Changeset 1723 in vbox

Timestamp:

Mar 27, 2007 11:49:09 AM (18 years ago)

Author:

vboxsync

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

19880

Message:

Serial device:

• Renamed file & cleaned up
• Enabled GC & R0 IO port handling
• Critical section protection added
• Added structure checking in testcase

Location:

trunk/src/VBox/Devices

Files:

• Makefile (modified) (3 diffs)
• Serial/serial.c (deleted)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeGC.cpp (modified) (2 diffs)
• vl_vbox.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile

@@ -183 +183 @@
         PC/dma.c \
         Storage/fdc.c \
-        Serial/serial.c
+        Serial/DevSerial.cpp
 
 ifeq (0,1)
@@ -225 +225 @@
         PC/DevRTC.cpp \
         Storage/DevATA.cpp \
-        Network/DevPCNet.cpp
+        Network/DevPCNet.cpp \
+        Serial/DevSerial.cpp
 
 ifdef VBOX_WITH_USB
@@ -261 +262 @@
         PC/DevRTC.cpp \
         Storage/DevATA.cpp \
-        Network/DevPCNet.cpp
+        Network/DevPCNet.cpp \
+        Serial/DevSerial.cpp
 
 ifdef VBOX_WITH_USB

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

@@ -57 +57 @@
 #undef LOG_GROUP
 #include "VMMDev/VBoxDev.cpp"
+#undef LOG_GROUP
+#include "Serial/DevSerial.cpp"
 
 #include <stdio.h>

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

@@ -67 +67 @@
 #undef LOG_GROUP
 #include "VMMDev/VBoxDev.cpp"
+#undef LOG_GROUP
+#include "Serial/DevSerial.cpp"
 
 
@@ -767 +769 @@
     /* VMMDev/VBoxDev.cpp */
 
+    /* Serial/DevSerial.cpp */
+    GEN_CHECK_SIZE(SerialState);
+    GEN_CHECK_OFF(SerialState, divider);
+    GEN_CHECK_OFF(SerialState, rbr);
+    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, thr_ipending);
+    GEN_CHECK_OFF(SerialState, irq);
+    GEN_CHECK_OFF(SerialState, fGCEnabled);
+    GEN_CHECK_OFF(SerialState, fR0Enabled);
+    GEN_CHECK_OFF(SerialState, pDevInsGC);
+    GEN_CHECK_OFF(SerialState, pDevInsHC);
+    GEN_CHECK_OFF(SerialState, IBase);
+    GEN_CHECK_OFF(SerialState, ICharPort);
+    GEN_CHECK_OFF(SerialState, pDrvBase);
+    GEN_CHECK_OFF(SerialState, pDrvChar);
+    GEN_CHECK_OFF(SerialState, CritSect);
+    GEN_CHECK_OFF(SerialState, ReceiveSem);
+    GEN_CHECK_OFF(SerialState, last_break_enable);
+    GEN_CHECK_OFF(SerialState, base);
+
     return (0);
 }

trunk/src/VBox/Devices/vl_vbox.h

@@ -75 +75 @@
 typedef PCIDEVICE               PCIDevice;
 typedef RTGCUINTREG             target_ulong;
-
-typedef struct SerialState SerialState;
-typedef struct {
-    int speed;
-    int parity;
-    int data_bits;
-    int stop_bits;
-} QEMUSerialSetParams;