MdeModulePkg/PciBus: Refine EFI_PCI_ROM_IMAGE_MAPPING

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciBusDxe / PciRomTable.c

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