Merge branch 'master' into newmouse

19 files changed, 37 insertions, 26 deletions

diff --git a/src/gfile/fatfs_chibios_diskio.c b/src/gfile/gfile_fatfs_diskio_chibios.c
index 803c96a0..46ddbb7e 100644
--- a/src/gfile/fatfs_chibios_diskio.c
+++ b/src/gfile/gfile_fatfs_diskio_chibios.c
@@ -5,11 +5,17 @@
 /* disk I/O modules and attach it to FatFs module with common interface. */
 /*-----------------------------------------------------------------------*/
 
+/**
+ * @file    src/gfile/gfile_fatfs_diskio_chibios.c
+ * @brief   GFILE FATFS wrapper.
+ *
+ */
+
 #include "gfx.h"
 
 #if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS
 
-#include "fatfs_wrapper.h"
+#include "gfile_fatfs_wrapper.h"
 
 #if HAL_USE_MMC_SPI && HAL_USE_SDC
 #error "cannot specify both MMC_SPI and SDC drivers"
diff --git a/src/gfile/fatfs_wrapper.c b/src/gfile/gfile_fatfs_wrapper.c
index 3ac8e427..edcab056 100644
--- a/src/gfile/fatfs_wrapper.c
+++ b/src/gfile/gfile_fatfs_wrapper.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gfile/fatfs_wrapper.c
+ * @file    src/gfile/gfile_fatfs_wrapper.c
  * @brief   GFILE FATFS wrapper.
  *
  */
@@ -15,7 +15,7 @@
 
 #if GFX_USE_GFILE && GFILE_NEED_FATFS
 
-#include "fatfs_wrapper.h"
+#include "gfile_fatfs_wrapper.h"
 
 // Include the source we want
 #include "3rdparty/fatfs-0.10b/src/ff.c"
diff --git a/src/gfile/fatfs_wrapper.h b/src/gfile/gfile_fatfs_wrapper.h
index fc08815b..e66e13bc 100644
--- a/src/gfile/fatfs_wrapper.h
+++ b/src/gfile/gfile_fatfs_wrapper.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gfile/fatfs_wrapper.h
+ * @file    src/gfile/gfile_fatfs_wrapper.h
  * @brief   GFILE FATFS wrapper.
  *
  */
diff --git a/src/gfile/inc_chibiosfs.c b/src/gfile/gfile_fs_chibios.c
index 72826e28..72826e28 100644
--- a/src/gfile/inc_chibiosfs.c
+++ b/src/gfile/gfile_fs_chibios.c
diff --git a/src/gfile/inc_fatfs.c b/src/gfile/gfile_fs_fatfs.c
index 2e4ef52b..2e4ef52b 100644
--- a/src/gfile/inc_fatfs.c
+++ b/src/gfile/gfile_fs_fatfs.c
diff --git a/src/gfile/inc_memfs.c b/src/gfile/gfile_fs_mem.c
index 150220b8..150220b8 100644
--- a/src/gfile/inc_memfs.c
+++ b/src/gfile/gfile_fs_mem.c
diff --git a/src/gfile/inc_nativefs.c b/src/gfile/gfile_fs_native.c
index b8441ac7..6a9fce94 100644
--- a/src/gfile/inc_nativefs.c
+++ b/src/gfile/gfile_fs_native.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-//#include <unistd.h>
 
 static bool_t NativeDel(const char *fname);
 static bool_t NativeExists(const char *fname);
diff --git a/src/gfile/inc_petitfs.c b/src/gfile/gfile_fs_petitfs.c
index 9b3b510b..9b3b510b 100644
--- a/src/gfile/inc_petitfs.c
+++ b/src/gfile/gfile_fs_petitfs.c
diff --git a/src/gfile/inc_ramfs.c b/src/gfile/gfile_fs_ram.c
index f71eff6c..f71eff6c 100644
--- a/src/gfile/inc_ramfs.c
+++ b/src/gfile/gfile_fs_ram.c
diff --git a/src/gfile/inc_romfs.c b/src/gfile/gfile_fs_rom.c
index 6b7719c7..6b7719c7 100644
--- a/src/gfile/inc_romfs.c
+++ b/src/gfile/gfile_fs_rom.c
diff --git a/src/gfile/inc_strings.c b/src/gfile/gfile_fs_strings.c
index 35c1575c..35c1575c 100644
--- a/src/gfile/inc_strings.c
+++ b/src/gfile/gfile_fs_strings.c
diff --git a/src/gfile/gfile.c b/src/gfile/gfile_gfile.c
index 595bba1f..3547f861 100644
--- a/src/gfile/gfile.c
+++ b/src/gfile/gfile_gfile.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gfile/gfile.c
+ * @file    src/gfile/gfile_gfile.c
  * @brief   GFILE code.
  *
  */
diff --git a/src/gfile/petitfs_chibios_diskio.c b/src/gfile/gfile_petitfs_diskio_chibios.c
index dda3f6fc..90e709e4 100644
--- a/src/gfile/petitfs_chibios_diskio.c
+++ b/src/gfile/gfile_petitfs_diskio_chibios.c
@@ -5,11 +5,17 @@
 /* disk I/O modules and attach it to FatFs module with common interface. */
 /*-----------------------------------------------------------------------*/
 
