Changeset 613 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS

Timestamp:

May 27, 2021, 6:25:17 PM (4 years ago)

Author:

Tomi Tilli

Message:

Added more complex way to limit illegal P-CHS Cylinders. This way more modifications can be easily made later if necessary.
Updated biosdrvs to display unmodified and modified CHS.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/Int13h.inc (modified) (1 diff)
• Src/Device/Device.asm (modified) (3 diffs)
• Src/Handlers/Int13h/AH25h_HDrvID.asm (modified) (1 diff)
• Src/Initialization/AtaID.asm (modified) (2 diffs)
• Src/VariablesAndDPTs/AtaGeometry.asm (modified) (1 diff)
• makefile (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Inc/Int13h.inc

@@ -20 +20 @@
 %ifndef INT13H_INC
 %define INT13H_INC
+
+; Signature for XTIDE Universal BIOS specific functions
+XUB_INT13h_SIGNATURE    EQU     RAMVARS_RAM_SIGNATURE
 
 ; Hard Disk function (INT 13h) return status codes in AH

trunk/XTIDE_Universal_BIOS/Src/Device/Device.asm

@@ -88 +88 @@
 ;   Parameters:
 ;       BH:     Drive Select byte for Drive and Head Select Register
+;       CX:     XUB_INT13h_SIGNATURE to ignore illegal ATA-ID values, otherwise
+;               correct them (only used if NOT build with NO_ATAID_CORRECTION)
 ;       DX:     Autodetected port (for devices that support autodetection)
 ;       DS:     Segment to RAMVARS
@@ -98 +100 @@
 ;       AL, BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
+Device_IdentifyToBufferInESSIwithDriveSelectByteInBH:
+%ifndef NO_ATAID_CORRECTION
+    cmp     cx, XUB_INT13h_SIGNATURE
+    je      SHORT .DoNotFixAtaInformation
+    push    es
+    push    si
+    ePUSH_T cx, AtaID_PopESSIandFixIllegalValuesFromESSI    ; Here we modify ATA information if necessary
+.DoNotFixAtaInformation:
+%endif
+
 %ifdef MODULE_SERIAL    ; IDE + Serial
-Device_IdentifyToBufferInESSIwithDriveSelectByteInBH:
     cmp     BYTE [cs:bp+IDEVARS.bDevice], DEVICE_SERIAL_PORT
 %ifdef USE_386
@@ -112 +123 @@
 
 %else                   ; IDE
-    Device_IdentifyToBufferInESSIwithDriveSelectByteInBH    EQU     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
+    jmp     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
 %endif
 

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

@@ -26 +26 @@
 ; AH25h_HandlerForGetDriveInformation
 ;   Parameters:
-;       ES:     Same as in INTPACK
+;       CX, ES: Same as in INTPACK
 ;       DL:     Translated Drive number
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
 ;       SS:BP:  Ptr to IDEPACK
 ;   Parameters on INTPACK:
+;       CX:     XUB_INT13h_SIGNATURE to ignore illegal ATA-ID values, otherwise
+;               correct them (only used if NOT build with NO_ATAID_CORRECTION)
 ;       ES:BX:  Ptr to buffer to receive 512-byte drive information
 ;   Returns with INTPACK:

trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm

@@ -22 +22 @@
 SECTION .text
 
+;--------------------------------------------------------------------
+; Adjust ATA information for compatibility, debug, etc purposes.
+; We can also completely ignore the drive if necessary.
+;
+; AtaID_FixIllegalValuesFromESSI
+;   Parameters:
+;       AH:     INT 13h Error Code from reading ATA information
+;       CF:     Cleared if successfully read ATA information,
+;               Set if failed to read ATA information
+;       ES:SI:  Ptr to 512-byte ATA information read from the drive
+;   Returns:
+;       ES:SI:  Ata information with possible corrections made
+;       AH:     INT 13h Error Code from reading ATA information
+;       CF      cleared if drive now accepted
+;   Corrupts registers:
+;       AL, BX, CX, DX, DI
+;--------------------------------------------------------------------
+%ifndef NO_ATAID_CORRECTION
+%ifndef EXCLUDE_FROM_BIOSDRVS
+AtaID_PopESSIandFixIllegalValuesFromESSI:
+    pop     si
+    pop     es
+%endif
+AtaID_FixIllegalValuesFromESSI:
+    jc      SHORT .Return   ; Nothing to fix since failed to read ATA Info
+
+    ; Only correct cylinders since there are no reports that head or sectors could be wrong
+    MIN_U   WORD [es:si+ATA1.wCylCnt], MAX_VALID_PCHS_CYLINDERS     ; Limit to max allowed value
+    
+    ; Note! There are ATA ID words 54-58 that also need to be modified! However,
+    ; the drive itself should modify them when we do Initialize Device Parameters command at AH=9h.
+    ; Verification from real drive needed before we fix them manually
+    
+    clc                     ; Return success
+.Return:
+    ret
+%endif ; NO_ATAID_CORRECTION
+
+
+%ifndef EXCLUDE_FROM_BIOSDRVS
 ;--------------------------------------------------------------------
 ; AtaID_VerifyFromESSI
@@ -233 +273 @@
 
 %endif ; MODULE_ADVANCED_ATA
+
+%endif ; EXCLUDE_FROM_BIOSDRVS

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/AtaGeometry.asm

@@ -239 +239 @@
     mov     bl, [es:si+ATA1.wHeadCnt]   ; Heads (1...16)
     mov     bh, [es:si+ATA1.wSPT]       ; Sectors per Track (1...63)
-%ifndef EXCLUDE_FROM_BIOSDRVS   ; We want the true value in BIOSDRVS
-    ; Some CF cards (for example Sandisk Ultra 16/32 GB) violates
-    ; the ATA specification by reporting more than 16383 cylinders.
-    MIN_U   ax, MAX_PCHS_CYLINDERS      ; Limit the count to avoid problems.
-%endif
     ret
 

trunk/XTIDE_Universal_BIOS/makefile

@@ -37 +37 @@
 # RELOCATE_INT13H_STACK **    Relocates INT 13h stack to beginning of stolen conventional memory   #
 # NO_ATAID_VALIDATION ***     Excludes code that tries to ensure proper communication with drives  #
+# NO_ATAID_CORRECTION         Excludes code that corrects illegal CHS values from some CF cards    #
 # USE_186                     Use instructions supported by 80188/80186 and V20/V30 and later      #
 # USE_286                     Use instructions supported by 286 and later (defines USE_UNDOC_INTEL)#
@@ -117 +118 @@
 DEFINES_AT_LARGE = $(DEFINES_AT) $(DEFINES_COMMON_LARGE)
 
-DEFINES_XT_TINY = MODULE_STRINGS_COMPRESSED MODULE_8BIT_IDE NO_ATAID_VALIDATION CLD_NEEDED
+DEFINES_XT_TINY = MODULE_STRINGS_COMPRESSED MODULE_8BIT_IDE NO_ATAID_VALIDATION NO_ATAID_CORRECTION CLD_NEEDED
 DEFINES_386 = $(DEFINES_AT) USE_386 MODULE_ADVANCED_ATA MODULE_WIN9X_CMOS_HACK
 DEFINES_386_LARGE = $(DEFINES_386) $(DEFINES_COMMON_LARGE)