Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 13:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-4.18/wacom' into for-linus

Browse Source 
Support for "In Range" flag for Wacom Intuos/Bamboo devices from Jason Gerecke
This commit is contained in:
Jiri Kosina 2018-06-08 10:28:24 +02:00
commit 06d8b9067c
1 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/hid/wacom_wac.c
View File

@ -2894,24 +2894,31 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
struct wacom_features *features = &wacom->features; struct wacom_features *features = &wacom->features;
struct input_dev *input = wacom->pen_input; struct input_dev *input = wacom->pen_input;
unsigned char *data = wacom->data; unsigned char *data = wacom->data;
int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; int x = 0, y = 0, p = 0, d = 0;
bool pen = false, btn1 = false, btn2 = false;
bool range, prox, rdy;
if (data[0] != WACOM_REPORT_PENABLED) if (data[0] != WACOM_REPORT_PENABLED)
return 0; return 0;
prox = (data[1] & 0x20) == 0x20; range = (data[1] & 0x80) == 0x80;
prox = (data[1] & 0x40) == 0x40;
rdy = (data[1] & 0x20) == 0x20;
wacom->shared->stylus_in_proximity = range;
if (delay_pen_events(wacom))
return 0;
if (rdy) {
p = le16_to_cpup((__le16 *)&data[6]);
pen = data[1] & 0x01;
btn1 = data[1] & 0x02;
btn2 = data[1] & 0x04;
}
if (prox) {
x = le16_to_cpup((__le16 *)&data[2]);
y = le16_to_cpup((__le16 *)&data[4]);
/*
* All reports shared between PEN and RUBBER tool must be
* forced to a known starting value (zero) when transitioning to
* out-of-prox.
*
* If not reset then, to userspace, it will look like lost events
* if new tool comes in-prox with same values as previous tool sent.
*
* Hardware does report zero in most out-of-prox cases but not all.
*/
if (!wacom->shared->stylus_in_proximity) {
if (data[1] & 0x08) { if (data[1] & 0x08) {
wacom->tool[0] = BTN_TOOL_RUBBER; wacom->tool[0] = BTN_TOOL_RUBBER;
wacom->id[0] = ERASER_DEVICE_ID; wacom->id[0] = ERASER_DEVICE_ID;
@ -2919,16 +2926,9 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
wacom->tool[0] = BTN_TOOL_PEN; wacom->tool[0] = BTN_TOOL_PEN;
wacom->id[0] = STYLUS_DEVICE_ID; wacom->id[0] = STYLUS_DEVICE_ID;
} }
wacom->reporting_data = true;
} }
if (range) {
wacom->shared->stylus_in_proximity = prox;
if (delay_pen_events(wacom))
return 0;
if (prox) {
x = le16_to_cpup((__le16 *)&data[2]);
y = le16_to_cpup((__le16 *)&data[4]);
p = le16_to_cpup((__le16 *)&data[6]);
/* /*
* Convert distance from out prox to distance from tablet. * Convert distance from out prox to distance from tablet.
* distance will be greater than distance_max once * distance will be greater than distance_max once
@ -2937,25 +2937,29 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
*/ */
if (data[8] <= features->distance_max) if (data[8] <= features->distance_max)
d = features->distance_max - data[8]; d = features->distance_max - data[8];
pen = data[1] & 0x01;
btn1 = data[1] & 0x02;
btn2 = data[1] & 0x04;
} else { } else {
wacom->id[0] = 0; wacom->id[0] = 0;
} }
if (wacom->reporting_data) {
input_report_key(input, BTN_TOUCH, pen); input_report_key(input, BTN_TOUCH, pen);
input_report_key(input, BTN_STYLUS, btn1); input_report_key(input, BTN_STYLUS, btn1);
input_report_key(input, BTN_STYLUS2, btn2); input_report_key(input, BTN_STYLUS2, btn2);
if (prox || !range) {
input_report_abs(input, ABS_X, x); input_report_abs(input, ABS_X, x);
input_report_abs(input, ABS_Y, y); input_report_abs(input, ABS_Y, y);
}
input_report_abs(input, ABS_PRESSURE, p); input_report_abs(input, ABS_PRESSURE, p);
input_report_abs(input, ABS_DISTANCE, d); input_report_abs(input, ABS_DISTANCE, d);
input_report_key(input, wacom->tool[0], prox); /* PEN or RUBBER */ input_report_key(input, wacom->tool[0], range); /* PEN or RUBBER */
input_report_abs(input, ABS_MISC, wacom->id[0]); /* TOOL ID */ input_report_abs(input, ABS_MISC, wacom->id[0]); /* TOOL ID */
}
if (!range) {
wacom->reporting_data = false;
}
return 1; return 1;
} }