Changeset 430 in xtideuniversalbios

Timestamp:

Jun 3, 2012, 8:29:57 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Server: Fixed support for CHS when LBA is also available.

File:

• trunk/Serial_Server/library/Image.cpp (modified) (3 diffs)

trunk/Serial_Server/library/Image.cpp

@@ -112 +112 @@
     }
 
-    if( p_useCHS )
-    {
-        if( p_cyl )
+    if( p_cyl )
+    {
+        if( (p_sect > 255 || p_sect < 1) || (p_head > 16 || p_head < 1) || (p_cyl > 65536 || p_cyl < 1) )
+            log( -1, "'%s', parts of the CHS geometry (%lu:%lu:%lu) are out of the range (1-65536:1-16:1-255)", name, p_cyl, p_head, p_sect );
+        else if( totallba != (p_sect * p_head * p_cyl) )
+            log( -1, "'%s', file size does not match geometry", name );
+        sect = p_sect;
+        head = p_head;
+        cyl = p_cyl;
+    }
+    else
+    {
+        if( totallba > 65536*16*63 )
         {
-            if( p_sect > 63 || (p_head > 16 || p_head < 1) || (p_cyl > 1024 || p_cyl < 1) )
-                log( -1, "'%s', parts of the CHS geometry (%lu:%lu:%lu) are out of the range (1-1024:1-16:1-63)", name, p_cyl, p_head, p_sect );
-            else if( totallba != (p_sect * p_head * p_cyl) )
-                log( -1, "'%s', file size does not match geometry", name );
-            sect = p_sect;
-            head = p_head;
-            cyl = p_cyl;
+            log( 0, "'%s': Warning: Image size is greater than derived standard CHS maximum, limiting CHS to 65535:16:63, consider using -g to specify geometry", name );
+            cyl = 65536;
+            head = 16;
+            sect = 63;
         }
-        else
+        else if( (totallba % 16) != 0 || ((totallba/16) % 63) != 0 )
         {
-            if( (totallba % 16) != 0 || ((totallba/16) % 63) != 0 )
-                log( -1, "'%s', file size does not match standard CHS geometry (x:16:63), please specify geometry explicitly with -g", name );
-            else
+            log( -1, "'%s', file size does not match standard CHS geometry (x:16:63), please specify geometry explicitly with -g", name );
+        }
+        else 
+        {
+            sect = 63;
+            head = 16;
+            cyl = (totallba / sect / head);
+            if( cyl > 65536 )
             {
-                sect = 63;
-                head = 16;
-                cyl = (totallba / sect / head);
-                if( cyl > 1024 )
-                    log( -1, "'%s', CHS geometry of %lu:%lu:%lu is larger than maximum values 1024:16:63", name, cyl, head, sect );
+                log( -1, "'%s', derived standard CHS geometry of %lu:16:63 is has more cylinders than 65536, please specify geometry explicitly with -g", name, cyl, head, sect );
             }
         }
     }
-    else
-    {
-        sect = 0;
-        head = 0;
-        cyl = 0;
-    }
+
     useCHS = p_useCHS;
 
@@ -157 +160 @@
              name, (floppy ? "Floppy Disk" : "Hard Disk"), cyl, head, sect, sizef, sizeChar );
     else
-        log( 0, "%s: %s with total sectors %lu, size %.2lf %cB", 
-             name, (floppy ? "Floppy Disk" : "Hard Disk"), totallba, sizef, sizeChar );
+        log( 0, "%s: %s with %lu LBA sectors, size %.2lf %cB (CHS geometry %u:%u:%u)", 
+             name, (floppy ? "Floppy Disk" : "Hard Disk"), totallba, sizef, sizeChar, cyl, head, sect );
 }
 
@@ -296 +299 @@
     flipEndian( &buff[ATA_strFirmware], ATA_strFirmware_Length );
 
-    if( useCHS )
-    {
-        buff[ ATA_wCylCnt ] = cyl;
-        buff[ ATA_wHeadCnt ] = head;
-        buff[ ATA_wSPT ] = sect;
-    }
-    else
+    buff[ ATA_wCylCnt ] = cyl;
+    buff[ ATA_wHeadCnt ] = head;
+    buff[ ATA_wSPT ] = sect;
+
+    if( !useCHS )
     {
         buff[ ATA_wCaps ] = ATA_wCaps_LBA;