Fatfs Cleanup

gfxconf.example.h

@@ -219,7 +219,7 @@
 //    #define GFILE_ALLOW_FLOATS                       FALSE
 //    #define GFILE_ALLOW_DEVICESPECIFIC               FALSE
 //    #define GFILE_MAX_GFILES                         3
-//#define GFILE_NEED_AUTOMOUNT                         FALSE
+//#define GFILE_NEED_NOAUTOMOUNT                       FALSE
 
 //#define GFILE_NEED_MEMFS                             FALSE
 //#define GFILE_NEED_ROMFS                             FALSE

src/gfile/fatfs/fatfs.c

@@ -0,0 +1,20 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    src/gfile/fatfs/fatfs.c
+ * @brief   GFILE FATFS wrapper.
+ *
+ */
+
+#include "gfx.h"
+
+#if GFX_USE_GFILE && GFILE_NEED_FATFS
+
+#include "src/ff.c"
+
+#endif // GFX_USE_GFILE && GFILE_NEED_FATFS

src/gfile/fatfs/fatfs.mk

@@ -1,6 +1,6 @@
-GFXSRC +=    $(GFXLIB)/src/gfile/fatfs/src/ff.c \
+GFXSRC +=    $(GFXLIB)/src/gfile/fatfs/fatfs.c \
-             $(GFXLIB)/src/gfile/fatfs/src/chibios_fatfs_diskio.c \
+             $(GFXLIB)/src/gfile/fatfs/fatfs_syscall.c \
-             $(GFXLIB)/src/gfile/fatfs/src/syscall.c
+             $(GFXLIB)/src/gfile/fatfs/fatfs_chibios_diskio.c
 
 
 GFXINC +=    $(GFXLIB)/src/gfile/fatfs/src

src/gfile/fatfs/fatfs_chibios_diskio.c

@@ -5,8 +5,10 @@
 /* disk I/O modules and attach it to FatFs module with common interface. */
 /*-----------------------------------------------------------------------*/
 
-#include "ch.h"
+#include "gfx.h"
-#include "hal.h"
+
+#if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS
+
 #include "ffconf.h"
 #include "diskio.h"
 
@@ -250,5 +252,6 @@ DWORD get_fattime(void) {
 #endif
 }
 
+#endif // GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS
 
 

src/gfile/fatfs/fatfs_syscall.c

@@ -6,6 +6,9 @@
  */
 
 #include "gfx.h"
+
+#if GFX_USE_GFILE && GFILE_NEED_FATFS
+
 #include "ff.h"
 
 #if _FS_REENTRANT
@@ -73,3 +76,5 @@ void ff_memfree(void *mblock)
 }
 #endif /* _USE_LFN == 3 */
 
+#endif // GFX_USE_GFILE && GFILE_NEED_FATFS
+

src/gfile/gfile.c

@@ -477,35 +477,33 @@ bool_t gfileEOF(GFILE *f) {
 	return f->vmt->eof(f);
 }
 
