mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 05:26:58 +00:00
[ISAPNP] Create resource requirements ahead of IRP_MN_QUERY_RESOURCE_REQUIREMENTS
This commit is contained in:
parent
1dcc6f8b94
commit
debec8c96e
|
@ -6,6 +6,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <isapnp.h>
|
#include <isapnp.h>
|
||||||
|
#include <isapnphw.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
@ -328,6 +329,56 @@ IsaReadWrite(
|
||||||
return STATUS_NOT_SUPPORTED;
|
return STATUS_NOT_SUPPORTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static
|
||||||
|
NTSTATUS
|
||||||
|
NTAPI
|
||||||
|
IsaPnpCreateReadPortDORequirements(
|
||||||
|
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;
|
||||||
|
|
||||||
|
ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST)
|
||||||
|
+ 2 * ARRAYSIZE(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR);
|
||||||
|
RequirementsList = ExAllocatePool(PagedPool, ListSize);
|
||||||
|
if (!RequirementsList)
|
||||||
|
return STATUS_NO_MEMORY;
|
||||||
|
|
||||||
|
RtlZeroMemory(RequirementsList, ListSize);
|
||||||
|
RequirementsList->ListSize = ListSize;
|
||||||
|
RequirementsList->AlternativeLists = 1;
|
||||||
|
|
||||||
|
RequirementsList->List[0].Version = 1;
|
||||||
|
RequirementsList->List[0].Revision = 1;
|
||||||
|
RequirementsList->List[0].Count = 2 * ARRAYSIZE(Ports);
|
||||||
|
|
||||||
|
for (i = 0; i < 2 * ARRAYSIZE(Ports); i += 2)
|
||||||
|
{
|
||||||
|
Descriptor = &RequirementsList->List[0].Descriptors[i];
|
||||||
|
|
||||||
|
/* Expected port */
|
||||||
|
Descriptor[0].Type = CmResourceTypePort;
|
||||||
|
Descriptor[0].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||||
|
Descriptor[0].Flags = CM_RESOURCE_PORT_16_BIT_DECODE;
|
||||||
|
Descriptor[0].u.Port.Length = Ports[i / 2] & 1 ? 0x01 : 0x04;
|
||||||
|
Descriptor[0].u.Port.Alignment = 0x01;
|
||||||
|
Descriptor[0].u.Port.MinimumAddress.LowPart = Ports[i / 2];
|
||||||
|
Descriptor[0].u.Port.MaximumAddress.LowPart = Ports[i / 2] + Descriptor[0].u.Port.Length - 1;
|
||||||
|
|
||||||
|
/* ... but mark it as optional */
|
||||||
|
Descriptor[1].Option = IO_RESOURCE_ALTERNATIVE;
|
||||||
|
Descriptor[1].Type = CmResourceTypePort;
|
||||||
|
Descriptor[1].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||||
|
Descriptor[1].Flags = CM_RESOURCE_PORT_16_BIT_DECODE;
|
||||||
|
Descriptor[1].u.Port.Alignment = 0x01;
|
||||||
|
}
|
||||||
|
|
||||||
|
PdoExt->RequirementsList = RequirementsList;
|
||||||
|
return STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
NTAPI
|
NTAPI
|
||||||
|
@ -380,6 +431,10 @@ IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt)
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
return Status;
|
return Status;
|
||||||
|
|
||||||
|
Status = IsaPnpCreateReadPortDORequirements(PdoExt);
|
||||||
|
if (!NT_SUCCESS(Status))
|
||||||
|
return Status;
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,7 @@ typedef struct _ISAPNP_PDO_EXTENSION {
|
||||||
UNICODE_STRING HardwareIDs;
|
UNICODE_STRING HardwareIDs;
|
||||||
UNICODE_STRING CompatibleIDs;
|
UNICODE_STRING CompatibleIDs;
|
||||||
UNICODE_STRING InstanceID;
|
UNICODE_STRING InstanceID;
|
||||||
|
PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList;
|
||||||
} ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION;
|
} ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION;
|
||||||
|
|
||||||
/* isapnp.c */
|
/* isapnp.c */
|
||||||
|
|
|
@ -183,46 +183,18 @@ IsaPdoQueryResourceRequirements(
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
IN PIO_STACK_LOCATION IrpSp)
|
IN PIO_STACK_LOCATION IrpSp)
|
||||||
{
|
{
|
||||||
USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, 0x274, 0x3e4, 0x204, 0x2e4, 0x354, 0x2f4 };
|
ULONG ListSize;
|
||||||
ULONG ListSize, i;
|
|
||||||
PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList;
|
PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList;
|
||||||
PIO_RESOURCE_DESCRIPTOR Descriptor;
|
|
||||||
|
|
||||||
ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST)
|
if (!PdoExt->RequirementsList)
|
||||||
+ 2 * ARRAYSIZE(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR);
|
return Irp->IoStatus.Status;
|
||||||
RequirementsList = ExAllocatePool(NonPagedPool, ListSize);
|
|
||||||
|
ListSize = PdoExt->RequirementsList->ListSize;
|
||||||
|
RequirementsList = ExAllocatePool(PagedPool, ListSize);
|
||||||
if (!RequirementsList)
|
if (!RequirementsList)
|
||||||
return STATUS_NO_MEMORY;
|
return STATUS_NO_MEMORY;
|
||||||
|
|
||||||
RtlZeroMemory(RequirementsList, ListSize);
|
RtlCopyMemory(RequirementsList, PdoExt->RequirementsList, ListSize);
|
||||||
RequirementsList->ListSize = ListSize;
|
|
||||||
RequirementsList->AlternativeLists = 1;
|
|
||||||
|
|
||||||
RequirementsList->List[0].Version = 1;
|
|
||||||
RequirementsList->List[0].Revision = 1;
|
|
||||||
RequirementsList->List[0].Count = 2 * ARRAYSIZE(Ports);
|
|
||||||
|
|
||||||
for (i = 0; i < 2 * ARRAYSIZE(Ports); i += 2)
|
|
||||||
{
|
|
||||||
Descriptor = &RequirementsList->List[0].Descriptors[i];
|
|
||||||
|
|
||||||
/* Expected port */
|
|
||||||
Descriptor[0].Type = CmResourceTypePort;
|
|
||||||
Descriptor[0].ShareDisposition = CmResourceShareDeviceExclusive;
|
|
||||||
Descriptor[0].Flags = CM_RESOURCE_PORT_16_BIT_DECODE;
|
|
||||||
Descriptor[0].u.Port.Length = Ports[i / 2] & 1 ? 0x01 : 0x04;
|
|
||||||
Descriptor[0].u.Port.Alignment = 0x01;
|
|
||||||
Descriptor[0].u.Port.MinimumAddress.LowPart = Ports[i / 2];
|
|
||||||
Descriptor[0].u.Port.MaximumAddress.LowPart = Ports[i / 2] + Descriptor[0].u.Port.Length - 1;
|
|
||||||
|
|
||||||
/* ... but mark it as optional */
|
|
||||||
Descriptor[1].Option = IO_RESOURCE_ALTERNATIVE;
|
|
||||||
Descriptor[1].Type = CmResourceTypePort;
|
|
||||||
Descriptor[1].ShareDisposition = CmResourceShareDeviceExclusive;
|
|
||||||
Descriptor[1].Flags = CM_RESOURCE_PORT_16_BIT_DECODE;
|
|
||||||
Descriptor[1].u.Port.Alignment = 0x01;
|
|
||||||
}
|
|
||||||
|
|
||||||
Irp->IoStatus.Information = (ULONG_PTR)RequirementsList;
|
Irp->IoStatus.Information = (ULONG_PTR)RequirementsList;
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -383,10 +355,7 @@ IsaPdoPnp(
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IRP_MN_QUERY_RESOURCE_REQUIREMENTS:
|
case IRP_MN_QUERY_RESOURCE_REQUIREMENTS:
|
||||||
if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo)
|
Status = IsaPdoQueryResourceRequirements(PdoExt, Irp, IrpSp);
|
||||||
Status = IsaPdoQueryResourceRequirements(PdoExt, Irp, IrpSp);
|
|
||||||
else
|
|
||||||
DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS is UNIMPLEMENTED!\n");
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IRP_MN_QUERY_ID:
|
case IRP_MN_QUERY_ID:
|
||||||
|
|
Loading…
Reference in a new issue