diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-10-14 14:47:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-10-14 14:47:56 +0200 |
| commit | d057fd4cb892087955568a139d15eae4115a0174 (patch) | |
| tree | 4fd631492ff8d2d78c394fd2b054175588a7d633 /include/linux/hid.h | |
| parent | bb6c8d8fa9b5587eea18078ce0bcf6bb2905789f (diff) | |
| parent | 709d27c04f4eccbc99d57a5569bce028915a4345 (diff) | |
Merge branch 'hidraw' into for-linus
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 35f5384a465..55e51f9f76c 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -405,6 +405,7 @@ struct hid_control_fifo { #define HID_CLAIMED_INPUT 1 #define HID_CLAIMED_HIDDEV 2 +#define HID_CLAIMED_HIDRAW 4 #define HID_CTRL_RUNNING 1 #define HID_OUT_RUNNING 2 @@ -440,6 +441,7 @@ struct hid_device { /* device report descriptor */ struct list_head inputs; /* The list of inputs */ void *hiddev; /* The hiddev structure */ + void *hidraw; int minor; /* Hiddev minor number */ wait_queue_head_t wait; /* For sleeping */ @@ -460,6 +462,9 @@ struct hid_device { /* device report descriptor */ void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field, struct hid_usage *, __s32); void (*hiddev_report_event) (struct hid_device *, struct hid_report *); + + /* handler for raw output data, used by hidraw */ + int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t); #ifdef CONFIG_USB_HIDINPUT_POWERBOOK unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; |