OvmfPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the OvmfPkg 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: Andrew Fish <afish@apple.com>

4 files changed, 498 insertions, 302 deletions

diff --git a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
index 56d00edb7c..98828e0b26 100644
--- a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
+++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
@@ -27,103 +27,124 @@
 //

 #pragma pack (1)

 typedef struct {

-  UINT32 Type;

-  UINT64 ChildBase;

-  UINT64 CpuBase;

-  UINT64 Size;

+  UINT32    Type;

+  UINT64    ChildBase;

+  UINT64    CpuBase;

+  UINT64    Size;

 } DTB_PCI_HOST_RANGE_RECORD;

 #pragma pack ()

 

-#define DTB_PCI_HOST_RANGE_RELOCATABLE  BIT31

-#define DTB_PCI_HOST_RANGE_PREFETCHABLE BIT30

-#define DTB_PCI_HOST_RANGE_ALIASED      BIT29

-#define DTB_PCI_HOST_RANGE_MMIO32       BIT25

-#define DTB_PCI_HOST_RANGE_MMIO64       (BIT25 | BIT24)

-#define DTB_PCI_HOST_RANGE_IO           BIT24

-#define DTB_PCI_HOST_RANGE_TYPEMASK     (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)

+#define DTB_PCI_HOST_RANGE_RELOCATABLE   BIT31

+#define DTB_PCI_HOST_RANGE_PREFETCHABLE  BIT30

+#define DTB_PCI_HOST_RANGE_ALIASED       BIT29

+#define DTB_PCI_HOST_RANGE_MMIO32        BIT25

+#define DTB_PCI_HOST_RANGE_MMIO64        (BIT25 | BIT24)

+#define DTB_PCI_HOST_RANGE_IO            BIT24

+#define DTB_PCI_HOST_RANGE_TYPEMASK      (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)

 

 STATIC

 EFI_STATUS

 MapGcdMmioSpace (

-  IN    UINT64    Base,

-  IN    UINT64    Size

+  IN    UINT64  Base,

+  IN    UINT64  Size

   )

 {

-  EFI_STATUS    Status;

-

-  Status = gDS->AddMemorySpace (EfiGcdMemoryTypeMemoryMappedIo, Base, Size,

-                  EFI_MEMORY_UC);

+  EFI_STATUS  Status;

+

+  Status = gDS->AddMemorySpace (

+                  EfiGcdMemoryTypeMemoryMappedIo,

+                  Base,

+                  Size,

+                  EFI_MEMORY_UC

+                  );

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR,

+    DEBUG ((

+      DEBUG_ERROR,

       "%a: failed to add GCD memory space for region [0x%Lx+0x%Lx)\n",

-      __FUNCTION__, Base, Size));

+      __FUNCTION__,

+      Base,

+      Size

+      ));

     return Status;

   }

 

   Status = gDS->SetMemorySpaceAttributes (Base, Size, EFI_MEMORY_UC);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR,

+    DEBUG ((

+      DEBUG_ERROR,

       "%a: failed to set memory space attributes for region [0x%Lx+0x%Lx)\n",

-      __FUNCTION__, Base, Size));

+      __FUNCTION__,

+      Base,

+      Size

+      ));

   }

+

   return Status;

 }

 

 STATIC

 EFI_STATUS

 ProcessPciHost (

-  OUT  UINT64    *IoBase,

-  OUT  UINT64    *IoSize,

-  OUT  UINT64    *Mmio32Base,

-  OUT  UINT64    *Mmio32Size,

-  OUT  UINT64    *Mmio64Base,

-  OUT  UINT64    *Mmio64Size,

-  OUT  UINT32    *BusMin,

-  OUT  UINT32    *BusMax

+  OUT  UINT64  *IoBase,

+  OUT  UINT64  *IoSize,

+  OUT  UINT64  *Mmio32Base,

+  OUT  UINT64  *Mmio32Size,

+  OUT  UINT64  *Mmio64Base,

+  OUT  UINT64  *Mmio64Size,

+  OUT  UINT32  *BusMin,

+  OUT  UINT32  *BusMax

   )

 {

-  FDT_CLIENT_PROTOCOL         *FdtClient;

-  INT32                       Node;

-  UINT64                      ConfigBase, ConfigSize;

-  CONST VOID                  *Prop;

-  UINT32                      Len;

-  UINT32                      RecordIdx;

-  EFI_STATUS                  Status;

-  UINT64                      IoTranslation;

-  UINT64                      Mmio32Translation;

-  UINT64                      Mmio64Translation;

+  FDT_CLIENT_PROTOCOL  *FdtClient;

+  INT32                Node;

+  UINT64               ConfigBase, ConfigSize;

+  CONST VOID           *Prop;

+  UINT32               Len;

+  UINT32               RecordIdx;

+  EFI_STATUS           Status;

+  UINT64               IoTranslation;

+  UINT64               Mmio32Translation;

+  UINT64               Mmio64Translation;

 

   //

   // The following output arguments are initialized only in

   // order to suppress '-Werror=maybe-uninitialized' warnings

   // *incorrectly* emitted by some gcc versions.

   //

-  *IoBase = 0;

+  *IoBase     = 0;

   *Mmio32Base = 0;

   *Mmio64Base = MAX_UINT64;

-  *BusMin = 0;

-  *BusMax = 0;

+  *BusMin     = 0;

+  *BusMax     = 0;

 

   //

   // *IoSize, *Mmio##Size and IoTranslation are initialized to zero because the

   // logic below requires it. However, since they are also affected by the issue

   // reported above, they are initialized early.

   //

-  *IoSize = 0;

-  *Mmio32Size = 0;

-  *Mmio64Size = 0;

+  *IoSize       = 0;

+  *Mmio32Size   = 0;

+  *Mmio64Size   = 0;

   IoTranslation = 0;

 

-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,

-                  (VOID **)&FdtClient);

