Changeset 618 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeDPT.asm

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.

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeDPT.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeDPT.asm

@@ -43 +43 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AL
+;       AX
 ;--------------------------------------------------------------------
 .DetectPowerManagementSupport:
-    mov     al, [es:si+ATA6.wSetSup82]
-    mov     ah, [es:si+ATA6.wSetSup83]
-    and     ah, A6_wSetSup83_APM
-    shl     ah, 1                       ; APM bit 3 to bit 4
-    and     al, A6_wSetSup82_POWERMAN   ; A6_wSetSup82_POWERMAN (bit 3) is the same
+    mov     ax, A6_wSetSup83_APM << 8 | A6_wSetSup82_POWERMAN   ; Both of these flags are bit 3
+    and     ah, [es:si+ATA6.wSetSup83]
+    and     al, [es:si+ATA6.wSetSup82]
+    eSHL_IM ah, 1                       ; APM bit 3 to bit 4 (same as FLGH_DPT_APM_SUPPORTED)
     or      al, ah
-    or      [di+DPT.bFlagsHigh], al     ; bit as FLGH_DPT_POWER_MANAGEMENT_SUPPORTED and FLGH_DPT_APM_SUPPORTED
+    or      [di+DPT.bFlagsHigh], al     ; FLGH_DPT_POWER_MANAGEMENT_SUPPORTED and FLGH_DPT_APM_SUPPORTED
 %endif ; MODULE_POWER_MANAGEMENT
 
@@ -118 +117 @@
     cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_32BIT_ATA
     ja      SHORT .NoAdvancedControllerDetected
-    
+
     mov     bx, [di+DPT.wBasePort]
     call    AdvAtaInit_DetectControllerForIdeBaseInBX