Changeset 398 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers

Timestamp:

Apr 19, 2012, 3:08:06 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• IRQ related stuff is now optional MODULE_IRQ.
• XT builds no longer include support for IDE IRQ.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers

Files:

• Int13h/AHDh_HReset.asm (modified) (1 diff)
• Int19h.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AHDh_HReset.asm

@@ -62 +62 @@
     push    di
 
+%ifdef MODULE_IRQ
     call    Interrupts_UnmaskInterruptControllerForDriveInDSDI
+%endif
     call    Device_ResetMasterAndSlaveController
     ;jc     SHORT .ReturnError                  ; CF would be set if slave drive present without master

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -104 +104 @@
 .DoNotDisplayBootMenu:
 %endif
-%endif
 
     ; Check if ROM boot (INT 18h) wanted
-%ifdef MODULE_HOTKEYS
     cmp     BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bScancode], ROM_BOOT_HOTKEY_SCANCODE
     je      SHORT JumpToBootSector_or_RomBoot   ; CF clear so ROM boot
-%endif
-
-    ; Try to boot from Primary boot drive (00h by default)
-%ifdef MODULE_HOTKEYS
+
+    ; Get Primary boot drive number to DL
     call    HotkeyBar_GetPrimaryBootDriveNumberToDL
 %else
-    mov     dl, [cs:ROMVARS.bBootDrv]
-    and     dl, 80h     ; Only 00h and 80h allowed when not using MODULE_HOTKEYS
-%endif
+    call    GetPrimaryBootDriveToDLwhenNotUsingModuleHotkeys
+%endif  ; MODULE_HOTKEYS
+
+    ; Try to boot from Primary boot drive (00h by default)
     call    TryToBootFromPrimaryOrSecondaryBootDevice
     jc      SHORT JumpToBootSector_or_RomBoot
@@ -126 +123 @@
     call    HotkeyBar_GetSecondaryBootDriveNumberToDL
 %else
-    mov     dl, [cs:ROMVARS.bBootDrv]
-    and     dl, 80h
+    call    GetPrimaryBootDriveToDLwhenNotUsingModuleHotkeys
     xor     dl, 80h
 %endif
@@ -203 +199 @@
     jmp     BootSector_TryToLoadFromDriveDL
 %endif
+
+
+;--------------------------------------------------------------------
+; GetPrimaryBootDriveToDLwhenNotUsingModuleHotkeys
+;   Parameters
+;       Nothing
+;   Returns:
+;       DL:     Drive to boot from (00h or 80h)
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------
+%ifndef MODULE_HOTKEYS
+GetPrimaryBootDriveToDLwhenNotUsingModuleHotkeys:
+    mov     dl, [cs:ROMVARS.bBootDrv]
+    and     dl, 80h     ; Only 00h and 80h allowed when not using MODULE_HOTKEYS
+    ret
+%endif