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

4 files changed, 29 insertions, 29 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))
diff --git a/src/arch/i386/lib/cpu.c b/src/arch/i386/lib/cpu.c
index 0bcd5a674c..9f72789c7c 100644
--- a/src/arch/i386/lib/cpu.c
+++ b/src/arch/i386/lib/cpu.c
@@ -224,7 +224,7 @@ void cpu_initialize(void)
 	
 	info = cpu_info();
 
-	printk_info("Initializing CPU #%ld\n", info->index);
+	printk(BIOS_INFO, "Initializing CPU #%ld\n", info->index);
 
 	cpu = info->cpu;
 	if (!cpu) {
@@ -233,12 +233,12 @@ void cpu_initialize(void)
 
 	/* Find what type of cpu we are dealing with */
 	identify_cpu(cpu);
-	printk_debug("CPU: vendor %s device %x\n",
+	printk(BIOS_DEBUG, "CPU: vendor %s device %x\n",
 		cpu_vendor_name(cpu->vendor), cpu->device);
 
 	get_fms(&c, cpu->device);
 
-	printk_debug("CPU: family %02x, model %02x, stepping %02x\n", c.x86, c.x86_model, c.x86_mask);
+	printk(BIOS_DEBUG, "CPU: family %02x, model %02x, stepping %02x\n", c.x86, c.x86_model, c.x86_mask);
 	
 	/* Lookup the cpu's operations */
 	set_cpu_ops(cpu);
@@ -249,7 +249,7 @@ void cpu_initialize(void)
 		set_cpu_ops(cpu);
 		cpu->device += c.x86_mask;
 		if(!cpu->ops) die("Unknown cpu");
-		printk_debug("Using generic cpu ops (good)\n");
+		printk(BIOS_DEBUG, "Using generic cpu ops (good)\n");
 	}
 	
 
@@ -260,7 +260,7 @@ void cpu_initialize(void)
 		cpu->ops->init(cpu);
 	}
 
-	printk_info("CPU #%ld initialized\n", info->index);
+	printk(BIOS_INFO, "CPU #%ld initialized\n", info->index);
 
 	return;
 }
diff --git a/src/arch/i386/lib/exception.c b/src/arch/i386/lib/exception.c
index f720ba8567..eb1df20e26 100644
--- a/src/arch/i386/lib/exception.c
+++ b/src/arch/i386/lib/exception.c
@@ -475,7 +475,7 @@ void x86_exception(struct eregs *info)
 		put_packet(out_buffer);
 	}
 #else /* !CONFIG_GDB_STUB */
-	printk_emerg(
+	printk(BIOS_EMERG, 
 		"Unexpected Exception: %d @ %02x:%08x - Halting\n"
 		"Code: %d eflags: %08x\n"
 		"eax: %08x ebx: %08x ecx: %08x edx: %08x\n"
diff --git a/src/arch/i386/lib/pci_ops_auto.c b/src/arch/i386/lib/pci_ops_auto.c
index 1dd2494ba9..1f144381ee 100644
--- a/src/arch/i386/lib/pci_ops_auto.c
+++ b/src/arch/i386/lib/pci_ops_auto.c
@@ -37,7 +37,7 @@ static int pci_sanity_check(const struct pci_bus_operations *o)
 			return 1;
 		}
 	}
-	printk_err("PCI: Sanity check failed\n");
+	printk(BIOS_ERR, "PCI: Sanity check failed\n");
 	return 0;
 }
 
@@ -58,7 +58,7 @@ static const struct pci_bus_operations *pci_check_direct(void)
 			pci_sanity_check(&pci_cf8_conf1)) 
 		{
 			outl(tmp, 0xCF8);
-			printk_debug("PCI: Using configuration type 1\n");
+			printk(BIOS_DEBUG, "PCI: Using configuration type 1\n");
 			return &pci_cf8_conf1;
 		}
 		outl(tmp, 0xCF8);
@@ -74,7 +74,7 @@ static const struct pci_bus_operations *pci_check_direct(void)
 		if ((inb(0xCF8) == 0x00 && inb(0xCFA) == 0x00) &&
 			pci_sanity_check(&pci_cf8_conf2))
 		{
-			printk_debug("PCI: Using configuration type 2\n");
+			printk(BIOS_DEBUG, "PCI: Using configuration type 2\n");
 			return &pci_cf8_conf2;
 		}
 	}
@@ -94,7 +94,7 @@ const struct pci_bus_operations *pci_remember_direct(void)
  */
 void pci_set_method(device_t dev)
 {
-	printk_info("Finding PCI configuration type.\n");
+	printk(BIOS_INFO, "Finding PCI configuration type.\n");
 	dev->ops->ops_pci_bus = pci_remember_direct();
 	post_code(0x5f);
 }