Author: wulf
Date: Sun Jun 3 10:53:10 2018
New Revision: 334555
URL: https://svnweb.freebsd.org/changeset/base/334555
Log:
[evdev] Sync event codes with Linux kernel 4.16
MFC after: 2 weeks
Modified:
head/sys/dev/evdev/input-event-codes.h
head/sys/dev/evdev/input.h
Modified: head/sys/dev/evdev/input-event-codes.h
==============================================================================
--- head/sys/dev/evdev/input-event-codes.h Sun Jun 3 06:02:31 2018
(r334554)
+++ head/sys/dev/evdev/input-event-codes.h Sun Jun 3 10:53:10 2018
(r334555)
@@ -421,6 +421,7 @@
#define BTN_TOOL_MOUSE 0x146
#define BTN_TOOL_LENS 0x147
#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */
+#define BTN_STYLUS3 0x149
#define BTN_TOUCH 0x14a
#define BTN_STYLUS 0x14b
#define BTN_STYLUS2 0x14c
@@ -607,6 +608,7 @@
#define BTN_DPAD_RIGHT 0x223
#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */
+#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */
#define KEY_BUTTONCONFIG 0x240 /* AL Button
Configuration */
#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */
@@ -615,6 +617,7 @@
#define KEY_APPSELECT 0x244 /* AL Select Task/Application */
#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */
#define KEY_VOICECOMMAND 0x246 /* Listening Voice
Command */
+#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop
assistant */
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to
Minimum */
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to
Maximum */
@@ -626,6 +629,38 @@
#define KEY_KBDINPUTASSIST_ACCEPT 0x264
#define KEY_KBDINPUTASSIST_CANCEL 0x265
+/* Diagonal movement keys */
+#define KEY_RIGHT_UP 0x266
+#define KEY_RIGHT_DOWN 0x267
+#define KEY_LEFT_UP 0x268
+#define KEY_LEFT_DOWN 0x269
+
+#define KEY_ROOT_MENU 0x26a /* Show Device's Root
Menu */
+/* Show Top Menu of the Media (e.g. DVD) */
+#define KEY_MEDIA_TOP_MENU 0x26b
+#define KEY_NUMERIC_11 0x26c
+#define KEY_NUMERIC_12 0x26d
+/*
+ * Toggle Audio Description: refers to an audio service that helps blind and
+ * visually impaired consumers understand the action in a program. Note: in
+ * some countries this is referred to as "Video Description".
+ */
+#define KEY_AUDIO_DESC 0x26e
+#define KEY_3D_MODE 0x26f
+#define KEY_NEXT_FAVORITE 0x270
+#define KEY_STOP_RECORD 0x271
+#define KEY_PAUSE_RECORD 0x272
+#define KEY_VOD 0x273 /* Video on Demand */
+#define KEY_UNMUTE 0x274
+#define KEY_FASTREVERSE 0x275
+#define KEY_SLOWREVERSE 0x276
+/*
+ * Control a data application associated with the currently viewed channel,
+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
+ */
+#define KEY_DATA 0x277
+#define KEY_ONSCREEN_KEYBOARD 0x278
+
#define BTN_TRIGGER_HAPPY 0x2c0
#define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1
@@ -763,6 +798,7 @@
#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
#define SW_LINEIN_INSERT 0x0d /* set = inserted */
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
+#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)
Modified: head/sys/dev/evdev/input.h
==============================================================================
--- head/sys/dev/evdev/input.h Sun Jun 3 06:02:31 2018 (r334554)
+++ head/sys/dev/evdev/input.h Sun Jun 3 10:53:10 2018 (r334555)
@@ -38,6 +38,9 @@
#include "input-event-codes.h"
+#define input_event_sec time.tv_sec
+#define input_event_usec time.tv_usec
+
struct input_event {
struct timeval time;
uint16_t type;
@@ -138,6 +141,9 @@ struct input_keymap_entry {
#define BUS_GSC 0x1A
#define BUS_ATARI 0x1B
#define BUS_SPI 0x1C
+#define BUS_RMI 0x1D
+#define BUS_CEC 0x1E
+#define BUS_INTEL_ISHTP 0x1F
/*
* MT_TOOL types
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