+  Status = gBS->LocateProtocol (

+                  &gFdtClientProtocolGuid,

+                  NULL,

+                  (VOID **)&FdtClient

+                  );

   ASSERT_EFI_ERROR (Status);

 

-  Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic",

-                        &Node);

+  Status = FdtClient->FindCompatibleNode (

+                        FdtClient,

+                        "pci-host-ecam-generic",

+                        &Node

+                        );

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_INFO,

+    DEBUG ((

+      DEBUG_INFO,

       "%a: No 'pci-host-ecam-generic' compatible DT node found\n",

-      __FUNCTION__));

+      __FUNCTION__

+      ));

     return EFI_NOT_FOUND;

   }

 

@@ -134,15 +155,22 @@ ProcessPciHost (
     // A DT can legally describe multiple PCI host bridges, but we are not

     // equipped to deal with that. So assert that there is only one.

     //

-    Status = FdtClient->FindNextCompatibleNode (FdtClient,

-                          "pci-host-ecam-generic", Node, &Tmp);

+    Status = FdtClient->FindNextCompatibleNode (

+                          FdtClient,

+                          "pci-host-ecam-generic",

+                          Node,

+                          &Tmp

+                          );

     ASSERT (Status == EFI_NOT_FOUND);

-  );

+    );

 

   Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", &Prop, &Len);

-  if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT64)) {

-    DEBUG ((DEBUG_ERROR, "%a: 'reg' property not found or invalid\n",

-      __FUNCTION__));

+  if (EFI_ERROR (Status) || (Len != 2 * sizeof (UINT64))) {

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: 'reg' property not found or invalid\n",

+      __FUNCTION__

+      ));

     return EFI_PROTOCOL_ERROR;

   }

 

@@ -155,13 +183,22 @@ ProcessPciHost (
   //

   // Fetch the bus range (note: inclusive).

   //

-  Status = FdtClient->GetNodeProperty (FdtClient, Node, "bus-range", &Prop,

-                        &Len);

-  if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT32)) {

-    DEBUG ((DEBUG_ERROR, "%a: 'bus-range' not found or invalid\n",

-      __FUNCTION__));

+  Status = FdtClient->GetNodeProperty (

+                        FdtClient,

+                        Node,

+                        "bus-range",

+                        &Prop,

+                        &Len

+                        );

+  if (EFI_ERROR (Status) || (Len != 2 * sizeof (UINT32))) {

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: 'bus-range' not found or invalid\n",

+      __FUNCTION__

+      ));

     return EFI_PROTOCOL_ERROR;

   }

+

   *BusMin = SwapBytes32 (((CONST UINT32 *)Prop)[0]);

   *BusMax = SwapBytes32 (((CONST UINT32 *)Prop)[1]);

 

@@ -169,10 +206,14 @@ ProcessPciHost (
   // Sanity check: the config space must accommodate all 4K register bytes of

   // all 8 functions of all 32 devices of all buses.

   //

-  if (*BusMax < *BusMin || *BusMax - *BusMin == MAX_UINT32 ||

-      DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1) {

-    DEBUG ((DEBUG_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n",

-      __FUNCTION__));

+  if ((*BusMax < *BusMin) || (*BusMax - *BusMin == MAX_UINT32) ||

+      (DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1))

+  {

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: invalid 'bus-range' and/or 'reg'\n",

+      __FUNCTION__

+      ));

     return EFI_PROTOCOL_ERROR;

   }

 

@@ -180,66 +221,84 @@ ProcessPciHost (
   // Iterate over "ranges".

   //

   Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);

-  if (EFI_ERROR (Status) || Len == 0 ||

-      Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {

+  if (EFI_ERROR (Status) || (Len == 0) ||

+      (Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0))

+  {

     DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));

     return EFI_PROTOCOL_ERROR;

   }

 

   for (RecordIdx = 0; RecordIdx < Len / sizeof (DTB_PCI_HOST_RANGE_RECORD);

-       ++RecordIdx) {

-    CONST DTB_PCI_HOST_RANGE_RECORD *Record;

+       ++RecordIdx)

+  {

+    CONST DTB_PCI_HOST_RANGE_RECORD  *Record;

 

     Record = (CONST DTB_PCI_HOST_RANGE_RECORD *)Prop + RecordIdx;

     switch (SwapBytes32 (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK) {

-    case DTB_PCI_HOST_RANGE_IO:

-      *IoBase = SwapBytes64 (Record->ChildBase);

-      *IoSize = SwapBytes64 (Record->Size);

-      IoTranslation = SwapBytes64 (Record->CpuBase) - *IoBase;

-

-      ASSERT (PcdGet64 (PcdPciIoTranslation) == IoTranslation);

-      break;

-

-    case DTB_PCI_HOST_RANGE_MMIO32:

-      *Mmio32Base = SwapBytes64 (Record->ChildBase);

-      *Mmio32Size = SwapBytes64 (Record->Size);

-      Mmio32Translation = SwapBytes64 (Record->CpuBase) - *Mmio32Base;

-

-      if (*Mmio32Base > MAX_UINT32 || *Mmio32Size > MAX_UINT32 ||

-          *Mmio32Base + *Mmio32Size > SIZE_4GB) {

-        DEBUG ((DEBUG_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));

-        return EFI_PROTOCOL_ERROR;

-      }

-

-      ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation);

-

-      if (Mmio32Translation != 0) {

-        DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO32 translation "

-          "0x%Lx\n", __FUNCTION__, Mmio32Translation));

-        return EFI_UNSUPPORTED;

-      }

