diff --git a/components/dfs/dfs_config.h b/components/dfs/dfs_config.h deleted file mode 100644 index 1681737121cc9f9c7ae516a15c37e2e32c43879f..0000000000000000000000000000000000000000 --- a/components/dfs/dfs_config.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -+------------------------------------------------------------------------------ -| Project : Device Filesystem -+------------------------------------------------------------------------------ -| Copyright 2004, 2005 www.fayfayspace.org. -| All rights reserved. -|------------------------------------------------------------------------------ -| File : dfs_opts.h, the option definitions of Device FileSystem -|------------------------------------------------------------------------------ -| Chang Logs: -| Date Author Notes -| 2005-01-22 ffxz The first version. -+------------------------------------------------------------------------------ -*/ - -#ifndef __DFS_CONFIG_H__ -#define __DFS_CONFIG_H__ - -/* the max type of filesystem */ -#define DFS_FILESYSTEM_TYPES_MAX 4 - -/* the max length of path name */ -#define DFS_PATH_MAX 256 - -/* the size of sector */ -#define SECTOR_SIZE 512 - -#define DFS_DEBUG_INFO 0x01 -#define DFS_DEBUG_WARNING 0x02 -#define DFS_DEBUG_ERROR 0x04 -#define DFS_DEBUG_LEVEL (DFS_DEBUG_INFO | DFS_DEBUG_WARNING | DFS_DEBUG_ERROR) - -/* #define DFS_DEBUG */ -#ifdef DFS_DEBUG -#define dfs_log(level, x) do { if (level & DFS_DEBUG_LEVEL) \ - {rt_kprintf("DFS %s, %d:", __FUNCTION__, __LINE__); rt_kprintf x; \ - rt_kprintf ("\n");}}while (0) -#else -#define dfs_log(level, x) -#endif - -#endif - diff --git a/components/dfs/include/dfs_def.h b/components/dfs/include/dfs_def.h index ae1101f47f3a9ac543fa1eaffac39910bbf5fac0..fed58ac01afc85f89df9541ddea1d977acd2b6a6 100644 --- a/components/dfs/include/dfs_def.h +++ b/components/dfs/include/dfs_def.h @@ -17,7 +17,6 @@ #define __DFS_DEF_H__ #include -#include #ifndef __D_FS__ #define __D_FS__ @@ -34,6 +33,32 @@ #define DFS_F_EOF 0x04000000 #define DFS_F_ERR 0x08000000 +#ifndef DFS_PATH_MAX +#define DFS_PATH_MAX 256 +#endif + +#ifndef SECTOR_SIZE +#define SECTOR_SIZE 512 +#endif + +#ifndef DFS_FILESYSTEM_TYPES_MAX +#define DFS_FILESYSTEM_TYPES_MAX 4 +#endif + +#define DFS_DEBUG_INFO 0x01 +#define DFS_DEBUG_WARNING 0x02 +#define DFS_DEBUG_ERROR 0x04 +#define DFS_DEBUG_LEVEL (DFS_DEBUG_INFO | DFS_DEBUG_WARNING | DFS_DEBUG_ERROR) + +/* #define DFS_DEBUG */ +#ifdef DFS_DEBUG +#define dfs_log(level, x) do { if (level & DFS_DEBUG_LEVEL) \ + {rt_kprintf("DFS %s, %d:", __FUNCTION__, __LINE__); rt_kprintf x; \ + rt_kprintf ("\n");}}while (0) +#else +#define dfs_log(level, x) +#endif + #if defined(RT_USING_NEWLIB) #include #include /* used for struct stat */ @@ -165,17 +190,17 @@ #define DFS_F_EOF 0x04000000 #define DFS_F_ERR 0x08000000 -/* Seek flags */ -#ifdef __CC_ARM -#include -#define DFS_SEEK_SET SEEK_SET -#define DFS_SEEK_CUR SEEK_CUR -#define DFS_SEEK_END SEEK_END +/* Seek flags */ +#ifdef __CC_ARM +#include +#define DFS_SEEK_SET SEEK_SET +#define DFS_SEEK_CUR SEEK_CUR +#define DFS_SEEK_END SEEK_END #else #define DFS_SEEK_SET 0 #define DFS_SEEK_CUR 1 #define DFS_SEEK_END 2 -#endif +#endif /* Stat codes */ #define DFS_S_IFMT 00170000 diff --git a/components/dfs/include/dfs_fs.h b/components/dfs/include/dfs_fs.h index d698df429b7fcca3b0cbb91a9696bad13f8c786b..b04de24f0b23eb746844d85c5c62cfbaeadcc80d 100644 --- a/components/dfs/include/dfs_fs.h +++ b/components/dfs/include/dfs_fs.h @@ -15,7 +15,6 @@ #define __DFS_FS_H__ #include -#include /* Pre-declaration */ struct dfs_filesystem; diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index 5888b8ad0b685f4aa5abbac8bd1877ba48252ce2..18eb41bf10a0b158431e038ad54187ef38b60aa5 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -15,7 +15,6 @@ #include #include -#include #include #define NO_WORKING_DIR "system does not support working dir\n" diff --git a/components/dfs/src/dfs_fs.c b/components/dfs/src/dfs_fs.c index 2d1959c9459c07c70166b7039bd0d62c68e40ed7..3a04a05f2832fa0a5b958dc798901ed8002f8a01 100644 --- a/components/dfs/src/dfs_fs.c +++ b/components/dfs/src/dfs_fs.c @@ -11,6 +11,7 @@ * Date Author Notes * 2005-02-22 Bernard The first version. * 2010-06-30 Bernard Optimize for RT-Thread RTOS + * 2011-03-12 Bernard fix the filesystem lookup issue. */ #include #include @@ -86,7 +87,7 @@ struct dfs_filesystem* dfs_filesystem_lookup(const char *path) dfs_lock(); /* lookup it in the filesystem table */ - for (index = 0; index < DFS_FILESYSTEMS_MAX + 1; index++) + for (index = 0; index < DFS_FILESYSTEMS_MAX; index++) { if (filesystem_table[index].path == RT_NULL) continue; else