Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-27 09:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[libc]&[dfs] remove unnecessary RT_USING_POSIX and RT_USING_DFS_DEVFS"

Browse Source
This commit is contained in:
Jianting (Meco) Man
2021-10-14 20:11:01 -04:00
committed by GitHub
parent 92ea0ec8c7
commit 8c01acc667
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/libc/compilers/dlib/libc.c
View File

@@ -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;
}

10
components/libc/compilers/dlib/syscall_write.c
View File

@@ -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
}