From 2b7d16cf8c416b011d9e133cca7e59823ac2f4ad Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 27 Nov 2008 09:11:41 +0000
Subject: [PATCH] Pass ICC building.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6761 6f19259b-4bc3-4df7-8a09-765794883524
---
 DuetPkg/8254TimerDxe/Timer.c                              | 2 +-
 DuetPkg/PciBusNoEnumerationDxe/PciCommand.c               | 8 ++++----
 DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c      | 2 --
 DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c       | 2 +-
 DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/DuetPkg/8254TimerDxe/Timer.c b/DuetPkg/8254TimerDxe/Timer.c
index 5b5fc42d9d..2874301bbc 100644
--- a/DuetPkg/8254TimerDxe/Timer.c
+++ b/DuetPkg/8254TimerDxe/Timer.c
@@ -51,7 +51,7 @@ EFI_LEGACY_8259_PROTOCOL  *mLegacy8259;
 // The notification function to call on every timer interrupt.
 // A bug in the compiler prevents us from initializing this here.
 //
-volatile EFI_TIMER_NOTIFY mTimerNotifyFunction;
+EFI_TIMER_NOTIFY mTimerNotifyFunction;
 
 //
 // The current period of the timer interrupt
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
index 61393edeb4..6d524c1a25 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
@@ -121,7 +121,7 @@ Returns:
           &OldCommand
           );
 
-  OldCommand |= Command;
+  OldCommand = (UINT16) (OldCommand | Command);
 
   return PciIo->Pci.Write (
               PciIo, 
@@ -165,7 +165,7 @@ Returns:
           &OldCommand
           );
 
-  OldCommand &= ~(Command);
+  OldCommand = (UINT16) (OldCommand & ~(Command));
 
   return PciIo->Pci.Write (
             PciIo, 
@@ -244,7 +244,7 @@ Returns:
           &OldCommand
           );
 
-  OldCommand |= Command;
+  OldCommand = (UINT16) (OldCommand | Command);
 
   return PciIo->Pci.Write (
               PciIo, 
@@ -287,7 +287,7 @@ Returns:
           &OldCommand
           );
 
-  OldCommand &= ~(Command);
+  OldCommand = (UINT16) (OldCommand & ~(Command));
 
   return PciIo->Pci.Write (
               PciIo, 
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
index a863475061..064b634806 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
@@ -148,7 +148,6 @@ Returns:
   UINT16                    OffsetPcir;
   UINT32                    RomBarOffset;
   UINT32                    RomBar;
-  UINT64                    Temp;
   EFI_STATUS                retStatus;
   BOOLEAN                   FirstCheck;
   UINT8                     *Image;
@@ -164,7 +163,6 @@ Returns:
   Indicator     = 0;
   RomImageSize  = 0;
   RomInMemory   = NULL;
-  Temp          = 0;
   CodeType      = 0xFF;
 
   //
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index 9edbc698bc..dc4530aa68 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -555,7 +555,7 @@ SaveCommandRegister (
   //
   // Clear the memory enable bit
   //
-  Command = Context->CommandRegisterBuffer[Index] & (~0x02);
+  Command = (UINT16) (Context->CommandRegisterBuffer[Index] & (~0x02));
 
   IoDev->Pci.Write (IoDev, EfiPciWidthUint16, Address, 1, &Command);
 }
diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
index c5895d98d8..3ebfc16de5 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
@@ -151,7 +151,7 @@ Returns:
     //
     // Build the EFI Device Path Protocol instance for this PCI Root Bridge
     //
-    Status = PcatRootBridgeDevicePathConstructor (&PrivateData->DevicePath, PciRootBridgeIndex, (PrivateData->PciExpressBaseAddress != 0) ? TRUE : FALSE);
+    Status = PcatRootBridgeDevicePathConstructor (&PrivateData->DevicePath, PciRootBridgeIndex, (BOOLEAN)((PrivateData->PciExpressBaseAddress != 0) ? TRUE : FALSE));
     if (EFI_ERROR (Status)) {
       goto Done;
     }
@@ -804,7 +804,7 @@ Returns:
   if ( *Value == 0 ) {
     return EFI_DEVICE_ERROR;
   }
-  return EFI_SUCCESS;
+  return Status;
 }
 
 EFI_STATUS
-- 
2.39.2