-#if GFILE_NEED_FATFS
+bool_t gfileMount(char fs, const char* drive) {
-	bool_t gfileMount(char fs, const char* drive) {
+	const GFILEVMT *p;
-		const GFILEVMT *p;
 
-		// Find the correct VMT
+	// Find the correct VMT
-		for(p = FsChain; p; p = p->next) {
+	for(p = FsChain; p; p = p->next) {
-			if (p->prefix == fs) {
+		if (p->prefix == fs) {
-				if (!p->mount)
+			if (!p->mount)
-					return FALSE;
+				return FALSE;
-				return p->mount(drive);
+			return p->mount(drive);
-			}
 		}
-		return FALSE;
 	}
+	return FALSE;
+}
 
-	bool_t gfileUnmount(char fs, const char* drive) {
+bool_t gfileUnmount(char fs, const char* drive) {
-		const GFILEVMT *p;
+	const GFILEVMT *p;
 
-		// Find the correct VMT
+	// Find the correct VMT
-		for(p = FsChain; p; p = p->next) {
+	for(p = FsChain; p; p = p->next) {
-			if (p->prefix == fs) {
+		if (p->prefix == fs) {
-				if (!p->mount)
+			if (!p->mount)
-					return FALSE;
+				return FALSE;
-				return p->unmount(drive);
+			return p->unmount(drive);
-			}
 		}
-		return FALSE;
 	}
-#endif
+	return FALSE;
+}
 
 /********************************************************
  * String VMT routines

src/gfile/inc_fatfs.c

@@ -56,20 +56,21 @@ static const GFILEVMT FsFatFSVMT = {
 static bool_t fatfs_mounted = FALSE;
 static FATFS fatfs_fs;
 
-static void _flags2mode(GFILE* f, BYTE* mode)
+static BYTE fatfs_flags2mode(GFILE* f)
 {
-	*mode = 0;
+	BYTE mode = 0;
 
 	if (f->flags & GFILEFLG_READ)
-		*mode |= FA_READ;
+		mode |= FA_READ;
 	if (f->flags & GFILEFLG_WRITE)
-		*mode |= FA_WRITE;
+		mode |= FA_WRITE;
 	if (f->flags & GFILEFLG_APPEND)
-		*mode |= 0;  // ToDo
+		mode |= 0;  // ToDo
 	if (f->flags & GFILEFLG_TRUNC)
-		*mode |= FA_CREATE_ALWAYS;
+		mode |= FA_CREATE_ALWAYS;
 
 	/* ToDo - Complete */
+	return mode;
 }
 
 static bool_t fatfsDel(const char* fname)
@@ -121,19 +122,16 @@ static bool_t fatfsRename(const char* oldname, const char* newname)
 static bool_t fatfsOpen(GFILE* f, const char* fname)
 {
 	FIL* fd;
-	BYTE mode;
+
-	FRESULT ferr;
+	#if !GFILE_NEED_NOAUTOMOUNT
-/*
+		if (!fatfs_mounted && !fatfsMount(""))
-	if (!fatfs_mounted && !fatfsMount(""))
+			return FALSE;
-		return FALSE;
+	#endif
-*/
+
 	if (!(fd = gfxAlloc(sizeof(FIL))))
 		return FALSE;
 
-	_flags2mode(f, &mode);
+	if (f_open(fd, fname, fatfs_flags2mode(f)) != FR_OK) {
-
-	ferr = f_open(fd, fname, mode);
-	if (ferr != FR_OK) {
 		gfxFree(fd);
 		f->obj = 0;
 

src/gfile/inc_nativefs.c

@@ -51,7 +51,7 @@ static const GFILEVMT FsNativeVMT = {
 #undef GFILE_CHAINHEAD
 #define GFILE_CHAINHEAD		&FsNativeVMT
 
-static void flags2mode(char *buf, uint16_t flags) {
+static void Native_flags2mode(char *buf, uint16_t flags) {
 	if (flags & GFILEFLG_MUSTEXIST)
 		*buf = 'r';
 	else if (flags & GFILEFLG_APPEND)
@@ -90,7 +90,7 @@ static bool_t NativeOpen(GFILE *f, const char *fname) {
 	FILE *fd;
 	char mode[5];
 
-	flags2mode(mode, f->flags);
+	Native_flags2mode(mode, f->flags);
 	if (!(fd = fopen(fname, mode)))
 		return FALSE;
 	f->obj = (void *)fd;

src/gfile/sys_defs.h

@@ -197,6 +197,35 @@ extern "C" {
 	 */
 	bool_t		gfileEOF(GFILE *f);
 
+	/**
+	 * @brief					Mount a logical drive (aka partition)
+	 *
+	 * @details					Not supported by every file system
+	 * @details					Currently just one drive at one is supported.
+	 *
+	 * @param[in] fs			The file system (F for FatFS)
+	 * @param[in] drive			The logical drive prefix
+	 *
+	 * @return					TRUE on success, FALSE otherwise
+	 *
+	 * @api
+	 */
+	bool_t gfileMount(char fs, const char *drive);
+
+	/**
+	 * @brief					Unmount a logical drive (aka partition)
+	 *
+	 * @details					Does have no effect if @p gfileMount() as been called before hand
+	 *
+	 * @param[in] fs			The file system (F for FatFS)
+	 * @param[in] drive			The logical drive prefix
+	 *
+	 * @return					TRUE on success, FALSE otherwise
+	 *
+	 * @api
+	 */
+	bool_t gfileUnmount(char fs, const char *drive);
+
 	#if GFILE_NEED_CHIBIOSFS && GFX_USE_OS_CHIBIOS
 		GFILE *		gfileOpenBaseFileStream(void *BaseFileStreamPtr, const char *mode);
 	#endif
@@ -205,37 +234,6 @@ extern "C" {
 		GFILE *		gfileOpenMemory(void *memptr, const char *mode);
 	#endif
 
-	#if GFILE_NEED_FATFS
-		/**
-		 * @brief					Mount a logical drive (aka partition)
-		 *
-		 * @details					Not supported by every file system
-		 * @details					Currently just one drive at one is supported.
-		 *
-		 * @param[in] fs			The file system (F for FatFS)
-		 * @param[in] drive			The logical drive prefix
-		 *
-		 * @return					TRUE on success, FALSE otherwise
-		 *
-		 * @api
-		 */
-		bool_t gfileMount(char fs, const char *drive);
-
-		/**
-		 * @brief					Unmount a logical drive (aka partition)
-		 *
-		 * @details					Does have no effect if @p gfileMount() as been called before hand
-		 *
-		 * @param[in] fs			The file system (F for FatFS)
-		 * @param[in] drive			The logical drive prefix
-		 *
-		 * @return					TRUE on success, FALSE otherwise
-		 *
-		 * @api
-		 */
-		bool_t gfileUnmount(char fs, const char *drive);	
-	#endif
-
 	#if GFILE_NEED_PRINTG
 		#include <stdarg.h>
 

src/gfile/sys_options.h

@@ -21,16 +21,14 @@
  * @{
  */
 	/**
-	 * @brief	Should the filesystem be mounted automatically
+	 * @brief	Should the filesystem not be mounted automatically
-	 * @details	The filesystem will be mounted automatically if the
+	 * @details	The filesystem is normally mounted automatically if the
-	 *			user does not do it manually.
+	 *			user does not do it manually. This option turns that off
+	 *			so the user must manually mount the file-system first.
 	 * @details	Defaults to FALSE
-	 *
-	 * @note	Only available for filesystems that actually implement a
-	 *			mounting routine.
 	 */
-	#ifndef GFILE_NEED_AUTOMOUNT
+	#ifndef GFILE_NEED_NOAUTOMOUNT
-		#define GFILE_NEED_AUTOMOUNT	FALSE
+		#define GFILE_NEED_NOAUTOMOUNT	FALSE
 	#endif
 	/**
 	 * @brief   Include printg, fprintg etc functions