tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ICC build break 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9767 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2010-01-15 02:11:58 +00:00
parent 1096a48f72
commit 6b9ddb4226
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
View File

@ -183,13 +183,13 @@ CpuIoCheckParameter (
// //
// Check to see if Width is in the valid range for I/O Port operations // Check to see if Width is in the valid range for I/O Port operations
// //
Width = Width & 0x03; Width = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
if (!MmioOperation && (Width == EfiCpuIoWidthUint64)) { if (!MmioOperation && (Width == EfiCpuIoWidthUint64)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
// //
// Check to see if Address is alligned // Check to see if Address is aligned
// //
if ((Address & (UINT64)(mInStride[Width] - 1)) != 0) { if ((Address & (UINT64)(mInStride[Width] - 1)) != 0) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
@ -205,9 +205,9 @@ CpuIoCheckParameter (
// //
// Since MAX_ADDRESS can be the maximum integer value supported by the CPU and Count // Since MAX_ADDRESS can be the maximum integer value supported by the CPU and Count
// can also be the maximum integer value supported by the CPU, this range // can also be the maximum integer value supported by the CPU, this range
// check must be adjusted to avoid all oveflow conditions. // check must be adjusted to avoid all overflow conditions.
// //
// The follwing form of the range check is equivalent but assumes that // The following form of the range check is equivalent but assumes that
// MAX_ADDRESS and MAX_IO_PORT_ADDRESS are of the form (2^n - 1). // MAX_ADDRESS and MAX_IO_PORT_ADDRESS are of the form (2^n - 1).
// //
Limit = (MmioOperation ? MAX_ADDRESS : MAX_IO_PORT_ADDRESS); Limit = (MmioOperation ? MAX_ADDRESS : MAX_IO_PORT_ADDRESS);
@ -226,7 +226,7 @@ CpuIoCheckParameter (
} }
// //
// Check to see if Buffer is alligned // Check to see if Buffer is aligned
// //
if (((UINTN)Buffer & (mInStride[Width] - 1)) != 0) { if (((UINTN)Buffer & (mInStride[Width] - 1)) != 0) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
@ -300,7 +300,7 @@ CpuMemoryServiceRead (
// //
InStride = mInStride[Width]; InStride = mInStride[Width];
OutStride = mOutStride[Width]; OutStride = mOutStride[Width];
OperationWidth = Width & 0x03; OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) { for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
if (OperationWidth == EfiCpuIoWidthUint8) { if (OperationWidth == EfiCpuIoWidthUint8) {
*Uint8Buffer = MmioRead8 ((UINTN)Address); *Uint8Buffer = MmioRead8 ((UINTN)Address);
@ -380,7 +380,7 @@ CpuMemoryServiceWrite (
// //
InStride = mInStride[Width]; InStride = mInStride[Width];
OutStride = mOutStride[Width]; OutStride = mOutStride[Width];
OperationWidth = Width & 0x03; OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) { for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
if (OperationWidth == EfiCpuIoWidthUint8) { if (OperationWidth == EfiCpuIoWidthUint8) {
MmioWrite8 ((UINTN)Address, *Uint8Buffer); MmioWrite8 ((UINTN)Address, *Uint8Buffer);
@ -460,7 +460,7 @@ CpuIoServiceRead (
// //
InStride = mInStride[Width]; InStride = mInStride[Width];
OutStride = mOutStride[Width]; OutStride = mOutStride[Width];
OperationWidth = Width & 0x03; OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) { for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
if (OperationWidth == EfiCpuIoWidthUint8) { if (OperationWidth == EfiCpuIoWidthUint8) {
*Uint8Buffer = IoRead8 ((UINTN)Address); *Uint8Buffer = IoRead8 ((UINTN)Address);
@ -542,7 +542,7 @@ CpuIoServiceWrite (
// //
InStride = mInStride[Width]; InStride = mInStride[Width];
OutStride = mOutStride[Width]; OutStride = mOutStride[Width];
OperationWidth = Width & 0x03; OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) { for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
if (OperationWidth == EfiCpuIoWidthUint8) { if (OperationWidth == EfiCpuIoWidthUint8) {
IoWrite8 ((UINTN)Address, *Uint8Buffer); IoWrite8 ((UINTN)Address, *Uint8Buffer);