[USBHUB_NEW]

- Revert r55167 now that OHCI is fixed
- USB drives attached to an OHCI controller before boot are now enumerated without a reconnect needed

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

diff --git a/drivers/usb/usbhub_new/fdo.c b/drivers/usb/usbhub_new/fdo.c
index a2ee1b3..ea9f241 100644 (file)
--- a/drivers/usb/usbhub_new/fdo.c
+++ b/drivers/usb/usbhub_new/fdo.c
@@ -1439,11 +1439,10 @@ RootHubInitCallbackFunction(
     PVOID Context)
 {
     PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context;
     PVOID Context)
 {
     PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context;

-/*

     NTSTATUS Status;
     NTSTATUS Status;

-    //ULONG PortId;
-    //PHUB_DEVICE_EXTENSION HubDeviceExtension;
-    //PORT_STATUS_CHANGE StatusChange;
+    ULONG PortId;
+    PHUB_DEVICE_EXTENSION HubDeviceExtension;
+    PORT_STATUS_CHANGE StatusChange;

 
     HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension;
 
 
     HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension;
 


@@ -1471,7 +1470,7 @@ RootHubInitCallbackFunction(
             }
         }
     }
             }
         }
     }

-*/
+

     //
     // Send the first SCE Request
     //
     //
     // Send the first SCE Request
     //


@@ -1489,7 +1488,7 @@ USBHUB_FdoHandlePnp(
     PHUB_DEVICE_EXTENSION HubDeviceExtension;
     PDEVICE_OBJECT RootHubDeviceObject;
     PVOID HubInterfaceBusContext , UsbDInterfaceBusContext;
     PHUB_DEVICE_EXTENSION HubDeviceExtension;
     PDEVICE_OBJECT RootHubDeviceObject;
     PVOID HubInterfaceBusContext , UsbDInterfaceBusContext;

-    //PORT_STATUS_CHANGE StatusChange;
+    PORT_STATUS_CHANGE StatusChange;

 
     HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension;
 
 
     HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension;
 


@@ -1826,7 +1825,6 @@ USBHUB_FdoHandlePnp(
             }
             else
             {
             }
             else
             {

-/*

                 //
                 // reset ports
                 //
                 //
                 // reset ports
                 //


@@ -1852,7 +1850,7 @@ USBHUB_FdoHandlePnp(
                         }
                     }
                 }
                         }
                     }
                 }

-*/
+

                 //
                 // Send the first SCE Request
                 //
                 //
                 // Send the first SCE Request
                 //