include: update input-event-codes.h to v4.19

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/include/linux/freebsd/input-event-codes.h b/include/linux/freebsd/input-event-codes.h
index 9771e4f870bb9990487a14de77cc15b4a4c97b4c..95552e5873f78c1875997cff40c2421d491ea161 100644 (file)
--- a/include/linux/freebsd/input-event-codes.h
+++ b/include/linux/freebsd/input-event-codes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Input event codes
  *
@@ -406,6 +407,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
@@ -592,6 +594,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 */
@@ -600,6 +603,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 */

diff --git a/include/linux/linux/input-event-codes.h b/include/linux/linux/input-event-codes.h
index 9771e4f870bb9990487a14de77cc15b4a4c97b4c..95552e5873f78c1875997cff40c2421d491ea161 100644 (file)
--- a/include/linux/linux/input-event-codes.h
+++ b/include/linux/linux/input-event-codes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Input event codes
  *
@@ -406,6 +407,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
@@ -592,6 +594,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 */
@@ -600,6 +603,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 */

diff --git a/include/linux/linux/input.h b/include/linux/linux/input.h
index b3044aec79b686f5dc2eb02379f1438bb46e06e3..857480785ec916e26ce9ef34e114924c6a27b8ec 100644 (file)
--- a/include/linux/linux/input.h
+++ b/include/linux/linux/input.h
@@ -268,10 +268,11 @@ struct input_mask {
 /*
  * MT_TOOL types
  */
-#define MT_TOOL_FINGER         0
-#define MT_TOOL_PEN            1
-#define MT_TOOL_PALM           2
-#define MT_TOOL_MAX            2
+#define MT_TOOL_FINGER         0x00
+#define MT_TOOL_PEN            0x01
+#define MT_TOOL_PALM           0x02
+#define MT_TOOL_DIAL           0x0a
+#define MT_TOOL_MAX            0x0f
 
 /*
  * Values describing the status of a force-feedback effect