clean up

Author: hathach

examples/Video/video_capture/video_capture.ino

@@ -156,6 +156,9 @@ void loop() {
   tud_video_n_frame_xfer(0, 0, (void*) frame_buffer, FRAME_WIDTH * FRAME_HEIGHT * 16 / 8);
 }
 
+//--------------------------------------------------------------------+
+// TinyUSB Video Callbacks
+//--------------------------------------------------------------------+
 void tud_video_frame_xfer_complete_cb(uint_fast8_t ctl_idx, uint_fast8_t stm_idx) {
   (void) ctl_idx;
   (void) stm_idx;

src/arduino/Adafruit_USBD_Device.cpp

@@ -240,90 +240,6 @@ bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface &itf) {
     return false;
   }
 
-#if 0
-  uint8_t *desc_end = desc + len;
-  const char *desc_str = itf.getStringDescriptor();
-
-  // Parse interface descriptor to update
-  // - IAD: interface number
-  // - Interface: number & string descriptor
-  // - Endpoint: address
-  while (desc < desc_end) {
-    switch (tu_desc_type(desc)) {
-    case TUSB_DESC_INTERFACE_ASSOCIATION: {
-      tusb_desc_interface_assoc_t *desc_iad =
-          (tusb_desc_interface_assoc_t *)desc;
-      desc_iad->bFirstInterface = _itf_count;
-      break;
-    }
-
-    case TUSB_DESC_INTERFACE: {
-      tusb_desc_interface_t *desc_itf = (tusb_desc_interface_t *)desc;
-      desc_itf->bInterfaceNumber = _itf_count;
-
-#if CFG_TUD_VIDEO && CFG_TUD_VIDEO_STREAMING
-      if (TUSB_CLASS_VIDEO == desc_itf->bInterfaceClass) {
-        desc += tu_desc_len(desc); // next to CS Interface
-
-        if (TUSB_DESC_CS_INTERFACE == tu_desc_type(desc)) {
-          uint8_t const subtype = desc[2];
-
-          if (VIDEO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass) {
-            // Adjust stream interface number in VC Header
-            if (subtype == VIDEO_CS_ITF_VC_HEADER) {
-              uint8_t const vs_count = desc[11];
-              for (uint8_t i = 0; i < vs_count; i++) {
-                desc[12 + i] += _itf_count;
-              }
-            }
-          } else if (VIDEO_SUBCLASS_STREAMING == desc_itf->bInterfaceSubClass) {
-            // Adjust the endpoint address in CS VS Input/Output Header
-            if (subtype == VIDEO_CS_ITF_VS_INPUT_HEADER) {
-              desc[6] = 0x80 | _epin_count;
-            } else if (subtype == VIDEO_CS_ITF_VS_OUTPUT_HEADER) {
-              desc[6] = _epout_count;
-            }
-          }
-        }
-      }
-#endif
-
-      if (desc_itf->bAlternateSetting == 0) {
-        _itf_count++;
-        if (desc_str && (_desc_str_count < STRING_DESCRIPTOR_MAX)) {
-          _desc_str_arr[_desc_str_count] = desc_str;
-          desc_itf->iInterface = _desc_str_count;
-          _desc_str_count++;
-
-          // only assign string index to first interface
-          desc_str = NULL;
-        } else {
-          desc_itf->iInterface = 0;
-        }
-      }
-
-      break;
-    }
-
-    case TUSB_DESC_ENDPOINT: {
-      tusb_desc_endpoint_t *desc_ep = (tusb_desc_endpoint_t *)desc;
-      desc_ep->bEndpointAddress |=
-          (desc_ep->bEndpointAddress & 0x80) ? _epin_count++ : _epout_count++;
-      break;
-    }
-
-    default:
-      break;
-    }
-
-    if (desc[0] == 0) {
-      return false;
-    }
-
-    desc += tu_desc_len(desc);
-  }
-#endif
-
   _desc_cfg_len += len;
 
   // Update configuration descriptor