diff options
| author | Grissiom <[email protected]> | 2014-11-01 17:57:43 +0800 |
|---|---|---|
| committer | Grissiom <[email protected]> | 2014-11-01 17:57:43 +0800 |
| commit | 3531fa71aaab7110da240e25b02967f714e44232 (patch) | |
| tree | f3c64079b748d772d60eca9dd7a054bef4e6ca9d /components | |
| parent | 6281ab2bbe1aea91cc32baf74f512cdea2ce4fb4 (diff) | |
romfs: declare the dummy entry as weak
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/filesystems/romfs/dfs_romfs.c | 8 | ||||
| -rw-r--r-- | components/dfs/filesystems/romfs/romfs.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/components/dfs/filesystems/romfs/dfs_romfs.c b/components/dfs/filesystems/romfs/dfs_romfs.c index 893b7fb0f2..03df8a88c5 100644 --- a/components/dfs/filesystems/romfs/dfs_romfs.c +++ b/components/dfs/filesystems/romfs/dfs_romfs.c @@ -56,7 +56,7 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch struct romfs_dirent *dirent; rt_size_t dirent_size; - if (path[0] == '/' && path[1] == '\0') + if (path[0] == '/' && path[1] == '\0') { *size = root_dirent->size; return root_dirent; @@ -78,7 +78,7 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch while (dirent != RT_NULL) { found = 0; - + /* search in folder */ for (index = 0; index < dirent_size; index ++) { @@ -106,12 +106,12 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch found = 1; break; } - else + else { /* return file dirent */ if (subpath != RT_NULL) break; /* not the end of path */ - + return &dirent[index]; } } diff --git a/components/dfs/filesystems/romfs/romfs.c b/components/dfs/filesystems/romfs/romfs.c index 90614a14a6..ff4b353059 100644 --- a/components/dfs/filesystems/romfs/romfs.c +++ b/components/dfs/filesystems/romfs/romfs.c @@ -21,6 +21,7 @@ * Date Author Notes */ +#include <rtthread.h> #include <dfs_romfs.h> const static unsigned char _dummy_dummy_txt[] = @@ -38,13 +39,13 @@ const static unsigned char _dummy_txt[] = 0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x61,0x20,0x66,0x69,0x6c,0x65,0x21,0x0d,0x0a, }; -const struct romfs_dirent _root_dirent[] = +const struct romfs_dirent WEAK _root_dirent[] = { {ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy)/sizeof(_dummy[0])}, {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)}, }; -const struct romfs_dirent romfs_root = +const struct romfs_dirent WEAK romfs_root = { ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent)/sizeof(_root_dirent[0]) }; |