Changeset 545 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Apr 19, 2013, 11:44:35 AM (11 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Integrated XT-CFv3 support by James Pearce.
• XT-CFv2 memory mapped I/O and DMA modes are no longer supported (but PIO mode is).

File:

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

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -158 +158 @@
 ;--------------------------------------------------------------------
 StartDetectionWithDriveSelectByteInBHandStringInCX:
-%ifdef MODULE_8BIT_IDE_ADVANCED
-    ; Autodetect port for XT-CF
+%ifdef MODULE_8BIT_IDE
     call    DetectDrives_DoesIdevarsInCSBPbelongToXTCF
-    jne     SHORT .SkipXTCFportDetection
+    jne     SHORT .ShouldNotSkipSlaveDriveDetection
 
     ; 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
-    ; for next drive (another XT-CF card on same system)
-.DetectNextPort:
-    mov     dx, [es:BOOTVARS.wNextXTCFportToScan]
-    xor     dl, 40h
-    jnz     SHORT .StoreNextXTCFportToScan
-    inc     dh
-    cmp     dh, XTCF_BASE_PORT_4 >> 8
-    ja      SHORT .SkipXTCFportDetection        ; XT-CF not found from any port
-.StoreNextXTCFportToScan:
-    mov     [es:BOOTVARS.wNextXTCFportToScan], dx
-
-    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_ADVANCED
+.ShouldNotSkipSlaveDriveDetection:
+%endif ; MODULE_8BIT_IDE
 
     call    DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
@@ -197 +172 @@
 %ifdef MODULE_HOTKEYS
     call    HotkeyBar_UpdateDuringDriveDetection
-%endif
-
-%ifdef MODULE_8BIT_IDE_ADVANCED
-    pop     dx
 %endif
     ; Fall to .ReadAtaInfoFromHardDisk
@@ -278 +249 @@
 
 
-%ifdef MODULE_8BIT_IDE_ADVANCED
+%ifdef MODULE_8BIT_IDE
 ;--------------------------------------------------------------------
 ; DetectDrives_DoesIdevarsInCSBPbelongToXTCF
@@ -292 +263 @@
     mov     al, [cs:bp+IDEVARS.bDevice]
     cmp     al, DEVICE_8BIT_XTCF_PIO8
-    je      SHORT .DeviceIsXTCF
+    je      SHORT .Done
+    cmp     al, DEVICE_8BIT_XTCF_PIO8_WITH_BIU_OFFLOAD
+
+%ifdef MODULE_8BIT_IDE_ADVANCED
+    je      SHORT .Done
     cmp     al, DEVICE_8BIT_XTCF_DMA
-    je      SHORT .DeviceIsXTCF
-    cmp     al, DEVICE_8BIT_XTCF_MEMMAP
-.DeviceIsXTCF:
+%endif ; MODULE_8BIT_IDE_ADVANCED
+
+.Done:      ; return state via ZF, set from the cmp instructions
 NoSlaveDriveAvailable:
     ret
-%endif ; MODULE_8BIT_IDE_ADVANCED
+%endif ; MODULE_8BIT_IDE