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

Timestamp:

Apr 28, 2013 10:16:52 PM (12 years ago)

Author:

vboxsync

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

85363

Message:

32-bit burn fixes.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevLsiLogicSCSI.cpp (modified) (7 diffs)
• DevLsiLogicSCSI.h (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -162 +162 @@
     RCPTRTYPE(PPDMQUEUE) pNotificationQueueRC;
 
-#if HC_ARCH_BITS == 64
-    uint32_t             Alignment1;
-#endif
-
     /** Number of device states allocated. */
     uint32_t             cDeviceStates;
 
-#if HC_ARCH_BITS == 64
-    uint32_t             Alignment2;
-#endif
-
     /** States for attached devices. */
     R3PTRTYPE(PLSILOGICDEVICE) paDeviceStates;
-
-    /** MMIO address the device is mapped to. */
-    RTGCPHYS              GCPhysMMIOBase;
-    /** I/O port address the device is mapped to. */
-    RTIOPORT              IOPortBase;
+#if HC_ARCH_BITS == 32
+    RTR3PTR                 R3PtrPadding0;
+#endif
 
     /** Interrupt mask. */
@@ -186 +176 @@
     volatile uint32_t     uInterruptStatus;
 
-    /** Buffer for messages which are passed
-     * through the doorbell using the
+    /** Buffer for messages which are passed through the doorbell using the
      * handshake method. */
-    uint32_t              aMessage[sizeof(MptConfigurationRequest)];
+    uint32_t              aMessage[sizeof(MptConfigurationRequest)]; /** @todo r=bird: Looks like 4 tims the required size? Please explain in comment if this correct... */
     /** Actual position in the buffer. */
     uint32_t              iMessage;
@@ -195 +184 @@
     uint32_t              cMessage;
 
-    /** Reply buffer. */
+    /** Reply buffer.
+     * @note 60 bytes  */
     MptReplyUnion         ReplyBuffer;
     /** Next entry to read. */
@@ -204 +194 @@
     /** The fault code of the I/O controller if we are in the fault state. */
     uint16_t              u16IOCFaultCode;
+
+    /** I/O port address the device is mapped to. */
+    RTIOPORT              IOPortBase;
+    /** MMIO address the device is mapped to. */
+    RTGCPHYS              GCPhysMMIOBase;
 
     /** Upper 32 bits of the message frame address to locate requests in guest memory. */
@@ -225 +220 @@
     uint32_t              cRequestQueueEntries;
 
-#if HC_ARCH_BITS == 64
-    uint32_t              Alignment3;
-#endif
 
     /** Critical section protecting the reply post queue. */
@@ -254 +246 @@
     /** Pointer to the start of the request queue - RC. */
     RCPTRTYPE(volatile uint32_t *) pRequestQueueBaseRC;
+    /** End these RC pointers on a 64-bit boundrary. */
+    RTRCPTR                        RCPtrPadding1;
 
     /** Next free entry in the reply queue the guest can write a address to. */
@@ -275 +269 @@
     uint16_t                       u16NextHandle;
 
-    uint16_t                       u16Alignment4;
-    uint32_t                       u32Alignment5;
-
     /** Number of ports this controller has. */
     uint8_t                        cPorts;
 
-#if HC_ARCH_BITS == 64
-    uint32_t                       Alignment6;
-#endif
-
     /** BIOS emulation. */
     VBOXSCSI                       VBoxSCSI;
+
     /** Cache for allocated tasks. */
     R3PTRTYPE(RTMEMCACHE)          hTaskCache;

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h

@@ -1151 +1151 @@
     MptFWUploadReply           FWUpload;
 } MptReplyUnion, *PMptReplyUnion;
+AssertCompileSize(MptReplyUnion, 60);