MdeModulePkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the MdeModulePkg 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: Liming Gao <gaoliming@byosoft.com.cn>

7 files changed, 117 insertions, 113 deletions

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
index e05f14de67..b974d6067f 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
@@ -33,4 +33,3 @@ IsPersistAcrossResetCapsuleSupported (
   //

   return FeaturePcdGet (PcdSupportUpdateCapsuleReset) && !EfiAtRuntime ();

 }

-

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
index 3c96851e93..5eab31df3c 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
@@ -24,10 +24,10 @@
 **/

 VOID

 CapsuleCacheWriteBack (

-  IN  EFI_PHYSICAL_ADDRESS    ScatterGatherList

+  IN  EFI_PHYSICAL_ADDRESS  ScatterGatherList

   )

 {

-  EFI_CAPSULE_BLOCK_DESCRIPTOR    *Desc;

+  EFI_CAPSULE_BLOCK_DESCRIPTOR  *Desc;

 

   if (!EfiAtRuntime ()) {

     Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;

@@ -54,4 +54,3 @@ CapsuleCacheWriteBack (
       );

   }

 }

-

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
index edff7573b2..b795928ab6 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
@@ -25,8 +25,7 @@
 **/

 VOID

 CapsuleCacheWriteBack (

-  IN  EFI_PHYSICAL_ADDRESS    ScatterGatherList

+  IN  EFI_PHYSICAL_ADDRESS  ScatterGatherList

   )

 {

 }

