1) Use FeatureFlag PcdPciBusHotplugDeviceSupport to merge LightPciLib.c with PcdLib.c.

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

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c
index 76c5a207841a00524be6d882f3e4e0cb0a6b9c82..70ad48b5ecce272b1a5a9c3af6940119533146e6 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c
@@ -143,6 +143,7 @@ Returns:
   EFI_IMAGE_NT_HEADERS          *PeHdr;\r
   EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;\r
   PCI_DRIVER_OVERRIDE_LIST      *Node;\r
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
   EFI_DRIVER_OS_HANDOFF_HEADER  *DriverOsHandoffHeader;\r
   EFI_DRIVER_OS_HANDOFF_HEADER  *NewDriverOsHandoffHeader;\r
   EFI_DRIVER_OS_HANDOFF         *DriverOsHandoff;\r
@@ -151,6 +152,7 @@ Returns:
   UINTN                         NumberOfEntries;\r
   UINTN                         Size;\r
   UINTN                         Index;\r
+#endif\r
 \r
   Status = gBS->HandleProtocol (DriverImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &LoadedImage);\r
   if (EFI_ERROR (Status)) {\r
@@ -180,6 +182,7 @@ Returns:
     return EFI_SUCCESS;\r
   }\r
 \r
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
   DriverOsHandoffHeader = NULL;\r
   Status                = EfiGetSystemConfigurationTable (&gEfiUgaIoProtocolGuid, (VOID **) &DriverOsHandoffHeader);\r
   if (!EFI_ERROR (Status) && DriverOsHandoffHeader != NULL) {\r
@@ -285,6 +288,7 @@ Returns:
   if (DriverOsHandoffHeader != NULL) {\r
     gBS->FreePool (DriverOsHandoffHeader);\r
   }\r
+#endif\r
 \r
   return EFI_SUCCESS;\r
 }\r