-

-      break;

-

-    case DTB_PCI_HOST_RANGE_MMIO64:

-      *Mmio64Base = SwapBytes64 (Record->ChildBase);

-      *Mmio64Size = SwapBytes64 (Record->Size);

-      Mmio64Translation = SwapBytes64 (Record->CpuBase) - *Mmio64Base;

-

-      ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation);

-

-      if (Mmio64Translation != 0) {

-        DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO64 translation "

-          "0x%Lx\n", __FUNCTION__, Mmio64Translation));

-        return EFI_UNSUPPORTED;

-      }

-

-      break;

+      case DTB_PCI_HOST_RANGE_IO:

+        *IoBase       = SwapBytes64 (Record->ChildBase);

+        *IoSize       = SwapBytes64 (Record->Size);

+        IoTranslation = SwapBytes64 (Record->CpuBase) - *IoBase;

+

+        ASSERT (PcdGet64 (PcdPciIoTranslation) == IoTranslation);

+        break;

+

+      case DTB_PCI_HOST_RANGE_MMIO32:

+        *Mmio32Base       = SwapBytes64 (Record->ChildBase);

+        *Mmio32Size       = SwapBytes64 (Record->Size);

+        Mmio32Translation = SwapBytes64 (Record->CpuBase) - *Mmio32Base;

+

+        if ((*Mmio32Base > MAX_UINT32) || (*Mmio32Size > MAX_UINT32) ||

+            (*Mmio32Base + *Mmio32Size > SIZE_4GB))

+        {

+          DEBUG ((DEBUG_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));

+          return EFI_PROTOCOL_ERROR;

+        }

+

+        ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation);

+

+        if (Mmio32Translation != 0) {

+          DEBUG ((

+            DEBUG_ERROR,

+            "%a: unsupported nonzero MMIO32 translation "

+            "0x%Lx\n",

+            __FUNCTION__,

+            Mmio32Translation

+            ));

+          return EFI_UNSUPPORTED;

+        }

+

+        break;

+

+      case DTB_PCI_HOST_RANGE_MMIO64:

+        *Mmio64Base       = SwapBytes64 (Record->ChildBase);

+        *Mmio64Size       = SwapBytes64 (Record->Size);

+        Mmio64Translation = SwapBytes64 (Record->CpuBase) - *Mmio64Base;

+

+        ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation);

+

+        if (Mmio64Translation != 0) {

+          DEBUG ((

+            DEBUG_ERROR,

+            "%a: unsupported nonzero MMIO64 translation "

+            "0x%Lx\n",

+            __FUNCTION__,

+            Mmio64Translation

+            ));

+          return EFI_UNSUPPORTED;

+        }

+

+        break;

     }

   }

-  if (*IoSize == 0 || *Mmio32Size == 0) {

-    DEBUG ((DEBUG_ERROR, "%a: %a space empty\n", __FUNCTION__,

-      (*IoSize == 0) ? "IO" : "MMIO32"));

+

+  if ((*IoSize == 0) || (*Mmio32Size == 0)) {

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: %a space empty\n",

+      __FUNCTION__,

+      (*IoSize == 0) ? "IO" : "MMIO32"

+      ));

     return EFI_PROTOCOL_ERROR;

   }

 

