Changeset 505 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH1Eh_XTCF.asm

Timestamp:

Feb 25, 2013, 4:23:09 PM (11 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Reverted the changes to MenuEvents.inc done in r492 since they broke the F1 key function in XTIDECFG.
• Added a tail-call optimized variant of the CALL_DISPLAY_LIBRARY macro (JMP_DISPLAY_LIBRARY).
• Put a block size limit in AH1Eh_ChangeXTCFmodeBasedOnControlRegisterInAL. I think it's needed but if not, it's easy to remove.
• Other optimizations and fixes.

File:

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

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

@@ -102 +102 @@
     out     dx, al
 
+    ; We always need to enable 8-bit mode since 16-bit mode is restored
+    ; when controller is reset (AH=00h or 0Dh)
+    ePUSH_T bx, AH23h_Enable8bitPioMode
+
     ; Convert Control Register Contents to device code
     test    al, al
@@ -108 +112 @@
     jae     SHORT .SetMemoryMappedMode
 
+; We need to limit block size here. Consider this scenario;
+; 1. While in PIO mode or memory mapped mode, the drive is set to do
+;    block transfers larger than XTCF_DMA_MODE_MAX_BLOCK_SIZE.
+; 2. A call is subsequently made to change device mode to DEVICE_8BIT_XTCF_DMA.
+; 3. The call to AH24h_SetBlockSize fails but the change in device mode has been made.
+
     ; Set DMA Mode
     mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_DMA
     mov     al, [di+DPT_ATA.bBlockSize]
-    call    AH24h_SetBlockSize  ; AH=24h limits block size if necessary
-    jmp     SHORT .Enable8bitPioMode
+    MIN_U   al, XTCF_DMA_MODE_MAX_BLOCK_SIZE
+    jmp     SHORT AH24h_SetBlockSize    ; Returns via AH23h_Enable8bitPioMode
 
 .SetMemoryMappedMode:
-    mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_MEMMAP
-    jmp     SHORT .Enable8bitPioMode
+    mov     al, DEVICE_8BIT_XTCF_MEMMAP
+    SKIP2B  bx
 
 .Set8bitPioMode:
-    mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_PIO8
-    ; Fall to .Enable8bitPioMode
-
-    ; We always need to enable 8-bit mode since 16-bit mode is restored
-    ; when controller is reset (AH=00h or 0Dh)
-.Enable8bitPioMode:
-    jmp     AH23h_Enable8bitPioMode
+    mov     al, DEVICE_8BIT_XTCF_PIO8
+    mov     [di+DPT_ATA.bDevice], al
+    ret     ; Via AH23h_Enable8bitPioMode