refactor binding ep and interface to driver

4 files changed, 27 insertions, 83 deletions

diff --git a/src/common/tusb_private.h b/src/common/tusb_private.h
index 5cea7b5a0..a94470039 100644
--- a/src/common/tusb_private.h
+++ b/src/common/tusb_private.h
@@ -95,8 +95,9 @@ TU_ATTR_ALWAYS_INLINE static inline bool tu_edpt_validate(tusb_desc_endpoint_t c
 }
 #endif
 
-// Bind all endpoint of a interface descriptor to class driver
-void tu_edpt_bind_driver(uint8_t ep2drv[][2], tusb_desc_interface_t const* p_desc, uint16_t desc_len, uint8_t driver_id);
+// Bind drivers to all interfaces and endpoints in the provided configuration descriptor
+bool tu_bind_driver_to_ep_itf(uint8_t driver_id, uint8_t ep2drv[][2], uint8_t itf2drv[], uint8_t itf_max,
+                              const uint8_t *p_desc, uint16_t desc_len);
 
 // Calculate total length of n interfaces (depending on IAD)
 uint16_t tu_desc_get_interface_total_len(tusb_desc_interface_t const* desc_itf, uint8_t itf_count, uint16_t max_len);
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 80d9fee3e..6fd88bf42 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -1046,19 +1046,11 @@ static bool process_set_config(uint8_t rhport, uint8_t cfg_num) {
   const uint8_t *p_desc   = ((const uint8_t *)desc_cfg) + sizeof(tusb_desc_configuration_t);
   const uint8_t *desc_end = ((const uint8_t *)desc_cfg) + tu_le16toh(desc_cfg->wTotalLength);
 
-  while (p_desc < desc_end) {
-    uint8_t assoc_itf_count = 1;
-
+  while (tu_desc_in_bounds(p_desc, desc_end)) {
     // Class will always start with Interface Association (if any) and then Interface descriptor
     if (TUSB_DESC_INTERFACE_ASSOCIATION == tu_desc_type(p_desc)) {
-      const tusb_desc_interface_assoc_t *desc_iad = (const tusb_desc_interface_assoc_t *)p_desc;
-
-      assoc_itf_count = desc_iad->bInterfaceCount;
       p_desc = tu_desc_next(p_desc); // next to Interface
-
-      // IAD's first interface number and class should match with opened interface
-      // TU_ASSERT(desc_iad->bFirstInterface == desc_itf->bInterfaceNumber &&
-      //          desc_iad->bFunctionClass  == desc_itf->bInterfaceClass);
+      continue;
     }
 
     TU_ASSERT(TUSB_DESC_INTERFACE == tu_desc_type(p_desc));
@@ -1076,67 +1068,9 @@ static bool process_set_config(uint8_t rhport, uint8_t cfg_num) {
         // Open successfully
         TU_LOG_USBD("  %s opened\r\n", driver->name);
 
-        // Some drivers use 2 or more interfaces but may not have IAD e.g MIDI (always) or
-        // BTH (even CDC) with class in device descriptor (single interface)
-        if (assoc_itf_count == 1) {
-  #if CFG_TUD_CDC
-          if (driver->open == cdcd_open) {
-            assoc_itf_count = 2;
-          }
-  #endif
-
-  #if CFG_TUD_MIDI
-          if (driver->open == midid_open) {
-            // If there is a class-compliant Audio Control Class, then 2 interfaces. Otherwise, only one
-            if (TUSB_CLASS_AUDIO == desc_itf->bInterfaceClass &&
-                AUDIO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass &&
-                AUDIO_FUNC_PROTOCOL_CODE_UNDEF == desc_itf->bInterfaceProtocol) {
-              assoc_itf_count = 2;
-            }
-          }
-  #endif
-
-  #if CFG_TUD_BTH && CFG_TUD_BTH_ISO_ALT_COUNT
-          if (driver->open == btd_open) {
-            assoc_itf_count = 2;
-          }
-  #endif
-
-  #if CFG_TUD_AUDIO
-          if (driver->open == audiod_open) {
-            // UAC1 device doesn't have IAD, needs to read AS interface count from CS AC descriptor
-            if (TUSB_CLASS_AUDIO == desc_itf->bInterfaceClass &&
-                AUDIO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass &&
-                AUDIO_FUNC_PROTOCOL_CODE_UNDEF == desc_itf->bInterfaceProtocol) {
-              const uint8_t       *p       = tu_desc_next(p_desc);
-              const uint8_t *const itf_end = p_desc + remaining_len;
-              while (p < itf_end) {
-                if (TUSB_DESC_CS_INTERFACE == tu_desc_type(p) &&
-                    AUDIO10_CS_AC_INTERFACE_HEADER ==
-                      ((const audio10_desc_cs_ac_interface_1_t *)p)->bDescriptorSubType) {
-                  const audio10_desc_cs_ac_interface_1_t *p_header = (const audio10_desc_cs_ac_interface_1_t *)p;
-                  // AC + AS interfaces
-                  assoc_itf_count = p_header->bInCollection + 1;
-                  break;
-                }
-                p = tu_desc_next(p);
-              }
-            }
-          }
-  #endif
-        }
-
-        // bind (associated) interfaces to found driver
-        for (uint8_t i = 0; i < assoc_itf_count; i++) {
-          const uint8_t itf_num = desc_itf->bInterfaceNumber + i;
-
-          // Interface number must not be used already
-          TU_ASSERT(TUSB_INDEX_INVALID_8 == _usbd_dev.itf2drv[itf_num]);
-          _usbd_dev.itf2drv[itf_num] = drv_id;
-        }
-
-        // bind all endpoints to found driver
-        tu_edpt_bind_driver(_usbd_dev.ep2drv, desc_itf, drv_len, drv_id);
+        // bind found driver to all interfaces and endpoint within drv_len
+        TU_ASSERT(tu_bind_driver_to_ep_itf(drv_id, _usbd_dev.ep2drv, _usbd_dev.itf2drv, CFG_TUD_INTERFACE_MAX, p_desc,
+                                           drv_len));
 
         p_desc += drv_len; // next Interface
         break; // exit driver find loop
diff --git a/src/tusb.c b/src/tusb.c
index 14b388d04..de6ec0211 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -286,19 +286,28 @@ bool tu_edpt_validate(tusb_desc_endpoint_t const* desc_ep, tusb_speed_t speed, b
 }
 #endif
 
-void tu_edpt_bind_driver(uint8_t ep2drv[][2], tusb_desc_interface_t const* desc_itf, uint16_t desc_len,
-                         uint8_t driver_id) {
-  uint8_t const* p_desc = (uint8_t const*) desc_itf;
-  uint8_t const* desc_end = p_desc + desc_len;
+bool tu_bind_driver_to_ep_itf(uint8_t driver_id, uint8_t ep2drv[][2], uint8_t itf2drv[], uint8_t itf_max,
+                              const uint8_t *p_desc, uint16_t desc_len) {
+  const uint8_t *desc_end = p_desc + desc_len;
+  while (tu_desc_in_bounds(p_desc, desc_end)) {
+    const uint8_t desc_type = tu_desc_type(p_desc);
 
-  while (p_desc < desc_end) {
-    if (TUSB_DESC_ENDPOINT == tu_desc_type(p_desc)) {
-      uint8_t const ep_addr = ((tusb_desc_endpoint_t const*) p_desc)->bEndpointAddress;
-      TU_LOG(2, "  Bind EP %02x to driver id %u\r\n", ep_addr, driver_id);
-      ep2drv[tu_edpt_number(ep_addr)][tu_edpt_dir(ep_addr)] = driver_id;
+    if (desc_type == TUSB_DESC_ENDPOINT) {
+      const uint8_t ep_addr  = ((const tusb_desc_endpoint_t *)p_desc)->bEndpointAddress;
+      const uint8_t ep_num   = tu_edpt_number(ep_addr);
+      const uint8_t ep_dir   = tu_edpt_dir(ep_addr);
+      ep2drv[ep_num][ep_dir] = driver_id;
+    } else if (desc_type == TUSB_DESC_INTERFACE) {
+      const tusb_desc_interface_t *desc_itf = (const tusb_desc_interface_t *)p_desc;
+      if (desc_itf->bAlternateSetting == 0) {
+        TU_ASSERT(desc_itf->bInterfaceNumber < itf_max);
+        itf2drv[desc_itf->bInterfaceNumber] = driver_id;
+      }
     }
+
     p_desc = tu_desc_next(p_desc);
   }
+  return true;
 }
 
 uint16_t tu_desc_get_interface_total_len(tusb_desc_interface_t const* desc_itf, uint8_t itf_count, uint16_t max_len) {
diff --git a/src/tusb_option.h b/src/tusb_option.h
index be954e01a..a70d7a97e 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -31,7 +31,7 @@
 // Version is release as major.minor.revision eg 1.0.0
 #define TUSB_VERSION_MAJOR     0
 #define TUSB_VERSION_MINOR     20
-#define TUSB_VERSION_REVISION  0
+#define TUSB_VERSION_REVISION  1
 
 #define TUSB_VERSION_NUMBER    (TUSB_VERSION_MAJOR * 10000 + TUSB_VERSION_MINOR * 100 + TUSB_VERSION_REVISION)
 #define TUSB_VERSION_STRING    TU_XSTRING(TUSB_VERSION_MAJOR) "." TU_XSTRING(TUSB_VERSION_MINOR) "." TU_XSTRING(TUSB_VERSION_REVISION)