From 3d2e23ec1c5140c8750c71ebf37c197f6048b94e Mon Sep 17 00:00:00 2001 From: liukangcc Date: Tue, 11 Jan 2022 15:20:14 +0800 Subject: [update] move dfs_posix.h to legacy/dfs/dfs_posix.h --- components/dfs/include/dfs_posix.h | 24 ---------------------- components/drivers/serial/serial.c | 5 ++++- components/drivers/serial/serial_v2.c | 4 +++- components/drivers/src/pipe.c | 5 +++-- components/finsh/msh.c | 5 ++++- components/finsh/msh_file.c | 5 ++++- components/finsh/shell.c | 4 +++- components/legacy/dfs/dfs_posix.h | 24 ++++++++++++++++++++++ components/libc/compilers/common/sys/ioctl.h | 4 +++- components/libc/libdl/dlmodule.c | 4 +++- components/libc/posix/io/aio/aio.c | 5 ++++- components/libc/posix/io/mman/mman.c | 4 +++- components/libc/posix/io/termios/termios.c | 4 +++- components/lwp/lwp.c | 5 ++++- components/lwp/lwp_syscall.h | 5 ++++- .../net/lwip-2.0.2/src/apps/tftp/tftp_port.c | 4 +++- .../net/lwip-2.0.3/src/apps/tftp/tftp_port.c | 4 +++- .../net/lwip-2.1.2/src/apps/tftp/tftp_port.c | 4 +++- components/net/sal_socket/impl/proto_mbedtls.c | 4 +++- components/utilities/rt-link/src/rtlink_dev.c | 4 +++- components/utilities/ymodem/ry_sy.c | 5 ++++- components/utilities/zmodem/rz.c | 5 +++-- components/utilities/zmodem/sz.c | 5 +++-- components/utilities/zmodem/zcore.c | 5 +++-- components/utilities/zmodem/zdevice.c | 5 +++-- 25 files changed, 100 insertions(+), 52 deletions(-) delete mode 100644 components/dfs/include/dfs_posix.h create mode 100644 components/legacy/dfs/dfs_posix.h (limited to 'components') diff --git a/components/dfs/include/dfs_posix.h b/components/dfs/include/dfs_posix.h deleted file mode 100644 index ee62cdde82..0000000000 --- a/components/dfs/include/dfs_posix.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2009-05-27 Yi.qiu The first version. - * 2010-07-18 Bernard add stat and statfs structure definitions. - * 2011-05-16 Yi.qiu Change parameter name of rename, "new" is C++ key word. - * 2017-12-27 Bernard Add fcntl API. - * 2018-02-07 Bernard Change the 3rd parameter of open/fcntl/ioctl to '...' - */ - -#ifndef __DFS_POSIX_H__ -#define __DFS_POSIX_H__ - -#include -#include -#include /* rename() */ -#include -#include /* statfs() */ - -#endif diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index da330b5e9c..7182e23c37 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -37,7 +37,10 @@ #include #ifdef RT_USING_POSIX_STDIO -#include +#include +#include +#include +#include #include #include diff --git a/components/drivers/serial/serial_v2.c b/components/drivers/serial/serial_v2.c index 16d376eeb9..738afcb081 100644 --- a/components/drivers/serial/serial_v2.c +++ b/components/drivers/serial/serial_v2.c @@ -17,7 +17,9 @@ #include #ifdef RT_USING_POSIX_STDIO -#include +#include +#include +#include #include #include diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c index 7e1f569b62..2bc0a10083 100644 --- a/components/drivers/src/pipe.c +++ b/components/drivers/src/pipe.c @@ -14,8 +14,9 @@ #include #if defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_POSIX_PIPE) -#include -#include +#include +#include +#include #include #include diff --git a/components/finsh/msh.c b/components/finsh/msh.c index acb5445ad1..abf82e992c 100644 --- a/components/finsh/msh.c +++ b/components/finsh/msh.c @@ -21,7 +21,10 @@ #include "msh.h" #include "shell.h" #ifdef DFS_USING_POSIX -#include +#include +#include +#include +#include #endif /* DFS_USING_POSIX */ #ifdef RT_USING_MODULE #include diff --git a/components/finsh/msh_file.c b/components/finsh/msh_file.c index 8022b176fc..28f8d4803f 100644 --- a/components/finsh/msh_file.c +++ b/components/finsh/msh_file.c @@ -15,7 +15,10 @@ #include #include "msh.h" -#include +#include +#include +#include +#include static int msh_readline(int fd, char *line_buf, int size) { diff --git a/components/finsh/shell.c b/components/finsh/shell.c index 5398db5370..a326ba1978 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -28,7 +28,9 @@ #include "msh.h" #ifdef DFS_USING_POSIX -#include +#include +#include +#include #endif /* DFS_USING_POSIX */ /* finsh thread */ diff --git a/components/legacy/dfs/dfs_posix.h b/components/legacy/dfs/dfs_posix.h new file mode 100644 index 0000000000..ee62cdde82 --- /dev/null +++ b/components/legacy/dfs/dfs_posix.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2009-05-27 Yi.qiu The first version. + * 2010-07-18 Bernard add stat and statfs structure definitions. + * 2011-05-16 Yi.qiu Change parameter name of rename, "new" is C++ key word. + * 2017-12-27 Bernard Add fcntl API. + * 2018-02-07 Bernard Change the 3rd parameter of open/fcntl/ioctl to '...' + */ + +#ifndef __DFS_POSIX_H__ +#define __DFS_POSIX_H__ + +#include +#include +#include /* rename() */ +#include +#include /* statfs() */ + +#endif diff --git a/components/libc/compilers/common/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h index d93c79115a..49c294eb8d 100644 --- a/components/libc/compilers/common/sys/ioctl.h +++ b/components/libc/compilers/common/sys/ioctl.h @@ -12,7 +12,9 @@ #define __SYS_IOCTL_H__ #include -#include +#include +#include +#include #ifdef _WIN32 #include diff --git a/components/libc/libdl/dlmodule.c b/components/libc/libdl/dlmodule.c index 044c05a994..32d6b6b7e7 100644 --- a/components/libc/libdl/dlmodule.c +++ b/components/libc/libdl/dlmodule.c @@ -15,7 +15,9 @@ #include "dlelf.h" #if defined(RT_USING_POSIX) -#include +#include +#include +#include #endif #define DBG_TAG "DLMD" diff --git a/components/libc/posix/io/aio/aio.c b/components/libc/posix/io/aio/aio.c index 08ef4c634a..bf188728f0 100644 --- a/components/libc/posix/io/aio/aio.c +++ b/components/libc/posix/io/aio/aio.c @@ -10,7 +10,10 @@ #include #include -#include +#include +#include +#include +#include #include "aio.h" struct rt_workqueue* aio_queue = NULL; diff --git a/components/libc/posix/io/mman/mman.c b/components/libc/posix/io/mman/mman.c index 827f2cbb14..d484b3ed7b 100644 --- a/components/libc/posix/io/mman/mman.c +++ b/components/libc/posix/io/mman/mman.c @@ -12,7 +12,9 @@ #include #include -#include +#include +#include +#include #include "sys/mman.h" diff --git a/components/libc/posix/io/termios/termios.c b/components/libc/posix/io/termios/termios.c index 44e0e80853..14d85e9f0c 100644 --- a/components/libc/posix/io/termios/termios.c +++ b/components/libc/posix/io/termios/termios.c @@ -10,7 +10,9 @@ #include #include -#include +#include +#include +#include #include #include "termios.h" diff --git a/components/lwp/lwp.c b/components/lwp/lwp.c index 9789595ee7..4b91538b68 100644 --- a/components/lwp/lwp.c +++ b/components/lwp/lwp.c @@ -11,7 +11,10 @@ #include #include -#include +#include +#include +#include +#include #ifndef RT_USING_DFS #error "lwp need file system(RT_USING_DFS)" diff --git a/components/lwp/lwp_syscall.h b/components/lwp/lwp_syscall.h index 02599f4317..749406c1ca 100644 --- a/components/lwp/lwp_syscall.h +++ b/components/lwp/lwp_syscall.h @@ -13,7 +13,10 @@ #include #include -#include +#include +#include +#include +#include #include #include #include diff --git a/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c b/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c index 59e64c7a3b..38221ac580 100644 --- a/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c +++ b/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c @@ -10,7 +10,9 @@ #include -#include +#include +#include +#include #include static struct tftp_context ctx; diff --git a/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c b/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c index 59e64c7a3b..38221ac580 100644 --- a/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c +++ b/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c @@ -10,7 +10,9 @@ #include -#include +#include +#include +#include #include static struct tftp_context ctx; diff --git a/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c b/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c index 59e64c7a3b..38221ac580 100644 --- a/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c +++ b/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c @@ -10,7 +10,9 @@ #include -#include +#include +#include +#include #include static struct tftp_context ctx; diff --git a/components/net/sal_socket/impl/proto_mbedtls.c b/components/net/sal_socket/impl/proto_mbedtls.c index 79fbdcc5d4..338792c948 100644 --- a/components/net/sal_socket/impl/proto_mbedtls.c +++ b/components/net/sal_socket/impl/proto_mbedtls.c @@ -11,7 +11,9 @@ #include #ifdef RT_USING_DFS -#include +#include +#include +#include #endif #ifdef SAL_USING_TLS diff --git a/components/utilities/rt-link/src/rtlink_dev.c b/components/utilities/rt-link/src/rtlink_dev.c index e91736251d..702aed32da 100644 --- a/components/utilities/rt-link/src/rtlink_dev.c +++ b/components/utilities/rt-link/src/rtlink_dev.c @@ -20,7 +20,9 @@ #define RTLINK_SERV(dev) (((struct rt_link_device*)dev)->service) #ifdef RT_USING_POSIX_DEVIO -#include +#include +#include +#include #include int rtlink_fops_open(struct dfs_fd *fd) diff --git a/components/utilities/ymodem/ry_sy.c b/components/utilities/ymodem/ry_sy.c index 3f3b022d7e..b77bd7abc2 100644 --- a/components/utilities/ymodem/ry_sy.c +++ b/components/utilities/ymodem/ry_sy.c @@ -11,7 +11,10 @@ #include #include -#include +#include +#include +#include +#include #include #include diff --git a/components/utilities/zmodem/rz.c b/components/utilities/zmodem/rz.c index 224d8f95a8..f4fa4bde6c 100644 --- a/components/utilities/zmodem/rz.c +++ b/components/utilities/zmodem/rz.c @@ -13,8 +13,9 @@ #include #include #include -#include -#include +#include +#include +#include #include #include "zdef.h" diff --git a/components/utilities/zmodem/sz.c b/components/utilities/zmodem/sz.c index e6096756b1..bda5d939d4 100644 --- a/components/utilities/zmodem/sz.c +++ b/components/utilities/zmodem/sz.c @@ -12,8 +12,9 @@ #include #include #include -#include -#include +#include +#include +#include #include "zdef.h" diff --git a/components/utilities/zmodem/zcore.c b/components/utilities/zmodem/zcore.c index 75d9647348..b4e23b585a 100644 --- a/components/utilities/zmodem/zcore.c +++ b/components/utilities/zmodem/zcore.c @@ -11,8 +11,9 @@ #include #include #include -#include -#include +#include +#include +#include #include #include "zdef.h" diff --git a/components/utilities/zmodem/zdevice.c b/components/utilities/zmodem/zdevice.c index 3a144e79de..980a15f4f8 100644 --- a/components/utilities/zmodem/zdevice.c +++ b/components/utilities/zmodem/zdevice.c @@ -11,8 +11,9 @@ #include #include #include -#include -#include +#include +#include +#include #include "zdef.h" -- cgit v1.3.1