aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2011-11-23 04:54:34 -0500
committerJiri Kosina <jkosina@suse.cz>2011-11-23 08:50:39 -0500
commit1b723e8dc81b23141bfb8991e002073b17fd0199 (patch)
tree4ae5e481d6a605245ed25218fde9d6858155a7fd /drivers/hid/hid-multitouch.c
parent66f06127f34ad6e8a1b24a2c03144b694d19f99f (diff)
HID: multitouch: correct eGalax a001 protocol
This device use another protocol while sending the events. It's the same as the one described as "serial" by Microsoft. We are keeping here the sn_move and sn_pressure parameters for egalax devices. CC: Cedric Sodhi <manday@gmx.net> CC: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r--drivers/hid/hid-multitouch.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index fd2fa5977831..26e9706eedf5 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -97,6 +97,7 @@ struct mt_device {
97#define MT_CLS_3M 0x0101 97#define MT_CLS_3M 0x0101
98#define MT_CLS_CYPRESS 0x0102 98#define MT_CLS_CYPRESS 0x0102
99#define MT_CLS_EGALAX 0x0103 99#define MT_CLS_EGALAX 0x0103
100#define MT_CLS_EGALAX_SERIAL 0x0104
100 101
101#define MT_DEFAULT_MAXCONTACT 10 102#define MT_DEFAULT_MAXCONTACT 10
102 103
@@ -174,6 +175,12 @@ struct mt_class mt_classes[] = {
174 .sn_move = 4096, 175 .sn_move = 4096,
175 .sn_pressure = 32, 176 .sn_pressure = 32,
176 }, 177 },
178 { .name = MT_CLS_EGALAX_SERIAL,
179 .quirks = MT_QUIRK_SLOT_IS_CONTACTID |
180 MT_QUIRK_ALWAYS_VALID,
181 .sn_move = 4096,
182 .sn_pressure = 32,
183 },
177 184
178 { } 185 { }
179}; 186};
@@ -705,7 +712,7 @@ static const struct hid_device_id mt_devices[] = {
705 { .driver_data = MT_CLS_EGALAX, 712 { .driver_data = MT_CLS_EGALAX,
706 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 713 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
707 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) }, 714 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
708 { .driver_data = MT_CLS_EGALAX, 715 { .driver_data = MT_CLS_EGALAX_SERIAL,
709 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 716 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
710 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, 717 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
711 718