Fix ICC building issue for DuetPkg

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

2 files changed, 7 insertions, 7 deletions

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
index 2f0a1757c0..b763c6cce6 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
@@ -864,7 +864,7 @@ Returns:
 --*/

 {

   UINT32      Value;

-  UINT64      BarValue64;

+  //UINT64      BarValue64;

   UINT32      OriginalValue;

   UINT32      Mask;

   UINT32      Data;

@@ -873,7 +873,7 @@ Returns:
 

   OriginalValue = 0;

   Value         = 0;

-  BarValue64    = 0;

+  //BarValue64    = 0;

 

   Status = BarExisted (

             PciIoDevice,

@@ -923,7 +923,7 @@ Returns:
     // Need to treat it as no-bar

     //

     if (PciIoDevice->PciBar[BarIndex].Length == 0) {

-      PciIoDevice->PciBar[BarIndex].BarType = 0;

+      PciIoDevice->PciBar[BarIndex].BarType = PciBarTypeUnknown;

     }

 

     PciIoDevice->PciBar[BarIndex].Prefetchable  = FALSE;

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
index 55d16b64cb..759c61a83c 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
@@ -370,7 +370,7 @@ Returns:
     Count = 1;

   }

 

-  Width &= 0x03;

+  Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & 0x03);

 

   if ((*Offset + Count * ((UINTN)1 << Width)) - 1 >= PciIoDevice->PciBar[BarIndex].Length) {

     return EFI_INVALID_PARAMETER;

@@ -412,7 +412,7 @@ Returns:
   // If Width is EfiPciIoWidthFifoUintX then convert to EfiPciIoWidthUintX

   // If Width is EfiPciIoWidthFillUintX then convert to EfiPciIoWidthUintX

   //

-  Width &= 0x03;

+  Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & 0x03);

 

   if (PciIoDevice->IsPciExp) {

     if ((*Offset + Count * ((UINTN)1 << Width)) - 1 >= PCI_EXP_MAX_CONFIG_OFFSET) {

@@ -951,7 +951,7 @@ Returns:
   }

 

   if (PciIoDevice->Attributes & EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE) {

-    Operation = Operation + EfiPciOperationBusMasterRead64;

+    Operation = (EFI_PCI_IO_PROTOCOL_OPERATION) (Operation + EfiPciOperationBusMasterRead64);

   }

 

   Status = PciIoDevice->PciRootBridgeIo->Map (

@@ -1865,5 +1865,5 @@ Returns:
     return TRUE;

   }

 

-  return (PciDeviceExisted (PciDevice1->Parent, PciDevice2)|| PciDeviceExisted (PciDevice2->Parent, PciDevice1));

+  return (BOOLEAN) ((PciDeviceExisted (PciDevice1->Parent, PciDevice2)|| PciDeviceExisted (PciDevice2->Parent, PciDevice1)));

 }