sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdePkg: Apply uncrustify changes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

456
MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c
View File

@@ -38,11 +38,11 @@
UINT8
EFIAPI
IoOr8 (
IN UINTN Port,
IN UINT8 OrData
IN UINTN Port,
IN UINT8 OrData
)
{
return IoWrite8 (Port, (UINT8) (IoRead8 (Port) | OrData));
return IoWrite8 (Port, (UINT8)(IoRead8 (Port) | OrData));
}
/**
@@ -66,11 +66,11 @@ IoOr8 (
UINT8
EFIAPI
IoAnd8 (
IN UINTN Port,
IN UINT8 AndData
IN UINTN Port,
IN UINT8 AndData
)
{
return IoWrite8 (Port, (UINT8) (IoRead8 (Port) & AndData));
return IoWrite8 (Port, (UINT8)(IoRead8 (Port) & AndData));
}
/**
@@ -96,12 +96,12 @@ IoAnd8 (
UINT8
EFIAPI
IoAndThenOr8 (
IN UINTN Port,
IN UINT8 AndData,
IN UINT8 OrData
IN UINTN Port,
IN UINT8 AndData,
IN UINT8 OrData
)
{
return IoWrite8 (Port, (UINT8) ((IoRead8 (Port) & AndData) | OrData));
return IoWrite8 (Port, (UINT8)((IoRead8 (Port) & AndData) | OrData));
}
/**
@@ -127,9 +127,9 @@ IoAndThenOr8 (
UINT8
EFIAPI
IoBitFieldRead8 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead8 (IoRead8 (Port), StartBit, EndBit);
@@ -162,10 +162,10 @@ IoBitFieldRead8 (
UINT8
EFIAPI
IoBitFieldWrite8 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 Value
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 Value
)
{
return IoWrite8 (
@@ -203,10 +203,10 @@ IoBitFieldWrite8 (
UINT8
EFIAPI
IoBitFieldOr8 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 OrData
)
{
return IoWrite8 (
@@ -244,10 +244,10 @@ IoBitFieldOr8 (
UINT8
EFIAPI
IoBitFieldAnd8 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData
)
{
return IoWrite8 (
@@ -289,11 +289,11 @@ IoBitFieldAnd8 (
UINT8
EFIAPI
IoBitFieldAndThenOr8 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData,
IN UINT8 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT8 AndData,
IN UINT8 OrData
)
{
return IoWrite8 (
@@ -323,11 +323,11 @@ IoBitFieldAndThenOr8 (
UINT16
EFIAPI
IoOr16 (
IN UINTN Port,
IN UINT16 OrData
IN UINTN Port,
IN UINT16 OrData
)
{
return IoWrite16 (Port, (UINT16) (IoRead16 (Port) | OrData));
return IoWrite16 (Port, (UINT16)(IoRead16 (Port) | OrData));
}
/**
@@ -351,11 +351,11 @@ IoOr16 (
UINT16
EFIAPI
IoAnd16 (
IN UINTN Port,
IN UINT16 AndData
IN UINTN Port,
IN UINT16 AndData
)
{
return IoWrite16 (Port, (UINT16) (IoRead16 (Port) & AndData));
return IoWrite16 (Port, (UINT16)(IoRead16 (Port) & AndData));
}
/**
@@ -381,12 +381,12 @@ IoAnd16 (
UINT16
EFIAPI
IoAndThenOr16 (
IN UINTN Port,
IN UINT16 AndData,
IN UINT16 OrData
IN UINTN Port,
IN UINT16 AndData,
IN UINT16 OrData
)
{
return IoWrite16 (Port, (UINT16) ((IoRead16 (Port) & AndData) | OrData));
return IoWrite16 (Port, (UINT16)((IoRead16 (Port) & AndData) | OrData));
}
/**
@@ -412,9 +412,9 @@ IoAndThenOr16 (
UINT16
EFIAPI
IoBitFieldRead16 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead16 (IoRead16 (Port), StartBit, EndBit);
@@ -447,10 +447,10 @@ IoBitFieldRead16 (
UINT16
EFIAPI
IoBitFieldWrite16 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 Value
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 Value
)
{
return IoWrite16 (
@@ -488,10 +488,10 @@ IoBitFieldWrite16 (
UINT16
EFIAPI
IoBitFieldOr16 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 OrData
)
{
return IoWrite16 (
@@ -529,10 +529,10 @@ IoBitFieldOr16 (
UINT16
EFIAPI
IoBitFieldAnd16 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData
)
{
return IoWrite16 (
@@ -574,11 +574,11 @@ IoBitFieldAnd16 (
UINT16
EFIAPI
IoBitFieldAndThenOr16 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData,
IN UINT16 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT16 AndData,
IN UINT16 OrData
)
{
return IoWrite16 (
@@ -608,8 +608,8 @@ IoBitFieldAndThenOr16 (
UINT32
EFIAPI
IoOr32 (
IN UINTN Port,
IN UINT32 OrData
IN UINTN Port,
IN UINT32 OrData
)
{
return IoWrite32 (Port, IoRead32 (Port) | OrData);
@@ -636,8 +636,8 @@ IoOr32 (
UINT32
EFIAPI
IoAnd32 (
IN UINTN Port,
IN UINT32 AndData
IN UINTN Port,
IN UINT32 AndData
)
{
return IoWrite32 (Port, IoRead32 (Port) & AndData);
@@ -666,9 +666,9 @@ IoAnd32 (
UINT32
EFIAPI
IoAndThenOr32 (
IN UINTN Port,
IN UINT32 AndData,
IN UINT32 OrData
IN UINTN Port,
IN UINT32 AndData,
IN UINT32 OrData
)
{
return IoWrite32 (Port, (IoRead32 (Port) & AndData) | OrData);
@@ -697,9 +697,9 @@ IoAndThenOr32 (
UINT32
EFIAPI
IoBitFieldRead32 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead32 (IoRead32 (Port), StartBit, EndBit);
@@ -732,10 +732,10 @@ IoBitFieldRead32 (
UINT32
EFIAPI
IoBitFieldWrite32 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 Value
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 Value
)
{
return IoWrite32 (
@@ -773,10 +773,10 @@ IoBitFieldWrite32 (
UINT32
EFIAPI
IoBitFieldOr32 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 OrData
)
{
return IoWrite32 (
@@ -814,10 +814,10 @@ IoBitFieldOr32 (
UINT32
EFIAPI
IoBitFieldAnd32 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData
)
{
return IoWrite32 (
@@ -859,11 +859,11 @@ IoBitFieldAnd32 (
UINT32
EFIAPI
IoBitFieldAndThenOr32 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData,
IN UINT32 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT32 AndData,
IN UINT32 OrData
)
{
return IoWrite32 (
@@ -893,8 +893,8 @@ IoBitFieldAndThenOr32 (
UINT64
EFIAPI
IoOr64 (
IN UINTN Port,
IN UINT64 OrData
IN UINTN Port,
IN UINT64 OrData
)
{
return IoWrite64 (Port, IoRead64 (Port) | OrData);
@@ -921,8 +921,8 @@ IoOr64 (
UINT64
EFIAPI
IoAnd64 (
IN UINTN Port,
IN UINT64 AndData
IN UINTN Port,
IN UINT64 AndData
)
{
return IoWrite64 (Port, IoRead64 (Port) & AndData);
@@ -951,9 +951,9 @@ IoAnd64 (
UINT64
EFIAPI
IoAndThenOr64 (
IN UINTN Port,
IN UINT64 AndData,
IN UINT64 OrData
IN UINTN Port,
IN UINT64 AndData,
IN UINT64 OrData
)
{
return IoWrite64 (Port, (IoRead64 (Port) & AndData) | OrData);
@@ -982,9 +982,9 @@ IoAndThenOr64 (
UINT64
EFIAPI
IoBitFieldRead64 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead64 (IoRead64 (Port), StartBit, EndBit);
@@ -1017,10 +1017,10 @@ IoBitFieldRead64 (
UINT64
EFIAPI
IoBitFieldWrite64 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 Value
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 Value
)
{
return IoWrite64 (
@@ -1058,10 +1058,10 @@ IoBitFieldWrite64 (
UINT64
EFIAPI
IoBitFieldOr64 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 OrData
)
{
return IoWrite64 (
@@ -1099,10 +1099,10 @@ IoBitFieldOr64 (
UINT64
EFIAPI
IoBitFieldAnd64 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData
)
{
return IoWrite64 (
@@ -1144,11 +1144,11 @@ IoBitFieldAnd64 (
UINT64
EFIAPI
IoBitFieldAndThenOr64 (
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData,
IN UINT64 OrData
IN UINTN Port,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData,
IN UINT64 OrData
)
{
return IoWrite64 (
@@ -1178,11 +1178,11 @@ IoBitFieldAndThenOr64 (
UINT8
EFIAPI
MmioOr8 (
IN UINTN Address,
IN UINT8 OrData
IN UINTN Address,
IN UINT8 OrData
)
{
return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) | OrData));
return MmioWrite8 (Address, (UINT8)(MmioRead8 (Address) | OrData));
}
/**
@@ -1206,11 +1206,11 @@ MmioOr8 (
UINT8
EFIAPI
MmioAnd8 (
IN UINTN Address,
IN UINT8 AndData
IN UINTN Address,
IN UINT8 AndData
)
{
return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) & AndData));
return MmioWrite8 (Address, (UINT8)(MmioRead8 (Address) & AndData));
}
/**
@@ -1237,12 +1237,12 @@ MmioAnd8 (
UINT8
EFIAPI
MmioAndThenOr8 (
IN UINTN Address,
IN UINT8 AndData,
IN UINT8 OrData
IN UINTN Address,
IN UINT8 AndData,
IN UINT8 OrData
)
{
return MmioWrite8 (Address, (UINT8) ((MmioRead8 (Address) & AndData) | OrData));
return MmioWrite8 (Address, (UINT8)((MmioRead8 (Address) & AndData) | OrData));
}
/**
@@ -1268,9 +1268,9 @@ MmioAndThenOr8 (
UINT8
EFIAPI
MmioBitFieldRead8 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead8 (MmioRead8 (Address), StartBit, EndBit);
@@ -1302,10 +1302,10 @@ MmioBitFieldRead8 (
UINT8
EFIAPI
MmioBitFieldWrite8 (
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 MmioWrite8 (
@@ -1344,10 +1344,10 @@ MmioBitFieldWrite8 (
UINT8
EFIAPI
MmioBitFieldOr8 (
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 MmioWrite8 (
@@ -1386,10 +1386,10 @@ MmioBitFieldOr8 (
UINT8
EFIAPI
MmioBitFieldAnd8 (
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 MmioWrite8 (
@@ -1431,11 +1431,11 @@ MmioBitFieldAnd8 (
UINT8
EFIAPI
MmioBitFieldAndThenOr8 (
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 MmioWrite8 (
@@ -1465,11 +1465,11 @@ MmioBitFieldAndThenOr8 (
UINT16
EFIAPI
MmioOr16 (
IN UINTN Address,
IN UINT16 OrData
IN UINTN Address,
IN UINT16 OrData
)
{
return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) | OrData));
return MmioWrite16 (Address, (UINT16)(MmioRead16 (Address) | OrData));
}
/**
@@ -1493,11 +1493,11 @@ MmioOr16 (
UINT16
EFIAPI
MmioAnd16 (
IN UINTN Address,
IN UINT16 AndData
IN UINTN Address,
IN UINT16 AndData
)
{
return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) & AndData));
return MmioWrite16 (Address, (UINT16)(MmioRead16 (Address) & AndData));
}
/**
@@ -1524,12 +1524,12 @@ MmioAnd16 (
UINT16
EFIAPI
MmioAndThenOr16 (
IN UINTN Address,
IN UINT16 AndData,
IN UINT16 OrData
IN UINTN Address,
IN UINT16 AndData,
IN UINT16 OrData
)
{
return MmioWrite16 (Address, (UINT16) ((MmioRead16 (Address) & AndData) | OrData));
return MmioWrite16 (Address, (UINT16)((MmioRead16 (Address) & AndData) | OrData));
}
/**
@@ -1555,9 +1555,9 @@ MmioAndThenOr16 (
UINT16
EFIAPI
MmioBitFieldRead16 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead16 (MmioRead16 (Address), StartBit, EndBit);
@@ -1589,10 +1589,10 @@ MmioBitFieldRead16 (
UINT16
EFIAPI
MmioBitFieldWrite16 (
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 MmioWrite16 (
@@ -1631,10 +1631,10 @@ MmioBitFieldWrite16 (
UINT16
EFIAPI
MmioBitFieldOr16 (
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 MmioWrite16 (
@@ -1673,10 +1673,10 @@ MmioBitFieldOr16 (
UINT16
EFIAPI
MmioBitFieldAnd16 (
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 MmioWrite16 (
@@ -1718,11 +1718,11 @@ MmioBitFieldAnd16 (
UINT16
EFIAPI
MmioBitFieldAndThenOr16 (
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 MmioWrite16 (
@@ -1752,8 +1752,8 @@ MmioBitFieldAndThenOr16 (
UINT32
EFIAPI
MmioOr32 (
IN UINTN Address,
IN UINT32 OrData
IN UINTN Address,
IN UINT32 OrData
)
{
return MmioWrite32 (Address, MmioRead32 (Address) | OrData);
@@ -1780,8 +1780,8 @@ MmioOr32 (
UINT32
EFIAPI
MmioAnd32 (
IN UINTN Address,
IN UINT32 AndData
IN UINTN Address,
IN UINT32 AndData
)
{
return MmioWrite32 (Address, MmioRead32 (Address) & AndData);
@@ -1811,9 +1811,9 @@ MmioAnd32 (
UINT32
EFIAPI
MmioAndThenOr32 (
IN UINTN Address,
IN UINT32 AndData,
IN UINT32 OrData
IN UINTN Address,
IN UINT32 AndData,
IN UINT32 OrData
)
{
return MmioWrite32 (Address, (MmioRead32 (Address) & AndData) | OrData);
@@ -1842,9 +1842,9 @@ MmioAndThenOr32 (
UINT32
EFIAPI
MmioBitFieldRead32 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead32 (MmioRead32 (Address), StartBit, EndBit);
@@ -1876,10 +1876,10 @@ MmioBitFieldRead32 (
UINT32
EFIAPI
MmioBitFieldWrite32 (
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 MmioWrite32 (
@@ -1918,10 +1918,10 @@ MmioBitFieldWrite32 (
UINT32
EFIAPI
MmioBitFieldOr32 (
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 MmioWrite32 (
@@ -1960,10 +1960,10 @@ MmioBitFieldOr32 (
UINT32
EFIAPI
MmioBitFieldAnd32 (
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 MmioWrite32 (
@@ -2005,11 +2005,11 @@ MmioBitFieldAnd32 (
UINT32
EFIAPI
MmioBitFieldAndThenOr32 (
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 MmioWrite32 (
@@ -2039,8 +2039,8 @@ MmioBitFieldAndThenOr32 (
UINT64
EFIAPI
MmioOr64 (
IN UINTN Address,
IN UINT64 OrData
IN UINTN Address,
IN UINT64 OrData
)
{
return MmioWrite64 (Address, MmioRead64 (Address) | OrData);
@@ -2067,8 +2067,8 @@ MmioOr64 (
UINT64
EFIAPI
MmioAnd64 (
IN UINTN Address,
IN UINT64 AndData
IN UINTN Address,
IN UINT64 AndData
)
{
return MmioWrite64 (Address, MmioRead64 (Address) & AndData);
@@ -2098,9 +2098,9 @@ MmioAnd64 (
UINT64
EFIAPI
MmioAndThenOr64 (
IN UINTN Address,
IN UINT64 AndData,
IN UINT64 OrData
IN UINTN Address,
IN UINT64 AndData,
IN UINT64 OrData
)
{
return MmioWrite64 (Address, (MmioRead64 (Address) & AndData) | OrData);
@@ -2129,9 +2129,9 @@ MmioAndThenOr64 (
UINT64
EFIAPI
MmioBitFieldRead64 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit
)
{
return BitFieldRead64 (MmioRead64 (Address), StartBit, EndBit);
@@ -2163,10 +2163,10 @@ MmioBitFieldRead64 (
UINT64
EFIAPI
MmioBitFieldWrite64 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 Value
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 Value
)
{
return MmioWrite64 (
@@ -2205,10 +2205,10 @@ MmioBitFieldWrite64 (
UINT64
EFIAPI
MmioBitFieldOr64 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 OrData
)
{
return MmioWrite64 (
@@ -2247,10 +2247,10 @@ MmioBitFieldOr64 (
UINT64
EFIAPI
MmioBitFieldAnd64 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData
)
{
return MmioWrite64 (
@@ -2292,11 +2292,11 @@ MmioBitFieldAnd64 (
UINT64
EFIAPI
MmioBitFieldAndThenOr64 (
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData,
IN UINT64 OrData
IN UINTN Address,
IN UINTN StartBit,
IN UINTN EndBit,
IN UINT64 AndData,
IN UINT64 OrData
)
{
return MmioWrite64 (

128
MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
View File

@@ -29,12 +29,12 @@
UINT64
EFIAPI
IoReadWorker (
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width
)
{
EFI_STATUS Status;
UINT64 Data;
EFI_STATUS Status;
UINT64 Data;
Status = gSmst->SmmIo.Io.Read (&gSmst->SmmIo, Width, Port, 1, &Data);
ASSERT_EFI_ERROR (Status);
@@ -60,12 +60,12 @@ IoReadWorker (
UINT64
EFIAPI
IoWriteWorker (
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
)
{
EFI_STATUS Status;
EFI_STATUS Status;
Status = gSmst->SmmIo.Io.Write (&gSmst->SmmIo, Width, Port, 1, &Data);
ASSERT_EFI_ERROR (Status);
@@ -90,12 +90,12 @@ IoWriteWorker (
UINT64
EFIAPI
MmioReadWorker (
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width
)
{
EFI_STATUS Status;
UINT64 Data;
EFI_STATUS Status;
UINT64 Data;
Status = gSmst->SmmIo.Mem.Read (&gSmst->SmmIo, Width, Address, 1, &Data);
ASSERT_EFI_ERROR (Status);
@@ -121,12 +121,12 @@ MmioReadWorker (
UINT64
EFIAPI
MmioWriteWorker (
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
)
{
EFI_STATUS Status;
EFI_STATUS Status;
Status = gSmst->SmmIo.Mem.Write (&gSmst->SmmIo, Width, Address, 1, &Data);
ASSERT_EFI_ERROR (Status);
@@ -151,7 +151,7 @@ MmioWriteWorker (
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
return (UINT8)IoReadWorker (Port, SMM_IO_UINT8);
@@ -175,8 +175,8 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
return (UINT8)IoWriteWorker (Port, SMM_IO_UINT8, Value);
@@ -201,7 +201,7 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
//
@@ -231,8 +231,8 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
//
@@ -261,7 +261,7 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
//
@@ -291,8 +291,8 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
//
@@ -321,7 +321,7 @@ IoWrite32 (
UINT64
EFIAPI
IoRead64 (
IN UINTN Port
IN UINTN Port
)
{
//
@@ -351,8 +351,8 @@ IoRead64 (
UINT64
EFIAPI
IoWrite64 (
IN UINTN Port,
IN UINT64 Value
IN UINTN Port,
IN UINT64 Value
)
{
//
@@ -382,12 +382,12 @@ IoWrite64 (
VOID
EFIAPI
IoReadFifo8 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
UINT8 *Buffer8;
UINT8 *Buffer8;
Buffer8 = (UINT8 *)Buffer;
while (Count-- > 0) {
@@ -415,12 +415,12 @@ IoReadFifo8 (
VOID
EFIAPI
IoWriteFifo8 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
UINT8 *Buffer8;
UINT8 *Buffer8;
Buffer8 = (UINT8 *)Buffer;
while (Count-- > 0) {
@@ -448,12 +448,12 @@ IoWriteFifo8 (
VOID
EFIAPI
IoReadFifo16 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
UINT16 *Buffer16;
UINT16 *Buffer16;
//
// Make sure Port is aligned on a 16-bit boundary.
@@ -485,12 +485,12 @@ IoReadFifo16 (
VOID
EFIAPI
IoWriteFifo16 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
UINT16 *Buffer16;
UINT16 *Buffer16;
//
// Make sure Port is aligned on a 16-bit boundary.
@@ -522,12 +522,12 @@ IoWriteFifo16 (
VOID
EFIAPI
IoReadFifo32 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
UINT32 *Buffer32;
UINT32 *Buffer32;
//
// Make sure Port is aligned on a 32-bit boundary.
@@ -559,12 +559,12 @@ IoReadFifo32 (
VOID
EFIAPI
IoWriteFifo32 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
UINT32 *Buffer32;
UINT32 *Buffer32;
//
// Make sure Port is aligned on a 32-bit boundary.
@@ -593,7 +593,7 @@ IoWriteFifo32 (
UINT8
EFIAPI
MmioRead8 (
IN UINTN Address
IN UINTN Address
)
{
return (UINT8)MmioReadWorker (Address, SMM_IO_UINT8);
@@ -615,8 +615,8 @@ MmioRead8 (
UINT8
EFIAPI
MmioWrite8 (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
)
{
return (UINT8)MmioWriteWorker (Address, SMM_IO_UINT8, Value);
@@ -641,7 +641,7 @@ MmioWrite8 (
UINT16
EFIAPI
MmioRead16 (
IN UINTN Address
IN UINTN Address
)
{
//
@@ -669,8 +669,8 @@ MmioRead16 (
UINT16
EFIAPI
MmioWrite16 (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
)
{
//
@@ -699,7 +699,7 @@ MmioWrite16 (
UINT32
EFIAPI
MmioRead32 (
IN UINTN Address
IN UINTN Address
)
{
//
@@ -727,8 +727,8 @@ MmioRead32 (
UINT32
EFIAPI
MmioWrite32 (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
)
{
//
@@ -757,7 +757,7 @@ MmioWrite32 (
UINT64
EFIAPI
MmioRead64 (
IN UINTN Address
IN UINTN Address
)
{
//
@@ -785,8 +785,8 @@ MmioRead64 (
UINT64
EFIAPI
MmioWrite64 (
IN UINTN Address,
IN UINT64 Value
IN UINTN Address,
IN UINT64 Value
)
{
//

124
MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c
View File

@@ -29,15 +29,15 @@
UINT8 *
EFIAPI
MmioReadBuffer8 (
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT8 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT8 *Buffer
)
{
UINT8 *ReturnBuffer;
UINT8 *ReturnBuffer;
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ReturnBuffer = Buffer;
@@ -74,27 +74,27 @@ MmioReadBuffer8 (
UINT16 *
EFIAPI
MmioReadBuffer16 (
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT16 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT16 *Buffer
)
{
UINT16 *ReturnBuffer;
UINT16 *ReturnBuffer;
ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);
ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);
ASSERT (((UINTN)Buffer & (sizeof (UINT16) - 1)) == 0);
ReturnBuffer = Buffer;
while (Length > 0) {
*(Buffer++) = MmioRead16 (StartAddress);
*(Buffer++) = MmioRead16 (StartAddress);
StartAddress += sizeof (UINT16);
Length -= sizeof (UINT16);
Length -= sizeof (UINT16);
}
return ReturnBuffer;
@@ -125,27 +125,27 @@ MmioReadBuffer16 (
UINT32 *
EFIAPI
MmioReadBuffer32 (
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT32 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT32 *Buffer
)
{
UINT32 *ReturnBuffer;
UINT32 *ReturnBuffer;
ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);
ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);
ASSERT (((UINTN)Buffer & (sizeof (UINT32) - 1)) == 0);
ReturnBuffer = Buffer;
while (Length > 0) {
*(Buffer++) = MmioRead32 (StartAddress);
*(Buffer++) = MmioRead32 (StartAddress);
StartAddress += sizeof (UINT32);
Length -= sizeof (UINT32);
Length -= sizeof (UINT32);
}
return ReturnBuffer;
@@ -177,33 +177,32 @@ MmioReadBuffer32 (
UINT64 *
EFIAPI
MmioReadBuffer64 (
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT64 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
OUT UINT64 *Buffer
)
{
UINT64 *ReturnBuffer;
UINT64 *ReturnBuffer;
ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);
ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);
ASSERT (((UINTN)Buffer & (sizeof (UINT64) - 1)) == 0);
ReturnBuffer = Buffer;
while (Length > 0) {
*(Buffer++) = MmioRead64 (StartAddress);
*(Buffer++) = MmioRead64 (StartAddress);
StartAddress += sizeof (UINT64);
Length -= sizeof (UINT64);
Length -= sizeof (UINT64);
}
return ReturnBuffer;
}
/**
Copy data from system memory to MMIO region by using 8-bit access.
@@ -226,24 +225,23 @@ MmioReadBuffer64 (
UINT8 *
EFIAPI
MmioWriteBuffer8 (
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT8 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT8 *Buffer
)
{
VOID* ReturnBuffer;
VOID *ReturnBuffer;
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ReturnBuffer = (UINT8 *) Buffer;
ReturnBuffer = (UINT8 *)Buffer;
while (Length-- > 0) {
MmioWrite8 (StartAddress++, *(Buffer++));
MmioWrite8 (StartAddress++, *(Buffer++));
}
return ReturnBuffer;
}
/**
@@ -273,34 +271,33 @@ MmioWriteBuffer8 (
UINT16 *
EFIAPI
MmioWriteBuffer16 (
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT16 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT16 *Buffer
)
{
UINT16 *ReturnBuffer;
UINT16 *ReturnBuffer;
ASSERT ((StartAddress & (sizeof (UINT16) - 1)) == 0);
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ASSERT ((Length & (sizeof (UINT16) - 1)) == 0);
ASSERT (((UINTN) Buffer & (sizeof (UINT16) - 1)) == 0);
ASSERT (((UINTN)Buffer & (sizeof (UINT16) - 1)) == 0);
ReturnBuffer = (UINT16 *) Buffer;
ReturnBuffer = (UINT16 *)Buffer;
while (Length > 0) {
MmioWrite16 (StartAddress, *(Buffer++));
StartAddress += sizeof (UINT16);
Length -= sizeof (UINT16);
Length -= sizeof (UINT16);
}
return ReturnBuffer;
}
/**
Copy data from system memory to MMIO region by using 32-bit access.
@@ -328,28 +325,28 @@ MmioWriteBuffer16 (
UINT32 *
EFIAPI
MmioWriteBuffer32 (
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT32 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT32 *Buffer
)
{
UINT32 *ReturnBuffer;
UINT32 *ReturnBuffer;
ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);
ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);
ASSERT (((UINTN)Buffer & (sizeof (UINT32) - 1)) == 0);
ReturnBuffer = (UINT32 *) Buffer;
ReturnBuffer = (UINT32 *)Buffer;
while (Length > 0) {
MmioWrite32 (StartAddress, *(Buffer++));
StartAddress += sizeof (UINT32);
Length -= sizeof (UINT32);
Length -= sizeof (UINT32);
}
return ReturnBuffer;
@@ -382,30 +379,29 @@ MmioWriteBuffer32 (
UINT64 *
EFIAPI
MmioWriteBuffer64 (
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT64 *Buffer
IN UINTN StartAddress,
IN UINTN Length,
IN CONST UINT64 *Buffer
)
{
UINT64 *ReturnBuffer;
UINT64 *ReturnBuffer;
ASSERT ((StartAddress & (sizeof (UINT64) - 1)) == 0);
ASSERT ((Length - 1) <= (MAX_ADDRESS - StartAddress));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN) Buffer));
ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
ASSERT ((Length & (sizeof (UINT64) - 1)) == 0);
ASSERT (((UINTN) Buffer & (sizeof (UINT64) - 1)) == 0);
ASSERT (((UINTN)Buffer & (sizeof (UINT64) - 1)) == 0);
ReturnBuffer = (UINT64 *) Buffer;
ReturnBuffer = (UINT64 *)Buffer;
while (Length > 0) {
MmioWrite64 (StartAddress, *(Buffer++));
StartAddress += sizeof (UINT64);
Length -= sizeof (UINT64);
Length -= sizeof (UINT64);
}
return ReturnBuffer;
}

21
MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h
View File

@@ -20,7 +20,6 @@
#include <Library/BaseLib.h>
#include <Library/SmmServicesTableLib.h>
/**
Reads registers in the EFI CPU I/O space.
@@ -38,8 +37,8 @@
UINT64
EFIAPI
IoReadWorker (
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width
);
/**
@@ -60,9 +59,9 @@ IoReadWorker (
UINT64
EFIAPI
IoWriteWorker (
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
IN UINTN Port,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
);
/**
@@ -82,8 +81,8 @@ IoWriteWorker (
UINT64
EFIAPI
MmioReadWorker (
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width
);
/**
@@ -104,9 +103,9 @@ MmioReadWorker (
UINT64
EFIAPI
MmioWriteWorker (
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
IN UINTN Address,
IN EFI_SMM_IO_WIDTH Width,
IN UINT64 Data
);
#endif