Merge pull request #219 from adafruit/rp2040-enhance-irq-task-runner

Rp2040 enhance irq task runner

Author: hathach

src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp

@@ -40,9 +40,6 @@ extern "C" {
 #include "arduino/Adafruit_TinyUSB_API.h"
 #include "tusb.h"
 
-// USB processing will be a periodic timer task
-#define USB_TASK_INTERVAL 1000
-
 // SDK >= 1.4.0 need to dynamically request the IRQ to avoid conflicts
 #if (PICO_SDK_VERSION_MAJOR * 100 + PICO_SDK_VERSION_MINOR) < 104
 #define USB_TASK_IRQ 31
@@ -63,34 +60,15 @@ static unsigned int USB_TASK_IRQ;
 // mbed use old pico-sdk does not have unique_id
 #ifdef ARDUINO_ARCH_MBED
 
-#include "mbed.h"
-static mbed::Ticker _usb_ticker;
-
 #define get_unique_id(_serial) flash_get_unique_id(_serial)
 
-static void ticker_task(void) { irq_set_pending(USB_TASK_IRQ); }
-
-static void setup_periodic_usb_hanlder(uint64_t us) {
-  _usb_ticker.attach(ticker_task, (std::chrono::microseconds)us);
-}
-
 #else
 
 #include "pico/unique_id.h"
-
 #define get_unique_id(_serial)                                                 \
   pico_get_unique_board_id((pico_unique_board_id_t *)_serial);
 
-static int64_t timer_task(__unused alarm_id_t id, __unused void *user_data) {
-  irq_set_pending(USB_TASK_IRQ);
-  return USB_TASK_INTERVAL;
-}
-
-static void setup_periodic_usb_hanlder(uint64_t us) {
-  add_alarm_in_us(us, timer_task, NULL, true);
-}
-
-#endif // mbed
+#endif
 
 //--------------------------------------------------------------------+
 // Porting API
@@ -100,7 +78,7 @@ static void setup_periodic_usb_hanlder(uint64_t us) {
 // have multiple cores updating the TUSB state in parallel
 mutex_t __usb_mutex;
 
-static void usb_irq() {
+static void usb_task_irq(void) {
   // if the mutex is already owned, then we are in user code
   // in this file which will do a tud_task itself, so we'll just do nothing
   // until the next tick; we won't starve
@@ -110,26 +88,24 @@ static void usb_irq() {
   }
 }
 
-void TinyUSB_Port_InitDevice(uint8_t rhport) {
-  (void)rhport;
+// invoked when there is hardware usb irq, trigger task runner later
+static void usb_task_trigger_irq(void) { irq_set_pending(USB_TASK_IRQ); }
 
+void TinyUSB_Port_InitDevice(uint8_t rhport) {
   mutex_init(&__usb_mutex);
 
-  irq_set_enabled(USBCTRL_IRQ, false);
-  irq_handler_t current_handler = irq_get_exclusive_handler(USBCTRL_IRQ);
-  if (current_handler) {
-    irq_remove_handler(USBCTRL_IRQ, current_handler);
-  }
-
-  tusb_init();
+  tud_init(rhport);
 
-  // soft irq for periodically task runner
+  // soft irq for task runner
 #if (PICO_SDK_VERSION_MAJOR * 100 + PICO_SDK_VERSION_MINOR) >= 104
   USB_TASK_IRQ = user_irq_claim_unused(true);
 #endif
-  irq_set_exclusive_handler(USB_TASK_IRQ, usb_irq);
+  irq_set_exclusive_handler(USB_TASK_IRQ, usb_task_irq);
   irq_set_enabled(USB_TASK_IRQ, true);
-  setup_periodic_usb_hanlder(USB_TASK_INTERVAL);
+
+  // add shared irq to trigger task runner
+  irq_add_shared_handler(USBCTRL_IRQ, usb_task_trigger_irq,
+                         PICO_SHARED_IRQ_HANDLER_LOWEST_ORDER_PRIORITY);
 }
 
 void TinyUSB_Port_EnterDFU(void) {

src/arduino/ports/rp2040/tusb_config_rp2040.h

@@ -104,6 +104,7 @@ extern int serial1_printf(const char *__restrict __format, ...);
 // Enable tuh_edpt_xfer() API
 //#define CFG_TUH_API_EDPT_XFER       1
 
+#define CFG_TUH_MSC 1
 #define CFG_TUH_HID 4
 
 #ifdef __cplusplus

tools/build_all.py

@@ -20,8 +20,8 @@
     ['metro_m4_tinyusb', 'adafruit:samd:adafruit_metro_m4:speed=120,usbstack=tinyusb'],
     ['nrf52840', 'adafruit:nrf52:feather52840'],
     ['feather_rp2040_tinyusb', 'rp2040:rp2040:adafruit_feather:flash=8388608_0,freq=125,dbgport=Disabled,dbglvl=None,usbstack=tinyusb'],
-    ['metroesp32s2', 'esp32:esp32:adafruit_metro_esp32s2:CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=cdc,PSRAM=enabled,PartitionScheme=tinyuf2'],
-    #[' ', 'esp32:esp32:adafruit_feather_esp32s3:FlashMode=qio,LoopCore=1,EventsCore=1,USBMode=default,CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=cdc,PartitionScheme=tinyuf2'],
+    ['metroesp32s2', 'espressif:esp32:adafruit_metro_esp32s2:CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=cdc,PSRAM=enabled,PartitionScheme=tinyuf2'],
+    #[' ', 'espressif:esp32:adafruit_feather_esp32s3:FlashMode=qio,LoopCore=1,EventsCore=1,USBMode=default,CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=cdc,PartitionScheme=tinyuf2'],
 ]
 
 # return [succeeded, failed, skipped]