Pass ICC building.

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

diff --git a/DuetPkg/8254TimerDxe/Timer.c b/DuetPkg/8254TimerDxe/Timer.c
index 5b5fc42d9d962f9e645b3c65268109eedb379f14..2874301bbcae60e0acd630fc6091a665b6e55952 100644 (file)
--- 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.\r
 // A bug in the compiler prevents us from initializing this here.\r
 //\r
-volatile EFI_TIMER_NOTIFY mTimerNotifyFunction;\r
+EFI_TIMER_NOTIFY mTimerNotifyFunction;\r
 \r
 //\r
 // The current period of the timer interrupt\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
index 61393edeb4e7129d7eff445c06aaa51700443813..6d524c1a25d3c6319252e97ea8c5c8d4455bcdf8 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
@@ -121,7 +121,7 @@ Returns:
           &OldCommand\r
           );\r
 \r
-  OldCommand |= Command;\r
+  OldCommand = (UINT16) (OldCommand | Command);\r
 \r
   return PciIo->Pci.Write (\r
               PciIo, \r
@@ -165,7 +165,7 @@ Returns:
           &OldCommand\r
           );\r
 \r
-  OldCommand &= ~(Command);\r
+  OldCommand = (UINT16) (OldCommand & ~(Command));\r
 \r
   return PciIo->Pci.Write (\r
             PciIo, \r
@@ -244,7 +244,7 @@ Returns:
           &OldCommand\r
           );\r
 \r
-  OldCommand |= Command;\r
+  OldCommand = (UINT16) (OldCommand | Command);\r
 \r
   return PciIo->Pci.Write (\r
               PciIo, \r
@@ -287,7 +287,7 @@ Returns:
           &OldCommand\r
           );\r
 \r
-  OldCommand &= ~(Command);\r
+  OldCommand = (UINT16) (OldCommand & ~(Command));\r
 \r
   return PciIo->Pci.Write (\r
               PciIo, \r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
index a863475061b2a3db719fba0914cf1fc9b9286ab7..064b634806ad97aa558d4454ede0d527db370604 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
@@ -148,7 +148,6 @@ Returns:
   UINT16                    OffsetPcir;\r
   UINT32                    RomBarOffset;\r
   UINT32                    RomBar;\r
-  UINT64                    Temp;\r
   EFI_STATUS                retStatus;\r
   BOOLEAN                   FirstCheck;\r
   UINT8                     *Image;\r
@@ -164,7 +163,6 @@ Returns:
   Indicator     = 0;\r
   RomImageSize  = 0;\r
   RomInMemory   = NULL;\r
-  Temp          = 0;\r
   CodeType      = 0xFF;\r
 \r
   //\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index 9edbc698bc76833f4a130e82d9abb04b761c5125..dc4530aa6837b37f98fb12eb0908408687fc5da5 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -555,7 +555,7 @@ SaveCommandRegister (
   //\r
   // Clear the memory enable bit\r
   //\r
-  Command = Context->CommandRegisterBuffer[Index] & (~0x02);\r
+  Command = (UINT16) (Context->CommandRegisterBuffer[Index] & (~0x02));\r
 \r
   IoDev->Pci.Write (IoDev, EfiPciWidthUint16, Address, 1, &Command);\r
 }\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
index c5895d98d83d96a7fe7c46c6ecd03874cb06de73..3ebfc16de52a1d56cde0e9545861cd7a7cc4f954 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.c
@@ -151,7 +151,7 @@ Returns:
     //\r
     // Build the EFI Device Path Protocol instance for this PCI Root Bridge\r
     //\r
-    Status = PcatRootBridgeDevicePathConstructor (&PrivateData->DevicePath, PciRootBridgeIndex, (PrivateData->PciExpressBaseAddress != 0) ? TRUE : FALSE);\r
+    Status = PcatRootBridgeDevicePathConstructor (&PrivateData->DevicePath, PciRootBridgeIndex, (BOOLEAN)((PrivateData->PciExpressBaseAddress != 0) ? TRUE : FALSE));\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
@@ -804,7 +804,7 @@ Returns:
   if ( *Value == 0 ) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 EFI_STATUS\r