pl011 uart: Complete function to get a character

2012-05-16 06:01:51 -05:00 · 2012-05-16 06:01:51 -05:00 · 4747ee6ea8
commit 4747ee6ea8
parent ce077d96cb
1 changed files with 9 additions and 1 deletions
--- a/src/system/kernel/arch/arm/uart_pl011.cpp
+++ b/src/system/kernel/arch/arm/uart_pl011.cpp
@ -152,7 +152,15 @@ UartPL011::PutChar(char c)
 int
 UartPL011::GetChar(bool wait)
 {
-	#warning ARM Amba PL011 UART incomplete
+	if (fUARTEnabled == true) {
+		// Wait until a character is received?
+		if (wait) {
+			while ((ReadUart(PL01x_FR) & PL01x_FR_RXFE) != 0)
+				barrier();
+		}
+		return ReadUart(PL01x_DR);
+	}
+
 	return -1;
 }