Module Name: src
Committed By: nia
Date: Sat Jan 11 21:43:11 UTC 2020
Modified Files:
src/sys/dev/hid: hidkbdmap.c
src/sys/dev/pckbport: wskbdmap_mfii.c
Log Message:
Support the combination of KB_SWAPCTRLCAPS and UK layout.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hid/hidkbdmap.c
cvs rdiff -u -r1.26 -r1.27 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.1 src/sys/dev/hid/hidkbdmap.c:1.2
--- src/sys/dev/hid/hidkbdmap.c:1.1 Sun Dec 10 17:03:07 2017
+++ src/sys/dev/hid/hidkbdmap.c Sat Jan 11 21:43:10 2020
@@ -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 @@ const struct wscons_keydesc hidkbd_keyde
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),
Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.26 src/sys/dev/pckbport/wskbdmap_mfii.c:1.27
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.26 Mon Feb 19 14:34:17 2018
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Sat Jan 11 21:43:11 2020
@@ -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 @@ const struct wscons_keydesc pckbd_keydes
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,
