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

Timestamp:

Oct 20, 2012, 5:04:32 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Added non-working DMA transfer code.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h

Files:

• AH1Eh_XTCF.asm (modified) (2 diffs)
• Tools/Prepare.asm (modified) (1 diff)

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

@@ -112 +112 @@
     mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_DMA
     mov     al, [di+DPT_ATA.bBlockSize]
-    jmp     AH24h_SetBlockSize  ; AH=24h limits block size if necessary
+    call    AH24h_SetBlockSize  ; AH=24h limits block size if necessary
+    jmp     SHORT .Enable8bitPioMode
 
 .SetMemoryMappedMode:
@@ -120 +121 @@
 .Set8bitPioMode:
     mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_PIO8
+    ; Fall to .Enable8bitPioMode
+    
+    ; We always need to enable 8-bit mode since 16-bit mode is restored
+    ; when controller is reset (AH=0h or Dh)
 .Enable8bitPioMode: 
     jmp     AH23h_Enable8bitPioMode

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Tools/Prepare.asm

@@ -94 +94 @@
 ALIGN JUMP_ALIGN
 Prepare_BufferToESSIforOldInt13hTransfer:
+    mov     si, [bp+IDEPACK.intpack+INTPACK.bx] ; Load offset
+
+%ifdef MODULE_8BIT_IDE
     cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_DMA
     jne     SHORT .NormalizeForSmallestPossibleOffset
 
-    ; Normalize segment for physical 64k pages
-    xor     bx, bx
-    mov     si, [bp+IDEPACK.intpack+INTPACK.es] ; Load segment
-%rep 4
-    shl     si, 1
-    rcl     bx, 1
-%endrep
-    add     si, [bp+IDEPACK.intpack+INTPACK.bx]
-    adc     bx, BYTE 0
-    mov     es, bx                              ; ES:SI now has physical address
+    ; DMA transfers do not need to normalize pointer
+    ; (it will be converted to physical address in IdeDmaTransfer.asm)
+    mov     es, [bp+IDEPACK.intpack+INTPACK.es]
     jmp     SHORT Prepare_ByValidatingSectorsInALforOldInt13h
+%endif ; MODULE_8BIT_IDE
 
     ; Normalize segment for 16b pages
 .NormalizeForSmallestPossibleOffset:
-    mov     bx, [bp+IDEPACK.intpack+INTPACK.bx] ; Load offset
-    mov     si, bx
+    mov     bx, si
     eSHR_IM bx, 4                               ; Divide offset by 16
     add     bx, [bp+IDEPACK.intpack+INTPACK.es]