Browse Source

WhitleyOpenBoardPkg: Fix GCC warnings

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@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Isaac Oram 1 year ago
parent
commit
1690b98989
100 changed files with 259 additions and 305 deletions
  1. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
  2. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
  3. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
  4. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
  5. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
  6. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
  7. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
  8. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
  9. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
  10. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
  11. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
  12. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
  13. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
  14. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
  15. 11 11
      Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
  16. 7 7
      Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
  17. 15 15
      Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
  18. 2 3
      Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
  19. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
  20. 2 3
      Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
  21. 17 18
      Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
  22. 8 8
      Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
  23. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
  24. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
  25. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
  26. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
  27. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
  28. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
  29. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
  30. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
  31. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
  32. 8 8
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
  33. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
  34. 6 6
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
  35. 4 4
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
  36. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
  37. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
  38. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
  39. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
  40. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
  41. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
  42. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
  43. 2 4
      Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
  44. 3 3
      Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
  45. 4 4
      Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
  46. 18 24
      Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
  47. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
  48. 10 12
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
  49. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
  50. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
  51. 2 4
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
  52. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
  53. 1 3
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
  54. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
  55. 5 5
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
  56. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
  57. 1 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
  58. 2 4
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
  59. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
  60. 3 3
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
  61. 2 3
      Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
  62. 3 14
      Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
  63. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
  64. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
  65. 4 4
      Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
  66. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
  67. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
  68. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
  69. 1 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
  70. 3 3
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
  71. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
  72. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
  73. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
  74. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
  75. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
  76. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
  77. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
  78. 5 5
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
  79. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
  80. 8 8
      Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
  81. 2 3
      Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
  82. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
  83. 8 8
      Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
  84. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
  85. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
  86. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
  87. 3 8
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
  88. 1 3
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
  89. 2 3
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
  90. 3 4
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
  91. 5 7
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
  92. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
  93. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
  94. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
  95. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
  96. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
  97. 1 2
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
  98. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
  99. 2 2
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
  100. 1 1
      Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c

+ 1 - 1
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);

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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;

+ 1 - 1
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;

+ 2 - 2
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);
 

+ 11 - 11
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);

+ 7 - 7
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;

+ 15 - 15
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,

+ 2 - 3
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;
 }
-

+ 1 - 1
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);
   }
 

+ 2 - 3
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;
 }
-

+ 17 - 18
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.

+ 8 - 8
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);
 

+ 1 - 1
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)
 

+ 1 - 1
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

+ 1 - 1
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);

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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;

+ 2 - 2
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;
-}
+}

+ 8 - 8
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;

+ 1 - 1
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;

+ 6 - 6
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;

+ 4 - 4
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;

+ 1 - 1
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;

+ 1 - 1
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);

+ 1 - 1
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;

+ 2 - 2
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);

+ 2 - 2
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;

+ 2 - 2
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;

+ 1 - 1
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;

+ 2 - 4
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;
 }
-
-

+ 3 - 3
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;

+ 4 - 4
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;
-}
+}

+ 18 - 24
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;
 }
-
-

+ 2 - 2
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));

+ 10 - 12
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;
 
 }
-
-

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c

@@ -32,7 +32,7 @@ PlatformGetUsbOcMappings (
               &gUbaConfigDatabasePpiGuid,
               0,
               NULL,
-              &UbaConfigPpi
+              (VOID **) &UbaConfigPpi
               );
   if (EFI_ERROR(Status)) {
     return Status;

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c

@@ -29,7 +29,7 @@ PlatformGetBoardSioInfo (
               &gUbaConfigDatabasePpiGuid,
               0,
               NULL,
-              &UbaConfigPpi
+              (VOID **) &UbaConfigPpi
               );
   if (EFI_ERROR(Status)) {
     return Status;

+ 2 - 4
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;
 }
-
-

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c

@@ -32,7 +32,7 @@ ConfigurePlatformClock (
               &gUbaConfigDatabasePpiGuid,
               0,
               NULL,
-              &UbaConfigPpi
+              (VOID **) &UbaConfigPpi
               );
   if (EFI_ERROR(Status)) {
     return Status;

+ 1 - 3
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;
 }
-
-

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c

@@ -32,7 +32,7 @@ InstallPlatformHsioPtssTable (
               &gUbaConfigDatabasePpiGuid,
               0,
               NULL,
-              &UbaConfigPpi
+              (VOID **) &UbaConfigPpi
               );
   if (EFI_ERROR(Status)) {
     return Status;

+ 5 - 5
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;
-}
+}

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c

@@ -28,7 +28,7 @@ IioPortBifurcationInit (
               &gUbaConfigDatabasePpiGuid,
               0,
               NULL,
-              &UbaConfigPpi
+              (VOID **) &UbaConfigPpi
               );
   if (EFI_ERROR(Status)) {
     return Status;

+ 1 - 2
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;
 }
-

+ 2 - 4
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;
 }
-
-

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c

@@ -31,7 +31,7 @@ PlatformGetPchPcieBifurcationConfig (
               &gUbaConfigDatabasePpiGuid,
               0,
               NULL,
-              &UbaConfigPpi
+              (VOID **) &UbaConfigPpi
               );
   if (EFI_ERROR(Status)) {
     return Status;

+ 3 - 3
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;

+ 2 - 3
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);
 }
-

+ 3 - 14
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);
 
   //

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf

@@ -27,6 +27,7 @@
 [LibraryClasses]
   DebugLib
   HobLib
+  PeiServicesLib
 
 [Protocols]
 
@@ -37,4 +38,3 @@
 
 [FixedPcd]
   gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
-

+ 1 - 1
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;

+ 4 - 4
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
                     );
     }
   }

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 2
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;
 }
-

+ 3 - 3
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;
   }

+ 2 - 2
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;

+ 1 - 1
Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c

@@ -32,7 +32,7 @@ GetSystemBoardInfo (
   Status = gBS->LocateProtocol (
                   &gUbaConfigDatabaseProtocolGuid,
                   NULL,
-                  &UbaConfigProtocol
+                  (VOID **) &UbaConfigProtocol
                   );
 
   if (EFI_ERROR (Status)) {

+ 1 - 1
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"));

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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;

+ 5 - 5
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;

+ 2 - 2
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;

+ 8 - 8
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;

+ 2 - 3
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;
 }
-

+ 1 - 1
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);

+ 8 - 8
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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;
-}
+}

+ 3 - 8
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;
 }
-

+ 1 - 3
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;
 }
-
-

+ 2 - 3
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;
 }
-

+ 3 - 4
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)
            );
 }
-

+ 5 - 7
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 (
     }
   }
 }
-
-

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 2
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;
 }
-

+ 1 - 1
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;

+ 2 - 2
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;

+ 1 - 1
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;

Some files were not shown because too many files changed in this diff