diff --git a/rEFIt_UEFI/Platform/Settings.cpp b/rEFIt_UEFI/Platform/Settings.cpp index 4a17b35cf..a949b2e2f 100755 --- a/rEFIt_UEFI/Platform/Settings.cpp +++ b/rEFIt_UEFI/Platform/Settings.cpp @@ -417,7 +417,8 @@ void afterGetUserSettings(SETTINGS_DATA& settingsData) GlobalConfig.EnableC6 = settingsData.getEnableC6(); GlobalConfig.EnableC4 = settingsData.getEnableC4(); GlobalConfig.EnableC2 = settingsData.getEnableC2(); - GlobalConfig.C3Latency = settingsData.getEnableC6(); +// GlobalConfig.C3Latency = settingsData.getC3Latency(); +// DBG("4: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency); if (settingsData.CPU.HWPEnable && (gCPUStructure.Model >= CPU_MODEL_SKYLAKE_U)) { GlobalConfig.HWP = TRUE; diff --git a/rEFIt_UEFI/Platform/Settings.h b/rEFIt_UEFI/Platform/Settings.h index 7b60c2933..dec19c534 100755 --- a/rEFIt_UEFI/Platform/Settings.h +++ b/rEFIt_UEFI/Platform/Settings.h @@ -2684,7 +2684,7 @@ printf("%s", ""); return ACPI.SSDT._EnableC2; } bool getC3Latency() const { - if ( CPU._C3Latency.isDefined() ) return CPU._C3Latency.value(); + // if ( CPU._C3Latency.isDefined() ) return CPU._C3Latency.value(); return ACPI.SSDT._C3Latency; } diff --git a/rEFIt_UEFI/Settings/ConfigManager.cpp b/rEFIt_UEFI/Settings/ConfigManager.cpp index b8347fe3f..2b596abdb 100644 --- a/rEFIt_UEFI/Settings/ConfigManager.cpp +++ b/rEFIt_UEFI/Settings/ConfigManager.cpp @@ -735,8 +735,10 @@ void ConfigManager::applySettings() const if ( !configPlist.ACPI.SSDT.getMinMultiplier().isDefined() ) gSettings.ACPI.SSDT.MinMultiplier = 7; } + // DBG("2: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency); if ( !configPlist.ACPI.SSDT.getC3Latency().isDefined() ) gSettings.ACPI.SSDT._C3Latency = 0x00FA; + // DBG("2: gSettings.ACPI.SSDT._C3Latency=%x\n", gSettings.ACPI.SSDT._C3Latency); } //gSettings.CPU.Turbo = gCPUStructure.Turbo; gSettings.CPU.SavingMode = 0xFF; //means not set diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp index 983a4245d..c7d42ede3 100644 --- a/rEFIt_UEFI/refit/main.cpp +++ b/rEFIt_UEFI/refit/main.cpp @@ -2434,7 +2434,7 @@ void SetVariablesFromNvram() } void -GetListOfConfigs () +GetListOfConfigs() { REFIT_DIR_ITER DirIter; EFI_FILE_INFO *DirEntry; @@ -2877,7 +2877,7 @@ RefitMain (IN EFI_HANDLE ImageHandle, DBG("SimpleTextEx Status=%s\n", efiStrError(Status)); gConf.InitialisePlatform(); - +// DBG("5: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency); /* * saving debug.log works from here */ @@ -2954,7 +2954,8 @@ RefitMain (IN EFI_HANDLE ImageHandle, GetListOfThemes(); GetListOfConfigs(); } - +// DBG("0: GlobalConfig.C3Latency=%x\n", gSettings.ACPI.SSDT._C3Latency); + GlobalConfig.C3Latency = gSettings.ACPI.SSDT._C3Latency; // ThemeX.FillByEmbedded(); //init XTheme before EarlyUserSettings { void *Value = NULL;