printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / superio / via / vt1211 / vt1211.c

diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c
index 49e11ce039dfb63cda6f18f042d327bcd340f38a..46e9689800a6ababecd4a751db63ae3bea62f1ab 100644 (file)
--- a/src/superio/via/vt1211/vt1211.c
+++ b/src/superio/via/vt1211/vt1211.c
@@ -1,6 +1,7 @@
 /*
- * (C) Copyright 2004 Nick Barker <nick.barker9@btinternet.com>
+ * This file is part of the coreboot project.
  *
+ * Copyright (C) 2004 Nick Barker <nick.barker9@btinternet.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,48 +21,47 @@
 
  /* vt1211 routines and defines*/
 
-
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <uart8250.h>
+#include <stdlib.h>
 
 #include "vt1211.h"
 #include "chip.h"
 
-
 static unsigned char vt1211hwmonitorinits[]={
- 0x10,0x3, 0x11,0x10, 0x12,0xd, 0x13,0x7f,
- 0x14,0x21, 0x15,0x81, 0x16,0xbd, 0x17,0x8a,
- 0x18,0x0, 0x19,0x0, 0x1a,0x0, 0x1b,0x0,
- 0x1d,0xff, 0x1e,0x0, 0x1f,0x73, 0x20,0x67,
- 0x21,0xc1, 0x22,0xca, 0x23,0x74, 0x24,0xc2,
- 0x25,0xc7, 0x26,0xc9, 0x27,0x7f, 0x29,0x0,
- 0x2a,0x0, 0x2b,0xff, 0x2c,0x0, 0x2d,0xff,
- 0x2e,0x0, 0x2f,0xff, 0x30,0x0, 0x31,0xff,
- 0x32,0x0, 0x33,0xff, 0x34,0x0, 0x39,0xff,
- 0x3a,0x0, 0x3b,0xff, 0x3c,0xff, 0x3d,0xff,
- 0x3e,0x0, 0x3f,0xb0, 0x43,0xff, 0x44,0xff,
- 0x46,0xff, 0x47,0x50, 0x4a,0x3, 0x4b,0xc0,
- 0x4c,0x0, 0x4d,0x0, 0x4e,0xf, 0x5d,0x77,
- 0x5c,0x0, 0x5f,0x33, 0x40,0x1};
-
-static void pnp_enter_ext_func_mode(device_t dev) 
+       0x10,0x3, 0x11,0x10, 0x12,0xd, 0x13,0x7f,
+       0x14,0x21, 0x15,0x81, 0x16,0xbd, 0x17,0x8a,
+       0x18,0x0, 0x19,0x0, 0x1a,0x0, 0x1b,0x0,
+       0x1d,0xff, 0x1e,0x0, 0x1f,0x73, 0x20,0x67,
+       0x21,0xc1, 0x22,0xca, 0x23,0x74, 0x24,0xc2,
+       0x25,0xc7, 0x26,0xc9, 0x27,0x7f, 0x29,0x0,
+       0x2a,0x0, 0x2b,0xff, 0x2c,0x0, 0x2d,0xff,
+       0x2e,0x0, 0x2f,0xff, 0x30,0x0, 0x31,0xff,
+       0x32,0x0, 0x33,0xff, 0x34,0x0, 0x39,0xff,
+       0x3a,0x0, 0x3b,0xff, 0x3c,0xff, 0x3d,0xff,
+       0x3e,0x0, 0x3f,0xb0, 0x43,0xff, 0x44,0xff,
+       0x46,0xff, 0x47,0x50, 0x4a,0x3, 0x4b,0xc0,
+       0x4c,0x0, 0x4d,0x0, 0x4e,0xf, 0x5d,0x77,
+       0x5c,0x0, 0x5f,0x33, 0x40,0x1
+};
+
+static void pnp_enter_ext_func_mode(device_t dev)
 {
-       outb(0x87, dev->path.u.pnp.port);
-       outb(0x87, dev->path.u.pnp.port);
+       outb(0x87, dev->path.pnp.port);
+       outb(0x87, dev->path.pnp.port);
 }
 
