Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SCSIPORT]: Code formatting only.

Browse source 
svn path=/trunk/; revision=74596
This commit is contained in:
Hermès Bélusca-Maïto 2017-05-19 16:08:40 +00:00
parent 87d9dfae0d
commit 2e3ea31302
1 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ SpiAdapterControl(PDEVICE_OBJECT DeviceObject, PIRP Irp,
PVOID MapRegisterBase, PVOID Context); PVOID MapRegisterBase, PVOID Context);
static PSCSI_PORT_LUN_EXTENSION static PSCSI_PORT_LUN_EXTENSION
SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension);
static PSCSI_PORT_LUN_EXTENSION static PSCSI_PORT_LUN_EXTENSION
SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
@ -97,8 +97,8 @@ SpiAllocateSrbStructures(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
PSCSI_REQUEST_BLOCK Srb); PSCSI_REQUEST_BLOCK Srb);
static NTSTATUS static NTSTATUS
SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject, SpiSendInquiry(IN PDEVICE_OBJECT DeviceObject,
IN PSCSI_LUN_INFO LunInfo); IN OUT PSCSI_LUN_INFO LunInfo);
static VOID static VOID
SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension);
@ -136,8 +136,8 @@ ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject,
IN PVOID Context); IN PVOID Context);
static NTSTATUS static NTSTATUS
SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, SpiBuildDeviceMap(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
PUNICODE_STRING RegistryPath); IN PUNICODE_STRING RegistryPath);
static NTSTATUS static NTSTATUS
SpiStatusSrbToNt(UCHAR SrbStatus); SpiStatusSrbToNt(UCHAR SrbStatus);
@ -3322,13 +3322,12 @@ SpiAdapterControl(PDEVICE_OBJECT DeviceObject,
} }
static PSCSI_PORT_LUN_EXTENSION static PSCSI_PORT_LUN_EXTENSION
SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) SpiAllocateLunExtension(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
{ {
PSCSI_PORT_LUN_EXTENSION LunExtension; PSCSI_PORT_LUN_EXTENSION LunExtension;
ULONG LunExtensionSize; ULONG LunExtensionSize;
DPRINT("SpiAllocateLunExtension (%p)\n", DPRINT("SpiAllocateLunExtension(%p)\n", DeviceExtension);
DeviceExtension);
/* Round LunExtensionSize first to the sizeof LONGLONG */ /* Round LunExtensionSize first to the sizeof LONGLONG */
LunExtensionSize = (DeviceExtension->LunExtensionSize + LunExtensionSize = (DeviceExtension->LunExtensionSize +
@ -3357,7 +3356,7 @@ SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
LunExtension->MaxQueueCount = 256; LunExtension->MaxQueueCount = 256;
/* Initialize request queue */ /* Initialize request queue */
KeInitializeDeviceQueue (&LunExtension->DeviceQueue); KeInitializeDeviceQueue(&LunExtension->DeviceQueue);
return LunExtension; return LunExtension;
} }
@ -3547,8 +3546,8 @@ SpiAllocateSrbStructures(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
static NTSTATUS static NTSTATUS
SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject, SpiSendInquiry(IN PDEVICE_OBJECT DeviceObject,
IN PSCSI_LUN_INFO LunInfo) IN OUT PSCSI_LUN_INFO LunInfo)
{ {
IO_STATUS_BLOCK IoStatusBlock; IO_STATUS_BLOCK IoStatusBlock;
PIO_STACK_LOCATION IrpStack; PIO_STACK_LOCATION IrpStack;
@ -3801,7 +3800,6 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
{ {
/* We need to allocate this buffer */ /* We need to allocate this buffer */
BusScanInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO), TAG_SCSIPORT); BusScanInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO), TAG_SCSIPORT);
if (!BusScanInfo) if (!BusScanInfo)
{ {
DPRINT1("Out of resources!\n"); DPRINT1("Out of resources!\n");
@ -3823,8 +3821,7 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
/* Create LUN information structure */ /* Create LUN information structure */
LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT);
if (!LunInfo)
if (LunInfo == NULL)
{ {
DPRINT1("Out of resources!\n"); DPRINT1("Out of resources!\n");
return; return;
@ -3833,7 +3830,7 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO)); RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO));
/* Create LunExtension */ /* Create LunExtension */
LunExtension = SpiAllocateLunExtension (DeviceExtension); LunExtension = SpiAllocateLunExtension(DeviceExtension);
/* And send INQUIRY to every target */ /* And send INQUIRY to every target */
for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++)
@ -3878,7 +3875,7 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
/* Fill Path, Target, Lun fields */ /* Fill Path, Target, Lun fields */
LunExtension->PathId = LunInfo->PathId = (UCHAR)Bus; LunExtension->PathId = LunInfo->PathId = (UCHAR)Bus;
LunExtension->TargetId = LunInfo->TargetId = (UCHAR) Target; LunExtension->TargetId = LunInfo->TargetId = (UCHAR)Target;
LunExtension->Lun = LunInfo->Lun = (UCHAR)Lun; LunExtension->Lun = LunInfo->Lun = (UCHAR)Lun;
/* Set flag to prevent race conditions */ /* Set flag to prevent race conditions */
@ -3929,7 +3926,6 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
/* Allocate another buffer */ /* Allocate another buffer */
LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT);
if (!LunInfo) if (!LunInfo)
{ {
DPRINT1("Out of resources!\n"); DPRINT1("Out of resources!\n");
@ -3966,11 +3962,11 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
ExFreePool(LunInfo); ExFreePool(LunInfo);
/* Sum what we found */ /* Sum what we found */
BusScanInfo->LogicalUnitsCount += (UCHAR) DevicesFound; BusScanInfo->LogicalUnitsCount += (UCHAR)DevicesFound;
DPRINT(" Found %d devices on bus %d\n", DevicesFound, Bus); DPRINT(" Found %d devices on bus %d\n", DevicesFound, Bus);
} }
DPRINT ("SpiScanAdapter() done\n"); DPRINT("SpiScanAdapter() done\n");
} }
@ -4008,8 +4004,7 @@ SpiGetInquiryData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1)); sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1));
/* Calculate data size */ /* Calculate data size */
Length = sizeof(SCSI_ADAPTER_BUS_INFO) + (BusCount - 1) * Length = sizeof(SCSI_ADAPTER_BUS_INFO) + (BusCount - 1) * sizeof(SCSI_BUS_DATA);
sizeof(SCSI_BUS_DATA);
Length += InquiryDataSize * LunCount; Length += InquiryDataSize * LunCount;
@ -4079,7 +4074,7 @@ SpiGetInquiryData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
/* Either mark the end, or set offset to 0 */ /* Either mark the end, or set offset to 0 */
if (BusData->NumberOfLogicalUnits != 0) if (BusData->NumberOfLogicalUnits != 0)
((PSCSI_INQUIRY_DATA) ((PCHAR) InquiryData - InquiryDataSize))->NextInquiryDataOffset = 0; ((PSCSI_INQUIRY_DATA) ((PCHAR)InquiryData - InquiryDataSize))->NextInquiryDataOffset = 0;
else else
BusData->InquiryDataOffset = 0; BusData->InquiryDataOffset = 0;
} }