summaryrefslogtreecommitdiff
path: root/components/libc/compilers/dlib/syscall_write.c
diff options
context:
space:
mode:
author192.168.1.134 <[email protected]>2021-11-08 15:02:29 +0800
committer192.168.1.134 <[email protected]>2021-11-08 15:02:29 +0800
commit85da2247c050ff16842eba5927fc34a06564c5dc (patch)
treed489fbe3078ed99096210087be80759dd515d703 /components/libc/compilers/dlib/syscall_write.c
parent078c3c5991e3024664fe7a51878874e02bf107dc (diff)
parent9e7d7ae52544fd8e84f18734fd4216fc7659d9c9 (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components/libc/compilers/dlib/syscall_write.c')
-rw-r--r--components/libc/compilers/dlib/syscall_write.c30
1 files changed, 13 insertions, 17 deletions
diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c
index ffee51882d..ab011c1096 100644
--- a/components/libc/compilers/dlib/syscall_write.c
+++ b/components/libc/compilers/dlib/syscall_write.c
@@ -9,11 +9,11 @@
*/
#include <rtthread.h>
-#ifdef RT_USING_DFS
-#include <dfs_posix.h>
-#endif
#include <yfuns.h>
+#include <unistd.h>
+#ifdef RT_USING_POSIX
#include "libc.h"
+#endif
#define DBG_TAG "dlib.syscall_write"
#define DBG_LVL DBG_INFO
@@ -23,16 +23,12 @@
size_t __write(int handle, const unsigned char *buf, size_t len)
{
-#ifdef RT_USING_DFS
+#ifdef RT_USING_POSIX
int size;
-#endif
+#endif /* RT_USING_POSIX */
if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR))
{
-#ifndef RT_USING_CONSOLE
- return _LLIO_ERROR;
-#else
-
#ifdef RT_USING_POSIX
if (libc_stdio_get_console() < 0)
{
@@ -40,7 +36,7 @@ size_t __write(int handle, const unsigned char *buf, size_t len)
return 0;
}
return write(STDOUT_FILENO, (void*)buf, len);
-#else
+#elif defined(RT_USING_CONSOLE)
rt_device_t console_device;
console_device = rt_console_get_device();
@@ -50,19 +46,19 @@ size_t __write(int handle, const unsigned char *buf, size_t len)
}
return len;
-#endif
-#endif
+#else
+ return _LLIO_ERROR;
+#endif /* RT_USING_POSIX */
}
else if (handle == _LLIO_STDIN)
{
return _LLIO_ERROR;
}
-#ifndef RT_USING_DFS
- return _LLIO_ERROR;
-#else
+#ifdef RT_USING_POSIX
size = write(handle, buf, len);
return size;
-#endif
+#else
+ return _LLIO_ERROR;
+#endif /* RT_USING_POSIX */
}
-