clean up

Author: hathach

examples/msc_ramdisk/msc_ramdisk.ino

@@ -41,7 +41,7 @@ void setup()
   usb_msc.setCapacity(0, DISK_BLOCK_NUM, DISK_BLOCK_SIZE);
 
   // Set callback
-  usb_msc.setReadWriteCallback(0, ram_read_cb, ram_write_cb, ram_flush_cb);
+  usb_msc.setReadWriteCallback(0, msc_read_cb, msc_write_cb, msc_flush_cb);
 
   // Set Lun ready (RAM disk is always ready)
   usb_msc.setUnitReady(0, true);
@@ -51,7 +51,7 @@ void setup()
   Serial.begin(115200);
   while ( !Serial ) delay(10);   // wait for native usb
 
-  Serial.println("Adafruit TinyUSB Mass Storage Disk RAM example");
+  Serial.println("Mass Storage RAM Disk example");
 }
 
 void loop()
@@ -62,7 +62,7 @@ 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) 
-int32_t ram_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
+int32_t msc_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
 {
   uint8_t const* addr = msc_disk[lba];
   memcpy(buffer, addr, bufsize);
@@ -73,7 +73,7 @@ int32_t ram_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 
 // return number of written bytes (must be multiple of block size)
-int32_t ram_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
+int32_t msc_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 {
   uint8_t* addr = msc_disk[lba];
   memcpy(addr, buffer, bufsize);
@@ -83,7 +83,7 @@ int32_t ram_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 
 // Callback invoked when WRITE10 command is completed (status received and accepted by host).
 // used to flush any pending cache.
-void ram_flush_cb (void)
+void msc_flush_cb (void)
 {
   // nothing to do
 }

examples/msc_ramdisk_dual/msc_ramdisk_dual.ino

@@ -53,7 +53,7 @@ void setup()
   Serial.begin(115200);
   while ( !Serial ) delay(10);   // wait for native usb
 
-  Serial.println("Adafruit TinyUSB Mass Storage Dual Disks RAM example");
+  Serial.println("Mass Storage Dual RAM Disks example");
 }
 
 void loop()

examples/msc_sdcard/msc_sdcard.ino

@@ -43,7 +43,7 @@ void setup()
   usb_msc.setID(0, "Adafruit", "SD Card", "1.0");
 
   // Set read write callback
-  usb_msc.setReadWriteCallback(0, sd_read_cb, sd_write_cb, sd_flush_cb);
+  usb_msc.setReadWriteCallback(0, 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
@@ -53,7 +53,7 @@ void setup()
   Serial.begin(115200);
   while ( !Serial ) delay(10);   // wait for native usb
 
-  Serial.println("Adafruit TinyUSB MSC SD Card example");
+  Serial.println("Mass Storage SD Card example");
 
   Serial.println("\nInitializing SD card...");
 
@@ -89,7 +89,7 @@ void loop()
   // nothing to do
 }
 
-int32_t sd_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
+int32_t msc_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
 {
   (void) bufsize;
   return card.readBlock(lba, (uint8_t*) buffer) ? 512 : -1;
@@ -98,14 +98,14 @@ int32_t sd_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 
 // return number of written bytes (must be multiple of block size)
-int32_t sd_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
+int32_t msc_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 {
   return card.writeBlock(lba, buffer) ? 512 : -1;
 }
 
 // Callback invoked when WRITE10 command is completed (status received and accepted by host).
 // used to flush any pending cache.
-void sd_flush_cb (void)
+void msc_flush_cb (void)
 {
   // nothing to do
 }