libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[simulator] 优化SD挂载，在首次挂载失败后格式化重新尝试

This commit is contained in:
Meco Man 2022-05-16 01:21:47 -04:00 committed by guo
parent 7d657cbf46
commit e43548f46f
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bsp/simulator/applications/mnt.c
View File

@ -10,10 +10,14 @@
#include <rtthread.h> #include <rtthread.h>
#include <rtdevice.h> #include <rtdevice.h>
#define DBG_TAG "FileSystem"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
#include <dfs_fs.h> #include <dfs_fs.h>
int mnt_init(void) static int mnt_init(void)
{ {
#ifdef RT_USING_DFS_WINSHAREDIR #ifdef RT_USING_DFS_WINSHAREDIR
extern int dfs_win32_init(void); extern int dfs_win32_init(void);
@ -24,29 +28,40 @@ int mnt_init(void)
if (dfs_mount("wshare", "/", "wdir", 0, 0) == 0) if (dfs_mount("wshare", "/", "wdir", 0, 0) == 0)
{ {
rt_kprintf("File System on root initialized!\n"); LOG_I("[wshare] File System on root ('wshare') initialized!");
} }
else else
{ {
rt_kprintf("File System on root initialization failed!\n"); LOG_E("[wshare] File System on root ('wshare') initialization failed!");
} }
if (dfs_mount("sd0", "/sd", "elm", 0, 0) == 0) if (dfs_mount("sd0", "/sd", "elm", 0, 0) == 0)
{ {
rt_kprintf("File System on sd initialized!\n"); LOG_I("[sd0] File System on SD ('sd0') initialized!");
} }
else else
{ {
rt_kprintf("File System on sd initialization failed!\n"); LOG_W("[sd0] File System on SD ('sd0') initialization failed!");
LOG_W("[sd0] Try to format and re-mount again...");
if (dfs_mkfs("elm", "sd0") == 0)
{
if (dfs_mount("sd0", "/sd", "elm", 0, 0) == 0)
{
LOG_I("[sd0] File System on SD ('sd0') initialized!");
return 0;
}
}
LOG_E("[sd0] File System on SD ('sd0') initialization failed!");
} }
#else #else
if (dfs_mount("sd0", "/", "elm", 0, 0) == 0) if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
{ {
rt_kprintf("File System on sd initialized!\n"); LOG_I("[sd0] File System on sd initialized!");
} }
else else
{ {
rt_kprintf("File System on sd initialization failed!\n"); LOG_E("[sd0] File System on sd initialization failed!");
} }
#endif #endif