update msc example to work with both sdfat v1 and v2

Author: hathach

examples/MassStorage/msc_esp32_file_browser/msc_esp32_file_browser.ino

@@ -60,7 +60,7 @@ Adafruit_FlashTransport_ESP32 flashTransport;
 Adafruit_SPIFlash flash(&flashTransport);
 
 // file system object from SdFat
-FatFileSystem fatfs;
+FatVolume fatfs;
 
 // USB Mass Storage object
 Adafruit_USBD_MSC usb_msc;

examples/MassStorage/msc_external_flash/msc_external_flash.ino

@@ -69,7 +69,7 @@
 Adafruit_SPIFlash flash(&flashTransport);
 
 // file system object from SdFat
-FatFileSystem fatfs;
+FatVolume fatfs;
 
 FatFile root;
 FatFile file;

examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino

@@ -70,7 +70,7 @@
 Adafruit_SPIFlash flash(&flashTransport);
 
 // External Flash File system
-FatFileSystem fatfs;
+FatVolume fatfs;
 
 //--------------------------------------------------------------------+
 // SDCard Config
@@ -150,12 +150,20 @@ bool init_sdcard(void)
   if ( !sd.begin(SDCARD_CS, SD_SCK_MHZ(50)) )
   {
     Serial.print("Failed ");
-    sd.errorPrint();
+    sd.errorPrint("sd.begin() failed");
 
     return false;
   }
 
-  uint32_t block_count = sd.card()->cardSize();
+  uint32_t block_count;
+
+#if SD_FAT_VERSION >= 20000
+  block_count = sd.card()->sectorCount();
+#else
+  block_count = sd.card()->cardSize();
+#endif
+
+
   usb_msc.setCapacity(1, block_count, 512);
   usb_msc.setReadWriteCallback(1, sdcard_read_cb, sdcard_write_cb, sdcard_flush_cb);
 
@@ -239,24 +247,44 @@ void loop()
 
 int32_t sdcard_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
 {
-  return sd.card()->readBlocks(lba, (uint8_t*) buffer, bufsize/512) ? bufsize : -1;
+  bool rc;
+
+#if SD_FAT_VERSION >= 20000
+  rc = sd.card()->readSectors(lba, (uint8_t*) buffer, bufsize/512);
+#else
+  rc = sd.card()->readBlocks(lba, (uint8_t*) buffer, bufsize/512);
+#endif
+
+  return rc ? bufsize : -1;
 }
 
 // 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 sdcard_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 {
+  bool rc;
+
   digitalWrite(LED_BUILTIN, HIGH);
 
-  return sd.card()->writeBlocks(lba, buffer, bufsize/512) ? bufsize : -1;
+#if SD_FAT_VERSION >= 20000
+  rc = sd.card()->writeSectors(lba, buffer, bufsize/512);
+#else
+  rc = sd.card()->writeBlocks(lba, buffer, bufsize/512);
+#endif
+
+  return rc ? bufsize : -1;
 }
 
 // Callback invoked when WRITE10 command is completed (status received and accepted by host).
 // used to flush any pending cache.
 void sdcard_flush_cb (void)
 {
+#if SD_FAT_VERSION >= 20000
+  sd.card()->syncDevice();
+#else
   sd.card()->syncBlocks();
+#endif
 
   // clear file system's cache to force refresh
   sd.cacheClear();

examples/MassStorage/msc_internal_flash_samd/msc_internal_flash_samd.ino

@@ -23,7 +23,7 @@
 Adafruit_InternalFlash flash(INTERNAL_FLASH_FILESYSTEM_START_ADDR, INTERNAL_FLASH_FILESYSTEM_SIZE);
 
 // file system object from SdFat
-FatFileSystem fatfs;
+FatVolume fatfs;
 
 FatFile root;
 FatFile file;

examples/MassStorage/msc_sdfat/msc_sdfat.ino

@@ -65,7 +65,11 @@ void setup()
   }
 
   // Size in blocks (512 bytes)
+#if SD_FAT_VERSION >= 20000
+  uint32_t block_count = sd.card()->sectorCount();
+#else
   uint32_t block_count = sd.card()->cardSize();
+#endif
 
   Serial.print("Volume size (MB):  ");
   Serial.println((block_count/2) / 1024);
@@ -117,24 +121,44 @@ void loop()
 // return number of copied bytes (must be multiple of block size)
 int32_t msc_read_cb (uint32_t lba, void* buffer, uint32_t bufsize)
 {
-  return sd.card()->readBlocks(lba, (uint8_t*) buffer, bufsize/512) ? bufsize : -1;
+  bool rc;
+
+#if SD_FAT_VERSION >= 20000
+  rc = sd.card()->readSectors(lba, (uint8_t*) buffer, bufsize/512);
+#else
+  rc = sd.card()->readBlocks(lba, (uint8_t*) buffer, bufsize/512);
+#endif
+
+  return rc ? bufsize : -1;
 }
 
 // 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 msc_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 {
+  bool rc;
+
   digitalWrite(LED_BUILTIN, HIGH);
 
-  return sd.card()->writeBlocks(lba, buffer, bufsize/512) ? bufsize : -1;
+#if SD_FAT_VERSION >= 20000
+  rc = sd.card()->writeSectors(lba, buffer, bufsize/512);
+#else
+  rc = sd.card()->writeBlocks(lba, buffer, bufsize/512);
+#endif
+
+  return rc ? bufsize : -1;
 }
 
 // Callback invoked when WRITE10 command is completed (status received and accepted by host).
 // used to flush any pending cache.
 void msc_flush_cb (void)
 {
+#if SD_FAT_VERSION >= 20000
+  sd.card()->syncDevice();
+#else
   sd.card()->syncBlocks();
+#endif
 
   // clear file system's cache to force refresh
   sd.cacheClear();