Skip to content

Commit d2c93fa

Browse files
daphSasha Levin
daph
authored and
Sasha Levin
committed
HID: elecom: Add support for ELECOM HUGE Plus M-HT1MRBK
[ Upstream commit b8e5fdf0bd022cd5493a5987ef66f5a24f8352d8 ] New model in the ELECOM HUGE trackball line that has 8 buttons but the report descriptor specifies only 5. The HUGE Plus supports connecting via Bluetooth, 2.4GHz wireless USB dongle, and directly via a USB-C cable. Each connection type reports a different device id, 01AA for cable, 01AB for USB dongle, and 01AC for Bluetooth. This patch adds these device IDs and applies the fixups similar to the other ELECOM devices to get all 8 buttons working for all 3 connection types. For reference, the usbhid-dump output: 001:013:001:DESCRIPTOR 1769085639.598405 05 01 09 02 A1 01 85 01 09 01 A1 00 05 09 19 01 29 05 15 00 25 01 75 01 95 05 81 02 75 03 95 01 81 01 05 01 09 30 09 31 16 01 80 26 FF 7F 75 10 95 02 81 06 09 38 15 81 25 7F 75 08 95 01 81 06 05 0C 0A 38 02 15 81 25 7F 75 08 95 01 81 06 C0 C0 05 0C 09 01 A1 01 85 02 15 01 26 8C 02 19 01 2A 8C 02 75 10 95 01 81 00 C0 05 01 09 80 A1 01 85 03 09 82 09 81 09 83 15 00 25 01 19 01 29 03 75 01 95 03 81 02 95 05 81 01 C0 06 01 FF 09 00 A1 01 85 08 09 00 15 00 26 FF 00 75 08 95 07 81 02 C0 06 02 FF 09 02 A1 01 85 06 09 02 15 00 26 FF 00 75 08 95 07 B1 02 C0 Signed-off-by: David Phillips <david@profile.sh> Signed-off-by: Jiri Kosina <jkosina@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 0e266b2 commit d2c93fa

4 files changed

Lines changed: 23 additions & 0 deletions

File tree

‎drivers/hid/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ config HID_ELECOM
337337
- EX-G Trackballs (M-XT3DRBK, M-XT3URBK)
338338
- DEFT Trackballs (M-DT1DRBK, M-DT1URBK, M-DT2DRBK, M-DT2URBK)
339339
- HUGE Trackballs (M-HT1DRBK, M-HT1URBK)
340+
- HUGE Plus Trackball (M-HT1MRBK)
340341

341342
config HID_ELO
342343
tristate "ELO USB 4000/4500 touchscreen"

‎drivers/hid/hid-elecom.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* - EX-G Trackballs (M-XT3DRBK, M-XT3URBK, M-XT4DRBK)
66
* - DEFT Trackballs (M-DT1DRBK, M-DT1URBK, M-DT2DRBK, M-DT2URBK)
77
* - HUGE Trackballs (M-HT1DRBK, M-HT1URBK)
8+
* - HUGE Plus Trackball (M-HT1MRBK)
89
*
910
* Copyright (c) 2010 Richard Nauber <Richard.Nauber@gmail.com>
1011
* Copyright (c) 2016 Yuxuan Shui <yshuiv7@gmail.com>
@@ -111,12 +112,25 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc,
111112
*/
112113
mouse_button_fixup(hdev, rdesc, *rsize, 22, 30, 24, 16, 8);
113114
break;
115+
case USB_DEVICE_ID_ELECOM_M_HT1MRBK:
116+
case USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AB:
117+
case USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AC:
118+
/*
119+
* Report descriptor format:
120+
* 24: button bit count
121+
* 28: padding bit count
122+
* 22: button report size
123+
* 16: button usage maximum
124+
*/
125+
mouse_button_fixup(hdev, rdesc, *rsize, 24, 28, 22, 16, 8);
126+
break;
114127
}
115128
return rdesc;
116129
}
117130

118131
static const struct hid_device_id elecom_devices[] = {
119132
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
133+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AC) },
120134
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XGL20DLBK) },
121135
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB) },
122136
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_018F) },
@@ -127,6 +141,8 @@ static const struct hid_device_id elecom_devices[] = {
127141
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) },
128142
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK_010D) },
129143
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK_011C) },
144+
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1MRBK) },
145+
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AB) },
130146
{ }
131147
};
132148
MODULE_DEVICE_TABLE(hid, elecom_devices);

‎drivers/hid/hid-ids.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,9 @@
429429
#define USB_DEVICE_ID_ELECOM_M_HT1URBK 0x010c
430430
#define USB_DEVICE_ID_ELECOM_M_HT1DRBK_010D 0x010d
431431
#define USB_DEVICE_ID_ELECOM_M_HT1DRBK_011C 0x011c
432+
#define USB_DEVICE_ID_ELECOM_M_HT1MRBK 0x01aa
433+
#define USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AB 0x01ab
434+
#define USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AC 0x01ac
432435

433436
#define USB_VENDOR_ID_DREAM_CHEEKY 0x1d34
434437
#define USB_DEVICE_ID_DREAM_CHEEKY_WN 0x0004

‎drivers/hid/hid-quirks.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
392392
#if IS_ENABLED(CONFIG_HID_ELECOM)
393393
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
394394
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XGL20DLBK) },
395+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AC) },
395396
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_00FB) },
396397
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK_018F) },
397398
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) },
@@ -401,6 +402,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
401402
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) },
402403
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK_010D) },
403404
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK_011C) },
405+
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1MRBK) },
406+
{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1MRBK_01AB) },
404407
#endif
405408
#if IS_ENABLED(CONFIG_HID_ELO)
406409
{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0009) },

0 commit comments

Comments
 (0)