Changeset 616 in xtideuniversalbios

Timestamp:

Aug 8, 2021, 7:03:21 PM (3 years ago)

Author:

Tomi Tilli

Message:

• Added check for APM

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/CustomDPT.inc (modified) (1 diff)
• Src/Device/IDE/IdeDPT.asm (modified) (1 diff)
• Src/Handlers/Int13h/AH9h_HInit.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc

@@ -72 +72 @@
 %ifdef MODULE_POWER_MANAGEMENT
     FLGH_DPT_POWER_MANAGEMENT_SUPPORTED EQU (1<<3)              ; Bit 3, Drive supports power management (must be bit 3!)
+    FLGH_DPT_APM_SUPPORTED              EQU (1<<4)              ; Bit 4, Drive supports advanced power management (must be bit 4!)
 %endif
 %ifdef MODULE_ADVANCED_ATA

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

@@ -47 +47 @@
 .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
-    or      [di+DPT.bFlagsHigh], al     ; bit as FLGH_DPT_POWER_MANAGEMENT_SUPPORTED
+    or      al, ah
+    or      [di+DPT.bFlagsHigh], al     ; bit as FLGH_DPT_POWER_MANAGEMENT_SUPPORTED and FLGH_DPT_APM_SUPPORTED
 %endif ; MODULE_POWER_MANAGEMENT
 

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

@@ -197 +197 @@
 ;;; InitStandbyTimer
     ; Initialize the standby timer (if supported)
-    test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_POWER_MANAGEMENT_SUPPORTED
+    mov     dh, [di+DPT.bFlagsHigh]
+    test    dh, FLGH_DPT_POWER_MANAGEMENT_SUPPORTED
     jz      SHORT .NoPowerManagementSupport
 
     ; Do we need to disable APM?
-;TODO: We should check APM feature set flag from ATA ID word 83. The above
-;FLGH_DPT_POWER_MANAGEMENT_SUPPORTED is from ATA ID word 82
     mov     dl, [cs:ROMVARS.bIdleTimeout]
     push    dx
     push    dx
+    test    dh, FLGH_DPT_APM_SUPPORTED
+    jz      SHORT .NoAdvancedPowerManagementSupport
     call    AH23h_EnableOrDisableAdvancedPowerManagement
+.NoAdvancedPowerManagementSupport:
 
     ; COMMAND_IDLE is not enough for Toshiba 1,8" HDD since idle mode is the default mode