CVS commit: src/sys/dev/pckbport

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Jul 22 23:22:38 UTC 2011

Modified Files:
        src/sys/dev/pckbport: wskbdmap_mfii.c

Log Message:
fixes from gilbert dot fernandes at orange dot fr


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pckbport/wskbdmap_mfii.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.21 src/sys/dev/pckbport/wskbdmap_mfii.c:1.22
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.21	Fri Jul 22 15:20:28 2011
+++ src/sys/dev/pckbport/wskbdmap_mfii.c	Fri Jul 22 19:22:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.21 2011/07/22 19:20:28 christos Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.22 2011/07/22 23:22:38 christos 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.21 2011/07/22 19:20:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.22 2011/07/22 23:22:38 christos Exp $");
 
 #include "opt_wskbdmap.h"
 #include <sys/types.h>
@@ -198,15 +198,16 @@
     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(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_r,		KS_R,		KS_paragraph,
+    KC(18),  KS_e,		KS_E,		KS_currency,
+    KC(19),  KS_r,		KS_R,		KS_paragraph,
     KC(26),  KS_dead_diaeresis,	KS_dead_circumflex,
     KC(27),  KS_asterisk,	KS_bar,
-    KC(30),  KS_s,		KS_S,		KS_ssharp,
+    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_section,	KS_notsign,
@@ -218,7 +219,7 @@
     KC(51),  KS_comma,		KS_semicolon,
     KC(52),  KS_period,		KS_colon,	KS_periodcentered,
     KC(53),  KS_minus,		KS_equal,
-    KC(86),  KS_braceleft,	KS_braceright,	KS_brokenbar,
+    KC(86),  KS_bracketleft,	KS_bracketright,KS_brokenbar,
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 
@@ -227,7 +228,7 @@
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(13),  KS_degree,		KS_asciitilde,	KS_cedilla,
     KC(26),  KS_quotedbl,	KS_asciicircum,
-    KC(27),  KS_asterisk,	KS_bar,
+/*  KC(27),  KS_asterisk,	KS_bar, */
     KC(40),  KS_apostrophe,	KS_grave,
 };