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

Fix spiff and stdin_uart_interrupt overiding the same read function (#249)

Browse source 
* Fix spiff and stdin_uart_interrupt overiding the same read function

* Make strong function defninition replace a weak one
This commit is contained in:
sheinz 2016-11-01 17:14:34 +02:00 • committed by GitHub
parent 98de5e573a
commit e2e6f35288
6 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/newlib_syscalls.c
View file

@ -59,14 +59,9 @@ __attribute__((weak)) long _write_r(struct _reent *r, int fd, const char *ptr, i
}
/* syscall implementation for stdio read from UART */
__attribute__((weak)) long _read_r( struct _reent *r, int fd, char *ptr, int len )
__attribute__((weak)) long _read_stdin_r(struct _reent *r, int fd, char *ptr, int len)
{
int ch, i;
if(fd != r->_stdin->_file) {
r->_errno = EBADF;
return -1;
}
uart_rxfifo_wait(0, 1);
for(i = 0; i < len; i++) {
ch = uart_getc_nowait(0);
@ -76,6 +71,15 @@ __attribute__((weak)) long _read_r( struct _reent *r, int fd, char *ptr, int len
return i;
}
__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_stdin_r(r, fd, ptr, len);
}
/* Stub syscall implementations follow, to allow compiling newlib functions that
pull these in via various codepaths
*/