summaryrefslogtreecommitdiff
path: root/components/dfs
diff options
context:
space:
mode:
authorbernard <[email protected]>2017-10-25 14:21:49 +0800
committerbernard <[email protected]>2017-10-25 14:21:49 +0800
commit5bc690336bfb2e8fe19c848a684e393af1b9f8a6 (patch)
treee37040c2171f057b36fa86346a5f7f12d50ae200 /components/dfs
parent4b2a3d02f35f20fa4f7bf423b0e12ceeddafbaf3 (diff)
[DFS] Fix the romfs compiling issue.
Diffstat (limited to 'components/dfs')
-rw-r--r--components/dfs/KConfig16
-rw-r--r--components/dfs/filesystems/romfs/dfs_romfs.c4
2 files changed, 19 insertions, 1 deletions
diff --git a/components/dfs/KConfig b/components/dfs/KConfig
index 59adb46c71..e833157dc1 100644
--- a/components/dfs/KConfig
+++ b/components/dfs/KConfig
@@ -24,7 +24,9 @@ if RT_USING_DFS
default y
help
FatFs is a generic FAT/exFAT file system module for small embedded systems.
+
if RT_USING_DFS_ELMFAT
+ menu "elm-chan's FatFs, Generic FAT Filesystem Module"
config RT_DFS_ELM_CODE_PAGE
int "OEM code page"
default 437
@@ -79,6 +81,7 @@ if RT_USING_DFS
config RT_DFS_ELM_REENTRANT
bool "Enable the reentrancy (thread safe) of the FatFs module"
default y
+ endmenu
endif
config RT_USING_DFS_DEVFS
@@ -93,6 +96,19 @@ if RT_USING_DFS
help
Let BSD socket operated by file system API, such as read/write and involveed in select/poll POSIX APIs.
+ config RT_USING_DFS_ROMFS
+ bool "Enable ReadOnly file system on flash"
+ default n
+
+ config RT_USING_DFS_RAMFS
+ bool "Enable RAM file system"
+ default n
+
+ config RT_USING_DFS_UFFS
+ bool "Enable UFFS file system: Ultra-low-cost Flash File System"
+ select RT_USING_MTD_NAND
+ default n
+
config RT_USING_DFS_NFS
bool "Using NFS v3 client file system"
depends on RT_USING_LWIP
diff --git a/components/dfs/filesystems/romfs/dfs_romfs.c b/components/dfs/filesystems/romfs/dfs_romfs.c
index 6b9bfa0bce..e543899ad1 100644
--- a/components/dfs/filesystems/romfs/dfs_romfs.c
+++ b/components/dfs/filesystems/romfs/dfs_romfs.c
@@ -24,6 +24,8 @@
#include <rtthread.h>
#include <dfs.h>
#include <dfs_fs.h>
+#include <dfs_file.h>
+
#include "dfs_romfs.h"
int dfs_romfs_mount(struct dfs_filesystem *fs, unsigned long rwflag, const void *data)
@@ -190,7 +192,7 @@ int dfs_romfs_open(struct dfs_fd *file)
struct romfs_dirent *dirent;
struct romfs_dirent *root_dirent;
- root_dirent = (struct romfs_dirent *)file->fs->data;
+ root_dirent = (struct romfs_dirent *)file->data;
if (check_dirent(root_dirent) != 0)
return -EIO;