Changeset 208

Timestamp:

Feb 26, 2021, 1:33:13 PM (4 years ago)

Author:

David Azarewicz

Message:

Use standardized routines.

File:

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

trunk/src/os2ahci/ata.c

@@ -429 +429 @@
 
   return(rc);
-}
-
-/* Adjust the cylinder count in the physical
- * geometry to the last full cylinder.
- */
-int adjust_cylinders(GEOMETRY64 *geometry, ULONG TotalSectors)
-{
-  USHORT SecPerCyl;
-  int rc = FALSE;
-
-  geometry->TotalSectors = TotalSectors;
-  SecPerCyl = geometry->SectorsPerTrack * geometry->NumHeads;
-  if (SecPerCyl > 0)
-  {
-    ULONG TotalCylinders  = TotalSectors / SecPerCyl;
-
-    geometry->TotalSectors   = TotalCylinders * SecPerCyl;
-    geometry->TotalCylinders = TotalCylinders;
-    if (TotalCylinders >> 16)
-    {
-      geometry->TotalCylinders = 65535;
-      rc = TRUE;
-    }
-  }
-  return (rc);
-}
-
-/* Calculate the logical geometry based on the input physcial geometry
- * using the LBA Assist Translation algorithm.
- */
-#define BIOS_MAX_CYLINDERS       1024l
-#define BIOS_MAX_NUMHEADS         255
-#define BIOS_MAX_SECTORSPERTRACK   63
-void log_geom_calculate_LBA_assist(GEOMETRY64 *geometry, ULONG TotalSectors)
-{
-  UCHAR numSpT   = BIOS_MAX_SECTORSPERTRACK;
-  UCHAR numHeads = BIOS_MAX_NUMHEADS;
-  ULONG Cylinders;
-
-  if (TotalSectors <= (BIOS_MAX_CYLINDERS * 128 * BIOS_MAX_SECTORSPERTRACK))
-  {
-    USHORT temp = (TotalSectors - 1) / (BIOS_MAX_CYLINDERS * BIOS_MAX_SECTORSPERTRACK);
-
-    if (temp < 16)      numHeads = 16;
-    else if (temp < 32) numHeads = 32;
-    else if (temp < 64) numHeads = 64;
-    else                numHeads = 128;
-  }
-
-  do
-  {
-    Cylinders = TotalSectors / (USHORT)(numHeads * numSpT);
-    if (Cylinders >> 16)
-    {
-      if (numSpT < 128)
-        numSpT = (numSpT << 1) | 1;
-      else
-        Cylinders = 65535; // overflow !
-    }
-  } while (Cylinders >> 16);
-
-  geometry->TotalCylinders  = Cylinders;
-  geometry->NumHeads        = numHeads;
-  geometry->SectorsPerTrack = numSpT;
 }
 
@@ -676 +612 @@
 
   if (is_lvm_geometry(pIorb)) Method = "LVM";  /* Writes TotalSectors/ullTotalSectors */
-  else
-  {
-    if (add_workspace(pIorb)->fIs64bit)
-    {
-      geometry->NumHeads        = 255;
-      geometry->SectorsPerTrack = 255;
-      geometry->TotalCylinders  = ullTotalSectors / (255*255);
-      geometry->ullTotalSectors = ullTotalSectors;
-    }
-    else
-    {
-      /* Fixup the geometry in case the geometry reported by the BIOS is bad */
-      if (adjust_cylinders(geometry, ullTotalSectors))  /* Writes TotalSectors */
-      { // cylinder overflow
-        log_geom_calculate_LBA_assist(geometry, ullTotalSectors); /* Does not write TotalSectors */
-        ullTotalSectors = (USHORT)(geometry->NumHeads * geometry->SectorsPerTrack) * (ULONG)geometry->TotalCylinders;
-      }
-      adjust_cylinders(geometry, ullTotalSectors); /* Writes TotalSectors */
-    }
-  }
+  else CalculateLogicalGeometry(geometry, add_workspace(pIorb)->fIs64bit, ullTotalSectors);
   if (add_workspace(pIorb)->fIs64bit) ullTotalSectors = geometry->ullTotalSectors;
   else ullTotalSectors = geometry->TotalSectors;