Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR]

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb/usbstor/error.c
View file

@ -134,7 +134,7 @@ USBSTOR_HandleTransferError(
// //
Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1;
DPRINT1("Retrying\n"); 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); DPRINT1("USBSTOR_HandleTransferError returning with Status %x\n", Status);

11
drivers/usb/usbstor/fdo.c
View file

@ -244,6 +244,7 @@ USBSTOR_FdoHandleStartDevice(
}while(Index < DeviceExtension->MaxLUN); }while(Index < DeviceExtension->MaxLUN);
#if 0
// //
// finally get usb device interface // finally get usb device interface
// //
@ -253,9 +254,10 @@ USBSTOR_FdoHandleStartDevice(
// //
// failed to device interface // 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; return Status;
} }
#endif
// //
// fdo is now initialized // fdo is now initialized
@ -306,11 +308,10 @@ USBSTOR_FdoHandlePnp(
case IRP_MN_QUERY_CAPABILITIES: case IRP_MN_QUERY_CAPABILITIES:
{ {
// //
// just forward irp to lower device // FIXME: set custom capabilities
// //
//IoSkipCurrentIrpStackLocation(Irp); IoSkipCurrentIrpStackLocation(Irp);
Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);
break;
} }
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
{ {