DynamicTablesPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the DynamicTablesPkg 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>

13 files changed, 429 insertions, 431 deletions

diff --git a/DynamicTablesPkg/Include/AcpiTableGenerator.h b/DynamicTablesPkg/Include/AcpiTableGenerator.h
index 45c808ba74..6221d54632 100644
--- a/DynamicTablesPkg/Include/AcpiTableGenerator.h
+++ b/DynamicTablesPkg/Include/AcpiTableGenerator.h
@@ -160,7 +160,7 @@ typedef enum StdAcpiTableId {
   @param [in] Type      The ACPI table structure.

   @param [in] Revision  The ACPI table revision.

 **/

-#define ACPI_HEADER(Signature, Type, Revision) {              \

+#define ACPI_HEADER(Signature, Type, Revision)  {             \

           Signature,             /* UINT32  Signature */      \

           sizeof (Type),         /* UINT32  Length */         \

           Revision,              /* UINT8   Revision */       \

@@ -169,7 +169,7 @@ typedef enum StdAcpiTableId {
           0,                     /* UINT64  OemTableId */     \

           0,                     /* UINT32  OemRevision */    \

           0,                     /* UINT32  CreatorId */      \

-          0                      /* UINT32  CreatorRevision */\

+          0                      /* UINT32  CreatorRevision */ \

           }

 

 /** A macro to dump the common header part of EFI ACPI tables as

@@ -209,10 +209,10 @@ typedef struct AcpiTableGenerator           ACPI_TABLE_GENERATOR;
                         failure codes as returned by the generator.

 **/

 typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (

-  IN  CONST ACPI_TABLE_GENERATOR                   *       This,

-  IN  CONST CM_STD_OBJ_ACPI_TABLE_INFO             * CONST AcpiTableInfo,

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   * CONST CfgMgrProtocol,

-  OUT       EFI_ACPI_DESCRIPTION_HEADER           **       Table

+  IN  CONST ACPI_TABLE_GENERATOR                           *This,

+  IN  CONST CM_STD_OBJ_ACPI_TABLE_INFO             *CONST  AcpiTableInfo,

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   *CONST  CfgMgrProtocol,

+  OUT       EFI_ACPI_DESCRIPTION_HEADER                    **Table

   );

 

 /** This function pointer describes the interface used by the

@@ -229,10 +229,10 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (
                         as returned by the generator.

 **/

 typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (

-  IN      CONST ACPI_TABLE_GENERATOR                   * CONST This,

-  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO             * CONST AcpiTableInfo,

-  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   * CONST CfgMgrProtocol,

-  IN OUT        EFI_ACPI_DESCRIPTION_HEADER           ** CONST Table

+  IN      CONST ACPI_TABLE_GENERATOR                   *CONST  This,

+  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO             *CONST  AcpiTableInfo,

+  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   *CONST  CfgMgrProtocol,

+  IN OUT        EFI_ACPI_DESCRIPTION_HEADER           **CONST  Table

   );

 

 /** This function pointer describes an extended interface to build

@@ -252,11 +252,11 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (
                         failure codes as returned by the generator.

 **/

 typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (

-  IN  CONST ACPI_TABLE_GENERATOR                   *       This,

-  IN  CONST CM_STD_OBJ_ACPI_TABLE_INFO             * CONST AcpiTableInfo,

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   * CONST CfgMgrProtocol,

-  OUT       EFI_ACPI_DESCRIPTION_HEADER          ***       Table,

-  OUT       UINTN                                  * CONST TableCount

+  IN  CONST ACPI_TABLE_GENERATOR                           *This,

+  IN  CONST CM_STD_OBJ_ACPI_TABLE_INFO             *CONST  AcpiTableInfo,

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   *CONST  CfgMgrProtocol,

+  OUT       EFI_ACPI_DESCRIPTION_HEADER                    ***Table,

+  OUT       UINTN                                  *CONST  TableCount

   );

 

 /** This function pointer describes an extended interface used by the

@@ -275,10 +275,10 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (
                         as returned by the generator.

 **/

 typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLEEX) (

-  IN      CONST ACPI_TABLE_GENERATOR                   * CONST This,

-  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO             * CONST AcpiTableInfo,

-  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   * CONST CfgMgrProtocol,

-  IN OUT        EFI_ACPI_DESCRIPTION_HEADER          *** CONST Table,

+  IN      CONST ACPI_TABLE_GENERATOR                   *CONST  This,

+  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO             *CONST  AcpiTableInfo,

+  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL   *CONST  CfgMgrProtocol,

+  IN OUT        EFI_ACPI_DESCRIPTION_HEADER          ***CONST  Table,

   IN      CONST UINTN                                          TableCount

   );

 

@@ -293,42 +293,42 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLEEX) (
 **/

 typedef struct AcpiTableGenerator {

   /// The ACPI table generator ID.

-  ACPI_TABLE_GENERATOR_ID                GeneratorID;

+  ACPI_TABLE_GENERATOR_ID               GeneratorID;

 

   /// String describing the ACPI table generator.

-  CONST CHAR16                         * Description;

+  CONST CHAR16                          *Description;

 

   /// The ACPI table signature.

-  UINT32                                 AcpiTableSignature;

+  UINT32                                AcpiTableSignature;

 

   /// The ACPI table revision.

-  UINT8                                  AcpiTableRevision;

+  UINT8                                 AcpiTableRevision;

 

   /// The minimum supported ACPI table revision.

-  UINT8                                  MinAcpiTableRevision;

+  UINT8                                 MinAcpiTableRevision;

 

   /// The ACPI table creator ID.

-  UINT32                                 CreatorId;

+  UINT32                                CreatorId;

 

   /// The ACPI table creator revision.

-  UINT32                                 CreatorRevision;

+  UINT32                                CreatorRevision;

 

   /// ACPI table build function pointer.

-  ACPI_TABLE_GENERATOR_BUILD_TABLE       BuildAcpiTable;

+  ACPI_TABLE_GENERATOR_BUILD_TABLE      BuildAcpiTable;

 

   /** The function to free any resources

       allocated for building the ACPI table.

   */

-  ACPI_TABLE_GENERATOR_FREE_TABLE        FreeTableResources;

+  ACPI_TABLE_GENERATOR_FREE_TABLE       FreeTableResources;

 

   /// ACPI table extended build function pointer.

-  ACPI_TABLE_GENERATOR_BUILD_TABLEEX     BuildAcpiTableEx;

+  ACPI_TABLE_GENERATOR_BUILD_TABLEEX    BuildAcpiTableEx;

 

   /** The function to free any resources

       allocated for building the ACPI table

       using the extended interface.

   */

-  ACPI_TABLE_GENERATOR_FREE_TABLEEX      FreeTableResourcesEx;

+  ACPI_TABLE_GENERATOR_FREE_TABLEEX     FreeTableResourcesEx;

 } ACPI_TABLE_GENERATOR;

 

 /** Register ACPI table factory generator.

@@ -348,7 +348,7 @@ typedef struct AcpiTableGenerator {
 EFI_STATUS

 EFIAPI

 RegisterAcpiTableGenerator (

-  IN CONST ACPI_TABLE_GENERATOR                 * CONST Generator

+  IN CONST ACPI_TABLE_GENERATOR                 *CONST  Generator

   );

 

 /** Deregister ACPI generator.

@@ -366,10 +366,9 @@ RegisterAcpiTableGenerator (
 EFI_STATUS

 EFIAPI

 DeregisterAcpiTableGenerator (

-  IN CONST ACPI_TABLE_GENERATOR                 * CONST Generator

+  IN CONST ACPI_TABLE_GENERATOR                 *CONST  Generator

   );

 

 #pragma pack()

 

 #endif // ACPI_TABLE_GENERATOR_H_

-

diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index f19c9c7066..22b37edfab 100644
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -71,7 +71,7 @@ typedef struct CmArmBootArchInfo {
   /** This is the ARM_BOOT_ARCH flags field of the FADT Table

       described in the ACPI Table Specification.

   */

-  UINT16  BootArchFlags;

+  UINT16    BootArchFlags;

 } CM_ARM_BOOT_ARCH_INFO;

 

 /** A structure that describes the

@@ -83,7 +83,7 @@ typedef struct CmArmPowerManagementProfileInfo {
   /** This is the Preferred_PM_Profile field of the FADT Table

       described in the ACPI Specification

   */

-  UINT8  PowerManagementProfile;

+  UINT8    PowerManagementProfile;

 } CM_ARM_POWER_MANAGEMENT_PROFILE_INFO;

 

 /** A structure that describes the

@@ -93,99 +93,99 @@ typedef struct CmArmPowerManagementProfileInfo {
 */

 typedef struct CmArmGicCInfo {

   /// The GIC CPU Interface number.

-  UINT32  CPUInterfaceNumber;

+  UINT32    CPUInterfaceNumber;

 

   /** The ACPI Processor UID. This must match the

       _UID of the CPU Device object information described

       in the DSDT/SSDT for the CPU.

   */

-  UINT32  AcpiProcessorUid;

+  UINT32    AcpiProcessorUid;

 

   /** The flags field as described by the GICC structure

       in the ACPI Specification.

   */

-  UINT32  Flags;

+  UINT32    Flags;

 

   /** The parking protocol version field as described by

     the GICC structure in the ACPI Specification.

   */

-  UINT32  ParkingProtocolVersion;

+  UINT32    ParkingProtocolVersion;

 

   /** The Performance Interrupt field as described by

       the GICC structure in the ACPI Specification.

   */

-  UINT32  PerformanceInterruptGsiv;

+  UINT32    PerformanceInterruptGsiv;

 

   /** The CPU Parked address field as described by

       the GICC structure in the ACPI Specification.

   */

-  UINT64  ParkedAddress;

+  UINT64    ParkedAddress;

 

   /** The base address for the GIC CPU Interface

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT64  PhysicalBaseAddress;

+  UINT64    PhysicalBaseAddress;

 

   /** The base address for GICV interface

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT64  GICV;

+  UINT64    GICV;

 

   /** The base address for GICH interface

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT64  GICH;

+  UINT64    GICH;

 

   /** The GICV maintenance interrupt

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT32  VGICMaintenanceInterrupt;

+  UINT32    VGICMaintenanceInterrupt;

 

   /** The base address for GICR interface

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT64  GICRBaseAddress;

+  UINT64    GICRBaseAddress;

 

   /** The MPIDR for the CPU

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT64  MPIDR;

+  UINT64    MPIDR;

 

   /** The Processor Power Efficiency class

       as described by the GICC structure in the

       ACPI Specification.

   */

-  UINT8   ProcessorPowerEfficiencyClass;

+  UINT8     ProcessorPowerEfficiencyClass;

 

   /** Statistical Profiling Extension buffer overflow GSIV. Zero if

       unsupported by this processor. This field was introduced in

       ACPI 6.3 (MADT revision 5) and is therefore ignored when

       generating MADT revision 4 or lower.

   */

-  UINT16  SpeOverflowInterrupt;

+  UINT16    SpeOverflowInterrupt;

 

   /** The proximity domain to which the logical processor belongs.

       This field is used to populate the GICC affinity structure

       in the SRAT table.

   */

-  UINT32  ProximityDomain;

+  UINT32    ProximityDomain;

 

   /** The clock domain to which the logical processor belongs.

       This field is used to populate the GICC affinity structure

       in the SRAT table.

   */

-  UINT32  ClockDomain;

+  UINT32    ClockDomain;

 

   /** The GICC Affinity flags field as described by the GICC Affinity structure

       in the SRAT table.

   */

-  UINT32  AffinityFlags;

+  UINT32    AffinityFlags;

 } CM_ARM_GICC_INFO;

 

 /** A structure that describes the

@@ -195,19 +195,19 @@ typedef struct CmArmGicCInfo {
 */

 typedef struct CmArmGicDInfo {

   /// The Physical Base address for the GIC Distributor.

-  UINT64  PhysicalBaseAddress;

+  UINT64    PhysicalBaseAddress;

 

   /** The global system interrupt

       number where this GIC Distributor's

       interrupt inputs start.

   */

-  UINT32  SystemVectorBase;

+  UINT32    SystemVectorBase;

 

   /** The GIC version as described

       by the GICD structure in the

       ACPI Specification.

   */

-  UINT8   GicVersion;

+  UINT8     GicVersion;

 } CM_ARM_GICD_INFO;

 

 /** A structure that describes the

@@ -217,22 +217,22 @@ typedef struct CmArmGicDInfo {
 */

 typedef struct CmArmGicMsiFrameInfo {

   /// The GIC MSI Frame ID

-  UINT32  GicMsiFrameId;

+  UINT32    GicMsiFrameId;

 

   /// The Physical base address for the MSI Frame

-  UINT64  PhysicalBaseAddress;

+  UINT64    PhysicalBaseAddress;

 

   /** The GIC MSI Frame flags

       as described by the GIC MSI frame

       structure in the ACPI Specification.

   */

-  UINT32  Flags;

+  UINT32    Flags;

 

   /// SPI Count used by this frame

-  UINT16  SPICount;

+  UINT16    SPICount;

 

   /// SPI Base used by this frame

-  UINT16  SPIBase;

+  UINT16    SPIBase;

 } CM_ARM_GIC_MSI_FRAME_INFO;

 

 /** A structure that describes the

@@ -244,10 +244,10 @@ typedef struct CmArmGicRedistInfo {
   /** The physical address of a page range

       containing all GIC Redistributors.

   */

