Changeset 267 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/MemoryMappedIDE/MemIdeTransfer.asm

Timestamp:

Feb 24, 2012, 8:34:41 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• More JR-IDE/ISA fixes.

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/MemoryMappedIDE/MemIdeTransfer.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/Device/MemoryMappedIDE/MemIdeTransfer.asm

@@ -70 +70 @@
 ;--------------------------------------------------------------------
 ReadFromSectorAccessWindow:
-    pop     ds  ; CS -> DS
-    mov     di, si
-    mov     si, JRIDE_SECTOR_ACCESS_WINDOW_OFFSET
-
-    call    WaitUntilReadyToTransferNextBlock
-    jc      SHORT ReturnWithMemoryIOtransferErrorInAH
-
-    mov     cx, [bp+PIOVARS.wWordsInBlock]
+    pop     ds      ; CS -> DS
+    mov     di, si  ; ES:DI = destination
+    mov     si, JRIDE_SECTOR_ACCESS_WINDOW_OFFSET   ; DS:SI = source
+
+    call    WaitUntilReadyToTransferNextBlock
+    jc      SHORT ReturnWithMemoryIOtransferErrorInAH
+
+    mov     cx, [bp+MEMPIOVARS.wWordsInBlock]
 
 ALIGN JUMP_ALIGN
 .ReadNextBlockFromDrive:
-    cmp     [bp+PIOVARS.wWordsLeft], cx
+    cmp     [bp+MEMPIOVARS.wWordsLeft], cx
     jbe     SHORT .ReadLastBlockFromDrive
     call    ReadSingleBlockFromSectorAccessWindowInDSSItoESDI
@@ -88 +88 @@
 
     ; Increment number of successfully read WORDs
-    mov     cx, [bp+PIOVARS.wWordsInBlock]
-    sub     [bp+PIOVARS.wWordsLeft], cx
-    add     [bp+PIOVARS.wWordsDone], cx
+    mov     cx, [bp+MEMPIOVARS.wWordsInBlock]
+    sub     [bp+MEMPIOVARS.wWordsLeft], cx
+    add     [bp+MEMPIOVARS.wWordsDone], cx
     jmp     SHORT .ReadNextBlockFromDrive
 
 ALIGN JUMP_ALIGN
 .ReadLastBlockFromDrive:
-    mov     ch, [bp+PIOVARS.wWordsLeft+1]       ; Sectors left
+    mov     ch, [bp+MEMPIOVARS.wWordsLeft+1]    ; Sectors left
     call    ReadSingleBlockFromSectorAccessWindowInDSSItoESDI
 
@@ -107 +107 @@
 ReturnWithMemoryIOtransferErrorInAH:
     lds     di, [bp+MEMPIOVARS.fpDPT]           ; DPT now in DS:DI
-    mov     cx, [bp+PIOVARS.wWordsDone]
+    mov     cx, [bp+MEMPIOVARS.wWordsDone]
     jc      SHORT .ConvertTransferredWordsInCXtoSectors
-    add     cx, [bp+PIOVARS.wWordsLeft]         ; Never sets CF
+    add     cx, [bp+MEMPIOVARS.wWordsLeft]      ; Never sets CF
 .ConvertTransferredWordsInCXtoSectors:
     xchg    cl, ch
@@ -141 +141 @@
     jc      SHORT ReturnWithMemoryIOtransferErrorInAH
 
-    mov     cx, [bp+PIOVARS.wWordsInBlock]
+    mov     cx, [bp+MEMPIOVARS.wWordsInBlock]
 
 ALIGN JUMP_ALIGN
 .WriteNextBlockToDrive:
-    cmp     [bp+PIOVARS.wWordsLeft], cx
+    cmp     [bp+MEMPIOVARS.wWordsLeft], cx
     jbe     SHORT .WriteLastBlockToDrive
     call    WriteSingleBlockFromDSSIToSectorAccessWindowInESDI
@@ -152 +152 @@
 
     ; Increment number of successfully written WORDs
-    mov     cx, [bp+PIOVARS.wWordsInBlock]
-    sub     [bp+PIOVARS.wWordsLeft], cx
-    add     [bp+PIOVARS.wWordsDone], cx
+    mov     cx, [bp+MEMPIOVARS.wWordsInBlock]
+    sub     [bp+MEMPIOVARS.wWordsLeft], cx
+    add     [bp+MEMPIOVARS.wWordsDone], cx
     jmp     SHORT .WriteNextBlockToDrive
 
 ALIGN JUMP_ALIGN
 .WriteLastBlockToDrive:
-    mov     ch, [bp+PIOVARS.wWordsLeft+1]       ; Sectors left
+    mov     ch, [bp+MEMPIOVARS.wWordsLeft+1]        ; Sectors left
     ePUSH_T bx, CheckErrorsAfterTransferringLastMemoryMappedBlock
     ; Fall to WriteSingleBlockFromDSSIToSectorAccessWindowInESDI