Changeset 27838 in vbox for trunk/src

Timestamp:

Mar 30, 2010 5:52:53 PM (15 years ago)

Author:

vboxsync

Message:

USB keyboard: avoid loosing keypresses due to missed URBs

File:

• trunk/src/VBox/Devices/Input/UsbKbd.cpp (modified) (8 diffs)

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

@@ -13 +13 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define LOG_GROUP   LOG_GROUP_USB_MSD
+#define LOG_GROUP   LOG_GROUP_USB_KBD
 #include <VBox/pdmusb.h>
 #include <VBox/log.h>
@@ -160 +160 @@
     /** Someone is waiting on the done queue. */
     bool                fHaveDoneQueueWaiter;
+    /** If no URB since last key press */
+    bool                fNoUrbSinceLastPress;
+    /* Keys released since last URB */
+    uint8_t             aReleasedKeys[6];
 
     /**
@@ -603 +607 @@
     pThis->bIdle = 0;
     memset(&pThis->Report, 0, sizeof(pThis->Report));
+    pThis->fNoUrbSinceLastPress = false;
+    memset(&pThis->aReleasedKeys, 0, sizeof(pThis->aReleasedKeys));
 
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aEps); i++)
@@ -625 +631 @@
 }
 
+static void usbHidUpdateReportReleased(PUSBHID pThis, uint8_t u8HidCode)
+{
+    unsigned i;
+    
+    for (i = 0; i < RT_ELEMENTS(pThis->Report.aKeys); ++i)
+    {
+        if (pThis->Report.aKeys[i] == u8HidCode)
+        {
+            pThis->Report.aKeys[i] = 0;
+            break;                              /* Remove key down. */
+        }
+    }
+
+    if (i == RT_ELEMENTS(pThis->Report.aKeys))
+    {
+        //            AssertMsgFailed(("Key is up but was never down!?"));
+    }
+}
 
 /**
@@ -636 +660 @@
         PUSBHIDK_REPORT pReport = &pThis->Report;
         size_t          cbCopy;
+        unsigned        i;
 
         cbCopy = sizeof(*pReport);
         memcpy(&pUrb->abData[0], pReport, cbCopy);
+        pThis->fNoUrbSinceLastPress = false;
+        for (i=0; i < RT_ELEMENTS(pThis->aReleasedKeys); ++i)
+        {
+            if (pThis->aReleasedKeys[i] != 0)
+            {
+                usbHidUpdateReportReleased(pThis, pThis->aReleasedKeys[i]);
+                pThis->aReleasedKeys[i] = 0;
+            }
+        }
 //        LogRel(("Sent report: %x : %x %x, size %d\n", pReport->ShiftState, pReport->aKeys[0], pReport->aKeys[1], cbCopy));
         return usbHidCompleteOk(pThis, pUrb, cbCopy);
+    }
+    else
+    {
+        Log(("No available URB for USB kbd\n"));
     }
     return VINF_EOF;
@@ -695 +733 @@
                 }
             }
+
+            pThis->fNoUrbSinceLastPress = true;
+
             if (i == RT_ELEMENTS(pReport->aKeys))
             {
                 /* We ran out of room. Report error. */
+                Log(("no more room in usbHidKeyboardPutEvent\n"));
                 // @todo!!
             }
@@ -703 +745 @@
         else
         {
-            for (i = 0; i < RT_ELEMENTS(pReport->aKeys); ++i)
-            {
-                if (pReport->aKeys[i] == u8HidCode)
+            /* We have to avoid coalescing key presses and releases, so put all releases somewhere else */
+            if (pThis->fNoUrbSinceLastPress)
+            {                
+                for (i = 0; i < RT_ELEMENTS(pThis->aReleasedKeys); ++i)
                 {
-                    pReport->aKeys[i] = 0;
-                    break;                              /* Remove key down. */
+                    if (pThis->aReleasedKeys[i] == 0)
+                    {
+                        pThis->aReleasedKeys[i] = u8HidCode;
+                        break;
+                    }
                 }
             }
-            if (i == RT_ELEMENTS(pReport->aKeys))
-            {
-    //            AssertMsgFailed(("Key is up but was never down!?"));
-            }
+            else
+                usbHidUpdateReportReleased(pThis, u8HidCode);
         }
 
@@ -841 +885 @@
 {
     PVUSBSETUP pSetup = (PVUSBSETUP)&pUrb->abData[0];
+    LogFlow(("usbHidHandleDefaultPipe: cbData=%d\n", pUrb->cbData));
+
     AssertReturn(pUrb->cbData >= sizeof(*pSetup), VERR_VUSB_FAILED_TO_QUEUE_URB);