diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:50:21 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:50:21 +1000 |
| commit | b2167b52e291ec68884e32851a8ec24cdd1972a8 (patch) | |
| tree | 4d904cfb31a74d8df2b5955d13cfd803f4ea3363 /include | |
| parent | 9d6a1ef1537264d1e8680f95d0a543eaf4bb1cae (diff) | |
| parent | 224197167b71e3128876a8c5c387d4ccb7a977c8 (diff) | |
Merge remote branch 'hid/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 3 | ||||
| -rw-r--r-- | include/linux/hidraw.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 895001f7f4b2..e6796c54a62e 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -502,6 +502,9 @@ struct hid_device { /* device report descriptor */ struct hid_usage *, __s32); void (*hiddev_report_event) (struct hid_device *, struct hid_report *); + /* handler for raw input (Get_Report) data, used by hidraw */ + int (*hid_get_raw_report) (struct hid_device *, unsigned char, __u8 *, size_t, unsigned char); + /* handler for raw output data, used by hidraw */ int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t, unsigned char); diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h index dd8d69269176..4b88e697c4e9 100644 --- a/include/linux/hidraw.h +++ b/include/linux/hidraw.h @@ -35,6 +35,9 @@ struct hidraw_devinfo { #define HIDIOCGRAWINFO _IOR('H', 0x03, struct hidraw_devinfo) #define HIDIOCGRAWNAME(len) _IOC(_IOC_READ, 'H', 0x04, len) #define HIDIOCGRAWPHYS(len) _IOC(_IOC_READ, 'H', 0x05, len) +/* The first byte of SFEATURE and GFEATURE is the report number */ +#define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) +#define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) #define HIDRAW_FIRST_MINOR 0 #define HIDRAW_MAX_DEVICES 64 |