Integrate gfile build files

gfx.mk

@@ -12,4 +12,4 @@ include $(GFXLIB)/src/gadc/gadc.mk
 include $(GFXLIB)/src/gaudin/gaudin.mk
 include $(GFXLIB)/src/gaudout/gaudout.mk
 include $(GFXLIB)/src/gmisc/gmisc.mk
-
+include $(GFXLIB)/src/gfile/gfile.mk

gfxconf.example.h

@@ -9,6 +9,8 @@
 /**
  * Copy this file into your project directory and rename it as gfxconf.h
  * Edit your copy to turn on the uGFX features you want to use.
+ * The values below are the defaults. You should delete anything
+ * you are leaving as default.
  *
  * Please use spaces instead of tabs in this file.
  */
@@ -26,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // GDISP                                                                 //
 ///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP                                TRUE
+#define GFX_USE_GDISP                                FALSE
 
 #define GDISP_NEED_AUTOFLUSH                         FALSE
 #define GDISP_NEED_TIMERFLUSH                        FALSE
@@ -185,6 +187,27 @@
 #define GINPUT_NEED_DIAL                             FALSE
 
 
+///////////////////////////////////////////////////////////////////////////
+// GFILE                                                                 //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GFILE                                FALSE
+
+#define GFILE_NEED_PRINTG                            FALSE
+#define GFILE_NEED_SCANG                             FALSE
+#define GFILE_NEED_STRINGS                           FALSE
+#define GFILE_NEED_STDIO                             FALSE
+    #define GFILE_ALLOW_FLOATS                       FALSE
+    #define GFILE_ALLOW_DEVICESPECIFIC               FALSE
+    #define GFILE_MAX_GFILES                         3
+
+#define GFILE_NEED_MEMFS                             FALSE
+#define GFILE_NEED_ROMFS                             FALSE
+#define GFILE_NEED_RAMFS                             FALSE
+#define GFILE_NEED_FATFS                             FALSE
+#define GFILE_NEED_NATIVEFS                          FALSE
+#define GFILE_NEED_CHBIOSFS                          FALSE
+
+
 ///////////////////////////////////////////////////////////////////////////
 // GADC                                                                  //
 ///////////////////////////////////////////////////////////////////////////

include/gfx.h

@@ -150,6 +150,13 @@
 	#ifndef GFX_USE_GMISC
 		#define GFX_USE_GMISC	FALSE
 	#endif
+	/**
+	 * @brief   GFX File API
+	 * @details	Defaults to FALSE
+	 */
+	#ifndef GFX_USE_GFILE
+		#define GFX_USE_GFILE	FALSE
+	#endif
 /** @} */
 
 /**
@@ -157,6 +164,7 @@
  *
  */
 #include "gos/options.h"
+#include "gfile/options.h"
 #include "gmisc/options.h"
 #include "gqueue/options.h"
 #include "gevent/options.h"
@@ -169,7 +177,7 @@
 #include "gaudout/options.h"
 
 /**
- * Inter-dependancy safety checks on the sub-systems.
+ * Interdependency safety checks on the sub-systems.
  *
  */
 #include "gfx_rules.h"
@@ -178,6 +186,7 @@
  *  Include the sub-system header files
  */
 #include "gos/gos.h"
+#include "gfile/options.h"
 #include "gmisc/gmisc.h"
 #include "gqueue/gqueue.h"
 #include "gevent/gevent.h"
@@ -208,7 +217,6 @@ extern "C" {
 	 * @brief	The one call to end it all
 	 *
 	 * @note	This will deinitialise each sub-system that has been turned on.
-	 * @note	Do not call this without a previous @p gfxInit();
 	 *
 	 * @api
 	 */

include/gfx_rules.h

@@ -187,6 +187,15 @@
 		#undef GDISP_INCLUDE_FONT_UI2
 		#define GDISP_INCLUDE_FONT_UI2		TRUE
 	#endif
+	#if GDISP_NEED_IMAGE
+		#if !GFX_USE_GFILE
+			#if GFX_DISPLAY_RULE_WARNINGS
+				#warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you."
+			#endif
+			#undef GFX_USE_GFILE
+			#define GFX_USE_GFILE	TRUE
+		#endif
+	#endif
 #endif
 
 #if GFX_USE_GAUDIN
@@ -230,5 +239,8 @@
 #if GFX_USE_GMISC
 #endif
 
+#if GFX_USE_GFILE
+#endif
+
 #endif /* _GFX_H */
 /** @} */