diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-17 18:41:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-17 18:41:50 -0800 |
| commit | 20f2ef0bb46d665714abe46f8ca9302a35411904 (patch) | |
| tree | 3d7f13d73eecf77f5c2eda5828003d8d59c9b8b5 /include | |
| parent | c3d7ae3b07d7d7d1214af82d240f4fb5706bf5b9 (diff) | |
| parent | 90b49267a152e0ac1712db01e3d0ff369bb314f6 (diff) | |
Merge http://linuxusb.bkbits.net/linus-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hiddev.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index cffc0323325d..4f57c1174598 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h @@ -119,6 +119,7 @@ struct hiddev_usage_ref { __s32 value; }; +#define HID_FIELD_INDEX_NONE 0xffffffff /* * Protocol version. @@ -143,6 +144,15 @@ struct hiddev_usage_ref { #define HIDIOCGUSAGE _IOWR('H', 0x0B, struct hiddev_usage_ref) #define HIDIOCSUSAGE _IOW('H', 0x0C, struct hiddev_usage_ref) #define HIDIOCGUCODE _IOWR('H', 0x0D, struct hiddev_usage_ref) +#define HIDIOCGFLAG _IOR('H', 0x0E, int) +#define HIDIOCSFLAG _IOW('H', 0x0F, int) + +/* + * Flags to be used in HIDIOCSFLAG + */ +#define HIDDEV_FLAG_UREF 0x1 +#define HIDDEV_FLAG_REPORT 0x2 +#define HIDDEV_FLAGS 0x3 /* To traverse the input report descriptor info for a HID device, perform the * following: @@ -179,7 +189,7 @@ struct hiddev_usage_ref { #ifdef CONFIG_USB_HIDDEV int hiddev_connect(struct hid_device *); void hiddev_disconnect(struct hid_device *); -void hiddev_hid_event(struct hid_device *, unsigned int usage, int value); +void hiddev_hid_event(struct hid_device *, struct hiddev_usage_ref *ref); int __init hiddev_init(void); void __exit hiddev_exit(void); #else |