-static void pnp_exit_ext_func_mode(device_t dev) 
+static void pnp_exit_ext_func_mode(device_t dev)
 {
-       outb(0xaa, dev->path.u.pnp.port);
+       outb(0xaa, dev->path.pnp.port);
 }
 
 static void vt1211_set_iobase(device_t dev, unsigned index, unsigned iobase)
 {
-
-       switch (dev->path.u.pnp.device) {
+       switch (dev->path.pnp.device) {
                case VT1211_FDC:
                case VT1211_PP:
                case VT1211_SP1:
@@ -74,14 +74,13 @@ static void vt1211_set_iobase(device_t dev, unsigned index, unsigned iobase)
                        pnp_write_config(dev, index + 1, iobase & 0xff);
                        break;
        }
-       
 }
 
 static void init_hwm(unsigned long base)
 {
        int i;
 
-       // initialize vt1211 hardware monitor registers, which are at 0xECXX
+       /* initialize vt1211 hardware monitor registers, which are at 0xECXX */
        for(i = 0; i < sizeof(vt1211hwmonitorinits); i += 2) {
                        outb(vt1211hwmonitorinits[i + 1],
                                        base + vt1211hwmonitorinits[i]);
@@ -97,7 +96,7 @@ static void vt1211_init(struct device *dev)
                return;
        }
 
-       switch (dev->path.u.pnp.device) {
+       switch (dev->path.pnp.device) {
        case VT1211_FDC:
        case VT1211_PP:
                break;
@@ -114,15 +113,13 @@ static void vt1211_init(struct device *dev)
                init_hwm(res0->base);
                break;
        default:
-               printk_info("vt1211 asked to initialise unknown device!\n");
+               printk(BIOS_INFO, "vt1211 asked to initialise unknown device!\n");
        }
-       
-
 }
 
 void vt1211_pnp_enable_resources(device_t dev)
 {
-       printk_debug("%s - enabling\n",dev_path(dev));
+       printk(BIOS_DEBUG, "%s - enabling\n",dev_path(dev));
        pnp_enter_ext_func_mode(dev);
        pnp_enable_resources(dev);
        pnp_exit_ext_func_mode(dev);
@@ -134,11 +131,11 @@ void vt1211_pnp_set_resources(struct device *dev)
        struct resource *resource;
 
 #if CONFIG_CONSOLE_SERIAL8250 == 1
-       if( dev->path.u.pnp.device == 2 ){
+       if( dev->path.pnp.device == 2 ){
                for( i = 0 ; i < dev->resources; i++){
                        resource = &dev->resource[i];
                        resource->flags |= IORESOURCE_STORED;
-                       report_resource_stored(dev, resource, "");      
+                       report_resource_stored(dev, resource, "");
                }
                return;
        }
@@ -151,7 +148,7 @@ void vt1211_pnp_set_resources(struct device *dev)
        for(i = 0; i < dev->resources; i++) {
                resource = &dev->resource[i];
                if (!(resource->flags & IORESOURCE_ASSIGNED)) {
-                       printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
+                       printk(BIOS_ERR, "ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
                                dev_path(dev), dev->resource->index,
                                resource_type(resource),
                                resource->size);
@@ -169,13 +166,13 @@ void vt1211_pnp_set_resources(struct device *dev)
                        pnp_set_irq(dev, resource->index, resource->base);
                }
                else {
-                       printk_err("ERROR: %s %02x unknown resource type\n",
+                       printk(BIOS_ERR, "ERROR: %s %02x unknown resource type\n",
                                dev_path(dev), resource->index);
                        return;
                }
                resource->flags |= IORESOURCE_STORED;
 
-               report_resource_stored(dev, resource, "");      
+               report_resource_stored(dev, resource, "");
        }
 
        pnp_exit_ext_func_mode(dev);
@@ -209,10 +206,10 @@ static struct pnp_info pnp_dev_info[] = {
 
 static void enable_dev(struct device *dev)
 {
-       printk_debug("vt1211 enabling PNP devices.\n");
+       printk(BIOS_DEBUG, "vt1211 enabling PNP devices.\n");
        pnp_enable_devices(dev,
                        &ops,
-                       sizeof(pnp_dev_info) / sizeof(pnp_dev_info[0]),
+                       ARRAY_SIZE(pnp_dev_info),
                        pnp_dev_info);
 }