aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorXing Wei <weixing@hanwang.com.cn>2010-09-02 02:25:35 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-02 02:26:18 -0400
commitbba5394ad3bd23fff6987fc8bc3aaf9d12433c63 (patch)
treea926dfceef5ddc5bf17295de7445814edf1d7960 /drivers/hid
parenta17f79553f052f04d47689a842118f775f81b7e3 (diff)
Input: add support for Hanwang tablets
Add support for Art Master III tablet of BeiJing HanwangTechnology Co, Ltd. Signed-off-by: Xing Wei <weixing@hanwang.com.cn> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c5
-rw-r--r--drivers/hid/hid-ids.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e635199a0cd2..baa25ad8270a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1766,6 +1766,11 @@ static bool hid_ignore(struct hid_device *hdev)
1766 hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST) 1766 hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST)
1767 return true; 1767 return true;
1768 break; 1768 break;
1769 case USB_VENDOR_ID_HANWANG:
1770 if (hdev->product >= USB_DEVICE_ID_HANWANG_TABLET_FIRST &&
1771 hdev->product <= USB_DEVICE_ID_HANWANG_TABLET_LAST)
1772 return true;
1773 break;
1769 } 1774 }
1770 1775
1771 if (hdev->type == HID_TYPE_USBMOUSE && 1776 if (hdev->type == HID_TYPE_USBMOUSE &&
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d3fc13ae094d..11af537414b8 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -291,6 +291,10 @@
291#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 291#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003
292#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 292#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008
293 293
294#define USB_VENDOR_ID_HANWANG 0x0b57
295#define USB_DEVICE_ID_HANWANG_TABLET_FIRST 0x5000
296#define USB_DEVICE_ID_HANWANG_TABLET_LAST 0x8fff
297
294#define USB_VENDOR_ID_HAPP 0x078b 298#define USB_VENDOR_ID_HAPP 0x078b
295#define USB_DEVICE_ID_UGCI_DRIVING 0x0010 299#define USB_DEVICE_ID_UGCI_DRIVING 0x0010
296#define USB_DEVICE_ID_UGCI_FLYING 0x0020 300#define USB_DEVICE_ID_UGCI_FLYING 0x0020