[parisc-linux-cvs] fix for Num-Pad problems on HIL-keyboards

Helge Deller deller@gmx.de
Sun, 8 Jul 2001 20:18:48 +0200


Patch to fix the Num-Pad problems on HIL-keyboards.
Pressing "Shift-Multiply" now toggles NumLock on HIL keyboards
(since the Multiply key is where the NumLock key lies on PC-keyboards)

Index: hilkbd.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/char/hilkbd.c,v
retrieving revision 1.10
diff -u -r1.10 hilkbd.c
--- hilkbd.c	2001/06/27 20:17:19	1.10
+++ hilkbd.c	2001/07/08 18:13:27
@@ -71,25 +71,23 @@
 #define plain_map		__initdata hp_plain_map
 #define shift_map		__initdata hp_shift_map
 #define altgr_map		__initdata hp_altgr_map
-#define shift_altgr_map		__initdata hp_shift_altgr_map
 #define ctrl_map		__initdata hp_ctrl_map
 #define shift_ctrl_map		__initdata hp_shift_ctrl_map
 #define alt_map			__initdata hp_alt_map
-#define shift_alt_map		__initdata hp_shift_alt_map
 #define ctrl_alt_map		__initdata hp_ctrl_alt_map
 
 u_short plain_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf300,	0xf200,
+	0xf304,	0xf308,	0xf305,	0xf309,	0xf306,	0xf307,	0xf30f,	0xf311,
+	0xf301,	0xf30d,	0xf302,	0xf30a,	0xf303,	0xf30c,	0xf300,	0xf30b,
 	0xfb62,	0xfb76,	0xfb63,	0xfb78,	0xfb7a,	0xf200,	0xf200,	0xf01b,
-	0xf200,	0xf109,	0xf200,	0xf10a,	0xf200,	0xf108,	0xf200,	0xf10b,
+	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,	0xf060,
+	0xf037,	0xf036,	0xf035,	0xf034,	0xf033,	0xf032,	0xf031,	0xf03c,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 	0xf200,	0xf103,	0xf102,	0xf101,	0xf100,	0xf200,	0xf209,	0xf200,
-	0xf200,	0xf104,	0xf105,	0xf106,	0xf107,	0xf200,	0xf200,	0xf200,
+	0xf208,	0xf104,	0xf105,	0xf106,	0xf107,	0xf200,	0xf200,	0xf200,
 	0xf038,	0xf039,	0xf030,	0xf02d,	0xf03d,	0xf07f,	0xf200,	0xf200,
 	0xfb69,	0xfb6f,	0xfb70,	0xf05b,	0xf05d,	0xf05c,	0xf115,	0xf116,
 	0xfb6a,	0xfb6b,	0xfb6c,	0xf03b,	0xf027,	0xf201,	0xf114,	0xf118,
@@ -99,16 +97,16 @@
 
 static u_short shift_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf003,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf208,
-	0xf301,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf300,	0xf200,
+	0xf304,	0xf308,	0xf305,	0xf309,	0xf306,	0xf307,	0xf02e,	0xf311,
+	0xf301,	0xf30d,	0xf302,	0xf30a,	0xf303,	0xf208,	0xf300,	0xf30b,
 	0xfb42,	0xfb56,	0xfb43,	0xfb58,	0xfb5a,	0xf200,	0xf200,	0xf87f,
-	0xf200,	0xf11f,	0xf200,	0xf120,	0xf200,	0xf11e,	0xf200,	0xf121,
+	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,	0xf07e,
+	0xf026,	0xf05e,	0xf025,	0xf024,	0xf023,	0xf040,	0xf021,	0xf03e,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 	0xf200,	0xf10f,	0xf10e,	0xf10d,	0xf10c,	0xf200,	0xf209,	0xf200,
-	0xf203,	0xf110,	0xf111,	0xf112,	0xf113,	0xf200,	0xf200,	0xf200,
+	0xf204,	0xf110,	0xf111,	0xf112,	0xf113,	0xf200,	0xf200,	0xf200,
 	0xf02a,	0xf028,	0xf029,	0xf05f,	0xf02b,	0xf07f,	0xf200,	0xf200,
 	0xfb49,	0xfb4f,	0xfb50,	0xf07b,	0xf07d,	0xf07c,	0xf115,	0xf116,
 	0xfb4a,	0xfb4b,	0xfb4c,	0xf03a,	0xf022,	0xf201,	0xf114,	0xf118,
@@ -118,172 +116,114 @@
 
 static u_short altgr_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf07b,	0xf05b,	0xf05d,	0xf07d,	0xf05c,	0xf200,	0xf200,	0xf30c,
