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

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / UhciDxe / Uhci.h

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index cd92f6dd848b7e3b1318e37e1ae2467375301575..d0aea616f595a078197a6520c9f037c2c6e18e58 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -59,28 +59,28 @@ enum {
   // UHCI register operation timeout, set by experience\r
   //\r
   UHC_GENERIC_TIMEOUT           = UHC_1_SECOND,\r
-  \r
+\r
   //\r
   // Wait for force global resume(FGR) complete, refers to\r
   // specification[UHCI11-2.1.1]\r
-  // \r
+  //\r
   UHC_FORCE_GLOBAL_RESUME_STALL = 20 * UHC_1_MILLISECOND,\r
 \r
   //\r
   // Wait for roothub port reset and recovery, reset stall\r
-  // is set by experience, and recovery stall refers to \r
+  // is set by experience, and recovery stall refers to\r
   // specification[UHCI11-2.1.1]\r
   //\r
   UHC_ROOT_PORT_RESET_STALL     = 50 * UHC_1_MILLISECOND,\r
   UHC_ROOT_PORT_RECOVERY_STALL  = 10 * UHC_1_MILLISECOND,\r
 \r
   //\r
-  // Sync and Async transfer polling interval, set by experience, \r
+  // Sync and Async transfer polling interval, set by experience,\r
   // and the unit of Async is 100us.\r
   //\r
   UHC_SYNC_POLL_INTERVAL        = 50 * UHC_1_MICROSECOND,\r
   UHC_ASYNC_POLL_INTERVAL       = 50 * 10000UL,\r
-  \r
+\r
   //\r
   // UHC raises TPL to TPL_NOTIFY to serialize all its operations\r
   // to protect shared data structures.\r
@@ -98,7 +98,6 @@ typedef struct {
 } USB_CLASSC;\r
 #pragma pack()\r
 \r
-#define UHC_FROM_USB_HC_PROTO(This)   CR(This, USB_HC_DEV, UsbHc, USB_HC_DEV_SIGNATURE)\r
 #define UHC_FROM_USB2_HC_PROTO(This)  CR(This, USB_HC_DEV, Usb2Hc, USB_HC_DEV_SIGNATURE)\r
 \r
 //\r
@@ -114,9 +113,9 @@ typedef struct {
 //\r
 struct _USB_HC_DEV {\r
   UINT32                    Signature;\r
-  EFI_USB_HC_PROTOCOL       UsbHc;\r
   EFI_USB2_HC_PROTOCOL      Usb2Hc;\r
   EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  UINT64                    OriginalPciAttributes;\r
 \r
   //\r
   // Schedule data structures\r