Sync with trunk r58740.

[reactos.git] / drivers / usb / usbohci / usbohci.cpp

diff --git a/drivers/usb/usbohci/usbohci.cpp b/drivers/usb/usbohci/usbohci.cpp
index 9d79e3c..9077210 100644 (file)
--- a/drivers/usb/usbohci/usbohci.cpp
+++ b/drivers/usb/usbohci/usbohci.cpp
@@ -10,117 +10,6 @@
 
 #include "usbohci.h"
 
-//
-// driver verifier
-//
-DRIVER_ADD_DEVICE OHCI_AddDevice;
-
-NTSTATUS
-NTAPI
-OHCI_AddDevice(
-    PDRIVER_OBJECT DriverObject,
-    PDEVICE_OBJECT PhysicalDeviceObject)
-{
-    NTSTATUS Status;
-    PHCDCONTROLLER HcdController;
-
-    DPRINT1("OHCI_AddDevice\n");
-
-    /* first create the controller object */
-    Status = CreateHCDController(&HcdController);
-    if (!NT_SUCCESS(Status))
-    {
-        /* failed to create hcd */
-        DPRINT1("AddDevice: Failed to create hcd with %x\n", Status);
-        return Status;
-    }
-
-    /* initialize the hcd */
-    Status = HcdController->Initialize(NULL, // FIXME
-                                       DriverObject,
-                                       PhysicalDeviceObject);
-
-    /* check for success */
-    if (!NT_SUCCESS(Status))
-    {
-        /* failed to initialize device */
-        DPRINT1("AddDevice: failed to initialize\n");
-
-        /* release object */
-        HcdController->Release();
-    }
-
-    return Status;
-
-}
-
-NTSTATUS
-NTAPI
-OHCI_Dispatch(
-    PDEVICE_OBJECT DeviceObject, 
-    PIRP Irp)
-{
-    PCOMMON_DEVICE_EXTENSION DeviceExtension;
-    PIO_STACK_LOCATION IoStack;
-    NTSTATUS Status;
-
-    //
-    // get common device extension
-    //
-    DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-
-    //
-    // get current stack location
-    //
-    IoStack = IoGetCurrentIrpStackLocation(Irp);
-
-    //
-    // sanity checks
-    //
-    PC_ASSERT(DeviceExtension->Dispatcher);
-
-    switch(IoStack->MajorFunction)
-    {
-        case IRP_MJ_PNP:
-        {
-            //
-            // dispatch pnp
-            //
-            return DeviceExtension->Dispatcher->HandlePnp(DeviceObject, Irp);
-        }
-
-        case IRP_MJ_POWER:
-        {
-            //
-            // dispatch pnp
-            //
-            return DeviceExtension->Dispatcher->HandlePower(DeviceObject, Irp);
-        }
-        case IRP_MJ_INTERNAL_DEVICE_CONTROL:
-        case IRP_MJ_DEVICE_CONTROL:
-        {
-            //
-            // dispatch pnp
-            //
-            return DeviceExtension->Dispatcher->HandleDeviceControl(DeviceObject, Irp);
-        }
-        default:
-        {
-            DPRINT1("OHCI_Dispatch> Major %lu Minor %lu unhandeled\n", IoStack->MajorFunction, IoStack->MinorFunction);
-            Status = STATUS_SUCCESS;
-        }
-    }
-
-    //
-    // complete request
-    //
-    Irp->IoStatus.Information = 0;
-    Irp->IoStatus.Status = Status;
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
-    return Status;
-}
-
 extern
 "C"
 NTSTATUS
@@ -131,14 +20,21 @@ DriverEntry(
 {
 
     /* initialize driver object*/
-    DriverObject->DriverExtension->AddDevice = OHCI_AddDevice;
+    DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice;
+
+    DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch;
+    DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBLIB_Dispatch;
+    DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBLIB_Dispatch;
+    DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBLIB_Dispatch;
+    DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBLIB_Dispatch;
+    DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch;
+    return STATUS_SUCCESS;
+}
 
-    DriverObject->MajorFunction[IRP_MJ_CREATE] = OHCI_Dispatch;
-    DriverObject->MajorFunction[IRP_MJ_CLOSE] = OHCI_Dispatch;
-    DriverObject->MajorFunction[IRP_MJ_CLEANUP] = OHCI_Dispatch;
-    DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = OHCI_Dispatch;
-    DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = OHCI_Dispatch;
-    DriverObject->MajorFunction[IRP_MJ_PNP] = OHCI_Dispatch;
 
-    return STATUS_SUCCESS;
+extern "C" {
+   void free(void * ptr)
+   {
+       ExFreePool(ptr);
+   }
 }