Changeset 284 in xtideuniversalbios

Timestamp:

Feb 29, 2012, 6:13:11 PM (13 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.

Location:

trunk

Files:

• Serial_Server/library/Image.cpp (modified) (4 diffs)
• Serial_Server/win32/Win32Serial.h (modified) (1 diff)
• XTIDE_Universal_BIOS/Inc/BootMenu.inc (modified) (2 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;
 }
+

trunk/Serial_Server/win32/Win32Serial.h

@@ -46 +46 @@
                 log( -1, "Could not ConnectNamedPipe" );
 
-            if( baudRate->divisor > 3 )
+            if( baudRate->divisor > 0x80 )
                 log( -1, "Cannot simulate baud rates with hardware multipliers" );
 

trunk/XTIDE_Universal_BIOS/Inc/BootMenu.inc

@@ -19 +19 @@
 ; Boot Menu Information Table. These are generated for all XTIDE Universal
 ; BIOS drives. Available only until boot is successfull.
-MAX_HARD_DISK_NAME_LENGTH               EQU     26      ; Bytes reserved for drive name
+MAX_HARD_DISK_NAME_LENGTH               EQU     30      ; Bytes reserved for drive name
 
 struc BOOTMENUINFO
     .szDrvName      resb    MAX_HARD_DISK_NAME_LENGTH
                     resb    2       ; Zero word (ensures string terminates)
-                    resb    8       ; padding to make BOOTMENUINFO size an even multiple of DPT size
+                    resb    4       ; padding to make BOOTMENUINFO size an even multiple of DPT size
 endstruc
 
@@ -30 +30 @@
 
 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS                
+
+%if MAX_HARD_DISK_NAME_LENGTH % 2 <> 0 
+%error "MAX_HARD_DISK_NAME_LENGTH needs to be a multiple of 2, memory is moved with word operations."
+%endif
 
 %if BOOTMENUINFO_size % LARGEST_DPT_SIZE <> 0