[ros-diffs] [cgutman] 55740: [USBOHCI] - Set the power switching configuration into a known state when initializing the controller

Author: cgutman
Date: Mon Feb 20 08:41:19 2012
New Revision: 55740

URL: http://svn.reactos.org/svn/reactos?rev=55740&view=rev
Log:
[USBOHCI]
- Set the power switching configuration into a known state when initializing the controller

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

Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwar...
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Feb 20 08:41:19 2012
@@ -595,7 +595,26 @@
     //
     // no over current protection
     //
-    WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor | OHCI_RH_NO_OVER_CURRENT_PROTECTION);
+    Descriptor |= OHCI_RH_NO_OVER_CURRENT_PROTECTION;
+
+    //
+    // power switching on
+    //
+    Descriptor &= ~OHCI_RH_NO_POWER_SWITCHING;
+
+    //
+    // control each port power independently (disabled until it's supported correctly)
+    //
+#if 0
+    Descriptor |= OHCI_RH_POWER_SWITCHING_MODE;
+#else
+    Descriptor &= ~OHCI_RH_POWER_SWITCHING_MODE;
+#endif
+
+    //
+    // write the configuration back
+    //
+    WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor);

//
     // enable power on all ports