diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:09:06 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 19:09:06 +0300 |
| commit | 16501e846dd23f56a23330cd874cfbfaf60daf1a (patch) | |
| tree | 22513a8f89b046b8feeb84a43ad754ea66441a5d /include/uapi/linux | |
| parent | f5dd80715ae1f34909cb04f29b7092dfc6717ed7 (diff) | |
| parent | 28a042a3b7ab3e28039d6309f0764a8e4c1b261d (diff) | |
| download | linux-16501e846dd23f56a23330cd874cfbfaf60daf1a.tar.xz | |
Merge branch 'for-4.19/multitouch-multiaxis' into for-linus
Multitouch updates:
- Dial support
- Palm rejection for touchscreens
- a few small assorted fixes
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/input.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 7288a7c573cc..fb78f6f500f3 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -270,10 +270,11 @@ struct input_mask { /* * MT_TOOL types */ -#define MT_TOOL_FINGER 0 -#define MT_TOOL_PEN 1 -#define MT_TOOL_PALM 2 -#define MT_TOOL_MAX 2 +#define MT_TOOL_FINGER 0x00 +#define MT_TOOL_PEN 0x01 +#define MT_TOOL_PALM 0x02 +#define MT_TOOL_DIAL 0x0a +#define MT_TOOL_MAX 0x0f /* * Values describing the status of a force-feedback effect |