Changeset 82190 in vbox for trunk/src/VBox/Devices/Input/DevPS2.cpp

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

File:

• trunk/src/VBox/Devices/Input/DevPS2.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)