forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt', 'for-3.12/logitech', 'for-3.12/multitouch-win8', 'for-3.12/trasnport-driver-cleanup', 'for-3.12/uhid', 'for-3.12/upstream' and 'for-3.12/wiimote' into for-linus

Browse source
This commit is contained in:
Jiri Kosina 2013-09-06 11:58:37 +02:00
commit 63faf15dba
54 changed files with 1325 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/uapi/linux/input.h
View file

@ -716,6 +716,14 @@ struct input_keymap_entry {
#define BTN_DPAD_LEFT 0x222
#define BTN_DPAD_RIGHT 0x223
#define BTN_FRET_FAR_UP 0x224
#define BTN_FRET_UP 0x225
#define BTN_FRET_MID 0x226
#define BTN_FRET_LOW 0x227
#define BTN_FRET_FAR_LOW 0x228
#define BTN_STRUM_BAR_UP 0x229
#define BTN_STRUM_BAR_DOWN 0x22a
#define BTN_TRIGGER_HAPPY 0x2c0
#define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1
@ -829,8 +837,21 @@ struct input_keymap_entry {
#define ABS_MT_TOOL_X 0x3c /* Center X tool position */
#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */
/* Drums and guitars (mostly toys) */
#define ABS_TOM_FAR_LEFT 0x40
#define ABS_TOM_LEFT 0x41
#define ABS_TOM_RIGHT 0x42
#define ABS_TOM_FAR_RIGHT 0x43
#define ABS_CYMBAL_FAR_LEFT 0x44
#define ABS_CYMBAL_LEFT 0x45
#define ABS_CYMBAL_RIGHT 0x46
#define ABS_CYMBAL_FAR_RIGHT 0x47
#define ABS_BASS 0x48
#define ABS_HI_HAT 0x49
#define ABS_FRET_BOARD 0x4a /* Guitar fret board, vertical pos */
#define ABS_WHAMMY_BAR 0x4b /* Guitar whammy bar (or vibrato) */
#define ABS_MAX 0x3f
#define ABS_MAX 0x4f
#define ABS_CNT (ABS_MAX+1)
/*

4
include/uapi/linux/uhid.h
View file

@ -30,7 +30,7 @@ enum uhid_event_type {
UHID_OPEN,
UHID_CLOSE,
UHID_OUTPUT,
UHID_OUTPUT_EV,
UHID_OUTPUT_EV, /* obsolete! */
UHID_INPUT,
UHID_FEATURE,
UHID_FEATURE_ANSWER,
@ -69,6 +69,8 @@ struct uhid_output_req {
__u8 rtype;
} __attribute__((__packed__));
/* Obsolete! Newer kernels will no longer send these events but instead convert
* it into raw output reports via UHID_OUTPUT. */
struct uhid_output_ev_req {
__u16 type;
__u16 code;