printk_foo -> printk(BIOS_FOO, ...)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 19 insertions, 19 deletions

diff --git a/src/arch/i386/lib/console_printk.c b/src/arch/i386/lib/console_printk.c
index e9005796e9..191a4b7fe0 100644
--- a/src/arch/i386/lib/console_printk.c
+++ b/src/arch/i386/lib/console_printk.c
@@ -1,21 +1,21 @@
 
-#define printk_emerg(fmt, arg...)   do_printk(BIOS_EMERG   ,fmt, ##arg)
-#define printk_alert(fmt, arg...)   do_printk(BIOS_ALERT   ,fmt, ##arg)
+#define printk(BIOS_EMERG, fmt, arg...)   do_printk(BIOS_EMERG   ,fmt, ##arg)
+#define printk(BIOS_ALERT, fmt, arg...)   do_printk(BIOS_ALERT   ,fmt, ##arg)
 #define printk_crit(fmt, arg...)    do_printk(BIOS_CRIT    ,fmt, ##arg)
-#define printk_err(fmt, arg...)     do_printk(BIOS_ERR     ,fmt, ##arg)
-#define printk_warning(fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg)
+#define printk(BIOS_ERR, fmt, arg...)     do_printk(BIOS_ERR     ,fmt, ##arg)
+#define printk(BIOS_WARNING, fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg)
 #define printk_notice(fmt, arg...)  do_printk(BIOS_NOTICE  ,fmt, ##arg)
-#define printk_info(fmt, arg...)    do_printk(BIOS_INFO    ,fmt, ##arg)
-#define printk_debug(fmt, arg...)   do_printk(BIOS_DEBUG   ,fmt, ##arg)
-#define printk_spew(fmt, arg...)    do_printk(BIOS_SPEW    ,fmt, ##arg)
+#define printk(BIOS_INFO, fmt, arg...)    do_printk(BIOS_INFO    ,fmt, ##arg)
+#define printk(BIOS_DEBUG, fmt, arg...)   do_printk(BIOS_DEBUG   ,fmt, ##arg)
+#define printk(BIOS_SPEW, fmt, arg...)    do_printk(BIOS_SPEW    ,fmt, ##arg)
 
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_EMERG
 #undef  printk_emerg
-#define printk_emerg(fmt, arg...)   do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_EMERG, fmt, arg...)   do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ALERT
 #undef  printk_alert
-#define printk_alert(fmt, arg...)   do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_ALERT, fmt, arg...)   do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_CRIT
 #undef  printk_crit
@@ -23,11 +23,11 @@
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ERR
 #undef  printk_err
-#define printk_err(fmt, arg...)     do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_ERR, fmt, arg...)     do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_WARNING
 #undef  printk_warning
-#define printk_warning(fmt, arg...) do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_WARNING, fmt, arg...) do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_NOTICE
 #undef  printk_notice
@@ -35,22 +35,22 @@
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_INFO
 #undef  printk_info
-#define printk_info(fmt, arg...)    do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_INFO, fmt, arg...)    do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_DEBUG
 #undef  printk_debug
-#define printk_debug(fmt, arg...)   do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_DEBUG, fmt, arg...)   do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 #if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_SPEW
 #undef  printk_spew
-#define printk_spew(fmt, arg...)    do_printk(BIOS_EMERG   , "", ##arg)
+#define printk(BIOS_SPEW, fmt, arg...)    do_printk(BIOS_EMERG   , "", ##arg)
 #endif
 
 #define print_emerg(STR)   printk_emerg  ("%s", (STR))
 #define print_alert(STR)   printk_alert  ("%s", (STR))
 #define print_crit(STR)    printk_crit   ("%s", (STR))
 #define print_err(STR)     printk_err    ("%s", (STR))
-#define print_warning(STR) printk_warning("%s", (STR))
+#define print_warning(STR) printk(BIOS_WARNING, "%s", (STR))
 #define print_notice(STR)  printk_notice ("%s", (STR))
 #define print_info(STR)    printk_info   ("%s", (STR))
 #define print_debug(STR)   printk_debug  ("%s", (STR))
@@ -60,7 +60,7 @@
 #define print_alert_char(CH)   printk_alert  ("%c", (CH))
 #define print_crit_char(CH)    printk_crit   ("%c", (CH))
 #define print_err_char(CH)     printk_err    ("%c", (CH))
-#define print_warning_char(CH) printk_warning("%c", (CH))
+#define print_warning_char(CH) printk(BIOS_WARNING, "%c", (CH))
 #define print_notice_char(CH)  printk_notice ("%c", (CH))
 #define print_info_char(CH)    printk_info   ("%c", (CH))
 #define print_debug_char(CH)   printk_debug  ("%c", (CH))
@@ -70,7 +70,7 @@
 #define print_alert_hex8(HEX)   printk_alert  ("%02x",  (HEX))
 #define print_crit_hex8(HEX)    printk_crit   ("%02x",  (HEX))
 #define print_err_hex8(HEX)     printk_err    ("%02x",  (HEX))
-#define print_warning_hex8(HEX) printk_warning("%02x",  (HEX))
+#define print_warning_hex8(HEX) printk(BIOS_WARNING, "%02x",  (HEX))
 #define print_notice_hex8(HEX)  printk_notice ("%02x",  (HEX))
 #define print_info_hex8(HEX)    printk_info   ("%02x",  (HEX))
 #define print_debug_hex8(HEX)   printk_debug  ("%02x",  (HEX))
@@ -80,7 +80,7 @@
 #define print_alert_hex16(HEX)   printk_alert  ("%04x", (HEX))
 #define print_crit_hex16(HEX)    printk_crit   ("%04x", (HEX))
 #define print_err_hex16(HEX)     printk_err    ("%04x", (HEX))
-#define print_warning_hex16(HEX) printk_warning("%04x", (HEX))
+#define print_warning_hex16(HEX) printk(BIOS_WARNING, "%04x", (HEX))
 #define print_notice_hex16(HEX)  printk_notice ("%04x", (HEX))
 #define print_info_hex16(HEX)    printk_info   ("%04x", (HEX))
 #define print_debug_hex16(HEX)   printk_debug  ("%04x", (HEX))
@@ -90,7 +90,7 @@
 #define print_alert_hex32(HEX)   printk_alert  ("%08x", (HEX))
 #define print_crit_hex32(HEX)    printk_crit   ("%08x", (HEX))
 #define print_err_hex32(HEX)     printk_err    ("%08x", (HEX))
-#define print_warning_hex32(HEX) printk_warning("%08x", (HEX))
+#define print_warning_hex32(HEX) printk(BIOS_WARNING, "%08x", (HEX))
 #define print_notice_hex32(HEX)  printk_notice ("%08x", (HEX))
 #define print_info_hex32(HEX)    printk_info   ("%08x", (HEX))
 #define print_debug_hex32(HEX)   printk_debug  ("%08x", (HEX))