Changeset 73299 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

Jul 22, 2018 2:07:59 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123906

Message:

Serial: build fixes

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevSerialNew.cpp (modified) (1 diff)
• DrvCharNew.cpp (modified) (1 diff)
• UartCore.cpp (modified) (4 diffs)

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

@@ -209 +209 @@
         }
         else
+        {
+            if (uVersion > UART_SAVED_STATE_VERSION_16450)
+                enmType = UARTTYPE_16550A;
+            else
+                enmType = UARTTYPE_16450;
             rc = uartR3LoadExec(&pThis->UartCore, pSSM, uVersion, uPass, &uIrq, &PortBase);
+        }
         if (RT_SUCCESS(rc))
         {

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

@@ -75 +75 @@
     /** Current position into the read buffer. */
     uint8_t                     *pbBuf;
+
+#if HC_ARCH_BITS == 32
+    /** Alignment. */
+    uint32_t                    u32Alignment0;
+#endif
 
     /** Read/write statistics */

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

@@ -24 +24 @@
 #define LOG_GROUP LOG_GROUP_DEV_SERIAL
 #include <VBox/vmm/tm.h>
+#include <iprt/log.h>
 #include <iprt/uuid.h>
 #include <iprt/assert.h>
@@ -646 +647 @@
         size_t cbRead = 0;
         int rc2 = pThis->pDrvSerial->pfnReadRdr(pThis->pDrvSerial, &pThis->uRegRbr, 1, &cbRead);
-        AssertMsg(RT_SUCCESS(rc2) && cbRead == 1, ("This shouldn't fail and always return one byte!\n"));
+        AssertMsg(RT_SUCCESS(rc2) && cbRead == 1, ("This shouldn't fail and always return one byte!\n")); RT_NOREF(rc2);
         UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_DR);
         uartIrqUpdate(pThis);
@@ -1317 +1318 @@
         size_t cbRead = 0;
         int rc = pThis->pDrvSerial->pfnReadRdr(pThis->pDrvSerial, &pThis->uRegRbr, 1, &cbRead);
-        AssertMsg(RT_SUCCESS(rc) && cbRead == 1, ("This shouldn't fail and always return one byte!\n"));
+        AssertMsg(RT_SUCCESS(rc) && cbRead == 1, ("This shouldn't fail and always return one byte!\n")); RT_NOREF(rc);
         UART_REG_SET(pThis->uRegLsr, UART_REG_LSR_DR);
         uartIrqUpdate(pThis);
@@ -1458 +1459 @@
                                uint8_t *puIrq, RTIOPORT *pPortBase)
 {
+    RT_NOREF(uPass);
     int rc = VINF_SUCCESS;