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

Timestamp:

Mar 26, 2012, 4:20:43 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Added Advanced ATA Module (MODULE_ADVANCED_ATA) with native support for QDI Vision QD6500 and QD6580 VLB IDE Controllers.
• Hopefully optimized IDE transfer functions for 8088 (replaced some memory accesses from WORD to BYTE).
• XT build does not fit in 8k at the moment!!!

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h

Files:

• AH9h_HInit.asm (modified) (3 diffs)
• AHDh_HReset.asm (modified) (4 diffs)

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

@@ -38 +38 @@
 ;       CF:     0 if successful, 1 if error
 ;   Corrupts registers:
-;       AL, BX, DX
+;       AL, BX, CX, DX
 ;--------------------------------------------------------------------
 AH9h_InitializeDriveForUse:
+    push    es
     push    si
-    push    cx
+    call    ClearErrorFlagFromBootMenuInfo  ; Do this for serial devices as well
 
 %ifdef MODULE_SERIAL
-    ;
-    ; no need to do this for serial devices, and we use the DPT_RESET flag bits
-    ; to store the drive type for serial floppy drives (MODULE_SERIAL_FLOPPY)
-    ;
+    ; no need to do this for serial devices
     xor     ah, ah
     test    byte [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE    ; Clears CF
-    jnz     .ReturnNotSuccessful
+    jnz     .ReturnWithErrorCodeInAH
+
+%else
+    ; Clear Initialization Error flag from DPT
+    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_INITERROR
 %endif
 
     ; Try to select drive and wait until ready
-    or      BYTE [di+DPT.bFlagsHigh], MASKH_DPT_RESET       ; Everything uninitialized
     call    AccessDPT_GetDriveSelectByteToAL
     mov     [bp+IDEPACK.bDrvAndHead], al
     call    Device_SelectDrive
-    jc      SHORT .ReturnNotSuccessful
-    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_RESET_nDRDY ; Clear since success
+    mov     al, FLG_INIT_FAILED_TO_SELECT_DRIVE
+    call    SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
+    jc      SHORT .ReturnWithErrorCodeInAH
 
     ; Initialize CHS parameters if LBA is not used
     call    InitializeDeviceParameters
-    jc      SHORT .SetWriteCache
-    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_RESET_nINITPRMS
+    mov     al, FLG_INIT_FAILED_TO_INITIALIZE_CHS_PARAMETERS
+    call    SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
 
     ; Enable or Disable Write Cache
-.SetWriteCache:
     call    SetWriteCache
+    mov     al, FLG_INIT_FAILED_TO_SET_WRITE_CACHE
+    call    SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
 
     ; Recalibrate drive by seeking to cylinder 0
 .RecalibrateDrive:
     call    AH11h_RecalibrateDrive
-    jc      SHORT .InitializeBlockMode
-    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_RESET_nRECALIBRATE
+    mov     al, FLG_INIT_FAILED_TO_RECALIBRATE_DRIVE
+    call    SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
 
     ; Initialize block mode transfers
 .InitializeBlockMode:
     call    InitializeBlockMode
-    jc      SHORT .ReturnNotSuccessful
-    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_RESET_nSETBLOCK ; Keeps CF clear
-
-.ReturnNotSuccessful:
-    pop     cx
+    mov     al, FLG_INIT_FAILED_TO_SET_BLOCK_MODE
+    call    SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
+
+%ifdef MODULE_ADVANCED_ATA
+; Initialize fastest supported PIO mode
+.InitializePioMode:
+    call    InitializePioMode
+    mov     al, FLG_INIT_FAILED_TO_SET_PIO_MODE
+    call    SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
+%endif
+
+    ; There might have been several errors so just return
+    ; one error code for them all
+    test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_INITERROR
+    jz      SHORT .ReturnWithErrorCodeInAH
+    mov     ah, RET_HD_RESETFAIL
+    stc
+
+.ReturnWithErrorCodeInAH:
     pop     si
+    pop     es
     ret
 
@@ -140 +158 @@
 
 
+%ifdef MODULE_ADVANCED_ATA
+;--------------------------------------------------------------------
+; InitializePioMode
+;   Parameters:
+;       DS:DI:  Ptr to DPT (in RAMVARS segment)
+;   Returns:
+;       AH:     BIOS Error code
+;       CF:     Cleared if successful
+;               Set if any error
+;   Corrupts registers:
+;       AL, BX, CX, DX
+;--------------------------------------------------------------------
+InitializePioMode:
+    xor     dx, dx                      ; Parameter to Sector Count Register = 0 = PIO_DEFAULT_MODE
+    mov     al, [di+DPT_ATA.bPioMode]
+    cmp     al, 3                       ; PIO mode 3 and above require IORDY
+    jb      SHORT .SetTransferMode
+    or      dl, al
+.SetTransferMode:
+    mov     si, FEATURE_SET_TRANSFER_MODE
+    jmp     AH23h_SetControllerFeatures
+%endif
+
+
 ;--------------------------------------------------------------------
 ; InitializeBlockMode
@@ -160 +202 @@
     eCMOVNZ al, [di+DPT_ATA.bMaxBlock]  ; Load max block size
     jmp     AH24h_SetBlockSize
+
+
+;--------------------------------------------------------------------
+; ClearErrorFlagFromBootMenuInfo
+;   Parameters:
+;       DS:DI:  Ptr to DPT
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       BX, ES
+;--------------------------------------------------------------------
+ClearErrorFlagFromBootMenuInfo:
+    call    BootMenuInfo_IsAvailable    ; Load BOOTMENUINFO segment to ES
+    jne     SHORT .DoNotStoreErrorFlags
+    call    BootMenuInfo_ConvertDPTtoBX
+    mov     WORD [es:bx+BOOTMENUINFO.wInitErrorFlags], 0    ; Must clear whole WORD!
+.DoNotStoreErrorFlags:
+    ret
+
+
+;--------------------------------------------------------------------
+; SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo
+;   Parameters:
+;       AH:     BIOS Error Code
+;       AL:     Error flag to set
+;       DS:DI:  Ptr to DPT
+;   Returns:
+;       CF:     Clear if no error
+;               Set if error flag was set
+;   Corrupts registers:
+;       BX, ES
+;--------------------------------------------------------------------
+SetErrorFlagFromALwithErrorCodeInAHtoBootMenuInfo:
+    jnc     SHORT NoErrorFlagToSet
+    cmp     ah, RET_HD_INVALID
+    jbe     SHORT .IgnoreInvalidCommandError
+
+    call    BootMenuInfo_IsAvailable
+    jne     SHORT .BootvarsNotAvailableSoDoNotSetErrorFlag
+
+    call    BootMenuInfo_ConvertDPTtoBX
+    or      [es:bx+BOOTMENUINFO.wInitErrorFlags], al
+.BootvarsNotAvailableSoDoNotSetErrorFlag:
+    or      BYTE [di+DPT.bFlagsHigh], FLGH_DPT_INITERROR
+    stc
+    ret
+.IgnoreInvalidCommandError:
 ReturnSuccessSinceInitializationNotNeeded:
     xor     ah, ah
-    ret
+NoErrorFlagToSet:
+    ret

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

@@ -53 +53 @@
 
     ; Initialize Master and Slave drives
-    eMOVZX  ax, [di+DPT.bIdevarsOffset]         ; (AL) pointer to controller we are looking to reset
+    eMOVZX  ax, BYTE [di+DPT.bIdevarsOffset]    ; (AL) pointer to controller we are looking to reset
                                                 ; (AH) initialize error code, assume success
 
-    mov     si, IterateAndResetDrives
+    mov     si, IterateAndResetDrives           ; Callback function for FindDPT_IterateAllDPTs
     call    FindDPT_IterateAllDPTs
 
@@ -73 +73 @@
 ; merged into overall error code for this controller.  Master will be reset
 ; first.  Note that the iteration will go until the end of the DPT list.
+;
+;   Parameters:
+;       AL:     Offset to IDEVARS for drives to initialize
+;       AH:     Error status from previous initialization
+;       DS:DI:  Ptr to DPT to examine
+;   Returns:
+;       AH:     Error status from initialization
+;       CF:     Set to iterate all DPTs
+;   Corrupts registers:
+;       AL, BX, DX
 ;--------------------------------------------------------------------
 IterateAndResetDrives:
@@ -78 +88 @@
     jne     .done
     push    ax
+    push    cx
     call    AH9h_InitializeDriveForUse          ; Reset Master and Slave (Master will come first in DPT list)
+
+%ifdef MODULE_ADVANCED_ATA
+    jc      SHORT .SkipControllerInitSinceError
+    call    InitializeAdvancedIdeControllers    ; Done after drive init so drives are first set to advanced PIO mode, then the controller
+.SkipControllerInitSinceError:
+%endif
+
+    pop     cx
     pop     ax
     jnc     .done
@@ -85 +104 @@
     stc                                         ; From IterateAllDPTs perspective, the DPT is never found (continue iteration)
     ret
+
+
+%ifdef MODULE_ADVANCED_ATA
+;--------------------------------------------------------------------
+; Here we initialize the more advanced controllers (VLB and PCI)
+; to get better performance for systems with 32-bit bus.
+;
+; This step is optional since the controllers use slowest possible
+; settings by default if they are not initialized.
+;
+; InitializeAdvancedIdeController
+;   Parameters:
+;       DS:DI:  Ptr to DPT
+;   Returns:
+;       CF:     Cleared if success or no controller to initialize
+;               Set if error
+;   Corrupts registers:
+;       AX, BX, CX, DX
+;--------------------------------------------------------------------
+InitializeAdvancedIdeControllers:
+    ; We want to initialize the advanced controller only after both
+    ; Master and Slave drive are initialized to correct PIO mode.
+    ; We check if next DPT is for the same IDE controller. If it is,
+    ; we skip the initialization.
+    mov     al, [di+DPT.bIdevarsOffset]
+    cmp     al, [di++LARGEST_DPT_SIZE+DPT.bIdevarsOffset]
+    je      SHORT .SkipInitializationUntilNextDrive ; CF cleared
+
+    jmp     AdvAtaInit_InitializeControllerForDPTinDSDI
+.SkipInitializationUntilNextDrive:
+    clc
+    ret
+
+%endif  ; MODULE_ADVANCED_ATA