Fixed some issues for IA32 architecture platform build.

1. added UINTN typecast for shift.
2. updated Nt32.fpd and Unix.fpd.

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

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
index fb6f21fe9d02b34bd48289e09dd4b14503d4acf9..1296836a3089592868fd1055f8195671fb455552 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c
@@ -2113,7 +2113,7 @@ ReadConfigData (
           return Status;\r
         }\r
 \r
           return Status;\r
         }\r
 \r

-        Stride = 1 << AccessWidth;\r
+       Stride = 1 << AccessWidth;\r

         AccessAddress += Stride;\r
         if (AccessAddress >= (Address + (1 << Width))) {\r
           //\r
         AccessAddress += Stride;\r
         if (AccessAddress >= (Address + (1 << Width))) {\r
           //\r


@@ -2215,9 +2215,7 @@ UpdateConfigData (
 {\r
   EFI_STATUS                    Status;\r
   EFI_PCI_REGISTER_VALUE_DATA   *PciRegisterData;\r
 {\r
   EFI_STATUS                    Status;\r
   EFI_PCI_REGISTER_VALUE_DATA   *PciRegisterData;\r

-  UINT64                        AndValue;\r
-  UINT64                        OrValue;\r
-  UINT32                        TempValue;\r
+  UINT64                        TempValue;\r

 \r
   //\r
   // check register value incompatibility\r
 \r
   //\r
   // check register value incompatibility\r


@@ -2226,28 +2224,17 @@ UpdateConfigData (
 \r
   if (Status == EFI_SUCCESS) {\r
 \r
 \r
   if (Status == EFI_SUCCESS) {\r
 \r

-    AndValue = (PciRegisterData->AndValue) >> ((Address & 0x3) * 8);\r
-    OrValue  = (PciRegisterData->OrValue)  >> ((Address & 0x3) * 8);\r
-\r

     TempValue = * (UINT32 *) Buffer;\r
 \r
     TempValue = * (UINT32 *) Buffer;\r
 \r

-    if (PciRegisterData->AndValue != VALUE_NOCARE) {\r
-      TempValue &= (UINT32) AndValue;\r
-    }\r
-    if (PciRegisterData->OrValue != VALUE_NOCARE) {\r
-      TempValue |= (UINT32) OrValue;\r
-    }\r
-\r

     switch (Width) {\r
     case EfiPciWidthUint8:\r
     switch (Width) {\r
     case EfiPciWidthUint8:\r

-      *(UINT32 *)Buffer = *(UINT32 *)Buffer & 0xffffff00 + (UINT8)TempValue;\r
+      * (UINT8 *) Buffer = (UINT8) TempValue;\r

       break;\r
       break;\r

-\r

     case EfiPciWidthUint16:\r
     case EfiPciWidthUint16:\r

-      *(UINT32 *)Buffer = *(UINT32 *)Buffer & 0xffff0000 + (UINT16)TempValue;\r
+      * (UINT16 *) Buffer = (UINT16) TempValue;\r

       break;\r
     case EfiPciWidthUint32:\r
       break;\r
     case EfiPciWidthUint32:\r

-      *(UINT32 *)Buffer = TempValue;\r
+      * (UINT32 *) Buffer = (UINT32) TempValue;\r

       break;\r
 \r
     default:\r
       break;\r
 \r
     default:\r


@@ -2340,7 +2327,7 @@ WriteConfigData (
           //\r
           UpdateConfigData (PciDeviceInfo, PCI_REGISTER_READ, AccessWidth, AccessAddress & 0xff, &Data);\r
 \r
           //\r
           UpdateConfigData (PciDeviceInfo, PCI_REGISTER_READ, AccessWidth, AccessAddress & 0xff, &Data);\r
 \r

-          Shift = (Address - AccessAddress) * 8;\r
+          Shift = (UINTN) ((Address - AccessAddress) * 8);\r

           switch (Width) {\r
           case EfiPciWidthUint8:\r
             Data = (* (UINT8 *) Buffer) << Shift | (Data & ~(0xff << Shift));\r
           switch (Width) {\r
           case EfiPciWidthUint8:\r
             Data = (* (UINT8 *) Buffer) << Shift | (Data & ~(0xff << Shift));\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index ab4ac4b913aab32df2bbbe603ee062b2c331b8c3..9eb391b61f89efaf6537c100b261390c54126700 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -4537,6 +4537,8 @@
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

+        <!--Pkg: EdkModulePkg Mod: EdkPciIncompatibleDeviceSuppportLib Path: EdkModulePkg\Library\EdkPciIncompatibleDeviceSupportLib\EdkPciIncompatibleDeviceSupportLib.msa-->\r
+        <Instance ModuleGuid="1ca1c1f9-5baf-4204-b6e5-5e24109a4e4e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r

       </Libraries>\r
       <PcdBuildDefinition>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
       </Libraries>\r
       <PcdBuildDefinition>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r


@@ -4651,6 +4653,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPciIncompatibleDeviceSupportMask</C_Name>\r
+          <Token>0x0001003f</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT8</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>0x0</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r

diff --git a/EdkUnixPkg/Unix.fpd b/EdkUnixPkg/Unix.fpd
index b088f7d24cea09fa975ded8f9119c5d21354e7a1..c48a5e78c65cb2bbe3f4fa888a0d107a3ccb6518 100644 (file)
--- a/EdkUnixPkg/Unix.fpd
+++ b/EdkUnixPkg/Unix.fpd
@@ -4521,6 +4521,8 @@
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

+        <!--Pkg: EdkModulePkg Mod: EdkPciIncompatibleDeviceSuppportLib Path: EdkModulePkg\Library\EdkPciIncompatibleDeviceSupportLib\EdkPciIncompatibleDeviceSupportLib.msa-->\r
+        <Instance ModuleGuid="1ca1c1f9-5baf-4204-b6e5-5e24109a4e4e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r

       </Libraries>\r
       <PcdBuildDefinition>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
       </Libraries>\r
       <PcdBuildDefinition>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r


@@ -4635,6 +4637,14 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPciIncompatibleDeviceSupportMask</C_Name>\r
+          <Token>0x0001003f</Token>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT8</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>0x0</Value>\r
+        </PcdData>\r

       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r