3 files changed, 10 insertions, 12 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index e4715383ea..6f1cd1b8b1 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -1,7 +1,7 @@
 /** @file
   The implementation for EFI_ISA_IO_PROTOCOL. 
   
-Copyright (c) 2006 - 2011, 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
@@ -439,8 +439,7 @@ IsaIoVerifyAccess (
   EFI_ISA_ACPI_RESOURCE *Item;
   EFI_STATUS            Status;
 
-  if (Width < EfiIsaIoWidthUint8 ||
-      Width >= EfiIsaIoWidthMaximum ||
+  if ((UINT32)Width >= EfiIsaIoWidthMaximum ||
       Width == EfiIsaIoWidthReserved ||
       Width == EfiIsaIoWidthFifoReserved ||
       Width == EfiIsaIoWidthFillReserved
@@ -1000,7 +999,7 @@ IsaIoMapFullSupport (
   //
   // Make sure the Operation parameter is valid
   //
-  if (Operation < 0 || Operation >= EfiIsaIoOperationMaximum) {
+  if ((UINT32)Operation >= EfiIsaIoOperationMaximum) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -1378,7 +1377,7 @@ IsaIoAllocateBuffer (
     return EFI_INVALID_PARAMETER;
   }
 
-  if (Type < AllocateAnyPages || Type >= MaxAllocateType) {
+  if ((UINT32)Type >= MaxAllocateType) {
     return EFI_INVALID_PARAMETER;
   }
   //
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c
index ab2a9a5f92..2e4361fc0d 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIo.c
@@ -1,7 +1,7 @@
 /** @file
   The implementation for EFI_ISA_IO_PROTOCOL. 
   
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 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
@@ -105,8 +105,7 @@ IsaIoVerifyAccess (
   EFI_ISA_ACPI_RESOURCE *Item;
   EFI_STATUS            Status;
 
-  if (Width < EfiIsaIoWidthUint8 ||
-      Width >= EfiIsaIoWidthMaximum ||
+  if ((UINT32)Width >= EfiIsaIoWidthMaximum ||
       Width == EfiIsaIoWidthReserved ||
       Width == EfiIsaIoWidthFifoReserved ||
       Width == EfiIsaIoWidthFillReserved
@@ -1340,7 +1339,7 @@ IsaIoMapFullSupport (
   //
   // Make sure the Operation parameter is valid
   //
-  if (Operation < 0 || Operation >= EfiIsaIoOperationMaximum) {
+  if ((UINT32)Operation >= EfiIsaIoOperationMaximum) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -1718,7 +1717,7 @@ IsaIoAllocateBuffer (
     return EFI_INVALID_PARAMETER;
   }
 
-  if (Type < AllocateAnyPages || Type >= MaxAllocateType) {
+  if ((UINT32)Type >= MaxAllocateType) {
     return EFI_INVALID_PARAMETER;
   }
   //
diff --git a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
index 3865a7cfe0..e48b6382ff 100644
--- a/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
+++ b/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIo.c
@@ -1,7 +1,7 @@
 /** @file
   Uses the services of the I/O Library to produce the CPU I/O Protocol
 
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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        
@@ -116,7 +116,7 @@ CpuIoCheckParameter (
   //
   // Check to see if Width is in the valid range
   //
-  if (Width < 0 || Width >= EfiCpuIoWidthMaximum) {
+  if ((UINT32)Width >= EfiCpuIoWidthMaximum) {
     return EFI_INVALID_PARAMETER;
   }