Merge pull request #2881 from hathach/enhance-dwc2-dcd

hathach · Nov 18, 2024 · 9e674d4 · 9e674d4
2 parents b3efa8e + 3fe7e61
commit 9e674d4
Show file tree

Hide file tree

Showing 9 changed files with 567 additions and 415 deletions.
diff --git a/hw/bsp/family_support.cmake b/hw/bsp/family_support.cmake
@@ -289,6 +289,11 @@ function(family_add_tinyusb TARGET OPT_MCU RTOS)
       )
   endif ()
 
+  # compile define from command line
+  if(DEFINED CFLAGS_CLI)
+    target_compile_options(${TARGET}-tinyusb PUBLIC ${CFLAGS_CLI})
+  endif()
+
 endfunction()
 
 # Add bin/hex output

diff --git a/src/common/tusb_mcu.h b/src/common/tusb_mcu.h
@@ -548,7 +548,7 @@
   #define TUP_DCD_EDPT_ISO_ALLOC
 #endif
 
-#if defined(TUP_USBIP_DWC2) // && CFG_TUD_DWC2_DMA == 0
+#if defined(TUP_USBIP_DWC2) // && CFG_TUD_DWC2_DMA_ENABLE == 0
   #define TUP_MEM_CONST_ADDR
 #endif