Changeset 71753 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 9, 2018 1:15:57 AM (7 years ago)

Author:

vboxsync

Message:

DevIchAc97: Alignment fixing.

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchAc97.cpp (modified) (2 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -434 +434 @@
     uint8_t                 cStreamsActive;
 #ifndef VBOX_WITH_AUDIO_AC97_CALLBACKS
+    /** Flag indicating whether the timer is active or not. */
+    bool                    fTimerActive;
+    uint8_t                 u8Padding1[2];
+    /** The timer for pumping data thru the attached LUN drivers - RCPtr. */
+    PTMTIMERRC              pTimerRC;
     /** The timer for pumping data thru the attached LUN drivers - R3Ptr. */
     PTMTIMERR3              pTimerR3;
     /** The timer for pumping data thru the attached LUN drivers - R0Ptr. */
     PTMTIMERR0              pTimerR0;
-    /** The timer for pumping data thru the attached LUN drivers - RCPtr. */
-    PTMTIMERRC              pTimerRC;
-    uint32_t                Padding0;
-    /** Flag indicating whether the timer is active or not. */
-    bool                    fTimerActive;
-    uint8_t                 u8Padding1[7];
     /** The timer interval for pumping data thru the LUN drivers in timer ticks. */
     uint64_t                cTimerTicks;
@@ -468 +467 @@
     R3PTRTYPE(PAUDMIXSINK)  pSinkMicIn;
     uint8_t                 silence[128];
-    int                     bup_flag;
-    /** The base interface for LUN\#0. */
-    PDMIBASE                IBase;
+    int32_t                 bup_flag;
     /** Base port of the I/O space region. */
     RTIOPORT                IOPortBase[2];
     /** Codec model. */
     uint32_t                uCodecModel;
+#if HC_ARCH_BITS == 64
+    uint32_t                uPadding2;
+#endif
+    /** The base interface for LUN\#0. */
+    PDMIBASE                IBase;
 } AC97STATE;
 AssertCompileMemberAlignment(AC97STATE, StreamLineIn, 8);

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

@@ -1880 +1880 @@
     GEN_CHECK_OFF(AC97STATE, pTimerR0);
     GEN_CHECK_OFF(AC97STATE, pTimerRC);
-    GEN_CHECK_OFF(AC97STATE, Padding0);
     GEN_CHECK_OFF(AC97STATE, fTimerActive);
     GEN_CHECK_OFF(AC97STATE, u8Padding1);