Changeset 588 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH9h_HInit.asm

Timestamp:

Jun 3, 2015, 12:30:54 PM (10 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Fixed a bug in AH24h_HSetBlocks.asm from r550. Trying to set a too large block size with an XT-CF card in DMA transfer mode would corrupt the stack.
• Fixed a bug from r545 where the list of devices under g_szDeviceTypeValues in Strings.asm was no longer up to date causing the boot menu to display the wrong string for devices numbered higher than DEVICE_8BIT_XTCF_PIO8.
• Made some fairly significant changes to the XT-CF code to reduce size. Two changes in functionality; 1) Added a simple check to validate the request for a change of the XT-CF transfer mode. 2) Changing transfer mode to use DMA no longer calls AH24h_SetBlockSize if the block size already is within the limits of DMA transfers. UNTESTED
• XTIDECFG now clears IDEVARS.bIRQ when changing IDE controller to a serial device to keep the boot menu from displaying it since the serial device doesn't use IRQs at all.
• Other minor optimizations.

File:

• trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH9h_HInit.asm (modified) (2 diffs)

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

@@ -234 +234 @@
 
 
+%ifdef MODULE_8BIT_IDE
+;--------------------------------------------------------------------
+; 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
+%ifdef MODULE_8BIT_IDE_ADVANCED
+    jne     SHORT IgnoreInvalidCommandError
+    jmp     AH23h_Enable8bitPioMode
+%else ; ~MODULE_8BIT_IDE_ADVANCED
+    je      AH23h_Enable8bitPioMode
+    ; Fall to IgnoreInvalidCommandError
+%endif ; MODULE_8BIT_IDE_ADVANCED
+%endif ; MODULE_8BIT_IDE
+
+
+%ifdef MODULE_8BIT_IDE_ADVANCED
+;--------------------------------------------------------------------
+; 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
+    jnc     AH1Eh_ChangeXTCFmodeBasedOnModeInAL
+    ; Fall to IgnoreInvalidCommandError
+%endif ; MODULE_8BIT_IDE_ADVANCED
+
+
 ;--------------------------------------------------------------------
 ; SetErrorFlagFromALwithErrorCodeInAH
@@ -259 +305 @@
 .NoErrorFlagToSet:
     ret
-
-
-%ifdef MODULE_8BIT_IDE_ADVANCED
-;--------------------------------------------------------------------
-; 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_ChangeXTCFmodeBasedOnModeInAL
-%endif ; MODULE_8BIT_IDE_ADVANCED
-
-
-%ifdef MODULE_8BIT_IDE
-;--------------------------------------------------------------------
-; 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