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

Timestamp:

May 3, 2012, 2:33:46 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Strings.asm updated for MODULE_BOOT_MENU and MODULE_HOTKEYS.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Strings.asm

@@ -25 +25 @@
 SECTION .text
 
+; POST drive detection strings
+g_szDashForZero:    db  "- ",NULL   ; Required by Display Library
+g_szRomAt:          db  LF,CR,"%s @ %x",LF,CR
+                    db  "Released under GNU GPL v2",LF,CR,LF,CR,NULL
+
+
 ; The following strings are used by DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
 ; To support an optimization in that code, these strings must start on the same 256 byte page,
@@ -33 +39 @@
 g_szDetectSlave:        db  "Slave ",NULL
 g_szDetectOuter:        db  "%s at %s: ",NULL
-;%%; %ifdef MODULE_SERIAL       ;%%; is stripped off after string compression, %ifdef won't compress properly
+%ifdef MODULE_SERIAL
 g_szDetectCOM:          db  "COM%c%s",NULL
 g_szDetectCOMAuto:      db  " Detect",NULL
 g_szDetectCOMSmall:     db  "/%u%u00",NULL                  ; IDE Master at COM1/9600:
 g_szDetectCOMLarge:     db  "/%u.%uK",NULL                  ; IDE Master at COM1/19.2K:
-;%%; %endif                     ;%%; is stripped off after string compression, %ifdef won't compress properly
+%endif
 g_szDetectEnd:
 g_szDetectPort:         db  "%x",NULL                       ; IDE Master at 1F0h:
@@ -47 +53 @@
     %endif
 %endif
+
+
+; Boot loader strings
+g_szTryToBoot:          db  "Booting %c",ANGLE_QUOTE_RIGHT,"%c",LF,CR,NULL
+g_szBootSectorNotFound: db  "Boot sector "
+g_szNotFound:           db  "not found",LF,CR,NULL
+g_szReadError:          db  "Error %x!",LF,CR,NULL
+
+
+%ifdef MODULE_HOTKEYS
+
+; Hotkey Bar strings
+g_szFDD:        db  "FDD [%c]",NULL         ; "FDD [A]"
+g_szHDD:        db  "HDD [%c]",NULL         ; "HDD [C]"
+g_szBootMenu:   db  "%sMnu",NULL            ; "BootMnu"
+g_szRomBoot:    db  "Rom%s",NULL            ; "RomBoot"
+g_szBoot:       db  "Boot",NULL
+g_szHotkey:     db  "%A%c%c%A%s%A ",NULL    ; "C»HDD [A] ", "F2BootMnu " or "F8RomBoot "
+
+
+%ifdef MODULE_BOOT_MENU
 
 ; Boot Menu Floppy Disk strings
@@ -67 +94 @@
     %endif
 %endif
-
-; POST drive detection strings
-g_szRomAt:      db  "%s @ %x",LF,CR
-                db  "Released under GNU GPL v2",LF,CR,LF,CR,NULL
-
-; Boot loader strings
-g_szTryToBoot:          db  "Booting %c",ANGLE_QUOTE_RIGHT,"%c",LF,CR,NULL
-g_szBootSectorNotFound: db  "Boot sector "
-g_szNotFound:           db  "not found",LF,CR,NULL
-g_szReadError:          db  "Error %x!",LF,CR,NULL
 
 
@@ -141 +158 @@
 g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
 
-g_szDashForZero:        db      "- ",NULL
-
-; Boot menu bottom of screen strings
-g_szFDD:        db  "FDD [%c]",NULL         ; "FDD [A]"
-g_szHDD:        db  "HDD [%c]",NULL         ; "HDD [C]"
-g_szBootMenu:   db  "%sMnu",NULL            ; "BootMnu"
-g_szRomBoot:    db  "Rom%s",NULL            ; "RomBoot"
-g_szBoot:       db  "Boot",NULL
-g_szHotkey:     db  "%A%c%c%A%s%A ",NULL    ; "C»HDD [A] ", "F2BootMnu " or "F8RomBoot "
+
+
 
 ; Boot Menu information strings
@@ -158 +168 @@
     db     "%s",SINGLE_VERTICAL, "%5-u",SINGLE_VERTICAL, "%s",SINGLE_VERTICAL," %2-I",SINGLE_VERTICAL,"%5-x" ,NULL
 
+
 ; Boot Menu menuitem strings
 ;
@@ -176 +187 @@
     %endif
 %endif
-        
+
+%endif ; MODULE_BOOT_MENU
+%endif ; MODULE_HOTKEYS
+
+
 ;------------------------------------------------------------------------------------------
 ;