Add CIRCUITPY_USB_DEVICE config

This replaces CIRCUITPY_USB and makes room for CIRCUITPY_TINYUSB
when it may only be included for host support.

Author: tannewt

lib/tinyusb

@@ -236,7 +236,7 @@ STATIC void stop_mp(void) {
 
     background_callback_reset();
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_TINYUSB
     usb_background();
     #endif
 
@@ -466,7 +466,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
 
         start_mp(safe_mode);
 
-        #if CIRCUITPY_USB
+        #if CIRCUITPY_USB_DEVICE
         usb_setup_with_vm();
         #endif
 
@@ -845,7 +845,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     start_mp(safe_mode);
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     // Set up default USB values after boot.py VM starts but before running boot.py.
     usb_set_defaults();
     #endif
@@ -930,7 +930,7 @@ STATIC int run_repl(safe_mode_t safe_mode) {
 
     start_mp(safe_mode);
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     usb_setup_with_vm();
     #endif
 
@@ -1078,7 +1078,7 @@ int __attribute__((used)) main(void) {
     // By default our internal flash is readonly to local python code and
     // writable over USB. Set it here so that safemode.py or boot.py can change it.
     filesystem_set_internal_concurrent_write_protection(true);
-    filesystem_set_internal_writable_by_usb(CIRCUITPY_USB == 1);
+    filesystem_set_internal_writable_by_usb(CIRCUITPY_USB_DEVICE == 1);
 
     #if CIRCUITPY_SAFEMODE_PY
     // Run safemode.py if we ARE in safe mode.

main.c

@@ -52,7 +52,7 @@ void reset_all_pins(void) {
     uint32_t pin_mask[PORT_COUNT] = PORT_OUT_IMPLEMENTED;
 
     // Do not full reset USB lines.
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     pin_mask[0] &= ~(PORT_PA24 | PORT_PA25);
     #endif
 

ports/atmel-samd/common-hal/microcontroller/Pin.c

@@ -260,22 +260,34 @@ LIBS += -lm
 endif
 
 # TinyUSB defines
-ifeq ($(CIRCUITPY_USB),1)
-ifeq ($(IDF_TARGET),esp32s2)
+# Always add these because we might be doing host.
+ifeq ($(IDF_TARGET),esp32)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32
+else ifeq ($(IDF_TARGET),esp32c3)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C3
+else ifeq ($(IDF_TARGET),esp32c6)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C6
+else ifeq ($(IDF_TARGET),esp32h2)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32H2
+else ifeq ($(IDF_TARGET),esp32s2)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S2
 else ifeq ($(IDF_TARGET),esp32s3)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S3
 endif
+ifeq ($(CIRCUITPY_TINYUSB),1)
 CFLAGS += \
 	-DCFG_TUSB_OS=OPT_OS_FREERTOS \
+	-DCFG_TUD_TASK_QUEUE_SZ=32
+endif
+ifeq ($(CIRCUITPY_USB_DEVICE),1)
+CFLAGS += \
 	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
 	-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
 	-DCFG_TUD_MSC_BUFSIZE=4096 \
 	-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
 	-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
 	-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \
-	-DCFG_TUD_VENDOR_TX_BUFSIZE=128 \
-	-DCFG_TUD_TASK_QUEUE_SZ=32
+	-DCFG_TUD_VENDOR_TX_BUFSIZE=128
 endif
 
 ######################################
@@ -303,7 +315,7 @@ ifneq ($(CIRCUITPY_TOUCHIO_USE_NATIVE),0)
 SRC_C += peripherals/touch.c
 endif
 
-ifneq ($(CIRCUITPY_USB),0)
+ifneq ($(CIRCUITPY_USB_DEVICE),0)
 SRC_C += lib/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c
 endif
 
@@ -390,7 +402,7 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 else
-UF2_BOOTLOADER ?= $(CIRCUITPY_USB)
+UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
 ifeq ($(UF2_BOOTLOADER), 1)
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 else
@@ -503,7 +515,7 @@ endif
 ifneq ($(CIRCUITPY_PARALLELDISPLAYBUS),0)
 	ESP_IDF_COMPONENTS_LINK += esp_lcd
 endif
-ifneq ($(CIRCUITPY_USB),0)
+ifneq ($(CIRCUITPY_USB_DEVICE),0)
 	ESP_IDF_COMPONENTS_LINK += usb
 endif
 

ports/espressif/Makefile

@@ -13,7 +13,7 @@ IDF_TARGET = esp32s3
 
 # This board doesn't have USB by default, it
 # instead uses a CP2102 USB-to-Serial chip
-CIRCUITPY_USB = 0
+CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
 
 CIRCUITPY_ESP_FLASH_MODE = qio

ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk

@@ -18,7 +18,7 @@ CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1
 # To build with USB disabled allowing access to I2S pins
 #CIRCUITPY_CREATOR_ID = 0x1A000000
 #CIRCUITPY_CREATION_ID = 0x005381BF
-#CIRCUITPY_USB=0
+#CIRCUITPY_USB_DEVICE=0
 #CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
 #UF2_BOOTLOADER = 1
 #CIRCUITPY_WIFI=1

ports/espressif/boards/makerfabs_tft7/mpconfigboard.mk

@@ -99,7 +99,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GPIO19), MP_ROM_PTR(&pin_GPIO19) },
 
     // I2S pins are shared with USB D+/D-, these are only useful if USB is disabled
-    #if CIRCUITPY_USB == 0
+    #if CIRCUITPY_USB_DEVICE == 0
     { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO20) },
     { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO19) },

ports/espressif/boards/makerfabs_tft7/pins.c

@@ -3,7 +3,7 @@ CIRCUITPY_CREATION_ID = 0x00AA0004
 
 # This board doesn't have USB by default, it
 # instead uses a CH340C USB-to-Serial chip
-CIRCUITPY_USB = 0
+CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
 
 IDF_TARGET = esp32s3

ports/espressif/boards/sunton_esp32_8048S070/mpconfigboard.mk

@@ -3,7 +3,7 @@ CIRCUITPY_CREATION_ID = 0x00AB0001
 
 # This board doesn't have USB by default, it
 # instead uses a CH340C USB-to-Serial chip
-CIRCUITPY_USB = 0
+CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
 
 IDF_TARGET = esp32s3

ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/mpconfigboard.mk

@@ -176,7 +176,7 @@ static const uint64_t pin_mask_reset_forbidden =
     #endif // ESP32H2
 
     #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     // Never ever reset USB pins.
     GPIO_SEL_19 |         // USB D-
     GPIO_SEL_20 |         // USB D+