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

Timestamp:

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

Author:

aitotat

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.

File:

• trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Common/HError.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