儲存庫 vbox 的更動 83443

時間撮記:

2020-3-26 下午04:49:44 (5 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

136671

訊息:

DevPS2: Improved logging, gave queues human-readable names.

位置:

trunk/src/VBox/Devices/Input

檔案:

• DevPS2.cpp (修改) (5 筆差異)
• DevPS2.h (修改) (1 筆差異)
• DevPS2K.cpp (修改) (3 筆差異)
• DevPS2M.cpp (修改) (12 筆差異)

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

@@ -731 +731 @@
 {
     Assert(cElements > 0);
-    LogFlowFunc(("Clearing queue %p\n", pQHdr));
+    LogFlowFunc(("Clearing %s queue %p\n", pQHdr->pszDesc, pQHdr));
     pQHdr->wpos  = pQHdr->rpos = pQHdr->rpos % cElements;
     pQHdr->cUsed = 0;
@@ -764 +764 @@
         pQHdr->cUsed = cUsed + 1;
 
-        LogRelFlowFunc(("inserted %#04x into queue %p\n", bValue, pQHdr));
+        LogRelFlowFunc(("inserted %#04x into %s queue %p\n", bValue, pQHdr->pszDesc, pQHdr));
     }
     else
     {
         Assert(cUsed == cElements);
-        LogRelFlowFunc(("queue %p full (%zu entries)\n", pQHdr, cElements));
+        LogRelFlowFunc(("%s queue %p full (%zu entries)\n", pQHdr->pszDesc, pQHdr, cElements));
     }
 }
@@ -804 +804 @@
         pQHdr->cUsed = cUsed - 1;
 
-        LogFlowFunc(("removed 0x%02X from queue %p\n", *pbValue, pQHdr));
+        LogFlowFunc(("removed 0x%02X from %s queue %p\n", *pbValue, pQHdr->pszDesc, pQHdr));
         rc = VINF_SUCCESS;
     }
     else
     {
-        LogFlowFunc(("queue %p empty\n", pQHdr));
+        LogFlowFunc(("%s queue %p empty\n", pQHdr->pszDesc, pQHdr));
         rc = VINF_TRY_AGAIN;
     }
@@ -835 +835 @@
     pHlp->pfnSSMPutU32(pSSM, cItems);
 
-    LogFlow(("Storing %u items from queue %p\n", cItems, pQHdr));
+    LogFlow(("Storing %u items from %s queue %p\n", cItems, pQHdr->pszDesc, pQHdr));
 
     /* Save queue data - only the bytes actually used (typically zero). */
@@ -860 +860 @@
     AssertRCReturn(rc, rc);
 
-    LogFlow(("Loading %u items to queue %p\n", cUsed, pQHdr));
+    LogFlow(("Loading %u items to %s queue %p\n", cUsed, pQHdr->pszDesc, pQHdr));
 
     AssertMsgReturn(cUsed <= cElements, ("Saved size=%u, actual=%zu\n", cUsed, cElements),

trunk/src/VBox/Devices/Input/DevPS2.h

@@ -37 +37 @@
     uint32_t volatile   wpos;
     uint32_t volatile   cUsed;
+    uint32_t            uPadding;
+    const char          *pszDesc;
 } PS2QHDR;
 /** Pointer to a queue header. */

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

@@ -489 +489 @@
 void PS2KLineDisable(PPS2K pThis)
 {
+    LogFlowFunc(("Disabling keyboard serial line\n"));
+
     pThis->fLineDisabled = true;
 }
