From 9b6bc0fcc7f6c66fa3874b69b6c32a3a6ad85777 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Fri, 8 Apr 2022 23:33:34 -0400
Subject: [PATCH] =?UTF-8?q?[simulator]=20=E8=A7=A3=E5=86=B3simulator?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8=E4=B8=8D=E8=83=BD=E6=8C=82=E5=9C=A8?=
 =?UTF-8?q?sd=E5=8D=A1=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/simulator/.config                         | 9 +++++----
 bsp/simulator/applications/mnt.c              | 2 +-
 bsp/simulator/drivers/sd_sim.c                | 2 +-
 bsp/simulator/{readme.txt => readme.md}       | 8 +++-----
 bsp/simulator/{readme_en.txt => readme_en.md} | 0
 bsp/simulator/rtconfig.h                      | 6 +++---
 6 files changed, 13 insertions(+), 14 deletions(-)
 rename bsp/simulator/{readme.txt => readme.md} (91%)
 rename bsp/simulator/{readme_en.txt => readme_en.md} (100%)

diff --git a/bsp/simulator/.config b/bsp/simulator/.config
index 2544afd9fb..8d5aea4d22 100644
--- a/bsp/simulator/.config
+++ b/bsp/simulator/.config
@@ -29,7 +29,7 @@ CONFIG_IDLE_THREAD_STACK_SIZE=256
 # CONFIG_RT_KSERVICE_USING_STDLIB is not set
 # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
 # CONFIG_RT_USING_TINY_FFS is not set
-# CONFIG_RT_PRINTF_LONGLONG is not set
+# CONFIG_RT_KPRINTF_USING_LONGLONG is not set
 CONFIG_RT_DEBUG=y
 CONFIG_RT_DEBUG_COLOR=y
 # CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -108,9 +108,9 @@ CONFIG_FINSH_ARG_MAX=10
 CONFIG_RT_USING_DFS=y
 CONFIG_DFS_USING_POSIX=y
 CONFIG_DFS_USING_WORKDIR=y
-CONFIG_DFS_FILESYSTEMS_MAX=2
-CONFIG_DFS_FILESYSTEM_TYPES_MAX=4
-CONFIG_DFS_FD_MAX=4
+CONFIG_DFS_FILESYSTEMS_MAX=8
+CONFIG_DFS_FILESYSTEM_TYPES_MAX=8
+CONFIG_DFS_FD_MAX=32
 # CONFIG_RT_USING_DFS_MNTTABLE is not set
 CONFIG_RT_USING_DFS_ELMFAT=y
 
@@ -522,6 +522,7 @@ CONFIG_RT_USING_POSIX_FS=y
 # CONFIG_PKG_USING_TINYUSB is not set
 # CONFIG_PKG_USING_CHERRYUSB is not set
 # CONFIG_PKG_USING_KMULTI_RTIMER is not set
+# CONFIG_PKG_USING_TFDB is not set
 
 #
 # peripheral libraries and drivers
diff --git a/bsp/simulator/applications/mnt.c b/bsp/simulator/applications/mnt.c
index 4401a5ed94..170f104c75 100644
--- a/bsp/simulator/applications/mnt.c
+++ b/bsp/simulator/applications/mnt.c
@@ -52,5 +52,5 @@ int mnt_init(void)
 
     return 0;
 }
-INIT_COMPONENT_EXPORT(mnt_init);
+INIT_ENV_EXPORT(mnt_init);
 #endif
diff --git a/bsp/simulator/drivers/sd_sim.c b/bsp/simulator/drivers/sd_sim.c
index ed6d60a635..86ed57aea8 100755
--- a/bsp/simulator/drivers/sd_sim.c
+++ b/bsp/simulator/drivers/sd_sim.c
@@ -14,7 +14,7 @@
 #include <dfs.h>
 
 #define DBG_TAG    "sd.sim"
-#define DBG_LVL    DBG_INFO
+#define DBG_LVL    DBG_WARNING
 #include <rtdbg.h>
 
 #define SDCARD_SIM  "sd.bin"
diff --git a/bsp/simulator/readme.txt b/bsp/simulator/readme.md
similarity index 91%
rename from bsp/simulator/readme.txt
rename to bsp/simulator/readme.md
index 3dcad4a0fd..0daeb1e31e 100644
--- a/bsp/simulator/readme.txt
+++ b/bsp/simulator/readme.md
@@ -53,11 +53,9 @@ RTGUI的最新源码目前托管在github上：https://github.com/RT-Thread/RTGU
  sd.bin--模拟SD卡，挂载fat，大小为16M
  nand.bin-模拟nand flash，挂载uffs，参数page=2048+64bytes，block=64pages，16M
  nor.bin--模拟nor flash，挂载jffs2，型号为sst25vf，2M
-第一次启动时，会看到fatfs挂在失败。
-按下回车，出现finsh，然后输入`mkfs("elm", "sd0")`格式化SD卡，如下所示
-	finsh>>mkfs("elm", "sd0")
-			0, 0x00000000
-重启程序，可以正确挂载fat文件系统。
+第一次启动时，会看到fatfs挂在失败，因为文件系统没有格式化，需要键入以下命令：
+mkfs sd0
+重启运行程序，可以正确挂载、使用FATFS文件系统。
 
 2) 测试RTGUI
 打开RTGUI组件后编译，启动在finsh中输入snake_main()并回车，可运行贪吃蛇程序
diff --git a/bsp/simulator/readme_en.txt b/bsp/simulator/readme_en.md
similarity index 100%
rename from bsp/simulator/readme_en.txt
rename to bsp/simulator/readme_en.md
diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h
index 077772f093..155431bece 100755
--- a/bsp/simulator/rtconfig.h
+++ b/bsp/simulator/rtconfig.h
@@ -68,9 +68,9 @@
 #define RT_USING_DFS
 #define DFS_USING_POSIX
 #define DFS_USING_WORKDIR
-#define DFS_FILESYSTEMS_MAX 2
-#define DFS_FILESYSTEM_TYPES_MAX 4
-#define DFS_FD_MAX 4
+#define DFS_FILESYSTEMS_MAX 8
+#define DFS_FILESYSTEM_TYPES_MAX 8
+#define DFS_FD_MAX 32
 #define RT_USING_DFS_ELMFAT
 
 /* elm-chan's FatFs, Generic FAT Filesystem Module */
-- 
GitLab