Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix a couple of places where tagged commands support was not implemented.

Browse source 
- Uncomment buslogic.sys since it now half-works (at least it doesn't hang, and it even recognizes the driver, however an attempt to setup reactos to scsi disk fails).

svn path=/trunk/; revision=27493
This commit is contained in:
Aleksey Bragin 2007-07-08 17:14:19 +00:00
parent 34fdc401c5
commit 8d3e4b4e77
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/boot/bootdata/hivesys.inf
View file

@ -489,7 +489,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport"
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000004
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020

4
reactos/boot/freeldr/freeldr/reactos/setupldr.c
View file

@ -452,8 +452,8 @@ for(;;);
return;
/* Load buslogic.sys (depends on hardware detection) */
//if (!LoadDriver(SourcePath, "buslogic.sys"))
//return;
if (!LoadDriver(SourcePath, "buslogic.sys"))
return;
/* Load class2.sys */
if (!LoadDriver(SourcePath, "class2.sys"))

24
reactos/drivers/storage/scsiport/scsiport.c
View file

@ -116,7 +116,7 @@ SpiGetInquiryData (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
IN PIRP Irp);
static PSCSI_REQUEST_BLOCK_INFO
SpiGetSrbData(IN PVOID DeviceExtension,
SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
IN UCHAR PathId,
IN UCHAR TargetId,
IN UCHAR Lun,
@ -2888,6 +2888,7 @@ ScsiPortStartPacket(IN OUT PVOID Context)
PSCSI_REQUEST_BLOCK Srb;
PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context;
PSCSI_PORT_LUN_EXTENSION LunExtension;
PSCSI_REQUEST_BLOCK_INFO SrbInfo;
BOOLEAN Result;
BOOLEAN StartTimer;
@ -2937,8 +2938,6 @@ ScsiPortStartPacket(IN OUT PVOID Context)
/* Is this an abort request? */
if (Srb->Function == SRB_FUNCTION_ABORT_COMMAND)
{
PSCSI_REQUEST_BLOCK_INFO SrbInfo;
/* Get pointer to SRB info structure */
SrbInfo = SpiGetSrbData(DeviceExtension,
Srb->PathId,
@ -3011,8 +3010,13 @@ ScsiPortStartPacket(IN OUT PVOID Context)
/* If it's tagged - special thing */
if (Srb->QueueTag != SP_UNTAGGED)
{
/* TODO: Support tagged requests */
ASSERT(FALSE);
SrbInfo = &DeviceExtension->SrbInfo[Srb->QueueTag - 1];
/* Chek for consistency */
ASSERT(SrbInfo->Requests.Blink == NULL);
/* Insert it into the list of requests */
InsertTailList(&LunExtension->SrbInfo.Requests, &SrbInfo->Requests);
}
}
@ -3875,7 +3879,7 @@ SpiGetInquiryData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
}
static PSCSI_REQUEST_BLOCK_INFO
SpiGetSrbData(IN PVOID DeviceExtension,
SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
IN UCHAR PathId,
IN UCHAR TargetId,
IN UCHAR Lun,
@ -3900,9 +3904,11 @@ SpiGetSrbData(IN PVOID DeviceExtension,
}
else
{
/* TODO: Implement when we have it */
ASSERT(FALSE);
return NULL;
/* Make sure the tag is valid, if it is - return the data */
if (QueueTag > DeviceExtension->SrbDataCount || QueueTag < 1)
return NULL;
else
return &DeviceExtension->SrbInfo[QueueTag -1];
}
}