4 files changed, 26 insertions, 18 deletions
diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h
index 6cd78b37..4ef9ab9e 100644
--- a/demos/modules/gdisp/images/gfxconf.h
+++ b/demos/modules/gdisp/images/gfxconf.h
@@ -51,5 +51,9 @@
 #define GDISP_NEED_IMAGE_JPG		FALSE
 #define GDISP_NEED_IMAGE_PNG		FALSE
 
+#define GFX_USE_GFILE				TRUE
+#define GFILE_NEED_ROMFS			TRUE
+//#define GFILE_NEED_NATIVEFS		TRUE
+
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images/main.c b/demos/modules/gdisp/images/main.c
index b87f663c..6a2e4418 100644
--- a/demos/modules/gdisp/images/main.c
+++ b/demos/modules/gdisp/images/main.c
@@ -29,15 +29,12 @@
 
 #include "gfx.h"
 
-#ifdef WIN32
-	#define USE_MEMORY_FILE		TRUE				// Can be true or false for Win32
-#else
-	#define USE_MEMORY_FILE		TRUE				// Non-Win32 - use the compiled in image
-#endif
-
-#if USE_MEMORY_FILE
-	#include "test-pal8.h"
-#endif
+/**
+ * The image file must be stored on a GFILE file-system.
+ * Use either GFILE_NEED_NATIVEFS or GFILE_NEED_ROMFS (or both).
+ *
+ * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS.
+ */
 
 static gdispImage myImage;
 
@@ -52,13 +49,7 @@ int main(void) {
 	sheight = gdispGetHeight();
 
 	// Set up IO for our image
-#if USE_MEMORY_FILE
-	gdispImageSetMemoryReader(&myImage, test_pal8);
-#else
-	gdispImageSetSimulFileReader(&myImage, "test-pal8.bmp");
-#endif
-
-	gdispImageOpen(&myImage);
+	gdispImageOpenFile(&myImage, "test-pal8.bmp");
 	gdispImageDraw(&myImage, 0, 0, swidth, sheight, 0, 0);
 	gdispImageClose(&myImage);
 
diff --git a/demos/modules/gdisp/images/romfs_files.h b/demos/modules/gdisp/images/romfs_files.h
new file mode 100644
index 00000000..a31dc7bf
--- /dev/null
+++ b/demos/modules/gdisp/images/romfs_files.h
@@ -0,0 +1,7 @@
+/**
+ * This file contains the list of files for the ROMFS.
+ *
+ * The files have been converted using...
+ * 		file2c -dbcs infile outfile
+ */
+#include "romfs_testpal8.h"
diff --git a/demos/modules/gdisp/images/test-pal8.h b/demos/modules/gdisp/images/romfs_testpal8.h
index 9d1d7e0f..e6a353a2 100644
--- a/demos/modules/gdisp/images/test-pal8.h
+++ b/demos/modules/gdisp/images/romfs_testpal8.h
@@ -1,10 +1,10 @@
 /**
  * This file was generated from "test-pal8.bmp" using...
  *
- *	file2c -cs test-pal8.bmp test-pal8.h
+ *	file2c -dcs test-pal8.bmp romfs_testpal8.h
  *
  */
-static const unsigned char test_pal8[] = {
+static const char test_pal8[] = {
 	0x42, 0x4D, 0x26, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x04, 0x00, 0x00, 0x28, 0x00,
 	0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x13, 0x0B, 0x00, 0x00, 0x13, 0x0B, 0x00, 0x00, 0xFC, 0x00,
@@ -585,3 +585,9 @@ static const unsigned char test_pal8[] = {
 	0xC3, 0x93, 0xC4, 0x93, 0xC3, 0x93, 0xC4, 0x93, 0xC3, 0x93, 0xC4, 0x93, 0xC3, 0x93, 0xC4, 0x93,
 	0xC3, 0x93, 0xC4, 0x93, 0xC3, 0x00,
 };
+
+#ifdef ROMFS_DIRENTRY_HEAD
+	static const ROMFS_DIRENTRY test_pal8_dir = { 0, 0, ROMFS_DIRENTRY_HEAD, "test-pal8.bmp", 9254, test_pal8 };
+	#undef ROMFS_DIRENTRY_HEAD
+	#define ROMFS_DIRENTRY_HEAD &test_pal8_dir
+#endif