From fbce5c784a006691d39da68a6fc98a239ab6cefd Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 21 Jan 2020 15:39:02 +0000 Subject: [PATCH] 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. --- share/man/man4/pckbd.4 | 6 ++++-- sys/dev/hid/hidkbdmap.c | 5 +++-- sys/dev/pckbport/wskbdmap_mfii.c | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4 index 3cdf7a472b73..829e0b2d2d92 100644 --- a/share/man/man4/pckbd.4 +++ b/share/man/man4/pckbd.4 @@ -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 diff --git a/sys/dev/hid/hidkbdmap.c b/sys/dev/hid/hidkbdmap.c index 8cb88e837245..789587ebf6f2 100644 --- a/sys/dev/hid/hidkbdmap.c +++ b/sys/dev/hid/hidkbdmap.c @@ -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 -__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 #include @@ -640,6 +640,7 @@ const struct wscons_keydesc hidkbd_keydesctab[] = { 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 --git a/sys/dev/pckbport/wskbdmap_mfii.c b/sys/dev/pckbport/wskbdmap_mfii.c index 9be31ff676f4..ade18e008fa9 100644 --- a/sys/dev/pckbport/wskbdmap_mfii.c +++ b/sys/dev/pckbport/wskbdmap_mfii.c @@ -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 -__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 @@ -862,6 +862,7 @@ const struct wscons_keydesc pckbd_keydesctab[] = { 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,