From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
To: Stephane Chatty <chatty@enac.fr>,
Henrik Rydberg <rydberg@euromail.se>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Jiri Kosina <jkosina@suse.cz>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Subject: [RFC v2 06/10] hid-multitouch: added support for Cypress TrueTouch panels
Date: Wed, 5 Jan 2011 18:27:44 +0100 [thread overview]
Message-ID: <1294248468-19979-7-git-send-email-benjamin.tissoires@enac.fr> (raw)
In-Reply-To: <1294248468-19979-1-git-send-email-benjamin.tissoires@enac.fr>
Added support for Cypress TrueTouch panels, which detect up to 10 fingers
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Signed-off-by: Stéphane Chatty <chatty@enac.fr>
---
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-multitouch.c | 15 +++++++++++++++
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 9f1ab80..1dcb4b0 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1299,6 +1299,7 @@ static const struct hid_device_id hid_blacklist[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 70dd0fd..d8b0b3f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -181,6 +181,7 @@
#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
#define USB_DEVICE_ID_CYPRESS_BARCODE_3 0xbca1
+#define USB_DEVICE_ID_CYPRESS_TRUETOUCH 0xc001
#define USB_VENDOR_ID_DEALEXTREAME 0x10c5
#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 9edbf5d..f9d537e 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -65,6 +65,7 @@ struct mt_class {
#define MT_CLS_DEFAULT 0
#define MT_CLS_DUAL1 1
#define MT_CLS_DUAL2 2
+#define MT_CLS_CYPRESS 3
/*
* these device-dependent functions determine what slot corresponds
@@ -81,6 +82,14 @@ static int slot_is_contactnumber(struct mt_device *td)
return td->num_received;
}
+static int cypress_compute_slot(struct mt_device *td)
+{
+ if (td->curdata.contactid != 0 || td->num_received == 0)
+ return td->curdata.contactid;
+ else
+ return -1;
+}
+
static int find_slot_from_contactid(struct mt_device *td)
{
int i;
@@ -100,6 +109,7 @@ struct mt_class mt_classes[] = {
{ find_slot_from_contactid, 10 }, /* MT_CLS_DEFAULT */
{ slot_is_contactid, 2 }, /* MT_CLS_DUAL1 */
{ slot_is_contactnumber, 2 }, /* MT_CLS_DUAL2 */
+ { cypress_compute_slot, 10 }, /* MT_CLS_CYPRESS */
};
static void mt_feature_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -414,6 +424,11 @@ static const struct hid_device_id mt_devices[] = {
HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
+ /* Cypress panel */
+ { .driver_data = MT_CLS_CYPRESS,
+ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,
+ USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
+
{ }
};
MODULE_DEVICE_TABLE(hid, mt_devices);
--
1.7.3.4
next prev parent reply other threads:[~2011-01-05 17:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 17:27 [RFC v2 0/10] hid-multitouch: a first step towards multitouch unification Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 01/10] hid: add feature_mapping callback Benjamin Tissoires
2011-01-06 16:22 ` Henrik Rydberg
2011-01-07 9:44 ` Benjamin Tissoires
2011-01-07 10:18 ` Henrik Rydberg
2011-01-07 11:12 ` Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 02/10] hid: set HID_MAX_FIELD at 128 Benjamin Tissoires
2011-01-06 16:28 ` Henrik Rydberg
2011-01-05 17:27 ` [RFC v2 03/10] hid-multitouch: support for PixCir-based panels Benjamin Tissoires
2011-01-06 17:25 ` Henrik Rydberg
2011-01-07 9:38 ` Benjamin Tissoires
2011-01-07 12:23 ` Henrik Rydberg
2011-01-07 15:12 ` Benjamin Tissoires
2011-01-07 15:57 ` Henrik Rydberg
2011-01-07 17:07 ` Benjamin Tissoires
2011-01-07 17:27 ` Henrik Rydberg
2011-01-07 17:31 ` Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 04/10] hid-multitouch: migrated support for Cando panels Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 05/10] hid-multitouch: Add support for Cando 10.1" panels Benjamin Tissoires
2011-01-05 17:27 ` Benjamin Tissoires [this message]
2011-01-05 17:27 ` [RFC v2 07/10] hid-multitouch: migrated support for MosArt panels Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 08/10] hid-multitouch: migrated support for Quanta dual-touch panels Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 09/10] hid-mulitouch: added support for the 'Sensing Win7-TwoFinger' Benjamin Tissoires
2011-01-05 17:27 ` [RFC v2 10/10] hid-multitouch: migrated support for Stantum panels Benjamin Tissoires
2011-01-05 17:49 ` [RFC v2 0/10] hid-multitouch: a first step towards multitouch unification Henrik Rydberg
2011-01-06 15:08 ` Benjamin Tissoires
2011-01-06 15:11 ` Jiri Kosina
2011-01-06 16:04 ` Henrik Rydberg
2011-01-06 16:08 ` Benjamin Tissoires
2011-01-06 17:28 ` Henrik Rydberg
2011-01-06 23:26 ` Jiri Kosina
2011-01-07 1:14 ` Dmitry Torokhov
2011-01-07 9:41 ` Jiri Kosina
2011-01-07 9:48 ` Benjamin Tissoires
2011-01-07 10:03 ` 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=1294248468-19979-7-git-send-email-benjamin.tissoires@enac.fr \
--to=benjamin.tissoires@enac.fr \
--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®