UefiPayloadPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the UefiPayloadPkg 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: Ray Ni <ray.ni@intel.com>

15 files changed, 247 insertions, 253 deletions

diff --git a/UefiPayloadPkg/Include/Coreboot.h b/UefiPayloadPkg/Include/Coreboot.h
index 86e14a1..a3e1109 100644
--- a/UefiPayloadPkg/Include/Coreboot.h
+++ b/UefiPayloadPkg/Include/Coreboot.h
@@ -35,205 +35,205 @@
  * SUCH DAMAGE.

  */

 

-

 #ifndef _COREBOOT_PEI_H_INCLUDED_

 #define _COREBOOT_PEI_H_INCLUDED_

 

-#if defined(_MSC_VER)

-#pragma warning( disable : 4200 )

+#if defined (_MSC_VER)

+  #pragma warning( disable : 4200 )

 #endif

 

-#define DYN_CBMEM_ALIGN_SIZE (4096)

+#define DYN_CBMEM_ALIGN_SIZE  (4096)

 

-#define IMD_ENTRY_MAGIC      (~0xC0389481)

-#define CBMEM_ENTRY_MAGIC    (~0xC0389479)

+#define IMD_ENTRY_MAGIC    (~0xC0389481)

+#define CBMEM_ENTRY_MAGIC  (~0xC0389479)

 

 struct cbmem_entry {

-  UINT32 magic;

-  UINT32 start;

-  UINT32 size;

-  UINT32 id;

+  UINT32    magic;

+  UINT32    start;

+  UINT32    size;

+  UINT32    id;

 };

 

 struct cbmem_root {

-  UINT32 max_entries;

-  UINT32 num_entries;

-  UINT32 locked;

-  UINT32 size;

-  struct cbmem_entry entries[0];

+  UINT32                max_entries;

+  UINT32                num_entries;

+  UINT32                locked;

+  UINT32                size;

+  struct cbmem_entry    entries[0];

 };

 

 struct imd_entry {

-  UINT32 magic;

-  UINT32 start_offset;

-  UINT32 size;

-  UINT32 id;

+  UINT32    magic;

+  UINT32    start_offset;

+  UINT32    size;

+  UINT32    id;

 };

 

 struct imd_root {

-  UINT32 max_entries;

-  UINT32 num_entries;

-  UINT32 flags;

-  UINT32 entry_align;

-  UINT32 max_offset;

-  struct imd_entry entries[0];

+  UINT32              max_entries;

+  UINT32              num_entries;

+  UINT32              flags;

+  UINT32              entry_align;

+  UINT32              max_offset;

+  struct imd_entry    entries[0];

 };

 

 struct cbuint64 {

-  UINT32 lo;

-  UINT32 hi;

+  UINT32    lo;

+  UINT32    hi;

 };

 

-#define CB_HEADER_SIGNATURE 0x4F49424C

+#define CB_HEADER_SIGNATURE  0x4F49424C

 

 struct cb_header {

-  UINT32 signature;

-  UINT32 header_bytes;

-  UINT32 header_checksum;

-  UINT32 table_bytes;

-  UINT32 table_checksum;

-  UINT32 table_entries;

+  UINT32    signature;

+  UINT32    header_bytes;

+  UINT32    header_checksum;

+  UINT32    table_bytes;

+  UINT32    table_checksum;

+  UINT32    table_entries;

 };

 

 struct cb_record {

-  UINT32 tag;

-  UINT32 size;

+  UINT32    tag;

+  UINT32    size;

 };

 

-#define CB_TAG_UNUSED     0x0000

-#define CB_TAG_MEMORY     0x0001

+#define CB_TAG_UNUSED  0x0000

+#define CB_TAG_MEMORY  0x0001

 

 struct cb_memory_range {

-  struct cbuint64 start;

-  struct cbuint64 size;

-  UINT32 type;

+  struct cbuint64    start;

+  struct cbuint64    size;

+  UINT32             type;

 };

 

-#define CB_MEM_RAM    1

+#define CB_MEM_RAM          1

 #define CB_MEM_RESERVED     2

-#define CB_MEM_ACPI   3

-#define CB_MEM_NVS    4

+#define CB_MEM_ACPI         3

+#define CB_MEM_NVS          4

 #define CB_MEM_UNUSABLE     5

 #define CB_MEM_VENDOR_RSVD  6

-#define CB_MEM_TABLE       16

