Changeset 550 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers

Timestamp:

Apr 27, 2013, 5:30:50 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• CREATE_COMPATIBLE_DPT is now MODULE_COMPATIBLE_TABLES.
• DPTs pointed by INT 41h and INT 46h are now swapped when swapping drives 81h and 80h.
• Block mode commands are no longer used when block size is set to 1 with AH=24h.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h

Files:

• AH24h_HSetBlocks.asm (modified) (2 diffs)
• AH9h_HInit.asm (modified) (3 diffs)
• EBIOS/AH41h_CheckIfExtensionsPresent.asm (modified) (3 diffs)
• EBIOS/AH48h_GetExtendedDriveParameters.asm (modified) (4 diffs)
• Tools/Prepare.asm (modified) (1 diff)

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

@@ -68 +68 @@
     ; must know what the actual block size is.
     cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_DMA
-    je      SHORT ProcessXTCFsubcommandFromAL.AH1Eh_LoadInvalidCommandToAHandSetCF
+    je      SHORT .DisableBlockMode
 .NoNeedToLimitBlockSize:
 %endif ; MODULE_8BIT_IDE_ADVANCED
@@ -74 +74 @@
     push    bx
 
-    push    ax
+    push    ax          ; Store block size for later use
     xchg    dx, ax      ; DL = Block size (Sector Count Register)
     mov     al, COMMAND_SET_MULTIPLE_MODE
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_DRDY, FLG_STATUS_DRDY)
     call    Idepack_StoreNonExtParametersAndIssueCommandFromAL
-    pop     bx
-    jnc     SHORT .StoreBlockSize
 
-    ; Drive disabled block mode since we tried unsupported block size.
-    ; We must adjust DPT accordingly.
-    mov     bl, 1       ; Block size 1 will always work (=Block mode disabled)
-.StoreBlockSize:        ; Store new block size to DPT and return
+    ; Disable block mode if failure or if called with block size of 1 sector.
+    ; Some drives allow block mode commands for 1 sector blocks and some do not.
+    pop     bx          ; Pop block size to BL
+    jc      SHORT .DisableBlockMode
+    mov     bh, bl      ; BL and BH both have block size we tried to set
+    dec     bh
+    jz      SHORT .DisableBlockMode
+
+    ; Enable block mode and store block size
+    or      BYTE [di+DPT.bFlagsHigh], FLGH_DPT_USE_BLOCK_MODE_COMMANDS
+    jmp     SHORT .StoreBlockSizeFromBLandReturn
+
+.DisableBlockMode:
+    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_USE_BLOCK_MODE_COMMANDS
+    mov     bl, 1
+    stc
+.StoreBlockSizeFromBLandReturn:
     mov     [di+DPT_ATA.bBlockSize], bl
-
     pop     bx
     ret

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

@@ -163 +163 @@
     ; Initialize block mode transfers
     pop     ax  ; Restore .wFlags saved in SetWriteCache
-    test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_BLOCK_MODE_SUPPORTED
-    jz      SHORT .BlockModeNotSupportedOrDisabled
-    test    al, FLG_DRVPARAMS_BLOCKMODE
-    jz      SHORT .BlockModeNotSupportedOrDisabled
+    test    al, FLG_DRVPARAMS_BLOCKMODE ; Tested here so block mode can be enabled with AH=24h
+    jz      SHORT .BlockModeDisabled
 
     ; Try block sizes until we find largest possible supported by drive
@@ -177 +175 @@
     jnc     SHORT .TryNextBlockSize
     STORE_ERROR_FLAG_TO_DPT     FLG_INITERROR_FAILED_TO_SET_BLOCK_MODE
-.BlockModeNotSupportedOrDisabled:
+.BlockModeDisabled:
 .SupportedBlockSizeFound:
 
@@ -286 +284 @@
 %endif ; MODULE_8BIT_IDE_ADVANCED
 
+
 %ifdef MODULE_8BIT_IDE
 ;--------------------------------------------------------------------

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/EBIOS/AH41h_CheckIfExtensionsPresent.asm

@@ -44 +44 @@
     mov     WORD [bp+IDEPACK.intpack+INTPACK.bx], 0AA55h
 
-%ifdef CREATE_COMPATIBLE_DPT
+%ifdef MODULE_COMPATIBLE_TABLES
     call    AH41h_GetSupportBitsToCX
     mov     [bp+IDEPACK.intpack+INTPACK.cx], cx
 %else
     mov     WORD [bp+IDEPACK.intpack+INTPACK.cx], ENHANCED_DRIVE_ACCESS_SUPPORT
-%endif
+%endif ; MODULE_COMPATIBLE_TABLES
 
     and     BYTE [bp+IDEPACK.intpack+INTPACK.flags], ~FLG_FLAGS_CF  ; Return with CF cleared
@@ -57 +57 @@
 
 
-%ifdef CREATE_COMPATIBLE_DPT
+%ifdef MODULE_COMPATIBLE_TABLES
 ;--------------------------------------------------------------------
 ; AH41h_GetSupportBitsToCX
@@ -87 +87 @@
     ret
 
-%endif ; CREATE_COMPATIBLE_DPT
+%endif ; MODULE_COMPATIBLE_TABLES

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/EBIOS/AH48h_GetExtendedDriveParameters.asm

@@ -81 +81 @@
 
     ; Create DPTE (hardware information for device drivers)
-%ifdef CREATE_COMPATIBLE_DPT
+%ifdef MODULE_COMPATIBLE_TABLES
     call    AH41h_GetSupportBitsToCX
     test    cl, ENHANCED_DISK_DRIVE_SUPPORT
@@ -87 +87 @@
     call    CompatibleDPT_CreateDeviceParameterTableExtensionToESBXfromDPTinDSSI
 .DoNotCreateDPTE:
-%endif
+%endif ; MODULE_COMPATIBLE_TABLES
 
     ; Point DS:DI to Extended Drive Information Table to fill
@@ -107 +107 @@
     ; Store DPTE for standard controllers only,
     ; FFFF:FFFF for non standard controllers
-%ifdef CREATE_COMPATIBLE_DPT
+%ifdef MODULE_COMPATIBLE_TABLES
     mov     [di+EDRIVE_INFO.fpDPTE], bx
     mov     [di+EDRIVE_INFO.fpDPTE+2], es
@@ -117 +117 @@
     mov     [di+EDRIVE_INFO.fpDPTE], bx
     mov     [di+EDRIVE_INFO.fpDPTE+2], bx
-%endif
+%endif ; MODULE_COMPATIBLE_TABLES
 
     ; Fill Extended Drive Information Table in DS:DI from DPT in ES:SI

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

@@ -81 +81 @@
     ; Block mode or single sector
     mov     bl, [di+DPT.bFlagsHigh]
-    and     bx, BYTE FLGH_DPT_BLOCK_MODE_SUPPORTED  ; Bit 1
+    and     bx, BYTE FLGH_DPT_USE_BLOCK_MODE_COMMANDS   ; Bit 1
     ret