diff options
author | Przemo Firszt <przemo@firszt.eu> | 2012-02-28 12:19:04 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-01 03:24:29 -0500 |
commit | e0829e9c1e6981450f11204a4104646ed0f6907a (patch) | |
tree | e1ad79485edd172ae4ec49e22affbb6c55297849 /drivers/hid/hid-wacom.c | |
parent | 2470900b68ccfde046d5a20c47ae9abb4e406084 (diff) |
HID: wacom: report distance for Intuos4 WL
This patch adds reporting of distance of tool to the tablet surface. Maximum
reported value is 63 (0x3F).
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-wacom.c')
-rw-r--r-- | drivers/hid/hid-wacom.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index a3476f9a5103..5a58db2440fa 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c | |||
@@ -320,6 +320,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, | |||
320 | struct input_dev *input, unsigned char *data) | 320 | struct input_dev *input, unsigned char *data) |
321 | { | 321 | { |
322 | __u16 x, y, pressure; | 322 | __u16 x, y, pressure; |
323 | __u8 distance; | ||
323 | 324 | ||
324 | switch (data[1]) { | 325 | switch (data[1]) { |
325 | case 0x80: /* Out of proximity report */ | 326 | case 0x80: /* Out of proximity report */ |
@@ -353,6 +354,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, | |||
353 | y = data[4] << 9 | data[5] << 1 | (data[9] & 0x01); | 354 | y = data[4] << 9 | data[5] << 1 | (data[9] & 0x01); |
354 | pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) | 355 | pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) |
355 | | (data[1] & 0x01); | 356 | | (data[1] & 0x01); |
357 | distance = (data[9] >> 2) & 0x3f; | ||
356 | 358 | ||
357 | input_report_key(input, BTN_TOUCH, pressure > 1); | 359 | input_report_key(input, BTN_TOUCH, pressure > 1); |
358 | 360 | ||
@@ -362,6 +364,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, | |||
362 | input_report_abs(input, ABS_X, x); | 364 | input_report_abs(input, ABS_X, x); |
363 | input_report_abs(input, ABS_Y, y); | 365 | input_report_abs(input, ABS_Y, y); |
364 | input_report_abs(input, ABS_PRESSURE, pressure); | 366 | input_report_abs(input, ABS_PRESSURE, pressure); |
367 | input_report_abs(input, ABS_DISTANCE, distance); | ||
365 | input_report_abs(input, ABS_MISC, wdata->id); | 368 | input_report_abs(input, ABS_MISC, wdata->id); |
366 | input_event(input, EV_MSC, MSC_SERIAL, wdata->serial); | 369 | input_event(input, EV_MSC, MSC_SERIAL, wdata->serial); |
367 | input_report_key(input, wdata->tool, 1); | 370 | input_report_key(input, wdata->tool, 1); |
@@ -484,6 +487,7 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, | |||
484 | input_set_abs_params(input, ABS_X, 0, 40640, 4, 0); | 487 | input_set_abs_params(input, ABS_X, 0, 40640, 4, 0); |
485 | input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0); | 488 | input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0); |
486 | input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0); | 489 | input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0); |
490 | input_set_abs_params(input, ABS_DISTANCE, 0, 63, 0, 0); | ||
487 | break; | 491 | break; |
488 | } | 492 | } |
489 | 493 | ||