diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-07 16:18:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-07 16:18:33 -0700 |
| commit | f053ea8d841a3a4620fff4a1b2ab1da9d7c53939 (patch) | |
| tree | f8b6e0fc8c5c07d40db8d3aa3645092ab3d57ec6 /include/linux/input.h | |
| parent | Merge branch 'for-linus' to bring in change ensuring that drivers that (diff) | |
| parent | Revert "Input: atmel_mxt_ts - warn if sysfs could not be created" (diff) | |
| download | wireguard-linux-f053ea8d841a3a4620fff4a1b2ab1da9d7c53939.tar.xz wireguard-linux-f053ea8d841a3a4620fff4a1b2ab1da9d7c53939.zip | |
Pull input changes from Henrik Rydberg, including large update to
atmel_mxt_ts driver by Daniel and MT protocol addition for win8 devices.
Conflicts:
drivers/input/touchscreen/atmel_mxt_ts.c
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 2740d080ec6b..725dcd0f63a4 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -807,18 +807,20 @@ struct input_keymap_entry { #define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */ #define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */ #define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */ -#define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */ -#define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */ +#define ABS_MT_POSITION_X 0x35 /* Center X touch position */ +#define ABS_MT_POSITION_Y 0x36 /* Center Y touch position */ #define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ #define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ #define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ #define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ #define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ +#define ABS_MT_TOOL_X 0x3c /* Center X tool position */ +#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */ #ifdef __KERNEL__ /* Implementation details, userspace should not care about these */ #define ABS_MT_FIRST ABS_MT_TOUCH_MAJOR -#define ABS_MT_LAST ABS_MT_DISTANCE +#define ABS_MT_LAST ABS_MT_TOOL_Y #endif #define ABS_MAX 0x3f |