[coreboot-gerrit] New patch to review for coreboot: 872574b console: Split ROMCC helpers

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Tue Mar 4 18:01:32 CET 2014


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5339

-gerrit

commit 872574ba7cf2c4bcb98c4ab099cbf5c115da66eb
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon Feb 3 10:40:38 2014 +0200

    console: Split ROMCC helpers
    
    Change-Id: Id8c56e979660ad9f4eef39c648f68c7ec60edfba
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/arch/x86/lib/romcc_console.c  | 76 +-------------------------------
 src/console/console.c             | 46 ++++++++++++++++++++
 src/console/init.c                |  2 -
 src/include/console/console.h     | 52 ----------------------
 src/include/console/early_print.h | 91 +++++++++++++++++++++++++++++++++++++++
 src/include/console/streams.h     |  7 +++
 6 files changed, 146 insertions(+), 128 deletions(-)

diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index ae5720a..0fa633a 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -17,11 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/streams.h>
-
-/* While in romstage, console loglevel is built-time constant. */
-#define console_show(msg_level) (CONFIG_DEFAULT_CONSOLE_LOGLEVEL >= msg_level)
+#include <console/early_print.h>
 
+/* Include the sources. */
 #if CONFIG_CONSOLE_SERIAL && CONFIG_DRIVERS_UART_8250IO
 #include "drivers/uart/util.c"
 #include "drivers/uart/uart8250io.c"
@@ -31,76 +29,6 @@
 #endif
 
 #include <console/console.c>
-#define __console_tx_byte	console_tx_byte
-#define __console_tx_flush	console_tx_flush
-
-static void __console_tx_nibble(unsigned nibble)
-{
-	unsigned char digit;
-	digit = nibble + '0';
-	if (digit > '9') {
-		digit += 39;
-	}
-	__console_tx_byte(digit);
-}
-
-static void __console_tx_char(int loglevel, unsigned char byte)
-{
-	if (console_show(loglevel)) {
-		__console_tx_byte(byte);
-		__console_tx_flush();
-	}
-}
-
-static void __console_tx_hex8(int loglevel, unsigned char value)
-{
-	if (console_show(loglevel)) {
-		__console_tx_nibble((value >>  4U) & 0x0fU);
-		__console_tx_nibble(value & 0x0fU);
-		__console_tx_flush();
-	}
-}
-
-static void __console_tx_hex16(int loglevel, unsigned short value)
-{
-	if (console_show(loglevel)) {
-		__console_tx_nibble((value >> 12U) & 0x0fU);
-		__console_tx_nibble((value >>  8U) & 0x0fU);
-		__console_tx_nibble((value >>  4U) & 0x0fU);
-		__console_tx_nibble(value & 0x0fU);
-		__console_tx_flush();
-	}
-}
-
-static void __console_tx_hex32(int loglevel, unsigned int value)
-{
-	if (console_show(loglevel)) {
-		__console_tx_nibble((value >> 28U) & 0x0fU);
-		__console_tx_nibble((value >> 24U) & 0x0fU);
-		__console_tx_nibble((value >> 20U) & 0x0fU);
-		__console_tx_nibble((value >> 16U) & 0x0fU);
-		__console_tx_nibble((value >> 12U) & 0x0fU);
-		__console_tx_nibble((value >>  8U) & 0x0fU);
-		__console_tx_nibble((value >>  4U) & 0x0fU);
-		__console_tx_nibble(value & 0x0fU);
-		__console_tx_flush();
-	}
-}
-
-static void __console_tx_string(int loglevel, const char *str)
-{
-	if (console_show(loglevel)) {
-		unsigned char ch;
-		while((ch = *str++) != '\0') {
-			if (ch == '\n')
-				__console_tx_byte('\r');
-			__console_tx_byte(ch);
-		}
-		__console_tx_flush();
-	}
-}
-
-/* if included by romcc, include the sources, too. romcc can't use prototypes */
 #include <console/init.c>
 #include <console/post.c>
 #include <console/die.c>
diff --git a/src/console/console.c b/src/console/console.c
index 8865090..f3d0f78 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -81,3 +81,49 @@ void console_tx_flush(void)
 	usb_tx_flush(0);
 #endif
 }
