[USBEHCI_NEW]

[reactos.git] / drivers / usb / usbehci_new / usbehci.cpp

diff --git a/drivers/usb/usbehci_new/usbehci.cpp b/drivers/usb/usbehci_new/usbehci.cpp
index 28bf19b..7d535c5 100644 (file)
--- a/drivers/usb/usbehci_new/usbehci.cpp
+++ b/drivers/usb/usbehci_new/usbehci.cpp
@@ -79,12 +79,7 @@ EHCI_Dispatch(
     //
     // sanity checks
     //
     //
     // sanity checks
     //

-    PC_ASSERT(DeviceExtension->HcdController);
-
-    //
-    // FIXME: support bus device
-    //
-    PC_ASSERT(DeviceExtension->IsHub == FALSE);
+    PC_ASSERT(DeviceExtension->Dispatcher);

 
     switch(IoStack->MajorFunction)
     {
 
     switch(IoStack->MajorFunction)
     {


@@ -93,7 +88,7 @@ EHCI_Dispatch(
             //
             // dispatch pnp
             //
             //
             // dispatch pnp
             //

-            return DeviceExtension->HcdController->HandlePnp(DeviceObject, Irp);
+            return DeviceExtension->Dispatcher->HandlePnp(DeviceObject, Irp);

         }
 
         case IRP_MJ_POWER:
         }
 
         case IRP_MJ_POWER:


@@ -101,7 +96,7 @@ EHCI_Dispatch(
             //
             // dispatch pnp
             //
             //
             // dispatch pnp
             //

-            return DeviceExtension->HcdController->HandlePower(DeviceObject, Irp);
+            return DeviceExtension->Dispatcher->HandlePower(DeviceObject, Irp);

         }
         case IRP_MJ_SYSTEM_CONTROL:
         case IRP_MJ_DEVICE_CONTROL:
         }
         case IRP_MJ_SYSTEM_CONTROL:
         case IRP_MJ_DEVICE_CONTROL:


@@ -109,7 +104,7 @@ EHCI_Dispatch(
             //
             // dispatch pnp
             //
             //
             // dispatch pnp
             //

-            return DeviceExtension->HcdController->HandleDeviceControl(DeviceObject, Irp);
+            return DeviceExtension->Dispatcher->HandleDeviceControl(DeviceObject, Irp);

         }
         case IRP_MJ_CREATE:
         {
         }
         case IRP_MJ_CREATE:
         {


@@ -134,7 +129,6 @@ EHCI_Dispatch(
     Irp->IoStatus.Status = Status;
     IoCompleteRequest(Irp, IO_NO_INCREMENT);
 
     Irp->IoStatus.Status = Status;
     IoCompleteRequest(Irp, IO_NO_INCREMENT);
 

-

     return Status;
 }
 
     return Status;
 }