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

Timestamp:

Aug 31, 2021, 2:17:47 PM (3 years ago)

Author:

krille_n_

Message:

Changes:

• Updated the BIOS makefile. Added the NO_ATAID_CORRECTION define back to the Tiny build as I've realized that the correction code should not be needed for builds without MODULE_EBIOS. Also added a new makefile target 'custom' to make it easier for people to make custom builds.
• Fixed a bug where calling INT 13h/AH=15h for drives not handled by XUB (floppy drives for example) would return an error due to the fact that any non-zero return value in AH from the other BIOS would cause the CF to be set in Int13h_SetErrorCodeToIntpackInSSBPfromAH. The return path is now via Int13h_ReturnFromHandlerWithoutStoringErrorCode which means that no status/error code will be returned in the BDA but that should not be a problem as the other BIOS should do that anyway. This change also fixed another potential problem where return values in DL from the other BIOS were assumed to be drive numbers when MODULE_SERIAL_FLOPPY is included in the build.
• Minor optimizations and fixes.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers

Files:

• Int13h.asm (modified) (1 diff)
• Int13h/AH23h_HFeatures.asm (modified) (2 diffs)
• Int13h/AH4h_HVerify.asm (modified) (2 diffs)
• Int13h/AH9h_HInit.asm (modified) (2 diffs)
• Int13h/EBIOS/AH44h_ExtendedVerifySectors.asm (modified) (1 diff)
• Int13h/Tools/Address.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h.asm

@@ -250 +250 @@
     pop     WORD [RAMVARS.xlateVars+XLATEVARS.wFDandHDswap]
     cmp     dl, [RAMVARS.xlateVars+XLATEVARS.bXlatedDrv]    ; DL is still drive number?
-    je      SHORT Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
+    je      SHORT Int13h_ReturnFromHandlerWithoutStoringErrorCode
     mov     [bp+IDEPACK.intpack+INTPACK.dl], dl ; Something is returned in DL
 %endif
-    jmp     SHORT Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
+    jmp     SHORT Int13h_ReturnFromHandlerWithoutStoringErrorCode
+    ; We cannot return via Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH!
+    ; 1. If the other BIOS returns something in DL then that is assumed to be a drive number
+    ;    (if MODULE_SERIAL_FLOPPY is included) even though it could be anything.
+    ; 2. Any non-zero value in AH will cause the CF to be set on return from the handler.
+    ;    This breaks INT 13h/AH=15h for drives handled by the other BIOS.
 
 

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

@@ -106 +106 @@
 ; Enable/disable advanced power management command can be used to scale
 ; power consumption and performance. Drive supporting Enable APM might not
-; support Disable AMP so we set the drive to max performance if stand by
+; support Disable APM so we set the drive to max performance if stand by
 ; timer value is 0 (idle/standby disabled)
 ;
@@ -126 +126 @@
     test    dl, dl
     jnz     SHORT .EnablePowerSave
-    dec     dx
-    dec     dx      ; DL = FEh = Maximum performance
-    jmp     AH23h_SetControllerFeatures
-    
+    mov     dl, 0FEh    ; Maximum performance
+    SKIP2B  f
+
 ; TODO: We should add power management level to IDEVARS to be adjustable with xtidecfg
 .EnablePowerSave:
     mov     dl, 0BFh    ; For Toshiba 1.8" HDD: 80h...BFh = Mode 1
-    jmp     AH23h_SetControllerFeatures
-%endif ; %ifdef MODULE_POWER_MANAGEMENT
+    jmp     SHORT AH23h_SetControllerFeatures
+%endif ; MODULE_POWER_MANAGEMENT

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

@@ -65 +65 @@
 ;   Parameters:
 ;       AH:     INT 13h error code
-;       CX:     Number of sectors that was meant to we verified
+;       CX:     Number of sectors that was meant to be verified
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
 ;       SS:BP:  Ptr to IDEPACK
@@ -74 +74 @@
 ALIGN JUMP_ALIGN
 AH4h_CalculateNumberOfSuccessfullyVerifiedSectors:
-    xchg    cx, ax          ; Store error code to CL
+    xchg    cx, ax                      ; Store error code to CH
     call    Device_ReadLBAlowRegisterToAL
-    mov     ah, [bp+IDEPACK.bLbaLow]
-    sub     al, ah          ; AL = sector address with verify failure - starting sector address
+    sub     al, [bp+IDEPACK.bLbaLow]    ; AL = sector address with verify failure - starting sector address
     xor     ah, ah
-    xchg    cx, ax          ; Number of successfully verified sectors in CX, error code in AH
+    xchg    cx, ax                      ; Number of successfully verified sectors in CX, error code in AH
     stc
     ret

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

@@ -204 +204 @@
     mov     dl, [cs:ROMVARS.bIdleTimeout]
     push    dx
-    push    dx
     test    dh, FLGH_DPT_APM_SUPPORTED
     jz      SHORT .NoAdvancedPowerManagementSupport
@@ -213 +212 @@
     ; COMMAND_STAND_BY seemed to do the trick
     pop     dx
+    push    dx
     mov     al, COMMAND_STAND_BY
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_BSY, FLG_STATUS_BSY)

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

@@ -41 +41 @@
 AH44h_HandlerForExtendedVerifySectors:
     call    Prepare_ByLoadingDapToESSIandVerifyingForTransfer
-    push    WORD [es:si+DAP.wSectorCount]               ; Store for successfull number of sectors transferred
+    push    WORD [es:si+DAP.wSectorCount]               ; Store for successful number of sectors transferred
     mov     ah, [cs:bx+g_rgbVerifyCommandLookup]
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_DRQ, FLG_STATUS_DRDY)

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

@@ -39 +39 @@
     mov     bl, 3Fh             ; Load sector number mask
     and     bl, cl              ; Sector number now in BL
+%ifndef USE_186
     sub     cl, bl              ; Remove from cylinder number high
-    eROL_IM cl, 2               ; High bits to beginning
+    rol     cl, 1               ; High bits to beginning
+    rol     cl, 1
+%else
+    shr     cl, 6
+%endif
     mov     bh, dh              ; Copy Head number
     xchg    cl, ch              ; Cylinder number now in CX