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

Timestamp:

Dec 21, 2012, 1:01:55 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Removed the dependency between MODULE_BOOT_MENU and MODULE_HOTKEYS. With these changes, 0, 1, or 2 of them can be included in a build. This change also means that the hotkeys don't work while the menu is up. But the most important hotkey there was for Rom Boot, and that has been added to the menu as a choice proper. Lots of changes across the board in the hotkeys code - even if we eventually back this change out (becaue, for example we want hotkeys to work in the menu) we should probably start from this base and add that functionality back in, as these changes results in approximately 120 bytes of savings and includes new functionality, such as the Rom Boot menu item and the Com Detect hotkey.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Strings.asm

@@ -65 +65 @@
 ; Boot loader strings
 g_szTryToBoot:          db  "Booting %c",ANGLE_QUOTE_RIGHT,"%c",LF,CR,NULL
-g_szBootSectorNotFound: db  "Boot sector "
+g_szBootSectorNotFound: db  "Boot sector "          ; String fall through...
 g_szNotFound:           db  "not found",LF,CR,NULL
 g_szReadError:          db  "Error %x!",LF,CR,NULL
@@ -72 +72 @@
 %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 "
-
+g_szFDD:                db  "FDD [%c]",NULL         ; "FDD [A]"
+g_szHDD:                db  "HDD [%c]",NULL         ; "HDD [C]"
+%ifdef MODULE_BOOT_MENU
+g_szBootMenu:           db  "BootMnu%c",NULL        ; "BootMnu", location of %c doesn't matter
+%endif ; MODULE_BOOT_MENU
+g_szHotkey:             db  "%A%c%c%A%s%A ",NULL    ; "C»HDD [A] ", "F2BootMnu " or "F8RomBoot "
+%ifdef MODULE_SERIAL
+g_szHotComDetect:       db  "ComDtct%c",NULL        ; "ComDtct", location of %c doesn't matter
+%endif ; MODULE_SERIAL
+%endif ; MODULE_HOTKEYS
+
+%ifdef MODULE_BOOT_MENU
+g_szRomBootDash:        db  " -  "                  ; String fall through to g_szRomBoot
+%endif
+%ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU       
+g_szRomBoot:            db  "Rom%cBoot", NULL       ; "RomBoot" or "Rom Boot"
+%endif
+        
 
 %ifdef MODULE_BOOT_MENU
@@ -190 +201 @@
 ; which is checked at assembly time below.
 ;
+g_szDriveNumSpace:      db  " "                         ; leading space, used if drive number is less than 0fh
+                                                        ; must come immediately before g_szDriveNum!
 g_szBootMenuPrintStart:
 g_szDriveNum:           db  "%x %s",NULL
+g_szDriveNumBNSpace:    db  " "                         ; leading space, used if drive number is less than 0fh
+                                                        ; must come immediately before g_szDriveNumBOOTNFO!
 g_szDriveNumBOOTNFO:    db  "%x %z",NULL
 g_szFloppyDrv:          db  "Floppy Drive %c",NULL
@@ -201 +216 @@
         %error "g_szBootMenuPrint* strings must start on the same 256 byte page, required by the BootMenuPrint_* routines.  Please move this block up or down within Strings.asm"
     %endif
+    %if g_szDriveNumSpace+1 != g_szDriveNum || g_szDriveNumBNSpace+1 != g_szDriveNumBOOTNFO
+        %error "g_szDriveNumSpace or g_szDriveNumBNSpace are out of position"
+    %endif
 %endif
 
 %endif ; MODULE_BOOT_MENU
-%endif ; MODULE_HOTKEYS