+#define CB_MEM_TABLE        16

 

 struct cb_memory {

-  UINT32 tag;

-  UINT32 size;

-  struct cb_memory_range map[0];

+  UINT32                    tag;

+  UINT32                    size;

+  struct cb_memory_range    map[0];

 };

 

 #define CB_TAG_MAINBOARD  0x0003

 

 struct cb_mainboard {

-  UINT32 tag;

-  UINT32 size;

-  UINT8 vendor_idx;

-  UINT8 part_number_idx;

-  UINT8 strings[0];

-};

-#define CB_TAG_VERSION  0x0004

-#define CB_TAG_EXTRA_VERSION  0x0005

-#define CB_TAG_BUILD    0x0006

-#define CB_TAG_COMPILE_TIME   0x0007

-#define CB_TAG_COMPILE_BY     0x0008

-#define CB_TAG_COMPILE_HOST   0x0009

-#define CB_TAG_COMPILE_DOMAIN 0x000a

-#define CB_TAG_COMPILER       0x000b

-#define CB_TAG_LINKER   0x000c

-#define CB_TAG_ASSEMBLER      0x000d

+  UINT32    tag;

+  UINT32    size;

+  UINT8     vendor_idx;

+  UINT8     part_number_idx;

+  UINT8     strings[0];

+};

+

+#define CB_TAG_VERSION         0x0004

+#define CB_TAG_EXTRA_VERSION   0x0005

+#define CB_TAG_BUILD           0x0006

+#define CB_TAG_COMPILE_TIME    0x0007

+#define CB_TAG_COMPILE_BY      0x0008

+#define CB_TAG_COMPILE_HOST    0x0009

+#define CB_TAG_COMPILE_DOMAIN  0x000a

+#define CB_TAG_COMPILER        0x000b

+#define CB_TAG_LINKER          0x000c

+#define CB_TAG_ASSEMBLER       0x000d

 

 struct cb_string {

-  UINT32 tag;

-  UINT32 size;

-  UINT8 string[0];

+  UINT32    tag;

+  UINT32    size;

+  UINT8     string[0];

 };

 

-#define CB_TAG_SERIAL   0x000f

+#define CB_TAG_SERIAL  0x000f

 

 struct cb_serial {

-  UINT32 tag;

-  UINT32 size;

-#define CB_SERIAL_TYPE_IO_MAPPED     1

-#define CB_SERIAL_TYPE_MEMORY_MAPPED 2

-  UINT32 type;

-  UINT32 baseaddr;

-  UINT32 baud;

-  UINT32 regwidth;

+  UINT32    tag;

+  UINT32    size;

+  #define CB_SERIAL_TYPE_IO_MAPPED      1

+  #define CB_SERIAL_TYPE_MEMORY_MAPPED  2

+  UINT32    type;

+  UINT32    baseaddr;

+  UINT32    baud;

+  UINT32    regwidth;

 

   // Crystal or input frequency to the chip containing the UART.

   // Provide the board specific details to allow the payload to

   // initialize the chip containing the UART and make independent

   // decisions as to which dividers to select and their values

   // to eventually arrive at the desired console baud-rate.

-  UINT32 input_hertz;

+  UINT32    input_hertz;

 

   // UART PCI address: bus, device, function

   // 1 << 31 - Valid bit, PCI UART in use

   // Bus << 20

   // Device << 15

   // Function << 12

-  UINT32 uart_pci_addr;

+  UINT32    uart_pci_addr;

 };

 

-#define CB_TAG_CONSOLE       0x00010

+#define CB_TAG_CONSOLE  0x00010

 

 struct cb_console {

-  UINT32 tag;

-  UINT32 size;

-  UINT16 type;

+  UINT32    tag;

+  UINT32    size;

+  UINT16    type;

 };

 

-#define CB_TAG_CONSOLE_SERIAL8250 0

-#define CB_TAG_CONSOLE_VGA  1 // OBSOLETE

-#define CB_TAG_CONSOLE_BTEXT      2 // OBSOLETE

-#define CB_TAG_CONSOLE_LOGBUF     3

-#define CB_TAG_CONSOLE_SROM       4 // OBSOLETE

-#define CB_TAG_CONSOLE_EHCI       5

+#define CB_TAG_CONSOLE_SERIAL8250  0

+#define CB_TAG_CONSOLE_VGA         1 // OBSOLETE

+#define CB_TAG_CONSOLE_BTEXT       2 // OBSOLETE

+#define CB_TAG_CONSOLE_LOGBUF      3

+#define CB_TAG_CONSOLE_SROM        4// OBSOLETE

+#define CB_TAG_CONSOLE_EHCI        5

 

