hid: Misc tablet fixes and improvements
PATCH 1/1 hid: Misc tablet fixes and improvements
Hi Jiri, Benjamin,
Here is a bunch of patches syncing the DIGImend out-of-tree drivers package with upstream. There are some minor fixes, some tablets being supported, and addition of generic frame button support for UC-Logic tablets by Benjamin.
Thanks!
Nick
Benjamin Tissoires (1):
HID: uclogic: Switch to reporting abstract button events
Nikolai Kondrashov (8):
HID: Remove broken links to tablet descriptions
HID: kye: Rename MousePen i608X v2 macro
HID: kye: Fix MousePen i608X v2 report descriptor
HID: uclogic: Remove allocation failure messages
HID: uclogic: Add support for several more tablets
HID: uclogic: Support UGTizer GP0610 partially
HID: uclogic: Override constant descriptors
HID: uclogic: Add support for UC-Logic TWHA60 v3
drivers/hid/hid-core.c | 2 +- drivers/hid/hid-ids.h | 9 +- drivers/hid/hid-kye.c | 123 +++++++++++++++++--- drivers/hid/hid-uclogic.c | 187 +++++++++++++++++++++++------- drivers/hid/hid-waltop.c | 36 ------ drivers/hid/usbhid/hid-quirks.c | 2 +- 6 files changed, 264 insertions(+), 95 deletions(-)
PATCH 1/9 HID: Remove broken links to tablet descriptions
Remove comments with broken links to tablet descriptions from hid-kye/uclogic/waltop drivers.
They pointed to now dead DIGImend project wiki at sf.net. Even though the DIGImend project still hosts descriptions, now at digimend.github.io, it's better to avoid them going stale again, and let anyone interested search the web instead.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-kye.c | 15 --------------- drivers/hid/hid-uclogic.c | 27 --------------------------- drivers/hid/hid-waltop.c | 36 ------------------------------------ 3 files changed, 78 deletions(-)
drivers/hid/hid-kye.c +0 -15
@@ -19,11 +19,6 @@#include "hid-ids.h" -/* -* See EasyPen i405X description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=KYE_EasyPen_i405X -*/ -/* Original EasyPen i405X report descriptor size */ #define EASYPEN_I405X_RDESC_ORIG_SIZE 476
@@ -82,11 +77,6 @@ static __u8 easypen_i405x_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See MousePen i608X description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=KYE_MousePen_i608X -*/ -/* Original MousePen i608X report descriptor size */ #define MOUSEPEN_I608X_RDESC_ORIG_SIZE 476
@@ -186,11 +176,6 @@ static __u8 mousepen_i608x_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See EasyPen M610X description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=KYE_EasyPen_M610X -*/ -/* Original EasyPen M610X report descriptor size */ #define EASYPEN_M610X_RDESC_ORIG_SIZE 476
drivers/hid/hid-uclogic.c +0 -27
@@ -21,13 +21,6 @@#include "hid-ids.h" -/* -* See WPXXXXU model descriptions, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP4030U -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP5540U -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP8060U -*/ -/* Size of the original descriptor of WPXXXXU tablets */ #define WPXXXXU_RDESC_ORIG_SIZE 212
@@ -221,11 +214,6 @@ static __u8 wp8060u_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See WP1062 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP1062 -*/ -/* Size of the original descriptor of WP1062 tablet */ #define WP1062_RDESC_ORIG_SIZE 254
@@ -274,11 +262,6 @@ static __u8 wp1062_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See PF1209 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_PF1209 -*/ -/* Size of the original descriptor of PF1209 tablet */ #define PF1209_RDESC_ORIG_SIZE 234
@@ -356,11 +339,6 @@ static __u8 pf1209_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See TWHL850 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Wireless_Tablet_TWHL850 -*/ -/* Size of the original descriptors of TWHL850 tablet */ #define TWHL850_RDESC_ORIG_SIZE0 182#define TWHL850_RDESC_ORIG_SIZE1 161
@@ -469,11 +447,6 @@ static __u8 twhl850_rdesc_fixed2[] = { 0xC0 /* End Collection */ }; -/* -* See TWHA60 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_TWHA60 -*/ -/* Size of the original descriptors of TWHA60 tablet */ #define TWHA60_RDESC_ORIG_SIZE0 254#define TWHA60_RDESC_ORIG_SIZE1 139
drivers/hid/hid-waltop.c +0 -36
@@ -42,11 +42,6 @@* 02 16 02 ink */ -/* -* See Slim Tablet 5.8 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Slim_Tablet_5.8%22 -*/ -/* Size of the original report descriptor of Slim Tablet 5.8 inch */ #define SLIM_TABLET_5_8_INCH_RDESC_ORIG_SIZE 222
@@ -98,11 +93,6 @@ static __u8 slim_tablet_5_8_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Slim Tablet 12.1 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Slim_Tablet_12.1%22 -*/ -/* Size of the original report descriptor of Slim Tablet 12.1 inch */ #define SLIM_TABLET_12_1_INCH_RDESC_ORIG_SIZE 269
@@ -154,11 +144,6 @@ static __u8 slim_tablet_12_1_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Q Pad description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Q_Pad -*/ -/* Size of the original report descriptor of Q Pad */ #define Q_PAD_RDESC_ORIG_SIZE 241
@@ -210,11 +195,6 @@ static __u8 q_pad_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See description, device and HID report descriptors of tablet with PID 0038 at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_PID_0038 -*/ -/* Size of the original report descriptor of tablet with PID 0038 */ #define PID_0038_RDESC_ORIG_SIZE 241
@@ -268,11 +248,6 @@ static __u8 pid_0038_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Media Tablet 10.6 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Media_Tablet_10.6%22 -*/ -/* Size of the original report descriptor of Media Tablet 10.6 inch */ #define MEDIA_TABLET_10_6_INCH_RDESC_ORIG_SIZE 300
@@ -386,11 +361,6 @@ static __u8 media_tablet_10_6_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Media Tablet 14.1 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Media_Tablet_14.1%22 -*/ -/* Size of the original report descriptor of Media Tablet 14.1 inch */ #define MEDIA_TABLET_14_1_INCH_RDESC_ORIG_SIZE 309
@@ -502,12 +472,6 @@ static __u8 media_tablet_14_1_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Sirius Battery Free Tablet description, device and HID report descriptors -* at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Sirius_Battery_Free_Tablet -*/ -/* Size of the original report descriptor of Sirius Battery Free Tablet */ #define SIRIUS_BATTERY_FREE_TABLET_RDESC_ORIG_SIZE 335
Signature · 1 line
2.9.3
PATCH 2/9 HID: kye: Rename MousePen i608X v2 macro
In reply to Nikolai KondrashovRename the device ID macro for the second version of KYE MousePen i608x graphics tablet to have "V" in its name to signify that "2" is a version.
I.e. USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 ->
USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2
This also makes applying additional fixes from DIGImend easier.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-core.c | 2 +- drivers/hid/hid-ids.h | 2 +- drivers/hid/hid-kye.c | 6 +++--- drivers/hid/usbhid/hid-quirks.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/hid/hid-core.c +1 -1
@@ -1916,7 +1916,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
drivers/hid/hid-ids.h +1 -1
@@ -565,7 +565,7 @@#define USB_DEVICE_ID_KYE_GPEN_560 0x5003#define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X 0x5011 -#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 0x501a +#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 0x501a#define USB_DEVICE_ID_KYE_EASYPEN_M610X 0x5013#define USB_DEVICE_ID_KYE_PENSKETCH_M912 0x5015
drivers/hid/hid-kye.c +3 -3
@@ -439,7 +439,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, }break ;case USB_DEVICE_ID_KYE_MOUSEPEN_I608X : -case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 : +case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :if (*rsize ==MOUSEPEN_I608X_RDESC_ORIG_SIZE ) { rdesc = mousepen_i608x_rdesc_fixed; *rsize =sizeof (mousepen_i608x_rdesc_fixed);
@@ -538,7 +538,7 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)switch (id->product) {case USB_DEVICE_ID_KYE_EASYPEN_I405X :case USB_DEVICE_ID_KYE_MOUSEPEN_I608X : -case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 : +case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :case USB_DEVICE_ID_KYE_EASYPEN_M610X :case USB_DEVICE_ID_KYE_PENSKETCH_M912 : ret =kye_tablet_enable (hdev);
@@ -571,7 +571,7 @@ static const struct hid_device_id kye_devices[] = { {HID_USB_DEVICE (USB_VENDOR_ID_KYE , USB_DEVICE_ID_KYE_MOUSEPEN_I608X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, - USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) }, + USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE,
drivers/hid/usbhid/hid-quirks.c +1 -1
@@ -143,7 +143,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },
Signature · 1 line
2.9.3
PATCH 3/9 HID: kye: Fix MousePen i608X v2 report descriptor
In reply to Nikolai KondrashovAdd a dedicated, fixed report descriptor for the second version of KYE MousePen i608X graphics tablet. The descriptor fixes pressure and drawing area ranges.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-kye.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-)
drivers/hid/hid-kye.c +105 -1
@@ -176,6 +176,105 @@ static __u8 mousepen_i608x_rdesc_fixed[] = { 0xC0 /* End Collection */ }; +/* Original MousePen i608X v2 report descriptor size */ +#define MOUSEPEN_I608X_V2_RDESC_ORIG_SIZE 482 + +/* Fixed MousePen i608X v2 report descriptor */ +static __u8 mousepen_i608x_v2_rdesc_fixed[] = { +0x06 ,0x00 ,0xFF ,/* Usage Page (FF00h), */ +0x09 ,0x01 ,/* Usage (01h), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0x05 ,/* Report ID (5), */ +0x09 ,0x01 ,/* Usage (01h), */ +0x15 ,0x80 ,/* Logical Minimum (-128), */ +0x25 ,0x7F ,/* Logical Maximum (127), */ +0x75 ,0x08 ,/* Report Size (8), */ +0x95 ,0x07 ,/* Report Count (7), */ +0xB1 ,0x02 ,/* Feature (Variable), */ +0xC0 ,/* End Collection, */ +0x05 ,0x0D ,/* Usage Page (Digitizer), */ +0x09 ,0x02 ,/* Usage (Pen), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0x10 ,/* Report ID (16), */ +0x09 ,0x20 ,/* Usage (Stylus), */ +0xA0 ,/* Collection (Physical), */ +0x14 ,/* Logical Minimum (0), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x09 ,0x42 ,/* Usage (Tip Switch), */ +0x09 ,0x44 ,/* Usage (Barrel Switch), */ +0x09 ,0x46 ,/* Usage (Tablet Pick), */ +0x95 ,0x03 ,/* Report Count (3), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x95 ,0x04 ,/* Report Count (4), */ +0x81 ,0x03 ,/* Input (Constant, Variable), */ +0x09 ,0x32 ,/* Usage (In Range), */ +0x95 ,0x01 ,/* Report Count (1), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x75 ,0x10 ,/* Report Size (16), */ +0x95 ,0x01 ,/* Report Count (1), */ +0xA4 ,/* Push, */ +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x55 ,0xFD ,/* Unit Exponent (-3), */ +0x65 ,0x13 ,/* Unit (Inch), */ +0x34 ,/* Physical Minimum (0), */ +0x09 ,0x30 ,/* Usage (X), */ +0x46 ,0x40 ,0x1F ,/* Physical Maximum (8000), */ +0x27 ,0x00 ,0xA0 ,0x00 ,0x00 ,/* Logical Maximum (40960), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x09 ,0x31 ,/* Usage (Y), */ +0x46 ,0x70 ,0x17 ,/* Physical Maximum (6000), */ +0x26 ,0x00 ,0x78 ,/* Logical Maximum (30720), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xB4 ,/* Pop, */ +0x09 ,0x30 ,/* Usage (Tip Pressure), */ +0x26 ,0xFF ,0x07 ,/* Logical Maximum (2047), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xC0 ,/* End Collection, */ +0xC0 ,/* End Collection, */ +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x09 ,0x02 ,/* Usage (Mouse), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0x11 ,/* Report ID (17), */ +0x09 ,0x01 ,/* Usage (Pointer), */ +0xA0 ,/* Collection (Physical), */ +0x14 ,/* Logical Minimum (0), */ +0xA4 ,/* Push, */ +0x05 ,0x09 ,/* Usage Page (Button), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x19 ,0x01 ,/* Usage Minimum (01h), */ +0x29 ,0x03 ,/* Usage Maximum (03h), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x95 ,0x03 ,/* Report Count (3), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x95 ,0x05 ,/* Report Count (5), */ +0x81 ,0x01 ,/* Input (Constant), */ +0xB4 ,/* Pop, */ +0x95 ,0x01 ,/* Report Count (1), */ +0xA4 ,/* Push, */ +0x55 ,0xFD ,/* Unit Exponent (-3), */ +0x65 ,0x13 ,/* Unit (Inch), */ +0x34 ,/* Physical Minimum (0), */ +0x75 ,0x10 ,/* Report Size (16), */ +0x09 ,0x30 ,/* Usage (X), */ +0x46 ,0x40 ,0x1F ,/* Physical Maximum (8000), */ +0x27 ,0x00 ,0xA0 ,0x00 ,0x00 ,/* Logical Maximum (40960), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x09 ,0x31 ,/* Usage (Y), */ +0x46 ,0x70 ,0x17 ,/* Physical Maximum (6000), */ +0x26 ,0x00 ,0x78 ,/* Logical Maximum (30720), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xB4 ,/* Pop, */ +0x75 ,0x08 ,/* Report Size (8), */ +0x09 ,0x38 ,/* Usage (Wheel), */ +0x15 ,0xFF ,/* Logical Minimum (-1), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x81 ,0x06 ,/* Input (Variable, Relative), */ +0x81 ,0x01 ,/* Input (Constant), */ +0xC0 ,/* End Collection, */ +0xC0 /* End Collection */ +}; +/* Original EasyPen M610X report descriptor size */ #define EASYPEN_M610X_RDESC_ORIG_SIZE 476
@@ -439,12 +538,17 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, }break ;case USB_DEVICE_ID_KYE_MOUSEPEN_I608X : -case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :if (*rsize ==MOUSEPEN_I608X_RDESC_ORIG_SIZE ) { rdesc = mousepen_i608x_rdesc_fixed; *rsize =sizeof (mousepen_i608x_rdesc_fixed); }break ; +case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 : +if (*rsize ==MOUSEPEN_I608X_V2_RDESC_ORIG_SIZE ) { + rdesc = mousepen_i608x_v2_rdesc_fixed; + *rsize =sizeof (mousepen_i608x_v2_rdesc_fixed); + } +break ;case USB_DEVICE_ID_KYE_EASYPEN_M610X :if (*rsize ==EASYPEN_M610X_RDESC_ORIG_SIZE ) { rdesc = easypen_m610x_rdesc_fixed;
Signature · 1 line
2.9.3
PATCH 4/9 HID: uclogic: Remove allocation failure messages
In reply to Nikolai KondrashovRemove unnecessary allocation failure messages from hid-uclogic.c, following the checkpatch.pl recommendations.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-uclogic.c | 2 -- 1 file changed, 2 deletions(-)
drivers/hid/hid-uclogic.c +0 -2
@@ -777,7 +777,6 @@ static int uclogic_tablet_enable(struct hid_device *hdev) len =UCLOGIC_PRM_NUM *sizeof (*buf); buf =kmalloc (len,GFP_KERNEL );if (buf ==NULL ) { -hid_err (hdev,"failed to allocate parameter buffer\n" ); rc = -ENOMEM ; goto cleanup; }
@@ -821,7 +820,6 @@ static int uclogic_tablet_enable(struct hid_device *hdev)sizeof (uclogic_tablet_rdesc_template), GFP_KERNEL);if (drvdata->rdesc ==NULL ) { -hid_err (hdev,"failed to allocate fixed rdesc\n" ); rc = -ENOMEM ; goto cleanup; }
Signature · 1 line
2.9.3
PATCH 5/9 HID: uclogic: Switch to reporting abstract button events
In reply to Nikolai KondrashovFrom: Benjamin Tissoires <[email protected]>
Based on a patch from: Nikolai Kondrashov <[email protected]>
Enable abstract keyboard mode for Huion tablets, which makes them report frame buttons using the pen interface and report ID. Divert these reports to a virtual report ID describing them.
This makes the tablet compatible with xf86-input-wacom and libinput, but stops the frame buttons from reporting keyboard events.
Signed-off-by Nikolai Kondrashov <[email protected]>
Signed-off-by Benjamin Tissoires <[email protected]>
--- drivers/hid/hid-uclogic.c | 102 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 5 deletions(-)
drivers/hid/hid-uclogic.c +97 -5
@@ -586,6 +586,27 @@ static const __u8 uclogic_tablet_rdesc_template[] = {0xC0 /* End Collection */ }; +/* Fixed virtual pad report descriptor */ +static const __u8 uclogic_buttonpad_rdesc[] = { +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x09 ,0x07 ,/* Usage (Keypad), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0xF7 ,/* Report ID (247), */ +0x05 ,0x0D ,/* Usage Page (Digitizers), */ +0x09 ,0x39 ,/* Usage (Tablet Function Keys), */ +0xA0 ,/* Collection (Physical), */ +0x05 ,0x09 ,/* Usage Page (Button), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x95 ,0x18 ,/* Report Count (24), */ +0x81 ,0x03 ,/* Input (Constant, Variable), */ +0x19 ,0x01 ,/* Usage Minimum (01h), */ +0x29 ,0x08 ,/* Usage Maximum (08h), */ +0x95 ,0x08 ,/* Report Count (8), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xC0 ,/* End Collection */ +0xC0 /* End Collection */ +}; +/* Parameter indices */ enum uclogic_prm {UCLOGIC_PRM_X_LM =1 ,
@@ -601,6 +622,7 @@ struct uclogic_drvdata {unsigned int rsize;bool invert_pen_inrange;bool ignore_pen_usage; +bool has_virtual_pad_interface; }; static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -847,6 +869,69 @@ cleanup:return rc; } +/** +* Enable actual button mode. +* +* @hdev: HID device +*/ +static int uclogic_button_enable (struct hid_device *hdev) +{ +int rc; +struct usb_device *usb_dev =hid_to_usb_dev (hdev); +struct uclogic_drvdata *drvdata =hid_get_drvdata (hdev); +char *str_buf; +size_t str_len =16 ; +unsigned char *rdesc; +size_t rdesc_len; + + str_buf =kzalloc (str_len,GFP_KERNEL ); +if (str_buf ==NULL ) { + rc = -ENOMEM ; + goto cleanup; + } + +/* Enable abstract keyboard mode */ + rc =usb_string (usb_dev,0x7b , str_buf, str_len); +if (rc == -EPIPE ) { +hid_info (hdev,"button mode setting not found\n" ); + rc =0 ; + goto cleanup; + }else if (rc <0 ) { +hid_err (hdev,"failed to enable abstract keyboard\n" ); + goto cleanup; + }else if (strncmp (str_buf,"HK On" , rc)) { +hid_info (hdev,"invalid answer when requesting buttons: '%s'\n" , + str_buf); + rc = -EINVAL ; + goto cleanup; + } + +/* Re-allocate fixed report descriptor */ + rdesc_len = drvdata->rsize +sizeof (uclogic_buttonpad_rdesc); + rdesc =devm_kzalloc (&hdev->dev, rdesc_len,GFP_KERNEL ); +if (!rdesc) { + rc = -ENOMEM ; + goto cleanup; + } + +memcpy (rdesc, drvdata->rdesc, drvdata->rsize); + +/* Append the buttonpad descriptor */ +memcpy (rdesc + drvdata->rsize, uclogic_buttonpad_rdesc, +sizeof (uclogic_buttonpad_rdesc)); + +/* clean up old rdesc and use the new one */ + drvdata->rsize = rdesc_len; +devm_kfree (&hdev->dev, drvdata->rdesc); + drvdata->rdesc = rdesc; + + rc =0 ; + +cleanup: +kfree (str_buf); +return rc; +} +static int uclogic_probe (struct hid_device *hdev,const struct hid_device_id *id) {
@@ -878,6 +963,9 @@ static int uclogic_probe(struct hid_device *hdev,return rc; } drvdata->invert_pen_inrange = true; + + rc =uclogic_button_enable (hdev); + drvdata->has_virtual_pad_interface = !rc; }else { drvdata->ignore_pen_usage = true; }
@@ -904,12 +992,16 @@ static int uclogic_raw_event(struct hid_device *hdev, struct hid_report *report, {struct uclogic_drvdata *drvdata =hid_get_drvdata (hdev); -if ((drvdata->invert_pen_inrange) && - (report->type ==HID_INPUT_REPORT ) && +if ((report->type ==HID_INPUT_REPORT ) && (report->id ==UCLOGIC_PEN_REPORT_ID ) && - (size >=2 )) -/* Invert the in-range bit */ - data[1 ] ^=0x40 ; + (size >=2 )) { +if (drvdata->has_virtual_pad_interface && (data[1 ] &0x20 )) +/* Change to virtual frame button report ID */ + data[0 ] =0xf7 ; +else if (drvdata->invert_pen_inrange) +/* Invert the in-range bit */ + data[1 ] ^=0x40 ; + }return 0 ; }
Signature · 1 line
2.9.3
PATCH 6/9 HID: uclogic: Add support for several more tablets
In reply to Nikolai KondrashovAdd more product IDs to hid-uclogic.c driver to support several more tablet models, including:
UC-Logic DrawImage G3
aka Ugee G3
UC-Logic SP1001
aka Ugee SP1001
aka Yiynova UC-Logic SP-1001
Ugee 1000L
Ugee M708
Yiynova DP10U
aka Yiynova DP10U+
Yiynova MSP19U
Yiynova MSP19U+
Yiynova MVP10U
aka Yiynova MVP10U IPS
Yiynova MVP10UHD+IPS
Yiynova MVP22U+
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-uclogic.c | 8 ++++++++ 2 files changed, 12 insertions(+)
drivers/hid/hid-ids.h +4 -0
@@ -996,6 +996,10 @@#define USB_DEVICE_ID_UCLOGIC_TABLET_WP1062 0x0064#define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850 0x0522#define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 0x0781 +#define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 0x3031 +#define USB_DEVICE_ID_UGEE_TABLET_81 0x0081 +#define USB_DEVICE_ID_UGEE_TABLET_45 0x0045 +#define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d#define USB_VENDOR_ID_UNITEC 0x227d#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
drivers/hid/hid-uclogic.c +8 -0
@@ -955,6 +955,10 @@ static int uclogic_probe(struct hid_device *hdev,switch (id->product) {case USB_DEVICE_ID_HUION_TABLET : +case USB_DEVICE_ID_YIYNOVA_TABLET : +case USB_DEVICE_ID_UGEE_TABLET_81 : +case USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 : +case USB_DEVICE_ID_UGEE_TABLET_45 :/* If this is the pen interface */ if (intf->cur_altsetting->desc.bInterfaceNumber ==0 ) { rc =uclogic_tablet_enable (hdev);
@@ -1023,6 +1027,10 @@ static const struct hid_device_id uclogic_devices[] = { USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) }, { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, { } };MODULE_DEVICE_TABLE (hid, uclogic_devices);
Signature · 1 line
2.9.3
Re: [PATCH 6/9] HID: uclogic: Add support for several more tablets
Quoted 56 lines · Nikolai Kondrashov
Add more product IDs to
hid-uclogic.cdriver to support several more tablet models, including:UC-Logic DrawImage G3
aka Ugee G3
UC-Logic SP1001
aka Ugee SP1001
aka Yiynova UC-Logic SP-1001
Ugee 1000L
Ugee M708
Yiynova DP10U
aka Yiynova DP10U+
Yiynova MSP19U
Yiynova MSP19U+
Yiynova MVP10U
aka Yiynova MVP10U IPS
Yiynova MVP10UHD+IPS
Yiynova MVP22U+Signed-off-by Nikolai Kondrashov <[email protected]>--- drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-uclogic.c | 8 ++++++++ 2 files changed, 12 insertions(+)drivers/hid/hid-ids.h +4
-0@@ -996,6 +996,10 @@#define USB_DEVICE_ID_UCLOGIC_TABLET_WP1062 0x0064#define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850 0x0522#define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 0x0781 +#define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 0x3031 +#define USB_DEVICE_ID_UGEE_TABLET_81 0x0081 +#define USB_DEVICE_ID_UGEE_TABLET_45 0x0045 +#define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d#define USB_VENDOR_ID_UNITEC 0x227d#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709drivers/hid/hid-uclogic.c +4
-0@@ -955,6 +955,10 @@ static int uclogic_probe(struct hid_device *hdev,switch (id->product) {case USB_DEVICE_ID_HUION_TABLET : +case USB_DEVICE_ID_YIYNOVA_TABLET : +case USB_DEVICE_ID_UGEE_TABLET_81 : +case USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 : +case USB_DEVICE_ID_UGEE_TABLET_45 :/* If this is the pen interface */ if (intf->cur_altsetting->desc.bInterfaceNumber ==0 ) { rc =uclogic_tablet_enable (hdev);
drivers/hid/hid-uclogic.c static const struct hid_device_id uclogic_devices[] = { · line 1033
Quoted 7 lines
drivers/hid/hid-uclogic.c +4
-0@@ -1023,6 +1027,10 @@ static const struct hid_device_id uclogic_devices[] = { USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) }, { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },
For this one and 7/9, I think you forgot the hid-core.c changes to not bind hid-generic on those.
The reset of the series looks good to me:
Reviewed-by Benjamin Tissoires <[email protected]>
Cheers,
Benjamin
Quoted 6 lines
drivers/hid/hid-uclogic.c +0
-0{ } };MODULE_DEVICE_TABLE (hid, uclogic_devices);Signature · 1 line
2.9.3
PATCH v2 1/1 hid: Misc tablet fixes and improvements
Quoted 2 lines · Benjamin Tissoires
For this one and 7/9, I think you forgot the
hid-core.cchanges to not bind hid-generic on those.
Thanks, Benjamin! Yes, I forgot those. Perhaps I could have just sent the two patches fixed, but I respun the whole set with the hid-core changes added, just in case. Hope that's not bothersome.
Nick
PATCH 1/9 HID: Remove broken links to tablet descriptions
Remove comments with broken links to tablet descriptions from hid-kye/uclogic/waltop drivers.
They pointed to now dead DIGImend project wiki at sf.net. Even though the DIGImend project still hosts descriptions, now at digimend.github.io, it's better to avoid them going stale again, and let anyone interested search the web instead.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-kye.c | 15 --------------- drivers/hid/hid-uclogic.c | 27 --------------------------- drivers/hid/hid-waltop.c | 36 ------------------------------------ 3 files changed, 78 deletions(-)
drivers/hid/hid-kye.c +0 -15
@@ -19,11 +19,6 @@#include "hid-ids.h" -/* -* See EasyPen i405X description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=KYE_EasyPen_i405X -*/ -/* Original EasyPen i405X report descriptor size */ #define EASYPEN_I405X_RDESC_ORIG_SIZE 476
@@ -82,11 +77,6 @@ static __u8 easypen_i405x_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See MousePen i608X description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=KYE_MousePen_i608X -*/ -/* Original MousePen i608X report descriptor size */ #define MOUSEPEN_I608X_RDESC_ORIG_SIZE 476
@@ -186,11 +176,6 @@ static __u8 mousepen_i608x_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See EasyPen M610X description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=KYE_EasyPen_M610X -*/ -/* Original EasyPen M610X report descriptor size */ #define EASYPEN_M610X_RDESC_ORIG_SIZE 476
drivers/hid/hid-uclogic.c +0 -27
@@ -21,13 +21,6 @@#include "hid-ids.h" -/* -* See WPXXXXU model descriptions, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP4030U -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP5540U -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP8060U -*/ -/* Size of the original descriptor of WPXXXXU tablets */ #define WPXXXXU_RDESC_ORIG_SIZE 212
@@ -221,11 +214,6 @@ static __u8 wp8060u_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See WP1062 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_WP1062 -*/ -/* Size of the original descriptor of WP1062 tablet */ #define WP1062_RDESC_ORIG_SIZE 254
@@ -274,11 +262,6 @@ static __u8 wp1062_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See PF1209 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_PF1209 -*/ -/* Size of the original descriptor of PF1209 tablet */ #define PF1209_RDESC_ORIG_SIZE 234
@@ -356,11 +339,6 @@ static __u8 pf1209_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See TWHL850 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Wireless_Tablet_TWHL850 -*/ -/* Size of the original descriptors of TWHL850 tablet */ #define TWHL850_RDESC_ORIG_SIZE0 182#define TWHL850_RDESC_ORIG_SIZE1 161
@@ -469,11 +447,6 @@ static __u8 twhl850_rdesc_fixed2[] = { 0xC0 /* End Collection */ }; -/* -* See TWHA60 description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=UC-Logic_Tablet_TWHA60 -*/ -/* Size of the original descriptors of TWHA60 tablet */ #define TWHA60_RDESC_ORIG_SIZE0 254#define TWHA60_RDESC_ORIG_SIZE1 139
drivers/hid/hid-waltop.c +0 -36
@@ -42,11 +42,6 @@* 02 16 02 ink */ -/* -* See Slim Tablet 5.8 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Slim_Tablet_5.8%22 -*/ -/* Size of the original report descriptor of Slim Tablet 5.8 inch */ #define SLIM_TABLET_5_8_INCH_RDESC_ORIG_SIZE 222
@@ -98,11 +93,6 @@ static __u8 slim_tablet_5_8_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Slim Tablet 12.1 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Slim_Tablet_12.1%22 -*/ -/* Size of the original report descriptor of Slim Tablet 12.1 inch */ #define SLIM_TABLET_12_1_INCH_RDESC_ORIG_SIZE 269
@@ -154,11 +144,6 @@ static __u8 slim_tablet_12_1_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Q Pad description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Q_Pad -*/ -/* Size of the original report descriptor of Q Pad */ #define Q_PAD_RDESC_ORIG_SIZE 241
@@ -210,11 +195,6 @@ static __u8 q_pad_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See description, device and HID report descriptors of tablet with PID 0038 at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_PID_0038 -*/ -/* Size of the original report descriptor of tablet with PID 0038 */ #define PID_0038_RDESC_ORIG_SIZE 241
@@ -268,11 +248,6 @@ static __u8 pid_0038_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Media Tablet 10.6 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Media_Tablet_10.6%22 -*/ -/* Size of the original report descriptor of Media Tablet 10.6 inch */ #define MEDIA_TABLET_10_6_INCH_RDESC_ORIG_SIZE 300
@@ -386,11 +361,6 @@ static __u8 media_tablet_10_6_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Media Tablet 14.1 inch description, device and HID report descriptors at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Media_Tablet_14.1%22 -*/ -/* Size of the original report descriptor of Media Tablet 14.1 inch */ #define MEDIA_TABLET_14_1_INCH_RDESC_ORIG_SIZE 309
@@ -502,12 +472,6 @@ static __u8 media_tablet_14_1_inch_rdesc_fixed[] = { 0xC0 /* End Collection */ }; -/* -* See Sirius Battery Free Tablet description, device and HID report descriptors -* at -* http://sf.net/apps/mediawiki/digimend/?title=Waltop_Sirius_Battery_Free_Tablet -*/ -/* Size of the original report descriptor of Sirius Battery Free Tablet */ #define SIRIUS_BATTERY_FREE_TABLET_RDESC_ORIG_SIZE 335
Signature · 1 line
2.9.3
PATCH 2/9 HID: kye: Rename MousePen i608X v2 macro
In reply to Nikolai KondrashovRename the device ID macro for the second version of KYE MousePen i608x graphics tablet to have "V" in its name to signify that "2" is a version.
I.e. USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 ->
USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2
This also makes applying additional fixes from DIGImend easier.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-core.c | 2 +- drivers/hid/hid-ids.h | 2 +- drivers/hid/hid-kye.c | 6 +++--- drivers/hid/usbhid/hid-quirks.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/hid/hid-core.c +1 -1
@@ -1916,7 +1916,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
drivers/hid/hid-ids.h +1 -1
@@ -565,7 +565,7 @@#define USB_DEVICE_ID_KYE_GPEN_560 0x5003#define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X 0x5011 -#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 0x501a +#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 0x501a#define USB_DEVICE_ID_KYE_EASYPEN_M610X 0x5013#define USB_DEVICE_ID_KYE_PENSKETCH_M912 0x5015
drivers/hid/hid-kye.c +3 -3
@@ -439,7 +439,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, }break ;case USB_DEVICE_ID_KYE_MOUSEPEN_I608X : -case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 : +case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :if (*rsize ==MOUSEPEN_I608X_RDESC_ORIG_SIZE ) { rdesc = mousepen_i608x_rdesc_fixed; *rsize =sizeof (mousepen_i608x_rdesc_fixed);
@@ -538,7 +538,7 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)switch (id->product) {case USB_DEVICE_ID_KYE_EASYPEN_I405X :case USB_DEVICE_ID_KYE_MOUSEPEN_I608X : -case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 : +case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :case USB_DEVICE_ID_KYE_EASYPEN_M610X :case USB_DEVICE_ID_KYE_PENSKETCH_M912 : ret =kye_tablet_enable (hdev);
@@ -571,7 +571,7 @@ static const struct hid_device_id kye_devices[] = { {HID_USB_DEVICE (USB_VENDOR_ID_KYE , USB_DEVICE_ID_KYE_MOUSEPEN_I608X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, - USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) }, + USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE,
drivers/hid/usbhid/hid-quirks.c +1 -1
@@ -143,7 +143,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },
Signature · 1 line
2.9.3
PATCH 3/9 HID: kye: Fix MousePen i608X v2 report descriptor
In reply to Nikolai KondrashovAdd a dedicated, fixed report descriptor for the second version of KYE MousePen i608X graphics tablet. The descriptor fixes pressure and drawing area ranges.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-kye.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-)
drivers/hid/hid-kye.c +105 -1
@@ -176,6 +176,105 @@ static __u8 mousepen_i608x_rdesc_fixed[] = { 0xC0 /* End Collection */ }; +/* Original MousePen i608X v2 report descriptor size */ +#define MOUSEPEN_I608X_V2_RDESC_ORIG_SIZE 482 + +/* Fixed MousePen i608X v2 report descriptor */ +static __u8 mousepen_i608x_v2_rdesc_fixed[] = { +0x06 ,0x00 ,0xFF ,/* Usage Page (FF00h), */ +0x09 ,0x01 ,/* Usage (01h), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0x05 ,/* Report ID (5), */ +0x09 ,0x01 ,/* Usage (01h), */ +0x15 ,0x80 ,/* Logical Minimum (-128), */ +0x25 ,0x7F ,/* Logical Maximum (127), */ +0x75 ,0x08 ,/* Report Size (8), */ +0x95 ,0x07 ,/* Report Count (7), */ +0xB1 ,0x02 ,/* Feature (Variable), */ +0xC0 ,/* End Collection, */ +0x05 ,0x0D ,/* Usage Page (Digitizer), */ +0x09 ,0x02 ,/* Usage (Pen), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0x10 ,/* Report ID (16), */ +0x09 ,0x20 ,/* Usage (Stylus), */ +0xA0 ,/* Collection (Physical), */ +0x14 ,/* Logical Minimum (0), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x09 ,0x42 ,/* Usage (Tip Switch), */ +0x09 ,0x44 ,/* Usage (Barrel Switch), */ +0x09 ,0x46 ,/* Usage (Tablet Pick), */ +0x95 ,0x03 ,/* Report Count (3), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x95 ,0x04 ,/* Report Count (4), */ +0x81 ,0x03 ,/* Input (Constant, Variable), */ +0x09 ,0x32 ,/* Usage (In Range), */ +0x95 ,0x01 ,/* Report Count (1), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x75 ,0x10 ,/* Report Size (16), */ +0x95 ,0x01 ,/* Report Count (1), */ +0xA4 ,/* Push, */ +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x55 ,0xFD ,/* Unit Exponent (-3), */ +0x65 ,0x13 ,/* Unit (Inch), */ +0x34 ,/* Physical Minimum (0), */ +0x09 ,0x30 ,/* Usage (X), */ +0x46 ,0x40 ,0x1F ,/* Physical Maximum (8000), */ +0x27 ,0x00 ,0xA0 ,0x00 ,0x00 ,/* Logical Maximum (40960), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x09 ,0x31 ,/* Usage (Y), */ +0x46 ,0x70 ,0x17 ,/* Physical Maximum (6000), */ +0x26 ,0x00 ,0x78 ,/* Logical Maximum (30720), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xB4 ,/* Pop, */ +0x09 ,0x30 ,/* Usage (Tip Pressure), */ +0x26 ,0xFF ,0x07 ,/* Logical Maximum (2047), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xC0 ,/* End Collection, */ +0xC0 ,/* End Collection, */ +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x09 ,0x02 ,/* Usage (Mouse), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0x11 ,/* Report ID (17), */ +0x09 ,0x01 ,/* Usage (Pointer), */ +0xA0 ,/* Collection (Physical), */ +0x14 ,/* Logical Minimum (0), */ +0xA4 ,/* Push, */ +0x05 ,0x09 ,/* Usage Page (Button), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x19 ,0x01 ,/* Usage Minimum (01h), */ +0x29 ,0x03 ,/* Usage Maximum (03h), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x95 ,0x03 ,/* Report Count (3), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x95 ,0x05 ,/* Report Count (5), */ +0x81 ,0x01 ,/* Input (Constant), */ +0xB4 ,/* Pop, */ +0x95 ,0x01 ,/* Report Count (1), */ +0xA4 ,/* Push, */ +0x55 ,0xFD ,/* Unit Exponent (-3), */ +0x65 ,0x13 ,/* Unit (Inch), */ +0x34 ,/* Physical Minimum (0), */ +0x75 ,0x10 ,/* Report Size (16), */ +0x09 ,0x30 ,/* Usage (X), */ +0x46 ,0x40 ,0x1F ,/* Physical Maximum (8000), */ +0x27 ,0x00 ,0xA0 ,0x00 ,0x00 ,/* Logical Maximum (40960), */ +0x81 ,0x02 ,/* Input (Variable), */ +0x09 ,0x31 ,/* Usage (Y), */ +0x46 ,0x70 ,0x17 ,/* Physical Maximum (6000), */ +0x26 ,0x00 ,0x78 ,/* Logical Maximum (30720), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xB4 ,/* Pop, */ +0x75 ,0x08 ,/* Report Size (8), */ +0x09 ,0x38 ,/* Usage (Wheel), */ +0x15 ,0xFF ,/* Logical Minimum (-1), */ +0x25 ,0x01 ,/* Logical Maximum (1), */ +0x81 ,0x06 ,/* Input (Variable, Relative), */ +0x81 ,0x01 ,/* Input (Constant), */ +0xC0 ,/* End Collection, */ +0xC0 /* End Collection */ +}; +/* Original EasyPen M610X report descriptor size */ #define EASYPEN_M610X_RDESC_ORIG_SIZE 476
@@ -439,12 +538,17 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, }break ;case USB_DEVICE_ID_KYE_MOUSEPEN_I608X : -case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :if (*rsize ==MOUSEPEN_I608X_RDESC_ORIG_SIZE ) { rdesc = mousepen_i608x_rdesc_fixed; *rsize =sizeof (mousepen_i608x_rdesc_fixed); }break ; +case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 : +if (*rsize ==MOUSEPEN_I608X_V2_RDESC_ORIG_SIZE ) { + rdesc = mousepen_i608x_v2_rdesc_fixed; + *rsize =sizeof (mousepen_i608x_v2_rdesc_fixed); + } +break ;case USB_DEVICE_ID_KYE_EASYPEN_M610X :if (*rsize ==EASYPEN_M610X_RDESC_ORIG_SIZE ) { rdesc = easypen_m610x_rdesc_fixed;
Signature · 1 line
2.9.3
PATCH 4/9 HID: uclogic: Remove allocation failure messages
In reply to Nikolai KondrashovRemove unnecessary allocation failure messages from hid-uclogic.c, following the checkpatch.pl recommendations.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-uclogic.c | 2 -- 1 file changed, 2 deletions(-)
drivers/hid/hid-uclogic.c +0 -2
@@ -777,7 +777,6 @@ static int uclogic_tablet_enable(struct hid_device *hdev) len =UCLOGIC_PRM_NUM *sizeof (*buf); buf =kmalloc (len,GFP_KERNEL );if (buf ==NULL ) { -hid_err (hdev,"failed to allocate parameter buffer\n" ); rc = -ENOMEM ; goto cleanup; }
@@ -821,7 +820,6 @@ static int uclogic_tablet_enable(struct hid_device *hdev)sizeof (uclogic_tablet_rdesc_template), GFP_KERNEL);if (drvdata->rdesc ==NULL ) { -hid_err (hdev,"failed to allocate fixed rdesc\n" ); rc = -ENOMEM ; goto cleanup; }
Signature · 1 line
2.9.3
PATCH 5/9 HID: uclogic: Switch to reporting abstract button events
In reply to Nikolai KondrashovFrom: Benjamin Tissoires <[email protected]>
Based on a patch from: Nikolai Kondrashov <[email protected]>
Enable abstract keyboard mode for Huion tablets, which makes them report frame buttons using the pen interface and report ID. Divert these reports to a virtual report ID describing them.
This makes the tablet compatible with xf86-input-wacom and libinput, but stops the frame buttons from reporting keyboard events.
Signed-off-by Nikolai Kondrashov <[email protected]>
Signed-off-by Benjamin Tissoires <[email protected]>
--- drivers/hid/hid-uclogic.c | 102 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 5 deletions(-)
drivers/hid/hid-uclogic.c +97 -5
@@ -586,6 +586,27 @@ static const __u8 uclogic_tablet_rdesc_template[] = {0xC0 /* End Collection */ }; +/* Fixed virtual pad report descriptor */ +static const __u8 uclogic_buttonpad_rdesc[] = { +0x05 ,0x01 ,/* Usage Page (Desktop), */ +0x09 ,0x07 ,/* Usage (Keypad), */ +0xA1 ,0x01 ,/* Collection (Application), */ +0x85 ,0xF7 ,/* Report ID (247), */ +0x05 ,0x0D ,/* Usage Page (Digitizers), */ +0x09 ,0x39 ,/* Usage (Tablet Function Keys), */ +0xA0 ,/* Collection (Physical), */ +0x05 ,0x09 ,/* Usage Page (Button), */ +0x75 ,0x01 ,/* Report Size (1), */ +0x95 ,0x18 ,/* Report Count (24), */ +0x81 ,0x03 ,/* Input (Constant, Variable), */ +0x19 ,0x01 ,/* Usage Minimum (01h), */ +0x29 ,0x08 ,/* Usage Maximum (08h), */ +0x95 ,0x08 ,/* Report Count (8), */ +0x81 ,0x02 ,/* Input (Variable), */ +0xC0 ,/* End Collection */ +0xC0 /* End Collection */ +}; +/* Parameter indices */ enum uclogic_prm {UCLOGIC_PRM_X_LM =1 ,
@@ -601,6 +622,7 @@ struct uclogic_drvdata {unsigned int rsize;bool invert_pen_inrange;bool ignore_pen_usage; +bool has_virtual_pad_interface; }; static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -847,6 +869,69 @@ cleanup:return rc; } +/** +* Enable actual button mode. +* +* @hdev: HID device +*/ +static int uclogic_button_enable (struct hid_device *hdev) +{ +int rc; +struct usb_device *usb_dev =hid_to_usb_dev (hdev); +struct uclogic_drvdata *drvdata =hid_get_drvdata (hdev); +char *str_buf; +size_t str_len =16 ; +unsigned char *rdesc; +size_t rdesc_len; + + str_buf =kzalloc (str_len,GFP_KERNEL ); +if (str_buf ==NULL ) { + rc = -ENOMEM ; + goto cleanup; + } + +/* Enable abstract keyboard mode */ + rc =usb_string (usb_dev,0x7b , str_buf, str_len); +if (rc == -EPIPE ) { +hid_info (hdev,"button mode setting not found\n" ); + rc =0 ; + goto cleanup; + }else if (rc <0 ) { +hid_err (hdev,"failed to enable abstract keyboard\n" ); + goto cleanup; + }else if (strncmp (str_buf,"HK On" , rc)) { +hid_info (hdev,"invalid answer when requesting buttons: '%s'\n" , + str_buf); + rc = -EINVAL ; + goto cleanup; + } + +/* Re-allocate fixed report descriptor */ + rdesc_len = drvdata->rsize +sizeof (uclogic_buttonpad_rdesc); + rdesc =devm_kzalloc (&hdev->dev, rdesc_len,GFP_KERNEL ); +if (!rdesc) { + rc = -ENOMEM ; + goto cleanup; + } + +memcpy (rdesc, drvdata->rdesc, drvdata->rsize); + +/* Append the buttonpad descriptor */ +memcpy (rdesc + drvdata->rsize, uclogic_buttonpad_rdesc, +sizeof (uclogic_buttonpad_rdesc)); + +/* clean up old rdesc and use the new one */ + drvdata->rsize = rdesc_len; +devm_kfree (&hdev->dev, drvdata->rdesc); + drvdata->rdesc = rdesc; + + rc =0 ; + +cleanup: +kfree (str_buf); +return rc; +} +static int uclogic_probe (struct hid_device *hdev,const struct hid_device_id *id) {
@@ -878,6 +963,9 @@ static int uclogic_probe(struct hid_device *hdev,return rc; } drvdata->invert_pen_inrange = true; + + rc =uclogic_button_enable (hdev); + drvdata->has_virtual_pad_interface = !rc; }else { drvdata->ignore_pen_usage = true; }
@@ -904,12 +992,16 @@ static int uclogic_raw_event(struct hid_device *hdev, struct hid_report *report, {struct uclogic_drvdata *drvdata =hid_get_drvdata (hdev); -if ((drvdata->invert_pen_inrange) && - (report->type ==HID_INPUT_REPORT ) && +if ((report->type ==HID_INPUT_REPORT ) && (report->id ==UCLOGIC_PEN_REPORT_ID ) && - (size >=2 )) -/* Invert the in-range bit */ - data[1 ] ^=0x40 ; + (size >=2 )) { +if (drvdata->has_virtual_pad_interface && (data[1 ] &0x20 )) +/* Change to virtual frame button report ID */ + data[0 ] =0xf7 ; +else if (drvdata->invert_pen_inrange) +/* Invert the in-range bit */ + data[1 ] ^=0x40 ; + }return 0 ; }
Signature · 1 line
2.9.3
PATCH 6/9 HID: uclogic: Add support for several more tablets
In reply to Nikolai KondrashovAdd more product IDs to hid-uclogic.c driver to support several more tablet models, including:
UC-Logic DrawImage G3
aka Ugee G3
UC-Logic SP1001
aka Ugee SP1001
aka Yiynova UC-Logic SP-1001
Ugee 1000L
Ugee M708
Yiynova DP10U
aka Yiynova DP10U+
Yiynova MSP19U
Yiynova MSP19U+
Yiynova MVP10U
aka Yiynova MVP10U IPS
Yiynova MVP10UHD+IPS
Yiynova MVP22U+
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-core.c | 4 ++++ drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-uclogic.c | 8 ++++++++ 3 files changed, 16 insertions(+)
drivers/hid/hid-core.c +4 -0
@@ -2083,6 +2083,10 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP1062) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },
drivers/hid/hid-ids.h +4 -0
@@ -996,6 +996,10 @@#define USB_DEVICE_ID_UCLOGIC_TABLET_WP1062 0x0064#define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850 0x0522#define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 0x0781 +#define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 0x3031 +#define USB_DEVICE_ID_UGEE_TABLET_81 0x0081 +#define USB_DEVICE_ID_UGEE_TABLET_45 0x0045 +#define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d#define USB_VENDOR_ID_UNITEC 0x227d#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
drivers/hid/hid-uclogic.c +8 -0
@@ -955,6 +955,10 @@ static int uclogic_probe(struct hid_device *hdev,switch (id->product) {case USB_DEVICE_ID_HUION_TABLET : +case USB_DEVICE_ID_YIYNOVA_TABLET : +case USB_DEVICE_ID_UGEE_TABLET_81 : +case USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 : +case USB_DEVICE_ID_UGEE_TABLET_45 :/* If this is the pen interface */ if (intf->cur_altsetting->desc.bInterfaceNumber ==0 ) { rc =uclogic_tablet_enable (hdev);
@@ -1023,6 +1027,10 @@ static const struct hid_device_id uclogic_devices[] = { USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) }, { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, { } };MODULE_DEVICE_TABLE (hid, uclogic_devices);
Signature · 1 line
2.9.3
PATCH 7/9 HID: uclogic: Support UGTizer GP0610 partially
In reply to Nikolai KondrashovAdd partial support for the UGTizer GP0610 tablet (aka iBall PF1064U, aka UGTizer GT1060) to the hid-uclogic.c driver.
The pen input is supported fully, but frame buttons and wheel don't work yet.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-uclogic.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+)
drivers/hid/hid-core.c +1 -0
@@ -2087,6 +2087,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },
drivers/hid/hid-ids.h +3 -0
@@ -1089,4 +1089,7 @@#define USB_DEVICE_ID_RAPHNET_2NES2SNES 0x0002#define USB_DEVICE_ID_RAPHNET_4NES4SNES 0x0003 +#define USB_VENDOR_ID_UGTIZER 0x2179 +#define USB_DEVICE_ID_UGTIZER_TABLET_GP0610 0x0053 +#endif
drivers/hid/hid-uclogic.c +14 -0
@@ -974,6 +974,19 @@ static int uclogic_probe(struct hid_device *hdev, drvdata->ignore_pen_usage = true; }break ; +case USB_DEVICE_ID_UGTIZER_TABLET_GP0610 : +/* If this is the pen interface */ +if (intf->cur_altsetting->desc.bInterfaceNumber ==1 ) { + rc =uclogic_tablet_enable (hdev); +if (rc) { +hid_err (hdev,"tablet enabling failed\n" ); +return rc; + } + drvdata->invert_pen_inrange = true; + }else { + drvdata->ignore_pen_usage = true; + } +break ; } rc =hid_parse (hdev);
@@ -1031,6 +1044,7 @@ static const struct hid_device_id uclogic_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, { } };MODULE_DEVICE_TABLE (hid, uclogic_devices);
Signature · 1 line
2.9.3
PATCH 8/9 HID: uclogic: Override constant descriptors
In reply to Nikolai KondrashovMake uclogic_report_fixup override constant descriptors with generated descriptors, so models reusing product ID, but working with generated descriptor get correct one.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-uclogic.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/hid/hid-uclogic.c +6 -5
@@ -632,6 +632,12 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,__u8 iface_num = iface->cur_altsetting->desc.bInterfaceNumber;struct uclogic_drvdata *drvdata =hid_get_drvdata (hdev); +if (drvdata->rdesc !=NULL ) { + rdesc = drvdata->rdesc; + *rsize = drvdata->rsize; +return rdesc; + } +switch (hdev->product) {case USB_DEVICE_ID_UCLOGIC_TABLET_PF1209 :if (*rsize ==PF1209_RDESC_ORIG_SIZE ) {
@@ -701,11 +707,6 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,break ; }break ; -default : -if (drvdata->rdesc !=NULL ) { - rdesc = drvdata->rdesc; - *rsize = drvdata->rsize; - } }return rdesc;
Signature · 1 line
2.9.3
PATCH 9/9 HID: uclogic: Add support for UC-Logic TWHA60 v3
In reply to Nikolai KondrashovAdd support for the third version of UC-Logic TWHA60, which has three interfaces and responds to initialization.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-uclogic.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/hid/hid-uclogic.c +23 -0
@@ -938,6 +938,7 @@ static int uclogic_probe(struct hid_device *hdev, {int rc;struct usb_interface *intf =to_usb_interface (hdev->dev.parent); +struct usb_device *udev =hid_to_usb_dev (hdev);struct uclogic_drvdata *drvdata;/*
@@ -988,6 +989,28 @@ static int uclogic_probe(struct hid_device *hdev, drvdata->ignore_pen_usage = true; }break ; +case USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 : +/* +* If it is the three-interface version, which is known to +* respond to initialization. +*/ +if (udev->config->desc.bNumInterfaces ==3 ) { +/* If it is the pen interface */ +if (intf->cur_altsetting->desc.bInterfaceNumber ==0 ) { + rc =uclogic_tablet_enable (hdev); +if (rc) { +hid_err (hdev,"tablet enabling failed\n" ); +return rc; + } + drvdata->invert_pen_inrange = true; + + rc =uclogic_button_enable (hdev); + drvdata->has_virtual_pad_interface = !rc; + }else { + drvdata->ignore_pen_usage = true; + } + } +break ; } rc =hid_parse (hdev);
Signature · 1 line
2.9.3
Quoted 8 lines · Nikolai Kondrashov
Quoted 2 lines · Benjamin Tissoires
For this one and 7/9, I think you forgot the
hid-core.cchanges to not bind hid-generic on those.Thanks, Benjamin! Yes, I forgot those. Perhaps I could have just sent the two patches fixed, but I respun the whole set with the hid-core changes added, just in case. Hope that's not bothersome.
As replied in v1, the series is:
Reviewed-by Benjamin Tissoires <[email protected]>
BTW, patch 5/9 seems to be required for the Huion DWH69 which directly reports the buttons and not the keycode emulation:
https://bugs.freedesktop.org/show_bug.cgi?id=97771
Cheers,
Benjamin
Quoted 1 line
Nick
Quoted 5 lines · Benjamin Tissoires
Quoted 4 lines · Nikolai Kondrashov
Quoted 2 lines · Benjamin Tissoires
For this one and 7/9, I think you forgot the
hid-core.cchanges to not bind hid-generic on those.
Quoted 7 lines
Quoted 4 lines
Thanks, Benjamin! Yes, I forgot those. Perhaps I could have just sent the two patches fixed, but I respun the whole set with the hid-core changes added, just in case. Hope that's not bothersome.
As replied in v1, the series is:
Reviewed-by Benjamin Tissoires <[email protected]>
Thanks, Benjamin!
Quoted 3 lines
BTW, patch 5/9 seems to be required for the Huion DWH69 which directly reports the buttons and not the keycode emulation:
https://bugs.freedesktop.org/show_bug.cgi?id=97771
Ah, good to know. Unfortunately, as you know, I'm no longer working on new tablet support.
I wonder what's the problem with KERNEL_VERSION comparison there, though.
Nick
Quoted 6 lines · Nikolai Kondrashov
Quoted 2 lines
For this one and 7/9, I think you forgot the
hid-core.cchanges to not bind hid-generic on those.Thanks, Benjamin! Yes, I forgot those. Perhaps I could have just sent the two patches fixed, but I respun the whole set with the hid-core changes added, just in case. Hope that's not bothersome.
Thanks, applied the whole lot to hid.git#for-4.9/kye-uclogic-waltop-fixes
Signature · 2 lines
Jiri Kosina SUSE Labs
PATCH 7/9 HID: uclogic: Support UGTizer GP0610 partially
In reply to Nikolai KondrashovAdd partial support for the UGTizer GP0610 tablet (aka iBall PF1064U, aka UGTizer GT1060) to the hid-uclogic.c driver.
The pen input is supported fully, but frame buttons and wheel don't work yet.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-uclogic.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -1089,4 +1089,7 @@#define USB_DEVICE_ID_RAPHNET_2NES2SNES 0x0002#define USB_DEVICE_ID_RAPHNET_4NES4SNES 0x0003 +#define USB_VENDOR_ID_UGTIZER 0x2179 +#define USB_DEVICE_ID_UGTIZER_TABLET_GP0610 0x0053 +#endif
drivers/hid/hid-uclogic.c +14 -0
@@ -974,6 +974,19 @@ static int uclogic_probe(struct hid_device *hdev, drvdata->ignore_pen_usage = true; }break ; +case USB_DEVICE_ID_UGTIZER_TABLET_GP0610 : +/* If this is the pen interface */ +if (intf->cur_altsetting->desc.bInterfaceNumber ==1 ) { + rc =uclogic_tablet_enable (hdev); +if (rc) { +hid_err (hdev,"tablet enabling failed\n" ); +return rc; + } + drvdata->invert_pen_inrange = true; + }else { + drvdata->ignore_pen_usage = true; + } +break ; } rc =hid_parse (hdev);
@@ -1031,6 +1044,7 @@ static const struct hid_device_id uclogic_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) }, { } };MODULE_DEVICE_TABLE (hid, uclogic_devices);
Signature · 1 line
2.9.3
PATCH 8/9 HID: uclogic: Override constant descriptors
In reply to Nikolai KondrashovMake uclogic_report_fixup override constant descriptors with generated descriptors, so models reusing product ID, but working with generated descriptor get correct one.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-uclogic.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/hid/hid-uclogic.c +6 -5
@@ -632,6 +632,12 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,__u8 iface_num = iface->cur_altsetting->desc.bInterfaceNumber;struct uclogic_drvdata *drvdata =hid_get_drvdata (hdev); +if (drvdata->rdesc !=NULL ) { + rdesc = drvdata->rdesc; + *rsize = drvdata->rsize; +return rdesc; + } +switch (hdev->product) {case USB_DEVICE_ID_UCLOGIC_TABLET_PF1209 :if (*rsize ==PF1209_RDESC_ORIG_SIZE ) {
@@ -701,11 +707,6 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,break ; }break ; -default : -if (drvdata->rdesc !=NULL ) { - rdesc = drvdata->rdesc; - *rsize = drvdata->rsize; - } }return rdesc;
Signature · 1 line
2.9.3
PATCH 9/9 HID: uclogic: Add support for UC-Logic TWHA60 v3
In reply to Nikolai KondrashovAdd support for the third version of UC-Logic TWHA60, which has three interfaces and responds to initialization.
Signed-off-by Nikolai Kondrashov <[email protected]>
--- drivers/hid/hid-uclogic.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/hid/hid-uclogic.c +23 -0
@@ -938,6 +938,7 @@ static int uclogic_probe(struct hid_device *hdev, {int rc;struct usb_interface *intf =to_usb_interface (hdev->dev.parent); +struct usb_device *udev =hid_to_usb_dev (hdev);struct uclogic_drvdata *drvdata;/*
@@ -988,6 +989,28 @@ static int uclogic_probe(struct hid_device *hdev, drvdata->ignore_pen_usage = true; }break ; +case USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 : +/* +* If it is the three-interface version, which is known to +* respond to initialization. +*/ +if (udev->config->desc.bNumInterfaces ==3 ) { +/* If it is the pen interface */ +if (intf->cur_altsetting->desc.bInterfaceNumber ==0 ) { + rc =uclogic_tablet_enable (hdev); +if (rc) { +hid_err (hdev,"tablet enabling failed\n" ); +return rc; + } + drvdata->invert_pen_inrange = true; + + rc =uclogic_button_enable (hdev); + drvdata->has_virtual_pad_interface = !rc; + }else { + drvdata->ignore_pen_usage = true; + } + } +break ; } rc =hid_parse (hdev);
Signature · 1 line
2.9.3