Changeset 492 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenuEvent.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/Menus/BootMenu/BootMenuEvent.asm (modified) (10 diffs)

trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenuEvent.asm

@@ -21 +21 @@
 SECTION .text
 
-
-;--------------------------------------------------------------------
-; GetDefaultMenuitemToDL
-;   Parameters:
-;       DL:     Drive number
-;       ES:     Ptr to BDA (zero)
-;   Returns:
-;       DL:     Menuitem index (assuming drive is available)
-;   Corrupts registers:
-;       AX, DH
-;--------------------------------------------------------------------
-GetDefaultMenuitemToDX:
-    mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters]
-    test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST
-    eCMOVZ  dl, dh
-    call    IsDriveDLinSystem
-    jnc     SHORT BootMenuEvent_Handler.DoNotSetDefaultMenuitem
-    call    DriveXlate_SetDriveToSwap
-    ; Fall to GetMenuitemToDXforDriveInDL
-
-
 ;--------------------------------------------------------------------
 ; GetMenuitemToDXforDriveInDL
@@ -63 +42 @@
 
 ;--------------------------------------------------------------------
-; IsDriveDLinSystem
-;   Parameters:
-;       DL:     Drive number
-;       DS:     RAMVARS segment
-;   Returns:
-;       CF:     Set if drive number is valid
-;               Clear if drive is not present in system
-;   Corrupts registers:
-;       AX, CX
-;--------------------------------------------------------------------
-IsDriveDLinSystem:
-    test    dl, dl                              ; Floppy drive?
-    jns     SHORT .IsFloppyDriveInSystem
-    call    RamVars_GetHardDiskCountFromBDAtoAX ; Hard Disk count to AX
-    or      al, 80h                             ; Set Hard Disk bit to AX
-    jmp     SHORT .CompareDriveNumberToDriveCount
-.IsFloppyDriveInSystem:
-    call    FloppyDrive_GetCountToAX
-.CompareDriveNumberToDriveCount:
-    cmp     dl, al                              ; Set CF when DL is smaller
-    ret
-
-
-;--------------------------------------------------------------------
 ; BootMenuEvent_Handler
 ;   Common parameters for all events:
@@ -115 +70 @@
 MENUEVENT_ItemHighlightedFromCX equ (EventItemHighlightedFromCX - FirstEvent)
 MENUEVENT_ItemSelectedFromCX equ (EventItemSelectedFromCX - FirstEvent)
-MENUEVENT_KeyStrokeInAX equ (EventKeyStrokeInAX - FirstEvent)
 MENUEVENT_RefreshTitle equ (BootMenuPrint_TitleStrings - FirstEvent)
 MENUEVENT_RefreshInformation equ (BootMenuPrint_RefreshInformation - FirstEvent)
@@ -164 +118 @@
 EventInitializeMenuinitFromSSBP:
     ; Store default Menuitem (=default drive to boot from)
-    call    GetDefaultMenuitemToDX
+    xor     dx, dx
     mov     [bp+MENUINIT.wHighlightedItem], dx
 
@@ -172 +126 @@
     call    FloppyDrive_GetCountToAX
     add     ax, cx
+    inc     ax                              ; extra entry for ROM Boot item
     mov     [bp+MENUINIT.wItems], ax
-
+                
     ; Store menu size
     mov     WORD [bp+MENUINIT.wTitleAndInfoLines], BOOT_MENU_TITLE_AND_INFO_LINES
@@ -180 +135 @@
     xchg    cx, ax
     CALL_DISPLAY_LIBRARY    GetColumnsToALandRowsToAH
-    sub     ah, MENU_SCREEN_BOTTOM_LINES*2  ; Leave space for Hotkey Bar
     MIN_U   ah, cl
     mov     [bp+MENUINIT.bHeight], ah
@@ -207 +161 @@
 EventItemHighlightedFromCX:
     push    cx
+    call    DriveXlate_Reset        
     call    BootMenu_GetDriveToDXforMenuitemInCX        
-    call    DriveXlate_Reset
+    jnc     .noDriveSwap        
     call    DriveXlate_SetDriveToSwap
-
-    ; We need to generate keystroke so selection two drives is possible.
-    ; The secondary boot drive is selected by highlighting it using menu keys
-    ; and the primary boot drive is selected by pressing drive letter hotkey.
-    call    BootVars_StoreHotkeyForDriveNumberInDL
-    call    RedrawHotkeyBarFromInsideMenuEventHandler
-
+.noDriveSwap:   
+        
     ; Redraw changes in drive numbers
     xor     ax, ax  ; Update first floppy drive (for translated drive number)
@@ -230 +180 @@
     ret
 
-
-;--------------------------------------------------------------------
-; EventKeyStrokeInAX
-;   Parameters
-;       AL:     ASCII character for the key
-;       AH:     Keyboard library scan code for the key
-;       DS:     Ptr to RAMVARS
-;       ES:     Ptr to BDA (zero)
-;       SS:BP:  Menu library handle
-;   Returns:
-;       CF:     Set if event processed
-;               Cleared if event not processed
-;   Corrupts registers:
-;       Does not matter
-;--------------------------------------------------------------------
-EventKeyStrokeInAX:
-    cmp     ah, BOOT_MENU_HOTKEY_SCANCODE
-    je      SHORT BootMenuEvent_Completed   ; Ignore Boot Menu hotkey
-    call    HotkeyBar_StoreHotkeyToBootvarsIfValidKeystrokeInAX
-    jnc     SHORT BootMenuEvent_Completed
-
-    ; Hotkey is now stored to BOOTVARS and menu can be closed
-    jmp     SHORT CloseBootMenu
-
-
+        
 ;--------------------------------------------------------------------
 ; EventItemSelectedFromCX
@@ -269 +195 @@
 ;--------------------------------------------------------------------
 EventItemSelectedFromCX:
-    call    BootMenu_GetDriveToDXforMenuitemInCX
-    jnc     SHORT BootMenuEvent_Completed   ; No menuitem selected
-
-    ; Convert selected drive to hotkey keystroke
-    call    HotkeyBar_StoreHotkeyToBootvarsForDriveLetterInDL
     ; Fall to CloseBootMenu
 
@@ -290 +211 @@
     call    DriveXlate_Reset
     CALL_MENU_LIBRARY   Close
-    ; Fall to RedrawHotkeyBarFromInsideMenuEventHandler
-
-
-;--------------------------------------------------------------------
-; RedrawHotkeyBarFromInsideMenuEventHandler
-;   Parameters
-;       DS:     RAMVARS segment
-;       ES:     BDA segment (zero)
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, BX, CX, DX, SI, DI
-;--------------------------------------------------------------------
-RedrawHotkeyBarFromInsideMenuEventHandler:
-    mov     al, MONO_NORMAL
-    CALL_DISPLAY_LIBRARY    SetCharacterAttributeFromAL
-
-    mov     bl, ATTRIBUTES_ARE_USED
-    mov     ax, TELETYPE_OUTPUT_WITH_ATTRIBUTE
-    CALL_DISPLAY_LIBRARY    SetCharOutputFunctionFromAXwithAttribFlagInBL
-    call    HotkeyBar_DrawToTopOfScreen
     ; Fall to BootMenuEvent_Completed
 
-
+        
 ;--------------------------------------------------------------------
 ; BootMenuEvent_Completed