MdePkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the MdePkg 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: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:05 -08:00
committed by mergify[bot]
parent 1436aea4d5
commit 2f88bd3a12
975 changed files with 55681 additions and 57790 deletions

View File

@@ -24,7 +24,7 @@
@param M Additional bits to assert to be zero.
**/
#define ASSERT_INVALID_PCI_ADDRESS(A,M) \
#define ASSERT_INVALID_PCI_ADDRESS(A, M) \
ASSERT (((A) & (~0xfffffff | (M))) == 0)
/**
@@ -53,16 +53,16 @@
**/
UINT32
PeiPciLibPciCfg2ReadWorker (
IN UINTN Address,
IN EFI_PEI_PCI_CFG_PPI_WIDTH Width
IN UINTN Address,
IN EFI_PEI_PCI_CFG_PPI_WIDTH Width
)
{
EFI_STATUS Status;
UINT32 Data;
CONST EFI_PEI_PCI_CFG2_PPI *PciCfg2Ppi;
UINT64 PciCfg2Address;
EFI_STATUS Status;
UINT32 Data;
CONST EFI_PEI_PCI_CFG2_PPI *PciCfg2Ppi;
UINT64 PciCfg2Address;
Status = PeiServicesLocatePpi (&gEfiPciCfg2PpiGuid, 0, NULL, (VOID **) &PciCfg2Ppi);
Status = PeiServicesLocatePpi (&gEfiPciCfg2PpiGuid, 0, NULL, (VOID **)&PciCfg2Ppi);
ASSERT_EFI_ERROR (Status);
ASSERT (PciCfg2Ppi != NULL);
@@ -96,16 +96,16 @@ PeiPciLibPciCfg2ReadWorker (
**/
UINT32
PeiPciLibPciCfg2WriteWorker (
IN UINTN Address,
IN EFI_PEI_PCI_CFG_PPI_WIDTH Width,
IN UINT32 Data
IN UINTN Address,
IN EFI_PEI_PCI_CFG_PPI_WIDTH Width,
IN UINT32 Data
)
{
EFI_STATUS Status;
CONST EFI_PEI_PCI_CFG2_PPI *PciCfg2Ppi;
UINT64 PciCfg2Address;
EFI_STATUS Status;
CONST EFI_PEI_PCI_CFG2_PPI *PciCfg2Ppi;
UINT64 PciCfg2Address;
Status = PeiServicesLocatePpi (&gEfiPciCfg2PpiGuid, 0, NULL, (VOID **) &PciCfg2Ppi);
Status = PeiServicesLocatePpi (&gEfiPciCfg2PpiGuid, 0, NULL, (VOID **)&PciCfg2Ppi);
ASSERT_EFI_ERROR (Status);
ASSERT (PciCfg2Ppi != NULL);
@@ -170,12 +170,12 @@ PciRegisterForRuntimeAccess (
UINT8
EFIAPI
PciRead8 (
IN UINTN Address
IN UINTN Address
)
{
ASSERT_INVALID_PCI_ADDRESS (Address, 0);
return (UINT8) PeiPciLibPciCfg2ReadWorker (Address, EfiPeiPciCfgWidthUint8);
return (UINT8)PeiPciLibPciCfg2ReadWorker (Address, EfiPeiPciCfgWidthUint8);
}
/**
@@ -197,13 +197,13 @@ PciRead8 (
UINT8
EFIAPI
PciWrite8 (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
)
{
ASSERT_INVALID_PCI_ADDRESS (Address, 0);
return (UINT8) PeiPciLibPciCfg2WriteWorker (Address, EfiPeiPciCfgWidthUint8, Value);
return (UINT8)PeiPciLibPciCfg2WriteWorker (Address, EfiPeiPciCfgWidthUint8, Value);
}
/**
@@ -229,11 +229,11 @@ PciWrite8 (
UINT8
EFIAPI
PciOr8 (
IN UINTN Address,
IN UINT8 OrData
IN UINTN Address,
IN UINT8 OrData
)
{
return PciWrite8 (Address, (UINT8) (PciRead8 (Address) | OrData));
return PciWrite8 (Address, (UINT8)(PciRead8 (Address) | OrData));
}
/**
@@ -259,11 +259,11 @@ PciOr8 (
UINT8
EFIAPI
PciAnd8 (
IN UINTN Address,
IN UINT8 AndData
IN UINTN Address,
IN UINT8 AndData
)
{
return PciWrite8 (Address, (UINT8) (PciRead8 (Address) & AndData));
return PciWrite8 (Address, (UINT8)(PciRead8 (Address) & AndData));
}
/**
@@ -291,12 +291,12 @@ PciAnd8 (
UINT8
EFIAPI
PciAndThenOr8 (
IN UINTN Address,
IN UINT8 AndData,
IN UINT8 OrData
IN UINTN Address,
IN UINT8 AndData,
IN UINT8 OrData
)
{
return PciWrite8 (Address, (UINT8) ((PciRead8 (Address) & AndData) | OrData));
return PciWrite8 (Address, (UINT8)((PciRead8 (Address) & AndData) | OrData));
}
/**
@@ -323,9 +323,9 @@ PciAndThenOr8 (
UINT8
EFIAPI
PciBitFieldRead8 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead8 (PciRead8 (Address), StartBit, EndBit);
@@ -358,10 +358,10 @@ PciBitFieldRead8 (
UINT8
EFIAPI
PciBitFieldWrite8 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 Value
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 Value
)
{
return PciWrite8 (
@@ -400,10 +400,10 @@ PciBitFieldWrite8 (
UINT8
EFIAPI
PciBitFieldOr8 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 OrData
)
{
return PciWrite8 (
@@ -442,10 +442,10 @@ PciBitFieldOr8 (
UINT8
EFIAPI
PciBitFieldAnd8 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData
)
{
return PciWrite8 (
@@ -488,11 +488,11 @@ PciBitFieldAnd8 (
UINT8
EFIAPI
PciBitFieldAndThenOr8 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData,
IN UINT8 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData,
IN UINT8 OrData
)
{
return PciWrite8 (
@@ -520,12 +520,12 @@ PciBitFieldAndThenOr8 (
UINT16
EFIAPI
PciRead16 (
IN UINTN Address
IN UINTN Address
)
{
ASSERT_INVALID_PCI_ADDRESS (Address, 1);
return (UINT16) PeiPciLibPciCfg2ReadWorker (Address, EfiPeiPciCfgWidthUint16);
return (UINT16)PeiPciLibPciCfg2ReadWorker (Address, EfiPeiPciCfgWidthUint16);
}
/**
@@ -548,13 +548,13 @@ PciRead16 (
UINT16
EFIAPI
PciWrite16 (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
)
{
ASSERT_INVALID_PCI_ADDRESS (Address, 1);
return (UINT16) PeiPciLibPciCfg2WriteWorker (Address, EfiPeiPciCfgWidthUint16, Value);
return (UINT16)PeiPciLibPciCfg2WriteWorker (Address, EfiPeiPciCfgWidthUint16, Value);
}
/**
@@ -581,11 +581,11 @@ PciWrite16 (
UINT16
EFIAPI
PciOr16 (
IN UINTN Address,
IN UINT16 OrData
IN UINTN Address,
IN UINT16 OrData
)
{
return PciWrite16 (Address, (UINT16) (PciRead16 (Address) | OrData));
return PciWrite16 (Address, (UINT16)(PciRead16 (Address) | OrData));
}
/**
@@ -612,11 +612,11 @@ PciOr16 (
UINT16
EFIAPI
PciAnd16 (
IN UINTN Address,
IN UINT16 AndData
IN UINTN Address,
IN UINT16 AndData
)
{
return PciWrite16 (Address, (UINT16) (PciRead16 (Address) & AndData));
return PciWrite16 (Address, (UINT16)(PciRead16 (Address) & AndData));
}
/**
@@ -645,12 +645,12 @@ PciAnd16 (
UINT16
EFIAPI
PciAndThenOr16 (
IN UINTN Address,
IN UINT16 AndData,
IN UINT16 OrData
IN UINTN Address,
IN UINT16 AndData,
IN UINT16 OrData
)
{
return PciWrite16 (Address, (UINT16) ((PciRead16 (Address) & AndData) | OrData));
return PciWrite16 (Address, (UINT16)((PciRead16 (Address) & AndData) | OrData));
}
/**
@@ -678,9 +678,9 @@ PciAndThenOr16 (
UINT16
EFIAPI
PciBitFieldRead16 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead16 (PciRead16 (Address), StartBit, EndBit);
@@ -714,10 +714,10 @@ PciBitFieldRead16 (
UINT16
EFIAPI
PciBitFieldWrite16 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 Value
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 Value
)
{
return PciWrite16 (
@@ -757,10 +757,10 @@ PciBitFieldWrite16 (
UINT16
EFIAPI
PciBitFieldOr16 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 OrData
)
{
return PciWrite16 (
@@ -800,10 +800,10 @@ PciBitFieldOr16 (
UINT16
EFIAPI
PciBitFieldAnd16 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData
)
{
return PciWrite16 (
@@ -847,11 +847,11 @@ PciBitFieldAnd16 (
UINT16
EFIAPI
PciBitFieldAndThenOr16 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData,
IN UINT16 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData,
IN UINT16 OrData
)
{
return PciWrite16 (
@@ -879,7 +879,7 @@ PciBitFieldAndThenOr16 (
UINT32
EFIAPI
PciRead32 (
IN UINTN Address
IN UINTN Address
)
{
ASSERT_INVALID_PCI_ADDRESS (Address, 3);
@@ -907,8 +907,8 @@ PciRead32 (
UINT32
EFIAPI
PciWrite32 (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
)
{
ASSERT_INVALID_PCI_ADDRESS (Address, 3);
@@ -940,8 +940,8 @@ PciWrite32 (
UINT32
EFIAPI
PciOr32 (
IN UINTN Address,
IN UINT32 OrData
IN UINTN Address,
IN UINT32 OrData
)
{
return PciWrite32 (Address, PciRead32 (Address) | OrData);
@@ -971,8 +971,8 @@ PciOr32 (
UINT32
EFIAPI
PciAnd32 (
IN UINTN Address,
IN UINT32 AndData
IN UINTN Address,
IN UINT32 AndData
)
{
return PciWrite32 (Address, PciRead32 (Address) & AndData);
@@ -1004,9 +1004,9 @@ PciAnd32 (
UINT32
EFIAPI
PciAndThenOr32 (
IN UINTN Address,
IN UINT32 AndData,
IN UINT32 OrData
IN UINTN Address,
IN UINT32 AndData,
IN UINT32 OrData
)
{
return PciWrite32 (Address, (PciRead32 (Address) & AndData) | OrData);
@@ -1037,9 +1037,9 @@ PciAndThenOr32 (
UINT32
EFIAPI
PciBitFieldRead32 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead32 (PciRead32 (Address), StartBit, EndBit);
@@ -1073,10 +1073,10 @@ PciBitFieldRead32 (
UINT32
EFIAPI
PciBitFieldWrite32 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 Value
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 Value
)
{
return PciWrite32 (
@@ -1116,10 +1116,10 @@ PciBitFieldWrite32 (
UINT32
EFIAPI
PciBitFieldOr32 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 OrData
)
{
return PciWrite32 (
@@ -1159,10 +1159,10 @@ PciBitFieldOr32 (
UINT32
EFIAPI
PciBitFieldAnd32 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData
)
{
return PciWrite32 (
@@ -1206,11 +1206,11 @@ PciBitFieldAnd32 (
UINT32
EFIAPI
PciBitFieldAndThenOr32 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData,
IN UINT32 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData,
IN UINT32 OrData
)
{
return PciWrite32 (
@@ -1245,12 +1245,12 @@ PciBitFieldAndThenOr32 (
UINTN
EFIAPI
PciReadBuffer (
IN UINTN StartAddress,
IN UINTN Size,
OUT VOID *Buffer
IN UINTN StartAddress,
IN UINTN Size,
OUT VOID *Buffer
)
{
UINTN ReturnValue;
UINTN ReturnValue;
ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);
ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);
@@ -1271,19 +1271,19 @@ PciReadBuffer (
// Read a byte if StartAddress is byte aligned
//
*(volatile UINT8 *)Buffer = PciRead8 (StartAddress);
StartAddress += sizeof (UINT8);
Size -= sizeof (UINT8);
Buffer = (UINT8*)Buffer + 1;
StartAddress += sizeof (UINT8);
Size -= sizeof (UINT8);
Buffer = (UINT8 *)Buffer + 1;
}
if (Size >= sizeof (UINT16) && (StartAddress & BIT1) != 0) {
if ((Size >= sizeof (UINT16)) && ((StartAddress & BIT1) != 0)) {
//
// Read a word if StartAddress is word aligned
//
WriteUnaligned16 (Buffer, PciRead16 (StartAddress));
StartAddress += sizeof (UINT16);
Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
Size -= sizeof (UINT16);
Buffer = (UINT16 *)Buffer + 1;
}
while (Size >= sizeof (UINT32)) {
@@ -1292,8 +1292,8 @@ PciReadBuffer (
//
WriteUnaligned32 (Buffer, PciRead32 (StartAddress));
StartAddress += sizeof (UINT32);
Size -= sizeof (UINT32);
Buffer = (UINT32*)Buffer + 1;
Size -= sizeof (UINT32);
Buffer = (UINT32 *)Buffer + 1;
}
if (Size >= sizeof (UINT16)) {
@@ -1302,8 +1302,8 @@ PciReadBuffer (
//
WriteUnaligned16 (Buffer, PciRead16 (StartAddress));
StartAddress += sizeof (UINT16);
Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
Size -= sizeof (UINT16);
Buffer = (UINT16 *)Buffer + 1;
}
if (Size >= sizeof (UINT8)) {
@@ -1343,12 +1343,12 @@ PciReadBuffer (
UINTN
EFIAPI
PciWriteBuffer (
IN UINTN StartAddress,
IN UINTN Size,
IN VOID *Buffer
IN UINTN StartAddress,
IN UINTN Size,
IN VOID *Buffer
)
{
UINTN ReturnValue;
UINTN ReturnValue;
ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);
ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);
@@ -1368,20 +1368,20 @@ PciWriteBuffer (
//
// Write a byte if StartAddress is byte aligned
//
PciWrite8 (StartAddress, *(UINT8*)Buffer);
PciWrite8 (StartAddress, *(UINT8 *)Buffer);
StartAddress += sizeof (UINT8);
Size -= sizeof (UINT8);
Buffer = (UINT8*)Buffer + 1;
Size -= sizeof (UINT8);
Buffer = (UINT8 *)Buffer + 1;
}
if (Size >= sizeof (UINT16) && (StartAddress & BIT1) != 0) {
if ((Size >= sizeof (UINT16)) && ((StartAddress & BIT1) != 0)) {
//
// Write a word if StartAddress is word aligned
//
PciWrite16 (StartAddress, ReadUnaligned16 (Buffer));
StartAddress += sizeof (UINT16);
Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
Size -= sizeof (UINT16);
Buffer = (UINT16 *)Buffer + 1;
}
while (Size >= sizeof (UINT32)) {
@@ -1390,8 +1390,8 @@ PciWriteBuffer (
//
PciWrite32 (StartAddress, ReadUnaligned32 (Buffer));
StartAddress += sizeof (UINT32);
Size -= sizeof (UINT32);
Buffer = (UINT32*)Buffer + 1;
Size -= sizeof (UINT32);
Buffer = (UINT32 *)Buffer + 1;
}
if (Size >= sizeof (UINT16)) {
@@ -1400,15 +1400,15 @@ PciWriteBuffer (
//
PciWrite16 (StartAddress, ReadUnaligned16 (Buffer));
StartAddress += sizeof (UINT16);
Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
Size -= sizeof (UINT16);
Buffer = (UINT16 *)Buffer + 1;
}
if (Size >= sizeof (UINT8)) {
//
// Write the last remaining byte if exist
//
PciWrite8 (StartAddress, *(UINT8*)Buffer);
PciWrite8 (StartAddress, *(UINT8 *)Buffer);
}
return ReturnValue;