Author: tfaber
Date: Sun Jun 29 12:53:11 2014
New Revision: 63668
URL: http://svn.reactos.org/svn/reactos?rev=63668&view=rev
Log:
{USBEHCI][USBOHCI][USBUHCI]
- Let libusb handle IRP_MJ_POWER and IRP_MJ_SYSTEM_CONTROL requests
Modified:
trunk/reactos/drivers/usb/usbehci/usbehci.cpp
trunk/reactos/drivers/usb/usbohci/usbohci.cpp
trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp
Modified: trunk/reactos/drivers/usb/usbehci/usbehci.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehci.cpp?rev=63668&r1=63667&r2=63668&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/usbehci.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/usbehci.cpp [iso-8859-1] Sun Jun 29
12:53:11 2014
@@ -22,7 +22,7 @@
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 @@
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
Modified: trunk/reactos/drivers/usb/usbohci/usbohci.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohci.cpp?rev=63668&r1=63667&r2=63668&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/usbohci.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/usbohci.cpp [iso-8859-1] Sun Jun 29
12:53:11 2014
@@ -22,7 +22,7 @@
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 @@
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;
}
Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp?rev=63668&r1=63667&r2=63668&view=diff
==============================================================================
--- trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] Sun Jun 29
12:53:11 2014
@@ -22,7 +22,7 @@
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 @@
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;
}
