compiled with platformio

Author: hathach

src/arduino/Adafruit_USBH_Host.cpp

@@ -124,11 +124,18 @@ TU_ATTR_WEAK void tuh_hid_report_received_cb(uint8_t dev_addr, uint8_t instance,
 //--------------------------------------------------------------------+
 #if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
 
+#if defined(ARDUINO_ARCH_ESP32) && !defined(PLATFORMIO)
+extern "C" void hcd_int_handler_esp32(uint8_t rhport, bool in_isr);
+#endif
+
 static void max3421_isr(void) {
   // ESP32 out-of-sync
 #if defined(ARDUINO_ARCH_ESP32)
-  extern "C" void hcd_int_handler_esp32(uint8_t rhport, bool in_isr);
+#if defined(PLATFORMIO)
+  tuh_int_handler(1, false);
+#else
   hcd_int_handler_esp32(1, false);
+#endif
 #else
   tuh_int_handler(1, true);
 #endif

src/class/cdc/cdc_host.c

@@ -24,15 +24,25 @@
  * This file is part of the TinyUSB stack.
  */
 
+// ESP32 out-of-sync
+#ifdef ARDUINO_ARCH_ESP32
+#include "arduino/ports/esp32/tusb_config_esp32.h"
+#endif
+
 #include "tusb_option.h"
 
 #if (CFG_TUH_ENABLED && CFG_TUH_CDC)
 
 #include "host/usbh.h"
 #include "host/usbh_pvt.h"
 
+// ESP32 out-of-sync
+#ifdef ARDUINO_ARCH_ESP32
+#endif
+
 #include "cdc_host.h"
 
+
 // Level where CFG_TUSB_DEBUG must be at least for this driver is logged
 #ifndef CFG_TUH_CDC_LOG_LEVEL
   #define CFG_TUH_CDC_LOG_LEVEL   CFG_TUH_LOG_LEVEL

src/class/dfu/dfu_device.c

@@ -24,15 +24,15 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "tusb_option.h"
-
-#if (CFG_TUD_ENABLED && CFG_TUD_DFU)
-
 // ESP32 out-of-sync
 #ifdef ARDUINO_ARCH_ESP32
 #include "arduino/ports/esp32/tusb_config_esp32.h"
 #endif
 
+#include "tusb_option.h"
+
+#if (CFG_TUD_ENABLED && CFG_TUD_DFU)
+
 #include "device/usbd.h"
 #include "device/usbd_pvt.h"
 

src/class/hid/hid_host.c

@@ -24,6 +24,11 @@
  * This file is part of the TinyUSB stack.
  */
 
+// ESP32 out-of-sync
+#ifdef ARDUINO_ARCH_ESP32
+#include "arduino/ports/esp32/tusb_config_esp32.h"
+#endif
+
 #include "tusb_option.h"
 
 #if (CFG_TUH_ENABLED && CFG_TUH_HID)

src/class/msc/msc_host.c

@@ -24,6 +24,11 @@
  * This file is part of the TinyUSB stack.
  */
 
+// ESP32 out-of-sync
+#ifdef ARDUINO_ARCH_ESP32
+#include "arduino/ports/esp32/tusb_config_esp32.h"
+#endif
+
 #include "tusb_option.h"
 
 #if CFG_TUH_ENABLED && CFG_TUH_MSC

src/device/usbd.c

@@ -24,6 +24,11 @@
  * This file is part of the TinyUSB stack.
  */
 
+// ESP32 out-of-sync
+#ifdef ARDUINO_ARCH_ESP32
+#include "arduino/ports/esp32/tusb_config_esp32.h"
+#endif
+
 #include "tusb_option.h"
 
 #if CFG_TUD_ENABLED
@@ -38,9 +43,7 @@
 //--------------------------------------------------------------------+
 // ESP32 out-of-sync
 //--------------------------------------------------------------------+
-#ifdef ARDUINO_ARCH_ESP32
-#include "arduino/ports/esp32/tusb_config_esp32.h"
-
+#if defined(ARDUINO_ARCH_ESP32) && !defined(PLATFORMIO)
 TU_ATTR_WEAK bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size);
 TU_ATTR_WEAK bool dcd_edpt_iso_activate(uint8_t rhport,  tusb_desc_endpoint_t const * p_endpoint_desc);
 

src/portable/analog/max3421/hcd_max3421.c

@@ -672,7 +672,7 @@ bool hcd_setup_send(uint8_t rhport, uint8_t daddr, uint8_t const setup_packet[8]
 }
 
 // ESP32 out-of-sync
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && !defined(PLATFORMIO)
 bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) {
 #else
 // clear stall, data toggle is also reset to DATA0
@@ -870,7 +870,7 @@ void print_hirq(uint8_t hirq) {
 #endif
 
 // ESP32 out-of-sync
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && !defined(PLATFORMIO)
 void hcd_int_handler_esp32(uint8_t rhport, bool in_isr) {
 #else
 // Interrupt handler

src/tusb_config.h

@@ -39,9 +39,14 @@
   #include "arduino/ports/rp2040/tusb_config_rp2040.h"
 
 #elif defined(ARDUINO_ARCH_ESP32)
-  // For consistency: use the BSP sdk/include/arduino_tinyusb/include/tusb_config.h
-  // Note: platformio prioritize this file over the one in BSP, include BSP one is required
+  // Note: won't reach this if compiling with Arduino IDEs since Arduino IDE will include one
+  // in the the BSP sdk/include/arduino_tinyusb/include/tusb_config.h
+
+  #if defined(PLATFORMIO)
+  // For platformio prioritize this file over the one in BSP, include BSP one is required
+  // For consistency: include the one in BSP
   #include "../../arduino_tinyusb/include/tusb_config.h"
+  #endif
 
 #else
   #error TinyUSB Arduino Library does not support your core yet