giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1488 from simonduq/pr/jn516x-uart 

jn516x: flush only uart Tx FIFO in main loop, leaving Rx FIFO intact
This commit is contained in:
Simon Duquennoy 2016-02-01 14:19:44 +01:00
parent 447286197f 7c3108bf3b
commit badc4b77f1
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/jn516x/contiki-jn516x-main.c
View File

@ -463,7 +463,7 @@ main_loop(void)
#endif /* DCOSYNCH_CONF_ENABLED */ #endif /* DCOSYNCH_CONF_ENABLED */
/* flush standard output before sleeping */ /* flush standard output before sleeping */
uart_driver_flush(E_AHI_UART_0); uart_driver_flush(E_AHI_UART_0, TRUE, FALSE);
/* calculate the time to the next etimer and rtimer */ /* calculate the time to the next etimer and rtimer */
time_to_etimer = clock_arch_time_to_etimer(); time_to_etimer = clock_arch_time_to_etimer();

6
platform/jn516x/dev/uart-driver.c
View File

@ -589,19 +589,21 @@ uart_driver_tx_in_progress(uint8_t uart_dev)
* *
* PARAMETERS: Name RW Usage * PARAMETERS: Name RW Usage
* uart_dev R UART to disable, eg, E_AHI_UART_0 * uart_dev R UART to disable, eg, E_AHI_UART_0
* reset_tx R to reset the transmit FIFO
* reset_rx R to reset the receive FIFO
* *
* RETURNS: * RETURNS:
* void * void
* *
****************************************************************************/ ****************************************************************************/
void void
uart_driver_flush(uint8_t uart_dev) uart_driver_flush(uint8_t uart_dev, bool_t reset_tx, bool_t reset_rx)
{ {
/* Disable TX Fifo empty and Rx data interrupts */ /* Disable TX Fifo empty and Rx data interrupts */
uart_driver_disable_interrupts(uart_dev); uart_driver_disable_interrupts(uart_dev);
/* flush hardware buffer */ /* flush hardware buffer */
vAHI_UartReset(uart_dev, TRUE, TRUE); vAHI_UartReset(uart_dev, reset_tx, reset_rx);
vAHI_UartReset(uart_dev, FALSE, FALSE); vAHI_UartReset(uart_dev, FALSE, FALSE);
/* Re-enable TX Fifo empty and Rx data interrupts */ /* Re-enable TX Fifo empty and Rx data interrupts */

2
platform/jn516x/dev/uart-driver.h
View File

@ -58,7 +58,7 @@ void uart_driver_restore_interrupts(uint8_t uart_dev);
uint8_t uart_driver_tx_in_progress(uint8_t uart_dev); uint8_t uart_driver_tx_in_progress(uint8_t uart_dev);
#ifdef UART_EXTRAS #ifdef UART_EXTRAS
void uart_driver_flush(uint8_t uart_dev); void uart_driver_flush(uint8_t uart_dev, bool_t reset_tx, bool_t reset_rx);
#endif #endif
#endif /* UARTDRIVER_H */ #endif /* UARTDRIVER_H */