From 957a1ac6da8c004fc288a626ee1bbbe05966316a Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 5 Aug 2005 17:28:17 +0000 Subject: [PATCH] Remove mouse device detection for now, since it fails on some i8042 clones. svn path=/trunk/; revision=17073 --- reactos/drivers/input/i8042prt/i8042prt.c | 5 --- reactos/drivers/input/i8042prt/i8042prt.h | 2 -- reactos/drivers/input/i8042prt/mouse.c | 42 ----------------------- 3 files changed, 49 deletions(-) diff --git a/reactos/drivers/input/i8042prt/i8042prt.c b/reactos/drivers/input/i8042prt/i8042prt.c index b0ddcabcfb9..f72808a5d18 100644 --- a/reactos/drivers/input/i8042prt/i8042prt.c +++ b/reactos/drivers/input/i8042prt/i8042prt.c @@ -576,11 +576,6 @@ static NTSTATUS STDCALL I8042Initialize(PDEVICE_EXTENSION DevExt) 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); diff --git a/reactos/drivers/input/i8042prt/i8042prt.h b/reactos/drivers/input/i8042prt/i8042prt.h index 316364d22b3..03290663030 100644 --- a/reactos/drivers/input/i8042prt/i8042prt.h +++ b/reactos/drivers/input/i8042prt/i8042prt.h @@ -387,8 +387,6 @@ VOID STDCALL I8042MouseHandle(PDEVICE_EXTENSION DevExt, 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); diff --git a/reactos/drivers/input/i8042prt/mouse.c b/reactos/drivers/input/i8042prt/mouse.c index d463a674a32..e30bc6e8d15 100644 --- a/reactos/drivers/input/i8042prt/mouse.c +++ b/reactos/drivers/input/i8042prt/mouse.c @@ -895,45 +895,3 @@ BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt) 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; -} -