Changeset 248 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src

Timestamp:

Feb 13, 2012, 1:22:18 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Booting with hotkey now properly maintains FD and HD drive swappings (it is now again possible to boot with both translated FD and HD drives).
• Had to change file orders so compressed strings could be included after recent changes to Assembly Library size.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Boot/BootMenu.asm (modified) (1 diff)
• Boot/BootMenuEvent.asm (modified) (2 diffs)
• Initialization/DriveXlate.asm (modified) (1 diff)
• Main.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm

@@ -27 +27 @@
 
 ;--------------------------------------------------------------------
+; BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS
 ; BootMenu_GetDriveToDXforMenuitemInCX
 ;   Parameters:

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm

@@ -134 +134 @@
     cmp     ax, [bp+MENUINIT.wItems]
     jae     SHORT BootMenuEvent_EventCompleted  ; Invalid key
+
+    ; Highlighting new item resets drive translation and we do not want that.
+    ; We must be able to translate both floppy drive and hard drive when using hotkey.
+    call    RamVars_GetSegmentToDS  
+    mov     dx, [RAMVARS.xlateVars+XLATEVARS.wFDandHDswap]
     CALL_MENU_LIBRARY HighlightItemFromAX
+    or      [RAMVARS.xlateVars+XLATEVARS.wFDandHDswap], dx
     ; Fall to .ItemSelectedFromCX
 
@@ -143 +149 @@
 .ItemSelectedFromCX:
     CALL_MENU_LIBRARY Close
-        
+
 BootMenuEvent_EventCompleted:
     stc

trunk/XTIDE_Universal_BIOS/Src/Initialization/DriveXlate.asm

@@ -85 +85 @@
 ALIGN JUMP_ALIGN
 DriveXlate_Reset:
-    mov     WORD [RAMVARS.xlateVars], 8000h ; .bFDSwap and .bHDSwap
+    mov     WORD [RAMVARS.xlateVars+XLATEVARS.wFDandHDswap], 8000h
     ret
 

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -154 +154 @@
 iend
 
-    ; Libraries and data
+    ; Libraries, data, Initialization and drive detection
     %include "AssemblyLibrary.asm"
-%ifdef MODULE_STRINGS_COMPRESSED
-    %include "StringsCompressed.asm"
-%else
-    %include "Strings.asm"          ; For BIOS message strings
-%endif
-
-    ; Initialization and drive detection
     %include "Initialize.asm"       ; For BIOS initialization
     %include "Interrupts.asm"       ; For Interrupt initialization
     %include "RamVars.asm"          ; For RAMVARS initialization and access
+%ifdef MODULE_STRINGS_COMPRESSED
+    %include "StringsCompressed.asm"
+%else
+    %include "Strings.asm"          ; For BIOS message strings
+%endif
     %include "CreateDPT.asm"        ; For creating DPTs
     %include "FindDPT.asm"          ; For finding DPTs
@@ -173 +171 @@
     %include "DetectDrives.asm"     ; For detecting IDE drives
     %include "DetectPrint.asm"      ; For printing drive detection strings
-        
+
     ; Boot menu
     %include "BootMenu.asm"         ; For Boot Menu operations