mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
Merge branch 'for-4.19/multitouch-multiaxis' into for-linus
Multitouch updates: - Dial support - Palm rejection for touchscreens - a few small assorted fixes
This commit is contained in:
@@ -190,6 +190,12 @@ struct hid_item {
|
||||
* http://www.usb.org/developers/hidpage/HUTRR40RadioHIDUsagesFinal.pdf
|
||||
*/
|
||||
#define HID_GD_WIRELESS_RADIO_CTLS 0x0001000c
|
||||
/*
|
||||
* System Multi-Axis, see:
|
||||
* http://www.usb.org/developers/hidpage/HUTRR62_-_Generic_Desktop_CA_for_System_Multi-Axis_Controllers.txt
|
||||
*/
|
||||
#define HID_GD_SYSTEM_MULTIAXIS 0x0001000e
|
||||
|
||||
#define HID_GD_X 0x00010030
|
||||
#define HID_GD_Y 0x00010031
|
||||
#define HID_GD_Z 0x00010032
|
||||
@@ -638,12 +644,13 @@ static inline void hid_set_drvdata(struct hid_device *hdev, void *data)
|
||||
struct hid_parser {
|
||||
struct hid_global global;
|
||||
struct hid_global global_stack[HID_GLOBAL_STACK_SIZE];
|
||||
unsigned global_stack_ptr;
|
||||
unsigned int global_stack_ptr;
|
||||
struct hid_local local;
|
||||
unsigned collection_stack[HID_COLLECTION_STACK_SIZE];
|
||||
unsigned collection_stack_ptr;
|
||||
unsigned int *collection_stack;
|
||||
unsigned int collection_stack_ptr;
|
||||
unsigned int collection_stack_size;
|
||||
struct hid_device *device;
|
||||
unsigned scan_flags;
|
||||
unsigned int scan_flags;
|
||||
};
|
||||
|
||||
struct hid_class_descriptor {
|
||||
|
Reference in New Issue
Block a user