projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
caca925
)
Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"
author
Dmitry Torokhov
<
[email protected]
>
Thu, 14 Jul 2016 16:33:41 +0000
(09:33 -0700)
committer
Dmitry Torokhov
<
[email protected]
>
Thu, 14 Jul 2016 16:33:41 +0000
(09:33 -0700)
This reverts commit
5f7e5445a2de848c66d2d80ba5479197e8287c33
because
removal of input_mt_report_slot_state() means we no longer generate
tracking IDs for the reported contacts.
Cc:
[email protected]
Acked-by: Peter Hutterer <
[email protected]
>
Acked-by: Ping Cheng <
[email protected]
>
drivers/input/touchscreen/wacom_w8001.c
patch
|
blob
|
history
diff --git
a/drivers/input/touchscreen/wacom_w8001.c
b/drivers/input/touchscreen/wacom_w8001.c
index 0c9191cf324d491ab25117ab654c6f1bf91375de..b6fc4bde79ded75430725f97f72d7a9c3bae2c6b 100644
(file)
--- a/
drivers/input/touchscreen/wacom_w8001.c
+++ b/
drivers/input/touchscreen/wacom_w8001.c
@@
-155,6
+155,7
@@
static void parse_multi_touch(struct w8001 *w8001)
bool touch = data[0] & (1 << i);
input_mt_slot(dev, i);
+ input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
if (touch) {
x = (data[6 * i + 1] << 7) | data[6 * i + 2];
y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@
-522,6
+523,8
@@
static int w8001_setup_touch(struct w8001 *w8001, char *basename,
0, touch.x, 0, 0);
input_set_abs_params(dev, ABS_MT_POSITION_Y,
0, touch.y, 0, 0);
+ input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
+ 0, MT_TOOL_MAX, 0, 0);
strlcat(basename, " 2FG", basename_sz);
if (w8001->max_pen_x && w8001->max_pen_y)