Changeset 193 for trunk/src/os2ahci/trace.c

Timestamp:

Dec 12, 2017, 11:08:37 PM (8 years ago)

Author:

David Azarewicz

Message:

Fixed IOCtl pass-thru interface.
Cosmetic changes to user interface.
Removed old IBM smartctl exe from distribution.

File:

• trunk/src/os2ahci/trace.c (modified) (3 diffs)

trunk/src/os2ahci/trace.c

@@ -25 +25 @@
   int p;
   int d;
+  int iFlag;
 
   for (a = 0; a < ad_info_cnt; a++)
@@ -37 +38 @@
       ai->bios_config[HOST_VERSION / sizeof(u32)]);
 
-    for (p = 0; p <= ai->port_max; p++)
+    for (p = 0; p < ai->hw_ports; p++)
     {
       P_INFO *pi = &ai->ports[p];
-
-      dprintf(0,"  Port %d:\n", p);
+      iFlag = 1;
 
       for (d = 0; d <= pi->dev_max; d++)
       {
-        if (!pi->devs[d].present)
+        if (pi->devs[d].present)
         {
-          dprintf(0,"    No drive present\n");
-        } else {
+          if (iFlag) dprintf(0,"  Port %d:\n", p);
+          iFlag = 0;
           dprintf(0,"    Drive %d:", d);
           if (pi->devs[d].atapi) dprintf(0," atapi");
@@ -60 +60 @@
           dprintf(0,"\n");
           dprintf(0,"             Model: %s\n", pi->devs[d].dev_name);
+        }
+        else if (verbosity > 0)
+        {
+          if (iFlag) dprintf(0,"  Port %d:\n", p);
+          iFlag = 0;
+          dprintf(0,"    No drive present\n");
         } /* if */
       } /* for d */