StandaloneMmPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the StandaloneMmPkg 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: Sami Mujawar <sami.mujawar@arm.com>

8 files changed, 91 insertions, 103 deletions

diff --git a/StandaloneMmPkg/Include/Guid/MmCoreData.h b/StandaloneMmPkg/Include/Guid/MmCoreData.h
index f112a752c3..b8be92c6ab 100644
--- a/StandaloneMmPkg/Include/Guid/MmCoreData.h
+++ b/StandaloneMmPkg/Include/Guid/MmCoreData.h
@@ -13,16 +13,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define MM_CORE_DATA_HOB_GUID \

   { 0xa160bf99, 0x2aa4, 0x4d7d, { 0x99, 0x93, 0x89, 0x9c, 0xb1, 0x2d, 0xf3, 0x76 }}

 

-extern EFI_GUID gMmCoreDataHobGuid;

+extern EFI_GUID  gMmCoreDataHobGuid;

 

 typedef struct {

   //

   // Address pointer to MM_CORE_PRIVATE_DATA

   //

-  EFI_PHYSICAL_ADDRESS   Address;

+  EFI_PHYSICAL_ADDRESS    Address;

 } MM_CORE_DATA_HOB_DATA;

 

-

 ///

 /// Define values for the communications buffer used when gEfiEventDxeDispatchGuid is

 /// event signaled.  This event is signaled by the DXE Core each time the DXE Core

