Remove two global variable: mUsbCapabilityLen and mDeviceSpeed and integrate them...

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / Ehci / Dxe / EhciReg.c

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciReg.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciReg.c
index 70d1d5cf382459eb31e8cec18aa671a290dc95c3..5767bbc024d1b2f59f1371cc310f3edfd3ee7406 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciReg.c
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciReg.c
@@ -151,12 +151,12 @@ Returns:
     \r
 --*/\r
 {\r
-  ASSERT (mUsbCapabilityLen);\r
+  ASSERT (HcDev->UsbCapabilityLen);\r
   return HcDev->PciIo->Mem.Read (\r
                              HcDev->PciIo,\r
                              EfiPciIoWidthUint32,\r
                              USB_BAR_INDEX,\r
-                             (UINT64) (OperationalRegAddr + mUsbCapabilityLen),\r
+                             (UINT64) (OperationalRegAddr + HcDev->UsbCapabilityLen),\r
                              1,\r
                              Data\r
                              );\r
@@ -187,12 +187,12 @@ Returns:
   \r
 --*/\r
 {\r
-  ASSERT (mUsbCapabilityLen);\r
+  ASSERT (HcDev->UsbCapabilityLen);\r
   return HcDev->PciIo->Mem.Write (\r
                              HcDev->PciIo,\r
                              EfiPciIoWidthUint32,\r
                              USB_BAR_INDEX,\r
-                             (UINT64) (OperationalRegAddr + mUsbCapabilityLen),\r
+                             (UINT64) (OperationalRegAddr + HcDev->UsbCapabilityLen),\r
                              1,\r
                              &Data\r
                              );\r
@@ -347,9 +347,9 @@ Returns:
   Status = ReadEhcCapabiltiyReg (\r
              HcDev,\r
              CapabilityLenAddr,\r
-             &mUsbCapabilityLen\r
+             &(HcDev->UsbCapabilityLen)\r
              );\r
-  mUsbCapabilityLen = (UINT8) mUsbCapabilityLen;\r
+  HcDev->UsbCapabilityLen = (UINT8) HcDev->UsbCapabilityLen;\r
 \r
   return Status;\r
 }\r
@@ -1004,7 +1004,7 @@ Returns:
 \r
   HcCapParamsAddr = HCCPARAMS;\r
 \r
-  ReadEhcOperationalReg (\r
+  ReadEhcCapabiltiyReg(\r
     HcDev,\r
     HcCapParamsAddr,\r
     &HcCapParamsReg\r