diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-10 22:04:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-10 22:04:41 +0300 |
| commit | f5d582777bcb1c7ff19a5a2343f66ea01de401c6 (patch) | |
| tree | df88b21a048596675e7f82f033f393c390618180 /include | |
| parent | 9bb40f0108857ddb93e7480a7f38c1a9ad432e1d (diff) | |
| parent | c201e3808e0e4be9b98d192802085a9f491bd80c (diff) | |
| download | linux-f5d582777bcb1c7ff19a5a2343f66ea01de401c6.tar.xz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/input-event-codes.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 3eb5a4c3d60a..ae366b87426a 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -752,6 +752,15 @@ #define ABS_MISC 0x28 +/* + * 0x2e is reserved and should not be used in input drivers. + * It was used by HID as ABS_MISC+6 and userspace needs to detect if + * the next ABS_* event is correct or is just ABS_MISC + n. + * We define here ABS_RESERVED so userspace can rely on it and detect + * the situation described above. + */ +#define ABS_RESERVED 0x2e + #define ABS_MT_SLOT 0x2f /* MT slot being modified */ #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ |