diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-06-23 13:02:07 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-06-23 13:02:07 +1000 |
commit | 41271d632b74f5cf47c30d3b699eb6b2786f2136 (patch) | |
tree | 78bcb729c6d6177ca598f28908fefd186c50e9b6 /src/gfile/gfile_fs_fatfs.c | |
parent | 3b97fb798e96514057bcf17263c1e5dbdcd7da26 (diff) | |
download | uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.gz uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.bz2 uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.zip |
Added new type definitions - moving towards V3.0
Diffstat (limited to 'src/gfile/gfile_fs_fatfs.c')
-rw-r--r-- | src/gfile/gfile_fs_fatfs.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/gfile/gfile_fs_fatfs.c b/src/gfile/gfile_fs_fatfs.c index 7f67cd76..03c8d2e9 100644 --- a/src/gfile/gfile_fs_fatfs.c +++ b/src/gfile/gfile_fs_fatfs.c @@ -20,22 +20,22 @@ * The FAT file-system VMT ********************************************************/ -static bool_t fatfsDel(const char* fname); -static bool_t fatfsExists(const char* fname); +static gBool fatfsDel(const char* fname); +static gBool fatfsExists(const char* fname); static long int fatfsFileSize(const char* fname); -static bool_t fatfsRename(const char* oldname, const char* newname); -static bool_t fatfsOpen(GFILE* f, const char* fname); +static gBool fatfsRename(const char* oldname, const char* newname); +static gBool fatfsOpen(GFILE* f, const char* fname); static void fatfsClose(GFILE* f); static int fatfsRead(GFILE* f, void* buf, int size); static int fatfsWrite(GFILE* f, const void* buf, int size); -static bool_t fatfsSetPos(GFILE* f, long int pos); +static gBool fatfsSetPos(GFILE* f, long int pos); static long int fatfsGetSize(GFILE* f); -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); +static gBool fatfsEOF(GFILE* f); +static gBool fatfsMount(const char* drive); +static gBool fatfsUnmount(const char* drive); +static gBool fatfsSync(GFILE* f); #if GFILE_NEED_FILELISTS && _FS_MINIMIZE <= 1 - static gfileList *fatfsFlOpen(const char *path, bool_t dirs); + static gfileList *fatfsFlOpen(const char *path, gBool dirs); static const char *fatfsFlRead(gfileList *pfl); static void fatfsFlClose(gfileList *pfl); #endif @@ -75,7 +75,7 @@ typedef struct fatfsList { } fatfsList; // optimize these later on. Use an array to have multiple FatFS -static bool_t fatfs_mounted = FALSE; +static gBool fatfs_mounted = gFalse; static FATFS fatfs_fs; static BYTE fatfs_flags2mode(GFILE* f) @@ -95,27 +95,27 @@ static BYTE fatfs_flags2mode(GFILE* f) return mode; } -static bool_t fatfsDel(const char* fname) +static gBool fatfsDel(const char* fname) { FRESULT ferr; ferr = f_unlink( (const TCHAR*)fname ); if (ferr != FR_OK) - return FALSE; + return gFalse; - return TRUE; + return gTrue; } -static bool_t fatfsExists(const char* fname) +static gBool fatfsExists(const char* fname) { FRESULT ferr; FILINFO fno; ferr = f_stat( (const TCHAR*)fname, &fno); if (ferr != FR_OK) - return FALSE; + return gFalse; - return TRUE; + return gTrue; } static long int fatfsFileSize(const char* fname) @@ -130,34 +130,34 @@ static long int fatfsFileSize(const char* fname) return (long int)fno.fsize; } -static bool_t fatfsRename(const char* oldname, const char* newname) +static gBool fatfsRename(const char* oldname, const char* newname) { FRESULT ferr; ferr = f_rename( (const TCHAR*)oldname, (const TCHAR*)newname ); if (ferr != FR_OK) - return FALSE; + return gFalse; - return TRUE; + return gTrue; } -static bool_t fatfsOpen(GFILE* f, const char* fname) +static gBool fatfsOpen(GFILE* f, const char* fname) { FIL* fd; #if !GFILE_NEED_NOAUTOMOUNT if (!fatfs_mounted && !fatfsMount("")) - return FALSE; + return gFalse; #endif if (!(fd = gfxAlloc(sizeof(FIL)))) - return FALSE; + return gFalse; if (f_open(fd, fname, fatfs_flags2mode(f)) != FR_OK) { gfxFree(fd); f->obj = 0; - return FALSE; + return gFalse; } f->obj = (void*)fd; @@ -169,7 +169,7 @@ static bool_t fatfsOpen(GFILE* f, const char* fname) } #endif - return TRUE; + return gTrue; } static void fatfsClose(GFILE* f) @@ -201,15 +201,15 @@ static int fatfsWrite(GFILE* f, const void* buf, int size) return wr; } -static bool_t fatfsSetPos(GFILE* f, long int pos) +static gBool fatfsSetPos(GFILE* f, long int pos) { FRESULT ferr; ferr = f_lseek( (FIL*)f->obj, (DWORD)pos ); if (ferr != FR_OK) - return FALSE; + return gFalse; - return TRUE; + return gTrue; } static long int fatfsGetSize(GFILE* f) @@ -217,56 +217,56 @@ static long int fatfsGetSize(GFILE* f) return (long int)f_size( (FIL*)f->obj ); } -static bool_t fatfsEOF(GFILE* f) +static gBool fatfsEOF(GFILE* f) { if ( f_eof( (FIL*)f->obj ) != 0) - return TRUE; + return gTrue; else - return FALSE; + return gFalse; } -static bool_t fatfsMount(const char* drive) +static gBool fatfsMount(const char* drive) { FRESULT ferr; if (!fatfs_mounted) { ferr = f_mount(&fatfs_fs, drive, 1); if (ferr != FR_OK) - return FALSE; - fatfs_mounted = TRUE; - return TRUE; + return gFalse; + fatfs_mounted = gTrue; + return gTrue; } - return FALSE; + return gFalse; } -static bool_t fatfsUnmount(const char* drive) +static gBool fatfsUnmount(const char* drive) { (void)drive; if (fatfs_mounted) { // FatFS does not provide an unmount routine. - fatfs_mounted = FALSE; - return TRUE; + fatfs_mounted = gFalse; + return gTrue; } - return FALSE; + return gFalse; } -static bool_t fatfsSync(GFILE *f) +static gBool fatfsSync(GFILE *f) { FRESULT ferr; ferr = f_sync( (FIL*)f->obj ); if (ferr != FR_OK) { - return FALSE; + return gFalse; } - return TRUE; + return gTrue; } #if GFILE_NEED_FILELISTS && _FS_MINIMIZE <= 1 - static gfileList *fatfsFlOpen(const char *path, bool_t dirs) { + static gfileList *fatfsFlOpen(const char *path, gBool dirs) { fatfsList *p; (void) dirs; |