History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID subsystem fixes from Jiri Kosina: - two device-specific quirks from Hans de Goede and Nic Soudée - reintroduction of (mistakenly remocved) ABS_RESERVED from Peter Hutterer * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: Input: restore EV_ABS ABS_RESERVED HID: quirks: fix RetroUSB.com devices HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk

Linus Torvalds committed 7 years ago

Commit f5d58272 parents 9bb40f0 c201e384 files · +19 −0Browse files

Showing the changes to include/uapi/linux (1 of 4 files). Show all

Unified · Split

include/uapi/linux/input-event-codes.h+9−0
@@ -752,6 +752,15 @@ · 751 unmodified lines
752 752
753#define ABS_MISC 0x28753#define ABS_MISC 0x28
754 754
755/*
756 * 0x2e is reserved and should not be used in input drivers.
757 * It was used by HID as ABS_MISC+6 and userspace needs to detect if
758 * the next ABS_* event is correct or is just ABS_MISC + n.
759 * We define here ABS_RESERVED so userspace can rely on it and detect
760 * the situation described above.
761 */
762#define ABS_RESERVED 0x2e
763
755#define ABS_MT_SLOT 0x2f /* MT slot being modified */764#define ABS_MT_SLOT 0x2f /* MT slot being modified */
756#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */765#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */
757#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */766#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */