Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / devices / pnp_device.c

diff --git a/src/devices/pnp_device.c b/src/devices/pnp_device.c
index 8b5acecfcf766f0aa30496f17e3b69d17febb70f..469487d1d26f8007eaa7a2823e52c573c88bf976 100644 (file)
--- a/src/devices/pnp_device.c
+++ b/src/devices/pnp_device.c
@@ -34,19 +34,19 @@
 
 void pnp_write_config(device_t dev, uint8_t reg, uint8_t value)
 {
-       outb(reg, dev->path.u.pnp.port);
-       outb(value, dev->path.u.pnp.port + 1);
+       outb(reg, dev->path.pnp.port);
+       outb(value, dev->path.pnp.port + 1);
 }
 
 uint8_t pnp_read_config(device_t dev, uint8_t reg)
 {
-       outb(reg, dev->path.u.pnp.port);
-       return inb(dev->path.u.pnp.port + 1);
+       outb(reg, dev->path.pnp.port);
+       return inb(dev->path.pnp.port + 1);
 }
 
 void pnp_set_logical_device(device_t dev)
 {
-       pnp_write_config(dev, 0x07, dev->path.u.pnp.device & 0xff);
+       pnp_write_config(dev, 0x07, dev->path.pnp.device & 0xff);
 }
 
 void pnp_set_enable(device_t dev, int enable)
@@ -55,7 +55,7 @@ void pnp_set_enable(device_t dev, int enable)
 
        tmp = pnp_read_config(dev, 0x30);
        /* handle the virtual devices, which share same LDN register */
-       bitpos = (dev->path.u.pnp.device >> 8) & 0x7;
+       bitpos = (dev->path.pnp.device >> 8) & 0x7;
 
        if (enable) {
                tmp |= (1 << bitpos);
@@ -70,7 +70,7 @@ int pnp_read_enable(device_t dev)
        uint8_t tmp, bitpos;
        tmp = pnp_read_config(dev, 0x30);
        /* handle the virtual devices, which share same LDN register */
-       bitpos = (dev->path.u.pnp.device >> 8) & 0x7;
+       bitpos = (dev->path.pnp.device >> 8) & 0x7;
        return !!(tmp & (1 << bitpos));
 }
 
@@ -103,7 +103,7 @@ void pnp_read_resources(device_t dev)
 static void pnp_set_resource(device_t dev, struct resource *resource)
 {
        if (!(resource->flags & IORESOURCE_ASSIGNED)) {
-               printk_err("ERROR: %s %02lx %s size: 0x%010Lx not assigned\n",
+               printk(BIOS_ERR, "ERROR: %s %02lx %s size: 0x%010Lx not assigned\n",
                        dev_path(dev), resource->index,
                        resource_type(resource),
                        resource->size);
@@ -121,7 +121,7 @@ static void pnp_set_resource(device_t dev, struct resource *resource)
                pnp_set_irq(dev, resource->index, resource->base);
        }
        else {
-               printk_err("ERROR: %s %02lx unknown resource type\n",
+               printk(BIOS_ERR, "ERROR: %s %02lx unknown resource type\n",
                        dev_path(dev), resource->index);
                return;
        }
@@ -172,11 +172,11 @@ static void pnp_get_ioresource(device_t dev, unsigned index, struct io_info *inf
        unsigned moving, gran, step;
 
        resource = new_resource(dev, index);
-       
+
        /* Initilize the resource */
        resource->limit = 0xffff;
        resource->flags |= IORESOURCE_IO;
-       
+
        /* Get the resource size */
        moving = info->mask;
        gran = 15;
@@ -240,10 +240,28 @@ static void get_resources(device_t dev, struct pnp_info *info)
                resource = new_resource(dev, PNP_IDX_DRQ1);
                resource->size = 1;
                resource->flags |= IORESOURCE_DRQ;
-       }       
-} 
+       }
+       /* These are not IRQs, but set the flag to have the
+        * resource allocator do the right thing
+        */
+       if (info->flags & PNP_EN) {
+               resource = new_resource(dev, PNP_IDX_EN);
+               resource->size = 1;
+               resource->flags |= IORESOURCE_IRQ;
+       }
+       if (info->flags & PNP_MSC0) {
+               resource = new_resource(dev, PNP_IDX_MSC0);
+               resource->size = 1;
+               resource->flags |= IORESOURCE_IRQ;
+       }
+       if (info->flags & PNP_MSC1) {
+               resource = new_resource(dev, PNP_IDX_MSC1);
+               resource->size = 1;
+               resource->flags |= IORESOURCE_IRQ;
+       }
+}
 
-void pnp_enable_devices(device_t base_dev, struct device_operations *ops, 
+void pnp_enable_devices(device_t base_dev, struct device_operations *ops,
        unsigned functions, struct pnp_info *info)
 {
        struct device_path path;
@@ -251,19 +269,19 @@ void pnp_enable_devices(device_t base_dev, struct device_operations *ops,
        int i;
 
        path.type       = DEVICE_PATH_PNP;
-       path.u.pnp.port = base_dev->path.u.pnp.port;
-       
+       path.pnp.port = base_dev->path.pnp.port;
+
        /* Setup the ops and resources on the newly allocated devices */
        for(i = 0; i < functions; i++) {
                /* Skip logical devices this Super I/O doesn't have. */
                if (info[i].function == -1)
                        continue;
 
-               path.u.pnp.device = info[i].function;
+               path.pnp.device = info[i].function;
                dev = alloc_find_dev(base_dev->bus, &path);
-               
+
                /* Don't initialize a device multiple times */
-               if (dev->ops) 
+               if (dev->ops)
                        continue;
 
                if (info[i].ops == 0) {