-  UINT64  DiscoveryRangeBaseAddress;

+  UINT64    DiscoveryRangeBaseAddress;

 

   /// Length of the GIC Redistributor Discovery page range

-  UINT32  DiscoveryRangeLength;

+  UINT32    DiscoveryRangeLength;

 } CM_ARM_GIC_REDIST_INFO;

 

 /** A structure that describes the

@@ -257,16 +257,16 @@ typedef struct CmArmGicRedistInfo {
 */

 typedef struct CmArmGicItsInfo {

   /// The GIC ITS ID

-  UINT32  GicItsId;

+  UINT32    GicItsId;

 

   /// The physical address for the Interrupt Translation Service

-  UINT64  PhysicalBaseAddress;

+  UINT64    PhysicalBaseAddress;

 

   /** The proximity domain to which the logical processor belongs.

       This field is used to populate the GIC ITS affinity structure

       in the SRAT table.

   */

-  UINT32  ProximityDomain;

+  UINT32    ProximityDomain;

 } CM_ARM_GIC_ITS_INFO;

 

 /** A structure that describes the

@@ -278,25 +278,25 @@ typedef struct CmArmGicItsInfo {
 */

 typedef struct CmArmSerialPortInfo {

   /// The physical base address for the serial port

-  UINT64  BaseAddress;

+  UINT64    BaseAddress;

 

   /// The serial port interrupt

-  UINT32  Interrupt;

+  UINT32    Interrupt;

 

   /// The serial port baud rate

-  UINT64  BaudRate;

+  UINT64    BaudRate;

 

   /// The serial port clock

-  UINT32  Clock;

+  UINT32    Clock;

 

   /// Serial Port subtype

-  UINT16  PortSubtype;

+  UINT16    PortSubtype;

 

   /// The Base address length

-  UINT64  BaseAddressLength;

+  UINT64    BaseAddressLength;

 

   /// The access size

-  UINT8   AccessSize;

+  UINT8     AccessSize;

 } CM_ARM_SERIAL_PORT_INFO;

 

 /** A structure that describes the

@@ -306,40 +306,40 @@ typedef struct CmArmSerialPortInfo {
 */

 typedef struct CmArmGenericTimerInfo {

   /// The physical base address for the counter control frame

-  UINT64  CounterControlBaseAddress;

+  UINT64    CounterControlBaseAddress;

 

   /// The physical base address for the counter read frame

-  UINT64  CounterReadBaseAddress;

+  UINT64    CounterReadBaseAddress;

 

   /// The secure PL1 timer interrupt

-  UINT32  SecurePL1TimerGSIV;

+  UINT32    SecurePL1TimerGSIV;

 

   /// The secure PL1 timer flags

-  UINT32  SecurePL1TimerFlags;

+  UINT32    SecurePL1TimerFlags;

 

   /// The non-secure PL1 timer interrupt

-  UINT32  NonSecurePL1TimerGSIV;

+  UINT32    NonSecurePL1TimerGSIV;

 

   /// The non-secure PL1 timer flags

-  UINT32  NonSecurePL1TimerFlags;

+  UINT32    NonSecurePL1TimerFlags;

 

   /// The virtual timer interrupt

-  UINT32  VirtualTimerGSIV;

+  UINT32    VirtualTimerGSIV;

 

   /// The virtual timer flags

-  UINT32  VirtualTimerFlags;

+  UINT32    VirtualTimerFlags;

 

   /// The non-secure PL2 timer interrupt

-  UINT32  NonSecurePL2TimerGSIV;

+  UINT32    NonSecurePL2TimerGSIV;

 

   /// The non-secure PL2 timer flags

-  UINT32  NonSecurePL2TimerFlags;

+  UINT32    NonSecurePL2TimerFlags;

 

   /// GSIV for the virtual EL2 timer

-  UINT32  VirtualPL2TimerGSIV;

+  UINT32    VirtualPL2TimerGSIV;

 

   /// Flags for the virtual EL2 timer

-  UINT32  VirtualPL2TimerFlags;

+  UINT32    VirtualPL2TimerFlags;

 } CM_ARM_GENERIC_TIMER_INFO;

 

 /** A structure that describes the

@@ -349,34 +349,34 @@ typedef struct CmArmGenericTimerInfo {
 */

 typedef struct CmArmGTBlockTimerFrameInfo {

   /// The Generic Timer frame number

-  UINT8   FrameNumber;

+  UINT8     FrameNumber;

 

   /// The physical base address for the CntBase block

-  UINT64  PhysicalAddressCntBase;

+  UINT64    PhysicalAddressCntBase;

 

   /// The physical base address for the CntEL0Base block

-  UINT64  PhysicalAddressCntEL0Base;

+  UINT64    PhysicalAddressCntEL0Base;

 

   /// The physical timer interrupt

-  UINT32  PhysicalTimerGSIV;

+  UINT32    PhysicalTimerGSIV;

 

   /** The physical timer flags as described by the GT Block

       Timer frame Structure in the ACPI Specification.

   */

-  UINT32  PhysicalTimerFlags;

+  UINT32    PhysicalTimerFlags;

 

   /// The virtual timer interrupt

-  UINT32  VirtualTimerGSIV;

+  UINT32    VirtualTimerGSIV;

 

   /** The virtual timer flags as described by the GT Block

       Timer frame Structure in the ACPI Specification.

   */

-  UINT32  VirtualTimerFlags;

+  UINT32    VirtualTimerFlags;

 

   /** The common timer flags as described by the GT Block

       Timer frame Structure in the ACPI Specification.

   */

-  UINT32  CommonFlags;

+  UINT32    CommonFlags;

 } CM_ARM_GTBLOCK_TIMER_FRAME_INFO;

 

 /** A structure that describes the

@@ -386,13 +386,13 @@ typedef struct CmArmGTBlockTimerFrameInfo {
 */

 typedef struct CmArmGTBlockInfo {

   /// The physical base address for the GT Block Timer structure

-  UINT64            GTBlockPhysicalAddress;

+  UINT64             GTBlockPhysicalAddress;

 

   /// The number of timer frames implemented in the GT Block

-  UINT32            GTBlockTimerFrameCount;

+  UINT32             GTBlockTimerFrameCount;

 

   /// Reference token for the GT Block timer frame list

-  CM_OBJECT_TOKEN   GTBlockTimerFrameToken;

+  CM_OBJECT_TOKEN    GTBlockTimerFrameToken;

 } CM_ARM_GTBLOCK_INFO;

 

 /** A structure that describes the

@@ -402,18 +402,18 @@ typedef struct CmArmGTBlockInfo {
 */

 typedef struct CmArmGenericWatchdogInfo {

   /// The physical base address of the Arm Watchdog control frame

-  UINT64  ControlFrameAddress;

+  UINT64    ControlFrameAddress;

 

   /// The physical base address of the Arm Watchdog refresh frame

-  UINT64  RefreshFrameAddress;

+  UINT64    RefreshFrameAddress;

 

   /// The watchdog interrupt

-  UINT32  TimerGSIV;

+  UINT32    TimerGSIV;

 

   /** The flags for the watchdog as described by the Arm watchdog

       structure in the ACPI specification.

   */

-  UINT32  Flags;

+  UINT32    Flags;

 } CM_ARM_GENERIC_WATCHDOG_INFO;

 

 /** A structure that describes the

@@ -423,16 +423,16 @@ typedef struct CmArmGenericWatchdogInfo {
 */

 typedef struct CmArmPciConfigSpaceInfo {

   /// The physical base address for the PCI segment

-  UINT64  BaseAddress;

+  UINT64    BaseAddress;

 

   /// The PCI segment group number

-  UINT16  PciSegmentGroupNumber;

+  UINT16    PciSegmentGroupNumber;

 

   /// The start bus number

-  UINT8   StartBusNumber;

+  UINT8     StartBusNumber;

 

   /// The end bus number

-  UINT8   EndBusNumber;

+  UINT8     EndBusNumber;

 } CM_ARM_PCI_CONFIG_SPACE_INFO;

 

 /** A structure that describes the

@@ -442,7 +442,7 @@ typedef struct CmArmPciConfigSpaceInfo {
 */

 typedef struct CmArmHypervisorVendorId {

   /// The hypervisor Vendor ID

-  UINT64  HypervisorVendorId;

+  UINT64    HypervisorVendorId;

 } CM_ARM_HYPERVISOR_VENDOR_ID;

 

 /** A structure that describes the

@@ -452,7 +452,7 @@ typedef struct CmArmHypervisorVendorId {
 */

 typedef struct CmArmFixedFeatureFlags {

   /// The Fixed feature flags

-  UINT32  Flags;

+  UINT32    Flags;

 } CM_ARM_FIXED_FEATURE_FLAGS;

 

 /** A structure that describes the

@@ -462,11 +462,11 @@ typedef struct CmArmFixedFeatureFlags {
 */

 typedef struct CmArmItsGroupNode {

   /// An unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// The number of ITS identifiers in the ITS node

-  UINT32            ItsIdCount;

+  UINT32             ItsIdCount;

   /// Reference token for the ITS identifier array

-  CM_OBJECT_TOKEN   ItsIdToken;

+  CM_OBJECT_TOKEN    ItsIdToken;

 } CM_ARM_ITS_GROUP_NODE;

 

 /** A structure that describes the

@@ -476,28 +476,29 @@ typedef struct CmArmItsGroupNode {
 */

 typedef struct CmArmNamedComponentNode {

   /// An unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Number of ID mappings

-  UINT32            IdMappingCount;

+  UINT32             IdMappingCount;

   /// Reference token for the ID mapping array

-  CM_OBJECT_TOKEN   IdMappingToken;

+  CM_OBJECT_TOKEN    IdMappingToken;

 

   /// Flags for the named component

-  UINT32            Flags;

+  UINT32             Flags;

 

   /// Memory access properties : Cache coherent attributes

-  UINT32            CacheCoherent;

+  UINT32             CacheCoherent;

   /// Memory access properties : Allocation hints

-  UINT8             AllocationHints;

+  UINT8              AllocationHints;

   /// Memory access properties : Memory access flags

-  UINT8             MemoryAccessFlags;

+  UINT8              MemoryAccessFlags;

 

   /// Memory access properties : Address size limit

-  UINT8             AddressSizeLimit;

+  UINT8              AddressSizeLimit;

+

   /** ASCII Null terminated string with the full path to

       the entry in the namespace for this object.

   */

-  CHAR8*            ObjectName;

+  CHAR8              *ObjectName;

 } CM_ARM_NAMED_COMPONENT_NODE;

 

 /** A structure that describes the

@@ -507,25 +508,25 @@ typedef struct CmArmNamedComponentNode {
 */

 typedef struct CmArmRootComplexNode {

   /// An unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Number of ID mappings

-  UINT32            IdMappingCount;

+  UINT32             IdMappingCount;

   /// Reference token for the ID mapping array

-  CM_OBJECT_TOKEN   IdMappingToken;

+  CM_OBJECT_TOKEN    IdMappingToken;

 

   /// Memory access properties : Cache coherent attributes

-  UINT32            CacheCoherent;

+  UINT32             CacheCoherent;

   /// Memory access properties : Allocation hints

-  UINT8             AllocationHints;

+  UINT8              AllocationHints;

   /// Memory access properties : Memory access flags

-  UINT8             MemoryAccessFlags;

+  UINT8              MemoryAccessFlags;

 

   /// ATS attributes

-  UINT32            AtsAttribute;

+  UINT32             AtsAttribute;

   /// PCI segment number

-  UINT32            PciSegmentNumber;

+  UINT32             PciSegmentNumber;

   /// Memory address size limit

-  UINT8             MemoryAddressSize;

+  UINT8              MemoryAddressSize;

 } CM_ARM_ROOT_COMPLEX_NODE;

 

 /** A structure that describes the

@@ -535,39 +536,39 @@ typedef struct CmArmRootComplexNode {
 */

 typedef struct CmArmSmmuV1SmmuV2Node {

   /// An unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Number of ID mappings

-  UINT32            IdMappingCount;

+  UINT32             IdMappingCount;

   /// Reference token for the ID mapping array

-  CM_OBJECT_TOKEN   IdMappingToken;

+  CM_OBJECT_TOKEN    IdMappingToken;

 

   /// SMMU Base Address

-  UINT64            BaseAddress;

+  UINT64             BaseAddress;

   /// Length of the memory range covered by the SMMU

-  UINT64            Span;

+  UINT64             Span;

   /// SMMU Model

-  UINT32            Model;

+  UINT32             Model;

   /// SMMU flags

-  UINT32            Flags;

+  UINT32             Flags;

 

   /// Number of context interrupts

-  UINT32            ContextInterruptCount;

+  UINT32             ContextInterruptCount;

   /// Reference token for the context interrupt array

-  CM_OBJECT_TOKEN   ContextInterruptToken;

+  CM_OBJECT_TOKEN    ContextInterruptToken;

 

   /// Number of PMU interrupts

-  UINT32            PmuInterruptCount;

+  UINT32             PmuInterruptCount;

   /// Reference token for the PMU interrupt array

-  CM_OBJECT_TOKEN   PmuInterruptToken;

+  CM_OBJECT_TOKEN    PmuInterruptToken;

 

   /// GSIV of the SMMU_NSgIrpt interrupt

-  UINT32            SMMU_NSgIrpt;

+  UINT32             SMMU_NSgIrpt;

   /// SMMU_NSgIrpt interrupt flags

-  UINT32            SMMU_NSgIrptFlags;

+  UINT32             SMMU_NSgIrptFlags;

   /// GSIV of the SMMU_NSgCfgIrpt interrupt

-  UINT32            SMMU_NSgCfgIrpt;

+  UINT32             SMMU_NSgCfgIrpt;

   /// SMMU_NSgCfgIrpt interrupt flags

-  UINT32            SMMU_NSgCfgIrptFlags;

+  UINT32             SMMU_NSgCfgIrptFlags;

 } CM_ARM_SMMUV1_SMMUV2_NODE;

 

 /** A structure that describes the

@@ -577,33 +578,33 @@ typedef struct CmArmSmmuV1SmmuV2Node {
 */

 typedef struct CmArmSmmuV3Node {

   /// An unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Number of ID mappings

-  UINT32            IdMappingCount;

+  UINT32             IdMappingCount;

   /// Reference token for the ID mapping array

-  CM_OBJECT_TOKEN   IdMappingToken;

+  CM_OBJECT_TOKEN    IdMappingToken;

 

   /// SMMU Base Address

-  UINT64    BaseAddress;

+  UINT64             BaseAddress;

   /// SMMU flags

-  UINT32            Flags;

+  UINT32             Flags;

   /// VATOS address

-  UINT64            VatosAddress;

+  UINT64             VatosAddress;

   /// Model

-  UINT32            Model;

+  UINT32             Model;

   /// GSIV of the Event interrupt if SPI based

-  UINT32            EventInterrupt;

+  UINT32             EventInterrupt;

   /// PRI Interrupt if SPI based

-  UINT32            PriInterrupt;

+  UINT32             PriInterrupt;

   /// GERR interrupt if GSIV based

-  UINT32            GerrInterrupt;

+  UINT32             GerrInterrupt;

   /// Sync interrupt if GSIV based

-  UINT32            SyncInterrupt;

+  UINT32             SyncInterrupt;

 

   /// Proximity domain flag

-  UINT32            ProximityDomain;

+  UINT32             ProximityDomain;

   /// Index into the array of ID mapping

-  UINT32            DeviceIdMappingIndex;

+  UINT32             DeviceIdMappingIndex;

 } CM_ARM_SMMUV3_NODE;

 

 /** A structure that describes the

@@ -613,21 +614,21 @@ typedef struct CmArmSmmuV3Node {
 */

 typedef struct CmArmPmcgNode {

   /// An unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Number of ID mappings

-  UINT32            IdMappingCount;

+  UINT32             IdMappingCount;

   /// Reference token for the ID mapping array

-  CM_OBJECT_TOKEN   IdMappingToken;

+  CM_OBJECT_TOKEN    IdMappingToken;

 

   /// Base Address for performance monitor counter group

-  UINT64            BaseAddress;

+  UINT64             BaseAddress;

   /// GSIV for the Overflow interrupt

-  UINT32            OverflowInterrupt;

+  UINT32             OverflowInterrupt;

   /// Page 1 Base address

-  UINT64            Page1BaseAddress;

+  UINT64             Page1BaseAddress;

 

   /// Reference token for the IORT node associated with this node

-  CM_OBJECT_TOKEN   ReferenceToken;

+  CM_OBJECT_TOKEN    ReferenceToken;

 } CM_ARM_PMCG_NODE;

 

 /** A structure that describes the

@@ -637,7 +638,7 @@ typedef struct CmArmPmcgNode {
 */

 typedef struct CmArmGicItsIdentifier {

   /// The ITS Identifier

-  UINT32  ItsId;

+  UINT32    ItsId;

 } CM_ARM_ITS_IDENTIFIER;

 

 /** A structure that describes the

@@ -647,15 +648,15 @@ typedef struct CmArmGicItsIdentifier {
 */

 typedef struct CmArmIdMapping {

   /// Input base

-  UINT32           InputBase;

+  UINT32             InputBase;

   /// Number of input IDs

-  UINT32           NumIds;

+  UINT32             NumIds;

   /// Output Base

-  UINT32           OutputBase;

+  UINT32             OutputBase;

   /// Reference token for the output node

-  CM_OBJECT_TOKEN  OutputReferenceToken;

+  CM_OBJECT_TOKEN    OutputReferenceToken;

   /// Flags

-  UINT32    Flags;

+  UINT32             Flags;

 } CM_ARM_ID_MAPPING;

 

 /** A structure that describes the Arm

@@ -694,28 +695,28 @@ typedef CM_ARM_GENERIC_INTERRUPT CM_ARM_EXTENDED_INTERRUPT;
 */

 typedef struct CmArmProcHierarchyInfo {

   /// A unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Processor structure flags (ACPI 6.3 - January 2019, PPTT, Table 5-155)

-  UINT32            Flags;

+  UINT32             Flags;

   /// Token for the parent CM_ARM_PROC_HIERARCHY_INFO object in the processor

   /// topology. A value of CM_NULL_TOKEN means this node has no parent.

-  CM_OBJECT_TOKEN   ParentToken;

+  CM_OBJECT_TOKEN    ParentToken;

   /// Token of the associated CM_ARM_GICC_INFO object which has the

   /// corresponding ACPI Processor ID. A value of CM_NULL_TOKEN means this

   /// node represents a group of associated processors and it does not have an

   /// associated GIC CPU interface.

-  CM_OBJECT_TOKEN   GicCToken;

+  CM_OBJECT_TOKEN    GicCToken;

   /// Number of resources private to this Node

-  UINT32            NoOfPrivateResources;

+  UINT32             NoOfPrivateResources;

   /// Token of the array which contains references to the resources private to

   /// this CM_ARM_PROC_HIERARCHY_INFO instance. This field is ignored if

   /// the NoOfPrivateResources is 0, in which case it is recommended to set

   /// this field to CM_NULL_TOKEN.

-  CM_OBJECT_TOKEN   PrivateResourcesArrayToken;

+  CM_OBJECT_TOKEN    PrivateResourcesArrayToken;

   /// Optional field: Reference Token for the Lpi state of this processor.

   /// Token identifying a CM_ARM_OBJ_REF structure, itself referencing

   /// CM_ARM_LPI_INFO objects.

-  CM_OBJECT_TOKEN   LpiToken;

+  CM_OBJECT_TOKEN    LpiToken;

 } CM_ARM_PROC_HIERARCHY_INFO;

 

 /** A structure that describes the Cache Type Structure (Type 1) in PPTT

@@ -724,26 +725,26 @@ typedef struct CmArmProcHierarchyInfo {
 */

 typedef struct CmArmCacheInfo {

   /// A unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   /// Reference token for the next level of cache that is private to the same

   /// CM_ARM_PROC_HIERARCHY_INFO instance. A value of CM_NULL_TOKEN means this

   /// entry represents the last cache level appropriate to the processor

   /// hierarchy node structures using this entry.

-  CM_OBJECT_TOKEN   NextLevelOfCacheToken;

+  CM_OBJECT_TOKEN    NextLevelOfCacheToken;

   /// Size of the cache in bytes

-  UINT32            Size;

+  UINT32             Size;

   /// Number of sets in the cache

-  UINT32            NumberOfSets;

+  UINT32             NumberOfSets;

   /// Integer number of ways. The maximum associativity supported by

   /// ACPI Cache type structure is limited to MAX_UINT8. However,

   /// the maximum number of ways supported by the architecture is

   /// PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX. Therfore this field

   /// is 32-bit wide.

-  UINT32            Associativity;

+  UINT32             Associativity;

   /// Cache attributes (ACPI 6.3 - January 2019, PPTT, Table 5-156)

-  UINT8             Attributes;

+  UINT8              Attributes;

   /// Line size in bytes

-  UINT16            LineSize;

+  UINT16             LineSize;

 } CM_ARM_CACHE_INFO;

 

 /** A structure that describes the ID Structure (Type 2) in PPTT

@@ -752,19 +753,19 @@ typedef struct CmArmCacheInfo {
 */

 typedef struct CmArmProcNodeIdInfo {

   /// A unique token used to identify this object

-  CM_OBJECT_TOKEN   Token;

+  CM_OBJECT_TOKEN    Token;

   // Vendor ID (as described in ACPI ID registry)

-  UINT32            VendorId;

+  UINT32             VendorId;

   /// First level unique node ID

-  UINT64            Level1Id;

+  UINT64             Level1Id;

   /// Second level unique node ID

-  UINT64            Level2Id;

+  UINT64             Level2Id;

   /// Major revision of the node

-  UINT16            MajorRev;

+  UINT16             MajorRev;

   /// Minor revision of the node

-  UINT16            MinorRev;

+  UINT16             MinorRev;

   /// Spin revision of the node

-  UINT16            SpinRev;

+  UINT16             SpinRev;

 } CM_ARM_PROC_NODE_ID_INFO;

 

 /** A structure that describes a reference to another Configuration Manager

@@ -780,7 +781,7 @@ typedef struct CmArmProcNodeIdInfo {
 */

 typedef struct CmArmObjRef {

   /// Token of the CM object being referenced

-  CM_OBJECT_TOKEN   ReferenceToken;

+  CM_OBJECT_TOKEN    ReferenceToken;

 } CM_ARM_OBJ_REF;

 

 /** A structure that describes the Memory Affinity Structure (Type 1) in SRAT

@@ -789,16 +790,16 @@ typedef struct CmArmObjRef {
 */

 typedef struct CmArmMemoryAffinityInfo {

   /// The proximity domain to which the "range of memory" belongs.

-  UINT32            ProximityDomain;

+  UINT32    ProximityDomain;

 

   /// Base Address

-  UINT64            BaseAddress;

+  UINT64    BaseAddress;

 

   /// Length

-  UINT64            Length;

+  UINT64    Length;

 

   /// Flags

-  UINT32            Flags;

+  UINT32    Flags;

 } CM_ARM_MEMORY_AFFINITY_INFO;

 

 /** A structure that describes the ACPI Device Handle (Type 0) in the

@@ -808,10 +809,10 @@ typedef struct CmArmMemoryAffinityInfo {
 */

 typedef struct CmArmDeviceHandleAcpi {

   /// Hardware ID

-  UINT64  Hid;

+  UINT64    Hid;

 

   /// Unique Id

-  UINT32  Uid;

+  UINT32    Uid;

 } CM_ARM_DEVICE_HANDLE_ACPI;

 

 /** A structure that describes the PCI Device Handle (Type 1) in the

@@ -821,16 +822,16 @@ typedef struct CmArmDeviceHandleAcpi {
 */

 typedef struct CmArmDeviceHandlePci {

   /// PCI Segment Number

-  UINT16  SegmentNumber;

+  UINT16    SegmentNumber;

 

   /// PCI Bus Number - Max 256 busses (Bits 15:8 of BDF)

-  UINT8  BusNumber;

+  UINT8     BusNumber;

 

   /// PCI Device Number - Max 32 devices (Bits 7:3 of BDF)

-  UINT8   DeviceNumber;

+  UINT8     DeviceNumber;

 

   /// PCI Function Number - Max 8 functions (Bits 2:0 of BDF)

-  UINT8   FunctionNumber;

+  UINT8     FunctionNumber;

 } CM_ARM_DEVICE_HANDLE_PCI;

 

 /** A structure that describes the Generic Initiator Affinity structure in SRAT

@@ -839,16 +840,16 @@ typedef struct CmArmDeviceHandlePci {
 */

 typedef struct CmArmGenericInitiatorAffinityInfo {

   /// The proximity domain to which the generic initiator belongs.

-  UINT32            ProximityDomain;

+  UINT32             ProximityDomain;

 

   /// Flags

-  UINT32            Flags;

+  UINT32             Flags;

 

   /// Device Handle Type

-  UINT8             DeviceHandleType;

+  UINT8              DeviceHandleType;

 

   /// Reference Token for the Device Handle

-  CM_OBJECT_TOKEN   DeviceHandleToken;

+  CM_OBJECT_TOKEN    DeviceHandleToken;

 } CM_ARM_GENERIC_INITIATOR_AFFINITY_INFO;

 

 /** A structure that describes the CMN-600 hardware.

@@ -858,19 +859,19 @@ typedef struct CmArmGenericInitiatorAffinityInfo {
 typedef struct CmArmCmn600Info {

   /// The PERIPHBASE address.

   /// Corresponds to the Configuration Node Region (CFGR) base address.

-  UINT64                     PeriphBaseAddress;

+  UINT64    PeriphBaseAddress;

 

   /// The PERIPHBASE address length.

   /// Corresponds to the CFGR base address length.

-  UINT64                     PeriphBaseAddressLength;

+  UINT64    PeriphBaseAddressLength;

 

   /// The ROOTNODEBASE address.

   /// Corresponds to the Root node (ROOT) base address.

-  UINT64                     RootNodeBaseAddress;

+  UINT64    RootNodeBaseAddress;

 

   /// The Debug and Trace Logic Controller (DTC) count.

   /// CMN-600 can have maximum 4 DTCs.

-  UINT8                      DtcCount;

+  UINT8     DtcCount;

 

   /// DTC Interrupt list.

   /// The first interrupt resource descriptor pertains to

@@ -880,7 +881,7 @@ typedef struct CmArmCmn600Info {
   /// and DtcInterrupt[3] are ignored.

   /// Note: The size of CM_ARM_CMN_600_INFO structure remains

   /// constant and does not vary with the DTC count.

-  CM_ARM_EXTENDED_INTERRUPT  DtcInterrupt[4];

+  CM_ARM_EXTENDED_INTERRUPT    DtcInterrupt[4];

 } CM_ARM_CMN_600_INFO;

 

 /** A structure that describes the Lpi information.

@@ -894,28 +895,28 @@ typedef struct CmArmLpiInfo {
   /** Minimum Residency. Time in microseconds after which a

       state becomes more energy efficient than any shallower state.

   */

-  UINT32                                  MinResidency;

+  UINT32                                    MinResidency;

 

   /** Worst case time in microseconds from a wake interrupt

       being asserted to the return to a running state

   */

-  UINT32                                  WorstCaseWakeLatency;

+  UINT32                                    WorstCaseWakeLatency;

 

   /** Flags.

   */

-  UINT32                                  Flags;

+  UINT32                                    Flags;

 

   /** Architecture specific context loss flags.

   */

-  UINT32                                  ArchFlags;

+  UINT32                                    ArchFlags;

 

   /** Residency counter frequency in cycles-per-second (Hz).

   */

-  UINT32                                  ResCntFreq;

+  UINT32                                    ResCntFreq;

 

   /** Every shallower power state in the parent is also enabled.

   */

-  UINT32                                  EnableParentState;

+  UINT32                                    EnableParentState;

 

   /** The EntryMethod _LPI field can be described as an integer

       or in a Register resource data descriptor.

@@ -923,27 +924,27 @@ typedef struct CmArmLpiInfo {
   If IsInteger is TRUE, the IntegerEntryMethod field is used.

   If IsInteger is FALSE, the RegisterEntryMethod field is used.

   */

-  BOOLEAN                                 IsInteger;

+  BOOLEAN                                   IsInteger;

 

   /** EntryMethod described as an Integer.

   */

