RT-Thread/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-10-18 01:02:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

add RT_USING_POSIX_STDIO

Browse Source
This commit is contained in:
Meco Man
2022-01-02 17:51:44 -05:00
committed by Bernard Xiong
parent 0e5dd7d1ab
commit 918ee6147c
41 changed files with 112 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/libc/compilers/armlibc/syscalls.c
View File

@@ -22,9 +22,9 @@
#include <unistd.h>
#include <sys/stat.h>
#include <compiler_private.h>
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#include "libc.h"
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
#define DBG_TAG "armlibc.syscalls"
#define DBG_LVL DBG_INFO
@@ -152,7 +152,7 @@ int _sys_read(FILEHANDLE fh, unsigned char *buf, unsigned len, int mode)
if (fh == STDIN)
{
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
if (libc_stdio_get_console() < 0)
{
LOG_W("Do not invoke standard output before initializing Compiler");
@@ -161,9 +161,9 @@ int _sys_read(FILEHANDLE fh, unsigned char *buf, unsigned len, int mode)
size = read(STDIN_FILENO, buf, len);
return len - size; /* success */
#else
LOG_W("%s: %s", __func__, _WARNING_WITHOUT_DEVIO);
LOG_W("%s: %s", __func__, _WARNING_WITHOUT_STDIO);
return 0; /* error */
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
}
else if (fh == STDOUT || fh == STDERR)
{
@@ -349,7 +349,7 @@ int fputc(int c, FILE *f)
int fgetc(FILE *f)
{
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
char ch;
if (libc_stdio_get_console() < 0)
@@ -360,8 +360,8 @@ int fgetc(FILE *f)
if(read(STDIN_FILENO, &ch, 1) == 1)
return ch;
#endif /* RT_USING_POSIX_DEVIO */
LOG_W("%s: %s", __func__, _WARNING_WITHOUT_DEVIO);
#endif /* RT_USING_POSIX_STDIO */
LOG_W("%s: %s", __func__, _WARNING_WITHOUT_STDIO);
return 0; /* error */
}

2
components/libc/compilers/common/compiler_private.h
View File

@@ -13,6 +13,6 @@
#include <rtconfig.h>
#define _WARNING_WITHOUT_FS "Please enable RT_USING_POSIX_FS"
#define _WARNING_WITHOUT_DEVIO "Please enable RT_USING_POSIX_FS and RT_USING_POSIX_DEVIO"
#define _WARNING_WITHOUT_STDIO "Please enable RT_USING_POSIX_FS and RT_USING_POSIX_STDIO"
#endif /* __COMPILER_PRIVATE_H__ */

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

@@ -11,9 +11,9 @@
#include <rtthread.h>
#include <LowLevelIOInterface.h>
#include <unistd.h>
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#include "libc.h"
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
#include <compiler_private.h>
#define DBG_TAG "dlib.syscall.read"
#define DBG_LVL DBG_INFO
@@ -39,7 +39,7 @@ size_t __read(int handle, unsigned char *buf, size_t len)
if (handle == _LLIO_STDIN)
{
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
if (libc_stdio_get_console() < 0)
{
LOG_W("Do not invoke standard input before initializing Compiler");
@@ -47,9 +47,9 @@ size_t __read(int handle, unsigned char *buf, size_t len)
}
return read(STDIN_FILENO, buf, len); /* return the length of the data read */
#else
LOG_W(_WARNING_WITHOUT_DEVIO);
LOG_W(_WARNING_WITHOUT_STDIO);
return _LLIO_ERROR;
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
}
else if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR))
{

10
components/libc/compilers/gcc/newlib/syscalls.c
View File

@@ -20,9 +20,9 @@
#include <unistd.h>
#include <sys/errno.h>
#include <sys/stat.h>
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#include "libc.h"
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
#ifdef RT_USING_MODULE
#include <dlmodule.h>
#endif /* RT_USING_MODULE */
@@ -225,17 +225,17 @@ _ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
_ssize_t rc;
if (fd == STDIN_FILENO)
{
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
if (libc_stdio_get_console() < 0)
{
LOG_W("Do not invoke standard input before initializing Compiler");
return 0;
}
#else
LOG_W("%s: %s", __func__, _WARNING_WITHOUT_DEVIO);
LOG_W("%s: %s", __func__, _WARNING_WITHOUT_STDIO);
ptr->_errno = ENOTSUP;
return -1;
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
}
else if (fd == STDOUT_FILENO || fd == STDERR_FILENO)
{

7
components/libc/posix/Kconfig
View File

@@ -12,6 +12,11 @@ if RT_USING_POSIX_FS
select RT_USING_DFS_DEVFS
default n
config RT_USING_POSIX_STDIO
bool "Enable standard I/O devices, e.g. STDOUT_FILENO"
select RT_USING_POSIX_DEVIO
default n
config RT_USING_POSIX_POLL
bool "Enable I/O Multiplexing poll() <poll.h>"
default n
@@ -23,7 +28,7 @@ if RT_USING_POSIX_FS
config RT_USING_POSIX_TERMIOS
bool "Enable Terminal I/O <termios.h>"
select RT_USING_POSIX_DEVIO
select RT_USING_POSIX_STDIO
default n
config RT_USING_POSIX_AIO

2
components/libc/posix/io/SConscript
View File

@@ -10,7 +10,7 @@ group = []
flag = False
if GetDepend('RT_USING_POSIX_DEVIO'):
if GetDepend('RT_USING_POSIX_STDIO'):
src += ['libc.c']
flag = True

8
components/libc/posix/io/libc.c
View File

@@ -20,7 +20,7 @@
int libc_system_init(void)
{
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
rt_device_t dev_console;
dev_console = rt_console_get_device();
@@ -28,12 +28,12 @@ int libc_system_init(void)
{
libc_stdio_set_console(dev_console->parent.name, O_RDWR);
}
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
return 0;
}
INIT_COMPONENT_EXPORT(libc_system_init);
#if defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_NEWLIB)
#if defined(RT_USING_POSIX_STDIO) && defined(RT_USING_NEWLIB)
#define STDIO_DEVICE_NAME_MAX 32
static FILE* std_console = NULL;
int libc_stdio_set_console(const char* device_name, int mode)
@@ -134,4 +134,4 @@ int libc_stdio_set_console(const char* device_name, int mode)
int libc_stdio_get_console(void) {
return std_fd;
}
#endif /* defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_NEWLIB) */
#endif /* defined(RT_USING_POSIX_STDIO) && defined(RT_USING_NEWLIB) */

4
components/libc/posix/io/libc.h
View File

@@ -17,10 +17,10 @@ extern "C" {
#endif
int libc_system_init(void);
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
int libc_stdio_get_console(void);
int libc_stdio_set_console(const char* device_name, int mode);
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
#ifdef __cplusplus
}