-#define CB_TAG_FORWARD       0x00011

+#define CB_TAG_FORWARD  0x00011

 

 struct cb_forward {

-  UINT32 tag;

-  UINT32 size;

-  UINT64 forward;

+  UINT32    tag;

+  UINT32    size;

+  UINT64    forward;

 };

 

-#define CB_TAG_FRAMEBUFFER      0x0012

+#define CB_TAG_FRAMEBUFFER  0x0012

 struct cb_framebuffer {

-  UINT32 tag;

-  UINT32 size;

-

-  UINT64 physical_address;

-  UINT32 x_resolution;

-  UINT32 y_resolution;

-  UINT32 bytes_per_line;

-  UINT8 bits_per_pixel;

-  UINT8 red_mask_pos;

-  UINT8 red_mask_size;

-  UINT8 green_mask_pos;

-  UINT8 green_mask_size;

-  UINT8 blue_mask_pos;

-  UINT8 blue_mask_size;

-  UINT8 reserved_mask_pos;

-  UINT8 reserved_mask_size;

-};

-

-#define CB_TAG_VDAT     0x0015

+  UINT32    tag;

+  UINT32    size;

+

+  UINT64    physical_address;

+  UINT32    x_resolution;

+  UINT32    y_resolution;

+  UINT32    bytes_per_line;

+  UINT8     bits_per_pixel;

+  UINT8     red_mask_pos;

+  UINT8     red_mask_size;

+  UINT8     green_mask_pos;

+  UINT8     green_mask_size;

+  UINT8     blue_mask_pos;

+  UINT8     blue_mask_size;

+  UINT8     reserved_mask_pos;

+  UINT8     reserved_mask_size;

+};

+

+#define CB_TAG_VDAT  0x0015

 struct cb_vdat {

-  UINT32 tag;

-  UINT32 size;  /* size of the entire entry */

-  UINT64 vdat_addr;

-  UINT32 vdat_size;

+  UINT32    tag;

+  UINT32    size; /* size of the entire entry */

+  UINT64    vdat_addr;

+  UINT32    vdat_size;

 };

 

-#define CB_TAG_TIMESTAMPS       0x0016

-#define CB_TAG_CBMEM_CONSOLE    0x0017

-#define CB_TAG_MRC_CACHE  0x0018

+#define CB_TAG_TIMESTAMPS     0x0016

+#define CB_TAG_CBMEM_CONSOLE  0x0017

+#define CB_TAG_MRC_CACHE      0x0018

 struct cb_cbmem_tab {

-  UINT32 tag;

-  UINT32 size;

-  UINT64 cbmem_tab;

+  UINT32    tag;

+  UINT32    size;

+  UINT64    cbmem_tab;

 };

 

 /* Helpful macros */

