Changeset 493 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

Timestamp:

Dec 21, 2012, 8:44:25 AM (11 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Separated MODULE_8BIT_IDE into the basic part used by XTIDE rev 1 and rev 2 which is PIO based, and MODULE_8BIT_IDE_ADVANCED for JRIDE and XTCF support which requires memory mapping and/or DMA. This allows for creating an 8KB image with boot menu support (but no hotkeys) for the XTIDE rev 1. Cleaned up how we reset the drive translation information, ensuring it is properly set between boot attempt on a primary and secondary drive - as a result we clean it when needed, rather than trying to always keep it clean. Also fixed translation bugs in int13h.asm where I had previously missed converting some MODULE_HOTKEYS into MODULE_DRIVEXLATE.

File:

• trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -121 +121 @@
     call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars        
     cmp     al, ROM_BOOT_HOTKEY_SCANCODE
-    jz      JumpToBootSector_or_RomBoot         ; CF clear so ROM boot
+    jz      .RomBoot                            ; CF clear so ROM boot
 %ifdef MODULE_BOOT_MENU
     cmp     al, BOOT_MENU_HOTKEY_SCANCODE
@@ -135 +135 @@
 .BootMenu:      
     call    BootMenu_DisplayAndReturnDriveInDLRomBootClearCF
-    jnc     JumpToBootSector_or_RomBoot         ; CF clear so ROM boot
+    jnc     .RomBoot                            ; CF clear so ROM boot
 
     mov     dh, dl                              ; Setup for secondary drive
@@ -158 +158 @@
 %endif
 
-%ifndef MODULE_BOOT_MENU
-    clc     ;  fall through with flag for ROM boot.  Boot Menu goes back to menu and doesn't fall through.
-%endif      
+.RomBoot:
+%ifdef MODULE_DRIVEXLATE
+    call    DriveXlate_Reset                    ; Clean up any drive mappings before Rom Boot
+%endif
+    clc     
+    ;; fall through to JumpToBootSector_or_RomBoot
 
 ;--------------------------------------------------------------------