mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2025-12-27 17:40:22 +00:00
[libc] Update libc.
1. Add POSIX termios implementation; 2. Add POSIX signals implementation; 3. Add stdio for each libc.
This commit is contained in:
@@ -1,52 +1,60 @@
|
||||
/*
|
||||
* File : libc.c
|
||||
* Brief : gcc libc header file
|
||||
*
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2017/10/15 bernard the first version
|
||||
*/
|
||||
#include <rtthread.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "libc.h"
|
||||
|
||||
#ifdef RT_USING_PTHREADS
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#ifdef RT_USING_DFS
|
||||
#include <dfs_posix.h>
|
||||
|
||||
#ifdef RT_USING_DFS_DEVFS
|
||||
#include <devfs.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
int libc_system_init(void)
|
||||
{
|
||||
#ifdef RT_USING_DFS
|
||||
int fd;
|
||||
struct rt_device *console_dev;
|
||||
rt_device_t dev_console;
|
||||
|
||||
#ifndef RT_USING_DFS_DEVFS
|
||||
#error Please enable devfs by defining RT_USING_DFS_DEVFS in rtconfig.h
|
||||
#endif
|
||||
|
||||
console_dev = rt_console_get_device();
|
||||
if (console_dev)
|
||||
dev_console = rt_console_get_device();
|
||||
if (dev_console)
|
||||
{
|
||||
/* initialize console device */
|
||||
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;
|
||||
#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_POSIX_STDIN)
|
||||
libc_stdio_set_console(dev_console->parent.name, O_RDWR);
|
||||
#else
|
||||
libc_stdio_set_console(dev_console->parent.name, O_WRONLY);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/* set PATH and HOME */
|
||||
putenv("PATH=/bin");
|
||||
putenv("HOME=/home");
|
||||
|
||||
#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT
|
||||
pthread_system_init();
|
||||
#endif
|
||||
|
||||
@@ -1,3 +1,28 @@
|
||||
/*
|
||||
* File : libc.h
|
||||
* Brief : gcc libc header file
|
||||
*
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2017/10/15 bernard the first version
|
||||
*/
|
||||
#ifndef __RTT_LIBC_H__
|
||||
#define __RTT_LIBC_H__
|
||||
|
||||
@@ -12,6 +37,7 @@
|
||||
#define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND)
|
||||
|
||||
int libc_system_init(void);
|
||||
int libc_stdio_set_console(const char* device_name, int mode);
|
||||
|
||||
/* some time related function */
|
||||
int libc_set_time(const struct timespec *time);
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
#include <rtthread.h>
|
||||
#include <rtm.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
RTM_EXPORT(strcpy);
|
||||
RTM_EXPORT(strncpy);
|
||||
RTM_EXPORT(strlen);
|
||||
RTM_EXPORT(strcat);
|
||||
RTM_EXPORT(strstr);
|
||||
RTM_EXPORT(strchr);
|
||||
RTM_EXPORT(strcmp);
|
||||
RTM_EXPORT(strtol);
|
||||
RTM_EXPORT(strtoul);
|
||||
RTM_EXPORT(strncmp);
|
||||
|
||||
RTM_EXPORT(memcpy);
|
||||
RTM_EXPORT(memcmp);
|
||||
RTM_EXPORT(memmove);
|
||||
RTM_EXPORT(memset);
|
||||
RTM_EXPORT(memchr);
|
||||
|
||||
RTM_EXPORT(putchar);
|
||||
RTM_EXPORT(puts);
|
||||
RTM_EXPORT(printf);
|
||||
RTM_EXPORT(sprintf);
|
||||
RTM_EXPORT(snprintf);
|
||||
|
||||
RTM_EXPORT(fwrite);
|
||||
|
||||
#include <time.h>
|
||||
RTM_EXPORT(localtime);
|
||||
RTM_EXPORT(time);
|
||||
|
||||
#include <setjmp.h>
|
||||
RTM_EXPORT(longjmp);
|
||||
RTM_EXPORT(setjmp);
|
||||
|
||||
RTM_EXPORT(exit);
|
||||
RTM_EXPORT(abort);
|
||||
|
||||
RTM_EXPORT(rand);
|
||||
|
||||
#include <assert.h>
|
||||
RTM_EXPORT(__assert_func);
|
||||
72
components/libc/compilers/newlib/libc_syms.c
Normal file
72
components/libc/compilers/newlib/libc_syms.c
Normal file
@@ -0,0 +1,72 @@
|
||||
/*
|
||||
* File : libc_syms.c
|
||||
* Brief : exported symbols for libc.
|
||||
*
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2017/10/15 bernard the first version
|
||||
*/
|
||||
#include <rtthread.h>
|
||||
#include <rtm.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
RTM_EXPORT(strcpy);
|
||||
RTM_EXPORT(strncpy);
|
||||
RTM_EXPORT(strlen);
|
||||
RTM_EXPORT(strcat);
|
||||
RTM_EXPORT(strstr);
|
||||
RTM_EXPORT(strchr);
|
||||
RTM_EXPORT(strcmp);
|
||||
RTM_EXPORT(strtol);
|
||||
RTM_EXPORT(strtoul);
|
||||
RTM_EXPORT(strncmp);
|
||||
|
||||
RTM_EXPORT(memcpy);
|
||||
RTM_EXPORT(memcmp);
|
||||
RTM_EXPORT(memmove);
|
||||
RTM_EXPORT(memset);
|
||||
RTM_EXPORT(memchr);
|
||||
|
||||
RTM_EXPORT(putchar);
|
||||
RTM_EXPORT(puts);
|
||||
RTM_EXPORT(printf);
|
||||
RTM_EXPORT(sprintf);
|
||||
RTM_EXPORT(snprintf);
|
||||
|
||||
RTM_EXPORT(fwrite);
|
||||
|
||||
#include <time.h>
|
||||
RTM_EXPORT(localtime);
|
||||
RTM_EXPORT(time);
|
||||
|
||||
#include <setjmp.h>
|
||||
RTM_EXPORT(longjmp);
|
||||
RTM_EXPORT(setjmp);
|
||||
|
||||
RTM_EXPORT(exit);
|
||||
RTM_EXPORT(abort);
|
||||
|
||||
RTM_EXPORT(rand);
|
||||
|
||||
#include <assert.h>
|
||||
RTM_EXPORT(__assert_func);
|
||||
85
components/libc/compilers/newlib/stdio.c
Normal file
85
components/libc/compilers/newlib/stdio.c
Normal file
@@ -0,0 +1,85 @@
|
||||
/*
|
||||
* File : stdio.c
|
||||
* Brief : stdio for newlib
|
||||
*
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2017/10/15 bernard the first version
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <rtthread.h>
|
||||
#include "libc.h"
|
||||
|
||||
#define STDIO_DEVICE_NAME_MAX 32
|
||||
|
||||
static FILE* std_console = NULL;
|
||||
|
||||
int libc_stdio_set_console(const char* device_name, int mode)
|
||||
{
|
||||
FILE *fp;
|
||||
char name[STDIO_DEVICE_NAME_MAX];
|
||||
char *file_mode;
|
||||
|
||||
snprintf(name, sizeof(name) - 1, "/dev/%s", device_name);
|
||||
name[STDIO_DEVICE_NAME_MAX - 1] = '\0';
|
||||
|
||||
if (mode == O_RDWR) file_mode = "r+";
|
||||
else if (mode == O_WRONLY) file_mode = "wb";
|
||||
else if (mode == O_RDONLY) file_mode = "rb";
|
||||
|
||||
fp = fopen(name, file_mode);
|
||||
if (fp)
|
||||
{
|
||||
setvbuf(fp, NULL, _IONBF, 0);
|
||||
|
||||
if (std_console)
|
||||
{
|
||||
fclose(std_console);
|
||||
std_console = NULL;
|
||||
}
|
||||
std_console = fp;
|
||||
|
||||
if (mode == O_RDWR)
|
||||
{
|
||||
_GLOBAL_REENT->_stdin = std_console;
|
||||
}
|
||||
else
|
||||
{
|
||||
_GLOBAL_REENT->_stdin = NULL;
|
||||
}
|
||||
|
||||
if (mode == O_RDONLY)
|
||||
{
|
||||
_GLOBAL_REENT->_stdout = NULL;
|
||||
_GLOBAL_REENT->_stderr = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
_GLOBAL_REENT->_stdout = std_console;
|
||||
_GLOBAL_REENT->_stderr = std_console;
|
||||
}
|
||||
|
||||
_GLOBAL_REENT->__sdidinit = 1;
|
||||
}
|
||||
|
||||
return fileno(std_console);
|
||||
}
|
||||
@@ -13,6 +13,4 @@
|
||||
#define O_DIRECTORY 0x0200000
|
||||
#define O_BINARY 0x0008000
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#endif
|
||||
|
||||
0
components/libc/compilers/newlib/sys/termios.h
Normal file
0
components/libc/compilers/newlib/sys/termios.h
Normal file
@@ -205,30 +205,23 @@ _wait_r(struct _reent *ptr, int *status)
|
||||
_ssize_t
|
||||
_write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
|
||||
{
|
||||
if (fd < 3)
|
||||
#ifndef RT_USING_DFS
|
||||
if (fd == 0)
|
||||
{
|
||||
#ifdef RT_USING_CONSOLE
|
||||
rt_device_t console_device;
|
||||
extern rt_device_t rt_console_get_device(void);
|
||||
rt_device_t console;
|
||||
|
||||
console_device = rt_console_get_device();
|
||||
if (console_device != 0) rt_device_write(console_device, 0, buf, nbytes);
|
||||
return nbytes;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
console = rt_console_get_device();
|
||||
if (console) return rt_device_write(console, -1, buf, nbytes);
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef RT_USING_DFS
|
||||
_ssize_t rc;
|
||||
|
||||
rc = write(fd, buf, nbytes);
|
||||
return rc;
|
||||
return 0;
|
||||
|
||||
#else
|
||||
return 0;
|
||||
_ssize_t rc;
|
||||
|
||||
rc = write(fd, buf, nbytes);
|
||||
return rc;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user