Changeset 73766 in vbox for trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

Timestamp:

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

Author:

vboxsync

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)

File:

• trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp (modified) (2 diffs)

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));