Changeset 82190 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 25, 2019 5:44:40 PM (5 years ago)

Author:

vboxsync

Message:

DevPS2: ps2kRemoveQueue is common to both DevPS2M.cpp and DevPS2K.cpp, share it! bugref:9218

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2.cpp (modified) (2 diffs)
• DevPS2.h (modified) (1 diff)
• DevPS2K.cpp (modified) (3 diffs)
• DevPS2M.cpp (modified) (2 diffs)

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

@@ -745 +745 @@
 }
 
+/**
+ * Retrieve a byte from a queue.
+ *
+ * @param   pQ                  Pointer to the queue.
+ * @param   pVal                Pointer to storage for the byte.
+ *
+ * @retval  VINF_TRY_AGAIN if queue is empty,
+ * @retval  VINF_SUCCESS if a byte was read.
+ */
+int PS2CmnRemoveQueue(GeneriQ *pQ, uint8_t *pVal)
+{
+    int rc;
+
+    Assert(pVal);
+    if (pQ->cUsed)
+    {
+        *pVal = pQ->abQueue[pQ->rpos];
+        if (++pQ->rpos == pQ->cSize)
+            pQ->rpos = 0;   /* Roll over. */
+        --pQ->cUsed;
+        LogFlowFunc(("removed 0x%02X from queue %p\n", *pVal, pQ));
+        rc = VINF_SUCCESS;
+    }
+    else
+    {
+        LogFlowFunc(("queue %p empty\n", pQ));
+        rc = VINF_TRY_AGAIN;
+    }
+    return rc;
+}
+
 #ifdef IN_RING3
 
@@ -778 +809 @@
  * @param   pQ                  Pointer to the queue.
  *
- * @return  int                 VBox status/error code.
+ * @returns VBox status/error code.
  */
 int PS2CmnR3LoadQueue(PCPDMDEVHLPR3 pHlp, PSSMHANDLE pSSM, GeneriQ *pQ)

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

@@ -42 +42 @@
 void PS2CmnClearQueue(GeneriQ *pQ);
 void PS2CmnInsertQueue(GeneriQ *pQ, uint8_t val);
+int  PS2CmnRemoveQueue(GeneriQ *pQ, uint8_t *pVal);
 void PS2CmnR3SaveQueue(PCPDMDEVHLPR3 pHlp, PSSMHANDLE pSSM, GeneriQ *pQ);
 int  PS2CmnR3LoadQueue(PCPDMDEVHLPR3 pHlp, PSSMHANDLE pSSM, GeneriQ *pQ);

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

@@ -450 +450 @@
 #endif /* IN_RING3 */
 
-/**
- * Retrieve a byte from a queue.
- *
- * @param   pQ                  Pointer to the queue.
- * @param   pVal                Pointer to storage for the byte.
- *
- * @return  int                 VINF_TRY_AGAIN if queue is empty,
- *                              VINF_SUCCESS if a byte was read.
- */
-static int ps2kRemoveQueue(GeneriQ *pQ, uint8_t *pVal)
-{
-    int     rc = VINF_TRY_AGAIN;
-
-    Assert(pVal);
-    if (pQ->cUsed)
-    {
-        *pVal = pQ->abQueue[pQ->rpos];
-        if (++pQ->rpos == pQ->cSize)
-            pQ->rpos = 0;   /* Roll over. */
-        --pQ->cUsed;
-        rc = VINF_SUCCESS;
-        LogFlowFunc(("removed 0x%02X from queue %p\n", *pVal, pQ));
-    } else
-        LogFlowFunc(("queue %p empty\n", pQ));
-    return rc;
-}
-
-/* Clears the currently active typematic key, if any. */
+/** Clears the currently active typematic key, if any. */
 static void ps2kStopTypematicRepeat(PPS2K pThis)
 {
@@ -489 +462 @@
 }
 
-/* Convert encoded typematic value to milliseconds. Note that the values are rated
+/** Convert encoded typematic value to milliseconds. Note that the values are rated
  * with +/- 20% accuracy, so there's no need for high precision.
  */
@@ -668 +641 @@
      * the command queue is empty.
      */
-    rc = ps2kRemoveQueue((GeneriQ *)&pThis->cmdQ, pb);
+    rc = PS2CmnRemoveQueue((GeneriQ *)&pThis->cmdQ, pb);
     if (rc != VINF_SUCCESS && !pThis->u8CurrCmd && pThis->fScanning)
         if (!pThis->fThrottleActive)
         {
-            rc = ps2kRemoveQueue((GeneriQ *)&pThis->keyQ, pb);
+            rc = PS2CmnRemoveQueue((GeneriQ *)&pThis->keyQ, pb);
             if (pThis->fThrottleEnabled) {
                 pThis->fThrottleActive = true;

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

@@ -232 +232 @@
 
 #endif /* IN_RING3 */
-
-/**
- * Retrieve a byte from a queue.
- *
- * @param   pQ                  Pointer to the queue.
- * @param   pVal                Pointer to storage for the byte.
- *
- * @return  int                 VINF_TRY_AGAIN if queue is empty,
- *                              VINF_SUCCESS if a byte was read.
- */
-static int ps2kRemoveQueue(GeneriQ *pQ, uint8_t *pVal)
-{
-    int     rc = VINF_TRY_AGAIN;
-
-    Assert(pVal);
-    if (pQ->cUsed)
-    {
-        *pVal = pQ->abQueue[pQ->rpos];
-        if (++pQ->rpos == pQ->cSize)
-            pQ->rpos = 0;   /* Roll over. */
-        --pQ->cUsed;
-        rc = VINF_SUCCESS;
-        LogFlowFunc(("removed 0x%02X from queue %p\n", *pVal, pQ));
-    } else
-        LogFlowFunc(("queue %p empty\n", pQ));
-    return rc;
-}
 
 static void ps2mSetRate(PPS2M pThis, uint8_t rate)
@@ -683 +656 @@
      */
     /// @todo Probably should flush/not fill queue if stream mode reporting disabled?!
-    rc = ps2kRemoveQueue((GeneriQ *)&pThis->cmdQ, pb);
+    rc = PS2CmnRemoveQueue((GeneriQ *)&pThis->cmdQ, pb);
     if (rc != VINF_SUCCESS && !pThis->u8CurrCmd && (pThis->u8State & AUX_STATE_ENABLED))
-        rc = ps2kRemoveQueue((GeneriQ *)&pThis->evtQ, pb);
+        rc = PS2CmnRemoveQueue((GeneriQ *)&pThis->evtQ, pb);
 
     LogFlowFunc(("mouse sends 0x%02x (%svalid data)\n", *pb, rc == VINF_SUCCESS ? "" : "not "));