[parisc-linux-cvs] linux deller
Helge Deller
deller@gmx.de
Thu, 27 Dec 2001 22:55:09 +0100
--------------Boundary-00=_XJV0CNDGMW4OL91GXT29
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
On Thursday 27 December 2001 22:54, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux
> Changes by: deller 01/12/27 14:54:13
>
> Modified files:
> . : Makefile
> drivers/char : hilkbd.c
>
> Log message:
> - 2.4.16-pa28 (HIL keyboard update)
> - fixed backquote and tilde chars on US HIL keyboards
> (reported by provinsd@telusplanet.net (Dean Allen Provins))
> - added comments and KERN_WARNING to printk()s
--------------Boundary-00=_XJV0CNDGMW4OL91GXT29
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.232
diff -u -p -r1.232 Makefile
--- Makefile 2001/12/26 23:19:27 1.232
+++ Makefile 2001/12/27 21:50:50
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 16
-EXTRAVERSION = -pa27
+EXTRAVERSION = -pa28
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: drivers/char/hilkbd.c
===================================================================
RCS file: /var/cvs/linux/drivers/char/hilkbd.c,v
retrieving revision 1.14
diff -u -p -r1.14 hilkbd.c
--- drivers/char/hilkbd.c 2001/11/21 15:16:39 1.14
+++ drivers/char/hilkbd.c 2001/12/27 21:51:05
@@ -3,6 +3,7 @@
*
* Copyright (C) 1998 Philip Blundell <philb@gnu.org>
* Copyright (C) 1999 Matthew Wilcox <willy@bofh.ai>
+ * Copyright (C) 1999-2001 Helge Deller <deller@gmx.de>
*
* HP Human Interface Loop driver. This handles the keyboard and mouse
* on the HP300 series and some of the HP700 series machines.
@@ -84,6 +85,11 @@ unsigned int hil_irq;
#define alt_map __initdata hp_alt_map
#define ctrl_alt_map __initdata hp_ctrl_alt_map
+/*
+ * US standard HIL keymap,
+ * generated with "loadkeys --mktable key.map > key.c"
+ */
+
u_short plain_map[NR_KEYS] = {
0xf200, 0xf200, 0xf701, 0xf703, 0xf700, 0xf700, 0xf702, 0xf205,
0xf304, 0xf308, 0xf305, 0xf309, 0xf306, 0xf307, 0xf30f, 0xf311,
@@ -92,7 +98,7 @@ u_short plain_map[NR_KEYS] = {
0xf200, 0xf109, 0xf200, 0xf10a, 0xf02e, 0xf108, 0xf30e, 0xf10b,
0xfb68, 0xfb67, 0xfb66, 0xfb64, 0xfb73, 0xfb61, 0xf200, 0xf207,
0xfb75, 0xfb79, 0xfb74, 0xfb72, 0xfb65, 0xfb77, 0xfb71, 0xf009,
- 0xf037, 0xf036, 0xf035, 0xf034, 0xf033, 0xf032, 0xf031, 0xf03c,
+ 0xf037, 0xf036, 0xf035, 0xf034, 0xf033, 0xf032, 0xf031, 0xf060,
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
0xf200, 0xf103, 0xf102, 0xf101, 0xf100, 0xf200, 0xf209, 0xf200,
0xf208, 0xf104, 0xf105, 0xf106, 0xf107, 0xf200, 0xf200, 0xf200,
@@ -111,7 +117,7 @@ static u_short shift_map[NR_KEYS] = {
0xf200, 0xf11f, 0xf200, 0xf120, 0xf30f, 0xf11e, 0xf809, 0xf121,
0xfb48, 0xfb47, 0xfb46, 0xfb44, 0xfb53, 0xfb41, 0xf200, 0xf207,
0xfb55, 0xfb59, 0xfb54, 0xfb52, 0xfb45, 0xfb57, 0xfb51, 0xf009,
- 0xf026, 0xf05e, 0xf025, 0xf024, 0xf023, 0xf040, 0xf021, 0xf03e,
+ 0xf026, 0xf05e, 0xf025, 0xf024, 0xf023, 0xf040, 0xf021, 0xf07e,
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
0xf200, 0xf10f, 0xf10e, 0xf10d, 0xf10c, 0xf200, 0xf209, 0xf200,
0xf204, 0xf110, 0xf111, 0xf112, 0xf113, 0xf200, 0xf200, 0xf200,
@@ -130,7 +136,7 @@ static u_short altgr_map[NR_KEYS] = {
0xf917, 0xf515, 0xfb67, 0xf516, 0xf02e, 0xf514, 0xf919, 0xf517,
0xf200, 0xf200, 0xf919, 0xf917, 0xfb7a, 0xf914, 0xf916, 0xf207,
0xf915, 0xfb6e, 0xfb6d, 0xf200, 0xf918, 0xf200, 0xf700, 0xf009,
- 0xf07b, 0xf200, 0xf200, 0xf024, 0xf200, 0xf040, 0xf0b9, 0xf07c,
+ 0xf07b, 0xf200, 0xf200, 0xf024, 0xf200, 0xf040, 0xf0b9, 0xf200,
0xf511, 0xf512, 0xf513, 0xf514, 0xf515, 0xf200, 0xf202, 0xf200,
0xf200, 0xf50f, 0xf50e, 0xf50d, 0xf50c, 0xf910, 0xf209, 0xf90b,
0xf202, 0xf510, 0xf511, 0xf512, 0xf513, 0xf200, 0xf200, 0xf200,
@@ -147,7 +153,7 @@ static u_short ctrl_map[NR_KEYS] = {
0xf301, 0xf30d, 0xf302, 0xf30a, 0xf303, 0xf213, 0xf300, 0xf30b,
0xf200, 0xf200, 0xf003, 0xf200, 0xf200, 0xf200, 0xf200, 0xf01b,
0xf200, 0xf12b, 0xf200, 0xf12c, 0xf02e, 0xf12a, 0xf009, 0xf12d,
- 0xf008, 0xf007, 0xf200, 0xf004, 0xf013, 0xf001, 0xf200, 0xf207,
+ 0xf008, 0xf000, 0xf200, 0xf004, 0xf013, 0xf001, 0xf200, 0xf207,
0xf015, 0xf019, 0xf014, 0xf012, 0xf005, 0xf017, 0xf011, 0xf009,
0xf01f, 0xf01e, 0xf01d, 0xf01c, 0xf01b, 0xf200, 0xf0a1, 0xf200,
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
@@ -187,7 +193,7 @@ static u_short alt_map[NR_KEYS] = {
0xf864, 0xf509, 0xf867, 0xf50a, 0xf82c, 0xf508, 0xf30e, 0xf50b,
0xf827, 0xf860, 0xf200, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf207,
0xf862, 0xf86e, 0xf86d, 0xf82c, 0xf82e, 0xf82f, 0xf700, 0xf809,
- 0xf837, 0xf836, 0xf835, 0xf834, 0xf833, 0xf832, 0xf831, 0xf83c,
+ 0xf837, 0xf836, 0xf835, 0xf834, 0xf833, 0xf832, 0xf831, 0xf200,
0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf200, 0xf209, 0xf200,
0xf200, 0xf503, 0xf502, 0xf501, 0xf500, 0xf906, 0xf209, 0xf901,
0xf202, 0xf504, 0xf505, 0xf506, 0xf507, 0xf200, 0xf200, 0xf200,
@@ -259,7 +265,7 @@ static void poll_finished(void)
unsigned char scode = poll.data[1] >> 1;
#if 0
if (down)
- printk("[%d]", scode);
+ printk(KERN_DEBUG "[%d]", scode);
#endif
handle_scancode(scode, down);
}
@@ -400,7 +406,7 @@ int __init hil_keyb_init(void)
hil_do(HIL_READKBDSADR, NULL, 0);
while (!hil_last.valid) {
if (n++ > 100000) {
- printk("HIL: timed out, assuming no keyboard present.\n");
+ printk(KERN_DEBUG "HIL: timed out, assuming no keyboard present.\n");
return 1;
}
mb();
@@ -408,7 +414,7 @@ int __init hil_keyb_init(void)
hil_getlast(s, c);
if (c == 0) {
- printk("HIL: no keyboard present.\n");
+ printk(KERN_WARNING "HIL: no keyboard present.\n");
return 1;
}
@@ -437,7 +443,7 @@ static int __init
hil_init_chip(struct parisc_device *dev)
{
if (!dev->irq) {
- printk(__FILE__ ": IRQ not found for HIL at 0x%lx\n", dev->hpa);
+ printk(KERN_WARNING __FILE__ ": IRQ not found for HIL at 0x%lx\n", dev->hpa);
return -ENODEV;
}
--------------Boundary-00=_XJV0CNDGMW4OL91GXT29--