aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorJohn Sung <penmount.touch@gmail.com>2011-04-21 10:21:52 -0400
committerJiri Kosina <jkosina@suse.cz>2011-04-22 05:56:52 -0400
commit6ab3a9a63fc16b04f7de48eb0190d516dd7574df (patch)
tree4abc31d02718f12687ec0b87efa7b2c82b069e80 /drivers/hid/hid-multitouch.c
parent2955caed8b9865c1f04fcde6bd7103d5d5ec9415 (diff)
HID: hid-multitouch: add support for PenMount dual-touch panel
This patch adds PenMount support to hid-multitouch. A new class MT_CLS_CONFIDENCE is defined for PenMount, since it uses HID_DG_CONFIDENCE as the valid flag. Signed-off-by: John Sung <penmount.touch@gmail.com> [benjamin.tissoires@enac.fr: rebased on top of last_index_field changes] Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r--drivers/hid/hid-multitouch.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 6005e7888b14..51b5d272458f 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -89,6 +89,7 @@ struct mt_class {
89#define MT_CLS_EGALAX 5 89#define MT_CLS_EGALAX 5
90#define MT_CLS_STANTUM 6 90#define MT_CLS_STANTUM 6
91#define MT_CLS_3M 7 91#define MT_CLS_3M 7
92#define MT_CLS_CONFIDENCE 8
92 93
93#define MT_DEFAULT_MAXCONTACT 10 94#define MT_DEFAULT_MAXCONTACT 10
94 95
@@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
156 .sn_move = 2048, 157 .sn_move = 2048,
157 .sn_width = 128, 158 .sn_width = 128,
158 .sn_height = 128 }, 159 .sn_height = 128 },
160 { .name = MT_CLS_CONFIDENCE,
161 .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
159 162
160 { } 163 { }
161}; 164};
@@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
584 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, 587 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
585 USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, 588 USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
586 589
590 /* PenMount panels */
591 { .driver_data = MT_CLS_CONFIDENCE,
592 HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
593 USB_DEVICE_ID_PENMOUNT_PCI) },
594
587 /* PixCir-based panels */ 595 /* PixCir-based panels */
588 { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, 596 { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
589 HID_USB_DEVICE(USB_VENDOR_ID_HANVON, 597 HID_USB_DEVICE(USB_VENDOR_ID_HANVON,