Fix comparisons of enumerated types which may cause warnings for some compilers.
Signed-off-by: Sun Rui <rui.sun@intel.com> Reviewed-by: Gao Liming <liming.gao@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13686 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -363,7 +363,7 @@ Returns:
|
||||
|
||||
Private = DEVICE_IO_PRIVATE_DATA_FROM_THIS (This);
|
||||
|
||||
if (Width < 0 || Width >= MMIO_COPY_UINT8) {
|
||||
if ((UINT32)Width >= MMIO_COPY_UINT8) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
@@ -415,7 +415,7 @@ Returns:
|
||||
|
||||
Private = DEVICE_IO_PRIVATE_DATA_FROM_THIS (This);
|
||||
|
||||
if (Width < 0 || Width >= MMIO_COPY_UINT8) {
|
||||
if ((UINT32)Width >= MMIO_COPY_UINT8) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
@@ -648,7 +648,7 @@ Returns:
|
||||
|
||||
Private = DEVICE_IO_PRIVATE_DATA_FROM_THIS (This);
|
||||
|
||||
if (Operation < 0 || Operation > EfiBusMasterCommonBuffer) {
|
||||
if ((UINT32)Operation > EfiBusMasterCommonBuffer) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
@@ -748,7 +748,7 @@ Returns:
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
if ((Type >= MaxAllocateType) || (Type < AllocateAnyPages)) {
|
||||
if ((UINT32)Type >= MaxAllocateType) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
@@ -102,7 +102,7 @@ PcatRootBridgeIoPciRW (
|
||||
UINT64 PciExpressRegAddr;
|
||||
BOOLEAN UsePciExpressAccess;
|
||||
|
||||
if (Width < 0 || Width >= EfiPciWidthMaximum) {
|
||||
if ((UINT32)Width >= EfiPciWidthMaximum) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -81,7 +81,7 @@ PcatRootBridgeIoIoRead (
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
if (Width < 0 || Width >= EfiPciWidthMaximum) {
|
||||
if ((UINT32)Width >= EfiPciWidthMaximum) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -256,7 +256,7 @@ PcatRootBridgeIoPollMem (
|
||||
}
|
||||
|
||||
|
||||
if (Width < 0 || Width > EfiPciWidthUint64) {
|
||||
if ((UINT32)Width > EfiPciWidthUint64) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
//
|
||||
@@ -319,7 +319,7 @@ PcatRootBridgeIoPollIo (
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
if (Width < 0 || Width > EfiPciWidthUint64) {
|
||||
if ((UINT32)Width > EfiPciWidthUint64) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
//
|
||||
@@ -412,7 +412,7 @@ PcatRootBridgeIoMemRead (
|
||||
|
||||
In.buf = Buffer;
|
||||
Out.buf = (VOID *)(UINTN) Address;
|
||||
if (Width >= EfiPciWidthUint8 && Width <= EfiPciWidthUint64) {
|
||||
if ((UINT32)Width <= EfiPciWidthUint64) {
|
||||
return PcatRootBridgeIoMemRW (Width, Count, TRUE, In, TRUE, Out);
|
||||
}
|
||||
if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) {
|
||||
@@ -459,7 +459,7 @@ PcatRootBridgeIoMemWrite (
|
||||
|
||||
In.buf = (VOID *)(UINTN) Address;
|
||||
Out.buf = Buffer;
|
||||
if (Width >= EfiPciWidthUint8 && Width <= EfiPciWidthUint64) {
|
||||
if ((UINT32)Width <= EfiPciWidthUint64) {
|
||||
return PcatRootBridgeIoMemRW (Width, Count, TRUE, In, TRUE, Out);
|
||||
}
|
||||
if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) {
|
||||
@@ -489,7 +489,7 @@ PcatRootBridgeIoCopyMem (
|
||||
UINTN Index;
|
||||
UINT64 Result;
|
||||
|
||||
if (Width < 0 || Width > EfiPciWidthUint64) {
|
||||
if ((UINT32)Width > EfiPciWidthUint64) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
@@ -609,7 +609,7 @@ PcatRootBridgeIoMap (
|
||||
//
|
||||
// Make sure that Operation is valid
|
||||
//
|
||||
if (Operation < 0 || Operation >= EfiPciOperationMaximum) {
|
||||
if ((UINT32)Operation >= EfiPciOperationMaximum) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
@@ -102,7 +102,7 @@ PcatRootBridgeIoPciRW (
|
||||
UINT64 PciExpressRegAddr;
|
||||
BOOLEAN UsePciExpressAccess;
|
||||
|
||||
if (Width < 0 || Width >= EfiPciWidthMaximum) {
|
||||
if ((UINT32)Width >= EfiPciWidthMaximum) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user