Pull HID updates from Benjamin Tissoires: - handle of all Logitech Bluetooth HID++ devices in the Logitech HID++ drivers (Bastien Nocera) - fix broken atomic checks in hid-multitouch by adding memory barriers (Andri Yngvason) - better handling of devices with AMD SFH1.1 (Basavaraj Natikar) - better support of Nintendo clone controllers (Icenowy Zheng and Johnothan King) - Support for various RC controllers (Marcus Folkesson) - Add UGEEv2 support in hid-uclogic (XP-PEN Deco Pro S and Parblo A610 PRO) (José Expósito) - some conversions to use dev_groups (Greg Kroah-Hartman) - HID-BPF preparatory patches, mostly to convert blank defines as enums (Benjamin Tissoires) * tag 'for-linus-2022100501' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (38 commits) HID: wacom: add three styli to wacom_intuos_get_tool_type HID: amd_sfh: Handle condition of "no sensors" for SFH1.1 HID: amd_sfh: Change dev_err to dev_dbg for additional debug info HID: nintendo: check analog user calibration for plausibility HID: nintendo: deregister home LED when it fails HID: roccat: Fix use-after-free in roccat_read() hid: topre: Add driver fixing report descriptor HID: multitouch: Add memory barriers HID: convert defines of HID class requests into a proper enum HID: export hid_report_type to uapi HID: core: store the unique system identifier in hid_device HID: Add driver for PhoenixRC Flight Controller HID: Add driver for VRC-2 Car Controller HID: sony: Fix double word in comments hid: hid-logitech-hidpp: avoid unnecessary assignments in hidpp_connect_event HID: logitech-hidpp: Detect hi-res scrolling support HID: logitech-hidpp: Remove hard-coded "Sw. Id." for HID++ 2.0 commands HID: logitech-hidpp: Fix "Sw. Id." for HID++ 2.0 commands HID: logitech-hidpp: Remove special-casing of Bluetooth devices HID: logitech-hidpp: Enable HID++ for all the Logitech Bluetooth devices ...
Showing the changes to include/uapi/linux (1 of 38 files). Show all
Unified · Split
| @@ -42,16 +42,30 @@ · 41 unmodified lines | ||
| 42 | 42 | #define USB_INTERFACE_PROTOCOL_KEYBOARD 1 |
| 43 | 43 | #define USB_INTERFACE_PROTOCOL_MOUSE 2 |
| 44 | 44 | |
| 45 | +/* | |
| 46 | + * HID report types --- Ouch! HID spec says 1 2 3! | |
| 47 | + */ | |
| 48 | + | |
| 49 | +enum hid_report_type { | |
| 50 | + HID_INPUT_REPORT = 0, | |
| 51 | + HID_OUTPUT_REPORT = 1, | |
| 52 | + HID_FEATURE_REPORT = 2, | |
| 53 | + | |
| 54 | + HID_REPORT_TYPES, | |
| 55 | +}; | |
| 56 | + | |
| 45 | 57 | /* |
| 46 | 58 | * HID class requests |
| 47 | 59 | */ |
| 48 | 60 | |
| 49 | −#define HID_REQ_GET_REPORT 0x01 | |
| 50 | −#define HID_REQ_GET_IDLE 0x02 | |
| 51 | −#define HID_REQ_GET_PROTOCOL 0x03 | |
| 52 | −#define HID_REQ_SET_REPORT 0x09 | |
| 53 | −#define HID_REQ_SET_IDLE 0x0A | |
| 54 | −#define HID_REQ_SET_PROTOCOL 0x0B | |
| 61 | +enum hid_class_request { | |
| 62 | + HID_REQ_GET_REPORT = 0x01, | |
| 63 | + HID_REQ_GET_IDLE = 0x02, | |
| 64 | + HID_REQ_GET_PROTOCOL = 0x03, | |
| 65 | + HID_REQ_SET_REPORT = 0x09, | |
| 66 | + HID_REQ_SET_IDLE = 0x0A, | |
| 67 | + HID_REQ_SET_PROTOCOL = 0x0B, | |
| 68 | +}; | |
| 55 | 69 | |
| 56 | 70 | /* |
| 57 | 71 | * HID class descriptor types |