UefiPayloadPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the UefiPayloadPkg 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: Ray Ni <ray.ni@intel.com>

1 files changed, 92 insertions, 97 deletions

diff --git a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c
index 6853f2e55f..2c3acbbc19 100644
--- a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c
+++ b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c
@@ -15,7 +15,7 @@
 #include <Library/HobLib.h>

 #include <Library/PcdLib.h>

 

-VOID      *mHobList;

+VOID  *mHobList;

 

 /**

   Returns the pointer to the HOB list.

@@ -35,7 +35,6 @@ GetHobList (
   return mHobList;

 }

 

-

 /**

   Build a Handoff Information Table HOB

 

@@ -51,13 +50,13 @@ GetHobList (
   @return   The pointer to the handoff HOB table.

 

 **/

-EFI_HOB_HANDOFF_INFO_TABLE*

+EFI_HOB_HANDOFF_INFO_TABLE *

 EFIAPI

 HobConstructor (

-  IN VOID   *EfiMemoryBottom,

-  IN VOID   *EfiMemoryTop,

-  IN VOID   *EfiFreeMemoryBottom,

-  IN VOID   *EfiFreeMemoryTop

+  IN VOID  *EfiMemoryBottom,

+  IN VOID  *EfiMemoryTop,

+  IN VOID  *EfiFreeMemoryBottom,

+  IN VOID  *EfiFreeMemoryTop

   )

 {

   EFI_HOB_HANDOFF_INFO_TABLE  *Hob;

@@ -66,22 +65,22 @@ HobConstructor (
   Hob    = EfiFreeMemoryBottom;

   HobEnd = (EFI_HOB_GENERIC_HEADER *)(Hob+1);

 

-  Hob->Header.HobType      = EFI_HOB_TYPE_HANDOFF;

-  Hob->Header.HobLength    = sizeof(EFI_HOB_HANDOFF_INFO_TABLE);

-  Hob->Header.Reserved     = 0;

+  Hob->Header.HobType   = EFI_HOB_TYPE_HANDOFF;

+  Hob->Header.HobLength = sizeof (EFI_HOB_HANDOFF_INFO_TABLE);

+  Hob->Header.Reserved  = 0;

 

-  HobEnd->HobType          = EFI_HOB_TYPE_END_OF_HOB_LIST;

-  HobEnd->HobLength        = sizeof(EFI_HOB_GENERIC_HEADER);

-  HobEnd->Reserved         = 0;

+  HobEnd->HobType   = EFI_HOB_TYPE_END_OF_HOB_LIST;

+  HobEnd->HobLength = sizeof (EFI_HOB_GENERIC_HEADER);

+  HobEnd->Reserved  = 0;

 

-  Hob->Version             = EFI_HOB_HANDOFF_TABLE_VERSION;

-  Hob->BootMode            = BOOT_WITH_FULL_CONFIGURATION;

+  Hob->Version  = EFI_HOB_HANDOFF_TABLE_VERSION;

+  Hob->BootMode = BOOT_WITH_FULL_CONFIGURATION;

 

-  Hob->EfiMemoryTop        = (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryTop;

-  Hob->EfiMemoryBottom     = (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryBottom;

-  Hob->EfiFreeMemoryTop    = (EFI_PHYSICAL_ADDRESS) (UINTN) EfiFreeMemoryTop;

-  Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd+1);

-  Hob->EfiEndOfHobList     = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;

+  Hob->EfiMemoryTop        = (EFI_PHYSICAL_ADDRESS)(UINTN)EfiMemoryTop;

+  Hob->EfiMemoryBottom     = (EFI_PHYSICAL_ADDRESS)(UINTN)EfiMemoryBottom;

+  Hob->EfiFreeMemoryTop    = (EFI_PHYSICAL_ADDRESS)(UINTN)EfiFreeMemoryTop;

+  Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS)(UINTN)(HobEnd+1);

+  Hob->EfiEndOfHobList     = (EFI_PHYSICAL_ADDRESS)(UINTN)HobEnd;

 

   mHobList = Hob;

   return Hob;

@@ -100,8 +99,8 @@ HobConstructor (
 VOID *

 EFIAPI

 CreateHob (

-  IN  UINT16    HobType,

-  IN  UINT16    HobLength

+  IN  UINT16  HobType,

+  IN  UINT16  HobLength

   )

 {

   EFI_HOB_HANDOFF_INFO_TABLE  *HandOffHob;

@@ -116,22 +115,22 @@ CreateHob (
   FreeMemory = HandOffHob->EfiFreeMemoryTop - HandOffHob->EfiFreeMemoryBottom;

 

   if (FreeMemory < HobLength) {

-      return NULL;

+    return NULL;

   }

 

-  Hob = (VOID*) (UINTN) HandOffHob->EfiEndOfHobList;

-  ((EFI_HOB_GENERIC_HEADER*) Hob)->HobType = HobType;

-  ((EFI_HOB_GENERIC_HEADER*) Hob)->HobLength = HobLength;

-  ((EFI_HOB_GENERIC_HEADER*) Hob)->Reserved = 0;

+  Hob                                        = (VOID *)(UINTN)HandOffHob->EfiEndOfHobList;

+  ((EFI_HOB_GENERIC_HEADER *)Hob)->HobType   = HobType;

+  ((EFI_HOB_GENERIC_HEADER *)Hob)->HobLength = HobLength;

+  ((EFI_HOB_GENERIC_HEADER *)Hob)->Reserved  = 0;

 

-  HobEnd = (EFI_HOB_GENERIC_HEADER*) ((UINTN)Hob + HobLength);

-  HandOffHob->EfiEndOfHobList = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;

+  HobEnd                      = (EFI_HOB_GENERIC_HEADER *)((UINTN)Hob + HobLength);

+  HandOffHob->EfiEndOfHobList = (EFI_PHYSICAL_ADDRESS)(UINTN)HobEnd;

 

   HobEnd->HobType   = EFI_HOB_TYPE_END_OF_HOB_LIST;

-  HobEnd->HobLength = sizeof(EFI_HOB_GENERIC_HEADER);

+  HobEnd->HobLength = sizeof (EFI_HOB_GENERIC_HEADER);

   HobEnd->Reserved  = 0;

   HobEnd++;

-  HandOffHob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;

+  HandOffHob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS)(UINTN)HobEnd;

 

   return Hob;

 }

@@ -160,7 +159,7 @@ BuildResourceDescriptorHob (
   EFI_HOB_RESOURCE_DESCRIPTOR  *Hob;

 

   Hob = CreateHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, sizeof (EFI_HOB_RESOURCE_DESCRIPTOR));

-  ASSERT(Hob != NULL);

+  ASSERT (Hob != NULL);

 

   Hob->ResourceType      = ResourceType;

   Hob->ResourceAttribute = ResourceAttribute;

@@ -187,15 +186,15 @@ BuildResourceDescriptorHob (
 VOID *

 EFIAPI

 GetNextHob (

-  IN UINT16                 Type,

-  IN CONST VOID             *HobStart

+  IN UINT16      Type,

+  IN CONST VOID  *HobStart

   )

 {

   EFI_PEI_HOB_POINTERS  Hob;

 

   ASSERT (HobStart != NULL);

 

-  Hob.Raw = (UINT8 *) HobStart;

+  Hob.Raw = (UINT8 *)HobStart;

   //

   // Parse the HOB list until end of list or matching type is found.

   //

@@ -203,13 +202,13 @@ GetNextHob (
     if (Hob.Header->HobType == Type) {

       return Hob.Raw;

     }

+

     Hob.Raw = GET_NEXT_HOB (Hob);

   }

+

   return NULL;

 }

 

-

-

 /**

   Returns the first instance of a HOB type among the whole HOB list.

 

@@ -224,16 +223,15 @@ GetNextHob (
 VOID *

 EFIAPI

 GetFirstHob (

-  IN UINT16                 Type

+  IN UINT16  Type

   )

 {

-  VOID      *HobList;

+  VOID  *HobList;

 

   HobList = GetHobList ();

   return GetNextHob (Type, HobList);

 }

 

-

 /**

   This function searches the first instance of a HOB from the starting HOB pointer.

   Such HOB should satisfy two conditions:

@@ -256,23 +254,24 @@ GetFirstHob (
 VOID *

 EFIAPI

 GetNextGuidHob (

-  IN CONST EFI_GUID         *Guid,

-  IN CONST VOID             *HobStart

+  IN CONST EFI_GUID  *Guid,

+  IN CONST VOID      *HobStart

   )

 {

   EFI_PEI_HOB_POINTERS  GuidHob;

 

-  GuidHob.Raw = (UINT8 *) HobStart;

+  GuidHob.Raw = (UINT8 *)HobStart;

   while ((GuidHob.Raw = GetNextHob (EFI_HOB_TYPE_GUID_EXTENSION, GuidHob.Raw)) != NULL) {

     if (CompareGuid (Guid, &GuidHob.Guid->Name)) {

       break;

     }

+

     GuidHob.Raw = GET_NEXT_HOB (GuidHob);

   }

+

   return GuidHob.Raw;

 }

 

-

 /**

   This function searches the first instance of a HOB among the whole HOB list.

   Such HOB should satisfy two conditions:

@@ -290,18 +289,15 @@ GetNextGuidHob (
 VOID *

 EFIAPI

 GetFirstGuidHob (

-  IN CONST EFI_GUID         *Guid

+  IN CONST EFI_GUID  *Guid

   )

 {

-  VOID      *HobList;

+  VOID  *HobList;

 

   HobList = GetHobList ();

   return GetNextGuidHob (Guid, HobList);

 }

 

-

-

-

 /**

   Builds a HOB for a loaded PE32 module.

 

@@ -320,16 +316,18 @@ GetFirstGuidHob (
 VOID

 EFIAPI

 BuildModuleHob (

-  IN CONST EFI_GUID         *ModuleName,

-  IN EFI_PHYSICAL_ADDRESS   MemoryAllocationModule,

-  IN UINT64                 ModuleLength,

-  IN EFI_PHYSICAL_ADDRESS   EntryPoint

+  IN CONST EFI_GUID        *ModuleName,

+  IN EFI_PHYSICAL_ADDRESS  MemoryAllocationModule,

+  IN UINT64                ModuleLength,

+  IN EFI_PHYSICAL_ADDRESS  EntryPoint

   )

 {

   EFI_HOB_MEMORY_ALLOCATION_MODULE  *Hob;

 

-  ASSERT (((MemoryAllocationModule & (EFI_PAGE_SIZE - 1)) == 0) &&

-          ((ModuleLength & (EFI_PAGE_SIZE - 1)) == 0));

+  ASSERT (

+    ((MemoryAllocationModule & (EFI_PAGE_SIZE - 1)) == 0) &&

+    ((ModuleLength & (EFI_PAGE_SIZE - 1)) == 0)

+    );

 

   Hob = CreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE));

 

@@ -368,23 +366,22 @@ BuildModuleHob (
 VOID *

 EFIAPI

 BuildGuidHob (

-  IN CONST EFI_GUID              *Guid,

-  IN UINTN                       DataLength

+  IN CONST EFI_GUID  *Guid,

+  IN UINTN           DataLength

   )

 {

-  EFI_HOB_GUID_TYPE *Hob;

+  EFI_HOB_GUID_TYPE  *Hob;

 

   //

   // Make sure that data length is not too long.

   //

   ASSERT (DataLength <= (0xffff - sizeof (EFI_HOB_GUID_TYPE)));

 

-  Hob = CreateHob (EFI_HOB_TYPE_GUID_EXTENSION, (UINT16) (sizeof (EFI_HOB_GUID_TYPE) + DataLength));

+  Hob = CreateHob (EFI_HOB_TYPE_GUID_EXTENSION, (UINT16)(sizeof (EFI_HOB_GUID_TYPE) + DataLength));

   CopyGuid (&Hob->Name, Guid);

   return Hob + 1;

 }

 

-

 /**

   Copies a data buffer to a newly-built HOB.

 

@@ -408,9 +405,9 @@ BuildGuidHob (
 VOID *

 EFIAPI

 BuildGuidDataHob (

-  IN CONST EFI_GUID              *Guid,

-  IN VOID                        *Data,

-  IN UINTN                       DataLength

+  IN CONST EFI_GUID  *Guid,

+  IN VOID            *Data,

+  IN UINTN           DataLength

   )

 {

   VOID  *HobData;

@@ -422,7 +419,6 @@ BuildGuidDataHob (
   return CopyMem (HobData, Data, DataLength);

 }

 

-

 /**

   Builds a Firmware Volume HOB.

 

@@ -438,8 +434,8 @@ BuildGuidDataHob (
 VOID

 EFIAPI

 BuildFvHob (

-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,

-  IN UINT64                      Length

+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN UINT64                Length

   )

 {

   EFI_HOB_FIRMWARE_VOLUME  *Hob;

@@ -450,7 +446,6 @@ BuildFvHob (
   Hob->Length      = Length;

 }

 

-

 /**

   Builds a EFI_HOB_TYPE_FV2 HOB.

 

@@ -468,10 +463,10 @@ BuildFvHob (
 VOID

 EFIAPI

 BuildFv2Hob (

-  IN          EFI_PHYSICAL_ADDRESS        BaseAddress,

-  IN          UINT64                      Length,

-  IN CONST    EFI_GUID                    *FvName,

-  IN CONST    EFI_GUID                    *FileName

+  IN          EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN          UINT64                Length,

+  IN CONST    EFI_GUID              *FvName,

+  IN CONST    EFI_GUID              *FileName

   )

 {

   EFI_HOB_FIRMWARE_VOLUME2  *Hob;

@@ -507,12 +502,12 @@ BuildFv2Hob (
 VOID

 EFIAPI

 BuildFv3Hob (

-  IN          EFI_PHYSICAL_ADDRESS        BaseAddress,

-  IN          UINT64                      Length,

-  IN          UINT32                      AuthenticationStatus,

-  IN          BOOLEAN                     ExtractedFv,

-  IN CONST    EFI_GUID                    *FvName  OPTIONAL,

-  IN CONST    EFI_GUID                    *FileName OPTIONAL

+  IN          EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN          UINT64                Length,

+  IN          UINT32                AuthenticationStatus,

+  IN          BOOLEAN               ExtractedFv,

+  IN CONST    EFI_GUID              *FvName  OPTIONAL,

+  IN CONST    EFI_GUID              *FileName OPTIONAL

   )

 {

   EFI_HOB_FIRMWARE_VOLUME3  *Hob;

@@ -529,7 +524,6 @@ BuildFv3Hob (
   }

 }

 

-

 /**

   Builds a HOB for the CPU.

 

@@ -545,8 +539,8 @@ BuildFv3Hob (
 VOID

 EFIAPI

 BuildCpuHob (

-  IN UINT8                       SizeOfMemorySpace,

-  IN UINT8                       SizeOfIoSpace

+  IN UINT8  SizeOfMemorySpace,

+  IN UINT8  SizeOfIoSpace

   )

 {

   EFI_HOB_CPU  *Hob;

@@ -562,7 +556,6 @@ BuildCpuHob (
   ZeroMem (Hob->Reserved, sizeof (Hob->Reserved));

 }

 

-

 /**

   Builds a HOB for the Stack.

 

@@ -578,14 +571,16 @@ BuildCpuHob (
 VOID

 EFIAPI

 BuildStackHob (

-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,

-  IN UINT64                      Length

+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN UINT64                Length

   )

 {

   EFI_HOB_MEMORY_ALLOCATION_STACK  *Hob;

 

-  ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

-          ((Length & (EFI_PAGE_SIZE - 1)) == 0));

+  ASSERT (

+    ((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

+    ((Length & (EFI_PAGE_SIZE - 1)) == 0)

+    );

 

   Hob = CreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK));

 

@@ -600,7 +595,6 @@ BuildStackHob (
   ZeroMem (Hob->AllocDescriptor.Reserved, sizeof (Hob->AllocDescriptor.Reserved));

 }

 

-

 /**

   Update the Stack Hob if the stack has been moved

 

@@ -611,11 +605,11 @@ BuildStackHob (
 VOID

 EFIAPI

 UpdateStackHob (

-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,

-  IN UINT64                      Length

+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN UINT64                Length

   )

 {

-  EFI_PEI_HOB_POINTERS           Hob;

+  EFI_PEI_HOB_POINTERS  Hob;

 

   Hob.Raw = GetHobList ();

   while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw)) != NULL) {

@@ -633,15 +627,14 @@ UpdateStackHob (
       // Update the BSP Stack Hob to reflect the new stack info.

       //

       Hob.MemoryAllocationStack->AllocDescriptor.MemoryBaseAddress = BaseAddress;

-      Hob.MemoryAllocationStack->AllocDescriptor.MemoryLength = Length;

+      Hob.MemoryAllocationStack->AllocDescriptor.MemoryLength      = Length;

       break;

     }

+

     Hob.Raw = GET_NEXT_HOB (Hob);

   }

 }

 

-

-

 /**

   Builds a HOB for the memory allocation.

 

@@ -658,15 +651,17 @@ UpdateStackHob (
 VOID

 EFIAPI

 BuildMemoryAllocationHob (

-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,

-  IN UINT64                      Length,

-  IN EFI_MEMORY_TYPE             MemoryType

+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN UINT64                Length,

+  IN EFI_MEMORY_TYPE       MemoryType

   )

 {

   EFI_HOB_MEMORY_ALLOCATION  *Hob;

 

-  ASSERT (((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

-          ((Length & (EFI_PAGE_SIZE - 1)) == 0));

+  ASSERT (

+    ((BaseAddress & (EFI_PAGE_SIZE - 1)) == 0) &&

+    ((Length & (EFI_PAGE_SIZE - 1)) == 0)

+    );

 

   Hob = CreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION));