Changeset 233 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Strings.asm

Timestamp:

Feb 4, 2012, 6:21:22 PM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Port: split single byte port and baud into two bytes, taking advantage of the two bytes in DPT_SERIAL, which supports more serial baud rates and in particular fixed a bug where a 4x client machine couldn't talk to a 115.2K server machine. This is a wide change, touching lots of files, but most are shallow changes. DetectPrint.asm took the most significant changes, now it calculates the baud rate to display instead of using characters provided by the Configurator. The Configurator now has a new menu flag, FLG_MENUITEM_CHOICESTRINGS, for specifying that values are not linear and they should be lookedup rather than indexed. Finally, another important bug fixed here is that in some error cases, the serial port code could get into an infinite loop waiting ont the hardware; now it has a timeout.

File:

• trunk/XTIDE_Universal_BIOS/Src/Strings.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Src/Strings.asm

@@ -12 +12 @@
 g_szRomAt:      db  "%s @ %x",LF,CR,NULL
 
-g_szMaster:             db  "IDE Master at ",NULL 
-g_szSlave:              db  "IDE Slave  at ",NULL
-g_szDetect:             db  "%s%x: ",NULL                      ; IDE Master at 1F0h:
-g_szDetectCOM:          db  "%sCOM%c/%u%c: ",NULL              ; IDE Master at COM1/115K:       
-g_szDetectCOMAuto:      db  "%sCOM Detect: ",NULL              ; IDE Master at COM Detect:
+; The following strings are used by DetectPrint_StartDetectWithMasterOrSlaveStringInAXandIdeVarsInCSBP
+; To support an optimization in that code, these strings must start on the same 256 byte page, 
+; which is checked at assembly time below.
+;
+g_szDetectStart:        
+g_szDetectMaster:       db  "Master",NULL 
+g_szDetectSlave:        db  "Slave ",NULL
+g_szDetectOuter:        db  "IDE %s at %s: ",NULL
+g_szDetectPort:         db  "%x",NULL                       ; IDE Master at 1F0h:
+g_szDetectCOM:          db  "COM%c%s",NULL            
+g_szDetectCOMAuto:      db  " Auto",NULL
+g_szDetectCOMSmall:     db  "/%u%u00",NULL                  ; IDE Master at COM1/9600:
+g_szDetectEnd:
+g_szDetectCOMLarge:     db  "/%u.%uK",NULL                  ; IDE Master at COM1/19.2K:
+        
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS                
+%if ((g_szDetectEnd-$$) & 0xff00) <> ((g_szDetectStart-$$) & 0xff00)
+%error "g_szDetect* strings must be on the same 256 byte page, required by DetectPrint_StartDetectWithMasterOrSlaveStringInAXandIdeVarsInCSBP.  Please move this block up or down within strings.asm"
+%endif
+%endif              
                 
 ; Boot loader strings
@@ -137 +152 @@
 ;$translate{200}      = 18;    # DOUBLE_BOTTOM_LEFT_CORNER
 ;$translate{181}      = 19;    # DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL
+;$translate{ord('0')} = 20;    # DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL      
 ;
 ; Formats begin immediately after the last Translated character (they are in the same table)
 ;
-;$format_begin = 20;
+;$format_begin = 21;
 ;
-;$format{"s"}   = 20;        # n/a
 ;$format{"c"}   = 21;        # n/a
 ;$format{"2-I"} = 22;        # must be even
@@ -152 +167 @@
 ;$format{"2-u"} = 28;        # must be even
 ;$format{"A"}   = 29;        # n/a
+;$format{"s"}   = 30;        # n/a      
 ;
 ; NOTE: The last $format cannot exceed 31 (stored in a 5-bit quantity).