Improved read/write performances

.gitignore

@@ -3,7 +3,6 @@
 *.o
 *.xe
 *.vcd
-*.s
 *.xi
 *.i
 *.a

README.rst

@@ -35,6 +35,24 @@ To enable the 4bit SD native bus interface functions it is necessary to uncommen
 Resources (ports and clock blocks) used for the interface need to be specified in either "module_sdcardSPI/SDCardHostSPI.xc" or "module_sdcard4bit/SDCardHost4bit.xc" in the initialization of the SDif structure. 
 If you run it in a core other than XS1_G you need pull-up resistor for miso line (if in spi mode) or Cmd line and D0(=Dat port bit 3) line (if in 4bit bus mode)
 
+### Benchmark
+Using Micro SDHC Class 10 (unknown brand):
+* SPI mode, -O0 (20480 bytes write/read)
+	* Write speed: 1341KByte/s
+	* Read speed: 288KByte/s
+* SPI mode, -O3 (20480 bytes write/read)
+	* Write speed: 1416KByte/s
+	* Read speed: 312KByte/s
+* 4-bit mode, -O0 or -O3, no assembly code (20480 bytes write/read)
+	* Write speed: 782KByte/s
+	* Read speed: 1660KByte/s
+* 4-bit mode, -O0, with assembly code (20480 bytes write/read)
+	* Write speed: 2288KBytes/s
+	* Read speed: 2860KBytes/s
+* 4-bit mode, -O3, with assembly code (20480 bytes write/read)
+	* Write speed: 3740KBytes/s
+	* Read speed: 3100KBytes/s
+
 Known Issues
 ============
 

app_sdcard_test/src/sdcard_test.c

@@ -34,7 +34,7 @@ int main(void)
 
   for( i = 0; i < sizeof(Buff); i++) Buff[i] = i + i / 512; // fill the buffer with some data
 
-  f_mount(0, &Fatfs);             /* Register volume work area (never fails) for SD host interface #0 */
+  f_mount(&Fatfs, "", 0);             /* Register volume work area (never fails) for SD host interface #0 */
   {
     FATFS *fs;
     DWORD fre_clust, fre_sect, tot_sect;

module_FatFs/src/diskio.h

@@ -1,78 +1,82 @@
-/*-----------------------------------------------------------------------
-/  Low level disk interface modlue include file
+/*-----------------------------------------------------------------------/
+/  Low level disk interface modlue include file   (C)ChaN, 2014          /
 /-----------------------------------------------------------------------*/
 
-#ifndef _DISKIO
-
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
+
 //#define BUS_MODE_4BIT
 
-#define _READONLY       0       /* 1: Remove write functions */
-#define _USE_IOCTL      1       /* 1: Use disk_ioctl fucntion */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define _USE_WRITE	1	/* 1: Enable disk_write function */
+#define _USE_IOCTL	1	/* 1: Enable disk_ioctl fucntion */
 
 #include "integer.h"
 
 
 /* Status of Disk Functions */
-typedef BYTE    DSTATUS;
+typedef BYTE	DSTATUS;
 
 /* Results of Disk Functions */
 typedef enum {
-        RES_OK = 0,             /* 0: Successful */
-        RES_ERROR,              /* 1: R/W Error */
-        RES_WRPRT,              /* 2: Write Protected */
-        RES_NOTRDY,             /* 3: Not Ready */
-        RES_PARERR              /* 4: Invalid Parameter */
+	RES_OK = 0,		/* 0: Successful */
+	RES_ERROR,		/* 1: R/W Error */
+	RES_WRPRT,		/* 2: Write Protected */
+	RES_NOTRDY,		/* 3: Not Ready */
+	RES_PARERR		/* 4: Invalid Parameter */
 } DRESULT;
 
 
 /*---------------------------------------*/
 /* Prototypes for disk control functions */
 
-int assign_drives (int, int);
-DSTATUS disk_initialize (BYTE);
-DSTATUS disk_status (BYTE);
-DRESULT disk_read (BYTE, BYTE[], DWORD, BYTE);
-#if     _READONLY == 0
-DRESULT disk_write (BYTE, const BYTE[], DWORD, BYTE);
-#endif
-DRESULT disk_ioctl (BYTE, BYTE, BYTE[]);
+
+DSTATUS disk_initialize (BYTE pdrv);
+DSTATUS disk_status (BYTE pdrv);
+DRESULT disk_read (BYTE pdrv, BYTE buff[], DWORD sector, UINT count);
+DRESULT disk_write (BYTE pdrv, const BYTE buff[], DWORD sector, UINT count);
+DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, BYTE buff[]);
+
 
 /* Disk Status Bits (DSTATUS) */
 
