Pull HID updates from Jiri Kosina: - AMD SFH (Sensor Fusion Hub) support (Sandeep Singh) - increase of maximum HID report size to 16KB in order to support some of the modern devices (Dean Camera) - control interface support for hidraw (Dean Camera) - Sony DS4 power and firmware reporting fixes (Roderick Colenbrander) - support for ghlive PS3/WII U dongles (Pascal Giard) * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (27 commits) HID: i2c-hid: add Vero K147 to descriptor override HID: ite: Add support for Acer S1002 keyboard-dock HID: sony: support for ghlive ps3/wii u dongles HID: hidraw: Add additional hidraw input/output report ioctls. HID: Increase HID maximum report size to 16KB HID: elecom: drop stray comment HID: mf: add support for 0079:1846 Mayflash/Dragonrise USB Gamecube Adapter HID: elecom: add support for EX-G M-XGL20DLBK wireless mouse HID: elecom: rewrite report based on model specific parameters HID: wacom: Constify attribute_groups HID: input: Fix fall-through warnings for Clang HID: usbhid: Fix fall-through warnings for Clang HID: logitech-hidpp: Add hid_device_id for V470 bluetooth mouse HID: intel-ish-hid: Remove unnecessary assignment to variable rv HID: sony: Workaround for DS4 dongle hotplug kernel crash. HID: sony: Don't use fw_version/hw_version for sysfs cleanup. HID: sony: Report more accurate DS4 power status. SFH: fix error return check for -ERESTARTSYS HID: SFH: Add documentation HID: hid-input: occasionally report stylus battery even if not changed ...
Showing the changes to include (2 of 34 files). Show all
Unified · Split
| @@ -494,7 +494,7 @@ struct hid_report_enum { · 493 unmodified lines | ||
| 494 | 494 | }; |
| 495 | 495 | |
| 496 | 496 | #define HID_MIN_BUFFER_SIZE 64 /* make sure there is at least a packet size of space */ |
| 497 | −#define HID_MAX_BUFFER_SIZE 8192 /* 8kb */ | |
| 497 | +#define HID_MAX_BUFFER_SIZE 16384 /* 16kb */ | |
| 498 | 498 | #define HID_CONTROL_FIFO_SIZE 256 /* to init devices with >100 reports */ |
| 499 | 499 | #define HID_OUTPUT_FIFO_SIZE 64 |
| 500 | 500 | |
| @@ -585,6 +585,7 @@ struct hid_device { /* device report descriptor */ · 84 unmodified lines | ||
| 585 | 585 | __s32 battery_report_id; |
| 586 | 586 | enum hid_battery_status battery_status; |
| 587 | 587 | bool battery_avoid_query; |
| 588 | + ktime_t battery_ratelimit_time; | |
| 588 | 589 | #endif |
| 589 | 590 | |
| 590 | 591 | unsigned long status; /* see STAT flags above */ |
| @@ -40,6 +40,12 @@ struct hidraw_devinfo { · 39 unmodified lines | ||
| 40 | 40 | #define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) |
| 41 | 41 | #define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) |
| 42 | 42 | #define HIDIOCGRAWUNIQ(len) _IOC(_IOC_READ, 'H', 0x08, len) |
| 43 | +/* The first byte of SINPUT and GINPUT is the report number */ | |
| 44 | +#define HIDIOCSINPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x09, len) | |
| 45 | +#define HIDIOCGINPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0A, len) | |
| 46 | +/* The first byte of SOUTPUT and GOUTPUT is the report number */ | |
| 47 | +#define HIDIOCSOUTPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0B, len) | |
| 48 | +#define HIDIOCGOUTPUT(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x0C, len) | |
| 43 | 49 | |
| 44 | 50 | #define HIDRAW_FIRST_MINOR 0 |
| 45 | 51 | #define HIDRAW_MAX_DEVICES 64 |