Module Name: src
Committed By: martin
Date: Tue Jan 21 15:39:02 UTC 2020
Modified Files:
src/share/man/man4 [netbsd-9]: pckbd.4
src/sys/dev/hid [netbsd-9]: hidkbdmap.c
src/sys/dev/pckbport [netbsd-9]: wskbdmap_mfii.c
Log Message:
Pull up following revision(s) (requested by nia in ticket #635):
sys/dev/pckbport/wskbdmap_mfii.c: revision 1.27
share/man/man4/pckbd.4: revision 1.22
sys/dev/hid/hidkbdmap.c: revision 1.2
Support the combination of KB_SWAPCTRLCAPS and UK layout.
Note some more layouts that work with KB_SWAPCTRLCAPS.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.44.1 src/share/man/man4/pckbd.4
cvs rdiff -u -r1.1 -r1.1.10.1 src/sys/dev/hid/hidkbdmap.c
cvs rdiff -u -r1.26 -r1.26.10.1 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/share/man/man4/pckbd.4
diff -u src/share/man/man4/pckbd.4:1.21 src/share/man/man4/pckbd.4:1.21.44.1
--- src/share/man/man4/pckbd.4:1.21 Tue Aug 2 10:04:07 2011
+++ src/share/man/man4/pckbd.4 Tue Jan 21 15:39:02 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: pckbd.4,v 1.21 2011/08/02 10:04:07 wiz Exp $
+.\" $NetBSD: pckbd.4,v 1.21.44.1 2020/01/21 15:39:02 martin Exp $
.\"
.\" Copyright (c) 1999
.\" Matthias Drochner. All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 22, 2011
+.Dd January 11, 2020
.Dt PCKBD 4
.Os
.Sh NAME
@@ -109,6 +109,8 @@ This switches off the
.Pp
The
.Li KB_US ,
+.Li KB_UK ,
+.Li KB_FR ,
.Li KB_JP
and
.Li KB_US|KB_DVORAK
Index: src/sys/dev/hid/hidkbdmap.c
diff -u src/sys/dev/hid/hidkbdmap.c:1.1 src/sys/dev/hid/hidkbdmap.c:1.1.10.1
--- src/sys/dev/hid/hidkbdmap.c:1.1 Sun Dec 10 17:03:07 2017
+++ src/sys/dev/hid/hidkbdmap.c Tue Jan 21 15:39:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hidkbdmap.c,v 1.1 2017/12/10 17:03:07 bouyer Exp $ */
+/* $NetBSD: hidkbdmap.c,v 1.1.10.1 2020/01/21 15:39:02 martin 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.1.10.1 2020/01/21 15:39:02 martin 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.26.10.1
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.26 Mon Feb 19 14:34:17 2018
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Tue Jan 21 15:39:02 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.26.10.1 2020/01/21 15:39:02 martin 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.26.10.1 2020/01/21 15:39:02 martin 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,