+/**
+ * @file    src/gfile/gfile_petitfs_diskio_chibios.c
+ * @brief   GFILE FATFS wrapper.
+ *
+ */
+
 #include "gfx.h"
 
 #if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS
 
-#include "petitfs_wrapper.h"
+#include "gfile_petitfs_wrapper.h"
 
 #include <string.h>
 
diff --git a/src/gfile/petitfs_wrapper.c b/src/gfile/gfile_petitfs_wrapper.c
index 183edb70..8efc7eb9 100644
--- a/src/gfile/petitfs_wrapper.c
+++ b/src/gfile/gfile_petitfs_wrapper.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gfile/petitfs_wrapper.c
+ * @file    src/gfile/gfile_petitfs_wrapper.c
  * @brief   GFILE PETITFS wrapper.
  *
  */
@@ -15,7 +15,7 @@
 
 #if GFX_USE_GFILE && GFILE_NEED_PETITFS
 
-#include "petitfs_wrapper.h"
+#include "gfile_petitfs_wrapper.h"
 
 // Include the source we want
 #include "3rdparty/petitfs-0.03/src/pff.c"
diff --git a/src/gfile/petitfs_wrapper.h b/src/gfile/gfile_petitfs_wrapper.h
index 4f91bd7f..e9080b9e 100644
--- a/src/gfile/petitfs_wrapper.h
+++ b/src/gfile/gfile_petitfs_wrapper.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gfile/petitfs_wrapper.h
+ * @file    src/gfile/gfile_petitfs_wrapper.h
  * @brief   GFILE PETITFS wrapper.
  *
  */
diff --git a/src/gfile/inc_printg.c b/src/gfile/gfile_printg.c
index 33db8bc8..33db8bc8 100644
--- a/src/gfile/inc_printg.c
+++ b/src/gfile/gfile_printg.c
diff --git a/src/gfile/inc_scang.c b/src/gfile/gfile_scang.c
index 5fac5ce3..5fac5ce3 100644
--- a/src/gfile/inc_scang.c
+++ b/src/gfile/gfile_scang.c
diff --git a/src/gfile/inc_stdio.c b/src/gfile/gfile_stdio.c
index 20169ef2..20169ef2 100644
--- a/src/gfile/inc_stdio.c
+++ b/src/gfile/gfile_stdio.c
diff --git a/src/gfile/sys_make.mk b/src/gfile/sys_make.mk
index e14527c6..0a85d1ae 100644
--- a/src/gfile/sys_make.mk
+++ b/src/gfile/sys_make.mk
@@ -1,18 +1,18 @@
-GFXSRC +=   $(GFXLIB)/src/gfile/gfile.c \
-            $(GFXLIB)/src/gfile/inc_nativefs.c \
-            $(GFXLIB)/src/gfile/inc_ramfs.c \
-            $(GFXLIB)/src/gfile/inc_romfs.c \
-            $(GFXLIB)/src/gfile/inc_fatfs.c \
-            $(GFXLIB)/src/gfile/inc_petitfs.c \
-            $(GFXLIB)/src/gfile/inc_memfs.c \
-            $(GFXLIB)/src/gfile/inc_chibiosfs.c \
-            $(GFXLIB)/src/gfile/inc_strings.c \
-            $(GFXLIB)/src/gfile/inc_printg.c \
-            $(GFXLIB)/src/gfile/inc_scang.c \
-            $(GFXLIB)/src/gfile/inc_stdio.c \
-            $(GFXLIB)/src/gfile/fatfs_wrapper.c \
-            $(GFXLIB)/src/gfile/fatfs_chibios_diskio.c \
-            $(GFXLIB)/src/gfile/petitfs_wrapper.c \
-            $(GFXLIB)/src/gfile/petitfs_chibios_diskio.c \
+GFXSRC +=   $(GFXLIB)/src/gfile/gfile_gfile.c \
+            $(GFXLIB)/src/gfile/gfile_fs_native.c \
+            $(GFXLIB)/src/gfile/gfile_fs_ram.c \
+            $(GFXLIB)/src/gfile/gfile_fs_rom.c \
+            $(GFXLIB)/src/gfile/gfile_fs_fatfs.c \
+            $(GFXLIB)/src/gfile/gfile_fs_petitfs.c \
+            $(GFXLIB)/src/gfile/gfile_fs_mem.c \
+            $(GFXLIB)/src/gfile/gfile_fs_chibios.c \
+            $(GFXLIB)/src/gfile/gfile_fs_strings.c \
+            $(GFXLIB)/src/gfile/gfile_printg.c \
+            $(GFXLIB)/src/gfile/gfile_scang.c \
+            $(GFXLIB)/src/gfile/gfile_stdio.c \
+            $(GFXLIB)/src/gfile/gfile_fatfs_wrapper.c \
+            $(GFXLIB)/src/gfile/gfile_fatfs_diskio_chibios.c \
+            $(GFXLIB)/src/gfile/gfile_petitfs_wrapper.c \
+            $(GFXLIB)/src/gfile/gfile_petitfs_diskio_chibios.c \
 
             
\ No newline at end of file