From 0170af58e038038d4bbe6c9b9b5436f5456dafaf Mon Sep 17 00:00:00 2001 From: mdkinney Date: Fri, 5 Jun 2009 17:42:09 +0000 Subject: [PATCH] Retire PciHotplugDeviceGuid. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8482 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Pci/PciBusDxe/PciBus.h | 1 - .../Bus/Pci/PciBusDxe/PciBusDxe.inf | 2 - .../Bus/Pci/PciBusDxe/PciDeviceSupport.c | 10 --- .../Bus/Pci/PciBusDxe/PciLib.c | 70 ------------------- .../Bus/Pci/PciBusDxe/PciLib.h | 24 ------- .../Include/Guid/PciHotplugDevice.h | 24 ------- .../IntelFrameworkModulePkg.dec | 3 - 7 files changed, 134 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h 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. diff --git a/IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h b/IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h deleted file mode 100644 index a5be56c39d..0000000000 --- a/IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h +++ /dev/null @@ -1,24 +0,0 @@ -/** @file - GUIDs used to indicate the device is Pccard hotplug device - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef __PCI_HOTPLUG_DEVICE_GUID_H_ -#define __PCI_HOTPLUG_DEVICE_GUID_H_ - -#define EFI_PCI_HOTPLUG_DEVICE_GUID \ - { 0x0b280816, 0x52e7, 0x4e51, {0xaa, 0x57, 0x11, 0xbd, 0x41, 0xcb, 0xef, 0xc3 } } - -extern EFI_GUID gEfiPciHotplugDeviceGuid; - -#endif // __PCI_HOTPLUG_DEVICE_GUID_H_ - diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec index d30400caa5..acb6f98a82 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec @@ -43,9 +43,6 @@ ## Include/Guid/PciOptionRomTable.h gEfiPciOptionRomTableGuid = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }} - ## Include/Guid/PciHotplugDevice.h - gEfiPciHotplugDeviceGuid = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }} - gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }} ## Include/Guid/CustomDecompress.h -- 2.39.2