Update PciCfg2.c to follow strict ANSI C spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3687 6f19259b-4bc3-4df7-8a09-765794883524
diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
index 28af898..1cde202 100644
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
@@ -236,16 +236,24 @@
   IN CONST  VOID                      *ClearBits

 )

 {

-  UINTN  PciLibAddress;

+  UINTN   PciLibAddress;

+  UINT16  ClearValue16;

+  UINT16  SetValue16;

+  UINT32  ClearValue32;

+  UINT32  SetValue32;

 

   PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);

 

   if (Width == EfiPeiPciCfgWidthUint8) {

-    PciAndThenOr8 (PciLibAddress, ~(*(UINT8 *)ClearBits), *((UINT8 *) SetBits));

+    PciAndThenOr8 (PciLibAddress, (UINT8) (~(*(UINT8 *) ClearBits)), *((UINT8 *) SetBits));

   } else if (Width == EfiPeiPciCfgWidthUint16) {

-    PciAndThenOr16 (PciLibAddress, ~ReadUnaligned16 ((UINT16 *) ClearBits), ReadUnaligned16 ((UINT16 *) SetBits));

+    ClearValue16  = (UINT16) (~ReadUnaligned16 ((UINT16 *) ClearBits));

+    SetValue16    = ReadUnaligned16 ((UINT16 *) SetBits);

+    PciAndThenOr16 (PciLibAddress, ClearValue16, SetValue16);

   } else if (Width == EfiPeiPciCfgWidthUint32) {

-    PciAndThenOr32 (PciLibAddress, ~ReadUnaligned32 ((UINT32 *) ClearBits), ReadUnaligned32 ((UINT32 *) SetBits));

+    ClearValue32  = (UINT32) (~ReadUnaligned32 ((UINT32 *) ClearBits));

+    SetValue32    = ReadUnaligned32 ((UINT32 *) SetBits);

+    PciAndThenOr32 (PciLibAddress, ClearValue32, SetValue32);

   } else {

     return EFI_INVALID_PARAMETER;

   }

diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index de719f3..adc590d 100644
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
@@ -1546,4 +1546,4 @@
   CoreFreePool (ScratchBuffer);

   

   return EFI_SUCCESS;

-}
\ No newline at end of file
+}

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index 9e478eb..bf1fb2d 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -327,16 +327,24 @@
   IN CONST  VOID                      *ClearBits

 )

 {

-  UINTN  PciLibAddress;

+  UINTN   PciLibAddress;

+  UINT16  ClearValue16;

+  UINT16  SetValue16;

+  UINT32  ClearValue32;

+  UINT32  SetValue32;

 

   PciLibAddress = PciCfgAddressConvert ((EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS *) &Address);

 

   if (Width == EfiPeiPciCfgWidthUint8) {

-    PciAndThenOr8 (PciLibAddress, ~(*(UINT8 *)ClearBits), *((UINT8 *) SetBits));

+    PciAndThenOr8 (PciLibAddress, (UINT8) (~(*(UINT8 *) ClearBits)), *((UINT8 *) SetBits));

   } else if (Width == EfiPeiPciCfgWidthUint16) {

-    PciAndThenOr16 (PciLibAddress, ~ReadUnaligned16 ((UINT16 *) ClearBits), ReadUnaligned16 ((UINT16 *) SetBits));

+    ClearValue16  = (UINT16) (~ReadUnaligned16 ((UINT16 *) ClearBits));

+    SetValue16    = ReadUnaligned16 ((UINT16 *) SetBits);

+    PciAndThenOr16 (PciLibAddress, ClearValue16, SetValue16);

   } else if (Width == EfiPeiPciCfgWidthUint32) {

-    PciAndThenOr32 (PciLibAddress, ~ReadUnaligned32 ((UINT32 *) ClearBits), ReadUnaligned32 ((UINT32 *) SetBits));

+    ClearValue32  = (UINT32) (~ReadUnaligned32 ((UINT32 *) ClearBits));

+    SetValue32    = ReadUnaligned32 ((UINT32 *) SetBits);

+    PciAndThenOr32 (PciLibAddress, ClearValue32, SetValue32);

   } else {

     return EFI_INVALID_PARAMETER;

   }