mirror of
https://github.com/reactos/reactos.git
synced 2025-04-05 13:11:22 +00:00
- Move part of the 1st stage pnp hacks to kbdclass driver. Previously, the driver (i8042prt) relied on kbdclass's normal reinit routine being called BEFORE a registered boot reinit routine, which is certainly wrong on a real NT system.
- Now, the correct order is ensured, and it is not relying on a broken reinit calling order in ReactOS anymore. svn path=/trunk/; revision=39856
This commit is contained in:
Aleksey Bragin
parent
35ad8f5e49
commit
b988d2bd3d
5 changed files with 177 additions and 122 deletions
|
|
@ -46,123 +46,6 @@ IsFirstStageSetup(
|
|||
return ret;
|
||||
}
|
||||
|
||||
static VOID NTAPI
|
||||
SendStartDevice(
|
||||
IN PDRIVER_OBJECT DriverObject,
|
||||
IN PVOID Context,
|
||||
IN ULONG Count)
|
||||
{
|
||||
PDEVICE_OBJECT Pdo;
|
||||
PCM_RESOURCE_LIST AllocatedResources = NULL;
|
||||
PCM_RESOURCE_LIST AllocatedResourcesTranslated = NULL;
|
||||
PDEVICE_OBJECT TopDeviceObject = NULL;
|
||||
KEVENT Event;
|
||||
IO_STATUS_BLOCK IoStatusBlock;
|
||||
PIRP Irp;
|
||||
PIO_STACK_LOCATION Stack;
|
||||
ULONG ResourceListSize;
|
||||
NTSTATUS Status;
|
||||
|
||||
Pdo = (PDEVICE_OBJECT)Context;
|
||||
TRACE_(I8042PRT, "SendStartDevice(%p)\n", Pdo);
|
||||
|
||||
/* Create default resource list */
|
||||
ResourceListSize = sizeof(CM_RESOURCE_LIST) + 3 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
|
||||
AllocatedResources = ExAllocatePoolWithTag(PagedPool, ResourceListSize, I8042PRT_TAG);
|
||||
if (!AllocatedResources)
|
||||
{
|
||||
WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n");
|
||||
Status = STATUS_NO_MEMORY;
|
||||
goto cleanup;
|
||||
}
|
||||
AllocatedResources->Count = 1;
|
||||
AllocatedResources->List[0].PartialResourceList.Version = 1;
|
||||
AllocatedResources->List[0].PartialResourceList.Revision = 1;
|
||||
AllocatedResources->List[0].PartialResourceList.Count = 3;
|
||||
/* Data port */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Type = CmResourceTypePort;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Flags = 0; /* FIXME */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.HighPart = 0;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.LowPart = KEYBOARD_DATA_PORT;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Length = 1;
|
||||
/* Control port */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Type = CmResourceTypePort;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Flags = 0; /* FIXME */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.HighPart = 0;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.LowPart = KEYBOARD_CONTROL_PORT;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Length = 1;
|
||||
/* Interrupt */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Type = CmResourceTypeInterrupt;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Flags = CM_RESOURCE_INTERRUPT_LATCHED;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level = KEYBOARD_IRQ;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = 0;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity = (KAFFINITY)-1;
|
||||
|
||||
/* Create default resource list translated */
|
||||
AllocatedResourcesTranslated = ExAllocatePoolWithTag(PagedPool, ResourceListSize, I8042PRT_TAG);
|
||||
if (!AllocatedResourcesTranslated)
|
||||
{
|
||||
WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n");
|
||||
Status = STATUS_NO_MEMORY;
|
||||
goto cleanup;
|
||||
}
|
||||
RtlCopyMemory(AllocatedResourcesTranslated, AllocatedResources, ResourceListSize);
|
||||
AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = HalGetInterruptVector(
|
||||
Internal, 0,
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level,
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector,
|
||||
(PKIRQL)&AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level,
|
||||
&AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity);
|
||||
|
||||
/* Send IRP_MN_START_DEVICE */
|
||||
TopDeviceObject = IoGetAttachedDeviceReference(Pdo);
|
||||
KeInitializeEvent(
|
||||
&Event,
|
||||
NotificationEvent,
|
||||
FALSE);
|
||||
Irp = IoBuildSynchronousFsdRequest(
|
||||
IRP_MJ_PNP,
|
||||
TopDeviceObject,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
&Event,
|
||||
&IoStatusBlock);
|
||||
Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED;
|
||||
Irp->IoStatus.Information = 0;
|
||||
Stack = IoGetNextIrpStackLocation(Irp);
|
||||
Stack->MinorFunction = IRP_MN_START_DEVICE;
|
||||
Stack->Parameters.StartDevice.AllocatedResources = AllocatedResources;
|
||||
Stack->Parameters.StartDevice.AllocatedResourcesTranslated = AllocatedResourcesTranslated;
|
||||
Status = IoCallDriver(TopDeviceObject, Irp);
|
||||
if (Status == STATUS_PENDING)
|
||||
{
|
||||
KeWaitForSingleObject(
|
||||
&Event,
|
||||
Executive,
|
||||
KernelMode,
|
||||
FALSE,
|
||||
NULL);
|
||||
Status = IoStatusBlock.Status;
|
||||
}
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
WARN_(I8042PRT, "IoCallDriver() failed with status 0x%08lx\n", Status);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if (TopDeviceObject)
|
||||
ObDereferenceObject(TopDeviceObject);
|
||||
if (AllocatedResources)
|
||||
ExFreePoolWithTag(AllocatedResources, I8042PRT_TAG);
|
||||
if (AllocatedResourcesTranslated)
|
||||
ExFreePoolWithTag(AllocatedResourcesTranslated, I8042PRT_TAG);
|
||||
}
|
||||
|
||||
static NTSTATUS
|
||||
AddRegistryEntry(
|
||||
IN PCWSTR PortTypeName,
|
||||
|
|
@ -251,12 +134,8 @@ i8042AddLegacyKeyboard(
|
|||
goto cleanup;
|
||||
}
|
||||
|
||||
/* We will send the IRP_MN_START_DEVICE later, once kbdclass is loaded */
|
||||
/* We will send the IRP_MN_START_DEVICE later when kbdclass looks for legacy drivers */
|
||||
AddRegistryEntry(L"KeyboardPort", &KeyboardName, RegistryPath->Buffer);
|
||||
IoRegisterBootDriverReinitialization(
|
||||
DriverObject,
|
||||
SendStartDevice,
|
||||
Pdo);
|
||||
|
||||
Status = STATUS_SUCCESS;
|
||||
/* Yes, completly forget the Pdo pointer, as we will never
|
||||
|
|
|
|||
|
|
@ -939,6 +939,10 @@ SearchForLegacyDrivers(
|
|||
/* FIXME: Log the error */
|
||||
WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status);
|
||||
}
|
||||
|
||||
/* A special hack for 1st stage setup: manually send start device to i8042prt */
|
||||
if (IsFirstStageSetup())
|
||||
Send8042StartDevice(DriverObject, PortDeviceObject);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
|
|
|
|||
|
|
@ -81,3 +81,13 @@ DuplicateUnicodeString(
|
|||
IN ULONG Flags,
|
||||
IN PCUNICODE_STRING SourceString,
|
||||
OUT PUNICODE_STRING DestinationString);
|
||||
|
||||
/* setup.c */
|
||||
BOOLEAN
|
||||
IsFirstStageSetup(
|
||||
VOID);
|
||||
|
||||
VOID NTAPI
|
||||
Send8042StartDevice(
|
||||
IN PDRIVER_OBJECT DriverObject,
|
||||
IN PDEVICE_OBJECT Pdo);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<library>hal</library>
|
||||
<file>kbdclass.c</file>
|
||||
<file>misc.c</file>
|
||||
<file>setup.c</file>
|
||||
<file>kbdclass.rc</file>
|
||||
<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
|
||||
<compilerflag>-fno-unit-at-a-time</compilerflag>
|
||||
|
|
|
|||
161
reactos/drivers/input/kbdclass/setup.c
Normal file
161
reactos/drivers/input/kbdclass/setup.c
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
/*
|
||||
* PROJECT: ReactOS Keyboard class driver
|
||||
* LICENSE: GPL - See COPYING in the top level directory
|
||||
* FILE: drivers/input/kbdclass/setup.c
|
||||
* PURPOSE: Create a legacy PDO during ReactOS installation
|
||||
* PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin@reactos.org)
|
||||
*/
|
||||
|
||||
/* NOTE:
|
||||
* All this file is a big hack and should be removed one day...
|
||||
*/
|
||||
|
||||
/* INCLUDES ******************************************************************/
|
||||
|
||||
#include "kbdclass.h"
|
||||
|
||||
/* GLOBALS *******************************************************************/
|
||||
|
||||
#define KEYBOARD_DATA_PORT 0x60
|
||||
#define KEYBOARD_CONTROL_PORT 0x64
|
||||
#define KEYBOARD_IRQ 1
|
||||
|
||||
/* FUNCTIONS *****************************************************************/
|
||||
|
||||
BOOLEAN
|
||||
IsFirstStageSetup(
|
||||
VOID)
|
||||
{
|
||||
UNICODE_STRING PathU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\Setup");
|
||||
OBJECT_ATTRIBUTES ObjectAttributes;
|
||||
HANDLE hSetupKey = (HANDLE)NULL;
|
||||
NTSTATUS Status;
|
||||
BOOLEAN ret = TRUE;
|
||||
|
||||
InitializeObjectAttributes(&ObjectAttributes, &PathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);
|
||||
Status = ZwOpenKey(&hSetupKey, KEY_QUERY_VALUE, &ObjectAttributes);
|
||||
|
||||
if (Status == STATUS_OBJECT_NAME_NOT_FOUND)
|
||||
ret = TRUE;
|
||||
else
|
||||
ret = FALSE;
|
||||
|
||||
if (hSetupKey != (HANDLE)NULL)
|
||||
ZwClose(hSetupKey);
|
||||
INFO_(CLASS_NAME, "IsFirstStageSetup() returns %s\n", ret ? "YES" : "NO");
|
||||
return ret;
|
||||
}
|
||||
|
||||
VOID NTAPI
|
||||
Send8042StartDevice(
|
||||
IN PDRIVER_OBJECT DriverObject,
|
||||
IN PDEVICE_OBJECT Pdo)
|
||||
{
|
||||
PCM_RESOURCE_LIST AllocatedResources = NULL;
|
||||
PCM_RESOURCE_LIST AllocatedResourcesTranslated = NULL;
|
||||
PDEVICE_OBJECT TopDeviceObject = NULL;
|
||||
KEVENT Event;
|
||||
IO_STATUS_BLOCK IoStatusBlock;
|
||||
PIRP Irp;
|
||||
PIO_STACK_LOCATION Stack;
|
||||
ULONG ResourceListSize;
|
||||
NTSTATUS Status;
|
||||
|
||||
TRACE_(CLASS_NAME, "SendStartDevice(%p)\n", Pdo);
|
||||
|
||||
/* Create default resource list */
|
||||
ResourceListSize = sizeof(CM_RESOURCE_LIST) + 3 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
|
||||
AllocatedResources = ExAllocatePoolWithTag(PagedPool, ResourceListSize, CLASS_TAG);
|
||||
if (!AllocatedResources)
|
||||
{
|
||||
WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n");
|
||||
Status = STATUS_NO_MEMORY;
|
||||
goto cleanup;
|
||||
}
|
||||
AllocatedResources->Count = 1;
|
||||
AllocatedResources->List[0].PartialResourceList.Version = 1;
|
||||
AllocatedResources->List[0].PartialResourceList.Revision = 1;
|
||||
AllocatedResources->List[0].PartialResourceList.Count = 3;
|
||||
/* Data port */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Type = CmResourceTypePort;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Flags = 0; /* FIXME */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.HighPart = 0;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.LowPart = KEYBOARD_DATA_PORT;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Length = 1;
|
||||
/* Control port */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Type = CmResourceTypePort;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Flags = 0; /* FIXME */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.HighPart = 0;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.LowPart = KEYBOARD_CONTROL_PORT;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Length = 1;
|
||||
/* Interrupt */
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Type = CmResourceTypeInterrupt;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].ShareDisposition = CmResourceShareDeviceExclusive;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Flags = CM_RESOURCE_INTERRUPT_LATCHED;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level = KEYBOARD_IRQ;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = 0;
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity = (KAFFINITY)-1;
|
||||
|
||||
/* Create default resource list translated */
|
||||
AllocatedResourcesTranslated = ExAllocatePoolWithTag(PagedPool, ResourceListSize, CLASS_TAG);
|
||||
if (!AllocatedResourcesTranslated)
|
||||
{
|
||||
WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n");
|
||||
Status = STATUS_NO_MEMORY;
|
||||
goto cleanup;
|
||||
}
|
||||
RtlCopyMemory(AllocatedResourcesTranslated, AllocatedResources, ResourceListSize);
|
||||
AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = HalGetInterruptVector(
|
||||
Internal, 0,
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level,
|
||||
AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector,
|
||||
(PKIRQL)&AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level,
|
||||
&AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity);
|
||||
|
||||
/* Send IRP_MN_START_DEVICE */
|
||||
TopDeviceObject = IoGetAttachedDeviceReference(Pdo);
|
||||
KeInitializeEvent(
|
||||
&Event,
|
||||
NotificationEvent,
|
||||
FALSE);
|
||||
Irp = IoBuildSynchronousFsdRequest(
|
||||
IRP_MJ_PNP,
|
||||
TopDeviceObject,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
&Event,
|
||||
&IoStatusBlock);
|
||||
Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED;
|
||||
Irp->IoStatus.Information = 0;
|
||||
Stack = IoGetNextIrpStackLocation(Irp);
|
||||
Stack->MinorFunction = IRP_MN_START_DEVICE;
|
||||
Stack->Parameters.StartDevice.AllocatedResources = AllocatedResources;
|
||||
Stack->Parameters.StartDevice.AllocatedResourcesTranslated = AllocatedResourcesTranslated;
|
||||
Status = IoCallDriver(TopDeviceObject, Irp);
|
||||
if (Status == STATUS_PENDING)
|
||||
{
|
||||
KeWaitForSingleObject(
|
||||
&Event,
|
||||
Executive,
|
||||
KernelMode,
|
||||
FALSE,
|
||||
NULL);
|
||||
Status = IoStatusBlock.Status;
|
||||
}
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
WARN_(CLASS_NAME, "IoCallDriver() failed with status 0x%08lx\n", Status);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if (TopDeviceObject)
|
||||
ObDereferenceObject(TopDeviceObject);
|
||||
if (AllocatedResources)
|
||||
ExFreePoolWithTag(AllocatedResources, CLASS_TAG);
|
||||
if (AllocatedResourcesTranslated)
|
||||
ExFreePoolWithTag(AllocatedResourcesTranslated, CLASS_TAG);
|
||||
}
|
||||
Loading…
Reference in a new issue