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

Timestamp:

Apr 25, 2015, 7:17:41 PM (9 years ago)

Author:

aitotat

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Added support for Lo-tech 8-bit IDE Adapter (untested)

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Files:

• IdeCommand.asm (modified) (2 diffs)
• IdeTransfer.asm (modified) (2 diffs)

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

@@ -89 +89 @@
 
 %ifdef MODULE_8BIT_IDE
-    ; Enable 8-bit PIO mode for 8-bit ATA and XT-CF
     push    si
+
+    ; Enable 8-bit PIO for DEVICE_8BIT_ATA (no need to verify device type here)
     call    AH9h_Enable8bitModeForDevice8bitAta
+
+    ; Set XT-CF mode. No need to check here if device is XT-CF or not.
 %ifdef MODULE_8BIT_IDE_ADVANCED
-    mov     al, XTCF_8BIT_PIO_MODE      ; initialise with most basic transfer mode
-    call    AH9h_SetModeFromALtoXTCF
+    call    AH1Eh_GetCurrentXTCFmodeToAX    ; Reads from DPT_ATA.bDevice that we just stored
+    call    AH9h_SetModeFromALtoXTCF        ; Enables/disables 8-bit mode when necessary
 %endif ; MODULE_8BIT_IDE_ADVANCED
     pop     si
@@ -106 +109 @@
 
     ; Clean stack and return
-.FailedToSet8bitMode:
     lea     sp, [bp+SIZE_OF_IDEPACK_WITHOUT_INTPACK]    ; This assumes BP hasn't changed between Idepack_FakeToSSBP and here
     pop     bp

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

@@ -350 +350 @@
         dw      IdePioBlock_ReadFromXtideRev1       ; 3, DEVICE_8BIT_XTIDE_REV1
         dw      IdePioBlock_ReadFrom16bitDataPort   ; 4, DEVICE_8BIT_XTIDE_REV2
+%ifdef MODULE_8BIT_IDE_ADVANCED
         dw      IdePioBlock_ReadFrom8bitDataPort    ; 5, DEVICE_8BIT_XTCF_PIO8
         dw      IdePioBlock_ReadFrom16bitDataPort   ; 6, DEVICE_8BIT_XTCF_PIO8_WITH_BIU_OFFLOAD
-%ifdef MODULE_8BIT_IDE_ADVANCED
-        dw      IdeDmaBlock_ReadFromXTCF            ; 7, DEVICE_8BIT_XTCF_DMA
+        dw      IdePioBlock_ReadFrom16bitDataPort   ; 7, DEVICE_8BIT_XTCF_PIO16_WITH_BIU_OFFLOAD
+        dw      IdeDmaBlock_ReadFromXTCF            ; 8, DEVICE_8BIT_XTCF_DMA
 %endif ; MODULE_8BIT_IDE_ADVANCED
 %endif ; MODULE_8BIT_IDE
@@ -365 +366 @@
         dw      IdePioBlock_WriteToXtideRev1        ; 3, DEVICE_8BIT_XTIDE_REV1
         dw      IdePioBlock_WriteToXtideRev2        ; 4, DEVICE_8BIT_XTIDE_REV2
+%ifdef MODULE_8BIT_IDE_ADVANCED
         dw      IdePioBlock_WriteTo8bitDataPort     ; 5, DEVICE_8BIT_XTCF_PIO8
         dw      IdePioBlock_WriteTo16bitDataPort    ; 6, DEVICE_8BIT_XTCF_PIO8_WITH_BIU_OFFLOAD
-%ifdef MODULE_8BIT_IDE_ADVANCED
-        dw      IdeDmaBlock_WriteToXTCF             ; 7, DEVICE_8BIT_XTCF_DMA
+        dw      IdePioBlock_WriteTo16bitDataPort    ; 7, DEVICE_8BIT_XTCF_PIO16_WITH_BIU_OFFLOAD
+        dw      IdeDmaBlock_WriteToXTCF             ; 8, DEVICE_8BIT_XTCF_DMA
 %endif ; MODULE_8BIT_IDE_ADVANCED
 %endif ; MODULE_8BIT_IDE