Pull HID updates from Jiri Kosina: - touch_max detection improvements and quirk handling fixes in wacom driver from Jason Gerecke and Ping Cheng - Palm rejection from Dmitry Torokhov and _dial support from Benjamin Tissoires for hid-multitouch driver - Low voltage support for i2c-hid driver from Stephen Boyd - Guitar-Hero support from Nicolas Adenis-Lamarre - other assorted small fixes and device ID additions * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (40 commits) HID: intel_ish-hid: tx_buf memory leak on probe/remove HID: intel-ish-hid: Prevent loading of driver on Mehlow HID: cougar: Add support for the Cougar 500k Gaming Keyboard HID: cougar: make compare_device_paths reusable HID: intel-ish-hid: remove redundant variable num_frags HID: multitouch: handle palm for touchscreens HID: multitouch: touchscreens also use confidence reports HID: multitouch: report MT_TOOL_PALM for non-confident touches HID: microsoft: support the Surface Dial HID: core: do not upper bound the collection stack HID: input: enable Totem on the Dell Canvas 27 HID: multitouch: remove one copy of values HID: multitouch: ditch mt_report_id HID: multitouch: store a per application quirks value HID: multitouch: Store per collection multitouch data HID: multitouch: make sure the static list of class is not changed input: add MT_TOOL_DIAL HID: elan: Add support for touchpad on the Toshiba Click Mini L9W HID: elan: Add USB-id for HP x2 10-n000nd touchpad HID: elan: Add a flag for selecting if the touchpad has a LED ...
Showing the changes to include/uapi/linux (1 of 27 files). Show all
Unified · Split
| @@ -270,10 +270,11 @@ struct input_mask { · 269 unmodified lines | ||
| 270 | 270 | /* |
| 271 | 271 | * MT_TOOL types |
| 272 | 272 | */ |
| 273 | −#define MT_TOOL_FINGER 0 | |
| 274 | −#define MT_TOOL_PEN 1 | |
| 275 | −#define MT_TOOL_PALM 2 | |
| 276 | −#define MT_TOOL_MAX 2 | |
| 273 | +#define MT_TOOL_FINGER 0x00 | |
| 274 | +#define MT_TOOL_PEN 0x01 | |
| 275 | +#define MT_TOOL_PALM 0x02 | |
| 276 | +#define MT_TOOL_DIAL 0x0a | |
| 277 | +#define MT_TOOL_MAX 0x0f | |
| 277 | 278 | |
| 278 | 279 | /* |
| 279 | 280 | * Values describing the status of a force-feedback effect |