shared/tinyusb,extmod: Improve code organization and header declarations.

Consolidated extern declarations from scattered source locations into
mp_usbd.h header. Made descriptor buffer and function declarations
conditional on MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE to match their
definitions. Removed dead code in descriptor.c.

No functional changes - build sizes unchanged at 514,396 bytes (runtime)
and 512,020 bytes (static).

Signed-off-by: Andrew Leech <[email protected]>
Signed-off-by: Andrew Leech <[email protected]>

Author: pi-anl

extmod/machine_usb_device.c

@@ -84,7 +84,6 @@ static mp_obj_t usb_device_make_new(const mp_obj_type_t *type, size_t n_args, si
         o->base.type = &machine_usb_device_type;
 
         // Initialize fields common to both minimal and full modes
-        extern mp_usbd_class_state_t mp_usbd_class_state;
         #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
         // Runtime mode: read current class state to reflect default CDC configuration
         o->builtin_driver = mp_usbd_class_state.flags;
@@ -213,12 +212,10 @@ static mp_obj_t usb_device_active(size_t n_args, const mp_obj_t *args) {
                 // Update class state based on current builtin_driver
                 if (mp_obj_is_type(usbd->builtin_driver, &mp_type_usb_builtin)) {
                     mp_obj_usb_builtin_t *builtin = MP_OBJ_TO_PTR(usbd->builtin_driver);
-                    extern mp_usbd_class_state_t mp_usbd_class_state;
                     mp_usbd_class_state.flags = builtin->flags;
                 }
             } else {
                 // Disable all classes when deactivating
-                extern mp_usbd_class_state_t mp_usbd_class_state;
                 mp_usbd_class_state.flags = USB_BUILTIN_FLAG_NONE;
             }
             #endif
@@ -413,13 +410,10 @@ static uint8_t mp_usbd_get_str_max(uint8_t flags) {
 }
 
 static const uint8_t *mp_usbd_get_builtin_desc_cfg(uint8_t flags) {
-    extern uint8_t mp_usbd_desc_cfg_buffer[];
-    extern const uint8_t *mp_usbd_generate_desc_cfg_unified(uint8_t flags, uint8_t *buffer);
     return mp_usbd_generate_desc_cfg_unified(flags, mp_usbd_desc_cfg_buffer);
 }
 
 static size_t mp_usbd_get_desc_cfg_len(uint8_t flags) {
-    extern size_t mp_usbd_get_descriptor_cfg_len_from_flags(uint8_t flags);
     return mp_usbd_get_descriptor_cfg_len_from_flags(flags);
 }
 #endif // MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE

shared/tinyusb/mp_usbd.h

@@ -100,7 +100,6 @@ extern const mp_obj_type_t mp_type_usb_builtin;
 #define USB_BUILTIN_FLAG_NONE  0x00
 #define USB_BUILTIN_FLAG_CDC   0x01
 #define USB_BUILTIN_FLAG_MSC   0x02
-#define USB_BUILTIN_FLAG_NCM   0x04
 
 // Helper macros for checking enabled classes
 #define MP_USBD_CDC_ENABLED() (mp_usbd_class_state.flags & USB_BUILTIN_FLAG_CDC)
@@ -119,38 +118,6 @@ static inline void mp_usbd_init_class_state(void) {
     #endif
 }
 
-// Calculate descriptor length from flags using compile-time conditionals
-static inline size_t mp_usbd_get_descriptor_cfg_len_from_flags(uint8_t flags) {
-    size_t len = TUD_CONFIG_DESC_LEN;
-    #if CFG_TUD_CDC
-    if (flags & USB_BUILTIN_FLAG_CDC) {
-        len += TUD_CDC_DESC_LEN;
-    }
-    #endif
-    #if CFG_TUD_MSC
-    if (flags & USB_BUILTIN_FLAG_MSC) {
-        len += TUD_MSC_DESC_LEN;
-    }
-    #endif
-    return len;
-}
-
-// Calculate interface count from flags using compile-time conditionals
-static inline uint8_t mp_usbd_get_interface_count_from_flags(uint8_t flags) {
-    uint8_t count = 0;
-    #if CFG_TUD_CDC
-    if (flags & USB_BUILTIN_FLAG_CDC) {
-        count += 2;  // CDC uses 2 interfaces
-    }
-    #endif
-    #if CFG_TUD_MSC
-    if (flags & USB_BUILTIN_FLAG_MSC) {
-        count += 1;  // MSC uses 1 interface
-    }
-    #endif
-    return count;
-}
-
 // Combined descriptor info calculation using compile-time conditionals
 static inline usb_desc_info_t mp_usbd_get_desc_info_from_flags(uint8_t flags) {
     usb_desc_info_t info = { .length = TUD_CONFIG_DESC_LEN, .interface_count = 0 };
@@ -169,6 +136,11 @@ static inline usb_desc_info_t mp_usbd_get_desc_info_from_flags(uint8_t flags) {
     return info;
 }
 
+// Wrapper for length-only callers
+static inline size_t mp_usbd_get_descriptor_cfg_len_from_flags(uint8_t flags) {
+    return mp_usbd_get_desc_info_from_flags(flags).length;
+}
+
 // Initialise TinyUSB device
 static inline void mp_usbd_init_tud(void) {
     // Initialize class state before TinyUSB init
@@ -203,7 +175,16 @@ size_t mp_usbd_get_descriptor_cfg_len(void);
 
 // Built-in USB device and configuration descriptor values
 extern const tusb_desc_device_t mp_usbd_builtin_desc_dev;
+
+#if !MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
+// Static mode: Use static descriptor array
 extern const uint8_t mp_usbd_builtin_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN];
+#else
+// Runtime mode: Use buffer and generation functions
+extern uint8_t mp_usbd_desc_cfg_buffer[MP_USBD_BUILTIN_DESC_CFG_LEN];
+const uint8_t *mp_usbd_get_default_desc(void);
+const uint8_t *mp_usbd_generate_desc_cfg_unified(uint8_t flags, uint8_t *buffer);
+#endif
 
 void mp_usbd_task_callback(mp_sched_node_t *node);
 
@@ -219,6 +200,13 @@ static inline void mp_usbd_deinit(void) {
     // Called in soft reset path. No-op if no runtime USB devices require cleanup.
 }
 
+// Minimal USB device structure for static mode (builtin_driver control only)
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t builtin_driver; // Points to a USBBuiltin constant object
+    bool active; // Has the user set the USB device active?
+} mp_obj_usb_device_t;
+
 #else
 // Runtime USB Device support requires more complex init/deinit
 void mp_usbd_init(void);
@@ -264,15 +252,6 @@ typedef struct {
     mp_obj_t pend_excs[MP_USBD_MAX_PEND_EXCS];
 } mp_obj_usb_device_t;
 
-#else // Static USBD drivers only
-
-// Minimal USB device structure for static mode (builtin_driver control only)
-typedef struct {
-    mp_obj_base_t base;
-    mp_obj_t builtin_driver; // Points to a USBBuiltin constant object
-    bool active; // Has the user set the USB device active?
-} mp_obj_usb_device_t;
-
 #endif
 
 // Return true if any built-in driver is enabled

shared/tinyusb/mp_usbd_descriptor.c

@@ -165,40 +165,10 @@ const uint8_t *mp_usbd_generate_desc_cfg_unified(uint8_t flags, uint8_t *buffer)
 
 // Get dynamic descriptor length based on enabled classes
 size_t mp_usbd_get_descriptor_cfg_len(void) {
-    size_t len = TUD_CONFIG_DESC_LEN;
-
-    #if CFG_TUD_CDC
-    if (MP_USBD_CDC_ENABLED()) {
-        len += TUD_CDC_DESC_LEN;
-    }
-    #endif
-    #if CFG_TUD_MSC
-    if (MP_USBD_MSC_ENABLED()) {
-        len += TUD_MSC_DESC_LEN;
-    }
-    #endif
-
-    return len;
+    return mp_usbd_get_descriptor_cfg_len_from_flags(mp_usbd_class_state.flags);
 }
 
 
-#if 0
-// Static descriptor for maximum possible configuration
-static const uint8_t mp_usbd_builtin_desc_cfg_max[MP_USBD_BUILTIN_DESC_CFG_LEN] = {
-    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_BUILTIN_MAX, USBD_STR_0, MP_USBD_BUILTIN_DESC_CFG_LEN,
-        0, USBD_MAX_POWER_MA),
-
-    #if CFG_TUD_CDC
-    TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
-        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
-    #endif
-    #if CFG_TUD_MSC
-    TUD_MSC_DESCRIPTOR(USBD_ITF_MSC, USBD_STR_MSC, USBD_MSC_EP_OUT, USBD_MSC_EP_IN, USBD_MSC_IN_OUT_MAX_SIZE),
-    #endif
-};
-#endif
-
-
 // Dynamic descriptor buffer for runtime configuration
 static uint8_t mp_usbd_dynamic_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN];
 

shared/tinyusb/mp_usbd_runtime.c

@@ -123,21 +123,16 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
 
         // If no runtime descriptor but builtin_driver is set, generate from flags
         if (!result && usbd->builtin_driver != USB_BUILTIN_FLAG_NONE) {
-            extern uint8_t mp_usbd_desc_cfg_buffer[];
-            extern const uint8_t *mp_usbd_generate_desc_cfg_unified(uint8_t flags, uint8_t *buffer);
-            extern mp_usbd_class_state_t mp_usbd_class_state;
             mp_usbd_class_state.flags = usbd->builtin_driver;
             result = mp_usbd_generate_desc_cfg_unified(usbd->builtin_driver, mp_usbd_desc_cfg_buffer);
         }
     }
     // Fallback to descriptor (needed for boot before Python initializes)
     #if MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE
     // Runtime mode: Generate default descriptor from templates
-    extern const uint8_t *mp_usbd_get_default_desc(void);
     return result ? result : mp_usbd_get_default_desc();
     #else
     // Static mode: Use static descriptor
-    extern const uint8_t mp_usbd_builtin_desc_cfg[];
     return result ? result : mp_usbd_builtin_desc_cfg;
     #endif
 }