Retire PciHotplugDeviceGuid.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8482 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 8e4a222dc57f8c653b53cc6b26a20cd778c30f4d..90e32bf19847b035ae6a933f154a983fed335d7c 100644 (file)
--- 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 <Protocol/PciHostBridgeResourceAllocation.h>\r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/LoadFile2.h>\r
-#include <Guid/PciHotplugDevice.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/PciHotPlugRequest.h>\r
 #include <Protocol/DevicePath.h>\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index 0a6fe76e7d9a33ac7f7a6f3b5719cad81393fa84..b4dd56d2218495238d47703f4a790eb41995295f 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -89,8 +89,6 @@
 \r
 [Guids]\r
   gEfiPciOptionRomTableGuid                     # SOMETIMES_CONSUMED  System Table\r
-  gEfiPciHotplugDeviceGuid                      # PRIVATE\r
-  gEfiPciOptionRomTableGuid                     # SOMETIMES_CONSUMED\r
 \r
 [Protocols]\r
   gEfiPciHotPlugRequestProtocolGuid             # PROTOCOL ALWAYS_PRODUCED\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
index 320eb4c62d2dd1982c48263e3080d384b2842b5a..e205fe9dc88cb696d32f9b4dcbb350f18aee7f73 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
@@ -378,12 +378,6 @@ RegisterPciDevice (
     return Status;\r
   }\r
 \r
-  //\r
-  // Install Pccard Hotplug GUID for Pccard device so that\r
-  // to notify CardBus driver to stop the device when de-register happens\r
-  //\r
-  InstallPciHotplugGuid (PciIoDevice);\r
-\r
   if (Handle != NULL) {\r
     *Handle = PciIoDevice->Handle;\r
   }\r
@@ -505,10 +499,6 @@ DeRegisterPciDevice (
         CurrentLink = CurrentLink->ForwardLink;\r
       }\r
     }\r
-    //\r
-    // Uninstall Pccard Hotplug GUID for Pccard device\r
-    //\r
-    UninstallPciHotplugGuid (PciIoDevice);\r
 \r
     //\r
     // Close the child handle\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index fca1766d3209d2fc48d703fb60582f957eebfe95..7a870090cce63cca478b30f93b45bdcc8a54eb4d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.c
@@ -45,76 +45,6 @@ InstallHotPlugRequestProtocol (
                   );\r
 }\r
 \r
-/**\r
-  Install protocol gEfiPciHotplugDeviceGuid into hotplug device\r
-  instance.\r
-  \r
-  @param PciIoDevice  hotplug device instance.\r
-  \r
-**/\r
-VOID\r
-InstallPciHotplugGuid (\r
-  IN  PCI_IO_DEVICE                  *PciIoDevice\r
-  )\r
-{\r
-  EFI_STATUS  Status;\r
-\r
-  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
-    return;\r
-  }\r
-\r
-  if (IS_CARDBUS_BRIDGE (&PciIoDevice->Parent->Pci)) {\r
-\r
-    Status = gBS->InstallProtocolInterface (\r
-                    &PciIoDevice->Handle,\r
-                    &gEfiPciHotplugDeviceGuid,\r
-                    EFI_NATIVE_INTERFACE,\r
-                    NULL\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
-}\r
-\r
-/**\r
-  UnInstall protocol gEfiPciHotplugDeviceGuid into hotplug device\r
-  instance.\r
-  \r
-  @param PciIoDevice  hotplug device instance.\r
-  \r
-**/\r
-VOID\r
-UninstallPciHotplugGuid (\r
-  IN  PCI_IO_DEVICE                  *PciIoDevice\r
-  )\r
-{\r
-  EFI_STATUS  Status;\r
-\r
-  if (!FeaturePcdGet (PcdPciBusHotplugDeviceSupport)) {\r
-    return;\r
-  }\r
-\r
-  Status = gBS->OpenProtocol (\r
-                  PciIoDevice->Handle,\r
-                  &gEfiPciHotplugDeviceGuid,\r
-                  NULL,\r
-                  NULL,\r
-                  NULL,\r
-                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                  );\r
-\r
-  if (Status == EFI_SUCCESS) {\r
-    //\r
-    // This may triger CardBus driver to stop for\r
-    // Pccard devices opened the GUID via BY_DRIVER\r
-    //\r
-    Status = gBS->UninstallProtocolInterface (\r
-                    PciIoDevice->Handle,\r
-                    &gEfiPciHotplugDeviceGuid,\r
-                    NULL\r
-                    );\r
-  }\r
-}\r
-\r
 /**\r
   Retrieve the BAR information via PciIo interface.\r
   \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
index b8df129bd20f3e1448109455cc51ae526664375f..91ff03159d5a4d42cd30c31e7340f287202b0dbf 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
@@ -58,30 +58,6 @@ InstallHotPlugRequestProtocol (
   IN  EFI_STATUS                    *Status\r
   );\r
 \r
-/**\r
-  Install protocol gEfiPciHotplugDeviceGuid into hotplug device\r
-  instance.\r
-  \r
-  @param PciIoDevice  hotplug device instance.\r
-  \r
-**/\r
-VOID\r
-InstallPciHotplugGuid (\r
-  IN  PCI_IO_DEVICE                  *PciIoDevice\r
-  );\r
-\r
-/**\r
-  UnInstall protocol gEfiPciHotplugDeviceGuid into hotplug device\r
-  instance.\r
-  \r
-  @param PciIoDevice  hotplug device instance.\r
-  \r
-**/\r
-VOID\r
-UninstallPciHotplugGuid (\r
-  IN  PCI_IO_DEVICE                  *PciIoDevice\r
-  );\r
-\r
 /**\r
   Retrieve the BAR information via PciIo interface.\r
   \r

diff --git a/IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h b/IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h
deleted file mode 100644 (file)
index a5be56c..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/PciHotplugDevice.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file\r
-  GUIDs used to indicate the device is Pccard hotplug device\r
-  \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-**/\r
-\r
-#ifndef __PCI_HOTPLUG_DEVICE_GUID_H_\r
-#define __PCI_HOTPLUG_DEVICE_GUID_H_\r
-\r
-#define EFI_PCI_HOTPLUG_DEVICE_GUID \\r
-  { 0x0b280816, 0x52e7, 0x4e51, {0xaa, 0x57, 0x11, 0xbd, 0x41, 0xcb, 0xef, 0xc3 } }\r
-\r
-extern EFI_GUID gEfiPciHotplugDeviceGuid;\r
-\r
-#endif // __PCI_HOTPLUG_DEVICE_GUID_H_\r
-\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index d30400caa5fefa8cab84fc35f899a95614aa9428..acb6f98a82c83321174806f5c3aaf731c4001025 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -43,9 +43,6 @@
   ## Include/Guid/PciOptionRomTable.h\r
   gEfiPciOptionRomTableGuid       = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}\r
   \r
-  ## Include/Guid/PciHotplugDevice.h\r
-  gEfiPciHotplugDeviceGuid        = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }}\r
-\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}\r
   \r
   ## Include/Guid/CustomDecompress.h\r