-	0xf90b,	0xfb77,	0xf918,	0xfb72,	0xfb74,	0xfb79,	0xf90a,	0xfb69,
-	0xfb6f,	0xfb70,	0xf200,	0xf07e,	0xf201,	0xf702,	0xf914,	0xf01b,
-	0xf917,	0xf515,	0xfb67,	0xf516,	0xfb6a,	0xf514,	0xfb6c,	0xf517,
-	0xf200,	0xf200,	0xf700,	0xf200,	0xfb7a,	0xfb78,	0xf916,	0xf207,
-	0xf915,	0xfb6e,	0xfb6d,	0xf200,	0xf200,	0xf200,	0xf700,	0xf009,
-	0xf703,	0xf200,	0xf207,	0xf50c,	0xf50d,	0xf50e,	0xf50f,	0xf510,
-	0xf511,	0xf512,	0xf513,	0xf514,	0xf515,	0xf208,	0xf202,	0xf911,
+	0xf90e,	0xf912,	0xf90f,	0xf913,	0xf910,	0xf911,	0xf200,	0xf311,
+	0xf90b,	0xf915,	0xf90c,	0xf30a,	0xf90d,	0xf30c,	0xf90a,	0xf917,
+	0xf915,	0xf200,	0xf916,	0xf200,	0xf200,	0xf702,	0xf914,	0xf01b,
+	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,
+	0xf511,	0xf512,	0xf513,	0xf514,	0xf515,	0xf200,	0xf202,	0xf200,
 	0xf200,	0xf50f,	0xf50e,	0xf50d,	0xf50c,	0xf910,	0xf209,	0xf90b,
-	0xf202,	0xf510,	0xf511,	0xf512,	0xf513,	0xf200,	0xf07c,	0xf516,
-	0xf517,	0xf200,	0xf200,	0xf200,	0xf200,	0xf008,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf115,	0xf116,
-	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf201,	0xf114,	0xf118,
-	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf117,	0xf311,	0xf119,
+	0xf202,	0xf510,	0xf511,	0xf512,	0xf513,	0xf200,	0xf200,	0xf200,
+	0xf05b,	0xf05d,	0xf07d,	0xf05c,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf702,	0xf200,	0xf200,	0xf07e,	0xf200,	0xf115,	0xf116,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf200,	0xf201,	0xf114,	0xf118,
+	0xf11a,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf311,	0xf119,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
 };
 
-static u_short shift_altgr_map[NR_KEYS] = {
-	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf300,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf01b,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf207,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf209,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf115,	0xf116,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf201,	0xf114,	0xf118,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf200,	0xf119,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
-};
-
 static u_short ctrl_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf300,	0xf200,
-	0xf002,	0xf016,	0xf003,	0xf018,	0xf01a,	0xf200,	0xf200,	0xf01b,
-	0xf200,	0xf12b,	0xf200,	0xf12c,	0xf200,	0xf12a,	0xf200,	0xf12d,
-	0xf008,	0xf007,	0xf006,	0xf004,	0xf013,	0xf001,	0xf200,	0xf207,
+	0xf304,	0xf308,	0xf305,	0xf309,	0xf306,	0xf307,	0xf200,	0xf311,
+	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,
 	0xf015,	0xf019,	0xf014,	0xf012,	0xf005,	0xf017,	0xf011,	0xf009,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf000,
+	0xf01f,	0xf01e,	0xf01d,	0xf01c,	0xf01b,	0xf200,	0xf0a1,	0xf200,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 	0xf200,	0xf125,	0xf124,	0xf123,	0xf122,	0xf200,	0xf209,	0xf200,
-	0xf204,	0xf126,	0xf127,	0xf128,	0xf129,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf008,	0xf200,	0xf200,
-	0xf009,	0xf00f,	0xf010,	0xf200,	0xf200,	0xf01c,	0xf115,	0xf116,
+	0xf203,	0xf126,	0xf127,	0xf128,	0xf129,	0xf200,	0xf200,	0xf200,
+	0xf07f,	0xf200,	0xf200,	0xf01f,	0xf200,	0xf008,	0xf200,	0xf200,
+	0xf200,	0xf00f,	0xf200,	0xf01b,	0xf01d,	0xf01c,	0xf115,	0xf116,
 	0xf00a,	0xf00b,	0xf00c,	0xf200,	0xf007,	0xf201,	0xf114,	0xf118,
-	0xf00d,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf200,	0xf119,
-	0xf00e,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
+	0xf00d,	0xf200,	0xf20e,	0xf07f,	0xf200,	0xf117,	0xf200,	0xf119,
+	0xf00e,	0xf000,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
 };
 
 static u_short shift_ctrl_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf01f,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf017,	0xf005,	0xf012,	0xf014,	0xf019,	0xf300,	0xf009,
