summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeco Man <[email protected]>2021-09-11 11:48:14 -0400
committerMeco Man <[email protected]>2021-09-11 11:56:54 -0400
commitc360688714d3aaf1f2114c45afaa3ee2ddc64fdd (patch)
treef10b25263fff9276028660c9c8704cb2d0275ba6
parent92c62a8fab541a89aa5d37d15d43864ca072dd13 (diff)
使用poll.h代替dfs_poll.h
-rw-r--r--components/dfs/src/dfs_poll.c2
-rw-r--r--components/dfs/src/dfs_select.c2
-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.h9
-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
-rw-r--r--examples/rt-link/rtlink_dev_example.c2
13 files changed, 21 insertions, 12 deletions
diff --git a/components/dfs/src/dfs_poll.c b/components/dfs/src/dfs_poll.c
index d1e0372494..607b3487be 100644
--- a/components/dfs/src/dfs_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/dfs_select.c b/components/dfs/src/dfs_select.c
index c9286ca97f..ca9c549259 100644
--- a/components/dfs/src/dfs_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
index 1862373559..aea73d6eaf 100644
--- a/components/libc/compilers/common/poll.h
+++ b/components/libc/compilers/common/poll.h
@@ -1,3 +1,12 @@
+/*
+ * 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__
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)
{
diff --git a/examples/rt-link/rtlink_dev_example.c b/examples/rt-link/rtlink_dev_example.c
index 0a026bcb3d..d00f916efd 100644
--- a/examples/rt-link/rtlink_dev_example.c
+++ b/examples/rt-link/rtlink_dev_example.c
@@ -47,7 +47,7 @@ static rt_err_t rtlink_dev_tx_done(rt_device_t dev, void *buffer)
#ifdef RT_USING_POSIX
#include <dfs_posix.h>
-#include <dfs_poll.h>
+#include <poll.h>
#include <dfs_select.h>
#define RTLINK01_PATH "/dev/rtlink01"