* [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration
@ 2021-01-23 18:03 Filipe Laíns
2021-01-23 18:03 ` [PATCH 2/2] HID: logitech-hidpp: add support for the G Pro X Superlight over USB Filipe Laíns
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Filipe Laíns @ 2021-01-23 18:03 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires, linux-input, linux-kernel
Cc: Filipe Laíns
From: Filipe Laíns <lains@riseup.net>
Tested with the G Pro X Superlight. libratbag sees the device, as
expected, and input events are passing trough.
https://github.com/libratbag/libratbag/pull/1122
The receiver has a quirk where the moused interface doesn't have a
report ID, I am not sure why, perhaps they forgot. All other interfaces
have report IDs so I am left scratching my head.
Since this driver doesn't have a quirk system, I simply implemented it
as a different receiver type, which is true, it just wouldn't be the
prefered approach :P
Signed-off-by: Filipe Laíns <lains@riseup.net>
---
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-logitech-dj.c | 49 +++++++++++++++++++++++++----------
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 4c5f23640f9c..8eac3c93fa38 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -803,6 +803,7 @@
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1 0xc539
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1 0xc53f
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY 0xc53a
+#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2 0xc547
#define USB_DEVICE_ID_SPACETRAVELLER 0xc623
#define USB_DEVICE_ID_SPACENAVIGATOR 0xc626
#define USB_DEVICE_ID_DINOVO_DESKTOP 0xc704
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 1401ee2067ca..6596c81947a8 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -114,6 +114,7 @@ enum recvr_type {
recvr_type_dj,
recvr_type_hidpp,
recvr_type_gaming_hidpp,
+ recvr_type_gaming_hidpp_missing_mse_report_id, /* lightspeed receiver missing the mouse report ID */
recvr_type_mouse_only,
recvr_type_27mhz,
recvr_type_bluetooth,
@@ -1360,6 +1361,7 @@ static int logi_dj_ll_parse(struct hid_device *hid)
dbg_hid("%s: sending a mouse descriptor, reports_supported: %llx\n",
__func__, djdev->reports_supported);
if (djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp ||
+ djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id ||
djdev->dj_receiver_dev->type == recvr_type_mouse_only)
rdcat(rdesc, &rsize, mse_high_res_descriptor,
sizeof(mse_high_res_descriptor));
@@ -1605,19 +1607,35 @@ static int logi_dj_raw_event(struct hid_device *hdev,
data[0] = data[1];
data[1] = 0;
}
- /*
- * Mouse-only receivers send unnumbered mouse data. The 27 MHz
- * receiver uses 6 byte packets, the nano receiver 8 bytes.
- */
- if (djrcv_dev->unnumbered_application == HID_GD_MOUSE &&
- size <= 8) {
- u8 mouse_report[9];
-
- /* Prepend report id */
- mouse_report[0] = REPORT_TYPE_MOUSE;
- memcpy(mouse_report + 1, data, size);
- logi_dj_recv_forward_input_report(hdev, mouse_report,
- size + 1);
+
+
+ if (djrcv_dev->unnumbered_application == HID_GD_MOUSE) {
+ /*
+ * Mouse-only receivers send unnumbered mouse data. The 27 MHz
+ * receiver uses 6 byte packets, the nano receiver 8 bytes.
+ */
+ if (size <= 8) {
+ u8 mouse_report[9];
+
+ /* Prepend report id */
+ mouse_report[0] = REPORT_TYPE_MOUSE;
+ memcpy(mouse_report + 1, data, size);
+ logi_dj_recv_forward_input_report(hdev, mouse_report,
+ size + 1);
+
+ /*
+ * A variant of the ligtpseed receivers is missing the mouse
+ * report ID.
+ */
+ } else if (djrcv_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id) {
+ u8 mouse_report[17];
+
+ /* Prepend report id */
+ mouse_report[0] = REPORT_TYPE_MOUSE;
+ memcpy(mouse_report + 1, data, size);
+ logi_dj_recv_forward_input_report(hdev, mouse_report,
+ size + 1);
+ }
}
return false;
@@ -1688,6 +1706,7 @@ static int logi_dj_probe(struct hid_device *hdev,
case recvr_type_dj: no_dj_interfaces = 3; break;
case recvr_type_hidpp: no_dj_interfaces = 2; break;
case recvr_type_gaming_hidpp: no_dj_interfaces = 3; break;
+ case recvr_type_gaming_hidpp_missing_mse_report_id: no_dj_interfaces = 3; break;
case recvr_type_mouse_only: no_dj_interfaces = 2; break;
case recvr_type_27mhz: no_dj_interfaces = 2; break;
case recvr_type_bluetooth: no_dj_interfaces = 2; break;
@@ -1886,6 +1905,10 @@ static const struct hid_device_id logi_dj_receivers[] = {
HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1),
.driver_data = recvr_type_gaming_hidpp},
+ { /* Logitech lightspeed receiver (0xc547) */
+ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
+ USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2),
+ .driver_data = recvr_type_gaming_hidpp_missing_mse_report_id},
{ /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */
HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),
.driver_data = recvr_type_27mhz},
--
2.30.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] HID: logitech-hidpp: add support for the G Pro X Superlight over USB 2021-01-23 18:03 [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Filipe Laíns @ 2021-01-23 18:03 ` Filipe Laíns 2021-02-05 15:14 ` [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Jiri Kosina 2021-03-01 14:46 ` Benjamin Tissoires 2 siblings, 0 replies; 6+ messages in thread From: Filipe Laíns @ 2021-01-23 18:03 UTC (permalink / raw) To: Jiri Kosina, Benjamin Tissoires, linux-input, linux-kernel Cc: Filipe Laíns From: Filipe Laíns <lains@riseup.net> Tested and is working :) Signed-off-by: Filipe Laíns <lains@riseup.net> --- drivers/hid/hid-logitech-hidpp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 291c6b4d26b7..54a289510a7d 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -4268,6 +4268,8 @@ static const struct hid_device_id hidpp_devices[] = { .driver_data = HIDPP_QUIRK_CLASS_G920 | HIDPP_QUIRK_FORCE_OUTPUT_REPORTS}, { /* Logitech G Pro Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC088) }, + { /* Logitech G Pro X Superlight Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC094) }, { /* MX5000 keyboard over Bluetooth */ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb305), -- 2.30.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration 2021-01-23 18:03 [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Filipe Laíns 2021-01-23 18:03 ` [PATCH 2/2] HID: logitech-hidpp: add support for the G Pro X Superlight over USB Filipe Laíns @ 2021-02-05 15:14 ` Jiri Kosina 2021-02-26 14:08 ` Filipe Laíns 2021-03-01 14:46 ` Benjamin Tissoires 2 siblings, 1 reply; 6+ messages in thread From: Jiri Kosina @ 2021-02-05 15:14 UTC (permalink / raw) To: Filipe Laíns Cc: Benjamin Tissoires, linux-input, linux-kernel, Filipe Laíns On Sat, 23 Jan 2021, Filipe Laíns wrote: > From: Filipe Laíns <lains@riseup.net> > > Tested with the G Pro X Superlight. libratbag sees the device, as > expected, and input events are passing trough. > > https://github.com/libratbag/libratbag/pull/1122 > > The receiver has a quirk where the moused interface doesn't have a > report ID, I am not sure why, perhaps they forgot. All other interfaces > have report IDs so I am left scratching my head. > Since this driver doesn't have a quirk system, I simply implemented it > as a different receiver type, which is true, it just wouldn't be the > prefered approach :P Benjamin, do you have any other idea how to accomplish this without this kind of spaghetti-style conditions? If not, I am tempted to apply the patch as is. Thanks, -- Jiri Kosina SUSE Labs ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration 2021-02-05 15:14 ` [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Jiri Kosina @ 2021-02-26 14:08 ` Filipe Laíns 0 siblings, 0 replies; 6+ messages in thread From: Filipe Laíns @ 2021-02-26 14:08 UTC (permalink / raw) To: Jiri Kosina; +Cc: Benjamin Tissoires, linux-input, linux-kernel [-- Attachment #1: Type: text/plain, Size: 994 bytes --] On Fri, 2021-02-05 at 16:14 +0100, Jiri Kosina wrote: > On Sat, 23 Jan 2021, Filipe Laíns wrote: > > > From: Filipe Laíns <lains@riseup.net> > > > > Tested with the G Pro X Superlight. libratbag sees the device, as > > expected, and input events are passing trough. > > > > https://github.com/libratbag/libratbag/pull/1122 > > > > The receiver has a quirk where the moused interface doesn't have a > > report ID, I am not sure why, perhaps they forgot. All other interfaces > > have report IDs so I am left scratching my head. > > Since this driver doesn't have a quirk system, I simply implemented it > > as a different receiver type, which is true, it just wouldn't be the > > prefered approach :P > > Benjamin, do you have any other idea how to accomplish this without this > kind of spaghetti-style conditions? > If not, I am tempted to apply the patch as is. > > Thanks, > Hi Benjamin, Jiri, Could we get an update on this? Cheers, Filipe Laíns [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration 2021-01-23 18:03 [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Filipe Laíns 2021-01-23 18:03 ` [PATCH 2/2] HID: logitech-hidpp: add support for the G Pro X Superlight over USB Filipe Laíns 2021-02-05 15:14 ` [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Jiri Kosina @ 2021-03-01 14:46 ` Benjamin Tissoires 2021-12-13 11:28 ` Benjamin Tissoires 2 siblings, 1 reply; 6+ messages in thread From: Benjamin Tissoires @ 2021-03-01 14:46 UTC (permalink / raw) To: Filipe Laíns Cc: Jiri Kosina, open list:HID CORE LAYER, lkml, Filipe Laíns On Sat, Jan 23, 2021 at 7:03 PM Filipe Laíns <lains@archlinux.org> wrote: > > From: Filipe Laíns <lains@riseup.net> > > Tested with the G Pro X Superlight. libratbag sees the device, as > expected, and input events are passing trough. > > https://github.com/libratbag/libratbag/pull/1122 > > The receiver has a quirk where the moused interface doesn't have a > report ID, I am not sure why, perhaps they forgot. All other interfaces > have report IDs so I am left scratching my head. > Since this driver doesn't have a quirk system, I simply implemented it > as a different receiver type, which is true, it just wouldn't be the > prefered approach :P > > Signed-off-by: Filipe Laíns <lains@riseup.net> > --- > drivers/hid/hid-ids.h | 1 + > drivers/hid/hid-logitech-dj.c | 49 +++++++++++++++++++++++++---------- > 2 files changed, 37 insertions(+), 13 deletions(-) > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 4c5f23640f9c..8eac3c93fa38 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -803,6 +803,7 @@ > #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1 0xc539 > #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1 0xc53f > #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY 0xc53a > +#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2 0xc547 > #define USB_DEVICE_ID_SPACETRAVELLER 0xc623 > #define USB_DEVICE_ID_SPACENAVIGATOR 0xc626 > #define USB_DEVICE_ID_DINOVO_DESKTOP 0xc704 > diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c > index 1401ee2067ca..6596c81947a8 100644 > --- a/drivers/hid/hid-logitech-dj.c > +++ b/drivers/hid/hid-logitech-dj.c > @@ -114,6 +114,7 @@ enum recvr_type { > recvr_type_dj, > recvr_type_hidpp, > recvr_type_gaming_hidpp, > + recvr_type_gaming_hidpp_missing_mse_report_id, /* lightspeed receiver missing the mouse report ID */ > recvr_type_mouse_only, > recvr_type_27mhz, > recvr_type_bluetooth, > @@ -1360,6 +1361,7 @@ static int logi_dj_ll_parse(struct hid_device *hid) > dbg_hid("%s: sending a mouse descriptor, reports_supported: %llx\n", > __func__, djdev->reports_supported); > if (djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp || > + djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id || > djdev->dj_receiver_dev->type == recvr_type_mouse_only) > rdcat(rdesc, &rsize, mse_high_res_descriptor, > sizeof(mse_high_res_descriptor)); > @@ -1605,19 +1607,35 @@ static int logi_dj_raw_event(struct hid_device *hdev, > data[0] = data[1]; > data[1] = 0; > } > - /* > - * Mouse-only receivers send unnumbered mouse data. The 27 MHz > - * receiver uses 6 byte packets, the nano receiver 8 bytes. > - */ > - if (djrcv_dev->unnumbered_application == HID_GD_MOUSE && > - size <= 8) { > - u8 mouse_report[9]; > - > - /* Prepend report id */ > - mouse_report[0] = REPORT_TYPE_MOUSE; > - memcpy(mouse_report + 1, data, size); > - logi_dj_recv_forward_input_report(hdev, mouse_report, > - size + 1); > + > + > + if (djrcv_dev->unnumbered_application == HID_GD_MOUSE) { > + /* > + * Mouse-only receivers send unnumbered mouse data. The 27 MHz > + * receiver uses 6 byte packets, the nano receiver 8 bytes. > + */ > + if (size <= 8) { > + u8 mouse_report[9]; Hmm, as stated above, the 27 MHz receiver already does the exact same thing. Can't we just bump the array size and check above to the following: if (size <= 16) { u8 mouse_report[17]; The property "djrcv_dev->unnumbered_application" is based on the report descriptor entirely, and they are just following the HID norm here. So I think this should be enough. Cheers, Benjamin > + > + /* Prepend report id */ > + mouse_report[0] = REPORT_TYPE_MOUSE; > + memcpy(mouse_report + 1, data, size); > + logi_dj_recv_forward_input_report(hdev, mouse_report, > + size + 1); > + > + /* > + * A variant of the ligtpseed receivers is missing the mouse > + * report ID. > + */ > + } else if (djrcv_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id) { > + u8 mouse_report[17]; > + > + /* Prepend report id */ > + mouse_report[0] = REPORT_TYPE_MOUSE; > + memcpy(mouse_report + 1, data, size); > + logi_dj_recv_forward_input_report(hdev, mouse_report, > + size + 1); > + } > } > > return false; > @@ -1688,6 +1706,7 @@ static int logi_dj_probe(struct hid_device *hdev, > case recvr_type_dj: no_dj_interfaces = 3; break; > case recvr_type_hidpp: no_dj_interfaces = 2; break; > case recvr_type_gaming_hidpp: no_dj_interfaces = 3; break; > + case recvr_type_gaming_hidpp_missing_mse_report_id: no_dj_interfaces = 3; break; > case recvr_type_mouse_only: no_dj_interfaces = 2; break; > case recvr_type_27mhz: no_dj_interfaces = 2; break; > case recvr_type_bluetooth: no_dj_interfaces = 2; break; > @@ -1886,6 +1905,10 @@ static const struct hid_device_id logi_dj_receivers[] = { > HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, > USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1), > .driver_data = recvr_type_gaming_hidpp}, > + { /* Logitech lightspeed receiver (0xc547) */ > + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, > + USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2), > + .driver_data = recvr_type_gaming_hidpp_missing_mse_report_id}, > { /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */ > HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER), > .driver_data = recvr_type_27mhz}, > -- > 2.30.0 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration 2021-03-01 14:46 ` Benjamin Tissoires @ 2021-12-13 11:28 ` Benjamin Tissoires 0 siblings, 0 replies; 6+ messages in thread From: Benjamin Tissoires @ 2021-12-13 11:28 UTC (permalink / raw) To: Filipe Laíns Cc: Jiri Kosina, open list:HID CORE LAYER, lkml, Filipe Laíns Hi Filipe, On Mon, Mar 1, 2021 at 3:46 PM Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > On Sat, Jan 23, 2021 at 7:03 PM Filipe Laíns <lains@archlinux.org> wrote: > > > > From: Filipe Laíns <lains@riseup.net> > > > > Tested with the G Pro X Superlight. libratbag sees the device, as > > expected, and input events are passing trough. > > > > https://github.com/libratbag/libratbag/pull/1122 > > > > The receiver has a quirk where the moused interface doesn't have a > > report ID, I am not sure why, perhaps they forgot. All other interfaces > > have report IDs so I am left scratching my head. > > Since this driver doesn't have a quirk system, I simply implemented it > > as a different receiver type, which is true, it just wouldn't be the > > prefered approach :P > > > > Signed-off-by: Filipe Laíns <lains@riseup.net> > > --- > > drivers/hid/hid-ids.h | 1 + > > drivers/hid/hid-logitech-dj.c | 49 +++++++++++++++++++++++++---------- > > 2 files changed, 37 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > > index 4c5f23640f9c..8eac3c93fa38 100644 > > --- a/drivers/hid/hid-ids.h > > +++ b/drivers/hid/hid-ids.h > > @@ -803,6 +803,7 @@ > > #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1 0xc539 > > #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1 0xc53f > > #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY 0xc53a > > +#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2 0xc547 > > #define USB_DEVICE_ID_SPACETRAVELLER 0xc623 > > #define USB_DEVICE_ID_SPACENAVIGATOR 0xc626 > > #define USB_DEVICE_ID_DINOVO_DESKTOP 0xc704 > > diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c > > index 1401ee2067ca..6596c81947a8 100644 > > --- a/drivers/hid/hid-logitech-dj.c > > +++ b/drivers/hid/hid-logitech-dj.c > > @@ -114,6 +114,7 @@ enum recvr_type { > > recvr_type_dj, > > recvr_type_hidpp, > > recvr_type_gaming_hidpp, > > + recvr_type_gaming_hidpp_missing_mse_report_id, /* lightspeed receiver missing the mouse report ID */ > > recvr_type_mouse_only, > > recvr_type_27mhz, > > recvr_type_bluetooth, > > @@ -1360,6 +1361,7 @@ static int logi_dj_ll_parse(struct hid_device *hid) > > dbg_hid("%s: sending a mouse descriptor, reports_supported: %llx\n", > > __func__, djdev->reports_supported); > > if (djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp || > > + djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id || > > djdev->dj_receiver_dev->type == recvr_type_mouse_only) > > rdcat(rdesc, &rsize, mse_high_res_descriptor, > > sizeof(mse_high_res_descriptor)); > > @@ -1605,19 +1607,35 @@ static int logi_dj_raw_event(struct hid_device *hdev, > > data[0] = data[1]; > > data[1] = 0; > > } > > - /* > > - * Mouse-only receivers send unnumbered mouse data. The 27 MHz > > - * receiver uses 6 byte packets, the nano receiver 8 bytes. > > - */ > > - if (djrcv_dev->unnumbered_application == HID_GD_MOUSE && > > - size <= 8) { > > - u8 mouse_report[9]; > > - > > - /* Prepend report id */ > > - mouse_report[0] = REPORT_TYPE_MOUSE; > > - memcpy(mouse_report + 1, data, size); > > - logi_dj_recv_forward_input_report(hdev, mouse_report, > > - size + 1); > > + > > + > > + if (djrcv_dev->unnumbered_application == HID_GD_MOUSE) { > > + /* > > + * Mouse-only receivers send unnumbered mouse data. The 27 MHz > > + * receiver uses 6 byte packets, the nano receiver 8 bytes. > > + */ > > + if (size <= 8) { > > + u8 mouse_report[9]; > > Hmm, as stated above, the 27 MHz receiver already does the exact same thing. > > Can't we just bump the array size and check above to the following: > > if (size <= 16) { > u8 mouse_report[17]; > > The property "djrcv_dev->unnumbered_application" is based on the > report descriptor entirely, and they are just following the HID norm > here. So I think this should be enough. I've been pinged last week about the G Pro X superlight, and Peter found that this patch never got into upstream. AFAICT, compared to upstream the following code change should have the same effect that what you proposed here: --- diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c index 7106b921b53c..f5cdfce272e7 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c @@ -1691,11 +1691,12 @@ static int logi_dj_raw_event(struct hid_device *hdev, } /* * Mouse-only receivers send unnumbered mouse data. The 27 MHz - * receiver uses 6 byte packets, the nano receiver 8 bytes. + * receiver uses 6 byte packets, the nano receiver 8 bytes and + * some gaming ones are using 16 bytes. */ if (djrcv_dev->unnumbered_application == HID_GD_MOUSE && - size <= 8) { - u8 mouse_report[9]; + size <= 16) { + u8 mouse_report[17]; /* Prepend report id */ mouse_report[0] = REPORT_TYPE_MOUSE; --- Would you mind sending a v2 of the patch updated to the current for-next so we can schedule this for 5.17? Cheers, Benjamin > > Cheers, > Benjamin > > > + > > + /* Prepend report id */ > > + mouse_report[0] = REPORT_TYPE_MOUSE; > > + memcpy(mouse_report + 1, data, size); > > + logi_dj_recv_forward_input_report(hdev, mouse_report, > > + size + 1); > > + > > + /* > > + * A variant of the ligtpseed receivers is missing the mouse > > + * report ID. > > + */ > > + } else if (djrcv_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id) { > > + u8 mouse_report[17]; > > + > > + /* Prepend report id */ > > + mouse_report[0] = REPORT_TYPE_MOUSE; > > + memcpy(mouse_report + 1, data, size); > > + logi_dj_recv_forward_input_report(hdev, mouse_report, > > + size + 1); > > + } > > } > > > > return false; > > @@ -1688,6 +1706,7 @@ static int logi_dj_probe(struct hid_device *hdev, > > case recvr_type_dj: no_dj_interfaces = 3; break; > > case recvr_type_hidpp: no_dj_interfaces = 2; break; > > case recvr_type_gaming_hidpp: no_dj_interfaces = 3; break; > > + case recvr_type_gaming_hidpp_missing_mse_report_id: no_dj_interfaces = 3; break; > > case recvr_type_mouse_only: no_dj_interfaces = 2; break; > > case recvr_type_27mhz: no_dj_interfaces = 2; break; > > case recvr_type_bluetooth: no_dj_interfaces = 2; break; > > @@ -1886,6 +1905,10 @@ static const struct hid_device_id logi_dj_receivers[] = { > > HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, > > USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1), > > .driver_data = recvr_type_gaming_hidpp}, > > + { /* Logitech lightspeed receiver (0xc547) */ > > + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, > > + USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2), > > + .driver_data = recvr_type_gaming_hidpp_missing_mse_report_id}, > > { /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */ > > HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER), > > .driver_data = recvr_type_27mhz}, > > -- > > 2.30.0 > > ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-13 11:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-01-23 18:03 [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Filipe Laíns 2021-01-23 18:03 ` [PATCH 2/2] HID: logitech-hidpp: add support for the G Pro X Superlight over USB Filipe Laíns 2021-02-05 15:14 ` [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Jiri Kosina 2021-02-26 14:08 ` Filipe Laíns 2021-03-01 14:46 ` Benjamin Tissoires 2021-12-13 11:28 ` Benjamin Tissoires
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).