IntelFsp2WrapperPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the IntelFsp2WrapperPkg 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: Chasel Chiu <chasel.chiu@intel.com>

7 files changed, 69 insertions, 72 deletions

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/FspWrapperPlatformSecLibSample.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/FspWrapperPlatformSecLibSample.c
index 0902cadb24..29d4bb7c46 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/FspWrapperPlatformSecLibSample.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/FspWrapperPlatformSecLibSample.c
@@ -29,9 +29,9 @@
 EFI_STATUS

 EFIAPI

 SecPlatformInformation (

-  IN CONST EFI_PEI_SERVICES                     **PeiServices,

-  IN OUT   UINT64                               *StructureSize,

-     OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord

+  IN CONST EFI_PEI_SERVICES                  **PeiServices,

+  IN OUT   UINT64                            *StructureSize,

+  OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord

   );

 

 /**

@@ -95,30 +95,30 @@ EFI_PEI_PPI_DESCRIPTOR  mPeiSecPlatformPpi[] = {
 EFI_PEI_PPI_DESCRIPTOR *

 EFIAPI

 SecPlatformMain (

-  IN OUT   EFI_SEC_PEI_HAND_OFF        *SecCoreData

+  IN OUT   EFI_SEC_PEI_HAND_OFF  *SecCoreData

   )

 {

-  EFI_PEI_PPI_DESCRIPTOR      *PpiList;

+  EFI_PEI_PPI_DESCRIPTOR  *PpiList;

 

-  DEBUG((DEBUG_INFO, "SecPlatformMain\n"));

+  DEBUG ((DEBUG_INFO, "SecPlatformMain\n"));

 

-  DEBUG((DEBUG_INFO, "BootFirmwareVolumeBase - 0x%x\n", SecCoreData->BootFirmwareVolumeBase));

-  DEBUG((DEBUG_INFO, "BootFirmwareVolumeSize - 0x%x\n", SecCoreData->BootFirmwareVolumeSize));

-  DEBUG((DEBUG_INFO, "TemporaryRamBase       - 0x%x\n", SecCoreData->TemporaryRamBase));

-  DEBUG((DEBUG_INFO, "TemporaryRamSize       - 0x%x\n", SecCoreData->TemporaryRamSize));

-  DEBUG((DEBUG_INFO, "PeiTemporaryRamBase    - 0x%x\n", SecCoreData->PeiTemporaryRamBase));

-  DEBUG((DEBUG_INFO, "PeiTemporaryRamSize    - 0x%x\n", SecCoreData->PeiTemporaryRamSize));

-  DEBUG((DEBUG_INFO, "StackBase              - 0x%x\n", SecCoreData->StackBase));

-  DEBUG((DEBUG_INFO, "StackSize              - 0x%x\n", SecCoreData->StackSize));

+  DEBUG ((DEBUG_INFO, "BootFirmwareVolumeBase - 0x%x\n", SecCoreData->BootFirmwareVolumeBase));

+  DEBUG ((DEBUG_INFO, "BootFirmwareVolumeSize - 0x%x\n", SecCoreData->BootFirmwareVolumeSize));

+  DEBUG ((DEBUG_INFO, "TemporaryRamBase       - 0x%x\n", SecCoreData->TemporaryRamBase));

+  DEBUG ((DEBUG_INFO, "TemporaryRamSize       - 0x%x\n", SecCoreData->TemporaryRamSize));

+  DEBUG ((DEBUG_INFO, "PeiTemporaryRamBase    - 0x%x\n", SecCoreData->PeiTemporaryRamBase));

+  DEBUG ((DEBUG_INFO, "PeiTemporaryRamSize    - 0x%x\n", SecCoreData->PeiTemporaryRamSize));

+  DEBUG ((DEBUG_INFO, "StackBase              - 0x%x\n", SecCoreData->StackBase));

+  DEBUG ((DEBUG_INFO, "StackSize              - 0x%x\n", SecCoreData->StackSize));

 

-  InitializeApicTimer (0, (UINT32) -1, TRUE, 5);

+  InitializeApicTimer (0, (UINT32)-1, TRUE, 5);

 

   //

   // Use middle of Heap as temp buffer, it will be copied by caller.

   // Do not use Stack, because it will cause wrong calculation on stack by PeiCore

   //

   PpiList = (VOID *)((UINTN)SecCoreData->PeiTemporaryRamBase + (UINTN)SecCoreData->PeiTemporaryRamSize/2);

-  CopyMem (PpiList, mPeiSecPlatformPpi, sizeof(mPeiSecPlatformPpi));

+  CopyMem (PpiList, mPeiSecPlatformPpi, sizeof (mPeiSecPlatformPpi));

 

   //

   // Patch TopOfTemporaryRamPpi

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Fsp.h b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Fsp.h
index b654a47af7..d2af7a5484 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Fsp.h
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/Ia32/Fsp.h
@@ -12,34 +12,34 @@
 //

 // Fv Header

 //

-#define FVH_FV_LENGTH_OFFSET          0x20

-#define FVH_SIGINATURE_OFFSET         0x28

-#define FVH_SIGINATURE_VALID_VALUE    0x4856465F  // valid signature:_FVH

-#define FVH_HEADER_LENGTH_OFFSET      0x30

-#define FVH_EXTHEADER_OFFSET_OFFSET   0x34

-#define FVH_EXTHEADER_SIZE_OFFSET     0x10

+#define FVH_FV_LENGTH_OFFSET         0x20

+#define FVH_SIGINATURE_OFFSET        0x28

+#define FVH_SIGINATURE_VALID_VALUE   0x4856465F   // valid signature:_FVH

+#define FVH_HEADER_LENGTH_OFFSET     0x30

+#define FVH_EXTHEADER_OFFSET_OFFSET  0x34

+#define FVH_EXTHEADER_SIZE_OFFSET    0x10

 

 //

 // Ffs Header

 //

-#define FSP_HEADER_SIGNATURE_OFFSET   0x1C

-#define FSP_HEADER_SIGNATURE          0x48505346    ; valid signature:FSPH

-#define FSP_HEADER_GUID_DWORD1        0x912740BE

-#define FSP_HEADER_GUID_DWORD2        0x47342284

-#define FSP_HEADER_GUID_DWORD3        0xB08471B9

-#define FSP_HEADER_GUID_DWORD4        0x0C3F3527

-#define FFS_HEADER_SIZE_VALUE         0x18

+#define FSP_HEADER_SIGNATURE_OFFSET  0x1C

+#define FSP_HEADER_SIGNATURE         0x48505346    ; valid signature:FSPH

+#define FSP_HEADER_GUID_DWORD1       0x912740BE

+#define FSP_HEADER_GUID_DWORD2       0x47342284

+#define FSP_HEADER_GUID_DWORD3       0xB08471B9

+#define FSP_HEADER_GUID_DWORD4       0x0C3F3527

+#define FFS_HEADER_SIZE_VALUE        0x18

 

 //

 // Section Header

 //

-#define SECTION_HEADER_TYPE_OFFSET    0x03

-#define RAW_SECTION_HEADER_SIZE_VALUE 0x04

+#define SECTION_HEADER_TYPE_OFFSET     0x03

+#define RAW_SECTION_HEADER_SIZE_VALUE  0x04

 

 //

 // Fsp Header

 //

-#define FSP_HEADER_IMAGEBASE_OFFSET     0x1C

-#define FSP_HEADER_TEMPRAMINIT_OFFSET   0x30

+#define FSP_HEADER_IMAGEBASE_OFFSET    0x1C

+#define FSP_HEADER_TEMPRAMINIT_OFFSET  0x30

 

 #endif

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/PlatformInit.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/PlatformInit.c
index 0523d0cf55..eae474675e 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/PlatformInit.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/PlatformInit.c
@@ -6,7 +6,6 @@
 

 **/

 

