ArmVirtPkg: Apply uncrustify changes

[mirror_edk2.git] / ArmVirtPkg / Library / PlatformPeiLib / PlatformPeiLib.c

diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
index 6c4028e179955d896f7624b93b1ea7f27266b19e..bb71fee64920005acb78216b514e7cddcc7cda0f 100644 (file)
--- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
+++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
@@ -19,13 +19,13 @@
 #include <Guid/EarlyPL011BaseAddress.h>\r
 #include <Guid/FdtHob.h>\r
 \r
-STATIC CONST EFI_PEI_PPI_DESCRIPTOR mTpm2DiscoveredPpi = {\r
+STATIC CONST EFI_PEI_PPI_DESCRIPTOR  mTpm2DiscoveredPpi = {\r
   EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gOvmfTpmDiscoveredPpiGuid,\r
   NULL\r
 };\r
 \r
-STATIC CONST EFI_PEI_PPI_DESCRIPTOR mTpm2InitializationDonePpi = {\r
+STATIC CONST EFI_PEI_PPI_DESCRIPTOR  mTpm2InitializationDonePpi = {\r
   EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gPeiTpmInitializationDonePpiGuid,\r
   NULL\r
@@ -37,33 +37,33 @@ PlatformPeim (
   VOID\r
   )\r
 {\r
-  VOID               *Base;\r
-  VOID               *NewBase;\r
-  UINTN              FdtSize;\r
-  UINTN              FdtPages;\r
-  UINT64             *FdtHobData;\r
-  UINT64             *UartHobData;\r
-  INT32              Node, Prev;\r
-  INT32              Parent, Depth;\r
-  CONST CHAR8        *Compatible;\r
-  CONST CHAR8        *CompItem;\r
-  CONST CHAR8        *NodeStatus;\r
-  INT32              Len;\r
-  INT32              RangesLen;\r
-  INT32              StatusLen;\r
-  CONST UINT64       *RegProp;\r
-  CONST UINT32       *RangesProp;\r
-  UINT64             UartBase;\r
-  UINT64             TpmBase;\r
-  EFI_STATUS         Status;\r
-\r
-  Base = (VOID*)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress);\r
+  VOID          *Base;\r
+  VOID          *NewBase;\r
+  UINTN         FdtSize;\r
+  UINTN         FdtPages;\r
+  UINT64        *FdtHobData;\r
+  UINT64        *UartHobData;\r
+  INT32         Node, Prev;\r
+  INT32         Parent, Depth;\r
+  CONST CHAR8   *Compatible;\r
+  CONST CHAR8   *CompItem;\r
+  CONST CHAR8   *NodeStatus;\r
+  INT32         Len;\r
+  INT32         RangesLen;\r
+  INT32         StatusLen;\r
+  CONST UINT64  *RegProp;\r
+  CONST UINT32  *RangesProp;\r
+  UINT64        UartBase;\r
+  UINT64        TpmBase;\r
+  EFI_STATUS    Status;\r
+\r
+  Base = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress);\r
   ASSERT (Base != NULL);\r
   ASSERT (fdt_check_header (Base) == 0);\r
 \r
-  FdtSize = fdt_totalsize (Base) + PcdGet32 (PcdDeviceTreeAllocationPadding);\r
+  FdtSize  = fdt_totalsize (Base) + PcdGet32 (PcdDeviceTreeAllocationPadding);\r
   FdtPages = EFI_SIZE_TO_PAGES (FdtSize);\r
-  NewBase = AllocatePages (FdtPages);\r
+  NewBase  = AllocatePages (FdtPages);\r
   ASSERT (NewBase != NULL);\r
   fdt_open_into (Base, NewBase, EFI_PAGES_TO_SIZE (FdtPages));\r
 \r
@@ -82,7 +82,7 @@ PlatformPeim (
   //\r
   Parent = 0;\r
 \r
-  for (Prev = Depth = 0;; Prev = Node) {\r
+  for (Prev = Depth = 0; ; Prev = Node) {\r
     Node = fdt_next_node (Base, Prev, &Depth);\r
     if (Node < 0) {\r
       break;\r
@@ -98,11 +98,11 @@ PlatformPeim (
     // Iterate over the NULL-separated items in the compatible string\r
     //\r
     for (CompItem = Compatible; CompItem != NULL && CompItem < Compatible + Len;\r
-      CompItem += 1 + AsciiStrLen (CompItem)) {\r
-\r
+         CompItem += 1 + AsciiStrLen (CompItem))\r
+    {\r
       if (AsciiStrCmp (CompItem, "arm,pl011") == 0) {\r
         NodeStatus = fdt_getprop (Base, Node, "status", &StatusLen);\r
-        if (NodeStatus != NULL && AsciiStrCmp (NodeStatus, "okay") != 0) {\r
+        if ((NodeStatus != NULL) && (AsciiStrCmp (NodeStatus, "okay") != 0)) {\r
           continue;\r
         }\r
 \r
@@ -111,13 +111,13 @@ PlatformPeim (
 \r
         UartBase = fdt64_to_cpu (ReadUnaligned64 (RegProp));\r
 \r
-        DEBUG ((EFI_D_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase));\r
+        DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase));\r
 \r
         *UartHobData = UartBase;\r
         break;\r
       } else if (FeaturePcdGet (PcdTpm2SupportEnabled) &&\r
-                 AsciiStrCmp (CompItem, "tcg,tpm-tis-mmio") == 0) {\r
-\r
+                 (AsciiStrCmp (CompItem, "tcg,tpm-tis-mmio") == 0))\r
+      {\r
         RegProp = fdt_getprop (Base, Node, "reg", &Len);\r
         ASSERT (Len == 8 || Len == 16);\r
         if (Len == 8) {\r
@@ -145,9 +145,12 @@ PlatformPeim (
             // assume a single translated range with 2 cells for the parent base\r
             //\r
             if (RangesLen != Len + 2 * sizeof (UINT32)) {\r
-              DEBUG ((DEBUG_WARN,\r
+              DEBUG ((\r
+                DEBUG_WARN,\r
                 "%a: 'ranges' property has unexpected size %d\n",\r
-                __FUNCTION__, RangesLen));\r
+                __FUNCTION__,\r
+                RangesLen\r
+                ));\r
               break;\r
             }\r
 \r
@@ -161,9 +164,10 @@ PlatformPeim (
             // advance RangesProp to the parent bus address\r
             //\r
             RangesProp = (UINT32 *)((UINT8 *)RangesProp + Len / 2);\r
-            TpmBase += fdt64_to_cpu (ReadUnaligned64 ((UINT64 *)RangesProp));\r
+            TpmBase   += fdt64_to_cpu (ReadUnaligned64 ((UINT64 *)RangesProp));\r
           }\r
         }\r
+\r
         break;\r
       }\r
     }\r
@@ -180,6 +184,7 @@ PlatformPeim (
     } else {\r
       Status = PeiServicesInstallPpi (&mTpm2InitializationDonePpi);\r
     }\r
+\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r