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

Timestamp:

Jul 23, 2018 3:23:48 PM (6 years ago)

Author:

vboxsync

Message:

Serial: Fixes

Location:

trunk/src/VBox/Devices/Serial

Files:

• DrvCharNew.cpp (modified) (7 diffs)
• DrvHostSerialNew.cpp (modified) (2 diffs)
• UartCore.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Serial/DrvCharNew.cpp

@@ -114 +114 @@
 static DECLCALLBACK(int) drvCharDataAvailWrNotify(PPDMISERIALCONNECTOR pInterface, size_t cbAvail)
 {
+    LogFlowFunc(("pInterface=%#p cbAvail=%zu\n", pInterface, cbAvail));
     PDRVCHAR pThis = RT_FROM_MEMBER(pInterface, DRVCHAR, ISerialConnector);
 
@@ -130 +131 @@
 static DECLCALLBACK(int) drvCharReadRdr(PPDMISERIALCONNECTOR pInterface, void *pvBuf, size_t cbRead, size_t *pcbRead)
 {
+    LogFlowFunc(("pInterface=%#p pvBuf=%#p cbRead=%zu pcbRead=%#p\n", pInterface, pvBuf, cbRead, pcbRead));
     PDRVCHAR pThis = RT_FROM_MEMBER(pInterface, DRVCHAR, ISerialConnector);
     int rc = VINF_SUCCESS;
@@ -136 +138 @@
     size_t cbToRead = RT_MIN(cbRead, pThis->cbRemaining);
     memcpy(pvBuf, pThis->pbBuf, cbToRead);
+
+    pThis->pbBuf += cbToRead;
     *pcbRead = cbToRead;
     size_t cbOld = ASMAtomicSubZ(&pThis->cbRemaining, cbToRead);
@@ -142 +146 @@
     STAM_COUNTER_ADD(&pThis->StatBytesRead, cbToRead);
 
+    LogFlowFunc(("-> %Rrc\n", rc));
     return rc;
 }
@@ -230 +235 @@
                 {
                     /* Stuff as much data into the TX buffer as we can. */
-                    size_t cbToFetch = RT_ELEMENTS(pThis->abTxBuf) - pThis->cbTxUsed;
+                    size_t cbToFetch = RT_MIN(RT_ELEMENTS(pThis->abTxBuf) - pThis->cbTxUsed, pThis->cbAvailWr);
                     size_t cbFetched = 0;
                     rc = pThis->pDrvSerialPort->pfnReadWr(pThis->pDrvSerialPort, &pThis->abTxBuf[pThis->cbTxUsed], cbToFetch,
@@ -239 +244 @@
                     {
                         ASMAtomicSubZ(&pThis->cbAvailWr, cbFetched);
-                        pThis->cbTxUsed += cbFetched;
+                        pThis->cbTxUsed  += cbFetched;
                     }
                     else
@@ -281 +286 @@
                     break;
                 }
-                pThis->pbBuf = &pThis->abBuffer[0];
-                ASMAtomicWriteZ(&pThis->cbRemaining, cbRead);
-                /* Notify the upper device/driver. */
-                rc = pThis->pDrvSerialPort->pfnDataAvailRdrNotify(pThis->pDrvSerialPort, cbRead);
+
+                if (cbRead)
+                {
+                    pThis->pbBuf = &pThis->abBuffer[0];
+                    ASMAtomicWriteZ(&pThis->cbRemaining, cbRead);
+                    /* Notify the upper device/driver. */
+                    rc = pThis->pDrvSerialPort->pfnDataAvailRdrNotify(pThis->pDrvSerialPort, cbRead);
+                }
             }
         }

trunk/src/VBox/Devices/Serial/DrvHostSerialNew.cpp

