CVS commit: src/sys/dev

[Nia Alarie]

Module Name:    src
Committed By:   nia
Date:           Sun Jul 12 01:44:24 UTC 2020

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

Log Message:
Bring br.nodead closer to X11


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hid/hidkbdmap.c
cvs rdiff -u -r1.28 -r1.29 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/hid/hidkbdmap.c
diff -u src/sys/dev/hid/hidkbdmap.c:1.4 src/sys/dev/hid/hidkbdmap.c:1.5
--- src/sys/dev/hid/hidkbdmap.c:1.4	Sun Jul 12 01:35:59 2020
+++ src/sys/dev/hid/hidkbdmap.c	Sun Jul 12 01:44:24 2020
@@ -1,4 +1,4 @@
-/*	$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.
@@ -31,7 +31,7 @@
  */
 
 #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>
@@ -649,6 +649,7 @@ static const keysym_t hidkbd_keydesc_br[
 
 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,
 };

Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.28 src/sys/dev/pckbport/wskbdmap_mfii.c:1.29
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.28	Sun Jul 12 01:35:59 2020
+++ src/sys/dev/pckbport/wskbdmap_mfii.c	Sun Jul 12 01:44:24 2020
@@ -1,4 +1,4 @@
-/*	$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.
@@ -30,7 +30,7 @@
  */
 
 #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>
@@ -857,6 +857,7 @@ static const keysym_t pckbd_keydesc_br[]
 
 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,
 };