You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/10/01 17:53:21 UTC
(nuttx-apps) 01/03: examples/elf: remove unnecessary config CONFIG_EXAMPLES_ELF_DEVPATH
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit fdc35d0bad5d86f480eb62f5b1351eb1f300ae53
Author: dongjiuzhu1 <do...@xiaomi.com>
AuthorDate: Sat Nov 18 21:25:52 2023 +0800
examples/elf: remove unnecessary config CONFIG_EXAMPLES_ELF_DEVPATH
Signed-off-by: dongjiuzhu1 <do...@xiaomi.com>
---
examples/elf/elf_main.c | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c
index c0d7b578e..83eb92f06 100644
--- a/examples/elf/elf_main.c
+++ b/examples/elf/elf_main.c
@@ -62,6 +62,10 @@
# error "You must not disable mountpoints via CONFIG_DISABLE_MOUNTPOINT in your configuration file"
#endif
+#ifndef CONFIG_EXAMPLES_ELF_DEVMINOR
+# define CONFIG_EXAMPLES_ELF_DEVMINOR 0
+#endif
+
#if defined(CONFIG_EXAMPLES_ELF_ROMFS)
/* Describe the ROMFS file system */
@@ -69,14 +73,6 @@
# define NSECTORS(b) (((b) + SECTORSIZE - 1) / SECTORSIZE)
# define MOUNTPT "/mnt/romfs"
-# ifndef CONFIG_EXAMPLES_ELF_DEVMINOR
-# define CONFIG_EXAMPLES_ELF_DEVMINOR 0
-# endif
-
-# ifndef CONFIG_EXAMPLES_ELF_DEVPATH
-# define CONFIG_EXAMPLES_ELF_DEVPATH "/dev/ram0"
-# endif
-
#elif defined(CONFIG_EXAMPLES_ELF_CROMFS)
/* Describe the CROMFS file system */
@@ -106,6 +102,8 @@
# define errmsg printf
#endif
+#define ELF_DEVPATH_FMT "/dev/ram%d"
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -200,6 +198,7 @@ static inline void testheader(FAR const char *progname)
int main(int argc, FAR char *argv[])
{
+ char devname[32];
#ifdef CONFIG_EXAMPLES_ELF_FSREMOVEABLE
struct stat buf;
#endif
@@ -214,6 +213,8 @@ int main(int argc, FAR char *argv[])
mm_initmonitor();
+ sprintf(devname, ELF_DEVPATH_FMT, CONFIG_EXAMPLES_ELF_DEVMINOR);
+
#if defined(CONFIG_EXAMPLES_ELF_ROMFS)
/* Create a ROM disk for the ROMFS filesystem */
@@ -238,14 +239,13 @@ int main(int argc, FAR char *argv[])
/* Mount the ROMFS file system */
message("Mounting ROMFS filesystem at target=%s with source=%s\n",
- MOUNTPT, CONFIG_EXAMPLES_ELF_DEVPATH);
+ MOUNTPT, devname);
- ret = mount(CONFIG_EXAMPLES_ELF_DEVPATH, MOUNTPT, "romfs",
- MS_RDONLY, NULL);
+ ret = mount(devname, MOUNTPT, "romfs", MS_RDONLY, NULL);
if (ret < 0)
{
errmsg("ERROR: mount(%s,%s,romfs) failed: %s\n",
- CONFIG_EXAMPLES_ELF_DEVPATH, MOUNTPT, strerror(errno));
+ devname, MOUNTPT, strerror(errno));
}
#elif defined(CONFIG_EXAMPLES_ELF_CROMFS)
@@ -268,27 +268,26 @@ int main(int argc, FAR char *argv[])
do
{
- ret = stat(CONFIG_EXAMPLES_ELF_DEVPATH, &buf);
+ ret = stat(devname, &buf);
if (ret < 0)
{
int errcode = errno;
if (errcode == ENOENT)
{
- printf("%s does not exist. Waiting...\n",
- CONFIG_EXAMPLES_ELF_DEVPATH);
+ printf("%s does not exist. Waiting...\n", devname);
sleep(1);
}
else
{
printf("ERROR: stat(%s) failed: %s Aborting...\n",
- CONFIG_EXAMPLES_ELF_DEVPATH, strerror(errcode));
+ devname, strerror(errcode));
exit(EXIT_FAILURE);
}
}
else if (!S_ISBLK(buf.st_mode))
{
printf("ERROR: stat(%s) exists but is not a block driver: %04x\n",
- CONFIG_EXAMPLES_ELF_DEVPATH, buf.st_mode);
+ devname, buf.st_mode);
exit(EXIT_FAILURE);
}
}
@@ -300,13 +299,11 @@ int main(int argc, FAR char *argv[])
message("Mounting %s filesystem at target=%s\n",
CONFIG_EXAMPLES_ELF_FSTYPE, MOUNTPT);
- ret = mount(CONFIG_EXAMPLES_ELF_DEVPATH, MOUNTPT,
- CONFIG_EXAMPLES_ELF_FSTYPE, MS_RDONLY, NULL);
+ ret = mount(devname, MOUNTPT, CONFIG_EXAMPLES_ELF_FSTYPE, MS_RDONLY, NULL);
if (ret < 0)
{
- errmsg("ERROR: mount(%s, %s, %s) failed: %s\n",
- CONFIG_EXAMPLES_ELF_DEVPATH, CONFIG_EXAMPLES_ELF_FSTYPE,
- MOUNTPT, strerror(errno));
+ errmsg("ERROR: mount(%s, %s, %s) failed: %s\n", devname,
+ CONFIG_EXAMPLES_ELF_FSTYPE, MOUNTPT, strerror(errno));
}
#endif
#else