Changeset 31058 in vbox

Timestamp:

Jul 23, 2010 1:06:52 PM (15 years ago)

Author:

vboxsync

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

63988

Message:

VUSBInternal.h: Attempt to fix the alignment issues on 32-bit hosts.

File:

• trunk/src/VBox/Devices/USB/VUSBInternal.h (modified) (4 diffs)

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -28 +28 @@
 #include <VBox/vusb.h>
 #include <VBox/stam.h>
+#include <iprt/assert.h>
 
 RT_C_DECLS_BEGIN
@@ -353 +354 @@
     /** Chain of devices attached to this hub. */
     PVUSBDEV                pDevices;
+#if HC_ARCH_BITS == 32
+    uint32_t                Alignment0;
+#endif
     /** Availability Bitmap. */
     VUSBPORTBITMAP          Bitmap;
@@ -366 +370 @@
 #ifdef VBOX_WITH_STATISTICS
 #if HC_ARCH_BITS == 32
-    uint32_t                Alignment0; /**< Counters must be 64-bit aligned. */
+    uint32_t                Alignment1; /**< Counters must be 64-bit aligned. */
 #endif
     VUSBROOTHUBTYPESTATS    Total;
@@ -393 +397 @@
 #endif
 } VUSBROOTHUB;
+AssertCompileMemberAlignment(VUSBROOTHUB, IRhConnector, 8);
+AssertCompileMemberAlignment(VUSBROOTHUB, Bitmap, 8);
+AssertCompileMemberAlignment(VUSBROOTHUB, CritSect, 8);
+#ifdef VBOX_WITH_STATISTICS
+AssertCompileMemberAlignment(VUSBROOTHUB, Total, 8);
+#endif
 
 /** Converts a pointer to VUSBROOTHUB::IRhConnector to a PVUSBROOTHUB. */