printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / northbridge / via / cn700 / vga.c

diff --git a/src/northbridge/via/cn700/vga.c b/src/northbridge/via/cn700/vga.c
index f00f18dda05fa063250282daf34f7ad11ab7f822..283f23dd16058d7bc4a2238622290cdc787201c9 100644 (file)
--- a/src/northbridge/via/cn700/vga.c
+++ b/src/northbridge/via/cn700/vga.c
@@ -18,8 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/* Note: Some of the VGA control registers are located on the memory controller.
-   Registers are set both in raminit.c and northbridge.c */
+/*
+ * Note: Some of the VGA control registers are located on the memory
+ * controller. Registers are set both in raminit.c and northbridge.c.
+ */
 
 #include <console/console.h>
 #include <arch/io.h>
@@ -34,80 +36,73 @@
 #include "chip.h"
 #include "northbridge.h"
 #include "cn700.h"
+#include "vgachip.h"
 
 void write_protect_vgabios(void)
 {
-//Don't bother for now
+       /* Don't bother for now. */
 }
 
 static void vga_init(device_t dev)
 {
        u8 reg8;
 
-       print_debug("Copying BOCHS Bios to 0xf000\n");
-       /* Copy BOCHS BIOS from 4G-ROM_SIZE-64k (in flash) to 0xf0000 (in RAM)
-        * This is for compatibility with the VGA ROM's BIOS callbacks */
-       memcpy(0xf0000, (0xffffffff - ROM_SIZE - 0xffff), 0x10000);
+       print_debug("Copying BOCHS BIOS to 0xf000\n");
+       /*
+        * Copy BOCHS BIOS from 4G-CONFIG_ROM_SIZE-64k (in flash) to 0xf0000 (in RAM)
+        * This is for compatibility with the VGA ROM's BIOS callbacks.
+        */
+       memcpy(0xf0000, (0xffffffff - CONFIG_ROM_SIZE - 0xffff), 0x10000);
+
+       printk(BIOS_DEBUG, "Initializing VGA\n");
 
-       printk_debug("Initializing VGA\n");
-       
-       /* Set memory rate to 200MHz */
+       /* Set memory rate to 200 MHz. */
        outb(0x3d, CRTM_INDEX);
        reg8 = inb(CRTM_DATA);
        reg8 &= 0x0f;
        reg8 |= (0x1 << 4);
        outb(0x3d, CRTM_INDEX);
        outb(reg8, CRTM_DATA);
-       
-       /* Set framebuffer size */
+
+       /* Set framebuffer size. */
        reg8 = (CONFIG_VIDEO_MB / 4);
        outb(0x39, SR_INDEX);
        outb(reg8, SR_DATA);
-       
-       
+
        pci_write_config8(dev, 0x04, 0x07);
        pci_write_config8(dev, 0x0d, 0x20);
-       pci_write_config32(dev,0x10, 0xf4000008);
-       pci_write_config32(dev,0x14, 0xfb000000);
-       
-       
-       printk_debug("INSTALL REAL-MODE IDT\n");
+       pci_write_config32(dev, 0x10, 0xf4000008);
+       pci_write_config32(dev, 0x14, 0xfb000000);
+
+       printk(BIOS_DEBUG, "INSTALL REAL-MODE IDT\n");
        setup_realmode_idt();
-       printk_debug("DO THE VGA BIOS\n");
+       printk(BIOS_DEBUG, "DO THE VGA BIOS\n");
        do_vgabios();
-       /* VGA seems to work without this, but crash & burn with it */
-       //printk_debug("Enable VGA console\n");
-       //vga_enable_console();
+       /* VGA seems to work without this, but crash & burn with it. */
+       // printk(BIOS_DEBUG, "Enable VGA console\n");
+       // vga_enable_console();
 
        /* It's not clear if these need to be programmed before or after
-        * the VGA bios runs. Try both, clean up later */
-       /* Set memory rate to 200MHz */
+        * the VGA BIOS runs. Try both, clean up later. */
+       /* Set memory rate to 200 MHz (again). */
        outb(0x3d, CRTM_INDEX);
        reg8 = inb(CRTM_DATA);
        reg8 &= 0x0f;
        reg8 |= (0x1 << 4);
        outb(0x3d, CRTM_INDEX);
        outb(reg8, CRTM_DATA);
-       
-       /* Set framebuffer size (again) */
+
+       /* Set framebuffer size (again). */
        reg8 = (CONFIG_VIDEO_MB / 4);
        outb(0x39, SR_INDEX);
        outb(reg8, SR_DATA);
 
-       /* Clear the BOCHs Bios out of memory, so it doesn't confuse linux */
+       /* Clear the BOCHS BIOS out of memory, so it doesn't confuse Linux. */
        memset(0xf0000, 0, 0x10000);
 }
 
-static void vga_read_resources(device_t dev)
-{
-       dev->rom_address = 0xfff80000;
-       dev->on_mainboard=1;
-       pci_dev_read_resources(dev);
-}
-
-
 static const struct device_operations vga_operations = {
-       .read_resources   = vga_read_resources,
+       .read_resources   = pci_dev_read_resources,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_dev_enable_resources,
        .init             = vga_init,
@@ -115,7 +110,7 @@ static const struct device_operations vga_operations = {
 };
 
 static const struct pci_driver vga_driver __pci_driver = {
-       .ops = &vga_operations,
+       .ops    = &vga_operations,
        .vendor = PCI_VENDOR_ID_VIA,
        .device = PCI_DEVICE_ID_VIA_CN700_VGA,
 };