Merge pull request hathach#1370 from hathach/fix-esp-idf

hathach · web-flow · commit 5453c7e97f67 · 2022-03-04T15:20:51.000+07:00
fix build with esp32s2, also use dwc2 for esp example
diff --git a/examples/device/hid_composite_freertos/src/CMakeLists.txt b/examples/device/hid_composite_freertos/src/CMakeLists.txt
@@ -31,5 +31,5 @@ target_sources(${COMPONENT_TARGET} PUBLIC
   "${TOP}/src/class/net/ncm_device.c"
   "${TOP}/src/class/usbtmc/usbtmc_device.c"
   "${TOP}/src/class/vendor/vendor_device.c"
-  "${TOP}/src/portable/espressif/esp32sx/dcd_esp32sx.c"
+  "${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c"
 )
diff --git a/src/portable/espressif/esp32sx/dcd_esp32sx.c b/src/portable/espressif/esp32sx/dcd_esp32sx.c
@@ -34,7 +34,6 @@
 #include "freertos/xtensa_api.h"
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
-#include "driver/gpio.h"
 #include "soc/dport_reg.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/usb_periph.h"

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ target_sources(${COMPONENT_TARGET} PUBLIC`
`31`	`31`	`"${TOP}/src/class/net/ncm_device.c"`
`32`	`32`	`"${TOP}/src/class/usbtmc/usbtmc_device.c"`
`33`	`33`	`"${TOP}/src/class/vendor/vendor_device.c"`
`34`		`- "${TOP}/src/portable/espressif/esp32sx/dcd_esp32sx.c"`
	`34`	`+ "${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c"`
`35`	`35`	`)`