Changeset 27 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Common

Timestamp:

Jul 28, 2010, 6:53:32 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

• v1.1.1 broke booting from foreign drives, it is now fixed.
• Fixed a bug where Disk Parameter Table was accessed with wrong pointer register after writing last block.
• Cleaned AH=00h, Disk Controller Reset a bit.
• Timeout errors might now get translated for better error codes on certain situations.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Common

Files:

• HError.asm (modified) (4 diffs)
• HStatus.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Common/HError.asm

@@ -2 +2 @@
 ; Project name  :   IDE BIOS
 ; Created date  :   30.11.2007
-; Last update   :   8.4.2010
+; Last update   :   28.7.2010
 ; Author        :   Tomi Tilli
 ; Description   :   Error checking functions for BIOS Hard disk functions.
@@ -8 +8 @@
 ; Section containing code
 SECTION .text
+
+;--------------------------------------------------------------------
+; HError_GetErrorCodeToAHforBitPollingTimeout
+;   Parameters:
+;       AL:     IDE Status Register contents
+;       DX:     IDE Status Register Address
+;   Returns:
+;       AH:     Hard disk BIOS error code
+;       CF:     Set since error
+;   Corrupts registers:
+;       AL, CX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+HError_GetErrorCodeToAHforBitPollingTimeout:
+    test    al, FLG_IDE_ST_BSY                      ; Other bits undefined when BSY set
+    jnz     SHORT HError_GetErrorCodeForStatusReg   ; Busy, normal timeout
+    test    al, FLG_IDE_ST_DF | FLG_IDE_ST_CORR | FLG_IDE_ST_ERR
+    jnz     SHORT HError_GetErrorCodeForStatusReg   ; Not busy but some error
+    or      al, FLG_IDE_ST_BSY                      ; Polled bit got never set, force timeout
+    ; Fall to HError_GetErrorCodeForStatusReg
 
 ;--------------------------------------------------------------------
@@ -37 +57 @@
     mov     [HDBDA.wHDStAndErr], ax         ; Store Status and Error to BDA
     pop     ds
-
-    ; Translate registers to BIOS error code
     ; Fall to HError_ConvertIdeErrorToBiosRet
 
@@ -58 +76 @@
 ALIGN JUMP_ALIGN
 HError_ConvertIdeErrorToBiosRet:
-    ; Any error?
+    test    al, FLG_IDE_ST_BSY
+    jnz     SHORT .TimeoutError
     test    al, FLG_IDE_ST_DF | FLG_IDE_ST_CORR | FLG_IDE_ST_ERR
     jnz     SHORT .ReadErrorFromStatusReg
     xor     ah, ah                  ; No errors, zero AH and CF
+    ret
+
+.TimeoutError:
+    mov     ah, RET_HD_TIMEOUT
+    stc
     ret
 

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Common/HStatus.asm

@@ -2 +2 @@
 ; Project name  :   IDE BIOS
 ; Created date  :   15.12.2009
-; Last update   :   26.6.2010
+; Last update   :   28.7.2010
 ; Author        :   Tomi Tilli
 ; Description   :   IDE Status Register polling functions.
@@ -189 +189 @@
 ; IDE Status register polling.
 ; This function first waits until controller is not busy.
-; When not busy, IDE Status Register is polled until wanted
-; flag (HBIT_ST_DRDY or HBIT_ST_DRQ) is set.
+; When not busy, IDE Status Register is polled until wanted flag is set.
 ;
 ; HStatus_PollBusyAndFlg
@@ -207 +206 @@
 ALIGN JUMP_ALIGN
 HStatus_PollBsyAndFlg:
-    call    SoftDelay_InitTimeout       ; Initialize timeout counter
+    call    SoftDelay_InitTimeout               ; Initialize timeout counter
 ALIGN JUMP_ALIGN
 .PollLoop:
-    in      al, dx                      ; Load IDE Status Register
-    test    al, FLG_IDE_ST_BSY          ; Controller busy?
-    jnz     SHORT .UpdateTimeout        ;  If so, jump to timeout update
-    test    al, ah                      ; Test secondary flag
-    jnz     SHORT HStatus_PollCompleted ; If set, break loop
+    in      al, dx                              ; Load IDE Status Register
+    test    al, FLG_IDE_ST_BSY                  ; Controller busy?
+    jnz     SHORT .UpdateTimeout                ;  If so, jump to timeout update
+    test    al, ah                              ; Test secondary flag
+    jnz     SHORT GetErrorCodeFromPollingToAH   ; If set, break loop
 ALIGN JUMP_ALIGN
 .UpdateTimeout:
-    call    SoftDelay_UpdTimeout        ; Update timeout counter
-    jnc     SHORT .PollLoop             ; Loop if time left (sets CF on timeout)
-    mov     ah, RET_HD_TIMEOUT          ; Load error code for timeout
-    ret
-
+    call    SoftDelay_UpdTimeout                ; Update timeout counter
+    jnc     SHORT .PollLoop                     ; Loop if time left (sets CF on timeout)
+    jmp     HError_GetErrorCodeToAHforBitPollingTimeout
 
 ;--------------------------------------------------------------------
@@ -241 +238 @@
 ALIGN JUMP_ALIGN
 HStatus_PollBsy:
-    call    SoftDelay_InitTimeout       ; Initialize timeout counter
+    call    SoftDelay_InitTimeout               ; Initialize timeout counter
 ALIGN JUMP_ALIGN
 .PollLoop:
-    in      al, dx                      ; Load IDE Status Reg
-    test    al, FLG_IDE_ST_BSY          ; Controller busy? (clears CF)
-    jz      SHORT HStatus_PollCompleted ;  If not, jump to check errors
-    call    SoftDelay_UpdTimeout        ; Update timeout counter
-    jnc     SHORT .PollLoop             ; Loop if time left (sets CF on timeout)
-    mov     ah, RET_HD_TIMEOUT          ; Load error code for timeout
-    ret
-
-ALIGN JUMP_ALIGN
-HStatus_PollCompleted:
-    test    al, FLG_IDE_ST_DF | FLG_IDE_ST_ERR
-    jnz     SHORT .GetErrorCode         ;  If errors, jump to get error code
-    xor     ah, ah                      ; Zero AH and clear CF
-    ret
-.GetErrorCode:
+    in      al, dx                              ; Load IDE Status Reg
+    test    al, FLG_IDE_ST_BSY                  ; Controller busy?
+    jz      SHORT GetErrorCodeFromPollingToAH   ;  If not, jump to check errors
+    call    SoftDelay_UpdTimeout                ; Update timeout counter
+    jnc     SHORT .PollLoop                     ; Loop if time left (sets CF on timeout)
+ALIGN JUMP_ALIGN
+GetErrorCodeFromPollingToAH:
     jmp     HError_GetErrorCodeForStatusReg