The Logitech G Powerplay has a lightspeed receiver with a static HID++
device with ID 7 attached to it to. It is used to configure the led on
the mat. For this reason I increased the max number of devices.
Signed-off-by: Filipe Laíns <[email protected]>
---
v4
- Don't define the powerplay receiver (I forgot that we already did that
in a previous patch)
---
drivers/hid/hid-logitech-dj.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index bb50d6e7745b..1009f741a11d 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -16,11 +16,11 @@
#include <asm/unaligned.h>
#include "hid-ids.h"
-#define DJ_MAX_PAIRED_DEVICES 6
+#define DJ_MAX_PAIRED_DEVICES 7
#define DJ_MAX_NUMBER_NOTIFS 8
#define DJ_RECEIVER_INDEX 0
#define DJ_DEVICE_INDEX_MIN 1
-#define DJ_DEVICE_INDEX_MAX 6
+#define DJ_DEVICE_INDEX_MAX 7
#define DJREPORT_SHORT_LENGTH 15
#define DJREPORT_LONG_LENGTH 32
@@ -980,6 +980,11 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev,
break;
}
+ /* custom receiver device (eg. powerplay) */
+ if (hidpp_report->device_index == 7) {
+ workitem.reports_supported |= HIDPP;
+ }
+
if (workitem.type == WORKITEM_TYPE_EMPTY) {
hid_warn(hdev,
"unusable device of type %s (0x%02x) connected on slot %d",
@@ -1850,6 +1855,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 powerplay mat/receiver (0xc539) */
+ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
+ 0xc53a),
+ .driver_data = recvr_type_gaming_hidpp},
{ /* 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.24.1
On Wed, 2020-01-15 at 20:08 +0000, Filipe Laíns wrote:
> The Logitech G Powerplay has a lightspeed receiver with a static
> HID++
> device with ID 7 attached to it to. It is used to configure the led
> on
> the mat. For this reason I increased the max number of devices.
>
> Signed-off-by: Filipe Laíns <[email protected]>
> ---
>
> v4
>
> - Don't define the powerplay receiver (I forgot that we already did
> that
> in a previous patch)
>
> ---
> drivers/hid/hid-logitech-dj.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-
> logitech-dj.c
> index bb50d6e7745b..1009f741a11d 100644
> --- a/drivers/hid/hid-logitech-dj.c
> +++ b/drivers/hid/hid-logitech-dj.c
> @@ -16,11 +16,11 @@
> #include <asm/unaligned.h>
> #include "hid-ids.h"
>
> -#define DJ_MAX_PAIRED_DEVICES 6
> +#define DJ_MAX_PAIRED_DEVICES 7
> #define DJ_MAX_NUMBER_NOTIFS 8
> #define DJ_RECEIVER_INDEX 0
> #define DJ_DEVICE_INDEX_MIN 1
> -#define DJ_DEVICE_INDEX_MAX 6
> +#define DJ_DEVICE_INDEX_MAX 7
>
> #define DJREPORT_SHORT_LENGTH 15
> #define DJREPORT_LONG_LENGTH 32
> @@ -980,6 +980,11 @@ static void logi_hidpp_recv_queue_notif(struct
> hid_device *hdev,
> break;
> }
>
> + /* custom receiver device (eg. powerplay) */
> + if (hidpp_report->device_index == 7) {
> + workitem.reports_supported |= HIDPP;
> + }
> +
> if (workitem.type == WORKITEM_TYPE_EMPTY) {
> hid_warn(hdev,
> "unusable device of type %s (0x%02x) connected
> on slot %d",
> @@ -1850,6 +1855,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 powerplay mat/receiver (0xc539) */
> + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
> + 0xc53a),
> + .driver_data = recvr_type_gaming_hidpp},
> { /* 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},
Please disregard this, I will send a renamed patch with everything
fixed. Sorry for littering the list, I will be more careful in the
future.
Regards,
Filipe Laíns