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

Timestamp:

Jan 31, 2007 11:14:41 PM (18 years ago)

Author:

vboxsync

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

18089

Message:

64-bit alignment.

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -141 +141 @@
     uint16_t                            aMII[MII_MAX_REG];
     uint16_t                            u16CSR0LastSeenByGuest; /** @todo SSM!! */
+    uint16_t                            Alignment0[HC_ARCH_BITS == 32 ? 2 : 4];
     /** Last time we polled the queues */
     uint64_t                            u64LastPoll;
@@ -168 +169 @@
 
     /** Transmit signaller */
+    GCPTRTYPE(PPDMQUEUE)                pXmitQueueGC;
     HCPTRTYPE(PPDMQUEUE)                pXmitQueueHC;
-    GCPTRTYPE(PPDMQUEUE)                pXmitQueueGC;
 
     /** Receive signaller */
     HCPTRTYPE(PPDMQUEUE)                pCanRxQueueHC;
     GCPTRTYPE(PPDMQUEUE)                pCanRxQueueGC;
+    /** Pointer to the device instance. */
+    GCPTRTYPE(PPDMDEVINS)               pDevInsGC;
+    /** Pointer to the device instance. */
+    HCPTRTYPE(PPDMDEVINS)               pDevInsHC;
     /** Restore timer.
      *  This is used to disconnect and reconnect the link after a restore. */
     PTMTIMERHC                          pTimerRestore;
-    /** Pointer to the device instance. */
-    HCPTRTYPE(PPDMDEVINS)               pDevInsHC;
-    /** Pointer to the device instance. */
-    GCPTRTYPE(PPDMDEVINS)               pDevInsGC;
     /** Pointer to the connector of the attached network driver. */
     HCPTRTYPE(PPDMINETWORKCONNECTOR)    pDrv;
@@ -232 +233 @@
     bool                                fR0Enabled;
     bool                                fAm79C973;
+    bool                                afAlignment[5];
 
 #ifdef VBOX_WITH_STATISTICS
@@ -525 +527 @@
 #pragma pack()
 
+
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
 #define PRINT_TMD(T) Log((    \
         "TMD0 : TBADR=0x%08x\n" \
@@ -925 +932 @@
 }
 
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
 __BEGIN_DECLS
 PDMBOTHCBDECL(int) pcnetIOPortRead(PPDMDEVINS pDevIns, void *pvUser,
@@ -1231 +1235 @@
     RTGCPHYS TDRAPageStart = pData->GCTDRA & ~PAGE_OFFSET_MASK;
     RTGCPHYS TDRAPageEnd   = (pcnetTdraAddr(pData, 0) - 1) & ~PAGE_OFFSET_MASK;
-    
+
     if (    RDRAPageStart > TDRAPageEnd
         ||  TDRAPageStart > RDRAPageEnd)
@@ -4178 +4182 @@
 
 #endif /* IN_RING3 */
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
+