Merge pull request #5051 from mysterywolf/be_libc

[libc标准化] 使用标准poll.h代替dfs_poll.h

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)
 

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__ */

components/dfs/src/poll.c → 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
 

components/dfs/src/select.c → 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

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

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

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)

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__ */

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

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))

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>

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

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>

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>

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)
 {

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"