PNP: replace pnp_resource_table with dynamically allocated resources

[safe/jmp/linux-2.6] / drivers / pnp / support.c

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 95b076c..1566e4a 100644 (file)
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -16,6 +16,10 @@
  */
 int pnp_is_active(struct pnp_dev *dev)
 {
+       /*
+        * I don't think this is very reliable because pnp_disable_dev()
+        * only clears out auto-assigned resources.
+        */
        if (!pnp_port_start(dev, 0) && pnp_port_len(dev, 0) <= 1 &&
            !pnp_mem_start(dev, 0) && pnp_mem_len(dev, 0) <= 1 &&
            pnp_irq(dev, 0) == -1 && pnp_dma(dev, 0) == -1)
@@ -52,39 +56,59 @@ void pnp_eisa_id_to_string(u32 id, char *str)
        str[7] = '\0';
 }
 
+char *pnp_resource_type_name(struct resource *res)
+{
+       switch (pnp_resource_type(res)) {
+       case IORESOURCE_IO:
+               return "io";
+       case IORESOURCE_MEM:
+               return "mem";
+       case IORESOURCE_IRQ:
+               return "irq";
+       case IORESOURCE_DMA:
+               return "dma";
+       }
+       return NULL;
+}
+
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
 {
 #ifdef DEBUG
+       char buf[128];
+       int len = 0;
+       struct pnp_resource *pnp_res;
        struct resource *res;
-       int i;
 
        dev_dbg(&dev->dev, "current resources: %s\n", desc);
+       list_for_each_entry(pnp_res, &dev->resources, list) {
+               res = &pnp_res->res;
 
-       for (i = 0; i < PNP_MAX_IRQ; i++) {
-               res = pnp_get_resource(dev, IORESOURCE_IRQ, i);
-               if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  irq %lld flags %#lx\n",
-                               (unsigned long long) res->start, res->flags);
-       }
-       for (i = 0; i < PNP_MAX_DMA; i++) {
-               res = pnp_get_resource(dev, IORESOURCE_DMA, i);
-               if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  dma %lld flags %#lx\n",
-                               (unsigned long long) res->start, res->flags);
-       }
-       for (i = 0; i < PNP_MAX_PORT; i++) {
-               res = pnp_get_resource(dev, IORESOURCE_IO, i);
-               if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx\n",
-                               (unsigned long long) res->start,
-                               (unsigned long long) res->end, res->flags);
-       }
-       for (i = 0; i < PNP_MAX_MEM; i++) {
-               res = pnp_get_resource(dev, IORESOURCE_MEM, i);
-               if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx\n",
-                               (unsigned long long) res->start,
-                               (unsigned long long) res->end, res->flags);
+               len += snprintf(buf + len, sizeof(buf) - len, "  %-3s ",
+                               pnp_resource_type_name(res));
+
+               if (res->flags & IORESOURCE_DISABLED) {
+                       dev_dbg(&dev->dev, "%sdisabled\n", buf);
+                       continue;
+               }
+
+               switch (pnp_resource_type(res)) {
+               case IORESOURCE_IO:
+               case IORESOURCE_MEM:
+                       len += snprintf(buf + len, sizeof(buf) - len,
+                                       "%#llx-%#llx flags %#lx",
+                                       (unsigned long long) res->start,
+                                       (unsigned long long) res->end,
+                                       res->flags);
+                       break;
+               case IORESOURCE_IRQ:
+               case IORESOURCE_DMA:
+                       len += snprintf(buf + len, sizeof(buf) - len,
+                                       "%lld flags %#lx",
+                                       (unsigned long long) res->start,
+                                       res->flags);
+                       break;
+               }
+               dev_dbg(&dev->dev, "%s\n", buf);
        }
 #endif
 }