1. Remove USB HC Protocol installing from Uhci module. It only installs USB2 HC protocol.

[mirror_edk2.git] / IntelFrameworkModulePkg / Bus / Pci / PciBusDxe / pcibus.c

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c
index 0f9d944f94e34f0802becd5f7a0605a9b7d55510..a8e50fcb284e8affaa0dc4a5cda90618b6ab6e17 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c
@@ -1,25 +1,16 @@
-/*++\r
-\r
-Copyright (c) 2006 - 2007, 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
-Module Name:\r
-\r
-  PciBus.c\r
+/**@file\r
 \r
-Abstract:\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
-  PCI Bus Driver\r
+**/\r
 \r
-Revision History\r
-\r
---*/\r
 \r
 #include "pcibus.h"\r
 \r
@@ -36,6 +27,7 @@ EFI_DRIVER_BINDING_PROTOCOL                   gPciBusDriverBinding = {
   NULL\r
 };\r
 \r
+EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *gEfiIncompatiblePciDeviceSupport = NULL;\r
 EFI_HANDLE                                    gPciHostBrigeHandles[PCI_MAX_HOST_BRIDGE_NUM];\r
 UINTN                                         gPciHostBridgeNumber;\r
 BOOLEAN                                       gFullEnumeration;\r
@@ -85,14 +77,13 @@ Returns:
   //\r
   // Install driver model protocol(s).\r
   //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
+  Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
              SystemTable,\r
              &gPciBusDriverBinding,\r
              ImageHandle,\r
              &gPciBusComponentName,\r
-             NULL,\r
-             NULL\r
+             &gPciBusComponentName2\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -225,6 +216,12 @@ Returns:
 {\r
   EFI_STATUS  Status;\r
 \r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiIncompatiblePciDeviceSupportProtocolGuid,\r
+                  NULL,\r
+                  (VOID **) &gEfiIncompatiblePciDeviceSupport\r
+                  );\r
+\r
   //\r
   // If PCI Platform protocol is available, get it now.\r
   // If the platform implements this, it must be installed before BDS phase\r