IntelFsp2WrapperPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the IntelFsp2WrapperPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

2 files changed, 73 insertions, 72 deletions

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c
index 0af0ec778c..21385ac0b2 100644
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c
@@ -21,25 +21,25 @@
 #include <Library/HobLib.h>

 #include <FspStatusCode.h>

 

-#define   FSP_API_NOTIFY_PHASE_AFTER_PCI_ENUMERATION     BIT16

+#define   FSP_API_NOTIFY_PHASE_AFTER_PCI_ENUMERATION  BIT16

 

 typedef

 EFI_STATUS

-(EFIAPI * ADD_PERFORMANCE_RECORDS)(

+(EFIAPI *ADD_PERFORMANCE_RECORDS)(

   IN CONST VOID *HobStart

   );

 

 struct _ADD_PERFORMANCE_RECORD_PROTOCOL {

-  ADD_PERFORMANCE_RECORDS          AddPerformanceRecords;

+  ADD_PERFORMANCE_RECORDS    AddPerformanceRecords;

 };

 

 typedef struct _ADD_PERFORMANCE_RECORD_PROTOCOL ADD_PERFORMANCE_RECORD_PROTOCOL;

 

-extern EFI_GUID gAddPerfRecordProtocolGuid;

-extern EFI_GUID gFspHobGuid;

-extern EFI_GUID gFspApiPerformanceGuid;

+extern EFI_GUID  gAddPerfRecordProtocolGuid;

+extern EFI_GUID  gFspHobGuid;

+extern EFI_GUID  gFspApiPerformanceGuid;

 

-static EFI_EVENT mExitBootServicesEvent     = NULL;

+static EFI_EVENT  mExitBootServicesEvent = NULL;

 

 /**

   Relocate this image under 4G memory.

@@ -53,8 +53,8 @@ static EFI_EVENT mExitBootServicesEvent     = NULL;
 **/

 EFI_STATUS

 RelocateImageUnder4GIfNeeded (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   );

 

 /**

@@ -70,9 +70,9 @@ OnPciEnumerationComplete (
   IN VOID       *Context

   )

 {

-  NOTIFY_PHASE_PARAMS NotifyPhaseParams;

-  EFI_STATUS          Status;

-  VOID                *Interface;

+  NOTIFY_PHASE_PARAMS  NotifyPhaseParams;

+  EFI_STATUS           Status;

+  VOID                 *Interface;

 

   //

   // Try to locate it because gEfiPciEnumerationCompleteProtocolGuid will trigger it once when registration.

@@ -84,26 +84,26 @@ OnPciEnumerationComplete (
                   &Interface

                   );

   if (EFI_ERROR (Status)) {

-    return ;

+    return;

   }

 

   NotifyPhaseParams.Phase = EnumInitPhaseAfterPciEnumeration;

-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

   Status = CallFspNotifyPhase (&NotifyPhaseParams);

-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

 

   //

   // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status

   //

   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {

-    DEBUG((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration requested reset 0x%x\n", Status));

+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration requested reset 0x%x\n", Status));

     CallFspWrapperResetSystem ((UINT32)Status);

   }

 

   if (Status != EFI_SUCCESS) {

-    DEBUG((DEBUG_ERROR, "FSP NotifyPhase AfterPciEnumeration failed, status: 0x%x\n", Status));

+    DEBUG ((DEBUG_ERROR, "FSP NotifyPhase AfterPciEnumeration failed, status: 0x%x\n", Status));

   } else {

-    DEBUG((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration Success.\n"));

+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase AfterPciEnumeration Success.\n"));

   }

 }

 

@@ -125,28 +125,28 @@ OnReadyToBoot (
   IN VOID       *Context

   )

 {

-  NOTIFY_PHASE_PARAMS               NotifyPhaseParams;

-  EFI_STATUS                        Status;

+  NOTIFY_PHASE_PARAMS  NotifyPhaseParams;

+  EFI_STATUS           Status;

 

   gBS->CloseEvent (Event);

 

   NotifyPhaseParams.Phase = EnumInitPhaseReadyToBoot;

-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

   Status = CallFspNotifyPhase (&NotifyPhaseParams);

-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

 

   //

   // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status

   //

   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {

-    DEBUG((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot requested reset 0x%x\n", Status));

+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot requested reset 0x%x\n", Status));

     CallFspWrapperResetSystem ((UINT32)Status);

   }

 

   if (Status != EFI_SUCCESS) {

-    DEBUG((DEBUG_ERROR, "FSP NotifyPhase ReadyToBoot failed, status: 0x%x\n", Status));

+    DEBUG ((DEBUG_ERROR, "FSP NotifyPhase ReadyToBoot failed, status: 0x%x\n", Status));

   } else {

-    DEBUG((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot Success.\n"));

+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase ReadyToBoot Success.\n"));

   }

 }

 

@@ -166,39 +166,40 @@ OnEndOfFirmware (
   IN VOID       *Context

   )

 {

-  NOTIFY_PHASE_PARAMS               NotifyPhaseParams;

-  EFI_STATUS                        Status;

-  ADD_PERFORMANCE_RECORD_PROTOCOL   *AddPerfRecordInterface;

-  EFI_PEI_HOB_POINTERS              Hob;

-  VOID                              **FspHobListPtr;

+  NOTIFY_PHASE_PARAMS              NotifyPhaseParams;

+  EFI_STATUS                       Status;

+  ADD_PERFORMANCE_RECORD_PROTOCOL  *AddPerfRecordInterface;

+  EFI_PEI_HOB_POINTERS             Hob;

+  VOID                             **FspHobListPtr;

 

   gBS->CloseEvent (Event);

 

   NotifyPhaseParams.Phase = EnumInitPhaseEndOfFirmware;

-  PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+  PERF_START_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

   Status = CallFspNotifyPhase (&NotifyPhaseParams);

-  PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+  PERF_END_EX (&gFspApiPerformanceGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

 

   //

   // Reset the system if FSP API returned FSP_STATUS_RESET_REQUIRED status

   //

   if ((Status >= FSP_STATUS_RESET_REQUIRED_COLD) && (Status <= FSP_STATUS_RESET_REQUIRED_8)) {

-    DEBUG((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware requested reset 0x%x\n", Status));

+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware requested reset 0x%x\n", Status));

     CallFspWrapperResetSystem ((UINT32)Status);

   }

 

   if (Status != EFI_SUCCESS) {

-    DEBUG((DEBUG_ERROR, "FSP NotifyPhase EndOfFirmware failed, status: 0x%x\n", Status));

+    DEBUG ((DEBUG_ERROR, "FSP NotifyPhase EndOfFirmware failed, status: 0x%x\n", Status));

   } else {

-    DEBUG((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware Success.\n"));

+    DEBUG ((DEBUG_INFO, "FSP NotifyPhase EndOfFirmware Success.\n"));

   }

+

   Status = gBS->LocateProtocol (

                   &gAddPerfRecordProtocolGuid,

                   NULL,

-                  (VOID**) &AddPerfRecordInterface

+                  (VOID **)&AddPerfRecordInterface

                   );

   if (EFI_ERROR (Status)) {

-    DEBUG((DEBUG_INFO, "gAddPerfRecordProtocolGuid - Locate protocol failed\n"));

+    DEBUG ((DEBUG_INFO, "gAddPerfRecordProtocolGuid - Locate protocol failed\n"));

     return;

   } else {

     Hob.Raw = GetFirstGuidHob (&gFspHobGuid);

@@ -224,15 +225,15 @@ OnEndOfFirmware (
 EFI_STATUS

 EFIAPI

 FspWrapperNotifyDxeEntryPoint (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS Status;

-  EFI_EVENT  ReadyToBootEvent;

-  VOID       *Registration;

-  EFI_EVENT  ProtocolNotifyEvent;

-  UINT32     FspApiMask;

+  EFI_STATUS  Status;

+  EFI_EVENT   ReadyToBootEvent;

+  VOID        *Registration;

+  EFI_EVENT   ProtocolNotifyEvent;

+  UINT32      FspApiMask;

 

   //

   // Load this driver's image to memory

@@ -274,4 +275,3 @@ FspWrapperNotifyDxeEntryPoint (
 

   return EFI_SUCCESS;

 }

-

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c
index ebfeb67ec7..97723aad65 100644
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c
@@ -29,18 +29,18 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/

 EFI_STATUS

 RelocateImageUnder4GIfNeeded (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                                    Status;

-  UINT8                                         *Buffer;

-  UINTN                                         BufferSize;

-  EFI_HANDLE                                    NewImageHandle;

-  UINTN                                         Pages;

-  EFI_PHYSICAL_ADDRESS                          FfsBuffer;

-  PE_COFF_LOADER_IMAGE_CONTEXT                  ImageContext;

-  VOID                                          *Interface;

+  EFI_STATUS                    Status;

+  UINT8                         *Buffer;

+  UINTN                         BufferSize;

+  EFI_HANDLE                    NewImageHandle;

+  UINTN                         Pages;

+  EFI_PHYSICAL_ADDRESS          FfsBuffer;

+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;

+  VOID                          *Interface;

 

   //

   // If it is already <4G, no need do relocate

@@ -64,22 +64,22 @@ RelocateImageUnder4GIfNeeded (
   // Here we install a dummy handle

   //

   NewImageHandle = NULL;

-  Status = gBS->InstallProtocolInterface (

-                  &NewImageHandle,

-                  &gEfiCallerIdGuid,

-                  EFI_NATIVE_INTERFACE,

-                  NULL

-                  );

+  Status         = gBS->InstallProtocolInterface (

+                          &NewImageHandle,

+                          &gEfiCallerIdGuid,

+                          EFI_NATIVE_INTERFACE,

+                          NULL

+                          );

   ASSERT_EFI_ERROR (Status);

 

   //

   // Reload image itself to <4G mem

   //

-  Status = GetSectionFromAnyFv  (

+  Status = GetSectionFromAnyFv (

              &gEfiCallerIdGuid,

              EFI_SECTION_PE32,

              0,

-             (VOID **) &Buffer,

+             (VOID **)&Buffer,

              &BufferSize

              );

   ASSERT_EFI_ERROR (Status);

@@ -91,17 +91,18 @@ RelocateImageUnder4GIfNeeded (
   Status = PeCoffLoaderGetImageInfo (&ImageContext);

   ASSERT_EFI_ERROR (Status);

   if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {

-    Pages = EFI_SIZE_TO_PAGES ((UINTN) (ImageContext.ImageSize + ImageContext.SectionAlignment));

+    Pages = EFI_SIZE_TO_PAGES ((UINTN)(ImageContext.ImageSize + ImageContext.SectionAlignment));

   } else {

-    Pages = EFI_SIZE_TO_PAGES ((UINTN) ImageContext.ImageSize);

+    Pages = EFI_SIZE_TO_PAGES ((UINTN)ImageContext.ImageSize);

   }

+

   FfsBuffer = 0xFFFFFFFF;

-  Status = gBS->AllocatePages (

-                  AllocateMaxAddress,

-                  EfiBootServicesCode,

-                  Pages,

-                  &FfsBuffer

-                  );

+  Status    = gBS->AllocatePages (

+                     AllocateMaxAddress,

+                     EfiBootServicesCode,

+                     Pages,

+                     &FfsBuffer

+                     );

   ASSERT_EFI_ERROR (Status);

   ImageContext.ImageAddress = (PHYSICAL_ADDRESS)(UINTN)FfsBuffer;

   //

@@ -132,7 +133,7 @@ RelocateImageUnder4GIfNeeded (
   InvalidateInstructionCacheRange ((VOID *)(UINTN)ImageContext.ImageAddress, (UINTN)ImageContext.ImageSize);

 

   DEBUG ((DEBUG_INFO, "Loading driver at 0x%08x EntryPoint=0x%08x\n", (UINTN)ImageContext.ImageAddress, (UINTN)ImageContext.EntryPoint));

-  Status = ((EFI_IMAGE_ENTRY_POINT)(UINTN)(ImageContext.EntryPoint)) (NewImageHandle, gST);

+  Status = ((EFI_IMAGE_ENTRY_POINT)(UINTN)(ImageContext.EntryPoint))(NewImageHandle, gST);

   if (EFI_ERROR (Status)) {

     DEBUG ((DEBUG_ERROR, "Error: Image at 0x%08x start failed: %r\n", ImageContext.ImageAddress, Status));

     gBS->FreePages (FfsBuffer, Pages);