Browse Source

优化dfs.h和dirent.h的包含关系

Meco Man 3 years ago
parent
commit
dd9db58a86
2 changed files with 4 additions and 10 deletions
  1. 4 6
      components/dfs/include/dfs.h
  2. 0 4
      components/libc/compilers/common/dirent.h

+ 4 - 6
components/dfs/include/dfs.h

@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <dirent.h>
 #include <sys/time.h>
 #include <rtdevice.h>
 
@@ -24,11 +24,11 @@ extern "C" {
 #endif
 
 #ifndef DFS_FILESYSTEMS_MAX
-#define DFS_FILESYSTEMS_MAX     2
+#define DFS_FILESYSTEMS_MAX     4
 #endif
 
 #ifndef DFS_FD_MAX
-#define DFS_FD_MAX              4
+#define DFS_FD_MAX              16
 #endif
 
 /*
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #ifndef DFS_PATH_MAX
-#define DFS_PATH_MAX             256
+#define DFS_PATH_MAX             DIRENT_NAME_MAX
 #endif
 
 #ifndef SECTOR_SIZE
@@ -66,8 +66,6 @@ extern "C" {
 #define DFS_F_EOF               0x04000000
 #define DFS_F_ERR               0x08000000
 
-#include <dirent.h>
-
 struct statfs
 {
     size_t f_bsize;   /* block size */

+ 0 - 4
components/libc/compilers/common/dirent.h

@@ -44,11 +44,7 @@ typedef struct
 #ifndef HAVE_DIRENT_STRUCTURE
 #define HAVE_DIRENT_STRUCTURE
 
-#ifdef DFS_PATH_MAX
-#define DIRENT_NAME_MAX    DFS_PATH_MAX
-#else
 #define DIRENT_NAME_MAX    256
-#endif
 
 struct dirent
 {