diff options
author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-01-31 05:28:22 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-01-31 09:16:13 -0500 |
commit | 4dfcced8a1f42248f9e7a461485f6aa5f66d2105 (patch) | |
tree | 8c9f51fb7ffdbed47f6c80db053efc905d11f2d0 | |
parent | ef2fafb3e233ca9cb390fc3c1461b7f3859998fc (diff) |
HID: hid-multitouch: introduce IrTouch Infrared USB device
This patch adds support for IrTouch 42 inches.
Tested-by: Victor Zhuk <v.zhuk@acs-ltd.ru>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/Kconfig | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 24cca2f69dfc..a0b117ddeef5 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -304,6 +304,7 @@ config HID_MULTITOUCH | |||
304 | Say Y here if you have one of the following devices: | 304 | Say Y here if you have one of the following devices: |
305 | - Cypress TrueTouch panels | 305 | - Cypress TrueTouch panels |
306 | - Hanvon dual touch panels | 306 | - Hanvon dual touch panels |
307 | - IrTouch Infrared USB panels | ||
307 | - Pixcir dual touch panels | 308 | - Pixcir dual touch panels |
308 | - 'Sensing Win7-TwoFinger' panel by GeneralTouch | 309 | - 'Sensing Win7-TwoFinger' panel by GeneralTouch |
309 | 310 | ||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92a0d61a7379..b1dd7adcc716 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -333,6 +333,9 @@ | |||
333 | #define USB_VENDOR_ID_IMATION 0x0718 | 333 | #define USB_VENDOR_ID_IMATION 0x0718 |
334 | #define USB_DEVICE_ID_DISC_STAKKA 0xd000 | 334 | #define USB_DEVICE_ID_DISC_STAKKA 0xd000 |
335 | 335 | ||
336 | #define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 | ||
337 | #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 | ||
338 | |||
336 | #define USB_VENDOR_ID_JESS 0x0c45 | 339 | #define USB_VENDOR_ID_JESS 0x0c45 |
337 | #define USB_DEVICE_ID_JESS_YUREX 0x1010 | 340 | #define USB_DEVICE_ID_JESS_YUREX 0x1010 |
338 | 341 | ||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 4f634099f6a1..69f8744deac8 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -471,6 +471,11 @@ static const struct hid_device_id mt_devices[] = { | |||
471 | HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, | 471 | HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, |
472 | USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) }, | 472 | USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) }, |
473 | 473 | ||
474 | /* IRTOUCH panels */ | ||
475 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, | ||
476 | HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, | ||
477 | USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, | ||
478 | |||
474 | /* PixCir-based panels */ | 479 | /* PixCir-based panels */ |
475 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, | 480 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, |
476 | HID_USB_DEVICE(USB_VENDOR_ID_HANVON, | 481 | HID_USB_DEVICE(USB_VENDOR_ID_HANVON, |