MdeModulePkg/PciBus: Refine EFI_PCI_ROM_IMAGE_MAPPING

The patch doesn't impact real functionality.
It only renames EFI_PCI_ROM_IMAGE_MAPPING to PCI_ROM_IMAGE,
and changes prototype of PciRomAddImageMapping so that
no explicit type cast is needed when calling this function.

It also removes unused field RomBase from PCI_IO_DEVICE structure.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 3bcc134d0b3b83103979158a06135edede00fbc6..55eb3a5a80700e3956c6974df6503ee78e9e7243 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header files and data structures needed by PCI Bus module.\r
 \r
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -239,11 +239,6 @@ struct _PCI_IO_DEVICE {
   //\r
   UINT64                                    RomSize;\r
 \r
-  //\r
-  // The OptionRom Size\r
-  //\r
-  UINT64                                    RomBase;\r
-\r
   //\r
   // TRUE if all OpROM (in device or in platform specific position) have been processed\r
   //\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
index 359b9ded6d6c6ae6d6ba6da29454dafd73aa2978..97bb971a5966a2d869d8da42b47cb4e5be386f27 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
@@ -282,7 +282,7 @@ RegisterPciDevice (
           PciIoDevice->BusNumber,\r
           PciIoDevice->DeviceNumber,\r
           PciIoDevice->FunctionNumber,\r
-          (UINT64) (UINTN) PciIoDevice->PciIo.RomImage,\r
+          PciIoDevice->PciIo.RomImage,\r
           PciIoDevice->PciIo.RomSize\r
           );\r
       }\r
@@ -308,7 +308,7 @@ RegisterPciDevice (
           PciIoDevice->BusNumber,\r
           PciIoDevice->DeviceNumber,\r
           PciIoDevice->FunctionNumber,\r
-          (UINT64) (UINTN) PciIoDevice->PciIo.RomImage,\r
+          PciIoDevice->PciIo.RomImage,\r
           PciIoDevice->PciIo.RomSize\r
           );\r
       }   \r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index 3713c07844bd26a1a3cb8de62f2740e221c13f52..4382d79c2d9737a7a6cda8ba57737a4d62ffa640 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
@@ -551,7 +551,7 @@ LoadOpRomImage (
     PciDevice->BusNumber,\r
     PciDevice->DeviceNumber,\r
     PciDevice->FunctionNumber,\r
-    (UINT64) (UINTN) PciDevice->PciIo.RomImage,\r
+    PciDevice->PciIo.RomImage,\r
     PciDevice->PciIo.RomSize\r
     );\r
 \r
@@ -766,7 +766,7 @@ ProcessOpRomImage (
           PciDevice->BusNumber,\r
           PciDevice->DeviceNumber,\r
           PciDevice->FunctionNumber,\r
-          (UINT64) (UINTN) PciDevice->PciIo.RomImage,\r
+          PciDevice->PciIo.RomImage,\r
           PciDevice->PciIo.RomSize\r
           );\r
         RetStatus = EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index f48c3a0c59e667435ba7fc376905a0e72b9df38e..0eef41739c7def96d62a3c1652485f26828f4c07 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
