From 07644dbb393ca16ef797f5b246bfdd13fb1d7fe7 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 29 Jun 2014 12:53:11 +0000 Subject: [PATCH] {USBEHCI][USBOHCI][USBUHCI] - Let libusb handle IRP_MJ_POWER and IRP_MJ_SYSTEM_CONTROL requests svn path=/trunk/; revision=63668 --- reactos/drivers/usb/usbehci/usbehci.cpp | 7 ++++--- reactos/drivers/usb/usbohci/usbohci.cpp | 4 +++- reactos/drivers/usb/usbuhci/usbuhci.cpp | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/usb/usbehci/usbehci.cpp b/reactos/drivers/usb/usbehci/usbehci.cpp index d1d36372a7a..41e630fd126 100644 --- a/reactos/drivers/usb/usbehci/usbehci.cpp +++ b/reactos/drivers/usb/usbehci/usbehci.cpp @@ -22,7 +22,7 @@ DriverEntry( PUNICODE_STRING RegistryPath) { - /* initialize driver object*/ + /* initialize driver object */ DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch; @@ -30,13 +30,14 @@ DriverEntry( 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_SYSTEM_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch; - return STATUS_SUCCESS; } extern "C" { - void + void __cxa_pure_virtual() { // put error handling here diff --git a/reactos/drivers/usb/usbohci/usbohci.cpp b/reactos/drivers/usb/usbohci/usbohci.cpp index b5e6f0efbad..d51d609d729 100644 --- a/reactos/drivers/usb/usbohci/usbohci.cpp +++ b/reactos/drivers/usb/usbohci/usbohci.cpp @@ -22,7 +22,7 @@ DriverEntry( PUNICODE_STRING RegistryPath) { - /* initialize driver object*/ + /* initialize driver object */ DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch; @@ -30,6 +30,8 @@ DriverEntry( 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_SYSTEM_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch; return STATUS_SUCCESS; } diff --git a/reactos/drivers/usb/usbuhci/usbuhci.cpp b/reactos/drivers/usb/usbuhci/usbuhci.cpp index 9d53418dba2..54b54360872 100644 --- a/reactos/drivers/usb/usbuhci/usbuhci.cpp +++ b/reactos/drivers/usb/usbuhci/usbuhci.cpp @@ -22,7 +22,7 @@ DriverEntry( PUNICODE_STRING RegistryPath) { - /* initialize driver object*/ + /* initialize driver object */ DriverObject->DriverExtension->AddDevice = USBLIB_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBLIB_Dispatch; @@ -30,6 +30,8 @@ DriverEntry( 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_SYSTEM_CONTROL] = USBLIB_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBLIB_Dispatch; DriverObject->MajorFunction[IRP_MJ_PNP] = USBLIB_Dispatch; return STATUS_SUCCESS; }