Changeset 217 in xtideuniversalbios for trunk/Serial_Server/library/Image.cpp

Timestamp:

Jan 23, 2012, 10:08:13 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Server: various improvements, turned on LBA28 support by default.

File:

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

trunk/Serial_Server/library/Image.cpp

@@ -13 +13 @@
 Image::Image( char *name, int p_readOnly, int p_drive )
 {
-    init( name, p_readOnly, p_drive );
 }
 
 Image::Image( char *name, int p_readOnly, int p_drive, int p_create, unsigned long p_lba )
 {
-    init( name, p_readOnly, p_drive );
-}
-
-Image::Image( char *name, int p_readOnly, int p_drive, int p_create, unsigned long p_cyl, unsigned long p_sect, unsigned long p_head )
-{
-    init( name, p_readOnly, p_drive );
-}
-
-void Image::init( char *name, int p_readOnly, int p_drive )
-{
+}
+
+Image::Image( char *name, int p_readOnly, int p_drive, int p_create, unsigned long p_cyl, unsigned long p_head, unsigned long p_sect, int p_useCHS )
+{
+}
+
+void Image::init( char *name, int p_readOnly, int p_drive, unsigned long p_cyl, unsigned long p_head, unsigned long p_sect, int p_useCHS )
+{
+    double sizef;
+
     for( char *c = shortFileName = name; *c; c++ )
         if( *c == '\\' || *c == '/' || *c == ':' )
@@ -40 +39 @@
     readOnly = p_readOnly;
     drive = p_drive;
-}
-
-int Image::parseGeometry( char *str, unsigned long *p_cyl, unsigned long *p_sect, unsigned long *p_head )
+
+    if( totallba > 0xfffffff )     // lba28 limit - 28 bits
+        log( -1, "'%s', Image size larger than LBA28 maximum of 137,438,952,960 bytes, %lu", name, totallba );
+
+    if( totallba == 0 )
+        log( -1, "'%s', Image size zero?" );
+
+    if( p_useCHS )
+    {
+        if( p_cyl )
+        {
+            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;
+        }
+        else
+        {
+            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
+            {
+                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 );
+            }
+        }
+    }
+    else
+    {
+        sect = 0;
+        head = 0;
+        cyl = 0;
+    }
+    useCHS = p_useCHS;
+
+    sizef = totallba/2048.0;
+    if( useCHS )
+        log( 0, "Opening '%s', CHS geometry %u:%u:%u, total size %.1lf MB", name, cyl, sect, head, sizef );
+    else
+        log( 0, "Opening '%s', total lba %lu, total size %.1lf MB", name, totallba, sizef );
+}
+
+int Image::parseGeometry( char *str, unsigned long *p_cyl, unsigned long *p_head, unsigned long *p_sect )
 {
     char *c, *s, *h;
@@ -48 +93 @@
 
     c = str;
-    for( s = c; *s && *s != ':' && *s != 'x' && *s != 'X'; s++ ) ;
+    for( h = c; *h && *h != ':' && *h != 'x' && *h != 'X'; h++ ) ;
+    if( !*h )
+        return( 0 );
+
+    *h = '\0';
+    h++;
+    for( s = h+1; *s && *s != ':' && *s != 'x' && *s != 'X'; s++ ) ; 
     if( !*s )
         return( 0 );
@@ -54 +105 @@
     *s = '\0';
     s++;
-    for( h = s+1; *h && *h != ':' && *h != 'x' && *h != 'X'; h++ ) ; 
-    if( !*h )
-        return( 0 );
-
-    *h = '\0';
-    h++;
 
     cyl = atol(c);
+    head = atol(h);
     sect = atol(s);
-    head = atol(h);
 
     if( cyl == 0 || sect == 0 || head == 0 )
@@ -69 +114 @@
 
     *p_cyl = cyl;
+    *p_head = head;
     *p_sect = sect;
-    *p_head = head;
 
     return( 1 );
@@ -145 +190 @@
         buff[t] = (buff[t] >> 8) | (buff[t] << 8);
 
-#if 1
-    buff[ ATA_wCylCnt ] = cyl;
-    buff[ ATA_wHeadCnt ] = head;
-    buff[ ATA_wSPT ] = sect;
-#endif
+    if( useCHS )
+    {
+        buff[ ATA_wCylCnt ] = cyl;
+        buff[ ATA_wHeadCnt ] = head;
+        buff[ ATA_wSPT ] = sect;
+    }
+    else
+    {
+        buff[ ATA_wCaps ] = ATA_wCaps_LBA;
+        buff[ ATA_dwLBACnt ] = (unsigned short) (totallba & 0xffff);
+        buff[ ATA_dwLBACnt+1 ] = (unsigned short) (totallba >> 16);
+    }
+
     buff[ ATA_wGenCfg ] = ATA_wGenCfg_FIXED;
     //                  buff[ ATA_VendorSpecific_ReturnPortBaud ] = retWord;
-#if 0
-    buff[ ATA_wCaps ] = ATA_wCaps_LBA;
-  
-    buff[ ATA_dwLBACnt ] = (unsigned short) (totallba & 0xffff);
-    buff[ ATA_dwLBACnt+1 ] = (unsigned short) (totallba >> 16);
-#endif
-}
+}