summaryrefslogtreecommitdiffstats
path: root/include/linux/input.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
commit95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree27a92a942821cde1edda9a1b088718d436b3efe4 /include/linux/input.h
parent45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
Merge with Linux 2.3.40.
Diffstat (limited to 'include/linux/input.h')
-rw-r--r--include/linux/input.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 9269790da..1e998c944 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -284,6 +284,13 @@ struct input_event {
#define BTN_START 0x13b
#define BTN_MODE 0x13c
+#define BTN_DIGI 0x140
+#define BTN_PEN 0x140
+#define BTN_RUBBER 0x141
+#define BTN_PEN_SIDE 0x142
+#define BTN_PEN_SIDE2 0x143
+#define BTN_NEAR 0x144
+
#define KEY_MAX 0x1ff
/*
@@ -319,16 +326,18 @@ struct input_event {
#define ABS_HAT2Y 0x15
#define ABS_HAT3X 0x16
#define ABS_HAT3Y 0x17
-#define ABS_MISC 0x18
+#define ABS_PRESSURE 0x18
+#define ABS_DISTANCE 0x19
+#define ABS_MISC 0x1a
#define ABS_MAX 0x1f
/*
* LEDs
*/
-#define LED_SCROLLL 0x00
-#define LED_NUML 0x01
-#define LED_CAPSL 0x02
+#define LED_NUML 0x00
+#define LED_CAPSL 0x01
+#define LED_SCROLLL 0x02
#define LED_COMPOSE 0x03
#define LED_KANA 0x04
#define LED_MAX 0x0f