From patchwork Wed Jun 29 05:07:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kurtz X-Patchwork-Id: 927062 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 p5T5Mhge027310 for ; Wed, 29 Jun 2011 05:22:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753240Ab1F2FI2 (ORCPT ); Wed, 29 Jun 2011 01:08:28 -0400 Received: from smtp-out.google.com ([74.125.121.67]:60271 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751721Ab1F2FID (ORCPT ); Wed, 29 Jun 2011 01:08:03 -0400 Received: from kpbe18.cbf.corp.google.com (kpbe18.cbf.corp.google.com [172.25.105.82]) by smtp-out.google.com with ESMTP id p5T57vqY002031; Tue, 28 Jun 2011 22:07:58 -0700 Received: from puck.tpe.corp.google.com (puck.tpe.corp.google.com [172.30.210.35]) by kpbe18.cbf.corp.google.com with ESMTP id p5T57sto018495; Tue, 28 Jun 2011 22:07:54 -0700 Received: by puck.tpe.corp.google.com (Postfix, from userid 116377) id 683908135E; Wed, 29 Jun 2011 13:07:51 +0800 (CST) From: djkurtz@chromium.org To: dmitry.torokhov@gmail.com, rydberg@euromail.se, chase.douglas@canonical.com, rubini@cvml.unipv.it Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, derek.foreman@collabora.co.uk, daniel.stone@collabora.co.uk, olofj@chromium.org, Daniel Kurtz Subject: [PATCH 12/12] Input: synaptics - process finger (<=5) transitions Date: Wed, 29 Jun 2011 13:07:22 +0800 Message-Id: <1309324042-22943-13-git-send-email-djkurtz@chromium.org> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1309324042-22943-1-git-send-email-djkurtz@chromium.org> References: <1309324042-22943-1-git-send-email-djkurtz@chromium.org> X-System-Of-Record: true 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.6 (demeter2.kernel.org [140.211.167.43]); Wed, 29 Jun 2011 05:22:45 +0000 (UTC) From: Daniel Kurtz T5R2 touchpads track up to 5 fingers, but only report 2. They introduce a special "TYPE=2" (AGM-CONTACT) packet type that reports the number of tracked fingers and which finger is reported in the SGM and AGM packets. With this new packet type, it is possible to send up to 5 MTB slots to userspace. Signed-off-by: Daniel Kurtz --- drivers/input/mouse/synaptics.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 8b38e08..5f227be 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -647,11 +647,16 @@ static void synaptics_process_hw_state(struct synaptics_data *priv, new_num_fingers = 1; else if (sgm->w == 0) new_num_fingers = 2; - else if (sgm->w == 1) - new_num_fingers = 3; + else if (sgm->w == 1) { + if (agm->finger_count > 3) + new_num_fingers = agm->finger_count; + else + new_num_fingers = 3; + } if (new_num_fingers == 0) { synaptics_update_slots(priv, 0, 0, 0); + synaptics_agm_finger_update(priv, 0, 0, 0); goto process_mt_data_done; } @@ -661,6 +666,7 @@ static void synaptics_process_hw_state(struct synaptics_data *priv, */ if (priv->agm_pending && agm->z == 0) { synaptics_update_slots(priv, 1, 0, 0); + synaptics_agm_finger_update(priv, 0, 0, 0); goto process_mt_data_done; } @@ -720,6 +726,11 @@ static void synaptics_process_hw_state(struct synaptics_data *priv, */ synaptics_update_slots(priv, 0, 0, 0); break; + + case 4: + case 5: + synaptics_update_slots(priv, 1, agm->finger_sgm, 0); + break; } break; @@ -761,6 +772,12 @@ static void synaptics_process_hw_state(struct synaptics_data *priv, */ synaptics_update_slots(priv, 0, 0, 0); break; + + case 4: + case 5: + synaptics_update_slots(priv, 2, agm->finger_sgm, + agm->finger_agm); + break; } break; @@ -800,8 +817,20 @@ static void synaptics_process_hw_state(struct synaptics_data *priv, slot_agm = slot_sgm + 2; synaptics_update_slots(priv, 3, slot_sgm, slot_agm); break; + + case 4: + case 5: + synaptics_update_slots(priv, 3, agm->finger_sgm, + agm->finger_agm); + break; } break; + + case 4: + case 5: + synaptics_update_slots(priv, agm->finger_count, agm->finger_sgm, + agm->finger_agm); + break; } process_mt_data_done: