 @@ -1,14 +1,14 @@
-/*	$NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $	*/
+/*	$NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $	*/
 /*
  * Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -21,27 +21,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: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $");
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <dev/usb/usb.h>
 #define KC(n)		KS_KEYCODE(n)
 Static const keysym_t hidkbd_keydesc_us[] = {
 /*  pos      command		normal		shifted */
     KC(4), 			KS_a,
     KC(5), 			KS_b,
 @@ -639,26 +639,27 @@ static const keysym_t hidkbd_keydesc_br[
     KC(49),  KS_bracketright,	KS_braceright,		KS_masculine,		KS_masculine,
     KC(50),  KS_bracketright,	KS_braceright,		KS_masculine,		KS_masculine,
     KC(51),  KS_ccedilla,	KS_Ccedilla,		KS_dead_acute,		KS_dead_hungarumlaut,
     KC(52),  KS_dead_tilde,	KS_dead_circumflex,	KS_asciitilde,		KS_asciicircum,
     KC(53),  KS_apostrophe,	KS_quotedbl,		KS_notsign,		KS_notsign,
     KC(56),  KS_semicolon,	KS_colon,		KS_dead_dotaccent,	KS_abovedot,
     KC(100), KS_backslash,	KS_bar,			KS_masculine,		KS_dead_breve,
     KC(135), KS_slash,		KS_question,		KS_degree,		KS_questiondown,
     KC(230), KS_Mode_switch,	KS_Multi_key,
 };
 static const keysym_t hidkbd_keydesc_br_nodead[] = {
 /*  pos      normal             shifted         altgr           shift-altgr */
     KC(35),  KS_6,		KS_diaeresis,	KS_notsign,	KS_dead_diaeresis,
     KC(47),  KS_apostrophe,	KS_grave,	KS_dead_acute,	KS_dead_grave,
     KC(52),  KS_asciitilde,	KS_asciicircum,	KS_dead_tilde,	KS_dead_circumflex,
 };
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
 const struct wscons_keydesc hidkbd_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	hidkbd_keydesc_us),
 	KBD_MAP(KB_US | KB_SWAPCTRLCAPS,KB_US,	hidkbd_keydesc_swapctrlcaps),
 	KBD_MAP(KB_US | KB_DVORAK,	KB_US,	hidkbd_keydesc_us_dvorak),
 	KBD_MAP(KB_US | KB_DVORAK | KB_SWAPCTRLCAPS,	KB_US| KB_DVORAK,
 		hidkbd_keydesc_swapctrlcaps),

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia 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.28 2020/07/12 01:35:59 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia 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,
 @@ -847,26 +847,27 @@ static const keysym_t pckbd_keydesc_br[]
     KC(40),  KS_dead_tilde,	KS_dead_circumflex,	KS_asciitilde,		KS_asciicircum,
     KC(41),  KS_apostrophe,	KS_quotedbl,		KS_notsign,		KS_notsign,
     KC(43),  KS_bracketright,	KS_braceright,		KS_masculine,		KS_masculine,
     KC(46),  KS_c,		KS_C,			KS_copyright,		KS_copyright,
     KC(50),  KS_m,		KS_M,			KS_mu,			KS_mu,
     KC(53),  KS_semicolon,	KS_colon,		KS_dead_dotaccent,	KS_abovedot,
     KC(86),  KS_backslash,	KS_bar,			KS_masculine,		KS_dead_breve,
     KC(115), KS_slash,		KS_question,		KS_degree,		KS_questiondown,
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 static const keysym_t pckbd_keydesc_br_nodead[] = {
 /*  pos      normal             shifted         altgr           shift-altgr */
     KC(7),   KS_6,		KS_diaeresis,	KS_notsign,	KS_dead_diaeresis,
     KC(26),  KS_apostrophe,	KS_grave,	KS_dead_acute,	KS_dead_grave,
     KC(40),  KS_asciitilde,	KS_asciicircum,	KS_dead_tilde,	KS_dead_circumflex,
 };
 #endif /* WSKBD_USONLY */
 #define KBD_MAP(name, base, map) \
 			{ name, base, sizeof(map)/sizeof(keysym_t), map }
 /* KBD_NULLMAP generates a entry for machine native variant.
    the entry will be modified by machine dependent keyboard driver. */
 #define KBD_NULLMAP(name, base) { name, base, 0, 0 }
 const struct wscons_keydesc pckbd_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	pckbd_keydesc_us),