commit dbc7bd9dce2d188dd48de7acd5754507ff0c87e5
author Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Jan 28 11:34:38 2014 +0200
committer Patrick Georgi <patrick@georgi-clan.de> Wed Apr 09 13:28:33 2014 +0200
tree d5539c092fa6c3cfe7650703e1c38b4858d2db45
parent 77f43e9b43894f6cdeaab29b2960796b1e3a219e

console: Refactor uart8250/NE2K

Do this for symmetry with romstage_console.c.

Change-Id: If17acfc3da07b1dbefa87162c3c7168deb7b354a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5330
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

src/arch/x86/lib/romcc_console.c

diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index a6e8ecc..0557a52 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -41,6 +41,16 @@
 #endif
 }
 
+static void __console_tx_flush(void)
+{
+#if CONFIG_CONSOLE_SERIAL
+	uart_tx_flush();
+#endif
+#if CONFIG_CONSOLE_NE2K
+	ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
+#endif
+}
+
 static void __console_tx_nibble(unsigned nibble)
 {
 	unsigned char digit;
@@ -54,13 +64,8 @@
 static void __console_tx_char(int loglevel, unsigned char byte)
 {
 	if (console_log_level(loglevel)) {
-#if CONFIG_CONSOLE_SERIAL
-		uart_tx_byte(byte);
-#endif
-#if CONFIG_CONSOLE_NE2K
-		ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
-		ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
+		__console_tx_byte(byte);
+		__console_tx_flush();
 	}
 }
 
@@ -69,10 +74,8 @@
 	if (console_log_level(loglevel)) {
 		__console_tx_nibble((value >>  4U) & 0x0fU);
 		__console_tx_nibble(value & 0x0fU);
+		__console_tx_flush();
 	}
-#if CONFIG_CONSOLE_NE2K
-		ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
 }
 
 static void __console_tx_hex16(int loglevel, unsigned short value)
@@ -82,10 +85,8 @@
 		__console_tx_nibble((value >>  8U) & 0x0fU);
 		__console_tx_nibble((value >>  4U) & 0x0fU);
 		__console_tx_nibble(value & 0x0fU);
+		__console_tx_flush();
 	}
-#if CONFIG_CONSOLE_NE2K
-		ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
 }
 
 static void __console_tx_hex32(int loglevel, unsigned int value)
@@ -99,10 +100,8 @@
 		__console_tx_nibble((value >>  8U) & 0x0fU);
 		__console_tx_nibble((value >>  4U) & 0x0fU);
 		__console_tx_nibble(value & 0x0fU);
+		__console_tx_flush();
 	}
-#if CONFIG_CONSOLE_NE2K
-		ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
 }
 
 static void __console_tx_string(int loglevel, const char *str)
@@ -114,9 +113,7 @@
 				__console_tx_byte('\r');
 			__console_tx_byte(ch);
 		}
-#if CONFIG_CONSOLE_NE2K
-		ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
+		__console_tx_flush();
 	}
 }