From e7c521ddd7f8c753eb3f316550ef8cbac4d3fe81 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Tue, 28 Feb 2012 17:19:04 +0000 Subject: [PATCH] --- yaml --- r: 291648 b: refs/heads/master c: e0829e9c1e6981450f11204a4104646ed0f6907a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-wacom.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fc37f40d6c67..6c8472380497 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2470900b68ccfde046d5a20c47ae9abb4e406084 +refs/heads/master: e0829e9c1e6981450f11204a4104646ed0f6907a diff --git a/trunk/drivers/hid/hid-wacom.c b/trunk/drivers/hid/hid-wacom.c index a3476f9a5103..5a58db2440fa 100644 --- a/trunk/drivers/hid/hid-wacom.c +++ b/trunk/drivers/hid/hid-wacom.c @@ -320,6 +320,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, struct input_dev *input, unsigned char *data) { __u16 x, y, pressure; + __u8 distance; switch (data[1]) { case 0x80: /* Out of proximity report */ @@ -353,6 +354,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, y = data[4] << 9 | data[5] << 1 | (data[9] & 0x01); pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) | (data[1] & 0x01); + distance = (data[9] >> 2) & 0x3f; input_report_key(input, BTN_TOUCH, pressure > 1); @@ -362,6 +364,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, input_report_abs(input, ABS_X, x); input_report_abs(input, ABS_Y, y); input_report_abs(input, ABS_PRESSURE, pressure); + input_report_abs(input, ABS_DISTANCE, distance); input_report_abs(input, ABS_MISC, wdata->id); input_event(input, EV_MSC, MSC_SERIAL, wdata->serial); input_report_key(input, wdata->tool, 1); @@ -484,6 +487,7 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, input_set_abs_params(input, ABS_X, 0, 40640, 4, 0); input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0); input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0); + input_set_abs_params(input, ABS_DISTANCE, 0, 63, 0, 0); break; }