chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #364 from grissiom/romfs-next

Browse Source 
romfs: declare the dummy entry as weak
This commit is contained in:
Bernard Xiong 2014-11-01 23:18:09 +08:00
commit 007c265f99
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/dfs/filesystems/romfs/dfs_romfs.c
View File

@ -56,7 +56,7 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch
struct romfs_dirent *dirent; struct romfs_dirent *dirent;
rt_size_t dirent_size; rt_size_t dirent_size;
if (path[0] == '/' && path[1] == '\0') if (path[0] == '/' && path[1] == '\0')
{ {
*size = root_dirent->size; *size = root_dirent->size;
return root_dirent; return root_dirent;
@ -78,7 +78,7 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch
while (dirent != RT_NULL) while (dirent != RT_NULL)
{ {
found = 0; found = 0;
/* search in folder */ /* search in folder */
for (index = 0; index < dirent_size; index ++) 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; found = 1;
break; break;
} }
else else
{ {
/* return file dirent */ /* return file dirent */
if (subpath != RT_NULL) if (subpath != RT_NULL)
break; /* not the end of path */ break; /* not the end of path */
return &dirent[index]; return &dirent[index];
} }
} }

5
components/dfs/filesystems/romfs/romfs.c
View File

@ -21,6 +21,7 @@
* Date Author Notes * Date Author Notes
*/ */
#include <rtthread.h>
#include <dfs_romfs.h> #include <dfs_romfs.h>
const static unsigned char _dummy_dummy_txt[] = 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, 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_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy)/sizeof(_dummy[0])},
{ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)}, {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]) ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent)/sizeof(_root_dirent[0])
}; };