Download raw body.
[patch] remove KB_IOPENER from wscons
The attached patch removes the KB_IOPENER option from wscons.
Rationale:
This code was imported from NetBSD, where it was added to support the
non-standard keyboard layout of an internet appliance from around the
year 2000.
There is no sign that anybody has ever used this code on OpenBSD, and the
hardware that it is designed to work with is never going to be a practical
platform for current OpenBSD versions.
--- dev/wscons/wsksymdef.h
+++ dev/wscons/wsksymdef.h
@@ -748,7 +748,6 @@
#define KB_SWAPCTRLCAPS 0x00000008 /* swap Left-Control and Caps-Lock */
#define KB_DVORAK 0x00000010 /* Dvorak layout */
#define KB_METAESC 0x00000020 /* generate ESC prefix on ALT-key */
-#define KB_IOPENER 0x00000040 /* f1-f12 -> ESC,f1-f11 */
#define KB_NOENCODING 0x00000080 /* no encodings available */
#define KB_APPLE 0x00010000 /* Apple specific layout */
#define KB_COLEMAK 0x02000000 /* Colemak layout */
@@ -792,7 +791,6 @@
{ KB_SWAPCTRLCAPS, "swapctrlcaps" }, \
{ KB_DVORAK, "dvorak" }, \
{ KB_METAESC, "metaesc" }, \
- { KB_IOPENER, "iopener" }, \
{ KB_NOENCODING, "noencoding" }, \
{ KB_APPLE, "apple" }, \
{ KB_COLEMAK, "colemak" }
--- dev/pckbc/wskbdmap_mfii.c
+++ dev/pckbc/wskbdmap_mfii.c
@@ -623,22 +623,6 @@
KC(58), KS_Cmd1, KS_Control_L,
};
-static const keysym_t pckbd_keydesc_iopener[] = {
-/* pos command normal shifted */
- KC(59), KS_Cmd_Debugger, KS_Escape,
- KC(60), KS_Cmd_Screen0, KS_f1,
- KC(61), KS_Cmd_Screen1, KS_f2,
- KC(62), KS_Cmd_Screen2, KS_f3,
- KC(63), KS_Cmd_Screen3, KS_f4,
- KC(64), KS_Cmd_Screen4, KS_f5,
- KC(65), KS_Cmd_Screen5, KS_f6,
- KC(66), KS_Cmd_Screen6, KS_f7,
- KC(67), KS_Cmd_Screen7, KS_f8,
- KC(68), KS_Cmd_Screen8, KS_f9,
- KC(87), KS_Cmd_Screen9, KS_f10,
- KC(88), KS_f11,
-};
-
static const keysym_t pckbd_keydesc_ru[] = {
/* pos normal shifted altgr shift-altgr */
KC(7), KS_6, KS_asciicircum, KS_6, KS_comma,
@@ -1151,7 +1135,6 @@
KBD_MAP(KB_US | KB_DVORAK, KB_US, pckbd_keydesc_us_dvorak),
KBD_MAP(KB_US | KB_COLEMAK, KB_US, pckbd_keydesc_us_colemak),
KBD_MAP(KB_US | KB_SWAPCTRLCAPS, KB_US, pckbd_keydesc_swapctrlcaps),
- KBD_MAP(KB_US | KB_IOPENER, KB_US, pckbd_keydesc_iopener),
KBD_MAP(KB_UK | KB_SWAPCTRLCAPS, KB_UK, pckbd_keydesc_swapctrlcaps),
KBD_MAP(KB_JP | KB_SWAPCTRLCAPS, KB_JP, pckbd_keydesc_swapctrlcaps),
KBD_MAP(KB_FR | KB_SWAPCTRLCAPS, KB_FR, pckbd_keydesc_swapctrlcaps),
@@ -1161,8 +1144,6 @@
KBD_MAP(KB_US | KB_DVORAK | KB_SWAPCTRLCAPS, KB_US | KB_DVORAK,
pckbd_keydesc_swapctrlcaps),
KBD_MAP(KB_US | KB_COLEMAK | KB_SWAPCTRLCAPS, KB_US | KB_COLEMAK,
- pckbd_keydesc_swapctrlcaps),
- KBD_MAP(KB_US | KB_IOPENER | KB_SWAPCTRLCAPS, KB_US | KB_IOPENER,
pckbd_keydesc_swapctrlcaps),
KBD_MAP(KB_ES, KB_US, pckbd_keydesc_es),
KBD_MAP(KB_BE, KB_US, pckbd_keydesc_be),
[patch] remove KB_IOPENER from wscons