Skip to contentSkip to conversation

HID: logitech-hidpp: add support for the Powerplay mat/receiver

PATCH Superseded Filipe Laíns 2 participants 3 messages Jan 12, 2020 – Jan 14, 2020

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 HID: logitech-hidpp: add support for the Powerplay mat/receiver

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.

I also marked all lightspeed devices as HID++ compatible. As the internal powerplay device does not have REPORT_TYPE_KEYBOARD or REPORT_TYPE_MOUSE it was not being marked as HID++ compatible in logi_hidpp_dev_conn_notif_equad.

---
 drivers/hid/hid-logitech-dj.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/hid/hid-logitech-dj.c +7 -3
index bb50d6e7745b..732380b55b15 100644
@@ -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
@@ -971,7 +971,7 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev,
 	case 0x0c:
 		device_type = "eQUAD Lightspeed 1";
 		logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);
-		workitem.reports_supported |= STD_KEYBOARD;
+		workitem.reports_supported |= STD_KEYBOARD | HIDPP;
 		break;
 	case 0x0d:
 		device_type = "eQUAD Lightspeed 1_1";
@@ -1850,6 +1850,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},
Signature · 1 line
2.24.1
#1 lore raw

Hi Filipe,

Quoted 34 lines · Filipe Laíns

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.

I also marked all lightspeed devices as HID++ compatible. As the internal powerplay device does not have REPORT_TYPE_KEYBOARD or REPORT_TYPE_MOUSE it was not being marked as HID++ compatible in logi_hidpp_dev_conn_notif_equad.

---
 drivers/hid/hid-logitech-dj.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/hid/hid-logitech-dj.c +2 -2
index bb50d6e7745b..732380b55b15 100644
@@ -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

drivers/hid/hid-logitech-dj.c static void logi_hidpp_recv_queue_notif(struct hid_device *hdev, · line 974

Quoted 5 lines
drivers/hid/hid-logitech-dj.c +1 -1
@@ -971,7 +971,7 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev,
        case 0x0c:
                device_type = "eQUAD Lightspeed 1";
                logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);
-               workitem.reports_supported |= STD_KEYBOARD;
+               workitem.reports_supported |= STD_KEYBOARD | HIDPP;

This feels wrong. The whole initial code was hack-ish, and now this is even more hack-ish.

I don't have a simple solution right now (at a conference this week), but I will need to be convinced this is the only sane solution :/

Cheers,
Benjamin

Quoted 17 lines
drivers/hid/hid-logitech-dj.c +4 -1
                break;
        case 0x0d:
                device_type = "eQUAD Lightspeed 1_1";
@@ -1850,6 +1850,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

#2 lore raw
Quoted 45 lines · Benjamin Tissoires

Hi Filipe,

Quoted 33 lines · Filipe Laíns

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.

I also marked all lightspeed devices as HID++ compatible. As the internal powerplay device does not have REPORT_TYPE_KEYBOARD or REPORT_TYPE_MOUSE it was not being marked as HID++ compatible in logi_hidpp_dev_conn_notif_equad.

---
 drivers/hid/hid-logitech-dj.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/hid/hid-logitech-dj.c +2 -2
index bb50d6e7745b..732380b55b15 100644
@@ -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

drivers/hid/hid-logitech-dj.c static void logi_hidpp_recv_queue_notif(struct hid_device *hdev, · line 974

Quoted 5 lines
drivers/hid/hid-logitech-dj.c +1 -1
@@ -971,7 +971,7 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev,
        case 0x0c:
                device_type = "eQUAD Lightspeed 1";
                logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);
-               workitem.reports_supported |= STD_KEYBOARD;
+               workitem.reports_supported |= STD_KEYBOARD | HIDPP;

This feels wrong. The whole initial code was hack-ish, and now this is even more hack-ish.

Quoted 5 lines

I don't have a simple solution right now (at a conference this week), but I will need to be convinced this is the only sane solution :/

Cheers,
Benjamin

Yeah, I understand. I just addressed this in a reply to the previous patch:

Quoted 7 lines · Filipe Laíns

Okay, then is maybe better if I add HIDPP to reports_supported based on
the device ID (7). This is the only product to my knowledge that exports a device with ID 7. It's a better solution than setting HIDPP on all lightspeed devices.

I will send a new patch if you agree with this approach.

What do you think?

Maybe we will have to rework the driver but the method I proposed above doesn't seem that hack-ish, at least considering the current code :P

Quoted 20 lines
Quoted 20 lines
drivers/hid/hid-logitech-dj.c +4 -0
                break;
        case 0x0d:
                device_type = "eQUAD Lightspeed 1_1";
@@ -1850,6 +1850,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

Signature · 1 line
Filipe Laíns