From 3d78c020d22023d35d27b48817d73ff31a361ac7 Mon Sep 17 00:00:00 2001
From: rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 28 Aug 2012 06:48:28 +0000
Subject: 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
---
 PcAtChipsetPkg/8259InterruptControllerDxe/8259.c  | 10 +++++-----
 PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c   |  4 ++--
 PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'PcAtChipsetPkg')

diff --git a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
index 5a862d13b8..447106afe9 100644
--- a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
+++ b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.c
@@ -1,7 +1,7 @@
 /** @file
   This contains the installation function for the driver.
 
-Copyright (c) 2005 - 2011, 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
@@ -413,7 +413,7 @@ Interrupt8259GetVector (
   OUT UINT8                     *Vector
   )
 {
-  if (Irq < Efi8259Irq0 || Irq > Efi8259Irq15) {
+  if ((UINT32)Irq > Efi8259Irq15) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -445,7 +445,7 @@ Interrupt8259EnableIrq (
   IN BOOLEAN                   LevelTriggered
   )
 {
-  if (Irq < Efi8259Irq0 || Irq > Efi8259Irq15) {
+  if ((UINT32)Irq > Efi8259Irq15) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -478,7 +478,7 @@ Interrupt8259DisableIrq (
   IN EFI_8259_IRQ              Irq
   )
 {
-  if (Irq < Efi8259Irq0 || Irq > Efi8259Irq15) {
+  if ((UINT32)Irq > Efi8259Irq15) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -555,7 +555,7 @@ Interrupt8259EndOfInterrupt (
   IN EFI_8259_IRQ              Irq
   )
 {
-  if (Irq < Efi8259Irq0 || Irq > Efi8259Irq15) {
+  if ((UINT32)Irq > Efi8259Irq15) {
     return EFI_INVALID_PARAMETER;
   }
 
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
index a6c1d130ab..994bfeb604 100644
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
@@ -1,7 +1,7 @@
 /** @file
   Provides the basic interfaces to abstract a PCI Host Bridge Resource Allocation
 
-Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2008 - 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
@@ -1180,7 +1180,7 @@ PreprocessController (
     return EFI_INVALID_PARAMETER;
   }
 
-  if (Phase < EfiPciBeforeChildBusEnumeration || Phase > EfiPciBeforeResourceCollection) {
+  if ((UINT32)Phase > EfiPciBeforeResourceCollection) {
     return EFI_INVALID_PARAMETER;
   }
 
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c b/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
index b4da52eefe..7946324d9f 100644
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -1,7 +1,7 @@
 /** @file
   PCI Root Bridge Io Protocol implementation
 
-Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2008 - 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
@@ -770,7 +770,7 @@ RootBridgeIoCheckParameter (
   //
   // Check to see if Width is in the valid range
   //
-  if (Width < EfiPciWidthUint8 || Width >= EfiPciWidthMaximum) {
+  if ((UINT32)Width >= EfiPciWidthMaximum) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -1233,7 +1233,7 @@ RootBridgeIoPollMem (
     return EFI_INVALID_PARAMETER;
   }
 
-  if (Width < 0 || Width > EfiPciWidthUint64) {
+  if ((UINT32)Width > EfiPciWidthUint64) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -1340,7 +1340,7 @@ RootBridgeIoPollIo (
     return EFI_INVALID_PARAMETER;
   }
 
-  if (Width < 0 || Width > EfiPciWidthUint64) {
+  if ((UINT32)Width > EfiPciWidthUint64) {
     return EFI_INVALID_PARAMETER;
   }
   
@@ -1561,7 +1561,7 @@ RootBridgeIoCopyMem (
   UINTN       Index;
   UINT64      Result;
 
-  if (Width < 0 || Width > EfiPciWidthUint64) {
+  if ((UINT32)Width > EfiPciWidthUint64) {
     return EFI_INVALID_PARAMETER;
   }    
 
@@ -1735,7 +1735,7 @@ RootBridgeIoMap (
   //
   // Make sure that Operation is valid
   //
-  if (Operation < 0 || Operation >= EfiPciOperationMaximum) {
+  if ((UINT32)Operation >= EfiPciOperationMaximum) {
     return EFI_INVALID_PARAMETER;
   }
 
-- 
cgit v1.2.3