Changeset 73528 in vbox

Timestamp:

Aug 6, 2018 3:15:09 PM (6 years ago)

Author:

vboxsync

Message:

Devices/Serial/UartCore: Fix adjusting the amount of available bytes to read when the FIFO is enabled while there is something in the RBR register

File:

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

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

@@ -851 +851 @@
              */
             if (   ASMAtomicReadU32(&pThis->cbAvailRdr) > 0
-                && (pThis->uRegFcr & UART_REG_FCR_FIFO_EN))
+                && (uVal & UART_REG_FCR_FIFO_EN))
                 ASMAtomicDecU32(&pThis->cbAvailRdr);
 
@@ -1356 +1356 @@
 
     uint32_t cbAvailOld = ASMAtomicAddU32(&pThis->cbAvailRdr, (uint32_t)cbAvail);
-    LogFlow(("    cbAvailRdr=%zu -> cbAvailRdr=%zu\n", cbAvailOld, cbAvail + cbAvailOld));
+    LogFlow(("    cbAvailRdr=%u -> cbAvailRdr=%u\n", cbAvailOld, cbAvail + cbAvailOld));
     PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
     if (pThis->uRegFcr & UART_REG_FCR_FIFO_EN)