j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow changing write function of stdout.

Browse source 
Required for stdout redirection.
Works on blocks, not chars - does _not_ use sdk_os_putc !
Should work even when linking with SPIFFS.
This commit is contained in:
Oto Petřík 2016-12-05 18:40:40 +01:00
parent 53f85d0a2c
commit 194b8e420a
3 changed files with 69 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/include/stdout_redirect.h Normal file
View file

@ -0,0 +1,24 @@
/*
* Part of esp-open-rtos
* Copyright (C) 2016 Oto Petrik <oto.petrik@gmail.com>
* BSD Licensed as described in the file LICENSE
*/
#ifndef _STDOUT_REDIRECT_H_
#define _STDOUT_REDIRECT_H_
#ifdef __cplusplus
extern "C"
{
#endif
typedef long _WriteFunction(struct _reent *r, int fd, const char *ptr, int len );
void set_write_stdout(_WriteFunction *f);
_WriteFunction *get_write_stdout();
#ifdef __cplusplus
}
#endif
#endif /* _STDOUT_REDIRECT_H_ */

48
core/newlib_syscalls.c
View file

@ -12,6 +12,7 @@
#include <xtensa_ops.h>
#include <esp/uart.h>
#include <stdlib.h>
#include <stdout_redirect.h>
extern void *xPortSupervisorStackPointer;
@ -41,12 +42,8 @@ IRAM caddr_t _sbrk_r (struct _reent *r, int incr)
}
/* syscall implementation for stdio write to UART */
__attribute__((weak)) long _write_r(struct _reent *r, int fd, const char *ptr, int len )
__attribute__((weak)) long _write_stdout_r(struct _reent *r, int fd, const char *ptr, int len )
{
if(fd != r->_stdout->_file) {
r->_errno = EBADF;
return -1;
}
for(int i = 0; i < len; i++) {
/* Auto convert CR to CRLF, ignore other LFs (compatible with Espressif SDK behaviour) */
if(ptr[i] == '\r')
@ -58,6 +55,37 @@ __attribute__((weak)) long _write_r(struct _reent *r, int fd, const char *ptr, i
return len;
}
_WriteFunction *_current_stdout_write_r = &_write_stdout_r;
void set_write_stdout(_WriteFunction *f)
{
if (f != NULL) {
_current_stdout_write_r = f;
} else {
_current_stdout_write_r = &_write_stdout_r;
}
}
_WriteFunction *get_write_stdout()
{
return _current_stdout_write_r;
}
/* default implementation, replace in a filesystem */
__attribute__((weak)) long _write_filesystem_r(struct _reent *r, int fd, const char *ptr, int len )
{
r->_errno = EBADF;
return -1;
}
__attribute__((weak)) long _write_r(struct _reent *r, int fd, const char *ptr, int len )
{
if(fd != r->_stdout->_file) {
return _write_filesystem_r(r, fd, ptr, len);
}
return _current_stdout_write_r(r, fd, ptr, len);
}
/* syscall implementation for stdio read from UART */
__attribute__((weak)) long _read_stdin_r(struct _reent *r, int fd, char *ptr, int len)
{
@ -71,11 +99,17 @@ __attribute__((weak)) long _read_stdin_r(struct _reent *r, int fd, char *ptr, in
return i;
}
/* default implementation, replace in a filesystem */
__attribute__((weak)) long _read_filesystem_r( struct _reent *r, int fd, char *ptr, int len )
{
r->_errno = EBADF;
return -1;
}
__attribute__((weak)) long _read_r( struct _reent *r, int fd, char *ptr, int len )
{
if(fd != r->_stdin->_file) {
r->_errno = EBADF;
return -1;
return _read_filesystem_r(r, fd, ptr, len);
}
return _read_stdin_r(r, fd, ptr, len);
}

25
extras/spiffs/esp_spiffs.c
View file

@ -125,32 +125,15 @@ int32_t esp_spiffs_mount()
}
// This implementation replaces implementation in core/newlib_syscals.c
long _write_r(struct _reent *r, int fd, const char *ptr, int len )
long _write_filesystem_r(struct _reent *r, int fd, const char *ptr, int len )
{
if(fd != r->_stdout->_file) {
return SPIFFS_write(&fs, (spiffs_file)fd, (char*)ptr, len);
}
for(int i = 0; i < len; i++) {
/* Auto convert CR to CRLF, ignore other LFs (compatible with Espressif SDK behaviour) */
if(ptr[i] == '\r')
continue;
if(ptr[i] == '\n')
uart_putc(0, '\r');
uart_putc(0, ptr[i]);
}
return len;
return SPIFFS_write(&fs, (spiffs_file)fd, (char*)ptr, len);
}
// This function is weakly defined in core/newlib_syscalls.c
long _read_stdin_r(struct _reent *r, int fd, char *ptr, int len);
// This implementation replaces implementation in core/newlib_syscals.c
long _read_r( struct _reent *r, int fd, char *ptr, int len )
long _read_filesystem_r( struct _reent *r, int fd, char *ptr, int len )
{
if(fd != r->_stdin->_file) {
return SPIFFS_read(&fs, (spiffs_file)fd, ptr, len);
}
return _read_stdin_r(r, fd, ptr, len);
return SPIFFS_read(&fs, (spiffs_file)fd, ptr, len);
}
int _open_r(struct _reent *r, const char *pathname, int flags, int mode)