[src/trunk]: src/sys/dev/usb Make the us.dvorak.swapctrlcaps keyboard layout ...

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

details:   https://anonhg.NetBSD.org/src/rev/24e5878135e7
branches:  trunk
changeset: 342171:24e5878135e7
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Thu Dec 10 21:38:59 2015 +0000

description:
Make the us.dvorak.swapctrlcaps keyboard layout work for ukbd(4) too.

diffstat:

 sys/dev/usb/ukbdmap.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 26667aa9bfdf -r 24e5878135e7 sys/dev/usb/ukbdmap.c
--- a/sys/dev/usb/ukbdmap.c     Thu Dec 10 21:32:35 2015 +0000
+++ b/sys/dev/usb/ukbdmap.c     Thu Dec 10 21:38:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $     */
+/*     $NetBSD: ukbdmap.c,v 1.30 2015/12/10 21:38:59 jakllsch Exp $    */
 
 /*
  * Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.29 2014/07/14 10:05:23 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.30 2015/12/10 21:38:59 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <dev/wscons/wsksymdef.h>
@@ -626,6 +626,8 @@
        KBD_MAP(KB_US,                  0,      ukbd_keydesc_us),
        KBD_MAP(KB_US | KB_SWAPCTRLCAPS,KB_US,  ukbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_DVORAK,      KB_US,  ukbd_keydesc_us_dvorak),
+       KBD_MAP(KB_US | KB_DVORAK | KB_SWAPCTRLCAPS,    KB_US| KB_DVORAK,
+               ukbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_COLEMAK,     KB_US,  ukbd_keydesc_us_colemak),
        KBD_MAP(KB_JP,                  KB_US,  ukbd_keydesc_jp),
        KBD_MAP(KB_JP | KB_SWAPCTRLCAPS,KB_JP,  ukbd_keydesc_swapctrlcaps),