libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[libc] add libc_console_init for console initialization.

This commit is contained in:
Bernard Xiong 2018-02-25 15:11:04 +08:00
parent ac811fe9c4
commit 14faf8a77a
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/libc/newlib/libc.c
View File

@ -21,7 +21,6 @@
int libc_system_init(void) int libc_system_init(void)
{ {
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
int fd;
struct rt_device *console_dev; struct rt_device *console_dev;
#ifndef RT_USING_DFS_DEVFS #ifndef RT_USING_DFS_DEVFS
@ -33,14 +32,6 @@ int libc_system_init(void)
{ {
/* initialize console device */ /* initialize console device */
rt_console_init(console_dev->parent.name); rt_console_init(console_dev->parent.name);
/* open console as stdin/stdout/stderr */
fd = open("/dev/console", O_RDONLY, 0); /* for stdin */
fd = open("/dev/console", O_WRONLY, 0); /* for stdout */
fd = open("/dev/console", O_WRONLY, 0); /* for stderr */
/* skip warning */
fd = fd;
} }
#endif #endif

31
components/libc/newlib/syscalls.c
View File

@ -3,6 +3,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <rtthread.h> #include <rtthread.h>
#include <stdio.h>
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
#include <dfs_posix.h> #include <dfs_posix.h>
#endif #endif
@ -12,6 +14,8 @@
#endif #endif
/* Reentrant versions of system calls. */ /* Reentrant versions of system calls. */
static int __console_fd = -1;
int dump = 0;
int int
_close_r(struct _reent *ptr, int fd) _close_r(struct _reent *ptr, int fd)
@ -205,18 +209,14 @@ _wait_r(struct _reent *ptr, int *status)
_ssize_t _ssize_t
_write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes) _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
{ {
if (fd < 3) if (fd == __console_fd)
{ {
#ifdef RT_USING_CONSOLE
rt_device_t console_device; rt_device_t console_device;
extern rt_device_t rt_console_get_device(void); extern rt_device_t rt_console_get_device(void);
console_device = rt_console_get_device(); console_device = rt_console_get_device();
if (console_device != 0) rt_device_write(console_device, 0, buf, nbytes); if (console_device != 0) rt_device_write(console_device, 0, buf, nbytes);
return nbytes; return nbytes;
#else
return 0;
#endif
} }
else else
{ {
@ -462,3 +462,24 @@ void abort(void)
while (1); while (1);
} }
int libc_console_init(void)
{
/* open console as stdin/stdout/stderr */
__console_fd = open("/dev/console", O_RDWR, 0); /* for stdin/stdout/stderr */
if (__console_fd >= 0)
{
_GLOBAL_REENT->_stdin = fdopen(__console_fd, "r");
_GLOBAL_REENT->_stdout = fdopen(__console_fd, "w");
setvbuf(_GLOBAL_REENT->_stdout, NULL, _IONBF, 0);
_GLOBAL_REENT->_stderr = fdopen(__console_fd, "w");
setvbuf(_GLOBAL_REENT->_stderr, NULL, _IONBF, 0);
_GLOBAL_REENT->__sdidinit = 1;
}
return 0;
}
INIT_APP_EXPORT(libc_console_init);