Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pckbport/wskbdmap_mfii.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pckbport/wskbdmap_mfii.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- src/sys/dev/pckbport/wskbdmap_mfii.c	2004/08/14 16:42:36	1.4
+++ src/sys/dev/pckbport/wskbdmap_mfii.c	2005/05/05 22:31:13	1.9
@@ -1,4 +1,4 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.4 2004/08/14 16:42:36 mycroft Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.9 2005/05/05 22:31:13 abs Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.4 2004/08/14 16:42:36 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.9 2005/05/05 22:31:13 abs Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -158,6 +158,7 @@ static const keysym_t pckbd_keydesc_us[]
     KC(221),			KS_Menu,
 };
 
+#ifndef WSKBD_USONLY
 static const keysym_t pckbd_keydesc_de[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
@@ -274,7 +275,7 @@ static const keysym_t pckbd_keydesc_fr[]
     KC(13),  KS_equal,		KS_plus,	KS_braceright,
     KC(16),  KS_a,
     KC(17),  KS_z,
-    KC(26),  KS_dead_circumflex, KS_dead_diaeresis, 
+    KC(26),  KS_dead_circumflex, KS_dead_diaeresis,
     KC(27),  KS_dollar,		KS_sterling,	KS_currency,
     KC(30),  KS_q,
     KC(39),  KS_m,
@@ -391,15 +392,15 @@ static const keysym_t pckbd_keydesc_pt[]
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(3),   KS_2,		KS_quotedbl,	KS_at,
     KC(4),   KS_3,		KS_numbersign,	KS_sterling,
-    KC(5),   KS_4,		KS_dollar,
+    KC(5),   KS_4,		KS_dollar,	KS_section,
     KC(7),   KS_6,		KS_ampersand,
     KC(8),   KS_7,		KS_slash,	KS_braceleft,
     KC(9),   KS_8,		KS_parenleft,	KS_bracketleft,
     KC(10),  KS_9,		KS_parenright,	KS_bracketright,
     KC(11),  KS_0,		KS_equal,	KS_braceright,
     KC(12),  KS_apostrophe,	KS_question,
-    KC(13),  KS_less,		KS_greater,
-    KC(26),  KS_plus,		KS_asterisk,
+    KC(13),  KS_guillemotleft,	KS_guillemotright,
+    KC(26),  KS_plus,		KS_asterisk,	KS_dead_diaeresis,
     KC(27),  KS_dead_acute,	KS_dead_grave,
     KC(39),  KS_ccedilla,	KS_Ccedilla,
     KC(40),  KS_masculine,	KS_ordfeminine,
@@ -509,6 +510,7 @@ static const keysym_t pckbd_keydesc_iope
     KC(87),  KS_Cmd_Screen9,	KS_f10,
     KC(88), 			KS_f11,
 };
+#endif /* WSKBD_USONLY */
 
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
@@ -518,6 +520,7 @@ static const keysym_t pckbd_keydesc_iope
 
 const struct wscons_keydesc pckbd_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	pckbd_keydesc_us),
+#ifndef WSKBD_USONLY
 	KBD_MAP(KB_DE,			KB_US,	pckbd_keydesc_de),
 	KBD_MAP(KB_DE | KB_NODEAD,	KB_DE,	pckbd_keydesc_de_nodead),
 	KBD_MAP(KB_FR,                  KB_US,  pckbd_keydesc_fr),
@@ -542,16 +545,20 @@ const struct wscons_keydesc pckbd_keydes
 		pckbd_keydesc_swapctrlcaps),
 	KBD_MAP(KB_ES ,			KB_US,	pckbd_keydesc_es),
 	KBD_MAP(KB_PT,			KB_US,	pckbd_keydesc_pt),
+#endif /* WSKBD_USONLY */
 
 	/* placeholders */
 	KBD_NULLMAP(KB_US | KB_MACHDEP,	KB_US),
+#ifndef WSKBD_USONLY
 	KBD_NULLMAP(KB_DE | KB_MACHDEP,	KB_DE),
+	KBD_NULLMAP(KB_ES | KB_MACHDEP,	KB_ES),
 	KBD_NULLMAP(KB_FR | KB_MACHDEP,	KB_FR),
 	KBD_NULLMAP(KB_JP | KB_MACHDEP,	KB_JP),
 	KBD_NULLMAP(KB_US | KB_MACHDEP | KB_SWAPCTRLCAPS,
 		    KB_US | KB_SWAPCTRLCAPS),
 	KBD_NULLMAP(KB_JP | KB_MACHDEP | KB_SWAPCTRLCAPS,
 		    KB_JP | KB_SWAPCTRLCAPS),
+#endif /* WSKBD_USONLY */
 
 	{0, 0, 0, 0}
 };