Changeset 364 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Timestamp:

Mar 27, 2012, 4:21:58 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Advanced ATA Module variables are now kept in DPTs.
• Forced full mode when using Advanced ATA Module.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Files:

• IdeDPT.asm (modified) (4 diffs)
• IdeTransfer.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeDPT.asm

@@ -58 +58 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, CX, DX
+;       AX, BX, CX
 ;--------------------------------------------------------------------
 .StorePioMode:
-    call    AtaID_GetMaxPioModeToAXandMinCycleTimeToDX
-    call    AtaID_ConvertPioModeFromAXandMinCycleTimeFromDXtoActiveAndRecoveryTime
-    mov     [di+DPT_ATA.bPioMode], al
-    mov     [di+DPT_ADVANCED_ATA.wMinPioActiveTimeNs], cx
-    mov     [di+DPT_ADVANCED_ATA.wMinPioRecoveryTimeNs], dx
+    call    AtaID_GetMaxPioModeToAXandMinCycleTimeToCX
+    mov     [di+DPT_ADVANCED_ATA.wMinPioCycleTime], cx
+    mov     [di+DPT_ADVANCED_ATA.bPioMode], al
+    or      [di+DPT.bFlagsHigh], ah 
 
 ;--------------------------------------------------------------------
@@ -79 +78 @@
 ;--------------------------------------------------------------------
 .DetectAdvancedIdeController:
-    mov     dx, [cs:bp+IDEVARS.wPort]
-    mov     [di+DPT_ADVANCED_ATA.wIdeBasePort], dx
-    call    AdvAtaInit_DetectControllerForIdeBaseInDX
+    call    AccessDPT_GetIdeBasePortToBX
+    call    AdvAtaInit_DetectControllerForIdeBaseInBX
     mov     [di+DPT_ADVANCED_ATA.wControllerID], ax ; Store zero if none detected
-    mov     [di+DPT_ADVANCED_ATA.wControllerBasePort], cx
+    mov     [di+DPT_ADVANCED_ATA.wControllerBasePort], dx
     jnc     SHORT .NoAdvancedControllerDetected
 
@@ -90 +88 @@
     call    AdvAtaInit_GetControllerMaxPioModeToAL
     jnc     SHORT .ChangeTo32bitDevice
-    MIN_U   [di+DPT_ATA.bPioMode], al
+    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_IORDY   ; No IORDY supported if need to limit
+    MIN_U   [di+DPT_ADVANCED_ATA.bPioMode], al
 
     ; We have detected 32-bit controller so change Device Type since
     ; it might have been set to 16-bit on IDEVARS
 .ChangeTo32bitDevice:
-    mov     BYTE [di+DPT_ATA.bDevice], DEVICE_32BIT_ATA
+    mov     BYTE [di+DPT_ADVANCED_ATA.bDevice], DEVICE_32BIT_ATA
 
 .NoAdvancedControllerDetected:
@@ -136 +135 @@
 IdeDPT_StoreDeviceTypeFromIdevarsInCSBPtoDPTinDSDI:
     mov     al, [cs:bp+IDEVARS.bDevice]
-    mov     [di+DPT_ATA.bDevice], al
+    mov     [di+DPT_ADVANCED_ATA.bDevice], al
     ret
+
 %endif

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeTransfer.asm

@@ -189 +189 @@
     mov     dx, [cs:bx+IDEVARS.wPort]           ; Load IDE Data port address
 %ifdef MODULE_ADVANCED_ATA
-    mov     bl, [di+DPT_ATA.bDevice]
+    mov     bl, [di+DPT_ADVANCED_ATA.bDevice]
 %else
     mov     bl, [cs:bx+IDEVARS.bDevice]         ; Load device type to BX