From 815119f3d95581317847a5288b20c7426c0f45a6 Mon Sep 17 00:00:00 2001 From: jljusten Date: Wed, 13 Oct 2010 07:08:29 +0000 Subject: [PATCH] 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 --- DuetPkg/PciBusNoEnumerationDxe/PciIo.c | 2 +- DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c | 4 ++-- DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c | 4 ++-- MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 2 +- .../Universal/Console/ConSplitterDxe/ConSplitterGraphics.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c index 8e7c815172..61b0870b1a 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c +++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c @@ -366,7 +366,7 @@ Returns: // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX // - if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) { + if (Width >= EfiPciIoWidthFifoUint8 && Width <= EfiPciIoWidthFifoUint64) { Count = 1; } diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c index 25f85ae0dd..7395ce2d8b 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c @@ -114,11 +114,11 @@ PcatRootBridgeIoPciRW ( InStride = 1 << (Width & 0x03); OutStride = InStride; - if (Width >= EfiCpuIoWidthFifoUint8 && Width <= EfiCpuIoWidthFifoUint64) { + if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) { InStride = 0; } - if (Width >= EfiCpuIoWidthFillUint8 && Width <= EfiCpuIoWidthFillUint64) { + if (Width >= EfiPciWidthFillUint8 && Width <= EfiPciWidthFillUint64) { OutStride = 0; } diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c index 56da796a43..6390df6c85 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c @@ -112,11 +112,11 @@ PcatRootBridgeIoPciRW ( InStride = 1 << (Width & 0x03); OutStride = InStride; - if (Width >= EfiCpuIoWidthFifoUint8 && Width <= EfiCpuIoWidthFifoUint64) { + if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) { InStride = 0; } - if (Width >= EfiCpuIoWidthFillUint8 && Width <= EfiCpuIoWidthFillUint64) { + if (Width >= EfiPciWidthFillUint8 && Width <= EfiPciWidthFillUint64) { OutStride = 0; } diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c index 0969407831..310cedad04 100644 --- 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 // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX // - if (Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint64) { + if (Width >= EfiPciIoWidthFifoUint8 && Width <= EfiPciIoWidthFifoUint64) { Count = 1; } diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c index a9d63d3dc4..6a09de5bd0 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c @@ -535,7 +535,7 @@ ConSplitterUgaDrawBlt ( ); if (EFI_ERROR (Status)) { ReturnStatus = Status; - } else if (BltOperation == EfiBltVideoToBltBuffer) { + } else if (BltOperation == EfiUgaVideoToBltBuffer) { // // Only need to read the data into buffer one time // -- 2.39.2