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

2
MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
View File

@@ -10,8 +10,6 @@
#ifndef __BASEIOLIB_INTRINSIC_INTERNAL_H_
#define __BASEIOLIB_INTRINSIC_INTERNAL_H_
#include <Base.h>
#include <Library/IoLib.h>

456
MdePkg/Library/BaseIoLibIntrinsic/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);
@@ -161,10 +161,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 (
@@ -202,10 +202,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 (
@@ -243,10 +243,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 (
@@ -288,11 +288,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));
}
/**
@@ -352,11 +352,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));
}
/**
@@ -383,12 +383,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));
}
/**
@@ -415,9 +415,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);
@@ -451,10 +451,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 (
@@ -493,10 +493,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 (
@@ -535,10 +535,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 (
@@ -581,11 +581,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 (
@@ -616,8 +616,8 @@ IoBitFieldAndThenOr16 (
UINT32
EFIAPI
IoOr32 (
IN UINTN Port,
IN UINT32 OrData
IN UINTN Port,
IN UINT32 OrData
)
{
return IoWrite32 (Port, IoRead32 (Port) | OrData);
@@ -645,8 +645,8 @@ IoOr32 (
UINT32
EFIAPI
IoAnd32 (
IN UINTN Port,
IN UINT32 AndData
IN UINTN Port,
IN UINT32 AndData
)
{
return IoWrite32 (Port, IoRead32 (Port) & AndData);
@@ -676,9 +676,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);
@@ -708,9 +708,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);
@@ -744,10 +744,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 (
@@ -786,10 +786,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 (
@@ -828,10 +828,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 (
@@ -874,11 +874,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 (
@@ -909,8 +909,8 @@ IoBitFieldAndThenOr32 (
UINT64
EFIAPI
IoOr64 (
IN UINTN Port,
IN UINT64 OrData
IN UINTN Port,
IN UINT64 OrData
)
{
return IoWrite64 (Port, IoRead64 (Port) | OrData);
@@ -938,8 +938,8 @@ IoOr64 (
UINT64
EFIAPI
IoAnd64 (
IN UINTN Port,
IN UINT64 AndData
IN UINTN Port,
IN UINT64 AndData
)
{
return IoWrite64 (Port, IoRead64 (Port) & AndData);
@@ -969,9 +969,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);
@@ -1001,9 +1001,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);
@@ -1037,10 +1037,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 (
@@ -1079,10 +1079,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 (
@@ -1121,10 +1121,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 (
@@ -1167,11 +1167,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 (
@@ -1201,11 +1201,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));
}
/**
@@ -1229,11 +1229,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));
}
/**
@@ -1260,12 +1260,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));
}
/**
@@ -1291,9 +1291,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);
@@ -1325,10 +1325,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 (
@@ -1367,10 +1367,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 (
@@ -1409,10 +1409,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 (
@@ -1454,11 +1454,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 (
@@ -1489,11 +1489,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));
}
/**
@@ -1518,11 +1518,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));
}
/**
@@ -1549,12 +1549,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));
}
/**
@@ -1581,9 +1581,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);
@@ -1616,10 +1616,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 (
@@ -1659,10 +1659,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 (
@@ -1702,10 +1702,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 (
@@ -1748,11 +1748,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 (
@@ -1783,8 +1783,8 @@ MmioBitFieldAndThenOr16 (
UINT32
EFIAPI
MmioOr32 (
IN UINTN Address,
IN UINT32 OrData
IN UINTN Address,
IN UINT32 OrData
)
{
return MmioWrite32 (Address, MmioRead32 (Address) | OrData);
@@ -1812,8 +1812,8 @@ MmioOr32 (
UINT32
EFIAPI
MmioAnd32 (
IN UINTN Address,
IN UINT32 AndData
IN UINTN Address,
IN UINT32 AndData
)
{
return MmioWrite32 (Address, MmioRead32 (Address) & AndData);
@@ -1843,9 +1843,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);
@@ -1875,9 +1875,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);
@@ -1910,10 +1910,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 (
@@ -1953,10 +1953,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 (
@@ -1996,10 +1996,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 (
@@ -2042,11 +2042,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 (
@@ -2077,8 +2077,8 @@ MmioBitFieldAndThenOr32 (
UINT64
EFIAPI
MmioOr64 (
IN UINTN Address,
IN UINT64 OrData
IN UINTN Address,
IN UINT64 OrData
)
{
return MmioWrite64 (Address, MmioRead64 (Address) | OrData);
@@ -2106,8 +2106,8 @@ MmioOr64 (
UINT64
EFIAPI
MmioAnd64 (
IN UINTN Address,
IN UINT64 AndData
IN UINTN Address,
IN UINT64 AndData
)
{
return MmioWrite64 (Address, MmioRead64 (Address) & AndData);
@@ -2137,9 +2137,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);
@@ -2169,9 +2169,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);
@@ -2204,10 +2204,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 (
@@ -2247,10 +2247,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 (
@@ -2290,10 +2290,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 (
@@ -2336,11 +2336,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 (

80
MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
View File

@@ -26,7 +26,7 @@
UINT64
EFIAPI
IoRead64 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -52,15 +52,14 @@ IoRead64 (
UINT64
EFIAPI
IoWrite64 (
IN UINTN Port,
IN UINT64 Value
IN UINTN Port,
IN UINT64 Value
)
{
ASSERT (FALSE);
return 0;
}
/**
Reads an 8-bit MMIO register.
@@ -78,18 +77,19 @@ IoWrite64 (
UINT8
EFIAPI
MmioRead8 (
IN UINTN Address
IN UINTN Address
)
{
UINT8 Value;
BOOLEAN Flag;
UINT8 Value;
BOOLEAN Flag;
Flag = FilterBeforeMmIoRead (FilterWidth8, Address, &Value);
if (Flag) {
MemoryFence ();
Value = *(volatile UINT8*)Address;
Value = *(volatile UINT8 *)Address;
MemoryFence ();
}
FilterAfterMmIoRead (FilterWidth8, Address, &Value);
return Value;
@@ -113,18 +113,19 @@ MmioRead8 (
UINT8
EFIAPI
MmioWrite8 (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
Flag = FilterBeforeMmIoWrite (FilterWidth8, Address, &Value);
if (Flag) {
MemoryFence ();
*(volatile UINT8*)Address = Value;
*(volatile UINT8 *)Address = Value;
MemoryFence ();
}
FilterAfterMmIoWrite (FilterWidth8, Address, &Value);
return Value;
@@ -148,19 +149,20 @@ MmioWrite8 (
UINT16
EFIAPI
MmioRead16 (
IN UINTN Address
IN UINTN Address
)
{
UINT16 Value;
BOOLEAN Flag;
UINT16 Value;
BOOLEAN Flag;
ASSERT ((Address & 1) == 0);
Flag = FilterBeforeMmIoRead (FilterWidth16, Address, &Value);
if (Flag) {
MemoryFence ();
Value = *(volatile UINT16*)Address;
Value = *(volatile UINT16 *)Address;
MemoryFence ();
}
FilterAfterMmIoRead (FilterWidth16, Address, &Value);
return Value;
@@ -185,20 +187,21 @@ MmioRead16 (
UINT16
EFIAPI
MmioWrite16 (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 1) == 0);
Flag = FilterBeforeMmIoWrite (FilterWidth16, Address, &Value);
if (Flag) {
MemoryFence ();
*(volatile UINT16*)Address = Value;
*(volatile UINT16 *)Address = Value;
MemoryFence ();
}
FilterAfterMmIoWrite (FilterWidth16, Address, &Value);
return Value;
@@ -222,20 +225,21 @@ MmioWrite16 (
UINT32
EFIAPI
MmioRead32 (
IN UINTN Address
IN UINTN Address
)
{
UINT32 Value;
BOOLEAN Flag;
UINT32 Value;
BOOLEAN Flag;
ASSERT ((Address & 3) == 0);
Flag = FilterBeforeMmIoRead (FilterWidth32, Address, &Value);
if (Flag) {
MemoryFence ();
Value = *(volatile UINT32*)Address;
Value = *(volatile UINT32 *)Address;
MemoryFence ();
}
FilterAfterMmIoRead (FilterWidth32, Address, &Value);
return Value;
@@ -260,20 +264,21 @@ MmioRead32 (
UINT32
EFIAPI
MmioWrite32 (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 3) == 0);
Flag = FilterBeforeMmIoWrite (FilterWidth32, Address, &Value);
if (Flag) {
MemoryFence ();
*(volatile UINT32*)Address = Value;
*(volatile UINT32 *)Address = Value;
MemoryFence ();
}
FilterAfterMmIoWrite (FilterWidth32, Address, &Value);
return Value;
@@ -297,20 +302,21 @@ MmioWrite32 (
UINT64
EFIAPI
MmioRead64 (
IN UINTN Address
IN UINTN Address
)
{
UINT64 Value;
BOOLEAN Flag;
UINT64 Value;
BOOLEAN Flag;
ASSERT ((Address & 7) == 0);
Flag = FilterBeforeMmIoRead (FilterWidth64, Address, &Value);
if (Flag) {
MemoryFence ();
Value = *(volatile UINT64*)Address;
Value = *(volatile UINT64 *)Address;
MemoryFence ();
}
FilterAfterMmIoRead (FilterWidth64, Address, &Value);
return Value;
@@ -333,22 +339,22 @@ MmioRead64 (
UINT64
EFIAPI
MmioWrite64 (
IN UINTN Address,
IN UINT64 Value
IN UINTN Address,
IN UINT64 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 7) == 0);
Flag = FilterBeforeMmIoWrite (FilterWidth64, Address, &Value);
if (Flag) {
MemoryFence ();
*(volatile UINT64*)Address = Value;
*(volatile UINT64 *)Address = Value;
MemoryFence ();
}
FilterAfterMmIoWrite (FilterWidth64, Address, &Value);
return Value;
}

140
MdePkg/Library/BaseIoLibIntrinsic/IoLibArmVirt.c
View File

@@ -27,7 +27,7 @@
UINT8
EFIAPI
MmioRead8Internal (
IN UINTN Address
IN UINTN Address
);
/**
@@ -44,8 +44,8 @@ MmioRead8Internal (
VOID
EFIAPI
MmioWrite8Internal (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
);
/**
@@ -63,7 +63,7 @@ MmioWrite8Internal (
UINT16
EFIAPI
MmioRead16Internal (
IN UINTN Address
IN UINTN Address
);
/**
@@ -80,8 +80,8 @@ MmioRead16Internal (
VOID
EFIAPI
MmioWrite16Internal (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
);
/**
@@ -99,7 +99,7 @@ MmioWrite16Internal (
UINT32
EFIAPI
MmioRead32Internal (
IN UINTN Address
IN UINTN Address
);
/**
@@ -116,8 +116,8 @@ MmioRead32Internal (
VOID
EFIAPI
MmioWrite32Internal (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
);
/**
@@ -135,7 +135,7 @@ MmioWrite32Internal (
UINT64
EFIAPI
MmioRead64Internal (
IN UINTN Address
IN UINTN Address
);
/**
@@ -152,8 +152,8 @@ MmioRead64Internal (
VOID
EFIAPI
MmioWrite64Internal (
IN UINTN Address,
IN UINT64 Value
IN UINTN Address,
IN UINT64 Value
);
/**
@@ -173,7 +173,7 @@ MmioWrite64Internal (
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -198,8 +198,8 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
ASSERT (FALSE);
@@ -223,7 +223,7 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -248,8 +248,8 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
ASSERT (FALSE);
@@ -273,7 +273,7 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -298,8 +298,8 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
ASSERT (FALSE);
@@ -324,7 +324,7 @@ IoWrite32 (
UINT64
EFIAPI
IoRead64 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -350,8 +350,8 @@ IoRead64 (
UINT64
EFIAPI
IoWrite64 (
IN UINTN Port,
IN UINT64 Value
IN UINTN Port,
IN UINT64 Value
)
{
ASSERT (FALSE);
@@ -378,9 +378,9 @@ IoWrite64 (
VOID
EFIAPI
IoReadFifo8 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -406,9 +406,9 @@ IoReadFifo8 (
VOID
EFIAPI
IoWriteFifo8 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -434,9 +434,9 @@ IoWriteFifo8 (
VOID
EFIAPI
IoReadFifo16 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -462,9 +462,9 @@ IoReadFifo16 (
VOID
EFIAPI
IoWriteFifo16 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -490,9 +490,9 @@ IoWriteFifo16 (
VOID
EFIAPI
IoReadFifo32 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -518,9 +518,9 @@ IoReadFifo32 (
VOID
EFIAPI
IoWriteFifo32 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -543,16 +543,17 @@ IoWriteFifo32 (
UINT8
EFIAPI
MmioRead8 (
IN UINTN Address
IN UINTN Address
)
{
UINT8 Value;
BOOLEAN Flag;
UINT8 Value;
BOOLEAN Flag;
Flag = FilterBeforeMmIoRead (FilterWidth8, Address, &Value);
if (Flag) {
Value = MmioRead8Internal (Address);
}
FilterAfterMmIoRead (FilterWidth8, Address, &Value);
return Value;
@@ -574,16 +575,17 @@ MmioRead8 (
UINT8
EFIAPI
MmioWrite8 (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
Flag = FilterBeforeMmIoWrite (FilterWidth8, Address, &Value);
if (Flag) {
MmioWrite8Internal (Address, Value);
}
FilterAfterMmIoWrite (FilterWidth8, Address, &Value);
return Value;
@@ -606,11 +608,11 @@ MmioWrite8 (
UINT16
EFIAPI
MmioRead16 (
IN UINTN Address
IN UINTN Address
)
{
BOOLEAN Flag;
UINT16 Value;
BOOLEAN Flag;
UINT16 Value;
ASSERT ((Address & 1) == 0);
@@ -618,6 +620,7 @@ MmioRead16 (
if (Flag) {
Value = MmioRead16Internal (Address);
}
FilterAfterMmIoRead (FilterWidth16, Address, &Value);
return Value;
@@ -639,11 +642,11 @@ MmioRead16 (
UINT16
EFIAPI
MmioWrite16 (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 1) == 0);
@@ -651,6 +654,7 @@ MmioWrite16 (
if (Flag) {
MmioWrite16Internal (Address, Value);
}
FilterAfterMmIoWrite (FilterWidth16, Address, &Value);
return Value;
@@ -673,11 +677,11 @@ MmioWrite16 (
UINT32
EFIAPI
MmioRead32 (
IN UINTN Address
IN UINTN Address
)
{
BOOLEAN Flag;
UINT32 Value;
BOOLEAN Flag;
UINT32 Value;
ASSERT ((Address & 3) == 0);
@@ -685,6 +689,7 @@ MmioRead32 (
if (Flag) {
Value = MmioRead32Internal (Address);
}
FilterAfterMmIoRead (FilterWidth32, Address, &Value);
return Value;
@@ -706,11 +711,11 @@ MmioRead32 (
UINT32
EFIAPI
MmioWrite32 (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 3) == 0);
@@ -718,6 +723,7 @@ MmioWrite32 (
if (Flag) {
MmioWrite32Internal (Address, Value);
}
FilterAfterMmIoWrite (FilterWidth32, Address, &Value);
return Value;
@@ -740,11 +746,11 @@ MmioWrite32 (
UINT64
EFIAPI
MmioRead64 (
IN UINTN Address
IN UINTN Address
)
{
BOOLEAN Flag;
UINT64 Value;
BOOLEAN Flag;
UINT64 Value;
ASSERT ((Address & 7) == 0);
@@ -752,6 +758,7 @@ MmioRead64 (
if (Flag) {
Value = MmioRead64Internal (Address);
}
FilterAfterMmIoRead (FilterWidth64, Address, &Value);
return Value;
@@ -773,11 +780,11 @@ MmioRead64 (
UINT64
EFIAPI
MmioWrite64 (
IN UINTN Address,
IN UINT64 Value
IN UINTN Address,
IN UINT64 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 7) == 0);
@@ -785,6 +792,7 @@ MmioWrite64 (
if (Flag) {
MmioWrite64Internal (Address, Value);
}
FilterAfterMmIoWrite (FilterWidth64, Address, &Value);
return Value;

55
MdePkg/Library/BaseIoLibIntrinsic/IoLibEbc.c
View File

@@ -29,7 +29,7 @@
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -54,8 +54,8 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
ASSERT (FALSE);
@@ -80,7 +80,7 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -106,8 +106,8 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
ASSERT (FALSE);
@@ -132,7 +132,7 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -158,8 +158,8 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
ASSERT (FALSE);
@@ -186,9 +186,9 @@ IoWrite32 (
VOID
EFIAPI
IoReadFifo8 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -214,9 +214,9 @@ IoReadFifo8 (
VOID
EFIAPI
IoWriteFifo8 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -242,9 +242,9 @@ IoWriteFifo8 (
VOID
EFIAPI
IoReadFifo16 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -270,9 +270,9 @@ IoReadFifo16 (
VOID
EFIAPI
IoWriteFifo16 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -298,9 +298,9 @@ IoWriteFifo16 (
VOID
EFIAPI
IoReadFifo32 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -326,11 +326,10 @@ IoReadFifo32 (
VOID
EFIAPI
IoWriteFifo32 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
}

41
MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
View File

@@ -15,7 +15,6 @@
**/
#include "BaseIoLibIntrinsicInternal.h"
/**
@@ -35,16 +34,17 @@
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
UINT8 Data;
BOOLEAN Flag;
UINT8 Data;
BOOLEAN Flag;
Flag = FilterBeforeIoRead (FilterWidth8, Port, &Data);
if (Flag) {
__asm__ __volatile__ ("inb %w1,%b0" : "=a" (Data) : "d" ((UINT16)Port));
}
FilterAfterIoRead (FilterWidth8, Port, &Data);
return Data;
@@ -68,19 +68,20 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
Flag = FilterBeforeIoWrite (FilterWidth8, Port, &Value);
if (Flag) {
__asm__ __volatile__ ("outb %b0,%w1" : : "a" (Value), "d" ((UINT16)Port));
}
FilterAfterIoWrite (FilterWidth8, Port, &Value);
return Value;;
return Value;
}
/**
@@ -101,7 +102,7 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
UINT16 Data;
@@ -111,8 +112,9 @@ IoRead16 (
Flag = FilterBeforeIoRead (FilterWidth16, Port, &Data);
if (Flag) {
__asm__ __volatile__ ("inw %w1,%w0" : "=a" (Data) : "d" ((UINT16)Port));
__asm__ __volatile__ ("inw %w1,%w0" : "=a" (Data) : "d" ((UINT16)Port));
}
FilterAfterIoRead (FilterWidth16, Port, &Data);
return Data;
@@ -137,12 +139,11 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Port & 1) == 0);
@@ -150,9 +151,10 @@ IoWrite16 (
if (Flag) {
__asm__ __volatile__ ("outw %w0,%w1" : : "a" (Value), "d" ((UINT16)Port));
}
FilterAfterIoWrite (FilterWidth16, Port, &Value);
return Value;;
return Value;
}
/**
@@ -173,7 +175,7 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
UINT32 Data;
@@ -185,6 +187,7 @@ IoRead32 (
if (Flag) {
__asm__ __volatile__ ("inl %w1,%0" : "=a" (Data) : "d" ((UINT16)Port));
}
FilterAfterIoRead (FilterWidth32, Port, &Data);
return Data;
@@ -209,8 +212,8 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
BOOLEAN Flag;
@@ -221,8 +224,8 @@ IoWrite32 (
if (Flag) {
__asm__ __volatile__ ("outl %0,%w1" : : "a" (Value), "d" ((UINT16)Port));
}
FilterAfterIoWrite (FilterWidth32, Port, &Value);
return Value;
}

124
MdePkg/Library/BaseIoLibIntrinsic/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;
@@ -73,27 +73,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;
@@ -124,27 +124,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;
@@ -175,33 +175,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 the MMIO region by using 8-bit access.
@@ -223,24 +222,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;
}
/**
@@ -269,34 +267,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 the MMIO region by using 32-bit access.
@@ -323,28 +320,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;
@@ -376,30 +373,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;
}

96
MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
View File

@@ -13,21 +13,49 @@
**/
#include "BaseIoLibIntrinsicInternal.h"
//
// Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics.
//
int _inp (unsigned short port);
unsigned short _inpw (unsigned short port);
unsigned long _inpd (unsigned short port);
int _outp (unsigned short port, int databyte );
unsigned short _outpw (unsigned short port, unsigned short dataword );
unsigned long _outpd (unsigned short port, unsigned long dataword );
void _ReadWriteBarrier (void);
int
_inp (
unsigned short port
);
unsigned short
_inpw (
unsigned short port
);
unsigned long
_inpd (
unsigned short port
);
int
_outp (
unsigned short port,
int databyte
);
unsigned short
_outpw (
unsigned short port,
unsigned short dataword
);
unsigned long
_outpd (
unsigned short port,
unsigned long dataword
);
void
_ReadWriteBarrier (
void
);
#pragma intrinsic(_inp)
#pragma intrinsic(_inpw)
@@ -62,11 +90,11 @@ void _ReadWriteBarrier (void);
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
UINT8 Value;
BOOLEAN Flag;
UINT8 Value;
BOOLEAN Flag;
Flag = FilterBeforeIoRead (FilterWidth8, Port, &Value);
if (Flag) {
@@ -74,6 +102,7 @@ IoRead8 (
Value = (UINT8)_inp ((UINT16)Port);
_ReadWriteBarrier ();
}
FilterAfterIoRead (FilterWidth8, Port, &Value);
return Value;
@@ -97,18 +126,19 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
Flag = FilterBeforeIoWrite(FilterWidth8, Port, &Value);
Flag = FilterBeforeIoWrite (FilterWidth8, Port, &Value);
if (Flag) {
_ReadWriteBarrier ();
(UINT8)_outp ((UINT16)Port, Value);
_ReadWriteBarrier ();
}
FilterAfterIoWrite (FilterWidth8, Port, &Value);
return Value;
@@ -132,11 +162,11 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
UINT16 Value;
BOOLEAN Flag;
UINT16 Value;
BOOLEAN Flag;
ASSERT ((Port & 1) == 0);
@@ -146,6 +176,7 @@ IoRead16 (
Value = _inpw ((UINT16)Port);
_ReadWriteBarrier ();
}
FilterBeforeIoRead (FilterWidth16, Port, &Value);
return Value;
@@ -170,20 +201,21 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Port & 1) == 0);
Flag = FilterBeforeIoWrite(FilterWidth16, Port, &Value);
Flag = FilterBeforeIoWrite (FilterWidth16, Port, &Value);
if (Flag) {
_ReadWriteBarrier ();
_outpw ((UINT16)Port, Value);
_ReadWriteBarrier ();
}
FilterAfterIoWrite (FilterWidth16, Port, &Value);
return Value;
@@ -207,20 +239,21 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
UINT32 Value;
BOOLEAN Flag;
UINT32 Value;
BOOLEAN Flag;
ASSERT ((Port & 3) == 0);
Flag = FilterBeforeIoRead(FilterWidth32, Port, &Value);
Flag = FilterBeforeIoRead (FilterWidth32, Port, &Value);
if (Flag) {
_ReadWriteBarrier ();
Value = _inpd ((UINT16)Port);
_ReadWriteBarrier ();
}
FilterAfterIoRead (FilterWidth32, Port, &Value);
return Value;
@@ -245,20 +278,21 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Port & 3) == 0);
Flag = FilterBeforeIoWrite(FilterWidth32, Port, &Value);
Flag = FilterBeforeIoWrite (FilterWidth32, Port, &Value);
if (Flag) {
_ReadWriteBarrier ();
_outpd ((UINT16)Port, Value);
_ReadWriteBarrier ();
}
FilterAfterIoWrite (FilterWidth32, Port, &Value);
return Value;

