stm32: Fix compilation issues for static USB mode.

- Fix incomplete if statements in machine_usb_device.c and
  mp_usbd_descriptor.c that were causing nested function errors
- Add MICROPY_HW_STM_USB_STACK guards to pyb_usb_storage_medium
  usage in main.c for TinyUSB compatibility

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

Author: pi-anl

extmod/machine_usb_device.c

@@ -87,6 +87,16 @@ static mp_obj_t usb_device_make_new(const mp_obj_type_t *type, size_t n_args, si
             extern mp_usbd_class_state_t mp_usbd_class_state;
             uint8_t flags = 0;
             if (mp_usbd_class_state.cdc_enabled) {
+                flags |= USB_BUILTIN_FLAG_CDC;
+            }
+            if (mp_usbd_class_state.msc_enabled) {
+                flags |= USB_BUILTIN_FLAG_MSC;
+            }
+            #if MICROPY_HW_NETWORK_USBNET
+            if (mp_usbd_class_state.ncm_enabled) {
+                flags |= USB_BUILTIN_FLAG_NCM;
+            }
+            #endif
 
             // Create appropriate builtin object based on current state
             if (flags == USB_BUILTIN_FLAG_NONE) {

ports/stm32/usb.c

@@ -90,7 +90,9 @@ typedef struct _usb_device_t {
 } usb_device_t;
 
 usb_device_t usb_device = {0};
+#if MICROPY_HW_USB_MSC
 pyb_usb_storage_medium_t pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_NONE;
+#endif
 
 #if !MICROPY_HW_USB_IS_MULTI_OTG
 

ports/stm32/usb.h

@@ -43,12 +43,16 @@ typedef enum {
     USB_PHY_HS_ID = 1,
 } USB_PHY_ID;
 
+// Storage medium variable used by both USB stacks when MSC is enabled
+#if MICROPY_HW_USB_MSC
+extern pyb_usb_storage_medium_t pyb_usb_storage_medium;
+#endif
+
 #if MICROPY_HW_STM_USB_STACK
 
 typedef struct _pyb_usb_vcp_obj_t pyb_usb_vcp_obj_t;
 
 extern mp_uint_t pyb_usb_flags;
-extern pyb_usb_storage_medium_t pyb_usb_storage_medium;
 extern const struct _mp_rom_obj_tuple_t pyb_usb_hid_mouse_obj;
 extern const struct _mp_rom_obj_tuple_t pyb_usb_hid_keyboard_obj;
 extern const mp_obj_type_t pyb_usb_vcp_type;

shared/tinyusb/mp_usbd_descriptor.c

@@ -233,6 +233,14 @@ static uint8_t mp_usbd_dynamic_desc_cfg[MP_USBD_BUILTIN_DESC_CFG_LEN];
 static uint8_t mp_usbd_class_state_to_flags(void) {
     uint8_t flags = USB_BUILTIN_FLAG_NONE;
     if (mp_usbd_class_state.cdc_enabled) {
+        flags |= USB_BUILTIN_FLAG_CDC;
+    }
+    if (mp_usbd_class_state.msc_enabled) {
+        flags |= USB_BUILTIN_FLAG_MSC;
+    }
+    if (mp_usbd_class_state.ncm_enabled) {
+        flags |= USB_BUILTIN_FLAG_NCM;
+    }
     return flags;
 }