Changeset 72119 in vbox

Timestamp:

May 4, 2018 4:45:29 PM (7 years ago)

Author:

vboxsync

Message:

tstDeviceStructSizeRC: Add new serial port implementation

Location:

trunk/src/VBox/Devices/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstDeviceStructSize.cpp (modified) (2 diffs)
• tstDeviceStructSizeRC.cpp (modified) (3 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
-#include "../Serial/DevSerial.cpp"
+#ifndef VBOX_WITH_NEW_SERIAL
+# include "../Serial/DevSerial.cpp"
+#else
+# include "../Serial/DevSerialNew.cpp"
+#endif
 #ifdef VBOX_WITH_AHCI
 # undef LOG_GROUP
@@ -393 +397 @@
 #endif
     CHECK_MEMBER_ALIGNMENT(PITSTATE, StatPITIrq, 8);
+#ifndef VBOX_WITH_NEW_SERIAL
     CHECK_MEMBER_ALIGNMENT(SerialState, CritSect, 8);
+#else
+    CHECK_MEMBER_ALIGNMENT(DEVSERIAL, 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
-#include "../Serial/DevSerial.cpp"
+#ifndef VBOX_WITH_NEW_SERIAL
+# include "../Serial/DevSerial.cpp"
+#else
+# include "../Serial/DevSerialNew.cpp"
+#endif
 #ifdef VBOX_WITH_AHCI
 # undef LOG_GROUP
@@ -1274 +1278 @@
 #endif
 
+#ifndef VBOX_WITH_NEW_SERIAL
     /* Serial/DevSerial.cpp */
     GEN_CHECK_SIZE(SerialState);
@@ -1311 +1316 @@
     GEN_CHECK_OFF(SerialState, fYieldOnLSRRead);
     GEN_CHECK_OFF(SerialState, char_transmit_time);
+#else
+    /* Serial/DevSerialNew.cpp */
+    GEN_CHECK_SIZE(DEVSERIAL);
+    GEN_CHECK_OFF(DEVSERIAL, CritSect);
+    GEN_CHECK_OFF(DEVSERIAL, pDevInsR3);
+    GEN_CHECK_OFF(DEVSERIAL, pDevInsR0);
+    GEN_CHECK_OFF(DEVSERIAL, pDevInsRC);
+    GEN_CHECK_OFF(DEVSERIAL, IBase);
+    GEN_CHECK_OFF(DEVSERIAL, ISerialPort);
+    GEN_CHECK_OFF(DEVSERIAL, pDrvBase);
+    GEN_CHECK_OFF(DEVSERIAL, pDrvSerial);
+    GEN_CHECK_OFF(DEVSERIAL, fR0Enabled);
+    GEN_CHECK_OFF(DEVSERIAL, fRCEnabled);
+    GEN_CHECK_OFF(DEVSERIAL, f16550AEnabled);
+    GEN_CHECK_OFF(DEVSERIAL, fYieldOnLSRRead);
+    GEN_CHECK_OFF(DEVSERIAL, uIrq);
+    GEN_CHECK_OFF(DEVSERIAL, PortBase);
+    GEN_CHECK_OFF(DEVSERIAL, uRegDivisor);
+    GEN_CHECK_OFF(DEVSERIAL, uRegRbr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegThr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegIer);
+    GEN_CHECK_OFF(DEVSERIAL, uRegIir);
+    GEN_CHECK_OFF(DEVSERIAL, uRegFcr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegLcr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegMcr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegLsr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegMsr);
+    GEN_CHECK_OFF(DEVSERIAL, uRegScr);
+    GEN_CHECK_OFF(DEVSERIAL, cbAvailRdr);
+#endif
 
 #ifdef VBOX_WITH_AHCI