-  UINT64                                  IntegerEntryMethod;

+  UINT64                                    IntegerEntryMethod;

 

   /** EntryMethod described as a EFI_ACPI_GENERIC_REGISTER_DESCRIPTOR.

   */

-  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  RegisterEntryMethod;

+  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE    RegisterEntryMethod;

 

   /** Residency counter register.

   */

-  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  ResidencyCounterRegister;

+  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE    ResidencyCounterRegister;

 

   /** Usage counter register.

   */

-  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  UsageCounterRegister;

+  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE    UsageCounterRegister;

 

   /** String representing the Lpi state

   */

-  CHAR8                                   StateName[16];

+  CHAR8                                     StateName[16];

 } CM_ARM_LPI_INFO;

 

 #pragma pack()

diff --git a/DynamicTablesPkg/Include/ConfigurationManagerObject.h b/DynamicTablesPkg/Include/ConfigurationManagerObject.h
index b0d3e709ec..60d825a2b2 100644
--- a/DynamicTablesPkg/Include/ConfigurationManagerObject.h
+++ b/DynamicTablesPkg/Include/ConfigurationManagerObject.h
@@ -82,19 +82,19 @@ Object ID's in the ARM Namespace:
   29 - Processor Hierarchy Node ID Info

   30 - CM Object Reference

 */

-typedef UINT32  CM_OBJECT_ID;

+typedef UINT32 CM_OBJECT_ID;

 

 /** A mask for Object ID

 */

-#define OBJECT_ID_MASK            0xFF

+#define OBJECT_ID_MASK  0xFF

 

 /** A mask for Namespace ID

 */

-#define NAMESPACE_ID_MASK         0xF

+#define NAMESPACE_ID_MASK  0xF

 

 /** Starting bit position for Namespace ID

 */

-#define NAMESPACE_ID_BIT_SHIFT    28

+#define NAMESPACE_ID_BIT_SHIFT  28

 

 /** The EOBJECT_NAMESPACE_ID enum describes the defined namespaces

     for the Configuration Manager Objects.

@@ -113,16 +113,16 @@ typedef enum ObjectNameSpaceID {
 */

 typedef struct CmObjDescriptor {

   /// Object Id

-  CM_OBJECT_ID  ObjectId;

+  CM_OBJECT_ID    ObjectId;

 

   /// Size of the described Object or Object List

-  UINT32        Size;

+  UINT32          Size;

 

   /// Pointer to the described Object or Object List

-  VOID        * Data;

+  VOID            *Data;

 

   /// Count of objects in the list

-  UINT32        Count;

+  UINT32          Count;

 } CM_OBJ_DESCRIPTOR;

 

 #pragma pack()

