rename to Adafruit_TinyUSB_PortAPI.h

Author: hathach

src/arduino/Adafruit_USBD_CDC.cpp

@@ -29,7 +29,7 @@
 #include "Arduino.h"
 #include "Adafruit_USBD_Device.h"
 #include "Adafruit_USBD_CDC.h"
-#include "arduino/ports/Adafruit_TinyUSB_Port.h"
+#include "ports/Adafruit_TinyUSB_PortAPI.h"
 
 // TODO Multiple instances supports
 //	static uint8_t _itf_count;

src/arduino/Adafruit_USBD_Device.cpp

@@ -28,7 +28,7 @@
 
 #include "Adafruit_USBD_Device.h"
 #include "Adafruit_USBD_CDC.h"
-#include "arduino/ports/Adafruit_TinyUSB_Port.h"
+#include "ports/Adafruit_TinyUSB_PortAPI.h"
 
 #ifndef USB_MANUFACTURER
   #define USB_MANUFACTURER "Unknown"

src/arduino/ports/Adafruit_TinyUSB_Port.h renamed to src/arduino/ports/Adafruit_TinyUSB_PortAPI.h

@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef ADAFRUIT_TINYUSB_PORT_H_
-#define ADAFRUIT_TINYUSB_PORT_H_
+#ifndef ADAFRUIT_TINYUSB_PORTAPI_H_
+#define ADAFRUIT_TINYUSB_PORTAPI_H_
 
 //--------------------------------------------------------------------+
 // Porting API

src/portable/espressif/esp32sx/dcd_esp32sx.c

@@ -27,10 +27,11 @@
  */
 
 #include "tusb_option.h"
-#include "common/tusb_fifo.h"
 
 #if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) ||  (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && TUSB_OPT_DEVICE_ENABLED)
 
+#include "common/tusb_fifo.h"
+
 // Espressif
 #include "driver/periph_ctrl.h"
 #include "freertos/xtensa_api.h"

src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c

@@ -102,7 +102,6 @@
  */
 
 #include "tusb_option.h"
-#include "common/tusb_fifo.h"
 
 #if defined(STM32F102x6) || defined(STM32F102xB) || \
     defined(STM32F103x6) || defined(STM32F103xB) || \
@@ -121,6 +120,7 @@
 // Some definitions are copied to our private include file.
 #undef USE_HAL_DRIVER
 
+#include "common/tusb_fifo.h"
 #include "device/dcd.h"
 #include "portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h"
 
@@ -696,7 +696,7 @@ static void dcd_pma_free(uint8_t ep_addr)
   // Presently, this should never be called for EP0 IN/OUT
   TU_ASSERT(open_ep_count > 2, /**/);
   TU_ASSERT(xfer_ctl_ptr(epnum,dir)->max_packet_size != 0, /**/);
-  open_ep_count--;
+  open_ep_count--;#include "common/tusb_fifo.h"
 
   // If count is 2, only EP0 should be open, so allocations can be mostly reset.
 
@@ -824,7 +824,7 @@ static void dcd_transmit_packet(xfer_ctl_t * xfer, uint16_t ep_ix)
   {
     dcd_write_packet_memory_ff(xfer->ff, oldAddr, len);
   }
-  else
+  else#include "common/tusb_fifo.h"
 #endif
   {
     dcd_write_packet_memory(oldAddr, &(xfer->buffer[xfer->queued_len]), len);

src/portable/st/synopsys/dcd_synopsys.c

@@ -28,7 +28,6 @@
  */
 
 #include "tusb_option.h"
-#include "common/tusb_fifo.h"
 
 // Since TinyUSB doesn't use SOF for now, and this interrupt too often (1ms interval)
 // We disable SOF for now until needed later on
@@ -55,6 +54,8 @@
       (CFG_TUSB_MCU == OPT_MCU_STM32L4 && defined(STM32L4_SYNOPSYS))    \
     )
 
+#include "common/tusb_fifo.h"
+
 // EP_MAX       : Max number of bi-directional endpoints including EP0
 // EP_FIFO_SIZE : Size of dedicated USB SRAM
 #if CFG_TUSB_MCU == OPT_MCU_STM32F1