add callbacks for usbdev msc

Author: hathach

cores/nRF5/usb/tinyusb/src/class/msc/msc_device.h

@@ -47,7 +47,7 @@ TU_VERIFY_STATIC(CFG_TUD_MSC_BUFSIZE < UINT16_MAX, "Size is not correct");
 #endif
 
 #ifndef CFG_TUD_MSC_BUFSIZE
-  #error CFG_TUD_MSC_BUFSIZE must be defined, value of CFG_TUD_MSC_BLOCK_SZ should work well, the more the better
+  #error CFG_TUD_MSC_BUFSIZE must be defined, value of a block size should work well, the more the better
 #endif
 
 #ifndef CFG_TUD_MSC_VENDOR

libraries/Adafruit_USBDev_MSC/Adafruit_USBDev_MSC.cpp

@@ -58,6 +58,13 @@ void Adafruit_USBDev_MSC::getCapacity(uint32_t* block_count, uint16_t* block_siz
   (*block_size) = _block_size;
 }
 
+void Adafruit_USBDev_MSC::setCallback(read_callback_t rd_cb, write_callback_t wr_cb, flush_callback_t fl_cb)
+{
+  _rd_cb = rd_cb;
+  _wr_cb = wr_cb;
+  _fl_cb = fl_cb;
+}
+
 bool Adafruit_USBDev_MSC::begin(void)
 {
   if ( !USBDevice.addInterface(*this) ) return false;
@@ -123,43 +130,32 @@ int32_t tud_msc_scsi_cb (uint8_t lun, const uint8_t scsi_cmd[16], void* buffer,
   return resplen;
 }
 
-#define CFG_TUD_MSC_BLOCK_SZ 512
-
 // Callback invoked when received READ10 command.
 // Copy disk's data to buffer (up to bufsize) and return number of copied bytes.
 int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
 {
-  (void) lun;
-  if (!_msc_dev) return -1;
+  if ( !(_msc_dev && _msc_dev->_rd_cb) ) return -1;
 
-
-  return flash_qspi_read(buffer, lba * CFG_TUD_MSC_BLOCK_SZ + offset, bufsize);
+  return _msc_dev->_rd_cb(lun, lba, offset, buffer, bufsize);
 }
 
 // Callback invoked when received WRITE10 command.
 // Process data in buffer to disk's storage and return number of written bytes
 int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize)
 {
-  (void) lun;
-  if (!_msc_dev) return -1;
-
-  uint32_t wrcount = flash_qspi_write(lba * CFG_TUD_MSC_BLOCK_SZ + offset, buffer, bufsize);
+  if ( !(_msc_dev && _msc_dev->_wr_cb) ) return -1;
 
-  // update fatfs's cache if address matches
-  extern void ExternalFS_usbmsc_write (uint32_t lba, void const* buffer, uint32_t bufsize);
-  if ( ExternalFS_usbmsc_write ) ExternalFS_usbmsc_write(lba, buffer, bufsize);
-
-  return wrcount;
+  return _msc_dev->_wr_cb(lun, lba, offset, buffer, bufsize);
 }
 
 // Callback invoked when WRITE10 command is completed (status received and accepted by host).
 // used to flush any pending cache.
 void tud_msc_write10_complete_cb (uint8_t lun)
 {
-  (void) lun;
+  if ( !(_msc_dev && _msc_dev->_fl_cb) ) return;
 
   // flush pending cache when write10 is complete
-  flash_qspi_flush();
+  return _msc_dev->_fl_cb(lun);
 }
 
 void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size)

libraries/Adafruit_USBDev_MSC/Adafruit_USBDev_MSC.h

@@ -29,20 +29,33 @@
 
 class Adafruit_USBDev_MSC : Adafruit_USBDev_Interface
 {
-  private:
-    uint32_t _block_count;
-    uint16_t _block_size;
-
   public:
+    typedef int32_t (*read_callback_t ) (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);
+    typedef int32_t (*write_callback_t) (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize);
+    typedef void    (*flush_callback_t) (uint8_t lun);
+
     Adafruit_USBDev_MSC(void);
 
     bool begin(void);
 
     void setCapacity(uint32_t block_count, uint16_t block_size);
     void getCapacity(uint32_t* block_count, uint16_t* block_size);
+    void setCallback(read_callback_t rd_cb, write_callback_t wr_cb, flush_callback_t fl_cb);
 
     // from Adafruit_USBInterface
     virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
+
+  private:
+    uint32_t _block_count;
+    uint16_t _block_size;
+
+    read_callback_t  _rd_cb;
+    write_callback_t _wr_cb;
+    flush_callback_t _fl_cb;
+
+    friend int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);
+    friend int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize);
+    friend void tud_msc_write10_complete_cb (uint8_t lun);
 };
 
 #endif /* ADAFRUIT_USBDEV_MSC_H_ */

libraries/FileSystem/examples/External_ListFiles/External_ListFiles.ino

@@ -12,6 +12,7 @@
  any redistribution
 *********************************************************************/
 
+#include "flash/flash_qspi.h"
 #include <bluefruit.h>
 #include <Adafruit_USBDev_MSC.h>
 #include <Bluefruit_FileIO.h>
@@ -30,6 +31,7 @@ void setup()
 {
   // block count and size are defined in variant.h
   usbmsc.setCapacity(USB_MSC_BLOCK_COUNT, USB_MSC_BLOCK_SIZE);
+  usbmsc.setCallback(fl_read_cb, fl_write_cb, fl_flush_cb);
   usbmsc.begin();
 
   Serial.begin(115200);
@@ -64,6 +66,27 @@ void loop()
   }
 }
 
+int32_t fl_read_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
+{
+  return flash_qspi_read(buffer, lba * USB_MSC_BLOCK_SIZE + offset, bufsize);
+}
+
+int32_t fl_write_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize)
+{
+  uint32_t wrcount = flash_qspi_write(lba * USB_MSC_BLOCK_SIZE + offset, buffer, bufsize);
+
+  // update fatfs's cache if address matches
+  extern void ExternalFS_usbmsc_write (uint32_t lba, void const* buffer, uint32_t bufsize);
+  if ( ExternalFS_usbmsc_write ) ExternalFS_usbmsc_write(lba, buffer, bufsize);
+
+  return wrcount;
+}
+
+void fl_flush_cb (uint8_t lun)
+{
+  flash_qspi_flush();
+}
+
 /**************************************************************************/
 /*!
     @brief  Print out whole directory tree of an folder