diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-08-13 15:48:16 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-08-13 15:48:16 +1000 |
commit | efa13a879df590ce0043a5b4f97597484bf264e1 (patch) | |
tree | dcded7e06aa5467496d4f9aa365e00fb096a6801 /src/gfile/inc_fatfs.c | |
parent | 10902154aec652a3fcdf028b2c6ff16743464973 (diff) | |
download | uGFX-efa13a879df590ce0043a5b4f97597484bf264e1.tar.gz uGFX-efa13a879df590ce0043a5b4f97597484bf264e1.tar.bz2 uGFX-efa13a879df590ce0043a5b4f97597484bf264e1.zip |
Move 3rd Party source to a new directory.
Rationalise Fatfs code and fix a couple of configuration issues.
Diffstat (limited to 'src/gfile/inc_fatfs.c')
-rw-r--r-- | src/gfile/inc_fatfs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gfile/inc_fatfs.c b/src/gfile/inc_fatfs.c index c8db0e64..11df1055 100644 --- a/src/gfile/inc_fatfs.c +++ b/src/gfile/inc_fatfs.c @@ -9,8 +9,7 @@ * This file is included by src/gfile/gfile.c */ -#include "ff.h" -#include "ffconf.h" +#include "fatfs_wrapper.h" /******************************************************** * The FAT file-system VMT @@ -30,7 +29,7 @@ static bool_t fatfsEOF(GFILE* f); static bool_t fatfsMount(const char* drive); static bool_t fatfsUnmount(const char* drive); static bool_t fatfsSync(GFILE* f); -#if _FS_MINIMIZE <= 1 && GFILE_NEED_FILELISTS +#if GFILE_NEED_FILELISTS && _FS_MINIMIZE <= 1 static gfileList *fatfsFlOpen(const char *path, bool_t dirs); static const char *fatfsFlRead(gfileList *pfl); static void fatfsFlClose(gfileList *pfl); @@ -265,7 +264,7 @@ static bool_t fatfsSync(GFILE *f) return TRUE; } -#if _FS_MINIMIZE <= 1 && GFILE_NEED_FILELISTS +#if GFILE_NEED_FILELISTS && _FS_MINIMIZE <= 1 static gfileList *fatfsFlOpen(const char *path, bool_t dirs) { fatfsList *p; (void) dirs; |