svn commit: r326541 - stable/11/sys/dev/evdev

[Vladimir Kondratyev]

Author: wulf
Date: Mon Dec  4 20:22:26 2017
New Revision: 326541
URL: https://svnweb.freebsd.org/changeset/base/326541

Log:
  MFC r325269:
  
  evdev: Translate KEY_102ND in evdev_scancode2key()
  
  MFC r326020:
  
  Fix evdev codes for slash and asterisk numpad keys of AT-keyboards
  
  MFC r326021:
  
  evdev: change USB scancode 0x54 from KEY_SLASH to KEY_KPSLASH
  
  Submitted by:	dumbbell (r325269, r326021)
  Approved by:	gonzo (mentor)

Modified:
  stable/11/sys/dev/evdev/evdev_utils.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/evdev/evdev_utils.c
==============================================================================
--- stable/11/sys/dev/evdev/evdev_utils.c	Mon Dec  4 20:09:38 2017	(r326540)
+++ stable/11/sys/dev/evdev/evdev_utils.c	Mon Dec  4 20:22:26 2017	(r326541)
@@ -62,7 +62,7 @@ static uint16_t evdev_usb_scancodes[256] = {
 	KEY_PAUSE,	KEY_INSERT,	KEY_HOME,	KEY_PAGEUP,
 	KEY_DELETE,	KEY_END,	KEY_PAGEDOWN,	KEY_RIGHT,
 	KEY_LEFT,	KEY_DOWN,	KEY_UP,		KEY_NUMLOCK,
-	KEY_SLASH,	KEY_KPASTERISK,	KEY_KPMINUS,	KEY_KPPLUS,
+	KEY_KPSLASH,	KEY_KPASTERISK,	KEY_KPMINUS,	KEY_KPPLUS,
 	KEY_KPENTER,	KEY_KP1,	KEY_KP2,	KEY_KP3,
 	KEY_KP4,	KEY_KP5,	KEY_KP6,	KEY_KP7,
 	/* 0x60 - 0x7f */
@@ -129,7 +129,7 @@ static uint16_t evdev_at_set1_scancodes[] = {
 	KEY_APOSTROPHE,	KEY_GRAVE,	KEY_LEFTSHIFT,	KEY_BACKSLASH,
 	KEY_Z,		KEY_X,		KEY_C,		KEY_V,
 	KEY_B,		KEY_N,		KEY_M,		KEY_COMMA,
-	KEY_DOT,	KEY_SLASH,	KEY_RIGHTSHIFT,	NONE,
+	KEY_DOT,	KEY_SLASH,	KEY_RIGHTSHIFT,	KEY_KPASTERISK,
 	KEY_LEFTALT,	KEY_SPACE,	KEY_CAPSLOCK,	KEY_F1,
 	KEY_F2,		KEY_F3,		KEY_F4,		KEY_F5,
 	/* 0x40 - 0x5f */
@@ -138,7 +138,7 @@ static uint16_t evdev_at_set1_scancodes[] = {
 	KEY_KP8,	KEY_KP9,	KEY_KPMINUS,	KEY_KP4,
 	KEY_KP5,	KEY_KP6,	KEY_KPPLUS,	KEY_KP1,
 	KEY_KP2,	KEY_KP3,	KEY_KP0,	KEY_KPDOT,
-	NONE,		NONE,		NONE,		KEY_F11,
+	NONE,		NONE,		KEY_102ND,	KEY_F11,
 	KEY_F12,	NONE,		NONE,		NONE,
 	NONE,		NONE,		NONE,		NONE,
 	/* 0x60 - 0x7f */
@@ -165,7 +165,7 @@ static uint16_t evdev_at_set1_scancodes[] = {
 	NONE,		NONE,		NONE,		NONE,
 	NONE,		NONE,		KEY_VOLUMEDOWN,	NONE,
 	KEY_VOLUMEUP,	NONE,		KEY_HOMEPAGE,	NONE,
-	NONE,		KEY_KPASTERISK,	NONE,		KEY_SYSRQ,
+	NONE,		KEY_KPSLASH,	NONE,		KEY_SYSRQ,
 	KEY_RIGHTALT,	NONE,		NONE,		NONE,
 	NONE,		NONE,		NONE,		NONE,
 	/* 0x40 - 0x5f. 0xE0 prefixed */