Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-01 09:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix a few simple mistakes / typos.

Browse source 
- Enumerating buses almost works.

svn path=/trunk/; revision=26191
This commit is contained in:
Aleksey Bragin 2007-03-28 09:44:37 +00:00
parent 95c38a9cf1
commit 24387402f3
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -744,6 +744,10 @@ ScsiPortInitialize(IN PVOID Argument1,
/* Initialize the device base list */ /* Initialize the device base list */
InitializeListHead (&DeviceExtension->DeviceBaseListHead); InitializeListHead (&DeviceExtension->DeviceBaseListHead);
/* Initialize array of LUNs */
RtlZeroMemory(DeviceExtension->LunExtensionList,
sizeof(PSCSI_PORT_LUN_EXTENSION) * LUS_NUMBER);
/* Initialize the spin lock in the controller extension */ /* Initialize the spin lock in the controller extension */
KeInitializeSpinLock (&DeviceExtension->IrpLock); KeInitializeSpinLock (&DeviceExtension->IrpLock);
KeInitializeSpinLock (&DeviceExtension->SpinLock); KeInitializeSpinLock (&DeviceExtension->SpinLock);
@ -1001,7 +1005,8 @@ ByeBye:
IoDeleteDevice (PortDeviceObject); IoDeleteDevice (PortDeviceObject);
} }
DPRINT("ScsiPortInitialize() done!\n"); DPRINT("ScsiPortInitialize() done, Status = 0x%08X, DeviceFound = %b!\n",
Status, DeviceFound);
return (DeviceFound == FALSE) ? Status : STATUS_SUCCESS; return (DeviceFound == FALSE) ? Status : STATUS_SUCCESS;
} }
@ -1784,7 +1789,7 @@ SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
LunExtension = DeviceExtension->LunExtensionList[(TargetId + Lun) % LUS_NUMBER]; LunExtension = DeviceExtension->LunExtensionList[(TargetId + Lun) % LUS_NUMBER];
/* Iterate it until we find what we need */ /* Iterate it until we find what we need */
while (!LunExtension) while (LunExtension)
{ {
if (LunExtension->TargetId == TargetId && if (LunExtension->TargetId == TargetId &&
LunExtension->Lun == Lun && LunExtension->Lun == Lun &&
@ -1903,6 +1908,7 @@ SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject,
INQUIRYDATABUFFERSIZE); INQUIRYDATABUFFERSIZE);
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
KeepTrying = FALSE;
} }
else else
{ {
@ -1910,14 +1916,21 @@ SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject,
if (Srb.SrbStatus & SRB_STATUS_QUEUE_FROZEN) if (Srb.SrbStatus & SRB_STATUS_QUEUE_FROZEN)
{ {
/* Something weird happeend */ /* Something weird happeend */
KeepTrying = FALSE;
ASSERT(FALSE); ASSERT(FALSE);
} }
/* Check if data overrun happened */ /* Check if data overrun happened */
if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_DATA_OVERRUN) if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_DATA_OVERRUN)
{ {
/* TODO: Implement */ /* Nothing dramatic, just copy data, but limiting the size */
ASSERT(FALSE); RtlCopyMemory(LunInfo->InquiryData,
InquiryBuffer,
(Srb.DataTransferLength > INQUIRYDATABUFFERSIZE) ?
INQUIRYDATABUFFERSIZE : Srb.DataTransferLength);
Status = STATUS_SUCCESS;
KeepTrying = FALSE;
} }
else if ((Srb.SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && else if ((Srb.SrbStatus & SRB_STATUS_AUTOSENSE_VALID) &&
SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST)
@ -1926,6 +1939,7 @@ SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject,
Mark it as invalid anyway */ Mark it as invalid anyway */
Status = STATUS_INVALID_DEVICE_REQUEST; Status = STATUS_INVALID_DEVICE_REQUEST;
KeepTrying = FALSE;
} }
else else
{ {
@ -1946,7 +1960,7 @@ SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject,
if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_FUNCTION || if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_FUNCTION ||
SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_SRB_BLOCK_LENGTH) SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_SRB_BLOCK_LENGTH)
{ {
Status = STATUS_INVALID_DEVICE_REQUEST; Status = STATUS_INVALID_DEVICE_REQUEST;
} }
else else
{ {