-

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c
index 732a3c9ab4..f3cb6d5f8b 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c
@@ -26,4 +26,3 @@ IsPersistAcrossResetCapsuleSupported (
 {

   return FeaturePcdGet (PcdSupportUpdateCapsuleReset);

 }

-

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 2fba22dec2..50968a839e 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
@@ -19,10 +19,10 @@ EFI_HANDLE  mNewHandle = NULL;
 //

 // The times of calling UpdateCapsule ()

 //

-UINTN       mTimes      = 0;

+UINTN  mTimes = 0;

 

-UINT32      mMaxSizePopulateCapsule     = 0;

-UINT32      mMaxSizeNonPopulateCapsule  = 0;

+UINT32  mMaxSizePopulateCapsule    = 0;

+UINT32  mMaxSizeNonPopulateCapsule = 0;

 

 /**

   Passes capsules to the firmware with both virtual and physical mapping. Depending on the intended

@@ -58,24 +58,24 @@ UINT32      mMaxSizeNonPopulateCapsule  = 0;
 EFI_STATUS

 EFIAPI

 UpdateCapsule (

-  IN EFI_CAPSULE_HEADER      **CapsuleHeaderArray,

-  IN UINTN                   CapsuleCount,

-  IN EFI_PHYSICAL_ADDRESS    ScatterGatherList OPTIONAL

+  IN EFI_CAPSULE_HEADER    **CapsuleHeaderArray,

+  IN UINTN                 CapsuleCount,

+  IN EFI_PHYSICAL_ADDRESS  ScatterGatherList OPTIONAL

   )

 {

-  UINTN                     ArrayNumber;

-  EFI_STATUS                Status;

-  EFI_CAPSULE_HEADER        *CapsuleHeader;

-  BOOLEAN                   NeedReset;

-  BOOLEAN                   InitiateReset;

-  CHAR16                    CapsuleVarName[30];

-  CHAR16                    *TempVarName;

+  UINTN               ArrayNumber;

+  EFI_STATUS          Status;

+  EFI_CAPSULE_HEADER  *CapsuleHeader;

+  BOOLEAN             NeedReset;

+  BOOLEAN             InitiateReset;

+  CHAR16              CapsuleVarName[30];

+  CHAR16              *TempVarName;

 

   //

   // Check if platform support Capsule In RAM or not.

   // Platform could choose to drop CapsulePei/CapsuleX64 and do not support Capsule In RAM.

   //

-  if (!PcdGetBool(PcdCapsuleInRamSupport)) {

+  if (!PcdGetBool (PcdCapsuleInRamSupport)) {

     return EFI_UNSUPPORTED;

   }

 

@@ -100,6 +100,7 @@ UpdateCapsule (
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {

       return EFI_INVALID_PARAMETER;

     }

+

     //

     // A capsule which has the CAPSULE_FLAGS_INITIATE_RESET flag must have

     // CAPSULE_FLAGS_PERSIST_ACROSS_RESET set in its header as well.

@@ -111,9 +112,10 @@ UpdateCapsule (
     //

     // Check FMP capsule flag

     //

-    if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)

-     && (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {

-       return EFI_INVALID_PARAMETER;

+    if (  CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)

+       && ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0))

+    {

+      return EFI_INVALID_PARAMETER;

     }

 

     //

@@ -121,7 +123,7 @@ UpdateCapsule (
     //

     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {

       Status = SupportCapsuleImage (CapsuleHeader);

-      if (EFI_ERROR(Status)) {

+      if (EFI_ERROR (Status)) {

         return Status;

       }

     }

@@ -131,7 +133,7 @@ UpdateCapsule (
   // Walk through all capsules, record whether there is a capsule needs reset

   // or initiate reset. And then process capsules which has no reset flag directly.

   //

-  for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {

+  for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {

     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];

     //

     // Here should be in the boot-time for non-reset capsule image

@@ -141,9 +143,10 @@ UpdateCapsule (
       if (EfiAtRuntime () && !FeaturePcdGet (PcdSupportProcessCapsuleAtRuntime)) {

         Status = EFI_OUT_OF_RESOURCES;

       } else {

-        Status = ProcessCapsuleImage(CapsuleHeader);

+        Status = ProcessCapsuleImage (CapsuleHeader);

       }

-      if (EFI_ERROR(Status)) {

+

+      if (EFI_ERROR (Status)) {

         return Status;

       }

     } else {

@@ -166,7 +169,7 @@ UpdateCapsule (
   // ScatterGatherList is only referenced if the capsules are defined to persist across

   // system reset.

   //

-  if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) (UINTN) NULL) {

+  if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS)(UINTN)NULL) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -183,7 +186,7 @@ UpdateCapsule (
   // Construct variable name CapsuleUpdateData, CapsuleUpdateData1, CapsuleUpdateData2...

   // if user calls UpdateCapsule multiple times.

   //

-  StrCpyS (CapsuleVarName, sizeof(CapsuleVarName)/sizeof(CHAR16), EFI_CAPSULE_VARIABLE_NAME);

+  StrCpyS (CapsuleVarName, sizeof (CapsuleVarName)/sizeof (CHAR16), EFI_CAPSULE_VARIABLE_NAME);

   TempVarName = CapsuleVarName + StrLen (CapsuleVarName);

   if (mTimes > 0) {

     UnicodeValueToStringS (

@@ -205,22 +208,23 @@ UpdateCapsule (
              &gEfiCapsuleVendorGuid,

              EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,

              sizeof (UINTN),

-             (VOID *) &ScatterGatherList

+             (VOID *)&ScatterGatherList

              );

   if (!EFI_ERROR (Status)) {

-     //

-     // Variable has been set successfully, increase variable index.

-     //

-     mTimes++;

-     if(InitiateReset) {

-       //

-       // Firmware that encounters a capsule which has the CAPSULE_FLAGS_INITIATE_RESET Flag set in its header

-       // will initiate a reset of the platform which is compatible with the passed-in capsule request and will

-       // not return back to the caller.

-       //

-       EfiResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);

-     }

+    //

+    // Variable has been set successfully, increase variable index.

+    //

+    mTimes++;

+    if (InitiateReset) {

+      //

+      // Firmware that encounters a capsule which has the CAPSULE_FLAGS_INITIATE_RESET Flag set in its header

+      // will initiate a reset of the platform which is compatible with the passed-in capsule request and will

+      // not return back to the caller.

+      //

+      EfiResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);

+    }

   }

+

   return Status;

 }

 

@@ -248,16 +252,16 @@ UpdateCapsule (
 EFI_STATUS

 EFIAPI

 QueryCapsuleCapabilities (

-  IN  EFI_CAPSULE_HEADER   **CapsuleHeaderArray,

-  IN  UINTN                CapsuleCount,

-  OUT UINT64               *MaxiumCapsuleSize,

-  OUT EFI_RESET_TYPE       *ResetType

+  IN  EFI_CAPSULE_HEADER  **CapsuleHeaderArray,

+  IN  UINTN               CapsuleCount,

+  OUT UINT64              *MaxiumCapsuleSize,

+  OUT EFI_RESET_TYPE      *ResetType

   )

 {

-  EFI_STATUS                Status;

-  UINTN                     ArrayNumber;

-  EFI_CAPSULE_HEADER        *CapsuleHeader;

-  BOOLEAN                   NeedReset;

+  EFI_STATUS          Status;

+  UINTN               ArrayNumber;

+  EFI_CAPSULE_HEADER  *CapsuleHeader;

+  BOOLEAN             NeedReset;

 

   //

   // Capsule Count can't be less than one.

@@ -269,7 +273,7 @@ QueryCapsuleCapabilities (
   //

   // Check whether input parameter is valid

   //

-  if ((MaxiumCapsuleSize == NULL) ||(ResetType == NULL)) {

+  if ((MaxiumCapsuleSize == NULL) || (ResetType == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -285,6 +289,7 @@ QueryCapsuleCapabilities (
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {

       return EFI_INVALID_PARAMETER;

     }

+

     //

     // A capsule which has the CAPSULE_FLAGS_INITIATE_RESET flag must have

     // CAPSULE_FLAGS_PERSIST_ACROSS_RESET set in its header as well.

@@ -296,9 +301,10 @@ QueryCapsuleCapabilities (
     //

     // Check FMP capsule flag

     //

-    if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)

-     && (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {

-       return EFI_INVALID_PARAMETER;

+    if (  CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)

+       && ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0))

+    {

+      return EFI_INVALID_PARAMETER;

     }

 

     //

@@ -306,7 +312,7 @@ QueryCapsuleCapabilities (
     //

     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {

       Status = SupportCapsuleImage (CapsuleHeader);

-      if (EFI_ERROR(Status)) {

+      if (EFI_ERROR (Status)) {

         return Status;

       }

     }

@@ -315,7 +321,7 @@ QueryCapsuleCapabilities (
   //

   // Find out whether there is any capsule defined to persist across system reset.

   //

-  for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {

+  for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {

     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];

     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) != 0) {

       NeedReset = TRUE;

@@ -325,25 +331,25 @@ QueryCapsuleCapabilities (
 

   if (NeedReset) {

     //

-    //Check if the platform supports update capsule across a system reset

+    // Check if the platform supports update capsule across a system reset

     //

     if (!IsPersistAcrossResetCapsuleSupported ()) {

       return EFI_UNSUPPORTED;

     }

-    *ResetType = EfiResetWarm;

-    *MaxiumCapsuleSize = (UINT64) mMaxSizePopulateCapsule;

+

+    *ResetType         = EfiResetWarm;

+    *MaxiumCapsuleSize = (UINT64)mMaxSizePopulateCapsule;

   } else {

     //

     // For non-reset capsule image.

     //

-    *ResetType = EfiResetCold;

-    *MaxiumCapsuleSize = (UINT64) mMaxSizeNonPopulateCapsule;

+    *ResetType         = EfiResetCold;

+    *MaxiumCapsuleSize = (UINT64)mMaxSizeNonPopulateCapsule;

   }

 

   return EFI_SUCCESS;

 }

 

-

 /**

 

   This code installs UEFI capsule runtime service.

@@ -357,14 +363,14 @@ QueryCapsuleCapabilities (
 EFI_STATUS

 EFIAPI

 CapsuleServiceInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

   EFI_STATUS  Status;

 

-  mMaxSizePopulateCapsule = PcdGet32(PcdMaxSizePopulateCapsule);

-  mMaxSizeNonPopulateCapsule = PcdGet32(PcdMaxSizeNonPopulateCapsule);

+  mMaxSizePopulateCapsule    = PcdGet32 (PcdMaxSizePopulateCapsule);

+  mMaxSizeNonPopulateCapsule = PcdGet32 (PcdMaxSizeNonPopulateCapsule);

 

   //

   // When PEI phase is IA32, DXE phase is X64, it is possible that capsule data are

@@ -378,8 +384,8 @@ CapsuleServiceInitialize (
   //

   // Install capsule runtime services into UEFI runtime service tables.

   //

-  gRT->UpdateCapsule                    = UpdateCapsule;

-  gRT->QueryCapsuleCapabilities         = QueryCapsuleCapabilities;

+  gRT->UpdateCapsule            = UpdateCapsule;

+  gRT->QueryCapsuleCapabilities = QueryCapsuleCapabilities;

 

   //

   // Install the Capsule Architectural Protocol on a new handle

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 069df3c750..c671626f2f 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
@@ -64,7 +64,7 @@ IsPersistAcrossResetCapsuleSupported (
 **/

 VOID

 CapsuleCacheWriteBack (

-  IN  EFI_PHYSICAL_ADDRESS    ScatterGatherList

+  IN  EFI_PHYSICAL_ADDRESS  ScatterGatherList

   );

 

 #endif

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
index eab24e4da0..dab297dd0a 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
@@ -28,7 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 // 8 extra pages for PF handler.

 //

-#define EXTRA_PAGE_TABLE_PAGES   8

+#define EXTRA_PAGE_TABLE_PAGES  8

 

 /**

   Allocate EfiReservedMemoryType below 4G memory address.

@@ -40,28 +40,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
   @return Allocated Address for output.

 

 **/

-VOID*

+VOID *

 AllocateReservedMemoryBelow4G (

-  IN   UINTN   Size

+  IN   UINTN  Size

   )

 {

   UINTN                 Pages;

   EFI_PHYSICAL_ADDRESS  Address;

   EFI_STATUS            Status;

-  VOID*                 Buffer;

+  VOID                  *Buffer;

 

-  Pages = EFI_SIZE_TO_PAGES (Size);

+  Pages   = EFI_SIZE_TO_PAGES (Size);

   Address = 0xffffffff;

 

-  Status  = gBS->AllocatePages (

-                   AllocateMaxAddress,

-                   EfiReservedMemoryType,

-                   Pages,

-                   &Address

-                   );

+  Status = gBS->AllocatePages (

+                  AllocateMaxAddress,

+                  EfiReservedMemoryType,

+                  Pages,

+                  &Address

+                  );

   ASSERT_EFI_ERROR (Status);

 

-  Buffer = (VOID *) (UINTN) Address;

+  Buffer = (VOID *)(UINTN)Address;

   ZeroMem (Buffer, Size);

 

   return Buffer;

@@ -77,16 +77,17 @@ AllocateReservedMemoryBelow4G (
 VOID

 EFIAPI

 VariableLockCapsuleLongModeBufferVariable (

-  IN  EFI_EVENT                             Event,

-  IN  VOID                                  *Context

+  IN  EFI_EVENT  Event,

+  IN  VOID       *Context

   )

 {

   EFI_STATUS                    Status;

   EDKII_VARIABLE_LOCK_PROTOCOL  *VariableLock;

+

   //

   // Mark EFI_CAPSULE_LONG_MODE_BUFFER_NAME variable to read-only if the Variable Lock protocol exists

   //

-  Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);

+  Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **)&VariableLock);

   if (!EFI_ERROR (Status)) {

     Status = VariableLock->RequestToLock (VariableLock, EFI_CAPSULE_LONG_MODE_BUFFER_NAME, &gEfiCapsuleVendorGuid);

     ASSERT_EFI_ERROR (Status);

@@ -104,23 +105,23 @@ PrepareContextForCapsulePei (
   VOID

   )

 {

-  UINTN                                         ExtraPageTablePages;

-  UINT32                                        RegEax;

-  UINT32                                        RegEdx;

-  UINTN                                         TotalPagesNum;

-  UINT8                                         PhysicalAddressBits;

-  UINT32                                        NumberOfPml4EntriesNeeded;

-  UINT32                                        NumberOfPdpEntriesNeeded;

-  BOOLEAN                                       Page1GSupport;

-  EFI_CAPSULE_LONG_MODE_BUFFER                  LongModeBuffer;

-  EFI_STATUS                                    Status;

-  VOID                                          *Registration;

+  UINTN                         ExtraPageTablePages;

+  UINT32                        RegEax;

+  UINT32                        RegEdx;

+  UINTN                         TotalPagesNum;

+  UINT8                         PhysicalAddressBits;

+  UINT32                        NumberOfPml4EntriesNeeded;

+  UINT32                        NumberOfPdpEntriesNeeded;

+  BOOLEAN                       Page1GSupport;

+  EFI_CAPSULE_LONG_MODE_BUFFER  LongModeBuffer;

+  EFI_STATUS                    Status;

+  VOID                          *Registration;

 

   //

   // Calculate the size of page table, allocate the memory.

   //

   Page1GSupport = FALSE;

-  if (PcdGetBool(PcdUse1GPageTable)) {

+  if (PcdGetBool (PcdUse1GPageTable)) {

     AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);

     if (RegEax >= 0x80000001) {

       AsmCpuid (0x80000001, NULL, NULL, NULL, &RegEdx);

@@ -142,10 +143,10 @@ PrepareContextForCapsulePei (
   //

   if (PhysicalAddressBits <= 39 ) {

     NumberOfPml4EntriesNeeded = 1;

-    NumberOfPdpEntriesNeeded = (UINT32)LShiftU64 (1, (PhysicalAddressBits - 30));

+    NumberOfPdpEntriesNeeded  = (UINT32)LShiftU64 (1, (PhysicalAddressBits - 30));

   } else {

     NumberOfPml4EntriesNeeded = (UINT32)LShiftU64 (1, (PhysicalAddressBits - 39));

-    NumberOfPdpEntriesNeeded = 512;

+    NumberOfPdpEntriesNeeded  = 512;

   }

 

   if (!Page1GSupport) {

@@ -153,6 +154,7 @@ PrepareContextForCapsulePei (
   } else {

     TotalPagesNum = NumberOfPml4EntriesNeeded + 1;

   }

+

   TotalPagesNum += ExtraPageTablePages;

   DEBUG ((DEBUG_INFO, "CapsuleRuntimeDxe X64 TotalPagesNum - 0x%x pages\n", TotalPagesNum));

 

@@ -174,20 +176,20 @@ PrepareContextForCapsulePei (
                   &LongModeBuffer

                   );

   if (!EFI_ERROR (Status)) {

-      //

-      // Register callback function upon VariableLockProtocol

-      // to lock EFI_CAPSULE_LONG_MODE_BUFFER_NAME variable to avoid malicious code to update it.

-      //

-      EfiCreateProtocolNotifyEvent (

-        &gEdkiiVariableLockProtocolGuid,

-        TPL_CALLBACK,

-        VariableLockCapsuleLongModeBufferVariable,

-        NULL,

-        &Registration

-        );

+    //

+    // Register callback function upon VariableLockProtocol

+    // to lock EFI_CAPSULE_LONG_MODE_BUFFER_NAME variable to avoid malicious code to update it.

+    //

+    EfiCreateProtocolNotifyEvent (

+      &gEdkiiVariableLockProtocolGuid,

+      TPL_CALLBACK,

+      VariableLockCapsuleLongModeBufferVariable,

+      NULL,

+      &Registration

+      );

   } else {

-      DEBUG ((DEBUG_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be saved: %r. Capsule in PEI may fail!\n", Status));

-      gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (LongModeBuffer.StackSize));

+    DEBUG ((DEBUG_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be saved: %r. Capsule in PEI may fail!\n", Status));

+    gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (LongModeBuffer.StackSize));

   }

 }

 

@@ -200,7 +202,7 @@ SaveLongModeContext (
   VOID

   )

 {

-  if ((FeaturePcdGet(PcdSupportUpdateCapsuleReset)) && (FeaturePcdGet (PcdDxeIplSwitchToLongMode))) {

+  if ((FeaturePcdGet (PcdSupportUpdateCapsuleReset)) && (FeaturePcdGet (PcdDxeIplSwitchToLongMode))) {

     //

     // Allocate memory for Capsule IA32 PEIM, it will create page table to transfer to long mode to access capsule above 4GB.

     //