From 1d7541feeba372ec3d1d441442238e1c65972bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 17 Feb 2014 21:34:42 +0200 Subject: console: Fix includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not pull in console hw-specific prototypes everywhere with console.h as those are not needed for higher levels. Move prototypes for UARTs next to other consoles. Change-Id: Icbc9cd3e5bdfdab85d7dccd7c3827bba35248fb8 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5232 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer --- src/include/console/console.h | 16 -------------- src/include/console/uart.h | 49 +++++++++++++++++++++++++++++++++++++++++++ src/include/uart.h | 47 ----------------------------------------- src/include/uart8250.h | 2 -- 4 files changed, 49 insertions(+), 65 deletions(-) create mode 100644 src/include/console/uart.h delete mode 100644 src/include/uart.h (limited to 'src/include') diff --git a/src/include/console/console.h b/src/include/console/console.h index 6fa624c799..dfeedda5e0 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -24,22 +24,6 @@ #include #include -#if CONFIG_CONSOLE_SERIAL -#include -#endif -#if CONFIG_USBDEBUG && !defined(__ROMCC__) -#include -#endif -#if CONFIG_CONSOLE_NE2K -#include -#endif -#if CONFIG_CONSOLE_CBMEM -#include -#endif -#if CONFIG_SPKMODEM -#include -#endif - #ifndef __PRE_RAM__ unsigned char console_rx_byte(void); int console_tst_byte(void); diff --git a/src/include/console/uart.h b/src/include/console/uart.h new file mode 100644 index 0000000000..9b52a78c69 --- /dev/null +++ b/src/include/console/uart.h @@ -0,0 +1,49 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CONSOLE_UART_H +#define CONSOLE_UART_H + +/* Return the clock frequency UART uses as reference clock for + * baudrate generator. */ +unsigned int uart_platform_refclk(void); + +/* Return the baudrate determined from option_table, or when that is + * not used, CONFIG_TTYS0_BAUD. + */ +unsigned int default_baudrate(void); + +/* Returns the divisor value for a given baudrate. + * The formula to satisfy is: + * refclk / divisor = baudrate * oversample + */ +unsigned int uart_baudrate_divisor(unsigned int baudrate, + unsigned int refclk, unsigned int oversample); + + +unsigned char uart_rx_byte(void); +void uart_tx_byte(unsigned char data); +void uart_tx_flush(void); +void uart_init(void); + +uint32_t uartmem_getbaseaddr(void); + +void oxford_init(void); + +#endif /* CONSOLE_UART_H */ diff --git a/src/include/uart.h b/src/include/uart.h deleted file mode 100644 index 997fe185ce..0000000000 --- a/src/include/uart.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef UART_H -#define UART_H - -/* Return the clock frequency UART uses as reference clock for - * baudrate generator. */ -unsigned int uart_platform_refclk(void); - -/* Return the baudrate determined from option_table, or when that is - * not used, CONFIG_TTYS0_BAUD. - */ -unsigned int default_baudrate(void); - -/* Returns the divisor value for a given baudrate. - * The formula to satisfy is: - * refclk / divisor = baudrate * oversample - */ -unsigned int uart_baudrate_divisor(unsigned int baudrate, - unsigned int refclk, unsigned int oversample); - - -unsigned char uart_rx_byte(void); -void uart_tx_byte(unsigned char data); -void uart_tx_flush(void); -void uart_init(void); - -uint32_t uartmem_getbaseaddr(void); - -#endif /* UART_H */ diff --git a/src/include/uart8250.h b/src/include/uart8250.h index 112cd44945..af95796733 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -129,8 +129,6 @@ u32 uart_mem_init(void); #if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE /* and special init for OXPCIe based cards */ extern int oxford_oxpcie_present; - -void oxford_init(void); #endif #endif -- cgit v1.2.3