diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-06-28 06:33:59 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-06-28 06:33:59 +0200 |
| commit | 31d85d16e774883b136c89b479b0a0636a97cb95 (patch) | |
| tree | 4381e835b717669654fc44a89f0581e4b14cd861 | |
| parent | dad27f76baa6d1ed8fe2a7bb1b6dc1926bc16fb7 (diff) | |
| download | uGFX-31d85d16e774883b136c89b479b0a0636a97cb95.tar.gz uGFX-31d85d16e774883b136c89b479b0a0636a97cb95.tar.bz2 uGFX-31d85d16e774883b136c89b479b0a0636a97cb95.zip | |
fatfs update
| -rw-r--r-- | src/gfile/fatfs/fatfs.c | 1 | ||||
| -rw-r--r-- | src/gfile/fatfs/fatfs.mk | 3 | ||||
| -rw-r--r-- | src/gfile/fatfs/src/ffconf.h | 6 | ||||
| -rw-r--r-- | src/gfile/gfile.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/gfile/fatfs/fatfs.c b/src/gfile/fatfs/fatfs.c index f9d11aeb..fd505f08 100644 --- a/src/gfile/fatfs/fatfs.c +++ b/src/gfile/fatfs/fatfs.c @@ -16,5 +16,6 @@ #if GFX_USE_GFILE && GFILE_NEED_FATFS #include "src/ff.c" +#include "src/option/unicode.c" #endif // GFX_USE_GFILE && GFILE_NEED_FATFS diff --git a/src/gfile/fatfs/fatfs.mk b/src/gfile/fatfs/fatfs.mk index 683cea5b..463f0ba4 100644 --- a/src/gfile/fatfs/fatfs.mk +++ b/src/gfile/fatfs/fatfs.mk @@ -1,7 +1,6 @@ GFXSRC += $(GFXLIB)/src/gfile/fatfs/fatfs.c \ $(GFXLIB)/src/gfile/fatfs/fatfs_syscall.c \ - $(GFXLIB)/src/gfile/fatfs/fatfs_chibios_diskio.c - + $(GFXLIB)/src/gfile/fatfs/fatfs_chibios_diskio.c \ GFXINC += $(GFXLIB)/src/gfile/fatfs/src diff --git a/src/gfile/fatfs/src/ffconf.h b/src/gfile/fatfs/src/ffconf.h index aec765a4..3da731b3 100644 --- a/src/gfile/fatfs/src/ffconf.h +++ b/src/gfile/fatfs/src/ffconf.h @@ -56,7 +56,7 @@ / Locale and Namespace Configurations
/---------------------------------------------------------------------------*/
-#define _CODE_PAGE 932
+#define _CODE_PAGE 1252
/* The _CODE_PAGE specifies the OEM code page to be used on the target system.
/ Incorrect setting of the code page can cause a file open failure.
/
@@ -88,7 +88,7 @@ / 1 - ASCII (Valid for only non-LFN configuration) */
-#define _USE_LFN 0 /* 0 to 3 */
+#define _USE_LFN 3 /* 0 to 3 */
#define _MAX_LFN 255 /* Maximum LFN length to handle (12 to 255) */
/* The _USE_LFN option switches the LFN feature.
/
@@ -188,7 +188,7 @@ / with file lock control. This feature uses bss _FS_LOCK * 12 bytes. */
-#define _FS_REENTRANT 1 /* 0:Disable or 1:Enable */
+#define _FS_REENTRANT 0 /* 0:Disable or 1:Enable */
#if _FS_REENTRANT
#include "gfx.h"
#endif
diff --git a/src/gfile/gfile.c b/src/gfile/gfile.c index b7ebbc97..ba1b2dba 100644 --- a/src/gfile/gfile.c +++ b/src/gfile/gfile.c @@ -535,6 +535,7 @@ bool_t gfileUnmount(char fs, const char* drive) { 0, 0, 0, 0, 0, 0, StringRead, StringWrite, 0, 0, 0, + 0, 0 }; #endif |