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

Timestamp:

Aug 9, 2013, 12:17:15 AM (12 years ago)

Author:

David Azarewicz

Message:

Added a check for bad geometries reported by the BIOS and fix them.

File:

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

trunk/src/os2ahci/trace.c

@@ -226 +226 @@
       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];
 
@@ -232 +232 @@
 
       for (d = 0; d <= pi->dev_max; d++) {
-        if (!pi->devs[d].present) continue;
-
-        ntprintf("    Drive %d:", d);
-        if (pi->devs[d].atapi) ntprintf(" atapi");
-        if (pi->devs[d].removable) ntprintf(" removable");
-        if (pi->devs[d].dev_info.Method != NULL)
-          ntprintf(" %d cylinders, %d heads, %d sectors per track (%ldMB) (%s)",
-            pi->devs[d].dev_info.Cylinders, pi->devs[d].dev_info.HeadsPerCylinder, pi->devs[d].dev_info.SectorsPerTrack,
-            pi->devs[d].dev_info.TotalSectors/2048, pi->devs[d].dev_info.Method);
-        ntprintf("\n");
-      }
-    }
-  }
-}
-
+        if (!pi->devs[d].present) {
+          ntprintf("    No drive present\n");
+        } else {
+          ntprintf("    Drive %d:", d);
+          if (pi->devs[d].atapi) ntprintf(" atapi");
+          if (pi->devs[d].removable) ntprintf(" removable");
+          if (pi->devs[d].dev_info.Method != NULL) {
+            ntprintf(" %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)",
+              (u32)pi->devs[d].dev_info.Cylinders, pi->devs[d].dev_info.HeadsPerCylinder, pi->devs[d].dev_info.SectorsPerTrack,
+              pi->devs[d].dev_info.TotalSectors/2048, pi->devs[d].dev_info.Method);
+          } else ntprintf(" Drive present but no information available. Not queried by OS.");
+          ntprintf("\n");
+        } /* if */
+      } /* for d */
+    } /* for p */
+  } /* for a */
+}
+