提交 1741a6a9 编写于 作者: Z zhangdengyu

fixed 4d8e88ab from https://gitee.com/zhangdengyu/third_party_FatFs/pulls/50

fix: 修复ffconf.h中宏FF_FS_LOCK设置不合理的问题

方案描述:
1、修改FF_FS_LOCK宏定义为:#define FF_FS_LOCK  (CONFIG_NFILE_DESCRIPTORS + LOSCFG_MAX_OPEN_DIRS - MIN_START_FD)
2、其中各个宏的含义如下:
2.1、CONFIG_NFILE_DESCRIPTORS 在vfs_config.h文件中定义,表示打开文件描述符fd的最大数量
2.2、LOSCFG_MAX_OPEN_DIRS 在vfs_config.h文件中定义,表示打开目录最大数量
2.3、MIN_START_FD 在vfs_config.h文件中定义,表示保留的三个文件描述符fd:stdin,stdout,stderr

BREAKING CHANGE:
修复ffconf.h中宏FF_FS_LOCK设置不合理的问题
修改后的FF_FS_LOCK宏定义为:#define FF_FS_LOCK	(CONFIG_NFILE_DESCRIPTORS + LOSCFG_MAX_OPEN_DIRS - MIN_START_FD)

Close: #I663SZ
Signed-off-by: Nzhangdengyu <zhangdengyu2@huawei.com>
Change-Id: I5389e57d4276e99d40c79cb5a449c6e5a1f1179e
上级 dd5bd2a3
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "los_config.h" #include "los_config.h"
#else #else
#include "fs_config.h" #include "fs_config.h"
#include "vfs_config.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
...@@ -315,7 +316,7 @@ enum STORAGE { ...@@ -315,7 +316,7 @@ enum STORAGE {
#ifndef __LITEOS_M__ #ifndef __LITEOS_M__
#define FF_FS_LOCK CONFIG_NFILE_DESCRIPTORS #define FF_FS_LOCK CONFIG_NFILE_DESCRIPTORS
#else #else
#define FF_FS_LOCK 64 #define FF_FS_LOCK (CONFIG_NFILE_DESCRIPTORS + LOSCFG_MAX_OPEN_DIRS - MIN_START_FD)
#endif #endif
/* The option FF_FS_LOCK switches file lock function to control duplicated file open /* The option FF_FS_LOCK switches file lock function to control duplicated file open
/ and illegal operation to open objects. This option must be 0 when FF_FS_READONLY / and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册