@@ -499 +501 @@
 void PS2KLineEnable(PPS2K pThis)
 {
+    LogFlowFunc(("Enabling keyboard serial line\n"));
+
     pThis->fLineDisabled = false;
 
@@ -1389 +1393 @@
     pThisCC->Keyboard.IPort.pfnPutEventHid    = ps2kR3KeyboardPort_PutEventHid;
 
+    pThis->cmdQ.Hdr.pszDesc = "Kbd Cmd";
+    pThis->keyQ.Hdr.pszDesc = "Kbd Key";
+
     /*
      * Create the input rate throttling timer.

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

@@ -219 +219 @@
 static void ps2mR3Reset(PPS2M pThis, PPS2MR3 pThisCC)
 {
+    LogFlowFunc(());
+
     PS2Q_INSERT(&pThis->cmdQ, ARSP_BAT_OK);
     PS2Q_INSERT(&pThis->cmdQ, 0);
@@ -258 +260 @@
 {
     PS2M_PROTO          enmOldProtocol = pThis->enmProtocol;
+    LogFlowFunc(("rate=%u\n", rate));
 
     switch (pThis->enmKnockState)
@@ -321 +324 @@
     int         dX, dY, dZ, dW;
 
+    LogFlowFunc(("cQElements=%zu, fAccumBtns=%RTbool\n", cQElements, fAccumBtns));
+
     /* Clamp the accumulated delta values to the allowed range. */
     dX = RT_MIN(RT_MAX(pThis->iAccumX, -255), 255);
@@ -334 +339 @@
 
     /* Send the standard 3-byte packet (always the same). */
+    LogFlowFunc(("Queuing standard 3-byte packet\n"));
     PS2CmnInsertQueue(pQHdr, cQElements, pbQElements, val);
     PS2CmnInsertQueue(pQHdr, cQElements, pbQElements, dX);
@@ -347 +353 @@
         {
             /* NB: Only uses 4-bit dZ range, despite using a full byte. */
+            LogFlowFunc(("Queuing ImPS/2 last byte\n"));
             PS2CmnInsertQueue(pQHdr, cQElements, pbQElements, dZ);
             pThis->iAccumZ -= dZ;
@@ -356 +363 @@
            val |= dZ & 0x0f;
            pThis->iAccumZ -= dZ;
+           LogFlowFunc(("Queuing ImEx last byte\n"));
            PS2CmnInsertQueue(pQHdr, cQElements, pbQElements, val);
         }
@@ -388 +396 @@
                val = (fBtnState & PS2M_IMEX_BTN_MASK) << 1;
             }
+            LogFlowFunc(("Queuing ImEx+horz last byte\n"));
             PS2CmnInsertQueue(pQHdr, cQElements, pbQElements, val);
         }
@@ -428 +437 @@
 void PS2MLineDisable(PPS2M pThis)
 {
+    LogFlowFunc(("Disabling mouse serial line\n"));
+
     pThis->fLineDisabled = true;
 }
@@ -438 +449 @@
 void PS2MLineEnable(PPS2M pThis)
 {
+    LogFlowFunc(("Enabling mouse serial line\n"));
+
     pThis->fLineDisabled = false;
 
@@ -813 +826 @@
 static int ps2mR3PutEventWorker(PPDMDEVINS pDevIns, PPS2M pThis, int32_t dx, int32_t dy, int32_t dz, int32_t dw, uint32_t fButtons)
 {
+    LogFlowFunc(("dx=%d, dy=%d, dz=%d, dw=%d, fButtons=%X\n", dx, dy, dz, dw, fButtons));
+
     /* Update internal accumulators and button state. Ignore any buttons beyond 5. */
     pThis->iAccumX += dx;
@@ -1049 +1064 @@
 {
     LogFlowFunc(("\n"));
+
+    pThis->cmdQ.Hdr.pszDesc = "Aux Cmd";
+    pThis->evtQ.Hdr.pszDesc = "Aux Evt";
+
 #ifdef RT_STRICT
     ps2mR3TestAccumulation();
@@ -1110 +1129 @@
     This.u8State = AUX_STATE_ENABLED;
     This.fThrottleActive = true;
+    This.cmdQ.Hdr.pszDesc = "Test Aux Cmd";
+    This.evtQ.Hdr.pszDesc = "Test Aux Evt";
     /* Certain Windows touch pad drivers report a double tap as a press, then
      * a release-press-release all within a single 10ms interval.  Simulate