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


Ignore:
Timestamp:
Dec 21, 2012, 1:01:55 AM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r491 r492  
    6565; Boot loader strings
    6666g_szTryToBoot:          db  "Booting %c",ANGLE_QUOTE_RIGHT,"%c",LF,CR,NULL
    67 g_szBootSectorNotFound: db  "Boot sector "
     67g_szBootSectorNotFound: db  "Boot sector "          ; String fall through...
    6868g_szNotFound:           db  "not found",LF,CR,NULL
    6969g_szReadError:          db  "Error %x!",LF,CR,NULL
     
    7272%ifdef MODULE_HOTKEYS
    7373; Hotkey Bar strings
    74 g_szFDD:        db  "FDD [%c]",NULL         ; "FDD [A]"
    75 g_szHDD:        db  "HDD [%c]",NULL         ; "HDD [C]"
    76 g_szBootMenu:   db  "%sMnu",NULL            ; "BootMnu"
    77 g_szRomBoot:    db  "Rom%s",NULL            ; "RomBoot"
    78 g_szBoot:       db  "Boot",NULL
    79 g_szHotkey:     db  "%A%c%c%A%s%A ",NULL    ; "C»HDD [A] ", "F2BootMnu " or "F8RomBoot "
    80 
     74g_szFDD:                db  "FDD [%c]",NULL         ; "FDD [A]"
     75g_szHDD:                db  "HDD [%c]",NULL         ; "HDD [C]"
     76%ifdef MODULE_BOOT_MENU
     77g_szBootMenu:           db  "BootMnu%c",NULL        ; "BootMnu", location of %c doesn't matter
     78%endif ; MODULE_BOOT_MENU
     79g_szHotkey:             db  "%A%c%c%A%s%A ",NULL    ; "C»HDD [A] ", "F2BootMnu " or "F8RomBoot "
     80%ifdef MODULE_SERIAL
     81g_szHotComDetect:       db  "ComDtct%c",NULL        ; "ComDtct", location of %c doesn't matter
     82%endif ; MODULE_SERIAL
     83%endif ; MODULE_HOTKEYS
     84
     85%ifdef MODULE_BOOT_MENU
     86g_szRomBootDash:        db  " -  "                  ; String fall through to g_szRomBoot
     87%endif
     88%ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU       
     89g_szRomBoot:            db  "Rom%cBoot", NULL       ; "RomBoot" or "Rom Boot"
     90%endif
     91       
    8192
    8293%ifdef MODULE_BOOT_MENU
     
    190201; which is checked at assembly time below.
    191202;
     203g_szDriveNumSpace:      db  " "                         ; leading space, used if drive number is less than 0fh
     204                                                        ; must come immediately before g_szDriveNum!
    192205g_szBootMenuPrintStart:
    193206g_szDriveNum:           db  "%x %s",NULL
     207g_szDriveNumBNSpace:    db  " "                         ; leading space, used if drive number is less than 0fh
     208                                                        ; must come immediately before g_szDriveNumBOOTNFO!
    194209g_szDriveNumBOOTNFO:    db  "%x %z",NULL
    195210g_szFloppyDrv:          db  "Floppy Drive %c",NULL
     
    201216        %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"
    202217    %endif
     218    %if g_szDriveNumSpace+1 != g_szDriveNum || g_szDriveNumBNSpace+1 != g_szDriveNumBOOTNFO
     219        %error "g_szDriveNumSpace or g_szDriveNumBNSpace are out of position"
     220    %endif
    203221%endif
    204222
    205223%endif ; MODULE_BOOT_MENU
    206 %endif ; MODULE_HOTKEYS
    207224
    208225
Note: See TracChangeset for help on using the changeset viewer.