Author: cgutman
Date: Mon Feb 20 11:47:46 2012
New Revision: 55751
URL: http://svn.reactos.org/svn/reactos?rev=55751&view=rev
Log:
[KBDCLASS]
- Kill the rest of the input stack hack of doom
Removed:
trunk/reactos/drivers/input/kbdclass/setup.c
Modified:
trunk/reactos/drivers/input/kbdclass/CMakeLists.txt
trunk/reactos/drivers/input/kbdclass/kbdclass.c
trunk/reactos/drivers/input/kbdclass/kbdclass.h
trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMakeLists.txt?rev=55751&r1=55750&r2=55751&view=diff
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Mon Feb 20
11:47:46 2012
@@ -2,7 +2,6 @@
add_library(kbdclass SHARED
kbdclass.c
misc.c
- setup.c
kbdclass.rc)
set_module_type(kbdclass kernelmodedriver)
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdclass.c?rev=55751&r1=55750&r2=55751&view=diff
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Mon Feb 20
11:47:46 2012
@@ -1009,10 +1009,6 @@
/* 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:
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdclass.h?rev=55751&r1=55750&r2=55751&view=diff
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Mon Feb 20
11:47:46 2012
@@ -81,13 +81,3 @@
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);
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild?rev=55751&r1=55750&r2=55751&view=diff
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Mon Feb
20 11:47:46 2012
@@ -7,7 +7,6 @@
<library>hal</library>
<file>kbdclass.c</file>
<file>misc.c</file>
- <file>setup.c</file>
<file>kbdclass.rc</file>
<pch>kbdclass.h</pch>
</module>
Removed: trunk/reactos/drivers/input/kbdclass/setup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/setup.c?rev=55750&view=auto
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/setup.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/setup.c (removed)
@@ -1,161 +1,0 @@
-/*
- * 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 ([email protected])
- */
-
-/* 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);
-}
