From 2f88bd3a1296c522317f1c21377876de63de5be7 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:05 -0800 Subject: 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 Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Liming Gao --- MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c | 331 +++++++++++++++---------------- 1 file changed, 165 insertions(+), 166 deletions(-) (limited to 'MdePkg/Library/BasePciCf8Lib') diff --git a/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c b/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c index ba4190ab68..0d9667178f 100644 --- a/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c +++ b/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c @@ -7,7 +7,6 @@ **/ - #include #include @@ -51,7 +50,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) & (~0xffff0ff | (M))) == 0) /** @@ -105,7 +104,7 @@ PciCf8RegisterForRuntimeAccess ( UINT8 EFIAPI PciCf8Read8 ( - IN UINTN Address + IN UINTN Address ) { BOOLEAN InterruptState; @@ -114,7 +113,7 @@ PciCf8Read8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoRead8 (PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3)); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, AddressPort); @@ -142,8 +141,8 @@ PciCf8Read8 ( UINT8 EFIAPI PciCf8Write8 ( - IN UINTN Address, - IN UINT8 Value + IN UINTN Address, + IN UINT8 Value ) { BOOLEAN InterruptState; @@ -152,7 +151,7 @@ PciCf8Write8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoWrite8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -187,8 +186,8 @@ PciCf8Write8 ( UINT8 EFIAPI PciCf8Or8 ( - IN UINTN Address, - IN UINT8 OrData + IN UINTN Address, + IN UINT8 OrData ) { BOOLEAN InterruptState; @@ -197,7 +196,7 @@ PciCf8Or8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoOr8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -232,8 +231,8 @@ PciCf8Or8 ( UINT8 EFIAPI PciCf8And8 ( - IN UINTN Address, - IN UINT8 AndData + IN UINTN Address, + IN UINT8 AndData ) { BOOLEAN InterruptState; @@ -242,7 +241,7 @@ PciCf8And8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoAnd8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -279,9 +278,9 @@ PciCf8And8 ( UINT8 EFIAPI PciCf8AndThenOr8 ( - IN UINTN Address, - IN UINT8 AndData, - IN UINT8 OrData + IN UINTN Address, + IN UINT8 AndData, + IN UINT8 OrData ) { BOOLEAN InterruptState; @@ -290,7 +289,7 @@ PciCf8AndThenOr8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoAndThenOr8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -327,9 +326,9 @@ PciCf8AndThenOr8 ( UINT8 EFIAPI PciCf8BitFieldRead8 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit ) { BOOLEAN InterruptState; @@ -338,7 +337,7 @@ PciCf8BitFieldRead8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldRead8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -378,10 +377,10 @@ PciCf8BitFieldRead8 ( UINT8 EFIAPI PciCf8BitFieldWrite8 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 Value + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 Value ) { BOOLEAN InterruptState; @@ -390,7 +389,7 @@ PciCf8BitFieldWrite8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldWrite8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -434,10 +433,10 @@ PciCf8BitFieldWrite8 ( UINT8 EFIAPI PciCf8BitFieldOr8 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 OrData + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 OrData ) { BOOLEAN InterruptState; @@ -446,7 +445,7 @@ PciCf8BitFieldOr8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldOr8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -490,10 +489,10 @@ PciCf8BitFieldOr8 ( UINT8 EFIAPI PciCf8BitFieldAnd8 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 AndData + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 AndData ) { BOOLEAN InterruptState; @@ -502,7 +501,7 @@ PciCf8BitFieldAnd8 ( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldAnd8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -549,12 +548,12 @@ PciCf8BitFieldAnd8 ( **/ UINT8 EFIAPI -PciCf8BitFieldAndThenOr8( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT8 AndData, - IN UINT8 OrData +PciCf8BitFieldAndThenOr8 ( + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT8 AndData, + IN UINT8 OrData ) { BOOLEAN InterruptState; @@ -563,7 +562,7 @@ PciCf8BitFieldAndThenOr8( ASSERT_INVALID_PCI_ADDRESS (Address, 0); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldAndThenOr8 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 3), @@ -597,7 +596,7 @@ PciCf8BitFieldAndThenOr8( UINT16 EFIAPI PciCf8Read16 ( - IN UINTN Address + IN UINTN Address ) { BOOLEAN InterruptState; @@ -606,7 +605,7 @@ PciCf8Read16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoRead16 (PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2)); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, AddressPort); @@ -635,8 +634,8 @@ PciCf8Read16 ( UINT16 EFIAPI PciCf8Write16 ( - IN UINTN Address, - IN UINT16 Value + IN UINTN Address, + IN UINT16 Value ) { BOOLEAN InterruptState; @@ -645,7 +644,7 @@ PciCf8Write16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoWrite16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -681,8 +680,8 @@ PciCf8Write16 ( UINT16 EFIAPI PciCf8Or16 ( - IN UINTN Address, - IN UINT16 OrData + IN UINTN Address, + IN UINT16 OrData ) { BOOLEAN InterruptState; @@ -691,7 +690,7 @@ PciCf8Or16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoOr16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -727,8 +726,8 @@ PciCf8Or16 ( UINT16 EFIAPI PciCf8And16 ( - IN UINTN Address, - IN UINT16 AndData + IN UINTN Address, + IN UINT16 AndData ) { BOOLEAN InterruptState; @@ -737,7 +736,7 @@ PciCf8And16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoAnd16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -775,9 +774,9 @@ PciCf8And16 ( UINT16 EFIAPI PciCf8AndThenOr16 ( - IN UINTN Address, - IN UINT16 AndData, - IN UINT16 OrData + IN UINTN Address, + IN UINT16 AndData, + IN UINT16 OrData ) { BOOLEAN InterruptState; @@ -786,7 +785,7 @@ PciCf8AndThenOr16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoAndThenOr16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -824,9 +823,9 @@ PciCf8AndThenOr16 ( UINT16 EFIAPI PciCf8BitFieldRead16 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit ) { BOOLEAN InterruptState; @@ -835,7 +834,7 @@ PciCf8BitFieldRead16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldRead16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -876,10 +875,10 @@ PciCf8BitFieldRead16 ( UINT16 EFIAPI PciCf8BitFieldWrite16 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 Value + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 Value ) { BOOLEAN InterruptState; @@ -888,7 +887,7 @@ PciCf8BitFieldWrite16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldWrite16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -933,10 +932,10 @@ PciCf8BitFieldWrite16 ( UINT16 EFIAPI PciCf8BitFieldOr16 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 OrData + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 OrData ) { BOOLEAN InterruptState; @@ -945,7 +944,7 @@ PciCf8BitFieldOr16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldOr16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -990,10 +989,10 @@ PciCf8BitFieldOr16 ( UINT16 EFIAPI PciCf8BitFieldAnd16 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 AndData + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 AndData ) { BOOLEAN InterruptState; @@ -1002,7 +1001,7 @@ PciCf8BitFieldAnd16 ( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldAnd16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -1050,12 +1049,12 @@ PciCf8BitFieldAnd16 ( **/ UINT16 EFIAPI -PciCf8BitFieldAndThenOr16( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT16 AndData, - IN UINT16 OrData +PciCf8BitFieldAndThenOr16 ( + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT16 AndData, + IN UINT16 OrData ) { BOOLEAN InterruptState; @@ -1064,7 +1063,7 @@ PciCf8BitFieldAndThenOr16( ASSERT_INVALID_PCI_ADDRESS (Address, 1); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldAndThenOr16 ( PCI_CONFIGURATION_DATA_PORT + (UINT16)(Address & 2), @@ -1098,7 +1097,7 @@ PciCf8BitFieldAndThenOr16( UINT32 EFIAPI PciCf8Read32 ( - IN UINTN Address + IN UINTN Address ) { BOOLEAN InterruptState; @@ -1107,7 +1106,7 @@ PciCf8Read32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoRead32 (PCI_CONFIGURATION_DATA_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, AddressPort); @@ -1136,8 +1135,8 @@ PciCf8Read32 ( UINT32 EFIAPI PciCf8Write32 ( - IN UINTN Address, - IN UINT32 Value + IN UINTN Address, + IN UINT32 Value ) { BOOLEAN InterruptState; @@ -1146,7 +1145,7 @@ PciCf8Write32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoWrite32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1182,8 +1181,8 @@ PciCf8Write32 ( UINT32 EFIAPI PciCf8Or32 ( - IN UINTN Address, - IN UINT32 OrData + IN UINTN Address, + IN UINT32 OrData ) { BOOLEAN InterruptState; @@ -1192,7 +1191,7 @@ PciCf8Or32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoOr32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1228,8 +1227,8 @@ PciCf8Or32 ( UINT32 EFIAPI PciCf8And32 ( - IN UINTN Address, - IN UINT32 AndData + IN UINTN Address, + IN UINT32 AndData ) { BOOLEAN InterruptState; @@ -1238,7 +1237,7 @@ PciCf8And32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoAnd32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1276,9 +1275,9 @@ PciCf8And32 ( UINT32 EFIAPI PciCf8AndThenOr32 ( - IN UINTN Address, - IN UINT32 AndData, - IN UINT32 OrData + IN UINTN Address, + IN UINT32 AndData, + IN UINT32 OrData ) { BOOLEAN InterruptState; @@ -1287,7 +1286,7 @@ PciCf8AndThenOr32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoAndThenOr32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1325,9 +1324,9 @@ PciCf8AndThenOr32 ( UINT32 EFIAPI PciCf8BitFieldRead32 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit ) { BOOLEAN InterruptState; @@ -1336,7 +1335,7 @@ PciCf8BitFieldRead32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldRead32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1377,10 +1376,10 @@ PciCf8BitFieldRead32 ( UINT32 EFIAPI PciCf8BitFieldWrite32 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 Value + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 Value ) { BOOLEAN InterruptState; @@ -1389,7 +1388,7 @@ PciCf8BitFieldWrite32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldWrite32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1434,10 +1433,10 @@ PciCf8BitFieldWrite32 ( UINT32 EFIAPI PciCf8BitFieldOr32 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 OrData + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 OrData ) { BOOLEAN InterruptState; @@ -1446,7 +1445,7 @@ PciCf8BitFieldOr32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldOr32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1491,10 +1490,10 @@ PciCf8BitFieldOr32 ( UINT32 EFIAPI PciCf8BitFieldAnd32 ( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 AndData + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 AndData ) { BOOLEAN InterruptState; @@ -1503,7 +1502,7 @@ PciCf8BitFieldAnd32 ( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldAnd32 ( PCI_CONFIGURATION_DATA_PORT, @@ -1551,12 +1550,12 @@ PciCf8BitFieldAnd32 ( **/ UINT32 EFIAPI -PciCf8BitFieldAndThenOr32( - IN UINTN Address, - IN UINTN StartBit, - IN UINTN EndBit, - IN UINT32 AndData, - IN UINT32 OrData +PciCf8BitFieldAndThenOr32 ( + IN UINTN Address, + IN UINTN StartBit, + IN UINTN EndBit, + IN UINT32 AndData, + IN UINT32 OrData ) { BOOLEAN InterruptState; @@ -1565,15 +1564,15 @@ PciCf8BitFieldAndThenOr32( ASSERT_INVALID_PCI_ADDRESS (Address, 3); InterruptState = SaveAndDisableInterrupts (); - AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); + AddressPort = IoRead32 (PCI_CONFIGURATION_ADDRESS_PORT); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, PCI_TO_CF8_ADDRESS (Address)); Result = IoBitFieldAndThenOr32 ( - PCI_CONFIGURATION_DATA_PORT, - StartBit, - EndBit, - AndData, - OrData - ); + PCI_CONFIGURATION_DATA_PORT, + StartBit, + EndBit, + AndData, + OrData + ); IoWrite32 (PCI_CONFIGURATION_ADDRESS_PORT, AddressPort); SetInterruptState (InterruptState); return Result; @@ -1606,12 +1605,12 @@ PciCf8BitFieldAndThenOr32( UINTN EFIAPI PciCf8ReadBuffer ( - 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) <= 0x100); @@ -1632,40 +1631,40 @@ PciCf8ReadBuffer ( // Read a byte if StartAddress is byte aligned // *(volatile UINT8 *)Buffer = PciCf8Read8 (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 & 2) != 0) { + if ((Size >= sizeof (UINT16)) && ((StartAddress & 2) != 0)) { // // Read a word if StartAddress is word aligned // - WriteUnaligned16 ((UINT16 *)Buffer, (UINT16) PciCf8Read16 (StartAddress)); + WriteUnaligned16 ((UINT16 *)Buffer, (UINT16)PciCf8Read16 (StartAddress)); StartAddress += sizeof (UINT16); - Size -= sizeof (UINT16); - Buffer = (UINT16*)Buffer + 1; + Size -= sizeof (UINT16); + Buffer = (UINT16 *)Buffer + 1; } while (Size >= sizeof (UINT32)) { // // Read as many double words as possible // - WriteUnaligned32 ((UINT32 *)Buffer, (UINT32) PciCf8Read32 (StartAddress)); + WriteUnaligned32 ((UINT32 *)Buffer, (UINT32)PciCf8Read32 (StartAddress)); StartAddress += sizeof (UINT32); - Size -= sizeof (UINT32); - Buffer = (UINT32*)Buffer + 1; + Size -= sizeof (UINT32); + Buffer = (UINT32 *)Buffer + 1; } if (Size >= sizeof (UINT16)) { // // Read the last remaining word if exist // - WriteUnaligned16 ((UINT16 *)Buffer, (UINT16) PciCf8Read16 (StartAddress)); + WriteUnaligned16 ((UINT16 *)Buffer, (UINT16)PciCf8Read16 (StartAddress)); StartAddress += sizeof (UINT16); - Size -= sizeof (UINT16); - Buffer = (UINT16*)Buffer + 1; + Size -= sizeof (UINT16); + Buffer = (UINT16 *)Buffer + 1; } if (Size >= sizeof (UINT8)) { @@ -1706,12 +1705,12 @@ PciCf8ReadBuffer ( UINTN EFIAPI PciCf8WriteBuffer ( - 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) <= 0x100); @@ -1731,47 +1730,47 @@ PciCf8WriteBuffer ( // // Write a byte if StartAddress is byte aligned // - PciCf8Write8 (StartAddress, *(UINT8*)Buffer); + PciCf8Write8 (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 & 2) != 0) { + if ((Size >= sizeof (UINT16)) && ((StartAddress & 2) != 0)) { // // Write a word if StartAddress is word aligned // - PciCf8Write16 (StartAddress, ReadUnaligned16 ((UINT16*)Buffer)); + PciCf8Write16 (StartAddress, ReadUnaligned16 ((UINT16 *)Buffer)); StartAddress += sizeof (UINT16); - Size -= sizeof (UINT16); - Buffer = (UINT16*)Buffer + 1; + Size -= sizeof (UINT16); + Buffer = (UINT16 *)Buffer + 1; } while (Size >= sizeof (UINT32)) { // // Write as many double words as possible // - PciCf8Write32 (StartAddress, ReadUnaligned32 ((UINT32*)Buffer)); + PciCf8Write32 (StartAddress, ReadUnaligned32 ((UINT32 *)Buffer)); StartAddress += sizeof (UINT32); - Size -= sizeof (UINT32); - Buffer = (UINT32*)Buffer + 1; + Size -= sizeof (UINT32); + Buffer = (UINT32 *)Buffer + 1; } if (Size >= sizeof (UINT16)) { // // Write the last remaining word if exist // - PciCf8Write16 (StartAddress, ReadUnaligned16 ((UINT16*)Buffer)); + PciCf8Write16 (StartAddress, ReadUnaligned16 ((UINT16 *)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 // - PciCf8Write8 (StartAddress, *(UINT8*)Buffer); + PciCf8Write8 (StartAddress, *(UINT8 *)Buffer); } return ReturnValue; -- cgit v1.2.3