Changeset 492 in xtideuniversalbios for trunk/Assembly_Library/Inc

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/Assembly_Library/Inc/MenuEvents.inc (modified) (7 diffs)

trunk/Assembly_Library/Inc/MenuEvents.inc

@@ -50 +50 @@
     ;   DS:SI:      Ptr to initialized MENUINIT struct
     .InitializeMenuinitFromDSSI     resb    2
-%define MENUEVENT_InitializeMenuinitFromDSSI MENUEVENT.InitializeMenuinitFromDSSI
+MENUEVENT_InitializeMenuinitFromDSSI    equ     MENUEVENT.InitializeMenuinitFromDSSI
 
     ; Parameters:
@@ -58 +58 @@
     ;               Clear to cancel exit
     .ExitMenu                       resb    2
-%define MENUEVENT_ExitMenu MENUEVENT.ExitMenu
+MENUEVENT_ExitMenu                  equ     MENUEVENT.ExitMenu
 
 %ifdef MENUEVENT_IDLEPROCESSING_ENABLE
@@ -65 +65 @@
     ; See the definition of MENUEVENT_IDLEPROCESSING_ENABLE below.
     .IdleProcessing                 resb    2
-%define MENUEVENT_IdleProcessing MENUEVENT.IdleProcessing
+MENUEVENT_IdleProcessing            equ     MENUEVENT.IdleProcessing
 %endif
 
@@ -72 +72 @@
     ;   DX:         Index of previously highlighted item or NO_ITEM_HIGHLIGHTED
     .ItemHighlightedFromCX          resb    2
-%define MENUEVENT_ItemHighlightedFromCX MENUEVENT.ItemHighlightedFromCX
+MENUEVENT_ItemHighlightedFromCX     equ     MENUEVENT.ItemHighlightedFromCX
 
     ; Parameters:
     ;   CX:         Index of selected item
     .ItemSelectedFromCX             resb    2
-%define MENUEVENT_ItemSelectedFromCX MENUEVENT.ItemSelectedFromCX
+MENUEVENT_ItemSelectedFromCX        equ     MENUEVENT.ItemSelectedFromCX
 
     ; Parameters:
@@ -83 +83 @@
     ;   AH:         Keyboard library scan code for the key
     .KeyStrokeInAX                  resb    2
-%define MENUEVENT_KeyStrokeInAX MENUEVENT.KeyStrokeInAX
+MENUEVENT_KeyStrokeInAX             equ     MENUEVENT.KeyStrokeInAX
 
     ; Parameters:
@@ -90 +90 @@
     .RefreshTitle                   resb    2
     .RefreshInformation             resb    2
-%define MENUEVENT_RefreshTitle MENUEVENT.RefreshTitle
-%define MENUEVENT_RefreshInformation MENUEVENT.RefreshInformation
+MENUEVENT_RefreshTitle              equ     MENUEVENT.RefreshTitle
+MENUEVENT_RefreshInformation        equ     MENUEVENT.RefreshInformation
 
     ; Parameters:
@@ -97 +97 @@
     ;   Cursor has been positioned to the beginning of item line
     .RefreshItemFromCX              resb    2
-%define MENUEVENT_RefreshItemFromCX MENUEVENT.RefreshItemFromCX
+MENUEVENT_RefreshItemFromCX         equ     MENUEVENT.RefreshItemFromCX
 endstruc