[parisc-linux-cvs] 2.6.0-test2-pa5: move HIL keycode tables to one common place
Helge Deller
deller@gmx.de
Sat, 2 Aug 2003 23:54:03 +0200
--Boundary-00=_7LDL/kK/H/KKaLP
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
On Saturday 02 August 2003 23:51, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux-2.5
> Changes by: deller 03/08/02 15:51:00
>
> Modified files:
> . : Makefile
> drivers/input/keyboard: hil_kbd.c hilkbd.c
> include/linux : hil.h
> Removed files:
> include/asm-parisc: hil.h
>
> Log message:
> 2.6.0-test2-pa5:
> - remove include/asm-parisc/hil.h, it's nowhere used any longer
> - move the HIL keycode tables from all driver sources and move them to one
> place instead into include/linux/hil.h
--Boundary-00=_7LDL/kK/H/KKaLP
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/Makefile,v
retrieving revision 1.143
diff -u -p -r1.143 Makefile
--- Makefile 2 Aug 2003 07:54:11 -0000 1.143
+++ Makefile 2 Aug 2003 21:48:05 -0000
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 0
-EXTRAVERSION = -test2-pa4
+EXTRAVERSION = -test2-pa5
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
Index: include/asm-parisc/hil.h
===================================================================
RCS file: include/asm-parisc/hil.h
diff -N include/asm-parisc/hil.h
--- include/asm-parisc/hil.h 19 Jul 2002 15:54:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-#ifndef _ASM_HIL_H
-#define _ASM_HIL_H
-
-/*
- * linux/asm-parisc/hil.h
- *
- * (c) 1999 Matthew Wilcox
- */
-
-extern unsigned long hil_base; /* declared in drivers/parisc/hil.c */
-extern unsigned int hil_irq;
-
-#define HILBASE hil_base /* 0xf0821000 (old) or 0xf0201000 (new) */
-#define HIL_DATA 0x800
-#define HIL_CMD 0x801
-
-#define HIL_IRQ hil_irq
-
-#define hil_busy() (gsc_readb(HILBASE + HIL_CMD) & HIL_BUSY)
-#define hil_data_available() (gsc_readb(HILBASE + HIL_CMD) & HIL_DATA_RDY)
-#define hil_status() (gsc_readb(HILBASE + HIL_CMD))
-#define hil_command(x) do { gsc_writeb((x), HILBASE + HIL_CMD); } while (0)
-#define hil_read_data() (gsc_readb(HILBASE + HIL_DATA))
-#define hil_write_data(x) do { gsc_writeb((x), HILBASE + HIL_DATA); } while (0)
-
-#endif
Index: drivers/input/keyboard/hil_kbd.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/input/keyboard/hil_kbd.c,v
retrieving revision 1.7
diff -u -p -r1.7 hil_kbd.c
--- drivers/input/keyboard/hil_kbd.c 2 Aug 2003 07:54:11 -0000 1.7
+++ drivers/input/keyboard/hil_kbd.c 2 Aug 2003 21:48:06 -0000
@@ -51,85 +51,17 @@ MODULE_LICENSE("Dual BSD/GPL");
#define HIL_KBD_SET1_UPBIT 0x01
#define HIL_KBD_SET1_SHIFT 1
-
-#define KBD_TBLSIZE 128
-static unsigned int hil_kbd_set1[KBD_TBLSIZE] = { /* set1 keycodes */
- KEY_5, KEY_RESERVED, KEY_RIGHTALT, KEY_LEFTALT,
- KEY_RIGHTSHIFT, KEY_LEFTSHIFT, KEY_LEFTCTRL, KEY_SYSRQ,
- KEY_KP4, KEY_KP8, KEY_KP5, KEY_KP9,
- KEY_KP6, KEY_KP7, KEY_KPCOMMA, KEY_KPENTER,
- KEY_KP1, KEY_KPSLASH, KEY_KP2, KEY_KPPLUS,
- KEY_KP3, KEY_KPASTERISK, KEY_KP0, KEY_KPMINUS,
- KEY_B, KEY_V, KEY_C, KEY_X,
- KEY_Z, KEY_RESERVED, KEY_RESERVED, KEY_ESC,
- KEY_6, KEY_F10, KEY_3, KEY_F11,
- KEY_KPDOT, KEY_F9, KEY_TAB /*KP*/, KEY_F12,
- KEY_H, KEY_G, KEY_F, KEY_D,
- KEY_S, KEY_A, KEY_RESERVED, KEY_CAPSLOCK,
- KEY_U, KEY_Y, KEY_T, KEY_R,
- KEY_E, KEY_W, KEY_Q, KEY_TAB,
- KEY_7, KEY_6, KEY_5, KEY_4,
- KEY_3, KEY_2, KEY_1, KEY_GRAVE,
- KEY_INTL1, KEY_INTL2, KEY_INTL3, KEY_INTL4, /*Buttons*/
- KEY_INTL5, KEY_INTL6, KEY_INTL7, KEY_INTL8,
- KEY_MENU, KEY_F4, KEY_F3, KEY_F2,
- KEY_F1, KEY_VOLUMEUP, KEY_STOP, KEY_SENDFILE/*Enter/Print*/,
- KEY_SYSRQ, KEY_F5, KEY_F6, KEY_F7,
- KEY_F8, KEY_VOLUMEDOWN, KEY_DEL_EOL, KEY_DEL_EOS,
- KEY_8, KEY_9, KEY_0, KEY_MINUS,
- KEY_EQUAL, KEY_BACKSPACE, KEY_INS_LINE, KEY_DEL_LINE,
- KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE,
- KEY_RIGHTBRACE, KEY_BACKSLASH, KEY_INSERT, KEY_DELETE,
- KEY_J, KEY_K, KEY_L, KEY_SEMICOLON,
- KEY_APOSTROPHE, KEY_ENTER, KEY_HOME, KEY_PAGEUP,
- KEY_M, KEY_COMMA, KEY_DOT, KEY_SLASH,
- KEY_RESERVED, KEY_SELECT, KEY_RESERVED, KEY_PAGEDOWN,
- KEY_N, KEY_SPACE, KEY_NEXT, KEY_RESERVED,
- KEY_LEFT, KEY_DOWN, KEY_UP, KEY_RIGHT
-};
+static unsigned int hil_kbd_set1[HIL_KEYCODES_SET1_TBLSIZE] =
+ { HIL_KEYCODES_SET1 };
#define HIL_KBD_SET2_UPBIT 0x01
#define HIL_KBD_SET2_SHIFT 1
-
/* Set2 is user defined */
#define HIL_KBD_SET3_UPBIT 0x80
#define HIL_KBD_SET3_SHIFT 0
-
-static unsigned int hil_kbd_set3[KBD_TBLSIZE] = {
- KEY_RESERVED, KEY_ESC, KEY_1, KEY_2,
- KEY_3, KEY_4, KEY_5, KEY_6,
- KEY_7, KEY_8, KEY_9, KEY_0,
- KEY_MINUS, KEY_EQUAL, KEY_BACKSPACE, KEY_TAB,
- KEY_Q, KEY_W, KEY_E, KEY_R,
- KEY_T, KEY_Y, KEY_U, KEY_I,
- KEY_O, KEY_P, KEY_LEFTBRACE, KEY_RIGHTBRACE,
- KEY_ENTER, KEY_LEFTCTRL, KEY_A, KEY_S,
- KEY_D, KEY_F, KEY_G, KEY_H,
- KEY_J, KEY_K, KEY_L, KEY_SEMICOLON,
- KEY_APOSTROPHE,KEY_GRAVE, KEY_LEFTSHIFT, KEY_BACKSLASH,
- KEY_Z, KEY_X, KEY_C, KEY_V,
- KEY_B, KEY_N, KEY_M, KEY_COMMA,
- KEY_DOT, KEY_SLASH, KEY_RIGHTSHIFT, KEY_KPASTERISK,
- KEY_LEFTALT, KEY_SPACE, KEY_CAPSLOCK, KEY_F1,
- KEY_F2, KEY_F3, KEY_F4, KEY_F5,
- KEY_F6, KEY_F7, KEY_F8, KEY_F9,
- KEY_F10, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_KP7,
- KEY_KP8, KEY_KP9, KEY_KPMINUS, KEY_KP4,
- KEY_KP5, KEY_KP6, KEY_KPPLUS, KEY_KP1,
- KEY_KP2, KEY_KP3, KEY_KP0, KEY_KPDOT,
- KEY_SYSRQ, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
- KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
- KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
- KEY_UP, KEY_LEFT, KEY_DOWN, KEY_RIGHT,
- KEY_HOME, KEY_PAGEUP, KEY_END, KEY_PAGEDOWN,
- KEY_INSERT, KEY_DELETE, KEY_102ND, KEY_RESERVED,
- KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
- KEY_F1, KEY_F2, KEY_F3, KEY_F4,
- KEY_F5, KEY_F6, KEY_F7, KEY_F8,
- KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
- KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED
-};
+static unsigned int hil_kbd_set3[HIL_KEYCODES_SET3_TBLSIZE] =
+ { HIL_KEYCODES_SET3 };
static char hil_language[][16] = { HIL_LOCALE_MAP };
@@ -381,13 +313,13 @@ static void hil_kbd_connect(struct serio
kbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
kbd->dev.ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
- kbd->dev.keycodemax = KBD_TBLSIZE;
+ kbd->dev.keycodemax = HIL_KEYCODES_SET1_TBLSIZE;
kbd->dev.keycodesize = sizeof(hil_kbd_set1[0]);
kbd->dev.keycode = hil_kbd_set1;
kbd->dev.name = strlen(kbd->rnm) ? kbd->rnm : HIL_GENERIC_NAME;
kbd->dev.phys = "hpkbd/input0"; /* XXX */
- kbd->dev.rep[REP_DELAY] = HZ/4; /* auto-repeat values */
- kbd->dev.rep[REP_PERIOD] = HZ/8;
+ kbd->dev.rep[REP_DELAY] = HZ/4; /* auto-repeat values */
+ kbd->dev.rep[REP_PERIOD]= HZ/8;
kbd->dev.id.bustype = BUS_HIL;
kbd->dev.id.vendor = PCI_VENDOR_ID_HP;
Index: drivers/input/keyboard/hilkbd.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/input/keyboard/hilkbd.c,v
retrieving revision 1.6
diff -u -p -r1.6 hilkbd.c
--- drivers/input/keyboard/hilkbd.c 2 Aug 2003 07:54:11 -0000 1.6
+++ drivers/input/keyboard/hilkbd.c 2 Aug 2003 21:48:07 -0000
@@ -85,43 +85,8 @@ MODULE_LICENSE("GPL v2");
#define HIL_READKBDSADR 0xF9
#define HIL_WRITEKBDSADR 0xE9
-
-#define KBD_TBLSIZE 128
-static unsigned int hphilkeyb_keycode[KBD_TBLSIZE] = { /* set1 keycodes */
- KEY_5, KEY_RESERVED, KEY_RIGHTALT, KEY_LEFTALT,
- KEY_RIGHTSHIFT, KEY_LEFTSHIFT, KEY_LEFTCTRL, KEY_SYSRQ,
- KEY_KP4, KEY_KP8, KEY_KP5, KEY_KP9,
- KEY_KP6, KEY_KP7, KEY_KPCOMMA, KEY_KPENTER,
- KEY_KP1, KEY_KPSLASH, KEY_KP2, KEY_KPPLUS,
- KEY_KP3, KEY_KPASTERISK, KEY_KP0, KEY_KPMINUS,
- KEY_B, KEY_V, KEY_C, KEY_X,
- KEY_Z, KEY_RESERVED, KEY_RESERVED, KEY_ESC,
- KEY_6, KEY_F10, KEY_3, KEY_F11,
- KEY_KPDOT, KEY_F9, KEY_TAB /*KP*/, KEY_F12,
- KEY_H, KEY_G, KEY_F, KEY_D,
- KEY_S, KEY_A, KEY_RESERVED, KEY_CAPSLOCK,
- KEY_U, KEY_Y, KEY_T, KEY_R,
- KEY_E, KEY_W, KEY_Q, KEY_TAB,
- KEY_7, KEY_6, KEY_5, KEY_4,
- KEY_3, KEY_2, KEY_1, KEY_GRAVE,
- KEY_INTL1, KEY_INTL2, KEY_INTL3, KEY_INTL4, /*Buttons*/
- KEY_INTL5, KEY_INTL6, KEY_INTL7, KEY_INTL8,
- KEY_MENU, KEY_F4, KEY_F3, KEY_F2,
- KEY_F1, KEY_VOLUMEUP, KEY_STOP, KEY_SENDFILE/*Enter/Print*/,
- KEY_SYSRQ, KEY_F5, KEY_F6, KEY_F7,
- KEY_F8, KEY_VOLUMEDOWN, KEY_DEL_EOL, KEY_DEL_EOS,
- KEY_8, KEY_9, KEY_0, KEY_MINUS,
- KEY_EQUAL, KEY_BACKSPACE, KEY_INS_LINE, KEY_DEL_LINE,
- KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE,
- KEY_RIGHTBRACE, KEY_BACKSLASH, KEY_INSERT, KEY_DELETE,
- KEY_J, KEY_K, KEY_L, KEY_SEMICOLON,
- KEY_APOSTROPHE, KEY_ENTER, KEY_HOME, KEY_PAGEUP,
- KEY_M, KEY_COMMA, KEY_DOT, KEY_SLASH,
- KEY_RESERVED, KEY_SELECT, KEY_RESERVED, KEY_PAGEDOWN,
- KEY_N, KEY_SPACE, KEY_NEXT, KEY_RESERVED,
- KEY_LEFT, KEY_DOWN, KEY_UP, KEY_RIGHT
-};
-
+static unsigned int hphilkeyb_keycode[HIL_KEYCODES_SET1_TBLSIZE] =
+ { HIL_KEYCODES_SET1 };
/* HIL structure */
static struct {
@@ -265,7 +230,7 @@ hil_keyb_init(void)
init_waitqueue_head(&hil_wait);
wait_event_interruptible_timeout(hil_wait, hil_dev.valid, 3*HZ);
if (!hil_dev.valid) {
- printk(KERN_DEBUG "HIL: timed out, assuming no keyboard present.\n");
+ printk(KERN_WARNING "HIL: timed out, assuming no keyboard present.\n");
}
c = hil_dev.c;
@@ -284,13 +249,13 @@ hil_keyb_init(void)
init_input_dev(&hil_dev.dev);
- for (i = 0; i < KBD_TBLSIZE; i++)
+ for (i = 0; i < HIL_KEYCODES_SET1_TBLSIZE; i++)
if (hphilkeyb_keycode[i] != KEY_RESERVED)
set_bit(hphilkeyb_keycode[i], hil_dev.dev.keybit);
hil_dev.dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
hil_dev.dev.ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
- hil_dev.dev.keycodemax = KBD_TBLSIZE;
+ hil_dev.dev.keycodemax = HIL_KEYCODES_SET1_TBLSIZE;
hil_dev.dev.keycodesize = sizeof(hphilkeyb_keycode[0]);
hil_dev.dev.keycode = hphilkeyb_keycode;
hil_dev.dev.name = "HIL keyboard";
Index: include/linux/hil.h
===================================================================
RCS file: /var/cvs/linux-2.5/include/linux/hil.h,v
retrieving revision 1.1
diff -u -p -r1.1 hil.h
--- include/linux/hil.h 7 Nov 2002 04:04:36 -0000 1.1
+++ include/linux/hil.h 2 Aug 2003 21:48:07 -0000
@@ -1,3 +1,6 @@
+#ifndef _HIL_H_
+#define _HIL_H_
+
/*
* Hewlett Packard Human Interface Loop (HP-HIL) Protocol -- header.
*
@@ -387,6 +390,79 @@ enum hil_command {
"english.us" /* 0x1f United States */ \
+/* HIL keycodes */
+#define HIL_KEYCODES_SET1_TBLSIZE 128
+#define HIL_KEYCODES_SET1 \
+ KEY_5, KEY_RESERVED, KEY_RIGHTALT, KEY_LEFTALT, \
+ KEY_RIGHTSHIFT, KEY_LEFTSHIFT, KEY_LEFTCTRL, KEY_SYSRQ, \
+ KEY_KP4, KEY_KP8, KEY_KP5, KEY_KP9, \
+ KEY_KP6, KEY_KP7, KEY_KPCOMMA, KEY_KPENTER, \
+ KEY_KP1, KEY_KPSLASH, KEY_KP2, KEY_KPPLUS, \
+ KEY_KP3, KEY_KPASTERISK, KEY_KP0, KEY_KPMINUS, \
+ KEY_B, KEY_V, KEY_C, KEY_X, \
+ KEY_Z, KEY_RESERVED, KEY_RESERVED, KEY_ESC, \
+ KEY_6, KEY_F10, KEY_3, KEY_F11, \
+ KEY_KPDOT, KEY_F9, KEY_TAB /*KP*/, KEY_F12, \
+ KEY_H, KEY_G, KEY_F, KEY_D, \
+ KEY_S, KEY_A, KEY_RESERVED, KEY_CAPSLOCK, \
+ KEY_U, KEY_Y, KEY_T, KEY_R, \
+ KEY_E, KEY_W, KEY_Q, KEY_TAB, \
+ KEY_7, KEY_6, KEY_5, KEY_4, \
+ KEY_3, KEY_2, KEY_1, KEY_GRAVE, \
+ KEY_INTL1, KEY_INTL2, KEY_INTL3, KEY_INTL4, \
+ KEY_INTL5, KEY_INTL6, KEY_INTL7, KEY_INTL8, \
+ KEY_MENU, KEY_F4, KEY_F3, KEY_F2, \
+ KEY_F1, KEY_VOLUMEUP, KEY_STOP, KEY_SENDFILE, \
+ KEY_SYSRQ, KEY_F5, KEY_F6, KEY_F7, \
+ KEY_F8, KEY_VOLUMEDOWN, KEY_DEL_EOL, KEY_DEL_EOS, \
+ KEY_8, KEY_9, KEY_0, KEY_MINUS, \
+ KEY_EQUAL, KEY_BACKSPACE, KEY_INS_LINE, KEY_DEL_LINE, \
+ KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE, \
+ KEY_RIGHTBRACE, KEY_BACKSLASH, KEY_INSERT, KEY_DELETE, \
+ KEY_J, KEY_K, KEY_L, KEY_SEMICOLON, \
+ KEY_APOSTROPHE, KEY_ENTER, KEY_HOME, KEY_PAGEUP, \
+ KEY_M, KEY_COMMA, KEY_DOT, KEY_SLASH, \
+ KEY_RESERVED, KEY_SELECT, KEY_RESERVED, KEY_PAGEDOWN, \
+ KEY_N, KEY_SPACE, KEY_NEXT, KEY_RESERVED, \
+ KEY_LEFT, KEY_DOWN, KEY_UP, KEY_RIGHT
+
+
+#define HIL_KEYCODES_SET3_TBLSIZE 128
+#define HIL_KEYCODES_SET3 \
+ KEY_RESERVED, KEY_ESC, KEY_1, KEY_2, \
+ KEY_3, KEY_4, KEY_5, KEY_6, \
+ KEY_7, KEY_8, KEY_9, KEY_0, \
+ KEY_MINUS, KEY_EQUAL, KEY_BACKSPACE, KEY_TAB, \
+ KEY_Q, KEY_W, KEY_E, KEY_R, \
+ KEY_T, KEY_Y, KEY_U, KEY_I, \
+ KEY_O, KEY_P, KEY_LEFTBRACE, KEY_RIGHTBRACE, \
+ KEY_ENTER, KEY_LEFTCTRL, KEY_A, KEY_S, \
+ KEY_D, KEY_F, KEY_G, KEY_H, \
+ KEY_J, KEY_K, KEY_L, KEY_SEMICOLON, \
+ KEY_APOSTROPHE,KEY_GRAVE, KEY_LEFTSHIFT, KEY_BACKSLASH, \
+ KEY_Z, KEY_X, KEY_C, KEY_V, \
+ KEY_B, KEY_N, KEY_M, KEY_COMMA, \
+ KEY_DOT, KEY_SLASH, KEY_RIGHTSHIFT, KEY_KPASTERISK, \
+ KEY_LEFTALT, KEY_SPACE, KEY_CAPSLOCK, KEY_F1, \
+ KEY_F2, KEY_F3, KEY_F4, KEY_F5, \
+ KEY_F6, KEY_F7, KEY_F8, KEY_F9, \
+ KEY_F10, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_KP7, \
+ KEY_KP8, KEY_KP9, KEY_KPMINUS, KEY_KP4, \
+ KEY_KP5, KEY_KP6, KEY_KPPLUS, KEY_KP1, \
+ KEY_KP2, KEY_KP3, KEY_KP0, KEY_KPDOT, \
+ KEY_SYSRQ, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, \
+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, \
+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, \
+ KEY_UP, KEY_LEFT, KEY_DOWN, KEY_RIGHT, \
+ KEY_HOME, KEY_PAGEUP, KEY_END, KEY_PAGEDOWN, \
+ KEY_INSERT, KEY_DELETE, KEY_102ND, KEY_RESERVED, \
+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, \
+ KEY_F1, KEY_F2, KEY_F3, KEY_F4, \
+ KEY_F5, KEY_F6, KEY_F7, KEY_F8, \
+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, \
+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED
+
+
/* Response to POL command, the "poll record header" */
#define HIL_POL_NUM_AXES_MASK 0x03 /* Number of axis reported */
@@ -403,3 +479,5 @@ enum hil_command {
#define HIL_POL_CHARTYPE_SET3 0x70 /* Keycode Set 3 */
#define HIL_POL_AXIS_ALT 0x80 /* Data is from axis set 2 */
+
+#endif /* _HIL_H_ */
--Boundary-00=_7LDL/kK/H/KKaLP--