added some disk_status plumbing so FatFs can get the status from sdmm via an ioctl

Author: totalspectrum

include/filesys/block/sdmm.cc

@@ -805,8 +805,13 @@ DRESULT disk_ioctl (
 	DRESULT res;
 	BYTE n, csd[16];
 	DWORD cs;
-
-	if (disk_status(drv) & STA_NOINIT) return RES_NOTRDY;	/* Check if card is in the socket */
+        DWORD status = disk_status(drv);
+        
+        if (ctrl == DISKIO_GET_STATUS) {
+            *(int *)buff = status;
+            return 0;
+        }
+	if (status & STA_NOINIT) return RES_NOTRDY;	/* Check if card is in the socket */
 
 	res = RES_ERROR;
 	switch (ctrl) {
@@ -828,6 +833,7 @@ DRESULT disk_ioctl (
 
 		default:
 			res = RES_PARERR;
+                        break;
 	}
 
 	deselect();

include/filesys/fatfs/diskio.cc

@@ -2,6 +2,7 @@
 #include "diskio.h"
 #include <stdio.h>
 #include <sys/vfs.h>
+#include <sys/ioctl.h>
 
 vfs_file_t *fh;
 
@@ -28,9 +29,18 @@ DRESULT disk_deinitialize(BYTE pdrv) {
 }
 
 DRESULT disk_status(BYTE pdrv) {
+    int r;
+    int val = 0;
     if (!fh) {
         return RES_NOTRDY;
     }
+    r = fh->ioctl(fh, DISKIO_GET_STATUS, &val);
+    if (r < 0) {
+        /* if ioctl not supported, just assume all is well */
+        return RES_OK;
+    }
+    if (val & (STA_NOINIT|STA_NODISK))
+        return RES_NOTRDY;
     return RES_OK;
 }
 

include/sys/ioctl.h

@@ -1,12 +1,36 @@
 #ifndef _SYS_IOCTL_H
 #define _SYS_IOCTL_H
 
+/* disk control ioctls; must match up with defines
+   in include/filesys/fatfs/diskio.h
+*/
+#define DISKIO_CTRL_SYNC        0x0000
+#define DISKIO_GET_SECTOR_COUNT 0x0001
+#define DISKIO_GET_SECTOR_SIZE  0x0002
+#define DISKIO_GET_BLOCK_SIZE   0x0003
+#define DISKIO_CTRL_TRIM        0x0004
+#define DISKIO_CTRL_FORMAT      0x0005
+#define DISKIO_CTRL_POWER_IDLE  0x0006
+#define DISKIO_CTRL_POWER_OFF   0x0007
+#define DISKIO_CTRL_LOCK        0x0008
+#define DISKIO_CTRL_UNLOCK      0x0009
+#define DISKIO_CTRL_EJECT       0x000a
+#define DISKIO_CTRL_GET_SMART   0x000b
+
+#define DISKIO_GET_STATUS       0x00ff
+/* disk status bits */
+#  define DISKIO_STA_NOINIT		0x01	/* Drive not initialized */
+#  define DISKIO_STA_NODISK		0x02	/* No medium in the drive */
+#  define DISKIO_STA_PROTECT		0x04	/* Write protected */
+
+/* tty control */
 #define TTYIOCTLGETFLAGS 0x0100
 #define TTYIOCTLSETFLAGS 0x0101
 
 #define TTY_FLAG_ECHO 0x01
 #define TTY_FLAG_CRNL 0x02
 
+/* flash block control */
 #define BLKIOCTLERASE 0x0200
 
 struct _blkio_info {

version.h

@@ -6,8 +6,8 @@
 
 #define VERSION_MAJOR 7
 #define VERSION_MINOR 6
-#define VERSION_REV   11
-//#define BETA "-beta"
+#define VERSION_REV   12
+#define BETA "-beta"
 
 #define VERSIONSTR version_string