-

 #include <PiPei.h>

 #include <Library/DebugLib.h>

 #include <Library/SerialPortLib.h>

@@ -21,9 +20,9 @@
 VOID

 EFIAPI

 PlatformInit (

-  IN VOID                 *FspHobList,

-  IN VOID                 *StartOfRange,

-  IN VOID                 *EndOfRange

+  IN VOID  *FspHobList,

+  IN VOID  *StartOfRange,

+  IN VOID  *EndOfRange

   )

 {

   //

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecGetPerformance.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecGetPerformance.c
index 9ae15d1716..6946f4a01e 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecGetPerformance.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecGetPerformance.c
@@ -53,7 +53,7 @@ SecGetPerformance (
                              &gTopOfTemporaryRamPpiGuid,

                              0,

                              NULL,

-                             (VOID **) &TopOfTemporaryRamPpi

+                             (VOID **)&TopOfTemporaryRamPpi

                              );

   if (EFI_ERROR (Status)) {

     return EFI_NOT_FOUND;

@@ -72,12 +72,12 @@ SecGetPerformance (
   // |  TSC[31:00]  |

   // |--------------|

   //

-  TopOfTemporaryRam = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof(UINT32);

-  TopOfTemporaryRam -= sizeof(UINT32) * 2;

-  Count             = *(UINT32 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32));

-  Size              = Count * sizeof (UINT64);

+  TopOfTemporaryRam  = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UINT32);

+  TopOfTemporaryRam -= sizeof (UINT32) * 2;

+  Count              = *(UINT32 *)(UINTN)(TopOfTemporaryRam - sizeof (UINT32));

+  Size               = Count * sizeof (UINT64);

 

-  Ticker = *(UINT64 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32) - Size - sizeof (UINT32) * 2);

