]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Application / CapsuleApp / CapsuleDump.c
index 5725e2f6dd5b454f999c69305e556d974963c14c..26ad60ce592e3bafa1bc9a7f1c885b9289a471a5 100644 (file)
@@ -22,8 +22,8 @@
 **/\r
 BOOLEAN\r
 IsValidCapsuleHeader (\r
-  IN EFI_CAPSULE_HEADER     *CapsuleHeader,\r
-  IN UINT64                 CapsuleSize\r
+  IN EFI_CAPSULE_HEADER  *CapsuleHeader,\r
+  IN UINT64              CapsuleSize\r
   );\r
 \r
 /**\r
@@ -36,24 +36,24 @@ DumpUxCapsule (
   IN EFI_CAPSULE_HEADER  *CapsuleHeader\r
   )\r
 {\r
-  EFI_DISPLAY_CAPSULE                           *DisplayCapsule;\r
+  EFI_DISPLAY_CAPSULE  *DisplayCapsule;\r
+\r
   DisplayCapsule = (EFI_DISPLAY_CAPSULE *)CapsuleHeader;\r
-  Print(L"[UxCapsule]\n");\r
-  Print(L"CapsuleHeader:\n");\r
-  Print(L"  CapsuleGuid      - %g\n", &DisplayCapsule->CapsuleHeader.CapsuleGuid);\r
-  Print(L"  HeaderSize       - 0x%x\n", DisplayCapsule->CapsuleHeader.HeaderSize);\r
-  Print(L"  Flags            - 0x%x\n", DisplayCapsule->CapsuleHeader.Flags);\r
-  Print(L"  CapsuleImageSize - 0x%x\n", DisplayCapsule->CapsuleHeader.CapsuleImageSize);\r
-  Print(L"ImagePayload:\n");\r
-  Print(L"  Version          - 0x%x\n", DisplayCapsule->ImagePayload.Version);\r
-  Print(L"  Checksum         - 0x%x\n", DisplayCapsule->ImagePayload.Checksum);\r
-  Print(L"  ImageType        - 0x%x\n", DisplayCapsule->ImagePayload.ImageType);\r
-  Print(L"  Mode             - 0x%x\n", DisplayCapsule->ImagePayload.Mode);\r
-  Print(L"  OffsetX          - 0x%x\n", DisplayCapsule->ImagePayload.OffsetX);\r
-  Print(L"  OffsetY          - 0x%x\n", DisplayCapsule->ImagePayload.OffsetY);\r
+  Print (L"[UxCapsule]\n");\r
+  Print (L"CapsuleHeader:\n");\r
+  Print (L"  CapsuleGuid      - %g\n", &DisplayCapsule->CapsuleHeader.CapsuleGuid);\r
+  Print (L"  HeaderSize       - 0x%x\n", DisplayCapsule->CapsuleHeader.HeaderSize);\r
+  Print (L"  Flags            - 0x%x\n", DisplayCapsule->CapsuleHeader.Flags);\r
+  Print (L"  CapsuleImageSize - 0x%x\n", DisplayCapsule->CapsuleHeader.CapsuleImageSize);\r
+  Print (L"ImagePayload:\n");\r
+  Print (L"  Version          - 0x%x\n", DisplayCapsule->ImagePayload.Version);\r
+  Print (L"  Checksum         - 0x%x\n", DisplayCapsule->ImagePayload.Checksum);\r
+  Print (L"  ImageType        - 0x%x\n", DisplayCapsule->ImagePayload.ImageType);\r
+  Print (L"  Mode             - 0x%x\n", DisplayCapsule->ImagePayload.Mode);\r
+  Print (L"  OffsetX          - 0x%x\n", DisplayCapsule->ImagePayload.OffsetX);\r
+  Print (L"  OffsetY          - 0x%x\n", DisplayCapsule->ImagePayload.OffsetY);\r
 }\r
 \r
-\r
 /**\r
   Dump a non-nested FMP capsule.\r
 \r
@@ -70,36 +70,36 @@ DumpFmpCapsule (
   UINTN                                         Count;\r
   EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER  *FmpImageHeader;\r
 \r
-  Print(L"[FmpCapsule]\n");\r
-  Print(L"CapsuleHeader:\n");\r
-  Print(L"  CapsuleGuid      - %g\n", &CapsuleHeader->CapsuleGuid);\r
-  Print(L"  HeaderSize       - 0x%x\n", CapsuleHeader->HeaderSize);\r
-  Print(L"  Flags            - 0x%x\n", CapsuleHeader->Flags);\r
-  Print(L"  CapsuleImageSize - 0x%x\n", CapsuleHeader->CapsuleImageSize);\r
+  Print (L"[FmpCapsule]\n");\r
+  Print (L"CapsuleHeader:\n");\r
+  Print (L"  CapsuleGuid      - %g\n", &CapsuleHeader->CapsuleGuid);\r
+  Print (L"  HeaderSize       - 0x%x\n", CapsuleHeader->HeaderSize);\r
+  Print (L"  Flags            - 0x%x\n", CapsuleHeader->Flags);\r
+  Print (L"  CapsuleImageSize - 0x%x\n", CapsuleHeader->CapsuleImageSize);\r
 \r
   FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *)((UINT8 *)CapsuleHeader + CapsuleHeader->HeaderSize);\r
-  ItemOffsetList = (UINT64 *)(FmpCapsuleHeader + 1);\r
-  Print(L"FmpHeader:\n");\r
-  Print(L"  Version             - 0x%x\n", FmpCapsuleHeader->Version);\r
-  Print(L"  EmbeddedDriverCount - 0x%x\n", FmpCapsuleHeader->EmbeddedDriverCount);\r
-  Print(L"  PayloadItemCount    - 0x%x\n", FmpCapsuleHeader->PayloadItemCount);\r
+  ItemOffsetList   = (UINT64 *)(FmpCapsuleHeader + 1);\r
+  Print (L"FmpHeader:\n");\r
+  Print (L"  Version             - 0x%x\n", FmpCapsuleHeader->Version);\r
+  Print (L"  EmbeddedDriverCount - 0x%x\n", FmpCapsuleHeader->EmbeddedDriverCount);\r
+  Print (L"  PayloadItemCount    - 0x%x\n", FmpCapsuleHeader->PayloadItemCount);\r
   Count = FmpCapsuleHeader->EmbeddedDriverCount + FmpCapsuleHeader->PayloadItemCount;\r
   for (Index = 0; Index < Count; Index++) {\r
-    Print(L"  Offset[%d]           - 0x%x\n", Index, ItemOffsetList[Index]);\r
+    Print (L"  Offset[%d]           - 0x%x\n", Index, ItemOffsetList[Index]);\r
   }\r
 \r
   for (Index = FmpCapsuleHeader->EmbeddedDriverCount; Index < Count; Index++) {\r
-    Print(L"FmpPayload[%d] ImageHeader:\n", Index);\r
+    Print (L"FmpPayload[%d] ImageHeader:\n", Index);\r
     FmpImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]);\r
-    Print(L"  Version                - 0x%x\n", FmpImageHeader->Version);\r
-    Print(L"  UpdateImageTypeId      - %g\n", &FmpImageHeader->UpdateImageTypeId);\r
-    Print(L"  UpdateImageIndex       - 0x%x\n", FmpImageHeader->UpdateImageIndex);\r
-    Print(L"  UpdateImageSize        - 0x%x\n", FmpImageHeader->UpdateImageSize);\r
-    Print(L"  UpdateVendorCodeSize   - 0x%x\n", FmpImageHeader->UpdateVendorCodeSize);\r
+    Print (L"  Version                - 0x%x\n", FmpImageHeader->Version);\r
+    Print (L"  UpdateImageTypeId      - %g\n", &FmpImageHeader->UpdateImageTypeId);\r
+    Print (L"  UpdateImageIndex       - 0x%x\n", FmpImageHeader->UpdateImageIndex);\r
+    Print (L"  UpdateImageSize        - 0x%x\n", FmpImageHeader->UpdateImageSize);\r
+    Print (L"  UpdateVendorCodeSize   - 0x%x\n", FmpImageHeader->UpdateVendorCodeSize);\r
     if (FmpImageHeader->Version >= 2) {\r
-      Print(L"  UpdateHardwareInstance - 0x%lx\n", FmpImageHeader->UpdateHardwareInstance);\r
+      Print (L"  UpdateHardwareInstance - 0x%lx\n", FmpImageHeader->UpdateHardwareInstance);\r
       if (FmpImageHeader->Version >= EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION) {\r
-        Print(L"  ImageCapsuleSupport    - 0x%lx\n", FmpImageHeader->ImageCapsuleSupport);\r
+        Print (L"  ImageCapsuleSupport    - 0x%lx\n", FmpImageHeader->ImageCapsuleSupport);\r
       }\r
     }\r
   }\r
@@ -115,7 +115,7 @@ DumpFmpCapsule (
 **/\r
 BOOLEAN\r
 IsNestedFmpCapsule (\r
-  IN EFI_CAPSULE_HEADER         *CapsuleHeader\r
+  IN EFI_CAPSULE_HEADER  *CapsuleHeader\r
   )\r
 {\r
   EFI_STATUS                 Status;\r
@@ -130,12 +130,12 @@ IsNestedFmpCapsule (
   // Check ESRT\r
   //\r
   EsrtGuidFound = FALSE;\r
-  Status = EfiGetSystemConfigurationTable(&gEfiSystemResourceTableGuid, (VOID **)&Esrt);\r
-  if (!EFI_ERROR(Status)) {\r
+  Status        = EfiGetSystemConfigurationTable (&gEfiSystemResourceTableGuid, (VOID **)&Esrt);\r
+  if (!EFI_ERROR (Status)) {\r
     ASSERT (Esrt != NULL);\r
     EsrtEntry = (VOID *)(Esrt + 1);\r
     for (Index = 0; Index < Esrt->FwResourceCount; Index++, EsrtEntry++) {\r
-      if (CompareGuid(&EsrtEntry->FwClass, &CapsuleHeader->CapsuleGuid)) {\r
+      if (CompareGuid (&EsrtEntry->FwClass, &CapsuleHeader->CapsuleGuid)) {\r
         EsrtGuidFound = TRUE;\r
         break;\r
       }\r
@@ -151,13 +151,15 @@ IsNestedFmpCapsule (
   // FMP GUID after ESRT one\r
   //\r
   NestedCapsuleHeader = (EFI_CAPSULE_HEADER *)((UINT8 *)CapsuleHeader + CapsuleHeader->HeaderSize);\r
-  NestedCapsuleSize = (UINTN)CapsuleHeader + CapsuleHeader->CapsuleImageSize- (UINTN)NestedCapsuleHeader;\r
-  if (NestedCapsuleSize < sizeof(EFI_CAPSULE_HEADER)) {\r
+  NestedCapsuleSize   = (UINTN)CapsuleHeader + CapsuleHeader->CapsuleImageSize- (UINTN)NestedCapsuleHeader;\r
+  if (NestedCapsuleSize < sizeof (EFI_CAPSULE_HEADER)) {\r
     return FALSE;\r
   }\r
-  if (!CompareGuid(&NestedCapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
+\r
+  if (!CompareGuid (&NestedCapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
     return FALSE;\r
   }\r
+\r
   return TRUE;\r
 }\r
 \r
@@ -171,50 +173,53 @@ IsNestedFmpCapsule (
 **/\r
 EFI_STATUS\r
 DumpCapsule (\r
-  IN CHAR16                                        *CapsuleName\r
+  IN CHAR16  *CapsuleName\r
   )\r
 {\r
-  VOID                                          *Buffer;\r
-  UINTN                                         FileSize;\r
-  EFI_CAPSULE_HEADER                            *CapsuleHeader;\r
-  EFI_STATUS                                    Status;\r
+  VOID                *Buffer;\r
+  UINTN               FileSize;\r
+  EFI_CAPSULE_HEADER  *CapsuleHeader;\r
+  EFI_STATUS          Status;\r
 \r
   Buffer = NULL;\r
-  Status = ReadFileToBuffer(CapsuleName, &FileSize, &Buffer);\r
-  if (EFI_ERROR(Status)) {\r
-    Print(L"CapsuleApp: Capsule (%s) is not found.\n", CapsuleName);\r
+  Status = ReadFileToBuffer (CapsuleName, &FileSize, &Buffer);\r
+  if (EFI_ERROR (Status)) {\r
+    Print (L"CapsuleApp: Capsule (%s) is not found.\n", CapsuleName);\r
     goto Done;\r
   }\r
+\r
   if (!IsValidCapsuleHeader (Buffer, FileSize)) {\r
-    Print(L"CapsuleApp: Capsule image (%s) is not a valid capsule.\n", CapsuleName);\r
+    Print (L"CapsuleApp: Capsule image (%s) is not a valid capsule.\n", CapsuleName);\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
 \r
   CapsuleHeader = Buffer;\r
-  if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gWindowsUxCapsuleGuid)) {\r
-    DumpUxCapsule(CapsuleHeader);\r
+  if (CompareGuid (&CapsuleHeader->CapsuleGuid, &gWindowsUxCapsuleGuid)) {\r
+    DumpUxCapsule (CapsuleHeader);\r
     Status = EFI_SUCCESS;\r
     goto Done;\r
   }\r
 \r
-  if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
-    DumpFmpCapsule(CapsuleHeader);\r
+  if (CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
+    DumpFmpCapsule (CapsuleHeader);\r
   }\r
-  if (IsNestedFmpCapsule(CapsuleHeader)) {\r
-    Print(L"[NestedCapsule]\n");\r
-    Print(L"CapsuleHeader:\n");\r
-    Print(L"  CapsuleGuid      - %g\n", &CapsuleHeader->CapsuleGuid);\r
-    Print(L"  HeaderSize       - 0x%x\n", CapsuleHeader->HeaderSize);\r
-    Print(L"  Flags            - 0x%x\n", CapsuleHeader->Flags);\r
-    Print(L"  CapsuleImageSize - 0x%x\n", CapsuleHeader->CapsuleImageSize);\r
-    DumpFmpCapsule((EFI_CAPSULE_HEADER *)((UINTN)CapsuleHeader + CapsuleHeader->HeaderSize));\r
+\r
+  if (IsNestedFmpCapsule (CapsuleHeader)) {\r
+    Print (L"[NestedCapsule]\n");\r
+    Print (L"CapsuleHeader:\n");\r
+    Print (L"  CapsuleGuid      - %g\n", &CapsuleHeader->CapsuleGuid);\r
+    Print (L"  HeaderSize       - 0x%x\n", CapsuleHeader->HeaderSize);\r
+    Print (L"  Flags            - 0x%x\n", CapsuleHeader->Flags);\r
+    Print (L"  CapsuleImageSize - 0x%x\n", CapsuleHeader->CapsuleImageSize);\r
+    DumpFmpCapsule ((EFI_CAPSULE_HEADER *)((UINTN)CapsuleHeader + CapsuleHeader->HeaderSize));\r
   }\r
 \r
 Done:\r
   if (Buffer != NULL) {\r
-    FreePool(Buffer);\r
+    FreePool (Buffer);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -241,80 +246,81 @@ DumpCapsuleStatusVariable (
   CHAR16                              *CapsuleFileName;\r
   CHAR16                              *CapsuleTarget;\r
 \r
-  Status = GetVariable2(\r
+  Status = GetVariable2 (\r
              L"CapsuleMax",\r
              &gEfiCapsuleReportGuid,\r
              (VOID **)&CapsuleIndex,\r
              NULL\r
              );\r
-  if (!EFI_ERROR(Status)) {\r
+  if (!EFI_ERROR (Status)) {\r
     ASSERT (CapsuleIndex != NULL);\r
-    CopyMem(CapsuleIndexData, CapsuleIndex, 11 * sizeof(CHAR16));\r
+    CopyMem (CapsuleIndexData, CapsuleIndex, 11 * sizeof (CHAR16));\r
     CapsuleIndexData[11] = 0;\r
-    Print(L"CapsuleMax - %s\n", CapsuleIndexData);\r
-    FreePool(CapsuleIndex);\r
+    Print (L"CapsuleMax - %s\n", CapsuleIndexData);\r
+    FreePool (CapsuleIndex);\r
   }\r
-  Status = GetVariable2(\r
+\r
+  Status = GetVariable2 (\r
              L"CapsuleLast",\r
              &gEfiCapsuleReportGuid,\r
              (VOID **)&CapsuleIndex,\r
              NULL\r
              );\r
-  if (!EFI_ERROR(Status)) {\r
+  if (!EFI_ERROR (Status)) {\r
     ASSERT (CapsuleIndex != NULL);\r
-    CopyMem(CapsuleIndexData, CapsuleIndex, 11 * sizeof(CHAR16));\r
+    CopyMem (CapsuleIndexData, CapsuleIndex, 11 * sizeof (CHAR16));\r
     CapsuleIndexData[11] = 0;\r
-    Print(L"CapsuleLast - %s\n", CapsuleIndexData);\r
-    FreePool(CapsuleIndex);\r
+    Print (L"CapsuleLast - %s\n", CapsuleIndexData);\r
+    FreePool (CapsuleIndex);\r
   }\r
 \r
-\r
-  StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CapsuleVarName[0]), L"Capsule");\r
+  StrCpyS (CapsuleVarName, sizeof (CapsuleVarName)/sizeof (CapsuleVarName[0]), L"Capsule");\r
   TempVarName = CapsuleVarName + StrLen (CapsuleVarName);\r
-  Index = 0;\r
+  Index       = 0;\r
 \r
   while (TRUE) {\r
-    UnicodeSPrint (TempVarName, 5 * sizeof(CHAR16), L"%04x", Index);\r
+    UnicodeSPrint (TempVarName, 5 * sizeof (CHAR16), L"%04x", Index);\r
 \r
     Status = GetVariable2 (\r
                CapsuleVarName,\r
                &gEfiCapsuleReportGuid,\r
-               (VOID **) &CapsuleResult,\r
+               (VOID **)&CapsuleResult,\r
                NULL\r
                );\r
     if (Status == EFI_NOT_FOUND) {\r
       break;\r
-    } else if (EFI_ERROR(Status)) {\r
+    } else if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
+\r
     ASSERT (CapsuleResult != NULL);\r
 \r
     //\r
     // display capsule process status\r
     //\r
-    if (CapsuleResult->VariableTotalSize >= sizeof(EFI_CAPSULE_RESULT_VARIABLE_HEADER)) {\r
+    if (CapsuleResult->VariableTotalSize >= sizeof (EFI_CAPSULE_RESULT_VARIABLE_HEADER)) {\r
       Print (L"CapsuleName: %s\n", CapsuleVarName);\r
       Print (L"  Capsule Guid: %g\n", &CapsuleResult->CapsuleGuid);\r
       Print (L"  Capsule ProcessedTime: %t\n", &CapsuleResult->CapsuleProcessed);\r
       Print (L"  Capsule Status: %r\n", CapsuleResult->CapsuleStatus);\r
     }\r
 \r
-    if (CompareGuid(&CapsuleResult->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
-      if (CapsuleResult->VariableTotalSize >= sizeof(EFI_CAPSULE_RESULT_VARIABLE_HEADER) + sizeof(EFI_CAPSULE_RESULT_VARIABLE_FMP) + sizeof(CHAR16) * 2) {\r
+    if (CompareGuid (&CapsuleResult->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
+      if (CapsuleResult->VariableTotalSize >= sizeof (EFI_CAPSULE_RESULT_VARIABLE_HEADER) + sizeof (EFI_CAPSULE_RESULT_VARIABLE_FMP) + sizeof (CHAR16) * 2) {\r
         CapsuleResultFmp = (EFI_CAPSULE_RESULT_VARIABLE_FMP *)(CapsuleResult + 1);\r
-        Print(L"  Capsule FMP Version: 0x%x\n", CapsuleResultFmp->Version);\r
-        Print(L"  Capsule FMP PayloadIndex: 0x%x\n", CapsuleResultFmp->PayloadIndex);\r
-        Print(L"  Capsule FMP UpdateImageIndex: 0x%x\n", CapsuleResultFmp->UpdateImageIndex);\r
-        Print(L"  Capsule FMP UpdateImageTypeId: %g\n", &CapsuleResultFmp->UpdateImageTypeId);\r
+        Print (L"  Capsule FMP Version: 0x%x\n", CapsuleResultFmp->Version);\r
+        Print (L"  Capsule FMP PayloadIndex: 0x%x\n", CapsuleResultFmp->PayloadIndex);\r
+        Print (L"  Capsule FMP UpdateImageIndex: 0x%x\n", CapsuleResultFmp->UpdateImageIndex);\r
+        Print (L"  Capsule FMP UpdateImageTypeId: %g\n", &CapsuleResultFmp->UpdateImageTypeId);\r
         CapsuleFileName = (CHAR16 *)(CapsuleResultFmp + 1);\r
-        Print(L"  Capsule FMP CapsuleFileName: \"%s\"\n", CapsuleFileName);\r
-        CapsuleFileNameSize = StrSize(CapsuleFileName);\r
-        CapsuleTarget = (CHAR16 *)((UINTN)CapsuleFileName + CapsuleFileNameSize);\r
-        Print(L"  Capsule FMP CapsuleTarget: \"%s\"\n", CapsuleTarget);\r
+        Print (L"  Capsule FMP CapsuleFileName: \"%s\"\n", CapsuleFileName);\r
+        CapsuleFileNameSize = StrSize (CapsuleFileName);\r
+        CapsuleTarget       = (CHAR16 *)((UINTN)CapsuleFileName + CapsuleFileNameSize);\r
+        Print (L"  Capsule FMP CapsuleTarget: \"%s\"\n", CapsuleTarget);\r
       }\r
     }\r
 \r
-    FreePool(CapsuleResult);\r
+    FreePool (CapsuleResult);\r
 \r
     Index++;\r
     if (Index > 0xFFFF) {\r
@@ -325,14 +331,14 @@ DumpCapsuleStatusVariable (
   return EFI_SUCCESS;\r
 }\r
 \r
-CHAR8 *mFwTypeString[] = {\r
+CHAR8  *mFwTypeString[] = {\r
   "Unknown",\r
   "SystemFirmware",\r
   "DeviceFirmware",\r
   "UefiDriver",\r
 };\r
 \r
-CHAR8 *mLastAttemptStatusString[] = {\r
+CHAR8  *mLastAttemptStatusString[] = {\r
   "Success",\r
   "Error: Unsuccessful",\r
   "Error: Insufficient Resources",\r
@@ -356,7 +362,7 @@ FwTypeToString (
   IN UINT32  FwType\r
   )\r
 {\r
-  if (FwType < sizeof(mFwTypeString) / sizeof(mFwTypeString[0])) {\r
+  if (FwType < sizeof (mFwTypeString) / sizeof (mFwTypeString[0])) {\r
     return mFwTypeString[FwType];\r
   } else {\r
     return "Invalid";\r
@@ -375,7 +381,7 @@ LastAttemptStatusToString (
   IN UINT32  LastAttemptStatus\r
   )\r
 {\r
-  if (LastAttemptStatus < sizeof(mLastAttemptStatusString) / sizeof(mLastAttemptStatusString[0])) {\r
+  if (LastAttemptStatus < sizeof (mLastAttemptStatusString) / sizeof (mLastAttemptStatusString[0])) {\r
     return mLastAttemptStatusString[LastAttemptStatus];\r
   } else {\r
     return "Error: Unknown";\r
@@ -392,13 +398,13 @@ DumpEsrtEntry (
   IN EFI_SYSTEM_RESOURCE_ENTRY  *EsrtEntry\r
   )\r
 {\r
-  Print(L"  FwClass                  - %g\n", &EsrtEntry->FwClass);\r
-  Print(L"  FwType                   - 0x%x (%a)\n", EsrtEntry->FwType, FwTypeToString(EsrtEntry->FwType));\r
-  Print(L"  FwVersion                - 0x%x\n", EsrtEntry->FwVersion);\r
-  Print(L"  LowestSupportedFwVersion - 0x%x\n", EsrtEntry->LowestSupportedFwVersion);\r
-  Print(L"  CapsuleFlags             - 0x%x\n", EsrtEntry->CapsuleFlags);\r
-  Print(L"  LastAttemptVersion       - 0x%x\n", EsrtEntry->LastAttemptVersion);\r
-  Print(L"  LastAttemptStatus        - 0x%x (%a)\n", EsrtEntry->LastAttemptStatus, LastAttemptStatusToString(EsrtEntry->LastAttemptStatus));\r
+  Print (L"  FwClass                  - %g\n", &EsrtEntry->FwClass);\r
+  Print (L"  FwType                   - 0x%x (%a)\n", EsrtEntry->FwType, FwTypeToString (EsrtEntry->FwType));\r
+  Print (L"  FwVersion                - 0x%x\n", EsrtEntry->FwVersion);\r
+  Print (L"  LowestSupportedFwVersion - 0x%x\n", EsrtEntry->LowestSupportedFwVersion);\r
+  Print (L"  CapsuleFlags             - 0x%x\n", EsrtEntry->CapsuleFlags);\r
+  Print (L"  LastAttemptVersion       - 0x%x\n", EsrtEntry->LastAttemptVersion);\r
+  Print (L"  LastAttemptStatus        - 0x%x (%a)\n", EsrtEntry->LastAttemptStatus, LastAttemptStatusToString (EsrtEntry->LastAttemptStatus));\r
 }\r
 \r
 /**\r
@@ -415,18 +421,18 @@ DumpEsrt (
   EFI_SYSTEM_RESOURCE_ENTRY  *EsrtEntry;\r
 \r
   if (Esrt == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
-  Print(L"EFI_SYSTEM_RESOURCE_TABLE:\n");\r
-  Print(L"FwResourceCount    - 0x%x\n", Esrt->FwResourceCount);\r
-  Print(L"FwResourceCountMax - 0x%x\n", Esrt->FwResourceCountMax);\r
-  Print(L"FwResourceVersion  - 0x%lx\n", Esrt->FwResourceVersion);\r
+  Print (L"EFI_SYSTEM_RESOURCE_TABLE:\n");\r
+  Print (L"FwResourceCount    - 0x%x\n", Esrt->FwResourceCount);\r
+  Print (L"FwResourceCountMax - 0x%x\n", Esrt->FwResourceCountMax);\r
+  Print (L"FwResourceVersion  - 0x%lx\n", Esrt->FwResourceVersion);\r
 \r
   EsrtEntry = (VOID *)(Esrt + 1);\r
   for (Index = 0; Index < Esrt->FwResourceCount; Index++) {\r
-    Print(L"EFI_SYSTEM_RESOURCE_ENTRY (%d):\n", Index);\r
-    DumpEsrtEntry(EsrtEntry);\r
+    Print (L"EFI_SYSTEM_RESOURCE_ENTRY (%d):\n", Index);\r
+    DumpEsrtEntry (EsrtEntry);\r
     EsrtEntry++;\r
   }\r
 }\r
@@ -442,19 +448,19 @@ DumpEsrtData (
   EFI_STATUS                 Status;\r
   EFI_SYSTEM_RESOURCE_TABLE  *Esrt;\r
 \r
-  Print(L"##############\n");\r
-  Print(L"# ESRT TABLE #\n");\r
-  Print(L"##############\n");\r
+  Print (L"##############\n");\r
+  Print (L"# ESRT TABLE #\n");\r
+  Print (L"##############\n");\r
 \r
   Status = EfiGetSystemConfigurationTable (&gEfiSystemResourceTableGuid, (VOID **)&Esrt);\r
-  if (EFI_ERROR(Status)) {\r
-    Print(L"ESRT - %r\n", Status);\r
+  if (EFI_ERROR (Status)) {\r
+    Print (L"ESRT - %r\n", Status);\r
     return;\r
   }\r
-  DumpEsrt(Esrt);\r
-  Print(L"\n");\r
-}\r
 \r
+  DumpEsrt (Esrt);\r
+  Print (L"\n");\r
+}\r
 \r
 /**\r
   Dump capsule information from CapsuleHeader\r
@@ -466,7 +472,7 @@ DumpEsrtData (
 **/\r
 EFI_STATUS\r
 DumpCapsuleFromBuffer (\r
-  IN EFI_CAPSULE_HEADER                         *CapsuleHeader\r
+  IN EFI_CAPSULE_HEADER  *CapsuleHeader\r
   )\r
 {\r
   if (CompareGuid (&CapsuleHeader->CapsuleGuid, &gWindowsUxCapsuleGuid)) {\r
@@ -477,6 +483,7 @@ DumpCapsuleFromBuffer (
   if (CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)) {\r
     DumpFmpCapsule (CapsuleHeader);\r
   }\r
+\r
   if (IsNestedFmpCapsule (CapsuleHeader)) {\r
     Print (L"[NestedCapusule]\n");\r
     Print (L"CapsuleHeader:\n");\r
@@ -501,13 +508,13 @@ DumpCapsuleFromBuffer (
 STATIC\r
 CHAR16 *\r
 UpperCaseString (\r
-  IN CHAR16 *Str\r
+  IN CHAR16  *Str\r
   )\r
 {\r
   CHAR16  *Cptr;\r
 \r
   for (Cptr = Str; *Cptr != L'\0'; Cptr++) {\r
-    if (L'a' <= *Cptr && *Cptr <= L'z') {\r
+    if ((L'a' <= *Cptr) && (*Cptr <= L'z')) {\r
       *Cptr = *Cptr - L'a' + L'A';\r
     }\r
   }\r
@@ -527,18 +534,19 @@ UpperCaseString (
 STATIC\r
 VOID\r
 GetSubStringBeforePeriod (\r
-  IN  CHAR16 *Str,\r
-  OUT CHAR16 *SubStr,\r
-  OUT UINTN  *SubStrLen\r
+  IN  CHAR16  *Str,\r
+  OUT CHAR16  *SubStr,\r
+  OUT UINTN   *SubStrLen\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
+\r
   for (Index = 0; Str[Index] != L'.' && Str[Index] != L'\0'; Index++) {\r
     SubStr[Index] = Str[Index];\r
   }\r
 \r
   SubStr[Index] = L'\0';\r
-  *SubStrLen = Index;\r
+  *SubStrLen    = Index;\r
 }\r
 \r
 /**\r
@@ -552,16 +560,17 @@ GetSubStringBeforePeriod (
 STATIC\r
 VOID\r
 PadStrInTail (\r
-  IN CHAR16   *StrBuf,\r
-  IN UINTN    PadLen,\r
-  IN CHAR16   Character\r
+  IN CHAR16  *StrBuf,\r
+  IN UINTN   PadLen,\r
+  IN CHAR16  Character\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
 \r
-  for (Index = 0; StrBuf[Index] != L'\0'; Index++);\r
+  for (Index = 0; StrBuf[Index] != L'\0'; Index++) {\r
+  }\r
 \r
-  while(PadLen != 0) {\r
+  while (PadLen != 0) {\r
     StrBuf[Index] = Character;\r
     Index++;\r
     PadLen--;\r
@@ -587,18 +596,19 @@ SplitFileNameExtension (
   OUT CHAR16  *FileNameExtension\r
   )\r
 {\r
-  UINTN Index;\r
-  UINTN StringLen;\r
+  UINTN  Index;\r
+  UINTN  StringLen;\r
 \r
-  StringLen = StrLen(FileName);\r
-  for (Index = StringLen; Index > 0 && FileName[Index] != L'.'; Index--);\r
+  StringLen = StrLen (FileName);\r
+  for (Index = StringLen; Index > 0 && FileName[Index] != L'.'; Index--) {\r
+  }\r
 \r
   //\r
   // No period exists. No FileName Extension\r
   //\r
-  if (Index == 0 && FileName[Index] != L'.') {\r
+  if ((Index == 0) && (FileName[Index] != L'.')) {\r
     FileNameExtension[0] = L'\0';\r
-    Index = StringLen;\r
+    Index                = StringLen;\r
   } else {\r
     StrCpyS (FileNameExtension, MAX_FILE_NAME_LEN, &FileName[Index+1]);\r
   }\r
@@ -623,8 +633,8 @@ SplitFileNameExtension (
 **/\r
 INTN\r
 CompareFileNameInAlphabet (\r
-  IN VOID                         *Left,\r
-  IN VOID                         *Right\r
+  IN VOID  *Left,\r
+  IN VOID  *Right\r
   )\r
 {\r
   EFI_FILE_INFO  *FileInfo1;\r
@@ -639,8 +649,8 @@ CompareFileNameInAlphabet (
   UINTN          SubStrLen2;\r
   INTN           SubStrCmpResult;\r
 \r
-  FileInfo1 = (EFI_FILE_INFO *) (*(UINTN *)Left);\r
-  FileInfo2 = (EFI_FILE_INFO *) (*(UINTN *)Right);\r
+  FileInfo1 = (EFI_FILE_INFO *)(*(UINTN *)Left);\r
+  FileInfo2 = (EFI_FILE_INFO *)(*(UINTN *)Right);\r
 \r
   SplitFileNameExtension (FileInfo1->FileName, FileName1, FileExtension1);\r
   SplitFileNameExtension (FileInfo2->FileName, FileName2, FileExtension2);\r
@@ -656,7 +666,7 @@ CompareFileNameInAlphabet (
     // Substr in NewFileName is longer.  Pad tail with SPACE\r
     //\r
     PadStrInTail (TempSubStr2, SubStrLen1 - SubStrLen2, L' ');\r
-  } else if (SubStrLen1 < SubStrLen2){\r
+  } else if (SubStrLen1 < SubStrLen2) {\r
     //\r
     // Substr in ListedFileName is longer. Pad tail with SPACE\r
     //\r
@@ -685,29 +695,29 @@ CompareFileNameInAlphabet (
 **/\r
 EFI_STATUS\r
 DumpCapsuleFromDisk (\r
-  IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL            *Fs,\r
-  IN BOOLEAN                                    DumpCapsuleInfo\r
+  IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *Fs,\r
+  IN BOOLEAN                          DumpCapsuleInfo\r
   )\r
 {\r
-  EFI_STATUS                                    Status;\r
-  EFI_FILE                                      *Root;\r
-  EFI_FILE                                      *DirHandle;\r
-  EFI_FILE                                      *FileHandle;\r
-  UINTN                                         Index;\r
-  UINTN                                         FileSize;\r
-  VOID                                          *FileBuffer;\r
-  EFI_FILE_INFO                                 **FileInfoBuffer;\r
-  EFI_FILE_INFO                                 *FileInfo;\r
-  UINTN                                         FileCount;\r
-  BOOLEAN                                       NoFile;\r
-\r
-  DirHandle       = NULL;\r
-  FileHandle      = NULL;\r
-  Index           = 0;\r
-  FileInfoBuffer  = NULL;\r
-  FileInfo        = NULL;\r
-  FileCount       = 0;\r
-  NoFile          = FALSE;\r
+  EFI_STATUS     Status;\r
+  EFI_FILE       *Root;\r
+  EFI_FILE       *DirHandle;\r
+  EFI_FILE       *FileHandle;\r
+  UINTN          Index;\r
+  UINTN          FileSize;\r
+  VOID           *FileBuffer;\r
+  EFI_FILE_INFO  **FileInfoBuffer;\r
+  EFI_FILE_INFO  *FileInfo;\r
+  UINTN          FileCount;\r
+  BOOLEAN        NoFile;\r
+\r
+  DirHandle      = NULL;\r
+  FileHandle     = NULL;\r
+  Index          = 0;\r
+  FileInfoBuffer = NULL;\r
+  FileInfo       = NULL;\r
+  FileCount      = 0;\r
+  NoFile         = FALSE;\r
 \r
   Status = Fs->OpenVolume (Fs, &Root);\r
   if (EFI_ERROR (Status)) {\r
@@ -715,7 +725,7 @@ DumpCapsuleFromDisk (
     goto Done;\r
   }\r
 \r
-  Status = Root->Open (Root, &DirHandle, EFI_CAPSULE_FILE_DIRECTORY, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE , 0);\r
+  Status = Root->Open (Root, &DirHandle, EFI_CAPSULE_FILE_DIRECTORY, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, 0);\r
   if (EFI_ERROR (Status)) {\r
     Print (L"Cannot open %s. Status = %r\n", EFI_CAPSULE_FILE_DIRECTORY, Status);\r
     goto Done;\r
@@ -726,7 +736,7 @@ DumpCapsuleFromDisk (
   //\r
   Status = FileHandleFindFirstFile (DirHandle, &FileInfo);\r
   do {\r
-    if (EFI_ERROR (Status) || FileInfo == NULL) {\r
+    if (EFI_ERROR (Status) || (FileInfo == NULL)) {\r
       Print (L"Get File Info Fail. Status = %r\n", Status);\r
       goto Done;\r
     }\r
@@ -753,6 +763,7 @@ DumpCapsuleFromDisk (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
+\r
   NoFile = FALSE;\r
 \r
   //\r
@@ -760,7 +771,7 @@ DumpCapsuleFromDisk (
   //\r
   Status = FileHandleFindFirstFile (DirHandle, &FileInfo);\r
   do {\r
-    if (EFI_ERROR (Status) || FileInfo == NULL) {\r
+    if (EFI_ERROR (Status) || (FileInfo == NULL)) {\r
       Print (L"Get File Info Fail. Status = %r\n", Status);\r
       goto Done;\r
     }\r
@@ -783,7 +794,7 @@ DumpCapsuleFromDisk (
     FileInfoBuffer,\r
     FileCount,\r
     sizeof (FileInfo),\r
-    (SORT_COMPARE) CompareFileNameInAlphabet\r
+    (SORT_COMPARE)CompareFileNameInAlphabet\r
     );\r
 \r
   Print (L"The capsules will be performed by following order:\n");\r
@@ -797,16 +808,16 @@ DumpCapsuleFromDisk (
     goto Done;\r
   }\r
 \r
-  Print(L"The infomation of the capsules:\n");\r
+  Print (L"The infomation of the capsules:\n");\r
 \r
   for (Index = 0; Index < FileCount; Index++) {\r
     FileHandle = NULL;\r
-    Status = DirHandle->Open (DirHandle, &FileHandle, FileInfoBuffer[Index]->FileName, EFI_FILE_MODE_READ, 0);\r
+    Status     = DirHandle->Open (DirHandle, &FileHandle, FileInfoBuffer[Index]->FileName, EFI_FILE_MODE_READ, 0);\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
 \r
-    Status = FileHandleGetSize (FileHandle, (UINT64 *) &FileSize);\r
+    Status = FileHandleGetSize (FileHandle, (UINT64 *)&FileSize);\r
     if (EFI_ERROR (Status)) {\r
       Print (L"Cannot read file %s. Status = %r\n", FileInfoBuffer[Index]->FileName, Status);\r
       FileHandleClose (FileHandle);\r
@@ -830,7 +841,7 @@ DumpCapsuleFromDisk (
     Print (L"**************************\n");\r
     Print (L"  %d.%s:\n", Index + 1, FileInfoBuffer[Index]->FileName);\r
     Print (L"**************************\n");\r
-    DumpCapsuleFromBuffer ((EFI_CAPSULE_HEADER *) FileBuffer);\r
+    DumpCapsuleFromBuffer ((EFI_CAPSULE_HEADER *)FileBuffer);\r
     FileHandleClose (FileHandle);\r
     FreePool (FileBuffer);\r
   }\r
@@ -842,6 +853,7 @@ Done:
         FreePool (FileInfoBuffer[Index]);\r
       }\r
     }\r
+\r
     FreePool (FileInfoBuffer);\r
   }\r
 \r
@@ -857,30 +869,32 @@ Done:
 **/\r
 VOID\r
 DumpBlockDescriptors (\r
-  IN EFI_CAPSULE_BLOCK_DESCRIPTOR   *BlockDescriptors,\r
-  IN BOOLEAN                        DumpCapsuleInfo\r
+  IN EFI_CAPSULE_BLOCK_DESCRIPTOR  *BlockDescriptors,\r
+  IN BOOLEAN                       DumpCapsuleInfo\r
   )\r
 {\r
-  EFI_CAPSULE_BLOCK_DESCRIPTOR      *TempBlockPtr;\r
+  EFI_CAPSULE_BLOCK_DESCRIPTOR  *TempBlockPtr;\r
 \r
   TempBlockPtr = BlockDescriptors;\r
 \r
   while (TRUE) {\r
     if (TempBlockPtr->Length != 0) {\r
       if (DumpCapsuleInfo) {\r
-        Print(L"******************************************************\n");\r
+        Print (L"******************************************************\n");\r
       }\r
-      Print(L"Capsule data starts at 0x%08x with size 0x%08x\n", TempBlockPtr->Union.DataBlock, TempBlockPtr->Length);\r
+\r
+      Print (L"Capsule data starts at 0x%08x with size 0x%08x\n", TempBlockPtr->Union.DataBlock, TempBlockPtr->Length);\r
       if (DumpCapsuleInfo) {\r
-        Print(L"******************************************************\n");\r
-        DumpCapsuleFromBuffer ((EFI_CAPSULE_HEADER *) (UINTN) TempBlockPtr->Union.DataBlock);\r
+        Print (L"******************************************************\n");\r
+        DumpCapsuleFromBuffer ((EFI_CAPSULE_HEADER *)(UINTN)TempBlockPtr->Union.DataBlock);\r
       }\r
+\r
       TempBlockPtr += 1;\r
     } else {\r
       if (TempBlockPtr->Union.ContinuationPointer == (UINTN)NULL) {\r
         break;\r
       } else {\r
-        TempBlockPtr = (EFI_CAPSULE_BLOCK_DESCRIPTOR *) (UINTN) TempBlockPtr->Union.ContinuationPointer;\r
+        TempBlockPtr = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)TempBlockPtr->Union.ContinuationPointer;\r
       }\r
     }\r
   }\r
@@ -894,29 +908,29 @@ DumpBlockDescriptors (
 **/\r
 VOID\r
 DumpProvisionedCapsule (\r
-  IN BOOLEAN                      DumpCapsuleInfo\r
+  IN BOOLEAN  DumpCapsuleInfo\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  CHAR16                          CapsuleVarName[30];\r
-  CHAR16                          *TempVarName;\r
-  UINTN                           Index;\r
-  EFI_PHYSICAL_ADDRESS            *CapsuleDataPtr64;\r
-  UINT16                          *BootNext;\r
-  CHAR16                          BootOptionName[20];\r
-  EFI_BOOT_MANAGER_LOAD_OPTION    BootNextOptionEntry;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Fs;\r
-  EFI_SHELL_PROTOCOL              *ShellProtocol;\r
-\r
-  Index             = 0;\r
-  CapsuleDataPtr64  = NULL;\r
-  BootNext          = NULL;\r
+  EFI_STATUS                       Status;\r
+  CHAR16                           CapsuleVarName[30];\r
+  CHAR16                           *TempVarName;\r
+  UINTN                            Index;\r
+  EFI_PHYSICAL_ADDRESS             *CapsuleDataPtr64;\r
+  UINT16                           *BootNext;\r
+  CHAR16                           BootOptionName[20];\r
+  EFI_BOOT_MANAGER_LOAD_OPTION     BootNextOptionEntry;\r
+  EFI_DEVICE_PATH_PROTOCOL         *DevicePath;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *Fs;\r
+  EFI_SHELL_PROTOCOL               *ShellProtocol;\r
+\r
+  Index            = 0;\r
+  CapsuleDataPtr64 = NULL;\r
+  BootNext         = NULL;\r
 \r
   ShellProtocol = GetShellProtocol ();\r
   if (ShellProtocol == NULL) {\r
     Print (L"Get Shell Protocol Fail\n");\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -925,7 +939,7 @@ DumpProvisionedCapsule (
   Print (L"#########################\n");\r
   Print (L"### Capsule on Memory ###\n");\r
   Print (L"#########################\n");\r
-  StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CHAR16), EFI_CAPSULE_VARIABLE_NAME);\r
+  StrCpyS (CapsuleVarName, sizeof (CapsuleVarName)/sizeof (CHAR16), EFI_CAPSULE_VARIABLE_NAME);\r
   TempVarName = CapsuleVarName + StrLen (CapsuleVarName);\r
   while (TRUE) {\r
     if (Index > 0) {\r
@@ -939,21 +953,22 @@ DumpProvisionedCapsule (
     }\r
 \r
     Status = GetVariable2 (\r
-              CapsuleVarName,\r
-              &gEfiCapsuleVendorGuid,\r
-              (VOID **) &CapsuleDataPtr64,\r
-              NULL\r
-              );\r
-    if (EFI_ERROR (Status) || CapsuleDataPtr64 == NULL) {\r
+               CapsuleVarName,\r
+               &gEfiCapsuleVendorGuid,\r
+               (VOID **)&CapsuleDataPtr64,\r
+               NULL\r
+               );\r
+    if (EFI_ERROR (Status) || (CapsuleDataPtr64 == NULL)) {\r
       if (Index == 0) {\r
         Print (L"No data.\n");\r
       }\r
+\r
       break;\r
     }\r
 \r
     Index++;\r
     Print (L"Capsule Description at 0x%08x\n", *CapsuleDataPtr64);\r
-    DumpBlockDescriptors ((EFI_CAPSULE_BLOCK_DESCRIPTOR*) (UINTN) *CapsuleDataPtr64, DumpCapsuleInfo);\r
+    DumpBlockDescriptors ((EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)*CapsuleDataPtr64, DumpCapsuleInfo);\r
   }\r
 \r
   //\r
@@ -965,10 +980,10 @@ DumpProvisionedCapsule (
   Status = GetVariable2 (\r
              L"BootNext",\r
              &gEfiGlobalVariableGuid,\r
-             (VOID **) &BootNext,\r
+             (VOID **)&BootNext,\r
              NULL\r
-            );\r
-  if (EFI_ERROR (Status) || BootNext == NULL) {\r
+             );\r
+  if (EFI_ERROR (Status) || (BootNext == NULL)) {\r
     Print (L"Get BootNext Variable Fail. Status = %r\n", Status);\r
   } else {\r
     UnicodeSPrint (BootOptionName, sizeof (BootOptionName), L"Boot%04x", *BootNext);\r
@@ -978,9 +993,9 @@ DumpProvisionedCapsule (
       // Display description and device path\r
       //\r
       GetEfiSysPartitionFromBootOptionFilePath (BootNextOptionEntry.FilePath, &DevicePath, &Fs);\r
-      if(!EFI_ERROR (Status)) {\r
+      if (!EFI_ERROR (Status)) {\r
         Print (L"Capsules are provisioned on BootOption: %s\n", BootNextOptionEntry.Description);\r
-        Print (L"    %s %s\n", ShellProtocol->GetMapFromDevicePath (&DevicePath), ConvertDevicePathToText(DevicePath, TRUE, TRUE));\r
+        Print (L"    %s %s\n", ShellProtocol->GetMapFromDevicePath (&DevicePath), ConvertDevicePathToText (DevicePath, TRUE, TRUE));\r
         DumpCapsuleFromDisk (Fs, DumpCapsuleInfo);\r
       }\r
     }\r
@@ -1000,68 +1015,70 @@ DumpProvisionedCapsule (
 **/\r
 VOID\r
 DumpFmpImageInfo (\r
-  IN UINTN                           ImageInfoSize,\r
-  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *ImageInfo,\r
-  IN UINT32                          DescriptorVersion,\r
-  IN UINT8                           DescriptorCount,\r
-  IN UINTN                           DescriptorSize,\r
-  IN UINT32                          PackageVersion,\r
-  IN CHAR16                          *PackageVersionName\r
+  IN UINTN                          ImageInfoSize,\r
+  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR  *ImageInfo,\r
+  IN UINT32                         DescriptorVersion,\r
+  IN UINT8                          DescriptorCount,\r
+  IN UINTN                          DescriptorSize,\r
+  IN UINT32                         PackageVersion,\r
+  IN CHAR16                         *PackageVersionName\r
   )\r
 {\r
-  EFI_FIRMWARE_IMAGE_DESCRIPTOR                 *CurrentImageInfo;\r
-  UINTN                                         Index;\r
-  UINTN                                         Index2;\r
-\r
-  Print(L"  DescriptorVersion  - 0x%x\n", DescriptorVersion);\r
-  Print(L"  DescriptorCount    - 0x%x\n", DescriptorCount);\r
-  Print(L"  DescriptorSize     - 0x%x\n", DescriptorSize);\r
-  Print(L"  PackageVersion     - 0x%x\n", PackageVersion);\r
-  Print(L"  PackageVersionName - \"%s\"\n", PackageVersionName);\r
+  EFI_FIRMWARE_IMAGE_DESCRIPTOR  *CurrentImageInfo;\r
+  UINTN                          Index;\r
+  UINTN                          Index2;\r
+\r
+  Print (L"  DescriptorVersion  - 0x%x\n", DescriptorVersion);\r
+  Print (L"  DescriptorCount    - 0x%x\n", DescriptorCount);\r
+  Print (L"  DescriptorSize     - 0x%x\n", DescriptorSize);\r
+  Print (L"  PackageVersion     - 0x%x\n", PackageVersion);\r
+  Print (L"  PackageVersionName - \"%s\"\n", PackageVersionName);\r
   CurrentImageInfo = ImageInfo;\r
   for (Index = 0; Index < DescriptorCount; Index++) {\r
-    Print(L"  ImageDescriptor (%d)\n", Index);\r
-    Print(L"    ImageIndex                  - 0x%x\n", CurrentImageInfo->ImageIndex);\r
-    Print(L"    ImageTypeId                 - %g\n", &CurrentImageInfo->ImageTypeId);\r
-    Print(L"    ImageId                     - 0x%lx\n", CurrentImageInfo->ImageId);\r
-    Print(L"    ImageIdName                 - \"%s\"\n", CurrentImageInfo->ImageIdName);\r
-    Print(L"    Version                     - 0x%x\n", CurrentImageInfo->Version);\r
-    Print(L"    VersionName                 - \"%s\"\n", CurrentImageInfo->VersionName);\r
-    Print(L"    Size                        - 0x%x\n", CurrentImageInfo->Size);\r
-    Print(L"    AttributesSupported         - 0x%lx\n", CurrentImageInfo->AttributesSupported);\r
-    Print(L"      IMAGE_UPDATABLE           - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
-    Print(L"      RESET_REQUIRED            - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
-    Print(L"      AUTHENTICATION_REQUIRED   - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
-    Print(L"      IN_USE                    - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IN_USE);\r
-    Print(L"      UEFI_IMAGE                - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_UEFI_IMAGE);\r
-    Print(L"    AttributesSetting           - 0x%lx\n", CurrentImageInfo->AttributesSetting);\r
-    Print(L"      IMAGE_UPDATABLE           - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
-    Print(L"      RESET_REQUIRED            - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
-    Print(L"      AUTHENTICATION_REQUIRED   - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
-    Print(L"      IN_USE                    - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IN_USE);\r
-    Print(L"      UEFI_IMAGE                - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_UEFI_IMAGE);\r
-    Print(L"    Compatibilities             - 0x%lx\n", CurrentImageInfo->Compatibilities);\r
-    Print(L"      COMPATIB_CHECK_SUPPORTED  - 0x%lx\n", CurrentImageInfo->Compatibilities & IMAGE_COMPATIBILITY_CHECK_SUPPORTED);\r
+    Print (L"  ImageDescriptor (%d)\n", Index);\r
+    Print (L"    ImageIndex                  - 0x%x\n", CurrentImageInfo->ImageIndex);\r
+    Print (L"    ImageTypeId                 - %g\n", &CurrentImageInfo->ImageTypeId);\r
+    Print (L"    ImageId                     - 0x%lx\n", CurrentImageInfo->ImageId);\r
+    Print (L"    ImageIdName                 - \"%s\"\n", CurrentImageInfo->ImageIdName);\r
+    Print (L"    Version                     - 0x%x\n", CurrentImageInfo->Version);\r
+    Print (L"    VersionName                 - \"%s\"\n", CurrentImageInfo->VersionName);\r
+    Print (L"    Size                        - 0x%x\n", CurrentImageInfo->Size);\r
+    Print (L"    AttributesSupported         - 0x%lx\n", CurrentImageInfo->AttributesSupported);\r
+    Print (L"      IMAGE_UPDATABLE           - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
+    Print (L"      RESET_REQUIRED            - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
+    Print (L"      AUTHENTICATION_REQUIRED   - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
+    Print (L"      IN_USE                    - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IN_USE);\r
+    Print (L"      UEFI_IMAGE                - 0x%lx\n", CurrentImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_UEFI_IMAGE);\r
+    Print (L"    AttributesSetting           - 0x%lx\n", CurrentImageInfo->AttributesSetting);\r
+    Print (L"      IMAGE_UPDATABLE           - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
+    Print (L"      RESET_REQUIRED            - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
+    Print (L"      AUTHENTICATION_REQUIRED   - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
+    Print (L"      IN_USE                    - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IN_USE);\r
+    Print (L"      UEFI_IMAGE                - 0x%lx\n", CurrentImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_UEFI_IMAGE);\r
+    Print (L"    Compatibilities             - 0x%lx\n", CurrentImageInfo->Compatibilities);\r
+    Print (L"      COMPATIB_CHECK_SUPPORTED  - 0x%lx\n", CurrentImageInfo->Compatibilities & IMAGE_COMPATIBILITY_CHECK_SUPPORTED);\r
     if (DescriptorVersion > 1) {\r
-      Print(L"    LowestSupportedImageVersion - 0x%x\n", CurrentImageInfo->LowestSupportedImageVersion);\r
+      Print (L"    LowestSupportedImageVersion - 0x%x\n", CurrentImageInfo->LowestSupportedImageVersion);\r
       if (DescriptorVersion > 2) {\r
-        Print(L"    LastAttemptVersion          - 0x%x\n", CurrentImageInfo->LastAttemptVersion);\r
-        Print(L"    LastAttemptStatus           - 0x%x (%a)\n", CurrentImageInfo->LastAttemptStatus, LastAttemptStatusToString(CurrentImageInfo->LastAttemptStatus));\r
-        Print(L"    HardwareInstance            - 0x%lx\n", CurrentImageInfo->HardwareInstance);\r
+        Print (L"    LastAttemptVersion          - 0x%x\n", CurrentImageInfo->LastAttemptVersion);\r
+        Print (L"    LastAttemptStatus           - 0x%x (%a)\n", CurrentImageInfo->LastAttemptStatus, LastAttemptStatusToString (CurrentImageInfo->LastAttemptStatus));\r
+        Print (L"    HardwareInstance            - 0x%lx\n", CurrentImageInfo->HardwareInstance);\r
         if (DescriptorVersion > 3) {\r
-          Print(L"    Dependencies                - ");\r
+          Print (L"    Dependencies                - ");\r
           if (CurrentImageInfo->Dependencies == NULL) {\r
-            Print(L"NULL\n");\r
+            Print (L"NULL\n");\r
           } else {\r
             Index2 = 0;\r
             do {\r
-              Print(L"%02x ", CurrentImageInfo->Dependencies->Dependencies[Index2]);\r
-            } while (CurrentImageInfo->Dependencies->Dependencies[Index2 ++] != EFI_FMP_DEP_END);\r
-            Print(L"\n");\r
+              Print (L"%02x ", CurrentImageInfo->Dependencies->Dependencies[Index2]);\r
+            } while (CurrentImageInfo->Dependencies->Dependencies[Index2++] != EFI_FMP_DEP_END);\r
+\r
+            Print (L"\n");\r
           }\r
         }\r
       }\r
     }\r
+\r
     //\r
     // Use DescriptorSize to move ImageInfo Pointer to stay compatible with different ImageInfo version\r
     //\r
@@ -1080,24 +1097,24 @@ DumpFmpImageInfo (
 **/\r
 VOID\r
 DumpFmpPackageInfo (\r
-  IN UINT32                           PackageVersion,\r
-  IN CHAR16                           *PackageVersionName,\r
-  IN UINT32                           PackageVersionNameMaxLen,\r
-  IN UINT64                           AttributesSupported,\r
-  IN UINT64                           AttributesSetting\r
+  IN UINT32  PackageVersion,\r
+  IN CHAR16  *PackageVersionName,\r
+  IN UINT32  PackageVersionNameMaxLen,\r
+  IN UINT64  AttributesSupported,\r
+  IN UINT64  AttributesSetting\r
   )\r
 {\r
-  Print(L"  PackageVersion              - 0x%x\n", PackageVersion);\r
-  Print(L"  PackageVersionName          - \"%s\"\n", PackageVersionName);\r
-  Print(L"  PackageVersionNameMaxLen    - 0x%x\n", PackageVersionNameMaxLen);\r
-  Print(L"  AttributesSupported         - 0x%lx\n", AttributesSupported);\r
-  Print(L"    IMAGE_UPDATABLE           - 0x%lx\n", AttributesSupported & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
-  Print(L"    RESET_REQUIRED            - 0x%lx\n", AttributesSupported & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
-  Print(L"    AUTHENTICATION_REQUIRED   - 0x%lx\n", AttributesSupported & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
-  Print(L"  AttributesSetting           - 0x%lx\n", AttributesSetting);\r
-  Print(L"    IMAGE_UPDATABLE           - 0x%lx\n", AttributesSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
-  Print(L"    RESET_REQUIRED            - 0x%lx\n", AttributesSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
-  Print(L"    AUTHENTICATION_REQUIRED   - 0x%lx\n", AttributesSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
+  Print (L"  PackageVersion              - 0x%x\n", PackageVersion);\r
+  Print (L"  PackageVersionName          - \"%s\"\n", PackageVersionName);\r
+  Print (L"  PackageVersionNameMaxLen    - 0x%x\n", PackageVersionNameMaxLen);\r
+  Print (L"  AttributesSupported         - 0x%lx\n", AttributesSupported);\r
+  Print (L"    IMAGE_UPDATABLE           - 0x%lx\n", AttributesSupported & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
+  Print (L"    RESET_REQUIRED            - 0x%lx\n", AttributesSupported & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
+  Print (L"    AUTHENTICATION_REQUIRED   - 0x%lx\n", AttributesSupported & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
+  Print (L"  AttributesSetting           - 0x%lx\n", AttributesSetting);\r
+  Print (L"    IMAGE_UPDATABLE           - 0x%lx\n", AttributesSetting & IMAGE_ATTRIBUTE_IMAGE_UPDATABLE);\r
+  Print (L"    RESET_REQUIRED            - 0x%lx\n", AttributesSetting & IMAGE_ATTRIBUTE_RESET_REQUIRED);\r
+  Print (L"    AUTHENTICATION_REQUIRED   - 0x%lx\n", AttributesSetting & IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED);\r
 }\r
 \r
 /**\r
@@ -1108,25 +1125,25 @@ DumpFmpData (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                                    Status;\r
-  EFI_FIRMWARE_MANAGEMENT_PROTOCOL              *Fmp;\r
-  EFI_HANDLE                                    *HandleBuffer;\r
-  UINTN                                         NumberOfHandles;\r
-  UINTN                                         Index;\r
-  EFI_FIRMWARE_IMAGE_DESCRIPTOR                 *FmpImageInfoBuf;\r
-  UINTN                                         ImageInfoSize;\r
-  UINT32                                        FmpImageInfoDescriptorVer;\r
-  UINT8                                         FmpImageInfoCount;\r
-  UINTN                                         DescriptorSize;\r
-  UINT32                                        PackageVersion;\r
-  CHAR16                                        *PackageVersionName;\r
-  UINT32                                        PackageVersionNameMaxLen;\r
-  UINT64                                        AttributesSupported;\r
-  UINT64                                        AttributesSetting;\r
-\r
-  Print(L"############\n");\r
-  Print(L"# FMP DATA #\n");\r
-  Print(L"############\n");\r
+  EFI_STATUS                        Status;\r
+  EFI_FIRMWARE_MANAGEMENT_PROTOCOL  *Fmp;\r
+  EFI_HANDLE                        *HandleBuffer;\r
+  UINTN                             NumberOfHandles;\r
+  UINTN                             Index;\r
+  EFI_FIRMWARE_IMAGE_DESCRIPTOR     *FmpImageInfoBuf;\r
+  UINTN                             ImageInfoSize;\r
+  UINT32                            FmpImageInfoDescriptorVer;\r
+  UINT8                             FmpImageInfoCount;\r
+  UINTN                             DescriptorSize;\r
+  UINT32                            PackageVersion;\r
+  CHAR16                            *PackageVersionName;\r
+  UINT32                            PackageVersionNameMaxLen;\r
+  UINT64                            AttributesSupported;\r
+  UINT64                            AttributesSetting;\r
+\r
+  Print (L"############\n");\r
+  Print (L"# FMP DATA #\n");\r
+  Print (L"############\n");\r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
                   &gEfiFirmwareManagementProtocolGuid,\r
@@ -1134,32 +1151,32 @@ DumpFmpData (
                   &NumberOfHandles,\r
                   &HandleBuffer\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
-    Print(L"FMP protocol - %r\n", EFI_NOT_FOUND);\r
+  if (EFI_ERROR (Status)) {\r
+    Print (L"FMP protocol - %r\n", EFI_NOT_FOUND);\r
     return;\r
   }\r
 \r
   for (Index = 0; Index < NumberOfHandles; Index++) {\r
-    Status = gBS->HandleProtocol(\r
+    Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiFirmwareManagementProtocolGuid,\r
                     (VOID **)&Fmp\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
 \r
     ImageInfoSize = 0;\r
-    Status = Fmp->GetImageInfo (\r
-                    Fmp,\r
-                    &ImageInfoSize,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL\r
-                    );\r
+    Status        = Fmp->GetImageInfo (\r
+                           Fmp,\r
+                           &ImageInfoSize,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL\r
+                           );\r
     if (Status != EFI_BUFFER_TOO_SMALL) {\r
       continue;\r
     }\r
@@ -1172,28 +1189,28 @@ DumpFmpData (
     }\r
 \r
     PackageVersionName = NULL;\r
-    Status = Fmp->GetImageInfo (\r
-                    Fmp,\r
-                    &ImageInfoSize,               // ImageInfoSize\r
-                    FmpImageInfoBuf,              // ImageInfo\r
-                    &FmpImageInfoDescriptorVer,   // DescriptorVersion\r
-                    &FmpImageInfoCount,           // DescriptorCount\r
-                    &DescriptorSize,              // DescriptorSize\r
-                    &PackageVersion,              // PackageVersion\r
-                    &PackageVersionName           // PackageVersionName\r
-                    );\r
+    Status             = Fmp->GetImageInfo (\r
+                                Fmp,\r
+                                &ImageInfoSize,             // ImageInfoSize\r
+                                FmpImageInfoBuf,            // ImageInfo\r
+                                &FmpImageInfoDescriptorVer, // DescriptorVersion\r
+                                &FmpImageInfoCount,         // DescriptorCount\r
+                                &DescriptorSize,            // DescriptorSize\r
+                                &PackageVersion,            // PackageVersion\r
+                                &PackageVersionName         // PackageVersionName\r
+                                );\r
 \r
     //\r
     // If FMP GetInformation interface failed, skip this resource\r
     //\r
-    if (EFI_ERROR(Status)) {\r
-      Print(L"FMP (%d) ImageInfo - %r\n", Index, Status);\r
-      FreePool(FmpImageInfoBuf);\r
+    if (EFI_ERROR (Status)) {\r
+      Print (L"FMP (%d) ImageInfo - %r\n", Index, Status);\r
+      FreePool (FmpImageInfoBuf);\r
       continue;\r
     }\r
 \r
-    Print(L"FMP (%d) ImageInfo:\n", Index);\r
-    DumpFmpImageInfo(\r
+    Print (L"FMP (%d) ImageInfo:\n", Index);\r
+    DumpFmpImageInfo (\r
       ImageInfoSize,               // ImageInfoSize\r
       FmpImageInfoBuf,             // ImageInfo\r
       FmpImageInfoDescriptorVer,   // DescriptorVersion\r
@@ -1204,27 +1221,28 @@ DumpFmpData (
       );\r
 \r
     if (PackageVersionName != NULL) {\r
-      FreePool(PackageVersionName);\r
+      FreePool (PackageVersionName);\r
     }\r
-    FreePool(FmpImageInfoBuf);\r
+\r
+    FreePool (FmpImageInfoBuf);\r
 \r
     //\r
     // Get package info\r
     //\r
     PackageVersionName = NULL;\r
-    Status = Fmp->GetPackageInfo (\r
-                    Fmp,\r
-                    &PackageVersion,              // PackageVersion\r
-                    &PackageVersionName,          // PackageVersionName\r
-                    &PackageVersionNameMaxLen,    // PackageVersionNameMaxLen\r
-                    &AttributesSupported,         // AttributesSupported\r
-                    &AttributesSetting            // AttributesSetting\r
-                    );\r
-    if (EFI_ERROR(Status)) {\r
-      Print(L"FMP (%d) PackageInfo - %r\n", Index, Status);\r
+    Status             = Fmp->GetPackageInfo (\r
+                                Fmp,\r
+                                &PackageVersion,           // PackageVersion\r
+                                &PackageVersionName,       // PackageVersionName\r
+                                &PackageVersionNameMaxLen, // PackageVersionNameMaxLen\r
+                                &AttributesSupported,      // AttributesSupported\r
+                                &AttributesSetting         // AttributesSetting\r
+                                );\r
+    if (EFI_ERROR (Status)) {\r
+      Print (L"FMP (%d) PackageInfo - %r\n", Index, Status);\r
     } else {\r
-      Print(L"FMP (%d) ImageInfo:\n", Index);\r
-      DumpFmpPackageInfo(\r
+      Print (L"FMP (%d) ImageInfo:\n", Index);\r
+      DumpFmpPackageInfo (\r
         PackageVersion,              // PackageVersion\r
         PackageVersionName,          // PackageVersionName\r
         PackageVersionNameMaxLen,    // PackageVersionNameMaxLen\r
@@ -1233,14 +1251,15 @@ DumpFmpData (
         );\r
 \r
       if (PackageVersionName != NULL) {\r
-        FreePool(PackageVersionName);\r
+        FreePool (PackageVersionName);\r
       }\r
     }\r
   }\r
-  Print(L"\n");\r
+\r
+  Print (L"\n");\r
 \r
 EXIT:\r
-  FreePool(HandleBuffer);\r
+  FreePool (HandleBuffer);\r
 }\r
 \r
 /**\r
@@ -1256,22 +1275,24 @@ EXIT:
 **/\r
 BOOLEAN\r
 IsThisFmpImageInfo (\r
-  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *ImageInfo,\r
-  IN UINT8                           DescriptorCount,\r
-  IN UINTN                           DescriptorSize,\r
-  IN EFI_GUID                        *ImageTypeId\r
+  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR  *ImageInfo,\r
+  IN UINT8                          DescriptorCount,\r
+  IN UINTN                          DescriptorSize,\r
+  IN EFI_GUID                       *ImageTypeId\r
   )\r
 {\r
-  EFI_FIRMWARE_IMAGE_DESCRIPTOR                 *CurrentImageInfo;\r
-  UINTN                                         Index;\r
+  EFI_FIRMWARE_IMAGE_DESCRIPTOR  *CurrentImageInfo;\r
+  UINTN                          Index;\r
 \r
   CurrentImageInfo = ImageInfo;\r
   for (Index = 0; Index < DescriptorCount; Index++) {\r
     if (CompareGuid (&CurrentImageInfo->ImageTypeId, ImageTypeId)) {\r
       return TRUE;\r
     }\r
+\r
     CurrentImageInfo = (EFI_FIRMWARE_IMAGE_DESCRIPTOR *)((UINT8 *)CurrentImageInfo + DescriptorSize);\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -1287,19 +1308,19 @@ FindFmpFromImageTypeId (
   IN EFI_GUID  *ImageTypeId\r
   )\r
 {\r
-  EFI_STATUS                                    Status;\r
-  EFI_FIRMWARE_MANAGEMENT_PROTOCOL              *Fmp;\r
-  EFI_FIRMWARE_MANAGEMENT_PROTOCOL              *TargetFmp;\r
-  EFI_HANDLE                                    *HandleBuffer;\r
-  UINTN                                         NumberOfHandles;\r
-  UINTN                                         Index;\r
-  EFI_FIRMWARE_IMAGE_DESCRIPTOR                 *FmpImageInfoBuf;\r
-  UINTN                                         ImageInfoSize;\r
-  UINT32                                        FmpImageInfoDescriptorVer;\r
-  UINT8                                         FmpImageInfoCount;\r
-  UINTN                                         DescriptorSize;\r
-  UINT32                                        PackageVersion;\r
-  CHAR16                                        *PackageVersionName;\r
+  EFI_STATUS                        Status;\r
+  EFI_FIRMWARE_MANAGEMENT_PROTOCOL  *Fmp;\r
+  EFI_FIRMWARE_MANAGEMENT_PROTOCOL  *TargetFmp;\r
+  EFI_HANDLE                        *HandleBuffer;\r
+  UINTN                             NumberOfHandles;\r
+  UINTN                             Index;\r
+  EFI_FIRMWARE_IMAGE_DESCRIPTOR     *FmpImageInfoBuf;\r
+  UINTN                             ImageInfoSize;\r
+  UINT32                            FmpImageInfoDescriptorVer;\r
+  UINT8                             FmpImageInfoCount;\r
+  UINTN                             DescriptorSize;\r
+  UINT32                            PackageVersion;\r
+  CHAR16                            *PackageVersionName;\r
 \r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
@@ -1308,33 +1329,33 @@ FindFmpFromImageTypeId (
                   &NumberOfHandles,\r
                   &HandleBuffer\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
-    Print(L"FMP protocol - %r\n", EFI_NOT_FOUND);\r
+  if (EFI_ERROR (Status)) {\r
+    Print (L"FMP protocol - %r\n", EFI_NOT_FOUND);\r
     return NULL;\r
   }\r
 \r
   TargetFmp = NULL;\r
   for (Index = 0; Index < NumberOfHandles; Index++) {\r
-    Status = gBS->HandleProtocol(\r
+    Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiFirmwareManagementProtocolGuid,\r
                     (VOID **)&Fmp\r
                     );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
 \r
     ImageInfoSize = 0;\r
-    Status = Fmp->GetImageInfo (\r
-                    Fmp,\r
-                    &ImageInfoSize,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL,\r
-                    NULL\r
-                    );\r
+    Status        = Fmp->GetImageInfo (\r
+                           Fmp,\r
+                           &ImageInfoSize,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL,\r
+                           NULL\r
+                           );\r
     if (Status != EFI_BUFFER_TOO_SMALL) {\r
       continue;\r
     }\r
@@ -1342,44 +1363,46 @@ FindFmpFromImageTypeId (
     FmpImageInfoBuf = NULL;\r
     FmpImageInfoBuf = AllocateZeroPool (ImageInfoSize);\r
     if (FmpImageInfoBuf == NULL) {\r
-      FreePool(HandleBuffer);\r
-      Print(L"Out of resource\n");\r
+      FreePool (HandleBuffer);\r
+      Print (L"Out of resource\n");\r
       return NULL;\r
     }\r
 \r
     PackageVersionName = NULL;\r
-    Status = Fmp->GetImageInfo (\r
-                    Fmp,\r
-                    &ImageInfoSize,               // ImageInfoSize\r
-                    FmpImageInfoBuf,              // ImageInfo\r
-                    &FmpImageInfoDescriptorVer,   // DescriptorVersion\r
-                    &FmpImageInfoCount,           // DescriptorCount\r
-                    &DescriptorSize,              // DescriptorSize\r
-                    &PackageVersion,              // PackageVersion\r
-                    &PackageVersionName           // PackageVersionName\r
-                    );\r
+    Status             = Fmp->GetImageInfo (\r
+                                Fmp,\r
+                                &ImageInfoSize,             // ImageInfoSize\r
+                                FmpImageInfoBuf,            // ImageInfo\r
+                                &FmpImageInfoDescriptorVer, // DescriptorVersion\r
+                                &FmpImageInfoCount,         // DescriptorCount\r
+                                &DescriptorSize,            // DescriptorSize\r
+                                &PackageVersion,            // PackageVersion\r
+                                &PackageVersionName         // PackageVersionName\r
+                                );\r
 \r
     //\r
     // If FMP GetInformation interface failed, skip this resource\r
     //\r
-    if (EFI_ERROR(Status)) {\r
-      FreePool(FmpImageInfoBuf);\r
+    if (EFI_ERROR (Status)) {\r
+      FreePool (FmpImageInfoBuf);\r
       continue;\r
     }\r
 \r
     if (PackageVersionName != NULL) {\r
-      FreePool(PackageVersionName);\r
+      FreePool (PackageVersionName);\r
     }\r
 \r
     if (IsThisFmpImageInfo (FmpImageInfoBuf, FmpImageInfoCount, DescriptorSize, ImageTypeId)) {\r
       TargetFmp = Fmp;\r
     }\r
-    FreePool(FmpImageInfoBuf);\r
+\r
+    FreePool (FmpImageInfoBuf);\r
     if (TargetFmp != NULL) {\r
       break;\r
     }\r
   }\r
-  FreePool(HandleBuffer);\r
+\r
+  FreePool (HandleBuffer);\r
   return TargetFmp;\r
 }\r
 \r
@@ -1399,46 +1422,46 @@ DumpFmpImage (
   IN CHAR16    *ImageName\r
   )\r
 {\r
-  EFI_STATUS                                    Status;\r
-  EFI_FIRMWARE_MANAGEMENT_PROTOCOL              *Fmp;\r
-  VOID                                          *Image;\r
-  UINTN                                         ImageSize;\r
+  EFI_STATUS                        Status;\r
+  EFI_FIRMWARE_MANAGEMENT_PROTOCOL  *Fmp;\r
+  VOID                              *Image;\r
+  UINTN                             ImageSize;\r
 \r
   Fmp = FindFmpFromImageTypeId (ImageTypeId);\r
   if (Fmp == NULL) {\r
-    Print(L"No FMP include ImageTypeId %g\n", ImageTypeId);\r
-    return ;\r
+    Print (L"No FMP include ImageTypeId %g\n", ImageTypeId);\r
+    return;\r
   }\r
 \r
   if (ImageIndex > 0xFF) {\r
-    Print(L"ImageIndex 0x%x too big\n", ImageIndex);\r
-    return ;\r
+    Print (L"ImageIndex 0x%x too big\n", ImageIndex);\r
+    return;\r
   }\r
 \r
-  Image = Fmp;\r
+  Image     = Fmp;\r
   ImageSize = 0;\r
-  Status = Fmp->GetImage (Fmp, (UINT8)ImageIndex, Image, &ImageSize);\r
+  Status    = Fmp->GetImage (Fmp, (UINT8)ImageIndex, Image, &ImageSize);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
-    Print(L"Fmp->GetImage - %r\n", Status);\r
-    return ;\r
+    Print (L"Fmp->GetImage - %r\n", Status);\r
+    return;\r
   }\r
 \r
   Image = AllocatePool (ImageSize);\r
   if (Image == NULL) {\r
-    Print(L"Allocate FmpImage 0x%x - %r\n", ImageSize, EFI_OUT_OF_RESOURCES);\r
-    return ;\r
+    Print (L"Allocate FmpImage 0x%x - %r\n", ImageSize, EFI_OUT_OF_RESOURCES);\r
+    return;\r
   }\r
 \r
   Status = Fmp->GetImage (Fmp, (UINT8)ImageIndex, Image, &ImageSize);\r
-  if (EFI_ERROR(Status)) {\r
-    Print(L"Fmp->GetImage - %r\n", Status);\r
-    return ;\r
+  if (EFI_ERROR (Status)) {\r
+    Print (L"Fmp->GetImage - %r\n", Status);\r
+    return;\r
   }\r
 \r
-  Status = WriteFileFromBuffer(ImageName, ImageSize, Image);\r
-  Print(L"CapsuleApp: Dump %g ImageIndex (0x%x) to %s %r\n", ImageTypeId, ImageIndex, ImageName, Status);\r
+  Status = WriteFileFromBuffer (ImageName, ImageSize, Image);\r
+  Print (L"CapsuleApp: Dump %g ImageIndex (0x%x) to %s %r\n", ImageTypeId, ImageIndex, ImageName, Status);\r
 \r
   FreePool (Image);\r
 \r
-  return ;\r
+  return;\r
 }\r