EmbeddedPkg: Apply uncrustify changes

[mirror_edk2.git] / EmbeddedPkg / Library / PrePiLib / PrePiLib.c

diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
index b9344ed865cf9052a09ab600cd6694b4064c9042..a0c5d02debd0bfc2078634bdbedcaf0300165f64 100644 (file)
--- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
+++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
@@ -16,21 +16,21 @@ EFI_STATUS
 EFIAPI\r
 \r
 SecWinNtPeiLoadFile (\r
-  IN  VOID                    *Pe32Data,\r
-  IN  EFI_PHYSICAL_ADDRESS    *ImageAddress,\r
-  IN  UINT64                  *ImageSize,\r
-  IN  EFI_PHYSICAL_ADDRESS    *EntryPoint\r
+  IN  VOID                  *Pe32Data,\r
+  IN  EFI_PHYSICAL_ADDRESS  *ImageAddress,\r
+  IN  UINT64                *ImageSize,\r
+  IN  EFI_PHYSICAL_ADDRESS  *EntryPoint\r
   );\r
 \r
 STATIC\r
-VOID*\r
+VOID *\r
 EFIAPI\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
@@ -44,6 +44,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
@@ -53,19 +54,18 @@ AllocateCodePages (
   return NULL;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\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
+  VOID                          *Buffer;\r
 \r
   ZeroMem (&ImageContext, sizeof (ImageContext));\r
 \r
@@ -75,14 +75,12 @@ LoadPeCoffImage (
   Status = PeCoffLoaderGetImageInfo (&ImageContext);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-\r
   //\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
   ASSERT (Buffer != 0);\r
 \r
-\r
   ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Buffer;\r
 \r
   //\r
@@ -97,7 +95,6 @@ LoadPeCoffImage (
   Status = PeCoffLoaderRelocateImage (&ImageContext);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-\r
   *ImageAddress = ImageContext.ImageAddress;\r
   *ImageSize    = ImageContext.ImageSize;\r
   *EntryPoint   = ImageContext.EntryPoint;\r
@@ -111,11 +108,9 @@ LoadPeCoffImage (
   return Status;\r
 }\r
 \r
-\r
-\r
 typedef\r
 VOID\r
-(EFIAPI *DXE_CORE_ENTRY_POINT) (\r
+(EFIAPI *DXE_CORE_ENTRY_POINT)(\r
   IN  VOID *HobStart\r
   );\r
 \r
@@ -126,24 +121,23 @@ LoadDxeCoreFromFfsFile (
   IN UINTN                StackSize\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  VOID                    *PeCoffImage;\r
-  EFI_PHYSICAL_ADDRESS    ImageAddress;\r
-  UINT64                  ImageSize;\r
-  EFI_PHYSICAL_ADDRESS    EntryPoint;\r
-  VOID                    *BaseOfStack;\r
-  VOID                    *TopOfStack;\r
-  VOID                    *Hob;\r
-  EFI_FV_FILE_INFO        FvFileInfo;\r
+  EFI_STATUS            Status;\r
+  VOID                  *PeCoffImage;\r
+  EFI_PHYSICAL_ADDRESS  ImageAddress;\r
+  UINT64                ImageSize;\r
+  EFI_PHYSICAL_ADDRESS  EntryPoint;\r
+  VOID                  *BaseOfStack;\r
+  VOID                  *TopOfStack;\r
+  VOID                  *Hob;\r
+  EFI_FV_FILE_INFO      FvFileInfo;\r
 \r
   Status = FfsFindSectionData (EFI_SECTION_PE32, FileHandle, &PeCoffImage);\r
-  if (EFI_ERROR  (Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-\r
   Status = LoadPeCoffImage (PeCoffImage, &ImageAddress, &ImageSize, &EntryPoint);\r
-// For NT32 Debug  Status = SecWinNtPeiLoadFile (PeCoffImage, &ImageAddress, &ImageSize, &EntryPoint);\r
+  // For NT32 Debug  Status = SecWinNtPeiLoadFile (PeCoffImage, &ImageAddress, &ImageSize, &EntryPoint);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -152,7 +146,7 @@ LoadDxeCoreFromFfsFile (
   Status = FfsGetFileInfo (FileHandle, &FvFileInfo);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  BuildModuleHob (&FvFileInfo.FileName, (EFI_PHYSICAL_ADDRESS)(UINTN)ImageAddress, EFI_SIZE_TO_PAGES ((UINT32) ImageSize) * EFI_PAGE_SIZE, EntryPoint);\r
+  BuildModuleHob (&FvFileInfo.FileName, (EFI_PHYSICAL_ADDRESS)(UINTN)ImageAddress, EFI_SIZE_TO_PAGES ((UINT32)ImageSize) * EFI_PAGE_SIZE, EntryPoint);\r
 \r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DxeCore at 0x%10p EntryPoint=0x%10p\n", (VOID *)(UINTN)ImageAddress, (VOID *)(UINTN)EntryPoint));\r
 \r
@@ -160,9 +154,8 @@ LoadDxeCoreFromFfsFile (
   if (StackSize == 0) {\r
     // User the current stack\r
 \r
-    ((DXE_CORE_ENTRY_POINT)(UINTN)EntryPoint) (Hob);\r
+    ((DXE_CORE_ENTRY_POINT)(UINTN)EntryPoint)(Hob);\r
   } else {\r
-\r
     //\r
     // Allocate 128KB for the Stack\r
     //\r
@@ -173,13 +166,13 @@ LoadDxeCoreFromFfsFile (
     // Compute the top of the stack we were allocated. Pre-allocate a UINTN\r
     // for safety.\r
     //\r
-    TopOfStack = (VOID *) ((UINTN) BaseOfStack + EFI_SIZE_TO_PAGES (StackSize) * EFI_PAGE_SIZE - CPU_STACK_ALIGNMENT);\r
+    TopOfStack = (VOID *)((UINTN)BaseOfStack + EFI_SIZE_TO_PAGES (StackSize) * EFI_PAGE_SIZE - CPU_STACK_ALIGNMENT);\r
     TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);\r
 \r
     //\r
     // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r
     //\r
-    UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, StackSize);\r
+    UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN)BaseOfStack, StackSize);\r
 \r
     SwitchStack (\r
       (SWITCH_STACK_ENTRY_POINT)(UINTN)EntryPoint,\r
@@ -187,7 +180,6 @@ LoadDxeCoreFromFfsFile (
       NULL,\r
       TopOfStack\r
       );\r
-\r
   }\r
 \r
   // Should never get here as DXE Core does not return\r
@@ -197,8 +189,6 @@ LoadDxeCoreFromFfsFile (
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
-\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 LoadDxeCoreFromFv (\r
@@ -206,9 +196,9 @@ LoadDxeCoreFromFv (
   IN UINTN  StackSize\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PEI_FV_HANDLE   VolumeHandle;\r
-  EFI_PEI_FILE_HANDLE FileHandle = NULL;\r
+  EFI_STATUS           Status;\r
+  EFI_PEI_FV_HANDLE    VolumeHandle;\r
+  EFI_PEI_FILE_HANDLE  FileHandle = NULL;\r
 \r
   if (FvInstance != NULL) {\r
     //\r
@@ -229,16 +219,15 @@ LoadDxeCoreFromFv (
   return Status;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 DecompressFirstFv (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PEI_FV_HANDLE   VolumeHandle;\r
-  EFI_PEI_FILE_HANDLE FileHandle;\r
+  EFI_STATUS           Status;\r
+  EFI_PEI_FV_HANDLE    VolumeHandle;\r
+  EFI_PEI_FILE_HANDLE  FileHandle;\r
 \r
   Status = FfsAnyFvFindFirstFile (EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE, &VolumeHandle, &FileHandle);\r
   if (!EFI_ERROR (Status)) {\r