From 4770749edca1e54c9a04b48ca6909d786139fa1b Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 15 Feb 2014 07:53:18 +0200 Subject: uart8250io: Unify calls with generic UART MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6d56648e56f2177e1d5332497321e718df18300c Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5234 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/include/console/uart.h | 5 +++-- src/include/uart8250.h | 10 ---------- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src/include') diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 9b52a78c69..8aa8ea24ce 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -37,10 +37,11 @@ unsigned int uart_baudrate_divisor(unsigned int baudrate, unsigned int refclk, unsigned int oversample); -unsigned char uart_rx_byte(void); +void uart_init(void); void uart_tx_byte(unsigned char data); void uart_tx_flush(void); -void uart_init(void); +unsigned char uart_rx_byte(void); +int uart_can_rx_byte(void); uint32_t uartmem_getbaseaddr(void); diff --git a/src/include/uart8250.h b/src/include/uart8250.h index af95796733..100a216257 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -105,16 +105,6 @@ #define UART_SCR 0x07 #define UART_SPR 0x07 -#if CONFIG_CONSOLE_SERIAL8250 -unsigned char uart8250_rx_byte(unsigned base_port); -int uart8250_can_rx_byte(unsigned base_port); -void uart8250_tx_byte(unsigned base_port, unsigned char data); -void uart8250_tx_flush(unsigned base_port); -/* Yes it is silly to have three different uart init functions. But we used to - * have three different sets of uart code, so it's an improvement. - */ -void uart8250_init(unsigned base_port, unsigned divisor); -#endif #if CONFIG_CONSOLE_SERIAL8250MEM void uartmem_init(void); -- cgit v1.2.3