Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-01-25 21:31:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove CPU/Latency. Warning if CPU/Latency is used.

Browse Source
This commit is contained in:
jief666 2021-09-25 13:57:07 +03:00
parent e6c194d1b9
commit 537884c7bd
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xcode/CloverConfigPlistValidator/CloverConfigPlistValidator.xcodeproj/project.pbxproj
View File

@ -839,6 +839,7 @@
"wcsncmp=wcsncmp_fixed", "wcsncmp=wcsncmp_fixed",
"wcsstr=wcsstr_fixed", "wcsstr=wcsstr_fixed",
NO_DEBUG_TRACE, NO_DEBUG_TRACE,
OC_TARGET_DEBUG,
); );
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@ -967,6 +968,7 @@
"wcsncmp=wcsncmp_fixed", "wcsncmp=wcsncmp_fixed",
"wcsstr=wcsstr_fixed", "wcsstr=wcsstr_fixed",
NO_DEBUG_TRACE, NO_DEBUG_TRACE,
OC_TARGET_DEBUG,
); );
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;

6
Xcode/CloverConfigPlistValidator/src/main.cpp
View File

@ -57,11 +57,7 @@ extern "C" int main(int argc, const char * argv[])
#ifdef JIEF_DEBUG #ifdef JIEF_DEBUG
path = "config-nowarning-noerror.plist"; path = "config-nowarning-noerror.plist";
path = "config-test2.plist"; path = "config-test2.plist";
//path = "/JiefLand/5.Devel/Clover/user config/Matgen84/EFI_github/CLOVER/config.plist"; path = "/Volumes/CL_EFI_VMDK/EFI/CLOVER/config.plist";
//path = "/JiefLand/5.Devel/Clover/user config/BS.plist";
//path = "/JiefLand/5.Devel/Clover/user config/maclinuxG4/config.plist";
//path = "/JiefLand/5.Devel/Clover/user config/MICKHAEL/EFI_Github/CLOVER/config.plist";
path = "/JiefLand/5.Devel/Clover/user config/MacKonsti/2021-05-17/config-test.plist";
#endif #endif
if ( !path ) { if ( !path ) {

7
rEFIt_UEFI/Platform/Settings.h
View File

@ -1265,7 +1265,6 @@ public:
undefinable_bool _EnableC6 = undefinable_bool(); undefinable_bool _EnableC6 = undefinable_bool();
undefinable_bool _EnableC4 = undefinable_bool(); undefinable_bool _EnableC4 = undefinable_bool();
undefinable_bool _EnableC2 = undefinable_bool(); undefinable_bool _EnableC2 = undefinable_bool();
undefinable_uint16 _C3Latency = undefinable_uint16();
#if __cplusplus > 201703L #if __cplusplus > 201703L
bool operator == (const CPUClass&) const = default; bool operator == (const CPUClass&) const = default;
@ -1287,7 +1286,6 @@ public:
if ( !(_EnableC6 == other._EnableC6) ) return false; if ( !(_EnableC6 == other._EnableC6) ) return false;
if ( !(_EnableC4 == other._EnableC4) ) return false; if ( !(_EnableC4 == other._EnableC4) ) return false;
if ( !(_EnableC2 == other._EnableC2) ) return false; if ( !(_EnableC2 == other._EnableC2) ) return false;
if ( !(_C3Latency == other._C3Latency) ) return false;
return true; return true;
} }
void takeValueFrom(const ConfigPlistClass::CPU_Class& configPlist) void takeValueFrom(const ConfigPlistClass::CPU_Class& configPlist)
@ -1307,7 +1305,6 @@ public:
_EnableC6 = configPlist.dget_EnableC6(); _EnableC6 = configPlist.dget_EnableC6();
_EnableC4 = configPlist.dget_EnableC4(); _EnableC4 = configPlist.dget_EnableC4();
_EnableC2 = configPlist.dget_EnableC2(); _EnableC2 = configPlist.dget_EnableC2();
_C3Latency = configPlist.dget_C3Latency();
} }
}; };
@ -2689,10 +2686,6 @@ printf("%s", "");
if ( CPU._EnableC2.isDefined() ) return CPU._EnableC2.value(); if ( CPU._EnableC2.isDefined() ) return CPU._EnableC2.value();
return ACPI.SSDT._EnableC2; return ACPI.SSDT._EnableC2;
} }
bool getC3Latency() const {
// if ( CPU._C3Latency.isDefined() ) return CPU._C3Latency.value();
return ACPI.SSDT._C3Latency;
}
}; };

13
rEFIt_UEFI/Settings/ConfigPlist/Config_CPU.h
View File

@ -26,7 +26,16 @@ protected:
return true; return true;
} }
}; };
class LatencyClass : public XmlUInt16
{
using super = XmlUInt16;
public:
virtual bool validate(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, const XmlParserPosition& keyPos, bool generateErrors) override {
RETURN_IF_FALSE( super::validate(xmlLiteParser, xmlPath, keyPos, generateErrors) );
return xmlLiteParser->addWarning(generateErrors, S8Printf("Latency is replaced by ACPI/SSDT/C3Latency, value ignored. tag '%s:%d'.", xmlPath.c_str(), keyPos.getLine()));
}
};
XmlUInt16 QPI = XmlUInt16(); XmlUInt16 QPI = XmlUInt16();
FrequencyMHzClass FrequencyMHz = FrequencyMHzClass(); FrequencyMHzClass FrequencyMHz = FrequencyMHzClass();
XmlUInt16 Type = XmlUInt16(); XmlUInt16 Type = XmlUInt16();
@ -36,7 +45,7 @@ protected:
XmlBool C6 = XmlBool(); XmlBool C6 = XmlBool();
XmlBool C4 = XmlBool(); XmlBool C4 = XmlBool();
XmlBool C2 = XmlBool(); XmlBool C2 = XmlBool();
XmlUInt16 Latency = XmlUInt16(); LatencyClass Latency = LatencyClass();
XmlUInt8 SavingMode = XmlUInt8(); XmlUInt8 SavingMode = XmlUInt8();
XmlBool HWPEnable = XmlBool(); XmlBool HWPEnable = XmlBool();
XmlUInt32 HWPValue = XmlUInt32(); XmlUInt32 HWPValue = XmlUInt32();

3
rEFIt_UEFI/refit/main.cpp
View File

@ -2901,7 +2901,6 @@ RefitMain (IN EFI_HANDLE ImageHandle,
DBG("SimpleTextEx Status=%s\n", efiStrError(Status)); DBG("SimpleTextEx Status=%s\n", efiStrError(Status));
gConf.InitialisePlatform(); gConf.InitialisePlatform();
// DBG("5: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency);
#ifdef JIEF_DEBUG #ifdef JIEF_DEBUG
DumpNvram(); DumpNvram();
@ -2983,8 +2982,6 @@ RefitMain (IN EFI_HANDLE ImageHandle,
GetListOfThemes(); GetListOfThemes();
GetListOfConfigs(); GetListOfConfigs();
} }
// DBG("0: GlobalConfig.C3Latency=%x\n", gSettings.ACPI.SSDT._C3Latency);
// DBG("0: gSettings.CPU.SavingMode=%x\n", gSettings.CPU.SavingMode);
// ThemeX.FillByEmbedded(); //init XTheme before EarlyUserSettings // ThemeX.FillByEmbedded(); //init XTheme before EarlyUserSettings
{ {
void *Value = NULL; void *Value = NULL;