hid: egalax: Add support for Wetab
authorHenrik Rydberg <rydberg@euromail.se>
Mon, 29 Nov 2010 06:27:49 +0000 (07:27 +0100)
committerHenrik Rydberg <rydberg@euromail.se>
Thu, 16 Dec 2010 09:44:01 +0000 (10:44 +0100)
The Wetab tablet dual-touch controller works the same way as the one
in the Joojoo tablet. This patch adds the Wetab to the list of
supported devices, and grabs it accordingly in hid-core.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Stephane Chatty <chatty@enac.fr>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
drivers/hid/hid-core.c
drivers/hid/hid-egalax.c
drivers/hid/hid-ids.h

index 515345b11ac95b380942638ce25f8ea8afccd472..9762de5a2f370b6c2409189da19fa29bf3756373 100644 (file)
@@ -1300,6 +1300,7 @@ static const struct hid_device_id hid_blacklist[] = {
        { 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) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
index 38fdaadacdd4793856517d86eda28ed02f212446..e367cb233f9dc01d52aae72077560a63fd90989a 100644 (file)
@@ -238,6 +238,8 @@ static const struct hid_device_id egalax_devices[] = {
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, egalax_devices);
index 3341baa86a30f66ab426b78cd68b2f953f311a1b..b76166a10176d63cbdfad403bbc522ac124edeb5 100644 (file)
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER   0x0001
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH   0x480d
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1  0x720c
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2  0x72a1
 
 #define USB_VENDOR_ID_ELECOM           0x056e
 #define USB_DEVICE_ID_ELECOM_BM084     0x0061