Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 02:13:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR]

Browse source 
- partly implement support for scsiop_mechanism command, not yet activated
- terminate request properly when it is not supported. Fixes leaking of irp requests

svn path=/trunk/; revision=59081
This commit is contained in:
Johannes Anderwald 2013-05-24 19:02:28 +00:00
parent a2085a332c
commit 6b5c8cd891
1 changed files with 64 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

66
reactos/drivers/usb/usbstor/scsi.c
View file

@ -1249,6 +1249,52 @@ USBSTOR_SendTestUnit(
return USBSTOR_SendRequest(DeviceObject, Irp, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); return USBSTOR_SendRequest(DeviceObject, Irp, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount);
} }
NTSTATUS
USBSTOR_SendUnknownRequest(
IN PDEVICE_OBJECT DeviceObject,
IN OUT PIRP Irp,
IN ULONG RetryCount)
{
PPDO_DEVICE_EXTENSION PDODeviceExtension;
PIO_STACK_LOCATION IoStack;
PSCSI_REQUEST_BLOCK Request;
UFI_TEST_UNIT_CMD Cmd;
//
// get current stack location
//
IoStack = IoGetCurrentIrpStackLocation(Irp);
//
// get request block
//
Request = IoStack->Parameters.Others.Argument1;
//
// get PDO device extension
//
PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
//
// check that we're sending to the right LUN
//
ASSERT(Request->Cdb[1] == (PDODeviceExtension->LUN & MAX_LUN));
//
// sanity check
//
ASSERT(Request->CdbLength == sizeof(UFI_TEST_UNIT_CMD));
//
// initialize test unit cmd
//
RtlCopyMemory(&Cmd, Request->Cdb, Request->CdbLength);
//
// send the request
//
return USBSTOR_SendRequest(DeviceObject, Irp, Request->CdbLength, (PUCHAR)&Cmd, Request->DataTransferLength, Request->DataBuffer, RetryCount);
}
NTSTATUS NTSTATUS
USBSTOR_HandleExecuteSCSI( USBSTOR_HandleExecuteSCSI(
@ -1366,12 +1412,28 @@ USBSTOR_HandleExecuteSCSI(
// //
Status = USBSTOR_SendTestUnit(DeviceObject, Irp, RetryCount); Status = USBSTOR_SendTestUnit(DeviceObject, Irp, RetryCount);
} }
#if 0
else if (pCDB->AsByte[0] == SCSIOP_MECHANISM_STATUS)
{
DPRINT1("SCSIOP_MECHANISM_STATUS\n");
//
// Just send it the way it is
//
Status = USBSTOR_SendUnknownRequest(DeviceObject, Irp, RetryCount);
}
#endif
else else
{ {
// unsupported request
DPRINT1("UNIMPLEMENTED Operation Code %x\n", pCDB->AsByte[0]); DPRINT1("UNIMPLEMENTED Operation Code %x\n", pCDB->AsByte[0]);
Request->SrbStatus = SRB_STATUS_ERROR;
Status = STATUS_NOT_SUPPORTED; Status = STATUS_NOT_SUPPORTED;
DbgBreakPoint();
Request->SrbStatus = SRB_STATUS_ERROR;
Irp->IoStatus.Status = Status;
Irp->IoStatus.Information = 0;
USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp);
IoCompleteRequest(Irp, IO_NO_INCREMENT);
} }
return Status; return Status;