OcAcpiLib: Improve debug logging when applying ACPI patches

closes acidanthera/bugtracker#2140
ozzychow · Jan 2, 2023 · 76b59df · 76b59df
1 parent eb1347c
commit 76b59df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 OpenCore Changelog
 ==================
+#### v0.8.9
+- Improved debug logging when applying ACPI patches
+
 #### v0.8.8
 - Updated underlying EDK II package to edk2-stable202211
 - Updated AppleKeyboardLayouts.txt from macOS 13.1

diff --git a/Library/OcAcpiLib/OcAcpiLib.c b/Library/OcAcpiLib/OcAcpiLib.c
@@ -1255,8 +1255,6 @@ AcpiApplyPatch (
   UINT32                  ReplaceLimit;
   UINT32                  TablePrintSignature;
 
-  DEBUG ((DEBUG_INFO, "OCA: Applying %u byte ACPI patch skip %u, count %u\n", Patch->Size, Patch->Skip, Patch->Count));
-
   if (  (Context->Dsdt != NULL)
      && ((Patch->TableSignature == 0) || (Patch->TableSignature == EFI_ACPI_6_2_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE))
      && ((Patch->TableLength == 0) || (Context->Dsdt->Length == Patch->TableLength))

diff --git a/Library/OcMainLib/OpenCoreAcpi.c b/Library/OcMainLib/OpenCoreAcpi.c
@@ -188,6 +188,15 @@ OcAcpiPatchTables (
     Patch.TableLength = UserPatch->TableLength;
     CopyMem (&Patch.OemTableId, UserPatch->OemTableId, sizeof (UserPatch->OemTableId));
 
+    DEBUG ((
+      DEBUG_INFO,
+      "OC: Applying %u byte ACPI patch patch at %u, skip %u, count %u\n",
+      Patch.Size,
+      (UINT32)Index,
+      Patch.Skip,
+      Patch.Count
+      ));
+
     Status = AcpiApplyPatch (Context, &Patch);
     if (EFI_ERROR (Status)) {
       DEBUG ((DEBUG_WARN, "OC: ACPI patcher failed %u - %r\n", Index, Status));