Skip to content

fix-acpipatcher-oemtableid-comparison #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris1111 merged 2 commits into from
Oct 25, 2026
Merged

fix-acpipatcher-oemtableid-comparison #855

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f06302
Fix OemTableId comparison and RSDT index calculation in AcpiPatcher
YBronst Oct 24, 2026
1072996
Merge pull request #3 from YBronst/fix-acpipatcher-oemtableid-comparison
YBronst Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rEFIt_UEFI/Platform/AcpiPatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,17 @@ void DropTableFromRSDT(UINT32 Signature, UINT64 TableId, UINT32 Length)
CopyMem(&OTID[0], &Table->OemTableId, 8);
//DBG(" Found table: %s %s\n", sign, OTID);
if (!((Signature && Table->Signature == Signature) &&
(!TableId || OemTableId_NoSpace(Table->OemTableId) == TableId) &&
(!TableId || OemTableId_NoSpace(Table->OemTableId) == OemTableId_NoSpace(TableId)) &&
(!Length || Table->Length == Length))) {
continue;
}
if (IsXsdtEntryMerged(IndexFromXsdtEntryPtr(Ptr))) {
DBG(" attempt to drop already merged table[%d]: %s %s %d ignored\n", IndexFromXsdtEntryPtr(Ptr), sign, OTID, (INT32)Table->Length);
if (IsXsdtEntryMerged(IndexFromRsdtEntryPtr(Ptr))) {
DBG(" attempt to drop already merged table[%d]: %s %s %d ignored\n", IndexFromRsdtEntryPtr(Ptr), sign, OTID, (INT32)Table->Length);
continue;
}
// drop matching table by simply replacing entry with NULL
*Ptr = 0;
DBG(" Table[%d]: %s %s %d dropped\n", IndexFromXsdtEntryPtr(Ptr), sign, OTID, (INT32)Table->Length);
DBG(" Table[%d]: %s %s %d dropped\n", IndexFromRsdtEntryPtr(Ptr), sign, OTID, (INT32)Table->Length);
}
}

Expand Down Expand Up @@ -404,7 +404,7 @@ void DropTableFromXSDT(UINT32 Signature, UINT64 TableId, UINT32 Length)
CopyMem(&OTID[0], &Table->OemTableId, 8);
//DBG(" Found table: %s %s\n", sign, OTID);
if (!((Signature && Table->Signature == Signature) &&
(!TableId || OemTableId_NoSpace(Table->OemTableId) == TableId) &&
(!TableId || OemTableId_NoSpace(Table->OemTableId) == OemTableId_NoSpace(TableId)) &&
(!Length || Table->Length == Length))) {
continue;
}
Expand Down
Loading