>Number:         6814
>Category:       kern
>Synopsis:       KB_JP keyboard for wscons
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people (Kernel Bug People)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 15 06:20:00 1999
>Last-Modified:
>Originator:     Nonaka Kimihiro
>Organization:
ASAHI-NET
>Release:        NetBSD-current 19990112
>Environment:
System: NetBSD koharu 1.3I NetBSD 1.3I (KOHARU) #158: Wed Jan 13 00:45:51 JST 1999 nonaka@koharu:/home/sup/src/sys/arch/i386/compile/KOHARU i386

>Description:
JP keyboards have an another layout.

>How-To-Repeat:

>Fix:

--- /sys/dev/wscons/wsksymdef.h	Mon Jan 11 21:18:58 1999
+++ sys/dev/wscons/wsksymdef.h	Tue Jan 12 22:40:24 1999
@@ -459,6 +459,7 @@
 #define KB_IT			0x0500
 #define KB_FR			0x0600
 #define KB_UK			0x0700
+#define KB_JP			0x0800
 
 #define KB_NODEAD		0x0001
 #define KB_DECLK		0x0002	/* DEC LKnnn layout */
@@ -473,6 +474,7 @@
 	{ KB_IT,	"it" }, \
 	{ KB_FR,	"fr" }, \
 	{ KB_UK,	"uk" }, \
+	{ KB_JP,	"jp" }, \
 	{ KB_NODEAD,	"nodead" }, \
 	{ KB_DECLK,	"declk" }, \
 	{ KB_LK401,	"lk401" }, \
--- /sys/dev/pckbc/wskbdmap_mfii.c	Mon Jan 11 21:18:54 1999
+++ sys/dev/pckbc/wskbdmap_mfii.c	Tue Jan 12 22:42:21 1999
@@ -295,6 +295,28 @@
     KC(43),  KS_numbersign,     KS_asciitilde,  KS_sterling,    KS_thorn,
     KC(86),  KS_backslash,      KS_bar,         KS_Udiaeresis,
 };
+static const keysym_t pckbd_keydesc_jp[] = {
+/*  pos      normal		shifted		altgr		shift-altgr */
+    KC(3),   KS_2,              KS_quotedbl,
+    KC(7),   KS_6,              KS_ampersand,
+    KC(8),   KS_7,              KS_apostrophe,
+    KC(9),   KS_8,              KS_parenleft,
+    KC(10),  KS_9,              KS_parenright,
+    KC(11),  KS_0,
+    KC(12),  KS_minus,          KS_equal,
+    KC(13),  KS_asciicircum,    KS_asciitilde,
+    KC(26),  KS_grave,          KS_at,
+    KC(27),  KS_bracketleft,    KS_braceleft,
+    KC(39),  KS_semicolon,      KS_plus,
+    KC(40),  KS_colon,          KS_asterisk,
+    /* 41, Hankaku/Zenkaku, */
+    KC(43),  KS_bracketright,   KS_braceright,
+    /* 112, Katakana/Hiragana, */
+    KC(115), KS_backslash,      KS_underscore,
+    /* 121, Henkan, */
+    /* 123, Muhenkan, */
+    KC(125), KS_backslash,      KS_bar,
+};
 
 static const keysym_t pckbd_keydesc_us_declk[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
@@ -353,8 +375,10 @@
 	KBD_MAP(KB_DK | KB_NODEAD,	KB_DK,	pckbd_keydesc_dk_nodead),
 	KBD_MAP(KB_IT,			KB_US,	pckbd_keydesc_it),
 	KBD_MAP(KB_UK,			KB_US,	pckbd_keydesc_uk),
+	KBD_MAP(KB_JP,			KB_US,	pckbd_keydesc_jp),
 	KBD_MAP(KB_US | KB_DECLK,	KB_US,	pckbd_keydesc_us_declk),
 	KBD_MAP(KB_US | KB_SWAPCTRLCAPS, KB_US,	pckbd_keydesc_swapctrlcaps),
+	KBD_MAP(KB_JP | KB_SWAPCTRLCAPS, KB_JP, pckbd_keydesc_swapctrlcaps),
 	{0, 0, 0, 0}
 };
>Audit-Trail:
>Unformatted: