add single LUN API for MSC

Author: hathach

examples/msc_ramdisk/msc_ramdisk.ino

@@ -35,16 +35,16 @@ Adafruit_USBD_MSC usb_msc;
 void setup()
 {
   // Set disk vendor id, product id and revision with string up to 8, 16, 4 characters respectively
-  usb_msc.setID(0, "Adafruit", "Mass Storage", "1.0");
+  usb_msc.setID("Adafruit", "Mass Storage", "1.0");
 
   // Set disk size
-  usb_msc.setCapacity(0, DISK_BLOCK_NUM, DISK_BLOCK_SIZE);
+  usb_msc.setCapacity(DISK_BLOCK_NUM, DISK_BLOCK_SIZE);
 
   // Set callback
-  usb_msc.setReadWriteCallback(0, msc_read_cb, msc_write_cb, msc_flush_cb);
+  usb_msc.setReadWriteCallback(msc_read_cb, msc_write_cb, msc_flush_cb);
 
   // Set Lun ready (RAM disk is always ready)
-  usb_msc.setUnitReady(0, true);
+  usb_msc.setUnitReady(true);
 
   usb_msc.begin();
 

examples/msc_sdcard/msc_sdcard.ino

@@ -40,14 +40,14 @@ SdVolume volume;
 void setup()
 {
   // Set disk vendor id, product id and revision with string up to 8, 16, 4 characters respectively
-  usb_msc.setID(0, "Adafruit", "SD Card", "1.0");
+  usb_msc.setID("Adafruit", "SD Card", "1.0");
 
   // Set read write callback
-  usb_msc.setReadWriteCallback(0, msc_read_cb, msc_write_cb, msc_flush_cb);
+  usb_msc.setReadWriteCallback(msc_read_cb, msc_write_cb, msc_flush_cb);
 
   // Still initialize MSC but tell usb stack that MSC is not ready to read/write
   // If we don't initialize, board will be enumerated as CDC only
-  usb_msc.setUnitReady(0, false);
+  usb_msc.setUnitReady(false);
   usb_msc.begin();
 
   Serial.begin(115200);
@@ -78,10 +78,10 @@ void setup()
   Serial.println((block_count/2) / 1024);
 
   // Set disk size, SD block size is always 512
-  usb_msc.setCapacity(0, block_count, 512);
+  usb_msc.setCapacity(block_count, 512);
 
   // MSC is ready for read/write
-  usb_msc.setUnitReady(0, true);
+  usb_msc.setUnitReady(true);
 }
 
 void loop()

src/Adafruit_USBD_MSC.cpp

@@ -69,12 +69,6 @@ void Adafruit_USBD_MSC::setCapacity(uint8_t lun, uint32_t block_count, uint16_t
   _lun[lun].block_size = block_size;
 }
 
-void Adafruit_USBD_MSC::getCapacity(uint8_t lun, uint32_t* block_count, uint16_t* block_size)
-{
-  *block_count = _lun[lun].block_count;
-  *block_size  = _lun[lun].block_size;
-}
-
 void Adafruit_USBD_MSC::setUnitReady(uint8_t lun, bool ready)
 {
   _lun[lun].unit_ready = ready;
@@ -145,7 +139,9 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun)
 void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size)
 {
   if (!_msc_dev) return;
-  _msc_dev->getCapacity(lun, block_count, block_size);
+
+  *block_count = _msc_dev->_lun[lun].block_count;
+  *block_size  = _msc_dev->_lun[lun].block_size;
 }
 
 // Callback invoked when received an SCSI command not in built-in list below

src/Adafruit_USBD_MSC.h

@@ -42,16 +42,39 @@ class Adafruit_USBD_MSC : Adafruit_USBD_Interface
     void setMaxLun(uint8_t maxlun);
     uint8_t getMaxLun(void);
 
+    //------------- Multiple LUN API -------------//
     void setID(uint8_t lun, const char* vendor_id, const char* product_id, const char* product_rev);
-
     void setCapacity(uint8_t lun, uint32_t block_count, uint16_t block_size);
-    void getCapacity(uint8_t lun, uint32_t* block_count, uint16_t* block_size);
-
     void setUnitReady(uint8_t lun, bool ready);
-
     void setReadWriteCallback(uint8_t lun, read_callback_t rd_cb, write_callback_t wr_cb, flush_callback_t fl_cb);
     void setReadyCallback(uint8_t lun, ready_callback_t cb);
 
+    //------------- Single LUN API -------------//
+    void setID(const char* vendor_id, const char* product_id, const char* product_rev)
+    {
+      setID(0, vendor_id, product_rev, product_rev);
+    }
+
+    void setCapacity(uint32_t block_count, uint16_t block_size)
+    {
+      setCapacity(0, block_count, block_size);
+    }
+
+    void setUnitReady(bool ready)
+    {
+      setUnitReady(0, ready);
+    }
+
+    void setReadWriteCallback(read_callback_t rd_cb, write_callback_t wr_cb, flush_callback_t fl_cb)
+    {
+      setReadWriteCallback(0, rd_cb, wr_cb, fl_cb);
+    }
+
+    void setReadyCallback(ready_callback_t cb)
+    {
+      setReadyCallback(0, cb);
+    }
+
     // from Adafruit_USBD_Interface
     virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
 
@@ -76,11 +99,12 @@ class Adafruit_USBD_MSC : Adafruit_USBD_Interface
     uint8_t _maxlun;
 
     // Make all tinyusb callback friend to access private data
+    friend void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4]);
+    friend bool tud_msc_test_unit_ready_cb(uint8_t lun);
+    friend void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size);
     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);
-    friend void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4]);
-    friend bool tud_msc_test_unit_ready_cb(uint8_t lun);
 };
 
 #endif /* ADAFRUIT_USBD_MSC_H_ */