Fixed some issues for IA32 architecture platform build.

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / PciBus / Dxe / PciLib.c

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
-        Stride = 1 << AccessWidth;\r
+       Stride = 1 << AccessWidth;\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
-  UINT64                        AndValue;\r
-  UINT64                        OrValue;\r
-  UINT32                        TempValue;\r
+  UINT64                        TempValue;\r
 \r
   //\r
   // check register value incompatibility\r
@@ -2226,28 +2224,17 @@ UpdateConfigData (
 \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
-    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
-      *(UINT32 *)Buffer = *(UINT32 *)Buffer & 0xffffff00 + (UINT8)TempValue;\r
+      * (UINT8 *) Buffer = (UINT8) TempValue;\r
       break;\r
-\r
     case EfiPciWidthUint16:\r
-      *(UINT32 *)Buffer = *(UINT32 *)Buffer & 0xffff0000 + (UINT16)TempValue;\r
+      * (UINT16 *) Buffer = (UINT16) TempValue;\r
       break;\r
     case EfiPciWidthUint32:\r
-      *(UINT32 *)Buffer = TempValue;\r
+      * (UINT32 *) Buffer = (UINT32) TempValue;\r
       break;\r
 \r
     default:\r
@@ -2340,7 +2327,7 @@ WriteConfigData (
           //\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