ports/esp32: Use shared/tinyusb integration.

Uses newer libusb synopsys/dwc2 driver rather than the IDF tinyusb component. Signed-off-by: Andrew Leech <[email protected]>
andrewleech · Jun 20, 2024 · 722590c · 722590c
1 parent 457e02a
commit 722590c
Showing 1 changed file with 35 additions and 28 deletions.
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
@@ -52,34 +52,6 @@ list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
-if(MICROPY_PY_TINYUSB)
-    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
-
-    set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
-    string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
-
-    list(APPEND MICROPY_DEF_CORE
-        CFG_TUSB_MCU=${tusb_mcu}
-    )
-
-    list(APPEND MICROPY_SOURCE_LIB
-        ${TINYUSB_SRC}/tusb.c
-        ${TINYUSB_SRC}/common/tusb_fifo.c
-        ${TINYUSB_SRC}/device/usbd.c
-        ${TINYUSB_SRC}/device/usbd_control.c
-        ${TINYUSB_SRC}/class/cdc/cdc_device.c
-        ${TINYUSB_SRC}/portable/synopsys/dwc2/dcd_dwc2.c
-        ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
-        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
-        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
-    )
-
-    list(APPEND MICROPY_INC_CORE
-        ${TINYUSB_SRC}
-        ${MICROPY_DIR}/shared/tinyusb/
-    )
-endif()
-
 list(APPEND MICROPY_SOURCE_PORT
     panichandler.c
     adc.c
@@ -220,6 +192,41 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
     ${IDF_PATH}/components/bt/host/nimble/nimble
 )
 
+if(MICROPY_PY_TINYUSB)
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
+
+    # if(ECHO_SUBMODULES)
+    # # No-op, we're just doing submodule/variant discovery.
+    # # Cannot run the add_library/target_include_directories rules (even though
+    # # the build won't run) because IDF will attempt verify the files exist.
+    # else()
+
+    set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
+    string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
+
+    list(APPEND MICROPY_DEF_CORE
+        CFG_TUSB_MCU=${tusb_mcu}
+    )
+
+    list(APPEND MICROPY_SOURCE_LIB
+        ${TINYUSB_SRC}/tusb.c
+        ${TINYUSB_SRC}/common/tusb_fifo.c
+        ${TINYUSB_SRC}/device/usbd.c
+        ${TINYUSB_SRC}/device/usbd_control.c
+        ${TINYUSB_SRC}/class/cdc/cdc_device.c
+        ${TINYUSB_SRC}/portable/synopsys/dwc2/dcd_dwc2.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
+    )
+
+    target_include_directories(${MICROPY_TARGET} PRIVATE
+        ${TINYUSB_SRC}
+        ${MICROPY_DIR}/shared/tinyusb/
+    )
+    # endif()
+endif()
+
 # Add additional extmod and usermod components.
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)