-/* $Id: atapi.c,v 1.7 2002/02/04 01:21:03 ekohl Exp $
+/* $Id: atapi.c,v 1.8 2002/03/03 19:37:41 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS ATAPI miniport driver
{
DevExt->CurrentSrb = NULL;
Srb->SrbStatus = (UCHAR)Result;
-#if 0
+
ScsiPortNotification(RequestComplete,
DeviceExtension,
Srb);
-
ScsiPortNotification(NextRequest,
DeviceExtension,
NULL);
-#endif
+ }
+ else
+ {
+ DPRINT1("SrbStatus = SRB_STATUS_PENDING\n");
}
+ DPRINT1("AtapiStartIo() done\n");
+
return(TRUE);
}
- DPRINT1("AtapiInterrupt() called!\n");
+ DPRINT("AtapiInterrupt() called!\n");
DevExt = (PATAPI_MINIPORT_EXTENSION)DeviceExtension;
+ if (DevExt->ExpectingInterrupt == FALSE)
+ {
+ return(FALSE);
+ }
+
+ DevExt->ExpectingInterrupt = FALSE;
+
Srb = DevExt->CurrentSrb;
- DPRINT1("Srb: %p\n", Srb);
+ DPRINT("Srb: %p\n", Srb);
CommandPortBase = DevExt->CommandPortBase;
ControlPortBase = DevExt->ControlPortBase;
#endif
}
- DPRINT1("AtapiInterrupt() done!\n");
+ ScsiPortNotification(RequestComplete,
+ DeviceExtension,
+ Srb);
+
+ ScsiPortNotification(NextRequest,
+ DeviceExtension,
+ NULL);
+
+
+ DPRINT("AtapiInterrupt() done!\n");
return(TRUE);
}
for (UnitNumber = 0; UnitNumber < 2; UnitNumber++)
{
/* disable interrupts */
- IDEWriteDriveControl(CommandPortBase,
+ IDEWriteDriveControl(ControlPortBase,
IDE_DC_nIEN);
/* select drive */
return(IDEReadError(CommandPort) == 1);
}
-
-// AtapiIdentifyDevice
-//
-// DESCRIPTION:
-// Get the identification block from the drive
-//
-// RUN LEVEL:
-// PASSIVE_LEVEL
-//
-// ARGUMENTS:
-// IN int CommandPort Address of the command port
-// IN int DriveNum The drive index (0,1)
-// OUT PIDE_DRIVE_IDENTIFY DrvParms Address to write drive ident block
-//
-// RETURNS:
-// TRUE The drive identification block was retrieved successfully
-//
+/*
+ * AtapiIdentifyDevice
+ *
+ * DESCRIPTION:
+ * Get the identification block from the drive
+ *
+ * RUN LEVEL:
+ * PASSIVE_LEVEL
+ *
+ * ARGUMENTS:
+ * CommandPort
+ * Address of the command port
+ * ControlPort
+ * Address of the control port
+ * DriveNum
+ * The drive index (0,1)
+ * Atapi
+ * Send an ATA(FALSE) or an ATAPI(TRUE) identify comand
+ * DrvParms
+ * Address to write drive ident block
+ *
+ * RETURNS:
+ * TRUE: The drive identification block was retrieved successfully
+ * FALSE: an error ocurred
+ */
static BOOLEAN
AtapiIdentifyDevice(IN ULONG CommandPort,
{
ULONG SrbStatus = SRB_STATUS_SUCCESS;
- DPRINT("AtapiSendIdeCommand() called!\n");
+ DPRINT1("AtapiSendIdeCommand() called!\n");
DPRINT("PathId: %lu TargetId: %lu Lun: %lu\n",
Srb->PathId,
break;
}
- DPRINT("AtapiSendIdeCommand() done!\n");
+ DPRINT1("AtapiSendIdeCommand() done!\n");
return(SrbStatus);
}
PINQUIRYDATA InquiryData;
ULONG i;
- DPRINT("SCSIOP_INQUIRY: TargetId: %lu\n", Srb->TargetId);
+ DPRINT1("SCSIOP_INQUIRY: TargetId: %lu\n", Srb->TargetId);
if ((Srb->PathId != 0) ||
(Srb->TargetId > 1) ||
PIDE_DRIVE_IDENTIFY DeviceParams;
ULONG LastSector;
- DPRINT("SCSIOP_READ_CAPACITY: TargetId: %lu\n", Srb->TargetId);
+ DPRINT1("SCSIOP_READ_CAPACITY: TargetId: %lu\n", Srb->TargetId);
if ((Srb->PathId != 0) ||
(Srb->TargetId > 1) ||
UCHAR Status;
- DPRINT("AtapiReadWrite() called!\n");
+ DPRINT1("AtapiReadWrite() called!\n");
if ((Srb->PathId != 0) ||
(Srb->TargetId > 1) ||
return(SRB_STATUS_SELECTION_TIMEOUT);
}
- DPRINT("SCSIOP_WRITE: TargetId: %lu\n",
- Srb->TargetId);
+ DPRINT("SCSIOP_WRITE: TargetId: %lu\n",
+ Srb->TargetId);
DeviceParams = &DeviceExtension->DeviceParams[Srb->TargetId];
/* FIXME: Write data here! */
- DPRINT("AtapiReadWrite() done!\n");
+ DPRINT1("AtapiReadWrite() done!\n");
/* Wait for interrupt. */
return(SRB_STATUS_PENDING);
-/* $Id: class2.c,v 1.6 2002/02/26 23:02:14 ekohl Exp $
+/* $Id: class2.c,v 1.7 2002/03/03 19:38:09 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
ScsiClassBuildRequest(PDEVICE_OBJECT DeviceObject,
PIRP Irp)
{
- PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension;
- PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp);
- PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp);
- LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset;
- LARGE_INTEGER startingBlock;
+ PDEVICE_EXTENSION DeviceExtension;
+ PIO_STACK_LOCATION CurrentIrpStack;
+ PIO_STACK_LOCATION NextIrpStack;
+ LARGE_INTEGER StartingOffset;
+ LARGE_INTEGER StartingBlock;
PSCSI_REQUEST_BLOCK Srb;
PCDB Cdb;
ULONG LogicalBlockAddress;
- USHORT transferBlocks;
+ USHORT TransferBlocks;
+
+ DeviceExtension = DeviceObject->DeviceExtension;
+ CurrentIrpStack = IoGetCurrentIrpStackLocation(Irp);
+ NextIrpStack = IoGetNextIrpStackLocation(Irp);
+ StartingOffset = CurrentIrpStack->Parameters.Read.ByteOffset;
/* calculate logical block address */
- startingBlock.QuadPart = startingOffset.QuadPart / 512; // >> deviceExtension->SectorShift;
- LogicalBlockAddress = (ULONG)startingBlock.u.LowPart;
+ StartingBlock.QuadPart = StartingOffset.QuadPart / 512; // >> deviceExtension->SectorShift;
+ LogicalBlockAddress = (ULONG)StartingBlock.u.LowPart;
DPRINT1("Logical block address: %lu\n", LogicalBlockAddress);
Srb->SrbFlags = 0;
Srb->Length = sizeof(SCSI_REQUEST_BLOCK); //SCSI_REQUEST_BLOCK_SIZE;
Srb->OriginalRequest = Irp;
- Srb->PathId = deviceExtension->PathId;
- Srb->TargetId = deviceExtension->TargetId;
- Srb->Lun = deviceExtension->Lun;
+ Srb->PathId = DeviceExtension->PathId;
+ Srb->TargetId = DeviceExtension->TargetId;
+ Srb->Lun = DeviceExtension->Lun;
Srb->Function = SRB_FUNCTION_EXECUTE_SCSI;
Srb->DataBuffer = MmGetMdlVirtualAddress(Irp->MdlAddress);
- Srb->DataTransferLength = currentIrpStack->Parameters.Read.Length;
+ Srb->DataTransferLength = CurrentIrpStack->Parameters.Read.Length;
Srb->QueueAction = SRB_SIMPLE_TAG_REQUEST;
Srb->QueueSortKey = LogicalBlockAddress;
- Srb->SenseInfoBuffer = deviceExtension->SenseData;
+ Srb->SenseInfoBuffer = DeviceExtension->SenseData;
Srb->SenseInfoBufferLength = SENSE_BUFFER_SIZE;
Srb->TimeOutValue =
- ((Srb->DataTransferLength + 0xFFFF) >> 16) * deviceExtension->TimeOutValue;
+ ((Srb->DataTransferLength + 0xFFFF) >> 16) * DeviceExtension->TimeOutValue;
Srb->SrbStatus = SRB_STATUS_SUCCESS;
Srb->ScsiStatus = 0;
RtlZeroMemory(Cdb,
MAXIMUM_CDB_SIZE);
- Cdb->CDB10.LogicalUnitNumber = deviceExtension->Lun;
- transferBlocks = (USHORT)(currentIrpStack->Parameters.Read.Length >> deviceExtension->SectorShift);
-
- //
- // Move little endian values into CDB in big endian format.
- //
+ Cdb->CDB10.LogicalUnitNumber = DeviceExtension->Lun;
+ TransferBlocks = (USHORT)(CurrentIrpStack->Parameters.Read.Length >> DeviceExtension->SectorShift);
+ /* Copy little endian values into CDB in big endian format */
Cdb->CDB10.LogicalBlockByte0 = ((PFOUR_BYTE)&LogicalBlockAddress)->Byte3;
Cdb->CDB10.LogicalBlockByte1 = ((PFOUR_BYTE)&LogicalBlockAddress)->Byte2;
Cdb->CDB10.LogicalBlockByte2 = ((PFOUR_BYTE)&LogicalBlockAddress)->Byte1;
Cdb->CDB10.LogicalBlockByte3 = ((PFOUR_BYTE)&LogicalBlockAddress)->Byte0;
- Cdb->CDB10.TransferBlocksMsb = ((PFOUR_BYTE)&transferBlocks)->Byte1;
- Cdb->CDB10.TransferBlocksLsb = ((PFOUR_BYTE)&transferBlocks)->Byte0;
+ Cdb->CDB10.TransferBlocksMsb = ((PFOUR_BYTE)&TransferBlocks)->Byte1;
+ Cdb->CDB10.TransferBlocksLsb = ((PFOUR_BYTE)&TransferBlocks)->Byte0;
- //
- // Set transfer direction flag and Cdb command.
- //
- if (currentIrpStack->MajorFunction == IRP_MJ_READ)
+ if (CurrentIrpStack->MajorFunction == IRP_MJ_READ)
{
DPRINT1("ScsiClassBuildRequest: Read Command\n");
Cdb->CDB10.OperationCode = SCSIOP_WRITE;
}
- //
- // If this is not a write-through request, then allow caching.
- //
#if 0
- if (!(currentIrpStack->Flags & SL_WRITE_THROUGH))
+ /* if this is not a write-through request, then allow caching */
+ if (!(CurrentIrpStack->Flags & SL_WRITE_THROUGH))
{
Srb->SrbFlags |= SRB_FLAGS_ADAPTER_CACHE_ENABLE;
}
else
{
/* if write caching is enable then force media access in the cdb */
- if (deviceExtension->DeviceFlags & DEV_WRITE_CACHE)
+ if (DeviceExtension->DeviceFlags & DEV_WRITE_CACHE)
{
Cdb->CDB10.ForceUnitAccess = TRUE;
}
}
#endif
- /* Or in the default flags from the device object. */
- Srb->SrbFlags |= deviceExtension->SrbFlags;
-
- //
- // Set up major SCSI function.
- //
-
- nextIrpStack->MajorFunction = IRP_MJ_SCSI;
+ /* or in the default flags from the device object. */
+ Srb->SrbFlags |= DeviceExtension->SrbFlags;
- //
- // Save SRB address in next stack for port driver.
- //
- nextIrpStack->Parameters.Scsi.Srb = Srb;
+ NextIrpStack->MajorFunction = IRP_MJ_SCSI;
+ NextIrpStack->Parameters.Scsi.Srb = Srb;
- //
- // Save retry count in current IRP stack.
- //
#if 0
- currentIrpStack->Parameters.Others.Argument4 = (PVOID)MAXIMUM_RETRIES;
+ /* save retry count in current IRP stack */
+ CurrentIrpStack->Parameters.Others.Argument4 = (PVOID)MAXIMUM_RETRIES;
#endif
- /* set up IoCompletion routine address */
+ DPRINT1("IoSetCompletionRoutine (Irp %p Srb %p)\n", Irp, Srb);
IoSetCompletionRoutine(Irp,
ScsiClassIoComplete,
Srb,
{
DPRINT("ScsiPort%lu found.\n", PortNumber);
- /* Check scsi port for attached disk drives */
+ /* check scsi port for attached disk drives */
if (InitializationData->ClassFindDevices(DriverObject,
Argument2,
InitializationData,
}
DPRINT1("ScsiClassInitialize() done!\n");
-// DPRINT1("** System stopped! **\n");
-//for(;;);
+
return((DiskFound == TRUE) ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE);
}
PSCSI_REQUEST_BLOCK Srb;
NTSTATUS Status;
- DPRINT1("ScsiClassIoComplete() called\n");
+ DPRINT1("ScsiClassIoComplete(DeviceObject %p Irp %p Context %p) called\n",
+ DeviceObject, Irp, Context);
DeviceExtension = DeviceObject->DeviceExtension;
Srb = (PSCSI_REQUEST_BLOCK)Context;
+ DPRINT1("Srb %p\n", Srb);
IrpStack = IoGetCurrentIrpStackLocation(Irp);
+#if 0
if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS)
{
Status = STATUS_SUCCESS;
{
/* FIXME: improve error handling */
DPRINT1("Srb->SrbStatus %lx\n", Srb->SrbStatus);
+
+ if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_PENDING)
+ {
+ Status = STATUS_SUCCESS;
+ }
+ else
Status = STATUS_UNSUCCESSFUL;
}
+#endif
/* FIXME: use lookaside list instead */
- DPRINT1("Freed SRB %p\n", Srb);
- ExFreePool(Srb);
-
+ DPRINT1("Freed SRB %p\n", IrpStack->Parameters.Scsi.Srb);
+ ExFreePool(IrpStack->Parameters.Scsi.Srb);
- Irp->IoStatus.Status = Status;
+// Irp->IoStatus.Status = Status;
+#if 0
if (!NT_SUCCESS(Status) &&
IoIsErrorUserInduced(Status))
{
FALSE);
}
}
+#endif
DPRINT1("ScsiClassIoComplete() done (Status %lx)\n", Status);
- return(Status);
+// return(Status);
+ return(STATUS_SUCCESS);
}
if (DeviceExtension->ClassStartIo != NULL)
{
+ DPRINT1("ScsiClassReadWrite() starting packet\n");
+
IoMarkIrpPending(Irp);
IoStartPacket(DeviceObject,
Irp,
ScsiClassBuildRequest(DeviceObject,
Irp);
- DPRINT("ScsiClassReadWrite() done\n");
+ DPRINT1("ScsiClassReadWrite() done\n");
/* Call the port driver */
return(IoCallDriver(DeviceExtension->PortDeviceObject,
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: scsiport.c,v 1.6 2002/02/27 22:50:31 ekohl Exp $
+/* $Id: scsiport.c,v 1.7 2002/03/03 19:39:10 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
{
PIO_SCSI_CAPABILITIES Capabilities;
- DPRINT(" IOCTL_SCSI_GET_CAPABILITIES\n");
+ DPRINT1(" IOCTL_SCSI_GET_CAPABILITIES\n");
Capabilities = (PIO_SCSI_CAPABILITIES)Irp->AssociatedIrp.SystemBuffer;
Capabilities->Length = sizeof(IO_SCSI_CAPABILITIES);
PIO_STACK_LOCATION IrpStack;
KIRQL OldIrql;
- DPRINT("ScsiPortStartIo() called!\n");
+ DPRINT1("ScsiPortStartIo() called!\n");
DeviceExtension = DeviceObject->DeviceExtension;
IrpStack = IoGetCurrentIrpStackLocation(Irp);
FALSE);
}
if (DeviceExtension->IrpFlags | IRP_FLAG_COMPLETE)
+ {
+ DeviceExtension->IrpFlags &= ~IRP_FLAG_COMPLETE;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
+ }
if (DeviceExtension->IrpFlags | IRP_FLAG_NEXT)
+ {
+ DeviceExtension->IrpFlags &= ~IRP_FLAG_NEXT;
IoStartNextPacket(DeviceObject, FALSE);
+ }
}
break;
default:
Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
Irp->IoStatus.Information = 0;
- IoStartNextPacket(DeviceObject,
- FALSE);
IoCompleteRequest(Irp,
IO_NO_INCREMENT);
+ IoStartNextPacket(DeviceObject,
+ FALSE);
break;
}
- DPRINT("ScsiPortStartIo() done\n");
+ DPRINT1("ScsiPortStartIo() done\n");
}
{
PSCSI_PORT_DEVICE_EXTENSION DeviceExtension;
- DPRINT1("ScsiPortDpcForIsr()\n");
+ DPRINT1("ScsiPortDpcForIsr(Dpc %p DpcDeviceObject %p DpcIrp %p DpcContext %p)\n",
+ Dpc, DpcDeviceObject, DpcIrp, DpcContext);
DeviceExtension = (PSCSI_PORT_DEVICE_EXTENSION)DpcContext;
DeviceExtension->CurrentIrp = NULL;
- DpcIrp->IoStatus.Information = 0;
- DpcIrp->IoStatus.Status = STATUS_SUCCESS;
+// DpcIrp->IoStatus.Information = 0;
+// DpcIrp->IoStatus.Status = STATUS_SUCCESS;
+
+ if (DeviceExtension->IrpFlags | IRP_FLAG_COMPLETE)
+ {
+ DeviceExtension->IrpFlags &= ~IRP_FLAG_COMPLETE;
+ IoCompleteRequest(DpcIrp, IO_NO_INCREMENT);
+ }
+
+ if (DeviceExtension->IrpFlags | IRP_FLAG_NEXT)
+ {
+ DeviceExtension->IrpFlags &= ~IRP_FLAG_NEXT;
+// IoStartNextPacket(DpcDeviceObject, FALSE);
+ }
- IoCompleteRequest(DpcIrp,
- IO_NO_INCREMENT);
- IoStartNextPacket(DpcDeviceObject,
- FALSE);
+ DPRINT1("ScsiPortDpcForIsr() done\n");
}
projects / reactos.git / commitdiff