Changeset 480 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h

Timestamp:

Oct 27, 2012, 11:26:11 AM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• XT-CF DMA transfers should now work.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h

Files:

• AH9h_HInit.asm (modified) (2 diffs)
• Tools/Prepare.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH9h_HInit.asm

@@ -108 +108 @@
 ;;; Set XT-CF mode
 %ifdef MODULE_8BIT_IDE
-    call    AccessDPT_IsThisDeviceXTCF
-    jne     SHORT .DoNotSetXTCFmode
-
     call    AccessDPT_GetIdevarsToCSBX
     mov     al, [cs:bx+IDEVARS.bXTCFcontrolRegister]
-    call    AH1Eh_ChangeXTCFmodeBasedOnControlRegisterInAL
+    call    AH9h_SetModeFromALtoXTCF
     STORE_ERROR_FLAG_TO_DPT     FLG_INITERROR_FAILED_TO_SET_XTCF_MODE
 .DoNotSetXTCFmode:
-%endif
+
+
+;;; Set 8-bit PIO mode
+    call    AH9h_Enable8bitModeForDevice8bitAta
+    STORE_ERROR_FLAG_TO_DPT     FLG_INITERROR_FAILED_TO_SET_8BIT_MODE
+.DoNotSet8bitMode:
+%endif ; MODULE_8BIT_IDE
 
 
@@ -261 +264 @@
 .NoErrorFlagToSet:
     ret
+
+
+%ifdef MODULE_8BIT_IDE
+;--------------------------------------------------------------------
+; AH9h_SetModeFromALtoXTCF
+;   Parameters:
+;       AL:     XT-CF Mode to set
+;       DS:DI:  Ptr to DPT (in RAMVARS segment)
+;       SS:BP:  Ptr to IDEPACK
+;   Returns:
+;       AH:     Int 13h return status
+;       CF:     Clear if successful or device is not XT-CF
+;               Set if failed to set mode for XT-CF
+;   Corrupts registers:
+;       AL, BX, CX, DX, SI
+;--------------------------------------------------------------------
+AH9h_SetModeFromALtoXTCF:
+    call    AccessDPT_IsThisDeviceXTCF
+    jne     SHORT IgnoreInvalidCommandError
+    jmp     AH1Eh_ChangeXTCFmodeBasedOnControlRegisterInAL
+
+
+;--------------------------------------------------------------------
+; AH9h_Enable8bitModeForDevice8bitAta
+;   Parameters:
+;       DS:DI:  Ptr to DPT (in RAMVARS segment)
+;       SS:BP:  Ptr to IDEPACK
+;   Returns:
+;       AH:     Int 13h return status
+;       CF:     Clear if successful or device is not DEVICE_8BIT_ATA
+;               Set if failed to set 8-bit mode for DEVICE_8BIT_ATA
+;   Corrupts registers:
+;       AL, BX, CX, DX, SI
+;--------------------------------------------------------------------
+AH9h_Enable8bitModeForDevice8bitAta:
+    cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_ATA
+    jne     SHORT IgnoreInvalidCommandError
+    jmp     AH23h_Enable8bitPioMode
+%endif ; MODULE_8BIT_IDE

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Tools/Prepare.asm

@@ -95 +95 @@
 Prepare_BufferToESSIforOldInt13hTransfer:
     mov     si, [bp+IDEPACK.intpack+INTPACK.bx] ; Load offset
-
-%ifdef MODULE_8BIT_IDE
-    cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_DMA
-    jne     SHORT .NormalizeForSmallestPossibleOffset
-
-    ; DMA transfers do not need to normalize pointer
-    ; (it will be converted to physical address in IdeDmaTransfer.asm)
-    mov     es, [bp+IDEPACK.intpack+INTPACK.es]
-    jmp     SHORT Prepare_ByValidatingSectorsInALforOldInt13h
-%endif ; MODULE_8BIT_IDE
-
-    ; Normalize segment for 16b pages
-.NormalizeForSmallestPossibleOffset:
-    mov     bx, si
-    eSHR_IM bx, 4                               ; Divide offset by 16
-    add     bx, [bp+IDEPACK.intpack+INTPACK.es]
-    mov     es, bx                              ; Segment normalized
-    and     si, BYTE 0Fh                        ; Offset normalized
+    mov     es, [bp+IDEPACK.intpack+INTPACK.es] ; Load segment
     ; Fall to Prepare_ByValidatingSectorsInALforOldInt13h
-
 
 ;---------------------------------------------------------------------