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

Fix comparisons of enumerated types which may cause warnings for some compilers.

Browse Source 
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:
rsun3
2012-08-28 06:48:28 +00:00
parent 055c829c42
commit 3d78c020d2
24 changed files with 92 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DuetPkg/PciBusNoEnumerationDxe/PciIo.c
View File

@@ -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
@@ -343,7 +343,7 @@ Returns:
--*/
{
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -404,7 +404,7 @@ Returns:
{
UINT64 ExtendOffset;
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -465,7 +465,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -521,7 +521,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width > EfiPciIoWidthUint64) {
if ((UINT32)Width > EfiPciIoWidthUint64) {
return EFI_INVALID_PARAMETER;
}
@@ -576,7 +576,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -629,7 +629,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -682,7 +682,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -735,7 +735,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -877,7 +877,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Width < 0 || Width >= EfiPciIoWidthMaximum) {
if ((UINT32)Width >= EfiPciIoWidthMaximum) {
return EFI_INVALID_PARAMETER;
}
@@ -942,7 +942,7 @@ Returns:
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (This);
if (Operation < 0 || Operation >= EfiPciIoOperationMaximum) {
if ((UINT32)Operation >= EfiPciIoOperationMaximum) {
return EFI_INVALID_PARAMETER;
}

10
DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.c
View File

@@ -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;
}

2
DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
View File

@@ -102,7 +102,7 @@ PcatRootBridgeIoPciRW (
UINT64 PciExpressRegAddr;
BOOLEAN UsePciExpressAccess;
if (Width < 0 || Width >= EfiPciWidthMaximum) {
if ((UINT32)Width >= EfiPciWidthMaximum) {
return EFI_INVALID_PARAMETER;
}

4
DuetPkg/PciRootBridgeNoEnumerationDxe/Ipf/PcatIo.c
View File

@@ -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;
}

14
DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
View File

@@ -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;
}

2
DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
View File

@@ -102,7 +102,7 @@ PcatRootBridgeIoPciRW (
UINT64 PciExpressRegAddr;
BOOLEAN UsePciExpressAccess;
if (Width < 0 || Width >= EfiPciWidthMaximum) {
if ((UINT32)Width >= EfiPciWidthMaximum) {
return EFI_INVALID_PARAMETER;
}