sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/sotest: remove unnecessary config

Browse Source 
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu1 2023-04-08 16:17:58 +08:00 committed by Xiang Xiao
parent c9f13d698c
commit f890a0b1cb
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/sotest/Kconfig
View File

@ -43,14 +43,6 @@ config EXAMPLES_SOTEST_DEVMINOR
Used for registering the RAM block driver that will hold the ROMFS file system Used for registering the RAM block driver that will hold the ROMFS file system
containing the SOTEST executables to be tested. Default: 0 containing the SOTEST executables to be tested. Default: 0
config EXAMPLES_SOTEST_DEVPATH
string "ROMFS Device Path"
default "/dev/ram0"
---help---
The path to the ROMFS block driver device. This must match EXAMPLES_SOTEST_DEVMINOR.
Used for registering the RAM block driver that will hold the ROMFS file system
containing the SOTEST executables to be tested. Default: "/dev/ram0"
endif # EXAMPLES_SOTEST_BUILTINFS endif # EXAMPLES_SOTEST_BUILTINFS
if !EXAMPLES_SOTEST_BUILTINFS if !EXAMPLES_SOTEST_BUILTINFS

14
examples/sotest/sotest_main.c
View File

@ -73,14 +73,12 @@
# ifndef CONFIG_EXAMPLES_SOTEST_DEVMINOR # ifndef CONFIG_EXAMPLES_SOTEST_DEVMINOR
# define CONFIG_EXAMPLES_SOTEST_DEVMINOR 0 # define CONFIG_EXAMPLES_SOTEST_DEVMINOR 0
# endif # endif
# ifndef CONFIG_EXAMPLES_SOTEST_DEVPATH
# define CONFIG_EXAMPLES_SOTEST_DEVPATH "/dev/ram0"
# endif
#else #else
# define BINDIR CONFIG_EXAMPLES_SOTEST_BINDIR # define BINDIR CONFIG_EXAMPLES_SOTEST_BINDIR
#endif /* CONFIG_EXAMPLES_SOTEST_BUILTINFS */ #endif /* CONFIG_EXAMPLES_SOTEST_BUILTINFS */
#define SOTEST_DEVPATH_FMT "/dev/ram%d"
/**************************************************************************** /****************************************************************************
* Symbols from Auto-Generated Code * Symbols from Auto-Generated Code
****************************************************************************/ ****************************************************************************/
@ -103,6 +101,7 @@ extern const int g_sot_nexports;
int main(int argc, FAR char *argv[]) int main(int argc, FAR char *argv[])
{ {
char devname[32];
#if CONFIG_MODLIB_MAXDEPEND > 0 #if CONFIG_MODLIB_MAXDEPEND > 0
FAR void *handle1; FAR void *handle1;
#endif #endif
@ -144,15 +143,16 @@ int main(int argc, FAR char *argv[])
/* Mount the file system */ /* Mount the file system */
sprintf(devname, SOTEST_DEVPATH_FMT, CONFIG_EXAMPLES_SOTEST_DEVMINOR);
printf("main: Mounting ROMFS filesystem at target=%s with source=%s\n", printf("main: Mounting ROMFS filesystem at target=%s with source=%s\n",
BINDIR, CONFIG_EXAMPLES_SOTEST_DEVPATH); BINDIR, devname);
ret = mount(CONFIG_EXAMPLES_SOTEST_DEVPATH, BINDIR, "romfs", MS_RDONLY, ret = mount(devname, BINDIR, "romfs", MS_RDONLY,
NULL); NULL);
if (ret < 0) if (ret < 0)
{ {
fprintf(stderr, "ERROR: mount(%s,%s,romfs) failed: %s\n", fprintf(stderr, "ERROR: mount(%s,%s,romfs) failed: %s\n",
CONFIG_EXAMPLES_SOTEST_DEVPATH, BINDIR, strerror(errno)); devname, BINDIR, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif /* CONFIG_EXAMPLES_SOTEST_BUILTINFS */ #endif /* CONFIG_EXAMPLES_SOTEST_BUILTINFS */