@@ -394 +394 @@
                 {
                     /* Stuff as much data into the TX buffer as we can. */
-                    size_t cbToFetch = RT_ELEMENTS(pThis->abTxBuf) - pThis->cbTxUsed;
+                    size_t cbToFetch = RT_MIN(RT_ELEMENTS(pThis->abTxBuf) - pThis->cbTxUsed, pThis->cbAvailWr);
                     size_t cbFetched = 0;
                     rc = pThis->pDrvSerialPort->pfnReadWr(pThis->pDrvSerialPort, &pThis->abTxBuf[pThis->cbTxUsed], cbToFetch,
@@ -403 +403 @@
                     {
                         ASMAtomicSubZ(&pThis->cbAvailWr, cbFetched);
-                        pThis->cbTxUsed += cbFetched;
+                        pThis->cbTxUsed  += cbFetched;
                     }
                     else

trunk/src/VBox/Devices/Serial/UartCore.cpp

@@ -614 +614 @@
     while (cbFilled < cbFill)
     {
-        size_t cbThisRead = RT_MIN(cbFill - cbFilled, (uint8_t)(pFifo->cbMax - pFifo->offWrite));
+        size_t cbThisRead = cbFill - cbFilled;
+
+        if (pFifo->offRead <= pFifo->offWrite)
+            cbThisRead = RT_MIN(cbThisRead, (uint8_t)(pFifo->cbMax - pFifo->offWrite));
+        else
+            cbThisRead = RT_MIN(cbThisRead, (uint8_t)(pFifo->offRead - pFifo->offWrite));
+
         size_t cbRead = 0;
         int rc = pThis->pDrvSerial->pfnReadRdr(pThis->pDrvSerial, &pFifo->abBuf[pFifo->offWrite], cbThisRead, &cbRead);
@@ -670 +676 @@
     else
         uartR3ByteFetch(pThis);
+}
+
+
+/**
+ * Reset the transmit/receive related bits to the standard values
+ * (after a detach/attach/reset event).
+ *
+ * @returns nothing.
+ * @param   pThis               The serial port instance.
+ */
+static void uartR3XferReset(PUARTCORE pThis)
+{
+    pThis->uRegLsr = UART_REG_LSR_THRE | UART_REG_LSR_TEMT;
+
+    uartFifoClear(&pThis->FifoXmit);
+    uartFifoClear(&pThis->FifoRecv);
+    uartR3ParamsUpdate(pThis);
+    uartIrqUpdate(pThis);
+
+    if (pThis->pDrvSerial)
+    {
+        /* Set the modem lines to reflect the current state. */
+        int rc = pThis->pDrvSerial->pfnChgModemLines(pThis->pDrvSerial, false /*fRts*/, false /*fDtr*/);
+        if (RT_FAILURE(rc))
+            LogRel(("Serial#%d: Failed to set modem lines with %Rrc during reset\n",
+                    pThis->pDevInsR3->iInstance, rc));
+
+        uint32_t fStsLines = 0;
+        rc = pThis->pDrvSerial->pfnQueryStsLines(pThis->pDrvSerial, &fStsLines);
+        if (RT_SUCCESS(rc))
+            uartR3StsLinesUpdate(pThis, fStsLines);
+        else
+            LogRel(("Serial#%d: Failed to query status line status with %Rrc during reset\n",
+                    pThis->pDevInsR3->iInstance, rc));
+    }
+
 }
 #endif
@@ -1600 +1642 @@
     pThis->FifoXmit.cbMax = 16;
     pThis->FifoRecv.cbMax = 16;
-    uartFifoClear(&pThis->FifoXmit);
-    uartFifoClear(&pThis->FifoRecv);
     pThis->FifoRecv.cbItl = 1;
 
-    uartR3ParamsUpdate(pThis);
-    uartIrqUpdate(pThis);
-
-    if (pThis->pDrvSerial)
-    {
-        /* Set the modem lines to reflect the current state. */
-        int rc = pThis->pDrvSerial->pfnChgModemLines(pThis->pDrvSerial, false /*fRts*/, false /*fDtr*/);
-        if (RT_FAILURE(rc))
-            LogRel(("Serial#%d: Failed to set modem lines with %Rrc during reset\n",
-                    pThis->pDevInsR3->iInstance, rc));
-
-        uint32_t fStsLines = 0;
-        rc = pThis->pDrvSerial->pfnQueryStsLines(pThis->pDrvSerial, &fStsLines);
-        if (RT_SUCCESS(rc))
-            uartR3StsLinesUpdate(pThis, fStsLines);
-        else
-            LogRel(("Serial#%d: Failed to query status line status with %Rrc during reset\n",
-                    pThis->pDevInsR3->iInstance, rc));
-    }
+    uartR3XferReset(pThis);
 }
 
@@ -1637 +1659 @@
             return VERR_PDM_MISSING_INTERFACE;
         }
+        uartR3XferReset(pThis);
     }
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
@@ -1643 +1666 @@
         pThis->pDrvSerial = NULL;
         rc = VINF_SUCCESS;
+        uartR3XferReset(pThis);
         LogRel(("Serial#%d: no unit\n", pThis->pDevInsR3->iInstance));
     }
@@ -1657 +1681 @@
     pThis->pDrvBase   = NULL;
     pThis->pDrvSerial = NULL;
+    uartR3XferReset(pThis);
 }