Changeset 443 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device

Timestamp:

Aug 25, 2012, 2:48:40 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Offset to ATA-ID buffer will no longer get corrupted when trying to enable 8-bit mode for XT-CF.
• Optimized A0<->A3 swapping a bit.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device

Files:

• Device.asm (modified) (1 diff)
• IDE/IdeCommand.asm (modified) (4 diffs)
• IDE/IdeIO.asm (modified) (1 diff)
• Idepack.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Device/Device.asm

@@ -89 +89 @@
 ;       CF:     Cleared if success, Set if error
 ;   Corrupts registers:
-;       AL, BL, CX, DX, SI, DI, ES
+;       AL, BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
 %ifdef MODULE_SERIAL    ; IDE + Serial

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

@@ -63 +63 @@
 ;       CF:     Cleared if success, Set if error
 ;   Corrupts registers:
-;       AL, BL, CX, DX, SI, DI, ES
+;       AL, BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
 IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH:
@@ -74 +74 @@
     call    IdeDPT_StoreDeviceTypeFromIdevarsInCSBPtoDPTinDSDI
 
-    ; Wait until drive motors have reached max speed
+    ; Wait until drive motors have reached full speed
     cmp     bp, BYTE ROMVARS.ideVars0       ; First controller?
     jne     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
@@ -88 +88 @@
 %ifdef MODULE_8BIT_IDE
     ; Enable 8-bit PIO mode for Lo-tech XT-CF
+    push    si
     call    AH9h_Enable8bitPioModeForXTCF
+    pop     si
     jc      SHORT .FailedToSet8bitMode
 %endif
@@ -100 +102 @@
     ; Clean stack and return
 .FailedToSet8bitMode:
-    lea     sp, [bp+EXTRA_BYTES_FOR_INTPACK]    ; This assumes BP hasn't changed between Idepack_FakeToSSBP and here
+    lea     sp, [bp+SIZE_OF_IDEPACK_WITHOUT_INTPACK]    ; This assumes BP hasn't changed between Idepack_FakeToSSBP and here
     pop     bp
     ret

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

@@ -163 +163 @@
     ; Exchange address lines A0 and A3 from DL
     add     dx, [cs:bx]                         ; DX now has port address
-    mov     bl, dl
-    mov     bh, MASK_A3_AND_A0_ADDRESS_LINES
-    and     bh, bl                              ; BH = 0, 1, 8 or 9, we can ignore 0 and 9
-    jz      SHORT .ReturnTranslatedPortInDX     ; Jump out since DH is 0
-    xor     bh, MASK_A3_AND_A0_ADDRESS_LINES
-    jz      SHORT .ReturnTranslatedPortInDX     ; Jump out since DH was 9
-    and     dl, ~MASK_A3_AND_A0_ADDRESS_LINES
-    or      dl, bh                              ; Address lines now reversed
+    mov     bl, dl                              ; Port low byte to BL
+    and     bl, MASK_A3_AND_A0_ADDRESS_LINES    ; Clear all bits except A0 and A3
+    jz      SHORT .ReturnTranslatedPortInDX     ; A0 and A3 both zeroes, no change needed
+    cmp     bl, MASK_A3_AND_A0_ADDRESS_LINES
+    je      SHORT .ReturnTranslatedPortInDX     ; A0 and A3 both ones, no change needed
+    xor     dl, MASK_A3_AND_A0_ADDRESS_LINES    ; Invert A0 and A3
 .ReturnTranslatedPortInDX:
     ret

trunk/XTIDE_Universal_BIOS/Src/Device/Idepack.asm

@@ -32 +32 @@
 Idepack_FakeToSSBP:
     pop     ax
-    sub     sp, BYTE EXTRA_BYTES_FOR_INTPACK
+    sub     sp, BYTE SIZE_OF_IDEPACK_WITHOUT_INTPACK
     mov     bp, sp
     jmp     ax
@@ -161 +161 @@
 
     ; Device Control byte with interrupts disabled
-    call    AccessDPT_GetDeviceControlByteToAL
-    or      al, FLG_DEVCONTROL_nIEN     ; Disable interrupt
-    mov     [bp+IDEPACK.bDeviceControl], al
+    mov     BYTE [bp+IDEPACK.bDeviceControl], FLG_DEVCONTROL_nIEN
 
     jmp     Device_OutputCommandWithParameters