Backport: Simplified FatFS bindings. Removed MMCSD experiment files.

Use wrappers from hal_ioblock.h . So it will call correct functions
in hal_mmc_spi.c that cares about spiAcquireBus().
Direct call to mmc* functions ignores locking/unlocking

8f967fe2af

os/various/fatfs_bindings/fatfs_diskio.c

@@ -37,10 +37,6 @@ extern RTCDriver RTCD1;
 /*-----------------------------------------------------------------------*/
 /* Correspondence between physical drive number and physical drive.      */
 
-#define MMC     0
-#define SDC     0
-
-
 
 /*-----------------------------------------------------------------------*/
 /* Inidialize a Drive                                                    */
@@ -52,25 +48,14 @@ DSTATUS disk_initialize (
   DSTATUS stat;
 
   switch (pdrv) {
-#if HAL_USE_MMC_SPI
+  case 0:
-  case MMC:
     stat = 0;
     /* It is initialized externally, just reads the status.*/
     if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
       stat |= STA_NOINIT;
-    if (mmcIsWriteProtected(&FATFS_HAL_DEVICE))
+    if (blkIsWriteProtected(&FATFS_HAL_DEVICE))
-      stat |=  STA_PROTECT;
+      stat |= STA_PROTECT;
     return stat;
-#else
-  case SDC:
-    stat = 0;
-    /* It is initialized externally, just reads the status.*/
-    if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
-      stat |= STA_NOINIT;
-    if (sdcIsWriteProtected(&FATFS_HAL_DEVICE))
-      stat |=  STA_PROTECT;
-    return stat;
-#endif
   }
   return STA_NOINIT;
 }
@@ -87,25 +72,14 @@ DSTATUS disk_status (
   DSTATUS stat;
 
   switch (pdrv) {
-#if HAL_USE_MMC_SPI
+  case 0:
-  case MMC:
     stat = 0;
     /* It is initialized externally, just reads the status.*/
     if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
       stat |= STA_NOINIT;
-    if (mmcIsWriteProtected(&FATFS_HAL_DEVICE))
+    if (blkIsWriteProtected(&FATFS_HAL_DEVICE))
       stat |= STA_PROTECT;
     return stat;
-#else
-  case SDC:
-    stat = 0;
-    /* It is initialized externally, just reads the status.*/
-    if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
-      stat |= STA_NOINIT;
-    if (sdcIsWriteProtected(&FATFS_HAL_DEVICE))
-      stat |= STA_PROTECT;
-    return stat;
-#endif
   }
   return STA_NOINIT;
 }
@@ -123,29 +97,12 @@ DRESULT disk_read (
 )
 {
   switch (pdrv) {
-#if HAL_USE_MMC_SPI
+  case 0:
-  case MMC:
     if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
       return RES_NOTRDY;
-    if (mmcStartSequentialRead(&FATFS_HAL_DEVICE, sector))
+    if (blkRead(&FATFS_HAL_DEVICE, sector, buff, count))
-      return RES_ERROR;
-    while (count > 0) {
-      if (mmcSequentialRead(&FATFS_HAL_DEVICE, buff))
-        return RES_ERROR;
-      buff += MMCSD_BLOCK_SIZE;
-      count--;
-    }
-    if (mmcStopSequentialRead(&FATFS_HAL_DEVICE))
-        return RES_ERROR;
-    return RES_OK;
-#else
-  case SDC:
-    if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
-      return RES_NOTRDY;
-    if (sdcRead(&FATFS_HAL_DEVICE, sector, buff, count))
       return RES_ERROR;
     return RES_OK;
-#endif
   }
   return RES_PARERR;
 }
@@ -164,31 +121,12 @@ DRESULT disk_write (
 )
 {
   switch (pdrv) {
-#if HAL_USE_MMC_SPI
+  case 0:
-  case MMC:
-    if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
-        return RES_NOTRDY;
-    if (mmcIsWriteProtected(&FATFS_HAL_DEVICE))
-        return RES_WRPRT;
-    if (mmcStartSequentialWrite(&FATFS_HAL_DEVICE, sector))
-        return RES_ERROR;
-    while (count > 0) {
-        if (mmcSequentialWrite(&FATFS_HAL_DEVICE, buff))
-            return RES_ERROR;
-        buff += MMCSD_BLOCK_SIZE;
-        count--;
-    }
-    if (mmcStopSequentialWrite(&FATFS_HAL_DEVICE))
-        return RES_ERROR;
-    return RES_OK;
-#else
-  case SDC:
     if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
       return RES_NOTRDY;
-    if (sdcWrite(&FATFS_HAL_DEVICE, sector, buff, count))
+    if (blkWrite(&FATFS_HAL_DEVICE, sector, buff, count))
       return RES_ERROR;
     return RES_OK;
-#endif
   }
   return RES_PARERR;
 }
@@ -205,52 +143,40 @@ DRESULT disk_ioctl (
     void *buff        /* Buffer to send/receive control data */
 )
 {
+  BlockDeviceInfo bdi;
+
   (void)buff;
 
   switch (pdrv) {
-#if HAL_USE_MMC_SPI
+  case 0:
-  case MMC:
     switch (cmd) {
     case CTRL_SYNC:
-        return RES_OK;
+      return RES_OK;
-#if FF_MAX_SS > FF_MIN_SS
-    case GET_SECTOR_SIZE:
-        *((WORD *)buff) = MMCSD_BLOCK_SIZE;
-        return RES_OK;
-#endif
-#if FF_USE_TRIM
-    case CTRL_TRIM:
-        mmcErase(&FATFS_HAL_DEVICE, *((DWORD *)buff), *((DWORD *)buff + 1));
-        return RES_OK;
-#endif
-    default:
-        return RES_PARERR;
-    }
-#else
-  case SDC:
-    switch (cmd) {
-    case CTRL_SYNC:
-        return RES_OK;
     case GET_SECTOR_COUNT:
-        *((DWORD *)buff) = mmcsdGetCardCapacity(&FATFS_HAL_DEVICE);
+      if (blkGetInfo(&FATFS_HAL_DEVICE, &bdi)) {
-        return RES_OK;
+        return RES_ERROR;
+      }
+      *((DWORD *)buff) = bdi.blk_num;
+      return RES_OK;
 #if FF_MAX_SS > FF_MIN_SS
     case GET_SECTOR_SIZE:
-        *((WORD *)buff) = MMCSD_BLOCK_SIZE;
+      if (blkGetInfo(&FATFS_HAL_DEVICE, &bdi)) {
-        return RES_OK;
+        return RES_ERROR;
+      }
+      *((WORD *)buff) = bdi.blk_size;
+      return RES_OK;
 #endif
-    case GET_BLOCK_SIZE:
-        *((DWORD *)buff) = 256; /* 512b blocks in one erase block */
-        return RES_OK;
 #if FF_USE_TRIM
+    case GET_BLOCK_SIZE:
+      /* unsupported */
+      break;
     case CTRL_TRIM:
-        sdcErase(&FATFS_HAL_DEVICE, *((DWORD *)buff), *((DWORD *)buff + 1));
+      /* unsupported */
-        return RES_OK;
+      break;
 #endif
     default:
-        return RES_PARERR;
+      return RES_PARERR;
     }
-#endif
   }
   return RES_PARERR;
 }