From patchwork Mon Aug 15 03:51:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JJ Ding X-Patchwork-Id: 1066502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7F3xcaI002875 for ; Mon, 15 Aug 2011 03:59:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751813Ab1HOD7h (ORCPT ); Sun, 14 Aug 2011 23:59:37 -0400 Received: from emcscan.emc.com.tw ([192.72.220.5]:50446 "EHLO emcscan.emc.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751786Ab1HOD7h (ORCPT ); Sun, 14 Aug 2011 23:59:37 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 15 Aug 2011 03:59:38 +0000 (UTC) X-Greylist: delayed 585 seconds by postgrey-1.27 at vger.kernel.org; Sun, 14 Aug 2011 23:59:36 EDT Received: from unknown (HELO emc.com.tw) ([192.168.10.1]) by emcscan.emc.com.tw with ESMTP; 15 Aug 2011 11:49:50 +0800 Received: from localhost ([192.168.81.59]) by emc.com.tw (8.13.7+Sun/8.13.7) with ESMTP id p7F3nmat025070; Mon, 15 Aug 2011 11:49:48 +0800 (CST) From: JJ Ding To: linux-input@vger.kernel.org Cc: Tom Lin , Aaron Huang , Dmitry Torokhov , =?UTF-8?q?=C3=89ric=20Piel?= , Daniel Kurtz , JJ Ding Subject: [PATCH] Input: elantech - correct x, y value range for v2 hardware Date: Mon, 15 Aug 2011 11:51:35 +0800 Message-Id: <1313380295-26226-1-git-send-email-jj_ding@emc.com.tw> X-Mailer: git-send-email 1.7.4.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org x, y values are actually 12-bit long. Also update protocol document to reflect the change. Signed-off-by: JJ Ding Reviewed-by: Daniel Kurtz --- Hello List, We are working on adding support for newer elantech touchpad, which we will submit shortly. Along the way I found this error in current code. This is a simple patch to correct x, y value ranges in v2 hardware. Please review, thank you. Documentation/input/elantech.txt | 8 ++++---- drivers/input/mouse/elantech.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/input/elantech.txt b/Documentation/input/elantech.txt index db798af..bce9941 100644 --- a/Documentation/input/elantech.txt +++ b/Documentation/input/elantech.txt @@ -389,14 +389,14 @@ byte 0: byte 1: bit 7 6 5 4 3 2 1 0 - p7 p6 p5 p4 . x10 x9 x8 + p7 p6 p5 p4 x11 x10 x9 x8 byte 2: bit 7 6 5 4 3 2 1 0 x7 x6 x5 x4 x3 x2 x1 x0 - x10..x0 = absolute x value (horizontal) + x11..x0 = absolute x value (horizontal) byte 3: @@ -420,7 +420,7 @@ byte 3: byte 4: bit 7 6 5 4 3 2 1 0 - p3 p1 p2 p0 . . y9 y8 + p3 p1 p2 p0 y11 y10 y9 y8 p7..p0 = pressure (not EF113) @@ -429,7 +429,7 @@ byte 5: bit 7 6 5 4 3 2 1 0 y7 y6 y5 y4 y3 y2 y1 y0 - y9..y0 = absolute y value (vertical) + y11..y0 = absolute y value (vertical) 4.2.2 Two finger touch diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 3250356..da161da 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -290,15 +290,15 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse) /* pass through... */ case 1: /* - * byte 1: . . . . . x10 x9 x8 + * byte 1: . . . . x11 x10 x9 x8 * byte 2: x7 x6 x5 x4 x4 x2 x1 x0 */ - x1 = ((packet[1] & 0x07) << 8) | packet[2]; + x1 = ((packet[1] & 0x0f) << 8) | packet[2]; /* - * byte 4: . . . . . . y9 y8 + * byte 4: . . . . y11 y10 y9 y8 * byte 5: y7 y6 y5 y4 y3 y2 y1 y0 */ - y1 = ETP_YMAX_V2 - (((packet[4] & 0x03) << 8) | packet[5]); + y1 = ETP_YMAX_V2 - (((packet[4] & 0x0f) << 8) | packet[5]); input_report_abs(dev, ABS_X, x1); input_report_abs(dev, ABS_Y, y1);