Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-11 12:57:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

binfmt: Decouple builtin from binfs file system

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-02-13 20:07:18 +08:00
committed by Alan Carvalho de Assis
parent 4be416a2a8
commit 47e38eb70f
8 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
binfmt/binfmt.h
View File

@@ -131,7 +131,7 @@ void binfmt_freeargv(FAR char * const *argv);
*
****************************************************************************/
#ifdef CONFIG_FS_BINFS
#ifdef CONFIG_BUILTIN
int builtin_initialize(void);
#endif
@@ -146,7 +146,7 @@ int builtin_initialize(void);
*
****************************************************************************/
#ifdef CONFIG_FS_BINFS
#ifdef CONFIG_BUILTIN
void builtin_uninitialize(void);
#endif

2
binfmt/binfmt_initialize.c
View File

@@ -51,7 +51,7 @@ void binfmt_initialize(void)
{
int ret;
#ifdef CONFIG_FS_BINFS
#ifdef CONFIG_BUILTIN
ret = builtin_initialize();
if (ret < 0)
{

23
binfmt/builtin.c
View File

@@ -24,21 +24,15 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdint.h>
#include <string.h>
#include <fcntl.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/binfmt/binfmt.h>
#include <nuttx/lib/builtin.h>
#ifdef CONFIG_FS_BINFS
#ifdef CONFIG_BUILTIN
/****************************************************************************
* Private Function Prototypes
@@ -79,21 +73,10 @@ static int builtin_loadbinary(FAR struct binary_s *binp,
{
FAR const struct builtin_s *builtin;
FAR char *name;
struct file file;
int index;
int ret;
binfo("Loading file: %s\n", filename);
/* Open the binary file for reading (only) */
ret = file_open(&file, filename, O_RDONLY);
if (ret < 0)
{
berr("ERROR: Failed to open binary %s: %d\n", filename, ret);
return ret;
}
name = strrchr(filename, '/');
if (name != NULL)
{
@@ -106,7 +89,6 @@ static int builtin_loadbinary(FAR struct binary_s *binp,
if (index < 0)
{
berr("ERROR: %s is not a builtin application\n", filename);
file_close(&file);
return index;
}
@@ -118,7 +100,6 @@ static int builtin_loadbinary(FAR struct binary_s *binp,
binp->entrypt = builtin->main;
binp->stacksize = builtin->stacksize;
binp->priority = builtin->priority;
file_close(&file);
return OK;
}
@@ -173,4 +154,4 @@ void builtin_uninitialize(void)
unregister_binfmt(&g_builtin_binfmt);
}
#endif /* CONFIG_FS_BINFS */
#endif /* CONFIG_BUILTIN */