-#define STA_NOINIT              0x01    /* Drive not initialized */
-#define STA_NODISK              0x02    /* No medium in the drive */
-#define STA_PROTECT             0x04    /* Write protected */
+#define STA_NOINIT		0x01	/* Drive not initialized */
+#define STA_NODISK		0x02	/* No medium in the drive */
+#define STA_PROTECT		0x04	/* Write protected */
 
 
 /* Command code for disk_ioctrl fucntion */
 
-/* Generic command (defined for FatFs) */
-#define CTRL_SYNC                       0       /* Flush disk cache (for write functions) */
-#define GET_SECTOR_COUNT        1       /* Get media size (for only f_mkfs()) */
-#define GET_SECTOR_SIZE         2       /* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */
-#define GET_BLOCK_SIZE          3       /* Get erase block size (for only f_mkfs()) */
-#define CTRL_ERASE_SECTOR       4       /* Force erased a block of sectors (for only _USE_ERASE) */
+/* Generic command (Used by FatFs) */
+#define CTRL_SYNC			0	/* Complete pending write process (needed at _FS_READONLY == 0) */
+#define GET_SECTOR_COUNT	1	/* Get media size (needed at _USE_MKFS == 1) */
+#define GET_SECTOR_SIZE		2	/* Get sector size (needed at _MAX_SS != _MIN_SS) */
+#define GET_BLOCK_SIZE		3	/* Get erase block size (needed at _USE_MKFS == 1) */
+#define CTRL_TRIM			4	/* Inform device that the data on the block of sectors is no longer used (needed at _USE_TRIM == 1) */
 
-/* Generic command */
-#define CTRL_POWER                      5       /* Get/Set power status */
-#define CTRL_LOCK                       6       /* Lock/Unlock media removal */
-#define CTRL_EJECT                      7       /* Eject media */
+/* Generic command (Not used by FatFs) */
+#define CTRL_POWER			5	/* Get/Set power status */
+#define CTRL_LOCK			6	/* Lock/Unlock media removal */
+#define CTRL_EJECT			7	/* Eject media */
+#define CTRL_FORMAT			8	/* Create physical format on the media */
 
 /* MMC/SDC specific ioctl command */
-#define MMC_GET_TYPE            10      /* Get card type */
-#define MMC_GET_CSD                     11      /* Get CSD */
-#define MMC_GET_CID                     12      /* Get CID */
-#define MMC_GET_OCR                     13      /* Get OCR */
-#define MMC_GET_SDSTAT          14      /* Get SD status */
+#define MMC_GET_TYPE		10	/* Get card type */
+#define MMC_GET_CSD			11	/* Get CSD */
+#define MMC_GET_CID			12	/* Get CID */
+#define MMC_GET_OCR			13	/* Get OCR */
+#define MMC_GET_SDSTAT		14	/* Get SD status */
 
 /* ATA/CF specific ioctl command */
-#define ATA_GET_REV                     20      /* Get F/W revision */
-#define ATA_GET_MODEL           21      /* Get model name */
-#define ATA_GET_SN                      22      /* Get serial number */
-
-/* NAND specific ioctl command */
-#define NAND_FORMAT                     30      /* Create physical format */
+#define ATA_GET_REV			20	/* Get F/W revision */
+#define ATA_GET_MODEL		21	/* Get model name */
+#define ATA_GET_SN			22	/* Get serial number */
 
+#ifdef __cplusplus
+}
+#endif
 
-#define _DISKIO
 #endif