Module Name: src Committed By: msaitoh Date: Fri Aug 8 06:50:12 UTC 2014
Modified Files: src/sys/dev/pckbport [netbsd-5]: wskbdmap_mfii.c src/sys/dev/usb [netbsd-5]: ukbdmap.c Log Message: Pull up following revision(s) (requested by mbalmer in ticket #1915): sys/dev/usb/ukbdmap.c: revision 1.29 sys/dev/pckbport/wskbdmap_mfii.c: revision 1.25 Add a belgian keyboard layout, based on the french keyboard layout. Fixes PR install/46871. To generate a diff of this commit: cvs rdiff -u -r1.15.8.5 -r1.15.8.6 src/sys/dev/pckbport/wskbdmap_mfii.c cvs rdiff -u -r1.20.8.2 -r1.20.8.3 src/sys/dev/usb/ukbdmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pckbport/wskbdmap_mfii.c diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.5 src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.6 --- src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.5 Sun Nov 15 06:03:59 2009 +++ src/sys/dev/pckbport/wskbdmap_mfii.c Fri Aug 8 06:50:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.5 2009/11/15 06:03:59 snj Exp $ */ +/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.6 2014/08/08 06:50:12 msaitoh 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.15.8.5 2009/11/15 06:03:59 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.15.8.6 2014/08/08 06:50:12 msaitoh Exp $"); #include "opt_wskbdmap.h" #include <sys/types.h> @@ -364,6 +364,28 @@ static const keysym_t pckbd_keydesc_fr[] 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, @@ -694,6 +716,7 @@ const struct wscons_keydesc pckbd_keydes 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), Index: src/sys/dev/usb/ukbdmap.c diff -u src/sys/dev/usb/ukbdmap.c:1.20.8.2 src/sys/dev/usb/ukbdmap.c:1.20.8.3 --- src/sys/dev/usb/ukbdmap.c:1.20.8.2 Sun Nov 21 02:38:07 2010 +++ src/sys/dev/usb/ukbdmap.c Fri Aug 8 06:50:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ukbdmap.c,v 1.20.8.2 2010/11/21 02:38:07 riz Exp $ */ +/* $NetBSD: ukbdmap.c,v 1.20.8.3 2014/08/08 06:50:12 msaitoh 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.20.8.2 2010/11/21 02:38:07 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.20.8.3 2014/08/08 06:50:12 msaitoh Exp $"); #include <sys/types.h> #include <dev/wscons/wsksymdef.h> @@ -415,6 +415,28 @@ Static const keysym_t ukbd_keydesc_fr[] 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, @@ -610,6 +632,7 @@ const struct wscons_keydesc ukbd_keydesc 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),