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>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:18 -08:00
committed by mergify[bot]
parent 053e878bfb
commit e5efcf8be8
76 changed files with 4281 additions and 4072 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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()

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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()

View File

@@ -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