hosfs_rpmsg: merge hostfs_rpmsg to rpmsgfs

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2021-11-30 20:00:03 +08:00
committed by Xiang Xiao
parent 5ed85ef476
commit 985cc4fc6d
18 changed files with 3476 additions and 1896 deletions
+14
View File
@@ -207,6 +207,17 @@ struct fs_hostfsdir_s
};
#endif
#ifdef CONFIG_FS_RPMSGFS
/* RPMSGFS provides mapping to directories on the host machine in the
* sim environment.
*/
struct fs_rpmsgfsdir_s
{
FAR void *fs_dir; /* Opaque pointer to remote DIR */
};
#endif
#endif /* CONFIG_DISABLE_MOUNTPOINT */
struct fs_dirent_s
@@ -288,6 +299,9 @@ struct fs_dirent_s
#ifdef CONFIG_FS_HOSTFS
struct fs_hostfsdir_s hostfs;
#endif
#ifdef CONFIG_FS_RPMSGFS
struct fs_rpmsgfsdir_s rpmsgfs;
#endif
#endif /* !CONFIG_DISABLE_MOUNTPOINT */
} u;
@@ -1,5 +1,5 @@
/****************************************************************************
* include/nuttx/fs/hostfs_rpmsg.h
* include/nuttx/fs/rpmsgfs.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,12 +33,8 @@ extern "C"
#define EXTERN extern
#endif
#ifdef CONFIG_FS_HOSTFS_RPMSG
int hostfs_rpmsg_init(FAR const char *cpu_name);
#endif
#ifdef CONFIG_FS_HOSTFS_RPMSG_SERVER
int hostfs_rpmsg_server_init(void);
#ifdef CONFIG_FS_RPMSGFS
int rpmsgfs_server_init(void);
#endif
#undef EXTERN
+1
View File
@@ -93,6 +93,7 @@
#define HOSTFS_MAGIC 0x54534f48
#define USERFS_MAGIC 0x52455355
#define CROMFS_MAGIC 0x4d4f5243
#define RPMSGFS_MAGIC 0x54534f47
#if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG)
# define statfs64 statfs