PNP: in debug resource dump, make empty list obvious

[deliverable/linux.git] / drivers / pnp / support.c

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index e848b794e31293c0591c5e728309bc41cf5c2be9..0ad42db948843ed4a761ff50367d02a3c309195b 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)
@@ -45,9 +49,71 @@ void pnp_eisa_id_to_string(u32 id, char *str)
        str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
        str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
        str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
-       str[3] = hex_asc((id >> 12) & 0xf);
-       str[4] = hex_asc((id >>  8) & 0xf);
-       str[5] = hex_asc((id >>  4) & 0xf);
-       str[6] = hex_asc((id >>  0) & 0xf);
+       str[3] = hex_asc_hi(id >> 8);
+       str[4] = hex_asc_lo(id >> 8);
+       str[5] = hex_asc_hi(id);
+       str[6] = hex_asc_lo(id);
        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;
+
+       if (list_empty(&dev->resources)) {
+               dev_dbg(&dev->dev, "%s: no current resources\n", desc);
+               return;
+       }
+
+       dev_dbg(&dev->dev, "%s: current resources:\n", desc);
+       list_for_each_entry(pnp_res, &dev->resources, list) {
+               res = &pnp_res->res;
+
+               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
+}