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

Timestamp:

Feb 24, 2012, 10:28:31 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

More optimizations. Merged RamVars_IsFunction/DriveHandledByThisBIOS in with FindDPT_ForDriveNumber, since they are often used together, making a returned NULL DI pointer indicate a foreign drive in many places. Revamped the iteration done in the handlers for int13/0dh and int13h/0h. Added serial specific print string during drive detection.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Strings.asm

@@ -17 +17 @@
 g_szDetectSlave:        db  "Slave ",NULL
 g_szDetectOuter:        db  "IDE %s at %s: ",NULL
+g_szDetectOuterSerial:  db  "Serial %s on %s: ",NULL        
 g_szDetectPort:         db  "%x",NULL                       ; IDE Master at 1F0h:
 g_szDetectCOM:          db  "COM%c%s",NULL
-g_szDetectCOMAuto:      db  " Auto",NULL
+g_szDetectCOMAuto:      db  " Detect",NULL
 g_szDetectCOMSmall:     db  "/%u%u00",NULL                  ; IDE Master at COM1/9600:
 g_szDetectEnd:
@@ -70 +71 @@
     db  "Addr.",SINGLE_VERTICAL,"Block",SINGLE_VERTICAL,"Bus",SINGLE_VERTICAL,  "IRQ",SINGLE_VERTICAL,"Reset",LF,CR
     db     "%s",SINGLE_VERTICAL, "%5-u",SINGLE_VERTICAL, "%s",SINGLE_VERTICAL," %2-I",SINGLE_VERTICAL,"%5-x" ,NULL
-
-; Boot Menu Floppy Disk strings
-;
-; The following strings are used by BootMenuPrint_RefreshInformation
-; To support optimizations in that code, these strings must start on the same 256 byte page,
-; which is checked at assembly time below.
-;
-g_szFddStart:
-g_szFddUnknown: db  "Unknown",NULL
-g_szFddSizeOr:  db  "5",ONE_QUARTER,QUOTATION_MARK," or 3",ONE_HALF,QUOTATION_MARK," DD",NULL
-g_szFddSize:    db  "%s",QUOTATION_MARK,", %u kiB",NULL ; 3½", 1440 kiB
-g_szFddThreeHalf:       db  "3",ONE_HALF,NULL
-g_szFddEnd:
-g_szFddFiveQuarter:     db  "5",ONE_QUARTER,NULL
-
-%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
-    %if ((g_szFddStart-$$) & 0xff00) <> ((g_szFddEnd-$$) & 0xff00)
-        %error "g_szFdd* strings must start on the same 256 byte page, required by the BootMenuPrint_RefreshInformation routines for floppy drives.  Please move this block up or down within strings.asm"
-    %endif
-%endif
 
 g_szAddressingModes:
@@ -151 +132 @@
 g_szDashForZero:        db      "- ",NULL
 
+; Boot Menu Floppy Disk strings
+;
+; The following strings are used by BootMenuPrint_RefreshInformation
+; To support optimizations in that code, these strings must start on the same 256 byte page,
+; which is checked at assembly time below.
+;
+g_szFddStart:
+g_szFddUnknown: db  "Unknown",NULL
+g_szFddSizeOr:  db  "5",ONE_QUARTER,QUOTATION_MARK," or 3",ONE_HALF,QUOTATION_MARK," DD",NULL
+g_szFddSize:    db  "%s",QUOTATION_MARK,", %u kiB",NULL ; 3½", 1440 kiB
+g_szFddThreeHalf:       db  "3",ONE_HALF,NULL
+g_szFddEnd:
+g_szFddFiveQuarter:     db  "5",ONE_QUARTER,NULL
+
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
+    %if ((g_szFddStart-$$) & 0xff00) <> ((g_szFddEnd-$$) & 0xff00)
+        %error "g_szFdd* strings must start on the same 256 byte page, required by the BootMenuPrint_RefreshInformation routines for floppy drives.  Please move this block up or down within strings.asm"
+    %endif
+%endif
 
 ;------------------------------------------------------------------------------------------