X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FBus%2FPci%2FEhciDxe%2FEhciDxe.inf;h=1d3b0be57aec040c65f8413760d468ed27e5f62a;hb=0cd645250306b244a5d6e0e293ed1786ec101641;hp=69f693f95c685fc8678f50381fe761b9f0ac4f44;hpb=7b728d6273042b7310e96224747aa9a6755c628f;p=mirror_edk2.git

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
index 69f693f95c..1d3b0be57a 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -1,14 +1,16 @@
-#/** @file
-#  
-#  Component Description File For EhciDxe Module.
-# 
-#  EhciDxe driver is responsible for managing the behavior of EHCI controller. 
-#  It implements the interfaces of monitoring the status of all ports and transferring 
+## @file
+#  The EhciDxe driver is responsible for managing the behavior of EHCI controller.
+#  It implements the interfaces of monitoring the status of all ports and transferring
 #  Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.
 #
-#  Copyright (c) 2006 - 2009, Intel Corporation. 
+#  Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached
+#  to the EHCI controller before the UHCI driver attaches to the companion UHCI controller.
+#  This way avoids the control transfer on a shared port between EHCI and companion host
+#  controller when UHCI gets attached earlier than EHCI and a USB 2.0 device inserts.
 #
-#  All rights reserved. This program and the accompanying materials
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+#
+#  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
@@ -17,11 +19,12 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 #
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = EhciDxe
+  MODULE_UNI_FILE                = EhciDxe.uni
   FILE_GUID                      = BDFE430E-8F2A-4db0-9991-6F856594777E
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -31,14 +34,14 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64
 #
-#  DRIVER_BINDING                =  gEhciDriverBinding                        
+#  DRIVER_BINDING                =  gEhciDriverBinding
 #  COMPONENT_NAME                =  gEhciComponentName
 #  COMPONENT_NAME2               =  gEhciComponentName2
 #
 
-[Sources.common]
+[Sources]
   UsbHcMem.h
   EhciUrb.c
   EhciReg.h
@@ -59,7 +62,7 @@
   MdeModulePkg/MdeModulePkg.dec
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport  ## CONSUMES
 
 [LibraryClasses]
   MemoryAllocationLib
@@ -70,14 +73,18 @@
   BaseMemoryLib
   DebugLib
   PcdLib
+  ReportStatusCodeLib
+
+[Guids]
+  gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event
 
 [Protocols]
   gEfiPciIoProtocolGuid                         ## TO_START
   gEfiUsb2HcProtocolGuid                        ## BY_START
 
 # [Event]
-#   ##
-#   # Periodic timer event for checking the result of interrupt transfer execution.
-#   #
-#   EVENT_TYPE_PERIODIC_TIMER                   ## PRODUCES
+# EVENT_TYPE_PERIODIC_TIMER       ## CONSUMES
 #
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  EhciDxeExtra.uni