adafruit-mirror/esp32-arduino-lib-builder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update arduino_tinyusb dcd

Browse source
This commit is contained in:
me-no-dev 2021-08-12 13:27:41 +03:00
parent f43bfe41d5
commit 533482e145
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/arduino_tinyusb/CMakeLists.txt
View file

@ -26,9 +26,9 @@ if(CONFIG_TINYUSB_ENABLED)
"${COMPONENT_DIR}/include") "${COMPONENT_DIR}/include")
set(srcs set(srcs
# espressif: # espressif:
"${COMPONENT_DIR}/src/dcd_esp32s2.c" "${COMPONENT_DIR}/src/dcd_esp32sx.c"
# tusb: # tusb:
#"${COMPONENT_DIR}/tinyusb/src/portable/espressif/esp32s2/dcd_esp32s2.c" #"${COMPONENT_DIR}/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c"
"${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c" "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c"
"${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c" "${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c"
"${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c" "${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c"

8
components/arduino_tinyusb/src/dcd_esp32s2.c → components/arduino_tinyusb/src/dcd_esp32sx.c
View file

@ -27,16 +27,15 @@
*/ */
#include "tusb_option.h" #include "tusb_option.h"
#include "common/tusb_fifo.h"
#if CFG_TUSB_MCU == OPT_MCU_ESP32S2 && TUSB_OPT_DEVICE_ENABLED #if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) || (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && TUSB_OPT_DEVICE_ENABLED)
// Espressif // Espressif
#include "driver/periph_ctrl.h" #include "driver/periph_ctrl.h"
#include "freertos/xtensa_api.h" #include "freertos/xtensa_api.h"
#include "esp_intr_alloc.h" #include "esp_intr_alloc.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp32s2/rom/gpio.h" #include "driver/gpio.h"
#include "soc/dport_reg.h" #include "soc/dport_reg.h"
#include "soc/gpio_sig_map.h" #include "soc/gpio_sig_map.h"
#include "soc/usb_periph.h" #include "soc/usb_periph.h"
@ -299,6 +298,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const *desc_edpt)
uint8_t const epnum = tu_edpt_number(desc_edpt->bEndpointAddress); uint8_t const epnum = tu_edpt_number(desc_edpt->bEndpointAddress);
uint8_t const dir = tu_edpt_dir(desc_edpt->bEndpointAddress); uint8_t const dir = tu_edpt_dir(desc_edpt->bEndpointAddress);
TU_ASSERT(desc_edpt->wMaxPacketSize.size <= 64);
TU_ASSERT(epnum < EP_MAX); TU_ASSERT(epnum < EP_MAX);
xfer_ctl_t *xfer = XFER_CTL_BASE(epnum, dir); xfer_ctl_t *xfer = XFER_CTL_BASE(epnum, dir);
@ -932,5 +932,5 @@ void dcd_int_disable (uint8_t rhport)
esp_intr_free(usb_ih); esp_intr_free(usb_ih);
} }
#endif // OPT_MCU_ESP32S2 #endif // #if OPT_MCU_ESP32S2 || OPT_MCU_ESP32S3