mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
- Implemented LUN-Extensions.
- Moved Inquiry-Data from Port-Extension to LUN-Extensions. svn path=/trunk/; revision=5984
This commit is contained in:
Eric Kohl
parent
a7793b4ec9
commit
9d8179a6c8
2 changed files with 407 additions and 294 deletions
|
|
@ -16,7 +16,7 @@
|
|||
* 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.32 2003/09/04 11:30:42 ekohl Exp $
|
||||
/* $Id: scsiport.c,v 1.33 2003/09/04 23:33:55 ekohl Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
|
@ -79,8 +79,24 @@ ScsiPortCreatePortDevice(IN PDRIVER_OBJECT DriverObject,
|
|||
IN ULONG PortCount,
|
||||
IN OUT PSCSI_PORT_DEVICE_EXTENSION *RealDeviceExtension);
|
||||
|
||||
static PSCSI_PORT_LUN_EXTENSION
|
||||
SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
IN UCHAR PathId,
|
||||
IN UCHAR TargetId,
|
||||
IN UCHAR Lun);
|
||||
|
||||
static PSCSI_PORT_LUN_EXTENSION
|
||||
SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
IN UCHAR PathId,
|
||||
IN UCHAR TargetId,
|
||||
IN UCHAR Lun);
|
||||
|
||||
static VOID
|
||||
ScsiPortInquire(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension);
|
||||
ScsiPortInquire(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension);
|
||||
|
||||
static ULONG
|
||||
SpiGetInquiryData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
OUT PSCSI_ADAPTER_BUS_INFO AdapterBusInfo);
|
||||
|
||||
static BOOLEAN STDCALL
|
||||
ScsiPortIsr(IN PKINTERRUPT Interrupt,
|
||||
|
|
@ -337,7 +353,7 @@ ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension,
|
|||
|
||||
|
||||
/*
|
||||
* @unimplemented
|
||||
* @implemented
|
||||
*/
|
||||
PVOID STDCALL
|
||||
ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension,
|
||||
|
|
@ -345,8 +361,35 @@ ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension,
|
|||
IN UCHAR TargetId,
|
||||
IN UCHAR Lun)
|
||||
{
|
||||
DPRINT("ScsiPortGetLogicalUnit()\n");
|
||||
UNIMPLEMENTED;
|
||||
PSCSI_PORT_DEVICE_EXTENSION DeviceExtension;
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
PLIST_ENTRY Entry;
|
||||
|
||||
DPRINT("ScsiPortGetLogicalUnit() called\n");
|
||||
|
||||
DeviceExtension = CONTAINING_RECORD(HwDeviceExtension,
|
||||
SCSI_PORT_DEVICE_EXTENSION,
|
||||
MiniPortDeviceExtension);
|
||||
if (IsListEmpty(&DeviceExtension->LunExtensionListHead))
|
||||
return NULL;
|
||||
|
||||
Entry = DeviceExtension->LunExtensionListHead.Flink;
|
||||
while (Entry != &DeviceExtension->LunExtensionListHead)
|
||||
{
|
||||
LunExtension = CONTAINING_RECORD(Entry,
|
||||
SCSI_PORT_LUN_EXTENSION,
|
||||
List);
|
||||
if (LunExtension->PathId == PathId &&
|
||||
LunExtension->TargetId == TargetId &&
|
||||
LunExtension->Lun == Lun)
|
||||
{
|
||||
return (PVOID)&LunExtension->MiniportLunExtension;
|
||||
}
|
||||
|
||||
Entry = Entry->Flink;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -479,6 +522,7 @@ ScsiPortInitialize(IN PVOID Argument1,
|
|||
ExtensionSize);
|
||||
PseudoDeviceExtension->Length = ExtensionSize;
|
||||
PseudoDeviceExtension->MiniPortExtensionSize = HwInitializationData->DeviceExtensionSize;
|
||||
PseudoDeviceExtension->LunExtensionSize = HwInitializationData->SpecificLuExtensionSize;
|
||||
PseudoDeviceExtension->HwStartIo = HwInitializationData->HwStartIo;
|
||||
PseudoDeviceExtension->HwInterrupt = HwInitializationData->HwInterrupt;
|
||||
|
||||
|
|
@ -699,7 +743,7 @@ ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension,
|
|||
|
||||
|
||||
/*
|
||||
* @unimplemented
|
||||
* @implemented
|
||||
*/
|
||||
BOOLEAN STDCALL
|
||||
ScsiPortValidateRange(IN PVOID HwDeviceExtension,
|
||||
|
|
@ -822,88 +866,47 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject,
|
|||
|
||||
case SRB_FUNCTION_CLAIM_DEVICE:
|
||||
{
|
||||
PSCSI_ADAPTER_BUS_INFO AdapterInfo;
|
||||
PSCSI_INQUIRY_DATA UnitInfo;
|
||||
PINQUIRYDATA InquiryData;
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
|
||||
DPRINT(" SRB_FUNCTION_CLAIM_DEVICE\n");
|
||||
DPRINT("PathId: %lu TargetId: %lu Lun: %lu\n", Srb->PathId, Srb->TargetId, Srb->Lun);
|
||||
|
||||
Srb->DataBuffer = NULL;
|
||||
|
||||
if (DeviceExtension->PortBusInfo != NULL)
|
||||
LunExtension = SpiGetLunExtension(DeviceExtension,
|
||||
Srb->PathId,
|
||||
Srb->TargetId,
|
||||
Srb->Lun);
|
||||
if (LunExtension != NULL)
|
||||
{
|
||||
AdapterInfo = (PSCSI_ADAPTER_BUS_INFO)DeviceExtension->PortBusInfo;
|
||||
|
||||
if (AdapterInfo->BusData[Srb->PathId].NumberOfLogicalUnits == 0)
|
||||
break;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)AdapterInfo +
|
||||
AdapterInfo->BusData[Srb->PathId].InquiryDataOffset);
|
||||
|
||||
while (AdapterInfo->BusData[Srb->PathId].InquiryDataOffset)
|
||||
{
|
||||
InquiryData = (PINQUIRYDATA)UnitInfo->InquiryData;
|
||||
|
||||
if ((UnitInfo->TargetId == Srb->TargetId) &&
|
||||
(UnitInfo->Lun == Srb->Lun) &&
|
||||
(UnitInfo->DeviceClaimed == FALSE))
|
||||
{
|
||||
UnitInfo->DeviceClaimed = TRUE;
|
||||
DPRINT("Claimed device!\n");
|
||||
|
||||
/* FIXME: Hack!!!!! */
|
||||
/* Reference device object and keep the pointer */
|
||||
ObReferenceObject(DeviceObject);
|
||||
LunExtension->DeviceObject = DeviceObject;
|
||||
LunExtension->DeviceClaimed = TRUE;
|
||||
Srb->DataBuffer = DeviceObject;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (UnitInfo->NextInquiryDataOffset == 0)
|
||||
break;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)AdapterInfo + UnitInfo->NextInquiryDataOffset);
|
||||
}
|
||||
else
|
||||
{
|
||||
Srb->DataBuffer = NULL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case SRB_FUNCTION_RELEASE_DEVICE:
|
||||
{
|
||||
PSCSI_ADAPTER_BUS_INFO AdapterInfo;
|
||||
PSCSI_INQUIRY_DATA UnitInfo;
|
||||
PINQUIRYDATA InquiryData;
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
|
||||
DPRINT(" SRB_FUNCTION_RELEASE_DEVICE\n");
|
||||
DPRINT("PathId: %lu TargetId: %lu Lun: %lu\n", Srb->PathId, Srb->TargetId, Srb->Lun);
|
||||
|
||||
if (DeviceExtension->PortBusInfo != NULL)
|
||||
LunExtension = SpiGetLunExtension(DeviceExtension,
|
||||
Srb->PathId,
|
||||
Srb->TargetId,
|
||||
Srb->Lun);
|
||||
if (LunExtension != NULL)
|
||||
{
|
||||
AdapterInfo = (PSCSI_ADAPTER_BUS_INFO)DeviceExtension->PortBusInfo;
|
||||
|
||||
if (AdapterInfo->BusData[Srb->PathId].NumberOfLogicalUnits == 0)
|
||||
break;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)AdapterInfo +
|
||||
AdapterInfo->BusData[Srb->PathId].InquiryDataOffset);
|
||||
|
||||
while (AdapterInfo->BusData[Srb->PathId].InquiryDataOffset)
|
||||
{
|
||||
InquiryData = (PINQUIRYDATA)UnitInfo->InquiryData;
|
||||
|
||||
if ((UnitInfo->TargetId == Srb->TargetId) &&
|
||||
(UnitInfo->Lun == Srb->Lun) &&
|
||||
(UnitInfo->DeviceClaimed == TRUE))
|
||||
{
|
||||
UnitInfo->DeviceClaimed = FALSE;
|
||||
DPRINT("Released device!\n");
|
||||
break;
|
||||
}
|
||||
|
||||
if (UnitInfo->NextInquiryDataOffset == 0)
|
||||
break;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)AdapterInfo + UnitInfo->NextInquiryDataOffset);
|
||||
}
|
||||
/* Dereference device object */
|
||||
ObDereferenceObject(LunExtension->DeviceObject);
|
||||
LunExtension->DeviceObject = NULL;
|
||||
LunExtension->DeviceClaimed = FALSE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -968,6 +971,7 @@ ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject,
|
|||
Irp->IoStatus.Information = sizeof(DUMP_POINTERS);
|
||||
}
|
||||
break;
|
||||
|
||||
case IOCTL_SCSI_GET_CAPABILITIES:
|
||||
{
|
||||
DPRINT(" IOCTL_SCSI_GET_CAPABILITIES\n");
|
||||
|
|
@ -984,12 +988,10 @@ ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject,
|
|||
DPRINT(" IOCTL_SCSI_GET_INQUIRY_DATA\n");
|
||||
|
||||
/* Copy inquiry data to the port device extension */
|
||||
memcpy(Irp->AssociatedIrp.SystemBuffer,
|
||||
DeviceExtension->PortBusInfo,
|
||||
DeviceExtension->PortBusInfoSize);
|
||||
|
||||
DPRINT("BufferSize: %lu\n", DeviceExtension->PortBusInfoSize);
|
||||
Irp->IoStatus.Information = DeviceExtension->PortBusInfoSize;
|
||||
Irp->IoStatus.Information =
|
||||
SpiGetInquiryData(DeviceExtension,
|
||||
Irp->AssociatedIrp.SystemBuffer);
|
||||
DPRINT("Inquiry data size: %lu\n", Irp->IoStatus.Information);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -1278,12 +1280,10 @@ ScsiPortCreatePortDevice(IN PDRIVER_OBJECT DriverObject,
|
|||
PortDeviceExtension->PortConfig.AdapterScansDown;
|
||||
PortCapabilities->AdapterUsesPio = TRUE; /* FIXME */
|
||||
|
||||
/* Initialize inquiry data */
|
||||
PortDeviceExtension->PortBusInfoSize = 0;
|
||||
PortDeviceExtension->PortBusInfo = NULL;
|
||||
/* Initialize LUN-Extension list */
|
||||
InitializeListHead(&PortDeviceExtension->LunExtensionListHead);
|
||||
|
||||
DPRINT("DeviceExtension %p\n", PortDeviceExtension);
|
||||
// ScsiPortInquire(PortDeviceExtension);
|
||||
|
||||
/* FIXME: Copy more configuration data? */
|
||||
|
||||
|
|
@ -1306,32 +1306,92 @@ ScsiPortCreatePortDevice(IN PDRIVER_OBJECT DriverObject,
|
|||
}
|
||||
|
||||
|
||||
static PSCSI_PORT_LUN_EXTENSION
|
||||
SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
IN UCHAR PathId,
|
||||
IN UCHAR TargetId,
|
||||
IN UCHAR Lun)
|
||||
{
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
ULONG LunExtensionSize;
|
||||
|
||||
DPRINT("SpiAllocateLunExtension (%p %u %u %u)\n",
|
||||
DeviceExtension, PathId, TargetId, Lun);
|
||||
|
||||
LunExtensionSize =
|
||||
sizeof(SCSI_PORT_LUN_EXTENSION) + DeviceExtension->LunExtensionSize;
|
||||
DPRINT("LunExtensionSize %lu\n", LunExtensionSize);
|
||||
|
||||
LunExtension = ExAllocatePool(NonPagedPool,
|
||||
LunExtensionSize);
|
||||
if (LunExtension == NULL)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
RtlZeroMemory(LunExtension,
|
||||
LunExtensionSize);
|
||||
|
||||
InsertTailList(&DeviceExtension->LunExtensionListHead,
|
||||
&LunExtension->List);
|
||||
|
||||
LunExtension->PathId = PathId;
|
||||
LunExtension->TargetId = TargetId;
|
||||
LunExtension->Lun = Lun;
|
||||
|
||||
return LunExtension;
|
||||
}
|
||||
|
||||
|
||||
static PSCSI_PORT_LUN_EXTENSION
|
||||
SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
IN UCHAR PathId,
|
||||
IN UCHAR TargetId,
|
||||
IN UCHAR Lun)
|
||||
{
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
PLIST_ENTRY Entry;
|
||||
|
||||
DPRINT("SpiGetLunExtension(%p %u %u %u) called\n",
|
||||
DeviceExtension, PathId, TargetId, Lun);
|
||||
|
||||
if (IsListEmpty(&DeviceExtension->LunExtensionListHead))
|
||||
return NULL;
|
||||
|
||||
Entry = DeviceExtension->LunExtensionListHead.Flink;
|
||||
while (Entry != &DeviceExtension->LunExtensionListHead)
|
||||
{
|
||||
LunExtension = CONTAINING_RECORD(Entry,
|
||||
SCSI_PORT_LUN_EXTENSION,
|
||||
List);
|
||||
if (LunExtension->PathId == PathId &&
|
||||
LunExtension->TargetId == TargetId &&
|
||||
LunExtension->Lun == Lun)
|
||||
{
|
||||
return LunExtension;
|
||||
}
|
||||
|
||||
Entry = Entry->Flink;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static VOID
|
||||
ScsiPortInquire(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
|
||||
{
|
||||
PSCSI_ADAPTER_BUS_INFO AdapterInfo;
|
||||
PSCSI_INQUIRY_DATA UnitInfo, PrevUnit;
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
SCSI_REQUEST_BLOCK Srb;
|
||||
ULONG Bus;
|
||||
ULONG Target;
|
||||
ULONG Lun;
|
||||
ULONG UnitCount;
|
||||
ULONG DataSize;
|
||||
BOOLEAN Result;
|
||||
|
||||
DPRINT("ScsiPortInquire() called\n");
|
||||
|
||||
DeviceExtension->Initializing = TRUE;
|
||||
|
||||
/* Copy inquiry data to the port device extension */
|
||||
AdapterInfo =(PSCSI_ADAPTER_BUS_INFO)ExAllocatePool(NonPagedPool, 4096);
|
||||
RtlZeroMemory(AdapterInfo, 4096);
|
||||
AdapterInfo->NumberOfBuses = DeviceExtension->PortConfig.NumberOfBuses;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)
|
||||
((PUCHAR)AdapterInfo + sizeof(SCSI_ADAPTER_BUS_INFO) +
|
||||
(sizeof(SCSI_BUS_DATA) * (AdapterInfo->NumberOfBuses - 1)));
|
||||
|
||||
RtlZeroMemory(&Srb,
|
||||
sizeof(SCSI_REQUEST_BLOCK));
|
||||
Srb.DataBuffer = ExAllocatePool(NonPagedPool, 256);
|
||||
|
|
@ -1339,18 +1399,10 @@ ScsiPortInquire(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
|
|||
Srb.DataTransferLength = 256;
|
||||
Srb.Cdb[0] = SCSIOP_INQUIRY;
|
||||
|
||||
for (Bus = 0; Bus < AdapterInfo->NumberOfBuses; Bus++)
|
||||
for (Bus = 0; Bus < DeviceExtension->PortConfig.NumberOfBuses; Bus++)
|
||||
{
|
||||
Srb.PathId = Bus;
|
||||
|
||||
AdapterInfo->BusData[Bus].InitiatorBusId =
|
||||
DeviceExtension->PortConfig.InitiatorBusId[Bus];
|
||||
AdapterInfo->BusData[Bus].InquiryDataOffset =
|
||||
(ULONG)((PUCHAR)UnitInfo - (PUCHAR)AdapterInfo);
|
||||
|
||||
PrevUnit = NULL;
|
||||
UnitCount = 0;
|
||||
|
||||
for (Target = 0; Target < DeviceExtension->PortConfig.MaximumNumberOfTargets; Target++)
|
||||
{
|
||||
Srb.TargetId = Target;
|
||||
|
|
@ -1366,50 +1418,100 @@ ScsiPortInquire(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
|
|||
|
||||
if (Result == TRUE && Srb.SrbStatus == SRB_STATUS_SUCCESS)
|
||||
{
|
||||
UnitInfo->PathId = Bus;
|
||||
UnitInfo->TargetId = Target;
|
||||
UnitInfo->Lun = Lun;
|
||||
UnitInfo->InquiryDataLength = INQUIRYDATABUFFERSIZE;
|
||||
memcpy(&UnitInfo->InquiryData,
|
||||
Srb.DataBuffer,
|
||||
INQUIRYDATABUFFERSIZE);
|
||||
if (PrevUnit != NULL)
|
||||
PrevUnit->NextInquiryDataOffset = (ULONG)((PUCHAR)UnitInfo-(PUCHAR)AdapterInfo);
|
||||
PrevUnit = UnitInfo;
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)UnitInfo + sizeof(SCSI_INQUIRY_DATA)+INQUIRYDATABUFFERSIZE-1);
|
||||
UnitCount++;
|
||||
}
|
||||
else if (Lun == 0)
|
||||
LunExtension = SpiAllocateLunExtension(DeviceExtension,
|
||||
Bus,
|
||||
Target,
|
||||
Lun);
|
||||
if (LunExtension != NULL)
|
||||
{
|
||||
break;
|
||||
/* Copy inquiry data */
|
||||
memcpy(&LunExtension->InquiryData,
|
||||
Srb.DataBuffer,
|
||||
sizeof(INQUIRYDATA));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
DPRINT("UnitCount: %lu\n", UnitCount);
|
||||
AdapterInfo->BusData[Bus].NumberOfLogicalUnits = UnitCount;
|
||||
if (UnitCount == 0)
|
||||
AdapterInfo->BusData[Bus].InquiryDataOffset = 0;
|
||||
}
|
||||
DataSize = (ULONG)((PUCHAR)UnitInfo-(PUCHAR)AdapterInfo);
|
||||
|
||||
ExFreePool(Srb.DataBuffer);
|
||||
|
||||
DeviceExtension->Initializing = FALSE;
|
||||
|
||||
/* copy inquiry data to the port driver's device extension */
|
||||
DeviceExtension->PortBusInfoSize = DataSize;
|
||||
DeviceExtension->PortBusInfo = ExAllocatePool(NonPagedPool,
|
||||
DataSize);
|
||||
RtlCopyMemory(DeviceExtension->PortBusInfo,
|
||||
AdapterInfo,
|
||||
DataSize);
|
||||
|
||||
ExFreePool(AdapterInfo);
|
||||
|
||||
DPRINT("ScsiPortInquire() done\n");
|
||||
}
|
||||
|
||||
|
||||
static ULONG
|
||||
SpiGetInquiryData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
OUT PSCSI_ADAPTER_BUS_INFO AdapterBusInfo)
|
||||
{
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
PSCSI_INQUIRY_DATA UnitInfo, PrevUnit;
|
||||
ULONG Bus;
|
||||
ULONG Target;
|
||||
ULONG Lun;
|
||||
ULONG UnitCount;
|
||||
|
||||
DPRINT("SpiGetInquiryData() called\n");
|
||||
|
||||
/* Copy inquiry data to the port device extension */
|
||||
AdapterBusInfo->NumberOfBuses = DeviceExtension->PortConfig.NumberOfBuses;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)
|
||||
((PUCHAR)AdapterBusInfo + sizeof(SCSI_ADAPTER_BUS_INFO) +
|
||||
(sizeof(SCSI_BUS_DATA) * (AdapterBusInfo->NumberOfBuses - 1)));
|
||||
|
||||
for (Bus = 0; Bus < AdapterBusInfo->NumberOfBuses; Bus++)
|
||||
{
|
||||
AdapterBusInfo->BusData[Bus].InitiatorBusId =
|
||||
DeviceExtension->PortConfig.InitiatorBusId[Bus];
|
||||
AdapterBusInfo->BusData[Bus].InquiryDataOffset =
|
||||
(ULONG)((PUCHAR)UnitInfo - (PUCHAR)AdapterBusInfo);
|
||||
|
||||
PrevUnit = NULL;
|
||||
UnitCount = 0;
|
||||
|
||||
for (Target = 0; Target < DeviceExtension->PortConfig.MaximumNumberOfTargets; Target++)
|
||||
{
|
||||
for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++)
|
||||
{
|
||||
LunExtension = SpiGetLunExtension(DeviceExtension,
|
||||
Bus,
|
||||
Target,
|
||||
Lun);
|
||||
if (LunExtension != NULL)
|
||||
{
|
||||
DPRINT("(Bus %lu Target %lu Lun %lu)\n",
|
||||
Bus, Target, Lun);
|
||||
|
||||
UnitInfo->PathId = Bus;
|
||||
UnitInfo->TargetId = Target;
|
||||
UnitInfo->Lun = Lun;
|
||||
UnitInfo->InquiryDataLength = INQUIRYDATABUFFERSIZE;
|
||||
memcpy(&UnitInfo->InquiryData,
|
||||
&LunExtension->InquiryData,
|
||||
INQUIRYDATABUFFERSIZE);
|
||||
if (PrevUnit != NULL)
|
||||
PrevUnit->NextInquiryDataOffset = (ULONG)((PUCHAR)UnitInfo-(PUCHAR)AdapterBusInfo);
|
||||
PrevUnit = UnitInfo;
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)UnitInfo + sizeof(SCSI_INQUIRY_DATA)+INQUIRYDATABUFFERSIZE-1);
|
||||
UnitCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
DPRINT("UnitCount: %lu\n", UnitCount);
|
||||
AdapterBusInfo->BusData[Bus].NumberOfLogicalUnits = UnitCount;
|
||||
if (UnitCount == 0)
|
||||
AdapterBusInfo->BusData[Bus].InquiryDataOffset = 0;
|
||||
}
|
||||
|
||||
DPRINT("Data size: %lu\n", (ULONG)UnitInfo - (ULONG)AdapterBusInfo);
|
||||
|
||||
return (ULONG)((PUCHAR)UnitInfo-(PUCHAR)AdapterBusInfo);
|
||||
}
|
||||
|
||||
|
||||
static BOOLEAN STDCALL
|
||||
ScsiPortIsr(IN PKINTERRUPT Interrupt,
|
||||
IN PVOID ServiceContext)
|
||||
|
|
@ -1638,6 +1740,7 @@ static NTSTATUS
|
|||
ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
||||
PUNICODE_STRING RegistryPath)
|
||||
{
|
||||
PSCSI_PORT_LUN_EXTENSION LunExtension;
|
||||
OBJECT_ATTRIBUTES ObjectAttributes;
|
||||
UNICODE_STRING KeyName;
|
||||
UNICODE_STRING ValueName;
|
||||
|
|
@ -1650,10 +1753,9 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
HANDLE ScsiTargetKey;
|
||||
HANDLE ScsiLunKey;
|
||||
ULONG BusNumber;
|
||||
UCHAR CurrentTarget;
|
||||
PSCSI_ADAPTER_BUS_INFO AdapterInfo;
|
||||
PSCSI_INQUIRY_DATA UnitInfo;
|
||||
PINQUIRYDATA InquiryData;
|
||||
ULONG Target;
|
||||
ULONG CurrentTarget;
|
||||
ULONG Lun;
|
||||
PWCHAR DriverName;
|
||||
ULONG UlongData;
|
||||
PWCHAR TypeName;
|
||||
|
|
@ -1854,17 +1956,19 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
|
||||
|
||||
/* Enumerate targets */
|
||||
CurrentTarget = (UCHAR)-1;
|
||||
CurrentTarget = (ULONG)-1;
|
||||
ScsiTargetKey = NULL;
|
||||
AdapterInfo = (PSCSI_ADAPTER_BUS_INFO)DeviceExtension->PortBusInfo;
|
||||
if (AdapterInfo->BusData[BusNumber].NumberOfLogicalUnits != 0)
|
||||
for (Target = 0; Target < DeviceExtension->PortConfig.MaximumNumberOfTargets; Target++)
|
||||
{
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)AdapterInfo +
|
||||
AdapterInfo->BusData[BusNumber].InquiryDataOffset);
|
||||
|
||||
while (AdapterInfo->BusData[BusNumber].InquiryDataOffset)
|
||||
for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++)
|
||||
{
|
||||
if (UnitInfo->TargetId != CurrentTarget)
|
||||
LunExtension = SpiGetLunExtension(DeviceExtension,
|
||||
BusNumber,
|
||||
Target,
|
||||
Lun);
|
||||
if (LunExtension != NULL)
|
||||
{
|
||||
if (Target != CurrentTarget)
|
||||
{
|
||||
/* Close old target key */
|
||||
if (ScsiTargetKey != NULL)
|
||||
|
|
@ -1874,11 +1978,10 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
}
|
||||
|
||||
/* Create 'Target Id X' key */
|
||||
DPRINT(" Target Id %u\n",
|
||||
UnitInfo->TargetId);
|
||||
DPRINT(" Target Id %lu\n", Target);
|
||||
swprintf(NameBuffer,
|
||||
L"Target Id %u",
|
||||
UnitInfo->TargetId);
|
||||
L"Target Id %lu",
|
||||
Target);
|
||||
RtlInitUnicodeString(&KeyName,
|
||||
NameBuffer);
|
||||
InitializeObjectAttributes(&ObjectAttributes,
|
||||
|
|
@ -1901,15 +2004,14 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
return(Status);
|
||||
}
|
||||
|
||||
CurrentTarget = UnitInfo->TargetId;
|
||||
CurrentTarget = Target;
|
||||
}
|
||||
|
||||
/* Create 'Logical Unit Id X' key */
|
||||
DPRINT(" Logical Unit Id %u\n",
|
||||
UnitInfo->Lun);
|
||||
DPRINT(" Logical Unit Id %lu\n", Lun);
|
||||
swprintf(NameBuffer,
|
||||
L"Logical Unit Id %u",
|
||||
UnitInfo->Lun);
|
||||
L"Logical Unit Id %lu",
|
||||
Lun);
|
||||
RtlInitUnicodeString(&KeyName,
|
||||
NameBuffer);
|
||||
InitializeObjectAttributes(&ObjectAttributes,
|
||||
|
|
@ -1933,17 +2035,13 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
return(Status);
|
||||
}
|
||||
|
||||
/* Set values for logical unit */
|
||||
InquiryData = (PINQUIRYDATA)UnitInfo->InquiryData;
|
||||
|
||||
/* Set 'Identifier' (REG_SZ) value */
|
||||
swprintf(NameBuffer,
|
||||
L"%.8S%.16S%.4S",
|
||||
InquiryData->VendorId,
|
||||
InquiryData->ProductId,
|
||||
InquiryData->ProductRevisionLevel);
|
||||
DPRINT(" Identifier = '%S'\n",
|
||||
NameBuffer);
|
||||
LunExtension->InquiryData.VendorId,
|
||||
LunExtension->InquiryData.ProductId,
|
||||
LunExtension->InquiryData.ProductRevisionLevel);
|
||||
DPRINT(" Identifier = '%S'\n", NameBuffer);
|
||||
RtlInitUnicodeString(&ValueName,
|
||||
L"Identifier");
|
||||
Status = ZwSetValueKey(ScsiLunKey,
|
||||
|
|
@ -1963,7 +2061,7 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
}
|
||||
|
||||
/* Set 'Type' (REG_SZ) value */
|
||||
switch (InquiryData->DeviceType)
|
||||
switch (LunExtension->InquiryData.DeviceType)
|
||||
{
|
||||
case 0:
|
||||
TypeName = L"DiskPeripheral";
|
||||
|
|
@ -2016,12 +2114,7 @@ ScsiPortBuildDeviceMap(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
|
|||
}
|
||||
|
||||
ZwClose(ScsiLunKey);
|
||||
|
||||
if (UnitInfo->NextInquiryDataOffset == 0)
|
||||
break;
|
||||
|
||||
UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)AdapterInfo +
|
||||
UnitInfo->NextInquiryDataOffset);
|
||||
}
|
||||
}
|
||||
|
||||
/* Close old target key */
|
||||
|
|
|
|||
|
|
@ -23,6 +23,26 @@ typedef struct _SCSI_PORT_DEVICE_BASE
|
|||
ULONG SystemIoBusNumber;
|
||||
} SCSI_PORT_DEVICE_BASE, *PSCSI_PORT_DEVICE_BASE;
|
||||
|
||||
|
||||
typedef struct _SCSI_PORT_LUN_EXTENSION
|
||||
{
|
||||
LIST_ENTRY List;
|
||||
|
||||
UCHAR PathId;
|
||||
UCHAR TargetId;
|
||||
UCHAR Lun;
|
||||
|
||||
BOOLEAN DeviceClaimed;
|
||||
PDEVICE_OBJECT DeviceObject;
|
||||
|
||||
INQUIRYDATA InquiryData;
|
||||
|
||||
/* More data? */
|
||||
|
||||
UCHAR MiniportLunExtension[1]; /* must be the last entry */
|
||||
} SCSI_PORT_LUN_EXTENSION, *PSCSI_PORT_LUN_EXTENSION;
|
||||
|
||||
|
||||
/*
|
||||
* SCSI_PORT_DEVICE_EXTENSION
|
||||
*
|
||||
|
|
@ -51,8 +71,8 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION
|
|||
|
||||
LIST_ENTRY DeviceBaseListHead;
|
||||
|
||||
ULONG PortBusInfoSize;
|
||||
PSCSI_ADAPTER_BUS_INFO PortBusInfo;
|
||||
ULONG LunExtensionSize;
|
||||
LIST_ENTRY LunExtensionListHead;
|
||||
|
||||
PIO_SCSI_CAPABILITIES PortCapabilities;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue