From 294c1fdf411d4778e11a6bcdb4e6ab33de2472cc Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 2 Sep 2024 09:46:51 +0200 Subject: [PATCH] Fix USB descriptor in case only HID is enabled. Signed-off-by: Pol Henarejos --- src/usb/usb_descriptors.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/usb/usb_descriptors.c b/src/usb/usb_descriptors.c index a2f9481..81d16b7 100644 --- a/src/usb/usb_descriptors.c +++ b/src/usb/usb_descriptors.c @@ -105,7 +105,7 @@ uint8_t const desc_hid_report[] = { TUD_HID_REPORT_DESC_FIDO_U2F(CFG_TUD_HID_EP_BUFSIZE) }; uint8_t const desc_hid_report_kb[] = { - TUD_HID_REPORT_DESC_KEYBOARD(HID_USAGE(HID_USAGE_DESKTOP_GAMEPAD), HID_LOGICAL_MIN(0), HID_LOGICAL_MAX_N(255, 2), HID_REPORT_COUNT(8), HID_REPORT_SIZE(8), HID_FEATURE( HID_DATA | HID_VARIABLE | HID_ABSOLUTE), ) + TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(REPORT_ID_KEYBOARD)) }; #define EPNUM_HID 0x04 #endif @@ -127,7 +127,11 @@ uint8_t const desc_hid_report_kb[] = { #endif const uint8_t desc_config_nowcid[] = { +#ifdef USB_ITF_CCID TUD_CONFIG_DESCRIPTOR(1, ITF_TOTAL-1, 4, TUSB_DESC_TOTAL_LEN_NOWCID, USB_CONFIG_ATT_ONE | TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100), +#else + TUD_CONFIG_DESCRIPTOR(1, ITF_TOTAL, 4, TUSB_DESC_TOTAL_LEN_NOWCID, USB_CONFIG_ATT_ONE | TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100), +#endif #ifdef USB_ITF_HID TUD_HID_INOUT_DESCRIPTOR(ITF_HID, ITF_HID + 5, HID_ITF_PROTOCOL_NONE, sizeof(desc_hid_report), EPNUM_HID, TUSB_DIR_IN_MASK | EPNUM_HID, CFG_TUD_HID_EP_BUFSIZE, 10), TUD_HID_DESCRIPTOR(ITF_KEYBOARD, ITF_KEYBOARD + 5, HID_ITF_PROTOCOL_NONE, sizeof(desc_hid_report_kb), TUSB_DIR_IN_MASK | (EPNUM_HID + 1), 16, 5),