Do full flush on uart8250 only at end of printk.

[coreboot.git] / src / console / uart8250_console.c

diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c
index 333693befbc42998d3e9ca19aba187c32ec748a0..330ed684f786f7b1662e6282a89a45bfc46405c2 100644 (file)
--- a/src/console/uart8250_console.c
+++ b/src/console/uart8250_console.c
@@ -1,62 +1,55 @@
+/*
+ * 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 TTYS0_BASE
-#define TTYS0_BASE 0x3f8
-#endif
-
-#ifndef TTYS0_BAUD
-#define TTYS0_BAUD 115200
-#endif
-
-#ifndef TTYS0_DIV
-#if ((115200%TTYS0_BAUD) != 0)
-#error Bad ttys0 baud rate
-#endif
-#define TTYS0_DIV      (115200/TTYS0_BAUD)
-#endif
-
-/* Line Control Settings */
-#ifndef TTYS0_LCS
-/* Set 8bit, 1 stop bit, no parity */
-#define TTYS0_LCS      0x3
-#endif
-
-#define UART_LCS       TTYS0_LCS
-
-void ttyS0_init(void)
+static void ttyS0_init(void)
 {
-       static unsigned char div[8]={1,2,3,6,12,24,48,96};
-       int b_index=0;
-       unsigned int divisor=TTYS0_DIV;
+       uart_init();
+}
 
-       if(get_option(&b_index,"baud_rate")==0) {
-               divisor=div[b_index];
-       }
-       uart8250_init(TTYS0_BASE, divisor, TTYS0_LCS);
+static void ttyS0_tx_byte(unsigned char data)
+{
+       uart8250_tx_byte(CONFIG_TTYS0_BASE, data);
 }
 
-void ttyS0_tx_byte(unsigned char data) 
+static void ttyS0_tx_flush(void)
 {
-       uart8250_tx_byte(TTYS0_BASE, data);
+       uart8250_tx_flush(CONFIG_TTYS0_BASE);
 }
 
-unsigned char ttyS0_rx_byte(void) 
+static unsigned char ttyS0_rx_byte(void)
 {
-       return uart8250_rx_byte(TTYS0_BASE);
+       return uart8250_rx_byte(CONFIG_TTYS0_BASE);
 }
 
-int ttyS0_tst_byte(unsigned char data) 
+static int ttyS0_tst_byte(void)
 {
-       return uart8250_can_rx_byte(TTYS0_BASE);
+       return uart8250_can_rx_byte(CONFIG_TTYS0_BASE);
 }
 
-static struct console_driver uart8250_console __console = {
-       .init    = ttyS0_init,
-       .tx_byte = ttyS0_tx_byte,
-       .rx_byte = ttyS0_rx_byte,
+static const struct console_driver uart8250_console __console = {
+       .init     = ttyS0_init,
+       .tx_byte  = ttyS0_tx_byte,
+       .tx_flush = ttyS0_tx_flush,
+       .rx_byte  = ttyS0_rx_byte,
        .tst_byte = ttyS0_tst_byte,
 };
-