[src/trunk]: src/sys/dev Support the combination of KB_SWAPCTRLCAPS and UK la...

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

details:   https://anonhg.NetBSD.org/src/rev/ec17656e824e
branches:  trunk
changeset: 968301:ec17656e824e
user:      nia <nia%NetBSD.org@localhost>
date:      Sat Jan 11 21:43:10 2020 +0000

description:
Support the combination of KB_SWAPCTRLCAPS and UK layout.

diffstat:

 sys/dev/hid/hidkbdmap.c          |  5 +++--
 sys/dev/pckbport/wskbdmap_mfii.c |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r c8211e6f4183 -r ec17656e824e sys/dev/hid/hidkbdmap.c
--- a/sys/dev/hid/hidkbdmap.c   Sat Jan 11 21:05:45 2020 +0000
+++ b/sys/dev/hid/hidkbdmap.c   Sat Jan 11 21:43:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hidkbdmap.c,v 1.1 2017/12/10 17:03:07 bouyer Exp $     */
+/*     $NetBSD: hidkbdmap.c,v 1.2 2020/01/11 21:43:10 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.1 2017/12/10 17:03:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.2 2020/01/11 21:43:10 nia Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -640,6 +640,7 @@
        KBD_MAP(KB_DK | KB_NODEAD,      KB_DK,  hidkbd_keydesc_dk_nodead),
        KBD_MAP(KB_IT,                  KB_US,  hidkbd_keydesc_it),
        KBD_MAP(KB_UK,                  KB_US,  hidkbd_keydesc_uk),
+       KBD_MAP(KB_UK | KB_SWAPCTRLCAPS,KB_UK,  hidkbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_SV,                  KB_DK,  hidkbd_keydesc_sv),
        KBD_MAP(KB_SV | KB_NODEAD,      KB_SV,  hidkbd_keydesc_sv_nodead),
        KBD_MAP(KB_NO,                  KB_DK,  hidkbd_keydesc_no),
diff -r c8211e6f4183 -r ec17656e824e sys/dev/pckbport/wskbdmap_mfii.c
--- a/sys/dev/pckbport/wskbdmap_mfii.c  Sat Jan 11 21:05:45 2020 +0000
+++ b/sys/dev/pckbport/wskbdmap_mfii.c  Sat Jan 11 21:43:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wskbdmap_mfii.c,v 1.26 2018/02/19 14:34:17 maya Exp $  */
+/*     $NetBSD: wskbdmap_mfii.c,v 1.27 2020/01/11 21:43:11 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.26 2018/02/19 14:34:17 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.27 2020/01/11 21:43:11 nia Exp $");
 
 #include "opt_wskbdmap.h"
 #include <sys/types.h>
@@ -862,6 +862,7 @@
        KBD_MAP(KB_US | KB_IOPENER, KB_US,      pckbd_keydesc_iopener),
        KBD_MAP(KB_JP | KB_SWAPCTRLCAPS, KB_JP, pckbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_FR | KB_SWAPCTRLCAPS, KB_FR, pckbd_keydesc_swapctrlcaps),
+       KBD_MAP(KB_UK | KB_SWAPCTRLCAPS, KB_UK, pckbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_DVORAK | KB_SWAPCTRLCAPS,    KB_US | KB_DVORAK,
                pckbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_IOPENER | KB_SWAPCTRLCAPS,   KB_US | KB_IOPENER,