Changeset 73766 in vbox for trunk/src/VBox/Devices/testcase

Timestamp:

Aug 19, 2018 4:55:11 PM (7 years ago)

Author:

vboxsync

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

124449

Message:

Serial: Remove the old serial code and switch over to the new one by default now that it is mostly stable (Any remaining bugs will get fixed)

Location:

trunk/src/VBox/Devices/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstDeviceStructSize.cpp (modified) (2 diffs)
• tstDeviceStructSizeRC.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -49 +49 @@
         $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
         $(if $(VBOX_WITH_XHCI_IMPL),VBOX_WITH_XHCI_IMPL,) \
-        $(if $(VBOX_WITH_NEW_SERIAL),VBOX_WITH_NEW_SERIAL,) \
        $(VBOX_AUDIO_DEFS)
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -110 +110 @@
 #include "../Parallel/DevParallel.cpp"
 #undef LOG_GROUP
-#ifndef VBOX_WITH_NEW_SERIAL
-# include "../Serial/DevSerial.cpp"
-#else
-# include "../Serial/DevSerialNew.cpp"
-# include "../Serial/DevOxPcie958.cpp"
-#endif
+#include "../Serial/DevSerial.cpp"
+#undef LOG_GROUP
+#include "../Serial/DevOxPcie958.cpp"
 #ifdef VBOX_WITH_AHCI
 # undef LOG_GROUP
@@ -398 +395 @@
 #endif
     CHECK_MEMBER_ALIGNMENT(PITSTATE, StatPITIrq, 8);
-#ifndef VBOX_WITH_NEW_SERIAL
-    CHECK_MEMBER_ALIGNMENT(SerialState, CritSect, 8);
-#else
     CHECK_MEMBER_ALIGNMENT(DEVSERIAL, UartCore, 8);
     CHECK_MEMBER_ALIGNMENT(UARTCORE, CritSect, 8);
-#endif
 #ifdef VBOX_WITH_VMSVGA
     CHECK_SIZE(VMSVGAState, RT_ALIGN_Z(sizeof(VMSVGAState), 8));

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -109 +109 @@
 #include "../Parallel/DevParallel.cpp"
 #undef LOG_GROUP
-#ifndef VBOX_WITH_NEW_SERIAL
-# include "../Serial/DevSerial.cpp"
-#else
-# include "../Serial/DevSerialNew.cpp"
-# include "../Serial/DevOxPcie958.cpp"
-# include "../Serial/UartCore.h"
-#endif
+#include "../Serial/DevSerial.cpp"
+#undef LOG_GROUP
+#include "../Serial/DevOxPcie958.cpp"
+#undef LOG_GROUP
+#include "../Serial/UartCore.h"
 #ifdef VBOX_WITH_AHCI
 # undef LOG_GROUP
@@ -1280 +1278 @@
 #endif
 
-#ifndef VBOX_WITH_NEW_SERIAL
-    /* Serial/DevSerial.cpp */
-    GEN_CHECK_SIZE(SerialState);
-    GEN_CHECK_OFF(SerialState, CritSect);
-    GEN_CHECK_OFF(SerialState, pDevInsR3);
-    GEN_CHECK_OFF(SerialState, pDevInsR0);
-    GEN_CHECK_OFF(SerialState, pDevInsRC);
-    GEN_CHECK_OFF(SerialState, IBase);
-    GEN_CHECK_OFF(SerialState, ICharPort);
-    GEN_CHECK_OFF(SerialState, pDrvBase);
-    GEN_CHECK_OFF(SerialState, pDrvChar);
-    GEN_CHECK_OFF(SerialState, ReceiveSem);
-    GEN_CHECK_OFF(SerialState, base);
-    GEN_CHECK_OFF(SerialState, divider);
-    GEN_CHECK_OFF(SerialState, recv_fifo);
-    GEN_CHECK_OFF(SerialState, xmit_fifo);
-    GEN_CHECK_OFF(SerialState, rbr);
-    GEN_CHECK_OFF(SerialState, thr);
-    GEN_CHECK_OFF(SerialState, tsr);
-    GEN_CHECK_OFF(SerialState, ier);
-    GEN_CHECK_OFF(SerialState, iir);
-    GEN_CHECK_OFF(SerialState, lcr);
-    GEN_CHECK_OFF(SerialState, mcr);
-    GEN_CHECK_OFF(SerialState, lsr);
-    GEN_CHECK_OFF(SerialState, msr);
-    GEN_CHECK_OFF(SerialState, scr);
-    GEN_CHECK_OFF(SerialState, fcr);
-    GEN_CHECK_OFF(SerialState, fcr_vmstate);
-    GEN_CHECK_OFF(SerialState, thr_ipending);
-    GEN_CHECK_OFF(SerialState, timeout_ipending);
-    GEN_CHECK_OFF(SerialState, irq);
-    GEN_CHECK_OFF(SerialState, last_break_enable);
-    GEN_CHECK_OFF(SerialState, tsr_retry);
-    GEN_CHECK_OFF(SerialState, msr_changed);
-    GEN_CHECK_OFF(SerialState, fGCEnabled);
-    GEN_CHECK_OFF(SerialState, fR0Enabled);
-    GEN_CHECK_OFF(SerialState, fYieldOnLSRRead);
-    GEN_CHECK_OFF(SerialState, char_transmit_time);
-#else
     /* Serial/UartCore.cpp */
     GEN_CHECK_SIZE(UARTCORE);
@@ -1356 +1315 @@
     GEN_CHECK_OFF(UARTCORE, cbAvailRdr);
 
-    /* Serial/DevSerialNew.cpp */
+    /* Serial/DevSerial.cpp */
     GEN_CHECK_SIZE(DEVSERIAL);
     GEN_CHECK_OFF(DEVSERIAL, pDevInsR3);
@@ -1382 +1341 @@
     GEN_CHECK_OFF(DEVOX958, aUarts);
     GEN_CHECK_OFF(DEVOX958, aUarts[OX958_UARTS_MAX - 1]);
-#endif
 
 #ifdef VBOX_WITH_AHCI