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

Timestamp:

Dec 21, 2012, 1:01:55 AM (11 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/Main.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -36 +36 @@
     %define MENUEVENT_INLINE_OFFSETS        ; Only one menu required, save space and inline offsets
     %define INCLUDE_MENU_LIBRARY
-
+    %define MENU_NO_ESC                     ; User cannot 'esc' out of the menu
 %else   ; If no boot menu included
     %define INCLUDE_DISPLAY_LIBRARY
@@ -197 +197 @@
 %ifdef MODULE_HOTKEYS
     %include "HotkeyBar.asm"        ; For hotkeys during drive detection and boot menu
-    %include "DriveXlate.asm"       ; For swapping drive numbers
+%endif      
+%ifdef MODULE_DRIVEXLATE
+    %include "DriveXlate.asm"       ; For swapping drive numbers, must come immediately after HotkeyBar.asm
 %endif
 
@@ -211 +213 @@
     ; Boot loader
     %include "Int19h.asm"           ; For Int 19h, Boot Loader
+    %include "BootSector.asm"       ; For loading boot sector
     %include "Int19hReset.asm"      ; INT 19h handler for proper system reset
-    %include "BootSector.asm"       ; For loading boot sector
 
     ; For all device types