diff options
| author | Stefan Reinauer <stepan@coreboot.org> | 2010-12-17 00:08:21 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-12-17 00:08:21 +0000 |
| commit | 85b0fa1ace685bfdb1f1febbbf5127710a314888 (patch) | |
| tree | 11fac9795931c6cdca6a785301d9294e4ba9dcae /src/console | |
| parent | efbfd501fee8decd0942808a47a3f9e93d30ae38 (diff) | |
drop one more version of doing serial uart output differently.
coreboot made it kind of complicated to print a character on serial. Not quite
as complicated as UEFI, but too much for a good design. Fix it.
Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
Acked-by: Stefan Reinauer <stepan@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6191 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/uart8250_console.c | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 20deaa72e3..53ca3a762e 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -1,41 +1,36 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2003 Eric Biederman + * + * 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 + */ + #include <console/console.h> #include <uart8250.h> #include <pc80/mc146818rtc.h> -/* Base Address */ -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3f8 -#endif - -#ifndef CONFIG_TTYS0_BAUD -#define CONFIG_TTYS0_BAUD 115200 -#endif - -#ifndef CONFIG_TTYS0_DIV -#if ((115200%CONFIG_TTYS0_BAUD) != 0) -#error Bad ttys0 baud rate -#endif -#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) -#endif - -/* Line Control Settings */ -#ifndef CONFIG_TTYS0_LCS -/* Set 8bit, 1 stop bit, no parity */ -#define CONFIG_TTYS0_LCS 0x3 -#endif - -#define UART_LCS CONFIG_TTYS0_LCS - static void ttyS0_init(void) { - static const unsigned char div[8]={1,2,3,6,12,24,48,96}; - int b_index=0; - unsigned int divisor=CONFIG_TTYS0_DIV; + static const unsigned char div[8] = { 1, 2, 3, 6, 12, 24, 48, 96 }; + int b_index = 0; + unsigned int divisor = CONFIG_TTYS0_DIV; - if(get_option(&b_index,"baud_rate")==0) { - divisor=div[b_index]; + if (get_option(&b_index, "baud_rate") == 0) { + divisor = div[b_index]; } - uart8250_init(CONFIG_TTYS0_BASE, divisor, CONFIG_TTYS0_LCS); + uart8250_init(CONFIG_TTYS0_BASE, divisor); } static void ttyS0_tx_byte(unsigned char data) @@ -54,9 +49,8 @@ static int ttyS0_tst_byte(void) } static const struct console_driver uart8250_console __console = { - .init = ttyS0_init, - .tx_byte = ttyS0_tx_byte, - .rx_byte = ttyS0_rx_byte, + .init = ttyS0_init, + .tx_byte = ttyS0_tx_byte, + .rx_byte = ttyS0_rx_byte, .tst_byte = ttyS0_tst_byte, }; - |