Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-10 09:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

take into account enable-disable patches in menu

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2020-10-10 16:31:14 +03:00
parent 2a44824869
commit 914349ec14
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rEFIt_UEFI/Platform/AcpiPatcher.cpp
View File

@ -805,7 +805,7 @@ void MarkTableAsSaved(void *TableEntry)
//
// If TableEntry is not in mSavedTables - add it
//
//DBG(" MarkTableAsSaved %p", TableEntry);
//DBG(" MarkTableAsSaved %llx", TableEntry);
if (IsTableSaved(TableEntry)) {
// already saved
//DBG(" - already saved\n");
@ -1299,12 +1299,12 @@ void DumpTables(void *RsdPtrVoid, CONST CHAR16 *DirName)
if (RsdPtr->Revision == 0) {
// Acpi 1.0 - no Xsdt
Rsdt = (RSDT_TABLE*)(UINTN)(RsdPtr->RsdtAddress);
DBG(" (Rsdt: %p)\n", Rsdt);
DBG(" (Rsdt: %llx)\n", (UINTN)Rsdt);
} else {
// Acpi 2.0 or newer - may have Xsdt and/or Rsdt
Rsdt = (RSDT_TABLE*)(UINTN)(RsdPtr->RsdtAddress);
Xsdt = (XSDT_TABLE *)(UINTN)(RsdPtr->XsdtAddress);
DBG(" (Xsdt: %p, Rsdt: %p)\n", Xsdt, Rsdt);
DBG(" (Xsdt: %llx, Rsdt: %llx)\n", (UINTN)Xsdt, (UINTN)Rsdt);
}
if (Rsdt == NULL && Xsdt == NULL) {
@ -1457,7 +1457,7 @@ void SaveOemTables()
// RsdPtr = NULL;
RsdPtr = FindAcpiRsdPtr();
if (RsdPtr != NULL) {
DBG("Found BIOS RSDP at %p\n", RsdPtr);
DBG("Found BIOS RSDP at %llx\n", (UINTN)RsdPtr);
if (gFirmwareClover) {
// Save it
DumpTables(RsdPtr, AcpiOriginPath.wc_str());
@ -1473,7 +1473,7 @@ void SaveOemTables()
RsdPtr = NULL;
/*Status = */EfiGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &RsdPtr);
if (RsdPtr != NULL) { //it may be EFI_SUCCESS but null pointer
DBG("Found UEFI Acpi 2.0 RSDP at %p\n", RsdPtr);
DBG("Found UEFI Acpi 2.0 RSDP at %llx\n", (UINTN)RsdPtr);
// if tables already saved, then just print to log
DumpTables(RsdPtr, Saved ? NULL : AcpiOriginPath.wc_str());
Saved = TRUE;
@ -1484,7 +1484,7 @@ void SaveOemTables()
RsdPtr = NULL;
/*Status = */EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, &RsdPtr);
if (RsdPtr != NULL) {
DBG("Found UEFI Acpi 1.0 RSDP at %p\n", RsdPtr);
DBG("Found UEFI Acpi 1.0 RSDP at %llx\n", (UINTN)RsdPtr);
// if tables already saved, then just print to log
DumpTables(RsdPtr, Saved ? NULL : AcpiOriginPath.wc_str());
// Saved = TRUE;
@ -1732,23 +1732,23 @@ EFI_STATUS PatchACPI(IN REFIT_VOLUME *Volume, const XString8& OSVersion)
return EFI_UNSUPPORTED;
}
Rsdt = (RSDT_TABLE*)(UINTN)RsdPointer->RsdtAddress;
// DBG("RSDT 0x%p\n", Rsdt);
// DBG("RSDT 0x%llx\n", Rsdt);
rf = ScanRSDT(EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, 0);
if(rf) {
FadtPointer = (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE*)(UINTN)(*rf);
// DBG("FADT from RSDT: 0x%p\n", FadtPointer);
// DBG("FADT from RSDT: 0x%llx\n", FadtPointer);
}
Xsdt = NULL;
if (RsdPointer->Revision >=2 && (RsdPointer->XsdtAddress < (UINT64)(UINTN)-1)) {
Xsdt = (XSDT_TABLE*)(UINTN)RsdPointer->XsdtAddress;
// DBG("XSDT 0x%p\n", Xsdt);
// DBG("XSDT 0x%llx\n", Xsdt);
xf = ScanXSDT(EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, 0);
if(xf) {
//Slice - change priority. First Xsdt, second Rsdt
if (*xf) {
FadtPointer = (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE*)(UINTN)(*xf);
// DBG("FADT from XSDT: 0x%p\n", FadtPointer);
// DBG("FADT from XSDT: 0x%llx\n", FadtPointer);
} else {
*xf = (UINT64)(UINTN)FadtPointer;
// DBG("reuse FADT\n"); //never happens
@ -1772,7 +1772,7 @@ EFI_STATUS PatchACPI(IN REFIT_VOLUME *Volume, const XString8& OSVersion)
// and Xsdt will come after it
BufferPtr += 0x30;
// DBG("::pointers %p %p\n", NewRsdPointer, RsdPointer);
// DBG("::pointers %llx %llx\n", NewRsdPointer, RsdPointer);
// Signature, Checksum, OemId, Reserved/Revision, RsdtAddress
CopyMem(NewRsdPointer, RsdPointer, sizeof(EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER));
NewRsdPointer->Revision = 2;
@ -2329,7 +2329,7 @@ EFI_STATUS LoadAndInjectDSDT(CONST CHAR16 *PathPatched,
FadtPointer->Dsdt = (UINT32)Dsdt;
FadtPointer->XDsdt = Dsdt;
FixChecksum(&FadtPointer->Header);
DBG("DSDT at 0x%llX injected to FADT 0x%p\n", Dsdt, FadtPointer);
DBG("DSDT at 0x%llX injected to FADT 0x%llx\n", Dsdt, (UINTN)FadtPointer);
}
FreePool(Buffer);

16
rEFIt_UEFI/refit/main.cpp
View File

@ -432,11 +432,12 @@ void LOADER_ENTRY::FilterKextPatches()
KernelAndKextPatches.KextPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.KextPatches[i].MatchOS.c_str() : "All",
KernelAndKextPatches.KextPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.KextPatches[i].MatchBuild.c_str() : "All"
);
if (!KernelAndKextPatches.KextPatches[i].MenuItem.BValue) {
if (!gSettings.KernelAndKextPatches.KextPatches[i].MenuItem.BValue) {
KernelAndKextPatches.KextPatches[i].MenuItem.BValue = false;
DBG(" ==> disabled by user\n");
continue;
}
KernelAndKextPatches.KextPatches[i].MenuItem.BValue = true;
if ((BuildVersion.notEmpty()) && (KernelAndKextPatches.KextPatches[i].MatchBuild.notEmpty())) {
KernelAndKextPatches.KextPatches[i].MenuItem.BValue = IsPatchEnabled(KernelAndKextPatches.KextPatches[i].MatchBuild, BuildVersion);
DBG(" ==> %s\n", KernelAndKextPatches.KextPatches[i].MenuItem.BValue ? "allowed" : "not allowed");
@ -461,11 +462,12 @@ void LOADER_ENTRY::FilterKernelPatches()
KernelAndKextPatches.KernelPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.KernelPatches[i].MatchOS.c_str() : "All",
KernelAndKextPatches.KernelPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.KernelPatches[i].MatchBuild.c_str() : "no"
);
if (!KernelAndKextPatches.KernelPatches[i].MenuItem.BValue) {
if (!gSettings.KernelAndKextPatches.KernelPatches[i].MenuItem.BValue) {
KernelAndKextPatches.KernelPatches[i].MenuItem.BValue = false;
DBG(" ==> disabled by user\n");
continue;
}
KernelAndKextPatches.KernelPatches[i].MenuItem.BValue = true;
if ((BuildVersion.notEmpty()) && (KernelAndKextPatches.KernelPatches[i].MatchBuild.notEmpty())) {
KernelAndKextPatches.KernelPatches[i].MenuItem.BValue = IsPatchEnabled(KernelAndKextPatches.KernelPatches[i].MatchBuild, BuildVersion);
DBG(" ==> %s by build\n", KernelAndKextPatches.KernelPatches[i].MenuItem.BValue ? "allowed" : "not allowed");
@ -490,11 +492,11 @@ void LOADER_ENTRY::FilterBootPatches()
KernelAndKextPatches.BootPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.BootPatches[i].MatchOS.c_str() : "All",
KernelAndKextPatches.BootPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.BootPatches[i].MatchBuild.c_str() : "no"
);
if (!KernelAndKextPatches.BootPatches[i].MenuItem.BValue) {
if (!gSettings.KernelAndKextPatches.BootPatches[i].MenuItem.BValue) {
DBG(" ==> disabled by user\n");
continue;
}
KernelAndKextPatches.BootPatches[i].MenuItem.BValue = true;
if ((BuildVersion.notEmpty()) && (KernelAndKextPatches.BootPatches[i].MatchBuild.notEmpty())) {
KernelAndKextPatches.BootPatches[i].MenuItem.BValue = IsPatchEnabled(KernelAndKextPatches.BootPatches[i].MatchBuild, BuildVersion);
DBG(" ==> %s by build\n", KernelAndKextPatches.BootPatches[i].MenuItem.BValue ? "allowed" : "not allowed");
@ -1144,7 +1146,7 @@ DBG("Beginning OC\n");
CHAR16* UnicodeDevicePath = NULL; (void)UnicodeDevicePath;
UnicodeDevicePath = ConvertDevicePathToText (DevicePath, FALSE, FALSE);
MsgLog("DevicePAth = %ls\n", UnicodeDevicePath);
MsgLog("DevicePath = %ls\n", UnicodeDevicePath);
// point to InternalEfiLoadImage from OC
Status = gBS->LoadImage (