History

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

Pull HID updates from Jiri Kosina: - rumble support for Xbox One S, from Andrey Smirnov - high-resolution support for Logitech mice, from Harry Cutts - support for recent devices requiring the HID parse to be able to cope with tag report sizes > 256 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (35 commits) HID: usbhid: Add quirk for Redragon/Dragonrise Seymur 2 HID: wacom: Work around HID descriptor bug in DTK-2451 and DTH-2452 HID: google: add dependency on Cros EC for Hammer HID: elan: fix spelling mistake "registred" -> "registered" HID: google: drop superfluous const before SIMPLE_DEV_PM_OPS() HID: google: add support tablet mode switch for Whiskers mfd: cros: add "base attached" MKBP switch definition Input: reserve 2 events code because of HID HID: magicmouse: add support for Apple Magic Trackpad 2 HID: i2c-hid: override HID descriptors for certain devices HID: hid-bigbenff: driver for BigBen Interactive PS3OFMINIPAD gamepad HID: logitech: fix a used uninitialized GCC warning HID: intel-ish-hid: using list_head for ipc write queue HID: intel-ish-hid: use resource-managed api HID: intel_ish-hid: Enhance API to get ring buffer sizes HID: intel-ish-hid: use helper function to search client id HID: intel-ish-hid: ishtp: add helper function for client search HID: intel-ish-hid: use helper function to access client buffer HID: intel-ish-hid: ishtp: add helper functions for client buffer operation HID: intel-ish-hid: use helper function for private driver data set/get ...

Linus Torvalds committed 8 years ago

Commit 96f2f662 parents 3f2dcb6 46011e932 files · +2225 −245Browse files

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

Unified · Split

include/uapi/linux/input-event-codes.h+18−0
@@ -708,6 +708,15 @@ · 707 unmodified lines
708#define REL_DIAL 0x07708#define REL_DIAL 0x07
709#define REL_WHEEL 0x08709#define REL_WHEEL 0x08
710#define REL_MISC 0x09710#define REL_MISC 0x09
711/*
712 * 0x0a is reserved and should not be used in input drivers.
713 * It was used by HID as REL_MISC+1 and userspace needs to detect if
714 * the next REL_* event is correct or is just REL_MISC + n.
715 * We define here REL_RESERVED so userspace can rely on it and detect
716 * the situation described above.
717 */
718#define REL_RESERVED 0x0a
719#define REL_WHEEL_HI_RES 0x0b
711#define REL_MAX 0x0f720#define REL_MAX 0x0f
712#define REL_CNT (REL_MAX+1)721#define REL_CNT (REL_MAX+1)
713 722
@@ -744,6 +753,15 @@ · 30 unmodified lines
744 753
745#define ABS_MISC 0x28754#define ABS_MISC 0x28
746 755
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
747#define ABS_MT_SLOT 0x2f /* MT slot being modified */765#define ABS_MT_SLOT 0x2f /* MT slot being modified */
748#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */766#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */
749#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */767#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t