Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:23:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ISAPNP] Report a ReadDataPort PDO

Browse source 
This PDO will later request resources required for ISAPNP bus.
This commit is contained in:
Hervé Poussineau 2020-03-16 19:24:07 +01:00
parent e0607fcebf
commit c4813f73f5
4 changed files with 87 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/bus/isapnp/fdo.c
View file

@ -59,7 +59,7 @@ IsaFdoQueryDeviceRelations(
return Status; return Status;
} }
return IsaPnpFillDeviceRelations(FdoExt, Irp); return IsaPnpFillDeviceRelations(FdoExt, Irp, TRUE);
} }
NTSTATUS NTSTATUS

61
drivers/bus/isapnp/isapnp.c
View file

@ -140,7 +140,8 @@ NTSTATUS
NTAPI NTAPI
IsaPnpFillDeviceRelations( IsaPnpFillDeviceRelations(
IN PISAPNP_FDO_EXTENSION FdoExt, IN PISAPNP_FDO_EXTENSION FdoExt,
IN PIRP Irp) IN PIRP Irp,
IN BOOLEAN IncludeDataPort)
{ {
PISAPNP_PDO_EXTENSION PdoExt; PISAPNP_PDO_EXTENSION PdoExt;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
@ -156,6 +157,12 @@ IsaPnpFillDeviceRelations(
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
} }
if (IncludeDataPort)
{
DeviceRelations->Objects[i++] = FdoExt->DataPortPdo;
ObReferenceObject(FdoExt->DataPortPdo);
}
CurrentEntry = FdoExt->DeviceListHead.Flink; CurrentEntry = FdoExt->DeviceListHead.Flink;
while (CurrentEntry != &FdoExt->DeviceListHead) while (CurrentEntry != &FdoExt->DeviceListHead)
{ {
@ -320,6 +327,53 @@ IsaReadWrite(
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
static
NTSTATUS
NTAPI
IsaPnpCreateReadPortDO(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 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);
if (!NT_SUCCESS(Status))
return Status;
PdoExt = (PISAPNP_PDO_EXTENSION)FdoExt->DataPortPdo->DeviceExtension;
RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION));
PdoExt->Common.IsFdo = FALSE;
PdoExt->Common.Self = FdoExt->DataPortPdo;
PdoExt->Common.State = dsStopped;
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,
&InstanceID,
&PdoExt->InstanceID);
if (!NT_SUCCESS(Status))
return Status;
return Status;
}
static static
NTSTATUS NTSTATUS
NTAPI NTAPI
@ -360,7 +414,12 @@ IsaAddDevice(
InitializeListHead(&FdoExt->DeviceListHead); InitializeListHead(&FdoExt->DeviceListHead);
KeInitializeSpinLock(&FdoExt->Lock); KeInitializeSpinLock(&FdoExt->Lock);
Status = IsaPnpCreateReadPortDO(FdoExt);
if (!NT_SUCCESS(Status))
return Status;
Fdo->Flags &= ~DO_DEVICE_INITIALIZING; Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
FdoExt->DataPortPdo->Flags &= ~DO_DEVICE_INITIALIZING;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

4
drivers/bus/isapnp/isapnp.h
View file

@ -37,6 +37,7 @@ typedef struct _ISAPNP_FDO_EXTENSION {
ISAPNP_COMMON_EXTENSION Common; ISAPNP_COMMON_EXTENSION Common;
PDEVICE_OBJECT Ldo; PDEVICE_OBJECT Ldo;
PDEVICE_OBJECT Pdo; PDEVICE_OBJECT Pdo;
PDEVICE_OBJECT DataPortPdo;
LIST_ENTRY DeviceListHead; LIST_ENTRY DeviceListHead;
ULONG DeviceCount; ULONG DeviceCount;
PDRIVER_OBJECT DriverObject; PDRIVER_OBJECT DriverObject;
@ -68,7 +69,8 @@ NTSTATUS
NTAPI NTAPI
IsaPnpFillDeviceRelations( IsaPnpFillDeviceRelations(
IN PISAPNP_FDO_EXTENSION FdoExt, IN PISAPNP_FDO_EXTENSION FdoExt,
IN PIRP Irp); IN PIRP Irp,
IN BOOLEAN IncludeDataPort);
DRIVER_INITIALIZE DriverEntry; DRIVER_INITIALIZE DriverEntry;

27
drivers/bus/isapnp/pdo.c
View file

@ -44,13 +44,26 @@ IsaPdoQueryCapabilities(
{ {
PDEVICE_CAPABILITIES DeviceCapabilities; PDEVICE_CAPABILITIES DeviceCapabilities;
PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice;
ULONG i;
DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities;
if (DeviceCapabilities->Version != 1) if (DeviceCapabilities->Version != 1)
return STATUS_REVISION_MISMATCH; return STATUS_REVISION_MISMATCH;
DeviceCapabilities->UniqueID = LogDev->SerialNumber != 0xffffffff; if (LogDev)
DeviceCapabilities->Address = LogDev->CSN; {
DeviceCapabilities->UniqueID = LogDev->SerialNumber != 0xffffffff;
DeviceCapabilities->Address = LogDev->CSN;
}
else
{
DeviceCapabilities->UniqueID = TRUE;
DeviceCapabilities->SilentInstall = TRUE;
DeviceCapabilities->RawDeviceOK = TRUE;
for (i = 0; i < POWER_SYSTEM_MAXIMUM; i++)
DeviceCapabilities->DeviceState[i] = PowerDeviceD3;
DeviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0;
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -115,14 +128,20 @@ IsaPdoPnp(
switch (IrpSp->MinorFunction) switch (IrpSp->MinorFunction)
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); if (PdoExt->IsaPnpDevice)
Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice);
else
Status = STATUS_SUCCESS;
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
PdoExt->Common.State = dsStarted; PdoExt->Common.State = dsStarted;
break; break;
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice); if (PdoExt->IsaPnpDevice)
Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice);
else
Status = STATUS_SUCCESS;
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
PdoExt->Common.State = dsStopped; PdoExt->Common.State = dsStopped;