DuetPkg, MdeModulePkg: Fix several enum comparions

These comparisons were not comparing an enum variable
with a member of the same enum type.

GCC 4.5 generated a warning for these comparison
operations.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10932 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
index 8e7c8151720b328cebf14f6cfa08aa56f5ea6ecd..61b0870b1afdad960b734c477ede30a3fcd7720e 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
@@ -366,7 +366,7 @@ Returns:
   // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX\r
   // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX\r
   //\r
   // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX\r
   // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX\r
   //\r

-  if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) {\r
+  if (Width >= EfiPciIoWidthFifoUint8 && Width <= EfiPciIoWidthFifoUint64) {\r

     Count = 1;\r
   }\r
 \r
     Count = 1;\r
   }\r
 \r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index 25f85ae0ddcebf458cdc98401021dcfa0c449e3e..7395ce2d8b45c9ea3e2a0e87598740367ed5d9f6 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -114,11 +114,11 @@ PcatRootBridgeIoPciRW (
 \r
   InStride    = 1 << (Width & 0x03);\r
   OutStride   = InStride;\r
 \r
   InStride    = 1 << (Width & 0x03);\r
   OutStride   = InStride;\r

-  if (Width >= EfiCpuIoWidthFifoUint8 && Width <= EfiCpuIoWidthFifoUint64) {\r
+  if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) {\r

     InStride = 0;\r
   }\r
 \r
     InStride = 0;\r
   }\r
 \r

-  if (Width >= EfiCpuIoWidthFillUint8 && Width <= EfiCpuIoWidthFillUint64) {\r
+  if (Width >= EfiPciWidthFillUint8 && Width <= EfiPciWidthFillUint64) {\r

     OutStride = 0;\r
   }\r
 \r
     OutStride = 0;\r
   }\r
 \r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
index 56da796a4339b7f7f12ce82e6559d49b228ab78c..6390df6c85cdb5278db01aad9e30075158a55f82 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
@@ -112,11 +112,11 @@ PcatRootBridgeIoPciRW (
 \r
   InStride    = 1 << (Width & 0x03);\r
   OutStride   = InStride;\r
 \r
   InStride    = 1 << (Width & 0x03);\r
   OutStride   = InStride;\r

-  if (Width >= EfiCpuIoWidthFifoUint8 && Width <= EfiCpuIoWidthFifoUint64) {\r
+  if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) {\r

     InStride = 0;\r
   }\r
 \r
     InStride = 0;\r
   }\r
 \r

-  if (Width >= EfiCpuIoWidthFillUint8 && Width <= EfiCpuIoWidthFillUint64) {\r
+  if (Width >= EfiPciWidthFillUint8 && Width <= EfiPciWidthFillUint64) {\r

     OutStride = 0;\r
   }\r
 \r
     OutStride = 0;\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index 0969407831d85fd48414dd542235fbea3cb0787e..310cedad049c9d9e6497ff64bba7aec5d05b0bcc 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
@@ -128,7 +128,7 @@ PciIoVerifyBarAccess (
   // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX\r
   // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX\r
   //\r
   // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX\r
   // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX\r
   //\r

-  if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) {\r
+  if (Width >= EfiPciIoWidthFifoUint8 && Width <= EfiPciIoWidthFifoUint64) {\r

     Count = 1;\r
   }\r
 \r
     Count = 1;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index a9d63d3dc4ed25050c01a84444d040e40f45d826..6a09de5bd05fcb674aa5605852b904cc03bc8e74 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -535,7 +535,7 @@ ConSplitterUgaDrawBlt (
                               );\r
       if (EFI_ERROR (Status)) {\r
         ReturnStatus = Status;\r
                               );\r
       if (EFI_ERROR (Status)) {\r
         ReturnStatus = Status;\r

-      } else if (BltOperation == EfiBltVideoToBltBuffer) {\r
+      } else if (BltOperation == EfiUgaVideoToBltBuffer) {\r

         //\r
         // Only need to read the data into buffer one time\r
         //\r
         //\r
         // Only need to read the data into buffer one time\r
         //\r