Changeset 7044 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 20, 2008 3:23:26 PM (17 years ago)

Author:

vboxsync

Message:

Realigning after RTGCPHYS change.

File:

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

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

@@ -166 +166 @@
 
     /** Transmit signaller */
+    R3R0PTRTYPE(PPDMQUEUE)              pXmitQueueHC;
     GCPTRTYPE(PPDMQUEUE)                pXmitQueueGC;
-    R3R0PTRTYPE(PPDMQUEUE)              pXmitQueueHC;
 
     /** Receive signaller */
+    GCPTRTYPE(PPDMQUEUE)                pCanRxQueueGC;
     R3R0PTRTYPE(PPDMQUEUE)              pCanRxQueueHC;
-    GCPTRTYPE(PPDMQUEUE)                pCanRxQueueGC;
+    /** Pointer to the device instance. */
+    R3R0PTRTYPE(PPDMDEVINS)             pDevInsHC;
     /** Pointer to the device instance. */
     GCPTRTYPE(PPDMDEVINS)               pDevInsGC;
-    /** Pointer to the device instance. */
-    R3R0PTRTYPE(PPDMDEVINS)             pDevInsHC;
+    /** Alignment padding. */
+    RTGCPTR                             GCPtrAlignment0;
     /** Restore timer.
      *  This is used to disconnect and reconnect the link after a restore. */
@@ -208 +210 @@
     PDMMAC                              MacConfigured;
 
+#if HC_ARCH_BITS == 64
+    uint32_t                            u32Alignment0; /** Alignment padding. */
+#endif
     /** The LED. */
     PDMLED                              Led;
@@ -2752 +2757 @@
         case 2:
             /* PHY identifier 1. */
-            val = 0x22;     /* Am79C874 PHY */ 
+            val = 0x22;     /* Am79C874 PHY */
             break;
 
         case 3:
             /* PHY identifier 2. */
-            val = 0x561b;   /* Am79C874 PHY */  
+            val = 0x561b;   /* Am79C874 PHY */
             break;
 
@@ -2765 +2770 @@
 #if 0
                 // Advertising flow control is a) not the default, and b) confuses
-                // the link speed detection routine in Windows PCnet driver 
+                // the link speed detection routine in Windows PCnet driver
                   | 0x0400  /* Try flow control. */
 #endif