Changeset 442 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src

Timestamp:

Aug 21, 2012, 5:17:11 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• ATA ID validation now compares heads to correct maximum number of heads.
• Added XTCF 8-bit mode transfer functions.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Device/IDE/IdeCommand.asm (modified) (1 diff)
• Device/IDE/IdeTransfer.asm (modified) (4 diffs)
• Initialization/AtaID.asm (modified) (2 diffs)

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

@@ -75 +75 @@
 
     ; Wait until drive motors have reached max speed
-    cmp     bp, BYTE ROMVARS.ideVars0
+    cmp     bp, BYTE ROMVARS.ideVars0       ; First controller?
     jne     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
-    test    bh, FLG_DRVNHEAD_DRV
+    test    bh, FLG_DRVNHEAD_DRV            ; Wait already done for Master
     jnz     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
     call    AHDh_WaitUnilDriveMotorHasReachedFullSpeed

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

@@ -273 +273 @@
 %endif
 
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+ReadBlockFromXTCF:
+    UNROLL_SECTORS_IN_CX_TO_DWORDS
+ALIGN JUMP_ALIGN
+.ReadNextDword:
+    in      al, dx      ; Read 1st BYTE
+    stosb               ; Store 1st BYTE to [ES:DI]
+    in      al, dx
+    stosb
+
+    in      al, dx
+    stosb
+    in      al, dx
+    stosb
+    loop    .ReadNextDword
+    ret
+
 %endif  ; MODULE_8BIT_IDE
 
@@ -352 +370 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-WriteBlockToFastXtide:
-    UNROLL_SECTORS_IN_CX_TO_QWORDS
+WriteBlockToXTCF:
+    UNROLL_SECTORS_IN_CX_TO_DWORDS
     push    ds
     push    es
     pop     ds
-    or      dl, (1<<4)  ; Writes need A4 set
-ALIGN JUMP_ALIGN
-.ReadNextQword:
-    lodsw               ; Load 1st WORD from [DS:SI]
-    out     dx, ax      ; Write 1st WORD
-    lodsw
-    out     dx, ax      ; 2nd
-    lodsw
-    out     dx, ax      ; 3rd
-    lodsw
-    out     dx, ax      ; 4th
-    loop    .ReadNextQword
+ALIGN JUMP_ALIGN
+.WriteNextDword:
+    lodsb               ; Load 1st BYTE from [DS:SI]
+    out     dx, al      ; Write 1st BYTE
+    lodsb
+    out     dx, al
+
+    lodsb
+    out     dx, al
+    lodsb
+    out     dx, al
+    loop    .WriteNextDword
     pop     ds
     ret
@@ -404 +422 @@
 %ifdef MODULE_8BIT_IDE
         dw      0                           ; 0, DEVICE_8BIT_JRIDE_ISA
+        dw      ReadBlockFromXTCF           ; 1, DEVICE_8BIT_XTCF
     %ifdef USE_186
-        dw      ReadBlockFrom16bitDataPort  ; 1, DEVICE_FAST_XTIDE
         dw      ReadBlockFrom16bitDataPort  ; 2, DEVICE_8BIT_XTIDE_REV2
     %else
-        dw      ReadBlockFromXtideRev2      ; 1, DEVICE_FAST_XTIDE
         dw      ReadBlockFromXtideRev2      ; 2, DEVICE_8BIT_XTIDE_REV2
     %endif
@@ -425 +442 @@
 %ifdef MODULE_8BIT_IDE
         dw      0                           ; 0, DEVICE_8BIT_JRIDE_ISA
-        dw      WriteBlockToFastXtide       ; 1, DEVICE_FAST_XTIDE
+        dw      WriteBlockToXTCF            ; 1, DEVICE_8BIT_XTCF
         dw      WriteBlockToXtideRev2       ; 2, DEVICE_XTIDE_REV2
         dw      WriteBlockToXtideRev1       ; 3, DEVICE_XTIDE_REV1

trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm

@@ -45 +45 @@
 
     add     bx, BYTE ATA1.wHeadCnt - ATA1.wCylCnt
-    mov     cl, MAX_VALID_PCHS_HEADS
+    mov     cx, MAX_VALID_PCHS_HEADS
     call    .CompareCHorSfromOffsetBXtoMaxValueInCX
 
@@ -96 +96 @@
     jbe     SHORT .ValidPCHorSinOffsetBX
 .InvalidPCHorSinOffsetBX:
-    add     sp, 2           ; Clear return address for this function
+    add     sp, BYTE 2      ; Clear return address for this function
 .FailedToVerifyAtaID:
     stc                     ; Set carry to indicate invalid ATA-ID