@@ -245,6 +245,6 @@ struct cb_cbmem_tab {
   (void *)(((UINT8 *) (_rec)) + sizeof(*(_rec)) \

     + (sizeof((_rec)->map[0]) * (_idx)))

 

-typedef struct cb_memory  CB_MEMORY;

+typedef struct cb_memory CB_MEMORY;

 

 #endif // _COREBOOT_PEI_H_INCLUDED_

diff --git a/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h b/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h
index 2ff0677..2f79c10 100644
--- a/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/AcpiBoardInfoGuid.h
@@ -12,19 +12,19 @@
 ///

 /// Board information GUID

 ///

-extern EFI_GUID gUefiAcpiBoardInfoGuid;

+extern EFI_GUID  gUefiAcpiBoardInfoGuid;

 

 typedef struct {

-  UINT8              Revision;

-  UINT8              Reserved0[2];

-  UINT8              ResetValue;

-  UINT64             PmEvtBase;

-  UINT64             PmGpeEnBase;

-  UINT64             PmCtrlRegBase;

-  UINT64             PmTimerRegBase;

-  UINT64             ResetRegAddress;

-  UINT64             PcieBaseAddress;

-  UINT64             PcieBaseSize;

+  UINT8     Revision;

+  UINT8     Reserved0[2];

+  UINT8     ResetValue;

+  UINT64    PmEvtBase;

+  UINT64    PmGpeEnBase;

+  UINT64    PmCtrlRegBase;

+  UINT64    PmTimerRegBase;

+  UINT64    ResetRegAddress;

+  UINT64    PcieBaseAddress;

+  UINT64    PcieBaseSize;

 } ACPI_BOARD_INFO;

 

 #endif

diff --git a/UefiPayloadPkg/Include/Guid/BootManagerMenu.h b/UefiPayloadPkg/Include/Guid/BootManagerMenu.h
index d17cdf3..36ea451 100644
--- a/UefiPayloadPkg/Include/Guid/BootManagerMenu.h
+++ b/UefiPayloadPkg/Include/Guid/BootManagerMenu.h
@@ -15,13 +15,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #pragma pack (1)

 

 typedef struct {

-  UNIVERSAL_PAYLOAD_GENERIC_HEADER   Header;

-  GUID                               FileName;

+  UNIVERSAL_PAYLOAD_GENERIC_HEADER    Header;

+  GUID                                FileName;

 } UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU;

 

 #pragma pack()

 

-#define UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_REVISION 1

+#define UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_REVISION  1

 

-extern GUID gEdkiiBootManagerMenuFileGuid;

+extern GUID  gEdkiiBootManagerMenuFileGuid;

 #endif

diff --git a/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h b/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h
index 1dda3ee..1b9b2b7 100644
--- a/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/MemoryMapInfoGuid.h
@@ -14,22 +14,22 @@
 ///

 /// Memory Map Information GUID

 ///

-extern EFI_GUID gLoaderMemoryMapInfoGuid;

+extern EFI_GUID  gLoaderMemoryMapInfoGuid;

 

 #pragma pack(1)

 typedef struct {

-  UINT64 Base;

-  UINT64 Size;

-  UINT8  Type;

-  UINT8  Flag;

-  UINT8  Reserved[6];

+  UINT64    Base;

+  UINT64    Size;

+  UINT8     Type;

+  UINT8     Flag;

+  UINT8     Reserved[6];

 } MEMORY_MAP_ENTRY;

 

 typedef struct {

-  UINT8  Revision;

-  UINT8  Reserved0[3];

-  UINT32 Count;

-  MEMORY_MAP_ENTRY  Entry[0];

+  UINT8               Revision;

+  UINT8               Reserved0[3];

+  UINT32              Count;

+  MEMORY_MAP_ENTRY    Entry[0];

 } MEMORY_MAP_INFO;

 #pragma pack()

 

diff --git a/UefiPayloadPkg/Include/Guid/NvVariableInfoGuid.h b/UefiPayloadPkg/Include/Guid/NvVariableInfoGuid.h
index f22e4e6..fd0bd73 100644
--- a/UefiPayloadPkg/Include/Guid/NvVariableInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/NvVariableInfoGuid.h
@@ -12,13 +12,13 @@
 //

 // NV variable hob info GUID

 //

-extern EFI_GUID gNvVariableInfoGuid;

+extern EFI_GUID  gNvVariableInfoGuid;

 

 typedef struct {

-  UINT8                  Revision;

-  UINT8                  Reserved[3];

-  UINT32                 VariableStoreBase;

-  UINT32                 VariableStoreSize;

+  UINT8     Revision;

+  UINT8     Reserved[3];

+  UINT32    VariableStoreBase;

+  UINT32    VariableStoreSize;

 } NV_VARIABLE_INFO;

 

 #endif

diff --git a/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h b/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h
index 1019713..1553e0d 100644
--- a/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/SerialPortInfoGuid.h
@@ -12,20 +12,20 @@
 ///

 /// Serial Port Information GUID

 ///

-extern EFI_GUID gUefiSerialPortInfoGuid;

+extern EFI_GUID  gUefiSerialPortInfoGuid;

 

-#define PLD_SERIAL_TYPE_IO_MAPPED     1

-#define PLD_SERIAL_TYPE_MEMORY_MAPPED 2

+#define PLD_SERIAL_TYPE_IO_MAPPED      1

+#define PLD_SERIAL_TYPE_MEMORY_MAPPED  2

 

 typedef struct {

-  UINT8  Revision;

-  UINT8  Reserved0[3];

-  UINT32 Type;

-  UINT32 BaseAddr;

-  UINT32 Baud;

-  UINT32 RegWidth;

-  UINT32 InputHertz;

-  UINT32 UartPciAddr;

+  UINT8     Revision;

+  UINT8     Reserved0[3];

+  UINT32    Type;

+  UINT32    BaseAddr;

+  UINT32    Baud;

+  UINT32    RegWidth;

+  UINT32    InputHertz;

+  UINT32    UartPciAddr;

 } SERIAL_PORT_INFO;

 

 #endif

diff --git a/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h b/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h
index 8a1d3d7..665eaa7 100644
--- a/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/SmmRegisterInfoGuid.h
@@ -14,35 +14,34 @@
 ///

 /// SMM Information GUID

 ///

-extern EFI_GUID gSmmRegisterInfoGuid;

+extern EFI_GUID  gSmmRegisterInfoGuid;

 

 ///

 /// Reuse ACPI definition

 /// AddressSpaceId(0xC0-0xFF) is defined by OEM for MSR and other spaces

 ///

-typedef EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE  PLD_GENERIC_ADDRESS;

+typedef EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE PLD_GENERIC_ADDRESS;

 

-#define REGISTER_ID_SMI_GBL_EN         1

-#define REGISTER_ID_SMI_GBL_EN_LOCK    2

-#define REGISTER_ID_SMI_EOS            3

-#define REGISTER_ID_SMI_APM_EN         4

-#define REGISTER_ID_SMI_APM_STS        5

+#define REGISTER_ID_SMI_GBL_EN       1

+#define REGISTER_ID_SMI_GBL_EN_LOCK  2

+#define REGISTER_ID_SMI_EOS          3

+#define REGISTER_ID_SMI_APM_EN       4

+#define REGISTER_ID_SMI_APM_STS      5

 

 #pragma pack(1)

 typedef struct {

-  UINT64                Id;

-  UINT64                Value;

-  PLD_GENERIC_ADDRESS   Address;

+  UINT64                 Id;

+  UINT64                 Value;

+  PLD_GENERIC_ADDRESS    Address;

 } PLD_GENERIC_REGISTER;

 

 typedef struct {

-  UINT16                Revision;

-  UINT16                Reserved;

-  UINT32                Count;

-  PLD_GENERIC_REGISTER  Registers[0];

+  UINT16                  Revision;

+  UINT16                  Reserved;

+  UINT32                  Count;

+  PLD_GENERIC_REGISTER    Registers[0];

 } PLD_SMM_REGISTERS;

 

-

 #pragma pack()

 

 #endif

diff --git a/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h b/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h
index ee621b2..0f7006a 100644
--- a/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/SmmS3CommunicationInfoGuid.h
@@ -9,13 +9,13 @@
 #ifndef PAYLOAD_S3_COMMUNICATION_GUID_H_

 #define PAYLOAD_S3_COMMUNICATION_GUID_H_

 

-extern EFI_GUID gS3CommunicationGuid;

+extern EFI_GUID  gS3CommunicationGuid;

 

 #pragma pack(1)

 

 typedef struct {

-  EFI_SMRAM_DESCRIPTOR  CommBuffer;

-  BOOLEAN               PldAcpiS3Enable;

+  EFI_SMRAM_DESCRIPTOR    CommBuffer;

+  BOOLEAN                 PldAcpiS3Enable;

 } PLD_S3_COMMUNICATION;

 

 ///

@@ -27,16 +27,16 @@ typedef struct {
 ///

 

 typedef struct {

-  UINT32             ApicId;

-  UINT32             SmmBase;

+  UINT32    ApicId;

+  UINT32    SmmBase;

 } CPU_SMMBASE;

 

 typedef struct {

-  UINT8              SwSmiData;

-  UINT8              SwSmiTriggerValue;

-  UINT16             Reserved;

-  UINT32             CpuCount;

-  CPU_SMMBASE        SmmBase[0];

+  UINT8          SwSmiData;

+  UINT8          SwSmiTriggerValue;

+  UINT16         Reserved;

+  UINT32         CpuCount;

+  CPU_SMMBASE    SmmBase[0];

 } SMM_S3_INFO;

 

 //

@@ -45,8 +45,8 @@ typedef struct {
 // to trigger SMI to let payload to restore S3.

 //

 typedef struct {

-  EFI_HOB_GUID_TYPE  Header;

-  SMM_S3_INFO        S3Info;

+  EFI_HOB_GUID_TYPE    Header;

+  SMM_S3_INFO          S3Info;

 } PLD_TO_BL_SMM_INFO;

 

 #pragma pack()

diff --git a/UefiPayloadPkg/Include/Guid/SpiFlashInfoGuid.h b/UefiPayloadPkg/Include/Guid/SpiFlashInfoGuid.h
index 6241463..59b8185 100644
--- a/UefiPayloadPkg/Include/Guid/SpiFlashInfoGuid.h
+++ b/UefiPayloadPkg/Include/Guid/SpiFlashInfoGuid.h
@@ -13,26 +13,26 @@
 //

 // SPI Flash infor hob GUID

 //

-extern EFI_GUID gSpiFlashInfoGuid;

+extern EFI_GUID  gSpiFlashInfoGuid;

 

 //

 // Set this bit if platform need disable SMM write protection when writing flash

 // in SMM mode using this method:  -- AsmWriteMsr32 (0x1FE, MmioRead32 (0xFED30880) | BIT0);

 //

-#define FLAGS_SPI_DISABLE_SMM_WRITE_PROTECT     BIT0

+#define FLAGS_SPI_DISABLE_SMM_WRITE_PROTECT  BIT0

 

 //

 // Reuse ACPI definition

 //

 typedef EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE PLD_GENERIC_ADDRESS;

-#define SPACE_ID_PCI_CONFIGURATION              EFI_ACPI_3_0_PCI_CONFIGURATION_SPACE

-#define REGISTER_BIT_WIDTH_DWORD                EFI_ACPI_3_0_DWORD

+#define SPACE_ID_PCI_CONFIGURATION  EFI_ACPI_3_0_PCI_CONFIGURATION_SPACE

+#define REGISTER_BIT_WIDTH_DWORD    EFI_ACPI_3_0_DWORD

 

 typedef struct {

-  UINT8                        Revision;

-  UINT8                        Reserved;

-  UINT16                       Flags;

-  PLD_GENERIC_ADDRESS          SpiAddress;

+  UINT8                  Revision;

+  UINT8                  Reserved;

+  UINT16                 Flags;

+  PLD_GENERIC_ADDRESS    SpiAddress;

 } SPI_FLASH_INFO;

 

 #endif

diff --git a/UefiPayloadPkg/Include/Library/BlParseLib.h b/UefiPayloadPkg/Include/Library/BlParseLib.h
index fb7bb0c..82be5a9 100644
--- a/UefiPayloadPkg/Include/Library/BlParseLib.h
+++ b/UefiPayloadPkg/Include/Library/BlParseLib.h
@@ -6,6 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

+

 #ifndef BOOTLOADER_PARSE_LIB_

 #define BOOTLOADER_PARSE_LIB_

 

@@ -17,10 +18,13 @@
 #include <UniversalPayload/AcpiTable.h>

 #include <UniversalPayload/SmbiosTable.h>

 

-#define GET_BOOTLOADER_PARAMETER()      PcdGet64 (PcdBootloaderParameter)

+#define GET_BOOTLOADER_PARAMETER()  PcdGet64 (PcdBootloaderParameter)

 

 typedef RETURN_STATUS \

-        (*BL_MEM_INFO_CALLBACK) (MEMORY_MAP_ENTRY *MemoryMapEntry, VOID *Param);

+(*BL_MEM_INFO_CALLBACK) (

+  MEMORY_MAP_ENTRY  *MemoryMapEntry,

+  VOID              *Param

+  );

 

 /**

   This function retrieves the parameter base address from boot loader.

@@ -51,8 +55,8 @@ GetParameterBase (
 RETURN_STATUS

 EFIAPI

 ParseMemoryInfo (

-  IN  BL_MEM_INFO_CALLBACK       MemInfoCallback,

-  IN  VOID                       *Params

+  IN  BL_MEM_INFO_CALLBACK  MemInfoCallback,

+  IN  VOID                  *Params

   );

 

 /**

@@ -67,7 +71,7 @@ ParseMemoryInfo (
 RETURN_STATUS

 EFIAPI

 ParseSmbiosTable (

-  OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE     *SmbiosTable

+  OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE  *SmbiosTable

   );

 

 /**

@@ -82,7 +86,7 @@ ParseSmbiosTable (
 RETURN_STATUS

 EFIAPI

 ParseAcpiTableInfo (

-  OUT UNIVERSAL_PAYLOAD_ACPI_TABLE        *AcpiTableHob

+  OUT UNIVERSAL_PAYLOAD_ACPI_TABLE  *AcpiTableHob

   );

 

 /**

@@ -97,10 +101,9 @@ ParseAcpiTableInfo (
 RETURN_STATUS

 EFIAPI

 ParseSerialInfo (

-  OUT SERIAL_PORT_INFO     *SerialPortInfo

+  OUT SERIAL_PORT_INFO  *SerialPortInfo

   );

 

-

 /**

   Find the video frame buffer information

 

@@ -113,7 +116,7 @@ ParseSerialInfo (
 RETURN_STATUS

 EFIAPI

 ParseGfxInfo (

-  OUT EFI_PEI_GRAPHICS_INFO_HOB       *GfxInfo

+  OUT EFI_PEI_GRAPHICS_INFO_HOB  *GfxInfo

   );

 

 /**

@@ -128,7 +131,7 @@ ParseGfxInfo (
 RETURN_STATUS

 EFIAPI

 ParseGfxDeviceInfo (

-  OUT EFI_PEI_GRAPHICS_DEVICE_INFO_HOB       *GfxDeviceInfo

+  OUT EFI_PEI_GRAPHICS_DEVICE_INFO_HOB  *GfxDeviceInfo

   );

 

 /**

diff --git a/UefiPayloadPkg/Include/Library/DxeHobListLib.h b/UefiPayloadPkg/Include/Library/DxeHobListLib.h
index 139b11e..bac2621 100644
--- a/UefiPayloadPkg/Include/Library/DxeHobListLib.h
+++ b/UefiPayloadPkg/Include/Library/DxeHobListLib.h
@@ -24,4 +24,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 extern VOID  *gHobList;

 

 #endif

-

diff --git a/UefiPayloadPkg/Include/Library/FlashDeviceLib.h b/UefiPayloadPkg/Include/Library/FlashDeviceLib.h
index d71481c..b5e8be2 100644
--- a/UefiPayloadPkg/Include/Library/FlashDeviceLib.h
+++ b/UefiPayloadPkg/Include/Library/FlashDeviceLib.h
@@ -6,7 +6,6 @@
 

 **/

 

-

 #ifndef FLASHDEVICE_LIB_H_

 #define FLASHDEVICE_LIB_H_

 

@@ -26,12 +25,11 @@
 EFI_STATUS

 EFIAPI

 LibFvbFlashDeviceRead (

-  IN      UINTN                           PAddress,

-  IN  OUT UINTN                           *NumBytes,

-      OUT UINT8                           *Buffer

+  IN      UINTN  PAddress,

+  IN  OUT UINTN  *NumBytes,

+  OUT UINT8      *Buffer

   );

 

-

 /**

   Write NumBytes bytes of data from Buffer to the address specified by

   PAddresss.

@@ -48,12 +46,11 @@ LibFvbFlashDeviceRead (
 EFI_STATUS

 EFIAPI

 LibFvbFlashDeviceWrite (

-  IN        UINTN                           PAddress,

-  IN OUT    UINTN                           *NumBytes,

-  IN        UINT8                           *Buffer

+  IN        UINTN  PAddress,

+  IN OUT    UINTN  *NumBytes,

+  IN        UINT8  *Buffer

   );

 

-

 /**

   Erase the block starting at PAddress.

 

@@ -72,10 +69,9 @@ LibFvbFlashDeviceWrite (
 EFI_STATUS

 EFIAPI

 LibFvbFlashDeviceBlockErase (

-  IN    UINTN                      PAddress,

-  IN    UINTN                      LbaLength

-);

-

+  IN    UINTN  PAddress,

+  IN    UINTN  LbaLength

+  );

 

 /**

   Lock or unlock the block starting at PAddress.

@@ -95,14 +91,14 @@ LibFvbFlashDeviceBlockErase (
 EFI_STATUS

 EFIAPI

 LibFvbFlashDeviceBlockLock (

-  IN    UINTN                          PAddress,

-  IN    UINTN                          LbaLength,

-  IN    BOOLEAN                        Lock

-);

+  IN    UINTN    PAddress,

+  IN    UINTN    LbaLength,

+  IN    BOOLEAN  Lock

+  );

 

 PHYSICAL_ADDRESS

 EFIAPI

 LibFvbFlashDeviceMemoryMap (

-);

+  );

 

 #endif

diff --git a/UefiPayloadPkg/Include/Library/PlatformSupportLib.h b/UefiPayloadPkg/Include/Library/PlatformSupportLib.h
index 7326372..7cf0719 100644
--- a/UefiPayloadPkg/Include/Library/PlatformSupportLib.h
+++ b/UefiPayloadPkg/Include/Library/PlatformSupportLib.h
@@ -25,4 +25,3 @@ ParsePlatformInfo (
   );

 

 #endif // __BOOTLOADER_PLATFORM_SUPPORT_LIB__

-

diff --git a/UefiPayloadPkg/Include/Library/SpiFlashLib.h b/UefiPayloadPkg/Include/Library/SpiFlashLib.h
index 0f172dc..07f4050 100644
--- a/UefiPayloadPkg/Include/Library/SpiFlashLib.h
+++ b/UefiPayloadPkg/Include/Library/SpiFlashLib.h
@@ -38,9 +38,9 @@ typedef enum {
 EFI_STATUS

 EFIAPI

 SpiFlashReadSfdp (

-  IN     UINT8              ComponentNumber,

-  IN     UINT32             ByteCount,

-  OUT    UINT8              *SfdpData

+  IN     UINT8   ComponentNumber,

+  IN     UINT32  ByteCount,

+  OUT    UINT8   *SfdpData

   );

 

 /**

@@ -58,9 +58,9 @@ SpiFlashReadSfdp (
 EFI_STATUS

 EFIAPI

 SpiFlashReadJedecId (

-  IN     UINT8              ComponentNumber,

-  IN     UINT32             ByteCount,

-  OUT    UINT8              *JedecId

+  IN     UINT8   ComponentNumber,

+  IN     UINT32  ByteCount,

+  OUT    UINT8   *JedecId

   );

 

 /**

@@ -76,8 +76,8 @@ SpiFlashReadJedecId (
 EFI_STATUS

 EFIAPI

 SpiFlashWriteStatus (

-  IN     UINT32             ByteCount,

-  IN     UINT8              *StatusValue

+  IN     UINT32  ByteCount,

+  IN     UINT8   *StatusValue

   );

 

 /**

@@ -93,8 +93,8 @@ SpiFlashWriteStatus (
 EFI_STATUS

 EFIAPI

 SpiFlashReadStatus (

-  IN     UINT32             ByteCount,

-  OUT    UINT8              *StatusValue

+  IN     UINT32  ByteCount,

+  OUT    UINT8   *StatusValue

   );

 

 /**

@@ -112,12 +112,11 @@ SpiFlashReadStatus (
 EFI_STATUS

 EFIAPI

 SpiReadPchSoftStrap (

-  IN     UINT32             SoftStrapAddr,

-  IN     UINT32             ByteCount,

-  OUT    UINT8              *SoftStrapValue

+  IN     UINT32  SoftStrapAddr,

+  IN     UINT32  ByteCount,

+  OUT    UINT8   *SoftStrapValue

   );

 

-

 /**

   Read data from the flash part.

 

diff --git a/UefiPayloadPkg/Include/Protocol/PlatformBootManagerOverride.h b/UefiPayloadPkg/Include/Protocol/PlatformBootManagerOverride.h
index 59544e4..878ddc0 100644
--- a/UefiPayloadPkg/Include/Protocol/PlatformBootManagerOverride.h
+++ b/UefiPayloadPkg/Include/Protocol/PlatformBootManagerOverride.h
@@ -8,7 +8,6 @@
 #ifndef __PLATFORM_BOOT_MANAGER_OVERRIDE_H__

 #define __PLATFORM_BOOT_MANAGER_OVERRIDE_H__

 

-

 /**

   Do the platform specific action before the console is connected.

 

@@ -21,7 +20,7 @@
 **/

 typedef

 VOID

-(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_BEFORE_CONSOLE) (

+(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_BEFORE_CONSOLE)(

   VOID

   );

 

@@ -39,7 +38,7 @@ VOID
 **/

 typedef

 VOID

-(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_AFTER_CONSOLE) (

+(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_AFTER_CONSOLE)(

   VOID

   );

 

@@ -51,7 +50,7 @@ VOID
 **/

 typedef

 VOID

-(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_WAIT_CALLBACK) (

+(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_WAIT_CALLBACK)(

   UINT16          TimeoutRemain

   );

 

@@ -65,7 +64,7 @@ VOID
 **/

 typedef

 VOID

-(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_UNABLE_TO_BOOT) (

+(EFIAPI *UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_UNABLE_TO_BOOT)(

   VOID

   );

 

@@ -74,12 +73,12 @@ VOID
 /// so platform can provide its own platform specific logic through this protocol

 ///

 typedef struct {

-  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_BEFORE_CONSOLE        BeforeConsole;

-  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_AFTER_CONSOLE         AfterConsole;

-  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_WAIT_CALLBACK         WaitCallback;

-  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_UNABLE_TO_BOOT        UnableToBoot;

+  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_BEFORE_CONSOLE    BeforeConsole;

+  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_AFTER_CONSOLE     AfterConsole;

+  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_WAIT_CALLBACK     WaitCallback;

+  UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_UNABLE_TO_BOOT    UnableToBoot;

 } UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_PROTOCOL;

 

-extern GUID gUniversalPayloadPlatformBootManagerOverrideProtocolGuid;

+extern GUID  gUniversalPayloadPlatformBootManagerOverrideProtocolGuid;

 

 #endif