Changeset 40592 in vbox for trunk/src/VBox/Devices/Input

Timestamp:

Mar 23, 2012 1:54:13 PM (13 years ago)

Author:

vboxsync

Message:

Fixed keyboard command state machine (incomplete command with parameter aborted by another command.)

File:

• trunk/src/VBox/Devices/Input/PS2K.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Input/PS2K.cpp

@@ -721 +721 @@
     case KCMD_ECHO:
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ECHO);
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_READ_ID:
@@ -726 +727 @@
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ID1);
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ID2);
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_ENABLE:
@@ -732 +734 @@
         /* Clear last typematic key?? */
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ACK);
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_DFLT_DISABLE:
@@ -737 +740 @@
         PS2KSetDefaults(pThis);
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ACK);
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_SET_DEFAULT:
         PS2KSetDefaults(pThis);
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ACK);
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_ALL_TYPEMATIC:
@@ -748 +753 @@
         //@todo: Set the key types here.
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_ACK);
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_RESEND:
+        pThis->u8CurrCmd = 0;
         break;
     case KCMD_RESET:
@@ -821 +828 @@
     case KCMD_INVALID_2:
         PS2InsertQueue((GeneriQ *)&pThis->cmdQ, KRSP_RESEND);
+        pThis->u8CurrCmd = 0;
         break;
     }