From 0170af58e038038d4bbe6c9b9b5436f5456dafaf Mon Sep 17 00:00:00 2001 From: mdkinney Date: Fri, 5 Jun 2009 17:42:09 +0000 Subject: Retire PciHotplugDeviceGuid. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8482 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h | 1 - .../Bus/Pci/PciBusDxe/PciBusDxe.inf | 2 - .../Bus/Pci/PciBusDxe/PciDeviceSupport.c | 10 ---- IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c | 70 ---------------------- IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h | 24 -------- 5 files changed, 107 deletions(-) (limited to 'IntelFrameworkModulePkg/Bus') diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h index 8e4a222dc5..90e32bf198 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include #include diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf index 0a6fe76e7d..b4dd56d221 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf @@ -89,8 +89,6 @@ [Guids] gEfiPciOptionRomTableGuid # SOMETIMES_CONSUMED System Table - gEfiPciHotplugDeviceGuid # PRIVATE - gEfiPciOptionRomTableGuid # SOMETIMES_CONSUMED [Protocols] gEfiPciHotPlugRequestProtocolGuid # PROTOCOL ALWAYS_PRODUCED diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c index 320eb4c62d..e205fe9dc8 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c @@ -378,12 +378,6 @@ RegisterPciDevice ( return Status; } - // - // Install Pccard Hotplug GUID for Pccard device so that - // to notify CardBus driver to stop the device when de-register happens - // - InstallPciHotplugGuid (PciIoDevice); - if (Handle != NULL) { *Handle = PciIoDevice->Handle; } @@ -505,10 +499,6 @@ DeRegisterPciDevice ( CurrentLink = CurrentLink->ForwardLink; } } - // - // Uninstall Pccard Hotplug GUID for Pccard device - // - UninstallPciHotplugGuid (PciIoDevice); // // Close the child handle diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c index fca1766d32..7a870090cc 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c @@ -45,76 +45,6 @@ InstallHotPlugRequestProtocol ( ); } -/** - Install protocol gEfiPciHotplugDeviceGuid into hotplug device - instance. - - @param PciIoDevice hotplug device instance. - -**/ -VOID -InstallPciHotplugGuid ( - IN PCI_IO_DEVICE *PciIoDevice - ) -{ - EFI_STATUS Status; - - if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) { - return; - } - - if (IS_CARDBUS_BRIDGE (&PciIoDevice->Parent->Pci)) { - - Status = gBS->InstallProtocolInterface ( - &PciIoDevice->Handle, - &gEfiPciHotplugDeviceGuid, - EFI_NATIVE_INTERFACE, - NULL - ); - ASSERT_EFI_ERROR (Status); - } -} - -/** - UnInstall protocol gEfiPciHotplugDeviceGuid into hotplug device - instance. - - @param PciIoDevice hotplug device instance. - -**/ -VOID -UninstallPciHotplugGuid ( - IN PCI_IO_DEVICE *PciIoDevice - ) -{ - EFI_STATUS Status; - - if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) { - return; - } - - Status = gBS->OpenProtocol ( - PciIoDevice->Handle, - &gEfiPciHotplugDeviceGuid, - NULL, - NULL, - NULL, - EFI_OPEN_PROTOCOL_TEST_PROTOCOL - ); - - if (Status == EFI_SUCCESS) { - // - // This may triger CardBus driver to stop for - // Pccard devices opened the GUID via BY_DRIVER - // - Status = gBS->UninstallProtocolInterface ( - PciIoDevice->Handle, - &gEfiPciHotplugDeviceGuid, - NULL - ); - } -} - /** Retrieve the BAR information via PciIo interface. diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h index b8df129bd2..91ff03159d 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h @@ -58,30 +58,6 @@ InstallHotPlugRequestProtocol ( IN EFI_STATUS *Status ); -/** - Install protocol gEfiPciHotplugDeviceGuid into hotplug device - instance. - - @param PciIoDevice hotplug device instance. - -**/ -VOID -InstallPciHotplugGuid ( - IN PCI_IO_DEVICE *PciIoDevice - ); - -/** - UnInstall protocol gEfiPciHotplugDeviceGuid into hotplug device - instance. - - @param PciIoDevice hotplug device instance. - -**/ -VOID -UninstallPciHotplugGuid ( - IN PCI_IO_DEVICE *PciIoDevice - ); - /** Retrieve the BAR information via PciIo interface. -- cgit v1.2.3