Remove mouse device detection for now, since it fails on some i8042
clones.
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h
Modified: trunk/reactos/drivers/input/i8042prt/mouse.c
_____
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c
--- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05
15:45:14 UTC (rev 17072)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05
17:28:17 UTC (rev 17073)
@@ -576,11 +576,6 @@
DevExt->KeyboardExists = I8042DetectKeyboard(DevExt);
}
- if (DevExt->MouseExists) {
- DPRINT("Mouse port detected\n");
- DevExt->MouseExists = I8042DetectMouse(DevExt);
- }
-
if (DevExt->KeyboardExists) {
DPRINT("Keyboard detected\n");
I8042KeyboardEnable(DevExt);
_____
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h
--- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-05
15:45:14 UTC (rev 17072)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-05
17:28:17 UTC (rev 17073)
@@ -387,8 +387,6 @@
BOOLEAN STDCALL I8042MouseEnable(PDEVICE_EXTENSION DevExt);
BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt);
-BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt);
-
/* ps2pp.c */
VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, BYTE Input);
_____
Modified: trunk/reactos/drivers/input/i8042prt/mouse.c
--- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-05
15:45:14 UTC (rev 17072)
+++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-05
17:28:17 UTC (rev 17073)
@@ -895,45 +895,3 @@
return TRUE;
}
-
-BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt)
-{
- NTSTATUS Status;
- UCHAR Value;
- UINT RetryCount = 10;
-
- DPRINT("Detecting mouse\n");
-
- I8042MouseDisable(DevExt);
-
- do {
- Status = I8042SynchWritePortMouse(DevExt, KBD_GET_ID,
TRUE);
- } while (STATUS_TIMEOUT == Status && RetryCount--);
-
- if (!NT_SUCCESS(Status)) {
- DPRINT1("Can't write AUX_GET_ID (%x)\n", Status);
- return FALSE;
- }
-
- Status = I8042ReadDataWait(DevExt, &Value);
- if (!NT_SUCCESS(Status)) {
- DPRINT1("No response after AUX_GET_ID\n");
- return FALSE;
- }
-
- if (Value != 0xFA) {
- DPRINT("Bad ID: %x\n", Value);
- return FALSE;
- }
-
- Status = I8042ReadDataWait(DevExt, &Value);
- if (!NT_SUCCESS(Status)) {
- DPRINT("Partial ID\n");
- return FALSE;
- }
-
- DPRINT ("%x\n", Value);
-
- return TRUE;
-}
-
Show replies by date