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

13
extras/spiffs/esp_spiffs.c
View file

@ -141,21 +141,16 @@ long _write_r(struct _reent *r, int fd, const char *ptr, int len )
return 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 )
{
int ch, i;
if(fd != r->_stdin->_file) {
return SPIFFS_read(&fs, (spiffs_file)fd, ptr, len);
}
uart_rxfifo_wait(0, 1);
for(i = 0; i < len; i++) {
ch = uart_getc_nowait(0);
if (ch < 0) break;
ptr[i] = ch;
}
return i;
return _read_stdin_r(r, fd, ptr, len);
}
int _open_r(struct _reent *r, const char *pathname, int flags, int mode)

10
extras/stdin_uart_interrupt/component.mk
View file

@ -4,10 +4,12 @@
# for 'usage' as this module is a drop-in replacement for the original polled
# version of reading from the UART.
INC_DIRS += $(ROOT)extras/stdin_uart_interrupt
INC_DIRS += $(stdin_uart_interrupt_ROOT)
# args for passing into compile rule generation
extras/stdin_uart_interrupt_INC_DIR = $(ROOT)extras/stdin_uart_interrupt
extras/stdin_uart_interrupt_SRC_DIR = $(ROOT)extras/stdin_uart_interrupt
stdin_uart_interrupt_SRC_DIR = $(stdin_uart_interrupt_ROOT)
$(eval $(call component_compile_rules,extras/stdin_uart_interrupt))
INCLUDE_SRC_IN_AR = 0
EXTRA_LDFLAGS = -Wl,--whole-archive $(stdin_uart_interrupt_AR) -Wl,--no-whole-archive
$(eval $(call component_compile_rules,stdin_uart_interrupt))

4
extras/stdin_uart_interrupt/stdin_uart_interrupt.c
View file

@ -75,9 +75,9 @@ uint32_t uart0_num_char(void)
return count;
}
// _read_r in core/newlib_syscalls.c will be skipped by the linker in favour
// _read_stdin_r in core/newlib_syscalls.c will be skipped by the linker in favour
// of this function
long _read_r(struct _reent *r, int fd, char *ptr, int len)
long _read_stdin_r(struct _reent *r, int fd, char *ptr, int len)
{
if (!inited) uart0_rx_init();
for(int i = 0; i < len; i++) {