diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 13:38:38 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 13:38:38 +0300 |
| commit | 105856b36c0cefc2fa1c1e649d75da71e2e38c31 (patch) | |
| tree | 87adba76a320aa4ef4e122db84af21a9eac93382 /include/uapi/linux | |
| parent | 90c5f4649aafd0bca6f47f67ea0ba596c93a3ab0 (diff) | |
| parent | f43d3870cafa2a0f3854c1819c8385733db8f9ae (diff) | |
| download | linux-105856b36c0cefc2fa1c1e649d75da71e2e38c31.tar.xz | |
Merge branch 'for-5.11/core' into for-linus
- increase of maximum HID report size to 16KB in order to support
some of the modern devices, from Dean Camera
- control interface support for hidraw, from Dean Camera
- stylus battery reporting improvement, from Dmitry Torokhov
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/hidraw.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/hidraw.h b/include/uapi/linux/hidraw.h index 4913539e5bcc..33ebad81720a 100644 --- a/include/uapi/linux/hidraw.h +++ b/include/uapi/linux/hidraw.h @@ -40,6 +40,12 @@ struct hidraw_devinfo { #define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) #define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) #define HIDIOCGRAWUNIQ(len) _IOC(_IOC_READ, 'H', 0x08, len) +/* The first byte of SINPUT and GINPUT is the report number */ +#define HIDIOCSINPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x09, len) +#define HIDIOCGINPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0A, len) +/* The first byte of SOUTPUT and GOUTPUT is the report number */ +#define HIDIOCSOUTPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0B, len) +#define HIDIOCGOUTPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0C, len) #define HIDRAW_FIRST_MINOR 0 #define HIDRAW_MAX_DEVICES 64 |