summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/dfs/SConscript2
-rw-r--r--components/dfs/include/dfs_poll.h33
-rw-r--r--components/dfs/src/dfs_poll.c (renamed from components/dfs/src/poll.c)2
-rw-r--r--components/dfs/src/dfs_select.c (renamed from components/dfs/src/select.c)2
-rw-r--r--components/drivers/serial/serial.c2
-rw-r--r--components/drivers/serial/serial_v2.c2
-rw-r--r--components/drivers/src/pipe.c2
-rw-r--r--components/libc/compilers/common/poll.h49
-rw-r--r--components/libc/compilers/common/sys/time.h6
-rw-r--r--components/lwp/lwp_syscall.c2
-rw-r--r--components/net/at/at_socket/at_socket.c2
-rw-r--r--components/net/sal_socket/impl/af_inet_at.c2
-rw-r--r--components/net/sal_socket/impl/af_inet_lwip.c2
-rw-r--r--components/net/sal_socket/socket/net_sockets.c2
-rw-r--r--components/utilities/rt-link/src/rtlink_dev.c2
15 files changed, 65 insertions, 47 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..607b3487be 100644
--- a/components/dfs/src/poll.c
+++ b/components/dfs/src/dfs_poll.c
@@ -17,7 +17,7 @@
#include <dfs.h>
#include <dfs_file.h>
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
#ifdef RT_USING_POSIX
diff --git a/components/dfs/src/select.c b/components/dfs/src/dfs_select.c
index c9286ca97f..ca9c549259 100644
--- a/components/dfs/src/select.c
+++ b/components/dfs/src/dfs_select.c
@@ -11,7 +11,7 @@
#include <dfs_fs.h>
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <dfs_select.h>
#ifdef RT_USING_POSIX
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
index c567e34b52..289d523bd2 100644
--- a/components/drivers/serial/serial.c
+++ b/components/drivers/serial/serial.c
@@ -38,7 +38,7 @@
#ifdef RT_USING_POSIX
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <sys/ioctl.h>
#ifdef RT_USING_POSIX_TERMIOS
diff --git a/components/drivers/serial/serial_v2.c b/components/drivers/serial/serial_v2.c
index 6e65457a5d..390dd31748 100644
--- a/components/drivers/serial/serial_v2.c
+++ b/components/drivers/serial/serial_v2.c
@@ -18,7 +18,7 @@
#ifdef RT_USING_POSIX
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <sys/ioctl.h>
#ifdef getc
diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c
index 7fa5eb067d..af90f13c6f 100644
--- a/components/drivers/src/pipe.c
+++ b/components/drivers/src/pipe.c
@@ -16,7 +16,7 @@
#ifdef RT_USING_POSIX
#include <dfs_file.h>
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <sys/ioctl.h>
static int pipe_fops_open(struct dfs_fd *fd)
diff --git a/components/libc/compilers/common/poll.h b/components/libc/compilers/common/poll.h
new file mode 100644
index 0000000000..aea73d6eaf
--- /dev/null
+++ b/components/libc/compilers/common/poll.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date Author Notes
+ * 2021-09-11 Meco Man First version
+ */
+#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__ */
diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h
index c2320429e0..9d4422e17a 100644
--- a/components/libc/compilers/common/sys/time.h
+++ b/components/libc/compilers/common/sys/time.h
@@ -8,8 +8,8 @@
* 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
*/
-#ifndef _SYS_TIME_H_
-#define _SYS_TIME_H_
+#ifndef __SYS_TIME_H__
+#define __SYS_TIME_H__
#include <rtconfig.h>
#include <rtdef.h>
@@ -73,7 +73,7 @@ struct timespec {
};
#endif
-/* posix clock and timer */
+/* POSIX clock and timer */
#define MILLISECOND_PER_SECOND 1000UL
#define MICROSECOND_PER_SECOND 1000000UL
#define NANOSECOND_PER_SECOND 1000000000UL
diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c
index 02915ab1cc..d9112eed3e 100644
--- a/components/lwp/lwp_syscall.c
+++ b/components/lwp/lwp_syscall.c
@@ -13,7 +13,7 @@
#include <lwp_mem.h>
#include <lwp_syscall.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <dfs_select.h>
#if (defined(RT_USING_SAL) && defined(SAL_USING_POSIX))
diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c
index 8215dd4417..96ea053f9c 100644
--- a/components/net/at/at_socket/at_socket.c
+++ b/components/net/at/at_socket/at_socket.c
@@ -19,7 +19,7 @@
#include <at_device.h>
#ifdef SAL_USING_POSIX
-#include <dfs_poll.h>
+#include <poll.h>
#endif
#include <arpa/inet.h>
diff --git a/components/net/sal_socket/impl/af_inet_at.c b/components/net/sal_socket/impl/af_inet_at.c
index c85dfe9f06..07dff0018c 100644
--- a/components/net/sal_socket/impl/af_inet_at.c
+++ b/components/net/sal_socket/impl/af_inet_at.c
@@ -19,7 +19,7 @@
#include <netdev.h>
#ifdef SAL_USING_POSIX
-#include <dfs_poll.h>
+#include <poll.h>
#endif
#ifdef SAL_USING_AT
diff --git a/components/net/sal_socket/impl/af_inet_lwip.c b/components/net/sal_socket/impl/af_inet_lwip.c
index 2e19275b5d..2cf0958ee4 100644
--- a/components/net/sal_socket/impl/af_inet_lwip.c
+++ b/components/net/sal_socket/impl/af_inet_lwip.c
@@ -17,7 +17,7 @@
#include <lwip/netif.h>
#ifdef SAL_USING_POSIX
-#include <dfs_poll.h>
+#include <poll.h>
#endif
#include <sal.h>
diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c
index 7d4db34327..1b6db50e6d 100644
--- a/components/net/sal_socket/socket/net_sockets.c
+++ b/components/net/sal_socket/socket/net_sockets.c
@@ -11,7 +11,7 @@
#include <dfs.h>
#include <dfs_file.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <dfs_net.h>
#include <sys/errno.h>
#include <sys/socket.h>
diff --git a/components/utilities/rt-link/src/rtlink_dev.c b/components/utilities/rt-link/src/rtlink_dev.c
index 5eff1f9782..efebf37565 100644
--- a/components/utilities/rt-link/src/rtlink_dev.c
+++ b/components/utilities/rt-link/src/rtlink_dev.c
@@ -21,7 +21,7 @@
#ifdef RT_USING_POSIX
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
int rtlink_fops_open(struct dfs_fd *fd)
{
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-30 14:59:50 +0000