aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2012-03-06 04:53:47 -0500
committerJiri Kosina <jkosina@suse.cz>2012-03-06 08:09:24 -0500
commitfd1d152583e6ce02b47cb7315295ab58014aa26d (patch)
treed7f167abf33d1adf727c5a02317ebd9eb5e6049f /drivers/hid/hid-multitouch.c
parent71078b0deba8420e00b0c5e39ea359dbcaa11114 (diff)
HID: multitouch: add more eGalax devices
This is a list of devices that should be handled by hid-multitouch. They all present the HID usage "Contact ID" and won't be handled by hid-input. Some of them have _not_ been tested (though I have their report descriptors), but I've been guaranted by eeti that they follow the same protocol. The tested ones are also blacklisted in hid-core.c. 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.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index c7ee03503ec..0eda37f03c3 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -788,12 +788,27 @@ static const struct hid_device_id mt_devices[] = {
788 { .driver_data = MT_CLS_EGALAX, 788 { .driver_data = MT_CLS_EGALAX,
789 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 789 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
790 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) }, 790 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
791 { .driver_data = MT_CLS_EGALAX_SERIAL,
792 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
793 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) },
794 { .driver_data = MT_CLS_EGALAX_SERIAL,
795 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
796 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
797 { .driver_data = MT_CLS_EGALAX_SERIAL,
798 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
799 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
791 { .driver_data = MT_CLS_EGALAX, 800 { .driver_data = MT_CLS_EGALAX,
792 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 801 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
793 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) }, 802 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
803 { .driver_data = MT_CLS_EGALAX_SERIAL,
804 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
805 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
794 { .driver_data = MT_CLS_EGALAX, 806 { .driver_data = MT_CLS_EGALAX,
795 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 807 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
796 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) }, 808 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
809 { .driver_data = MT_CLS_EGALAX_SERIAL,
810 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
811 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) },
797 { .driver_data = MT_CLS_EGALAX, 812 { .driver_data = MT_CLS_EGALAX,
798 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 813 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
799 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) }, 814 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
@@ -802,6 +817,9 @@ static const struct hid_device_id mt_devices[] = {
802 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) }, 817 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
803 { .driver_data = MT_CLS_EGALAX_SERIAL, 818 { .driver_data = MT_CLS_EGALAX_SERIAL,
804 HID_USB_DEVICE(USB_VENDOR_ID_DWAV, 819 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
820 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349) },
821 { .driver_data = MT_CLS_EGALAX_SERIAL,
822 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
805 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) }, 823 USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
806 824
807 /* Elo TouchSystems IntelliTouch Plus panel */ 825 /* Elo TouchSystems IntelliTouch Plus panel */