Changeset 164 for trunk/src/os2ahci/ahci.c

Timestamp:

Jul 17, 2013, 8:31:34 PM (12 years ago)

Author:

David Azarewicz

Message:

Debug output updates

File:

• trunk/src/os2ahci/ahci.c (modified) (4 diffs)

trunk/src/os2ahci/ahci.c

@@ -128 +128 @@
   u32 version;
 
-  aprintf("AHCI global controller registers:\n");
+  aprintf("AHCI global registers for adapter %d:%d:%d irq=%d addr=0x%lx\n",
+      ai->bus, ai->dev_func>>3, ai->dev_func&7, ai->irq, ai->mmio_phys);
+
   for (i = 0; i <= HOST_CAP2; i += sizeof(u32)) {
     u32 val;
@@ -1236 +1238 @@
 
     if (rc) {
-      dprintf("timeout for IORB %Fp\n", iorb);
+      dprintf(" timeout for IORB %Fp", iorb);
       iorb_seterr(iorb, IOERR_ADAPTER_TIMEOUT);
     } else if (readl(port_mmio + PORT_SCR_ERR) != 0 ||
                readl(port_mmio + PORT_TFDATA) & 0x89) {
-      dprintf("polled cmd error for IORB %Fp\n", iorb);
+      dprintf(" polled cmd error for IORB %Fp", iorb);
       iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
       ahci_reset_port(ai, iorb_unit_port(iorb), 0);
@@ -1251 +1253 @@
       }
     }
+    ddprintf("\n");
   }
 
@@ -1309 +1312 @@
   /* check error condition */
   if ((tmp = readl(port_mmio + PORT_SCR_ERR)) != 0) {
-    dprintf("SERR = 0x%08lx\n", tmp);
+    dprintf(" SERR = 0x%08lx", tmp);
     rc = 1;
   }
   if (((tmp = readl(port_mmio + PORT_TFDATA)) & 0x89) != 0) {
-    dprintf("TFDATA = 0x%08lx\n", tmp);
+    dprintf(" TFDATA = 0x%08lx", tmp);
     rc = 1;
   }
 
   if (rc) {
+    ddprintf("failed\n");
     ahci_reset_port(ai, p, 0);
     return(-1);
   }
+  ddprintf("success\n");
   return(0);
 }