Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 08/20: [ISAPNP] Implement querying bus information

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e19595572aa04724ee007… commit e19595572aa04724ee00788bb76a0328d2586700 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:47:34 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:24:25 2021 +0600 [ISAPNP] Implement querying bus information --- drivers/bus/isapnp/isapnp.c | 2 ++ drivers/bus/isapnp/isapnp.h | 4 ++++ drivers/bus/isapnp/pdo.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index daa53f64758..c477fecf767 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -683,6 +683,7 @@ IsaAddDevice( PDEVICE_OBJECT Fdo; PISAPNP_FDO_EXTENSION FdoExt; NTSTATUS Status; + static ULONG BusNumber = 0; PAGED_CODE(); @@ -708,6 +709,7 @@ IsaAddDevice( FdoExt->Common.IsFdo = TRUE; FdoExt->Common.State = dsStopped; FdoExt->DriverObject = DriverObject; + FdoExt->BusNumber = BusNumber++; FdoExt->Pdo = PhysicalDeviceObject; FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index d22037bbb90..4eb7fb4e19b 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -14,6 +14,9 @@ #include <section_attribs.h> #include "isapnphw.h" +#include <initguid.h> +#include <wdmguid.h> + #ifdef __cplusplus extern "C" { #endif @@ -73,6 +76,7 @@ typedef struct _ISAPNP_FDO_EXTENSION PDEVICE_OBJECT Ldo; PDEVICE_OBJECT Pdo; PDEVICE_OBJECT ReadPortPdo; + ULONG BusNumber; KEVENT DeviceSyncEvent; LIST_ENTRY DeviceListHead; ULONG DeviceCount; diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 1227f7cf22b..1fae349f9e0 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -483,6 +483,31 @@ IsaPdoRepeatRequest( return STATUS_PENDING; } +static +CODE_SEG("PAGE") +NTSTATUS +IsaPdoQueryBusInformation( + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp) +{ + PPNP_BUS_INFORMATION BusInformation; + + PAGED_CODE(); + + BusInformation = ExAllocatePoolWithTag(PagedPool, + sizeof(PNP_BUS_INFORMATION), + TAG_ISAPNP); + if (!BusInformation) + return STATUS_INSUFFICIENT_RESOURCES; + + BusInformation->BusTypeGuid = GUID_BUS_TYPE_ISAPNP; + BusInformation->LegacyBusType = Isa; + BusInformation->BusNumber = PdoExt->FdoExt->BusNumber; + + Irp->IoStatus.Information = (ULONG_PTR)BusInformation; + return STATUS_SUCCESS; +} + CODE_SEG("PAGE") NTSTATUS IsaPdoPnp( @@ -544,6 +569,10 @@ IsaPdoPnp( Status = IsaReadPortQueryId(Irp, IrpSp); break; + case IRP_MN_QUERY_BUS_INFORMATION: + Status = IsaPdoQueryBusInformation(PdoExt, Irp); + break; + case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: @@ -559,7 +588,6 @@ IsaPdoPnp( case IRP_MN_WRITE_CONFIG: case IRP_MN_EJECT: case IRP_MN_SET_LOCK: - case IRP_MN_QUERY_BUS_INFORMATION: case IRP_MN_DEVICE_USAGE_NOTIFICATION: return IsaPdoRepeatRequest(PdoExt, Irp, TRUE);

3 years, 6 months

[reactos] 07/20: [ISAPNP] Properly count descriptors

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f36dee6ff56c285c2a98… commit 8f36dee6ff56c285c2a98dbe49d630a467a72d94 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:47:16 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:24:25 2021 +0600 [ISAPNP] Properly count descriptors Fixes random pool corruptions --- drivers/bus/isapnp/isapnp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index aa0ae2b6433..daa53f64758 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -241,7 +241,7 @@ IsaPnpCreateLogicalDeviceResources( for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { if (!LogDev->Io[i].CurrentBase) - continue; + break; Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypePort; @@ -256,7 +256,7 @@ IsaPnpCreateLogicalDeviceResources( for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) { if (!LogDev->Irq[i].CurrentNo) - continue; + break; Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypeInterrupt; @@ -272,7 +272,7 @@ IsaPnpCreateLogicalDeviceResources( for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { if (LogDev->Dma[i].CurrentChannel == 4) - continue; + break; Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypeDma;

3 years, 6 months

[reactos] 06/20: [ISAPNP] Fix device capabilities

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d367001bd17f56837501… commit 2d367001bd17f5683750182d7030d8c7bafce02b Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:46:50 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:24:19 2021 +0600 [ISAPNP] Fix device capabilities - The bus does not supply an address. - Read Port ID is always unique. This reverts commit fc0a0b9f84e1f284914b4576305cbf11c9015ad6. See also commit 21514e473f5. CORE-17034 --- drivers/bus/isapnp/pdo.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 3e2256b4b68..1227f7cf22b 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -53,23 +53,26 @@ IsaPdoQueryCapabilities( _In_ PIO_STACK_LOCATION IrpSp) { PDEVICE_CAPABILITIES DeviceCapabilities; - PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; ULONG i; + UNREFERENCED_PARAMETER(Irp); + PAGED_CODE(); DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; if (DeviceCapabilities->Version != 1) return STATUS_REVISION_MISMATCH; - if (LogDev) - { - DeviceCapabilities->UniqueID = TRUE; - DeviceCapabilities->Address = LogDev->CSN; - } - else + DeviceCapabilities->LockSupported = + DeviceCapabilities->EjectSupported = + DeviceCapabilities->Removable = + DeviceCapabilities->DockDevice = FALSE; + + DeviceCapabilities->UniqueID = TRUE; + + if (PdoExt->FdoExt->ReadPortPdo && + PdoExt->Common.Self == PdoExt->FdoExt->ReadPortPdo) { - DeviceCapabilities->UniqueID = FALSE; DeviceCapabilities->RawDeviceOK = TRUE; DeviceCapabilities->SilentInstall = TRUE; }

3 years, 6 months

[reactos] 05/20: [ISAPNP] Make Read Data Port PDO unique

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21514e473f5969f908118… commit 21514e473f5969f90811872f5993f3accc3f1ddb Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:45:38 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:22:32 2021 +0600 [ISAPNP] Make Read Data Port PDO unique This PDO is created only once during start of first FDO. Other buses will remain in an inactive state until the first FDO receives a remove request. CORE-17034 --- drivers/bus/isapnp/isapnp.c | 223 +++++++++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 95 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index d5aea3de39e..aa0ae2b6433 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -11,6 +11,8 @@ #define NDEBUG #include <debug.h> +BOOLEAN ReadPortCreated = FALSE; + static CODE_SEG("PAGE") NTSTATUS @@ -299,94 +301,6 @@ IsaPnpCreateLogicalDeviceResources( return STATUS_SUCCESS; } -CODE_SEG("PAGE") -NTSTATUS -IsaPnpFillDeviceRelations( - _In_ PISAPNP_FDO_EXTENSION FdoExt, - _Inout_ PIRP Irp, - _In_ BOOLEAN IncludeDataPort) -{ - PISAPNP_PDO_EXTENSION PdoExt; - NTSTATUS Status = STATUS_SUCCESS; - PLIST_ENTRY CurrentEntry; - PISAPNP_LOGICAL_DEVICE IsaDevice; - PDEVICE_RELATIONS DeviceRelations; - ULONG i = 0; - - PAGED_CODE(); - - DeviceRelations = ExAllocatePool(NonPagedPool, - sizeof(DEVICE_RELATIONS) + sizeof(DEVICE_OBJECT) * FdoExt->DeviceCount); - if (!DeviceRelations) - { - return STATUS_NO_MEMORY; - } - - if (IncludeDataPort) - { - DeviceRelations->Objects[i++] = FdoExt->ReadPortPdo; - ObReferenceObject(FdoExt->ReadPortPdo); - } - - CurrentEntry = FdoExt->DeviceListHead.Flink; - while (CurrentEntry != &FdoExt->DeviceListHead) - { - IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, DeviceLink); - - if (!IsaDevice->Pdo) - { - Status = IoCreateDevice(FdoExt->DriverObject, - sizeof(ISAPNP_PDO_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &IsaDevice->Pdo); - if (!NT_SUCCESS(Status)) - { - break; - } - - IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - - //Device->Pdo->Flags |= DO_POWER_PAGABLE; - - PdoExt = IsaDevice->Pdo->DeviceExtension; - - RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); - - PdoExt->Common.IsFdo = FALSE; - PdoExt->Common.Self = IsaDevice->Pdo; - PdoExt->Common.State = dsStopped; - PdoExt->IsaPnpDevice = IsaDevice; - PdoExt->FdoExt = FdoExt; - - Status = IsaPnpCreateLogicalDeviceRequirements(PdoExt); - - if (NT_SUCCESS(Status)) - Status = IsaPnpCreateLogicalDeviceResources(PdoExt); - - if (!NT_SUCCESS(Status)) - { - IoDeleteDevice(IsaDevice->Pdo); - IsaDevice->Pdo = NULL; - break; - } - } - DeviceRelations->Objects[i++] = IsaDevice->Pdo; - - ObReferenceObject(IsaDevice->Pdo); - - CurrentEntry = CurrentEntry->Flink; - } - - DeviceRelations->Count = i; - - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; - - return Status; -} - static IO_COMPLETION_ROUTINE ForwardIrpCompletion; static @@ -603,6 +517,9 @@ IsaPnpCreateReadPortDO( NTSTATUS Status; PAGED_CODE(); + ASSERT(ReadPortCreated == FALSE); + + DPRINT("Creating Read Port\n"); Status = IoCreateDevice(FdoExt->DriverObject, sizeof(ISAPNP_PDO_EXTENSION), @@ -623,11 +540,132 @@ IsaPnpCreateReadPortDO( Status = IsaPnpCreateReadPortDORequirements(PdoExt); if (!NT_SUCCESS(Status)) - return Status; + goto Failure; Status = IsaPnpCreateReadPortDOResources(PdoExt); if (!NT_SUCCESS(Status)) - return Status; + goto Failure; + + FdoExt->ReadPortPdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return Status; + +Failure: + if (PdoExt->RequirementsList) + ExFreePoolWithTag(PdoExt->RequirementsList, TAG_ISAPNP); + + if (PdoExt->ResourceList) + ExFreePoolWithTag(PdoExt->ResourceList, TAG_ISAPNP); + + IoDeleteDevice(FdoExt->ReadPortPdo); + + return Status; +} + +CODE_SEG("PAGE") +NTSTATUS +IsaPnpFillDeviceRelations( + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ BOOLEAN IncludeDataPort) +{ + NTSTATUS Status = STATUS_SUCCESS; + PLIST_ENTRY CurrentEntry; + PISAPNP_LOGICAL_DEVICE IsaDevice; + PDEVICE_RELATIONS DeviceRelations; + ULONG PdoCount, i = 0; + + PAGED_CODE(); + + /* Try to claim the Read Port for our FDO */ + if (!ReadPortCreated) + { + Status = IsaPnpCreateReadPortDO(FdoExt); + if (!NT_SUCCESS(Status)) + return Status; + + ReadPortCreated = TRUE; + } + + /* Inactive ISA bus */ + if (!FdoExt->ReadPortPdo) + IncludeDataPort = FALSE; + + PdoCount = FdoExt->DeviceCount; + if (IncludeDataPort) + ++PdoCount; + + DeviceRelations = ExAllocatePoolWithTag(PagedPool, + FIELD_OFFSET(DEVICE_RELATIONS, Objects[PdoCount]), + TAG_ISAPNP); + if (!DeviceRelations) + { + return STATUS_NO_MEMORY; + } + + if (IncludeDataPort) + { + DeviceRelations->Objects[i++] = FdoExt->ReadPortPdo; + ObReferenceObject(FdoExt->ReadPortPdo); + } + + CurrentEntry = FdoExt->DeviceListHead.Flink; + while (CurrentEntry != &FdoExt->DeviceListHead) + { + PISAPNP_PDO_EXTENSION PdoExt; + + IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, DeviceLink); + + if (!IsaDevice->Pdo) + { + Status = IoCreateDevice(FdoExt->DriverObject, + sizeof(ISAPNP_PDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &IsaDevice->Pdo); + if (!NT_SUCCESS(Status)) + { + break; + } + + IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + //Device->Pdo->Flags |= DO_POWER_PAGABLE; + + PdoExt = IsaDevice->Pdo->DeviceExtension; + + RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); + + PdoExt->Common.IsFdo = FALSE; + PdoExt->Common.Self = IsaDevice->Pdo; + PdoExt->Common.State = dsStopped; + PdoExt->IsaPnpDevice = IsaDevice; + PdoExt->FdoExt = FdoExt; + + Status = IsaPnpCreateLogicalDeviceRequirements(PdoExt); + + if (NT_SUCCESS(Status)) + Status = IsaPnpCreateLogicalDeviceResources(PdoExt); + + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(IsaDevice->Pdo); + IsaDevice->Pdo = NULL; + break; + } + } + DeviceRelations->Objects[i++] = IsaDevice->Pdo; + + ObReferenceObject(IsaDevice->Pdo); + + CurrentEntry = CurrentEntry->Flink; + } + + DeviceRelations->Count = i; + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; return Status; } @@ -677,12 +715,7 @@ IsaAddDevice( InitializeListHead(&FdoExt->DeviceListHead); KeInitializeEvent(&FdoExt->DeviceSyncEvent, SynchronizationEvent, TRUE); - Status = IsaPnpCreateReadPortDO(FdoExt); - if (!NT_SUCCESS(Status)) - return Status; - Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - FdoExt->ReadPortPdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; }

3 years, 6 months

[reactos] 04/20: [ISAPNP] Refactor string handling

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c92bec609b5acd2dc1ff1… commit c92bec609b5acd2dc1ff17344a3ed5549d92f65d Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:44:20 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:22:32 2021 +0600 [ISAPNP] Refactor string handling - Don't allocate string buffers twice. --- drivers/bus/isapnp/isapnp.c | 159 +--------------------------------- drivers/bus/isapnp/isapnp.h | 14 --- drivers/bus/isapnp/pdo.c | 202 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 182 insertions(+), 193 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 8342e191d69..d5aea3de39e 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -11,132 +11,6 @@ #define NDEBUG #include <debug.h> -NTSTATUS -NTAPI -IsaPnpDuplicateUnicodeString( - IN ULONG Flags, - IN PCUNICODE_STRING SourceString, - OUT PUNICODE_STRING DestinationString) -{ - if (SourceString == NULL || - DestinationString == NULL || - SourceString->Length > SourceString->MaximumLength || - (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || - Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || - Flags >= 4) - { - return STATUS_INVALID_PARAMETER; - } - - if ((SourceString->Length == 0) && - (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | - RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) - { - DestinationString->Length = 0; - DestinationString->MaximumLength = 0; - DestinationString->Buffer = NULL; - } - else - { - USHORT DestMaxLength = SourceString->Length; - - if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) - DestMaxLength += sizeof(UNICODE_NULL); - - DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); - if (DestinationString->Buffer == NULL) - return STATUS_NO_MEMORY; - - RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); - DestinationString->Length = SourceString->Length; - DestinationString->MaximumLength = DestMaxLength; - - if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) - DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; - } - - return STATUS_SUCCESS; -} - -static -NTSTATUS -NTAPI -IsaFdoCreateDeviceIDs( - IN PISAPNP_PDO_EXTENSION PdoExt) -{ - PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; - UNICODE_STRING TempString; - WCHAR TempBuffer[256]; - PWCHAR End; - NTSTATUS Status; - USHORT i; - - TempString.Buffer = TempBuffer; - TempString.MaximumLength = sizeof(TempBuffer); - TempString.Length = 0; - - /* Device ID */ - Status = RtlStringCbPrintfExW(TempString.Buffer, - TempString.MaximumLength / sizeof(WCHAR), - &End, - NULL, 0, - L"ISAPNP\\%.3S%04x", - LogDev->VendorId, - LogDev->ProdId); - if (!NT_SUCCESS(Status)) - return Status; - TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); - Status = IsaPnpDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &TempString, - &PdoExt->DeviceID); - if (!NT_SUCCESS(Status)) - return Status; - - /* HardwareIDs */ - Status = RtlStringCbPrintfExW(TempString.Buffer, - TempString.MaximumLength / sizeof(WCHAR), - &End, - NULL, 0, - L"ISAPNP\\%.3S%04x@" - L"*%.3S%04x@", - LogDev->VendorId, - LogDev->ProdId, - LogDev->VendorId, - LogDev->ProdId); - if (!NT_SUCCESS(Status)) - return Status; - TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); - Status = IsaPnpDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &TempString, - &PdoExt->HardwareIDs); - if (!NT_SUCCESS(Status)) - return Status; - for (i = 0; i < PdoExt->HardwareIDs.Length / sizeof(WCHAR); i++) - if (PdoExt->HardwareIDs.Buffer[i] == '@') - PdoExt->HardwareIDs.Buffer[i] = UNICODE_NULL; - - /* InstanceID */ - Status = RtlStringCbPrintfExW(TempString.Buffer, - TempString.MaximumLength / sizeof(WCHAR), - &End, - NULL, 0, - L"%X", - LogDev->SerialNumber); - if (!NT_SUCCESS(Status)) - return Status; - TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); - Status = IsaPnpDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &TempString, - &PdoExt->InstanceID); - if (!NT_SUCCESS(Status)) - return Status; - - return STATUS_SUCCESS; -} - static CODE_SEG("PAGE") NTSTATUS @@ -487,10 +361,7 @@ IsaPnpFillDeviceRelations( PdoExt->IsaPnpDevice = IsaDevice; PdoExt->FdoExt = FdoExt; - Status = IsaFdoCreateDeviceIDs(PdoExt); - - if (NT_SUCCESS(Status)) - Status = IsaPnpCreateLogicalDeviceRequirements(PdoExt); + Status = IsaPnpCreateLogicalDeviceRequirements(PdoExt); if (NT_SUCCESS(Status)) Status = IsaPnpCreateLogicalDeviceResources(PdoExt); @@ -728,10 +599,6 @@ NTSTATUS IsaPnpCreateReadPortDO( _In_ PISAPNP_FDO_EXTENSION FdoExt) { - UNICODE_STRING DeviceID = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0"); - UNICODE_STRING HardwareIDs = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0\0"); - UNICODE_STRING CompatibleIDs = RTL_CONSTANT_STRING(L"\0\0"); - UNICODE_STRING InstanceID = RTL_CONSTANT_STRING(L"0\0"); PISAPNP_PDO_EXTENSION PdoExt; NTSTATUS Status; @@ -754,30 +621,6 @@ IsaPnpCreateReadPortDO( PdoExt->Common.State = dsStopped; PdoExt->FdoExt = FdoExt; - Status = IsaPnpDuplicateUnicodeString(0, - &DeviceID, - &PdoExt->DeviceID); - if (!NT_SUCCESS(Status)) - return Status; - - Status = IsaPnpDuplicateUnicodeString(0, - &HardwareIDs, - &PdoExt->HardwareIDs); - if (!NT_SUCCESS(Status)) - return Status; - - Status = IsaPnpDuplicateUnicodeString(0, - &CompatibleIDs, - &PdoExt->CompatibleIDs); - if (!NT_SUCCESS(Status)) - return Status; - - Status = IsaPnpDuplicateUnicodeString(0, - &InstanceID, - &PdoExt->InstanceID); - if (!NT_SUCCESS(Status)) - return Status; - Status = IsaPnpCreateReadPortDORequirements(PdoExt); if (!NT_SUCCESS(Status)) return Status; diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 8e872a0e506..d22037bbb90 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -85,10 +85,6 @@ typedef struct _ISAPNP_PDO_EXTENSION ISAPNP_COMMON_EXTENSION Common; PISAPNP_LOGICAL_DEVICE IsaPnpDevice; PISAPNP_FDO_EXTENSION FdoExt; - UNICODE_STRING DeviceID; - UNICODE_STRING HardwareIDs; - UNICODE_STRING CompatibleIDs; - UNICODE_STRING InstanceID; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PCM_RESOURCE_LIST ResourceList; ULONG ResourceListSize; @@ -115,16 +111,6 @@ IsaPnpReleaseDeviceDataLock( /* isapnp.c */ -#define RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE 1 -#define RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING 2 - -NTSTATUS -NTAPI -IsaPnpDuplicateUnicodeString( - IN ULONG Flags, - IN PCUNICODE_STRING SourceString, - OUT PUNICODE_STRING DestinationString); - CODE_SEG("PAGE") NTSTATUS IsaPnpFillDeviceRelations( diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 402f62609cd..3e2256b4b68 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -103,47 +103,204 @@ IsaPdoQueryId( _Inout_ PIRP Irp, _In_ PIO_STACK_LOCATION IrpSp) { - PUNICODE_STRING Source; - PWCHAR Buffer; + PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; + NTSTATUS Status; + PWCHAR Buffer, End, IdStart; + size_t CharCount, Remaining; PAGED_CODE(); switch (IrpSp->Parameters.QueryId.IdType) { case BusQueryDeviceID: - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); - Source = &PdoExt->DeviceID; + { + CharCount = sizeof("ISAPNP\\XXXFFFF"); + + Buffer = ExAllocatePoolWithTag(PagedPool, + CharCount * sizeof(WCHAR), + TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = RtlStringCchPrintfExW(Buffer, + CharCount, + &End, + &Remaining, + 0, + L"ISAPNP\\%.3S%04x", + LogDev->VendorId, + LogDev->ProdId); + if (!NT_VERIFY(NT_SUCCESS(Status))) + goto Failure; + + DPRINT("Device ID: '%S'\n", Buffer); break; + } case BusQueryHardwareIDs: - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - Source = &PdoExt->HardwareIDs; + { + CharCount = sizeof("ISAPNP\\XXXFFFF") + + sizeof("*PNPxxxx") + + sizeof(ANSI_NULL); /* multi-string */ + + Buffer = ExAllocatePoolWithTag(PagedPool, + CharCount * sizeof(WCHAR), + TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + DPRINT("Hardware IDs:\n"); + + /* 1 */ + Status = RtlStringCchPrintfExW(Buffer, + CharCount, + &End, + &Remaining, + 0, + L"ISAPNP\\%.3S%04x", + LogDev->VendorId, + LogDev->ProdId); + if (!NT_VERIFY(NT_SUCCESS(Status))) + goto Failure; + + DPRINT(" '%S'\n", Buffer); + + ++End; + --Remaining; + + /* 2 */ + IdStart = End; + Status = RtlStringCchPrintfExW(End, + Remaining, + &End, + &Remaining, + 0, + L"*%.3S%04x", + LogDev->VendorId, + LogDev->ProdId); + if (!NT_VERIFY(NT_SUCCESS(Status))) + goto Failure; + + DPRINT(" '%S'\n", IdStart); + + *++End = UNICODE_NULL; + --Remaining; + break; + } case BusQueryCompatibleIDs: - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - Source = &PdoExt->CompatibleIDs; - break; + return STATUS_NOT_IMPLEMENTED; case BusQueryInstanceID: - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - Source = &PdoExt->InstanceID; + { + CharCount = sizeof(LogDev->SerialNumber) * 2 + sizeof(ANSI_NULL); + + Buffer = ExAllocatePoolWithTag(PagedPool, + CharCount * sizeof(WCHAR), + TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = RtlStringCchPrintfExW(Buffer, + CharCount, + NULL, + NULL, + 0, + L"%X", + LogDev->SerialNumber); + if (!NT_VERIFY(NT_SUCCESS(Status))) + goto Failure; + + DPRINT("Instance ID: '%S'\n", Buffer); break; + } default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", - IrpSp->Parameters.QueryId.IdType); - return Irp->IoStatus.Status; + return Irp->IoStatus.Status; } - if (!Source->Buffer) - return Irp->IoStatus.Status; + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + return STATUS_SUCCESS; - Buffer = ExAllocatePoolWithTag(PagedPool, Source->MaximumLength, TAG_ISAPNP); - if (!Buffer) - return STATUS_NO_MEMORY; +Failure: + ExFreePoolWithTag(Buffer, TAG_ISAPNP); + + return Status; +} + +static +CODE_SEG("PAGE") +NTSTATUS +IsaReadPortQueryId( + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) +{ + PWCHAR Buffer; + static const WCHAR ReadPortId[] = L"ISAPNP\\ReadDataPort"; + + PAGED_CODE(); + + switch (IrpSp->Parameters.QueryId.IdType) + { + case BusQueryDeviceID: + { + Buffer = ExAllocatePoolWithTag(PagedPool, sizeof(ReadPortId), TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Buffer, ReadPortId, sizeof(ReadPortId)); + + DPRINT("Device ID: '%S'\n", Buffer); + break; + } + + case BusQueryHardwareIDs: + { + Buffer = ExAllocatePoolWithTag(PagedPool, + sizeof(ReadPortId) + sizeof(UNICODE_NULL), + TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Buffer, ReadPortId, sizeof(ReadPortId)); + + Buffer[sizeof(ReadPortId) / sizeof(WCHAR)] = UNICODE_NULL; /* multi-string */ + + DPRINT("Hardware ID: '%S'\n", Buffer); + break; + } + + case BusQueryCompatibleIDs: + { + /* Empty multi-string */ + Buffer = ExAllocatePoolZero(PagedPool, sizeof(UNICODE_NULL) * 2, TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + DPRINT("Compatible ID: '%S'\n", Buffer); + break; + } + + case BusQueryInstanceID: + { + /* Even if there are multiple ISA buses, the driver has only one Read Port */ + static const WCHAR InstanceId[] = L"0"; + + Buffer = ExAllocatePoolWithTag(PagedPool, sizeof(InstanceId), TAG_ISAPNP); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Buffer, InstanceId, sizeof(InstanceId)); + + DPRINT("Instance ID: '%S'\n", Buffer); + break; + } + + default: + return Irp->IoStatus.Status; + } - RtlCopyMemory(Buffer, Source->Buffer, Source->MaximumLength); Irp->IoStatus.Information = (ULONG_PTR)Buffer; return STATUS_SUCCESS; } @@ -378,7 +535,10 @@ IsaPdoPnp( break; case IRP_MN_QUERY_ID: - Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); + if (PdoExt->IsaPnpDevice) + Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); + else + Status = IsaReadPortQueryId(Irp, IrpSp); break; case IRP_MN_QUERY_REMOVE_DEVICE:

3 years, 6 months

[reactos] 03/20: [ISAPNP] Make the driver pageable

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70ba96f1649d10f435632… commit 70ba96f1649d10f43563287161e6276f6d9d47a8 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:43:44 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:22:31 2021 +0600 [ISAPNP] Make the driver pageable --- drivers/bus/isapnp/fdo.c | 14 ++++++++++--- drivers/bus/isapnp/hardware.c | 31 +++++++++++++++++++++++++---- drivers/bus/isapnp/isapnp.c | 45 ++++++++++++++++++++++++++++++++---------- drivers/bus/isapnp/isapnp.h | 37 ++++++++++++++++++++++++++-------- drivers/bus/isapnp/pdo.c | 46 ++++++++++++++++++++++++++++++++----------- 5 files changed, 137 insertions(+), 36 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index b1d5781ea48..7b32e790246 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -11,8 +11,9 @@ #define NDEBUG #include <debug.h> +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaFdoStartDevice( _In_ PISAPNP_FDO_EXTENSION FdoExt, _Inout_ PIRP Irp, @@ -21,26 +22,31 @@ IsaFdoStartDevice( UNREFERENCED_PARAMETER(Irp); UNREFERENCED_PARAMETER(IrpSp); + PAGED_CODE(); + FdoExt->Common.State = dsStarted; return STATUS_SUCCESS; } +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaFdoQueryDeviceRelations( _In_ PISAPNP_FDO_EXTENSION FdoExt, _Inout_ PIRP Irp, _In_ PIO_STACK_LOCATION IrpSp) { + PAGED_CODE(); + if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) return Irp->IoStatus.Status; return IsaPnpFillDeviceRelations(FdoExt, Irp, TRUE); } +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaFdoPnp( _In_ PISAPNP_FDO_EXTENSION FdoExt, _Inout_ PIRP Irp, @@ -48,6 +54,8 @@ IsaFdoPnp( { NTSTATUS Status = Irp->IoStatus.Status; + PAGED_CODE(); + switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index d9146f15754..5922049864f 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -250,12 +250,15 @@ SendKey(VOID) } static +CODE_SEG("PAGE") USHORT PeekByte( _In_ PUCHAR ReadDataPort) { USHORT i; + PAGED_CODE(); + for (i = 0; i < 20; i++) { if (ReadStatus(ReadDataPort) & 0x01) @@ -268,6 +271,7 @@ PeekByte( } static +CODE_SEG("PAGE") VOID Peek( _In_ PUCHAR ReadDataPort, @@ -276,6 +280,8 @@ Peek( { USHORT i, Byte; + PAGED_CODE(); + for (i = 0; i < Length; i++) { Byte = PeekByte(ReadDataPort); @@ -285,12 +291,15 @@ Peek( } static +CODE_SEG("PAGE") USHORT IsaPnpChecksum( _In_ PISAPNP_IDENTIFIER Identifier) { UCHAR i, j, Lfsr; + PAGED_CODE(); + Lfsr = ISAPNP_LFSR_SEED; for (i = 0; i < FIELD_OFFSET(ISAPNP_IDENTIFIER, Checksum); i++) { @@ -307,6 +316,7 @@ IsaPnpChecksum( } static +CODE_SEG("PAGE") BOOLEAN ReadTags( _In_ PUCHAR ReadDataPort, @@ -318,6 +328,8 @@ ReadTags( USHORT Tag, TagLen, MaxLen; ULONG NumberOfIo = 0, NumberOfIrq = 0, NumberOfDma = 0; + PAGED_CODE(); + LogDev += 1; while (TRUE) @@ -391,6 +403,7 @@ ReadTags( } static +CODE_SEG("PAGE") INT TryIsolate( _In_ PUCHAR ReadDataPort) @@ -401,6 +414,8 @@ TryIsolate( INT Csn = 0; USHORT Byte, Data; + PAGED_CODE(); + DPRINT("Setting read data port: 0x%p\n", ReadDataPort); WaitForKey(); @@ -496,6 +511,7 @@ TryIsolate( return Csn; } +static VOID DeviceActivation( _In_ PISAPNP_LOGICAL_DEVICE IsaDevice, @@ -515,6 +531,8 @@ DeviceActivation( WaitForKey(); } +static +CODE_SEG("PAGE") NTSTATUS ProbeIsaPnpBus( _In_ PISAPNP_FDO_EXTENSION FdoExt) @@ -525,6 +543,7 @@ ProbeIsaPnpBus( USHORT LogDev; ULONG i; + PAGED_CODE(); ASSERT(FdoExt->ReadDataPort); for (Csn = 1; Csn <= 0xFF; Csn++) @@ -585,16 +604,18 @@ ProbeIsaPnpBus( return STATUS_SUCCESS; } +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaHwTryReadDataPort( _In_ PUCHAR ReadDataPort) { + PAGED_CODE(); + return TryIsolate(ReadDataPort) > 0 ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } +_IRQL_requires_max_(DISPATCH_LEVEL) NTSTATUS -NTAPI IsaHwActivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { @@ -604,8 +625,8 @@ IsaHwActivateDevice( return STATUS_SUCCESS; } +_IRQL_requires_max_(DISPATCH_LEVEL) NTSTATUS -NTAPI IsaHwDeactivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { @@ -615,10 +636,12 @@ IsaHwDeactivateDevice( return STATUS_SUCCESS; } +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaHwFillDeviceList( _In_ PISAPNP_FDO_EXTENSION FdoExt) { + PAGED_CODE(); + return ProbeIsaPnpBus(FdoExt); } diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 56ea50d379d..8342e191d69 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -138,8 +138,8 @@ IsaFdoCreateDeviceIDs( } static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpCreateLogicalDeviceRequirements( _In_ PISAPNP_PDO_EXTENSION PdoExt) { @@ -154,6 +154,8 @@ IsaPnpCreateLogicalDeviceRequirements( PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PIO_RESOURCE_DESCRIPTOR Descriptor; + PAGED_CODE(); + /* Count number of requirements */ for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { @@ -307,8 +309,8 @@ IsaPnpCreateLogicalDeviceRequirements( } static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpCreateLogicalDeviceResources( _In_ PISAPNP_PDO_EXTENSION PdoExt) { @@ -318,6 +320,8 @@ IsaPnpCreateLogicalDeviceResources( PCM_RESOURCE_LIST ResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + PAGED_CODE(); + /* Count number of required resources */ for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { @@ -421,8 +425,8 @@ IsaPnpCreateLogicalDeviceResources( return STATUS_SUCCESS; } +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpFillDeviceRelations( _In_ PISAPNP_FDO_EXTENSION FdoExt, _Inout_ PIRP Irp, @@ -435,6 +439,8 @@ IsaPnpFillDeviceRelations( PDEVICE_RELATIONS DeviceRelations; ULONG i = 0; + PAGED_CODE(); + DeviceRelations = ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + sizeof(DEVICE_OBJECT) * FdoExt->DeviceCount); if (!DeviceRelations) @@ -555,15 +561,18 @@ IsaForwardIrpSynchronous( _Dispatch_type_(IRP_MJ_CREATE) _Dispatch_type_(IRP_MJ_CLOSE) -static DRIVER_DISPATCH IsaCreateClose; +static CODE_SEG("PAGE") DRIVER_DISPATCH_PAGED IsaCreateClose; static +CODE_SEG("PAGE") NTSTATUS NTAPI IsaCreateClose( _In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { + PAGED_CODE(); + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -622,8 +631,8 @@ IsaReadWrite( } static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpCreateReadPortDORequirements( _In_ PISAPNP_PDO_EXTENSION PdoExt) { @@ -633,6 +642,8 @@ IsaPnpCreateReadPortDORequirements( const ULONG Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, 0x274, 0x3E4, 0x204, 0x2E4, 0x354, 0x2F4 }; + PAGED_CODE(); + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + 2 * RTL_NUMBER_OF(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); RequirementsList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); @@ -672,8 +683,8 @@ IsaPnpCreateReadPortDORequirements( } static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpCreateReadPortDOResources( _In_ PISAPNP_PDO_EXTENSION PdoExt) { @@ -682,6 +693,8 @@ IsaPnpCreateReadPortDOResources( PCM_RESOURCE_LIST ResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + PAGED_CODE(); + ListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (RTL_NUMBER_OF(Ports) - 1); ResourceList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); @@ -710,8 +723,8 @@ IsaPnpCreateReadPortDOResources( } static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpCreateReadPortDO( _In_ PISAPNP_FDO_EXTENSION FdoExt) { @@ -722,6 +735,8 @@ IsaPnpCreateReadPortDO( PISAPNP_PDO_EXTENSION PdoExt; NTSTATUS Status; + PAGED_CODE(); + Status = IoCreateDevice(FdoExt->DriverObject, sizeof(ISAPNP_PDO_EXTENSION), NULL, @@ -774,7 +789,10 @@ IsaPnpCreateReadPortDO( return Status; } +static CODE_SEG("PAGE") DRIVER_ADD_DEVICE IsaAddDevice; + static +CODE_SEG("PAGE") NTSTATUS NTAPI IsaAddDevice( @@ -785,6 +803,8 @@ IsaAddDevice( PISAPNP_FDO_EXTENSION FdoExt; NTSTATUS Status; + PAGED_CODE(); + DPRINT("%s(%p, %p)\n", __FUNCTION__, DriverObject, PhysicalDeviceObject); Status = IoCreateDevice(DriverObject, @@ -812,7 +832,7 @@ IsaAddDevice( PhysicalDeviceObject); InitializeListHead(&FdoExt->DeviceListHead); - KeInitializeSpinLock(&FdoExt->Lock); + KeInitializeEvent(&FdoExt->DeviceSyncEvent, SynchronizationEvent, TRUE); Status = IsaPnpCreateReadPortDO(FdoExt); if (!NT_SUCCESS(Status)) @@ -825,8 +845,9 @@ IsaAddDevice( } _Dispatch_type_(IRP_MJ_POWER) -DRIVER_DISPATCH IsaPower; +static DRIVER_DISPATCH_RAISED IsaPower; +static NTSTATUS NTAPI IsaPower( @@ -849,9 +870,10 @@ IsaPower( } _Dispatch_type_(IRP_MJ_PNP) -static DRIVER_DISPATCH IsaPnp; +static CODE_SEG("PAGE") DRIVER_DISPATCH_PAGED IsaPnp; static +CODE_SEG("PAGE") NTSTATUS NTAPI IsaPnp( @@ -861,6 +883,8 @@ IsaPnp( PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PISAPNP_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + PAGED_CODE(); + DPRINT("%s(%p, %p)\n", __FUNCTION__, DeviceObject, Irp); if (DevExt->IsFdo) @@ -869,6 +893,7 @@ IsaPnp( return IsaPdoPnp((PISAPNP_PDO_EXTENSION)DevExt, Irp, IrpSp); } +CODE_SEG("INIT") NTSTATUS NTAPI DriverEntry( diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index e9b003b325b..8e872a0e506 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -11,6 +11,7 @@ #include <wdm.h> #include <ntstrsafe.h> +#include <section_attribs.h> #include "isapnphw.h" #ifdef __cplusplus @@ -72,11 +73,11 @@ typedef struct _ISAPNP_FDO_EXTENSION PDEVICE_OBJECT Ldo; PDEVICE_OBJECT Pdo; PDEVICE_OBJECT ReadPortPdo; + KEVENT DeviceSyncEvent; LIST_ENTRY DeviceListHead; ULONG DeviceCount; PDRIVER_OBJECT DriverObject; PUCHAR ReadDataPort; - KSPIN_LOCK Lock; } ISAPNP_FDO_EXTENSION, *PISAPNP_FDO_EXTENSION; typedef struct _ISAPNP_PDO_EXTENSION @@ -93,6 +94,25 @@ typedef struct _ISAPNP_PDO_EXTENSION ULONG ResourceListSize; } ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION; +_Requires_lock_not_held_(FdoExt->DeviceSyncEvent) +_Acquires_lock_(FdoExt->DeviceSyncEvent) +FORCEINLINE +VOID +IsaPnpAcquireDeviceDataLock( + _In_ PISAPNP_FDO_EXTENSION FdoExt) +{ + KeWaitForSingleObject(&FdoExt->DeviceSyncEvent, Executive, KernelMode, FALSE, NULL); +} + +_Releases_lock_(FdoExt->DeviceSyncEvent) +FORCEINLINE +VOID +IsaPnpReleaseDeviceDataLock( + _In_ PISAPNP_FDO_EXTENSION FdoExt) +{ + KeSetEvent(&FdoExt->DeviceSyncEvent, IO_NO_INCREMENT, FALSE); +} + /* isapnp.c */ #define RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE 1 @@ -105,13 +125,14 @@ IsaPnpDuplicateUnicodeString( IN PCUNICODE_STRING SourceString, OUT PUNICODE_STRING DestinationString); +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPnpFillDeviceRelations( _In_ PISAPNP_FDO_EXTENSION FdoExt, _Inout_ PIRP Irp, _In_ BOOLEAN IncludeDataPort); +CODE_SEG("INIT") DRIVER_INITIALIZE DriverEntry; NTSTATUS @@ -121,39 +142,39 @@ IsaForwardIrpSynchronous( _Inout_ PIRP Irp); /* fdo.c */ +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaFdoPnp( _In_ PISAPNP_FDO_EXTENSION FdoExt, _Inout_ PIRP Irp, _In_ PIO_STACK_LOCATION IrpSp); /* pdo.c */ +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoPnp( _In_ PISAPNP_PDO_EXTENSION PdoDeviceExtension, _Inout_ PIRP Irp, _In_ PIO_STACK_LOCATION IrpSp); /* hardware.c */ +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaHwTryReadDataPort( _In_ PUCHAR ReadDataPort); +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaHwFillDeviceList( _In_ PISAPNP_FDO_EXTENSION FdoExt); +_IRQL_requires_max_(DISPATCH_LEVEL) NTSTATUS -NTAPI IsaHwDeactivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); +_IRQL_requires_max_(DISPATCH_LEVEL) NTSTATUS -NTAPI IsaHwActivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 57c217f200e..402f62609cd 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -11,8 +11,9 @@ #define NDEBUG #include <debug.h> +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoQueryDeviceRelations( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, @@ -20,6 +21,8 @@ IsaPdoQueryDeviceRelations( { PDEVICE_RELATIONS DeviceRelations; + PAGED_CODE(); + if (IrpSp->Parameters.QueryDeviceRelations.Type == RemovalRelations && PdoExt->Common.Self == PdoExt->FdoExt->ReadPortPdo) { @@ -41,8 +44,9 @@ IsaPdoQueryDeviceRelations( return STATUS_SUCCESS; } +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoQueryCapabilities( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, @@ -52,6 +56,8 @@ IsaPdoQueryCapabilities( PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; ULONG i; + PAGED_CODE(); + DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; if (DeviceCapabilities->Version != 1) return STATUS_REVISION_MISMATCH; @@ -75,19 +81,23 @@ IsaPdoQueryCapabilities( return STATUS_SUCCESS; } +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoQueryPnpDeviceState( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, _In_ PIO_STACK_LOCATION IrpSp) { + PAGED_CODE(); + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; return STATUS_SUCCESS; } +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoQueryId( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, @@ -96,6 +106,8 @@ IsaPdoQueryId( PUNICODE_STRING Source; PWCHAR Buffer; + PAGED_CODE(); + switch (IrpSp->Parameters.QueryId.IdType) { case BusQueryDeviceID: @@ -136,8 +148,9 @@ IsaPdoQueryId( return STATUS_SUCCESS; } +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoQueryResources( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, @@ -146,6 +159,8 @@ IsaPdoQueryResources( ULONG ListSize; PCM_RESOURCE_LIST ResourceList; + PAGED_CODE(); + if (!PdoExt->ResourceList) return Irp->IoStatus.Status; @@ -159,8 +174,9 @@ IsaPdoQueryResources( return STATUS_SUCCESS; } +static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoQueryResourceRequirements( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, @@ -169,6 +185,8 @@ IsaPdoQueryResourceRequirements( ULONG ListSize; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + PAGED_CODE(); + if (!PdoExt->RequirementsList) return Irp->IoStatus.Status; @@ -183,17 +201,18 @@ IsaPdoQueryResourceRequirements( } static +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoStartReadPort( _In_ PISAPNP_FDO_EXTENSION FdoExt, _In_ PIO_STACK_LOCATION IrpSp) { PCM_RESOURCE_LIST ResourceList = IrpSp->Parameters.StartDevice.AllocatedResources; NTSTATUS Status = STATUS_INSUFFICIENT_RESOURCES; - KIRQL OldIrql; ULONG i; + PAGED_CODE(); + if (!ResourceList || ResourceList->Count != 1) { DPRINT1("No resource list (%p) or bad count (%d)\n", @@ -222,10 +241,13 @@ IsaPdoStartReadPort( if (NT_SUCCESS(IsaHwTryReadDataPort(ReadDataPort))) { /* We detected some ISAPNP cards */ + FdoExt->ReadDataPort = ReadDataPort; - KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); + + IsaPnpAcquireDeviceDataLock(FdoExt); Status = IsaHwFillDeviceList(FdoExt); - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + IsaPnpReleaseDeviceDataLock(FdoExt); + if (FdoExt->DeviceCount > 0) { IoInvalidateDeviceRelations(FdoExt->Pdo, BusRelations); @@ -301,8 +323,8 @@ IsaPdoRepeatRequest( return STATUS_PENDING; } +CODE_SEG("PAGE") NTSTATUS -NTAPI IsaPdoPnp( _In_ PISAPNP_PDO_EXTENSION PdoExt, _Inout_ PIRP Irp, @@ -310,6 +332,8 @@ IsaPdoPnp( { NTSTATUS Status = Irp->IoStatus.Status; + PAGED_CODE(); + switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE:

3 years, 6 months

[reactos] 02/20: [ISAPNP] Use pool tagging

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66c195755c14a7d66b5b5… commit 66c195755c14a7d66b5b50f749d8188ef0a2f276 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:43:19 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:22:31 2021 +0600 [ISAPNP] Use pool tagging --- drivers/bus/isapnp/hardware.c | 6 ++---- drivers/bus/isapnp/isapnp.c | 12 ++++-------- drivers/bus/isapnp/isapnp.h | 2 +- drivers/bus/isapnp/pdo.c | 8 ++++---- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 5c016902d5b..d9146f15754 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -531,12 +531,10 @@ ProbeIsaPnpBus( { for (LogDev = 0; LogDev <= 0xFF; LogDev++) { - LogDevice = ExAllocatePool(NonPagedPool, sizeof(ISAPNP_LOGICAL_DEVICE)); + LogDevice = ExAllocatePoolZero(NonPagedPool, sizeof(ISAPNP_LOGICAL_DEVICE), TAG_ISAPNP); if (!LogDevice) return STATUS_NO_MEMORY; - RtlZeroMemory(LogDevice, sizeof(ISAPNP_LOGICAL_DEVICE)); - LogDevice->CSN = Csn; LogDevice->LDN = LogDev; @@ -548,7 +546,7 @@ ProbeIsaPnpBus( if (Identifier.VendorId & 0x80) { - ExFreePool(LogDevice); + ExFreePoolWithTag(LogDevice, TAG_ISAPNP); return STATUS_SUCCESS; } diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 784119502de..56ea50d379d 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -192,11 +192,10 @@ IsaPnpCreateLogicalDeviceRequirements( /* Allocate memory to store requirements */ ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + ResourceCount * sizeof(IO_RESOURCE_DESCRIPTOR); - RequirementsList = ExAllocatePool(PagedPool, ListSize); + RequirementsList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); if (!RequirementsList) return STATUS_NO_MEMORY; - RtlZeroMemory(RequirementsList, ListSize); RequirementsList->ListSize = ListSize; RequirementsList->InterfaceType = Isa; RequirementsList->AlternativeLists = 1; @@ -347,11 +346,10 @@ IsaPnpCreateLogicalDeviceResources( /* Allocate memory to store resources */ ListSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = ExAllocatePool(PagedPool, ListSize); + ResourceList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); if (!ResourceList) return STATUS_NO_MEMORY; - RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; ResourceList->List[0].InterfaceType = Isa; ResourceList->List[0].PartialResourceList.Version = 1; @@ -637,11 +635,10 @@ IsaPnpCreateReadPortDORequirements( ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + 2 * RTL_NUMBER_OF(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); - RequirementsList = ExAllocatePool(PagedPool, ListSize); + RequirementsList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); if (!RequirementsList) return STATUS_NO_MEMORY; - RtlZeroMemory(RequirementsList, ListSize); RequirementsList->ListSize = ListSize; RequirementsList->AlternativeLists = 1; @@ -687,11 +684,10 @@ IsaPnpCreateReadPortDOResources( ListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (RTL_NUMBER_OF(Ports) - 1); - ResourceList = ExAllocatePool(PagedPool, ListSize); + ResourceList = ExAllocatePoolZero(PagedPool, ListSize, TAG_ISAPNP); if (!ResourceList) return STATUS_NO_MEMORY; - RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; ResourceList->List[0].InterfaceType = Internal; ResourceList->List[0].PartialResourceList.Version = 1; diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 9d339f2f0d4..e9b003b325b 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -17,7 +17,7 @@ extern "C" { #endif -#define TAG_ISAPNP 'PNPI' +#define TAG_ISAPNP 'pasI' typedef enum { diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index c8a86ed76f0..57c217f200e 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -29,7 +29,7 @@ IsaPdoQueryDeviceRelations( if (IrpSp->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) return Irp->IoStatus.Status; - DeviceRelations = ExAllocatePool(PagedPool, sizeof(*DeviceRelations)); + DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(*DeviceRelations), TAG_ISAPNP); if (!DeviceRelations) return STATUS_NO_MEMORY; @@ -127,7 +127,7 @@ IsaPdoQueryId( if (!Source->Buffer) return Irp->IoStatus.Status; - Buffer = ExAllocatePool(PagedPool, Source->MaximumLength); + Buffer = ExAllocatePoolWithTag(PagedPool, Source->MaximumLength, TAG_ISAPNP); if (!Buffer) return STATUS_NO_MEMORY; @@ -150,7 +150,7 @@ IsaPdoQueryResources( return Irp->IoStatus.Status; ListSize = PdoExt->ResourceListSize; - ResourceList = ExAllocatePool(PagedPool, ListSize); + ResourceList = ExAllocatePoolWithTag(PagedPool, ListSize, TAG_ISAPNP); if (!ResourceList) return STATUS_NO_MEMORY; @@ -173,7 +173,7 @@ IsaPdoQueryResourceRequirements( return Irp->IoStatus.Status; ListSize = PdoExt->RequirementsList->ListSize; - RequirementsList = ExAllocatePool(PagedPool, ListSize); + RequirementsList = ExAllocatePoolWithTag(PagedPool, ListSize, TAG_ISAPNP); if (!RequirementsList) return STATUS_NO_MEMORY;

3 years, 6 months

[reactos] 01/20: [ISAPNP] Code formatting

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f44930f91fc843884a77… commit 8f44930f91fc843884a778c018c8809ed34ad5d9 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Mar 4 18:42:42 2021 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sun Jun 20 19:22:31 2021 +0600 [ISAPNP] Code formatting - Add SAL2 annotations. - Use RTL_NUMBER_OF macro in kernel mode. - Use better function/member names. - Less hardcoded values. - Add license information. See commit d9face83c693cb5e3fad155df8609d9c13316061 for details. No functional changes. --- drivers/bus/isapnp/fdo.c | 26 ++--- drivers/bus/isapnp/hardware.c | 107 +++++++++---------- drivers/bus/isapnp/isapnp.c | 234 ++++++++++++++++++++++-------------------- drivers/bus/isapnp/isapnp.h | 76 ++++++++------ drivers/bus/isapnp/isapnphw.h | 32 ++++-- drivers/bus/isapnp/pdo.c | 98 ++++++++++-------- 6 files changed, 311 insertions(+), 262 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index be044407f20..b1d5781ea48 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -1,12 +1,12 @@ /* * PROJECT: ReactOS ISA PnP Bus driver - * FILE: fdo.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: FDO-specific code - * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) - * Hervé Poussineau + * COPYRIGHT: Copyright 2010 Cameron Gutman <cameron.gutman(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> */ -#include <isapnp.h> +#include "isapnp.h" #define NDEBUG #include <debug.h> @@ -14,9 +14,9 @@ NTSTATUS NTAPI IsaFdoStartDevice( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { UNREFERENCED_PARAMETER(Irp); UNREFERENCED_PARAMETER(IrpSp); @@ -29,9 +29,9 @@ IsaFdoStartDevice( NTSTATUS NTAPI IsaFdoQueryDeviceRelations( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) return Irp->IoStatus.Status; @@ -42,9 +42,9 @@ IsaFdoQueryDeviceRelations( NTSTATUS NTAPI IsaFdoPnp( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { NTSTATUS Status = Irp->IoStatus.Status; diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 8b84038ef8a..5c016902d5b 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -1,12 +1,12 @@ /* * PROJECT: ReactOS ISA PnP Bus driver - * FILE: hardware.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Hardware support code - * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) - * Hervé Poussineau + * COPYRIGHT: Copyright 2010 Cameron Gutman <cameron.gutman(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> */ -#include <isapnp.h> +#include "isapnp.h" #define NDEBUG #include <debug.h> @@ -15,7 +15,7 @@ static inline VOID WriteAddress( - IN USHORT Address) + _In_ USHORT Address) { WRITE_PORT_UCHAR((PUCHAR)ISAPNP_ADDRESS, Address); } @@ -24,7 +24,7 @@ static inline VOID WriteData( - IN USHORT Data) + _In_ USHORT Data) { WRITE_PORT_UCHAR((PUCHAR)ISAPNP_WRITE_DATA, Data); } @@ -33,7 +33,7 @@ static inline UCHAR ReadData( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { return READ_PORT_UCHAR(ReadDataPort); } @@ -42,8 +42,8 @@ static inline VOID WriteByte( - IN USHORT Address, - IN USHORT Value) + _In_ USHORT Address, + _In_ USHORT Value) { WriteAddress(Address); WriteData(Value); @@ -53,8 +53,8 @@ static inline UCHAR ReadByte( - IN PUCHAR ReadDataPort, - IN USHORT Address) + _In_ PUCHAR ReadDataPort, + _In_ USHORT Address) { WriteAddress(Address); return ReadData(ReadDataPort); @@ -64,8 +64,8 @@ static inline USHORT ReadWord( - IN PUCHAR ReadDataPort, - IN USHORT Address) + _In_ PUCHAR ReadDataPort, + _In_ USHORT Address) { return ((ReadByte(ReadDataPort, Address) << 8) | (ReadByte(ReadDataPort, Address + 1))); @@ -75,7 +75,7 @@ static inline VOID SetReadDataPort( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { WriteByte(ISAPNP_READPORT, ((ULONG_PTR)ReadDataPort >> 2)); } @@ -108,7 +108,7 @@ static inline VOID Wake( - IN USHORT Csn) + _In_ USHORT Csn) { WriteByte(ISAPNP_WAKE, Csn); } @@ -117,7 +117,7 @@ static inline USHORT ReadResourceData( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { return ReadByte(ReadDataPort, ISAPNP_RESOURCEDATA); } @@ -126,7 +126,7 @@ static inline USHORT ReadStatus( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { return ReadByte(ReadDataPort, ISAPNP_STATUS); } @@ -135,7 +135,7 @@ static inline VOID WriteCsn( - IN USHORT Csn) + _In_ USHORT Csn) { WriteByte(ISAPNP_CARDSELECTNUMBER, Csn); } @@ -144,7 +144,7 @@ static inline VOID WriteLogicalDeviceNumber( - IN USHORT LogDev) + _In_ USHORT LogDev) { WriteByte(ISAPNP_LOGICALDEVICENUMBER, LogDev); } @@ -153,7 +153,7 @@ static inline VOID ActivateDevice( - IN USHORT LogDev) + _In_ USHORT LogDev) { WriteLogicalDeviceNumber(LogDev); WriteByte(ISAPNP_ACTIVATE, 1); @@ -163,7 +163,7 @@ static inline VOID DeactivateDevice( - IN USHORT LogDev) + _In_ USHORT LogDev) { WriteLogicalDeviceNumber(LogDev); WriteByte(ISAPNP_ACTIVATE, 0); @@ -173,8 +173,8 @@ static inline USHORT ReadIoBase( - IN PUCHAR ReadDataPort, - IN USHORT Index) + _In_ PUCHAR ReadDataPort, + _In_ USHORT Index) { return ReadWord(ReadDataPort, ISAPNP_IOBASE(Index)); } @@ -183,8 +183,8 @@ static inline USHORT ReadIrqNo( - IN PUCHAR ReadDataPort, - IN USHORT Index) + _In_ PUCHAR ReadDataPort, + _In_ USHORT Index) { return ReadByte(ReadDataPort, ISAPNP_IRQNO(Index)); } @@ -193,8 +193,8 @@ static inline USHORT ReadIrqType( - IN PUCHAR ReadDataPort, - IN USHORT Index) + _In_ PUCHAR ReadDataPort, + _In_ USHORT Index) { return ReadByte(ReadDataPort, ISAPNP_IRQTYPE(Index)); } @@ -203,8 +203,8 @@ static inline USHORT ReadDmaChannel( - IN PUCHAR ReadDataPort, - IN USHORT Index) + _In_ PUCHAR ReadDataPort, + _In_ USHORT Index) { return ReadByte(ReadDataPort, ISAPNP_DMACHANNEL(Index)); } @@ -221,8 +221,8 @@ static inline UCHAR NextLFSR( - IN UCHAR Lfsr, - IN UCHAR InputBit) + _In_ UCHAR Lfsr, + _In_ UCHAR InputBit) { UCHAR NextLfsr = Lfsr >> 1; @@ -252,7 +252,7 @@ SendKey(VOID) static USHORT PeekByte( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { USHORT i; @@ -270,9 +270,9 @@ PeekByte( static VOID Peek( - IN PUCHAR ReadDataPort, - IN OUT PVOID Buffer, - IN ULONG Length) + _In_ PUCHAR ReadDataPort, + _Out_writes_bytes_all_opt_(Length) PVOID Buffer, + _In_ ULONG Length) { USHORT i, Byte; @@ -280,22 +280,23 @@ Peek( { Byte = PeekByte(ReadDataPort); if (Buffer) - *((PUCHAR)Buffer + i) = Byte; + ((PUCHAR)Buffer)[i] = Byte; } } static USHORT IsaPnpChecksum( - IN PISAPNP_IDENTIFIER Identifier) + _In_ PISAPNP_IDENTIFIER Identifier) { - UCHAR i, j, Lfsr, Byte; + UCHAR i, j, Lfsr; Lfsr = ISAPNP_LFSR_SEED; - for (i = 0; i < 8; i++) + for (i = 0; i < FIELD_OFFSET(ISAPNP_IDENTIFIER, Checksum); i++) { - Byte = *(((PUCHAR)Identifier) + i); - for (j = 0; j < 8; j++) + UCHAR Byte = ((PUCHAR)Identifier)[i]; + + for (j = 0; j < RTL_BITS_OF(Byte); j++) { Lfsr = NextLFSR(Lfsr, Byte); Byte >>= 1; @@ -308,9 +309,9 @@ IsaPnpChecksum( static BOOLEAN ReadTags( - IN PUCHAR ReadDataPort, - IN USHORT LogDev, - IN OUT PISAPNP_LOGICAL_DEVICE LogDevice) + _In_ PUCHAR ReadDataPort, + _In_ USHORT LogDev, + _Inout_ PISAPNP_LOGICAL_DEVICE LogDevice) { BOOLEAN res = FALSE; PVOID Buffer; @@ -392,7 +393,7 @@ ReadTags( static INT TryIsolate( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { ISAPNP_IDENTIFIER Identifier; USHORT i, j; @@ -497,8 +498,8 @@ TryIsolate( VOID DeviceActivation( - IN PISAPNP_LOGICAL_DEVICE IsaDevice, - IN BOOLEAN Activate) + _In_ PISAPNP_LOGICAL_DEVICE IsaDevice, + _In_ BOOLEAN Activate) { WaitForKey(); SendKey(); @@ -516,7 +517,7 @@ DeviceActivation( NTSTATUS ProbeIsaPnpBus( - IN PISAPNP_FDO_EXTENSION FdoExt) + _In_ PISAPNP_FDO_EXTENSION FdoExt) { PISAPNP_LOGICAL_DEVICE LogDevice; ISAPNP_IDENTIFIER Identifier; @@ -578,7 +579,7 @@ ProbeIsaPnpBus( WaitForKey(); - InsertTailList(&FdoExt->DeviceListHead, &LogDevice->ListEntry); + InsertTailList(&FdoExt->DeviceListHead, &LogDevice->DeviceLink); FdoExt->DeviceCount++; } } @@ -589,7 +590,7 @@ ProbeIsaPnpBus( NTSTATUS NTAPI IsaHwTryReadDataPort( - IN PUCHAR ReadDataPort) + _In_ PUCHAR ReadDataPort) { return TryIsolate(ReadDataPort) > 0 ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } @@ -597,7 +598,7 @@ IsaHwTryReadDataPort( NTSTATUS NTAPI IsaHwActivateDevice( - IN PISAPNP_LOGICAL_DEVICE LogicalDevice) + _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { DeviceActivation(LogicalDevice, TRUE); @@ -608,7 +609,7 @@ IsaHwActivateDevice( NTSTATUS NTAPI IsaHwDeactivateDevice( - IN PISAPNP_LOGICAL_DEVICE LogicalDevice) + _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { DeviceActivation(LogicalDevice, FALSE); @@ -619,7 +620,7 @@ IsaHwDeactivateDevice( NTSTATUS NTAPI IsaHwFillDeviceList( - IN PISAPNP_FDO_EXTENSION FdoExt) + _In_ PISAPNP_FDO_EXTENSION FdoExt) { return ProbeIsaPnpBus(FdoExt); } diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index f14894de6c8..784119502de 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -1,12 +1,12 @@ /* * PROJECT: ReactOS ISA PnP Bus driver - * FILE: isapnp.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Driver entry - * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) - * Hervé Poussineau + * COPYRIGHT: Copyright 2010 Cameron Gutman <cameron.gutman(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> */ -#include <isapnp.h> +#include "isapnp.h" #define NDEBUG #include <debug.h> @@ -140,14 +140,14 @@ IsaFdoCreateDeviceIDs( static NTSTATUS NTAPI -IsaFdoCreateRequirements( - IN PISAPNP_PDO_EXTENSION PdoExt) +IsaPnpCreateLogicalDeviceRequirements( + _In_ PISAPNP_PDO_EXTENSION PdoExt) { PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; - RTL_BITMAP IrqBitmap[ARRAYSIZE(LogDev->Irq)]; - RTL_BITMAP DmaBitmap[ARRAYSIZE(LogDev->Dma)]; - ULONG IrqData[ARRAYSIZE(LogDev->Irq)]; - ULONG DmaData[ARRAYSIZE(LogDev->Dma)]; + RTL_BITMAP IrqBitmap[RTL_NUMBER_OF(LogDev->Irq)]; + RTL_BITMAP DmaBitmap[RTL_NUMBER_OF(LogDev->Dma)]; + ULONG IrqData[RTL_NUMBER_OF(LogDev->Irq)]; + ULONG DmaData[RTL_NUMBER_OF(LogDev->Dma)]; ULONG ResourceCount = 0; ULONG ListSize, i, j; BOOLEAN FirstIrq = TRUE, FirstDma = TRUE; @@ -155,19 +155,22 @@ IsaFdoCreateRequirements( PIO_RESOURCE_DESCRIPTOR Descriptor; /* Count number of requirements */ - for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { if (!LogDev->Io[i].Description.Length) break; + ResourceCount++; } - for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) { if (!LogDev->Irq[i].Description.Mask) break; + IrqData[i] = LogDev->Irq[i].Description.Mask; RtlInitializeBitMap(&IrqBitmap[i], &IrqData[i], 16); ResourceCount += RtlNumberOfSetBits(&IrqBitmap[i]); + if (LogDev->Irq[i].Description.Information & 0x4) { /* Add room for level sensitive */ @@ -176,10 +179,11 @@ IsaFdoCreateRequirements( } if (ResourceCount == 0) return STATUS_SUCCESS; - for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) { if (!LogDev->Dma[i].Description.Mask) break; + DmaData[i] = LogDev->Dma[i].Description.Mask; RtlInitializeBitMap(&DmaBitmap[i], &DmaData[i], 8); ResourceCount += RtlNumberOfSetBits(&DmaBitmap[i]); @@ -187,7 +191,7 @@ IsaFdoCreateRequirements( /* Allocate memory to store requirements */ ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) - + ResourceCount * sizeof(IO_RESOURCE_DESCRIPTOR); + + ResourceCount * sizeof(IO_RESOURCE_DESCRIPTOR); RequirementsList = ExAllocatePool(PagedPool, ListSize); if (!RequirementsList) return STATUS_NO_MEMORY; @@ -203,15 +207,17 @@ IsaFdoCreateRequirements( /* Store requirements */ Descriptor = RequirementsList->List[0].Descriptors; - for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { if (!LogDev->Io[i].Description.Length) break; + DPRINT("Device.Io[%d].Information = 0x%02x\n", i, LogDev->Io[i].Description.Information); DPRINT("Device.Io[%d].Minimum = 0x%02x\n", i, LogDev->Io[i].Description.Minimum); DPRINT("Device.Io[%d].Maximum = 0x%02x\n", i, LogDev->Io[i].Description.Maximum); DPRINT("Device.Io[%d].Alignment = 0x%02x\n", i, LogDev->Io[i].Description.Alignment); DPRINT("Device.Io[%d].Length = 0x%02x\n", i, LogDev->Io[i].Description.Length); + Descriptor->Type = CmResourceTypePort; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; if (LogDev->Io[i].Description.Information & 0x1) @@ -221,19 +227,23 @@ IsaFdoCreateRequirements( Descriptor->u.Port.Length = LogDev->Io[i].Description.Length; Descriptor->u.Port.Alignment = LogDev->Io[i].Description.Alignment; Descriptor->u.Port.MinimumAddress.LowPart = LogDev->Io[i].Description.Minimum; - Descriptor->u.Port.MaximumAddress.LowPart = LogDev->Io[i].Description.Maximum + LogDev->Io[i].Description.Length - 1; + Descriptor->u.Port.MaximumAddress.LowPart = + LogDev->Io[i].Description.Maximum + LogDev->Io[i].Description.Length - 1; Descriptor++; } - for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) { if (!LogDev->Irq[i].Description.Mask) break; + DPRINT("Device.Irq[%d].Mask = 0x%02x\n", i, LogDev->Irq[i].Description.Mask); DPRINT("Device.Irq[%d].Information = 0x%02x\n", i, LogDev->Irq[i].Description.Information); + for (j = 0; j < 15; j++) { if (!RtlCheckBit(&IrqBitmap[i], j)) continue; + if (FirstIrq) FirstIrq = FALSE; else @@ -242,6 +252,7 @@ IsaFdoCreateRequirements( Descriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; Descriptor->u.Interrupt.MinimumVector = Descriptor->u.Interrupt.MaximumVector = j; Descriptor++; + if (LogDev->Irq[i].Description.Information & 0x4) { /* Level interrupt */ @@ -253,16 +264,19 @@ IsaFdoCreateRequirements( } } } - for (i = 0; i < ARRAYSIZE(LogDev->Dma); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { if (!LogDev->Dma[i].Description.Mask) break; + DPRINT("Device.Dma[%d].Mask = 0x%02x\n", i, LogDev->Dma[i].Description.Mask); DPRINT("Device.Dma[%d].Information = 0x%02x\n", i, LogDev->Dma[i].Description.Information); + for (j = 0; j < 8; j++) { if (!RtlCheckBit(&DmaBitmap[i], j)) continue; + if (FirstDma) FirstDma = FALSE; else @@ -296,8 +310,8 @@ IsaFdoCreateRequirements( static NTSTATUS NTAPI -IsaFdoCreateResources( - IN PISAPNP_PDO_EXTENSION PdoExt) +IsaPnpCreateLogicalDeviceResources( + _In_ PISAPNP_PDO_EXTENSION PdoExt) { PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; ULONG ResourceCount = 0; @@ -306,21 +320,21 @@ IsaFdoCreateResources( PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; /* Count number of required resources */ - for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { if (LogDev->Io[i].CurrentBase) ResourceCount++; else break; } - for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) { if (LogDev->Irq[i].CurrentNo) ResourceCount++; else break; } - for (i = 0; i < ARRAYSIZE(LogDev->Dma); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { if (LogDev->Dma[i].CurrentChannel != 4) ResourceCount++; @@ -332,7 +346,7 @@ IsaFdoCreateResources( /* Allocate memory to store resources */ ListSize = sizeof(CM_RESOURCE_LIST) - + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); ResourceList = ExAllocatePool(PagedPool, ListSize); if (!ResourceList) return STATUS_NO_MEMORY; @@ -346,10 +360,11 @@ IsaFdoCreateResources( /* Store resources */ ResourceCount = 0; - for (i = 0; i < ARRAYSIZE(LogDev->Io); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Io); i++) { if (!LogDev->Io[i].CurrentBase) continue; + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypePort; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; @@ -360,10 +375,11 @@ IsaFdoCreateResources( Descriptor->u.Port.Length = LogDev->Io[i].Description.Length; Descriptor->u.Port.Start.LowPart = LogDev->Io[i].CurrentBase; } - for (i = 0; i < ARRAYSIZE(LogDev->Irq); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Irq); i++) { if (!LogDev->Irq[i].CurrentNo) continue; + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypeInterrupt; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; @@ -375,10 +391,11 @@ IsaFdoCreateResources( Descriptor->u.Interrupt.Vector = LogDev->Irq[i].CurrentNo; Descriptor->u.Interrupt.Affinity = -1; } - for (i = 0; i < ARRAYSIZE(LogDev->Dma); i++) + for (i = 0; i < RTL_NUMBER_OF(LogDev->Dma); i++) { if (LogDev->Dma[i].CurrentChannel == 4) continue; + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[ResourceCount++]; Descriptor->Type = CmResourceTypeDma; Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; @@ -409,9 +426,9 @@ IsaFdoCreateResources( NTSTATUS NTAPI IsaPnpFillDeviceRelations( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp, - IN BOOLEAN IncludeDataPort) + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ BOOLEAN IncludeDataPort) { PISAPNP_PDO_EXTENSION PdoExt; NTSTATUS Status = STATUS_SUCCESS; @@ -429,63 +446,63 @@ IsaPnpFillDeviceRelations( if (IncludeDataPort) { - DeviceRelations->Objects[i++] = FdoExt->DataPortPdo; - ObReferenceObject(FdoExt->DataPortPdo); + DeviceRelations->Objects[i++] = FdoExt->ReadPortPdo; + ObReferenceObject(FdoExt->ReadPortPdo); } CurrentEntry = FdoExt->DeviceListHead.Flink; while (CurrentEntry != &FdoExt->DeviceListHead) { - IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, ListEntry); + IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, DeviceLink); - if (!IsaDevice->Pdo) - { - Status = IoCreateDevice(FdoExt->DriverObject, - sizeof(ISAPNP_PDO_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &IsaDevice->Pdo); - if (!NT_SUCCESS(Status)) - { - break; - } + if (!IsaDevice->Pdo) + { + Status = IoCreateDevice(FdoExt->DriverObject, + sizeof(ISAPNP_PDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &IsaDevice->Pdo); + if (!NT_SUCCESS(Status)) + { + break; + } - IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - //Device->Pdo->Flags |= DO_POWER_PAGABLE; + //Device->Pdo->Flags |= DO_POWER_PAGABLE; - PdoExt = (PISAPNP_PDO_EXTENSION)IsaDevice->Pdo->DeviceExtension; + PdoExt = IsaDevice->Pdo->DeviceExtension; - RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); + RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); - PdoExt->Common.IsFdo = FALSE; - PdoExt->Common.Self = IsaDevice->Pdo; - PdoExt->Common.State = dsStopped; - PdoExt->IsaPnpDevice = IsaDevice; - PdoExt->FdoExt = FdoExt; + PdoExt->Common.IsFdo = FALSE; + PdoExt->Common.Self = IsaDevice->Pdo; + PdoExt->Common.State = dsStopped; + PdoExt->IsaPnpDevice = IsaDevice; + PdoExt->FdoExt = FdoExt; - Status = IsaFdoCreateDeviceIDs(PdoExt); + Status = IsaFdoCreateDeviceIDs(PdoExt); - if (NT_SUCCESS(Status)) - Status = IsaFdoCreateRequirements(PdoExt); + if (NT_SUCCESS(Status)) + Status = IsaPnpCreateLogicalDeviceRequirements(PdoExt); - if (NT_SUCCESS(Status)) - Status = IsaFdoCreateResources(PdoExt); + if (NT_SUCCESS(Status)) + Status = IsaPnpCreateLogicalDeviceResources(PdoExt); - if (!NT_SUCCESS(Status)) - { - IoDeleteDevice(IsaDevice->Pdo); - IsaDevice->Pdo = NULL; - break; - } - } - DeviceRelations->Objects[i++] = IsaDevice->Pdo; + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(IsaDevice->Pdo); + IsaDevice->Pdo = NULL; + break; + } + } + DeviceRelations->Objects[i++] = IsaDevice->Pdo; - ObReferenceObject(IsaDevice->Pdo); + ObReferenceObject(IsaDevice->Pdo); - CurrentEntry = CurrentEntry->Flink; + CurrentEntry = CurrentEntry->Flink; } DeviceRelations->Count = i; @@ -495,7 +512,6 @@ IsaPnpFillDeviceRelations( return Status; } - static IO_COMPLETION_ROUTINE ForwardIrpCompletion; static @@ -539,14 +555,16 @@ IsaForwardIrpSynchronous( return Status; } +_Dispatch_type_(IRP_MJ_CREATE) +_Dispatch_type_(IRP_MJ_CLOSE) static DRIVER_DISPATCH IsaCreateClose; static NTSTATUS NTAPI IsaCreateClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) { Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -609,15 +627,16 @@ static NTSTATUS NTAPI IsaPnpCreateReadPortDORequirements( - IN PISAPNP_PDO_EXTENSION PdoExt) + _In_ PISAPNP_PDO_EXTENSION PdoExt) { - USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, 0x274, 0x3e4, 0x204, 0x2e4, 0x354, 0x2f4 }; ULONG ListSize, i; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PIO_RESOURCE_DESCRIPTOR Descriptor; + const ULONG Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, + 0x274, 0x3E4, 0x204, 0x2E4, 0x354, 0x2F4 }; ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) - + 2 * ARRAYSIZE(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); + + 2 * RTL_NUMBER_OF(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); RequirementsList = ExAllocatePool(PagedPool, ListSize); if (!RequirementsList) return STATUS_NO_MEMORY; @@ -628,9 +647,9 @@ IsaPnpCreateReadPortDORequirements( RequirementsList->List[0].Version = 1; RequirementsList->List[0].Revision = 1; - RequirementsList->List[0].Count = 2 * ARRAYSIZE(Ports); + RequirementsList->List[0].Count = 2 * RTL_NUMBER_OF(Ports); - for (i = 0; i < 2 * ARRAYSIZE(Ports); i += 2) + for (i = 0; i < 2 * RTL_NUMBER_OF(Ports); i += 2) { Descriptor = &RequirementsList->List[0].Descriptors[i]; @@ -659,15 +678,15 @@ static NTSTATUS NTAPI IsaPnpCreateReadPortDOResources( - IN PISAPNP_PDO_EXTENSION PdoExt) + _In_ PISAPNP_PDO_EXTENSION PdoExt) { - USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; + const USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; ULONG ListSize, i; PCM_RESOURCE_LIST ResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - ListSize = sizeof(CM_RESOURCE_LIST) - + (ARRAYSIZE(Ports) - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ListSize = sizeof(CM_RESOURCE_LIST) + + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (RTL_NUMBER_OF(Ports) - 1); ResourceList = ExAllocatePool(PagedPool, ListSize); if (!ResourceList) return STATUS_NO_MEMORY; @@ -677,9 +696,9 @@ IsaPnpCreateReadPortDOResources( ResourceList->List[0].InterfaceType = Internal; ResourceList->List[0].PartialResourceList.Version = 1; ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; + ResourceList->List[0].PartialResourceList.Count = RTL_NUMBER_OF(Ports); - for (i = 0; i < ARRAYSIZE(Ports); i++) + for (i = 0; i < RTL_NUMBER_OF(Ports); i++) { Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; Descriptor->Type = CmResourceTypePort; @@ -697,28 +716,30 @@ IsaPnpCreateReadPortDOResources( static NTSTATUS NTAPI -IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) +IsaPnpCreateReadPortDO( + _In_ PISAPNP_FDO_EXTENSION FdoExt) { UNICODE_STRING DeviceID = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0"); UNICODE_STRING HardwareIDs = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0\0"); UNICODE_STRING CompatibleIDs = RTL_CONSTANT_STRING(L"\0\0"); UNICODE_STRING InstanceID = RTL_CONSTANT_STRING(L"0\0"); PISAPNP_PDO_EXTENSION PdoExt; - NTSTATUS Status; + Status = IoCreateDevice(FdoExt->DriverObject, sizeof(ISAPNP_PDO_EXTENSION), NULL, FILE_DEVICE_CONTROLLER, FILE_DEVICE_SECURE_OPEN, FALSE, - &FdoExt->DataPortPdo); + &FdoExt->ReadPortPdo); if (!NT_SUCCESS(Status)) return Status; - PdoExt = (PISAPNP_PDO_EXTENSION)FdoExt->DataPortPdo->DeviceExtension; + + PdoExt = FdoExt->ReadPortPdo->DeviceExtension; RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); PdoExt->Common.IsFdo = FALSE; - PdoExt->Common.Self = FdoExt->DataPortPdo; + PdoExt->Common.Self = FdoExt->ReadPortPdo; PdoExt->Common.State = dsStopped; PdoExt->FdoExt = FdoExt; @@ -761,8 +782,8 @@ static NTSTATUS NTAPI IsaAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PhysicalDeviceObject) + _In_ PDRIVER_OBJECT DriverObject, + _In_ PDEVICE_OBJECT PhysicalDeviceObject) { PDEVICE_OBJECT Fdo; PISAPNP_FDO_EXTENSION FdoExt; @@ -779,7 +800,7 @@ IsaAddDevice( &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create FDO (0x%x)\n", Status); + DPRINT1("Failed to create FDO (0x%08lx)\n", Status); return Status; } @@ -802,17 +823,19 @@ IsaAddDevice( return Status; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - FdoExt->DataPortPdo->Flags &= ~DO_DEVICE_INITIALIZING; + FdoExt->ReadPortPdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } +_Dispatch_type_(IRP_MJ_POWER) DRIVER_DISPATCH IsaPower; + NTSTATUS NTAPI IsaPower( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) { PISAPNP_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; NTSTATUS Status; @@ -829,14 +852,15 @@ IsaPower( return PoCallDriver(((PISAPNP_FDO_EXTENSION)DevExt)->Ldo, Irp); } +_Dispatch_type_(IRP_MJ_PNP) static DRIVER_DISPATCH IsaPnp; static NTSTATUS NTAPI IsaPnp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PISAPNP_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; @@ -844,24 +868,16 @@ IsaPnp( DPRINT("%s(%p, %p)\n", __FUNCTION__, DeviceObject, Irp); if (DevExt->IsFdo) - { - return IsaFdoPnp((PISAPNP_FDO_EXTENSION)DevExt, - Irp, - IrpSp); - } + return IsaFdoPnp((PISAPNP_FDO_EXTENSION)DevExt, Irp, IrpSp); else - { - return IsaPdoPnp((PISAPNP_PDO_EXTENSION)DevExt, - Irp, - IrpSp); - } + return IsaPdoPnp((PISAPNP_PDO_EXTENSION)DevExt, Irp, IrpSp); } NTSTATUS NTAPI DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) { DPRINT("%s(%p, %wZ)\n", __FUNCTION__, DriverObject, RegistryPath); diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index ed1d81b4bc9..9d339f2f0d4 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -1,9 +1,17 @@ +/* + * PROJECT: ReactOS ISA PnP Bus driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Common header file + * COPYRIGHT: Copyright 2010 Cameron Gutman <cameron.gutman(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> + */ + #ifndef _ISAPNP_PCH_ #define _ISAPNP_PCH_ #include <wdm.h> #include <ntstrsafe.h> -#include <isapnphw.h> +#include "isapnphw.h" #ifdef __cplusplus extern "C" { @@ -11,28 +19,33 @@ extern "C" { #define TAG_ISAPNP 'PNPI' -typedef enum { +typedef enum +{ dsStopped, dsStarted } ISAPNP_DEVICE_STATE; -typedef struct _ISAPNP_IO { +typedef struct _ISAPNP_IO +{ USHORT CurrentBase; ISAPNP_IO_DESCRIPTION Description; -} ISAPNP_IO, PISAPNP_IO; +} ISAPNP_IO, *PISAPNP_IO; -typedef struct _ISAPNP_IRQ { +typedef struct _ISAPNP_IRQ +{ UCHAR CurrentNo; UCHAR CurrentType; ISAPNP_IRQ_DESCRIPTION Description; } ISAPNP_IRQ, *PISAPNP_IRQ; -typedef struct _ISAPNP_DMA { +typedef struct _ISAPNP_DMA +{ UCHAR CurrentChannel; ISAPNP_DMA_DESCRIPTION Description; } ISAPNP_DMA, *PISAPNP_DMA; -typedef struct _ISAPNP_LOGICAL_DEVICE { +typedef struct _ISAPNP_LOGICAL_DEVICE +{ PDEVICE_OBJECT Pdo; ISAPNP_LOGDEVID LogDevId; UCHAR VendorId[3]; @@ -43,20 +56,22 @@ typedef struct _ISAPNP_LOGICAL_DEVICE { ISAPNP_DMA Dma[2]; UCHAR CSN; UCHAR LDN; - LIST_ENTRY ListEntry; + LIST_ENTRY DeviceLink; } ISAPNP_LOGICAL_DEVICE, *PISAPNP_LOGICAL_DEVICE; -typedef struct _ISAPNP_COMMON_EXTENSION { +typedef struct _ISAPNP_COMMON_EXTENSION +{ PDEVICE_OBJECT Self; BOOLEAN IsFdo; ISAPNP_DEVICE_STATE State; } ISAPNP_COMMON_EXTENSION, *PISAPNP_COMMON_EXTENSION; -typedef struct _ISAPNP_FDO_EXTENSION { +typedef struct _ISAPNP_FDO_EXTENSION +{ ISAPNP_COMMON_EXTENSION Common; PDEVICE_OBJECT Ldo; PDEVICE_OBJECT Pdo; - PDEVICE_OBJECT DataPortPdo; + PDEVICE_OBJECT ReadPortPdo; LIST_ENTRY DeviceListHead; ULONG DeviceCount; PDRIVER_OBJECT DriverObject; @@ -64,7 +79,8 @@ typedef struct _ISAPNP_FDO_EXTENSION { KSPIN_LOCK Lock; } ISAPNP_FDO_EXTENSION, *PISAPNP_FDO_EXTENSION; -typedef struct _ISAPNP_PDO_EXTENSION { +typedef struct _ISAPNP_PDO_EXTENSION +{ ISAPNP_COMMON_EXTENSION Common; PISAPNP_LOGICAL_DEVICE IsaPnpDevice; PISAPNP_FDO_EXTENSION FdoExt; @@ -92,60 +108,54 @@ IsaPnpDuplicateUnicodeString( NTSTATUS NTAPI IsaPnpFillDeviceRelations( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp, - IN BOOLEAN IncludeDataPort); + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ BOOLEAN IncludeDataPort); DRIVER_INITIALIZE DriverEntry; -NTSTATUS -NTAPI -DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath); - NTSTATUS NTAPI IsaForwardIrpSynchronous( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp); + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp); /* fdo.c */ NTSTATUS NTAPI IsaFdoPnp( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp); + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp); /* pdo.c */ NTSTATUS NTAPI IsaPdoPnp( - IN PISAPNP_PDO_EXTENSION PdoDeviceExtension, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp); + _In_ PISAPNP_PDO_EXTENSION PdoDeviceExtension, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp); /* hardware.c */ NTSTATUS NTAPI IsaHwTryReadDataPort( - IN PUCHAR ReadDataPort); + _In_ PUCHAR ReadDataPort); NTSTATUS NTAPI IsaHwFillDeviceList( - IN PISAPNP_FDO_EXTENSION FdoExt); + _In_ PISAPNP_FDO_EXTENSION FdoExt); NTSTATUS NTAPI IsaHwDeactivateDevice( - IN PISAPNP_LOGICAL_DEVICE LogicalDevice); + _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); NTSTATUS NTAPI IsaHwActivateDevice( - IN PISAPNP_LOGICAL_DEVICE LogicalDevice); + _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); #ifdef __cplusplus } diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h index 9f1cc0c9cab..cc33c320683 100644 --- a/drivers/bus/isapnp/isapnphw.h +++ b/drivers/bus/isapnp/isapnphw.h @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS ISA PnP Bus driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hardware definitions + * COPYRIGHT: Copyright 2010 Cameron Gutman <cameron.gutman(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> + */ + #pragma once #ifdef __cplusplus @@ -83,20 +91,23 @@ extern "C" { #define ISAPNP_TAG_RSVDLONGF 0xFF #define ISAPNP_TAG_PSEUDO_NEWBOARD 0x100 -typedef struct _ISAPNP_IDENTIFIER { +typedef struct _ISAPNP_IDENTIFIER +{ USHORT VendorId; USHORT ProdId; ULONG Serial; UCHAR Checksum; } ISAPNP_IDENTIFIER, *PISAPNP_IDENTIFIER; -typedef struct _ISAPNP_LOGDEVID { +typedef struct _ISAPNP_LOGDEVID +{ USHORT VendorId; USHORT ProdId; USHORT Flags; } ISAPNP_LOGDEVID, *PISAPNP_LOGDEVID; -typedef struct _ISAPNP_DEVICEID { +typedef struct _ISAPNP_DEVICEID +{ CHAR* Name; USHORT VendorId; USHORT ProdId; @@ -104,23 +115,26 @@ typedef struct _ISAPNP_DEVICEID { #include <pshpack1.h> -typedef struct _ISAPNP_IO_DESCRIPTION { +typedef struct _ISAPNP_IO_DESCRIPTION +{ UCHAR Information; USHORT Minimum; USHORT Maximum; UCHAR Alignment; UCHAR Length; -} ISAPNP_IO_DESCRIPTION; +} ISAPNP_IO_DESCRIPTION, *PISAPNP_IO_DESCRIPTION; -typedef struct _ISAPNP_IRQ_DESCRIPTION { +typedef struct _ISAPNP_IRQ_DESCRIPTION +{ USHORT Mask; UCHAR Information; -} ISAPNP_IRQ_DESCRIPTION; +} ISAPNP_IRQ_DESCRIPTION, *PISAPNP_IRQ_DESCRIPTION; -typedef struct _ISAPNP_DMA_DESCRIPTION { +typedef struct _ISAPNP_DMA_DESCRIPTION +{ UCHAR Mask; UCHAR Information; -} ISAPNP_DMA_DESCRIPTION; +} ISAPNP_DMA_DESCRIPTION, *PISAPNP_DMA_DESCRIPTION; #include <poppack.h> diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 36ba611e131..c8a86ed76f0 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -1,12 +1,12 @@ /* * PROJECT: ReactOS ISA PnP Bus driver - * FILE: pdo.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: PDO-specific code - * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) - * Hervé Poussineau + * COPYRIGHT: Copyright 2010 Cameron Gutman <cameron.gutman(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> */ -#include <isapnp.h> +#include "isapnp.h" #define NDEBUG #include <debug.h> @@ -14,14 +14,14 @@ NTSTATUS NTAPI IsaPdoQueryDeviceRelations( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { PDEVICE_RELATIONS DeviceRelations; if (IrpSp->Parameters.QueryDeviceRelations.Type == RemovalRelations && - PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + PdoExt->Common.Self == PdoExt->FdoExt->ReadPortPdo) { return IsaPnpFillDeviceRelations(PdoExt->FdoExt, Irp, FALSE); } @@ -38,16 +38,15 @@ IsaPdoQueryDeviceRelations( ObReferenceObject(PdoExt->Common.Self); Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; - return STATUS_SUCCESS; } NTSTATUS NTAPI IsaPdoQueryCapabilities( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { PDEVICE_CAPABILITIES DeviceCapabilities; PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; @@ -79,9 +78,9 @@ IsaPdoQueryCapabilities( NTSTATUS NTAPI IsaPdoQueryPnpDeviceState( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; return STATUS_SUCCESS; @@ -90,9 +89,9 @@ IsaPdoQueryPnpDeviceState( NTSTATUS NTAPI IsaPdoQueryId( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { PUNICODE_STRING Source; PWCHAR Buffer; @@ -140,9 +139,9 @@ IsaPdoQueryId( NTSTATUS NTAPI IsaPdoQueryResources( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { ULONG ListSize; PCM_RESOURCE_LIST ResourceList; @@ -163,9 +162,9 @@ IsaPdoQueryResources( NTSTATUS NTAPI IsaPdoQueryResourceRequirements( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { ULONG ListSize; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; @@ -187,8 +186,8 @@ static NTSTATUS NTAPI IsaPdoStartReadPort( - IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_FDO_EXTENSION FdoExt, + _In_ PIO_STACK_LOCATION IrpSp) { PCM_RESOURCE_LIST ResourceList = IrpSp->Parameters.StartDevice.AllocatedResources; NTSTATUS Status = STATUS_INSUFFICIENT_RESOURCES; @@ -197,24 +196,32 @@ IsaPdoStartReadPort( if (!ResourceList || ResourceList->Count != 1) { - DPRINT1("No resource list (%p) or bad count (%d)\n", ResourceList, ResourceList ? ResourceList->Count : 0); + DPRINT1("No resource list (%p) or bad count (%d)\n", + ResourceList, ResourceList ? ResourceList->Count : 0); return STATUS_INSUFFICIENT_RESOURCES; } - if (ResourceList->List[0].PartialResourceList.Version != 1 - || ResourceList->List[0].PartialResourceList.Revision != 1) + + if (ResourceList->List[0].PartialResourceList.Version != 1 || + ResourceList->List[0].PartialResourceList.Revision != 1) { - DPRINT1("Bad resource list version (%d.%d)\n", ResourceList->List[0].PartialResourceList.Version, ResourceList->List[0].PartialResourceList.Revision); + DPRINT1("Bad resource list version (%u.%u)\n", + ResourceList->List[0].PartialResourceList.Version, + ResourceList->List[0].PartialResourceList.Revision); return STATUS_REVISION_MISMATCH; } + for (i = 0; i < ResourceList->List[0].PartialResourceList.Count; i++) { - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; - if (PartialDescriptor->Type == CmResourceTypePort && PartialDescriptor->u.Port.Length > 1 && !FdoExt->ReadDataPort) + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = + &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + + if (PartialDescriptor->Type == CmResourceTypePort && + PartialDescriptor->u.Port.Length > 1 && !FdoExt->ReadDataPort) { PUCHAR ReadDataPort = ULongToPtr(PartialDescriptor->u.Port.Start.u.LowPart + 3); if (NT_SUCCESS(IsaHwTryReadDataPort(ReadDataPort))) { - /* we detected some ISAPNP cards */ + /* We detected some ISAPNP cards */ FdoExt->ReadDataPort = ReadDataPort; KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); Status = IsaHwFillDeviceList(FdoExt); @@ -222,16 +229,17 @@ IsaPdoStartReadPort( if (FdoExt->DeviceCount > 0) { IoInvalidateDeviceRelations(FdoExt->Pdo, BusRelations); - IoInvalidateDeviceRelations(FdoExt->DataPortPdo, RemovalRelations); + IoInvalidateDeviceRelations(FdoExt->ReadPortPdo, RemovalRelations); } } else { - /* mark read data port as started, even if no card has been detected */ + /* Mark read data port as started, even if no card has been detected */ Status = STATUS_SUCCESS; } } } + return Status; } @@ -239,8 +247,8 @@ static NTSTATUS NTAPI IsaPdoOnRepeaterComplete( - IN PDEVICE_OBJECT Tdo, - IN PIRP SubIrp, + PDEVICE_OBJECT Tdo, + PIRP SubIrp, PVOID NeedsVote) { PIO_STACK_LOCATION SubStack = IoGetCurrentIrpStackLocation(SubIrp); @@ -267,13 +275,12 @@ IsaPdoOnRepeaterComplete( NTSTATUS NTAPI IsaPdoRepeatRequest( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN BOOLEAN NeedsVote) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _In_ PIRP Irp, + _In_ BOOLEAN NeedsVote) { PDEVICE_OBJECT Fdo = PdoExt->FdoExt->Common.Self; PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); - PDEVICE_OBJECT Tdo = IoGetAttachedDeviceReference(Fdo); PIRP SubIrp = IoAllocateIrp(Tdo->StackSize + 1, FALSE); PIO_STACK_LOCATION SubStack = IoGetNextIrpStackLocation(SubIrp); @@ -290,15 +297,16 @@ IsaPdoRepeatRequest( SubIrp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoMarkIrpPending(Irp); IoCallDriver(Tdo, SubIrp); + return STATUS_PENDING; } NTSTATUS NTAPI IsaPdoPnp( - IN PISAPNP_PDO_EXTENSION PdoExt, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) + _In_ PISAPNP_PDO_EXTENSION PdoExt, + _Inout_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp) { NTSTATUS Status = Irp->IoStatus.Status; @@ -333,7 +341,7 @@ IsaPdoPnp( break; case IRP_MN_QUERY_PNP_DEVICE_STATE: - if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + if (PdoExt->Common.Self == PdoExt->FdoExt->ReadPortPdo) Status = IsaPdoQueryPnpDeviceState(PdoExt, Irp, IrpSp); break;

3 years, 6 months

[reactos] 02/02: [UNIATA] Workaround random crashes on Virtual PC (#3377)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba77a09c04a02841a6b88… commit ba77a09c04a02841a6b88428697bd725402c1b9d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 20 00:44:09 2021 +0300 [UNIATA] Workaround random crashes on Virtual PC (#3377) I am not sure why this line was added. I don't know how I could improve that case. Then, disable it, for the time being. Addendum to 4b9cf2e (r71252). CORE-12441 CORE-17371 --- drivers/storage/ide/uniata/id_queue.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/storage/ide/uniata/id_queue.cpp b/drivers/storage/ide/uniata/id_queue.cpp index bdafe2fd8e6..a042cf21e54 100644 --- a/drivers/storage/ide/uniata/id_queue.cpp +++ b/drivers/storage/ide/uniata/id_queue.cpp @@ -231,7 +231,11 @@ UniataQueueRequest( AtaReq->next_req = NULL; LunExt->first_req = LunExt->last_req = AtaReq; +#ifdef __REACTOS__ + // Do nothing here, workaround for CORE-12441 and CORE-17371 +#else chan->cur_cdev = GET_CDEV(Srb); +#endif } LunExt->queue_depth++; chan->queue_depth++;

3 years, 6 months

[reactos] 01/02: [UNIATA] BusMasterAdapters[]: 8086:7111 is really PIIX4, not PIIX3

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d65d4137d36d4053812ff… commit d65d4137d36d4053812ff6daee85f734ce83b248 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 20 00:34:23 2021 +0300 [UNIATA] BusMasterAdapters[]: 8086:7111 is really PIIX4, not PIIX3 Reverts a part of deaba45 (r57265). --- drivers/storage/ide/uniata/bm_devs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index f9cbc921937..8136f475178 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -143,7 +143,11 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 1230, 8086, 0x00, ATA_WDMA2, "Intel PIIX" , UNIATA_CHAN_TIMINGS ), PCI_DEV_HW_SPEC_BM( 7010, 8086, 0x00, ATA_WDMA2, "Intel PIIX3" , 0 ), +#ifndef __REACTOS__ PCI_DEV_HW_SPEC_BM( 7111, 8086, 0x00, ATA_UDMA2, "Intel PIIX3" , 0 ), +#else + PCI_DEV_HW_SPEC_BM( 7111, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), +#endif PCI_DEV_HW_SPEC_BM( 7199, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), PCI_DEV_HW_SPEC_BM( 84ca, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), PCI_DEV_HW_SPEC_BM( 7601, 8086, 0x00, ATA_UDMA2, "Intel ICH0" , 0 ),

3 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2021