@@ -55,19 +54,19 @@ typedef struct {
 /// thos structure.

 ///

 typedef struct {

-  UINT64                          Signature;

+  UINT64                  Signature;

 

   ///

   /// The number of MMRAM ranges passed from the MM IPL to the MM Core.  The MM

   /// Core uses these ranges of MMRAM to initialize the MM Core memory manager.

   ///

-  UINT64                          MmramRangeCount;

+  UINT64                  MmramRangeCount;

 

   ///

   /// A table of MMRAM ranges passed from the MM IPL to the MM Core.  The MM

   /// Core uses these ranges of MMRAM to initialize the MM Core memory manager.

   ///

-  EFI_PHYSICAL_ADDRESS            MmramRanges;

+  EFI_PHYSICAL_ADDRESS    MmramRanges;

 

   ///

   /// The MM Foundation Entry Point.  The MM Core fills in this field when the

@@ -78,50 +77,50 @@ typedef struct {
   /// the MM Foundation Entry Point as soon as the MM Configuration Protocol is

   /// available.

   ///

-  EFI_PHYSICAL_ADDRESS            MmEntryPoint;

+  EFI_PHYSICAL_ADDRESS    MmEntryPoint;

 

   ///

   /// Boolean flag set to TRUE while an MMI is being processed by the MM Core.

   ///

-  BOOLEAN                         MmEntryPointRegistered;

+  BOOLEAN                 MmEntryPointRegistered;

 

   ///

   /// Boolean flag set to TRUE while an MMI is being processed by the MM Core.

   ///

-  BOOLEAN                         InMm;

+  BOOLEAN                 InMm;

 

   ///

   /// This field is set by the MM Core then the MM Core is initialized.  This field is

   /// used by the MM Base 2 Protocol and MM Communication Protocol implementations in

   /// the MM IPL.

   ///

-  EFI_PHYSICAL_ADDRESS            Mmst;

+  EFI_PHYSICAL_ADDRESS    Mmst;

 

   ///

   /// This field is used by the MM Communication Protocol to pass a buffer into

   /// a software MMI handler and for the software MMI handler to pass a buffer back to

   /// the caller of the MM Communication Protocol.

   ///

-  EFI_PHYSICAL_ADDRESS            CommunicationBuffer;

+  EFI_PHYSICAL_ADDRESS    CommunicationBuffer;

 

   ///

   /// This field is used by the MM Communication Protocol to pass the size of a buffer,

   /// in bytes, into a software MMI handler and for the software MMI handler to pass the

   /// size, in bytes, of a buffer back to the caller of the MM Communication Protocol.

   ///

-  UINT64                          BufferSize;

+  UINT64                  BufferSize;

 

   ///

   /// This field is used by the MM Communication Protocol to pass the return status from

   /// a software MMI handler back to the caller of the MM Communication Protocol.

   ///

-  UINT64                          ReturnStatus;

+  UINT64                  ReturnStatus;

 

-  EFI_PHYSICAL_ADDRESS            MmCoreImageBase;

-  UINT64                          MmCoreImageSize;

-  EFI_PHYSICAL_ADDRESS            MmCoreEntryPoint;

+  EFI_PHYSICAL_ADDRESS    MmCoreImageBase;

+  UINT64                  MmCoreImageSize;

+  EFI_PHYSICAL_ADDRESS    MmCoreEntryPoint;

 

-  EFI_PHYSICAL_ADDRESS            StandaloneBfvAddress;

+  EFI_PHYSICAL_ADDRESS    StandaloneBfvAddress;

 } MM_CORE_PRIVATE_DATA;

 

 #endif

diff --git a/StandaloneMmPkg/Include/Guid/MmFvDispatch.h b/StandaloneMmPkg/Include/Guid/MmFvDispatch.h
index 643f6e65f9..6ddc89bb87 100644
--- a/StandaloneMmPkg/Include/Guid/MmFvDispatch.h
+++ b/StandaloneMmPkg/Include/Guid/MmFvDispatch.h
@@ -14,19 +14,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define MM_FV_DISPATCH_GUID \

   { 0xb65694cc, 0x9e3, 0x4c3b, { 0xb5, 0xcd, 0x5, 0xf4, 0x4d, 0x3c, 0xdb, 0xff }}

 

-extern EFI_GUID gMmFvDispatchGuid;

+extern EFI_GUID  gMmFvDispatchGuid;

 

 #pragma pack(1)

 

 typedef struct {

-  EFI_PHYSICAL_ADDRESS  Address;

-  UINT64                Size;

+  EFI_PHYSICAL_ADDRESS    Address;

+  UINT64                  Size;

 } EFI_MM_COMMUNICATE_FV_DISPATCH_DATA;

 

 typedef struct {

-  EFI_GUID                              HeaderGuid;

-  UINTN                                 MessageLength;

-  EFI_MM_COMMUNICATE_FV_DISPATCH_DATA   Data;

+  EFI_GUID                               HeaderGuid;

+  UINTN                                  MessageLength;

+  EFI_MM_COMMUNICATE_FV_DISPATCH_DATA    Data;

 } EFI_MM_COMMUNICATE_FV_DISPATCH;

 #pragma pack()

 

diff --git a/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h b/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h
index 898865ae6e..1159d3adcf 100644
--- a/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h
+++ b/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h
@@ -42,15 +42,14 @@ typedef struct {
   /// In Framework MM CIS 0.91 specification, it defines the field type as UINTN.

   /// However, HOBs are supposed to be CPU neutral, so UINT32 should be used instead.

   ///

-  UINT32                NumberOfMmReservedRegions;

+  UINT32                  NumberOfMmReservedRegions;

   ///

   /// Used throughout this protocol to describe the candidate

   /// regions for MMRAM that are supported by this platform.

   ///

-  EFI_MMRAM_DESCRIPTOR  Descriptor[1];

+  EFI_MMRAM_DESCRIPTOR    Descriptor[1];

 } EFI_MMRAM_HOB_DESCRIPTOR_BLOCK;

 

-extern EFI_GUID gEfiMmPeiSmramMemoryReserveGuid;

+extern EFI_GUID  gEfiMmPeiSmramMemoryReserveGuid;

 

 #endif

-

diff --git a/StandaloneMmPkg/Include/Guid/MpInformation.h b/StandaloneMmPkg/Include/Guid/MpInformation.h
index e3a916dfc5..dbf88d12de 100644
--- a/StandaloneMmPkg/Include/Guid/MpInformation.h
+++ b/StandaloneMmPkg/Include/Guid/MpInformation.h
@@ -24,12 +24,12 @@
 

 #pragma pack(1)

 typedef struct {

-  UINT64                     NumberOfProcessors;

-  UINT64                     NumberOfEnabledProcessors;

-  EFI_PROCESSOR_INFORMATION  ProcessorInfoBuffer[];

+  UINT64                       NumberOfProcessors;

+  UINT64                       NumberOfEnabledProcessors;

+  EFI_PROCESSOR_INFORMATION    ProcessorInfoBuffer[];

 } MP_INFORMATION_HOB_DATA;

 #pragma pack()

 

-extern EFI_GUID gMpInformationHobGuid;

+extern EFI_GUID  gMpInformationHobGuid;

 

 #endif

diff --git a/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
index c44f7066c6..4593609dfc 100644
--- a/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
+++ b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
@@ -16,52 +16,52 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define CPU_INFO_FLAG_PRIMARY_CPU  0x00000001

 

 typedef struct {

-  UINT8  Type;       /* type of the structure */

-  UINT8  Version;    /* version of this structure */

-  UINT16 Size;      /* size of this structure in bytes */

-  UINT32 Attr;      /* attributes: unused bits SBZ */

+  UINT8     Type;    /* type of the structure */

+  UINT8     Version; /* version of this structure */

+  UINT16    Size;    /* size of this structure in bytes */

+  UINT32    Attr;    /* attributes: unused bits SBZ */

 } EFI_PARAM_HEADER;

 

 typedef struct {

-  UINT64 Mpidr;

-  UINT32 LinearId;

-  UINT32 Flags;

+  UINT64    Mpidr;

+  UINT32    LinearId;

+  UINT32    Flags;

 } EFI_SECURE_PARTITION_CPU_INFO;

 

 typedef struct {

-  EFI_PARAM_HEADER              Header;

-  UINT64                        SpMemBase;

-  UINT64                        SpMemLimit;

-  UINT64                        SpImageBase;

-  UINT64                        SpStackBase;

-  UINT64                        SpHeapBase;

-  UINT64                        SpNsCommBufBase;

-  UINT64                        SpSharedBufBase;

-  UINT64                        SpImageSize;

-  UINT64                        SpPcpuStackSize;

-  UINT64                        SpHeapSize;

-  UINT64                        SpNsCommBufSize;

-  UINT64                        SpPcpuSharedBufSize;

-  UINT32                        NumSpMemRegions;

-  UINT32                        NumCpus;

-  EFI_SECURE_PARTITION_CPU_INFO *CpuInfo;

+  EFI_PARAM_HEADER                 Header;

+  UINT64                           SpMemBase;

+  UINT64                           SpMemLimit;

+  UINT64                           SpImageBase;

+  UINT64                           SpStackBase;

+  UINT64                           SpHeapBase;

+  UINT64                           SpNsCommBufBase;

+  UINT64                           SpSharedBufBase;

+  UINT64                           SpImageSize;

+  UINT64                           SpPcpuStackSize;

+  UINT64                           SpHeapSize;

+  UINT64                           SpNsCommBufSize;

+  UINT64                           SpPcpuSharedBufSize;

+  UINT32                           NumSpMemRegions;

+  UINT32                           NumCpus;

+  EFI_SECURE_PARTITION_CPU_INFO    *CpuInfo;

 } EFI_SECURE_PARTITION_BOOT_INFO;

 

 typedef

 EFI_STATUS

 (*PI_MM_ARM_TF_CPU_DRIVER_ENTRYPOINT) (

-  IN UINTN EventId,

-  IN UINTN CpuNumber,

-  IN UINTN NsCommBufferAddr

+  IN UINTN  EventId,

+  IN UINTN  CpuNumber,

+  IN UINTN  NsCommBufferAddr

   );

 

 typedef struct {

-  PI_MM_ARM_TF_CPU_DRIVER_ENTRYPOINT *ArmTfCpuDriverEpPtr;

+  PI_MM_ARM_TF_CPU_DRIVER_ENTRYPOINT    *ArmTfCpuDriverEpPtr;

 } ARM_TF_CPU_DRIVER_EP_DESCRIPTOR;

 

 typedef RETURN_STATUS (*REGION_PERMISSION_UPDATE_FUNC) (

-  IN  EFI_PHYSICAL_ADDRESS      BaseAddress,

-  IN  UINT64                    Length

+  IN  EFI_PHYSICAL_ADDRESS  BaseAddress,

+  IN  UINT64                Length

   );

 

 /**

@@ -82,16 +82,15 @@ typedef RETURN_STATUS (*REGION_PERMISSION_UPDATE_FUNC) (
 EFI_STATUS

 EFIAPI

 UpdateMmFoundationPeCoffPermissions (

-  IN  CONST PE_COFF_LOADER_IMAGE_CONTEXT      *ImageContext,

-  IN  EFI_PHYSICAL_ADDRESS                    ImageBase,

-  IN  UINT32                                  SectionHeaderOffset,

-  IN  CONST  UINT16                           NumberOfSections,

-  IN  REGION_PERMISSION_UPDATE_FUNC           TextUpdater,

-  IN  REGION_PERMISSION_UPDATE_FUNC           ReadOnlyUpdater,

-  IN  REGION_PERMISSION_UPDATE_FUNC           ReadWriteUpdater

+  IN  CONST PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,

+  IN  EFI_PHYSICAL_ADDRESS                ImageBase,

+  IN  UINT32                              SectionHeaderOffset,

+  IN  CONST  UINT16                       NumberOfSections,

+  IN  REGION_PERMISSION_UPDATE_FUNC       TextUpdater,

+  IN  REGION_PERMISSION_UPDATE_FUNC       ReadOnlyUpdater,

+  IN  REGION_PERMISSION_UPDATE_FUNC       ReadWriteUpdater

   );

 

-

 /**

   Privileged firmware assigns RO & Executable attributes to all memory occupied

   by the Boot Firmware Volume. This function locates the section information of

@@ -108,14 +107,13 @@ UpdateMmFoundationPeCoffPermissions (
 EFI_STATUS

 EFIAPI

 GetStandaloneMmCorePeCoffSections (

-  IN        VOID                            *TeData,

-  IN  OUT   PE_COFF_LOADER_IMAGE_CONTEXT    *ImageContext,

-      OUT   EFI_PHYSICAL_ADDRESS            *ImageBase,

-  IN  OUT   UINT32                          *SectionHeaderOffset,

-  IN  OUT   UINT16                          *NumberOfSections

+  IN        VOID                          *TeData,

+  IN  OUT   PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,

+  OUT   EFI_PHYSICAL_ADDRESS              *ImageBase,

+  IN  OUT   UINT32                        *SectionHeaderOffset,

+  IN  OUT   UINT16                        *NumberOfSections

   );

 

-

 /**

   Privileged firmware assigns RO & Executable attributes to all memory occupied

   by the Boot Firmware Volume. This function locates the Standalone MM Core

@@ -130,12 +128,11 @@ GetStandaloneMmCorePeCoffSections (
 EFI_STATUS

 EFIAPI

 LocateStandaloneMmCorePeCoffData (

-  IN        EFI_FIRMWARE_VOLUME_HEADER      *BfvAddress,

-  IN  OUT   VOID                            **TeData,

-  IN  OUT   UINTN                           *TeDataSize

+  IN        EFI_FIRMWARE_VOLUME_HEADER  *BfvAddress,

+  IN  OUT   VOID                        **TeData,

+  IN  OUT   UINTN                       *TeDataSize

   );

 

-

 /**

   Use the boot information passed by privileged firmware to populate a HOB list

   suitable for consumption by the MM Core and drivers.

@@ -148,11 +145,10 @@ LocateStandaloneMmCorePeCoffData (
 VOID *

 EFIAPI

 CreateHobListFromBootInfo (

-  IN  OUT  PI_MM_ARM_TF_CPU_DRIVER_ENTRYPOINT *CpuDriverEntryPoint,

-  IN       EFI_SECURE_PARTITION_BOOT_INFO     *PayloadBootInfo

+  IN  OUT  PI_MM_ARM_TF_CPU_DRIVER_ENTRYPOINT  *CpuDriverEntryPoint,

+  IN       EFI_SECURE_PARTITION_BOOT_INFO      *PayloadBootInfo

   );

 

-

 /**

   The entry point of Standalone MM Foundation.

 

@@ -171,7 +167,6 @@ _ModuleEntryPoint (
   IN UINT64  cookie2

   );

 

-

 /**

   Auto generated function that calls the library constructors for all of the module's dependent libraries.

 

@@ -191,11 +186,10 @@ _ModuleEntryPoint (
 VOID

 EFIAPI

 ProcessLibraryConstructorList (

-  IN EFI_HANDLE             ImageHandle,

+  IN EFI_HANDLE           ImageHandle,

   IN EFI_MM_SYSTEM_TABLE  *MmSystemTable

   );

 

-

 /**

   Auto generated function that calls a set of module entry points.

 

diff --git a/StandaloneMmPkg/Include/Library/FvLib.h b/StandaloneMmPkg/Include/Library/FvLib.h
index 4ef2c8540a..1eb9ea7e04 100644
--- a/StandaloneMmPkg/Include/Library/FvLib.h
+++ b/StandaloneMmPkg/Include/Library/FvLib.h
@@ -52,9 +52,9 @@ FfsFindNextFile (
 EFI_STATUS

 EFIAPI

 FfsFindSection (

-  IN EFI_SECTION_TYPE              SectionType,

-  IN EFI_FFS_FILE_HEADER           *FfsFileHeader,

-  IN OUT EFI_COMMON_SECTION_HEADER **SectionHeader

+  IN EFI_SECTION_TYPE               SectionType,

+  IN EFI_FFS_FILE_HEADER            *FfsFileHeader,

+  IN OUT EFI_COMMON_SECTION_HEADER  **SectionHeader

   );

 

 /**

@@ -73,10 +73,10 @@ FfsFindSection (
 EFI_STATUS

 EFIAPI

 FindFfsSectionInSections (

-  IN  VOID                             *Sections,

-  IN  UINTN                            SizeOfSections,

-  IN  EFI_SECTION_TYPE                 SectionType,

-  OUT EFI_COMMON_SECTION_HEADER        **FoundSection

+  IN  VOID                       *Sections,

+  IN  UINTN                      SizeOfSections,

+  IN  EFI_SECTION_TYPE           SectionType,

+  OUT EFI_COMMON_SECTION_HEADER  **FoundSection

   );

 

 /**

@@ -95,10 +95,10 @@ FindFfsSectionInSections (
 EFI_STATUS

 EFIAPI

 FfsFindSectionData (

-  IN EFI_SECTION_TYPE              SectionType,

-  IN EFI_FFS_FILE_HEADER           *FfsFileHeader,

-  OUT VOID                         **SectionData,

-  OUT UINTN                        *SectionDataSize

+  IN EFI_SECTION_TYPE     SectionType,

+  IN EFI_FFS_FILE_HEADER  *FfsFileHeader,

+  OUT VOID                **SectionData,

+  OUT UINTN               *SectionDataSize

   );

 

 #endif

diff --git a/StandaloneMmPkg/Include/Library/StandaloneMmCoreEntryPoint.h b/StandaloneMmPkg/Include/Library/StandaloneMmCoreEntryPoint.h
index 9799604e85..4e88482230 100644
--- a/StandaloneMmPkg/Include/Library/StandaloneMmCoreEntryPoint.h
+++ b/StandaloneMmPkg/Include/Library/StandaloneMmCoreEntryPoint.h
@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///

 extern VOID  *gHobList;

 

-

 /**

   The entry point of PE/COFF Image for the STANDALONE MM Core.

 

@@ -35,7 +34,6 @@ _ModuleEntryPoint (
   IN VOID  *HobStart

   );

 

-

 /**

   Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().

 

@@ -50,7 +48,6 @@ EfiMain (
   IN VOID  *HobStart

   );

 

-

 /**

   Auto generated function that calls the library constructors for all of the module's dependent libraries.

 

@@ -70,11 +67,10 @@ EfiMain (
 VOID

 EFIAPI

 ProcessLibraryConstructorList (

-  IN EFI_HANDLE             ImageHandle,

-  IN EFI_MM_SYSTEM_TABLE    *MmSystemTable

+  IN EFI_HANDLE           ImageHandle,

+  IN EFI_MM_SYSTEM_TABLE  *MmSystemTable

   );

 

-

 /**

   Autogenerated function that calls a set of module entry points.

 

diff --git a/StandaloneMmPkg/Include/StandaloneMm.h b/StandaloneMmPkg/Include/StandaloneMm.h
index 2968b32b33..05f1da593a 100644
--- a/StandaloneMmPkg/Include/StandaloneMm.h
+++ b/StandaloneMmPkg/Include/StandaloneMm.h
@@ -15,14 +15,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 typedef

 EFI_STATUS

-(EFIAPI *MM_IMAGE_ENTRY_POINT) (

+(EFIAPI *MM_IMAGE_ENTRY_POINT)(

   IN EFI_HANDLE            ImageHandle,

   IN EFI_MM_SYSTEM_TABLE   *MmSystemTable

   );

 

 typedef

 EFI_STATUS

-(EFIAPI *STANDALONE_MM_FOUNDATION_ENTRY_POINT) (

+(EFIAPI *STANDALONE_MM_FOUNDATION_ENTRY_POINT)(

   IN VOID  *HobStart

   );