Replace a void* by PDEVICE_OBJECT and fix its usage

svn path=/trunk/; revision=19013

diff --git a/reactos/drivers/usb/miniport/linux/linux_wrapper.h b/reactos/drivers/usb/miniport/linux/linux_wrapper.h
index 1decac1..3c1bf71 100644 (file)
--- a/reactos/drivers/usb/miniport/linux/linux_wrapper.h
+++ b/reactos/drivers/usb/miniport/linux/linux_wrapper.h
@@ -129,7 +129,7 @@ struct device {
        struct list_head driver_list;
        void    (*release)(struct device * dev);
 
-       void *dev_ext; // ReactOS-specific: pointer to windows device extension
+       PDEVICE_OBJECT dev_ext; // ReactOS-specific: pointer to windows device object
 };
 struct class_device{int a;};
 struct semaphore{int a;};

diff --git a/reactos/drivers/usb/miniport/usbohci/ohci.c b/reactos/drivers/usb/miniport/usbohci/ohci.c
index 0c7f281..2da6b0d 100644 (file)
--- a/reactos/drivers/usb/miniport/usbohci/ohci.c
+++ b/reactos/drivers/usb/miniport/usbohci/ohci.c
@@ -21,7 +21,7 @@ InitLinuxWrapper(PDEVICE_OBJECT DeviceObject)
        /* Initialize generic linux structure */\r
        dev->irq = DeviceExtension->InterruptVector;\r
        dev->dev_ext = (PVOID)DeviceExtension;\r
-       dev->dev.dev_ext = (PVOID)DeviceExtension;\r
+       dev->dev.dev_ext = (PVOID)DeviceObject;\r
        dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_OHCI_TAG); // 128 max len for slot name\r
 \r
        // Init wrapper\r

diff --git a/reactos/drivers/usb/miniport/usbuhci/uhci.c b/reactos/drivers/usb/miniport/usbuhci/uhci.c
index 9c3c3d7..bf07f78 100644 (file)
--- a/reactos/drivers/usb/miniport/usbuhci/uhci.c
+++ b/reactos/drivers/usb/miniport/usbuhci/uhci.c
@@ -26,7 +26,7 @@ InitLinuxWrapper(PDEVICE_OBJECT DeviceObject)
        /* Initialize generic linux structure */
        dev->irq = DeviceExtension->InterruptVector;
        dev->dev_ext = (PVOID)DeviceExtension;
-       dev->dev.dev_ext = (PVOID)DeviceExtension;
+       dev->dev.dev_ext = (PVOID)DeviceObject;
        dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_UHCI_TAG); // 128 max len for slot name
        init_wrapper(dev);