From df6d2ff6726d437874048f0ec907459781310a3c Mon Sep 17 00:00:00 2001 From: vboxsync Date: Sun, 19 Aug 2018 16:55:11 +0000 Subject: 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) git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@73766 cfe28804-0f27-0410-a406-dd0f0b0b656f --- src/VBox/Devices/testcase/tstDeviceStructSize.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/VBox/Devices/testcase/tstDeviceStructSize.cpp') diff --git a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp index f809a369fdb..ad93e8e1485 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp @@ -109,12 +109,9 @@ #undef LOG_GROUP #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 # include "../Storage/DevAHCI.cpp" @@ -397,12 +394,8 @@ int main() CHECK_MEMBER_ALIGNMENT(PCNETSTATE, StatMMIOReadRZ, 8); #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)); CHECK_MEMBER_ALIGNMENT(VGASTATE, svga, 8); -- cgit v1.2.1