OvmfPkg: Apply uncrustify changes

[mirror_edk2.git] / OvmfPkg / Fdt / HighMemDxe / HighMemDxe.c

diff --git a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
index e2ae706127f2ab3285e3a447006504e9b73f3815..87bc8b6827a2ef617f61091fff39b2ad2d01dbd0 100644 (file)
--- a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
+++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
@@ -20,40 +20,58 @@
 EFI_STATUS\r
 EFIAPI\r
 InitializeHighMemDxe (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  FDT_CLIENT_PROTOCOL               *FdtClient;\r
-  EFI_CPU_ARCH_PROTOCOL             *Cpu;\r
-  EFI_STATUS                        Status, FindNodeStatus;\r
-  INT32                             Node;\r
-  CONST UINT32                      *Reg;\r
-  UINT32                            RegSize;\r
-  UINTN                             AddressCells, SizeCells;\r
-  UINT64                            CurBase;\r
-  UINT64                            CurSize;\r
-  UINT64                            Attributes;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR   GcdDescriptor;\r
-\r
-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
-                  (VOID **)&FdtClient);\r
+  FDT_CLIENT_PROTOCOL              *FdtClient;\r
+  EFI_CPU_ARCH_PROTOCOL            *Cpu;\r
+  EFI_STATUS                       Status, FindNodeStatus;\r
+  INT32                            Node;\r
+  CONST UINT32                     *Reg;\r
+  UINT32                           RegSize;\r
+  UINTN                            AddressCells, SizeCells;\r
+  UINT64                           CurBase;\r
+  UINT64                           CurSize;\r
+  UINT64                           Attributes;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  GcdDescriptor;\r
+\r
+  Status = gBS->LocateProtocol (\r
+                  &gFdtClientProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&FdtClient\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL,\r
-                  (VOID **)&Cpu);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiCpuArchProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&Cpu\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   // Check for memory node and add the memory spaces except the lowest one\r
   //\r
-  for (FindNodeStatus = FdtClient->FindMemoryNodeReg (FdtClient, &Node,\r
-                                     (CONST VOID **) &Reg, &AddressCells,\r
-                                     &SizeCells, &RegSize);\r
+  for (FindNodeStatus = FdtClient->FindMemoryNodeReg (\r
+                                     FdtClient,\r
+                                     &Node,\r
+                                     (CONST VOID **)&Reg,\r
+                                     &AddressCells,\r
+                                     &SizeCells,\r
+                                     &RegSize\r
+                                     );\r
        !EFI_ERROR (FindNodeStatus);\r
-       FindNodeStatus = FdtClient->FindNextMemoryNodeReg (FdtClient, Node,\r
-                                     &Node, (CONST VOID **) &Reg, &AddressCells,\r
-                                     &SizeCells, &RegSize)) {\r
+       FindNodeStatus = FdtClient->FindNextMemoryNodeReg (\r
+                                     FdtClient,\r
+                                     Node,\r
+                                     &Node,\r
+                                     (CONST VOID **)&Reg,\r
+                                     &AddressCells,\r
+                                     &SizeCells,\r
+                                     &RegSize\r
+                                     ))\r
+  {\r
     ASSERT (AddressCells <= 2);\r
     ASSERT (SizeCells <= 2);\r
 \r
@@ -62,36 +80,60 @@ InitializeHighMemDxe (
       if (AddressCells > 1) {\r
         CurBase = (CurBase << 32) | SwapBytes32 (*Reg++);\r
       }\r
+\r
       CurSize = SwapBytes32 (*Reg++);\r
       if (SizeCells > 1) {\r
         CurSize = (CurSize << 32) | SwapBytes32 (*Reg++);\r
       }\r
+\r
       RegSize -= (AddressCells + SizeCells) * sizeof (UINT32);\r
 \r
       Status = gDS->GetMemorySpaceDescriptor (CurBase, &GcdDescriptor);\r
       if (EFI_ERROR (Status)) {\r
-        DEBUG ((DEBUG_WARN,\r
+        DEBUG ((\r
+          DEBUG_WARN,\r
           "%a: Region 0x%lx - 0x%lx not found in the GCD memory space map\n",\r
-          __FUNCTION__, CurBase, CurBase + CurSize - 1));\r
-          continue;\r
+          __FUNCTION__,\r
+          CurBase,\r
+          CurBase + CurSize - 1\r
+          ));\r
+        continue;\r
       }\r
+\r
       if (GcdDescriptor.GcdMemoryType == EfiGcdMemoryTypeNonExistent) {\r
-        Status = gDS->AddMemorySpace (EfiGcdMemoryTypeSystemMemory, CurBase,\r
-                        CurSize, EFI_MEMORY_WB);\r
+        Status = gDS->AddMemorySpace (\r
+                        EfiGcdMemoryTypeSystemMemory,\r
+                        CurBase,\r
+                        CurSize,\r
+                        EFI_MEMORY_WB\r
+                        );\r
 \r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_ERROR,\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
             "%a: Failed to add System RAM @ 0x%lx - 0x%lx (%r)\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1,\r
+            Status\r
+            ));\r
           continue;\r
         }\r
 \r
-        Status = gDS->SetMemorySpaceAttributes (CurBase, CurSize,\r
-                        EFI_MEMORY_WB);\r
+        Status = gDS->SetMemorySpaceAttributes (\r
+                        CurBase,\r
+                        CurSize,\r
+                        EFI_MEMORY_WB\r
+                        );\r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_WARN,\r
+          DEBUG ((\r
+            DEBUG_WARN,\r
             "%a: gDS->SetMemorySpaceAttributes() failed on region 0x%lx - 0x%lx (%r)\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1,\r
+            Status\r
+            ));\r
         }\r
 \r
         //\r
@@ -107,19 +149,30 @@ InitializeHighMemDxe (
         //\r
         Attributes = EFI_MEMORY_WB;\r
         if ((PcdGet64 (PcdDxeNxMemoryProtectionPolicy) &\r
-             (1U << (UINT32)EfiConventionalMemory)) != 0) {\r
+             (1U << (UINT32)EfiConventionalMemory)) != 0)\r
+        {\r
           Attributes |= EFI_MEMORY_XP;\r
         }\r
 \r
         Status = Cpu->SetMemoryAttributes (Cpu, CurBase, CurSize, Attributes);\r
 \r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_ERROR,\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
             "%a: Failed to set System RAM @ 0x%lx - 0x%lx attribute (%r)\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1,\r
+            Status\r
+            ));\r
         } else {\r
-          DEBUG ((DEBUG_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1));\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "%a: Add System RAM @ 0x%lx - 0x%lx\n",\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1\r
+            ));\r
         }\r
       }\r
     }\r