Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-15 08:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBEHCI]

Browse source 
- Add back the m_PortResetInProgress hack for broken vbox behavior

svn path=/trunk/; revision=55928
This commit is contained in:
Cameron Gutman 2012-02-29 19:05:16 +00:00
parent 82d9d774ca
commit bc96c38875
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/drivers/usb/usbehci/hardware.cpp
View file

@ -99,6 +99,7 @@ protected:
ULONG m_WorkItemActive; // work item status ULONG m_WorkItemActive; // work item status
ULONG m_SyncFramePhysAddr; // periodic frame list physical address ULONG m_SyncFramePhysAddr; // periodic frame list physical address
BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface
BOOLEAN m_PortResetInProgress[0xF]; // stores reset in progress (vbox hack)
// read register // read register
ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset);
@ -357,8 +358,8 @@ CUSBHardwareDevice::PnpStart(
DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller has %d Length\n", m_Capabilities.Length);
DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion);
DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); DPRINT1("Controller EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong);
DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); DPRINT1("Controller EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong);
DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount);
// //
@ -977,7 +978,7 @@ CUSBHardwareDevice::GetPortStatus(
Status |= USB_PORT_STATUS_OVER_CURRENT; Status |= USB_PORT_STATUS_OVER_CURRENT;
// In a reset state? // In a reset state?
if (Value & EHCI_PRT_RESET) if ((Value & EHCI_PRT_RESET) || m_PortResetInProgress[PortId])
{ {
Status |= USB_PORT_STATUS_RESET; Status |= USB_PORT_STATUS_RESET;
Change |= USB_PORT_STATUS_RESET; Change |= USB_PORT_STATUS_RESET;
@ -1013,6 +1014,9 @@ CUSBHardwareDevice::ClearPortStatus(
if (Status == C_PORT_RESET) if (Status == C_PORT_RESET)
{ {
// reset done
m_PortResetInProgress[PortId] = FALSE;
// Clear reset // Clear reset
Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId));
Value &= (EHCI_PORTSC_DATAMASK | EHCI_PRT_ENABLED); Value &= (EHCI_PORTSC_DATAMASK | EHCI_PRT_ENABLED);
@ -1137,6 +1141,9 @@ CUSBHardwareDevice::SetPortFeature(
// //
ResetPort(PortId); ResetPort(PortId);
// reset in progress
m_PortResetInProgress[PortId] = TRUE;
// //
// is there a status change callback // is there a status change callback
// //