Diff: ChaN/diskio.h

Revision:

6:b3b3370574cf

Parent:

1:46ce1e16c870

diff -r 3ff2606d5713 -r b3b3370574cf ChaN/diskio.h
--- a/ChaN/diskio.h	Thu Aug 28 13:15:31 2014 +0100
+++ b/ChaN/diskio.h	Thu Aug 13 10:15:39 2015 +0100
@@ -1,76 +1,81 @@
-//-----------------------------------------------------------------------
-//  Low level disk interface modlue include file
-//-----------------------------------------------------------------------
+/*-----------------------------------------------------------------------/
+/  Low level disk interface modlue include file   (C)ChaN, 2014          /
+/-----------------------------------------------------------------------*/
+
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
 
-#ifndef _DISKIO
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#define _READONLY    0   // 1: Remove write functions
-#define _USE_IOCTL   1   // 1: Use disk_ioctl fucntion
+#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;
+/* Status of Disk Functions */
+typedef BYTE	DSTATUS;
 
-// Results of Disk Functions
+/* 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, void*);
+/*---------------------------------------*/
+/* Prototypes for disk control functions */
 
 
+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, void* 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
+
+/* 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 */
 
 
-// Command code for disk_ioctrl fucntion
+/* 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
+/* 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 */
 
-// 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
+/* 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
+#ifdef __cplusplus
+}
+#endif
 
+#endif
 
-#define _DISKIO
-#endif