From cb4e2ba0ebe75f19b88c9c1a812fd9a51e81d0c8 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 11 Dec 2024 12:14:31 +0100 Subject: [PATCH] Fixes for ESP32-S3: - It only supports 4 IN endpoints, so 1 EP must be removed (INT of CCID). - It only supports 8 strings max. Signed-off-by: Pol Henarejos --- src/usb/ccid/ccid.c | 11 +++++++---- src/usb/usb.h | 6 ++++++ src/usb/usb_descriptors.c | 18 +++++++++++++----- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/usb/ccid/ccid.c b/src/usb/ccid/ccid.c index 8931114..b4f46a4 100644 --- a/src/usb/ccid/ccid.c +++ b/src/usb/ccid/ccid.c @@ -348,17 +348,20 @@ static uint16_t ccid_open(uint8_t rhport, tusb_desc_interface_t const *itf_desc, TU_VERIFY( itf_desc->bInterfaceClass == TUSB_CLASS_SMART_CARD && itf_desc->bInterfaceSubClass == 0 && itf_desc->bInterfaceProtocol == 0, 0); //vendord_open expects a CLASS_VENDOR interface class - uint16_t const drv_len = sizeof(tusb_desc_interface_t) + sizeof(struct ccid_class_descriptor) + 3 * sizeof(tusb_desc_endpoint_t); + uint16_t const drv_len = sizeof(tusb_desc_interface_t) + sizeof(struct ccid_class_descriptor) + TUSB_SMARTCARD_CCID_EPS * sizeof(tusb_desc_endpoint_t); memcpy(itf_vendor, itf_desc, sizeof(uint8_t) * max_len); ((tusb_desc_interface_t *) itf_vendor)->bInterfaceClass = TUSB_CLASS_VENDOR_SPECIFIC; +#if TUSB_SMARTCARD_CCID_EPS == 3 ((tusb_desc_interface_t *) itf_vendor)->bNumEndpoints -= 1; - vendord_open(rhport, (tusb_desc_interface_t *) itf_vendor, max_len - sizeof(tusb_desc_endpoint_t)); + vendord_open(rhport, (tusb_desc_interface_t *)itf_vendor, max_len - sizeof(tusb_desc_endpoint_t)); tusb_desc_endpoint_t const *desc_ep = (tusb_desc_endpoint_t const *)((uint8_t *)itf_desc + drv_len - sizeof(tusb_desc_endpoint_t)); TU_ASSERT(usbd_edpt_open(rhport, desc_ep), 0); - free(itf_vendor); - uint8_t msg[] = { 0x50, 0x03 }; usbd_edpt_xfer(rhport, desc_ep->bEndpointAddress, msg, sizeof(msg)); +#else + vendord_open(rhport, (tusb_desc_interface_t *)itf_vendor, max_len); +#endif + free(itf_vendor); TU_VERIFY(max_len >= drv_len, 0); diff --git a/src/usb/usb.h b/src/usb/usb.h index f6e5ca1..8b98c8d 100644 --- a/src/usb/usb.h +++ b/src/usb/usb.h @@ -76,6 +76,12 @@ enum { REPORT_ID_COUNT }; +#if defined(ESP_PLATFORM) && defined(USB_ITF_HID) && defined(USB_ITF_CCID) +#define TUSB_SMARTCARD_CCID_EPS 2 +#else +#define TUSB_SMARTCARD_CCID_EPS 3 +#endif + extern void usb_task(); extern queue_t usb_to_card_q; extern queue_t card_to_usb_q; diff --git a/src/usb/usb_descriptors.c b/src/usb/usb_descriptors.c index 55c4505..4662386 100644 --- a/src/usb/usb_descriptors.c +++ b/src/usb/usb_descriptors.c @@ -76,7 +76,8 @@ uint8_t const *tud_descriptor_device_cb(void) { #define TUD_INTERFACE_DESC_LEN 9 #define TUD_ENDPOINT_DESC_LEN 7 #define TUSB_SMARTCARD_LEN 54 -#define TUSB_SMARTCARD_CCID_DESC_LEN (TUD_INTERFACE_DESC_LEN + TUSB_SMARTCARD_LEN + 3 * TUD_ENDPOINT_DESC_LEN) + +#define TUSB_SMARTCARD_CCID_DESC_LEN (TUD_INTERFACE_DESC_LEN + TUSB_SMARTCARD_LEN + TUSB_SMARTCARD_CCID_EPS * TUD_ENDPOINT_DESC_LEN) #define TUSB_SMARTCARD_WCID_DESC_LEN (TUD_INTERFACE_DESC_LEN + TUSB_SMARTCARD_LEN + 2 * TUD_ENDPOINT_DESC_LEN) enum { @@ -107,12 +108,19 @@ uint8_t const desc_hid_report_kb[] = { 54, 0x21, U16_TO_U8S_LE(0x0110), 0, 0x1, U32_TO_U8S_LE(0x01|0x2), U32_TO_U8S_LE(0xDFC), U32_TO_U8S_LE(0xDFC), 0, U32_TO_U8S_LE(0x2580), U32_TO_U8S_LE(0x2580), 0, U32_TO_U8S_LE(0xFE), U32_TO_U8S_LE(0), U32_TO_U8S_LE(0), U32_TO_U8S_LE(0x40840), U32_TO_U8S_LE(65544+10), 0xFF, 0xFF, U16_TO_U8S_LE(0x0), 0, 0x1, \ 7, TUSB_DESC_ENDPOINT, _epout, TUSB_XFER_BULK, U16_TO_U8S_LE(_epsize), 0, \ 7, TUSB_DESC_ENDPOINT, _epin, TUSB_XFER_BULK, U16_TO_U8S_LE(_epsize), 0 -#define TUD_SMARTCARD_DESCRIPTOR(_itf, _strix, _epout, _epin, _epint, _epsize) \ - 9, TUSB_DESC_INTERFACE, _itf, 0, 3, TUSB_CLASS_SMART_CARD, 0, 0, _strix, \ +#define TUD_SMARTCARD_DESCRIPTOR_2EP(_itf, _strix, _epout, _epin, _epsize) \ + 9, TUSB_DESC_INTERFACE, _itf, 0, TUSB_SMARTCARD_CCID_EPS, TUSB_CLASS_SMART_CARD, 0, 0, _strix, \ 54, 0x21, U16_TO_U8S_LE(0x0110), 0, 0x1, U32_TO_U8S_LE(0x01|0x2), U32_TO_U8S_LE(0xDFC), U32_TO_U8S_LE(0xDFC), 0, U32_TO_U8S_LE(0x2580), U32_TO_U8S_LE(0x2580), 0, U32_TO_U8S_LE(0xFE), U32_TO_U8S_LE(0), U32_TO_U8S_LE(0), U32_TO_U8S_LE(0x40840), U32_TO_U8S_LE(65544+10), 0xFF, 0xFF, U16_TO_U8S_LE(0x0), 0, 0x1, \ 7, TUSB_DESC_ENDPOINT, _epout, TUSB_XFER_BULK, U16_TO_U8S_LE(_epsize), 0, \ - 7, TUSB_DESC_ENDPOINT, _epin, TUSB_XFER_BULK, U16_TO_U8S_LE(_epsize), 0, \ + 7, TUSB_DESC_ENDPOINT, _epin, TUSB_XFER_BULK, U16_TO_U8S_LE(_epsize), 0 +#if TUSB_SMARTCARD_CCID_EPS == 3 +#define TUD_SMARTCARD_DESCRIPTOR(_itf, _strix, _epout, _epin, _epint, _epsize) \ + TUD_SMARTCARD_DESCRIPTOR_2EP(_itf, _strix, _epout, _epin, _epsize), \ 7, TUSB_DESC_ENDPOINT, _epint, TUSB_XFER_INTERRUPT, U16_TO_U8S_LE(_epsize), 0 +#else +#define TUD_SMARTCARD_DESCRIPTOR(_itf, _strix, _epout, _epin, _epint, _epsize) \ + TUD_SMARTCARD_DESCRIPTOR_2EP(_itf, _strix, _epout, _epin, _epsize) +#endif #endif const uint8_t desc_config[] = { @@ -273,7 +281,7 @@ char const *string_desc_arr [] = { tinyusb_config_t tusb_cfg = { .device_descriptor = &desc_device, .string_descriptor = string_desc_arr, - .string_descriptor_count = sizeof(string_desc_arr) / sizeof(string_desc_arr[0]), + .string_descriptor_count = (sizeof(string_desc_arr) / sizeof(string_desc_arr[0])) > 8 ? 8 : (sizeof(string_desc_arr) / sizeof(string_desc_arr[0])), .external_phy = false, .configuration_descriptor = desc_config, };