Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-10-02 14:23:19 +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-05 23:11:58 +08: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
bsp/avr32uc3b0/startup.c
+1 -1
View File
@@ -38,7 +38,7 @@ int main(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(FINSH_DEVICE_NAME);
#endif
#endif
bsp/bf533/startup.c
+1 -1
View File
@@ -62,7 +62,7 @@ void rtthread_startup(void)
/* init finsh */
extern int finsh_system_init(void);
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart0");
#endif
#endif
bsp/efm32/startup.c
+1 -1
View File
@@ -111,7 +111,7 @@ void rtthread_startup(void)
/* init finsh */
#ifdef RT_USING_FINSH
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(CONSOLE_DEVICE);
#endif
#endif
bsp/frdm-k64f/applications/startup.c
+2 -2
View File
@@ -79,8 +79,8 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
finsh_set_device( FINSH_DEVICE_NAME );
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(FINSH_DEVICE_NAME);
#endif
#endif
bsp/lm3s8962/applications/startup.c
+1 -1
View File
@@ -119,7 +119,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/lm3s9b9x/applications/startup.c
+1 -1
View File
@@ -119,7 +119,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/lm4f232/applications/startup.c
+1 -1
View File
@@ -119,7 +119,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/lpc43xx/M0/applications/application.c
+1 -1
View File
@@ -28,7 +28,7 @@ void rt_init_thread_entry(void *parameter)
#ifdef RT_USING_FINSH
/* initialize finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
#endif
bsp/lpc43xx/M4/applications/application.c
+1 -1
View File
@@ -59,7 +59,7 @@ void rt_init_thread_entry(void *parameter)
#ifdef RT_USING_FINSH
/* initialize finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
#endif
bsp/m16c62p/applications/startup.c
+1 -1
View File
@@ -65,7 +65,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart0");
#endif
#endif
bsp/mb9bf568r/applications/application.c
+1 -1
View File
@@ -25,7 +25,7 @@ void rt_init_thread_entry(void *parameter)
//finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
bsp/microblaze/startup.c
+1 -1
View File
@@ -84,7 +84,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/mini4020/applications/startup.c
+1 -1
View File
@@ -77,7 +77,7 @@ void rtthread_startup()
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart0");
#endif
#endif
bsp/nios_ii/startup.c
+1 -1
View File
@@ -60,7 +60,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart");
#endif
#endif
bsp/nv32f100x/app/src/main.c
+1 -1
View File
@@ -18,7 +18,7 @@ int main(void)
rt_thread_t thread;
#ifdef RT_USING_FINSH
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
#endif
bsp/pic32ethernet/startup.c
+1 -1
View File
@@ -48,7 +48,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/qemu-vexpress-a9/.config
+25 -74
View File
File diff suppressed because it is too large Load Diff
bsp/qemu-vexpress-a9/rtconfig.h
+6 -56
View File
File diff suppressed because it is too large Load Diff
bsp/rm48x50/application/startup.c
+1 -1
View File
@@ -104,7 +104,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("sci2");
#endif
#endif
bsp/rx/applications/application.c
+2 -2
View File
@@ -60,7 +60,7 @@ void rt_init_thread_entry(void* parameter)
#ifdef RT_USING_FINSH
/* initialize finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
#endif
@@ -123,7 +123,7 @@ void rt_init_thread_entry(void* parameter)
#endif
#ifdef RT_USING_FINSH
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
#endif /* RT_USING_FINSH */
bsp/sam7x/applications/startup.c
+1 -1
View File
@@ -114,7 +114,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/samd21/applications/application.c
+1 -1
View File
@@ -87,7 +87,7 @@ void rt_init_thread_entry(void* parameter)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/sep6200/application/startup.c
+1 -1
View File
@@ -64,7 +64,7 @@ void rtthread_startup()
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart0");
#endif
#endif
bsp/taihu/applications/startup.c
+1 -1
View File
@@ -53,7 +53,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart1");
#endif
#endif
bsp/upd70f3454/applications/startup.c
+1 -1
View File
@@ -64,7 +64,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device("uart0");
#endif
#endif
bsp/xplorer4330/applications/application.c
+1 -1
View File
@@ -23,7 +23,7 @@ void rt_init_thread_entry(void *parameter)
#ifdef RT_USING_FINSH
/* initialize finsh */
finsh_system_init();
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
#endif
#endif
components/cplusplus/Kconfig
+1 -1
View File
@@ -10,7 +10,7 @@ if RT_USING_CPLUSPLUS
bool "Enable c++11 threading feature support"
default n
select RT_USING_POSIX_FS
select RT_USING_POSIX_DEVIO
select RT_USING_POSIX_STDIO
select RT_USING_PTHREADS
select RT_USING_RTC
components/dfs/src/dfs.c
+4 -4
View File
@@ -18,9 +18,9 @@
#include <lwp.h>
#endif
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#include <libc.h>
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
/* Global variables */
const struct dfs_filesystem_ops *filesystem_operation_table[DFS_FILESYSTEM_TYPES_MAX];
@@ -216,10 +216,10 @@ struct dfs_fd *fd_get(int fd)
struct dfs_fd *d;
struct dfs_fdtable *fdt;
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
if ((0 <= fd) && (fd <= 2))
fd = libc_stdio_get_console();
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
fdt = dfs_fdtable_get();
fd = fd - DFS_FD_OFFSET;
components/drivers/serial/serial.c
+7 -7
View File
@@ -36,7 +36,7 @@
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#include <dfs_posix.h>
#include <poll.h>
#include <sys/ioctl.h>
@@ -203,7 +203,7 @@ const static struct dfs_file_ops _serial_fops =
RT_NULL, /* getdents */
serial_fops_poll,
};
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
/*
* Serial poll routines
@@ -362,7 +362,7 @@ static void _serial_check_buffer_size(void)
}
}
#if defined(RT_USING_POSIX_DEVIO) || defined(RT_SERIAL_USING_DMA)
#if defined(RT_USING_POSIX_STDIO) || defined(RT_SERIAL_USING_DMA)
static rt_size_t _serial_fifo_calc_recved_len(struct rt_serial_device *serial)
{
struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *) serial->serial_rx;
@@ -385,7 +385,7 @@ static rt_size_t _serial_fifo_calc_recved_len(struct rt_serial_device *serial)
}
}
}
#endif /* RT_USING_POSIX_DEVIO || RT_SERIAL_USING_DMA */
#endif /* RT_USING_POSIX_STDIO || RT_SERIAL_USING_DMA */
#ifdef RT_SERIAL_USING_DMA
/**
@@ -1019,7 +1019,7 @@ static rt_err_t rt_serial_control(struct rt_device *dev,
}
break;
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#ifdef RT_USING_POSIX_TERMIOS
case TCGETA:
{
@@ -1215,7 +1215,7 @@ static rt_err_t rt_serial_control(struct rt_device *dev,
*(rt_size_t *)args = recved;
}
break;
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
default :
/* control device */
ret = serial->ops->control(serial, cmd, args);
@@ -1270,7 +1270,7 @@ rt_err_t rt_hw_serial_register(struct rt_serial_device *serial,
/* register a character device */
ret = rt_device_register(device, name, flag);
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
/* set fops */
device->fops = &_serial_fops;
#endif
components/drivers/serial/serial_v2.c
+3 -3
View File
@@ -16,7 +16,7 @@
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
#include <dfs_posix.h>
#include <poll.h>
#include <sys/ioctl.h>
@@ -179,7 +179,7 @@ const static struct dfs_file_ops _serial_fops =
RT_NULL, /* getdents */
serial_fops_poll,
};
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
static rt_size_t rt_serial_get_linear_buffer(struct rt_ringbuffer *rb,
rt_uint8_t **ptr)
@@ -1135,7 +1135,7 @@ rt_err_t rt_hw_serial_register(struct rt_serial_device *serial,
/* register a character device */
ret = rt_device_register(device, name, flag);
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
/* set fops */
device->fops = &_serial_fops;
#endif
components/finsh/finsh.h
+1 -1
View File
@@ -168,7 +168,7 @@ extern struct finsh_syscall *_syscall_table_begin, *_syscall_table_end;
/* find out system call, which should be implemented in user program */
struct finsh_syscall *finsh_syscall_lookup(const char *name);
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
void finsh_set_device(const char *device_name);
#endif
components/finsh/shell.c
+6 -6
View File
@@ -146,7 +146,7 @@ int finsh_getchar(void)
{
#ifdef RT_USING_DEVICE
char ch = 0;
#ifdef RT_USING_POSIX_DEVIO
#ifdef RT_USING_POSIX_STDIO
if(read(STDIN_FILENO, &ch, 1) > 0)
{
return ch;
@@ -170,14 +170,14 @@ int finsh_getchar(void)
rt_sem_take(&shell->rx_sem, RT_WAITING_FOREVER);
return ch;
#endif /* RT_USING_POSIX_DEVIO */
#endif /* RT_USING_POSIX_STDIO */
#else
extern char rt_hw_console_getchar(void);
return rt_hw_console_getchar();
#endif /* RT_USING_DEVICE */
}
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
static rt_err_t finsh_rx_ind(rt_device_t dev, rt_size_t size)
{
RT_ASSERT(shell != RT_NULL);
@@ -241,7 +241,7 @@ const char *finsh_get_device()
RT_ASSERT(shell != RT_NULL);
return shell->device->parent.name;
}
#endif /* !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE) */
#endif /* !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE) */
/**
* @ingroup finsh
@@ -443,7 +443,7 @@ void finsh_thread_entry(void *parameter)
shell->echo_mode = 0;
#endif
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
/* set console device as shell device */
if (shell->device == RT_NULL)
{
@@ -453,7 +453,7 @@ void finsh_thread_entry(void *parameter)
finsh_set_device(console->parent.name);
}
}
#endif /* !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE) */
#endif /* !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE) */
#ifdef FINSH_USING_AUTH
/* set the default password when the password isn't setting */
components/finsh/shell.h
+1 -1
View File
@@ -78,7 +78,7 @@ struct finsh_shell
rt_uint16_t line_position;
rt_uint16_t line_curpos;
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
#if !defined(RT_USING_POSIX_STDIO) && defined(RT_USING_DEVICE)
rt_device_t device;
#endif
components/libc/compilers/armlibc/syscalls.c
+8 -8
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 */
}
components/libc/compilers/common/compiler_private.h
+1 -1
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__ */
components/libc/compilers/dlib/syscall_read.c
+5 -5
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))
{
components/libc/compilers/gcc/newlib/syscalls.c
+5 -5
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)
{
components/libc/posix/Kconfig
+6 -1
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
components/libc/posix/io/SConscript
+1 -1
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
components/libc/posix/io/libc.c
+4 -4
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) */
components/libc/posix/io/libc.h
+2 -2
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
}