printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / via / vt8235 / vt8235.c

diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index e6287ece9cea38c22ebfd1f0b67e96c4a3837a48..228da0f9483e1004a6e8f24730822298a1b61475 100644 (file)
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -4,7 +4,7 @@
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
 #include <pc80/keyboard.h>
-#include "vt8235.h"
+#include <pc80/i8259.h>
 #include "chip.h"
 
 /*
@@ -14,7 +14,7 @@ static int enabled = 0;
 
 void hard_reset(void) 
 {
-       printk_err("NO HARD RESET ON VT8235! FIX ME!\n");
+       printk(BIOS_ERR, "NO HARD RESET ON VT8235! FIX ME!\n");
 }
 
 static void keyboard_on(struct device *dev)
@@ -26,7 +26,7 @@ static void keyboard_on(struct device *dev)
        regval &= 0xfd;
        pci_write_config8(dev, 0x51, regval);
 
-       init_pc_keyboard(0x60, 0x64, 0);
+       pc_keyboard_init(0);
 }
 
 void dump_south(device_t dev0)
@@ -34,11 +34,11 @@ void dump_south(device_t dev0)
        int i,j;
        
        for(i = 0; i < 256; i += 16) {
-               printk_debug("0x%x: ", i);
+               printk(BIOS_DEBUG, "0x%x: ", i);
                for(j = 0; j < 16; j++) {
-                       printk_debug("%02x ", pci_read_config8(dev0, i+j));
+                       printk(BIOS_DEBUG, "%02x ", pci_read_config8(dev0, i+j));
                }
-               printk_debug("\n");
+               printk(BIOS_DEBUG, "\n");
        }
 }
 
@@ -61,7 +61,7 @@ static void vt8235_enable(struct device *dev)
        vendor = pci_read_config16(dev,0);
        model = pci_read_config16(dev,0x2);
 
-       printk_debug("In vt8235_enable %04x %04x.\n",vendor,model);
+       printk(BIOS_DEBUG, "In vt8235_enable %04x %04x.\n",vendor,model);
        
        /* if this is not the southbridge itself just return */
        /* this is necessary because USB devices are slot 10, whereas this device is slot 11 
@@ -70,7 +70,7 @@ static void vt8235_enable(struct device *dev)
        if( (vendor != PCI_VENDOR_ID_VIA) || (model != PCI_DEVICE_ID_VIA_8235))
                return;
 
-       printk_debug("Initialising Devices\n");
+       printk(BIOS_DEBUG, "Initialising Devices\n");
 
 
        setup_i8259();   // make sure interupt controller is configured before keyboard init 
@@ -92,6 +92,6 @@ static void vt8235_enable(struct device *dev)
 }
 
 struct chip_operations southbridge_via_vt8235_ops = {
-       CHIP_NAME("VIA vt8235")
+       CHIP_NAME("VIA VT8235 Southbridge")
        .enable_dev = vt8235_enable,
 };