134
MdePkg/Library/BaseIoLibIntrinsic/IoLibNoIo.c
View File

@@ -11,7 +11,6 @@
**/
//
// Include common header file for this module.
//
@@ -34,7 +33,7 @@
UINT8
EFIAPI
IoRead8 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -59,8 +58,8 @@ IoRead8 (
UINT8
EFIAPI
IoWrite8 (
IN UINTN Port,
IN UINT8 Value
IN UINTN Port,
IN UINT8 Value
)
{
ASSERT (FALSE);
@@ -84,7 +83,7 @@ IoWrite8 (
UINT16
EFIAPI
IoRead16 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -109,8 +108,8 @@ IoRead16 (
UINT16
EFIAPI
IoWrite16 (
IN UINTN Port,
IN UINT16 Value
IN UINTN Port,
IN UINT16 Value
)
{
ASSERT (FALSE);
@@ -134,7 +133,7 @@ IoWrite16 (
UINT32
EFIAPI
IoRead32 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -159,8 +158,8 @@ IoRead32 (
UINT32
EFIAPI
IoWrite32 (
IN UINTN Port,
IN UINT32 Value
IN UINTN Port,
IN UINT32 Value
)
{
ASSERT (FALSE);
@@ -185,7 +184,7 @@ IoWrite32 (
UINT64
EFIAPI
IoRead64 (
IN UINTN Port
IN UINTN Port
)
{
ASSERT (FALSE);
@@ -211,8 +210,8 @@ IoRead64 (
UINT64
EFIAPI
IoWrite64 (
IN UINTN Port,
IN UINT64 Value
IN UINTN Port,
IN UINT64 Value
)
{
ASSERT (FALSE);
@@ -239,9 +238,9 @@ IoWrite64 (
VOID
EFIAPI
IoReadFifo8 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -267,9 +266,9 @@ IoReadFifo8 (
VOID
EFIAPI
IoWriteFifo8 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -295,9 +294,9 @@ IoWriteFifo8 (
VOID
EFIAPI
IoReadFifo16 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -323,9 +322,9 @@ IoReadFifo16 (
VOID
EFIAPI
IoWriteFifo16 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -351,9 +350,9 @@ IoWriteFifo16 (
VOID
EFIAPI
IoReadFifo32 (
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
IN UINTN Port,
IN UINTN Count,
OUT VOID *Buffer
)
{
ASSERT (FALSE);
@@ -379,9 +378,9 @@ IoReadFifo32 (
VOID
EFIAPI
IoWriteFifo32 (
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
IN UINTN Port,
IN UINTN Count,
IN VOID *Buffer
)
{
ASSERT (FALSE);
@@ -404,16 +403,17 @@ IoWriteFifo32 (
UINT8
EFIAPI
MmioRead8 (
IN UINTN Address
IN UINTN Address
)
{
UINT8 Value;
BOOLEAN Flag;
UINT8 Value;
BOOLEAN Flag;
Flag = FilterBeforeMmIoRead (FilterWidth8, Address, &Value);
if (Flag) {
Value = *(volatile UINT8*)Address;
Value = *(volatile UINT8 *)Address;
}
FilterAfterMmIoRead (FilterWidth8, Address, &Value);
return Value;
@@ -435,16 +435,17 @@ MmioRead8 (
UINT8
EFIAPI
MmioWrite8 (
IN UINTN Address,
IN UINT8 Value
IN UINTN Address,
IN UINT8 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
Flag = FilterBeforeMmIoWrite (FilterWidth8, Address, &Value);
if (Flag) {
*(volatile UINT8*)Address = Value;
*(volatile UINT8 *)Address = Value;
}
FilterAfterMmIoWrite (FilterWidth8, Address, &Value);
return Value;
@@ -467,18 +468,19 @@ MmioWrite8 (
UINT16
EFIAPI
MmioRead16 (
IN UINTN Address
IN UINTN Address
)
{
UINT16 Value;
BOOLEAN Flag;
UINT16 Value;
BOOLEAN Flag;
ASSERT ((Address & 1) == 0);
Flag = FilterBeforeMmIoRead (FilterWidth16, Address, &Value);
if (Flag) {
Value = *(volatile UINT16*)Address;
Value = *(volatile UINT16 *)Address;
}
FilterAfterMmIoRead (FilterWidth16, Address, &Value);
return Value;
@@ -500,18 +502,19 @@ MmioRead16 (
UINT16
EFIAPI
MmioWrite16 (
IN UINTN Address,
IN UINT16 Value
IN UINTN Address,
IN UINT16 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 1) == 0);
Flag = FilterBeforeMmIoWrite (FilterWidth16, Address, &Value);
if (Flag) {
*(volatile UINT16*)Address = Value;
*(volatile UINT16 *)Address = Value;
}
FilterAfterMmIoWrite (FilterWidth16, Address, &Value);
return Value;
@@ -534,18 +537,19 @@ MmioWrite16 (
UINT32
EFIAPI
MmioRead32 (
IN UINTN Address
IN UINTN Address
)
{
UINT32 Value;
BOOLEAN Flag;
UINT32 Value;
BOOLEAN Flag;
ASSERT ((Address & 3) == 0);
Flag = FilterBeforeMmIoRead (FilterWidth32, Address, &Value);
if (Flag) {
Value = *(volatile UINT32*)Address;
Value = *(volatile UINT32 *)Address;
}
FilterAfterMmIoRead (FilterWidth32, Address, &Value);
return Value;
@@ -567,18 +571,19 @@ MmioRead32 (
UINT32
EFIAPI
MmioWrite32 (
IN UINTN Address,
IN UINT32 Value
IN UINTN Address,
IN UINT32 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 3) == 0);
Flag = FilterBeforeMmIoWrite (FilterWidth32, Address, &Value);
if (Flag) {
*(volatile UINT32*)Address = Value;
*(volatile UINT32 *)Address = Value;
}
FilterAfterMmIoWrite (FilterWidth32, Address, &Value);
return Value;
@@ -601,18 +606,19 @@ MmioWrite32 (
UINT64
EFIAPI
MmioRead64 (
IN UINTN Address
IN UINTN Address
)
{
UINT64 Value;
BOOLEAN Flag;
UINT64 Value;
BOOLEAN Flag;
ASSERT ((Address & 7) == 0);
Flag = FilterBeforeMmIoRead (FilterWidth64, Address, &Value);
if (Flag) {
Value = *(volatile UINT64*)Address;
Value = *(volatile UINT64 *)Address;
}
FilterAfterMmIoRead (FilterWidth64, Address, &Value);
return Value;
@@ -634,20 +640,20 @@ MmioRead64 (
UINT64
EFIAPI
MmioWrite64 (
IN UINTN Address,
IN UINT64 Value
IN UINTN Address,
IN UINT64 Value
)
{
BOOLEAN Flag;
BOOLEAN Flag;
ASSERT ((Address & 7) == 0);
Flag = FilterBeforeMmIoWrite (FilterWidth64, Address, &Value);
if (Flag) {
*(volatile UINT64*)Address = Value;
*(volatile UINT64 *)Address = Value;
}
FilterAfterMmIoWrite (FilterWidth64, Address, &Value);
return Value;
}