-	0xf00f,	0xf010,	0xf200,	0xf200,	0xf201,	0xf702,	0xf001,	0xf01b,
-	0xf004,	0xf109,	0xf007,	0xf10a,	0xf00a,	0xf108,	0xf00c,	0xf10b,
-	0xf200,	0xf200,	0xf700,	0xf200,	0xf01a,	0xf018,	0xf003,	0xf207,
+	0xf304,	0xf308,	0xf305,	0xf309,	0xf306,	0xf307,	0xf200,	0xf311,
+	0xf301,	0xf30d,	0xf302,	0xf30a,	0xf303,	0xf30c,	0xf300,	0xf30b,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf702,	0xf001,	0xf01b,
+	0xf004,	0xf109,	0xf007,	0xf10a,	0xf02e,	0xf108,	0xf30e,	0xf10b,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf01a,	0xf018,	0xf003,	0xf207,
 	0xf002,	0xf00e,	0xf00d,	0xf200,	0xf200,	0xf200,	0xf700,	0xf009,
-	0xf703,	0xf200,	0xf207,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf208,	0xf200,	0xf307,
-	0xf200,	0xf103,	0xf102,	0xf101,	0xf100,	0xf306,	0xf209,	0xf301,
-	0xf302,	0xf104,	0xf105,	0xf106,	0xf107,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf008,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf115,	0xf116,
-	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf201,	0xf114,	0xf118,
-	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf117,	0xf311,	0xf119,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
-};
-
-static u_short altgr_ctrl_map[NR_KEYS] = {
-	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf300,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf01b,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf207,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf009,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf209,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf115,	0xf20c,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf201,	0xf114,	0xf118,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf200,	0xf119,
+	0xf200,	0xf103,	0xf102,	0xf101,	0xf100,	0xf306,	0xf209,	0xf301,
+	0xf208,	0xf104,	0xf105,	0xf106,	0xf107,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf01f,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf702,	0xf200,	0xf200,	0xf200,	0xf200,	0xf115,	0xf116,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf200,	0xf201,	0xf114,	0xf118,
+	0xf11a,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf311,	0xf119,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
 };
 
 static u_short alt_map[NR_KEYS] = {
 	0xf200,	0xf81b,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf837,	0xf838,	0xf839,	0xf830,	0xf82d,	0xf83d,	0xf87f,	0xf30c,
-	0xf901,	0xf877,	0xf865,	0xf872,	0xf874,	0xf879,	0xf900,	0xf869,
-	0xf86f,	0xf870,	0xf85b,	0xf85d,	0xf80d,	0xf702,	0xf861,	0xf81b,
-	0xf864,	0xf509,	0xf867,	0xf50a,	0xf86a,	0xf508,	0xf86c,	0xf50b,
-	0xf827,	0xf860,	0xf700,	0xf85c,	0xf87a,	0xf878,	0xf863,	0xf207,
+	0xf904,	0xf908,	0xf905,	0xf909,	0xf906,	0xf907,	0xf82c,	0xf311,
+	0xf901,	0xf30d,	0xf902,	0xf30a,	0xf903,	0xf208,	0xf900,	0xf30b,
+	0xf200,	0xf200,	0xf85b,	0xf85d,	0xf200,	0xf702,	0xf861,	0xf81b,
+	0xf864,	0xf509,	0xf867,	0xf50a,	0xf82c,	0xf508,	0xf30e,	0xf50b,
+	0xf827,	0xf860,	0xf200,	0xf85c,	0xf87a,	0xf878,	0xf863,	0xf207,
 	0xf862,	0xf86e,	0xf86d,	0xf82c,	0xf82e,	0xf82f,	0xf700,	0xf809,
-	0xf703,	0xf820,	0xf207,	0xf500,	0xf501,	0xf502,	0xf503,	0xf504,
-	0xf505,	0xf506,	0xf507,	0xf508,	0xf509,	0xf208,	0xf209,	0xf907,
+	0xf837,	0xf836,	0xf835,	0xf834,	0xf833,	0xf832,	0xf831,	0xf83c,
+	0xf505,	0xf506,	0xf507,	0xf508,	0xf509,	0xf200,	0xf209,	0xf200,
 	0xf200,	0xf503,	0xf502,	0xf501,	0xf500,	0xf906,	0xf209,	0xf901,
-	0xf902,	0xf504,	0xf505,	0xf506,	0xf507,	0xf200,	0xf83c,	0xf50a,
-	0xf50b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf87f,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf115,	0xf116,
-	0xf118,	0xf210,	0xf211,	0xf117,	0xf600,	0xf80d,	0xf114,	0xf20b,
-	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf117,	0xf311,	0xf20a,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf210,	0xf600,	0xf212,	0xf211,
-};
-
-static u_short shift_alt_map[NR_KEYS] = {
-	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf300,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf81b,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf207,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf809,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf209,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf87f,	0xf200,	0xf200,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf115,	0xf116,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf201,	0xf114,	0xf118,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf200,	0xf119,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
+	0xf202,	0xf504,	0xf505,	0xf506,	0xf507,	0xf200,	0xf200,	0xf200,
+	0xf838,	0xf839,	0xf830,	0xf82d,	0xf83d,	0xf87f,	0xf200,	0xf200,
+	0xf200,	0xf702,	0xf200,	0xf85b,	0xf85d,	0xf85c,	0xf115,	0xf116,
+	0xf118,	0xf210,	0xf211,	0xf117,	0xf827,	0xf80d,	0xf114,	0xf20b,
+	0xf11a,	0xf82c,	0xf82e,	0xf82f,	0xf200,	0xf117,	0xf311,	0xf20a,
+	0xf200,	0xf820,	0xf200,	0xf200,	0xf210,	0xf600,	0xf212,	0xf211,
 };
 
 static u_short ctrl_alt_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf701,	0xf703,	0xf700,	0xf700,	0xf702,	0xf205,
