Changeset 558 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdePioBlock.asm

Timestamp:

Jun 23, 2013, 3:52:31 PM (12 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Building the BIOS Drive Information Tool now works again.
• Moved all XT-CF related code to MODULE_8BIT_IDE_ADVANCED. I don't see how an XT-CF card could work without *_ADVANCED anyway but if I'm wrong, feel free to undo this. Note! The autodetection code in XTIDECFG has NOT been changed to reflect this (still relies on MODULE_8BIT_IDE).
• Optimizations and fixes in general.

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdePioBlock.asm (modified) (12 diffs)

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

@@ -1 +1 @@
 ; Project name  :   XTIDE Universal BIOS
-; Description   :   IDE Read/Write functions for transferring
-;                   block using PIO modes.
+; Description   :   IDE Read/Write functions for transferring block using PIO modes.
 ;                   These functions should only be called from IdeTransfer.asm.
 
@@ -65 +64 @@
 ;
 ;   Parameters:
-;       CX: Block size in 512 byte sectors
-;       DX: IDE Data port address
+;       CX:     Block size in 512 byte sectors
+;       DX:     IDE Data port address
 ;       ES:DI:  Normalized ptr to buffer to receive data
 ;   Returns:
@@ -100 +99 @@
 ;
 ;   Parameters:
-;       CX: Block size in 512 byte sectors
-;       DX: IDE Data port address
+;       CX:     Block size in 512 byte sectors
+;       DX:     IDE Data port address
 ;       ES:DI:  Normalized ptr to buffer to receive data
 ;   Returns:
@@ -111 +110 @@
 IdePioBlock_ReadFrom16bitDataPort:
 %ifdef USE_186
-    xchg        cl, ch  ; Sectors to WORDs
+    xchg    cl, ch  ; Sectors to WORDs
     rep insw
     ret
@@ -120 +119 @@
 .ReadNextOword:
     %rep 8  ; WORDs
-        in      ax, dx  ; Read BYTE
-        stosw           ; Store BYTE to [ES:DI]
+        in      ax, dx  ; Read WORD
+        stosw           ; Store WORD to [ES:DI]
     %endrep
     loop    .ReadNextOword
@@ -152 +151 @@
 ; IdePioBlock_WriteToXtideRev1
 ;   Parameters:
-;       CX: Block size in 512-byte sectors
-;       DX: IDE Data port address
+;       CX:     Block size in 512-byte sectors
+;       DX:     IDE Data port address
 ;       ES:SI:  Normalized ptr to buffer containing data
 ;   Returns:
@@ -180 +179 @@
 ; IdePioBlock_WriteToXtideRev2  or rev 1 with swapped A0 and A3 (chuck-mod)
 ;   Parameters:
-;       CX: Block size in 512-byte sectors
-;       DX: IDE Data port address
+;       CX:     Block size in 512-byte sectors
+;       DX:     IDE Data port address
 ;       ES:SI:  Normalized ptr to buffer containing data
 ;   Returns:
@@ -191 +190 @@
 IdePioBlock_WriteToXtideRev2:
     UNROLL_SECTORS_IN_CX_TO_QWORDS
-    push        ds
-    push        es      ; Copy ES...
-    pop         ds      ; ...to DS
+    push    ds
+    push    es      ; Copy ES...
+    pop     ds      ; ...to DS
 ALIGN JUMP_ALIGN
 .WriteNextQword:
@@ -207 +206 @@
 ; IdePioBlock_WriteTo8bitDataPort
 ;   Parameters:
-;       CX: Block size in 512-byte sectors
-;       DX: IDE Data port address
+;       CX:     Block size in 512-byte sectors
+;       DX:     IDE Data port address
 ;       ES:SI:  Normalized ptr to buffer containing data
 ;   Returns:
@@ -225 +224 @@
 %else ; If 8088/8086
     UNROLL_SECTORS_IN_CX_TO_QWORDS
-    push        ds
-    ;mov        ax, es
-    ;mov        ds, ax  ; move es to ds via ax (does this run faster on 8088?)
-    push        es
-    pop         ds
+    push    ds
+    ;mov    ax, es
+    ;mov    ds, ax  ; move es to ds via ax (does this run faster on 8088?)
+    push    es
+    pop     ds
 ALIGN JUMP_ALIGN
 .WriteNextQword:
@@ -248 +247 @@
 ; IdePioBlock_WriteTo32bitDataPort      VLB/PCI 32-bit IDE
 ;   Parameters:
-;       CX: Block size in 512-byte sectors
-;       DX: IDE Data port address
+;       CX:     Block size in 512-byte sectors
+;       DX:     IDE Data port address
 ;       ES:SI:  Normalized ptr to buffer containing data
 ;   Returns:
@@ -274 +273 @@
 .WriteNextQword:
     %rep 4  ; WORDs
-        lodsw           ; Load BYTE from [DS:SI]
-        out dx, ax      ; Write BYTE
+        lodsw           ; Load WORD from [DS:SI]
+        out dx, ax      ; Write WORD
     %endrep
     loop    .WriteNextQword