Changeset 73300 in vbox

Timestamp:

Jul 22, 2018 2:16:51 PM (7 years ago)

Author:

vboxsync

Message:

Serial: build fixes

File:

• trunk/src/VBox/Devices/Serial/UartCore.cpp (modified) (4 diffs)

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

@@ -429 +429 @@
     while (cbCopy)
     {
-        size_t cbThisCopy = RT_MIN(cbCopy, (uint8_t)(pFifo->cbMax - pFifo->offRead));
+        uint8_t cbThisCopy = (uint8_t)RT_MIN(cbCopy, (uint8_t)(pFifo->cbMax - pFifo->offRead));
         memcpy(pbDst, &pFifo->abBuf[pFifo->offRead], cbThisCopy);
 
@@ -459 +459 @@
     while (cbCopy)
     {
-        size_t cbThisCopy = RT_MIN(cbCopy, (uint8_t)(pFifo->cbMax - pFifo->offWrite));
+        uint8_t cbThisCopy = (uint8_t)RT_MIN(cbCopy, (uint8_t)(pFifo->cbMax - pFifo->offWrite));
         memcpy(&pFifo->abBuf[pFifo->offWrite], pbSrc, cbThisCopy);
 
@@ -613 +613 @@
         size_t cbRead = 0;
         int rc = pThis->pDrvSerial->pfnReadRdr(pThis->pDrvSerial, &pFifo->abBuf[pFifo->offWrite], cbThisRead, &cbRead);
-        /*Assert(RT_SUCCESS(rc) && cbRead == cbThisRead);*/ RT_NOREF(rc);
-
-        pFifo->offWrite = (pFifo->offWrite + cbRead) % pFifo->cbMax;
+        AssertRC(rc); Assert(cbRead <= UINT8_MAX); RT_NOREF(rc);
+
+        pFifo->offWrite = (pFifo->offWrite + (uint8_t)cbRead) % pFifo->cbMax;
         pFifo->cbUsed   += cbRead;
         cbFilled        += cbRead;
@@ -629 +629 @@
     }
 
-    Assert(cbFilled <= pThis->cbAvailRdr);
+    Assert(cbFilled <= (size_t)pThis->cbAvailRdr);
     ASMAtomicSubU32(&pThis->cbAvailRdr, cbFilled);
 }