-	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf30c,
-	0xf301,	0xf817,	0xf805,	0xf812,	0xf814,	0xf819,	0xf300,	0xf809,
-	0xf80f,	0xf810,	0xf200,	0xf200,	0xf201,	0xf702,	0xf801,	0xf01b,
-	0xf804,	0xf509,	0xf807,	0xf50a,	0xf80a,	0xf508,	0xf80c,	0xf50b,
-	0xf200,	0xf200,	0xf700,	0xf200,	0xf81a,	0xf818,	0xf803,	0xf207,
+	0xf304,	0xf308,	0xf305,	0xf309,	0xf306,	0xf307,	0xf200,	0xf311,
+	0xf301,	0xf30d,	0xf302,	0xf30a,	0xf303,	0xf30c,	0xf300,	0xf30b,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf702,	0xf801,	0xf01b,
+	0xf804,	0xf509,	0xf807,	0xf50a,	0xf02e,	0xf508,	0xf30e,	0xf50b,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf81a,	0xf818,	0xf803,	0xf207,
 	0xf802,	0xf80e,	0xf80d,	0xf200,	0xf200,	0xf200,	0xf700,	0xf009,
-	0xf703,	0xf200,	0xf207,	0xf500,	0xf501,	0xf502,	0xf503,	0xf504,
-	0xf505,	0xf506,	0xf507,	0xf508,	0xf509,	0xf208,	0xf200,	0xf307,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf505,	0xf506,	0xf507,	0xf508,	0xf509,	0xf200,	0xf200,	0xf200,
 	0xf200,	0xf503,	0xf502,	0xf501,	0xf500,	0xf306,	0xf209,	0xf301,
-	0xf302,	0xf504,	0xf505,	0xf506,	0xf507,	0xf200,	0xf200,	0xf50a,
-	0xf50b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf008,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf115,	0xf20c,
-	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf201,	0xf114,	0xf118,
-	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf117,	0xf311,	0xf119,
+	0xf208,	0xf504,	0xf505,	0xf506,	0xf507,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf702,	0xf200,	0xf200,	0xf200,	0xf200,	0xf115,	0xf20c,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf200,	0xf201,	0xf114,	0xf118,
+	0xf11a,	0xf200,	0xf200,	0xf200,	0xf200,	0xf117,	0xf311,	0xf119,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf601,	0xf600,	0xf603,	0xf602,
 };
+
 #undef plain_map
 #undef shift_map
 #undef altgr_map
-#undef shift_altgr_map
 #undef ctrl_map
 #undef shift_ctrl_map
 #undef alt_map
-#undef shift_alt_map
 #undef ctrl_alt_map
 
 
 /* standard HP specific HIL keymaps */
 static ushort * __initdata hp_key_maps[MAX_NR_KEYMAPS] = {
-	hp_plain_map, hp_shift_map, hp_altgr_map, hp_shift_altgr_map,
+	hp_plain_map, hp_shift_map, hp_altgr_map, 0,
 	hp_ctrl_map, hp_shift_ctrl_map, 0, 0,
-	hp_alt_map, hp_shift_alt_map, 0, 0,
-	hp_ctrl_alt_map, 0
+	hp_alt_map, 0, 0, 0,
+	hp_ctrl_alt_map, 0, 0, 0
 };
 
 
@@ -311,7 +251,7 @@
 			unsigned char scode = poll.data[1] >> 1;
 #if 0
 			if (down)
-				printk("[%02x]", scode);
+				printk("[%d]", scode);
 #endif
 			handle_scancode(scode, down);
 		}