printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / arch / i386 / smp / ioapic.c

diff --git a/src/arch/i386/smp/ioapic.c b/src/arch/i386/smp/ioapic.c
index 630463e63db8c66f1a8725b04f55fc2e66fd7409..efc2ac52fc2512d33a54efe9dfd71079d9562ebe 100644 (file)
--- a/src/arch/i386/smp/ioapic.c
+++ b/src/arch/i386/smp/ioapic.c
@@ -40,13 +40,13 @@ void clear_ioapic(u32 ioapic_base)
        u32 low, high;
        u32 i, ioapic_interrupts;
 
-       printk_debug("IOAPIC: Clearing IOAPIC at 0x%08x\n", ioapic_base); 
+       printk(BIOS_DEBUG, "IOAPIC: Clearing IOAPIC at 0x%08x\n", ioapic_base); 
 
        /* Read the available number of interrupts */
        ioapic_interrupts = (io_apic_read(ioapic_base, 1) >> 16) & 0xff;
        if (!ioapic_interrupts || ioapic_interrupts == 0xff)
                ioapic_interrupts = 24;
-       printk_debug("IOAPIC: %d interrupts\n", ioapic_interrupts); 
+       printk(BIOS_DEBUG, "IOAPIC: %d interrupts\n", ioapic_interrupts); 
 
        low = DISABLED;
        high = NONE;
@@ -55,11 +55,11 @@ void clear_ioapic(u32 ioapic_base)
                io_apic_write(ioapic_base, i * 2 + 0x10, low);
                io_apic_write(ioapic_base, i * 2 + 0x11, high);
 
-               printk_spew("IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", i, high, low);
+               printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", i, high, low);
        }
 
        if (io_apic_read(ioapic_base, 0x10) == 0xffffffff) {
-               printk_warning("IO APIC not responding.\n");
+               printk(BIOS_WARNING, "IO APIC not responding.\n");
                return;
        }
 }
@@ -70,12 +70,12 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
        u32 low, high;
        u32 i, ioapic_interrupts;
 
-       printk_debug("IOAPIC: Initializing IOAPIC at 0x%08x\n", ioapic_base); 
-       printk_debug("IOAPIC: Bootstrap Processor Local APIC = %02x\n",
+       printk(BIOS_DEBUG, "IOAPIC: Initializing IOAPIC at 0x%08x\n", ioapic_base); 
+       printk(BIOS_DEBUG, "IOAPIC: Bootstrap Processor Local APIC = %02x\n",
                        bsp_lapicid);
 
        if (ioapic_id) {
-               printk_debug("IOAPIC: ID = 0x%02x\n", ioapic_id); 
+               printk(BIOS_DEBUG, "IOAPIC: ID = 0x%02x\n", ioapic_id); 
                /* Set IOAPIC ID if it has been specified */
                io_apic_write(ioapic_base, 0x00, 
                        (io_apic_read(ioapic_base, 0x00) & 0xfff0ffff) | 
@@ -86,7 +86,7 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
        ioapic_interrupts = (io_apic_read(ioapic_base, 1) >> 16) & 0xff;
        if (!ioapic_interrupts || ioapic_interrupts == 0xff)
                ioapic_interrupts = 24;
-       printk_debug("IOAPIC: %d interrupts\n", ioapic_interrupts); 
+       printk(BIOS_DEBUG, "IOAPIC: %d interrupts\n", ioapic_interrupts); 
 
 
 // XXX this decision should probably be made elsewhere, and
@@ -101,11 +101,11 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
        /* For the Pentium 4 and above APICs deliver their interrupts
         * on the front side bus, enable that.
         */
-       printk_debug("IOAPIC: Enabling interrupts on FSB\n"); 
+       printk(BIOS_DEBUG, "IOAPIC: Enabling interrupts on FSB\n"); 
        io_apic_write(ioapic_base, 0x03, io_apic_read(ioapic_base, 0x03) | (1 << 0));
 #endif
 #ifdef IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
-       printk_debug("IOAPIC: Enabling interrupts on APIC serial bus\n"); 
+       printk(BIOS_DEBUG, "IOAPIC: Enabling interrupts on APIC serial bus\n"); 
        io_apic_write(ioapic_base, 0x03, 0);
 #endif
 
@@ -117,11 +117,11 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
        io_apic_write(ioapic_base, 0x11, high);
 
        if (io_apic_read(ioapic_base, 0x10) == 0xffffffff) {
-               printk_warning("IO APIC not responding.\n");
+               printk(BIOS_WARNING, "IO APIC not responding.\n");
                return;
        }
 
-       printk_spew("IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", 0, high, low);
+       printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", 0, high, low);
 
        low = DISABLED;
        high = NONE;
@@ -130,6 +130,6 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
                io_apic_write(ioapic_base, i * 2 + 0x10, low);
                io_apic_write(ioapic_base, i * 2 + 0x11, high);
 
-               printk_spew("IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", i, high, low);
+               printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", i, high, low);
        }
 }