Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-5.7/logitech' into for-linus

- Logitech HID++ protocol support improvement from Filipe Laíns

+9 -2
+9 -2
drivers/hid/hid-logitech-dj.c
··· 16 16 #include <asm/unaligned.h> 17 17 #include "hid-ids.h" 18 18 19 - #define DJ_MAX_PAIRED_DEVICES 6 19 + #define DJ_MAX_PAIRED_DEVICES 7 20 20 #define DJ_MAX_NUMBER_NOTIFS 8 21 21 #define DJ_RECEIVER_INDEX 0 22 22 #define DJ_DEVICE_INDEX_MIN 1 23 - #define DJ_DEVICE_INDEX_MAX 6 23 + #define DJ_DEVICE_INDEX_MAX 7 24 24 25 25 #define DJREPORT_SHORT_LENGTH 15 26 26 #define DJREPORT_LONG_LENGTH 32 ··· 980 980 break; 981 981 } 982 982 983 + /* custom receiver device (eg. powerplay) */ 984 + if (hidpp_report->device_index == 7) { 985 + workitem.reports_supported |= HIDPP; 986 + } 987 + 983 988 if (workitem.type == WORKITEM_TYPE_EMPTY) { 984 989 hid_warn(hdev, 985 990 "unusable device of type %s (0x%02x) connected on slot %d", ··· 1373 1368 } 1374 1369 1375 1370 if (djdev->reports_supported & HIDPP) { 1371 + dbg_hid("%s: sending a HID++ descriptor, reports_supported: %llx\n", 1372 + __func__, djdev->reports_supported); 1376 1373 rdcat(rdesc, &rsize, hidpp_descriptor, 1377 1374 sizeof(hidpp_descriptor)); 1378 1375 }