Changeset 492 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenu.asm

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/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenu.asm (modified) (4 diffs)

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

@@ -24 +24 @@
 ; Displays Boot Menu and returns Drive or Function number.
 ;
-; BootMenu_DisplayAndReturnSelectionInDX
+; BootMenu_DisplayAndStoreSelection
 ;   Parameters:
 ;       DS:     RAMVARS segment
 ;   Returns:
-;       Nothing, selected drive is converted to hotkey
+;       DL:     Drive number selected
+;       CF:     Set if selected item is an actual drive, DL is valid
+;               Clear if selected item is Rom Boot, DL is invalid
 ;   Corrupts registers:
 ;       All General Purpose Registers
 ;--------------------------------------------------------------------
-BootMenu_DisplayAndStoreSelectionAsHotkey:
+BootMenu_DisplayAndReturnDriveInDLRomBootClearCF:
     call    DriveXlate_Reset
 
@@ -38 +40 @@
     CALL_MENU_LIBRARY   DisplayWithHandlerInBXandUserDataInDXAX
 
+    xchg    cx, ax
+        
     ; Clear Boot Menu from screen
     mov     ax, ' ' | (MONO_NORMAL<<8)
     CALL_DISPLAY_LIBRARY    ClearScreenWithCharInALandAttrInAH
-    ret
 
+    ; fall through to BootMenu_GetDriveToDXforMenuitemInCX
 
 ;--------------------------------------------------------------------
@@ -52 +56 @@
 ;       DS:     RAMVARS segment
 ;       CF:     Set: There is a selected menu item, DL is valid
-;               Clear: There is no selected menu item, DL is not valid
+;               Clear: The item selected is Rom Boot, DL is not valid
 ;   Corrupts registers:
-;       AX, DI
+;       AX, BX, DI
+;
+; NOTE: We can't use the menu structure in here, as we are falling through
+; through from BootMenu_DisplayAndReturnDriveInDLRomBootClearCF when the
+; menu structure has already been destroyed.
 ;--------------------------------------------------------------------
 BootMenu_GetDriveToDXforMenuitemInCX:
-    cmp     cl, NO_ITEM_HIGHLIGHTED
-    je      SHORT .ReturnFloppyDriveInDX    ; Clear CF if branch taken
-
     mov     dl, cl                          ; Copy menuitem index to DX
     call    FloppyDrive_GetCountToAX
@@ -65 +70 @@
     jb      SHORT .ReturnFloppyDriveInDX    ; Set CF if branch taken
     or      al, 80h                         ; Or 80h into AL before the sub
-                                            ; to cause CF to be set after
-                                            ; and result has high order bit set
+                                            ; shorter instruction than or'ing it in afterward
     sub     dl, al                          ; Remove floppy drives from index
-
+    call    RamVars_GetHardDiskCountFromBDAtoAX
+    or      al, 80h                         ; Or 80h into AL before the sub             
+    cmp     dl, al                          ; Set CF if hard disk
+                                            ; Clear CF if last item, beyond hard disk list, which indicates ROM boot
 .ReturnFloppyDriveInDX:
     ret