From patchwork Thu Jan 31 16:22:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 2074281 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2C4D7E00E6 for ; Thu, 31 Jan 2013 16:23:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755486Ab3AaQXN (ORCPT ); Thu, 31 Jan 2013 11:23:13 -0500 Received: from mail-we0-f171.google.com ([74.125.82.171]:37218 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755343Ab3AaQXK (ORCPT ); Thu, 31 Jan 2013 11:23:10 -0500 Received: by mail-we0-f171.google.com with SMTP id u54so2166102wey.2 for ; Thu, 31 Jan 2013 08:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=AfvsmcXEeNsr7Q9mIRHbKvzjoPHlXv88WIj7QCM7dRA=; b=FbKoyI88GQjMCtLhkdYKzLCWUJ10Qqvb5pIV0PNIBY+cLzR4fUBSPZzKkofRjkjRlg yRWNkPVO1iq8czxcO4mHZI7WyvolVe7B/AxiCy2BInIc03/gzJjKsi+iFzpx1Bpcp3Bm y8u4DdkxvxxFShgzdX38S1TpAqZDUmeR5IuKwtttntKxFu/NfqkWqmGxyR7xLZHepc2E lKcOQMiDjG4b3K86lXG6irGQfs4TRMmQiMHI4IaOvR4MGttzGd2cJjfDt29K1CrhuwWJ rC+JfYxKL8VAYRZ/HaMu938FzMEYeQ3BKp5MFe7XKeviPscnTlOOoVNMe76Ic0XnVQPU iHLw== X-Received: by 10.194.90.116 with SMTP id bv20mr16526745wjb.33.1359649389509; Thu, 31 Jan 2013 08:23:09 -0800 (PST) Received: from localhost.localdomain.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id ec3sm9846164wib.1.2013.01.31.08.23.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 31 Jan 2013 08:23:08 -0800 (PST) From: Benjamin Tissoires To: Benjamin Tissoires , Dmitry Torokhov , Henrik Rydberg , Jiri Kosina , Stephane Chatty , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/9] HID: multitouch: fix protocol for Elo panels Date: Thu, 31 Jan 2013 17:22:30 +0100 Message-Id: <1359649351-11092-9-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359649351-11092-1-git-send-email-benjamin.tissoires@gmail.com> References: <1359649351-11092-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The previous protocol was nearly working, but when several fingers were present on the sensor, those that were not moving were not updated in the next report, introducing a lot of releases. Signed-off-by: Benjamin Tissoires Conflicts: drivers/hid/hid-multitouch.c --- drivers/hid/hid-multitouch.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index f106e90..68d511c 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -116,6 +116,7 @@ struct mt_device { #define MT_CLS_INRANGE_CONTACTNUMBER 0x0009 #define MT_CLS_ALWAYS_TRUE 0x000a #define MT_CLS_DUAL_CONTACT_NUMBER 0x0010 +#define MT_CLS_DUAL_CONTACT_ID 0x0011 /* vendor specific classes */ #define MT_CLS_3M 0x0101 @@ -183,6 +184,11 @@ static struct mt_class mt_classes[] = { MT_QUIRK_CONTACT_CNT_ACCURATE | MT_QUIRK_SLOT_IS_CONTACTNUMBER, .maxcontacts = 2 }, + { .name = MT_CLS_DUAL_CONTACT_ID, + .quirks = MT_QUIRK_ALWAYS_VALID | + MT_QUIRK_CONTACT_CNT_ACCURATE | + MT_QUIRK_SLOT_IS_CONTACTID, + .maxcontacts = 2 }, /* * vendor specific classes @@ -1040,7 +1046,7 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) }, /* Elo TouchSystems IntelliTouch Plus panel */ - { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID, + { .driver_data = MT_CLS_DUAL_CONTACT_ID, MT_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },