瀏覽代碼

[simulator] improve init process

Meco Man 2 年之前
父節點
當前提交
ada0e8f1a1
共有 1 個文件被更改,包括 9 次插入12 次删除
  1. 9 12
      bsp/simulator/applications/mnt.c

+ 9 - 12
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 */