[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

svn path=/branches/usb-bringup/; revision=52063
This commit is contained in:
Johannes Anderwald 2011-06-02 15:35:04 +00:00
parent 217a0347b7
commit 0dede89665
2 changed files with 7 additions and 6 deletions

View file

@ -134,7 +134,7 @@ USBSTOR_HandleTransferError(
//
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);

View file

@ -244,6 +244,7 @@ USBSTOR_FdoHandleStartDevice(
}while(Index < DeviceExtension->MaxLUN);
#if 0
//
// finally get usb device interface
//
@ -253,9 +254,10 @@ USBSTOR_FdoHandleStartDevice(
//
// failed to device interface
//
DPRINT1("USBSTOR_FdoHandleStartDevice failed to device interface %x\n", Status);
DPRINT1("USBSTOR_FdoHandleStartDevice failed to get device interface %x\n", Status);
return Status;
}
#endif
//
// fdo is now initialized
@ -306,11 +308,10 @@ USBSTOR_FdoHandlePnp(
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:
{