Pull HID updates from Jiri Kosina: - HID battery handling cleanup by David Herrmann - ELO 4000/4500 driver, which has been finally ported to be proper HID driver by Jiri Slaby - ps3remote driver functionality is now provided by generic sony driver, by Jiri Kosina - PS2/3 Buzz controllers support, by Colin Leitner - rework of wiimote driver including full extensions hotpluggin support, sub-device modularization and speaker support by David Herrmann * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits) HID: wacom: Intuos4 battery charging changes HID: i2c-hid: support sending HID output reports using the output register HID: kye: Add report fixup for Genius Gila Gaming mouse HID: wiimote: support Nintendo Wii U Pro Controller Input: make gamepad API keycodes more clear input: document gamepad API and add extra keycodes HID: explain out-of-range check better HID: fix false positive out of range values HID: wiimote: fix coccinelle warnings HID: roccat: check cdev_add return value HID: fold ps3remote driver into generic Sony driver HID: hyperv: convert alloc+memcpy to memdup HID: core: fix reporting of raw events HID: wiimote: discard invalid EXT data reports HID: wiimote: fix classic controller parsing HID: wiimote: init EXT/MP during device detection HID: wiimote: fix DRM debug-attr to correctly parse input HID: wiimote: add MP quirks HID: wiimote: remove old static extension support HID: wiimote: add "bboard_calib" attribute ...
Showing the changes to include/uapi/linux (1 of 25 files). Show all
Unified · Split
| @@ -506,11 +506,15 @@ struct input_keymap_entry { · 505 unmodified lines | ||
| 506 | 506 | #define BTN_DEAD 0x12f |
| 507 | 507 | |
| 508 | 508 | #define BTN_GAMEPAD 0x130 |
| 509 | −#define BTN_A 0x130 | |
| 510 | −#define BTN_B 0x131 | |
| 509 | +#define BTN_SOUTH 0x130 | |
| 510 | +#define BTN_A BTN_SOUTH | |
| 511 | +#define BTN_EAST 0x131 | |
| 512 | +#define BTN_B BTN_EAST | |
| 511 | 513 | #define BTN_C 0x132 |
| 512 | −#define BTN_X 0x133 | |
| 513 | −#define BTN_Y 0x134 | |
| 514 | +#define BTN_NORTH 0x133 | |
| 515 | +#define BTN_X BTN_NORTH | |
| 516 | +#define BTN_WEST 0x134 | |
| 517 | +#define BTN_Y BTN_WEST | |
| 514 | 518 | #define BTN_Z 0x135 |
| 515 | 519 | #define BTN_TL 0x136 |
| 516 | 520 | #define BTN_TR 0x137 |
| @@ -707,6 +711,11 @@ struct input_keymap_entry { · 190 unmodified lines | ||
| 707 | 711 | #define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ |
| 708 | 712 | #define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ |
| 709 | 713 | |
| 714 | +#define BTN_DPAD_UP 0x220 | |
| 715 | +#define BTN_DPAD_DOWN 0x221 | |
| 716 | +#define BTN_DPAD_LEFT 0x222 | |
| 717 | +#define BTN_DPAD_RIGHT 0x223 | |
| 718 | + | |
| 710 | 719 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 711 | 720 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 712 | 721 | #define BTN_TRIGGER_HAPPY2 0x2c1 |