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>

3 files changed, 125 insertions, 98 deletions

diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c
index 7dc2eea239..c9d679cb84 100644
--- a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c
+++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c
@@ -29,17 +29,17 @@
 STATIC

 VOID *

 AllocateMemoryBelow4G (

-  IN EFI_MEMORY_TYPE    MemoryType,

-  IN UINTN              Size

+  IN EFI_MEMORY_TYPE  MemoryType,

+  IN UINTN            Size

   )

 {

   UINTN                 Pages;

   EFI_PHYSICAL_ADDRESS  Address;

   EFI_STATUS            Status;

-  VOID*                 Buffer;

+  VOID                  *Buffer;

   UINTN                 AllocRemaining;

 

-  Pages = EFI_SIZE_TO_PAGES (Size);

+  Pages   = EFI_SIZE_TO_PAGES (Size);

   Address = 0xffffffff;

 

   //

@@ -49,36 +49,35 @@ AllocateMemoryBelow4G (
   // allocations, and use these to allocate memory for small buffers.

   //

   ASSERT (mLockBoxGlobal->Signature == LOCK_BOX_GLOBAL_SIGNATURE);

-  if ((UINTN) mLockBoxGlobal->SubPageRemaining >= Size) {

-    Buffer = (VOID*)(UINTN) mLockBoxGlobal->SubPageBuffer;

-    mLockBoxGlobal->SubPageBuffer += (UINT32) Size;

-    mLockBoxGlobal->SubPageRemaining -= (UINT32) Size;

+  if ((UINTN)mLockBoxGlobal->SubPageRemaining >= Size) {

+    Buffer                            = (VOID *)(UINTN)mLockBoxGlobal->SubPageBuffer;

+    mLockBoxGlobal->SubPageBuffer    += (UINT32)Size;

+    mLockBoxGlobal->SubPageRemaining -= (UINT32)Size;

     return Buffer;

   }

 

-  Status  = gBS->AllocatePages (

-                   AllocateMaxAddress,

-                   MemoryType,

-                   Pages,

-                   &Address

-                   );

+  Status = gBS->AllocatePages (

+                  AllocateMaxAddress,

+                  MemoryType,

+                  Pages,

+                  &Address

+                  );

   if (EFI_ERROR (Status)) {

     return NULL;

   }

 

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

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

   ZeroMem (Buffer, EFI_PAGES_TO_SIZE (Pages));

 

   AllocRemaining = EFI_PAGES_TO_SIZE (Pages) - Size;

-  if (AllocRemaining > (UINTN) mLockBoxGlobal->SubPageRemaining) {

-    mLockBoxGlobal->SubPageBuffer = (UINT32) (Address + Size);

-    mLockBoxGlobal->SubPageRemaining = (UINT32) AllocRemaining;

+  if (AllocRemaining > (UINTN)mLockBoxGlobal->SubPageRemaining) {

+    mLockBoxGlobal->SubPageBuffer    = (UINT32)(Address + Size);

+    mLockBoxGlobal->SubPageRemaining = (UINT32)AllocRemaining;

   }

 

   return Buffer;

 }

 

-

 /**

   Allocates a buffer of type EfiACPIMemoryNVS.

 

@@ -102,7 +101,6 @@ AllocateAcpiNvsPool (
   return AllocateMemoryBelow4G (EfiACPIMemoryNVS, AllocationSize);

 }

 

-

 EFI_STATUS

 EFIAPI

 LockBoxDxeLibInitialize (

@@ -110,8 +108,8 @@ LockBoxDxeLibInitialize (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS    Status;

-  VOID          *Interface;

+  EFI_STATUS  Status;

+  VOID        *Interface;

 

   Status = LockBoxLibInitialize ();

   if (!EFI_ERROR (Status)) {

diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
index 95ab4332e7..2000afeeb8 100644
--- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
+++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
@@ -18,17 +18,17 @@
 

 #pragma pack(1)

 typedef struct {

-  EFI_GUID             Guid;

-  EFI_PHYSICAL_ADDRESS OrigAddress;

-  EFI_PHYSICAL_ADDRESS CopyAddress;

-  UINT32               Size;

-  UINT64               Attributes;

+  EFI_GUID                Guid;

+  EFI_PHYSICAL_ADDRESS    OrigAddress;

+  EFI_PHYSICAL_ADDRESS    CopyAddress;

+  UINT32                  Size;

+  UINT64                  Attributes;

 } LOCK_BOX_ENTRY;

 #pragma pack()

 

-LOCK_BOX_GLOBAL *mLockBoxGlobal = NULL;

-STATIC LOCK_BOX_ENTRY *StartOfEntries = NULL;

-STATIC LOCK_BOX_ENTRY *EndOfEntries = NULL;

+LOCK_BOX_GLOBAL        *mLockBoxGlobal = NULL;

+STATIC LOCK_BOX_ENTRY  *StartOfEntries = NULL;

+STATIC LOCK_BOX_ENTRY  *EndOfEntries   = NULL;

 

 RETURN_STATUS

 EFIAPI

@@ -36,7 +36,7 @@ LockBoxLibInitialize (
   VOID

   )

 {

-  UINTN NumEntries;

+  UINTN  NumEntries;

 

   ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));

 

@@ -44,10 +44,10 @@ LockBoxLibInitialize (
     return RETURN_UNSUPPORTED;

   }

 

-  mLockBoxGlobal = (LOCK_BOX_GLOBAL *)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase);

-  StartOfEntries = ((LOCK_BOX_ENTRY *) (mLockBoxGlobal + 1));

-  NumEntries = ((PcdGet32 (PcdOvmfLockBoxStorageSize) - sizeof (LOCK_BOX_GLOBAL)) /

-                sizeof (LOCK_BOX_ENTRY));

+  mLockBoxGlobal = (LOCK_BOX_GLOBAL *)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase);

+  StartOfEntries = ((LOCK_BOX_ENTRY *)(mLockBoxGlobal + 1));

+  NumEntries     = ((PcdGet32 (PcdOvmfLockBoxStorageSize) - sizeof (LOCK_BOX_GLOBAL)) /

+                    sizeof (LOCK_BOX_ENTRY));

   EndOfEntries = StartOfEntries + NumEntries;

   if (mLockBoxGlobal->Signature != LOCK_BOX_GLOBAL_SIGNATURE) {

     //

@@ -57,10 +57,10 @@ LockBoxLibInitialize (
     //

     mLockBoxGlobal->Signature = LOCK_BOX_GLOBAL_SIGNATURE;

   }

+

   return RETURN_SUCCESS;

 }

 

-

 /**

   Find LockBox entry based on GUID.

 

@@ -80,13 +80,13 @@ STATIC
 LOCK_BOX_ENTRY *

 EFIAPI

 FindHeaderByGuid (

-  IN CONST EFI_GUID *Guid

+  IN CONST EFI_GUID  *Guid

   )

 {

-  LOCK_BOX_ENTRY *Header;

+  LOCK_BOX_ENTRY  *Header;

 

   for (Header = StartOfEntries; Header < EndOfEntries; Header++) {

-    if (Header->Size == 0 || CompareGuid (Guid, &Header->Guid)) {

+    if ((Header->Size == 0) || CompareGuid (Guid, &Header->Guid)) {

       return Header;

     }

   }

@@ -94,7 +94,6 @@ FindHeaderByGuid (
   return NULL;

 }

 

-

 /**

   This function will save confidential information to lockbox.

 

@@ -115,18 +114,24 @@ FindHeaderByGuid (
 RETURN_STATUS

 EFIAPI

 SaveLockBox (

-  IN  GUID                        *Guid,

-  IN  VOID                        *Buffer,

-  IN  UINTN                       Length

+  IN  GUID   *Guid,

+  IN  VOID   *Buffer,

+  IN  UINTN  Length

   )

 {

-  LOCK_BOX_ENTRY *Header;

+  LOCK_BOX_ENTRY  *Header;

   VOID            *CopyBuffer;

 

-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p Length=0x%x\n", __FUNCTION__,

-    Guid, Buffer, (UINT32) Length));

+  DEBUG ((

+    DEBUG_VERBOSE,

+    "%a: Guid=%g Buffer=%p Length=0x%x\n",

+    __FUNCTION__,

+    Guid,

+    Buffer,

+    (UINT32)Length

+    ));

 

-  if (Guid == NULL || Buffer == NULL || Length == 0) {

+  if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {

     return RETURN_INVALID_PARAMETER;

   }

 

@@ -152,9 +157,9 @@ SaveLockBox (
   // overwrite the current terminator header with new metadata

   //

   CopyGuid (&Header->Guid, Guid);

-  Header->OrigAddress = (UINTN) Buffer;

-  Header->CopyAddress = (UINTN) CopyBuffer;

-  Header->Size        = (UINT32) Length;

+  Header->OrigAddress = (UINTN)Buffer;

+  Header->CopyAddress = (UINTN)CopyBuffer;

+  Header->Size        = (UINT32)Length;

   Header->Attributes  = 0;

 

   //

@@ -165,7 +170,6 @@ SaveLockBox (
   return RETURN_SUCCESS;

 }

 

-

 /**

   This function will set lockbox attributes.

 

@@ -183,29 +187,34 @@ SaveLockBox (
 RETURN_STATUS

 EFIAPI

 SetLockBoxAttributes (

-  IN  GUID                        *Guid,

-  IN  UINT64                      Attributes

+  IN  GUID    *Guid,

+  IN  UINT64  Attributes

   )

 {

-  LOCK_BOX_ENTRY *Header;

+  LOCK_BOX_ENTRY  *Header;

 

-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Attributes=0x%Lx\n", __FUNCTION__, Guid,

-    Attributes));

+  DEBUG ((

+    DEBUG_VERBOSE,

+    "%a: Guid=%g Attributes=0x%Lx\n",

+    __FUNCTION__,

+    Guid,

+    Attributes

+    ));

 

   if (Guid == NULL) {

     return RETURN_INVALID_PARAMETER;

   }

 

   Header = FindHeaderByGuid (Guid);

-  if (!Header || Header->Size == 0) {

+  if (!Header || (Header->Size == 0)) {

     return RETURN_NOT_FOUND;

   }

+

   Header->Attributes = Attributes;

 

   return RETURN_SUCCESS;

 }

 

-

 /**

   This function will update confidential information to lockbox.

 

@@ -233,37 +242,43 @@ SetLockBoxAttributes (
 RETURN_STATUS

 EFIAPI

 UpdateLockBox (

-  IN  GUID                        *Guid,

-  IN  UINTN                       Offset,

-  IN  VOID                        *Buffer,

-  IN  UINTN                       Length

+  IN  GUID   *Guid,

+  IN  UINTN  Offset,

+  IN  VOID   *Buffer,

+  IN  UINTN  Length

   )

 {

-  LOCK_BOX_ENTRY *Header;

-

-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Offset=0x%x Length=0x%x\n", __FUNCTION__,

-    Guid, (UINT32) Offset, (UINT32) Length));

-

-  if (Guid == NULL || Buffer == NULL || Length == 0) {

+  LOCK_BOX_ENTRY  *Header;

+

+  DEBUG ((

+    DEBUG_VERBOSE,

+    "%a: Guid=%g Offset=0x%x Length=0x%x\n",

+    __FUNCTION__,

+    Guid,

+    (UINT32)Offset,

+    (UINT32)Length

+    ));

+

+  if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {

     return RETURN_INVALID_PARAMETER;

   }

 

   Header = FindHeaderByGuid (Guid);

-  if (!Header || Header->Size == 0) {

+  if (!Header || (Header->Size == 0)) {

     return RETURN_NOT_FOUND;

   }

 

-  if (Header->Size < Offset ||

-      Length > Header->Size - Offset) {

+  if ((Header->Size < Offset) ||

+      (Length > Header->Size - Offset))

+  {

     return RETURN_BUFFER_TOO_SMALL;

   }

 

-  CopyMem ((UINT8 *)(UINTN) (Header->CopyAddress) + Offset, Buffer, Length);

+  CopyMem ((UINT8 *)(UINTN)(Header->CopyAddress) + Offset, Buffer, Length);

 

   return RETURN_SUCCESS;

 }

 

-

 /**

   This function will restore confidential information from lockbox.

 

@@ -290,24 +305,30 @@ UpdateLockBox (
 RETURN_STATUS

 EFIAPI

 RestoreLockBox (

-  IN  GUID                        *Guid,

-  IN  VOID                        *Buffer  OPTIONAL,

-  IN  OUT UINTN                   *Length  OPTIONAL

+  IN  GUID       *Guid,

+  IN  VOID       *Buffer  OPTIONAL,

+  IN  OUT UINTN  *Length  OPTIONAL

   )

 {

-  LOCK_BOX_ENTRY *Header;

+  LOCK_BOX_ENTRY  *Header;

 

-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__, Guid,

-    Buffer));

+  DEBUG ((

+    DEBUG_VERBOSE,

+    "%a: Guid=%g Buffer=%p\n",

+    __FUNCTION__,

+    Guid,

+    Buffer

+    ));

 

   if ((Guid == NULL) ||

       ((Buffer == NULL) && (Length != NULL)) ||

-      ((Buffer != NULL) && (Length == NULL))) {

+      ((Buffer != NULL) && (Length == NULL)))

+  {

     return EFI_INVALID_PARAMETER;

   }

 

   Header = FindHeaderByGuid (Guid);

-  if (!Header || Header->Size == 0) {

+  if (!Header || (Header->Size == 0)) {

     return RETURN_NOT_FOUND;

   }

 

@@ -315,10 +336,12 @@ RestoreLockBox (
     if (!(Header->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE)) {

       return RETURN_WRITE_PROTECTED;

     }

+

     if (Header->OrigAddress + (Header->Size - 1) > MAX_ADDRESS) {

       return RETURN_UNSUPPORTED;

     }

-    Buffer = (VOID *)(UINTN) Header->OrigAddress;

+

+    Buffer = (VOID *)(UINTN)Header->OrigAddress;

   }

 

   //

@@ -332,15 +355,15 @@ RestoreLockBox (
       *Length = Header->Size;

       return EFI_BUFFER_TOO_SMALL;

     }

+

     *Length = Header->Size;

   }

 

-  CopyMem (Buffer, (VOID*)(UINTN) Header->CopyAddress, Header->Size);

+  CopyMem (Buffer, (VOID *)(UINTN)Header->CopyAddress, Header->Size);

 

   return RETURN_SUCCESS;

 }

 

-

 /**

   This function will restore confidential information from all lockbox which

   have RestoreInPlace attribute.

@@ -356,22 +379,30 @@ RestoreAllLockBoxInPlace (
   VOID

   )

 {

-  LOCK_BOX_ENTRY *Header;

+  LOCK_BOX_ENTRY  *Header;

 

   for (Header = StartOfEntries;

        Header < EndOfEntries && Header->Size > 0;

-       Header++) {

+       Header++)

+  {

     if (Header->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) {

-      VOID *Buffer;

+      VOID  *Buffer;

 

       if (Header->OrigAddress + (Header->Size - 1) > MAX_ADDRESS) {

         return RETURN_UNSUPPORTED;

       }

-      Buffer = (VOID *)(UINTN) Header->OrigAddress;

-      CopyMem (Buffer, (VOID*)(UINTN)Header->CopyAddress, Header->Size);

-      DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__,

-        &Header->Guid, Buffer));

+

+      Buffer = (VOID *)(UINTN)Header->OrigAddress;

+      CopyMem (Buffer, (VOID *)(UINTN)Header->CopyAddress, Header->Size);

+      DEBUG ((

+        DEBUG_VERBOSE,

+        "%a: Guid=%g Buffer=%p\n",

+        __FUNCTION__,

+        &Header->Guid,

+        Buffer

+        ));

     }

   }

+

   return RETURN_SUCCESS;

 }

diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.h b/OvmfPkg/Library/LockBoxLib/LockBoxLib.h
index d654ea6398..a5392c9124 100644
--- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.h
+++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.h
@@ -12,14 +12,14 @@
 #pragma pack(1)

 

 typedef struct {

-  UINT32               Signature;

-  UINT32               SubPageBuffer;

-  UINT32               SubPageRemaining;

+  UINT32    Signature;

+  UINT32    SubPageBuffer;

+  UINT32    SubPageRemaining;

 } LOCK_BOX_GLOBAL;

 

-#define LOCK_BOX_GLOBAL_SIGNATURE SIGNATURE_32('L', 'B', 'G', 'S')

+#define LOCK_BOX_GLOBAL_SIGNATURE  SIGNATURE_32('L', 'B', 'G', 'S')

 

-extern LOCK_BOX_GLOBAL *mLockBoxGlobal;

+extern LOCK_BOX_GLOBAL  *mLockBoxGlobal;

 

 #pragma pack()

 

@@ -43,12 +43,10 @@ AllocateAcpiNvsPool (
   IN UINTN  AllocationSize

   );

 

-

 RETURN_STATUS

 EFIAPI

 LockBoxLibInitialize (

   VOID

   );

 

-

 #endif