Changeset 480 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeTransfer.asm

Timestamp:

Oct 27, 2012, 11:26:11 AM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• XT-CF DMA transfers should now work.

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeTransfer.asm (modified) (6 diffs)

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

@@ -38 +38 @@
 ;       AL:     IDE command that was used to start the transfer
 ;               (all PIO read and write commands including Identify Device)
-;       ES:SI:  Ptr to normalized data buffer
+;       ES:SI:  Ptr to data buffer
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
 ;       SS:BP:  Ptr to IDEPACK
@@ -62 +62 @@
 ;   Parameters:
 ;       AH:     Number of sectors to transfer (1...128)
-;       ES:SI:  Normalized ptr to buffer to receive data
+;       ES:SI:  Ptr to buffer to receive data
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
 ;       SS:BP:  Ptr to PIOVARS
@@ -139 +139 @@
 ;       AH:     Number of sectors to transfer (1...128)
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
-;       ES:SI:  Normalized ptr to buffer containing data
+;       ES:SI:  Ptr to buffer containing data
 ;       SS:BP:  Ptr to PIOVARS
 ;   Returns:
@@ -198 +198 @@
 ;       BX:     Offset to transfer function lookup table
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
+;       ES:SI:  Ptr to data buffer
 ;       SS:BP:  Ptr to PIOVARS
 ;   Returns:
@@ -217 +218 @@
     xchg    ax, bx                              ; Lookup table offset to AX
     mov     bl, [di+DPT_ATA.bDevice]
+%ifdef MODULE_8BIT_IDE
+    mov     dl, bl
+%endif
     add     bx, ax
     mov     ax, [cs:bx]                         ; Load offset to transfer function
     mov     [bp+PIOVARS.fnXfer], ax
-    ret
-
+
+    ; Normalize pointer for PIO-transfers and convert to physical address for DMA transfers
+%ifdef MODULE_8BIT_IDE
+    cmp     dl, DEVICE_8BIT_XTCF_DMA
+    jb      SHORT IdeTransfer_NormalizePointerInESSI
+
+    ; Convert ES:SI to physical address
+    xor     dx, dx
+    mov     ax, es
+%rep 4
+    shl     ax, 1
+    rcl     dx, 1
+%endrep
+    add     si, ax
+    adc     dl, dh
+    mov     es, dx
+    ret
+%endif ; MODULE_8BIT_IDE
+    ; Fall to IdeTransfer_NormalizePointerInESSI if no MODULE_8BIT_IDE
+
+
+;--------------------------------------------------------------------
+; IdeTransfer_NormalizePointerInESSI
+;   Parameters:
+;       ES:SI:  Ptr to be normalized
+;   Returns:
+;       ES:SI:  Normalized pointer (SI = 0...15)
+;   Corrupts registers:
+;       AX, DX
+;--------------------------------------------------------------------
+IdeTransfer_NormalizePointerInESSI:
+    NORMALIZE_FAR_POINTER   es, si, ax, dx
+    ret
 
 
@@ -227 +262 @@
 ALIGN WORD_ALIGN
 g_rgfnPioRead:
-%ifdef USE_AT
         dw      IdePioBlock_ReadFrom16bitDataPort   ; 0, DEVICE_16BIT_ATA
         dw      IdePioBlock_ReadFrom32bitDataPort   ; 1, DEVICE_32BIT_ATA
-%else
-        dd      0
-%endif
-%ifdef MODULE_8BIT_IDE
-        dw      IdePioBlock_ReadFromXtideRev1       ; 2, DEVICE_8BIT_XTIDE_REV1
-    %ifndef USE_AT
-        g_rgfnPioWrite:
-    %endif
-        dw      IdePioBlock_ReadFromXtideRev2       ; 3, DEVICE_8BIT_XTIDE_REV2
-        dw      IdePioBlock_ReadFrom8bitDataPort    ; 4, DEVICE_8BIT_XTCF_PIO8
-%endif
-
-%ifdef USE_AT
+%ifdef MODULE_8BIT_IDE
+        dw      IdePioBlock_ReadFrom8bitDataPort    ; 2, DEVICE_8BIT_ATA
+        dw      IdePioBlock_ReadFromXtideRev1       ; 3, DEVICE_8BIT_XTIDE_REV1     
+        dw      IdePioBlock_ReadFromXtideRev2       ; 4, DEVICE_8BIT_XTIDE_REV2
+        dw      IdePioBlock_ReadFrom8bitDataPort    ; 5, DEVICE_8BIT_XTCF_PIO8
+        dw      IdeDmaBlock_ReadFromXTCF            ; 6, DEVICE_8BIT_XTCF_DMA
+%endif
+
+
 g_rgfnPioWrite:
         dw      IdePioBlock_WriteTo16bitDataPort    ; 0, DEVICE_16BIT_ATA
         dw      IdePioBlock_WriteTo32bitDataPort    ; 1, DEVICE_32BIT_ATA
-%endif
-%ifdef MODULE_8BIT_IDE
-        dw      IdePioBlock_WriteToXtideRev1        ; 2, DEVICE_8BIT_XTIDE_REV1
-        dw      IdePioBlock_WriteToXtideRev2        ; 3, DEVICE_8BIT_XTIDE_REV2
-        dw      IdePioBlock_WriteTo8bitDataPort     ; 4, DEVICE_8BIT_XTCF_PIO8
-%endif
+%ifdef MODULE_8BIT_IDE
+        dw      IdePioBlock_WriteTo8bitDataPort     ; 2, DEVICE_8BIT_ATA
+        dw      IdePioBlock_WriteToXtideRev1        ; 3, DEVICE_8BIT_XTIDE_REV1
+        dw      IdePioBlock_WriteToXtideRev2        ; 4, DEVICE_8BIT_XTIDE_REV2
+        dw      IdePioBlock_WriteTo8bitDataPort     ; 5, DEVICE_8BIT_XTCF_PIO8
+        dw      IdeDmaBlock_WriteToXTCF             ; 6, DEVICE_8BIT_XTCF_DMA
+%endif