[ros-diffs] [dgorbachev] 41156: Clear up debugger prompt from "mouse excrements". Tested in QEMU, Bochs, VirtualBox.

[dgorbachev at svn.reactos.org]

Author: dgorbachev
Date: Thu May 28 00:27:35 2009
New Revision: 41156

URL: http://svn.reactos.org/svn/reactos?rev=41156&view=rev
Log:
Clear up debugger prompt from "mouse excrements". Tested in QEMU, Bochs, VirtualBox.

Modified:
    trunk/reactos/ntoskrnl/kdbg/kdb_cli.c
    trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c

Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?rev=41156&r1=41155&r2=41156&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu May 28 00:27:35 2009
@@ -2258,7 +2258,7 @@
          /* Read the next char - this is to throw away a \n which most clients should
           * send after \r.
           */
-		 KeStallExecutionProcessor(100000);
+         KeStallExecutionProcessor(100000);
          if (KdbDebugState & KD_DEBUG_KDSERIAL)
             NextKey = KdbpTryGetCharSerial(5);
          else

Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c?rev=41156&r1=41155&r2=41156&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] Thu May 28 00:27:35 2009
@@ -16,18 +16,25 @@
 
 #if 1
 
-#define KBD_STATUS_REG		0x64
-#define KBD_CNTL_REG		0x64
-#define KBD_DATA_REG		0x60
+#define KBD_STATUS_REG          0x64
+#define KBD_CNTL_REG            0x64
+#define KBD_DATA_REG            0x60
+
+#define KBD_STAT_OBF            0x01
+#define KBD_STAT_IBF            0x02
+
+#define CTRL_WRITE_MOUSE        0xD4
+#define MOU_ENAB                0xF4
+#define MOU_DISAB               0xF5
+#define MOUSE_ACK               0xFA
 
 #define KBD_DISABLE_MOUSE       0xA7
 #define KBD_ENABLE_MOUSE        0xA8
 
-#define KBD_STAT_OBF 		0x01	/* Keyboard output buffer full */
-
-#define kbd_write_command(cmd) WRITE_PORT_UCHAR((PUCHAR)KBD_STATUS_REG,cmd)
-#define kbd_read_input() READ_PORT_UCHAR((PUCHAR)KBD_DATA_REG)
-#define kbd_read_status() READ_PORT_UCHAR((PUCHAR)KBD_STATUS_REG)
+#define kbd_write_command(cmd)  WRITE_PORT_UCHAR((PUCHAR)KBD_CNTL_REG,cmd)
+#define kbd_write_data(cmd)     WRITE_PORT_UCHAR((PUCHAR)KBD_DATA_REG,cmd)
+#define kbd_read_input()        READ_PORT_UCHAR((PUCHAR)KBD_DATA_REG)
+#define kbd_read_status()       READ_PORT_UCHAR((PUCHAR)KBD_STATUS_REG)
 
 static unsigned char keyb_layout[2][128] =
 {
@@ -50,14 +57,49 @@
 
 typedef UCHAR byte_t;
 
+/* FUNCTIONS *****************************************************************/
+
+static VOID
+KbdSendCommandToMouse(UCHAR Command)
+{
+    ULONG Retry = 20000;
+
+    while (kbd_read_status() & KBD_STAT_OBF && Retry--)
+    {
+        kbd_read_input();
+        KeStallExecutionProcessor(50);
+    }
+
+    Retry = 20000;
+    while (kbd_read_status() & KBD_STAT_IBF && Retry--)
+        KeStallExecutionProcessor(50);
+
+    kbd_write_command(CTRL_WRITE_MOUSE);
+
+    Retry = 20000;
+    while (kbd_read_status() & KBD_STAT_IBF && Retry--)
+        KeStallExecutionProcessor(50);
+
+    kbd_write_data(Command);
+
+    Retry = 20000;
+    while (!(kbd_read_status() & KBD_STAT_OBF) && Retry--)
+        KeStallExecutionProcessor(50);
+
+    if (kbd_read_input() != MOUSE_ACK) { ; }
+    return;
+}
+
 VOID KbdEnableMouse()
 {
-    kbd_write_command(KBD_ENABLE_MOUSE);
+    KbdSendCommandToMouse(MOU_ENAB);
+    // kbd_write_command(KBD_ENABLE_MOUSE);
 }
 
 VOID KbdDisableMouse()
 {
-    kbd_write_command(KBD_DISABLE_MOUSE);
+    KbdSendCommandToMouse(MOU_DISAB);
+    // kbd_write_command(KBD_DISABLE_MOUSE);
 }
 
 CHAR