libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

标准化<poll.h> 弱化<dfs_poll.h>

This commit is contained in:
Meco Man 2021-09-11 11:25:43 -04:00
parent ee55c58ce4
commit 92c62a8fab
6 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/dfs/SConscript
View File

@ -11,7 +11,7 @@ cwd = GetCurrentDir()
CPPPATH = [cwd + "/include"] CPPPATH = [cwd + "/include"]
if GetDepend('RT_USING_POSIX'): if GetDepend('RT_USING_POSIX'):
src += ['src/poll.c', 'src/select.c'] src += ['src/dfs_poll.c', 'src/dfs_select.c']
group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH)

33
components/dfs/include/dfs_poll.h
View File

@ -10,37 +10,6 @@
#ifndef DFS_POLL_H__ #ifndef DFS_POLL_H__
#define DFS_POLL_H__ #define DFS_POLL_H__
#include <rtthread.h> #include <poll.h>
#ifdef RT_USING_POSIX
#include <sys/time.h> /* for struct timeval */
#if !defined(POLLIN) && !defined(POLLOUT)
#define POLLIN (0x01)
#define POLLRDNORM (0x01)
#define POLLRDBAND (0x01)
#define POLLPRI (0x01)
#define POLLOUT (0x02)
#define POLLWRNORM (0x02)
#define POLLWRBAND (0x02)
#define POLLERR (0x04)
#define POLLHUP (0x08)
#define POLLNVAL (0x10)
typedef unsigned int nfds_t;
struct pollfd
{
int fd;
short events;
short revents;
};
#endif /* !defined(POLLIN) && !defined(POLLOUT) */
#define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
int poll(struct pollfd *fds, nfds_t nfds, int timeout);
#endif /* RT_USING_POSIX */
#endif /* DFS_POLL_H__ */ #endif /* DFS_POLL_H__ */

0
components/dfs/src/poll.c → components/dfs/src/dfs_poll.c
View File

0
components/dfs/src/select.c → components/dfs/src/dfs_select.c
View File

40
components/libc/compilers/common/poll.h Normal file
View File

@ -0,0 +1,40 @@
#ifndef __POLL_H__
#define __POLL_H__
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(POLLIN) && !defined(POLLOUT)
#define POLLIN (0x01)
#define POLLRDNORM (0x01)
#define POLLRDBAND (0x01)
#define POLLPRI (0x01)
#define POLLOUT (0x02)
#define POLLWRNORM (0x02)
#define POLLWRBAND (0x02)
#define POLLERR (0x04)
#define POLLHUP (0x08)
#define POLLNVAL (0x10)
typedef unsigned int nfds_t;
struct pollfd
{
int fd;
short events;
short revents;
};
#endif /* !defined(POLLIN) && !defined(POLLOUT) */
#define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
int poll(struct pollfd *fds, nfds_t nfds, int timeout);
#ifdef __cplusplus
}
#endif
#endif /* __POLL_H__ */

6
components/libc/compilers/common/sys/time.h
View File

@ -8,8 +8,8 @@
* 2020-09-07 Meco Man combine gcc armcc iccarm * 2020-09-07 Meco Man combine gcc armcc iccarm
* 2021-02-12 Meco Man move all definitions located in <clock_time.h> to this file * 2021-02-12 Meco Man move all definitions located in <clock_time.h> to this file
*/ */
#ifndef _SYS_TIME_H_ #ifndef __SYS_TIME_H__
#define _SYS_TIME_H_ #define __SYS_TIME_H__
#include <rtconfig.h> #include <rtconfig.h>
#include <rtdef.h> #include <rtdef.h>
@ -73,7 +73,7 @@ struct timespec {
}; };
#endif #endif
/* posix clock and timer */ /* POSIX clock and timer */
#define MILLISECOND_PER_SECOND 1000UL #define MILLISECOND_PER_SECOND 1000UL
#define MICROSECOND_PER_SECOND 1000000UL #define MICROSECOND_PER_SECOND 1000000UL
#define NANOSECOND_PER_SECOND 1000000000UL #define NANOSECOND_PER_SECOND 1000000000UL