@@ -1,7 +1,7 @@
 /** @file\r
   Set up ROM Table for PCI Bus module.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -23,13 +23,13 @@ typedef struct {
   UINT8       Bus;\r
   UINT8       Dev;\r
   UINT8       Func;\r
-  UINT64      RomAddress;\r
-  UINT64      RomLength;\r
-} EFI_PCI_ROM_IMAGE_MAPPING;\r
+  VOID        *RomImage;\r
+  UINT64      RomSize;\r
+} PCI_ROM_IMAGE;\r
 \r
-UINTN                      mNumberOfPciRomImages     = 0;\r
-UINTN                      mMaxNumberOfPciRomImages  = 0;\r
-EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;\r
+UINTN          mNumberOfPciRomImages     = 0;\r
+UINTN          mMaxNumberOfPciRomImages  = 0;\r
+PCI_ROM_IMAGE  *mRomImageTable           = NULL;\r
 \r
 /**\r
   Add the Rom Image to internal database for later PCI light enumeration.\r
@@ -39,9 +39,8 @@ EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;
   @param Bus            Bus NO of PCI space.\r
   @param Dev            Dev NO of PCI space.\r
   @param Func           Func NO of PCI space.\r
-  @param RomAddress     Base address of OptionRom.\r
-  @param RomLength      Length of rom image.\r
-\r
+  @param RomImage       Option Rom buffer.\r
+  @param RomSize        Size of Option Rom buffer.\r
 **/\r
 VOID\r
 PciRomAddImageMapping (\r
@@ -50,29 +49,25 @@ PciRomAddImageMapping (
   IN  UINT8       Bus,\r
   IN  UINT8       Dev,\r
   IN  UINT8       Func,\r
-  IN  UINT64      RomAddress,\r
-  IN  UINT64      RomLength\r
+  IN  VOID        *RomImage,\r
+  IN  UINT64      RomSize\r
   )\r
 {\r
-  EFI_PCI_ROM_IMAGE_MAPPING *TempMapping;\r
-\r
-  if (mNumberOfPciRomImages >= mMaxNumberOfPciRomImages) {\r
+  PCI_ROM_IMAGE   *NewTable;\r
 \r
-    mMaxNumberOfPciRomImages += 0x20;\r
+  if (mNumberOfPciRomImages == mMaxNumberOfPciRomImages) {\r
 \r
-    TempMapping = NULL;\r
-    TempMapping = AllocatePool (mMaxNumberOfPciRomImages * sizeof (EFI_PCI_ROM_IMAGE_MAPPING));\r
-    if (TempMapping == NULL) {\r
+    NewTable = ReallocatePool (\r
+                 mMaxNumberOfPciRomImages * sizeof (PCI_ROM_IMAGE),\r
+                 (mMaxNumberOfPciRomImages + 0x20) * sizeof (PCI_ROM_IMAGE),\r
+                 mRomImageTable\r
+                 );\r
+    if (NewTable == NULL) {\r
       return ;\r
     }\r
 \r
-    CopyMem (TempMapping, mRomImageTable, mNumberOfPciRomImages * sizeof (EFI_PCI_ROM_IMAGE_MAPPING));\r
-\r
-    if (mRomImageTable != NULL) {\r
-      FreePool (mRomImageTable);\r
-    }\r
-\r
-    mRomImageTable = TempMapping;\r
+    mRomImageTable            = NewTable;\r
+    mMaxNumberOfPciRomImages += 0x20;\r
   }\r
 \r
   mRomImageTable[mNumberOfPciRomImages].ImageHandle = ImageHandle;\r
@@ -80,8 +75,8 @@ PciRomAddImageMapping (
   mRomImageTable[mNumberOfPciRomImages].Bus         = Bus;\r
   mRomImageTable[mNumberOfPciRomImages].Dev         = Dev;\r
   mRomImageTable[mNumberOfPciRomImages].Func        = Func;\r
-  mRomImageTable[mNumberOfPciRomImages].RomAddress  = RomAddress;\r
-  mRomImageTable[mNumberOfPciRomImages].RomLength   = RomLength;\r
+  mRomImageTable[mNumberOfPciRomImages].RomImage    = RomImage;\r
+  mRomImageTable[mNumberOfPciRomImages].RomSize     = RomSize;\r
   mNumberOfPciRomImages++;\r
 }\r
 \r
@@ -116,8 +111,8 @@ PciRomGetImageMapping (
       if (mRomImageTable[Index].ImageHandle != NULL) {\r
         AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle);\r
       } else {\r
-        PciIoDevice->PciIo.RomImage = (VOID *) (UINTN) mRomImageTable[Index].RomAddress;\r
-        PciIoDevice->PciIo.RomSize  = (UINTN) mRomImageTable[Index].RomLength;\r
+        PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage;\r
+        PciIoDevice->PciIo.RomSize  = mRomImageTable[Index].RomSize;\r
       }\r
     }\r
   }\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
index d443f833360321d3338f42a25bd3565f6616e025..a7a1ed4ce3383930479b2b4acc1ae5faca525b1c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
@@ -1,7 +1,7 @@
 /** @file\r
   Set up ROM Table for PCI Bus module.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -23,8 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param Bus            Bus NO of PCI space.\r
   @param Dev            Dev NO of PCI space.\r
   @param Func           Func NO of PCI space.\r
-  @param RomAddress     Base address of OptionRom.\r
-  @param RomLength      Length of rom image.\r
+  @param RomImage       Option ROM buffer.\r
+  @param RomSize        Size of Option ROM buffer.\r
 \r
 **/\r
 VOID\r
@@ -34,8 +34,8 @@ PciRomAddImageMapping (
   IN  UINT8       Bus,\r
   IN  UINT8       Dev,\r
   IN  UINT8       Func,\r
-  IN  UINT64      RomAddress,\r
-  IN  UINT64      RomLength\r
+  IN  VOID        *RomImage,\r
+  IN  UINT64      RomSize\r
   );\r
 \r
 /**\r