From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
To: Benjamin Tissoires <benjamin.tissoires@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@euromail.se>,
Jiri Kosina <jkosina@suse.cz>, Stephane Chatty <chatty@enac.fr>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 7/9] HID: multitouch: fix protocol for Cando 2087:0a02
Date: Thu, 31 Jan 2013 17:22:29 +0100 [thread overview]
Message-ID: <1359649351-11092-8-git-send-email-benjamin.tissoires@gmail.com> (raw)
In-Reply-To: <1359649351-11092-1-git-send-email-benjamin.tissoires@gmail.com>
Cando 2087:0a02 was broken, this fixes it.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
---
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 71daf57..f106e90 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -115,6 +115,7 @@ struct mt_device {
#define MT_CLS_DUAL_NSMU_CONTACTID 0x0008
#define MT_CLS_INRANGE_CONTACTNUMBER 0x0009
#define MT_CLS_ALWAYS_TRUE 0x000a
+#define MT_CLS_DUAL_CONTACT_NUMBER 0x0010
/* vendor specific classes */
#define MT_CLS_3M 0x0101
@@ -177,6 +178,11 @@ static struct mt_class mt_classes[] = {
{ .name = MT_CLS_ALWAYS_TRUE,
.quirks = MT_QUIRK_ALWAYS_VALID |
MT_QUIRK_CONTACT_CNT_ACCURATE },
+ { .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
@@ -947,7 +953,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,
--
1.8.1
next prev parent reply other threads:[~2013-01-31 16:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 16:22 [PATCH v2 0/9] Support of Nexio 42" and new default class for hid-multitouch Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 1/9] HID: core: add "report" hook, called once the report has been parsed Benjamin Tissoires
2013-02-03 12:27 ` Henrik Rydberg
2013-02-04 9:24 ` Benjamin Tissoires
2013-02-04 11:21 ` Henrik Rydberg
2013-02-04 9:34 ` Jiri Kosina
2013-02-04 9:41 ` Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 2/9] HID: multitouch: use the callback "report" instead of sequential events Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 3/9] HID: multitouch: add support for Nexio 42" panel Benjamin Tissoires
2013-02-03 13:00 ` Henrik Rydberg
2013-02-04 9:36 ` Benjamin Tissoires
2013-02-04 11:42 ` Henrik Rydberg
2013-02-04 13:42 ` Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 4/9] HID: multitouch: fix Win8 protocol for Sharp like devices Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 5/9] HID: multitouch: ensure that serial devices make no use of contact count Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 6/9] HID: multitouch: fix protocol for Sitronix 1403:5001 Benjamin Tissoires
2013-01-31 16:22 ` Benjamin Tissoires [this message]
2013-01-31 16:22 ` [PATCH v2 8/9] HID: multitouch: fix protocol for Elo panels Benjamin Tissoires
2013-01-31 16:22 ` [PATCH v2 9/9] HID: multitouch: make MT_CLS_ALWAYS_TRUE the new default class Benjamin Tissoires
2013-02-03 13:07 ` [PATCH v2 0/9] Support of Nexio 42" and new default class for hid-multitouch Henrik Rydberg
2013-02-04 9:38 ` Benjamin Tissoires
2013-02-04 11:54 ` Henrik Rydberg
2013-02-05 11:13 ` Jiri Kosina
2013-02-06 11:04 ` Benjamin Tissoires
2013-02-06 13:11 ` Jiri Kosina
2013-02-06 13:28 ` Benjamin Tissoires
2013-02-06 13:31 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359649351-11092-8-git-send-email-benjamin.tissoires@gmail.com \
--to=benjamin.tissoires@gmail.com \
--cc=chatty@enac.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®