Module Name: src Committed By: khorben Date: Sun Apr 22 14:32:08 UTC 2012
Modified Files: src/sys/dev/usb: ukbd.c src/sys/dev/wscons: wsksymdef.h Log Message: Implemented extra keys as found on Sun Type 7 USB keyboards, and according to the documentation mentioned above in this file. "works here" macallan@, myself To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/usb/ukbd.c cvs rdiff -u -r1.65 -r1.66 src/sys/dev/wscons/wsksymdef.h 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/ukbd.c diff -u src/sys/dev/usb/ukbd.c:1.121 src/sys/dev/usb/ukbd.c:1.122 --- src/sys/dev/usb/ukbd.c:1.121 Sun Apr 22 14:25:14 2012 +++ src/sys/dev/usb/ukbd.c Sun Apr 22 14:32:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ukbd.c,v 1.121 2012/04/22 14:25:14 khorben Exp $ */ +/* $NetBSD: ukbd.c,v 1.122 2012/04/22 14:32:08 khorben Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.121 2012/04/22 14:25:14 khorben Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.122 2012/04/22 14:32:08 khorben Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -195,39 +195,39 @@ Static const struct ukbd_keycodetrans tr * For example, some keys generate Fake ShiftL events (e0 2a) * before the actual key sequence. */ -Static const u_int8_t ukbd_trtab[256] = { - NN, NN, NN, NN, 0x1e, 0x30, 0x2e, 0x20, /* 00 - 07 */ - 0x12, 0x21, 0x22, 0x23, 0x17, 0x24, 0x25, 0x26, /* 08 - 0f */ - 0x32, 0x31, 0x18, 0x19, 0x10, 0x13, 0x1f, 0x14, /* 10 - 17 */ - 0x16, 0x2f, 0x11, 0x2d, 0x15, 0x2c, 0x02, 0x03, /* 18 - 1f */ - 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, /* 20 - 27 */ - 0x1c, 0x01, 0x0e, 0x0f, 0x39, 0x0c, 0x0d, 0x1a, /* 28 - 2f */ - 0x1b, 0x2b, 0x2b, 0x27, 0x28, 0x29, 0x33, 0x34, /* 30 - 37 */ - 0x35, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, /* 38 - 3f */ - 0x41, 0x42, 0x43, 0x44, 0x57, 0x58, 0xb7, 0x46, /* 40 - 47 */ - 0x7f, 0xd2, 0xc7, 0xc9, 0xd3, 0xcf, 0xd1, 0xcd, /* 48 - 4f */ - 0xcb, 0xd0, 0xc8, 0x45, 0xb5, 0x37, 0x4a, 0x4e, /* 50 - 57 */ - 0x9c, 0x4f, 0x50, 0x51, 0x4b, 0x4c, 0x4d, 0x47, /* 58 - 5f */ - 0x48, 0x49, 0x52, 0x53, 0x56, 0xdd, NN, 0x59, /* 60 - 67 */ - 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, NN, /* 68 - 6f */ - NN, NN, NN, NN, NN, NN, NN, NN, /* 70 - 77 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* 78 - 7f */ - NN, NN, NN, NN, NN, 0x7e, NN, 0x73, /* 80 - 87 */ - 0x70, 0x7d, 0x79, 0x7b, 0x5c, NN, NN, NN, /* 88 - 8f */ - NN, NN, 0x78, 0x77, 0x76, NN, NN, NN, /* 90 - 97 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* 98 - 9f */ - NN, NN, NN, NN, NN, NN, NN, NN, /* a0 - a7 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* a8 - af */ - NN, NN, NN, NN, NN, NN, NN, NN, /* b0 - b7 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* b8 - bf */ - NN, NN, NN, NN, NN, NN, NN, NN, /* c0 - c7 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* c8 - cf */ - NN, NN, NN, NN, NN, NN, NN, NN, /* d0 - d7 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* d8 - df */ - 0x1d, 0x2a, 0x38, 0xdb, 0x9d, 0x36, 0xb8, 0xdc, /* e0 - e7 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* e8 - ef */ - NN, NN, NN, NN, NN, NN, NN, NN, /* f0 - f7 */ - NN, NN, NN, NN, NN, NN, NN, NN, /* f8 - ff */ +Static const u_int16_t ukbd_trtab[256] = { + NN, NN, NN, NN, 0x1e, 0x30, 0x2e, 0x20, /* 00 - 07 */ + 0x12, 0x21, 0x22, 0x23, 0x17, 0x24, 0x25, 0x26, /* 08 - 0f */ + 0x32, 0x31, 0x18, 0x19, 0x10, 0x13, 0x1f, 0x14, /* 10 - 17 */ + 0x16, 0x2f, 0x11, 0x2d, 0x15, 0x2c, 0x02, 0x03, /* 18 - 1f */ + 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, /* 20 - 27 */ + 0x1c, 0x01, 0x0e, 0x0f, 0x39, 0x0c, 0x0d, 0x1a, /* 28 - 2f */ + 0x1b, 0x2b, 0x2b, 0x27, 0x28, 0x29, 0x33, 0x34, /* 30 - 37 */ + 0x35, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, /* 38 - 3f */ + 0x41, 0x42, 0x43, 0x44, 0x57, 0x58, 0xb7, 0x46, /* 40 - 47 */ + 0x7f, 0xd2, 0xc7, 0xc9, 0xd3, 0xcf, 0xd1, 0xcd, /* 48 - 4f */ + 0xcb, 0xd0, 0xc8, 0x45, 0xb5, 0x37, 0x4a, 0x4e, /* 50 - 57 */ + 0x9c, 0x4f, 0x50, 0x51, 0x4b, 0x4c, 0x4d, 0x47, /* 58 - 5f */ + 0x48, 0x49, 0x52, 0x53, 0x56, 0xdd,0xe05f, 0x59, /* 60 - 67 */ + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, NN, /* 68 - 6f */ + NN, NN, NN, NN,0xf38b,0xf38a,0xf38f,0xf38d, /* 70 - 77 */ + 0xf396,0xf38e,0xf390,0xf395,0xf392,0xf394,0xf38c, NN, /* 78 - 7f */ + NN, NN, NN, NN, NN, 0x7e, NN, 0x73, /* 80 - 87 */ + 0x70, 0x7d, 0x79, 0x7b, 0x5c, NN, NN, NN, /* 88 - 8f */ + NN, NN, 0x78, 0x77, 0x76, NN, NN, NN, /* 90 - 97 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* 98 - 9f */ + NN, NN, NN, NN, NN, NN, NN, NN, /* a0 - a7 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* a8 - af */ + NN, NN, NN, NN, NN, NN, NN, NN, /* b0 - b7 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* b8 - bf */ + NN, NN, NN, NN, NN, NN, NN, NN, /* c0 - c7 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* c8 - cf */ + NN, NN, NN, NN, NN, NN, NN, NN, /* d0 - d7 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* d8 - df */ + 0x1d, 0x2a, 0x38, 0xdb, 0x9d, 0x36, 0xb8, 0xdc, /* e0 - e7 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* e8 - ef */ + NN, NN, NN, NN, NN, NN, NN, NN, /* f0 - f7 */ + NN, NN, NN, NN, NN, NN, NN, NN, /* f8 - ff */ }; #endif /* defined(WSDISPLAY_COMPAT_RAWKBD) */ Index: src/sys/dev/wscons/wsksymdef.h diff -u src/sys/dev/wscons/wsksymdef.h:1.65 src/sys/dev/wscons/wsksymdef.h:1.66 --- src/sys/dev/wscons/wsksymdef.h:1.65 Fri Jul 22 18:17:12 2011 +++ src/sys/dev/wscons/wsksymdef.h Sun Apr 22 14:32:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wsksymdef.h,v 1.65 2011/07/22 18:17:12 christos Exp $ */ +/* $NetBSD: wsksymdef.h,v 1.66 2012/04/22 14:32:08 khorben Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -544,6 +544,7 @@ #define KS_Open 0xf393 #define KS_Paste 0xf394 #define KS_Cut 0xf395 +#define KS_Stop 0xf396 #define KS_Menu 0xf3c0 #define KS_Pause 0xf3c1