git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2235
6f19259b-4bc3-4df7-8a09-
765794883524
-UINT32 mUsbCapabilityLen;\r
-UINT32 mDeviceSpeed[16];\r
// Not Low Speed Device Attached\r
//\r
if ((PORTSC_CCS & PortStatusControlReg) && (PORTSC_CSC & PortStatusControlReg)) {\r
// Not Low Speed Device Attached\r
//\r
if ((PORTSC_CCS & PortStatusControlReg) && (PORTSC_CSC & PortStatusControlReg)) {\r
- mDeviceSpeed[PortNumber] = IsHighSpeedDevice (This, PortNumber) ? USB_PORT_STAT_HIGH_SPEED : 0;\r
+ HcDev->DeviceSpeed[PortNumber] = IsHighSpeedDevice (This, PortNumber) ? USB_PORT_STAT_HIGH_SPEED : 0;\r
- PortStatus->PortStatus |= mDeviceSpeed[PortNumber];\r
+ PortStatus->PortStatus |= HcDev->DeviceSpeed[PortNumber];\r
}\r
//\r
// Fill Port Status Change bits\r
}\r
//\r
// Fill Port Status Change bits\r
}\r
Status = WaitForEhcNotHalt (HcDev, EHCI_GENERIC_TIMEOUT);\r
if (EFI_ERROR (Status)) {\r
}\r
Status = WaitForEhcNotHalt (HcDev, EHCI_GENERIC_TIMEOUT);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((gEHCDebugLevel, "WaitForEhcNotHalt TimeOut\n"));\r
+ DEBUG ((gEHCDebugLevel, "EHCI: WaitForEhcNotHalt TimeOut\n"));\r
Status = EFI_DEVICE_ERROR;\r
goto exit;\r
}\r
Status = EFI_DEVICE_ERROR;\r
goto exit;\r
}\r
//\r
// Enhanced Host Controller Registers definitions\r
//\r
//\r
// Enhanced Host Controller Registers definitions\r
//\r
-extern UINT32 mUsbCapabilityLen;\r
extern EFI_DRIVER_BINDING_PROTOCOL gEhciDriverBinding;\r
extern EFI_COMPONENT_NAME_PROTOCOL gEhciComponentName;\r
\r
extern EFI_DRIVER_BINDING_PROTOCOL gEhciDriverBinding;\r
extern EFI_COMPONENT_NAME_PROTOCOL gEhciComponentName;\r
\r
MEMORY_MANAGE_HEADER *MemoryHeader;\r
UINT8 Is64BitCapable;\r
UINT32 High32BitAddr;\r
MEMORY_MANAGE_HEADER *MemoryHeader;\r
UINT8 Is64BitCapable;\r
UINT32 High32BitAddr;\r
+ UINT32 UsbCapabilityLen;\r
+ UINT16 DeviceSpeed[16];\r
- ASSERT (mUsbCapabilityLen);\r
+ ASSERT (HcDev->UsbCapabilityLen);\r
return HcDev->PciIo->Mem.Read (\r
HcDev->PciIo,\r
EfiPciIoWidthUint32,\r
USB_BAR_INDEX,\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
- ASSERT (mUsbCapabilityLen);\r
+ ASSERT (HcDev->UsbCapabilityLen);\r
return HcDev->PciIo->Mem.Write (\r
HcDev->PciIo,\r
EfiPciIoWidthUint32,\r
USB_BAR_INDEX,\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
Status = ReadEhcCapabiltiyReg (\r
HcDev,\r
CapabilityLenAddr,\r
Status = ReadEhcCapabiltiyReg (\r
HcDev,\r
CapabilityLenAddr,\r
+ &(HcDev->UsbCapabilityLen)\r
- mUsbCapabilityLen = (UINT8) mUsbCapabilityLen;\r
+ HcDev->UsbCapabilityLen = (UINT8) HcDev->UsbCapabilityLen;\r
\r
HcCapParamsAddr = HCCPARAMS;\r
\r
\r
HcCapParamsAddr = HCCPARAMS;\r
\r
- ReadEhcOperationalReg (\r
+ ReadEhcCapabiltiyReg(\r
HcDev,\r
HcCapParamsAddr,\r
&HcCapParamsReg\r
HcDev,\r
HcCapParamsAddr,\r
&HcCapParamsReg\r
0\r
);\r
if (EFI_ERROR (Status)) {\r
0\r
);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((gEHCErrorLevel, "PciIo->AllocateBuffer Failed\n"));\r
+ DEBUG ((gEHCErrorLevel, "EHCI: PciIo->AllocateBuffer Failed\n"));\r
Status = EFI_OUT_OF_RESOURCES;\r
goto exit;\r
}\r
Status = EFI_OUT_OF_RESOURCES;\r
goto exit;\r
}\r
&Map\r
);\r
if (EFI_ERROR (Status) || (BufferSizeInBytes != EFI_PAGE_SIZE)) {\r
&Map\r
);\r
if (EFI_ERROR (Status) || (BufferSizeInBytes != EFI_PAGE_SIZE)) {\r
- DEBUG ((gEHCErrorLevel, "PciIo->MapBuffer Failed\n"));\r
+ DEBUG ((gEHCErrorLevel, "EHCI: PciIo->MapBuffer Failed\n"));\r
Status = EFI_OUT_OF_RESOURCES;\r
goto free_buffer;\r
}\r
Status = EFI_OUT_OF_RESOURCES;\r
goto free_buffer;\r
}\r
\r
Status = SetCtrlDataStructSeg (HcDev);\r
if (EFI_ERROR (Status)) {\r
\r
Status = SetCtrlDataStructSeg (HcDev);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((gEHCErrorLevel, "SetCtrlDataStructSeg Failed\n"));\r
+ DEBUG ((gEHCErrorLevel, "EHCI: SetCtrlDataStructSeg Failed\n"));\r
Status = EFI_DEVICE_ERROR;\r
goto unmap_buffer;\r
}\r
Status = EFI_DEVICE_ERROR;\r
goto unmap_buffer;\r
}\r