[src/trunk]: src/sys/arch/hpcarm/dev US keydesc corrections from Bryan Vyhmei...

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e2cd7c948b9
branches:  trunk
changeset: 552006:2e2cd7c948b9
user:      uwe <uwe%NetBSD.org@localhost>
date:      Mon Sep 15 21:03:10 2003 +0000

description:
US keydesc corrections from Bryan Vyhmeister (bsd at hub3 dot net).
Tested by Julian Coleman <jdc@netbsd>.

diffstat:

 sys/arch/hpcarm/dev/j720kbdmap.c |  31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diffs (91 lines):

diff -r 685ae02f3446 -r 2e2cd7c948b9 sys/arch/hpcarm/dev/j720kbdmap.c
--- a/sys/arch/hpcarm/dev/j720kbdmap.c  Mon Sep 15 20:24:42 2003 +0000
+++ b/sys/arch/hpcarm/dev/j720kbdmap.c  Mon Sep 15 21:03:10 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: j720kbdmap.c,v 1.6 2003/07/15 00:25:07 lukem Exp $     */
+/*     $NetBSD: j720kbdmap.c,v 1.7 2003/09/15 21:03:10 uwe Exp $       */
 
 /*-
  * Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: j720kbdmap.c,v 1.6 2003/07/15 00:25:07 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: j720kbdmap.c,v 1.7 2003/09/15 21:03:10 uwe Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -47,7 +47,7 @@
 #define KC(n) KS_KEYCODE(n)
 
 static const keysym_t j720kbd_keydesc_us[] = {
-/*  pos      command           normal          shifted */
+/*  pos      command           normal          shifted         altgr */
     KC(1),   KS_Cmd_Debugger,  KS_Escape,
     KC(2),   KS_Cmd_Screen0,   KS_f1,
     KC(3),   KS_Cmd_Screen1,   KS_f2,
@@ -57,10 +57,13 @@
     KC(7),   KS_Cmd_Screen5,   KS_f6,
     KC(8),   KS_Cmd_Screen6,   KS_f7,
     KC(9),   KS_Cmd_Screen7,   KS_f8,
-    KC(17),                    KS_1,           KS_exclam,
-    KC(18),                    KS_2,           KS_at,
-    KC(19),                    KS_3,           KS_numbersign,
-    KC(20),                    KS_4,           KS_dollar,
+    KC(10),                    KS_f9,
+    KC(11),                    KS_f10,
+    KC(12),                    KS_f11,
+    KC(17),                    KS_1,           KS_exclam,      KS_asciitilde,
+    KC(18),                    KS_2,           KS_at,          KS_grave,
+    KC(19),                    KS_3,           KS_numbersign,  KS_sterling,
+    KC(20),                    KS_4,           KS_dollar,   /* KS_euro, */
     KC(21),                    KS_5,           KS_percent,
     KC(22),                    KS_6,           KS_asciicircum,
     KC(23),                    KS_7,           KS_ampersand,
@@ -78,8 +81,8 @@
     KC(39),                    KS_u,
     KC(40),                    KS_i,
     KC(41),                    KS_o,
-    KC(42),                    KS_p,
-    KC(43),                    KS_backslash,   KS_bar,
+    KC(42),                    KS_p,           KS_P,           KS_braceleft,
+    KC(43),                    KS_backslash,   KS_bar,         KS_braceright,
     KC(44),                    KS_BackSpace,
     KC(49),                    KS_a,
     KC(50),                    KS_s,
@@ -90,6 +93,7 @@
     KC(55),                    KS_j,
     KC(56),                    KS_k,
     KC(57),                    KS_l,
+    KC(58),                    KS_semicolon,   KS_colon,       KS_bracketleft,
     KC(65),                    KS_z,
     KC(66),                    KS_x,
     KC(67),                    KS_c,
@@ -99,11 +103,13 @@
     KC(71),                    KS_m,
     KC(72),                    KS_comma,       KS_less,
     KC(73),                    KS_period,      KS_greater,
+    KC(75),                    KS_apostrophe,  KS_quotedbl,    KS_bracketright,
     KC(76),                    KS_Return,
     KC(81),                    KS_Tab,
     KC(83),                    KS_Shift_L,
     KC(92),                    KS_Shift_R,
-    KC(101), KS_Cmd2,          KS_Alt_L,
+    KC(101),  KS_Cmd2,         KS_Alt_L,
+    KC(102),                   KS_Mode_switch,
 
     KC(113),                   KS_Meta_L,
     KC(114),  KS_Cmd1,         KS_Control_L,
@@ -111,11 +117,6 @@
     KC(120),                   KS_slash,       KS_question,
     KC(121),  KS_Cmd_ResetEmul,        KS_Delete,
 
-    /* below are guesses from Japanese model key layout */
-    KC(59),                    KS_bracketright, KS_braceright,
-    KC(58),                    KS_semicolon,   KS_colon,
-    KC(75),                    KS_apostrophe,  KS_quotedbl,
-
     KC(90),                    KS_Up,
     KC(105),                   KS_Left,
     KC(107),                   KS_Right,