@@ -249,10 +308,23 @@ ProcessPciHost (
   //

   ASSERT (PcdGet64 (PcdPciExpressBaseAddress) == ConfigBase);

 

-  DEBUG ((DEBUG_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "

+  DEBUG ((

+    DEBUG_INFO,

+    "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "

     "Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n",

-    __FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize,

-    IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size));

+    __FUNCTION__,

+    ConfigBase,

+    ConfigSize,

+    *BusMin,

+    *BusMax,

+    *IoBase,

+    *IoSize,

+    IoTranslation,

+    *Mmio32Base,

+    *Mmio32Size,

+    *Mmio64Base,

+    *Mmio64Size

+    ));

 

   // Map the ECAM space in the GCD memory map

   Status = MapGcdMmioSpace (ConfigBase, ConfigSize);

@@ -284,21 +356,21 @@ ProcessPciHost (
 PCI_ROOT_BRIDGE *

 EFIAPI

 PciHostBridgeGetRootBridges (

-  UINTN *Count

+  UINTN  *Count

   )

 {

-  UINT64                   IoBase, IoSize;

-  UINT64                   Mmio32Base, Mmio32Size;

-  UINT64                   Mmio64Base, Mmio64Size;

-  UINT32                   BusMin, BusMax;

-  EFI_STATUS               Status;

-  UINT64                   Attributes;

-  UINT64                   AllocationAttributes;

-  PCI_ROOT_BRIDGE_APERTURE Io;

-  PCI_ROOT_BRIDGE_APERTURE Mem;

-  PCI_ROOT_BRIDGE_APERTURE MemAbove4G;

-  PCI_ROOT_BRIDGE_APERTURE PMem;

-  PCI_ROOT_BRIDGE_APERTURE PMemAbove4G;

+  UINT64                    IoBase, IoSize;

+  UINT64                    Mmio32Base, Mmio32Size;

+  UINT64                    Mmio64Base, Mmio64Size;

+  UINT32                    BusMin, BusMax;

+  EFI_STATUS                Status;

+  UINT64                    Attributes;

+  UINT64                    AllocationAttributes;

+  PCI_ROOT_BRIDGE_APERTURE  Io;

+  PCI_ROOT_BRIDGE_APERTURE  Mem;

+  PCI_ROOT_BRIDGE_APERTURE  MemAbove4G;

+  PCI_ROOT_BRIDGE_APERTURE  PMem;

+  PCI_ROOT_BRIDGE_APERTURE  PMemAbove4G;

 

   if (PcdGet64 (PcdPciExpressBaseAddress) == 0) {

     DEBUG ((DEBUG_INFO, "%a: PCI host bridge not present\n", __FUNCTION__));

@@ -307,11 +379,23 @@ PciHostBridgeGetRootBridges (
     return NULL;

   }

 

-  Status = ProcessPciHost (&IoBase, &IoSize, &Mmio32Base, &Mmio32Size,

-             &Mmio64Base, &Mmio64Size, &BusMin, &BusMax);

+  Status = ProcessPciHost (

+             &IoBase,

+             &IoSize,

+             &Mmio32Base,

+             &Mmio32Size,

+             &Mmio64Base,

+             &Mmio64Size,

+             &BusMin,

+             &BusMax

+             );

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: failed to discover PCI host bridge: %r\n",

-      __FUNCTION__, Status));

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: failed to discover PCI host bridge: %r\n",

+      __FUNCTION__,

+      Status

+      ));

     *Count = 0;

     return NULL;

   }

