[fatfs] Make LFN and RT_DFS_ELM_CODE_PAGE >= 900 config working

Author: onelife

library.properties

@@ -1,5 +1,5 @@
 name=RT-Thread
-version=0.4.2
+version=0.4.3
 author=Bernard Xiong <[email protected]>, onelife <[email protected]>
 maintainer=onelife <[email protected]>
 sentence=Real Time Operating System porting for Arduino SAM and SAMD boards

src/components/dfs/filesystems/elmfat/dfs_patch_content.h

@@ -6,7 +6,7 @@
  * @author  onelife <onelife.real[at]gmail.com>
  ******************************************************************************/
 #include "include/rtthread.h"
-#include "dfs_patch_header.h"
+
 
 FRESULT f_seekdir(
     DIR *dj,        /* Pointer to the open directory object */

src/components/dfs/filesystems/elmfat/ffconf.h

@@ -1,6 +1,8 @@
 /*---------------------------------------------------------------------------/
 /  FatFs Functional Configurations
 /---------------------------------------------------------------------------*/
+#include "rtconfig.h"   /* RTT config */
+
 
 #define FFCONF_DEF	86604	/* Revision ID */
 
@@ -101,7 +103,7 @@
 */
 
 
-#if RT_DFS_ELM_USE_LFN  /* RTT config */
+#ifdef RT_DFS_ELM_USE_LFN   /* RTT config */
 #define FF_USE_LFN		RT_DFS_ELM_USE_LFN
 #define FF_MAX_LFN		RT_DFS_ELM_MAX_LFN
 #else
@@ -127,7 +129,7 @@
 
 
 #ifdef RT_DFS_ELM_LFN_UNICODE  /* RTT config */
-#define FF_LFN_UNICODE	1
+#define FF_LFN_UNICODE	2
 #else
 #define FF_LFN_UNICODE	0
 #endif

src/rtconfig.h

@@ -140,12 +140,16 @@
 // #define RT_USING_DFS_MNTTABLE
 #define RT_USING_DFS_ELMFAT
 #define DFS_USING_WORKDIR
+// #define DFS_FILESYSTEMS_MAX             (2)     /* Max number of fs */
+// #define DFS_FD_MAX                      (4)     /* Max number of open file */
 #define RT_DFS_ELM_CODE_PAGE            (437)
+// #define RT_DFS_ELM_CODE_PAGE            936     /* (936) is wrong -_-! */
+// #define RT_DFS_ELM_LFN_UNICODE
 // #define RT_DFS_ELM_USE_EXFAT
-#ifdef RT_DFS_ELM_USE_EXFAT
+#if defined(RT_DFS_ELM_USE_EXFAT) || (RT_DFS_ELM_CODE_PAGE >= 900)
 #define RT_DFS_ELM_USE_LFN              (2)
 #define RT_DFS_ELM_MAX_LFN              (255)
-#endif /* RT_DFS_ELM_USE_EXFAT */
+#endif /* defined(RT_DFS_ELM_USE_EXFAT) || (RT_DFS_ELM_CODE_PAGE >= 900) */
 #endif /* CONFIG_USING_SPISD */
 
 /* Other Options */

src/rtt.cpp

@@ -200,9 +200,9 @@ void arduino_thread_entry(void *param) {
         (void)elm_init();
         #endif
         if (dfs_mount(SD_NAME, "/", "elm", 0, 0))
-            rt_kprintf("[ERR] Mount %s failed!\n", SD_NAME);
+            rt_kprintf("! Mount %s failed!\n", SD_NAME);
         else
-            rt_kprintf("[INFO] Mount %s to \"/\"\n", SD_NAME);
+            rt_kprintf("+ Mount %s to \"/\"\n", SD_NAME);
     #endif
 
     /* run Arduino loop here */