Changeset 157 for trunk/src/os2ahci/ata.c

Timestamp:

May 8, 2013, 5:10:33 PM (12 years ago)

Author:

David Azarewicz

Message:

Fixed up timer functions

File:

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

trunk/src/os2ahci/ata.c

@@ -443 +443 @@
 int check_lvm(IORBH _far *iorb, ULONG sector)
 {
-  ADD_WORKSPACE _far *aws = add_workspace(iorb);
+  DLA_Table_Sector *pDLA = (DLA_Table_Sector*)add_workspace(iorb)->buf;
   AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
   GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
-  PDLA_Table_Sector pDLA;
   int p = iorb_unit_port(iorb);
   int rc;
@@ -453 +452 @@
          AP_SECTOR_28, (u32) sector-1,
          AP_COUNT, (u16) 1,
-         AP_VADDR, (void _far *) aws->buf, 512,
+         AP_VADDR, (void _far *) pDLA, 512,
          AP_DEVICE, 0x40,
          AP_END);
   if (rc) return 0;
 
-  pDLA = (PDLA_Table_Sector)aws->buf;
   ddphex(pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
 
   if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2)) {
-    ddprintf("is_lvm_geometry found at sector %d\n", sector);
+    ddprintf("is_lvm_geometry found at sector %d\n", sector-1);
     geometry->TotalCylinders = pDLA->Cylinders;
     geometry->NumHeads = pDLA->Heads_Per_Cylinder;
     geometry->SectorsPerTrack = pDLA->Sectors_Per_Track;
+    geometry->TotalSectors = pDLA->Cylinders * pDLA->Heads_Per_Cylinder * pDLA->Sectors_Per_Track;
     return 1;
   }
@@ -605 +604 @@
   if (is_lvm_geometry(iorb)) Method = "LVM";
 
-  if (debug) {
-    printf("Drive geometry: %d cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
-        (u16) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
-        (u32) (geometry->TotalSectors / 2048), Method);
-  }
+  dprintf("Drive geometry: %ld cylinders, %d heads, %d sectors per track (%ldMB) (%s)\n",
+      (u32) geometry->TotalCylinders, (u16) geometry->NumHeads, (u16) geometry->SectorsPerTrack,
+      (u32) (geometry->TotalSectors / 2048), Method);
 
   /* tell interrupt handler that this IORB is complete */