From patchwork Wed May 5 12:14:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?w4PigLByaWMgUGllbA==?= X-Patchwork-Id: 97062 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o45CLmwW007509 for ; Wed, 5 May 2010 12:21:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934399Ab0EEMVg (ORCPT ); Wed, 5 May 2010 08:21:36 -0400 Received: from mailservice.tudelft.nl ([130.161.131.5]:52628 "EHLO mailservice.tudelft.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934313Ab0EEMVf (ORCPT ); Wed, 5 May 2010 08:21:35 -0400 Received: from localhost (localhost [127.0.0.1]) by amavis (Postfix) with ESMTP id E693CCC21C; Wed, 5 May 2010 14:21:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at tudelft.nl X-Spam-Flag: NO X-Spam-Score: -22.589 X-Spam-Level: X-Spam-Status: No, score=-22.589 tagged_above=-99 required=5 tests=[BAYES_00=-2.599, PROLO_LEO3=0.01, TUD_REL01=-20] autolearn=ham Received: from mailservice.tudelft.nl ([130.161.131.71]) by localhost (tudelft.nl [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id MzNPGmiyWBw2; Wed, 5 May 2010 14:21:34 +0200 (CEST) Received: from smtp-a.tudelft.nl (smtp-a.tudelft.nl [130.161.180.7]) by mx4.tudelft.nl (Postfix) with ESMTP id DE5B9CC1A8; Wed, 5 May 2010 14:21:33 +0200 (CEST) Received: from [172.19.3.21] (63-103-dsl.ipact.nl [84.35.103.63]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-a.tudelft.nl (Postfix) with ESMTP id 75B85B3A62; Wed, 5 May 2010 14:21:33 +0200 (CEST) Message-ID: <4BE16121.8040000@tudelft.nl> Date: Wed, 05 May 2010 14:14:25 +0200 From: =?UTF-8?B?w4lyaWMgUGllbA==?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.21) Gecko/20090319 Mandriva/2.0.0.21-1mdv2009.1 (2009.1) Thunderbird/2.0.0.21 Mnenhy/0.7.6.666 MIME-Version: 1.0 To: Dmitry Torokhov CC: Florian Ragwitz , "linux-input@vger.kernel.org" Subject: [PATCH 1/2] elantech: Report tool width when it is known X-Enigmail-Version: 1.0.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 05 May 2010 12:21:48 +0000 (UTC) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 0520c2e..6a99b30 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -249,7 +249,7 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse) { struct input_dev *dev = psmouse->dev; unsigned char *packet = psmouse->packet; - int fingers, x1, y1, x2, y2; + int fingers, x1, y1, x2, y2, width; /* byte 0: n1 n0 . . . . R L */ fingers = (packet[0] & 0xc0) >> 6; @@ -258,17 +258,19 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse) switch (fingers) { case 1: /* - * byte 1: . . . . . x10 x9 x8 + * byte 1: w3 w2 w1 w0 . x10 x9 x8 * byte 2: x7 x6 x5 x4 x4 x2 x1 x0 */ - input_report_abs(dev, ABS_X, - ((packet[1] & 0x07) << 8) | packet[2]); + width = ((packet[1] & 0xf0) >> 4); + x1 = ((packet[1] & 0x07) << 8) | packet[2]; /* * byte 4: . . . . . . y9 y8 * byte 5: y7 y6 y5 y4 y3 y2 y1 y0 */ - input_report_abs(dev, ABS_Y, - ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5])); + y1 = ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5]); + input_report_abs(dev, ABS_TOOL_WIDTH, width); + input_report_abs(dev, ABS_X, x1); + input_report_abs(dev, ABS_Y, y1); break; case 2: @@ -286,7 +288,7 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse) * byte 4: bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0 */ x2 = ((packet[3] & 0x10) << 4) | packet[4]; - /* byte 5: by7 by8 by5 by4 by3 by2 by1 by0 */ + /* byte 5: by7 by6 by5 by4 by3 by2 by1 by0 */ y2 = ETP_2FT_YMAX - (((packet[3] & 0x20) << 3) | packet[5]); /* * For compatibility with the X Synaptics driver scale up @@ -467,6 +469,7 @@ static void elantech_set_input_params(struct psmouse *psmouse) break; case 2: + input_set_abs_params(dev, ABS_TOOL_WIDTH, ETP_WMIN_V2, ETP_WMAX_V2, 0, 0); input_set_abs_params(dev, ABS_X, ETP_XMIN_V2, ETP_XMAX_V2, 0, 0); input_set_abs_params(dev, ABS_Y, ETP_YMIN_V2, ETP_YMAX_V2, 0, 0); input_set_abs_params(dev, ABS_HAT0X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0); diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h index feac5f7..2ce79c1 100644 --- a/drivers/input/mouse/elantech.h +++ b/drivers/input/mouse/elantech.h @@ -76,6 +76,8 @@ #define ETP_XMAX_V2 (1152 - ETP_EDGE_FUZZ_V2) #define ETP_YMIN_V2 ( 0 + ETP_EDGE_FUZZ_V2) #define ETP_YMAX_V2 ( 768 - ETP_EDGE_FUZZ_V2) +#define ETP_WMIN_V2 0 +#define ETP_WMAX_V2 12 /* * For two finger touches the coordinate of each finger gets reported