History

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

Pull HID subsystem updates from Jiri Kosina: - The need for HID_QUIRK_NO_INIT_REPORTS per-device quirk has been growing dramatically during past years, so the time has come to switch over the default, and perform the pro-active reading only in cases where it's really needed (multitouch, wacom). The only place where this behavior is (in some form) preserved is hiddev so that we don't introduce userspace-visible change of behavior. From Benjamin Tissoires - HID++ support for power_supply / baterry reporting. From Benjamin Tissoires and Bastien Nocera - Vast improvements / rework of DS3 and DS4 in Sony driver. From Roderick Colenbrander - Improvment (in terms of getting closer to the Microsoft's interpretation of slightly ambiguous specification) of logical range interpretation in case null-state is set in the rdesc. From Valtteri Heikkilä and Tomasz Kramkowski - A lot of newly supported device IDs and small assorted fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (71 commits) HID: usbhid: Add HID_QUIRK_NOGET for Aten CS-1758 KVM switch HID: asus: support backlight on USB keyboards HID: wacom: Move wacom_remote_irq and wacom_remote_status_irq HID: wacom: generic: sync pad events only for actual packets HID: sony: remove redundant check for -ve err HID: sony: Make sure to unregister sensors on failure HID: sony: Make DS4 bt poll interval adjustable HID: sony: Set proper bit flags on DS4 output report HID: sony: DS4 use brighter LED colors HID: sony: Improve navigation controller axis/button mapping HID: sony: Use DS3 MAC address as unique identifier on USB HID: logitech-hidpp: add a sysfs file to tell we support power_supply HID: logitech-hidpp: enable HID++ 1.0 battery reporting HID: logitech-hidpp: add support for battery status for the K750 HID: logitech-hidpp: battery: provide CAPACITY_LEVEL HID: logitech-hidpp: rename battery level into capacity HID: logitech-hidpp: battery: provide ONLINE property HID: logitech-hidpp: notify battery on connect HID: logitech-hidpp: return an error if the queried feature is not present HID: logitech-hidpp: create the battery for all types of HID++ devices ...

Linus Torvalds committed 9 years ago

Commit 7af4c722 parents 68fed41 4d6ca2230 files · +2490 −1129Browse files

Showing the changes to include/uapi/linux (2 of 30 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/input-event-codes.h +1 −0
  2. include/uapi/linux/input.h +8 −3
include/uapi/linux/input-event-codes.h+1−0
@@ -641,6 +641,7 @@ · 640 unmodified lines
641 * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)641 * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
642 */642 */
643#define KEY_DATA 0x277643#define KEY_DATA 0x277
644#define KEY_ONSCREEN_KEYBOARD 0x278
644 645
645#define BTN_TRIGGER_HAPPY 0x2c0646#define BTN_TRIGGER_HAPPY 0x2c0
646#define BTN_TRIGGER_HAPPY1 0x2c0647#define BTN_TRIGGER_HAPPY1 0x2c0
include/uapi/linux/input.h+8−3
@@ -61,9 +61,14 @@ struct input_id { · 60 unmodified lines
61 * Note that input core does not clamp reported values to the61 * Note that input core does not clamp reported values to the
62 * [minimum, maximum] limits, such task is left to userspace.62 * [minimum, maximum] limits, such task is left to userspace.
63 *63 *
64 * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in64 * The default resolution for main axes (ABS_X, ABS_Y, ABS_Z)
65 * units per millimeter (units/mm), resolution for rotational axes65 * is reported in units per millimeter (units/mm), resolution
66 * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.66 * for rotational axes (ABS_RX, ABS_RY, ABS_RZ) is reported
67 * in units per radian.
68 * When INPUT_PROP_ACCELEROMETER is set the resolution changes.
69 * The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in
70 * in units per g (units/g) and in units per degree per second
71 * (units/deg/s) for rotational axes (ABS_RX, ABS_RY, ABS_RZ).
67 */72 */
68struct input_absinfo {73struct input_absinfo {
69 __s32 value;74 __s32 value;