Changeset 39972 in vbox for trunk

Timestamp:

Feb 2, 2012 9:38:21 PM (13 years ago)

Author:

vboxsync

Message:

Updated struct testcase to see what breaks.

Location:

trunk/src/VBox/Devices

Files:

• Input/DevPS2.cpp (modified) (1 diff)
• Input/PS2Dev.h (modified) (1 diff)
• Input/PS2K.cpp (modified) (3 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (2 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -236 +236 @@
 
     /** Keyboard state (implemented in separate PS2K module). */
+#ifdef VBOX_DEVICE_STRUCT_TESTCASE
+    uint8_t                     KbdFiller[PS2K_STRUCT_FILLER];
+#else
     PS2K                        Kbd;
-
-#if 1 //OLD_KBD
+#endif
+
+#if OLD_KBD
     /**
      * Keyboard port - LUN#0.

trunk/src/VBox/Devices/Input/PS2Dev.h

@@ -22 +22 @@
 
 /* Hide the internal structure. */
-#ifndef IN_PS2K
+#if !(defined(IN_PS2K) || defined(VBOX_DEVICE_STRUCT_TESTCASE))
 typedef struct PS2K {
     uint8_t     abFiller[PS2K_STRUCT_FILLER];

trunk/src/VBox/Devices/Input/PS2K.cpp

@@ -155 +155 @@
 {
     /** Pointer to parent device (keyboard controller). */
-    void                *pParent;
+    R3PTRTYPE(void *)     pParent;
     /** Set if keyboard is enabled ('scans' for input). */
     bool                fScanning;
@@ -222 +222 @@
 
 AssertCompile(PS2K_STRUCT_FILLER >= sizeof(PS2K));
+
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
 /* Key type flags. */
@@ -1480 +1482 @@
     return state;
 }
+
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */

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

@@ -35 +35 @@
 #undef LOG_GROUP
 #include "../Input/DevPS2.cpp"
+#undef LOG_GROUP
+#include "../Input/PS2K.cpp"
 #ifdef VBOX_WITH_E1000
 # undef LOG_GROUP
@@ -298 +300 @@
 #endif
     CHECK_MEMBER_ALIGNMENT(KBDState, CritSect, 8);
+    CHECK_MEMBER_ALIGNMENT(PS2K, KbdCritSect, 8);
     CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, ReplyPostQueueCritSect, 8);
     CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, ReplyFreeQueueCritSect, 8);

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

@@ -44 +44 @@
 #undef LOG_GROUP
 #include "../Input/DevPS2.cpp"
+#undef LOG_GROUP
+#include "../Input/PS2K.cpp"
 #undef LOG_GROUP
 #include "../Network/DevPCNet.cpp"
@@ -364 +366 @@
     GEN_CHECK_OFF(KBDState, status);
     GEN_CHECK_OFF(KBDState, mode);
-    GEN_CHECK_OFF(KBDState, kbd_write_cmd);
-    GEN_CHECK_OFF(KBDState, scan_enabled);
     GEN_CHECK_OFF(KBDState, mouse_write_cmd);
     GEN_CHECK_OFF(KBDState, mouse_status);
@@ -381 +381 @@
     GEN_CHECK_OFF(KBDState, pDevInsR0);
     GEN_CHECK_OFF(KBDState, pDevInsRC);
-    GEN_CHECK_OFF(KBDState, Keyboard.IBase);
-    GEN_CHECK_OFF(KBDState, Keyboard.IPort);
-    GEN_CHECK_OFF(KBDState, Keyboard.pDrvBase);
-    GEN_CHECK_OFF(KBDState, Keyboard.pDrv);
+    GEN_CHECK_OFF(KBDState, CritSect);
+    GEN_CHECK_OFF(PS2K, fScanning);
+    GEN_CHECK_OFF(PS2K, fNumLockOn);
+    GEN_CHECK_OFF(PS2K, u8ScanSet);
+    GEN_CHECK_OFF(PS2K, u8Typematic);
+    GEN_CHECK_OFF(PS2K, enmTypematicState);
+    GEN_CHECK_OFF(PS2K, keyQ);
+    GEN_CHECK_OFF(PS2K, cmdQ);
+    GEN_CHECK_OFF(PS2K, uTypematicDelay);
+    GEN_CHECK_OFF(PS2K, pKbdDelayTimerRC);
+    GEN_CHECK_OFF(PS2K, pKbdDelayTimerR3);
+    GEN_CHECK_OFF(PS2K, pKbdDelayTimerR0);
+    GEN_CHECK_OFF(PS2K, pKbdTypematicTimerRC);
+    GEN_CHECK_OFF(PS2K, pKbdTypematicTimerR3);
+    GEN_CHECK_OFF(PS2K, pKbdTypematicTimerR0);
+    GEN_CHECK_OFF(PS2K, Keyboard.IBase);
+    GEN_CHECK_OFF(PS2K, Keyboard.IPort);
+    GEN_CHECK_OFF(PS2K, Keyboard.pDrvBase);
+    GEN_CHECK_OFF(PS2K, Keyboard.pDrv);
     GEN_CHECK_OFF(KBDState, Mouse.IBase);
     GEN_CHECK_OFF(KBDState, Mouse.IPort);