diff options
| author | Jianting (Meco) Man <[email protected]> | 2021-10-14 20:11:01 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-14 20:11:01 -0400 |
| commit | 8c01acc667898be1674cf0be3f2c21c2cedaa329 (patch) | |
| tree | 023ef8735104687ea14929a719e6fd20498c59c9 /components/libc/compilers/dlib | |
| parent | 92ea0ec8c7a42cd366c5285c1e55fc7d21dcdf93 (diff) | |
Revert "[libc]&[dfs] remove unnecessary RT_USING_POSIX and RT_USING_DFS_DEVFS"
Diffstat (limited to 'components/libc/compilers/dlib')
| -rw-r--r-- | components/libc/compilers/dlib/libc.c | 10 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/syscall_write.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/components/libc/compilers/dlib/libc.c b/components/libc/compilers/dlib/libc.c index ac3d78f1f9..f540ac955f 100644 --- a/components/libc/compilers/dlib/libc.c +++ b/components/libc/compilers/dlib/libc.c @@ -17,23 +17,23 @@ int libc_system_init(void) { -#ifdef RT_USING_DFS_DEVFS +#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS) rt_device_t dev_console; dev_console = rt_console_get_device(); if (dev_console) { - #ifdef RT_USING_POSIX + #if defined(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 /* RT_USING_POSIX */ + #endif } -#endif /* RT_USING_DFS_DEVFS */ +#endif #if defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) pthread_system_init(); -#endif /* defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) */ +#endif return 0; } diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c index 481e9f8c3d..ffee51882d 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 /* RT_USING_DFS */ +#endif 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_DFS +#ifdef RT_USING_POSIX 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 /* RT_USING_DFS */ -#endif /* RT_USING_CONSOLE */ +#endif +#endif } 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 /* RT_USING_DFS */ +#endif } |