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

11
MdePkg/Library/DxeIoLibCpuIo2/DxeCpuIo2LibInternal.h
View File

@@ -20,7 +20,6 @@
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
/**
Reads registers in the EFI CPU I/O space.
@@ -136,8 +135,8 @@ IoWriteFifoWorker (
UINT64
EFIAPI
MmioReadWorker (
IN UINTN Address,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width
IN UINTN Address,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width
);
/**
@@ -158,9 +157,9 @@ MmioReadWorker (
UINT64
EFIAPI
MmioWriteWorker (
IN UINTN Address,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Data
IN UINTN Address,
IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
IN UINT64 Data
);
#endif

457
MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
View File

@@ -9,7 +9,6 @@
**/
#include "DxeCpuIo2LibInternal.h"
/**
@@ -33,11 +32,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));
}
/**
@@ -61,11 +60,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));
}
/**
@@ -91,12 +90,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));
}
/**
@@ -122,9 +121,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);
@@ -157,10 +156,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 (
@@ -198,10 +197,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 (
@@ -239,10 +238,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 (
@@ -284,11 +283,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 (
@@ -318,11 +317,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));
}
/**
@@ -346,11 +345,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));
}
/**
@@ -376,12 +375,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));
}
/**
@@ -407,9 +406,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);
@@ -442,10 +441,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 (
@@ -483,10 +482,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 (
@@ -524,10 +523,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 (
@@ -569,11 +568,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 (
@@ -603,8 +602,8 @@ IoBitFieldAndThenOr16 (
UINT32
EFIAPI
IoOr32 (
IN UINTN Port,
IN UINT32 OrData
IN UINTN Port,
IN UINT32 OrData
)
{
return IoWrite32 (Port, IoRead32 (Port) | OrData);
@@ -631,8 +630,8 @@ IoOr32 (
UINT32
EFIAPI
IoAnd32 (
IN UINTN Port,
IN UINT32 AndData
IN UINTN Port,
IN UINT32 AndData
)
{
return IoWrite32 (Port, IoRead32 (Port) & AndData);
@@ -661,9 +660,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);
@@ -692,9 +691,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);
@@ -727,10 +726,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 (
@@ -768,10 +767,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 (
@@ -809,10 +808,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 (
@@ -854,11 +853,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 (
@@ -888,8 +887,8 @@ IoBitFieldAndThenOr32 (
UINT64
EFIAPI
IoOr64 (
IN UINTN Port,
IN UINT64 OrData
IN UINTN Port,
IN UINT64 OrData
)
{
return IoWrite64 (Port, IoRead64 (Port) | OrData);
@@ -916,8 +915,8 @@ IoOr64 (
UINT64
EFIAPI
IoAnd64 (
IN UINTN Port,
IN UINT64 AndData
IN UINTN Port,
IN UINT64 AndData
)
{
return IoWrite64 (Port, IoRead64 (Port) & AndData);
@@ -946,9 +945,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);
@@ -977,9 +976,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);
@@ -1012,10 +1011,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 (
@@ -1053,10 +1052,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 (
@@ -1094,10 +1093,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 (
@@ -1139,11 +1138,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 (
@@ -1173,11 +1172,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));
}
/**
@@ -1201,11 +1200,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));
}
/**
@@ -1232,12 +1231,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));
}
/**
@@ -1263,9 +1262,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);
@@ -1297,10 +1296,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 (
@@ -1339,10 +1338,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 (
@@ -1381,10 +1380,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 (
@@ -1426,11 +1425,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 (
@@ -1460,11 +1459,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));
}
/**
@@ -1488,11 +1487,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));
}
/**
@@ -1519,12 +1518,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));
}
/**
@@ -1550,9 +1549,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);
@@ -1584,10 +1583,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 (
@@ -1626,10 +1625,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 (
@@ -1668,10 +1667,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 (
@@ -1713,11 +1712,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 (
@@ -1747,8 +1746,8 @@ MmioBitFieldAndThenOr16 (
UINT32
EFIAPI
MmioOr32 (
IN UINTN Address,
IN UINT32 OrData
IN UINTN Address,
IN UINT32 OrData
)
{
return MmioWrite32 (Address, MmioRead32 (Address) | OrData);
@@ -1775,8 +1774,8 @@ MmioOr32 (
UINT32
EFIAPI
MmioAnd32 (
IN UINTN Address,
IN UINT32 AndData
IN UINTN Address,
IN UINT32 AndData
)
{
return MmioWrite32 (Address, MmioRead32 (Address) & AndData);
@@ -1806,9 +1805,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);
@@ -1837,9 +1836,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);
@@ -1871,10 +1870,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 (
@@ -1913,10 +1912,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 (
@@ -1955,10 +1954,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 (
@@ -2000,11 +1999,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 (
@@ -2034,8 +2033,8 @@ MmioBitFieldAndThenOr32 (
UINT64
EFIAPI
MmioOr64 (
IN UINTN Address,
IN UINT64 OrData
IN UINTN Address,
IN UINT64 OrData
)
{
return MmioWrite64 (Address, MmioRead64 (Address) | OrData);
@@ -2062,8 +2061,8 @@ MmioOr64 (
UINT64
EFIAPI
MmioAnd64 (
IN UINTN Address,
IN UINT64 AndData
IN UINTN Address,
IN UINT64 AndData
)
{
return MmioWrite64 (Address, MmioRead64 (Address) & AndData);
@@ -2093,9 +2092,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);
@@ -2124,9 +2123,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);
@@ -2158,10 +2157,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 (
@@ -2200,10 +2199,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 (
@@ -2242,10 +2241,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 (
@@ -2287,11 +2286,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 (

90
MdePkg/Library/DxeIoLibCpuIo2/IoLib.c
View File

@@ -30,13 +30,13 @@ EFI_CPU_IO2_PROTOCOL *mCpuIo = NULL;
EFI_STATUS
EFIAPI
IoLibConstructor (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **) &mCpuIo);
Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **)&mCpuIo);
ASSERT_EFI_ERROR (Status);
return Status;
@@ -247,7 +247,7 @@ MmioWriteWorker (
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
return (UINT8)IoReadWorker (Port, EfiCpuIoWidthUint8);
@@ -271,8 +271,8 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
return (UINT8)IoWriteWorker (Port, EfiCpuIoWidthUint8, Value);
@@ -297,7 +297,7 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
//
@@ -327,8 +327,8 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
//
@@ -357,7 +357,7 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
//
@@ -387,8 +387,8 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
//
@@ -417,7 +417,7 @@ IoWrite32 (
UINT64
EFIAPI
IoRead64 (
IN UINTN Port
IN UINTN Port
)
{
//
@@ -447,8 +447,8 @@ IoRead64 (
UINT64
EFIAPI
IoWrite64 (
IN UINTN Port,
IN UINT64 Value
IN UINTN Port,
IN UINT64 Value
)
{
//
@@ -478,9 +478,9 @@ IoWrite64 (
VOID
EFIAPI
IoReadFifo8 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
IoReadFifoWorker (Port, EfiCpuIoWidthFifoUint8, Count, Buffer);
@@ -506,9 +506,9 @@ IoReadFifo8 (
VOID
EFIAPI
IoWriteFifo8 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
IoWriteFifoWorker (Port, EfiCpuIoWidthFifoUint8, Count, Buffer);
@@ -534,9 +534,9 @@ IoWriteFifo8 (
VOID
EFIAPI
IoReadFifo16 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
//
@@ -566,9 +566,9 @@ IoReadFifo16 (
VOID
EFIAPI
IoWriteFifo16 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
//
@@ -598,9 +598,9 @@ IoWriteFifo16 (
VOID
EFIAPI
IoReadFifo32 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
//
@@ -630,9 +630,9 @@ IoReadFifo32 (
VOID
EFIAPI
IoWriteFifo32 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
//
@@ -659,7 +659,7 @@ IoWriteFifo32 (
UINT8
EFIAPI
MmioRead8 (
IN UINTN Address
IN UINTN Address
)
{
return (UINT8)MmioReadWorker (Address, EfiCpuIoWidthUint8);
@@ -681,8 +681,8 @@ MmioRead8 (
UINT8
EFIAPI
MmioWrite8 (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
)
{
return (UINT8)MmioWriteWorker (Address, EfiCpuIoWidthUint8, Value);
@@ -707,7 +707,7 @@ MmioWrite8 (
UINT16
EFIAPI
MmioRead16 (
IN UINTN Address
IN UINTN Address
)
{
//
@@ -735,8 +735,8 @@ MmioRead16 (
UINT16
EFIAPI
MmioWrite16 (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
)
{
//
@@ -765,7 +765,7 @@ MmioWrite16 (
UINT32
EFIAPI
MmioRead32 (
IN UINTN Address
IN UINTN Address
)
{
//
@@ -793,8 +793,8 @@ MmioRead32 (
UINT32
EFIAPI
MmioWrite32 (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
)
{
//
@@ -823,7 +823,7 @@ MmioWrite32 (
UINT64
EFIAPI
MmioRead64 (
IN UINTN Address
IN UINTN Address
)
{
//
@@ -851,8 +851,8 @@ MmioRead64 (
UINT64
EFIAPI
MmioWrite64 (
IN UINTN Address,
IN UINT64 Value
IN UINTN Address,
IN UINT64 Value
)
{
//

124
MdePkg/Library/DxeIoLibCpuIo2/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.
@@ -225,24 +224,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;
}
/**
@@ -271,34 +269,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.
@@ -325,28 +322,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;
@@ -378,30 +375,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;
}