+
+void console_tx_nibble(unsigned nibble)
+{
+	unsigned char digit;
+	digit = nibble + '0';
+	if (digit > '9') {
+		digit += 39;
+	}
+	console_tx_byte(digit);
+}
+
+void console_tx_hex8(unsigned char value)
+{
+	console_tx_nibble((value >>  4U) & 0x0fU);
+	console_tx_nibble(value & 0x0fU);
+}
+
+void console_tx_hex16(unsigned short value)
+{
+	console_tx_nibble((value >> 12U) & 0x0fU);
+	console_tx_nibble((value >>  8U) & 0x0fU);
+	console_tx_nibble((value >>  4U) & 0x0fU);
+	console_tx_nibble(value & 0x0fU);
+}
+
+void console_tx_hex32(unsigned int value)
+{
+	console_tx_nibble((value >> 28U) & 0x0fU);
+	console_tx_nibble((value >> 24U) & 0x0fU);
+	console_tx_nibble((value >> 20U) & 0x0fU);
+	console_tx_nibble((value >> 16U) & 0x0fU);
+	console_tx_nibble((value >> 12U) & 0x0fU);
+	console_tx_nibble((value >>  8U) & 0x0fU);
+	console_tx_nibble((value >>  4U) & 0x0fU);
+	console_tx_nibble(value & 0x0fU);
+}
+
+void console_tx_string(const char *str)
+{
+	unsigned char ch;
+	while((ch = *str++) != '\0') {
+		if (ch == '\n')
+			console_tx_byte('\r');
+		console_tx_byte(ch);
+	}
+}
diff --git a/src/console/init.c b/src/console/init.c
index 4ad20ab..d6fb213 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -26,7 +26,6 @@
 #include <console/streams.h>
 #include <option.h>
 
-#if !defined(__ROMCC__)
 /* While in romstage, console loglevel is built-time constant. */
 static ROMSTAGE_CONST int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
 
@@ -34,7 +33,6 @@ int console_show(int msg_level)
 {
 	return (console_loglevel >= msg_level);
 }
