diff options
| author | Meco Man <[email protected]> | 2021-09-11 11:25:43 -0400 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-09-11 11:25:43 -0400 |
| commit | 92c62a8fab541a89aa5d37d15d43864ca072dd13 (patch) | |
| tree | 82092ee50453df26024df4e439afd3d14c1c7edb /components/dfs | |
| parent | ee55c58ce43cf2405481db11df187af3aff74eb4 (diff) | |
标准化<poll.h> 弱化<dfs_poll.h>
Diffstat (limited to 'components/dfs')
| -rw-r--r-- | components/dfs/SConscript | 2 | ||||
| -rw-r--r-- | components/dfs/include/dfs_poll.h | 33 | ||||
| -rw-r--r-- | components/dfs/src/dfs_poll.c (renamed from components/dfs/src/poll.c) | 0 | ||||
| -rw-r--r-- | components/dfs/src/dfs_select.c (renamed from components/dfs/src/select.c) | 0 |
4 files changed, 2 insertions, 33 deletions
diff --git a/components/dfs/SConscript b/components/dfs/SConscript index 3ccaeb1080..e449c84911 100644 --- a/components/dfs/SConscript +++ b/components/dfs/SConscript @@ -11,7 +11,7 @@ cwd = GetCurrentDir() CPPPATH = [cwd + "/include"] 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) diff --git a/components/dfs/include/dfs_poll.h b/components/dfs/include/dfs_poll.h index 096a5fe712..11d17cc1ff 100644 --- a/components/dfs/include/dfs_poll.h +++ b/components/dfs/include/dfs_poll.h @@ -10,37 +10,6 @@ #ifndef DFS_POLL_H__ #define DFS_POLL_H__ -#include <rtthread.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 */ +#include <poll.h> #endif /* DFS_POLL_H__ */ diff --git a/components/dfs/src/poll.c b/components/dfs/src/dfs_poll.c index d1e0372494..d1e0372494 100644 --- a/components/dfs/src/poll.c +++ b/components/dfs/src/dfs_poll.c diff --git a/components/dfs/src/select.c b/components/dfs/src/dfs_select.c index c9286ca97f..c9286ca97f 100644 --- a/components/dfs/src/select.c +++ b/components/dfs/src/dfs_select.c |