Pull HID fixes from Jiri Kosina: - revert of the high-resolution scrolling feature, as it breaks certain hardware due to incompatibilities between Logitech and Microsoft worlds. Peter Hutterer is working on a fixed implementation. Until that is finished, revert by Benjamin Tissoires. - revert of incorrect strncpy->strlcpy conversion in uhid, from David Herrmann - fix for buggy sendfile() implementation on uhid device node, from Eric Biggers - a few assorted device-ID specific quirks * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: Revert "Input: Add the `REL_WHEEL_HI_RES` event code" Revert "HID: input: Create a utility class for counting scroll events" Revert "HID: logitech: Add function to enable HID++ 1.0 "scrolling acceleration"" Revert "HID: logitech: Enable high-resolution scrolling on Logitech mice" Revert "HID: logitech: Use LDJ_DEVICE macro for existing Logitech mice" Revert "HID: logitech: fix a used uninitialized GCC warning" Revert "HID: input: simplify/fix high-res scroll event handling" HID: Add quirk for Primax PIXART OEM mice HID: i2c-hid: Disable runtime PM for LG touchscreen HID: multitouch: Add pointstick support for Cirque Touchpad HID: steam: remove input device when a hid client is running. Revert "HID: uhid: use strlcpy() instead of strncpy()" HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges HID: input: Ignore battery reported by Symbol DS4308 HID: Add quirk for Microsoft PIXART OEM mouse
Showing the changes to include/uapi/linux (1 of 11 files). Show all
Unified · Split
| @@ -716,7 +716,6 @@ · 715 unmodified lines | |||
| 716 | * the situation described above. | 716 | * the situation described above. |
| 717 | */ | 717 | */ |
| 718 | #define REL_RESERVED 0x0a | 718 | #define REL_RESERVED 0x0a |
| 719 | #define REL_WHEEL_HI_RES 0x0b | ||
| 720 | #define REL_MAX 0x0f | 719 | #define REL_MAX 0x0f |
| 721 | #define REL_CNT (REL_MAX+1) | 720 | #define REL_CNT (REL_MAX+1) |
| 722 | 721 | ||
| @@ -753,15 +752,6 @@ · 30 unmodified lines | |||
| 753 | 752 | ||
| 754 | #define ABS_MISC 0x28 | 753 | #define ABS_MISC 0x28 |
| 755 | 754 | ||
| 756 | /* | ||
| 757 | * 0x2e is reserved and should not be used in input drivers. | ||
| 758 | * It was used by HID as ABS_MISC+6 and userspace needs to detect if | ||
| 759 | * the next ABS_* event is correct or is just ABS_MISC + n. | ||
| 760 | * We define here ABS_RESERVED so userspace can rely on it and detect | ||
| 761 | * the situation described above. | ||
| 762 | */ | ||
| 763 | #define ABS_RESERVED 0x2e | ||
| 764 | |||
| 765 | #define ABS_MT_SLOT 0x2f /* MT slot being modified */ | 755 | #define ABS_MT_SLOT 0x2f /* MT slot being modified */ |
| 766 | #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ | 756 | #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ |
| 767 | #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ | 757 | #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ |