[edk2-devel] [edk2-platforms][PATCH v1 3/3] WhitleyOpenBoardPkg: Fix invalid debug macros

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki at microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4094

Updates several debug macros in WhitleyOpenBoardPkg to correctly
match print specifiers to actual arguments.

Note: The "EFI_D_ERROR" macro was changed to "DEBUG_ERROR" in
FspWrapperHobProcessLib.c to pass PatchCheck and comply with latest
guidelines.

Cc: Isaac Oram <isaac.w.oram at intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone at intel.com>
Cc: Chasel Chiu <chasel.chiu at intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki at microsoft.com>
---
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c           | 2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c           | 2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
index b8677340cae7..fc42bf380ae3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -137,7 +137,7 @@ UpdateApicIdMap (
     }
 
     if (ThreadIndex != mThreadCount[SocketId]) {
-      DEBUG((DEBUG_ERROR, ":: Skt: %d - Enabled ThreadCount is incorrect!!!\n"));
+      DEBUG ((DEBUG_ERROR, ":: Skt: %d - Enabled ThreadCount is incorrect!!!\n", ThreadIndex));
       break;
     }
   }
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
index 111d32b44c42..29bf32564e49 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
@@ -254,7 +254,7 @@ SkipExternalSbOpcodes(
     }
   }
 
-  DEBUG ((DEBUG_ERROR, "ExternSbExpected: %d, ExternSbFound: %d\n"));
+  DEBUG ((DEBUG_ERROR, "ExternSbExpected: %d, ExternSbFound: %d\n", ExternSbExpected, ExternSbFound));
 
   ASSERT ((ExternSbFound % ExternSbExpected) == 0);
 
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
index 19dc82d7a73f..e8a1c556cd2d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
@@ -185,7 +185,7 @@ CopyHobData (
   OrgData = GET_GUID_HOB_DATA (OrgGuidHob);
   OrgDataSize = GET_GUID_HOB_DATA_SIZE (OrgGuidHob);
   if (OrgDataSize != DataSize) {
-    DEBUG ((EFI_D_ERROR, "%a Hob Size Don't Match Between FSP and BootLoader. FSP:%x vs BootLoader:%x\n", OrgDataSize, DataSize));
+    DEBUG ((DEBUG_ERROR, "Hob Size Don't Match Between FSP and BootLoader. FSP:%x vs BootLoader:%x\n", OrgDataSize, DataSize));
     ASSERT (FALSE);
   }
   CopyMem (OrgData, Data, DataSize);
-- 
2.28.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94736): https://edk2.groups.io/g/devel/message/94736
Mute This Topic: https://groups.io/mt/94129232/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-