aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hid.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2006-12-08 12:41:10 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-08 13:43:15 -0500
commitaa938f7974b82cfd9ee955031987344f332b7c77 (patch)
tree21198b8aa8a4c3be76def4b57968dae816753846 /include/linux/hid.h
parent4916b3a57fc94664677d439b911b8aaf86c7ec23 (diff)
[PATCH] Generic HID layer - hiddev
- hiddev is USB-only (agreed with Marcel Holtmann that Bluetooth currently doesn't need it, and future planned interface (rawhid) will be more flexible and usable) - both HID and USB-hid can be now compiled as modules (wasn't possible before hiddev was fully separated from generic HID layer) Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r--include/linux/hid.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index fc6f74228da3..5a969a137b85 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -433,6 +433,10 @@ struct hid_device { /* device report descriptor */
433 int (*hidinput_open) (struct input_dev *); 433 int (*hidinput_open) (struct input_dev *);
434 void (*hidinput_close) (struct input_dev *); 434 void (*hidinput_close) (struct input_dev *);
435 435
436 /* hiddev event handler */
437 void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
438 struct hid_usage *, __s32);
439
436#ifdef CONFIG_USB_HIDINPUT_POWERBOOK 440#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
437 unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; 441 unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
438 unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; 442 unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
@@ -477,13 +481,9 @@ struct hid_descriptor {
477#define resolv_event(a,b) do { } while (0) 481#define resolv_event(a,b) do { } while (0)
478#endif 482#endif
479 483
480#ifdef CONFIG_HID
481/* Applications from HID Usage Tables 4/8/99 Version 1.1 */ 484/* Applications from HID Usage Tables 4/8/99 Version 1.1 */
482/* We ignore a few input applications that are not widely used */ 485/* We ignore a few input applications that are not widely used */
483#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001)) 486#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001))
484#else
485#define IS_INPUT_APPLICATION(a) (0)
486#endif
487 487
488/* HID core API */ 488/* HID core API */
489extern void hidinput_hid_event(struct hid_device *, struct hid_field *, struct hid_usage *, __s32); 489extern void hidinput_hid_event(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);