+  Ticker                = *(UINT64 *)(UINTN)(TopOfTemporaryRam - sizeof (UINT32) - Size - sizeof (UINT32) * 2);

   Performance->ResetEnd = GetTimeInNanoSecond (Ticker);

 

   return EFI_SUCCESS;

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecPlatformInformation.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecPlatformInformation.c
index 28e25fde22..1406d0f2ac 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecPlatformInformation.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecPlatformInformation.c
@@ -28,9 +28,9 @@
 EFI_STATUS

 EFIAPI

 SecPlatformInformation (

-  IN CONST EFI_PEI_SERVICES                     **PeiServices,

-  IN OUT   UINT64                               *StructureSize,

-     OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord

+  IN CONST EFI_PEI_SERVICES                  **PeiServices,

+  IN OUT   UINT64                            *StructureSize,

+  OUT   EFI_SEC_PLATFORM_INFORMATION_RECORD  *PlatformInformationRecord

   )

 {

   UINT32      *Bist;

@@ -47,7 +47,7 @@ SecPlatformInformation (
                              &gTopOfTemporaryRamPpiGuid,

                              0,

                              NULL,

-                             (VOID **) &TopOfTemporaryRamPpi

+                             (VOID **)&TopOfTemporaryRamPpi

                              );

   if (EFI_ERROR (Status)) {

     return EFI_NOT_FOUND;

@@ -59,18 +59,18 @@ SecPlatformInformation (
   // This routine copies the BIST information to the buffer pointed by

   // PlatformInformationRecord for output.

   //

-  TopOfTemporaryRam = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UINT32);

-  TopOfTemporaryRam -= sizeof(UINT32) * 2;

-  Count             = *((UINT32 *)(UINTN) (TopOfTemporaryRam - sizeof (UINT32)));

-  Size              = Count * sizeof (IA32_HANDOFF_STATUS);

+  TopOfTemporaryRam  = (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UINT32);

+  TopOfTemporaryRam -= sizeof (UINT32) * 2;

+  Count              = *((UINT32 *)(UINTN)(TopOfTemporaryRam - sizeof (UINT32)));

+  Size               = Count * sizeof (IA32_HANDOFF_STATUS);

 

-  if ((*StructureSize) < (UINT64) Size) {

+  if ((*StructureSize) < (UINT64)Size) {

     *StructureSize = Size;

     return EFI_BUFFER_TOO_SMALL;

   }

 

-  *StructureSize  = Size;

-  Bist            = (UINT32 *) (TopOfTemporaryRam - sizeof (UINT32) - Size);

+  *StructureSize = Size;

+  Bist           = (UINT32 *)(TopOfTemporaryRam - sizeof (UINT32) - Size);

 

   CopyMem (PlatformInformationRecord, Bist, Size);

 

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
index e57b5b57be..03616cb418 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
@@ -10,10 +10,10 @@
 #include <FspEas.h>

 

 typedef struct {

-  UINT32                      MicrocodeRegionBase;

-  UINT32                      MicrocodeRegionSize;

-  UINT32                      CodeRegionBase;

-  UINT32                      CodeRegionSize;

+  UINT32    MicrocodeRegionBase;

+  UINT32    MicrocodeRegionSize;

+  UINT32    CodeRegionBase;

+  UINT32    CodeRegionSize;

 } FSPT_CORE_UPD;

 

 typedef struct {

@@ -25,7 +25,7 @@ typedef struct {
   FSPT_CORE_UPD     FsptCoreUpd;

 } FSPT_UPD_CORE_DATA;

 

-GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA FsptUpdDataPtr = {

+GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA  FsptUpdDataPtr = {

   {

     0x4450555F54505346,

     //

@@ -33,8 +33,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA FsptUpdDataPtr = {
     //

     0x02,

     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

-    }

+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }

   },

   //

   // If platform does not support FSP spec 2.2 remove FSPT_ARCH_UPD structure.

@@ -58,4 +57,3 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA FsptUpdDataPtr = {
     FixedPcdGet32 (PcdFlashCodeCacheSize),

   }

 };

-

diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecTempRamDone.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecTempRamDone.c
index eafbadb152..ef426b3677 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecTempRamDone.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecTempRamDone.c
@@ -23,21 +23,21 @@ SecPlatformDisableTemporaryMemory (
   VOID

   )

 {

-  EFI_STATUS                Status;

-  VOID                      *TempRamExitParam;

-  FSP_INFO_HEADER           *FspHeader;

+  EFI_STATUS       Status;

+  VOID             *TempRamExitParam;

+  FSP_INFO_HEADER  *FspHeader;

 

-  FspHeader = FspFindFspHeader (PcdGet32(PcdFspmBaseAddress));

+  FspHeader = FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));

   if (FspHeader == NULL) {

-    return ;

+    return;

   }

 

-  DEBUG((DEBUG_INFO, "SecPlatformDisableTemporaryMemory enter\n"));

+  DEBUG ((DEBUG_INFO, "SecPlatformDisableTemporaryMemory enter\n"));

 

   TempRamExitParam = UpdateTempRamExitParam ();

-  Status = CallTempRamExit (TempRamExitParam);

-  DEBUG((DEBUG_INFO, "TempRamExit status: 0x%x\n", Status));

-  ASSERT_EFI_ERROR(Status);

+  Status           = CallTempRamExit (TempRamExitParam);

+  DEBUG ((DEBUG_INFO, "TempRamExit status: 0x%x\n", Status));

+  ASSERT_EFI_ERROR (Status);

 

-  return ;

+  return;

 }