From a354f846e8699fbb8152cfa721f5b9a1e3a2c1a4 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Wed, 13 Oct 2021 14:29:00 -0400 Subject: [PATCH] [libc]&[dfs] remove unnecessary RT_USING_POSIX and RT_USING_DFS_DEVFS --- components/dfs/src/dfs.c | 4 ++-- components/libc/compilers/armlibc/libc.c | 12 ++++++------ components/libc/compilers/armlibc/syscalls.c | 10 +++++----- components/libc/compilers/dlib/libc.c | 10 +++++----- components/libc/compilers/dlib/syscall_write.c | 10 +++++----- components/libc/compilers/gcc/newlib/libc.c | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index 8155b088f0..c91a9c6ef8 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -18,7 +18,7 @@ #include #endif -#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_POSIX) +#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_LIBC) #include #endif @@ -216,7 +216,7 @@ struct dfs_fd *fd_get(int fd) struct dfs_fd *d; struct dfs_fdtable *fdt; -#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_POSIX) +#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_LIBC) if ((0 <= fd) && (fd <= 2)) fd = libc_stdio_get_console(); #endif diff --git a/components/libc/compilers/armlibc/libc.c b/components/libc/compilers/armlibc/libc.c index 889c687309..82f42f5047 100644 --- a/components/libc/compilers/armlibc/libc.c +++ b/components/libc/compilers/armlibc/libc.c @@ -17,23 +17,23 @@ int libc_system_init(void) { -#if defined(RT_USING_DFS) & defined(RT_USING_DFS_DEVFS) +#ifdef RT_USING_DFS_DEVFS rt_device_t dev_console; dev_console = rt_console_get_device(); if (dev_console) { - #if defined(RT_USING_POSIX) + #ifdef RT_USING_POSIX libc_stdio_set_console(dev_console->parent.name, O_RDWR); #else libc_stdio_set_console(dev_console->parent.name, O_WRONLY); - #endif + #endif /* RT_USING_POSIX */ } -#endif +#endif /* RT_USING_DFS_DEVFS */ -#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT +#if defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT) pthread_system_init(); -#endif +#endif /* defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT) */ return 0; } diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c index ccdcfc86ea..0142c3335d 100644 --- a/components/libc/compilers/armlibc/syscalls.c +++ b/components/libc/compilers/armlibc/syscalls.c @@ -187,14 +187,14 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode) { #ifdef RT_USING_DFS int size; -#endif +#endif /* RT_USING_DFS */ if ((fh == STDOUT) || (fh == STDERR)) { #if !defined(RT_USING_CONSOLE) || !defined(RT_USING_DEVICE) return 0; #else -#ifdef RT_USING_POSIX +#ifdef RT_USING_DFS if (libc_stdio_get_console() < 0) { LOG_W("Do not invoke standard input before initializing libc"); @@ -210,8 +210,8 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode) } return -1; -#endif -#endif +#endif /* RT_USING_DFS */ +#endif /* !defined(RT_USING_CONSOLE) || !defined(RT_USING_DEVICE) */ } else if (fh == STDIN) { @@ -226,7 +226,7 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode) return len - size; else return -1; -#endif +#endif /* RT_USING_DFS */ } /* diff --git a/components/libc/compilers/dlib/libc.c b/components/libc/compilers/dlib/libc.c index f540ac955f..ac3d78f1f9 100644 --- a/components/libc/compilers/dlib/libc.c +++ b/components/libc/compilers/dlib/libc.c @@ -17,23 +17,23 @@ int libc_system_init(void) { -#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS) +#ifdef RT_USING_DFS_DEVFS rt_device_t dev_console; dev_console = rt_console_get_device(); if (dev_console) { - #if defined(RT_USING_POSIX) + #ifdef RT_USING_POSIX libc_stdio_set_console(dev_console->parent.name, O_RDWR); #else libc_stdio_set_console(dev_console->parent.name, O_WRONLY); - #endif + #endif /* RT_USING_POSIX */ } -#endif +#endif /* RT_USING_DFS_DEVFS */ #if defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) pthread_system_init(); -#endif +#endif /* defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) */ return 0; } diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c index ffee51882d..481e9f8c3d 100644 --- a/components/libc/compilers/dlib/syscall_write.c +++ b/components/libc/compilers/dlib/syscall_write.c @@ -25,7 +25,7 @@ size_t __write(int handle, const unsigned char *buf, size_t len) { #ifdef RT_USING_DFS int size; -#endif +#endif /* RT_USING_DFS */ if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR)) { @@ -33,7 +33,7 @@ size_t __write(int handle, const unsigned char *buf, size_t len) return _LLIO_ERROR; #else -#ifdef RT_USING_POSIX +#ifdef RT_USING_DFS if (libc_stdio_get_console() < 0) { LOG_W("Do not invoke standard output before initializing libc"); @@ -50,8 +50,8 @@ size_t __write(int handle, const unsigned char *buf, size_t len) } return len; -#endif -#endif +#endif /* RT_USING_DFS */ +#endif /* RT_USING_CONSOLE */ } else if (handle == _LLIO_STDIN) { @@ -63,6 +63,6 @@ size_t __write(int handle, const unsigned char *buf, size_t len) #else size = write(handle, buf, len); return size; -#endif +#endif /* RT_USING_DFS */ } diff --git a/components/libc/compilers/gcc/newlib/libc.c b/components/libc/compilers/gcc/newlib/libc.c index 9834a9a015..20d41a521b 100644 --- a/components/libc/compilers/gcc/newlib/libc.c +++ b/components/libc/compilers/gcc/newlib/libc.c @@ -23,7 +23,7 @@ int _EXFUN(putenv,(char *__string)); int libc_system_init(void) { -#if defined(RT_USING_DFS) & defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE) +#if defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE) rt_device_t dev_console; dev_console = rt_console_get_device(); @@ -39,11 +39,11 @@ int libc_system_init(void) /* set PATH and HOME */ putenv("PATH=/bin"); putenv("HOME=/home"); -#endif +#endif /* defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE) */ -#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT +#if defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT) pthread_system_init(); -#endif +#endif /* defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT) */ return 0; }