 @@ -1,14 +1,14 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.19 2009/07/28 18:48:27 ahoka Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.20 2011/07/22 18:17:11 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.19 2009/07/28 18:48:27 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.20 2011/07/22 18:17:11 christos Exp $");
 #include "opt_wskbdmap.h"
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <dev/pckbport/wskbdmap_mfii.h>
 #define KC(n) KS_KEYCODE(n)
 static const keysym_t pckbd_keydesc_us[] = {
 /*  pos      command		normal		shifted */
     KC(1),   KS_Cmd_Debugger,	KS_Escape,
     KC(2),  			KS_1,		KS_exclam,
 @@ -179,26 +179,94 @@ static const keysym_t pckbd_keydesc_gr[]
     KC(37),  KS_k,		KS_K,		KS_gr_k,	KS_gr_K,
     KC(38),  KS_l,		KS_L,		KS_gr_l,	KS_gr_L,
     KC(39),  KS_semicolon,	KS_colon,	KS_dead_semi,	KS_dead_colon,
     KC(44),  KS_z,		KS_Z,		KS_gr_z,	KS_gr_Z,
     KC(45),  KS_x,		KS_X,		KS_gr_x,	KS_gr_X,
     KC(46),  KS_c,		KS_C,		KS_gr_c,	KS_gr_C,
     KC(47),  KS_v,		KS_V,		KS_gr_v,	KS_gr_V,
     KC(48),  KS_b,		KS_B,		KS_gr_b,	KS_gr_B,
     KC(49),  KS_n,		KS_N,		KS_gr_n,	KS_gr_N,
     KC(50),  KS_m,		KS_M,		KS_gr_m,	KS_gr_M,
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 static const keysym_t pckbd_keydesc_nl[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(2),   KS_1,		KS_exclam,	KS_onesuperior,
     KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
     KC(4),   KS_3,		KS_numbersign,	KS_threesuperior,
     KC(5),   KS_4,		KS_dollar,	KS_onequarter,
     KC(6),   KS_5,		KS_percent,	KS_onehalf,
     KC(7),   KS_6,		KS_ampersand,	KS_threequarters,
     KC(8),   KS_7,		KS_underscore,	KS_sterling,
     KC(9),   KS_8,		KS_parenleft,	KS_bracketleft,
     KC(10),  KS_9,		KS_parenright,	KS_bracketright,
     KC(11),  KS_0,		KS_apostrophe,
     KC(12),  KS_slash,		KS_question,	KS_backslash,
     KC(13),  KS_degree,		KS_dead_tilde,	KS_dead_cedilla,
     KC(18),  KS_e,		KS_E,		KS_currency,
     KC(26),  KS_dead_diaeresis,	KS_dead_circumflex,
     KC(27),  KS_asterisk,	KS_bar,
     KC(30),  KS_s,		KS_S,		KS_ssharp,
     KC(39),  KS_plus,		KS_plusminus,
     KC(40),  KS_dead_acute,	KS_dead_grave,
     KC(41),  KS_at,		KS_paragraph,	KS_notsign,
     KC(43),  KS_less,		KS_greater,
     KC(44),  KS_z,		KS_Z,		KS_guillemotleft,
     KC(45),  KS_x,		KS_X,		KS_guillemotright,
     KC(46),  KS_c,		KS_C,		KS_cent,
     KC(50),  KS_m,		KS_M,		KS_mu,
     KC(51),  KS_comma,		KS_semicolon,
     KC(52),  KS_period,		KS_colon,
     KC(53),  KS_minus,		KS_equal,
     KC(86),  KS_braceleft,	KS_braceright,	KS_brokenbar,
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 static const keysym_t pckbd_keydesc_nl[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(2),   KS_1,		KS_exclam,	KS_onesuperior,
     KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
     KC(4),   KS_3,		KS_numbersign,	KS_threesuperior,
     KC(5),   KS_4,		KS_dollar,	KS_onequarter,
     KC(6),   KS_5,		KS_percent,	KS_onehalf,
     KC(7),   KS_6,		KS_ampersand,	KS_threequarters,
     KC(8),   KS_7,		KS_underscore,	KS_sterling,
     KC(9),   KS_8,		KS_parenleft,	KS_braceleft,
     KC(10),  KS_9,		KS_parenright,	KS_braceright,
     KC(11),  KS_0,		KS_apostrophe,
     KC(12),  KS_slash,		KS_question,	KS_backslash,
     KC(13),  KS_degree,		KS_dead_tilde,	KS_dead_cedilla,
     KC(18),  KS_e,		KS_E,		KS_currency,
     KC(26),  KS_dead_diaeresis,	KS_dead_circumflex,
     KC(27),  KS_asterisk,	KS_bar,
     KC(31),  KS_s,		KS_S,		KS_ssharp,
     KC(39),  KS_plus,		KS_plusminus,
     KC(40),  KS_dead_acute,	KS_dead_grave,
     KC(41),  KS_at,		KS_paragraph,	KS_notsign,
     KC(43),  KS_less,		KS_greater,
     KC(44),  KS_z,		KS_Z,		KS_guillemotleft,
     KC(45),  KS_x,		KS_X,		KS_guillemotright,
     KC(46),  KS_c,		KS_C,		KS_cent,
     KC(50),  KS_m,		KS_M,		KS_mu,
     KC(51),  KS_comma,		KS_semicolon,
     KC(52),  KS_period,		KS_colon,
     KC(53),  KS_minus,		KS_equal,
     KC(86),  KS_bracketright,	KS_bracketleft,	KS_brokenbar,
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 static const keysym_t pckbd_keydesc_de[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
     KC(4),   KS_3,		KS_section,	KS_threesuperior,
     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_ssharp,		KS_question,	KS_backslash,
     KC(13),  KS_dead_acute,	KS_dead_grave,
     KC(16),  KS_q,		KS_Q,		KS_at,
     KC(21),  KS_z,
 @@ -743,31 +811,32 @@ const struct wscons_keydesc pckbd_keydes
 	KBD_MAP(KB_NO,			KB_DK,	pckbd_keydesc_no),
 	KBD_MAP(KB_NO | KB_NODEAD,	KB_NO,	pckbd_keydesc_no_nodead),
 	KBD_MAP(KB_US | KB_DECLK,	KB_US,	pckbd_keydesc_us_declk),
 	KBD_MAP(KB_US | KB_DVORAK,	KB_US,	pckbd_keydesc_us_dvorak),
 	KBD_MAP(KB_US | KB_COLEMAK,	KB_US,	pckbd_keydesc_us_colemak),
 	KBD_MAP(KB_US | KB_SWAPCTRLCAPS, KB_US,	pckbd_keydesc_swapctrlcaps),
 	KBD_MAP(KB_US | KB_IOPENER, KB_US,	pckbd_keydesc_iopener),
 	KBD_MAP(KB_JP | KB_SWAPCTRLCAPS, KB_JP, pckbd_keydesc_swapctrlcaps),
 	KBD_MAP(KB_FR | KB_SWAPCTRLCAPS, KB_FR, pckbd_keydesc_swapctrlcaps),
 	KBD_MAP(KB_US | KB_DVORAK | KB_SWAPCTRLCAPS,	KB_US | KB_DVORAK,
 		pckbd_keydesc_swapctrlcaps),
 	KBD_MAP(KB_US | KB_IOPENER | KB_SWAPCTRLCAPS,	KB_US | KB_IOPENER,
 		pckbd_keydesc_swapctrlcaps),
-	KBD_MAP(KB_ES ,			KB_US,	pckbd_keydesc_es),
+	KBD_MAP(KB_ES,			KB_US,	pckbd_keydesc_es),
 	KBD_MAP(KB_PT,			KB_US,	pckbd_keydesc_pt),
 	KBD_MAP(KB_GR,			KB_US,	pckbd_keydesc_gr),
         KBD_MAP(KB_CZ,			KB_US,	pckbd_keydesc_cz),
 	KBD_MAP(KB_HU,			KB_US,	pckbd_keydesc_hu),
 	KBD_MAP(KB_NL,			KB_US,	pckbd_keydesc_nl),
 #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_SG | KB_MACHDEP,	KB_SG),
 	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,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wsksymdef.h,v 1.64 2010/01/28 22:36:19 drochner Exp $ */
+/*	$NetBSD: wsksymdef.h,v 1.65 2011/07/22 18:17:12 christos Exp $ */
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -634,47 +634,48 @@
 /*
  * Define keyboard type and texts all in one table.
  * Include default variants (and their text form) for sysinst.
  * Sort (loosely) by country name.
  */
 #define KB_ENC_FUN(action) \
 action(KB_USER,	0,	0x0100,	"user",	,	"User-defined")	\
 action(KB_US,	0,	0x0200,	"us",	,	"US-English")	\
 action(KB_UK,	0,	0x0700,	"uk",	,	"UK-English")	\
 action(KB_BE,	0,	0x1300,	"be",	,	"Belgian")	\
 action(KB_CZ,	0,	0x1500, "cz",	,	"Czech")	\
 action(KB_DK,	0,	0x0400,	"dk",	,	"Danish")	\
 action(KB_NL,	0,	0x1600,	"nl",	,	"Dutch") 	\
 action(KB_FI,	0,	0x0900,	"fi",	,	"Finnish")	\
 action(KB_FR,	0,	0x0600,	"fr",	,	"French")	\
 action(KB_DE, KB_NODEAD,0x0300,	"de",".nodead",	"German")	\
 action(KB_GR,	0,	0x1400,	"gr",	,	"Greek")	\
 action(KB_HU,	0,	0x0c00,	"hu",	,	"Hungarian")	\
 action(KB_IT,	0,	0x0500,	"it",	,	"Italian")	\
 action(KB_JP,	0,	0x0800,	"jp",	,	"Japanese")	\
 action(KB_NO,	0,	0x0a00,	"no",	,	"Norwegian")	\
 action(KB_PL,	0,	0x0d00,	"pl",	,	"Polish")	\
 action(KB_PT,	0,	0x1100,	"pt",	,	"Portuguese")	\
 action(KB_RU,	0,	0x0e00,	"ru",	,	"Russian")	\
 action(KB_ES,	0,	0x0b00,	"es",	,	"Spanish")	\
 action(KB_SV,	0,	0x0900,	"sv",	,	"Swedish")	\
 action(KB_SF,	0,	0x1000,	"sf",	,	"Swiss French")	\
 action(KB_SG,	0,	0x0f00,	"sg",	,	"Swiss German")	\
 action(KB_UA,	0,	0x1200,	"ua",	,	"Ukrainian")
 #define KB_NONE 0x0000
 /* Define all the KB_xx numeric values using above table */
 #define KBF_ENUM(tag, tagf, value, cc, ccf, country) tag=value,
-enum { KB_ENC_FUN(KBF_ENUM) KB_NEXT=0x1600 };
+enum { KB_ENC_FUN(KBF_ENUM) KB_NEXT=0x1700 };
 /* Define list of KB_xxx and country codes for array initialisation */
 #define KBF_ENCTAB(tag, tagf, value, cc, ccf, country) { tag, cc },
 #define KB_ENCTAB KB_ENC_FUN(KBF_ENCTAB)
 #define KB_VARTAB \
 	{ KB_NODEAD,	"nodead" }, \
 	{ KB_DECLK,	"declk" }, \
 	{ KB_LK401,	"lk401" }, \
 	{ KB_SWAPCTRLCAPS, "swapctrlcaps" }, \
 	{ KB_DVORAK,	"dvorak" }, \
 	{ KB_METAESC,	"metaesc" }, \
 	{ KB_IOPENER,	"iopener" }, \