From patchwork Fri Jan 25 13:23:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 2045021 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 67F3DE01ED for ; Fri, 25 Jan 2013 13:24:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932457Ab3AYNYK (ORCPT ); Fri, 25 Jan 2013 08:24:10 -0500 Received: from mail-bk0-f49.google.com ([209.85.214.49]:42701 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932393Ab3AYNYH (ORCPT ); Fri, 25 Jan 2013 08:24:07 -0500 Received: by mail-bk0-f49.google.com with SMTP id w11so240131bku.36 for ; Fri, 25 Jan 2013 05:24:06 -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=dKkZTnsGQwHH1NW5OpyLNEDVRzUPdMgcx1clT51uRoQ=; b=ZVe2MgIu1sg8gJ9psTlBNDQZT0cgXwuNd8AOgonRMT9SnOWy+XT1QHQDmrhdlzrZe1 NHxJGMHDU+ySYo1M+ug4UEjir7xixw/Pwy9LOQLQEuXaF3bUpUe0469eCKIyt6j/cvqZ Ih5+Aqx/diAgWsm25a/BdrnSWJBNJ3c5QIko+0z2OvvLDmlgnnWqz2X37Z+7i2H6nvWu Hu7U97xhRw1+Cymw/Uou2cqKH36xdbqHPa0QzM8cvWsGW0w6OUv5bfmPoiQvRWUl9rMY Wd70+GFHc4E+mLdtadfTmaEKZG0UTcZZmXHlrJgVTrpTBNX7GHRG70cSr9UPH0uIOIXF SouA== X-Received: by 10.204.156.11 with SMTP id u11mr1839614bkw.106.1359120246408; Fri, 25 Jan 2013 05:24:06 -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 hu20sm759377bkc.12.2013.01.25.05.24.04 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 05:24:05 -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 17/25] HID: multitouch: fix protocol for Cando 2087:0a02 Date: Fri, 25 Jan 2013 14:23:02 +0100 Message-Id: <1359120190-18281-18-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359120190-18281-1-git-send-email-benjamin.tissoires@gmail.com> References: <1359120190-18281-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 Cando 2087:0a02 was broken, this fixes it. Signed-off-by: Benjamin Tissoires --- 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 6db423f..9d8228a 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -122,6 +122,7 @@ struct mt_device { #define MT_CLS_CONTACT_ID 0x0011 #define MT_CLS_MINUS_ONE 0x0012 #define MT_CLS_DUAL_CONTACT_ID 0x0013 +#define MT_CLS_DUAL_CONTACT_NUMBER 0x0014 /* vendor specific classes */ #define MT_CLS_3M 0x0101 @@ -197,6 +198,11 @@ static struct mt_class mt_classes[] = { MT_QUIRK_CONTACT_CNT_ACCURATE | MT_QUIRK_SLOT_IS_CONTACTID, .maxcontacts = 2 }, + { .name = MT_CLS_DUAL_CONTACT_NUMBER, + .quirks = MT_QUIRK_ALWAYS_VALID | + MT_QUIRK_CONTACT_CNT_ACCURATE | + MT_QUIRK_SLOT_IS_CONTACTNUMBER, + .maxcontacts = 2 }, /* * vendor specific classes @@ -969,7 +975,7 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, MT_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, - { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, + { .driver_data = MT_CLS_DUAL_CONTACT_NUMBER, MT_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) }, { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,