feat: 支持select.h的FD_SETSIZE宏配置
1. FD_SETSIZE由普通文件+网络文件的文件句柄个数之和决定。 2. 以前vfs_config.h引入fatfs.h和lfs_api.h又会引入其他头文件, 导致变异问题。因此需要将配置宏拆分出来放到fatfs_conf.h和 lfs_conf.h 头文件中。 3. lwipopts.h会提供网络的句柄个数,依赖FD_SETSIZE,而select.h会提供FD_SETSIZE, 依赖网络句柄个数,因此会形成相互依赖的情况,需要通过顺序来解决。 4. 网络中新增ntohl的定义。 close: #I4RYK4 Signed-off-by: likailong <likailong@huawei.com>
This commit is contained in:
@@ -98,14 +98,14 @@
|
||||
/* max numbers of other descriptors except socket descriptors */
|
||||
|
||||
#ifdef LOSCFG_FS_FAT
|
||||
#include "fatfs.h"
|
||||
#include "fatfs_conf.h"
|
||||
#define __FAT_NFILE FAT_MAX_OPEN_FILES
|
||||
#else
|
||||
#define __FAT_NFILE 0
|
||||
#endif
|
||||
|
||||
#ifdef LOSCFG_FS_LITTLEFS
|
||||
#include "lfs_api.h"
|
||||
#include "lfs_conf.h"
|
||||
#define __LFS_NFILE LITTLE_FS_MAX_OPEN_FILES
|
||||
#else
|
||||
#define __LFS_NFILE 0
|
||||
@@ -123,12 +123,10 @@
|
||||
|
||||
#define CONFIG_NQUEUE_DESCRIPTORS 256
|
||||
|
||||
#undef FD_SETSIZE
|
||||
#define FD_SETSIZE (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS)
|
||||
#define TIMER_FD_OFFSET (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS)
|
||||
#define CONFIG_NEXPANED_DESCRIPTORS (CONFIG_NTIME_DESCRIPTORS + CONFIG_NQUEUE_DESCRIPTORS)
|
||||
#define FD_SET_TOTAL_SIZE (FD_SETSIZE + CONFIG_NEXPANED_DESCRIPTORS)
|
||||
#define TIMER_FD_OFFSET FD_SETSIZE
|
||||
#define MQUEUE_FD_OFFSET (FD_SETSIZE + CONFIG_NTIME_DESCRIPTORS)
|
||||
#define FD_SET_TOTAL_SIZE (TIMER_FD_OFFSET + CONFIG_NEXPANED_DESCRIPTORS)
|
||||
#define MQUEUE_FD_OFFSET (TIMER_FD_OFFSET + CONFIG_NTIME_DESCRIPTORS)
|
||||
|
||||
/* directory configure */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user