Changeset 493 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Timestamp:

Dec 21, 2012, 8:44:25 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Separated MODULE_8BIT_IDE into the basic part used by XTIDE rev 1 and rev 2 which is PIO based, and MODULE_8BIT_IDE_ADVANCED for JRIDE and XTCF support which requires memory mapping and/or DMA. This allows for creating an 8KB image with boot menu support (but no hotkeys) for the XTIDE rev 1. Cleaned up how we reset the drive translation information, ensuring it is properly set between boot attempt on a primary and secondary drive - as a result we clean it when needed, rather than trying to always keep it clean. Also fixed translation bugs in int13h.asm where I had previously missed converting some MODULE_HOTKEYS into MODULE_DRIVEXLATE.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Files:

• IdeCommand.asm (modified) (3 diffs)
• IdeIO.asm (modified) (6 diffs)
• IdeTransfer.asm (modified) (5 diffs)

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

@@ -87 +87 @@
     call    Idepack_FakeToSSBP
 
-%ifdef MODULE_8BIT_IDE
+%ifdef MODULE_8BIT_IDE_ADVANCED
     ; Enable 8-bit PIO mode for 8-bit ATA and XT-CF
     push    si
@@ -94 +94 @@
     call    AH9h_SetModeFromALtoXTCF
     pop     si
-%endif ; MODULE_8BIT_IDE
+%endif ; MODULE_8BIT_IDE_ADVANCED
 
     ; Prepare to output Identify Device command
@@ -172 +172 @@
     cmp     bl, FLG_STATUS_DRQ              ; Data transfer started?
     jne     SHORT .WaitUntilNonTransferCommandCompletes
-%ifdef MODULE_8BIT_IDE
+%ifdef MODULE_8BIT_IDE_ADVANCED
     cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_MEMMAP
     jae     SHORT JrIdeTransfer_StartWithCommandInAL    ; DEVICE_8BIT_XTCF_MEMMAP or DEVICE_8BIT_JRIDE_ISA

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

@@ -58 +58 @@
     je      SHORT .ReverseA0andA3fromRegisterIndexInDX
     jb      SHORT .InputToALfromRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
+        
+%ifdef MODULE_8BIT_IDE_ADVANCED
     cmp     al, DEVICE_8BIT_JRIDE_ISA
     jne     SHORT .ShlRegisterIndexInDX         ; All XT-CF modes
@@ -68 +70 @@
     pop     ds
     ret
-
+%endif
+        
 .ReverseA0andA3fromRegisterIndexInDX:
     mov     dl, [cs:bx+g_rgbSwapA0andA3fromIdeRegisterIndex]
@@ -103 +106 @@
     cmp     bl, DEVICE_8BIT_XTIDE_REV2
     jbe     SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
+        
+%ifdef MODULE_8BIT_IDE_ADVANCED
     cmp     bl, DEVICE_8BIT_JRIDE_ISA
     jne     SHORT .ShlRegisterIndexInDX     ; All XT-CF modes
@@ -115 +120 @@
     eSHL_IM dx, 1
     jmp     SHORT OutputALtoRegisterInDX
+%endif
 
 .OutputALtoControlBlockRegisterInDX:
@@ -141 +147 @@
     je      SHORT .ReverseA0andA3fromRegisterIndexInDX
     jb      SHORT OutputALtoRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
+
+%ifdef MODULE_8BIT_IDE_ADVANCED
     cmp     bl, DEVICE_8BIT_JRIDE_ISA
     jne     SHORT .ShlRegisterIndexInDX     ; All XT-CF modes
@@ -154 +162 @@
     pop     ds
     ret
-
+%endif
+        
 .ReverseA0andA3fromRegisterIndexInDX:
     mov     bx, dx

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

@@ -218 +218 @@
     xchg    ax, bx                              ; Lookup table offset to AX
     mov     bl, [di+DPT_ATA.bDevice]
-%ifdef MODULE_8BIT_IDE
+%ifdef MODULE_8BIT_IDE_ADVANCED
     mov     dl, bl
 %endif
@@ -226 +226 @@
 
     ; Normalize pointer for PIO-transfers and convert to physical address for DMA transfers
-%ifdef MODULE_8BIT_IDE
+%ifdef MODULE_8BIT_IDE_ADVANCED
     cmp     dl, DEVICE_8BIT_XTCF_DMA
     jb      SHORT IdeTransfer_NormalizePointerInESSI
@@ -281 +281 @@
 %endif                  ; 26    29/26
     ret
-%endif ; MODULE_8BIT_IDE
+%endif ; MODULE_8BIT_IDE_ADVANCED
     ; Fall to IdeTransfer_NormalizePointerInESSI if no MODULE_8BIT_IDE
 
@@ -308 +308 @@
         dw      IdePioBlock_ReadFromXtideRev1       ; 3, DEVICE_8BIT_XTIDE_REV1
         dw      IdePioBlock_ReadFromXtideRev2       ; 4, DEVICE_8BIT_XTIDE_REV2
+%ifdef MODULE_8BIT_IDE_ADVANCED
         dw      IdePioBlock_ReadFrom8bitDataPort    ; 5, DEVICE_8BIT_XTCF_PIO8
         dw      IdeDmaBlock_ReadFromXTCF            ; 6, DEVICE_8BIT_XTCF_DMA
+%endif
 %endif
 
@@ -320 +322 @@
         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      IdeDmaBlock_WriteToXTCF             ; 6, DEVICE_8BIT_XTCF_DMA
 %endif
+%endif