@@ -322,21 +406,21 @@ PciHostBridgeGetRootBridges (
   ZeroMem (&PMem, sizeof (PMem));

   ZeroMem (&PMemAbove4G, sizeof (PMemAbove4G));

 

-  Attributes           = EFI_PCI_ATTRIBUTE_ISA_IO_16 |

-                         EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |

-                         EFI_PCI_ATTRIBUTE_VGA_IO_16  |

-                         EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;

+  Attributes = EFI_PCI_ATTRIBUTE_ISA_IO_16 |

+               EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |

+               EFI_PCI_ATTRIBUTE_VGA_IO_16  |

+               EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;

 

   AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;

 

-  Io.Base              = IoBase;

-  Io.Limit             = IoBase + IoSize - 1;

-  Mem.Base             = Mmio32Base;

-  Mem.Limit            = Mmio32Base + Mmio32Size - 1;

+  Io.Base   = IoBase;

+  Io.Limit  = IoBase + IoSize - 1;

+  Mem.Base  = Mmio32Base;

+  Mem.Limit = Mmio32Base + Mmio32Size - 1;

 

   if (sizeof (UINTN) == sizeof (UINT64)) {

-    MemAbove4G.Base    = Mmio64Base;

-    MemAbove4G.Limit   = Mmio64Base + Mmio64Size - 1;

+    MemAbove4G.Base  = Mmio64Base;

+    MemAbove4G.Limit = Mmio64Base + Mmio64Size - 1;

     if (Mmio64Size > 0) {

       AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;

     }

@@ -347,32 +431,32 @@ PciHostBridgeGetRootBridges (
     // BARs unless they are allocated below 4 GB. So ignore the range above

     // 4 GB in this case.

     //

-    MemAbove4G.Base    = MAX_UINT64;

-    MemAbove4G.Limit   = 0;

+    MemAbove4G.Base  = MAX_UINT64;

+    MemAbove4G.Limit = 0;

   }

 

   //

   // No separate ranges for prefetchable and non-prefetchable BARs

   //

-  PMem.Base            = MAX_UINT64;

-  PMem.Limit           = 0;

-  PMemAbove4G.Base     = MAX_UINT64;

-  PMemAbove4G.Limit    = 0;

+  PMem.Base         = MAX_UINT64;

+  PMem.Limit        = 0;

+  PMemAbove4G.Base  = MAX_UINT64;

+  PMemAbove4G.Limit = 0;

 

   return PciHostBridgeUtilityGetRootBridges (

-    Count,

-    Attributes,

-    AllocationAttributes,

-    TRUE,

-    FALSE,

-    BusMin,

-    BusMax,

-    &Io,

-    &Mem,

-    &MemAbove4G,

-    &PMem,

-    &PMemAbove4G

-    );

+           Count,

+           Attributes,

+           AllocationAttributes,

+           TRUE,

+           FALSE,

+           BusMin,

+           BusMax,

+           &Io,

+           &Mem,

+           &MemAbove4G,

+           &PMem,

+           &PMemAbove4G

+           );

 }

 

 /**

@@ -385,8 +469,8 @@ PciHostBridgeGetRootBridges (
 VOID

 EFIAPI

 PciHostBridgeFreeRootBridges (

-  PCI_ROOT_BRIDGE *Bridges,

-  UINTN           Count

+  PCI_ROOT_BRIDGE  *Bridges,

+  UINTN            Count

   )

 {

   PciHostBridgeUtilityFreeRootBridges (Bridges, Count);

@@ -409,8 +493,8 @@ PciHostBridgeFreeRootBridges (
 VOID

 EFIAPI

 PciHostBridgeResourceConflict (

-  EFI_HANDLE                        HostBridgeHandle,

-  VOID                              *Configuration

+  EFI_HANDLE  HostBridgeHandle,

+  VOID        *Configuration

   )

 {

   PciHostBridgeUtilityResourceConflict (Configuration);

diff --git a/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
index 8dd8fc9b3d..b5a6718146 100644
--- a/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
+++ b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
@@ -22,59 +22,62 @@
 //

 #pragma pack (1)

 typedef struct {

-  UINT32 Type;

-  UINT64 ChildBase;

-  UINT64 CpuBase;

-  UINT64 Size;

+  UINT32    Type;

+  UINT64    ChildBase;

+  UINT64    CpuBase;

+  UINT64    Size;

 } DTB_PCI_HOST_RANGE_RECORD;

 #pragma pack ()

 

-#define DTB_PCI_HOST_RANGE_RELOCATABLE  BIT31

-#define DTB_PCI_HOST_RANGE_PREFETCHABLE BIT30

-#define DTB_PCI_HOST_RANGE_ALIASED      BIT29

-#define DTB_PCI_HOST_RANGE_MMIO32       BIT25

-#define DTB_PCI_HOST_RANGE_MMIO64       (BIT25 | BIT24)

-#define DTB_PCI_HOST_RANGE_IO           BIT24

-#define DTB_PCI_HOST_RANGE_TYPEMASK     (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)

+#define DTB_PCI_HOST_RANGE_RELOCATABLE   BIT31

+#define DTB_PCI_HOST_RANGE_PREFETCHABLE  BIT30

+#define DTB_PCI_HOST_RANGE_ALIASED       BIT29

+#define DTB_PCI_HOST_RANGE_MMIO32        BIT25

+#define DTB_PCI_HOST_RANGE_MMIO64        (BIT25 | BIT24)

+#define DTB_PCI_HOST_RANGE_IO            BIT24

+#define DTB_PCI_HOST_RANGE_TYPEMASK      (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)

 

 STATIC

 RETURN_STATUS

 GetPciIoTranslation (

-  IN  FDT_CLIENT_PROTOCOL *FdtClient,

-  IN  INT32               Node,

-  OUT UINT64              *IoTranslation

+  IN  FDT_CLIENT_PROTOCOL  *FdtClient,

+  IN  INT32                Node,

+  OUT UINT64               *IoTranslation

   )

 {

-  UINT32        RecordIdx;

-  CONST VOID    *Prop;

-  UINT32        Len;

-  EFI_STATUS    Status;

-  UINT64        IoBase;

+  UINT32      RecordIdx;

+  CONST VOID  *Prop;

+  UINT32      Len;

+  EFI_STATUS  Status;

+  UINT64      IoBase;

 

   //

   // Iterate over "ranges".

   //

   Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);

-  if (EFI_ERROR (Status) || Len == 0 ||

-      Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {

+  if (EFI_ERROR (Status) || (Len == 0) ||

+      (Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0))

+  {

     DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));

     return RETURN_PROTOCOL_ERROR;

   }

 

   for (RecordIdx = 0; RecordIdx < Len / sizeof (DTB_PCI_HOST_RANGE_RECORD);

-       ++RecordIdx) {

-    CONST DTB_PCI_HOST_RANGE_RECORD *Record;

-    UINT32                          Type;

+       ++RecordIdx)

+  {

+    CONST DTB_PCI_HOST_RANGE_RECORD  *Record;

+    UINT32                           Type;

 

     Record = (CONST DTB_PCI_HOST_RANGE_RECORD *)Prop + RecordIdx;

-    Type = SwapBytes32 (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK;

+    Type   = SwapBytes32 (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK;

     if (Type == DTB_PCI_HOST_RANGE_IO) {

-      IoBase = SwapBytes64 (Record->ChildBase);

+      IoBase         = SwapBytes64 (Record->ChildBase);

       *IoTranslation = SwapBytes64 (Record->CpuBase) - IoBase;

 

       return RETURN_SUCCESS;

     }

   }

+

   return RETURN_NOT_FOUND;

 }

 

@@ -84,15 +87,15 @@ FdtPciPcdProducerLibConstructor (
   VOID

   )

 {

-  UINT64              PciExpressBaseAddress;

-  FDT_CLIENT_PROTOCOL *FdtClient;

-  CONST UINT64        *Reg;

-  UINT32              RegSize;

-  EFI_STATUS          Status;

-  INT32               Node;

-  RETURN_STATUS       RetStatus;

-  UINT64              IoTranslation;

-  RETURN_STATUS       PcdStatus;

+  UINT64               PciExpressBaseAddress;

+  FDT_CLIENT_PROTOCOL  *FdtClient;

+  CONST UINT64         *Reg;

+  UINT32               RegSize;

+  EFI_STATUS           Status;

+  INT32                Node;

+  RETURN_STATUS        RetStatus;

+  UINT64               IoTranslation;

+  RETURN_STATUS        PcdStatus;

 

   PciExpressBaseAddress = PcdGet64 (PcdPciExpressBaseAddress);

   if (PciExpressBaseAddress != MAX_UINT64) {

@@ -106,38 +109,51 @@ FdtPciPcdProducerLibConstructor (
     return EFI_SUCCESS;

   }

 

-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,

-                  (VOID **)&FdtClient);

+  Status = gBS->LocateProtocol (

+                  &gFdtClientProtocolGuid,

+                  NULL,

+                  (VOID **)&FdtClient

+                  );

   ASSERT_EFI_ERROR (Status);

 

   PciExpressBaseAddress = 0;

-  Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic",

-                        &Node);

+  Status                = FdtClient->FindCompatibleNode (

+                                       FdtClient,

+                                       "pci-host-ecam-generic",

+                                       &Node

+                                       );

 

   if (!EFI_ERROR (Status)) {

-    Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg",

-                          (CONST VOID **)&Reg, &RegSize);

-

-    if (!EFI_ERROR (Status) && RegSize == 2 * sizeof (UINT64)) {

+    Status = FdtClient->GetNodeProperty (

+                          FdtClient,

+                          Node,

+                          "reg",

+                          (CONST VOID **)&Reg,

+                          &RegSize

+                          );

+

+    if (!EFI_ERROR (Status) && (RegSize == 2 * sizeof (UINT64))) {

       PciExpressBaseAddress = SwapBytes64 (*Reg);

 

       PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, FALSE);

       ASSERT_RETURN_ERROR (PcdStatus);

 

       IoTranslation = 0;

-      RetStatus = GetPciIoTranslation (FdtClient, Node, &IoTranslation);

+      RetStatus     = GetPciIoTranslation (FdtClient, Node, &IoTranslation);

       if (!RETURN_ERROR (RetStatus)) {

-          PcdStatus = PcdSet64S (PcdPciIoTranslation, IoTranslation);

-          ASSERT_RETURN_ERROR (PcdStatus);

+        PcdStatus = PcdSet64S (PcdPciIoTranslation, IoTranslation);

+        ASSERT_RETURN_ERROR (PcdStatus);

       } else {

         //

         // Support for I/O BARs is not mandatory, and so it does not make sense

         // to abort in the general case. So leave it up to the actual driver to

         // complain about this if it wants to, and just issue a warning here.

         //

-        DEBUG ((DEBUG_WARN,

+        DEBUG ((

+          DEBUG_WARN,

           "%a: 'pci-host-ecam-generic' device encountered with no I/O range\n",

-          __FUNCTION__));

+          __FUNCTION__

+          ));

       }

     }

   }

diff --git a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
index e2ae706127..87bc8b6827 100644
--- a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
+++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
@@ -20,40 +20,58 @@
 EFI_STATUS

 EFIAPI

 InitializeHighMemDxe (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  FDT_CLIENT_PROTOCOL               *FdtClient;

-  EFI_CPU_ARCH_PROTOCOL             *Cpu;

-  EFI_STATUS                        Status, FindNodeStatus;

-  INT32                             Node;

-  CONST UINT32                      *Reg;

-  UINT32                            RegSize;

-  UINTN                             AddressCells, SizeCells;

-  UINT64                            CurBase;

-  UINT64                            CurSize;

-  UINT64                            Attributes;

-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR   GcdDescriptor;

-

-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,

-                  (VOID **)&FdtClient);

+  FDT_CLIENT_PROTOCOL              *FdtClient;

+  EFI_CPU_ARCH_PROTOCOL            *Cpu;

+  EFI_STATUS                       Status, FindNodeStatus;

+  INT32                            Node;

+  CONST UINT32                     *Reg;

+  UINT32                           RegSize;

+  UINTN                            AddressCells, SizeCells;

+  UINT64                           CurBase;

+  UINT64                           CurSize;

+  UINT64                           Attributes;

+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  GcdDescriptor;

+

+  Status = gBS->LocateProtocol (

+                  &gFdtClientProtocolGuid,

+                  NULL,

+                  (VOID **)&FdtClient

+                  );

   ASSERT_EFI_ERROR (Status);

 

-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL,

-                  (VOID **)&Cpu);

+  Status = gBS->LocateProtocol (

+                  &gEfiCpuArchProtocolGuid,

+                  NULL,

+                  (VOID **)&Cpu

+                  );

   ASSERT_EFI_ERROR (Status);

 

   //

   // Check for memory node and add the memory spaces except the lowest one

   //

-  for (FindNodeStatus = FdtClient->FindMemoryNodeReg (FdtClient, &Node,

-                                     (CONST VOID **) &Reg, &AddressCells,

-                                     &SizeCells, &RegSize);

+  for (FindNodeStatus = FdtClient->FindMemoryNodeReg (

+                                     FdtClient,

+                                     &Node,

+                                     (CONST VOID **)&Reg,

+                                     &AddressCells,

+                                     &SizeCells,

+                                     &RegSize

+                                     );

        !EFI_ERROR (FindNodeStatus);

-       FindNodeStatus = FdtClient->FindNextMemoryNodeReg (FdtClient, Node,

-                                     &Node, (CONST VOID **) &Reg, &AddressCells,

-                                     &SizeCells, &RegSize)) {

+       FindNodeStatus = FdtClient->FindNextMemoryNodeReg (

+                                     FdtClient,

+                                     Node,

+                                     &Node,

+                                     (CONST VOID **)&Reg,

+                                     &AddressCells,

+                                     &SizeCells,

+                                     &RegSize

+                                     ))

+  {

     ASSERT (AddressCells <= 2);

     ASSERT (SizeCells <= 2);

 

@@ -62,36 +80,60 @@ InitializeHighMemDxe (
       if (AddressCells > 1) {

         CurBase = (CurBase << 32) | SwapBytes32 (*Reg++);

       }

+

       CurSize = SwapBytes32 (*Reg++);

       if (SizeCells > 1) {

         CurSize = (CurSize << 32) | SwapBytes32 (*Reg++);

       }

+

       RegSize -= (AddressCells + SizeCells) * sizeof (UINT32);

 

       Status = gDS->GetMemorySpaceDescriptor (CurBase, &GcdDescriptor);

       if (EFI_ERROR (Status)) {

-        DEBUG ((DEBUG_WARN,

+        DEBUG ((

+          DEBUG_WARN,

           "%a: Region 0x%lx - 0x%lx not found in the GCD memory space map\n",

-          __FUNCTION__, CurBase, CurBase + CurSize - 1));

-          continue;

+          __FUNCTION__,

+          CurBase,

+          CurBase + CurSize - 1

+          ));

+        continue;

       }

+

       if (GcdDescriptor.GcdMemoryType == EfiGcdMemoryTypeNonExistent) {

-        Status = gDS->AddMemorySpace (EfiGcdMemoryTypeSystemMemory, CurBase,

-                        CurSize, EFI_MEMORY_WB);

+        Status = gDS->AddMemorySpace (

+                        EfiGcdMemoryTypeSystemMemory,

+                        CurBase,

+                        CurSize,

+                        EFI_MEMORY_WB

+                        );

 

         if (EFI_ERROR (Status)) {

-          DEBUG ((DEBUG_ERROR,

+          DEBUG ((

+            DEBUG_ERROR,

             "%a: Failed to add System RAM @ 0x%lx - 0x%lx (%r)\n",

-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));

+            __FUNCTION__,

+            CurBase,

+            CurBase + CurSize - 1,

+            Status

+            ));

           continue;

         }

 

-        Status = gDS->SetMemorySpaceAttributes (CurBase, CurSize,

-                        EFI_MEMORY_WB);

+        Status = gDS->SetMemorySpaceAttributes (

+                        CurBase,

+                        CurSize,

+                        EFI_MEMORY_WB

+                        );

         if (EFI_ERROR (Status)) {

-          DEBUG ((DEBUG_WARN,

+          DEBUG ((

+            DEBUG_WARN,

             "%a: gDS->SetMemorySpaceAttributes() failed on region 0x%lx - 0x%lx (%r)\n",

-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));

+            __FUNCTION__,

+            CurBase,

+            CurBase + CurSize - 1,

+            Status

+            ));

         }

 

         //

@@ -107,19 +149,30 @@ InitializeHighMemDxe (
         //

         Attributes = EFI_MEMORY_WB;

         if ((PcdGet64 (PcdDxeNxMemoryProtectionPolicy) &

-             (1U << (UINT32)EfiConventionalMemory)) != 0) {

+             (1U << (UINT32)EfiConventionalMemory)) != 0)

+        {

           Attributes |= EFI_MEMORY_XP;

         }

 

         Status = Cpu->SetMemoryAttributes (Cpu, CurBase, CurSize, Attributes);

 

         if (EFI_ERROR (Status)) {

-          DEBUG ((DEBUG_ERROR,

+          DEBUG ((

+            DEBUG_ERROR,

             "%a: Failed to set System RAM @ 0x%lx - 0x%lx attribute (%r)\n",

-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));

+            __FUNCTION__,

+            CurBase,

+            CurBase + CurSize - 1,

+            Status

+            ));

         } else {

-          DEBUG ((DEBUG_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n",

-            __FUNCTION__, CurBase, CurBase + CurSize - 1));

+          DEBUG ((

+            DEBUG_INFO,

+            "%a: Add System RAM @ 0x%lx - 0x%lx\n",

+            __FUNCTION__,

+            CurBase,

+            CurBase + CurSize - 1

+            ));

         }

       }

     }

diff --git a/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
index fdef5f166a..619740e6e7 100644
--- a/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
+++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
@@ -22,43 +22,62 @@
 

 #pragma pack (1)

 typedef struct {

-  VENDOR_DEVICE_PATH                  Vendor;

-  UINT64                              PhysBase;

-  EFI_DEVICE_PATH_PROTOCOL            End;

+  VENDOR_DEVICE_PATH          Vendor;

+  UINT64                      PhysBase;

+  EFI_DEVICE_PATH_PROTOCOL    End;

 } VIRTIO_TRANSPORT_DEVICE_PATH;

 #pragma pack ()

 

 EFI_STATUS

 EFIAPI

 InitializeVirtioFdtDxe (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                     Status, FindNodeStatus;

-  FDT_CLIENT_PROTOCOL            *FdtClient;

-  INT32                          Node;

-  CONST UINT64                   *Reg;

-  UINT32                         RegSize;

-  VIRTIO_TRANSPORT_DEVICE_PATH   *DevicePath;

-  EFI_HANDLE                     Handle;

-  UINT64                         RegBase;

-

-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,

-                  (VOID **)&FdtClient);

+  EFI_STATUS                    Status, FindNodeStatus;

+  FDT_CLIENT_PROTOCOL           *FdtClient;

+  INT32                         Node;

+  CONST UINT64                  *Reg;

+  UINT32                        RegSize;

+  VIRTIO_TRANSPORT_DEVICE_PATH  *DevicePath;

+  EFI_HANDLE                    Handle;

+  UINT64                        RegBase;

+

+  Status = gBS->LocateProtocol (

+                  &gFdtClientProtocolGuid,

+                  NULL,

+                  (VOID **)&FdtClient

+                  );

   ASSERT_EFI_ERROR (Status);

 

-  for (FindNodeStatus = FdtClient->FindCompatibleNode (FdtClient,

-                                     "virtio,mmio", &Node);

+  for (FindNodeStatus = FdtClient->FindCompatibleNode (

+                                     FdtClient,

+                                     "virtio,mmio",

+                                     &Node

+                                     );

        !EFI_ERROR (FindNodeStatus);

-       FindNodeStatus = FdtClient->FindNextCompatibleNode (FdtClient,

-                                     "virtio,mmio", Node, &Node)) {

-

-    Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg",

-                          (CONST VOID **)&Reg, &RegSize);

+       FindNodeStatus = FdtClient->FindNextCompatibleNode (

+                                     FdtClient,

+                                     "virtio,mmio",

+                                     Node,

+                                     &Node

+                                     ))

+  {

+    Status = FdtClient->GetNodeProperty (

+                          FdtClient,

+                          Node,

+                          "reg",

+                          (CONST VOID **)&Reg,

+                          &RegSize

+                          );

     if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n",

-        __FUNCTION__, Status));

+      DEBUG ((

+        DEBUG_ERROR,

+        "%a: GetNodeProperty () failed (Status == %r)\n",

+        __FUNCTION__,

+        Status

+        ));

       continue;

     }

 

@@ -67,11 +86,12 @@ InitializeVirtioFdtDxe (
     //

     // Create a unique device path for this transport on the fly

     //

-    RegBase = SwapBytes64 (*Reg);

+    RegBase    = SwapBytes64 (*Reg);

     DevicePath = (VIRTIO_TRANSPORT_DEVICE_PATH *)CreateDeviceNode (

-                                  HARDWARE_DEVICE_PATH,

-                                  HW_VENDOR_DP,

-                                  sizeof (VIRTIO_TRANSPORT_DEVICE_PATH));

+                                                   HARDWARE_DEVICE_PATH,

+                                                   HW_VENDOR_DP,

+                                                   sizeof (VIRTIO_TRANSPORT_DEVICE_PATH)

+                                                   );

     if (DevicePath == NULL) {

       DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));

       continue;

@@ -79,39 +99,62 @@ InitializeVirtioFdtDxe (
 

     CopyGuid (&DevicePath->Vendor.Guid, &gVirtioMmioTransportGuid);

     DevicePath->PhysBase = RegBase;

-    SetDevicePathNodeLength (&DevicePath->Vendor,

-      sizeof (*DevicePath) - sizeof (DevicePath->End));

+    SetDevicePathNodeLength (

+      &DevicePath->Vendor,

+      sizeof (*DevicePath) - sizeof (DevicePath->End)

+      );

     SetDevicePathEndNode (&DevicePath->End);

 

     Handle = NULL;

-    Status = gBS->InstallProtocolInterface (&Handle,

-                     &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE,

-                     DevicePath);

+    Status = gBS->InstallProtocolInterface (

+                    &Handle,

+                    &gEfiDevicePathProtocolGuid,

+                    EFI_NATIVE_INTERFACE,

+                    DevicePath

+                    );

     if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "%a: Failed to install the EFI_DEVICE_PATH "

+      DEBUG ((

+        DEBUG_ERROR,

+        "%a: Failed to install the EFI_DEVICE_PATH "

         "protocol on a new handle (Status == %r)\n",

-        __FUNCTION__, Status));

+        __FUNCTION__,

+        Status

+        ));

       FreePool (DevicePath);

       continue;

     }

 

     Status = VirtioMmioInstallDevice (RegBase, Handle);

     if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx "

-        "on handle %p (Status == %r)\n", __FUNCTION__, RegBase,

-        Handle, Status));

-

-      Status = gBS->UninstallProtocolInterface (Handle,

-                      &gEfiDevicePathProtocolGuid, DevicePath);

+      DEBUG ((

+        DEBUG_ERROR,

+        "%a: Failed to install VirtIO transport @ 0x%Lx "

+        "on handle %p (Status == %r)\n",

+        __FUNCTION__,

+        RegBase,

+        Handle,

+        Status

+        ));

+

+      Status = gBS->UninstallProtocolInterface (

+                      Handle,

+                      &gEfiDevicePathProtocolGuid,

+                      DevicePath

+                      );

       ASSERT_EFI_ERROR (Status);

       FreePool (DevicePath);

       continue;

     }

   }

 

-  if (EFI_ERROR (FindNodeStatus) && FindNodeStatus != EFI_NOT_FOUND) {

-     DEBUG ((DEBUG_ERROR, "%a: Error occurred while iterating DT nodes "

-       "(FindNodeStatus == %r)\n", __FUNCTION__, FindNodeStatus));

+  if (EFI_ERROR (FindNodeStatus) && (FindNodeStatus != EFI_NOT_FOUND)) {

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: Error occurred while iterating DT nodes "

+      "(FindNodeStatus == %r)\n",

+      __FUNCTION__,

+      FindNodeStatus

+      ));

   }

 

   return EFI_SUCCESS;