Changeset 492 in xtideuniversalbios for trunk/Assembly_Library/Src/Menu/MenuLoop.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/Assembly_Library/Src/Menu/MenuLoop.asm (modified) (4 diffs)

trunk/Assembly_Library/Src/Menu/MenuLoop.asm

@@ -85 +85 @@
     xchg    ax, cx
     call    .ProcessMenuSystemKeystrokeFromAX
+%ifdef MENUEVENT_KeyStrokeInAX
     jc      SHORT NoKeystrokeToProcess
     jmp     MenuEvent_KeyStrokeInAX
-
+%else
+    jmp     SHORT NoKeystrokeToProcess
+%endif
+        
 ;--------------------------------------------------------------------
 ; .ProcessMenuSystemKeystrokeFromAX
@@ -104 +108 @@
 ALIGN MENU_JUMP_ALIGN
 .ProcessMenuSystemKeystrokeFromAX:
+%ifndef MENU_NO_ESC
     cmp     al, ESC
     je      SHORT .LeaveMenuWithoutSelectingItem
+%endif
     cmp     al, CR
     je      SHORT .SelectItem
@@ -113 +119 @@
     ret     ; Return with CF cleared since keystroke not processed
 
+%ifndef MENU_NO_ESC     
 ALIGN MENU_JUMP_ALIGN
 .LeaveMenuWithoutSelectingItem:
@@ -122 +129 @@
     stc
     ret
-
+%endif
+        
 ALIGN MENU_JUMP_ALIGN
 .SelectItem: