UefiPayloadPkg: Apply uncrustify changes

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadEntry / LoadDxeCore.c

diff --git a/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c b/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c
index 67eed179f00e573cfdfeb8e5c42490033d41c1d8..898d610951fa3c1c8e17931600aa666a83e3d787 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c
@@ -15,13 +15,13 @@
 \r
   @return Allocated memory.\r
 **/\r
-VOID*\r
+VOID *\r
 AllocateCodePages (\r
-  IN  UINTN     Pages\r
+  IN  UINTN  Pages\r
   )\r
 {\r
-  VOID                    *Alloc;\r
-  EFI_PEI_HOB_POINTERS    Hob;\r
+  VOID                  *Alloc;\r
+  EFI_PEI_HOB_POINTERS  Hob;\r
 \r
   Alloc = AllocatePages (Pages);\r
   if (Alloc == NULL) {\r
@@ -35,6 +35,7 @@ AllocateCodePages (
       Hob.MemoryAllocation->AllocDescriptor.MemoryType = EfiBootServicesCode;\r
       return Alloc;\r
     }\r
+\r
     Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, GET_NEXT_HOB (Hob));\r
   }\r
 \r
@@ -44,7 +45,6 @@ AllocateCodePages (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
     Loads and relocates a PE/COFF image\r
 \r
@@ -58,15 +58,15 @@ AllocateCodePages (
 **/\r
 EFI_STATUS\r
 LoadPeCoffImage (\r
-  IN  VOID                          *PeCoffImage,\r
-  OUT EFI_PHYSICAL_ADDRESS          *ImageAddress,\r
-  OUT UINT64                        *ImageSize,\r
-  OUT EFI_PHYSICAL_ADDRESS          *EntryPoint\r
+  IN  VOID                  *PeCoffImage,\r
+  OUT EFI_PHYSICAL_ADDRESS  *ImageAddress,\r
+  OUT UINT64                *ImageSize,\r
+  OUT EFI_PHYSICAL_ADDRESS  *EntryPoint\r
   )\r
 {\r
-  RETURN_STATUS                     Status;\r
-  PE_COFF_LOADER_IMAGE_CONTEXT      ImageContext;\r
-  VOID                              *Buffer;\r
+  RETURN_STATUS                 Status;\r
+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;\r
+  VOID                          *Buffer;\r
 \r
   ZeroMem (&ImageContext, sizeof (ImageContext));\r
 \r
@@ -82,10 +82,11 @@ LoadPeCoffImage (
   //\r
   // Allocate Memory for the image\r
   //\r
-  Buffer = AllocateCodePages (EFI_SIZE_TO_PAGES((UINT32)ImageContext.ImageSize));\r
+  Buffer = AllocateCodePages (EFI_SIZE_TO_PAGES ((UINT32)ImageContext.ImageSize));\r
   if (Buffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Buffer;\r
 \r
   //\r
@@ -134,13 +135,13 @@ FvFindFileByTypeGuid (
   OUT EFI_FFS_FILE_HEADER         **FileHeader\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS        CurrentAddress;\r
-  EFI_PHYSICAL_ADDRESS        EndOfFirmwareVolume;\r
-  EFI_FFS_FILE_HEADER         *File;\r
-  UINT32                      Size;\r
-  EFI_PHYSICAL_ADDRESS        EndOfFile;\r
+  EFI_PHYSICAL_ADDRESS  CurrentAddress;\r
+  EFI_PHYSICAL_ADDRESS  EndOfFirmwareVolume;\r
+  EFI_FFS_FILE_HEADER   *File;\r
+  UINT32                Size;\r
+  EFI_PHYSICAL_ADDRESS  EndOfFile;\r
 \r
-  CurrentAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) FvHeader;\r
+  CurrentAddress      = (EFI_PHYSICAL_ADDRESS)(UINTN)FvHeader;\r
   EndOfFirmwareVolume = CurrentAddress + FvHeader->FvLength;\r
 \r
   //\r
@@ -152,7 +153,7 @@ FvFindFileByTypeGuid (
       break;\r
     }\r
 \r
-    File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
+    File = (EFI_FFS_FILE_HEADER *)(UINTN)CurrentAddress;\r
     if (IS_FFS_FILE2 (File)) {\r
       Size = FFS_FILE2_SIZE (File);\r
       if (Size <= 0x00FFFFFF) {\r
@@ -174,7 +175,7 @@ FvFindFileByTypeGuid (
     // Look for file type\r
     //\r
     if (File->Type == FileType) {\r
-      if (Guid == NULL || CompareGuid(&File->Name, Guid)) {\r
+      if ((Guid == NULL) || CompareGuid (&File->Name, Guid)) {\r
         *FileHeader = File;\r
         return EFI_SUCCESS;\r
       }\r
@@ -184,7 +185,6 @@ FvFindFileByTypeGuid (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   This function searchs a given section type within a valid FFS file.\r
 \r
@@ -199,32 +199,34 @@ FvFindFileByTypeGuid (
 **/\r
 EFI_STATUS\r
 FileFindSection (\r
-  IN EFI_FFS_FILE_HEADER        *FileHeader,\r
-  IN EFI_SECTION_TYPE           SectionType,\r
-  OUT VOID                      **SectionData\r
+  IN EFI_FFS_FILE_HEADER  *FileHeader,\r
+  IN EFI_SECTION_TYPE     SectionType,\r
+  OUT VOID                **SectionData\r
   )\r
 {\r
-  UINT32                        FileSize;\r
-  EFI_COMMON_SECTION_HEADER     *Section;\r
-  UINT32                        SectionSize;\r
-  UINT32                        Index;\r
+  UINT32                     FileSize;\r
+  EFI_COMMON_SECTION_HEADER  *Section;\r
+  UINT32                     SectionSize;\r
+  UINT32                     Index;\r
 \r
   if (IS_FFS_FILE2 (FileHeader)) {\r
     FileSize = FFS_FILE2_SIZE (FileHeader);\r
   } else {\r
     FileSize = FFS_FILE_SIZE (FileHeader);\r
   }\r
-  FileSize  -= sizeof (EFI_FFS_FILE_HEADER);\r
 \r
-  Section    = (EFI_COMMON_SECTION_HEADER *)(FileHeader + 1);\r
-  Index      = 0;\r
+  FileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
+\r
+  Section = (EFI_COMMON_SECTION_HEADER *)(FileHeader + 1);\r
+  Index   = 0;\r
   while (Index < FileSize) {\r
     if (Section->Type == SectionType) {\r
       if (IS_SECTION2 (Section)) {\r
-        *SectionData = (VOID *)((UINT8 *) Section + sizeof (EFI_COMMON_SECTION_HEADER2));\r
+        *SectionData = (VOID *)((UINT8 *)Section + sizeof (EFI_COMMON_SECTION_HEADER2));\r
       } else {\r
-        *SectionData = (VOID *)((UINT8 *) Section + sizeof (EFI_COMMON_SECTION_HEADER));\r
+        *SectionData = (VOID *)((UINT8 *)Section + sizeof (EFI_COMMON_SECTION_HEADER));\r
       }\r
+\r
       return EFI_SUCCESS;\r
     }\r
 \r
@@ -244,7 +246,6 @@ FileFindSection (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Find DXE core from FV and build DXE core HOBs.\r
 \r
@@ -255,7 +256,7 @@ FileFindSection (
 **/\r
 EFI_STATUS\r
 LoadDxeCore (\r
-  OUT PHYSICAL_ADDRESS        *DxeCoreEntryPoint\r
+  OUT PHYSICAL_ADDRESS  *DxeCoreEntryPoint\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -275,6 +276,7 @@ LoadDxeCore (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = FileFindSection (FileHeader, EFI_SECTION_FIRMWARE_VOLUME_IMAGE, (VOID **)&DxeCoreFv);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -283,7 +285,7 @@ LoadDxeCore (
   //\r
   // Report DXE FV to DXE core\r
   //\r
-  BuildFvHob ((EFI_PHYSICAL_ADDRESS) (UINTN) DxeCoreFv, DxeCoreFv->FvLength);\r
+  BuildFvHob ((EFI_PHYSICAL_ADDRESS)(UINTN)DxeCoreFv, DxeCoreFv->FvLength);\r
 \r
   //\r
   // Find DXE core file from DXE FV\r
@@ -306,7 +308,7 @@ LoadDxeCore (
     return Status;\r
   }\r
 \r
-  BuildModuleHob (&FileHeader->Name, ImageAddress, EFI_SIZE_TO_PAGES ((UINT32) ImageSize) * EFI_PAGE_SIZE, *DxeCoreEntryPoint);\r
+  BuildModuleHob (&FileHeader->Name, ImageAddress, EFI_SIZE_TO_PAGES ((UINT32)ImageSize) * EFI_PAGE_SIZE, *DxeCoreEntryPoint);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -322,15 +324,15 @@ LoadDxeCore (
 **/\r
 EFI_STATUS\r
 UniversalLoadDxeCore (\r
-  IN  EFI_FIRMWARE_VOLUME_HEADER *DxeFv,\r
-  OUT PHYSICAL_ADDRESS           *DxeCoreEntryPoint\r
+  IN  EFI_FIRMWARE_VOLUME_HEADER  *DxeFv,\r
+  OUT PHYSICAL_ADDRESS            *DxeCoreEntryPoint\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_FFS_FILE_HEADER         *FileHeader;\r
-  VOID                        *PeCoffImage;\r
-  EFI_PHYSICAL_ADDRESS        ImageAddress;\r
-  UINT64                      ImageSize;\r
+  EFI_STATUS            Status;\r
+  EFI_FFS_FILE_HEADER   *FileHeader;\r
+  VOID                  *PeCoffImage;\r
+  EFI_PHYSICAL_ADDRESS  ImageAddress;\r
+  UINT64                ImageSize;\r
 \r
   //\r
   // Find DXE core file from DXE FV\r
@@ -353,7 +355,7 @@ UniversalLoadDxeCore (
     return Status;\r
   }\r
 \r
-  BuildModuleHob (&FileHeader->Name, ImageAddress, EFI_SIZE_TO_PAGES ((UINT32) ImageSize) * EFI_PAGE_SIZE, *DxeCoreEntryPoint);\r
+  BuildModuleHob (&FileHeader->Name, ImageAddress, EFI_SIZE_TO_PAGES ((UINT32)ImageSize) * EFI_PAGE_SIZE, *DxeCoreEntryPoint);\r
 \r
   return EFI_SUCCESS;\r
 }\r