Reorganized some build files & commented out WFI to debug USB. USB enumerates but has some issues starting interfaces for CDC/MSC/HID.

Author: Brandon-Hurst

ports/analog/Makefile

@@ -167,36 +167,24 @@ COPT += -O0 #opt completely off to start
 endif
 
 # TinyUSB CFLAGS
-ifeq ($(CIRCUITPY_TINYUSB),1)
 CFLAGS += \
 	-DCFG_TUSB_MCU=OPT_MCU_$(MCU_VARIANT_UPPER) \
 	-DBOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED \
-	-DCFG_TUSB_OS=OPT_OS_NONE
-
-# -DCFG_TUD_TASK_QUEUE_SZ=32
-
-# Add TinyUSB sources
-INC += -I../../lib/tinyusb/src
-INC += -I../../supervisor/shared/usb
-SRC_C += lib/tinyusb/src/portable/mentor/musb/dcd_musb.c
-endif
-
-ifeq ($(CIRCUITPY_USB_DEVICE),1)
-CFLAGS += \
+	-DCFG_TUSB_OS=OPT_OS_NONE \
 	-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
 	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
-	-DCFG_TUD_MSC_BUFSIZE=4096
-endif
-
-ifdef CIRCUITPY_USB_VENDOR
-CFLASGS += \
+	-DCFG_TUD_MSC_BUFSIZE=4096 \
+	-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
+	-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
 	-DCFG_TUD_VENDOR_RX_BUFSIZE=1024 \
 	-DCFG_TUD_VENDOR_TX_BUFSIZE=1024
-endif
 
-# -DCFG_TUD_MIDI_RX_BUFSIZE=128
-# -DCFG_TUD_MIDI_TX_BUFSIZE=128
+# Add TinyUSB sources
+INC += -I../../lib/tinyusb/src
+INC += -I../../supervisor/shared/usb
+SRC_C += lib/tinyusb/src/portable/mentor/musb/dcd_musb.c
 
+# Add port sources incl. any board functions
 SRC_C += \
 	boards/$(BOARD)/board.c \
 	background.c \

ports/analog/mpconfigport.mk

@@ -17,15 +17,16 @@ INTERNAL_FLASH_FILESYSTEM = 1
 SPI_FLASH_FILESYSTEM = 0
 QSPI_FLASH_FILESYSTEM = 0
 
-# TODO: Test/Debug fs & general bringup
+# TODO: Test/Debug fs once USB-MSC is ready
 DISABLE_FILESYSTEM = 0
 
 # TODO: Test/Debug TinyUSB!
-CIRCUITPY_TINYUSB = 1
-CIRCUITPY_USB_DEVICE ?= 1
-CIRCUITPY_USB_CDC ?= 1
-CIRCUITPY_USB_HID ?= 0
-CIRCUITPY_USB_MIDI ?= 0
+# CIRCUITPY_TINYUSB = 1
+# CIRCUITPY_USB_DEVICE ?= 1
+# CIRCUITPY_USB_CDC ?= 1
+# CIRCUITPY_USB_VENDOR ?=1
+# CIRCUITPY_USB_HID ?= 0
+# CIRCUITPY_USB_MIDI ?= 0
 
 ####################################################################################
 # Suggested config for first-time porting

ports/analog/supervisor/port.c

@@ -163,7 +163,7 @@ uint32_t *port_stack_get_limit(void) {
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Warray-bounds"
 
-    // NOTE: Only return how much stack we have alloted for CircuitPython
+    // NOTE: Only return how much stack we have allotted for CircuitPython
     return port_stack_get_top() - (CIRCUITPY_DEFAULT_STACK_SIZE + CIRCUITPY_EXCEPTION_STACK_SIZE) / sizeof(uint32_t);
     #pragma GCC diagnostic pop
 }
@@ -268,7 +268,7 @@ void port_idle_until_interrupt(void) {
     if (!background_callback_pending()) {
         __DSB();
         /** DEBUG: may comment out WFI for debugging port functions */
-        __WFI();
+        // __WFI();
     }
     common_hal_mcu_enable_interrupts();
 }