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

apps/examples/module: Fix some error introduced with last changes to this example. Found in build testing.

Browse Source
This commit is contained in:
Gregory Nutt 2018-08-05 17:03:08 -06:00
parent 62134a0419
commit af30085f9c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/module/Kconfig
View File

@ -32,7 +32,7 @@ config EXAMPLES_MODULE_BUILTINFS
for testing on the target. That file system will need to be mounted
such that CONFIG_EXAMPLES_MODULE_BINDIR refers to the directory
containing the module binaries (unless the file system is auto-
automounted)
mounted)
NOTE: This option can only be used in the FLAT build mode because
it makes an illegal OS call to ramdisk_register().

16
examples/module/module_main.c
View File

@ -80,7 +80,7 @@
#endif
#if defined(CONFIG_EXAMPLES_MODULE_BUILTINFS)
# if !defined(CONFIG_FS_ROMFS) || !defined(CONFIG_FS_CROMFS)
# if !defined(CONFIG_FS_ROMFS) && !defined(CONFIG_FS_CROMFS)
# error "You must select CONFIG_FS_ROMFS or CONFIG_FS_CROMFS in your configuration file"
# endif
@ -88,9 +88,9 @@
# error "You must not disable mountpoints via CONFIG_DISABLE_MOUNTPOINT in your configuration file"
# endif
/* Describe the ROMFS file system */
# if defined(CONFIG_EXAMPLES_MODULE_ROMFS)
/* Describe the ROMFS file system */
# if defined(CONFIG_EXAMPLES_MODULE_CROMFS)
# define SECTORSIZE 64
# define NSECTORS(b) (((b)+SECTORSIZE-1)/SECTORSIZE)
# define MOUNTPT "/mnt/romfs"
@ -102,6 +102,7 @@
# ifndef CONFIG_EXAMPLES_MODULE_DEVPATH
# define CONFIG_EXAMPLES_MODULE_DEVPATH "/dev/ram0"
# endif
# elif defined(CONFIG_EXAMPLES_MODULE_CROMFS)
/* Describe the CROMFS file system */
@ -111,10 +112,14 @@
# define BINDIR MOUNTPT
#elif defined(CONFIG_EXAMPLES_MODULE_FSMOUNT)
/* Describe how to auto-mount the external file system */
# define MOUNTPT "/mnt/" CONFIG_EXAMPLES_MODULE_FSTYPE
# define BINDIR MOUNTPT
#else
/* Describe how to use the pre-mounted external file system */
# define BINDIR CONFIG_EXAMPLES_MODULE_BINDIR
#endif /* CONFIG_EXAMPLES_MODULE_BUILTINFS */
@ -275,7 +280,7 @@ int module_main(int argc, char *argv[])
MOUNTPT, errno);
}
#endif
#endif /* CONFIG_EXAMPLES_MODULE_FSMOUNT */
#endif /* CONFIG_EXAMPLES_MODULE_BUILTINFS */
/* Install the character driver */
@ -284,7 +289,8 @@ int module_main(int argc, char *argv[])
if (handle == NULL)
{
int errcode = errno;
fprintf(stderr, "ERROR: insmod failed: %d\n", errcode);
fprintf(stderr, "ERROR: insmod(%s/chardev, chardev) failed: %d\n",
BINDIR, errcode);
exit(EXIT_FAILURE);
}