Merge tag 'fatfs-0.10c'

Import fatfs R0.10c

1 files changed, 4 insertions, 5 deletions

diff --git a/fatfs/src/ff.h b/fatfs/src/ff.h
index 9894921..5eaad5f 100644
--- a/fatfs/src/ff.h
+++ b/fatfs/src/ff.h
@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module include file  R0.10b    (C)ChaN, 2014

+/  FatFs - FAT file system module include file  R0.10c    (C)ChaN, 2014

 /----------------------------------------------------------------------------/

 / FatFs module is a generic FAT file system module for small embedded systems.

 / This is a free software that opened for education, research and commercial

@@ -15,7 +15,7 @@
 /----------------------------------------------------------------------------*/

 

 #ifndef _FATFS

-#define _FATFS	8051	/* Revision ID */

+#define _FATFS	80376	/* Revision ID */

 

 #ifdef __cplusplus

 extern "C" {

@@ -23,7 +23,6 @@ extern "C" {
 

 #include "integer.h"	/* Basic integer types */

 #include "ffconf.h"		/* FatFs configuration options */

-

 #if _FATFS != _FFCONF

 #error Wrong configuration file (ffconf.h).

 #endif

@@ -236,7 +235,7 @@ int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
 int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */

 TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */

 

-#define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)

+#define f_eof(fp) ((int)((fp)->fptr == (fp)->fsize))

 #define f_error(fp) ((fp)->err)

 #define f_tell(fp) ((fp)->fptr)

 #define f_size(fp) ((fp)->fsize)

@@ -252,7 +251,7 @@ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the fil
 /* Additional user defined functions                            */

 

 /* RTC function */

-#if !_FS_READONLY

+#if !_FS_READONLY && !_FS_NORTC

 DWORD get_fattime (void);

 #endif