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

Timestamp:

Feb 29, 2012, 6:13:11 PM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Increased the width of the drive Model name that the boot menu display, better accomodating serial drives on auto detect which include the COM port and baud rate information.

File:

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

trunk/Serial_Server/library/Image.cpp

@@ -192 +192 @@
 
 #define ATA_strModel 27
-#define ATA_strModel_Length 40
+#define ATA_strModel_Length 40                 // Maximum allowable length of the string according to the ATA spec
+#define XTIDEBIOS_strModel_Length 30           // Maximum length copied out of the ATA information by the BIOS
 
 #define ATA_wCaps 49
@@ -240 +241 @@
 {
     char formatBuff[ 128 ];
+    char speedBuff[ 128 ];
 
     memset( &buff[0], 0, 514 );
@@ -256 +258 @@
 
         if( comPort )
-            sprintf( formatBuff, "%.15s (COM%c/%s) ", shortFileName, comPort, baudRate->display );
+            sprintf( speedBuff, " (COM%c/%s)", comPort, baudRate->display );
         else
-            sprintf( formatBuff, "%.25s (%s baud) ", shortFileName, baudRate->display );
+            sprintf( speedBuff, " (%s baud)", shortFileName, baudRate->display );
+
+        sprintf( formatBuff, "%.*s%s ", XTIDEBIOS_strModel_Length - strlen(speedBuff), shortFileName, speedBuff );
     }
     else
-        sprintf( formatBuff, "%.30s ", shortFileName );
+        sprintf( formatBuff, "%.*s ", XTIDEBIOS_strModel_Length, shortFileName );
     strncpy( (char *) &buff[ATA_strModel], formatBuff, ATA_strModel_Length );
     flipEndian( &buff[ATA_strModel], ATA_strModel_Length );
@@ -302 +306 @@
     buff[ ATA_wGenCfg ] = ATA_wGenCfg_FIXED;
 }
+