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, 25 insertions, 19 deletions

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index b3b9035eea..96771b1935 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
@@ -11,7 +11,6 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent

 **/

 

-

 #include <PiPei.h>

 

 #include <Guid/TpmInstance.h>

@@ -22,7 +21,7 @@
 

 #include "Tpm12Support.h"

 

-STATIC CONST EFI_PEI_PPI_DESCRIPTOR mTpmSelectedPpi = {

+STATIC CONST EFI_PEI_PPI_DESCRIPTOR  mTpmSelectedPpi = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gEfiTpmDeviceSelectedGuid,

   NULL

@@ -47,15 +46,15 @@ Tcg2ConfigPeimEntryPoint (
   IN CONST EFI_PEI_SERVICES     **PeiServices

   )

 {

-  UINTN                           Size;

-  EFI_STATUS                      Status;

+  UINTN       Size;

+  EFI_STATUS  Status;

 

   DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__));

 

   Status = InternalTpm12Detect ();

   if (!EFI_ERROR (Status)) {

     DEBUG ((DEBUG_INFO, "%a: TPM1.2 detected\n", __FUNCTION__));

-    Size = sizeof (gEfiTpmDeviceInstanceTpm12Guid);

+    Size   = sizeof (gEfiTpmDeviceInstanceTpm12Guid);

     Status = PcdSetPtrS (

                PcdTpmInstanceGuid,

                &Size,

@@ -66,7 +65,7 @@ Tcg2ConfigPeimEntryPoint (
     Status = Tpm2RequestUseTpm ();

     if (!EFI_ERROR (Status)) {

       DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));

-      Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);

+      Size   = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);

       Status = PcdSetPtrS (

                  PcdTpmInstanceGuid,

                  &Size,

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c b/OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c
index 4f5a775c7a..c88da5758b 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c
+++ b/OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c
@@ -14,8 +14,8 @@
 

 #pragma pack (1)

 typedef struct {

-  TPM_RSP_COMMAND_HDR   Hdr;

-  TPM_CURRENT_TICKS     CurrentTicks;

+  TPM_RSP_COMMAND_HDR    Hdr;

+  TPM_CURRENT_TICKS      CurrentTicks;

 } TPM_RSP_GET_TICKS;

 #pragma pack ()

 

@@ -44,8 +44,12 @@ TestTpm12 (
   Command.ordinal   = SwapBytes32 (TPM_ORD_GetTicks);

 

   Length = sizeof (Response);

-  Status = Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length,

-             (UINT8 *)&Response);

+  Status = Tpm12SubmitCommand (

+             sizeof (Command),

+             (UINT8 *)&Command,

+             &Length,

+             (UINT8 *)&Response

+             );

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -68,7 +72,7 @@ InternalTpm12Detect (
   VOID

   )

 {

-  EFI_STATUS Status;

+  EFI_STATUS  Status;

 

   Status = Tpm12RequestUseTpm ();

   if (EFI_ERROR (Status)) {

diff --git a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c b/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c
index 570c8467a6..88bb9e8e04 100644
--- a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c
+++ b/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c
@@ -7,7 +7,6 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent

 **/

 

-

 #include <PiPei.h>

 

 #include <Library/DebugLib.h>

@@ -36,8 +35,8 @@ TpmMmioSevDecryptPeimEntryPoint (
   IN CONST EFI_PEI_SERVICES     **PeiServices

   )

 {

-  RETURN_STATUS                   DecryptStatus;

-  EFI_STATUS                      Status;

+  RETURN_STATUS  DecryptStatus;

+  EFI_STATUS     Status;

 

   DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__));

 

@@ -58,20 +57,24 @@ TpmMmioSevDecryptPeimEntryPoint (
   // termination in this scenario, mark the range unencrypted ahead of access.

   //

   if (MemEncryptSevEsIsEnabled ()) {

-    DEBUG ((DEBUG_INFO,

+    DEBUG ((

+      DEBUG_INFO,

       "%a: mapping TPM MMIO address range unencrypted\n",

-      __FUNCTION__));

+      __FUNCTION__

+      ));

 

     DecryptStatus = MemEncryptSevClearMmioPageEncMask (

                       0,

                       FixedPcdGet64 (PcdTpmBaseAddress),

-                      EFI_SIZE_TO_PAGES ((UINTN) 0x5000)

+                      EFI_SIZE_TO_PAGES ((UINTN)0x5000)

                       );

 

     if (RETURN_ERROR (DecryptStatus)) {

-      DEBUG ((DEBUG_ERROR,

+      DEBUG ((

+        DEBUG_ERROR,

         "%a: failed to map TPM MMIO address range unencrypted\n",

-        __FUNCTION__));

+        __FUNCTION__

+        ));

       ASSERT_RETURN_ERROR (DecryptStatus);

     }

   }