Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
44f1c0bd
Commit
44f1c0bd
authored
8 years ago
by
davidcunado-arm
Committed by
GitHub
8 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #807 from nmenon/upstream/fix-16650-rx
uart: 16550: Fix getc
parents
fc7c870b
861ac52a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/ti/uart/aarch64/16550_console.S
+1
-1
drivers/ti/uart/aarch64/16550_console.S
include/drivers/ti/uart/uart_16550.h
+2
-1
include/drivers/ti/uart/uart_16550.h
with
3 additions
and
2 deletions
+3
-2
drivers/ti/uart/aarch64/16550_console.S
View file @
44f1c0bd
...
...
@@ -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
,
1
b
tbz
w1
,
#
UARTLSR_RDR
_BIT
,
1
b
ldr
w0
,
[
x0
,
#
UARTRX
]
ret
getc_error
:
...
...
This diff is collapsed.
Click to expand it.
include/drivers/ti/uart/uart_16550.h
View file @
44f1c0bd
...
...
@@ -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__ */
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment