andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #807 from nmenon/upstream/fix-16650-rx 

uart: 16550: Fix getc
This commit is contained in:
davidcunado-arm 2017-01-13 17:18:59 +00:00 committed by GitHub
parent fc7c870bbf 861ac52a7e
commit 44f1c0bded
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ti/uart/aarch64/16550_console.S
View File

@ -146,7 +146,7 @@ endfunc console_core_putc
func console_core_getc
/* Check if the receive FIFO is empty */
1: ldr w1, [x0, #UARTLSR]
tbz w1, #UARTLSR_RDR, 1b
tbz w1, #UARTLSR_RDR_BIT, 1b
ldr w0, [x0, #UARTRX]
ret
getc_error:

3
include/drivers/ti/uart/uart_16550.h
View File

@ -88,6 +88,7 @@
#define UARTLSR_FERR (1 << 3) /* Framing Error */
#define UARTLSR_PERR (1 << 3) /* Parity Error */
#define UARTLSR_OVRF (1 << 2) /* Rx Overrun Error */
#define UARTLSR_RDR (1 << 2) /* Rx Data Ready */
#define UARTLSR_RDR_BIT (0) /* Rx Data Ready Bit */
#define UARTLSR_RDR (1 << UARTLSR_RDR_BIT) /* Rx Data Ready */
#endif /* __UART_16550_H__ */