Index: /trunk/src/VBox/Devices/Input/PS2M.cpp
===================================================================
--- /trunk/src/VBox/Devices/Input/PS2M.cpp	(revision 68108)
+++ /trunk/src/VBox/Devices/Input/PS2M.cpp	(revision 68109)
@@ -597,5 +597,4 @@
 
     LogFlowFunc(("cmd=0x%02X, active cmd=0x%02X\n", cmd, pThis->u8CurrCmd));
-//LogRel(("aux: cmd=0x%02X, active cmd=0x%02X\n", cmd, pThis->u8CurrCmd));
 
     if (pThis->enmMode == AUX_MODE_RESET)
@@ -802,10 +801,9 @@
     }
     LogFlowFunc(("Active cmd now 0x%02X; updating interrupts\n", pThis->u8CurrCmd));
-//    KBCUpdateInterrupts(pThis->pParent);
     return VINF_SUCCESS;
 }
 
 /**
- * Send a byte (keystroke or command response) to the keyboard controller.
+ * Send a byte (packet data or command response) to the keyboard controller.
  *
  * @returns VINF_SUCCESS or VINF_TRY_AGAIN.
@@ -821,5 +819,5 @@
 
     /* Anything in the command queue has priority over data
-     * in the event queue. Additionally, keystrokes are /// @todo true?
+     * in the event queue. Additionally, packet data are
      * blocked if a command is currently in progress, even if
      * the command queue is empty.
@@ -831,5 +829,4 @@
 
     LogFlowFunc(("mouse sends 0x%02x (%svalid data)\n", *pb, rc == VINF_SUCCESS ? "" : "not "));
-//if (rc == VINF_SUCCESS) LogRel(("aux: sends 0x%02X\n", *pb));
 
     return rc;
@@ -857,7 +854,4 @@
     AssertReleaseRC(rc);
 
-#if 0
-    /* If the input queue is not empty, restart the timer. */
-#else
     /* If more movement is accumulated, report it and restart the timer. */
     uHaveEvents = ps2mHaveEvents(pThis);
@@ -865,5 +859,4 @@
 
     if (uHaveEvents)
-#endif
     {
         /* Report accumulated data, poke the KBC, and start the timer. */
@@ -878,5 +871,5 @@
 }
 
-/* The auxiliary device is specified to take up to about 500 milliseconds. We need
+/* The auxiliary device reset is specified to take up to about 500 milliseconds. We need
  * to delay sending the result to the host for at least a tiny little while.
  */
@@ -968,5 +961,4 @@
     pThis->fCurrB   = fButtons;
 
-#if 1
     /* Report the event and start the throttle timer unless it's already running. */
     if (!pThis->fThrottleActive)
@@ -977,27 +969,4 @@
         TMTimerSetMillies(pThis->CTX_SUFF(pThrottleTimer), pThis->uThrottleDelay);
     }
-#else
-    /* Clamp the delta values to the allowed range. */
-    dx = RT_MIN(RT_MAX(dx, -256), 255);
-    dy = RT_MIN(RT_MAX(dy, -256), 255);
-
-    /* Start with the sync bit. */
-    val  = RT_BIT(3);
-    /* Add buttons 1-3. */
-    val |= fButtons & PS2M_STD_BTN_MASK;
-    /* Set the X/Y sign bits. */
-    if (dx < 0)
-        val |= RT_BIT(4);
-    if (dy < 0)
-        val |= RT_BIT(5);
-
-    ps2kInsertQueue((GeneriQ *)&pThis->evtQ, val);
-    ps2kInsertQueue((GeneriQ *)&pThis->evtQ, (uint8_t)dx);
-    ps2kInsertQueue((GeneriQ *)&pThis->evtQ, (uint8_t)dy);
-    if (pThis->enmProtocol > PS2M_PROTO_PS2STD)
-    {
-        ps2kInsertQueue((GeneriQ *)&pThis->evtQ, (uint8_t)dz);
-    }
-#endif
 
     return rc;
@@ -1179,8 +1148,4 @@
     ps2kClearQueue((GeneriQ *)&pThis->cmdQ);
     ps2mSetDefaults(pThis);     /* Also clears event queue. */
-
-    /* Activate the PS/2 mouse by default. */
-//    if (pThis->Mouse.pDrv)
-//        pThis->Mouse.pDrv->pfnSetActive(pThis->Mouse.pDrv, true);
 }