1. Added EdkPciIncompatibleDeviceSupportLib in EdkModulePkg, this library is used...

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

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.c
index 449d0dc4431cb6060c15ad2d5a055e8214baed0b..f6b371f8a508532dc4afa63531ecc196eb2ed2da 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciOptionRomSupport.c
@@ -1,18 +1,18 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
 \r
   PciOptionRomSupport.c\r
-  \r
+\r
 Abstract:\r
 \r
   PCI Bus Driver\r
@@ -88,8 +88,9 @@ Returns:
   AllOnes = 0xfffffffe;\r
   Address = EFI_PCI_ADDRESS (Bus, Device, Function, RomBarIndex);\r
 \r
-  Status = PciRootBridgeIo->Pci.Write (\r
+  Status = PciRootBridgeIoWrite (\r
                                   PciRootBridgeIo,\r
+                                  &PciIoDevice->Pci,\r
                                   EfiPciWidthUint32,\r
                                   Address,\r
                                   1,\r
@@ -98,12 +99,13 @@ Returns:
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  \r
+\r
   //\r
   // read back\r
   //\r
-  Status = PciRootBridgeIo->Pci.Read (\r
+  Status = PciRootBridgeIoRead (\r
                                   PciRootBridgeIo,\r
+                                  &PciIoDevice->Pci,\r
                                   EfiPciWidthUint32,\r
                                   Address,\r
                                   1,\r
@@ -151,7 +153,6 @@ Returns:
   UINT16                    OffsetPcir;\r
   UINT32                    RomBarOffset;\r
   UINT32                    RomBar;\r
-  UINT64                    Temp;\r
   EFI_STATUS                retStatus;\r
   BOOLEAN                   FirstCheck;\r
   UINT8                     *Image;\r
@@ -167,7 +168,6 @@ Returns:
   Indicator     = 0;\r
   RomImageSize  = 0;\r
   RomInMemory   = NULL;\r
-  Temp          = 0;\r
   CodeType      = 0xFF;\r
 \r
   //\r
@@ -336,7 +336,7 @@ Returns:
     // Clear all bars\r
     //\r
     for (Offset = 0x10; Offset <= 0x24; Offset += sizeof (UINT32)) {\r
-      PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, Offset, 1, &gAllZero);\r
+      PciIoWrite (PciIo, EfiPciIoWidthUint32, Offset, 1, &gAllZero);\r
     }\r
     \r
     //\r
@@ -344,7 +344,7 @@ Returns:
     // enable its decoder\r
     //\r
     Value32 = RomBar | 0x1;\r
-    PciIo->Pci.Write (\r
+    PciIoWrite (\r
                 PciIo,\r
                 (EFI_PCI_IO_PROTOCOL_WIDTH) EfiPciWidthUint32,\r
                 RomBarIndex,\r
@@ -378,7 +378,7 @@ Returns:
     // disable rom decode\r
     //\r
     Value32 = 0xFFFFFFFE;\r
-    PciIo->Pci.Write (\r
+    PciIoWrite (\r
                 PciIo,\r
                 (EFI_PCI_IO_PROTOCOL_WIDTH) EfiPciWidthUint32,\r
                 RomBarIndex,\r