diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:52:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:52:36 -0400 |
commit | d6b92c2c373e0beefa8048c1448992cd5cda6e07 (patch) | |
tree | 9650bc989b34df3fcf1e076d9d65cda00e33a894 /include/linux | |
parent | 1aacb90eaaac057c10fd746e189553e04cfeb291 (diff) | |
parent | beea3f4a29e76561a3aa02cf5314c91a06150f60 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid into next
Pull HID patches from Jiri Kosina:
- RMI driver for Synaptics touchpads, by Benjamin Tissoires, Andrew
Duggan and Jiri Kosina
- cleanup of hid-sony driver and improved support for Sixaxis and
Dualshock 4, by Frank Praznik
- other usual small fixes and support for new device IDs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
HID: thingm: thingm_fwinfo[] doesn't need to be global
HID: core: add two new usages for digitizer
HID: hid-sensor-hub: new device id and quirk for STM Sensor hub
HID: usbhid: enable NO_INIT_REPORTS quirk for Semico USB Keykoard
HID: hid-sensor-hub: Set report quirk for Microsoft Surface
HID: debug: add labels for HID Sensor Usages
HID: uhid: Use kmemdup instead of kmalloc + memcpy
HID: rmi: do not handle touchscreens through hid-rmi
HID: quirk for Saitek RAT7 and MMO7 mices' mode button
HID: core: fix validation of report id 0
HID: rmi: fix masks for x and w_x data
HID: rmi: fix wrong struct field name
HID: rmi: do not fetch more than 16 bytes in a query
HID: rmi: check for the existence of some optional queries before reading query 12
HID: i2c-hid: hid report descriptor retrieval changes
HID: add missing hid usages
HID: hid-sony - allow 3rd party INTEC controller to turn off all leds
HID: sony: Add blink support to the Sixaxis and DualShock 4 LEDs
HID: sony: Initialize the controller LEDs with a device ID value
HID: sony: Use the controller Bluetooth MAC address as the unique value in the battery name string
...
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hid.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 720e3a10608c..77632cf159c0 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -233,11 +233,6 @@ struct hid_item { | |||
233 | #define HID_DG_BARRELSWITCH 0x000d0044 | 233 | #define HID_DG_BARRELSWITCH 0x000d0044 |
234 | #define HID_DG_ERASER 0x000d0045 | 234 | #define HID_DG_ERASER 0x000d0045 |
235 | #define HID_DG_TABLETPICK 0x000d0046 | 235 | #define HID_DG_TABLETPICK 0x000d0046 |
236 | /* | ||
237 | * as of May 20, 2009 the usages below are not yet in the official USB spec | ||
238 | * but are being pushed by Microsft as described in their paper "Digitizer | ||
239 | * Drivers for Windows Touch and Pen-Based Computers" | ||
240 | */ | ||
241 | #define HID_DG_CONFIDENCE 0x000d0047 | 236 | #define HID_DG_CONFIDENCE 0x000d0047 |
242 | #define HID_DG_WIDTH 0x000d0048 | 237 | #define HID_DG_WIDTH 0x000d0048 |
243 | #define HID_DG_HEIGHT 0x000d0049 | 238 | #define HID_DG_HEIGHT 0x000d0049 |
@@ -246,6 +241,8 @@ struct hid_item { | |||
246 | #define HID_DG_DEVICEINDEX 0x000d0053 | 241 | #define HID_DG_DEVICEINDEX 0x000d0053 |
247 | #define HID_DG_CONTACTCOUNT 0x000d0054 | 242 | #define HID_DG_CONTACTCOUNT 0x000d0054 |
248 | #define HID_DG_CONTACTMAX 0x000d0055 | 243 | #define HID_DG_CONTACTMAX 0x000d0055 |
244 | #define HID_DG_BARRELSWITCH2 0x000d005a | ||
245 | #define HID_DG_TOOLSERIALNUMBER 0x000d005b | ||
249 | 246 | ||
250 | /* | 247 | /* |
251 | * HID report types --- Ouch! HID spec says 1 2 3! | 248 | * HID report types --- Ouch! HID spec says 1 2 3! |
@@ -299,6 +296,9 @@ struct hid_item { | |||
299 | 296 | ||
300 | /* | 297 | /* |
301 | * HID device groups | 298 | * HID device groups |
299 | * | ||
300 | * Note: HID_GROUP_ANY is declared in linux/mod_devicetable.h | ||
301 | * and has a value of 0x0000 | ||
302 | */ | 302 | */ |
303 | #define HID_GROUP_GENERIC 0x0001 | 303 | #define HID_GROUP_GENERIC 0x0001 |
304 | #define HID_GROUP_MULTITOUCH 0x0002 | 304 | #define HID_GROUP_MULTITOUCH 0x0002 |
@@ -306,6 +306,11 @@ struct hid_item { | |||
306 | #define HID_GROUP_MULTITOUCH_WIN_8 0x0004 | 306 | #define HID_GROUP_MULTITOUCH_WIN_8 0x0004 |
307 | 307 | ||
308 | /* | 308 | /* |
309 | * Vendor specific HID device groups | ||
310 | */ | ||
311 | #define HID_GROUP_RMI 0x0100 | ||
312 | |||
313 | /* | ||
309 | * This is the global environment of the parser. This information is | 314 | * This is the global environment of the parser. This information is |
310 | * persistent for main-items. The global environment can be saved and | 315 | * persistent for main-items. The global environment can be saved and |
311 | * restored with PUSH/POP statements. | 316 | * restored with PUSH/POP statements. |
@@ -570,6 +575,8 @@ struct hid_descriptor { | |||
570 | .bus = BUS_USB, .vendor = (ven), .product = (prod) | 575 | .bus = BUS_USB, .vendor = (ven), .product = (prod) |
571 | #define HID_BLUETOOTH_DEVICE(ven, prod) \ | 576 | #define HID_BLUETOOTH_DEVICE(ven, prod) \ |
572 | .bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod) | 577 | .bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod) |
578 | #define HID_I2C_DEVICE(ven, prod) \ | ||
579 | .bus = BUS_I2C, .vendor = (ven), .product = (prod) | ||
573 | 580 | ||
574 | #define HID_REPORT_ID(rep) \ | 581 | #define HID_REPORT_ID(rep) \ |
575 | .report_type = (rep) | 582 | .report_type = (rep) |