[edk2-platforms][PATCH V1 2/5] WhitleyOpenBoardPkg: Fix GCC warnings


Oram, Isaac W
 

Remove build option to ignore no-incompatible-pointer-types.
Remove build option to ignore no-overflow warnings.
Fixed resulting warnings as errors.

Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Chasel Chiu <chasel.chiu@...>
Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
.../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +-
.../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../Aowanda/Uba/TypeAowanda/Pei/PcdData.c | 2 +-
.../Uba/TypeAowanda/Pei/PchEarlyUpdate.c | 2 +-
.../Uba/TypeAowanda/Pei/PeiBoardInitLib.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../Pei/PchEarlyUpdate.c | 4 +-
.../Pei/PeiBoardInitLib.c | 2 +-
.../Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c | 4 +-
.../Features/Acpi/AcpiPlatform/AcpiPlatform.c | 22 +++++-----
.../Acpi/AcpiPlatform/AcpiPlatformHooks.c | 14 +++----
.../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 30 ++++++-------
.../Pci/Dxe/PciHostBridge/PciHostBridge.c | 5 +--
.../Dxe/PciHostBridge/PciHostBridgeSupport.c | 2 +-
.../Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 5 +--
.../Pci/Dxe/PciPlatform/PciPlatform.c | 35 ++++++++--------
.../Pci/Dxe/PciPlatform/PciPlatformHooks.c | 16 +++----
.../WhitleyOpenBoardPkg/Include/Acpi/Fadt.h | 2 +-
.../Include/Dsc/BuildOptions.dsc | 2 +-
.../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +-
.../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c | 4 +-
.../TypeJunctionCity/Pei/PeiBoardInitLib.c | 4 +-
.../AcpiPlatformTableLib/AcpiPlatformLib.c | 16 +++----
.../AcpiPlatformLibApic.c | 2 +-
.../AcpiPlatformLibBdat.c | 12 +++---
.../AcpiPlatformLibHmat.c | 8 ++--
.../AcpiPlatformLibMsct.c | 2 +-
.../AcpiPlatformLibNfit.c | 2 +-
.../AcpiPlatformLibPcat.c | 2 +-
.../AcpiPlatformLibPmtt.c | 4 +-
.../AcpiPlatformLibSlit.c | 4 +-
.../AcpiPlatformLibSrat.c | 4 +-
.../AcpiPlatformLibSsdt.c | 2 +-
.../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 6 +--
.../Library/BoardInitLib/BoardInitDxeLib.c | 6 +--
.../Library/BoardInitLib/BoardInitPreMemLib.c | 8 ++--
.../MultiPlatSupportLib/MultiPlatSupportLib.c | 42 ++++++++-----------
.../Library/PeiReportFvLib/PeiReportFvLib.c | 4 +-
.../PeiUbaGpioPlatformConfigLib.c | 22 +++++-----
.../PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c | 2 +-
.../PeiUbaPlatLib/UbaBoardSioInfoLib.c | 2 +-
.../PeiUbaPlatLib/UbaClkGenUpdateLib.c | 6 +--
.../PeiUbaPlatLib/UbaClocksConfigLib.c | 2 +-
.../Library/PeiUbaPlatLib/UbaGpioUpdateLib.c | 4 +-
.../PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c | 2 +-
.../PeiUbaPlatLib/UbaIioConfigLibPei.c | 10 ++---
.../UbaIioPortBifurcationInitLib.c | 2 +-
.../Library/PeiUbaPlatLib/UbaPcdUpdateLib.c | 3 +-
.../PeiUbaPlatLib/UbaPchEarlyUpdateLib.c | 6 +--
.../PeiUbaPlatLib/UbaPchPcieBifurcationLib.c | 2 +-
.../PeiUbaPlatLib/UbaSlotUpdateLibPei.c | 6 +--
.../PeiUbaPlatLib/UbaSoftStrapUpdateLib.c | 5 +--
.../PlatformClocksLib/Pei/PlatformClocksLib.c | 17 ++------
.../Pei/PlatformClocksLib.inf | 2 +-
.../PlatformCmosAccessLib.c | 2 +-
.../Library/SetCacheMtrrLib/SetCacheMtrrLib.c | 8 ++--
.../PchPolicyUpdateUsb.c | 2 +-
.../SiliconPolicyUpdateLib.c | 2 +-
.../SiliconPolicyUpdateLibFsp.c | 2 +-
.../SmmSpiFlashCommonLib/SpiFlashCommon.c | 3 +-
.../Library/UbaGpioInitLib/UbaGpioInitLib.c | 6 +--
.../UbaPlatLib/DxeUbaGpioPlatformConfigLib.c | 4 +-
.../UbaPlatLib/DxeUbaSystemBoardInfoLib.c | 2 +-
.../UbaPlatLib/DxeUbaSystemConfigUpdateLib.c | 2 +-
.../Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c | 2 +-
.../Library/UbaPlatLib/UbaAcpiUpdateLib.c | 2 +-
.../Library/UbaPlatLib/UbaFpkConfigLib.c | 2 +-
.../Library/UbaPlatLib/UbaIioConfigLib.c | 4 +-
.../Library/UbaPlatLib/UbaOpromUpdateLib.c | 10 ++---
.../Library/UbaPlatLib/UbaSlotUpdateLib.c | 4 +-
.../Library/UbaPlatLib/UbaSmbiosUpdateLib.c | 16 +++----
.../Platform/Dxe/PlatformType/PlatformTypes.c | 5 +--
.../EmulationPlatformInit.c | 2 +-
.../Platform/Pei/PlatformInfo/PlatformInfo.c | 16 +++----
.../Uba/BoardInit/Dxe/BoardInitDxe.c | 2 +-
.../SystemBoardInfoDxe/SystemBoardInfoDxe.c | 2 +-
.../SystemConfigUpdateDxe.c | 4 +-
.../Uba/UbaMain/Common/Pei/ClocksConfig.c | 11 ++---
.../UbaMain/Common/Pei/GpioPlatformConfig.c | 4 +-
.../UbaMain/Common/Pei/HsioPtssTableConfig.c | 5 +--
.../UbaMain/Common/Pei/IioPortBifurcation.c | 7 ++--
.../Common/Pei/IioPortBifurcationVer1.c | 12 +++---
.../Common/Pei/PeiCommonBoardInitLib.c | 2 +-
.../StaticSkuDataDxe/StaticSkuDataDxe.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../UbaMain/TypeCooperCityRP/Pei/PcdData.c | 3 +-
.../TypeCooperCityRP/Pei/PchEarlyUpdate.c | 2 +-
.../TypeCooperCityRP/Pei/PeiBoardInitLib.c | 4 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../TypeWilsonCityRP/Pei/PchEarlyUpdate.c | 4 +-
.../TypeWilsonCityRP/Pei/PeiBoardInitLib.c | 4 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c | 2 +-
.../TypeWilsonCitySMT/Pei/PchEarlyUpdate.c | 6 +--
.../TypeWilsonCitySMT/Pei/PeiBoardInitLib.c | 2 +-
.../PeiInterposerToSvidMap.c | 9 ++--
.../FspWrapperPlatformLib.c | 2 +-
.../SiliconPolicyInitLibShim.c | 8 ++--
113 files changed, 283 insertions(+), 328 deletions(-)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
index 0c06222c9a..cc63f4b8f3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
@@ -35,7 +35,7 @@ PlatformIpmiIoRangeSet (

DEBUG ((DEBUG_INFO, "PlatformIpmiIoRangeSet IpmiIoBase %x\n", IpmiIoBase));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "PeiServicesLocatePpi for gDynamicSiLibraryPpiGuid failed. Status %r\n", Status));
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
index 19d431f472..9686f77745 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
@@ -49,7 +49,7 @@ DisableMEDevices (

DEBUG ((DEBUG_INFO, "DisableMEDevices\n"));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index a37b40cd4c..e1b4a9993d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index 4b235a0221..5a4e5e4c43 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -82,7 +82,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index dd9a069e7f..bae0c94c5b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -111,7 +111,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
index 3c32e53e84..07fdb966fa 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
@@ -59,7 +59,7 @@ GpioGetRiserId (

DEBUG((EFI_D_INFO, "%a Entry...\n", __FUNCTION__));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
index dc03e49cbd..27fe3987d2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
@@ -65,7 +65,7 @@ TypeAowandaPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
index 0c76ee99b1..7a916f61a5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
@@ -72,7 +72,7 @@ TypeAowandaPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index 3f4297361a..72d1720575 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index 581bc949d5..3316157e1f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -85,7 +85,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 6bf6acede1..62f9e78c68 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -110,7 +110,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
index 9f94360128..68649a7dde 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeBoardPortTemplatePchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -75,7 +75,7 @@ TypeBoardPortTemplatePchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
index 51a64084c7..55c7eed57c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
@@ -74,7 +74,7 @@ TypeBoardPortTemplatePeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c b/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
index 556dc1b0bf..d2a7b811dc 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
@@ -206,7 +206,7 @@ PlatformCpuPolicyEntryPoint (
CPU_VAR_DATA *CpuVarDataPtr = NULL;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -666,7 +666,7 @@ PlatformCpuPolicyEntryPoint (
Status = gBS->LocateProtocol (
&gEfiPlatformTypeProtocolGuid,
NULL,
- &PlatformType
+ (VOID **) &PlatformType
);
ASSERT_EFI_ERROR (Status);

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
index 1648029bd1..8b461b07f7 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
@@ -48,7 +48,7 @@ AcpiOnPciEnumCmplCallback (
{
EFI_STATUS Status;

- Status = gBS->LocateProtocol (&gEfiPciEnumerationCompleteProtocolGuid, NULL, &Context);
+ Status = gBS->LocateProtocol (&gEfiPciEnumerationCompleteProtocolGuid, NULL, (VOID **) &Context);
if (EFI_ERROR (Status)) {
//
// Skip the first dummy event signal.
@@ -202,7 +202,7 @@ AcpiOnReadyToBootCallback (

DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -332,7 +332,7 @@ AcpiOnReadyToBootCallback (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);

@@ -411,7 +411,7 @@ AcpiPlatformEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);

@@ -423,7 +423,7 @@ AcpiPlatformEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiAcpiTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
ASSERT_EFI_ERROR (Status);
@@ -442,7 +442,7 @@ AcpiPlatformEarlyAcpiTablesInstall (
&gEfiAcpiTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
(UINTN *) &Size,
&FvStatus
);
@@ -557,7 +557,7 @@ PmSsdtEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiPmSsdtTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);

@@ -569,7 +569,7 @@ PmSsdtEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiPmSsdtTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
ASSERT_EFI_ERROR (Status);
@@ -588,7 +588,7 @@ PmSsdtEarlyAcpiTablesInstall (
&gEfiPmSsdtTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
(UINTN *) &Size,
&FvStatus
);
@@ -658,7 +658,7 @@ AcpiPlatformEntryPoint (

DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -673,7 +673,7 @@ AcpiPlatformEntryPoint (
(EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_BS_ACPI_INIT)
);

- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, &mIioUds2);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds2);
if (EFI_ERROR (Status)) {

ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
index 93f312a178..141e719ef3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
@@ -190,7 +190,7 @@ InstallAndPatchAcpiTable (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);
ASSERT_EFI_ERROR (Status);
@@ -198,7 +198,7 @@ InstallAndPatchAcpiTable (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiAcpiTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
ASSERT_EFI_ERROR (Status);
@@ -210,7 +210,7 @@ InstallAndPatchAcpiTable (
&gEfiAcpiTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
(UINTN *) &Size,
&FvStatus
);
@@ -294,7 +294,7 @@ InstallXhciAcpiTable (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);

@@ -306,7 +306,7 @@ InstallXhciAcpiTable (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiAcpiTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);

@@ -321,7 +321,7 @@ InstallXhciAcpiTable (
&gEfiAcpiTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
&Size,
&FvStatus
);
@@ -374,7 +374,7 @@ DetectHwpFeature (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
index a517a9adce..fb557e2ca6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
@@ -440,13 +440,13 @@ AcpiVtdIntRemappingEnable (

DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
}

- Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, &DmaRemap);
+ Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, (VOID **) &DmaRemap);
if (EFI_ERROR (Status) || !DmaRemap->VTdSupport || !DmaRemap->InterruptRemap) {

DEBUG ((DEBUG_INFO, "[VTD] %a disabled\n",
@@ -472,7 +472,7 @@ AcpiVtdIntRemappingEnable (
//
// Allocate 4K alligned space for IRTE entries Added extra space of 500 bytes.
//
- Status = gBS->AllocatePool (EfiACPIReclaimMemory, IRTECount + 0x1500, &xApicAddr);
+ Status = gBS->AllocatePool (EfiACPIReclaimMemory, IRTECount + 0x1500, (VOID **) &xApicAddr);
ASSERT_EFI_ERROR (Status);

//
@@ -527,7 +527,7 @@ AcpiVtdIntRemappingEnable (
//
// Allocate memory for the queued invalidation.
//
- Status = gBS->AllocatePool (EfiACPIReclaimMemory, 0x1000 + 0x1000, &Addr);
+ Status = gBS->AllocatePool (EfiACPIReclaimMemory, 0x1000 + 0x1000, (VOID **) &Addr);
if (EFI_ERROR (Status)) {
ASSERT (FALSE);
return;
@@ -722,7 +722,7 @@ BuildDRHDForStack (
DMAR_ATSR *pAtsr = NULL;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return EFI_NOT_FOUND;
@@ -914,7 +914,7 @@ ReportDmar (
EFI_HANDLE *HandleBuffer;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
@@ -971,7 +971,7 @@ ReportDmar (
Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiPciRootBridgeIoProtocolGuid,
- &PciRootBridgePtr
+ (VOID **) &PciRootBridgePtr
);

ASSERT_EFI_ERROR (Status);
@@ -983,10 +983,10 @@ ReportDmar (
//
// Allocate memory to DevScope structures
//
- Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (DEVICE_SCOPE), &DevScope);
+ Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (DEVICE_SCOPE), (VOID **) &DevScope);
ASSERT_EFI_ERROR (Status);

- Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (PCI_NODE), &PciNode);
+ Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (PCI_NODE), (VOID **) &PciNode);
ASSERT_EFI_ERROR (Status);

for (Index = 1; Index <= MAX_SOCKET; Index++) {
@@ -1385,7 +1385,7 @@ AcpiVtdTablesInstall (

DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return EFI_NOT_FOUND;
@@ -1422,7 +1422,7 @@ AcpiVtdTablesInstall (

for (Index = 0; Index < HandleCount; Index ++) {

- gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, &PciIo);
+ gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID **) &PciIo);
PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0, sizeof(PciConfigHeader) / sizeof(UINT32), &PciConfigHeader);
if ((PciConfigHeader.Hdr.ClassCode[0] == 0x00 || PciConfigHeader.Hdr.ClassCode[0] == 0x01) && PciConfigHeader.Hdr.ClassCode[1] == 0x04 && PciConfigHeader.Hdr.ClassCode[2] == 0x06) {
//
@@ -1520,18 +1520,18 @@ AcpiVtdTablesInstall (
//
// Find the AcpiSupport protocol
//
- Status = LocateSupportProtocol (&gEfiAcpiTableProtocolGuid, gEfiAcpiTableStorageGuid, &AcpiTable, FALSE);
+ Status = LocateSupportProtocol (&gEfiAcpiTableProtocolGuid, gEfiAcpiTableStorageGuid, (VOID **) &AcpiTable, FALSE);
ASSERT_EFI_ERROR (Status);

TableVersion = EFI_ACPI_TABLE_VERSION_2_0;

- Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, &DmaRemap);
+ Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, (VOID **) &DmaRemap);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "[ACPI](DMAR) ERROR: Cannot locate gDmaRemapProtocolGuid (%r)\n", Status));
} else {
if (DmaRemap->VTdSupport) {
ReportDmar (DmaRemap);
- Status = DmaRemap->GetDmarTable (DmaRemap, &CurrentTable);
+ Status = DmaRemap->GetDmarTable (DmaRemap, (VOID **) &CurrentTable);

if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -1700,7 +1700,7 @@ DisableAriForwarding (
gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiPciIoProtocolGuid,
- &PciIo
+ (VOID **) &PciIo
);
PciIo->Pci.Read (
PciIo,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
index a15fff4817..f09703b5af 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
@@ -86,7 +86,7 @@ IoMmuProtocolCallback (
{
EFI_STATUS Status;

- Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmu);
+ Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **) &mIoMmu);
if (!EFI_ERROR(Status)) {
gBS->CloseEvent (mIoMmuEvent);
}
@@ -127,7 +127,7 @@ InitializePciHostBridge (
//
// Located the IIO Protocol Interface
//
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, &mIioUds);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds);
ASSERT_EFI_ERROR (Status);

//
@@ -1631,4 +1631,3 @@ Power2MaxMemory (

return Result;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
index fe3f274f1f..fcc9ba0672 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
@@ -47,7 +47,7 @@ ChipsetPreprocessController (
//
// Get root bridge in the system.
//
- Status = gBS->HandleProtocol (RootBridgeHandle, &gEfiPciRootBridgeIoProtocolGuid, &mPciRootBridgeIo);
+ Status = gBS->HandleProtocol (RootBridgeHandle, &gEfiPciRootBridgeIoProtocolGuid, (VOID **) &mPciRootBridgeIo);
ASSERT_EFI_ERROR (Status);
}

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
index ed5fb7e4a3..d00f9add95 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
@@ -131,11 +131,11 @@ SimpleIioRootBridgeConstructor (
Status = gBS->LocateProtocol (
&gEfiCpuIo2ProtocolGuid,
NULL,
- &mCpuIo
+ (VOID **) &mCpuIo
);
ASSERT_EFI_ERROR (Status);

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &mDynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &mDynamicSiLibraryProtocol);
ASSERT_EFI_ERROR (Status);

return EFI_SUCCESS;
@@ -1661,4 +1661,3 @@ RootBridgeIoConfiguration (
*Resources = RootBridge->ConfigBuffer;
return EFI_SUCCESS;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
index 8584c0f330..2999b0326a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
@@ -41,7 +41,7 @@ InternalPlatformCheckPcieRootPort (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
DEBUG ((DEBUG_INFO," InternalPlatformCheckPcieRootPort fail!\n"));
@@ -80,7 +80,7 @@ InternalGetSystemBoardInfo (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);

if (EFI_ERROR(Status)) {
@@ -148,11 +148,12 @@ GetPlatformPolicy (

**/
EFI_STATUS
-GetRawImage(
- IN EFI_GUID *NameGuid,
- IN OUT VOID **Buffer,
- IN OUT UINTN *Size
- ) {
+GetRawImage (
+ IN EFI_GUID *NameGuid,
+ IN OUT VOID **Buffer,
+ IN OUT UINTN *Size
+ )
+{
EFI_STATUS Status;
EFI_HANDLE *HandleBuffer;
UINTN HandleCount;
@@ -160,26 +161,26 @@ GetRawImage(
EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
UINT32 AuthenticationStatus;

- Status = gBS->LocateHandleBuffer(
+ Status = gBS->LocateHandleBuffer (
ByProtocol,
&gEfiFirmwareVolume2ProtocolGuid,
NULL,
&HandleCount,
&HandleBuffer
);
- if (EFI_ERROR(Status) || HandleCount == 0) {
+ if (EFI_ERROR (Status) || HandleCount == 0) {
return EFI_NOT_FOUND;
}
//
// Find desired image in all Fvs
//
for (Index = 0; Index < HandleCount; Index++) {
- Status = gBS->HandleProtocol(
+ Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiFirmwareVolume2ProtocolGuid,
- &Fv
+ (VOID **) &Fv
);
- if (EFI_ERROR(Status)) {
+ if (EFI_ERROR (Status)) {
return EFI_LOAD_ERROR;
}
//
@@ -187,7 +188,7 @@ GetRawImage(
//
*Buffer = NULL;
*Size = 0;
- Status = Fv->ReadSection(
+ Status = Fv->ReadSection (
Fv,
NameGuid,
EFI_SECTION_RAW,
@@ -196,8 +197,8 @@ GetRawImage(
Size,
&AuthenticationStatus
);
- if (!EFI_ERROR(Status)) {
- DEBUG((EFI_D_INFO, "Read the OROM successfully!\n"));
+ if (!EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_INFO, "Read the OROM successfully!\n"));
break;
}
}
@@ -255,7 +256,7 @@ GetPciRom (
OpRomBase = NULL;
OpRomSize = 0;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -324,8 +325,6 @@ GetPciRom (
PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET, 1, &VendorId);
PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET, 1, &DeviceId);

- //DEBUG ((EFI_D_INFO, "GetPciRom - VenID:DevID: %04x:%04x\n", (UINTN)VendorId, (UINTN)DeviceId));
-
//
// Fix MS-HD5770 video adapter can not work:
// This device is not a OPROM 3.0 and does not have device id list as well.
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
index 89154cb6e1..42751a1013 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
@@ -245,7 +245,7 @@ PciPlatformInitPciIovData (
Status = gBS->LocateProtocol (
&gEfiPciIovPlatformProtocolGuid,
NULL,
- &gPciIovPlatformProtocol
+ (VOID **) &gPciIovPlatformProtocol
);
if (!EFI_ERROR (Status)) {
Status = gPciIovPlatformProtocol->GetSystemLowestPageSize (
@@ -363,7 +363,7 @@ AttemptToSetXhciMse (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
EFI_STATUS Status;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -419,7 +419,7 @@ PciPlatformPostInit (
// Program all the IOAPIC in system
//

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -660,7 +660,7 @@ PlatformPrepController (
);
ASSERT_EFI_ERROR (Status);

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -788,7 +788,7 @@ PhaseNotify (
DEBUG ((DEBUG_ERROR, "[PCI] ERROR: Unknown phase %d notified (execution %d)\n", Phase, ChipsetPhase));
}

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -813,14 +813,14 @@ PhaseNotify (
Status = gBS->LocateProtocol (
&gEfiIioUdsProtocolGuid,
NULL,
- &mIioUds
+ (VOID **) &mIioUds
);
ASSERT_EFI_ERROR (Status);

Status = gBS->LocateProtocol (
&gEfiCpuIo2ProtocolGuid,
NULL,
- &mPciPrivateData.CpuIo
+ (VOID **) &mPciPrivateData.CpuIo
);
ASSERT_EFI_ERROR (Status);

@@ -834,7 +834,7 @@ PhaseNotify (
Status = gBS->LocateProtocol (
&gEfiPciHostBridgeResourceAllocationProtocolGuid,
NULL,
- &HostResAllocPtr
+ (VOID **) &HostResAllocPtr
);
ASSERT_EFI_ERROR (Status);

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
index 004aac350d..ebfd21b6cc 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
@@ -152,7 +152,7 @@ For Watson Creek we set this to 0 and then dynamically update this to 1 in the D
// Information
//
#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_2_SYSTEM_IO
-#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0x100 // size of R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96 (2*0x80 = 0x100)
+#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96
#define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_GPE0_BLK_ADDRESS (EFI_ACPI_PM1A_EVT_BLK_ADDRESS + 0x80)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
index 068ca195bf..ac05ea8ec5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
@@ -145,7 +145,7 @@ DEFINE EDKII_DSC_FEATURE_BUILD_OPTIONS = $(EDKII_DSC_FEATURE_BUILD_OPTIONS) $(ME
MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096

[BuildOptions]
- GCC:*_GCC5_*_CC_FLAGS = -Wno-overflow -Wno-discarded-qualifiers -Wno-unused-variable -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -mabi=ms
+ GCC:*_GCC5_*_CC_FLAGS = -Wno-discarded-qualifiers -Wno-unused-variable -Wno-unused-but-set-variable -mabi=ms
GCC:*_GCC5_IA32_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs
GCC:*_GCC5_X64_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs
MSFT:*_*_*_CC_FLAGS = /FAsc
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
index b69ea1ee92..45bb323938 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
@@ -35,7 +35,7 @@ PlatformIpmiIoRangeSet (

DEBUG ((DEBUG_INFO, "PlatformIpmiIoRangeSet IpmiIoBase %x\n", IpmiIoBase));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "PeiServicesLocatePpi for gDynamicSiLibraryPpiGuid failed. Status %r\n", Status));
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
index 11657f777c..9e694bc189 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
@@ -49,7 +49,7 @@ DisableMEDevices (

DEBUG ((DEBUG_INFO, "DisableMEDevices\n"));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index d39f87a758..1f4b67cbd2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -58,7 +58,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index f404bc3b9c..196021eebe 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -86,7 +86,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 8bdb393553..2f0c4cb6e6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -111,7 +111,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
index 49c5d6c9ec..8a99f9140c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
@@ -25,7 +25,7 @@ TypeJunctionCityPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -76,7 +76,7 @@ TypeJunctionCityPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
index 2287296881..87c49dac38 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
@@ -75,7 +75,7 @@ TypeJunctionCityPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -154,4 +154,4 @@ TypeJunctionCityPeiBoardInitLibConstructor (
}
}
return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
index f321c73a51..f3d4075880 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
@@ -70,7 +70,7 @@ AcpiPlatformLibConstructor (
return RETURN_NOT_FOUND;
}

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -86,13 +86,13 @@ AcpiPlatformLibConstructor (
//
// Locate the IIO Protocol Interface
//
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid,NULL,&mIioUds);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
}

- Status = gBS->LocateProtocol (&gEfiCpuCsrAccessGuid, NULL, &mCpuCsrAccess);
+ Status = gBS->LocateProtocol (&gEfiCpuCsrAccessGuid, NULL, (VOID **) &mCpuCsrAccess);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -104,7 +104,7 @@ AcpiPlatformLibConstructor (

mMpService = NULL;

- Status = gBS->LocateProtocol (&gEfiMpServiceProtocolGuid, NULL, &mMpService);
+ Status = gBS->LocateProtocol (&gEfiMpServiceProtocolGuid, NULL, (VOID **) &mMpService);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -123,7 +123,7 @@ AcpiPlatformLibConstructor (
mNumberOfCPUs = MAX_CPU_NUM;
}

- Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, &mAcpiTable);
+ Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &mAcpiTable);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -211,7 +211,7 @@ AcpiPlatformHooksIsActiveTable (
}

if (TableHeader->Signature == NVDIMM_FW_INTERFACE_TABLE_SIGNATURE) {
- Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, &NfitTableUpdateProtocol);
+ Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, (VOID **) &NfitTableUpdateProtocol);
if (EFI_ERROR (Status)){
// If NfitTableUpdateProtocol is not found we assume no NVDIMM is present - it means don't publish NFIT
DEBUG ((DEBUG_ERROR, "NfitTableUpdateProtocol is not installed.\n"));
@@ -253,7 +253,7 @@ AcpiPlatformHooksIsActiveTable (
return EFI_UNSUPPORTED;
}
if ( (0 == CompareMem (&(TableHeader->OemTableId), OemSkuAcpiName, 8)) ) {
- Status = PlatformGetAcpiFixTableDataPointer (&mAmlOffsetTablePointer);
+ Status = PlatformGetAcpiFixTableDataPointer ((VOID ** ) &mAmlOffsetTablePointer);
if (!EFI_ERROR(Status)) {
DEBUG((DEBUG_INFO, "[ACPI] Platform DSDT Fixup table found\n"));
DEBUG((DEBUG_INFO, "[ACPI] Platform SRP: Using %a DSDT\n", OemSkuAcpiName));
@@ -311,7 +311,7 @@ PlatformUpdateTables (

DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
index 0718e81682..0b22689f5a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -578,7 +578,7 @@ InstallMadtFromScratch (
// Build IOAPIC Structures
//
if (mIioUds == NULL) {
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid,NULL,&mIioUds);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds);
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
goto Done;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
index 09464b4a11..295e6b440d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
@@ -188,7 +188,7 @@ GetNumberOfSchemasFromBssaHob (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return 0;
@@ -410,7 +410,7 @@ CopyBdatPointerToScratchPad5 (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -773,7 +773,7 @@ GetSpdDataSize (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return 0;
@@ -845,7 +845,7 @@ FillSpdPerDimmEntry (

DEBUG ((DEBUG_VERBOSE, "Fill Spd entry for Socket:%d Channel:%d Dimm:%d at location:0x%x \n", Socket, Channel, Dimm, Address));

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -909,7 +909,7 @@ FillSpdSchema (

DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -1261,7 +1261,7 @@ IsSlowBoot (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return TRUE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
index 277c956196..f0fe01a6cf 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
@@ -322,7 +322,7 @@ UpdateSmbiosHandles(
UINT8 SlotsPerImc = MAX_DIMM * MAX_MC_CH;
UINT8 DimmsPerImc = 0;

- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return ;
}
@@ -423,7 +423,7 @@ GetMemoryDomains (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -677,7 +677,7 @@ GetProcessorDomains (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -835,7 +835,7 @@ PatchHmatMsars (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
index 1755325d61..c1a9ff481f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
@@ -34,7 +34,7 @@ PatchMsctAcpiTable (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
index cc65d575c3..3c97b05133 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
@@ -32,7 +32,7 @@ UpdateNfitTable (
EFI_NFIT_TABLE_UPDATE_PROTOCOL *NfitTableUpdateProtocol = NULL;
EFI_STATUS Status;

- Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, &NfitTableUpdateProtocol);
+ Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, (VOID **) &NfitTableUpdateProtocol);

if (!EFI_ERROR (Status)) {
Status = NfitTableUpdateProtocol->UpdateAcpiTable ((UINT64*) Table);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
index 515e8ffd1d..9c3fb1c66c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
@@ -31,7 +31,7 @@ UpdatePcatTable (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
index dd9807c899..5e294fdf0f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
@@ -58,7 +58,7 @@ PatchPlatformMemoryTopologyTable (

DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -69,7 +69,7 @@ PatchPlatformMemoryTopologyTable (

ASSERT (PmttTable->Header.Signature == ACPI_PMTT_TABLE_SIGNATURE);

- Status = gBS->LocateProtocol (&gSmbiosMemInfoProtocolGuid, NULL, (VOID**)&SmbiosInfoProtocol);
+ Status = gBS->LocateProtocol (&gSmbiosMemInfoProtocolGuid, NULL, (VOID**) &SmbiosInfoProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "[ACPI] (PMTT) Cannot locate SmbiosMemInfoProtocol! (%r)\n", Status));
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
index a8ac046aea..6976688c3f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
@@ -189,7 +189,7 @@ GetPmemNodeCount (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return 0;
@@ -315,7 +315,7 @@ SocketsLinked (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
index c19c942274..15dbdc14c4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
@@ -208,7 +208,7 @@ ProximityDomainOf (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
}
@@ -291,7 +291,7 @@ PatchMemorySratEntries (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
index cb8b2b24be..4e53df2dd9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
@@ -62,7 +62,7 @@ DetectPcpsInfo (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index 0f8a62460a..dc843b1002 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -32,7 +32,7 @@ BoardEnableAcpi (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL;

- Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, &DynamicSiLibrarySmmProtocol);
+ Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, (VOID**) &DynamicSiLibrarySmmProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -85,7 +85,7 @@ BoardDisableAcpi (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL;

- Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, &DynamicSiLibrarySmmProtocol);
+ Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, (VOID**) &DynamicSiLibrarySmmProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -108,5 +108,3 @@ BoardDisableAcpi (

return EFI_SUCCESS;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
index d31c9292a6..b6609c6e4b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
@@ -126,7 +126,7 @@ EnableAntiFlashWearout (
SYSTEM_CONFIGURATION SetupData;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -185,7 +185,7 @@ BdsBoardBeforeConsoleAfterTrustedConsoleCallback (
Status = gBS->LocateProtocol (
&gEfiPciEnumerationCompleteProtocolGuid,
NULL,
- &Interface
+ (VOID **) &Interface
);
if (EFI_ERROR (Status)) {
ConnectRootBridge (FALSE);
@@ -209,7 +209,7 @@ BoardNotificationInit (
EFI_EVENT BeforeConsoleAfterTrustedConsoleEvent;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
index 5c186ce862..f90166d339 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
@@ -86,7 +86,7 @@ EarlyPlatformPchInit (

DEBUG((DEBUG_INFO, "EarlyPlatformPchInit - Start\n"));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -209,7 +209,7 @@ BoardInitBeforeMemoryInit (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -286,7 +286,7 @@ BoardInitAfterMemoryInit (
UINT16 Pm1Cnt;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -447,4 +447,4 @@ UpdatePlatformInfo (
ASSERT (PlatformInfo->MemData.MemTsegSize - PlatformInfo->MemData.MemIedSize >= 0x300000);

return EFI_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
index 9f0af4b3e0..6b0eaa8def 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
@@ -14,6 +14,7 @@
#include <Library/ReadFfsLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Guid/AuthenticatedVariableFormat.h>
+#include <Library/PeiServicesLib.h>


//notes
@@ -47,7 +48,8 @@ VOID * FindDefaultHobinFfs (
{
EFI_PEI_SERVICES **PeiServices;
UINTN FvInstance;
- EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
+ EFI_PEI_FV_HANDLE FvHandle;
+ EFI_PEI_FILE_HANDLE *FfsHandle;
EFI_FFS_FILE_HEADER *FfsHeader;
UINT32 FileSize;
EFI_COMMON_SECTION_HEADER *Section;
@@ -58,25 +60,18 @@ VOID * FindDefaultHobinFfs (
VARIABLE_STORE_HEADER *VarStoreHeader;
UINT32 FFSSize = 0;

-
-
- //
- // Get PeiService pointer
- //
- PeiServices = (EFI_PEI_SERVICES **)GetPeiServicesTablePointer ();
-
//
// Find the FFS file that stores all default data.
//
DefaultFileIsFound = FALSE;
FvInstance = 0;
- FfsHeader = NULL;
- while (((*PeiServices)->FfsFindNextVolume (PeiServices, FvInstance, &FvHeader) == EFI_SUCCESS) &&
- (!DefaultFileIsFound)) {
- FfsHeader = NULL;
- while ((*PeiServices)->FfsFindNextFile (PeiServices, EFI_FV_FILETYPE_FREEFORM, FvHeader, &FfsHeader) == EFI_SUCCESS) {
- if (CompareGuid ((EFI_GUID *) FfsHeader, &gDefaultDataFileGuid)) {
+ FfsHandle = NULL;
+ while ((PeiServicesFfsFindNextVolume (FvInstance, &FvHandle) == EFI_SUCCESS) && (!DefaultFileIsFound)) {
+ FfsHandle = NULL;
+ while (PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_FREEFORM, FvHandle, FfsHandle) == EFI_SUCCESS) {
+ if (CompareGuid ((EFI_GUID *) FfsHandle, &gDefaultDataFileGuid)) {
DefaultFileIsFound = TRUE;
+ FfsHeader = (EFI_FFS_FILE_HEADER *) FfsHandle;
break;
}
}
@@ -87,17 +82,18 @@ VOID * FindDefaultHobinFfs (
// FFS file is not found.
//
if (!DefaultFileIsFound) {
-
- if(PcdGet32(PcdFailSafeVarFfsSize)!=0 ){
- //try to search other FVS
- FfsHeader = (EFI_FFS_FILE_HEADER *) AllocatePool(PcdGet32(PcdFailSafeVarFfsSize) );
- if(FfsHeader == NULL) {
+ if (PcdGet32 (PcdFailSafeVarFfsSize) != 0 ){
+ //
+ // try to search other FVS
+ //
+ FfsHeader = (EFI_FFS_FILE_HEADER *) AllocatePool (PcdGet32 (PcdFailSafeVarFfsSize));
+ if (FfsHeader == NULL) {
return NULL;
}
- if(EFI_SUCCESS != ReadFFSFile( (EFI_FIRMWARE_VOLUME_HEADER *) PcdGet32(PcdFailSafeVarFvBase), gDefaultDataFileGuid, 0, FfsHeader, &FFSSize, FALSE)) {
+ if (EFI_SUCCESS != ReadFFSFile ((EFI_FIRMWARE_VOLUME_HEADER *) PcdGet32 (PcdFailSafeVarFvBase), gDefaultDataFileGuid, 0, FfsHeader, &FFSSize, FALSE)) {
return NULL;
}
- ASSERT(PcdGet32(PcdFailSafeVarFfsSize) <FFSSize);
+ ASSERT (PcdGet32 (PcdFailSafeVarFfsSize) <FFSSize);
} else {
return NULL;
}
@@ -109,7 +105,7 @@ VOID * FindDefaultHobinFfs (
//
VarStoreHeader = NULL;
Section = (EFI_COMMON_SECTION_HEADER *)(FfsHeader + 1);
- FileSize = *(UINT32 *)(FfsHeader->Size) & 0x00FFFFFF;
+ FileSize = *(UINT32 *) (FfsHeader->Size) & 0x00FFFFFF;
while (((UINTN) Section < (UINTN) FfsHeader + FileSize) && (VarStoreHeader == NULL)) {
DefaultData = (DEFAULT_DATA *) (Section + 1);
DefaultInfo = &(DefaultData->DefaultInfo[0]);
@@ -251,5 +247,3 @@ Returns:

return EFI_SUCCESS;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
index f0230642d2..5318251927 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
@@ -32,7 +32,7 @@ ReportPreMemFv (

DEBUG_CODE (
for (Index = 0; Status == EFI_SUCCESS; Index++) {
- Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, &Ppi);
+ Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, (VOID**) &Ppi);
if (!EFI_ERROR (Status)) {
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) Ppi->FvInfo;
DEBUG ((DEBUG_INFO, "Found FV at 0x%x, size 0x%x\n", FvHeader, FvHeader->FvLength));
@@ -141,7 +141,7 @@ ReportPostMemFv (

DEBUG_CODE (
for (Index = 0; Status == EFI_SUCCESS; Index++) {
- Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, &Ppi);
+ Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, (VOID**) &Ppi);
if (!EFI_ERROR (Status)) {
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) Ppi->FvInfo;
DEBUG ((DEBUG_INFO, "Found FV at 0x%x, size 0x%x\n", FvHeader, FvHeader->FvLength));
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
index 6711de4fad..1ee7f4a326 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
@@ -43,7 +43,7 @@ PlatformGetGpioPlatformMappings (
UBA_CONFIG_DATABASE_PPI *UbaConfigPpi = NULL;
UINTN TableSize;

- Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, &UbaConfigPpi);
+ Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, (VOID **) &UbaConfigPpi);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -78,7 +78,7 @@ GpioGetFlashSecOvrdVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -117,7 +117,7 @@ GpioGetRcvPadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -155,7 +155,7 @@ GpioGetFmAdrTriggerPadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -193,7 +193,7 @@ GpioSetAdrEnablePadOutVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -235,7 +235,7 @@ GpioGetForcetoS1ConfigModePadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -272,7 +272,7 @@ GpioGetQATPadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -403,7 +403,7 @@ GpioGetBoardId0PadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -441,7 +441,7 @@ GpioConfigForMFGMode (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -487,7 +487,7 @@ IsManufacturingMode (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
@@ -514,5 +514,3 @@ IsManufacturingMode (
return ManufacturingMode;

}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
index 6dbf9eb7eb..39d45f7743 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
@@ -32,7 +32,7 @@ PlatformGetUsbOcMappings (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
index 86c2a6ff4e..fce5f12448 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
@@ -29,7 +29,7 @@ PlatformGetBoardSioInfo (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
index c0eb5df07a..6c295ed15c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
@@ -43,7 +43,7 @@ PlatformUpdateClockgen (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -53,7 +53,7 @@ PlatformUpdateClockgen (
&gEfiPeiSmbus2PpiGuid,
0,
NULL,
- &SmbusPpi
+ (VOID **) &SmbusPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -130,5 +130,3 @@ PlatformUpdateClockgen (

return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
index dd7873522c..20fdd38b32 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
@@ -32,7 +32,7 @@ ConfigurePlatformClock (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
index 164302ba7b..883eafc295 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
@@ -36,7 +36,7 @@ PlatformUpdateGpios (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -64,5 +64,3 @@ PlatformUpdateGpios (

return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
index 35f67a013a..ada4d4e7ae 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
@@ -32,7 +32,7 @@ InstallPlatformHsioPtssTable (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
index e4ac30a962..4f4f2a3261 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
@@ -33,7 +33,7 @@ PlatformIioConfigInit (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -81,7 +81,7 @@ PlatformIioConfigInit2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -147,7 +147,7 @@ PlatformUpdateIioConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -190,7 +190,7 @@ PlatformUpdateIioConfig_EX (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -216,4 +216,4 @@ PlatformUpdateIioConfig_EX (
}

return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
index 41416adef1..b1b72fc000 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
@@ -28,7 +28,7 @@ IioPortBifurcationInit (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
index ce822faa2d..fa18cf5c49 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
@@ -41,7 +41,7 @@ PlatformUpdatePcds (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
return Status;
@@ -66,4 +66,3 @@ PlatformUpdatePcds (

return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
index dc7a044729..9de4cc57c9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
@@ -34,7 +34,7 @@ PlatformPchLanConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -75,7 +75,7 @@ PlatformInitLateHook (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -104,5 +104,3 @@ PlatformInitLateHook (

return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
index 53c913aa54..def5720ec9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
@@ -31,7 +31,7 @@ PlatformGetPchPcieBifurcationConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
index 55ada7b3aa..af906b06f9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
@@ -32,7 +32,7 @@ PlatformGetSlotTableData (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -78,7 +78,7 @@ PlatformGetSlotTableData2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -129,7 +129,7 @@ PlatformPchGetPciSlotImplementedTableData (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- (VOID **)&UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
index a4042d2b37..69878960fb 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
@@ -31,7 +31,7 @@ GetPchSoftSoftStrapTable (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -70,7 +70,7 @@ PlatformSpecificPchSoftStrapUpdate (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return;
@@ -92,4 +92,3 @@ PlatformSpecificPchSoftStrapUpdate (

PchSoftStrapUpdate.PchSoftStrapPlatformSpecificUpdate (FlashDescriptorCopy);
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
index 3cd48be906..d647ba1021 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
@@ -17,6 +17,7 @@
#include <Library/HobLib.h>
#include <Platform.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/PeiServicesLib.h>

#define MAX_SMBUS_RETRIES 10

@@ -70,13 +71,7 @@ ConfigureClockGenerator (
//
// Locate SmBus Ppi
//
- Status = (**PeiServices).LocatePpi (
- PeiServices,
- &gEfiPeiSmbus2PpiGuid,
- 0,
- NULL,
- &SmbusPpi
- );
+ Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID** ) &SmbusPpi);
ASSERT_EFI_ERROR (Status);

//
@@ -264,13 +259,7 @@ ConfigureClockGeneratorOnSecondarySmbus (
//
// Locate Stall PPI
//
- Status = (**PeiServices).LocatePpi (
- PeiServices,
- &gEfiPeiStallPpiGuid,
- 0,
- NULL,
- &StallPpi
- );
+ Status = PeiServicesLocatePpi (&gEfiPeiStallPpiGuid, 0, NULL, (VOID** ) &StallPpi);
ASSERT_EFI_ERROR (Status);

//
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
index cbb5d53d98..ecc20dc41b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
@@ -27,6 +27,7 @@
[LibraryClasses]
DebugLib
HobLib
+ PeiServicesLib

[Protocols]

@@ -37,4 +38,3 @@

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
index 2169b3fadd..fbf7cbfe56 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
@@ -53,7 +53,7 @@ PlatformCmosGetNmiState (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
index b67dafd366..8ec6f467c9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
@@ -278,7 +278,7 @@ PkgMpEnableMcaOnCacheableMmio(
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -642,7 +642,7 @@ SetCacheMtrrAfterEndOfPei (
MemoryBase = BASE_1MB;
MemoryLength = LowUncableBase;

- Status = (*PeiServices)->GetHobList (PeiServices, &Hob.Raw);
+ Status = PeiServicesGetHobList ((VOID **) &Hob.Raw);
while (!END_OF_HOB_LIST (Hob)) {
if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {
if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) ||
@@ -841,7 +841,7 @@ SetCacheMtrrAfterEndOfPei (
&gEfiPeiMpServicesPpiGuid,
0,
NULL,
- &mPeiMpServices
+ (VOID** ) &mPeiMpServices
);

if (BootMode != BOOT_ON_S3_RESUME) {
@@ -855,7 +855,7 @@ SetCacheMtrrAfterEndOfPei (
(EFI_AP_PROCEDURE)SetAllMtrrs,
FALSE,
0,
- (VOID*)&MtrrSettings
+ (VOID*) &MtrrSettings
);
}
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
index c4c5d9aaba..2227084d5e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
@@ -52,7 +52,7 @@ Returns:
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
index 25a27eee39..d940a39133 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
@@ -265,7 +265,7 @@ Returns:

DEBUG((DEBUG_INFO, "platform common UpdatePeiPchPolicy entry\n"));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
index f9fa6dfe64..f7e4ee5e2f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
@@ -267,7 +267,7 @@ Returns:

DEBUG((DEBUG_INFO, "platform common UpdatePeiPchPolicy entry\n"));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
index d28b453580..204c9282f6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
@@ -43,7 +43,7 @@ SpiMemorySpaceCheckandEnable(
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL;

- Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, &DynamicSiLibrarySmmProtocol);
+ Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, (VOID**) &DynamicSiLibrarySmmProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -234,4 +234,3 @@ SpiFlashBlockErase (
);
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
index 3fdcf2e18f..4cc69565c5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
@@ -74,12 +74,12 @@ PlatformInitGpios (
VOID *HobPtr;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, &UbaConfigPpi);
+ Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, (VOID **) &UbaConfigPpi);
if (EFI_ERROR (Status)) {
return Status;
}

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -87,7 +87,7 @@ PlatformInitGpios (

TableSize = PcdGet32(PcdOemSku_GPIO_TABLE_SIZE);
DEBUG ((DEBUG_INFO, "UBA:Size of GpioTable 0x%X, blocks: 0x%X.\n", TableSize, (TableSize/sizeof (GPIO_INIT_CONFIG)) ));
- Status = PeiServicesAllocatePool (TableSize, &GpioTable);
+ Status = PeiServicesAllocatePool (TableSize, (VOID** ) &GpioTable);
if (EFI_ERROR(Status)) {
return Status;
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
index d03f0f9957..c89893b393 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
@@ -48,7 +48,7 @@ InitializeDxeUbaPlatLib (
UBA_CONFIG_DATABASE_PROTOCOL *UbaConfigProtocol = NULL;
UINTN TableSize;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &mDynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &mDynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return EFI_NOT_FOUND;
@@ -57,7 +57,7 @@ InitializeDxeUbaPlatLib (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
index f585b1ac9e..96f41db451 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
@@ -32,7 +32,7 @@ GetSystemBoardInfo (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);

if (EFI_ERROR (Status)) {
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
index 525e44358f..156ea66692 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
@@ -31,7 +31,7 @@ UpdateIioDefaultConfig (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR," [UpdateIioDefaultConfig] Locate UbaConfigProtocol fail!\n"));
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
index bdbd012913..587f157a0b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
@@ -31,7 +31,7 @@ PlatformGetUsbOcMappings (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
index 595d1a62fd..a9cff5790c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
@@ -33,7 +33,7 @@ PlatformGetAcpiFixTableDataPointer (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
index 9d1c867cab..458cf3c939 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
@@ -33,7 +33,7 @@ FpkConfigGetConfigStruct (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
index 0e18b4543b..de4eba631c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
@@ -33,7 +33,7 @@ PlatformIioConfigInit (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -79,7 +79,7 @@ PlatformIioConfigInit2 (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
index 922b7daaca..ed99c94aac 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
@@ -35,7 +35,7 @@ PlatformCheckPcieRootPort (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return TRUE;
@@ -72,7 +72,7 @@ PlatformGetOptionRomTable (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -114,7 +114,7 @@ PlatformGetNicSetupConfigTable (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -156,7 +156,7 @@ PlatformGetNicCapabilityTable (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -197,7 +197,7 @@ PlatformSetupPcieSlotNumber (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
index 1d39cb7d6f..aa48fdf6f1 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
@@ -32,7 +32,7 @@ PlatformGetSlotTableData (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -76,7 +76,7 @@ PlatformGetSlotTableData2 (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
index 5d4ed55969..fe9da0f03d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
@@ -48,7 +48,7 @@ PlatformRegisterSmbiosUpdate (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -254,7 +254,7 @@ PlatformSmbiosAddNew (
EFI_SMBIOS_HANDLE SmbiosHandle;

if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -290,7 +290,7 @@ PlatformSmbiosGetInstanceCount (
UINTN Count = 0;

if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -354,7 +354,7 @@ PlatformSmbiosGetInstance (
}

if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -452,7 +452,7 @@ PlatformSmbiosUpdateInstalledString (
UINTN StringSize = 0;

if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -494,7 +494,7 @@ PlatformSmbiosRemoveType (
EFI_SMBIOS_HANDLE SmbiosHandle;

if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -561,7 +561,7 @@ PlatformSmbiosUpdateType (
EFI_SMBIOS_HANDLE SmbiosHandle;

if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -607,7 +607,7 @@ DispatchSmbiosDynamicUpdate (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
index 08396c3b7a..b460dcf26d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
@@ -68,7 +68,7 @@ GetPchName (

BufferAsciiSize = sizeof (AsciiBuffer);

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -145,7 +145,7 @@ AssertPostGpio (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
EFI_STATUS Status;

- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -361,4 +361,3 @@ PlatformTypeInit (

return EFI_SUCCESS;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
index d065225a92..1f3c978192 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
@@ -70,7 +70,7 @@ EmulationPlatformInitEntry (
&gEfiPeiReadOnlyVariable2PpiGuid,
0,
NULL,
- &PeiVariable
+ (VOID** ) &PeiVariable
);

Status = PeiVariable->GetVariable (PeiVariable, EMULATION_DFX_CONFIGURATION_NAME, &gEmulationDfxVariableGuid, NULL, &BufferSize, &EmulationVariable);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
index 439ce357f1..eb8db0dac2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
@@ -83,7 +83,7 @@ GpioConfigForBoardId (
PadConfig.LockConfig = mBoardAndRevIdConfig.LockConfig;
PadConfig.OtherSettings = mBoardAndRevIdConfig.OtherSettings;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -116,7 +116,7 @@ GpioConfigForBoardRevId (
PadConfig.LockConfig = mBoardAndRevIdConfig.LockConfig;
PadConfig.OtherSettings = mBoardAndRevIdConfig.OtherSettings;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -150,7 +150,7 @@ GpioGetBoardId (
return EFI_UNSUPPORTED;
}

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -198,7 +198,7 @@ GpioGetBoardRevId (
return EFI_UNSUPPORTED;
}

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -389,7 +389,7 @@ PdrGetPlatformInfo (
&gPchSpiPpiGuid,
0,
NULL,
- &SpiPpi
+ (VOID** ) &SpiPpi
);

if (EFI_ERROR (Status)) {
@@ -456,7 +456,7 @@ GatherQATInfo(OUT EFI_PLATFORM_INFO *PlatformInfoHob)
PadConfig.LockConfig = GpioPadConfigLock;
PadConfig.OtherSettings = 00;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -653,11 +653,11 @@ PlatformInfoInit (
//
// Locate Variable PPI
//
- Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, &PeiVariable);
+ Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &PeiVariable);

(*PeiServices)->SetMem (&PlatformInfoHob, sizeof (PlatformInfoHob), 0);

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
index 6e17717f8f..c4d0bfc764 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
@@ -39,7 +39,7 @@ BoardInitDxeDriverEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
index f19fa7d61c..791eaa6fb1 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
@@ -185,7 +185,7 @@ SystemBoardInfoEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
index 18205d16c8..9482bedcfb 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
@@ -74,7 +74,7 @@ SystemConfigUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
@@ -91,4 +91,4 @@ SystemConfigUpdateEntry (
}

return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
index 196164ad9b..13d281a84d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
@@ -14,6 +14,7 @@
#include <Library/PchInfoLib.h>
#include <Ppi/PchPolicy.h>
#include <Ppi/DynamicSiLibraryPpi.h>
+#include <Library/PeiServicesLib.h>

//
// Table providing details on clocks supported by this library
@@ -78,7 +79,7 @@ PlatformClocksConfigCallback (
UINT8 ClockGeneratorAddress = 0;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR(Status)) {
DEBUG ((DEBUG_ERROR, "ConfigurePlatformClocks. Can not read gDynamicSiLibraryPpiGuid\n"));
return Status;
@@ -123,12 +124,7 @@ PlatformClocksConfigCallback (
Length = sizeof (ConfigurationTablePlatformSRP);
ClockType = ClockGeneratorCk420;
}
- Status = (*PeiServices)->LocatePpi (PeiServices,
- &gPchPlatformPolicyPpiGuid,
- 0,
- NULL,
- (VOID **)&PchPolicyPpi
- );
+ Status = PeiServicesLocatePpi (&gPchPlatformPolicyPpiGuid, 0, NULL, (VOID **) &PchPolicyPpi);
ASSERT_EFI_ERROR (Status);
EnableSpreadSpectrum = (BOOLEAN) PchPolicyPpi->PchConfig.EnableClockSpreadSpec;
if (1 == EnableSpreadSpectrum) {
@@ -174,4 +170,3 @@ InstallPlatformClocksConfigData (

return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
index d18a3038ef..a6f0e31c23 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
@@ -137,7 +137,7 @@ InstallGpioPlatformData (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;


- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -162,5 +162,3 @@ InstallGpioPlatformData (

return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
index 75abf28d8c..55c4ea233e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
@@ -55,7 +55,7 @@ InstallPlatformHsioPtssTableCallback (
EFI_PLATFORM_INFO *PlatformInfo;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -438,7 +438,7 @@ InstallPlatformHsioPtssTableData (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -457,4 +457,3 @@ InstallPlatformHsioPtssTableData (

return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
index 4f23abc1e0..2d8e1bafa4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
@@ -542,7 +542,7 @@ GetBw5Bifurcation (
return IIO_BIFURCATE_xxxxxxxx;
}

- Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, &SmbPpi);
+ Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbPpi);

// Initialize Bw5Id to not present

@@ -854,13 +854,13 @@ IioPortBifurcationInitCallback (
//
// Locate PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX
//
- Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, &UbaConfigPpi);
+ Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, (VOID **) &UbaConfigPpi);
if (EFI_ERROR (Status)) {
ASSERT (FALSE);
return;
}

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -910,4 +910,3 @@ InstallIioPortBifurcationInitData (
sizeof (IioPortBifurcationInitTable)
);
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
index 8666717a8d..153cc505ba 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
@@ -106,7 +106,7 @@ GetBw5Id (
&gEfiPeiSmbus2PpiGuid,
0,
NULL,
- &Smbus
+ (VOID** ) &Smbus
);

// Initialize Bw5Id to not present
@@ -198,7 +198,7 @@ InternalPlatformGetSlotTableData2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -254,7 +254,7 @@ InternalPlatformIioConfigInit2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -772,7 +772,7 @@ PlatformUpdateIioConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -836,7 +836,7 @@ OverrideDefaultBifSlots_SKX (
//
// Purley platforms need to read the QAT bit
//
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -1352,5 +1352,3 @@ IioPortBifurcationInitVer1 (
}
}
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
index d65bc28b1d..acb41cd4f0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
@@ -35,7 +35,7 @@ CommonPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
index c4f0102f59..13cecba218 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
@@ -35,7 +35,7 @@ StaticSkuConfigDataDxeEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index 5d8862ea6e..806919ea1f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index bbc90ede3e..601ca09ac7 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -78,7 +78,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index fa5c21e4f4..42c5369362 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -107,7 +107,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
index 27c5a36944..2553c89633 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
@@ -97,7 +97,7 @@ TypeCooperCityRPPlatformPcdUpdateCallback (
return Status;
}

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -256,4 +256,3 @@ TypeCooperCityRPInstallPcdData (

return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
index ca57086394..0fdc4c422a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeCooperCityRPPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
index d76e2f29a3..03b9759636 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
@@ -141,13 +141,13 @@ TypeCooperCityRPPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
}

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index 72c55bc1c9..6518a455a5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index 31676bdeb6..4571af1da7 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -85,7 +85,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 0ec35ad330..cdcb59e4ec 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -110,7 +110,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c
index a2ee2322c3..1a583da1b8 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeWilsonCityRPPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -75,7 +75,7 @@ TypeWilsonCityRPPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c
index 44279bb1bd..38153c10a6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c
@@ -74,7 +74,7 @@ TypeWilsonCityRPPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -153,4 +153,4 @@ TypeWilsonCityRPPeiBoardInitLibConstructor (
}
}
return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index fea80ce49e..e904031e1b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index bdedb48316..236b9ee676 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -85,7 +85,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 769003d2be..4c74643de0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -110,7 +110,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c
index f8e6051df2..94caecb933 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c
@@ -299,7 +299,7 @@ TypeWilsonCitySMTInstallGpioData (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c
index 6e2d6df7d7..eb9fb49f24 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeWilsonCitySMTPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -72,7 +72,7 @@ TypeWilsonCitySMTPchEarlyUpdate(
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -86,7 +86,7 @@ TypeWilsonCitySMTPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c
index c368f5d143..8bff245802 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c
@@ -50,7 +50,7 @@ TypeWilsonCitySMTPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c b/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c
index 1fdefe9ef6..670371b69f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c
@@ -28,8 +28,9 @@
@retval EFI_SUCCESS The function completed successfully.
**/
EFI_STATUS
+EFIAPI
MapInterposerToSvid (
- IN CONST EFI_PEI_SERVICES **PeiServices,
+ IN EFI_PEI_SERVICES **PeiServices,
IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor,
IN VOID *Ppi
)
@@ -50,7 +51,7 @@ MapInterposerToSvid (

DEBUG ((EFI_D_INFO, "MapInterposerToSvid Entry\n"));

- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -67,7 +68,7 @@ MapInterposerToSvid (
}
Size = sizeof (MEM_SVID_MAP);
DEBUG ((EFI_D_INFO, "Allocate memory for MemSvidMap PCD\n"));
- Status = (*PeiServices)->AllocatePool (PeiServices, Size, &MemSvidMap);
+ Status = PeiServicesAllocatePool (Size, (VOID **) &MemSvidMap);
ASSERT_EFI_ERROR (Status);
ZeroMem (MemSvidMap, Size);

@@ -133,4 +134,4 @@ InterposerToSvidMapEntry (

DEBUG ((EFI_D_INFO, "InterposerToSvidMap Exit\n"));
return EFI_SUCCESS;;
-}
\ No newline at end of file
+}
diff --git a/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c b/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
index 95a1f2a33c..fa1f97dd41 100644
--- a/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
+++ b/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
@@ -59,7 +59,7 @@ UpdateFspmUpdData (
ASSERT (GuidHob != NULL);
PlatformInfo = GET_GUID_HOB_DATA(GuidHob);

- Status = PeiServicesLocatePpi (&gUpiSiPolicyPpiGuid, 0, NULL, &UpiPolicyPpi);
+ Status = PeiServicesLocatePpi (&gUpiSiPolicyPpiGuid, 0, NULL, (VOID **) &UpiPolicyPpi);
ASSERT_EFI_ERROR(Status);

Upi = &UpiPolicyPpi->Upi;
diff --git a/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c b/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c
index a1c7fb0f67..2dd7d4c174 100644
--- a/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c
+++ b/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c
@@ -20,7 +20,7 @@ SiliconPolicyInitPreMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;

- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return NULL;
@@ -38,7 +38,7 @@ SiliconPolicyDonePreMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;

- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -56,7 +56,7 @@ SiliconPolicyInitPostMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;

- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return NULL;
@@ -74,7 +74,7 @@ SiliconPolicyDonePostMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;

- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
--
2.36.1.windows.1