-#endif
 
 void console_init(void)
 {
diff --git a/src/include/console/console.h b/src/include/console/console.h
index cab8449..e0af4d3 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -118,58 +118,6 @@ void do_putchar(unsigned char byte);
 
 #else
 
-/* __ROMCC__ */
-
-#define print_emerg(STR)         __console_tx_string(BIOS_EMERG, STR)
-#define print_alert(STR)         __console_tx_string(BIOS_ALERT, STR)
-#define print_crit(STR)          __console_tx_string(BIOS_CRIT, STR)
-#define print_err(STR)           __console_tx_string(BIOS_ERR, STR)
-#define print_warning(STR)       __console_tx_string(BIOS_WARNING, STR)
-#define print_notice(STR)        __console_tx_string(BIOS_NOTICE, STR)
-#define print_info(STR)          __console_tx_string(BIOS_INFO, STR)
-#define print_debug(STR)         __console_tx_string(BIOS_DEBUG, STR)
-#define print_spew(STR)          __console_tx_string(BIOS_SPEW, STR)
-
-#define print_emerg_char(CH)     __console_tx_char(BIOS_EMERG, CH)
-#define print_alert_char(CH)     __console_tx_char(BIOS_ALERT, CH)
-#define print_crit_char(CH)      __console_tx_char(BIOS_CRIT, CH)
-#define print_err_char(CH)       __console_tx_char(BIOS_ERR, CH)
-#define print_warning_char(CH)   __console_tx_char(BIOS_WARNING, CH)
-#define print_notice_char(CH)    __console_tx_char(BIOS_NOTICE, CH)
-#define print_info_char(CH)      __console_tx_char(BIOS_INFO, CH)
-#define print_debug_char(CH)     __console_tx_char(BIOS_DEBUG, CH)
-#define print_spew_char(CH)      __console_tx_char(BIOS_SPEW, CH)
-
-#define print_emerg_hex8(HEX)    __console_tx_hex8(BIOS_EMERG, HEX)
-#define print_alert_hex8(HEX)    __console_tx_hex8(BIOS_ALERT, HEX)
-#define print_crit_hex8(HEX)     __console_tx_hex8(BIOS_CRIT, HEX)
-#define print_err_hex8(HEX)      __console_tx_hex8(BIOS_ERR, HEX)
-#define print_warning_hex8(HEX)  __console_tx_hex8(BIOS_WARNING, HEX)
-#define print_notice_hex8(HEX)   __console_tx_hex8(BIOS_NOTICE, HEX)
-#define print_info_hex8(HEX)     __console_tx_hex8(BIOS_INFO, HEX)
-#define print_debug_hex8(HEX)    __console_tx_hex8(BIOS_DEBUG, HEX)
-#define print_spew_hex8(HEX)     __console_tx_hex8(BIOS_SPEW, HEX)
-
-#define print_emerg_hex16(HEX)   __console_tx_hex16(BIOS_EMERG, HEX)
-#define print_alert_hex16(HEX)   __console_tx_hex16(BIOS_ALERT, HEX)
-#define print_crit_hex16(HEX)    __console_tx_hex16(BIOS_CRIT, HEX)
-#define print_err_hex16(HEX)     __console_tx_hex16(BIOS_ERR, HEX)
-#define print_warning_hex16(HEX) __console_tx_hex16(BIOS_WARNING, HEX)
-#define print_notice_hex16(HEX)  __console_tx_hex16(BIOS_NOTICE, HEX)
-#define print_info_hex16(HEX)    __console_tx_hex16(BIOS_INFO, HEX)
-#define print_debug_hex16(HEX)   __console_tx_hex16(BIOS_DEBUG, HEX)
-#define print_spew_hex16(HEX)    __console_tx_hex16(BIOS_SPEW, HEX)
-
-#define print_emerg_hex32(HEX)   __console_tx_hex32(BIOS_EMERG, HEX)
-#define print_alert_hex32(HEX)   __console_tx_hex32(BIOS_ALERT, HEX)
-#define print_crit_hex32(HEX)    __console_tx_hex32(BIOS_CRIT, HEX)
-#define print_err_hex32(HEX)     __console_tx_hex32(BIOS_ERR, HEX)
-#define print_warning_hex32(HEX) __console_tx_hex32(BIOS_WARNING, HEX)
-#define print_notice_hex32(HEX)  __console_tx_hex32(BIOS_NOTICE, HEX)
-#define print_info_hex32(HEX)    __console_tx_hex32(BIOS_INFO, HEX)
-#define print_debug_hex32(HEX)   __console_tx_hex32(BIOS_DEBUG, HEX)
-#define print_spew_hex32(HEX)    __console_tx_hex32(BIOS_SPEW, HEX)
-
 #include "arch/x86/lib/romcc_console.c"
 
 #endif /* __ROMCC__ */
diff --git a/src/include/console/early_print.h b/src/include/console/early_print.h
new file mode 100644
index 0000000..f5cc29d
--- /dev/null
+++ b/src/include/console/early_print.h
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * 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_EARLY_PRINT_H_
+#define __CONSOLE_EARLY_PRINT_H_
+
+#include <console/console.h>
+#include <console/streams.h>
+#include <console/loglevel.h>
+
+#define __console_tx_char(loglevel, y) \
+	if (console_show(loglevel)) { console_tx_byte(y); console_tx_flush(); }
+
+#define __console_tx_hex8(loglevel, y) \
+	if (console_show(loglevel)) { console_tx_hex8(y); console_tx_flush(); }
+
+#define __console_tx_hex16(loglevel, y) \
+	if (console_show(loglevel)) { console_tx_hex16(y); console_tx_flush(); }
+
+#define __console_tx_hex32(loglevel, y) \
+	if (console_show(loglevel)) { console_tx_hex32(y); console_tx_flush(); }
+
+#define __console_tx_string(loglevel, y) \
+	if (console_show(loglevel)) { console_tx_string(y); console_tx_flush(); }
+
+
+#define print_emerg(STR)         __console_tx_string(BIOS_EMERG, STR)
+#define print_alert(STR)         __console_tx_string(BIOS_ALERT, STR)
+#define print_crit(STR)          __console_tx_string(BIOS_CRIT, STR)
+#define print_err(STR)           __console_tx_string(BIOS_ERR, STR)
+#define print_warning(STR)       __console_tx_string(BIOS_WARNING, STR)
+#define print_notice(STR)        __console_tx_string(BIOS_NOTICE, STR)
+#define print_info(STR)          __console_tx_string(BIOS_INFO, STR)
+#define print_debug(STR)         __console_tx_string(BIOS_DEBUG, STR)
+#define print_spew(STR)          __console_tx_string(BIOS_SPEW, STR)
+
+#define print_emerg_char(CH)     __console_tx_char(BIOS_EMERG, CH)
+#define print_alert_char(CH)     __console_tx_char(BIOS_ALERT, CH)
+#define print_crit_char(CH)      __console_tx_char(BIOS_CRIT, CH)
+#define print_err_char(CH)       __console_tx_char(BIOS_ERR, CH)
+#define print_warning_char(CH)   __console_tx_char(BIOS_WARNING, CH)
+#define print_notice_char(CH)    __console_tx_char(BIOS_NOTICE, CH)
+#define print_info_char(CH)      __console_tx_char(BIOS_INFO, CH)
+#define print_debug_char(CH)     __console_tx_char(BIOS_DEBUG, CH)
+#define print_spew_char(CH)      __console_tx_char(BIOS_SPEW, CH)
+
+#define print_emerg_hex8(HEX)    __console_tx_hex8(BIOS_EMERG, HEX)
+#define print_alert_hex8(HEX)    __console_tx_hex8(BIOS_ALERT, HEX)
+#define print_crit_hex8(HEX)     __console_tx_hex8(BIOS_CRIT, HEX)
+#define print_err_hex8(HEX)      __console_tx_hex8(BIOS_ERR, HEX)
+#define print_warning_hex8(HEX)  __console_tx_hex8(BIOS_WARNING, HEX)
+#define print_notice_hex8(HEX)   __console_tx_hex8(BIOS_NOTICE, HEX)
+#define print_info_hex8(HEX)     __console_tx_hex8(BIOS_INFO, HEX)
+#define print_debug_hex8(HEX)    __console_tx_hex8(BIOS_DEBUG, HEX)
+#define print_spew_hex8(HEX)     __console_tx_hex8(BIOS_SPEW, HEX)
+
+#define print_emerg_hex16(HEX)   __console_tx_hex16(BIOS_EMERG, HEX)
+#define print_alert_hex16(HEX)   __console_tx_hex16(BIOS_ALERT, HEX)
+#define print_crit_hex16(HEX)    __console_tx_hex16(BIOS_CRIT, HEX)
+#define print_err_hex16(HEX)     __console_tx_hex16(BIOS_ERR, HEX)
+#define print_warning_hex16(HEX) __console_tx_hex16(BIOS_WARNING, HEX)
+#define print_notice_hex16(HEX)  __console_tx_hex16(BIOS_NOTICE, HEX)
+#define print_info_hex16(HEX)    __console_tx_hex16(BIOS_INFO, HEX)
+#define print_debug_hex16(HEX)   __console_tx_hex16(BIOS_DEBUG, HEX)
+#define print_spew_hex16(HEX)    __console_tx_hex16(BIOS_SPEW, HEX)
+
+#define print_emerg_hex32(HEX)   __console_tx_hex32(BIOS_EMERG, HEX)
+#define print_alert_hex32(HEX)   __console_tx_hex32(BIOS_ALERT, HEX)
+#define print_crit_hex32(HEX)    __console_tx_hex32(BIOS_CRIT, HEX)
+#define print_err_hex32(HEX)     __console_tx_hex32(BIOS_ERR, HEX)
+#define print_warning_hex32(HEX) __console_tx_hex32(BIOS_WARNING, HEX)
+#define print_notice_hex32(HEX)  __console_tx_hex32(BIOS_NOTICE, HEX)
+#define print_info_hex32(HEX)    __console_tx_hex32(BIOS_INFO, HEX)
+#define print_debug_hex32(HEX)   __console_tx_hex32(BIOS_DEBUG, HEX)
+#define print_spew_hex32(HEX)    __console_tx_hex32(BIOS_SPEW, HEX)
+
+#endif /* __CONSOLE_EARLY_PRINT_H_ */
diff --git a/src/include/console/streams.h b/src/include/console/streams.h
index 288fade..9d4d3fc 100644
--- a/src/include/console/streams.h
+++ b/src/include/console/streams.h
@@ -22,4 +22,11 @@ void console_hw_init(void);
 void console_tx_byte(unsigned char byte);
 void console_tx_flush(void);
 
+/* Helpers for ROMCC console. */
+void console_tx_nibble(unsigned nibble);
+void console_tx_hex8(unsigned char value);
+void console_tx_hex16(unsigned short value);
+void console_tx_hex32(unsigned int value);
+void console_tx_string(const char *str);
+
 #endif /* _CONSOLE_STREAMS_H_ */



More information about the coreboot-gerrit mailing list