HID: kye: Add support for MousePen M508X
PATCH 1/1 HID: kye: Add support for MousePen M508X
Genius MousePen M508X digitizer tablet sends incorrect report descriptor by default. This patch replaces it with a corrected one.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-kye.c | 152 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 144 insertions(+), 9 deletions(-)
drivers/hid/hid-ids.h +1 -0
@@ -716,6 +716,7 @@#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 +#define USB_DEVICE_ID_KYE_MOUSEPEN_M508X 0x5017#define USB_DEVICE_ID_KYE_EASYPEN_M406XE 0x5019#define USB_VENDOR_ID_LABTEC 0x1020
drivers/hid/hid-kye.c +143 -9
189 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 1/1 HID: kye: Add support for MousePen M508X
Genius MousePen M508X digitizer tablet sends incorrect report descriptor by default. This patch replaces it with a corrected one.
---
v2: add missing hid-quirks.c entry
drivers/hid/hid-ids.h | 1 + drivers/hid/hid-kye.c | 152 ++++++++++++++++++++++++++++++++++++--- drivers/hid/hid-quirks.c | 1 + 3 files changed, 145 insertions(+), 9 deletions(-)
drivers/hid/hid-ids.h +1 -0
@@ -716,6 +716,7 @@#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 +#define USB_DEVICE_ID_KYE_MOUSEPEN_M508X 0x5017#define USB_DEVICE_ID_KYE_EASYPEN_M406XE 0x5019#define USB_VENDOR_ID_LABTEC 0x1020
drivers/hid/hid-kye.c +143 -9
189 lines not on this page · raw message
drivers/hid/hid-quirks.c +1 -0
@@ -108,6 +108,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_M508X), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL },
Signature · 1 line
2.35.1
PATCH v3 1/1 HID: kye: Add support for MousePen M508X
Genius MousePen M508X digitizer tablet sends incorrect report descriptor by default. This patch replaces it with a corrected one.
---
v2: add missing hid-quirks.c entry
v3: minor fix of descriptor
drivers/hid/hid-ids.h | 1 + drivers/hid/hid-kye.c | 152 ++++++++++++++++++++++++++++++++++++--- drivers/hid/hid-quirks.c | 1 + 3 files changed, 145 insertions(+), 9 deletions(-)
drivers/hid/hid-ids.h +1 -0
@@ -716,6 +716,7 @@#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 +#define USB_DEVICE_ID_KYE_MOUSEPEN_M508X 0x5017#define USB_DEVICE_ID_KYE_EASYPEN_M406XE 0x5019#define USB_VENDOR_ID_LABTEC 0x1020
drivers/hid/hid-kye.c +143 -9
189 lines not on this page · raw message
drivers/hid/hid-quirks.c +1 -0
@@ -108,6 +108,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_M508X), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL },
Signature · 1 line
2.35.1
Jiri Kosina
maintainerQuoted 4 lines · David Yang
Genius MousePen M508X digitizer tablet sends incorrect report descriptor by default. This patch replaces it with a corrected one.
Signed-off-by David Yang <[email protected]>
Thanks for the fix. A few comments below.
Quoted 18 lines
drivers/hid/hid-kye.c +2
-6@@ -626,18 +751,24 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, *rsize =sizeof (easypen_m610x_rdesc_fixed); }break ; -case USB_DEVICE_ID_KYE_EASYPEN_M406XE : -if (*rsize ==EASYPEN_M406XE_RDESC_ORIG_SIZE ) { - rdesc = easypen_m406xe_rdesc_fixed; - *rsize =sizeof (easypen_m406xe_rdesc_fixed); - } -break ;case USB_DEVICE_ID_KYE_PENSKETCH_M912 :if (*rsize ==PENSKETCH_M912_RDESC_ORIG_SIZE ) { rdesc = pensketch_m912_rdesc_fixed; *rsize =sizeof (pensketch_m912_rdesc_fixed); }break ; +case USB_DEVICE_ID_KYE_MOUSEPEN_M508X : +if (*rsize ==MOUSEPEN_M508X_RDESC_ORIG_SIZE ) {
drivers/hid/hid-kye.c static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, · line 771
Quoted 10 lines
drivers/hid/hid-kye.c +10
-0+ rdesc = mousepen_m508x_rdesc_fixed; + *rsize =sizeof (mousepen_m508x_rdesc_fixed); + } +break ; +case USB_DEVICE_ID_KYE_EASYPEN_M406XE : +if (*rsize ==EASYPEN_M406XE_RDESC_ORIG_SIZE ) { + rdesc = easypen_m406xe_rdesc_fixed; + *rsize =sizeof (easypen_m406xe_rdesc_fixed); + } +break ;
What is the reason for moving USB_DEVICE_ID_KYE_EASYPEN_M406XE around?
drivers/hid/hid-kye.c static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id) · line 857
Quoted 11 lines
drivers/hid/hid-kye.c +2
-1case USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE : rdesc =kye_consumer_control_fixup (hdev, rdesc, rsize,104 ,"Genius Gila Gaming Mouse" );@@ -721,8 +852,9 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)case USB_DEVICE_ID_KYE_MOUSEPEN_I608X :case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :case USB_DEVICE_ID_KYE_EASYPEN_M610X : -case USB_DEVICE_ID_KYE_EASYPEN_M406XE :case USB_DEVICE_ID_KYE_PENSKETCH_M912 : +case USB_DEVICE_ID_KYE_MOUSEPEN_M508X : +case USB_DEVICE_ID_KYE_EASYPEN_M406XE :
Same here.
Quoted 15 lines
drivers/hid/hid-kye.c +4
-0ret =kye_tablet_enable (hdev);if (ret) {hid_err (hdev,"tablet enabling failed\n" );@@ -756,6 +888,10 @@ static const struct hid_device_id kye_devices[] = { 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_KYE, + USB_DEVICE_ID_KYE_MOUSEPEN_M508X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE,
drivers/hid/hid-kye.c static const struct hid_device_id kye_devices[] = { · line 768
Quoted 5 lines
drivers/hid/hid-kye.c +0
-2@@ -764,8 +900,6 @@ static const struct hid_device_id kye_devices[] = { USB_DEVICE_ID_GENIUS_GX_IMPERATOR) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, - USB_DEVICE_ID_KYE_PENSKETCH_M912) },
This looks unrelated and incorrect, why are you dropping USB_DEVICE_ID_KYE_PENSKETCH_M912 from the device table?
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 32 lines · Jiri Kosina <[email protected]> 于2022年11月22日周二 17:29写道:
Quoted 4 lines · David Yang
Genius MousePen M508X digitizer tablet sends incorrect report descriptor by default. This patch replaces it with a corrected one.
Signed-off-by David Yang <[email protected]>Thanks for the fix. A few comments below.
Quoted 22 lines
drivers/hid/hid-kye.c +6
-6@@ -626,18 +751,24 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, *rsize =sizeof (easypen_m610x_rdesc_fixed); }break ; -case USB_DEVICE_ID_KYE_EASYPEN_M406XE : -if (*rsize ==EASYPEN_M406XE_RDESC_ORIG_SIZE ) { - rdesc = easypen_m406xe_rdesc_fixed; - *rsize =sizeof (easypen_m406xe_rdesc_fixed); - } -break ;case USB_DEVICE_ID_KYE_PENSKETCH_M912 :if (*rsize ==PENSKETCH_M912_RDESC_ORIG_SIZE ) { rdesc = pensketch_m912_rdesc_fixed; *rsize =sizeof (pensketch_m912_rdesc_fixed); }break ; +case USB_DEVICE_ID_KYE_MOUSEPEN_M508X : +if (*rsize ==MOUSEPEN_M508X_RDESC_ORIG_SIZE ) { + rdesc = mousepen_m508x_rdesc_fixed; + *rsize =sizeof (mousepen_m508x_rdesc_fixed); + } +break ;
Quoted 9 lines
drivers/hid/hid-kye.c static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, · line 771
Quoted 6 lines
drivers/hid/hid-kye.c +6
-0+case USB_DEVICE_ID_KYE_EASYPEN_M406XE : +if (*rsize ==EASYPEN_M406XE_RDESC_ORIG_SIZE ) { + rdesc = easypen_m406xe_rdesc_fixed; + *rsize =sizeof (easypen_m406xe_rdesc_fixed); + } +break ;What is the reason for moving
USB_DEVICE_ID_KYE_EASYPEN_M406XEaround?
Reorder to match the sequence of device ids in hid-ids.h. Same below.
Quoted 29 lines
drivers/hid/hid-kye.c static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id) · line 857
Quoted 11 lines
drivers/hid/hid-kye.c +2
-1case USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE : rdesc =kye_consumer_control_fixup (hdev, rdesc, rsize,104 ,"Genius Gila Gaming Mouse" );@@ -721,8 +852,9 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)case USB_DEVICE_ID_KYE_MOUSEPEN_I608X :case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 :case USB_DEVICE_ID_KYE_EASYPEN_M610X : -case USB_DEVICE_ID_KYE_EASYPEN_M406XE :case USB_DEVICE_ID_KYE_PENSKETCH_M912 : +case USB_DEVICE_ID_KYE_MOUSEPEN_M508X : +case USB_DEVICE_ID_KYE_EASYPEN_M406XE :Same here.
Quoted 15 lines
drivers/hid/hid-kye.c +4
-0ret =kye_tablet_enable (hdev);if (ret) {hid_err (hdev,"tablet enabling failed\n" );@@ -756,6 +888,10 @@ static const struct hid_device_id kye_devices[] = { 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_KYE, + USB_DEVICE_ID_KYE_MOUSEPEN_M508X) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE,@@ -764,8 +900,6 @@ static const struct hid_device_id kye_devices[] = {
Quoted 9 lines
drivers/hid/hid-kye.c static const struct hid_device_id kye_devices[] = { · line 768
Quoted 5 lines
drivers/hid/hid-kye.c +0
-2USB_DEVICE_ID_GENIUS_GX_IMPERATOR) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, - USB_DEVICE_ID_KYE_PENSKETCH_M912) },This looks unrelated and incorrect, why are you dropping
USB_DEVICE_ID_KYE_PENSKETCH_M912from the device table?
USB_DEVICE_ID_KYE_PENSKETCH_M912 is moved upward, see -756,6 +888,10.
Quoted 6 lines
Thanks,
--
Jiri Kosina
SUSE Labs