diff --git a/FW/Core/001-base_rt/.config b/FW/Core/001-base_rt/.config index 2716c17..83d4d9e 100644 --- a/FW/Core/001-base_rt/.config +++ b/FW/Core/001-base_rt/.config @@ -96,7 +96,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y CONFIG_RT_USING_USER_MAIN=y CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048 CONFIG_RT_MAIN_THREAD_PRIORITY=10 -# CONFIG_RT_USING_LEGACY is not set +CONFIG_RT_USING_LEGACY=y CONFIG_RT_USING_MSH=y CONFIG_RT_USING_FINSH=y CONFIG_FINSH_USING_MSH=y @@ -117,7 +117,22 @@ CONFIG_FINSH_USING_OPTION_COMPLETION=y # # DFS: device virtual file system # -# CONFIG_RT_USING_DFS is not set +CONFIG_RT_USING_DFS=y +CONFIG_DFS_USING_POSIX=y +CONFIG_DFS_USING_WORKDIR=y +CONFIG_RT_USING_DFS_MNTTABLE=y +CONFIG_DFS_FD_MAX=16 +CONFIG_RT_USING_DFS_V1=y +# CONFIG_RT_USING_DFS_V2 is not set +CONFIG_DFS_FILESYSTEMS_MAX=4 +CONFIG_DFS_FILESYSTEM_TYPES_MAX=4 +# CONFIG_RT_USING_DFS_ELMFAT is not set +CONFIG_RT_USING_DFS_DEVFS=y +# CONFIG_RT_USING_DFS_ROMFS is not set +# CONFIG_RT_USING_DFS_CROMFS is not set +# CONFIG_RT_USING_DFS_RAMFS is not set +CONFIG_RT_USING_DFS_TMPFS=y +# CONFIG_RT_USING_DFS_MQUEUE is not set CONFIG_RT_USING_FAL=y CONFIG_FAL_DEBUG_CONFIG=y CONFIG_FAL_DEBUG=1 diff --git a/FW/Core/001-base_rt/applications/main.c b/FW/Core/001-base_rt/applications/main.c index 4f91967..5921462 100644 --- a/FW/Core/001-base_rt/applications/main.c +++ b/FW/Core/001-base_rt/applications/main.c @@ -3,6 +3,15 @@ #include +#ifdef RT_USING_DFS_MNTTABLE +#include +const struct dfs_mount_tbl mount_table[]= +{ + {NULL,"/","tmp",0,NULL}, + {0} +}; +#endif + int main(void) { RCC_ClocksTypeDef clocks; diff --git a/FW/Core/001-base_rt/project.uvoptx b/FW/Core/001-base_rt/project.uvoptx index d9e70a6..364abff 100644 --- a/FW/Core/001-base_rt/project.uvoptx +++ b/FW/Core/001-base_rt/project.uvoptx @@ -196,7 +196,7 @@ Applications - 0 + 1 0 0 0 @@ -207,8 +207,8 @@ 0 0 0 - applications\main.c - main.c + applications\led.c + led.c 0 0 @@ -219,8 +219,8 @@ 0 0 0 - applications\led.c - led.c + applications\main.c + main.c 0 0 @@ -228,7 +228,7 @@ Compiler - 0 + 1 0 0 0 @@ -1039,8 +1039,8 @@ 0 0 0 - ..\3rdparty\rt-thread\master\components\fal\src\fal_partition.c - fal_partition.c + ..\3rdparty\rt-thread\master\components\fal\src\fal_flash.c + fal_flash.c 0 0 @@ -1051,8 +1051,8 @@ 0 0 0 - ..\3rdparty\rt-thread\master\components\fal\src\fal_flash.c - fal_flash.c + ..\3rdparty\rt-thread\master\components\fal\src\fal.c + fal.c 0 0 @@ -1075,8 +1075,88 @@ 0 0 0 - ..\3rdparty\rt-thread\master\components\fal\src\fal.c - fal.c + ..\3rdparty\rt-thread\master\components\fal\src\fal_partition.c + fal_partition.c + 0 + 0 + + + + + Filesystem + 0 + 0 + 0 + 0 + + 7 + 71 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\filesystems\devfs\devfs.c + devfs.c + 0 + 0 + + + 7 + 72 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\filesystems\tmpfs\dfs_tmpfs.c + dfs_tmpfs.c + 0 + 0 + + + 7 + 73 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs.c + dfs.c + 0 + 0 + + + 7 + 74 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs_file.c + dfs_file.c + 0 + 0 + + + 7 + 75 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs_fs.c + dfs_fs.c + 0 + 0 + + + 7 + 76 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs_posix.c + dfs_posix.c 0 0 @@ -1089,8 +1169,8 @@ 0 0 - 7 - 71 + 8 + 77 1 0 0 @@ -1101,8 +1181,8 @@ 0 - 7 - 72 + 8 + 78 1 0 0 @@ -1113,8 +1193,8 @@ 0 - 7 - 73 + 8 + 79 1 0 0 @@ -1125,8 +1205,8 @@ 0 - 7 - 74 + 8 + 80 1 0 0 @@ -1136,6 +1216,18 @@ 0 0 + + 8 + 81 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\finsh\msh_file.c + msh_file.c + 0 + 0 + @@ -1145,8 +1237,8 @@ 0 0 - 8 - 75 + 9 + 82 1 0 0 @@ -1157,8 +1249,8 @@ 0 - 8 - 76 + 9 + 83 1 0 0 @@ -1169,8 +1261,8 @@ 0 - 8 - 77 + 9 + 84 1 0 0 @@ -1181,8 +1273,8 @@ 0 - 8 - 78 + 9 + 85 1 0 0 @@ -1193,8 +1285,8 @@ 0 - 8 - 79 + 9 + 86 1 0 0 @@ -1205,8 +1297,8 @@ 0 - 8 - 80 + 9 + 87 1 0 0 @@ -1217,8 +1309,8 @@ 0 - 8 - 81 + 9 + 88 1 0 0 @@ -1229,8 +1321,8 @@ 0 - 8 - 82 + 9 + 89 1 0 0 @@ -1241,8 +1333,8 @@ 0 - 8 - 83 + 9 + 90 1 0 0 @@ -1253,8 +1345,8 @@ 0 - 8 - 84 + 9 + 91 1 0 0 @@ -1265,8 +1357,8 @@ 0 - 8 - 85 + 9 + 92 1 0 0 @@ -1277,8 +1369,8 @@ 0 - 8 - 86 + 9 + 93 1 0 0 @@ -1289,8 +1381,8 @@ 0 - 8 - 87 + 9 + 94 1 0 0 @@ -1301,8 +1393,8 @@ 0 - 8 - 88 + 9 + 95 1 0 0 @@ -1313,8 +1405,8 @@ 0 - 8 - 89 + 9 + 96 1 0 0 @@ -1326,6 +1418,26 @@ + + Legacy + 0 + 0 + 0 + 0 + + 10 + 97 + 1 + 0 + 0 + 0 + ..\3rdparty\rt-thread\master\components\legacy\ipc\workqueue_legacy.c + workqueue_legacy.c + 0 + 0 + + + libcpu 0 @@ -1333,8 +1445,8 @@ 0 0 - 9 - 90 + 11 + 98 1 0 0 @@ -1345,8 +1457,8 @@ 0 - 9 - 91 + 11 + 99 1 0 0 @@ -1357,8 +1469,8 @@ 0 - 9 - 92 + 11 + 100 1 0 0 @@ -1369,8 +1481,8 @@ 0 - 9 - 93 + 11 + 101 2 0 0 @@ -1381,8 +1493,8 @@ 0 - 9 - 94 + 11 + 102 1 0 0 diff --git a/FW/Core/001-base_rt/project.uvprojx b/FW/Core/001-base_rt/project.uvprojx index 2c0d0e0..6b57c9d 100644 --- a/FW/Core/001-base_rt/project.uvprojx +++ b/FW/Core/001-base_rt/project.uvprojx @@ -338,7 +338,7 @@ RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - ..\3rdparty\rt-thread\master\components\libc\cplusplus;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\spi;..\3rdparty\rt-thread\master\components\libc\compilers\common\extension\fcntl\octal;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\libcpu\arm\cortex-m3;board\ports;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\include;libraries\CMSIS\Include;..\3rdparty\rt-thread\master\components\drivers\include;applications;..\3rdparty\rt-thread\master\components\libc\posix\io\eventfd;..\3rdparty\rt-thread\master\components\libc\compilers\common\extension;libraries;..\3rdparty\rt-thread\master\components\finsh;libraries\rt_drivers;..\3rdparty\rt-thread\master\components\libc\compilers\common\include;..\3rdparty\rt-thread\master\components\libc\posix\io\epoll;..\3rdparty\rt-thread\master\include;.;board;libraries\AIR32F10xLib\inc;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\libcpu\arm\common;..\3rdparty\rt-thread\master\components\libc\posix\io\poll;..\3rdparty\rt-thread\master\components\fal\inc;..\3rdparty\rt-thread\master\components\libc\posix\ipc + ..\3rdparty\rt-thread\master\components\libc\cplusplus;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\spi;..\3rdparty\rt-thread\master\components\libc\compilers\common\extension\fcntl\octal;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\libcpu\arm\cortex-m3;board\ports;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\drivers\include;libraries\CMSIS\Include;..\3rdparty\rt-thread\master\components\drivers\include;applications;..\3rdparty\rt-thread\master\components\dfs\dfs_v1\include;..\3rdparty\rt-thread\master\components\libc\posix\io\eventfd;..\3rdparty\rt-thread\master\components\libc\compilers\common\extension;libraries;..\3rdparty\rt-thread\master\components\finsh;libraries\rt_drivers;..\3rdparty\rt-thread\master\components\libc\compilers\common\include;..\3rdparty\rt-thread\master\components\libc\posix\io\epoll;..\3rdparty\rt-thread\master\include;.;board;libraries\AIR32F10xLib\inc;..\3rdparty\rt-thread\master\components\drivers\include;..\3rdparty\rt-thread\master\components\legacy\dfs;..\3rdparty\rt-thread\master\components\legacy;..\3rdparty\rt-thread\master\components\dfs\dfs_v1\filesystems\tmpfs;..\3rdparty\rt-thread\master\libcpu\arm\common;..\3rdparty\rt-thread\master\components\libc\posix\io\poll;..\3rdparty\rt-thread\master\components\fal\inc;..\3rdparty\rt-thread\master\components\dfs\dfs_v1\filesystems\devfs;..\3rdparty\rt-thread\master\components\libc\posix\ipc @@ -382,16 +382,16 @@ Applications - - main.c - 1 - applications\main.c - led.c 1 applications\led.c + + main.c + 1 + applications\main.c + @@ -1655,25 +1655,60 @@ Fal - - fal_partition.c - 1 - ..\3rdparty\rt-thread\master\components\fal\src\fal_partition.c - fal_flash.c 1 ..\3rdparty\rt-thread\master\components\fal\src\fal_flash.c + + fal.c + 1 + ..\3rdparty\rt-thread\master\components\fal\src\fal.c + fal_rtt.c 1 ..\3rdparty\rt-thread\master\components\fal\src\fal_rtt.c - fal.c + fal_partition.c 1 - ..\3rdparty\rt-thread\master\components\fal\src\fal.c + ..\3rdparty\rt-thread\master\components\fal\src\fal_partition.c + + + + + Filesystem + + + devfs.c + 1 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\filesystems\devfs\devfs.c + + + dfs_tmpfs.c + 1 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\filesystems\tmpfs\dfs_tmpfs.c + + + dfs.c + 1 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs.c + + + dfs_file.c + 1 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs_file.c + + + dfs_fs.c + 1 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs_fs.c + + + dfs_posix.c + 1 + ..\3rdparty\rt-thread\master\components\dfs\dfs_v1\src\dfs_posix.c @@ -1700,6 +1735,11 @@ 1 ..\3rdparty\rt-thread\master\components\finsh\cmd.c + + msh_file.c + 1 + ..\3rdparty\rt-thread\master\components\finsh\msh_file.c + @@ -2547,6 +2587,16 @@ + + Legacy + + + workqueue_legacy.c + 1 + ..\3rdparty\rt-thread\master\components\legacy\ipc\workqueue_legacy.c + + + libcpu diff --git a/FW/Core/001-base_rt/rtconfig.h b/FW/Core/001-base_rt/rtconfig.h index d1133f6..c90306c 100644 --- a/FW/Core/001-base_rt/rtconfig.h +++ b/FW/Core/001-base_rt/rtconfig.h @@ -63,6 +63,7 @@ #define RT_USING_USER_MAIN #define RT_MAIN_THREAD_STACK_SIZE 2048 #define RT_MAIN_THREAD_PRIORITY 10 +#define RT_USING_LEGACY #define RT_USING_MSH #define RT_USING_FINSH #define FINSH_USING_MSH @@ -80,6 +81,16 @@ /* DFS: device virtual file system */ +#define RT_USING_DFS +#define DFS_USING_POSIX +#define DFS_USING_WORKDIR +#define RT_USING_DFS_MNTTABLE +#define DFS_FD_MAX 16 +#define RT_USING_DFS_V1 +#define DFS_FILESYSTEMS_MAX 4 +#define DFS_FILESYSTEM_TYPES_MAX 4 +#define RT_USING_DFS_DEVFS +#define RT_USING_DFS_TMPFS #define RT_USING_FAL #define FAL_DEBUG_CONFIG #define FAL_DEBUG 1