summaryrefslogtreecommitdiffstats
path: root/include/linux/input.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
commit9f9f3e6e8548a596697778337110a423c384b6f3 (patch)
tree5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /include/linux/input.h
parentd5c9a365ee7d2fded249aa5abfc5e89587583029 (diff)
Merge with Linux 2.3.49.
Diffstat (limited to 'include/linux/input.h')
-rw-r--r--include/linux/input.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index e65ce8f45..d5b75700a 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -234,11 +234,15 @@ struct input_event {
#define KEY_RECORD 167
#define KEY_REWIND 168
#define KEY_PHONE 169
+
#define KEY_CONFIG 171
#define KEY_HOMEPAGE 172
#define KEY_REFRESH 173
#define KEY_EXIT 174
#define KEY_MOVE 175
+#define KEY_EDIT 176
+#define KEY_SCROLLUP 177
+#define KEY_SCROLLDOWN 178
#define KEY_UNKNOWN 180
@@ -339,7 +343,9 @@ struct input_event {
#define ABS_HAT3Y 0x17
#define ABS_PRESSURE 0x18
#define ABS_DISTANCE 0x19
-#define ABS_MISC 0x1a
+#define ABS_TILT_X 0x1a
+#define ABS_TILT_Y 0x1b
+#define ABS_MISC 0x1c
#define ABS_MAX 0x1f
/*
@@ -442,11 +448,6 @@ struct input_handle {
struct input_handle *hnext;
};
-int keybdev_init(void);
-int mousedev_init(void);
-int joydev_init(void);
-int evdev_init(void);
-
void input_register_device(struct input_dev *);
void input_unregister_device(struct input_dev *);
@@ -459,6 +460,7 @@ void input_close_device(struct input_handle *);
void input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value);
#define input_report_key(a,b,c) input_event(a, EV_KEY, b, c)
+#define input_report_btn(a,b,c) input_event(a, EV_KEY, b, !!(c))
#define input_report_rel(a,b,c) input_event(a, EV_REL, b, c)
#define input_report_abs(a,b,c) input_event(a, EV_ABS, b, c)