Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the handling for errors/retries.

Browse source 
svn path=/trunk/; revision=3916
This commit is contained in:
Hartmut Birr 2003-01-02 16:03:04 +00:00
parent f9725d0888
commit c937cd4933
1 changed files with 20 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
reactos/drivers/storage/class2/class2.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: class2.c,v 1.28 2002/12/15 14:33:09 ekohl Exp $ /* $Id: class2.c,v 1.29 2003/01/02 16:03:04 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -69,9 +69,7 @@ ScsiClassShutdownFlush(IN PDEVICE_OBJECT DeviceObject,
static VOID static VOID
ScsiClassRetryRequest(PDEVICE_OBJECT DeviceObject, ScsiClassRetryRequest(PDEVICE_OBJECT DeviceObject,
PIRP Irp, PIRP Irp);
PSCSI_REQUEST_BLOCK Srb,
BOOLEAN Associated);
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -773,7 +771,7 @@ ScsiClassInterpretSenseInfo(PDEVICE_OBJECT DeviceObject,
DPRINT("ScsiClassInterpretSenseInfo() called\n"); DPRINT("ScsiClassInterpretSenseInfo() called\n");
DPRINT("Srb->SrbStatus %lx\n", Srb->SrbStatus); DPRINT("Srb->SrbStatus %lx\n", Srb->SrbStatus);
if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_PENDING) if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_PENDING)
{ {
*Status = STATUS_SUCCESS; *Status = STATUS_SUCCESS;
@ -897,10 +895,10 @@ ScsiClassIoComplete(PDEVICE_OBJECT DeviceObject,
DeviceObject, Irp, Context); DeviceObject, Irp, Context);
DeviceExtension = DeviceObject->DeviceExtension; DeviceExtension = DeviceObject->DeviceExtension;
Srb = (PSCSI_REQUEST_BLOCK)Context;
DPRINT("Srb %p\n", Srb);
IrpStack = IoGetCurrentIrpStackLocation(Irp); IrpStack = IoGetCurrentIrpStackLocation(Irp);
Srb = IrpStack->Parameters.Scsi.Srb;
DPRINT("Srb %p\n", Srb);
if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS) if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS)
{ {
@ -920,9 +918,7 @@ ScsiClassIoComplete(PDEVICE_OBJECT DeviceObject,
((ULONG)IrpStack->Parameters.Others.Argument4)--; ((ULONG)IrpStack->Parameters.Others.Argument4)--;
ScsiClassRetryRequest(DeviceObject, ScsiClassRetryRequest(DeviceObject,
Irp, Irp);
Srb,
FALSE);
return(STATUS_MORE_PROCESSING_REQUIRED); return(STATUS_MORE_PROCESSING_REQUIRED);
} }
} }
@ -975,10 +971,10 @@ ScsiClassIoCompleteAssociated(PDEVICE_OBJECT DeviceObject,
MasterIrp = Irp->AssociatedIrp.MasterIrp; MasterIrp = Irp->AssociatedIrp.MasterIrp;
DeviceExtension = DeviceObject->DeviceExtension; DeviceExtension = DeviceObject->DeviceExtension;
Srb = (PSCSI_REQUEST_BLOCK)Context;
DPRINT("Srb %p\n", Srb);
IrpStack = IoGetCurrentIrpStackLocation(Irp); IrpStack = IoGetCurrentIrpStackLocation(Irp);
Srb = IrpStack->Parameters.Scsi.Srb;
DPRINT("Srb %p\n", Srb);
if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS) if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS)
{ {
@ -1002,9 +998,7 @@ ScsiClassIoCompleteAssociated(PDEVICE_OBJECT DeviceObject,
((ULONG)IrpStack->Parameters.Others.Argument4)--; ((ULONG)IrpStack->Parameters.Others.Argument4)--;
ScsiClassRetryRequest(DeviceObject, ScsiClassRetryRequest(DeviceObject,
Irp, Irp);
Srb,
TRUE);
return(STATUS_MORE_PROCESSING_REQUIRED); return(STATUS_MORE_PROCESSING_REQUIRED);
} }
} }
@ -1617,20 +1611,19 @@ ScsiClassShutdownFlush(IN PDEVICE_OBJECT DeviceObject,
static VOID static VOID
ScsiClassRetryRequest(PDEVICE_OBJECT DeviceObject, ScsiClassRetryRequest(PDEVICE_OBJECT DeviceObject,
PIRP Irp, PIRP Irp)
PSCSI_REQUEST_BLOCK Srb,
BOOLEAN Associated)
{ {
PDEVICE_EXTENSION DeviceExtension; PDEVICE_EXTENSION DeviceExtension;
PIO_STACK_LOCATION CurrentIrpStack; PIO_STACK_LOCATION CurrentIrpStack;
PIO_STACK_LOCATION NextIrpStack; PSCSI_REQUEST_BLOCK Srb;
ULONG TransferLength; ULONG TransferLength;
DPRINT("ScsiPortRetryRequest() called\n"); DPRINT("ScsiPortRetryRequest() called\n");
DeviceExtension = DeviceObject->DeviceExtension; DeviceExtension = DeviceObject->DeviceExtension;
CurrentIrpStack = IoGetCurrentIrpStackLocation(Irp); CurrentIrpStack = IoGetCurrentIrpStackLocation(Irp);
NextIrpStack = IoGetNextIrpStackLocation(Irp); Srb = CurrentIrpStack->Parameters.Scsi.Srb;
if (CurrentIrpStack->MajorFunction == IRP_MJ_READ || if (CurrentIrpStack->MajorFunction == IRP_MJ_READ ||
CurrentIrpStack->MajorFunction == IRP_MJ_WRITE) CurrentIrpStack->MajorFunction == IRP_MJ_WRITE)
@ -1646,6 +1639,7 @@ ScsiClassRetryRequest(PDEVICE_OBJECT DeviceObject,
TransferLength = 0; TransferLength = 0;
} }
Srb->DataBuffer = MmGetSystemAddressForMdl(Irp->MdlAddress);
Srb->DataTransferLength = TransferLength; Srb->DataTransferLength = TransferLength;
Srb->SrbStatus = 0; Srb->SrbStatus = 0;
Srb->ScsiStatus = 0; Srb->ScsiStatus = 0;
@ -1654,27 +1648,12 @@ ScsiClassRetryRequest(PDEVICE_OBJECT DeviceObject,
// Srb->Flags = // Srb->Flags =
// Srb->QueueTag = SP_UNTAGGED; // Srb->QueueTag = SP_UNTAGGED;
NextIrpStack->MajorFunction = IRP_MJ_SCSI; /*
NextIrpStack->Parameters.Scsi.Srb = Srb; * Our function is called from a completion routine. We must
* recall the driver with the same stack location. IoCallDriver
if (Associated == FALSE) * goes to the next location. So we go one step back.
{ */
IoSetCompletionRoutine(Irp, IoSkipCurrentIrpStackLocation(Irp);
ScsiClassIoComplete,
Srb,
TRUE,
TRUE,
TRUE);
}
else
{
IoSetCompletionRoutine(Irp,
ScsiClassIoCompleteAssociated,
Srb,
TRUE,
TRUE,
TRUE);
}
IoCallDriver(DeviceExtension->PortDeviceObject, IoCallDriver(DeviceExtension->PortDeviceObject,
Irp); Irp);