@@ -143,7 +143,7 @@ typedef struct CmObjDescriptor {
 

   @retval Returns the Object ID corresponding to the CmObjectID.

 **/

-#define GET_CM_OBJECT_ID(CmObjectId)    ((CmObjectId) & OBJECT_ID_MASK)

+#define GET_CM_OBJECT_ID(CmObjectId)  ((CmObjectId) & OBJECT_ID_MASK)

 

 /** This macro returns a Configuration Manager Object ID

     from the NameSpace ID and the ObjectID.

diff --git a/DynamicTablesPkg/Include/DeviceTreeTableGenerator.h b/DynamicTablesPkg/Include/DeviceTreeTableGenerator.h
index d4842b32a3..414794e469 100644
--- a/DynamicTablesPkg/Include/DeviceTreeTableGenerator.h
+++ b/DynamicTablesPkg/Include/DeviceTreeTableGenerator.h
@@ -89,10 +89,10 @@ typedef struct DtTableGenerator             DT_TABLE_GENERATOR;
                         failure codes as returned by the generator.

 **/

 typedef EFI_STATUS (*DT_TABLE_GENERATOR_BUILD_TABLE) (

-  IN  CONST DT_TABLE_GENERATOR                    *       Generator,

-  IN  CONST CM_STD_OBJ_DT_TABLE_INFO              * CONST DtTableInfo,

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

-  OUT       VOID                                 **       Table

+  IN  CONST DT_TABLE_GENERATOR                            *Generator,

+  IN  CONST CM_STD_OBJ_DT_TABLE_INFO              *CONST  DtTableInfo,

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,

+  OUT       VOID                                          **Table

   );

 

 /** This function pointer describes the interface to used by the

@@ -109,10 +109,10 @@ typedef EFI_STATUS (*DT_TABLE_GENERATOR_BUILD_TABLE) (
                         as returned by the generator.

 **/

 typedef EFI_STATUS (*DT_TABLE_GENERATOR_FREE_TABLE) (

-  IN  CONST DT_TABLE_GENERATOR                    *       Generator,

-  IN  CONST CM_STD_OBJ_DT_TABLE_INFO              * CONST DtTableInfo,

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

-  IN        VOID                                 **       Table

+  IN  CONST DT_TABLE_GENERATOR                            *Generator,

+  IN  CONST CM_STD_OBJ_DT_TABLE_INFO              *CONST  DtTableInfo,

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,

+  IN        VOID                                          **Table

   );

 

 /** The DT_TABLE_GENERATOR structure provides an interface that the

@@ -120,16 +120,16 @@ typedef EFI_STATUS (*DT_TABLE_GENERATOR_FREE_TABLE) (
 */

 typedef struct DtTableGenerator {

   /// The DT table generator ID.

-  DT_TABLE_GENERATOR_ID                  GeneratorID;

+  DT_TABLE_GENERATOR_ID             GeneratorID;

 

   /// String describing the DT table generator.

-  CONST CHAR16                         * Description;

+  CONST CHAR16                      *Description;

 

   /// DT table build function pointer.

-  DT_TABLE_GENERATOR_BUILD_TABLE         BuildDtTable;

+  DT_TABLE_GENERATOR_BUILD_TABLE    BuildDtTable;

 

   /// The function to free any resources allocated for building the DT table.

-  DT_TABLE_GENERATOR_FREE_TABLE          FreeTableResources;

+  DT_TABLE_GENERATOR_FREE_TABLE     FreeTableResources;

 } DT_TABLE_GENERATOR;

 

 /** Register DT table factory generator.

@@ -149,7 +149,7 @@ typedef struct DtTableGenerator {
 EFI_STATUS

 EFIAPI

 RegisterDtTableGenerator (

-  IN CONST DT_TABLE_GENERATOR                   * CONST Generator

+  IN CONST DT_TABLE_GENERATOR                   *CONST  Generator

   );

 

 /** Deregister DT generator.

@@ -167,10 +167,9 @@ RegisterDtTableGenerator (
 EFI_STATUS

 EFIAPI

 DeregisterDtTableGenerator (

-  IN CONST DT_TABLE_GENERATOR                   * CONST Generator

+  IN CONST DT_TABLE_GENERATOR                   *CONST  Generator

   );

 

 #pragma pack()

 

 #endif // DEVICETREE_TABLE_GENERATOR_H_

-

diff --git a/DynamicTablesPkg/Include/Library/AcpiHelperLib.h b/DynamicTablesPkg/Include/Library/AcpiHelperLib.h
index a93e95e919..300d862f82 100644
--- a/DynamicTablesPkg/Include/Library/AcpiHelperLib.h
+++ b/DynamicTablesPkg/Include/Library/AcpiHelperLib.h
@@ -10,15 +10,15 @@
 

 /** Is a character upper case

 */

-#define IS_UPPER_CHAR(x) ((x >= 'A') && (x <= 'Z'))

+#define IS_UPPER_CHAR(x)  ((x >= 'A') && (x <= 'Z'))

 

 /** Is a character a decimal digit

 */

-#define IS_DIGIT(x) ((x >= '0') && (x <= '9'))

+#define IS_DIGIT(x)  ((x >= '0') && (x <= '9'))

 

 /** Is a character an upper case hexadecimal digit

 */

-#define IS_UPPER_HEX(x) (((x >= 'A') && (x <= 'F')) || IS_DIGIT (x))

+#define IS_UPPER_HEX(x)  (((x >= 'A') && (x <= 'F')) || IS_DIGIT (x))

 

 /** Convert a hex number to its ASCII code.

 

@@ -31,7 +31,7 @@
 UINT8

 EFIAPI

 AsciiFromHex (

-  IN  UINT8   Hex

+  IN  UINT8  Hex

   );

 

 /** Convert an ASCII char representing an hexadecimal number

@@ -46,7 +46,7 @@ AsciiFromHex (
 UINT8

 EFIAPI

 HexFromAscii (

-  IN  CHAR8   Char

+  IN  CHAR8  Char

   );

 

 /** Check if a HID is a valid PNP ID.

@@ -58,7 +58,7 @@ HexFromAscii (
 **/

 BOOLEAN

 IsValidPnpId (

-  IN  CONST CHAR8  * Hid

+  IN  CONST CHAR8  *Hid

   );

 

 /** Check if a HID is a valid ACPI ID.

@@ -70,7 +70,7 @@ IsValidPnpId (
 **/

 BOOLEAN

 IsValidAcpiId (

-  IN  CONST CHAR8  * Hid

+  IN  CONST CHAR8  *Hid

   );

 

 /** Convert a EisaId string to its compressed UINT32 equivalent.

@@ -86,8 +86,8 @@ IsValidAcpiId (
 EFI_STATUS

 EFIAPI

 AmlGetEisaIdFromString (

-  IN  CONST CHAR8   * EisaIdStr,

-  OUT       UINT32  * EisaIdInt

+  IN  CONST CHAR8   *EisaIdStr,

+  OUT       UINT32  *EisaIdInt

   );

 

 #endif // ACPI_HELPER_LIB_H_

diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h
index f3a52dc3e0..094a8f32c6 100644
--- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h
+++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h
@@ -42,19 +42,19 @@
 

 /** Node handle.

 */

-typedef void* AML_NODE_HANDLE;

+typedef void *AML_NODE_HANDLE;

 

 /** Root Node handle.

 */

-typedef void* AML_ROOT_NODE_HANDLE;

+typedef void *AML_ROOT_NODE_HANDLE;

 

 /** Object Node handle.

 */

-typedef void* AML_OBJECT_NODE_HANDLE;

+typedef void *AML_OBJECT_NODE_HANDLE;

 

 /** Data Node handle.

 */

-typedef void* AML_DATA_NODE_HANDLE;

+typedef void *AML_DATA_NODE_HANDLE;

 

 #endif // AML_HANDLE

 

@@ -78,8 +78,8 @@ typedef void* AML_DATA_NODE_HANDLE;
 EFI_STATUS

 EFIAPI

 AmlParseDefinitionBlock (

-  IN  CONST EFI_ACPI_DESCRIPTION_HEADER   * DefinitionBlock,

-  OUT       AML_ROOT_NODE_HANDLE          * RootPtr

+  IN  CONST EFI_ACPI_DESCRIPTION_HEADER  *DefinitionBlock,

+  OUT       AML_ROOT_NODE_HANDLE         *RootPtr

   );

 

 /** Serialize an AML definition block.

@@ -101,8 +101,8 @@ AmlParseDefinitionBlock (
 EFI_STATUS

 EFIAPI

 AmlSerializeDefinitionBlock (

-  IN  AML_ROOT_NODE_HANDLE              RootNode,

-  OUT EFI_ACPI_DESCRIPTION_HEADER    ** Table

+  IN  AML_ROOT_NODE_HANDLE         RootNode,

+  OUT EFI_ACPI_DESCRIPTION_HEADER  **Table

   );

 

 /** Clone a node and its children (clone a tree branch).

@@ -123,8 +123,8 @@ AmlSerializeDefinitionBlock (
 EFI_STATUS

 EFIAPI

 AmlCloneTree (

-  IN  AML_NODE_HANDLE   Node,

-  OUT AML_NODE_HANDLE * ClonedNode

+  IN  AML_NODE_HANDLE  Node,

+  OUT AML_NODE_HANDLE  *ClonedNode

   );

 

 /** Delete a Node and its children.

@@ -142,7 +142,7 @@ AmlCloneTree (
 EFI_STATUS

 EFIAPI

 AmlDeleteTree (

-  IN  AML_NODE_HANDLE   Node

+  IN  AML_NODE_HANDLE  Node

   );

 

 /** Detach the Node from the tree.

@@ -163,7 +163,7 @@ AmlDeleteTree (
 EFI_STATUS

 EFIAPI

 AmlDetachNode (

-  IN  AML_NODE_HANDLE   Node

+  IN  AML_NODE_HANDLE  Node

   );

 

 /** Find a node in the AML namespace, given an ASL path and a reference Node.

@@ -212,9 +212,9 @@ AmlDetachNode (
 EFI_STATUS

 EFIAPI

 AmlFindNode (

-  IN  AML_NODE_HANDLE       ReferenceNode,

-  IN  CHAR8               * AslPath,

-  OUT AML_NODE_HANDLE     * OutNode

+  IN  AML_NODE_HANDLE  ReferenceNode,

+  IN  CHAR8            *AslPath,

+  OUT AML_NODE_HANDLE  *OutNode

   );

 

 /**

@@ -247,8 +247,8 @@ AmlFindNode (
 EFI_STATUS

 EFIAPI

 AmlDeviceOpUpdateName (

-  IN  AML_OBJECT_NODE_HANDLE    DeviceOpNode,

-  IN  CHAR8                   * NewNameString

+  IN  AML_OBJECT_NODE_HANDLE  DeviceOpNode,

+  IN  CHAR8                   *NewNameString

   );

 

 /** Update an integer value defined by a NameOp object node.

@@ -297,8 +297,8 @@ AmlNameOpUpdateInteger (
 EFI_STATUS

 EFIAPI

 AmlNameOpUpdateString (

-  IN        AML_OBJECT_NODE_HANDLE    NameOpNode,

-  IN  CONST CHAR8                   * NewName

+  IN        AML_OBJECT_NODE_HANDLE  NameOpNode,

+  IN  CONST CHAR8                   *NewName

   );

 

 /** Get the first Resource Data element contained in a named object.

@@ -331,8 +331,8 @@ AmlNameOpUpdateString (
 EFI_STATUS

 EFIAPI

 AmlNameOpGetFirstRdNode (

-  IN  AML_OBJECT_NODE_HANDLE   NameOpNode,

-  OUT AML_DATA_NODE_HANDLE   * OutRdNode

+  IN  AML_OBJECT_NODE_HANDLE  NameOpNode,

+  OUT AML_DATA_NODE_HANDLE    *OutRdNode

   );

 

 /** Get the Resource Data element following the CurrRdNode Resource Data.

@@ -367,8 +367,8 @@ AmlNameOpGetFirstRdNode (
 EFI_STATUS

 EFIAPI

 AmlNameOpGetNextRdNode (

-  IN  AML_DATA_NODE_HANDLE    CurrRdNode,

-  OUT AML_DATA_NODE_HANDLE  * OutRdNode

+  IN  AML_DATA_NODE_HANDLE  CurrRdNode,

+  OUT AML_DATA_NODE_HANDLE  *OutRdNode

   );

 

 /** Update the first interrupt of an Interrupt resource data node.

@@ -393,8 +393,8 @@ AmlNameOpGetNextRdNode (
 EFI_STATUS

 EFIAPI

 AmlUpdateRdInterrupt (

-  IN  AML_DATA_NODE_HANDLE    InterruptRdNode,

-  IN  UINT32                  Irq

+  IN  AML_DATA_NODE_HANDLE  InterruptRdNode,

+  IN  UINT32                Irq

   );

 

 /** Update the base address and length of a QWord resource data node.

@@ -495,11 +495,11 @@ AmlCodeGenRdInterrupt (
 EFI_STATUS

 EFIAPI

 AmlCodeGenDefinitionBlock (

-  IN  CONST CHAR8                 * TableSignature,

-  IN  CONST CHAR8                 * OemId,

-  IN  CONST CHAR8                 * OemTableId,

-  IN        UINT32                  OemRevision,

-  OUT       AML_ROOT_NODE_HANDLE  * NewRootNode

+  IN  CONST CHAR8                 *TableSignature,

+  IN  CONST CHAR8                 *OemId,

+  IN  CONST CHAR8                 *OemTableId,

+  IN        UINT32                OemRevision,

+  OUT       AML_ROOT_NODE_HANDLE  *NewRootNode

   );

 

 /** AML code generation for a Name object node, containing a String.

@@ -527,10 +527,10 @@ AmlCodeGenDefinitionBlock (
 EFI_STATUS

 EFIAPI

 AmlCodeGenNameString (

-  IN  CONST CHAR8                   * NameString,

-  IN        CHAR8                   * String,

-  IN        AML_NODE_HANDLE           ParentNode      OPTIONAL,

-  OUT       AML_OBJECT_NODE_HANDLE  * NewObjectNode   OPTIONAL

+  IN  CONST CHAR8                   *NameString,

+  IN        CHAR8                   *String,

+  IN        AML_NODE_HANDLE         ParentNode      OPTIONAL,

+  OUT       AML_OBJECT_NODE_HANDLE  *NewObjectNode   OPTIONAL

   );

 

 /** AML code generation for a Name object node, containing an Integer.

@@ -557,10 +557,10 @@ AmlCodeGenNameString (
 EFI_STATUS

 EFIAPI

 AmlCodeGenNameInteger (

-  IN  CONST CHAR8                   * NameString,

-  IN        UINT64                    Integer,

-  IN        AML_NODE_HANDLE           ParentNode      OPTIONAL,

-  OUT       AML_OBJECT_NODE_HANDLE  * NewObjectNode   OPTIONAL

+  IN  CONST CHAR8                   *NameString,

+  IN        UINT64                  Integer,

+  IN        AML_NODE_HANDLE         ParentNode      OPTIONAL,

+  OUT       AML_OBJECT_NODE_HANDLE  *NewObjectNode   OPTIONAL

   );

 

 /** AML code generation for a Device object node.

@@ -586,9 +586,9 @@ AmlCodeGenNameInteger (
 EFI_STATUS

 EFIAPI

 AmlCodeGenDevice (

-  IN  CONST CHAR8                   * NameString,

-  IN        AML_NODE_HANDLE           ParentNode      OPTIONAL,

-  OUT       AML_OBJECT_NODE_HANDLE  * NewObjectNode   OPTIONAL

+  IN  CONST CHAR8                   *NameString,

+  IN        AML_NODE_HANDLE         ParentNode      OPTIONAL,

+  OUT       AML_OBJECT_NODE_HANDLE  *NewObjectNode   OPTIONAL

   );

 

 /** AML code generation for a Scope object node.

@@ -614,9 +614,9 @@ AmlCodeGenDevice (
 EFI_STATUS

 EFIAPI

 AmlCodeGenScope (

-  IN  CONST CHAR8                   * NameString,

-  IN        AML_NODE_HANDLE           ParentNode      OPTIONAL,

-  OUT       AML_OBJECT_NODE_HANDLE  * NewObjectNode   OPTIONAL

+  IN  CONST CHAR8                   *NameString,

+  IN        AML_NODE_HANDLE         ParentNode      OPTIONAL,

+  OUT       AML_OBJECT_NODE_HANDLE  *NewObjectNode   OPTIONAL

   );

 

 /** AML code generation for a method returning a NameString.

@@ -663,13 +663,13 @@ AmlCodeGenScope (
 EFI_STATUS

 EFIAPI

 AmlCodeGenMethodRetNameString (

-  IN  CONST CHAR8                   * MethodNameString,

-  IN  CONST CHAR8                   * ReturnedNameString   OPTIONAL,

-  IN        UINT8                     NumArgs,

-  IN        BOOLEAN                   IsSerialized,

-  IN        UINT8                     SyncLevel,

-  IN        AML_NODE_HANDLE           ParentNode           OPTIONAL,

-  OUT       AML_OBJECT_NODE_HANDLE  * NewObjectNode        OPTIONAL

+  IN  CONST CHAR8                   *MethodNameString,

+  IN  CONST CHAR8                   *ReturnedNameString   OPTIONAL,

+  IN        UINT8                   NumArgs,

+  IN        BOOLEAN                 IsSerialized,

+  IN        UINT8                   SyncLevel,

+  IN        AML_NODE_HANDLE         ParentNode           OPTIONAL,

+  OUT       AML_OBJECT_NODE_HANDLE  *NewObjectNode        OPTIONAL

   );

 

 /** Create a _LPI name.

@@ -709,11 +709,11 @@ AmlCodeGenMethodRetNameString (
 EFI_STATUS

 EFIAPI

 AmlCreateLpiNode (

-  IN  CONST CHAR8                   * LpiNameString,

-  IN        UINT16                    Revision,

-  IN        UINT64                    LevelId,

-  IN        AML_NODE_HANDLE           ParentNode   OPTIONAL,

-  OUT       AML_OBJECT_NODE_HANDLE  * NewLpiNode   OPTIONAL

+  IN  CONST CHAR8                   *LpiNameString,

+  IN        UINT16                  Revision,

+  IN        UINT64                  LevelId,

+  IN        AML_NODE_HANDLE         ParentNode   OPTIONAL,

+  OUT       AML_OBJECT_NODE_HANDLE  *NewLpiNode   OPTIONAL

   );

 

 /** Add an _LPI state to a LPI node created using AmlCreateLpiNode ().

@@ -773,18 +773,18 @@ AmlCreateLpiNode (
 EFI_STATUS

 EFIAPI

 AmlAddLpiState (

-  IN  UINT32                                    MinResidency,

-  IN  UINT32                                    WorstCaseWakeLatency,

-  IN  UINT32                                    Flags,

-  IN  UINT32                                    ArchFlags,

-  IN  UINT32                                    ResCntFreq,

-  IN  UINT32                                    EnableParentState,

-  IN  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  * GenericRegisterDescriptor   OPTIONAL,

-  IN  UINT64                                    Integer                     OPTIONAL,

-  IN  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  * ResidencyCounterRegister    OPTIONAL,

-  IN  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  * UsageCounterRegister        OPTIONAL,

-  IN  CHAR8                                   * StateName                   OPTIONAL,

-  IN  AML_OBJECT_NODE_HANDLE                    LpiNode

+  IN  UINT32                                  MinResidency,

+  IN  UINT32                                  WorstCaseWakeLatency,

+  IN  UINT32                                  Flags,

+  IN  UINT32                                  ArchFlags,

+  IN  UINT32                                  ResCntFreq,

+  IN  UINT32                                  EnableParentState,

+  IN  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  *GenericRegisterDescriptor   OPTIONAL,

+  IN  UINT64                                  Integer                     OPTIONAL,

+  IN  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  *ResidencyCounterRegister    OPTIONAL,

+  IN  EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE  *UsageCounterRegister        OPTIONAL,

+  IN  CHAR8                                   *StateName                   OPTIONAL,

+  IN  AML_OBJECT_NODE_HANDLE                  LpiNode

   );

 

 // DEPRECATED APIS

@@ -823,8 +823,8 @@ AmlAddLpiState (
 EFI_STATUS

 EFIAPI

 AmlNameOpCrsGetFirstRdNode (

-  IN  AML_OBJECT_NODE_HANDLE   NameOpCrsNode,

-  OUT AML_DATA_NODE_HANDLE   * OutRdNode

+  IN  AML_OBJECT_NODE_HANDLE  NameOpCrsNode,

+  OUT AML_DATA_NODE_HANDLE    *OutRdNode

   );

 

 /** DEPRECATED API

@@ -860,8 +860,8 @@ AmlNameOpCrsGetFirstRdNode (
 EFI_STATUS

 EFIAPI

 AmlNameOpCrsGetNextRdNode (

-  IN  AML_DATA_NODE_HANDLE    CurrRdNode,

-  OUT AML_DATA_NODE_HANDLE  * OutRdNode

+  IN  AML_DATA_NODE_HANDLE  CurrRdNode,

+  OUT AML_DATA_NODE_HANDLE  *OutRdNode

   );

 

 /** DEPRECATED API

@@ -919,7 +919,7 @@ AmlCodeGenCrsAddRdInterrupt (
   IN  BOOLEAN                 EdgeTriggered,

   IN  BOOLEAN                 ActiveLow,

   IN  BOOLEAN                 Shared,

-  IN  UINT32                * IrqList,

+  IN  UINT32                  *IrqList,

   IN  UINT8                   IrqCount

   );

 

diff --git a/DynamicTablesPkg/Include/Library/SsdtSerialPortFixupLib.h b/DynamicTablesPkg/Include/Library/SsdtSerialPortFixupLib.h
index 4605f3f34b..4835f314c4 100644
--- a/DynamicTablesPkg/Include/Library/SsdtSerialPortFixupLib.h
+++ b/DynamicTablesPkg/Include/Library/SsdtSerialPortFixupLib.h
@@ -29,11 +29,11 @@
 EFI_STATUS

 EFIAPI

 BuildSsdtSerialPortTable (

-  IN  CONST CM_STD_OBJ_ACPI_TABLE_INFO    *  AcpiTableInfo,

-  IN  CONST CM_ARM_SERIAL_PORT_INFO       *  SerialPortInfo,

-  IN  CONST CHAR8                         *  Name,

-  IN  CONST UINT64                           Uid,

-  OUT       EFI_ACPI_DESCRIPTION_HEADER  **  Table

+  IN  CONST CM_STD_OBJ_ACPI_TABLE_INFO   *AcpiTableInfo,

+  IN  CONST CM_ARM_SERIAL_PORT_INFO      *SerialPortInfo,

+  IN  CONST CHAR8                        *Name,

+  IN  CONST UINT64                       Uid,

+  OUT       EFI_ACPI_DESCRIPTION_HEADER  **Table

   );

 

 /** Free an SSDT table previously created by

@@ -47,7 +47,7 @@ BuildSsdtSerialPortTable (
 EFI_STATUS

 EFIAPI

 FreeSsdtSerialPortTable (

-  IN EFI_ACPI_DESCRIPTION_HEADER  * Table

+  IN EFI_ACPI_DESCRIPTION_HEADER  *Table

   );

 

 /** Validate the Serial Port Information.

@@ -61,8 +61,8 @@ FreeSsdtSerialPortTable (
 EFI_STATUS

 EFIAPI

 ValidateSerialPortInfo (

-  IN  CONST CM_ARM_SERIAL_PORT_INFO  * SerialPortInfoTable,

-  IN        UINT32                     SerialPortCount

+  IN  CONST CM_ARM_SERIAL_PORT_INFO  *SerialPortInfoTable,

+  IN        UINT32                   SerialPortCount

   );

 

 #endif // SSDT_SERIAL_PORT_LIB_H_

diff --git a/DynamicTablesPkg/Include/Library/TableHelperLib.h b/DynamicTablesPkg/Include/Library/TableHelperLib.h
index 76f9e8c25f..f8b3ffb294 100644
--- a/DynamicTablesPkg/Include/Library/TableHelperLib.h
+++ b/DynamicTablesPkg/Include/Library/TableHelperLib.h
@@ -31,8 +31,8 @@
 EFI_STATUS

 EFIAPI

 GetCgfMgrInfo (

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL      * CONST  CfgMgrProtocol,

-  OUT       CM_STD_OBJ_CONFIGURATION_MANAGER_INFO    **        CfgMfrInfo

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL      *CONST  CfgMgrProtocol,

+  OUT       CM_STD_OBJ_CONFIGURATION_MANAGER_INFO             **CfgMfrInfo

   );

 

 /** The AddAcpiHeader function updates the ACPI header structure. It uses the

@@ -57,10 +57,10 @@ GetCgfMgrInfo (
 EFI_STATUS

 EFIAPI

 AddAcpiHeader (

-  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

-  IN      CONST ACPI_TABLE_GENERATOR                  * CONST Generator,

-  IN OUT  EFI_ACPI_DESCRIPTION_HEADER                 * CONST AcpiHeader,

-  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO            * CONST AcpiTableInfo,

+  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,

+  IN      CONST ACPI_TABLE_GENERATOR                  *CONST  Generator,

+  IN OUT  EFI_ACPI_DESCRIPTION_HEADER                 *CONST  AcpiHeader,

+  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO            *CONST  AcpiTableInfo,

   IN      CONST UINT32                                        Length

   );

 

@@ -91,10 +91,10 @@ AddAcpiHeader (
 EFI_STATUS

 EFIAPI

 AddSsdtAcpiHeader (

-  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

-  IN      CONST ACPI_TABLE_GENERATOR                  * CONST Generator,

-  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO            * CONST AcpiTableInfo,

-      OUT       AML_ROOT_NODE_HANDLE                  *       RootNode

+  IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,

+  IN      CONST ACPI_TABLE_GENERATOR                  *CONST  Generator,

+  IN      CONST CM_STD_OBJ_ACPI_TABLE_INFO            *CONST  AcpiTableInfo,

+  OUT       AML_ROOT_NODE_HANDLE                              *RootNode

   );

 

 /**

@@ -113,8 +113,8 @@ AddSsdtAcpiHeader (
 typedef

 BOOLEAN

 (EFIAPI *PFN_IS_EQUAL)(

-  IN CONST  VOID            * Object1,

-  IN CONST  VOID            * Object2,

+  IN CONST  VOID            *Object1,

+  IN CONST  VOID            *Object2,

   IN        UINTN             Index1 OPTIONAL,

   IN        UINTN             Index2 OPTIONAL

   );

@@ -136,10 +136,10 @@ BOOLEAN
 BOOLEAN

 EFIAPI

 FindDuplicateValue (

-  IN  CONST VOID          * Array,

-  IN  CONST UINTN           Count,

-  IN  CONST UINTN           ElementSize,

-  IN        PFN_IS_EQUAL    EqualTestFunction

+  IN  CONST VOID          *Array,

+  IN  CONST UINTN         Count,

+  IN  CONST UINTN         ElementSize,

+  IN        PFN_IS_EQUAL  EqualTestFunction

   );

 

 /** Parse and print a CmObjDesc.

@@ -149,7 +149,7 @@ FindDuplicateValue (
 VOID

 EFIAPI

 ParseCmObjDesc (

-  IN  CONST CM_OBJ_DESCRIPTOR * CmObjDesc

+  IN  CONST CM_OBJ_DESCRIPTOR  *CmObjDesc

   );

 

 #endif // TABLE_HELPER_LIB_H_

diff --git a/DynamicTablesPkg/Include/Protocol/ConfigurationManagerProtocol.h b/DynamicTablesPkg/Include/Protocol/ConfigurationManagerProtocol.h
index 7de1be3b23..6a1faec098 100644
--- a/DynamicTablesPkg/Include/Protocol/ConfigurationManagerProtocol.h
+++ b/DynamicTablesPkg/Include/Protocol/ConfigurationManagerProtocol.h
@@ -32,8 +32,8 @@
 /**

   Forward declarations:

 */

-typedef struct ConfigurationManagerProtocol EDKII_CONFIGURATION_MANAGER_PROTOCOL;

-typedef struct PlatformRepositoryInfo       EDKII_PLATFORM_REPOSITORY_INFO;

+typedef struct ConfigurationManagerProtocol  EDKII_CONFIGURATION_MANAGER_PROTOCOL;

+typedef struct PlatformRepositoryInfo        EDKII_PLATFORM_REPOSITORY_INFO;

 

 /** The GetObject function defines the interface implemented by the

     Configuration Manager Protocol for returning the Configuration

@@ -55,11 +55,11 @@ typedef struct PlatformRepositoryInfo       EDKII_PLATFORM_REPOSITORY_INFO;
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_CONFIGURATION_MANAGER_GET_OBJECT) (

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST This,

+(EFIAPI *EDKII_CONFIGURATION_MANAGER_GET_OBJECT)(

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST This,

   IN  CONST CM_OBJECT_ID                                  CmObjectId,

   IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,

-  IN  OUT   CM_OBJ_DESCRIPTOR                     * CONST CmObject

+  IN  OUT   CM_OBJ_DESCRIPTOR                     *CONST CmObject

   );

 

 /** The SetObject function defines the interface implemented by the

@@ -83,11 +83,11 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_CONFIGURATION_MANAGER_SET_OBJECT) (

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST This,

+(EFIAPI *EDKII_CONFIGURATION_MANAGER_SET_OBJECT)(

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST This,

   IN  CONST CM_OBJECT_ID                                  CmObjectId,

   IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,

-  IN        CM_OBJ_DESCRIPTOR                     * CONST CmObject

+  IN        CM_OBJ_DESCRIPTOR                     *CONST CmObject

   );

 

 /** The EDKII_CONFIGURATION_MANAGER_PROTOCOL structure describes the

@@ -95,27 +95,27 @@ EFI_STATUS
 */

 typedef struct ConfigurationManagerProtocol {

   /// The Configuration Manager Protocol revision.

-  UINT32                                  Revision;

+  UINT32                                    Revision;

 

   /** The interface used to request information about

       the Configuration Manager Objects.

   */

-  EDKII_CONFIGURATION_MANAGER_GET_OBJECT  GetObject;

+  EDKII_CONFIGURATION_MANAGER_GET_OBJECT    GetObject;

 

   /** The interface used to update the information stored

       in the Configuration Manager repository.

   */

-  EDKII_CONFIGURATION_MANAGER_SET_OBJECT  SetObject;

+  EDKII_CONFIGURATION_MANAGER_SET_OBJECT    SetObject;

 

   /** Pointer to an implementation defined abstract repository

       provisioned by the Configuration Manager.

   */

-  EDKII_PLATFORM_REPOSITORY_INFO        * PlatRepoInfo;

+  EDKII_PLATFORM_REPOSITORY_INFO            *PlatRepoInfo;

 } EDKII_CONFIGURATION_MANAGER_PROTOCOL;

 

 /** The Configuration Manager Protocol GUID.

 */

-extern EFI_GUID gEdkiiConfigurationManagerProtocolGuid;

+extern EFI_GUID  gEdkiiConfigurationManagerProtocolGuid;

 

 #pragma pack()

 

diff --git a/DynamicTablesPkg/Include/Protocol/DynamicTableFactoryProtocol.h b/DynamicTablesPkg/Include/Protocol/DynamicTableFactoryProtocol.h
index ff2331b060..b11fc0c9f1 100644
--- a/DynamicTablesPkg/Include/Protocol/DynamicTableFactoryProtocol.h
+++ b/DynamicTablesPkg/Include/Protocol/DynamicTableFactoryProtocol.h
@@ -35,8 +35,8 @@
 /**

   Forward declarations:

 */

-typedef struct DynamicTableFactoryProtocol EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL;

-typedef struct DynamicTableFactoryInfo EDKII_DYNAMIC_TABLE_FACTORY_INFO;

+typedef struct DynamicTableFactoryProtocol  EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL;

+typedef struct DynamicTableFactoryInfo      EDKII_DYNAMIC_TABLE_FACTORY_INFO;

 

 /** Return a pointer to the ACPI table generator.

 

@@ -53,10 +53,10 @@ typedef struct DynamicTableFactoryInfo EDKII_DYNAMIC_TABLE_FACTORY_INFO;
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_GET_ACPI_TABLE_GENERATOR) (

-  IN  CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  * CONST This,

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_GET_ACPI_TABLE_GENERATOR)(

+  IN  CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST This,

   IN  CONST ACPI_TABLE_GENERATOR_ID                       GeneratorId,

-  OUT CONST ACPI_TABLE_GENERATOR                 ** CONST Generator

+  OUT CONST ACPI_TABLE_GENERATOR                 **CONST Generator

   );

 

 /** Registers an ACPI table generator.

@@ -72,8 +72,8 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_ACPI_TABLE_GENERATOR) (

-  IN  CONST ACPI_TABLE_GENERATOR                * CONST Generator

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_ACPI_TABLE_GENERATOR)(

+  IN  CONST ACPI_TABLE_GENERATOR                *CONST Generator

   );

 

 /** Deregister an ACPI table generator.

@@ -87,8 +87,8 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_ACPI_TABLE_GENERATOR) (

-  IN  CONST ACPI_TABLE_GENERATOR                * CONST Generator

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_ACPI_TABLE_GENERATOR)(

+  IN  CONST ACPI_TABLE_GENERATOR                *CONST Generator

   );

 

 /** Return a pointer to the SMBIOS table generator.

@@ -106,10 +106,10 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_GET_SMBIOS_TABLE_GENERATOR) (

-  IN  CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  * CONST This,

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_GET_SMBIOS_TABLE_GENERATOR)(

+  IN  CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST This,

   IN  CONST SMBIOS_TABLE_GENERATOR_ID                     GeneratorId,

-  OUT CONST SMBIOS_TABLE_GENERATOR               ** CONST Generator

+  OUT CONST SMBIOS_TABLE_GENERATOR               **CONST Generator

   );

 

 /** Register a SMBIOS table generator.

@@ -125,8 +125,8 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_SMBIOS_TABLE_GENERATOR) (

-  IN  CONST SMBIOS_TABLE_GENERATOR              * CONST Generator

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_SMBIOS_TABLE_GENERATOR)(

+  IN  CONST SMBIOS_TABLE_GENERATOR              *CONST Generator

   );

 

 /** Deregister a SMBIOS table generator.

@@ -140,8 +140,8 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_SMBIOS_TABLE_GENERATOR) (

-  IN  CONST SMBIOS_TABLE_GENERATOR              * CONST Generator

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_SMBIOS_TABLE_GENERATOR)(

+  IN  CONST SMBIOS_TABLE_GENERATOR              *CONST Generator

   );

 

 /** Return a pointer to the Device Tree table generator.

@@ -159,10 +159,10 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_GET_DT_TABLE_GENERATOR) (

-  IN  CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  * CONST This,

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_GET_DT_TABLE_GENERATOR)(

+  IN  CONST EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL  *CONST This,

   IN  CONST DT_TABLE_GENERATOR_ID                         GeneratorId,

-  OUT CONST DT_TABLE_GENERATOR                   ** CONST Generator

+  OUT CONST DT_TABLE_GENERATOR                   **CONST Generator

   );

 

 /** Register a DT table generator.

@@ -178,8 +178,8 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_DT_TABLE_GENERATOR) (

-  IN  CONST DT_TABLE_GENERATOR                * CONST Generator

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_DT_TABLE_GENERATOR)(

+  IN  CONST DT_TABLE_GENERATOR                *CONST Generator

   );

 

 /** Deregister a DT table generator.

@@ -196,58 +196,58 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI * EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_DT_TABLE_GENERATOR) (

-  IN  CONST DT_TABLE_GENERATOR                * CONST Generator

+(EFIAPI *EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_DT_TABLE_GENERATOR)(

+  IN  CONST DT_TABLE_GENERATOR                *CONST Generator

   );

 

 /** A structure describing the Dynamic Table Factory Protocol interface.

 */

 typedef struct DynamicTableFactoryProtocol {

   /// The Dynamic Table Factory Protocol revision.

-  UINT32                                                 Revision;

+  UINT32                                                    Revision;

 

   /// The interface used to request an ACPI Table Generator.

-  EDKII_DYNAMIC_TABLE_FACTORY_GET_ACPI_TABLE_GENERATOR   GetAcpiTableGenerator;

+  EDKII_DYNAMIC_TABLE_FACTORY_GET_ACPI_TABLE_GENERATOR      GetAcpiTableGenerator;

 

   /// Register an ACPI table Generator

   EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_ACPI_TABLE_GENERATOR

-    RegisterAcpiTableGenerator;

+                                                            RegisterAcpiTableGenerator;

 

   /// Deregister an ACPI table Generator

   EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_ACPI_TABLE_GENERATOR

-    DeregisterAcpiTableGenerator;

+                                                            DeregisterAcpiTableGenerator;

 

   /// The interface used to request a SMBIOS Table Generator.

-  EDKII_DYNAMIC_TABLE_FACTORY_GET_SMBIOS_TABLE_GENERATOR GetSmbiosTableGenerator;

+  EDKII_DYNAMIC_TABLE_FACTORY_GET_SMBIOS_TABLE_GENERATOR    GetSmbiosTableGenerator;

 

   /// Register an SMBIOS table Generator

   EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_SMBIOS_TABLE_GENERATOR

-    RegisterSmbiosTableGenerator;

+                                                            RegisterSmbiosTableGenerator;

 

   /// Deregister an SMBIOS table Generator

   EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_SMBIOS_TABLE_GENERATOR

-    DeregisterSmbiosTableGenerator;

+                                                            DeregisterSmbiosTableGenerator;

 

   /// The interface used to request a Device Tree Table Generator.

-  EDKII_DYNAMIC_TABLE_FACTORY_GET_DT_TABLE_GENERATOR     GetDtTableGenerator;

+  EDKII_DYNAMIC_TABLE_FACTORY_GET_DT_TABLE_GENERATOR        GetDtTableGenerator;

 

   /// Register a DT generator

   EDKII_DYNAMIC_TABLE_FACTORY_REGISTER_DT_TABLE_GENERATOR

-    RegisterDtTableGenerator;

+                                                            RegisterDtTableGenerator;

 

   /// Deregister a DT generator

   EDKII_DYNAMIC_TABLE_FACTORY_DEREGISTER_DT_TABLE_GENERATOR

-    DeregisterDtTableGenerator;

+                                                            DeregisterDtTableGenerator;

 

   /** Pointer to the data structure that holds the

       list of registered table generators

   */

-  EDKII_DYNAMIC_TABLE_FACTORY_INFO          * TableFactoryInfo;

+  EDKII_DYNAMIC_TABLE_FACTORY_INFO                          *TableFactoryInfo;

 } EDKII_DYNAMIC_TABLE_FACTORY_PROTOCOL;

 

 /** The Dynamic Table Factory Protocol GUID.

 */

-extern EFI_GUID gEdkiiDynamicTableFactoryProtocolGuid;

+extern EFI_GUID  gEdkiiDynamicTableFactoryProtocolGuid;

 

 #pragma pack()

 

diff --git a/DynamicTablesPkg/Include/SmbiosTableGenerator.h b/DynamicTablesPkg/Include/SmbiosTableGenerator.h
index 9fbf9fc0cc..934d56c90d 100644
--- a/DynamicTablesPkg/Include/SmbiosTableGenerator.h
+++ b/DynamicTablesPkg/Include/SmbiosTableGenerator.h
@@ -142,10 +142,10 @@ typedef struct SmbiosTableGenerator         SMBIOS_TABLE_GENERATOR;
                         failure codes as returned by the generator.

 **/

 typedef EFI_STATUS (*SMBIOS_TABLE_GENERATOR_BUILD_TABLE) (

-  IN  CONST SMBIOS_TABLE_GENERATOR                *       Generator,

-  IN        CM_STD_OBJ_SMBIOS_TABLE_INFO          * CONST SmbiosTableInfo,

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

-  OUT       SMBIOS_STRUCTURE                     **       Table

+  IN  CONST SMBIOS_TABLE_GENERATOR                        *Generator,

+  IN        CM_STD_OBJ_SMBIOS_TABLE_INFO          *CONST  SmbiosTableInfo,

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,

+  OUT       SMBIOS_STRUCTURE                              **Table

   );

 

 /** This function pointer describes the interface to used by the

@@ -162,10 +162,10 @@ typedef EFI_STATUS (*SMBIOS_TABLE_GENERATOR_BUILD_TABLE) (
                         as returned by the generator.

 **/

 typedef EFI_STATUS (*SMBIOS_TABLE_GENERATOR_FREE_TABLE) (

-  IN  CONST SMBIOS_TABLE_GENERATOR                *       Generator,

-  IN  CONST CM_STD_OBJ_SMBIOS_TABLE_INFO          * CONST SmbiosTableInfo,

-  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

-  IN        SMBIOS_STRUCTURE                     **       Table

+  IN  CONST SMBIOS_TABLE_GENERATOR                        *Generator,

+  IN  CONST CM_STD_OBJ_SMBIOS_TABLE_INFO          *CONST  SmbiosTableInfo,

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  CfgMgrProtocol,

+  IN        SMBIOS_STRUCTURE                              **Table

   );

 

 /** The SMBIOS_TABLE_GENERATOR structure provides an interface that the

@@ -173,22 +173,22 @@ typedef EFI_STATUS (*SMBIOS_TABLE_GENERATOR_FREE_TABLE) (
 */

 typedef struct SmbiosTableGenerator {

   /// The SMBIOS table generator ID.

-  SMBIOS_TABLE_GENERATOR_ID                GeneratorID;

+  SMBIOS_TABLE_GENERATOR_ID             GeneratorID;

 

   /// String describing the DT table

   /// generator.

-  CONST CHAR16*                            Description;

+  CONST CHAR16                          *Description;

 

   /// The SMBIOS table type.

-  SMBIOS_TYPE                              Type;

+  SMBIOS_TYPE                           Type;

 

   /// SMBIOS table build function pointer.

-  SMBIOS_TABLE_GENERATOR_BUILD_TABLE       BuildSmbiosTable;

+  SMBIOS_TABLE_GENERATOR_BUILD_TABLE    BuildSmbiosTable;

 

   /** The function to free any resources

       allocated for building the SMBIOS table.

   */

-  SMBIOS_TABLE_GENERATOR_FREE_TABLE        FreeTableResources;

+  SMBIOS_TABLE_GENERATOR_FREE_TABLE     FreeTableResources;

 } SMBIOS_TABLE_GENERATOR;

 

 /** Register SMBIOS table factory generator.

@@ -208,7 +208,7 @@ typedef struct SmbiosTableGenerator {
 EFI_STATUS

 EFIAPI

 RegisterSmbiosTableGenerator (

-  IN CONST SMBIOS_TABLE_GENERATOR                 * CONST Generator

+  IN CONST SMBIOS_TABLE_GENERATOR                 *CONST  Generator

   );

 

 /** Deregister SMBIOS generator.

@@ -226,9 +226,9 @@ RegisterSmbiosTableGenerator (
 EFI_STATUS

 EFIAPI

 DeregisterSmbiosTableGenerator (

-  IN CONST SMBIOS_TABLE_GENERATOR                 * CONST Generator

+  IN CONST SMBIOS_TABLE_GENERATOR                 *CONST  Generator

   );

+

 #pragma pack()

 

 #endif // SMBIOS_TABLE_GENERATOR_H_

-

diff --git a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
index 0ba6b16369..8d0c7da15a 100644
--- a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
@@ -38,7 +38,7 @@
   Note: The token value 0 is reserved for a NULL token and does

         not identify any object.

 **/

-typedef UINTN   CM_OBJECT_TOKEN;

+typedef UINTN CM_OBJECT_TOKEN;

 

 /** The ESTD_OBJECT_ID enum describes the Object IDs

     in the Standard Namespace.

@@ -54,12 +54,12 @@ typedef enum StdObjectID {
 */

 typedef struct CmStdObjConfigurationManagerInfo {

   /// The Configuration Manager Revision.

-  UINT32  Revision;

+  UINT32    Revision;

 

   /** The OEM ID. This information is used to

       populate the ACPI table header information.

   */

-  UINT8   OemId[6];

+  UINT8     OemId[6];

 } CM_STD_OBJ_CONFIGURATION_MANAGER_INFO;

 

 /** A structure used to describe the ACPI table generators to be invoked.

@@ -85,7 +85,7 @@ typedef struct CmAStdObjAcpiTableInfo {
   ACPI_TABLE_GENERATOR_ID        TableGeneratorId;

 

   /// Optional pointer to the ACPI table data

-  EFI_ACPI_DESCRIPTION_HEADER  * AcpiTableData;

+  EFI_ACPI_DESCRIPTION_HEADER    *AcpiTableData;

 

   /// An OEM-supplied string that the OEM uses to identify the particular

   /// data table. This field is particularly useful when defining a definition

@@ -97,14 +97,14 @@ typedef struct CmAStdObjAcpiTableInfo {
   /// Generators shall populate this information using part of the

   /// CM_STD_OBJ_CONFIGURATION_MANAGER_INFO.OemId field and the

   /// ACPI table signature.

-  UINT64                         OemTableId;

+  UINT64    OemTableId;

 

   /// An OEM-supplied revision number. Larger numbers are assumed to be

   /// newer revisions.

   /// Note: If this field is not populated (has value of Zero), then the

   /// Generators shall populate this information using the revision of the

   /// Configuration Manager (CM_STD_OBJ_CONFIGURATION_MANAGER_INFO.Revision).

-  UINT32                         OemRevision;

+  UINT32    OemRevision;

 } CM_STD_OBJ_ACPI_TABLE_INFO;

 

 /** A structure used to describe the SMBIOS table generators to be invoked.

@@ -120,10 +120,10 @@ typedef struct CmAStdObjAcpiTableInfo {
 */

 typedef struct CmStdObjSmbiosTableInfo {

   /// The SMBIOS Table Generator ID

-  SMBIOS_TABLE_GENERATOR_ID   TableGeneratorId;

+  SMBIOS_TABLE_GENERATOR_ID    TableGeneratorId;

 

   /// Optional pointer to the SMBIOS table data

-  SMBIOS_STRUCTURE           * SmbiosTableData;

+  SMBIOS_STRUCTURE             *SmbiosTableData;

 } CM_STD_OBJ_SMBIOS_TABLE_INFO;

 

 #pragma pack()

diff --git a/DynamicTablesPkg/Include/TableGenerator.h b/DynamicTablesPkg/Include/TableGenerator.h
index da6434a48b..0d9ff9a1e3 100644
--- a/DynamicTablesPkg/Include/TableGenerator.h
+++ b/DynamicTablesPkg/Include/TableGenerator.h
@@ -107,7 +107,7 @@ _______________________________________________________________________________
      128 - Table Type126

      129 - Table Type127

 **/

-typedef UINT32  TABLE_GENERATOR_ID;

+typedef UINT32 TABLE_GENERATOR_ID;

 

 /** This enum lists the Table Generator Types.

 */

@@ -127,19 +127,19 @@ typedef enum TableGeneratorNameSpace {
 

 /** A mask for the Table ID bits of TABLE_GENERATOR_ID.

 */

-#define TABLE_ID_MASK                 0xFF

+#define TABLE_ID_MASK  0xFF

 

 /** A mask for the Namespace ID bits of TABLE_GENERATOR_ID.

 */

-#define TABLE_NAMESPACEID_MASK        (BIT31)

+#define TABLE_NAMESPACEID_MASK  (BIT31)

 

 /** A mask for the Table Type bits of TABLE_GENERATOR_ID.

 */

-#define TABLE_TYPE_MASK               (BIT29 | BIT28)

+#define TABLE_TYPE_MASK  (BIT29 | BIT28)

 

 /** Starting bit position for the Table Type bits

 */

-#define TABLE_TYPE_BIT_SHIFT          28

+#define TABLE_TYPE_BIT_SHIFT  28

 

 /** Starting bit position for the Table Namespace ID bit

 */

@@ -204,11 +204,11 @@ typedef enum TableGeneratorNameSpace {
 

 /** A mask for Major revision.

 */

-#define MAJOR_REVISION_MASK       0xFFFF

+#define MAJOR_REVISION_MASK  0xFFFF

 

 /** A mask for Minor revision.

 */

-#define MINOR_REVISION_MASK       0xFFFF

+#define MINOR_REVISION_MASK  0xFFFF

 

 /** This macro generates a Major.Minor version

     where the Major and Minor fields are 16 bit.

@@ -244,4 +244,3 @@ typedef enum TableGeneratorNameSpace {
 #define GET_MINOR_REVISION(Revision)  ((Revision) & MINOR_REVISION_MASK)

 

 #endif // TABLE_GENERATOR_H_

-