Author: janderwald
Date: Thu Jun 2 15:35:04 2011
New Revision: 52063
URL: http://svn.reactos.org/svn/reactos?rev=52063&view=rev
Log:
[USBSTOR]
- Comment out getting usb device interface. It is currently unused and usbhub
does not yet support it
- Forward pnp capabilities request to lower device object
- Fix compilation by Usurp
Modified:
branches/usb-bringup/drivers/usb/usbstor/error.c
branches/usb-bringup/drivers/usb/usbstor/fdo.c
Modified: branches/usb-bringup/drivers/usb/usbstor/error.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor/error.c?rev=52063&r1=52062&r2=52063&view=diff
==============================================================================
--- branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] Thu Jun 2
15:35:04 2011
@@ -134,7 +134,7 @@
//
Request =
(PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1;
DPRINT1("Retrying\n");
- Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp,
Request, Context->PDODeviceExtension);
+ Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp);
}
DPRINT1("USBSTOR_HandleTransferError returning with Status %x\n",
Status);
Modified: branches/usb-bringup/drivers/usb/usbstor/fdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor/fdo.c?rev=52063&r1=52062&r2=52063&view=diff
==============================================================================
--- branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] Thu Jun 2
15:35:04 2011
@@ -244,6 +244,7 @@
}while(Index < DeviceExtension->MaxLUN);
+#if 0
//
// finally get usb device interface
//
@@ -253,9 +254,10 @@
//
// failed to device interface
//
- DPRINT1("USBSTOR_FdoHandleStartDevice failed to device interface
%x\n", Status);
- return Status;
- }
+ DPRINT1("USBSTOR_FdoHandleStartDevice failed to get device interface
%x\n", Status);
+ return Status;
+ }
+#endif
//
// fdo is now initialized
@@ -306,11 +308,10 @@
case IRP_MN_QUERY_CAPABILITIES:
{
//
- // just forward irp to lower device
+ // FIXME: set custom capabilities
//
- //IoSkipCurrentIrpStackLocation(Irp);
- Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject,
Irp);
- break;
+ IoSkipCurrentIrpStackLocation(Irp);
+ return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);
}
case IRP_MN_START_DEVICE:
{
