From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 23 Jan 2012 16:06:32 +0000 (+0000)
Subject: [USB-BRINGUP-TRUNK]
X-Git-Tag: backups/usb-bringup-trunk@60667~182
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=2e9bda4f6324d29a7543753cbabaccdfe69375b8

[USB-BRINGUP-TRUNK]
- Store correct device power state for PowerSystemWorking

svn path=/branches/usb-bringup-trunk/; revision=55115
---

diff --git a/drivers/usb/usbehci_new/hub_controller.cpp b/drivers/usb/usbehci_new/hub_controller.cpp
index 4e071d12517..1876624e188 100644
--- a/drivers/usb/usbehci_new/hub_controller.cpp
+++ b/drivers/usb/usbehci_new/hub_controller.cpp
@@ -593,7 +593,7 @@ CHubController::HandlePnp(
             DeviceCapabilities->HardwareDisabled = FALSE;
             DeviceCapabilities->NoDisplayInUI = FALSE;
             DeviceCapabilities->DeviceState[0] = PowerDeviceD0;
-            for (Index = 0; Index < PowerSystemMaximum; Index++)
+            for (Index = 1; Index < PowerSystemMaximum; Index++)
                 DeviceCapabilities->DeviceState[Index] = PowerDeviceD3;
             DeviceCapabilities->DeviceWake = PowerDeviceUnspecified;
             DeviceCapabilities->D1Latency = 0;
diff --git a/drivers/usb/usbhub_new/pdo.c b/drivers/usb/usbhub_new/pdo.c
index 4c6e4de1b0f..170e1328e3b 100644
--- a/drivers/usb/usbhub_new/pdo.c
+++ b/drivers/usb/usbhub_new/pdo.c
@@ -506,7 +506,7 @@ USBHUB_PdoHandlePnp(
             DeviceCapabilities->Address = UsbChildExtension->PortNumber;
             DeviceCapabilities->UINumber = 0;
             DeviceCapabilities->DeviceState[0] = PowerDeviceD0;
-            for (i = 0; i < PowerSystemMaximum; i++)
+            for (i = 1; i < PowerSystemMaximum; i++)
                 DeviceCapabilities->DeviceState[i] = PowerDeviceD3;
             //DeviceCapabilities->DeviceWake = PowerDeviceUndefined;
             DeviceCapabilities->D1Latency = 0;
diff --git a/drivers/usb/usbohci/hub_controller.cpp b/drivers/usb/usbohci/hub_controller.cpp
index 5336cf09adf..511cf3ebb55 100644
--- a/drivers/usb/usbohci/hub_controller.cpp
+++ b/drivers/usb/usbohci/hub_controller.cpp
@@ -593,7 +593,7 @@ CHubController::HandlePnp(
             DeviceCapabilities->HardwareDisabled = FALSE;
             DeviceCapabilities->NoDisplayInUI = FALSE;
             DeviceCapabilities->DeviceState[0] = PowerDeviceD0;
-            for (Index = 0; Index < PowerSystemMaximum; Index++)
+            for (Index = 1; Index < PowerSystemMaximum; Index++)
                 DeviceCapabilities->DeviceState[Index] = PowerDeviceD3;
             DeviceCapabilities->DeviceWake = PowerDeviceUnspecified;
             DeviceCapabilities->D1Latency = 0;