kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-28 07:51:19 +01:00
Code Releases Activity

cpu/esp8266: use always newlib stdio functions

Browse Source 
The modules `newlib, `newlib_syscalls_default` and `stdio_uart` are now used by default for output to the UART interface. This also reduces the dependency rules.
This commit is contained in:
Gunar Schorcht 2019-08-31 13:29:21 +02:00 committed by Schorcht
parent ae8afaf42e
commit 69a5cc753d
3 changed files with 3 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cpu/esp8266/Makefile.dep
View File

@ -25,38 +25,7 @@ ifneq (, $(filter esp_wifi, $(USEMODULE)))
USEMODULE += netdev_eth
endif
ifneq (, $(filter lua, $(USEPKG)))
USEMODULE += newlib_syscalls_default
USEMODULE += xtimer
endif
ifneq (, $(filter lwip%, $(USEMODULE)))
USEMODULE += newlib_syscalls_default
endif
ifneq (,$(filter ndn-riot,$(USEPKG)))
USEMODULE += crypto
USEMODULE += cipher_modes
endif
ifneq (, $(filter posix%, $(USEMODULE)))
USEMODULE += newlib_syscalls_default
endif
ifneq (, $(filter shell, $(USEMODULE)))
USEMODULE += newlib_syscalls_default
USEMODULE += xtimer
endif
ifneq (, $(filter xtimer, $(USEMODULE)))
USEMODULE += newlib_syscalls_default
endif
ifneq (, $(filter vfs, $(USEMODULE)))
USEMODULE += newlib_syscalls_default
USEMODULE += xtimer
endif
ifneq (, $(filter newlib_syscalls_default, $(USEMODULE)))
USEMODULE += stdio_uart
endif

3
cpu/esp8266/Makefile.include
View File

@ -61,10 +61,13 @@ PSEUDOMODULES += esp_spiffs
USEMODULE += esp
USEMODULE += mtd
USEMODULE += newlib
USEMODULE += newlib_syscalls_default
USEMODULE += periph
USEMODULE += ps
USEMODULE += random
USEMODULE += sdk
USEMODULE += stdio_uart
USEMODULE += xtensa
ifneq (, $(filter pthread, $(USEMODULE)))

106
cpu/esp8266/syscalls.c
View File

@ -339,54 +339,12 @@ void IRAM _lock_release_recursive(_lock_t *lock)
rmutex_unlock ((rmutex_t*)*lock);
}
#ifdef MODULE_NEWLIB_SYSCALLS_DEFAULT
#define _cheap heap_top
extern char *heap_top;
extern char _eheap; /* end of heap (defined in esp8266.riot-os.app.ld) */
extern char _sheap; /* start of heap (defined in esp8266.riot-os.app.ld) */
#else /* MODULE_NEWLIB_SYSCALLS_DEFAULT */
static uint8_t* _cheap = 0; /* last allocated chunk of heap */
extern uint8_t _eheap; /* end of heap (defined in esp8266.riot-os.app.ld) */
extern uint8_t _sheap; /* start of heap (defined in esp8266.riot-os.app.ld) */
void* IRAM _sbrk_r (struct _reent *r, ptrdiff_t incr)
{
uint8_t* _cheap_old;
/* initial _cheap */
if (_cheap == NULL) {
_cheap = &_sheap;
}
/* save old _cheap */
_cheap_old = _cheap;
/* check whether _cheap + incr overflows the heap */
if (_cheap + incr >= &_eheap) {
r->_errno = ENOMEM;
return (caddr_t)-1;
}
/* set new _cheap */
_cheap += incr;
#if ENABLE_DEBUG
uint32_t remaining = &_eheap - _cheap;
printf ("%s %lu byte allocated in %p .. %p, remaining %u\n",
__func__, incr, _cheap_old, _cheap, remaining);
#endif
/* return allocated memory */
return (void*) _cheap_old;
}
#endif /* MODULE_NEWLIB_SYSCALLS_DEFAULT */
unsigned int IRAM get_free_heap_size (void)
{
return (_cheap) ? &_eheap - _cheap : 0;
@ -402,70 +360,6 @@ void heap_stats(void)
#endif /* MODULE_ESP_SDK */
#if !defined(MODULE_NEWLIB_SYSCALLS_DEFAULT)
NORETURN void _exit(int status)
{
UNREACHABLE();
}
static int _no_sys_func (struct _reent *r, const char* f)
{
LOG_ERROR("system function %s does not exist\n", f);
r->_errno = ENOSYS;
return -1;
}
int _open_r(struct _reent *r, const char *path, int flag, int m)
{
return _no_sys_func (r, __func__);
}
int _close_r(struct _reent *r, int fd)
{
return _no_sys_func (r, __func__);
}
int _fstat_r(struct _reent *r, int fdes, struct stat *stat)
{
return _no_sys_func (r, __func__);
}
int _stat_r(struct _reent *r, const char *path, struct stat *buff)
{
return _no_sys_func (r, __func__);
}
int _lseek_r(struct _reent *r, int fdes, int off, int w)
{
return _no_sys_func (r, __func__);
}
int _write_r(struct _reent *r, int fd, const void *buff, size_t cnt)
{
return _no_sys_func (r, __func__);
}
int _read_r(struct _reent *r, int fd, void *buff, size_t cnt)
{
return _no_sys_func (r, __func__);
}
#include <sys/time.h>
int _gettimeofday_r(struct _reent *r, struct timeval *tv, void *tz)
{
(void) tz;
if (tv) {
uint32_t microseconds = system_get_time();
tv->tv_sec = microseconds / 1000000;
tv->tv_usec = microseconds % 1000000;
}
return 0;
}
#endif /* MODULE_NEWLIB_SYSCALLS_DEFAULT */
int _rename_r (struct _reent *r, const char* old, const char* new)
{
DEBUG("%s: system function does not exist\n", __func__);