Skip to content

Commit 8c7b79b

Browse files
yangflJiri Kosina
yangfl
authored and
Jiri Kosina
committed
HID: kye: Sort kye devices
Sort kye devices by their Produce IDs. Signed-off-by: David Yang <mmyangfl@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1 parent 4782c0e commit 8c7b79b

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎drivers/hid/hid-ids.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,10 +720,10 @@
720720
#define USB_DEVICE_ID_KYE_GPEN_560 0x5003
721721
#define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010
722722
#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X 0x5011
723-
#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 0x501a
724723
#define USB_DEVICE_ID_KYE_EASYPEN_M610X 0x5013
725724
#define USB_DEVICE_ID_KYE_PENSKETCH_M912 0x5015
726725
#define USB_DEVICE_ID_KYE_EASYPEN_M406XE 0x5019
726+
#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 0x501A
727727

728728
#define USB_VENDOR_ID_LABTEC 0x1020
729729
#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006

‎drivers/hid/hid-kye.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -329,25 +329,25 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
329329
rdesc[74] = 0x08;
330330
}
331331
break;
332-
case USB_DEVICE_ID_KYE_EASYPEN_I405X:
333-
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X:
334-
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2:
335-
case USB_DEVICE_ID_KYE_EASYPEN_M610X:
336-
case USB_DEVICE_ID_KYE_EASYPEN_M406XE:
337-
case USB_DEVICE_ID_KYE_PENSKETCH_M912:
338-
rdesc = kye_tablet_fixup(hdev, rdesc, rsize);
339-
break;
340332
case USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE:
341333
rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,
342334
"Genius Gila Gaming Mouse");
343335
break;
336+
case USB_DEVICE_ID_GENIUS_MANTICORE:
337+
rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,
338+
"Genius Manticore Keyboard");
339+
break;
344340
case USB_DEVICE_ID_GENIUS_GX_IMPERATOR:
345341
rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83,
346342
"Genius Gx Imperator Keyboard");
347343
break;
348-
case USB_DEVICE_ID_GENIUS_MANTICORE:
349-
rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,
350-
"Genius Manticore Keyboard");
344+
case USB_DEVICE_ID_KYE_EASYPEN_I405X:
345+
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X:
346+
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2:
347+
case USB_DEVICE_ID_KYE_EASYPEN_M610X:
348+
case USB_DEVICE_ID_KYE_EASYPEN_M406XE:
349+
case USB_DEVICE_ID_KYE_PENSKETCH_M912:
350+
rdesc = kye_tablet_fixup(hdev, rdesc, rsize);
351351
break;
352352
}
353353
return rdesc;
@@ -417,26 +417,26 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)
417417
}
418418

419419
switch (id->product) {
420+
case USB_DEVICE_ID_GENIUS_MANTICORE:
421+
/*
422+
* The manticore keyboard needs to have all the interfaces
423+
* opened at least once to be fully functional.
424+
*/
425+
if (hid_hw_open(hdev))
426+
hid_hw_close(hdev);
427+
break;
420428
case USB_DEVICE_ID_KYE_EASYPEN_I405X:
421429
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X:
422-
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2:
423430
case USB_DEVICE_ID_KYE_EASYPEN_M610X:
424-
case USB_DEVICE_ID_KYE_EASYPEN_M406XE:
425431
case USB_DEVICE_ID_KYE_PENSKETCH_M912:
432+
case USB_DEVICE_ID_KYE_EASYPEN_M406XE:
433+
case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2:
426434
ret = kye_tablet_enable(hdev);
427435
if (ret) {
428436
hid_err(hdev, "tablet enabling failed\n");
429437
goto enabling_err;
430438
}
431439
break;
432-
case USB_DEVICE_ID_GENIUS_MANTICORE:
433-
/*
434-
* The manticore keyboard needs to have all the interfaces
435-
* opened at least once to be fully functional.
436-
*/
437-
if (hid_hw_open(hdev))
438-
hid_hw_close(hdev);
439-
break;
440440
}
441441

442442
return 0;
@@ -449,23 +449,23 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)
449449
static const struct hid_device_id kye_devices[] = {
450450
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
451451
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
452-
USB_DEVICE_ID_KYE_EASYPEN_I405X) },
452+
USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
453453
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
454-
USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },
454+
USB_DEVICE_ID_GENIUS_MANTICORE) },
455455
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
456-
USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) },
456+
USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },
457457
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
458-
USB_DEVICE_ID_KYE_EASYPEN_M610X) },
458+
USB_DEVICE_ID_KYE_EASYPEN_I405X) },
459459
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
460-
USB_DEVICE_ID_KYE_EASYPEN_M406XE) },
460+
USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },
461461
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
462-
USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
462+
USB_DEVICE_ID_KYE_EASYPEN_M610X) },
463463
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
464-
USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },
464+
USB_DEVICE_ID_KYE_PENSKETCH_M912) },
465465
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
466-
USB_DEVICE_ID_GENIUS_MANTICORE) },
466+
USB_DEVICE_ID_KYE_EASYPEN_M406XE) },
467467
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
468-
USB_DEVICE_ID_KYE_PENSKETCH_M912) },
468+
USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) },
469469
{ }
470470
};
471471
MODULE_DEVICE_TABLE(hid, kye_devices);

‎drivers/hid/hid-quirks.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ static const struct hid_device_id hid_quirks[] = {
104104
{ HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_1f4a), HID_QUIRK_ALWAYS_POLL },
105105
{ HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6680), HID_QUIRK_MULTI_INPUT },
106106
{ HID_USB_DEVICE(USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI), HID_QUIRK_MULTI_INPUT },
107-
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X), HID_QUIRK_MULTI_INPUT },
107+
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },
108108
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X), HID_QUIRK_MULTI_INPUT },
109-
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2), HID_QUIRK_MULTI_INPUT },
109+
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X), HID_QUIRK_MULTI_INPUT },
110110
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT },
111111
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },
112-
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },
112+
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2), HID_QUIRK_MULTI_INPUT },
113113
{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL },
114114
{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL },
115115
{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019), HID_QUIRK_ALWAYS_POLL },

0 commit comments

Comments
 (0)