Changeset 474 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

Timestamp:

Oct 11, 2012, 5:30:15 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Drive detection now displays autodetected XT-CF port and skips slave drives for XT-CF.
• AH=1Eh no longer tries to disable 8-bit mode for memory mapped and DMA transfer modes.
• Preparations to implement DMA.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -153 +153 @@
 ;--------------------------------------------------------------------
 StartDetectionWithDriveSelectByteInBHandStringInCX:
-    call    DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
-%ifdef MODULE_HOTKEYS
-    call    HotkeyBar_UpdateDuringDriveDetection
-%endif
-    ; Fall to .AutodetectXTCFport or .ReadAtaInfoFromHardDisk
-
-
+    ; Autodetect port for XT-CF
 %ifdef MODULE_8BIT_IDE
-;--------------------------------------------------------------------
-; .AutodetectXTCFport
-;   Parameters:
-;       BH:     Drive Select byte for Drive and Head Register
-;       CS:BP:  Ptr to IDEVARS for the drive
-;       DS:     RAMVARS segment
-;       ES:     Zero (BDA segment)
-;   Returns:
-;       DX:     Autodetected port (for devices that support autodetection)
-;   Corrupts registers:
-;       AX
-;--------------------------------------------------------------------
-.AutodetectXTCFport:
-    ; Detect port for XTCF
     call    DetectDrives_DoesIdevarsInCSBPbelongToXTCF
     jne     SHORT .SkipXTCFportDetection
+
+    ; XT-CF do not support slave drives so skip detection
+    test    bh, FLG_DRVNHEAD_DRV
+    jnz     SHORT NoSlaveDriveAvailable
 
     ; XT-CF do not support slave drives so we can safely update port
@@ -183 +167 @@
     call    BootVars_GetNextXTCFportToDetectToDX
     cmp     dx, XTCF_BASE_PORT_4
-    ja      SHORT DetectDrives_DriveNotFound    ; XT-CF not found from any port
+    ja      SHORT .SkipXTCFportDetection        ; XT-CF not found from any port
 
     call    AH1Eh_DetectXTCFwithBasePortInDX
     jc      SHORT .DetectNextPort               ; XT-CF not found from this port
+
+    ; We now have autodetected port in DX
+    push    dx
+    xchg    ax, dx                              ; Port to print in AX
+    call    DetectPrint_StartDetectWithAutodetectedBasePortInAXandIdeVarsInCSBP
+    jmp     SHORT .DriveDetectionStringPrintedOnScreen
+
+    ; Print detect string for devices that do not support autodetection     
 .SkipXTCFportDetection:
+    push    dx
+%endif ; MODULE_8BIT_IDE
+
+    call    DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
+.DriveDetectionStringPrintedOnScreen:
+%ifdef MODULE_HOTKEYS
+    call    HotkeyBar_UpdateDuringDriveDetection
+%endif
+%ifdef MODULE_8BIT_IDE
+    pop     dx
+%endif
     ; Fall to .ReadAtaInfoFromHardDisk
-%endif ; MODULE_8BIT_IDE
 
 
@@ -284 +286 @@
     cmp     al, DEVICE_8BIT_XTCF_MEMMAP
 .DeviceIsXTCF:
+NoSlaveDriveAvailable:
     ret
 %endif ; MODULE_8BIT_IDE