From ada0e8f1a1a19ef9bb840a52b3bd9b0209ac7987 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Wed, 1 Jun 2022 12:44:06 -0400
Subject: [PATCH] [simulator] improve init process

---
 bsp/simulator/applications/mnt.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/bsp/simulator/applications/mnt.c b/bsp/simulator/applications/mnt.c
index a4a559404e..5c96c1a2a5 100644
--- a/bsp/simulator/applications/mnt.c
+++ b/bsp/simulator/applications/mnt.c
@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2017-04-03     Urey         the first version
+ * 2022-06-01     Meco Man     improve the init process
  */
 #include <rtthread.h>
 #include <rtdevice.h>
@@ -36,6 +37,9 @@ static int mnt_init(void)
     }
 
     if (dfs_mount("sd0", "/sd", "elm", 0, 0) == 0)
+#else
+    if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
+#endif /* RT_USING_DFS_WINSHAREDIR */
     {
         LOG_I("[sd0] File System on SD ('sd0') initialized!");
     }
@@ -45,7 +49,11 @@ static int mnt_init(void)
         LOG_W("[sd0] Try to format and re-mount...");
         if (dfs_mkfs("elm", "sd0") == 0)
         {
+        #ifdef RT_USING_DFS_WINSHAREDIR
             if (dfs_mount("sd0", "/sd", "elm", 0, 0) == 0)
+        #else
+            if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
+        #endif /* RT_USING_DFS_WINSHAREDIR */
             {
                 LOG_I("[sd0] File System on SD ('sd0') initialized!");
                 return 0;
@@ -54,18 +62,7 @@ static int mnt_init(void)
 
         LOG_E("[sd0] File System on SD ('sd0') initialization failed!");
     }
-#else
-    if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
-    {
-        LOG_I("[sd0] File System on sd initialized!");
-    }
-    else
-    {
-        LOG_E("[sd0] File System on sd initialization failed!");
-    }
-#endif
-
     return 0;
 }
 INIT_ENV_EXPORT(mnt_init);
-#endif
+#endif /* RT_USING_DFS */
-- 
GitLab