diff options
| author | Xiaolei Yu <dreifachstein@gmail.com> | 2017-03-30 07:43:09 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-04-06 08:50:11 -0400 |
| commit | fe1a83b43869790501ed82b58dc8229023c69f74 (patch) | |
| tree | 1823494f60e2fa247f01c2eabcb00cf5a4501661 | |
| parent | 4d20c332de377fa5b06c46f6f34174c10dd998e4 (diff) | |
HID: uclogic: add support for Ugee Tablet EX07S
This device has a different vendor id but responds to initialization.
Signed-off-by: Xiaolei Yu <dreifachstein@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
| -rw-r--r-- | drivers/hid/hid-uclogic.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 63ec1993eaaa..86bbd8a1fd4a 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -2096,6 +2096,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 2096 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, | 2096 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, |
| 2097 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, | 2097 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, |
| 2098 | { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, | 2098 | { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, |
| 2099 | { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) }, | ||
| 2099 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, | 2100 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, |
| 2100 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, | 2101 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, |
| 2101 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) }, | 2102 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 4e2648c86c8c..b26c030926c1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -1028,6 +1028,9 @@ | |||
| 1028 | #define USB_DEVICE_ID_UGEE_TABLET_45 0x0045 | 1028 | #define USB_DEVICE_ID_UGEE_TABLET_45 0x0045 |
| 1029 | #define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d | 1029 | #define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d |
| 1030 | 1030 | ||
| 1031 | #define USB_VENDOR_ID_UGEE 0x28bd | ||
| 1032 | #define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071 | ||
| 1033 | |||
| 1031 | #define USB_VENDOR_ID_UNITEC 0x227d | 1034 | #define USB_VENDOR_ID_UNITEC 0x227d |
| 1032 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709 | 1035 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709 |
| 1033 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19 0x0a19 | 1036 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19 0x0a19 |
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c index 1509d7287ff3..e3e6e5c893cc 100644 --- a/drivers/hid/hid-uclogic.c +++ b/drivers/hid/hid-uclogic.c | |||
| @@ -977,6 +977,7 @@ static int uclogic_probe(struct hid_device *hdev, | |||
| 977 | } | 977 | } |
| 978 | break; | 978 | break; |
| 979 | case USB_DEVICE_ID_UGTIZER_TABLET_GP0610: | 979 | case USB_DEVICE_ID_UGTIZER_TABLET_GP0610: |
| 980 | case USB_DEVICE_ID_UGEE_TABLET_EX07S: | ||
| 980 | /* If this is the pen interface */ | 981 | /* If this is the pen interface */ |
| 981 | if (intf->cur_altsetting->desc.bInterfaceNumber == 1) { | 982 | if (intf->cur_altsetting->desc.bInterfaceNumber == 1) { |
| 982 | rc = uclogic_tablet_enable(hdev); | 983 | rc = uclogic_tablet_enable(hdev); |
| @@ -1069,6 +1070,7 @@ static const struct hid_device_id uclogic_devices[] = { | |||
| 1069 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, | 1070 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, |
| 1070 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, | 1071 | { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, |
| 1071 | { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, | 1072 | { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, |
| 1073 | { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) }, | ||
| 1072 | { } | 1074 | { } |
| 1073 | }; | 1075 | }; |
| 1074 | MODULE_DEVICE_TABLE(hid, uclogic_devices); | 1076 | MODULE_DEVICE_TABLE(hid, uclogic_devices); |
