[ros-diffs] [cgutman] 55928: [USBEHCI] - Add back the m_PortResetInProgress hack for broken vbox behavior

Author: cgutman
Date: Wed Feb 29 19:05:16 2012
New Revision: 55928

URL: http://svn.reactos.org/svn/reactos?rev=55928&view=rev
Log:
[USBEHCI]
- Add back the m_PortResetInProgress hack for broken vbox behavior

Modified:
    trunk/reactos/drivers/usb/usbehci/hardware.cpp

Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwar...
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Wed Feb 29 19:05:16 2012
@@ -99,6 +99,7 @@
     ULONG m_WorkItemActive;                                                            // work item status
     ULONG m_SyncFramePhysAddr;                                                         // periodic frame list physical address
     BUS_INTERFACE_STANDARD m_BusInterface;                                             // pci bus interface
+    BOOLEAN m_PortResetInProgress[0xF];                                                // stores reset in progress (vbox hack)

// read register
     ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset);
@@ -357,8 +358,8 @@

DPRINT1("Controller has %d Length\n", m_Capabilities.Length);
                 DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion);
-                DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong);
-                DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong);
+                DPRINT1("Controller EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong);
+                DPRINT1("Controller EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong);
                 DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount);

//
@@ -977,7 +978,7 @@
         Status |= USB_PORT_STATUS_OVER_CURRENT;

// In a reset state?
-    if (Value & EHCI_PRT_RESET)
+    if ((Value & EHCI_PRT_RESET) || m_PortResetInProgress[PortId])
     {
         Status |= USB_PORT_STATUS_RESET;
         Change |= USB_PORT_STATUS_RESET;
@@ -1013,6 +1014,9 @@

if (Status == C_PORT_RESET)
     {
+        // reset done
+        m_PortResetInProgress[PortId] = FALSE;
+
         // Clear reset
         Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId));
         Value &= (EHCI_PORTSC_DATAMASK | EHCI_PRT_ENABLED);
@@ -1136,6 +1140,9 @@
         // call the helper
         //
         ResetPort(PortId);
+
+        // reset in progress
+        m_PortResetInProgress[PortId] = TRUE;

//
         // is there a status change callback