Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[pub/USBasp.git] / Projects / TempDataLogger / Lib / FATFs / diskio.h

diff --git a/Projects/TempDataLogger/Lib/FATFs/diskio.h b/Projects/TempDataLogger/Lib/FATFs/diskio.h
index 3459da3..d3c3149 100644 (file)
--- a/Projects/TempDataLogger/Lib/FATFs/diskio.h
+++ b/Projects/TempDataLogger/Lib/FATFs/diskio.h
@@ -1,11 +1,13 @@
 /*-----------------------------------------------------------------------
 /*-----------------------------------------------------------------------

-/  Low level disk interface module include file  R0.07   (C)ChaN, 2010
+/  Low level disk interface module include file

 /-----------------------------------------------------------------------*/
 
 /-----------------------------------------------------------------------*/
 

-#ifndef _DISKIO
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED

 
 

-#define _READONLY      0       /* 1: Read-only mode */
-#define _USE_IOCTL     1
+#ifdef __cplusplus
+extern "C" {
+#endif

 
 #include "integer.h"
 
 
 #include "integer.h"
 


@@ -28,7 +30,6 @@ typedef enum {
 /*---------------------------------------*/
 /* Prototypes for disk control functions */
 
 /*---------------------------------------*/
 /* Prototypes for disk control functions */
 

-BOOL assign_drives (int argc, char *argv[]);

 DSTATUS disk_initialize (BYTE);
 DSTATUS disk_status (BYTE);
 DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
 DSTATUS disk_initialize (BYTE);
 DSTATUS disk_status (BYTE);
 DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);


@@ -44,29 +45,11 @@ DRESULT disk_ioctl (BYTE, BYTE, void*);
 #define STA_NODISK             0x02    /* No medium in the drive */
 #define STA_PROTECT            0x04    /* Write protected */
 
 #define STA_NODISK             0x02    /* No medium in the drive */
 #define STA_PROTECT            0x04    /* Write protected */
 

-
-/* Command code for disk_ioctrl() */
-

 /* Generic command */
 #define CTRL_SYNC                      0       /* Mandatory for write functions */
 /* Generic command */
 #define CTRL_SYNC                      0       /* Mandatory for write functions */

-#define GET_SECTOR_COUNT       1       /* Mandatory for only f_mkfs() */
-#define GET_SECTOR_SIZE                2       /* Mandatory for multiple sector size cfg */
-#define GET_BLOCK_SIZE         3       /* Mandatory for only f_mkfs() */
-#define CTRL_POWER                     4
-#define CTRL_LOCK                      5
-#define CTRL_EJECT                     6
-/* MMC/SDC command */
-#define MMC_GET_TYPE           10
-#define MMC_GET_CSD                    11
-#define MMC_GET_CID                    12
-#define MMC_GET_OCR                    13
-#define MMC_GET_SDSTAT         14
-/* ATA/CF command */
-#define ATA_GET_REV                    20
-#define ATA_GET_MODEL          21
-#define ATA_GET_SN                     22
-
-
-#define _DISKIO
+
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

+#endif