Module Name: src
Committed By: jakllsch
Date: Thu Dec 10 21:38:59 UTC 2015
Modified Files:
src/sys/dev/usb: ukbdmap.c
Log Message:
Make the us.dvorak.swapctrlcaps keyboard layout work for ukbd(4) too.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/ukbdmap.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/usb/ukbdmap.c
diff -u src/sys/dev/usb/ukbdmap.c:1.29 src/sys/dev/usb/ukbdmap.c:1.30
--- src/sys/dev/usb/ukbdmap.c:1.29 Mon Jul 14 10:05:23 2014
+++ src/sys/dev/usb/ukbdmap.c Thu Dec 10 21:38:59 2015
@@ -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 @@ const struct wscons_keydesc ukbd_keydesc
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),
