msc_ramdisk run ok with mbed rp2040 as proof of concept

Author: hathach

examples/MassStorage/msc_ramdisk/msc_ramdisk.ino

@@ -21,9 +21,15 @@ Adafruit_USBD_MSC usb_msc;
 // the setup function runs once when you press reset or power the board
 void setup()
 {
+#if defined(ARDUINO_ARCH_MBED) && defined(ARDUINO_ARCH_RP2040)
+  // Manual begin() is required on unsupported BSP such as mbed rp2040
+  // VID/PID, Manufacturer & Product string also need to be set as well
+  TinyUSBDevice.begin(0);
+#endif
+
   // Set disk vendor id, product id and revision with string up to 8, 16, 4 characters respectively
   usb_msc.setID("Adafruit", "Mass Storage", "1.0");
-  
+
   // Set disk size
   usb_msc.setCapacity(DISK_BLOCK_NUM, DISK_BLOCK_SIZE);
 
@@ -32,7 +38,7 @@ void setup()
 
   // Set Lun ready (RAM disk is always ready)
   usb_msc.setUnitReady(true);
-  
+
   usb_msc.begin();
 
   Serial.begin(115200);
@@ -47,8 +53,8 @@ void loop()
 }
 
 // Callback invoked when received READ10 command.
-// Copy disk's data to buffer (up to bufsize) and 
-// return number of copied bytes (must be multiple of block size) 
+// Copy disk's data to buffer (up to bufsize) and
+// return number of copied bytes (must be multiple of block size)
 int32_t msc_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
 {
   uint8_t const* addr = msc_disk[lba];
@@ -58,7 +64,7 @@ int32_t msc_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
 }
 
 // Callback invoked when received WRITE10 command.
-// Process data in buffer to disk's storage and 
+// Process data in buffer to disk's storage and
 // return number of written bytes (must be multiple of block size)
 int32_t msc_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 {

src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp

@@ -27,28 +27,72 @@
 #if defined ARDUINO_ARCH_RP2040 && TUSB_OPT_DEVICE_ENABLED
 
 #include "Arduino.h"
+
+// mbed old pico-sdk need to wrap with cpp
+extern "C" {
 #include "hardware/irq.h"
 #include "pico/bootrom.h"
 #include "pico/mutex.h"
 #include "pico/time.h"
-#include "pico/unique_id.h"
+#include "hardware/flash.h"
+}
 
 #include "arduino/Adafruit_TinyUSB_API.h"
 #include "tusb.h"
 
+// USB processing will be a periodic timer task
+#define USB_TASK_INTERVAL 1000
+#define USB_TASK_IRQ 31
+
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
-// rp2040 implementation will install approriate handler when initializing
+// rp2040 implementation will install appropriate handler when initializing
 // tinyusb. There is no need to forward IRQ from application
 //--------------------------------------------------------------------+
 
 //--------------------------------------------------------------------+
-// Porting API
+// Earle Philhower and mbed specific
 //--------------------------------------------------------------------+
 
-// USB processing will be a periodic timer task
-#define USB_TASK_INTERVAL 1000
-#define USB_TASK_IRQ 31
+// 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
+
+//--------------------------------------------------------------------+
+// Porting API
+//--------------------------------------------------------------------+
 
 // Big, global USB mutex, shared with all USB devices to make sure we don't
 // have multiple cores updating the TUSB state in parallel
@@ -64,21 +108,23 @@ static void usb_irq() {
   }
 }
 
-static int64_t timer_task(__unused alarm_id_t id, __unused void *user_data) {
-  irq_set_pending(USB_TASK_IRQ);
-  return USB_TASK_INTERVAL;
-}
-
 void TinyUSB_Port_InitDevice(uint8_t rhport) {
   (void)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();
 
+  // soft irq for periodically task runner
   irq_set_exclusive_handler(USB_TASK_IRQ, usb_irq);
   irq_set_enabled(USB_TASK_IRQ, true);
-
-  add_alarm_in_us(USB_TASK_INTERVAL, timer_task, NULL, true);
+  setup_periodic_usb_hanlder(USB_TASK_INTERVAL);
 }
 
 void TinyUSB_Port_EnterDFU(void) {
@@ -88,8 +134,8 @@ void TinyUSB_Port_EnterDFU(void) {
 }
 
 uint8_t TinyUSB_Port_GetSerialNumber(uint8_t serial_id[16]) {
-  pico_get_unique_board_id((pico_unique_board_id_t *)serial_id);
-  return PICO_UNIQUE_BOARD_ID_SIZE_BYTES;
+  get_unique_id(serial_id);
+  return FLASH_UNIQUE_ID_SIZE_BYTES;
 }
 
 //--------------------------------------------------------------------+
@@ -109,4 +155,4 @@ void TinyUSB_Device_Task(void) {
 }
 }
 
-#endif // USE_TINYUSB
+#endif

src/arduino/ports/rp2040/tusb_config_rp2040.h

@@ -32,11 +32,7 @@ extern "C" {
 //--------------------------------------------------------------------
 // COMMON CONFIGURATION
 //--------------------------------------------------------------------
-#ifdef USE_TINYUSB
 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE
-#else
-#define CFG_TUSB_RHPORT0_MODE OPT_MODE_NONE
-#endif
 
 #ifndef CFG_TUSB_MCU
 #define CFG_TUSB_MCU OPT_MCU_RP2040