[src/trunk]: src/sys/dev Add a belgian keyboard layout, based on the french k...

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

details:   https://anonhg.NetBSD.org/src/rev/0e791f405e59
branches:  trunk
changeset: 330564:0e791f405e59
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Mon Jul 14 10:05:23 2014 +0000

description:
Add a belgian keyboard layout, based on the french keyboard layout.
Fixes PR install/46871.

diffstat:

 sys/dev/pckbport/wskbdmap_mfii.c |  27 +++++++++++++++++++++++++--
 sys/dev/usb/ukbdmap.c            |  27 +++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 4 deletions(-)

diffs (110 lines):

diff -r 322f2caea869 -r 0e791f405e59 sys/dev/pckbport/wskbdmap_mfii.c
--- a/sys/dev/pckbport/wskbdmap_mfii.c  Mon Jul 14 07:55:26 2014 +0000
+++ b/sys/dev/pckbport/wskbdmap_mfii.c  Mon Jul 14 10:05:23 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wskbdmap_mfii.c,v 1.24 2014/06/11 20:09:17 riastradh Exp $     */
+/*     $NetBSD: wskbdmap_mfii.c,v 1.25 2014/07/14 10:05:24 mbalmer Exp $       */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.24 2014/06/11 20:09:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.25 2014/07/14 10:05:24 mbalmer Exp $");
 
 #include "opt_wskbdmap.h"
 #include <sys/types.h>
@@ -419,6 +419,28 @@
     KC(184), KS_Mode_switch,   KS_Multi_key,
 };
 
+static const keysym_t pckbd_keydesc_be[] = {
+/*  pos             normal             shifted         altgr           shift-altgr */
+    KC(2),   KS_ampersand,     KS_1,           KS_bar,
+    KC(3),   KS_eacute,                KS_2,           KS_at,
+    KC(5),   KS_apostrophe,    KS_4,
+    KC(6),   KS_parenleft,     KS_5,
+    KC(7),   KS_section,       KS_6,           KS_asciicircum,
+    KC(8),   KS_egrave,                KS_7,
+    KC(9),   KS_exclam,                KS_8,
+    KC(10),  KS_ccedilla,      KS_9,           KS_braceleft,
+    KC(11),  KS_agrave,                KS_0,           KS_braceright,
+    KC(12),  KS_parenright,    KS_degree,
+    KC(13),  KS_minus,         KS_underscore,
+    KC(26),  KS_dead_circumflex, KS_dead_diaeresis,    KS_bracketleft,
+    KC(27),  KS_dollar,                KS_asterisk,    KS_bracketright,
+    KC(43),  KS_mu,            KS_sterling,    KS_grave,
+    KC(40),  KS_ugrave,                KS_percent,     KS_acute,
+    KC(41),  KS_twosuperior,   KS_threesuperior,
+    KC(53),  KS_equal,         KS_plus,        KS_asciitilde,
+    KC(86),  KS_less,          KS_greater,     KS_backslash,
+};
+
 static const keysym_t pckbd_keydesc_it[] = {
 /*  pos      normal            shifted         altgr           shift-altgr */
     KC(3),   KS_2,             KS_quotedbl,    KS_twosuperior,
@@ -788,6 +810,7 @@
        KBD_MAP(KB_SF,                  KB_SG,  pckbd_keydesc_sf),
        KBD_MAP(KB_SF | KB_NODEAD,      KB_SF,  pckbd_keydesc_sg_nodead),
        KBD_MAP(KB_FR,                  KB_US,  pckbd_keydesc_fr),
+       KBD_MAP(KB_BE,                  KB_FR,  pckbd_keydesc_be),
        KBD_MAP(KB_DK,                  KB_US,  pckbd_keydesc_dk),
        KBD_MAP(KB_DK | KB_NODEAD,      KB_DK,  pckbd_keydesc_dk_nodead),
        KBD_MAP(KB_IT,                  KB_US,  pckbd_keydesc_it),
diff -r 322f2caea869 -r 0e791f405e59 sys/dev/usb/ukbdmap.c
--- a/sys/dev/usb/ukbdmap.c     Mon Jul 14 07:55:26 2014 +0000
+++ b/sys/dev/usb/ukbdmap.c     Mon Jul 14 10:05:23 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $       */
+/*     $NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $     */
 
 /*
  * Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -416,6 +416,28 @@
     KC(230), KS_Mode_switch,   KS_Multi_key,
 };
 
+Static const keysym_t ukbd_keydesc_be[] = {
+/*  pos             normal             shifted         altgr           shift-altgr */
+    KC(30),  KS_ampersand,     KS_1,           KS_bar,
+    KC(31),  KS_eacute,                KS_2,           KS_at,
+    KC(33),  KS_apostrophe,    KS_4,
+    KC(34),  KS_parenleft,     KS_5,
+    KC(35),  KS_section,       KS_6,           KS_asciicircum,
+    KC(36),  KS_egrave,                KS_7,
+    KC(37),  KS_exclam,                KS_8,
+    KC(38),  KS_ccedilla,      KS_9,           KS_braceleft,
+    KC(39),  KS_agrave,                KS_0,           KS_braceright,
+    KC(45),  KS_parenright,    KS_degree,
+    KC(46),  KS_minus,         KS_underscore,
+    KC(47),  KS_dead_circumflex, KS_dead_diaeresis,    KS_bracketleft,
+    KC(48),  KS_dollar,                KS_asterisk,    KS_bracketright,
+    KC(50),  KS_mu,            KS_sterling,    KS_grave,
+    KC(52),  KS_ugrave,                KS_percent,     KS_acute,
+    KC(53),  KS_twosuperior,   KS_threesuperior,
+    KC(56),  KS_equal,         KS_plus,        KS_asciitilde,
+    KC(100), KS_less,          KS_greater,     KS_backslash,
+};
+
 Static const keysym_t ukbd_keydesc_it[] = {
 /*  pos      normal            shifted         altgr           shift-altgr */
     KC(31),  KS_2,             KS_quotedbl,    KS_twosuperior,
@@ -611,6 +633,7 @@
        KBD_MAP(KB_DE | KB_NODEAD,      KB_DE,  ukbd_keydesc_de_nodead),
        KBD_MAP(KB_FR,                  KB_US,  ukbd_keydesc_fr),
        KBD_MAP(KB_FR | KB_SWAPCTRLCAPS,KB_FR,  ukbd_keydesc_swapctrlcaps),
+       KBD_MAP(KB_BE,                  KB_FR,  ukbd_keydesc_be),
        KBD_MAP(KB_DK,                  KB_US,  ukbd_keydesc_dk),
        KBD_MAP(KB_DK | KB_NODEAD,      KB_DK,  ukbd_keydesc_dk_nodead),
        KBD_MAP(KB_IT,                  KB_US,  ukbd_keydesc_it),