Move console functions out of pl011.c
This commit isolates the accessor functions in pl011.c and builds
a wrapper layer for console functions.
This also modifies the console driver to use the pl011 FIFO.
Fixes ARM-software/tf-issues#63
Change-Id: I3b402171cd14a927831bf5e5d4bb310b6da0e9a8
diff --git a/drivers/arm/peripherals/pl011/pl011.c b/drivers/arm/peripherals/pl011/pl011.c
index a6a06e6..8288cd8 100644
--- a/drivers/arm/peripherals/pl011/pl011.c
+++ b/drivers/arm/peripherals/pl011/pl011.c
@@ -28,62 +28,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdio.h>
-#include <console.h>
#include <platform.h>
#include <pl011.h>
+#include <assert.h>
-static unsigned long uart_base = PL011_BASE;
-
-/*
- * TODO: Console init functions shoule be in a console.c. This file should
- * only contain the pl011 accessors.
- */
-void console_init(unsigned long base_addr)
+void pl011_setbaudrate(unsigned long base_addr, unsigned int baudrate)
{
unsigned int divisor;
-
- /* Initialise internal base address variable */
- uart_base = base_addr;
-
- /* Baud Rate */
-
-#if defined(PL011_INTEGER) && defined(PL011_FRACTIONAL)
- mmio_write_32(uart_base + UARTIBRD, PL011_INTEGER);
- mmio_write_32(uart_base + UARTFBRD, PL011_FRACTIONAL);
-#else
- divisor = (PL011_CLK_IN_HZ * 4) / PL011_BAUDRATE;
- mmio_write_32(uart_base + UARTIBRD, divisor >> 6);
- mmio_write_32(uart_base + UARTFBRD, divisor & 0x3F);
-#endif
-
-
- mmio_write_32(uart_base + UARTLCR_H, PL011_LINE_CONTROL);
-
- /* Clear any pending errors */
- mmio_write_32(uart_base + UARTECR, 0);
-
- /* Enable tx, rx, and uart overall */
- mmio_write_32(uart_base + UARTCR,
- PL011_UARTCR_RXE | PL011_UARTCR_TXE |
- PL011_UARTCR_UARTEN);
-}
-
-int console_putc(int c)
-{
- if (c == '\n') {
- console_putc('\r');
- }
-
- while ((mmio_read_32(uart_base + UARTFR) & PL011_UARTFR_TXFE) == 0)
- ;
- mmio_write_32(uart_base + UARTDR, c);
- return c;
-}
-
-int console_getc(void)
-{
- while ((mmio_read_32(uart_base + UARTFR) & PL011_UARTFR_RXFE) != 0)
- ;
- return mmio_read_32(uart_base + UARTDR);
+ assert(baudrate);
+ divisor = (PL011_CLK_IN_HZ * 4) / baudrate;
+ pl011_write_ibrd(base_addr, divisor >> 6);
+ pl011_write_fbrd(base_addr, divisor & 0x3F);
}