aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hid.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2006-12-08 12:41:17 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-08 13:43:17 -0500
commitaa8de2f038baec993f07ef66fb3e94481d1ec22b (patch)
treefeb358b58c3eaf94381d9cc89306af0c8808d132 /include/linux/hid.h
parentaa938f7974b82cfd9ee955031987344f332b7c77 (diff)
[PATCH] Generic HID layer - input and event reporting
hid_input_report() was needlessly USB-specific in USB HID. This patch makes the function independent of HID implementation and fixes all the current users. Bluetooth patches comply with this prototype. 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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 5a969a137b85..342b4e639acb 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -436,7 +436,7 @@ struct hid_device { /* device report descriptor */
436 /* hiddev event handler */ 436 /* hiddev event handler */
437 void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field, 437 void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
438 struct hid_usage *, __s32); 438 struct hid_usage *, __s32);
439 439 void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
440#ifdef CONFIG_USB_HIDINPUT_POWERBOOK 440#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
441 unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; 441 unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
442 unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; 442 unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
@@ -492,6 +492,7 @@ extern int hidinput_connect(struct hid_device *);
492extern void hidinput_disconnect(struct hid_device *); 492extern void hidinput_disconnect(struct hid_device *);
493 493
494int hid_set_field(struct hid_field *, unsigned, __s32); 494int hid_set_field(struct hid_field *, unsigned, __s32);
495int hid_input_report(struct hid_device *, int type, u8 *, int, int);
495int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field); 496int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
496void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt); 497void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);
497void hid_output_report(struct hid_report *report, __u8 *data); 498void hid_output_report(struct hid_report *report, __u8 *data);