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

Timestamp:

Feb 4, 2022 9:01:01 AM (3 years ago)

Author:

vboxsync

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

149739

Message:

Dev3C501/DevDP8390: Reworked code to split R3/R0 data.

Location:

trunk/src/VBox/Devices/Network

Files:

• Dev3C501.cpp (modified) (118 diffs)
• DevDP8390.cpp (modified) (179 diffs)

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

@@ -188 +188 @@
 #define MAX_FRAME                       1536
 
-#define ELNKSTATE_2_DEVINS(pThis)       ((pThis)->CTX_SUFF(pDevIns))
-#define ELNK_INSTANCE                   (ELNKSTATE_2_DEVINS(pThis)->iInstance)
-
 /* Size of the packet buffer. */
 #define ELNK_BUF_SIZE       2048u
@@ -323 +320 @@
 /**
  * EtherLink 3C501 state.
- *
- * @extends     PDMPCIDEV
- * @implements  PDMIBASE
- * @implements  PDMINETWORKDOWN
- * @implements  PDMINETWORKCONFIG
- * @implements  PDMILEDPORTS
  */
 typedef struct ELNKSTATE
 {
-    /** Pointer to the device instance - R3. */
-    PPDMDEVINSR3                        pDevInsR3;
-    /** Pointer to the connector of the attached network driver - R3. */
-    PPDMINETWORKUPR3                    pDrvR3;
-    /** Pointer to the attached network driver. */
-    R3PTRTYPE(PPDMIBASE)                pDrvBase;
-    /** LUN\#0 + status LUN: The base interface. */
-    PDMIBASE                            IBase;
-    /** LUN\#0: The network port interface. */
-    PDMINETWORKDOWN                     INetworkDown;
-    /** LUN\#0: The network config port interface. */
-    PDMINETWORKCONFIG                   INetworkConfig;
     /** Restore timer.
      *  This is used to disconnect and reconnect the link after a restore. */
     TMTIMERHANDLE                       hTimerRestore;
-
-    /** Pointer to the device instance - R0. */
-    PPDMDEVINSR0                        pDevInsR0;
-    /** Pointer to the connector of the attached network driver - R0. */
-    PPDMINETWORKUPR0                    pDrvR0;
-
-    /** Pointer to the device instance - RC. */
-    PPDMDEVINSRC                        pDevInsRC;
-    /** Pointer to the connector of the attached network driver - RC. */
-    PPDMINETWORKUPRC                    pDrvRC;
 
     /** Transmit signaller. */
@@ -432 +401 @@
     };
 
+    /** Set if ELNKSTATER3::pDrv is not NULL. */
+    bool                                fDriverAttached;
     /** The LED. */
     PDMLED                              Led;
@@ -489 +460 @@
 
 
+/**
+ * EtherLink state for ring-3.
+ *
+ * @implements  PDMIBASE
+ * @implements  PDMINETWORKDOWN
+ * @implements  PDMINETWORKCONFIG
+ * @implements  PDMILEDPORTS
+ */
+typedef struct ELNKSTATER3
+{
+    /** Pointer to the device instance. */
+    PPDMDEVINSR3                        pDevIns;
+    /** Pointer to the connector of the attached network driver. */
+    PPDMINETWORKUPR3                    pDrv;
+    /** Pointer to the attached network driver. */
+    R3PTRTYPE(PPDMIBASE)                pDrvBase;
+    /** LUN\#0 + status LUN: The base interface. */
+    PDMIBASE                            IBase;
+    /** LUN\#0: The network port interface. */
+    PDMINETWORKDOWN                     INetworkDown;
+    /** LUN\#0: The network config port interface. */
+    PDMINETWORKCONFIG                   INetworkConfig;
+
+    /** Status LUN: The LED ports. */
+    PDMILEDPORTS                        ILeds;
+    /** Partner of ILeds. */
+    R3PTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
+} ELNKSTATER3;
+/** Pointer to an EtherLink state structure for ring-3. */
+typedef ELNKSTATER3 *PELNKSTATER3;
+
+
+/**
+ * EtherLink state for ring-0.
+ */
+typedef struct ELNKSTATER0
+{
+    /** Pointer to the connector of the attached network driver. */
+    PPDMINETWORKUPR0                    pDrv;
+} ELNKSTATER0;
+/** Pointer to an EtherLink state structure for ring-0. */
+typedef ELNKSTATER0 *PELNKSTATER0;
+
+
+/**
+ * EtherLink state for raw-mode.
+ */
+typedef struct ELNKSTATERC
+{
+    /** Pointer to the connector of the attached network driver. */
+    PPDMINETWORKUPRC                    pDrv;
+} ELNKSTATERC;
+/** Pointer to an EtherLink state structure for raw-mode. */
+typedef ELNKSTATERC *PELNKSTATERC;
+
+
+/** The EtherLink state structure for the current context. */
+typedef CTX_SUFF(ELNKSTATE) ELNKSTATECC;
+/** Pointer to an EtherLink state structure for the current
+ *  context. */
+typedef CTX_SUFF(PELNKSTATE) PELNKSTATECC;
+
+
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
@@ -496 +530 @@
 *********************************************************************************************************************************/
 
-static int elnkAsyncTransmit(PPDMDEVINS pDevIns, PELNKSTATE pThis, bool fOnWorkerThread);
+static int elnkAsyncTransmit(PPDMDEVINS pDevIns, PELNKSTATE pThis, PELNKSTATECC pThisCC, bool fOnWorkerThread);
 
 /**
@@ -505 +539 @@
 DECLINLINE(bool) elnkIsLinkUp(PELNKSTATE pThis)
 {
-    return pThis->pDrvR3 && !pThis->fLinkTempDown && pThis->fLinkUp;
+    return pThis->fDriverAttached && !pThis->fLinkTempDown && pThis->fLinkUp;
 }
 
@@ -566 +600 @@
  * Update the device IRQ line based on internal state.
  */
-static void elnkUpdateIrq(PELNKSTATE pThis)
+static void elnkUpdateIrq(PPDMDEVINS pDevIns, PELNKSTATE pThis)
 {
     bool     fISR = false;
@@ -578 +612 @@
         fISR = true;
 
-    Log2(("#%d set irq fISR=%d\n", ELNK_INSTANCE, fISR));
+    Log2(("#%d set irq fISR=%d\n", pThis->iInstance, fISR));
 
     /* The IRQ line typically does not change. */
     if (RT_UNLIKELY(fISR != pThis->fISR))
     {
-        Log(("#%d IRQ=%d, state=%d\n", ELNK_INSTANCE, pThis->uIsaIrq, fISR));
-        PDMDevHlpISASetIrq(ELNKSTATE_2_DEVINS(pThis), pThis->uIsaIrq, fISR);
+        Log(("#%d IRQ=%d, state=%d\n", pThis->iInstance, pThis->uIsaIrq, fISR));
+        PDMDevHlpISASetIrq(pDevIns, pThis->uIsaIrq, fISR);
         pThis->fISR = fISR;
     }
@@ -594 +628 @@
  * Perform a software reset of the NIC.
  */
-static void elnkSoftReset(PELNKSTATE pThis)
-{
-    LogFlow(("#%d elnkSoftReset:\n", ELNK_INSTANCE));
+static void elnkSoftReset(PPDMDEVINS pDevIns, PELNKSTATE pThis)
+{
+    LogFlowFunc(("#%d:\n", pThis->iInstance));
 
     /* Clear some of the user-visible register state. */
@@ -614 +648 @@
     /* Clear internal interrupt state. */
     pThis->IntrStateReg = 0;
-    elnkUpdateIrq(pThis);
+    elnkUpdateIrq(pDevIns, pThis);
 
     /* Note that a soft reset does not clear the packet buffer; software often
@@ -630 +664 @@
 static DECLCALLBACK(void) elnkR3WakeupReceive(PPDMDEVINS pDevIns)
 {
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     STAM_COUNTER_INC(&pThis->StatRxOverflowWakeup);
     if (pThis->hEventOutOfRxSpace != NIL_RTSEMEVENT)
@@ -652 +686 @@
  * Write incoming data into the packet buffer.
  */
-static void elnkReceiveLocked(PELNKSTATE pThis, const uint8_t *src, size_t cbToRecv, bool fLoopback)
-{
-    PPDMDEVINS pDevIns = ELNKSTATE_2_DEVINS(pThis);
+static void elnkReceiveLocked(PPDMDEVINS pDevIns, PELNKSTATE pThis, const uint8_t *src, size_t cbToRecv, bool fLoopback)
+{
     int is_padr = 0, is_bcast = 0, is_mcast = 0;
     union {
@@ -704 +737 @@
     }
 
-    LogFlowFunc(("#%d: size on wire=%d, RCV ptr=%u\n", ELNK_INSTANCE, cbToRecv, pThis->uRCVBufPtr));
+    LogFlowFunc(("#%d: size on wire=%d, RCV ptr=%u\n", pThis->iInstance, cbToRecv, pThis->uRCVBufPtr));
 
     /*
@@ -718 +751 @@
         uint8_t     *dst = pThis->abPacketBuf + pThis->uRCVBufPtr;
 
-        Log2Func(("#%d Packet passed address filter (is_padr=%d, is_bcast=%d, is_mcast=%d), size=%d\n", ELNK_INSTANCE, cbToRecv, is_padr, is_bcast, is_mcast));
+        Log2Func(("#%d Packet passed address filter (is_padr=%d, is_bcast=%d, is_mcast=%d), size=%d\n", pThis->iInstance, cbToRecv, is_padr, is_bcast, is_mcast));
 
         /* Receive status is evaluated from scratch. The stale bit must remain set until we know better. */
@@ -752 +785 @@
             else
             {
-                LogFunc(("#%d runt, size=%d\n", ELNK_INSTANCE, cbToRecv));
+                LogFunc(("#%d runt, size=%d\n", pThis->iInstance, cbToRecv));
                 RcvStatNew.runt = 1;
             }
@@ -767 +800 @@
         else
         {
-            LogFunc(("#%d overflow, size=%d\n", ELNK_INSTANCE, cbToRecv));
+            LogFunc(("#%d overflow, size=%d\n", pThis->iInstance, cbToRecv));
             RcvStatNew.oflow = 1;
         }
@@ -773 +806 @@
         if (fLoopback && pThis->AuxCmd.xmit_bf)
         {
-            LogFunc(("#%d bad FCS\n", ELNK_INSTANCE));
+            LogFunc(("#%d bad FCS\n", pThis->iInstance));
             RcvStatNew.fcs = 1;
         }
@@ -817 +850 @@
         pThis->RcvStat = RcvStatNew;
 
-        LogFlowFunc(("#%d: RcvCmd=%02X, RcvStat=%02X, RCVBufPtr=%u\n", ELNK_INSTANCE, pThis->RcvCmdReg, pThis->RcvStatReg, pThis->uRCVBufPtr));
-        elnkUpdateIrq(pThis);
+        LogFlowFunc(("#%d: RcvCmd=%02X, RcvStat=%02X, RCVBufPtr=%u\n", pThis->iInstance, pThis->RcvCmdReg, pThis->RcvStatReg, pThis->uRCVBufPtr));
+        elnkUpdateIrq(pDevIns, pThis);
     }
 }
@@ -828 +861 @@
  * @returns VBox status code.  VERR_TRY_AGAIN is returned if we're busy.
  *
- * @param   pThis               The device instance data.
+ * @param   pDevIns             The device instance.
+ * @param   pThis               The EtherLink shared instance
+ *                              data.
+ * @param   pThisCC             The EtherLink state data for the
+ *                              current context.
  * @param   fOnWorkerThread     Whether we're on a worker thread or on an EMT.
  */
-static int elnkXmitBuffer(PELNKSTATE pThis, bool fOnWorkerThread)
+static int elnkXmitBuffer(PPDMDEVINS pDevIns, PELNKSTATE pThis, PELNKSTATECC pThisCC, bool fOnWorkerThread)
 {
     RT_NOREF_PV(fOnWorkerThread);
@@ -839 +876 @@
      * Grab the xmit lock of the driver as well as the 3C501 device state.
      */
-    PPDMINETWORKUP pDrv = pThis->CTX_SUFF(pDrv);
+    PPDMINETWORKUP pDrv = pThisCC->pDrv;
     if (pDrv)
     {
@@ -846 +883 @@
             return rc;
     }
-    PPDMDEVINS pDevIns = ELNKSTATE_2_DEVINS(pThis);
     rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
     if (RT_SUCCESS(rc))
@@ -854 +890 @@
          * Do the transmitting.
          */
-        int rc2 = elnkAsyncTransmit(pDevIns, pThis, false /*fOnWorkerThread*/);
+        int rc2 = elnkAsyncTransmit(pDevIns, pThis, pThisCC, false /*fOnWorkerThread*/);
         AssertReleaseRC(rc2);
 
@@ -879 +915 @@
 static DECLCALLBACK(void) elnkR3XmitTaskCallback(PPDMDEVINS pDevIns, void *pvUser)
 {
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PELNKSTATECC);
     NOREF(pvUser);
 
@@ -885 +922 @@
      * Transmit if we can.
      */
-    elnkXmitBuffer(pThis, true /*fOnWorkerThread*/);
+    elnkXmitBuffer(pDevIns, pThis, pThisCC, true /*fOnWorkerThread*/);
 }
 #endif /* IN_RING3 */
@@ -894 +931 @@
  *
  * @returns See PPDMINETWORKUP::pfnAllocBuf.
- * @param   pThis       The device instance.
+ * @param   pThis       The shared state data.
+ * @param   pThisCC     The current context state data.
  * @param   cbMin       The minimum buffer size.
  * @param   fLoopback   Set if we're in loopback mode.
@@ -901 +939 @@
  *                      Always set.
  */
-DECLINLINE(int) elnkXmitAllocBuf(PELNKSTATE pThis, size_t cbMin, bool fLoopback,
+DECLINLINE(int) elnkXmitAllocBuf(PELNKSTATE pThis, PELNKSTATECC pThisCC, size_t cbMin, bool fLoopback,
                                  PPDMSCATTERGATHER pSgLoop, PPPDMSCATTERGATHER ppSgBuf)
 {
@@ -908 +946 @@
     if (!fLoopback)
     {
-        PPDMINETWORKUP pDrv = pThis->CTX_SUFF(pDrv);
+        PPDMINETWORKUP pDrv = pThisCC->pDrv;
         if (RT_LIKELY(pDrv))
         {
@@ -946 +984 @@
  *
  * @returns See PDMINETWORKUP::pfnSendBuf.
- * @param   pThis           The device instance.
+ * @param   pDevIns         The device instance.
+ * @param   pThis           The shared EtherLink state data.
+ * @param   pThisCC         The current context state data.
  * @param   fLoopback       Set if we're in loopback mode.
  * @param   pSgBuf          The SG to send.
@@ -952 +992 @@
  *                          if an EMT.
  */
-DECLINLINE(int) elnkXmitSendBuf(PELNKSTATE pThis, bool fLoopback, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
+DECLINLINE(int) elnkXmitSendBuf(PPDMDEVINS pDevIns, PELNKSTATE pThis, PELNKSTATECC pThisCC, bool fLoopback, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
 {
     int rc;
@@ -962 +1002 @@
             pThis->Led.Asserted.s.fWriting = pThis->Led.Actual.s.fWriting = 1;
 
-        PPDMINETWORKUP pDrv = pThis->CTX_SUFF(pDrv);
+        PPDMINETWORKUP pDrv = pThisCC->pDrv;
         if (RT_LIKELY(pDrv))
         {
@@ -980 +1020 @@
         pThis->Led.Asserted.s.fReading = pThis->Led.Actual.s.fReading = 1;
 
-        LogFlowFunc(("#%d: loopback (%u bytes)\n", ELNK_INSTANCE, pSgBuf->cbUsed));
-        elnkReceiveLocked(pThis, pThis->abLoopBuf, pSgBuf->cbUsed, fLoopback);
+        LogFlowFunc(("#%d: loopback (%u bytes)\n", pThis->iInstance, pSgBuf->cbUsed));
+        elnkReceiveLocked(pDevIns, pThis, pThis->abLoopBuf, pSgBuf->cbUsed, fLoopback);
         pThis->Led.Actual.s.fReading = 0;
         rc = VINF_SUCCESS;
@@ -1004 +1044 @@
  * Try to transmit a frame.
  */
-static void elnkTransmit(PELNKSTATE pThis)
-{
+static void elnkTransmit(PPDMDEVINS pDevIns, PELNKSTATE pThis)
+{
+    PELNKSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PELNKSTATECC);
+
     /*
      * Transmit the packet if possible, defer it if we cannot do it
@@ -1011 +1053 @@
      */
 #if defined(IN_RING0) || defined(IN_RC)
-    if (!pThis->CTX_SUFF(pDrv))
-    {
-        int rc = PDMDevHlpTaskTrigger(pThis->CTX_SUFF(pDevIns), pThis->hXmitTask);
+    if (!pThisCC->pDrv)
+    {
+        int rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hXmitTask);
         AssertRC(rc);
     }
@@ -1019 +1061 @@
 #endif
     {
-        int rc = elnkXmitBuffer(pThis, false /*fOnWorkerThread*/);
+        int rc = elnkXmitBuffer(pDevIns, pThis, pThisCC, false /*fOnWorkerThread*/);
         if (rc == VERR_TRY_AGAIN)
             rc = VINF_SUCCESS;
@@ -1032 +1074 @@
  * @threads EMT.
  */
-static void elnkKickReceive(PELNKSTATE pThis)
+static void elnkKickReceive(PPDMDEVINS pDevIns, PELNKSTATE pThis)
 {
     /* Some drivers (e.g. NetWare IPX shell/ODI drivers) first go to receive mode through
@@ -1042 +1084 @@
         {
 #ifdef IN_RING3
-            elnkR3WakeupReceive(ELNKSTATE_2_DEVINS(pThis));
+            elnkR3WakeupReceive(pDevIns);
 #else
-            int rc = PDMDevHlpTaskTrigger(pThis->CTX_SUFF(pDevIns), pThis->hCanRxTask);
+            int rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hCanRxTask);
             AssertRC(rc);
 #endif
@@ -1057 +1099 @@
  * @threads TX or EMT.
  */
-static int elnkAsyncTransmit(PPDMDEVINS pDevIns, PELNKSTATE pThis, bool fOnWorkerThread)
+static int elnkAsyncTransmit(PPDMDEVINS pDevIns, PELNKSTATE pThis, PELNKSTATECC pThisCC, bool fOnWorkerThread)
 {
     Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
@@ -1067 +1109 @@
     if (RT_UNLIKELY(!pThis->AuxStat.xmit_bsy))
     {
-        LogFunc(("#%d: Nope, xmit disabled (fOnWorkerThread=%RTbool)\n", ELNK_INSTANCE, fOnWorkerThread));
+        LogFunc(("#%d: Nope, xmit disabled (fOnWorkerThread=%RTbool)\n", pThis->iInstance, fOnWorkerThread));
         return VINF_SUCCESS;
     }
@@ -1073 +1115 @@
     if (RT_UNLIKELY((pThis->AuxCmd.buf_ctl != EL_BCTL_XMT_RCV) && (pThis->AuxCmd.buf_ctl != EL_BCTL_LOOPBACK)))
     {
-        LogFunc(("#%d: Nope, not in xmit-then-receive or loopback state (fOnWorkerThread=%RTbool)\n", ELNK_INSTANCE, fOnWorkerThread));
+        LogFunc(("#%d: Nope, not in xmit-then-receive or loopback state (fOnWorkerThread=%RTbool)\n", pThis->iInstance, fOnWorkerThread));
         return VINF_SUCCESS;
     }
@@ -1099 +1141 @@
          */
         const unsigned cb = ELNK_BUF_SIZE - ELNK_GP(pThis); /* Packet size. */
-        Log(("#%d elnkAsyncTransmit: cb=%d\n", ELNK_INSTANCE, cb));
+        LogFunc(("#%d: cb=%d\n", pThis->iInstance, cb));
 
         pThis->XmitStatReg = 0; /* Clear transmit status before filling it out. */
@@ -1107 +1149 @@
             if (RT_LIKELY(cb <= MAX_FRAME))
             {
-                rc = elnkXmitAllocBuf(pThis, cb, fLoopback, &SgLoop, &pSgBuf);
+                rc = elnkXmitAllocBuf(pThis, pThisCC, cb, fLoopback, &SgLoop, &pSgBuf);
                 if (RT_SUCCESS(rc))
                 {
                     elnkXmitRead(pDevIns, pThis, cb, pSgBuf);
-                    rc = elnkXmitSendBuf(pThis, fLoopback, pSgBuf, fOnWorkerThread);
-                    Log2(("#%d elnkAsyncTransmit: rc=%Rrc\n", ELNK_INSTANCE, rc));
+                    rc = elnkXmitSendBuf(pDevIns, pThis, pThisCC, fLoopback, pSgBuf, fOnWorkerThread);
+                    Log2Func(("#%d: rc=%Rrc\n", pThis->iInstance, rc));
                 }
                 else if (rc == VERR_TRY_AGAIN)
                 {
                     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTransmit), a);
-                    Log(("#%d elnkAsyncTransmit: rc=%Rrc\n", ELNK_INSTANCE, rc));
+                    LogFunc(("#%d: rc=%Rrc\n", pThis->iInstance, rc));
                     return VINF_SUCCESS;
                 }
@@ -1129 +1171 @@
                 /* Signal error, as this violates the Ethernet specs. */
                 /** @todo check if the correct error is generated. */
-                LogRel(("3C501#%d: elnkAsyncTransmit: illegal giant frame (%u bytes) -> signalling error\n", ELNK_INSTANCE, cb));
+                LogRel(("3C501#%d: illegal giant frame (%u bytes) -> signalling error\n", pThis->iInstance, cb));
             }
         }
@@ -1135 +1177 @@
         {
             /* Signal a transmit error pretending there was a collision. */
+            pThis->cLinkDownReported++;
             pThis->XmitStat.coll = 1;
         }
@@ -1140 +1183 @@
         pThis->AuxStat.xmit_bsy    = 0;
         pThis->IntrState.xmit_intr = !!(pThis->XmitCmdReg & pThis->XmitStatReg);
-        LogFlowFunc(("#%d: XmitCmd=%02X, XmitStat=%02X\n", ELNK_INSTANCE, pThis->XmitCmdReg, pThis->XmitStatReg));
+        LogFlowFunc(("#%d: XmitCmd=%02X, XmitStat=%02X\n", pThis->iInstance, pThis->XmitCmdReg, pThis->XmitStatReg));
 
         /* NB: After a transmit, the GP Buffer Pointer points just past
          * the end of the packet buffer (3C501 diagnostics).
          */
-        pThis->uGPBufPtr           = ELNK_BUF_SIZE;
+        pThis->uGPBufPtr = ELNK_BUF_SIZE;
 
         /* NB: The buffer control does *not* change to Receive and stays the way it was. */
@@ -1151 +1194 @@
         {
             pThis->AuxStat.recv_bsy = 1;    /* Receive Busy now set until a packet is received. */
-            elnkKickReceive(pThis);
+            elnkKickReceive(pDevIns, pThis);
         }
     } while (0);    /* No loop, because there isn't ever more than one packet to transmit. */
 
-    elnkUpdateIrq(pThis);
+    elnkUpdateIrq(pDevIns, pThis);
 
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTransmit), a);
@@ -1165 +1208 @@
 
 
-static int elnkCsrWrite(PELNKSTATE pThis, uint8_t data)
+static int elnkCsrWrite(PPDMDEVINS pDevIns, PELNKSTATE pThis, uint8_t data)
 {
     int         rc = VINF_SUCCESS;
@@ -1187 +1230 @@
              * effect and will be overwritten when the card is taken out of reset.
              */
-            Log(("#%d elnkCsrWrite: Card going into reset\n", ELNK_INSTANCE));
+            LogFunc(("#%d: Card going into reset\n", pThis->iInstance));
             pThis->fInReset = true;
 
@@ -1199 +1242 @@
         {
             /* Card is being taken out of reset. */
-            Log(("#%d elnkCsrWrite: Card going out of reset\n", ELNK_INSTANCE));
+            LogFunc(("#%d: Card going out of reset\n", pThis->iInstance));
             STAM_COUNTER_INC(&pThis->StatResets);
-            elnkSoftReset(pThis);
+            elnkSoftReset(pDevIns, pThis);
         }
         pThis->AuxCmd.reset = val.reset;    /* Update the reset bit, if nothing else. */
@@ -1217 +1260 @@
         /* Start/stop DMA as requested. */
         pThis->fDMA = fDMAR;
-        PDMDevHlpDMASetDREQ(pThis->CTX_SUFF(pDevIns), pThis->uIsaDma, fDMAR);
+        PDMDevHlpDMASetDREQ(pDevIns, pThis->uIsaDma, fDMAR);
         if (fDMAR)
-            PDMDevHlpDMASchedule(pThis->CTX_SUFF(pDevIns));
-        Log(("3C501#%d: DMARQ for channel %u set to %u\n", ELNK_INSTANCE, pThis->uIsaDma, fDMAR));
+            PDMDevHlpDMASchedule(pDevIns);
+        Log(("3C501#%d: DMARQ for channel %u set to %u\n", pThis->iInstance, pThis->uIsaDma, fDMAR));
     }
 #else
@@ -1250 +1293 @@
 #ifdef LOG_ENABLED
         static const char   *apszBuffCntrl[4] = { "System", "Xmit then Recv", "Receive", "Loopback" };
-        Log(("3C501#%d: Packet buffer control `%s' -> `%s'\n", ELNK_INSTANCE, apszBuffCntrl[pThis->AuxCmd.buf_ctl], apszBuffCntrl[val.buf_ctl]));
+        Log(("3C501#%d: Packet buffer control `%s' -> `%s'\n", pThis->iInstance, apszBuffCntrl[pThis->AuxCmd.buf_ctl], apszBuffCntrl[val.buf_ctl]));
 #endif
         if (val.buf_ctl == EL_BCTL_XMT_RCV)
         {
             /* Transmit, then receive. */
-            Log2(("3C501#%d: Transmit %u bytes\n%Rhxs\nxmit_bsy=%u\n", ELNK_INSTANCE, ELNK_BUF_SIZE - pThis->uGPBufPtr, &pThis->abPacketBuf[pThis->uGPBufPtr], pThis->AuxStat.xmit_bsy));
+            Log2(("3C501#%d: Transmit %u bytes\n%Rhxs\nxmit_bsy=%u\n", pThis->iInstance, ELNK_BUF_SIZE - pThis->uGPBufPtr, &pThis->abPacketBuf[pThis->uGPBufPtr], pThis->AuxStat.xmit_bsy));
             fTransmit = true;
             pThis->AuxStat.recv_bsy = 0;
@@ -1290 +1333 @@
 
     /* There are multiple bits that affect interrupt state. Handle them now. */
-    elnkUpdateIrq(pThis);
+    elnkUpdateIrq(pDevIns, pThis);
 
     /* After fully updating register state, do a transmit (including loopback) or receive. */
     if (fTransmit)
-        elnkTransmit(pThis);
+        elnkTransmit(pDevIns, pThis);
     else if (fReceive)
     {
         pThis->AuxStat.recv_bsy = 1;    /* Receive Busy now set until a packet is received. */
-        elnkKickReceive(pThis);
+        elnkKickReceive(pDevIns, pThis);
     }
 
@@ -1304 +1347 @@
 }
 
-static int elIoWrite(PELNKSTATE pThis, uint32_t addr, uint32_t val)
+static int elIoWrite(PPDMDEVINS pDevIns, PELNKSTATE pThis, uint32_t addr, uint32_t val)
 {
     int     reg = addr & 0xf;
     int     rc = VINF_SUCCESS;
 
-    Log2(("#%d elIoWrite: addr=%#06x val=%#04x\n", ELNK_INSTANCE, addr, val & 0xff));
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
 
     switch (reg)
@@ -1329 +1372 @@
             /* If address filter just got enabled, receive may need a kick. */
             if (OldRcvCmd.adr_match == EL_ADRM_DISABLED && pThis->RcvCmd.adr_match != EL_ADRM_DISABLED)
-                elnkKickReceive(pThis);
+                elnkKickReceive(pDevIns, pThis);
             Log2(("Receive Command register set to %02X\n", pThis->RcvCmdReg));
             break;
@@ -1361 +1404 @@
 
         case 0x0e:  /* Auxiliary Command (CSR). */
-            rc = elnkCsrWrite(pThis, val);
+            rc = elnkCsrWrite(pDevIns, pThis, val);
             break;
 
@@ -1380 +1423 @@
 }
 
-static uint32_t elIoRead(PELNKSTATE pThis, uint32_t addr, int *pRC)
+static uint32_t elIoRead(PPDMDEVINS pDevIns, PELNKSTATE pThis, uint32_t addr, int *pRC)
 {
     uint32_t val = UINT32_MAX;
@@ -1395 +1438 @@
             pThis->RcvStat.stale = 1;       /* Allows further reception. */
             pThis->IntrState.recv_intr = 0; /* Reading clears receive interrupt. */
-            elnkUpdateIrq(pThis);
+            elnkUpdateIrq(pDevIns, pThis);
             break;
 
@@ -1404 +1447 @@
             val = pThis->XmitStatReg;
             pThis->IntrState.xmit_intr = 0; /* Reading clears transmit interrupt. */
-            elnkUpdateIrq(pThis);
+            elnkUpdateIrq(pDevIns, pThis);
             break;
 
@@ -1440 +1483 @@
     }
 
-    elnkUpdateIrq(pThis);
-
-    Log2(("#%d elIoRead: addr=%#06x val=%#04x\n", ELNK_INSTANCE, addr, val & 0xff));
+    elnkUpdateIrq(pDevIns, pThis);
+
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
     return val;
 }
@@ -1453 +1496 @@
 elnkIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE  pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     int         rc    = VINF_SUCCESS;
     uint8_t     u8Lo, u8Hi;
@@ -1463 +1506 @@
     {
         case 1:
-            *pu32 = elIoRead(pThis, Port, &rc);
+            *pu32 = elIoRead(pDevIns, pThis, Port, &rc);
             break;
         case 2:
             /* Manually split word access. */
-            u8Lo = elIoRead(pThis, Port + 0, &rc);
+            u8Lo = elIoRead(pDevIns, pThis, Port + 0, &rc);
             Assert(RT_SUCCESS(rc));
-            u8Hi = elIoRead(pThis, Port + 1, &rc);
+            u8Hi = elIoRead(pDevIns, pThis, Port + 1, &rc);
             Assert(RT_SUCCESS(rc));
             *pu32 = RT_MAKE_U16(u8Lo, u8Hi);
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "elnkIOPortRead: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2(("#%d elnkIOPortRead: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", ELNK_INSTANCE, Port, *pu32, cb, rc));
+    Log2Func(("#%d: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, *pu32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIORead), a);
     return rc;
@@ -1491 +1534 @@
 elnkIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    PELNKSTATE  pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE  pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     int         rc    = VINF_SUCCESS;
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatIOWrite), a);
@@ -1500 +1543 @@
     {
         case 1:
-            rc = elIoWrite(pThis, Port, RT_LOBYTE(u32));
+            rc = elIoWrite(pDevIns, pThis, Port, RT_LOBYTE(u32));
             break;
         case 2:
             /* Manually split word access. */
-            rc = elIoWrite(pThis, Port + 0, RT_LOBYTE(u32));
+            rc = elIoWrite(pDevIns, pThis, Port + 0, RT_LOBYTE(u32));
             if (!RT_SUCCESS(rc))
                 break;
-            rc = elIoWrite(pThis, Port + 1, RT_HIBYTE(u32));
+            rc = elIoWrite(pDevIns, pThis, Port + 1, RT_HIBYTE(u32));
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "elnkIOPortWrite: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2(("#%d elnkIOPortWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", ELNK_INSTANCE, Port, u32, cb, rc));
+    Log2Func(("#%d: Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, u32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIOWrite), a);
     return rc;
@@ -1566 +1609 @@
      * reading from the buffer.
      */
-    dma_mode = PDMDevHlpDMAGetChannelMode(pThis->CTX_SUFF(pDevIns), pThis->uIsaDma);
+    dma_mode = PDMDevHlpDMAGetChannelMode(pDevIns, pThis->uIsaDma);
     dma_type = GET_MODE_XTYP(dma_mode);
     LogFlowFunc(("dma_mode=%d, dma_type=%d, dma_pos=%u, dma_len=%u, GPBP=%u\n", dma_mode, dma_type, dma_pos, dma_len, pThis->uGPBufPtr));
@@ -1575 +1618 @@
     {
         /* Write transfer type. Reading from device, writing to memory. */
-        rc = PDMDevHlpDMAWriteMemory(pThis->CTX_SUFF(pDevIns), nchan,
+        rc = PDMDevHlpDMAWriteMemory(pDevIns, nchan,
                                      &pThis->abPacketBuf[ELNK_GP(pThis)],
                                      dma_pos, cbToXfer, &cbXferred);
@@ -1584 +1627 @@
     {
         /* Read of Verify transfer type. Reading from memory, writing to device. */
-        rc = PDMDevHlpDMAReadMemory(pThis->CTX_SUFF(pDevIns), nchan,
+        rc = PDMDevHlpDMAReadMemory(pDevIns, nchan,
                                     &pThis->abPacketBuf[ELNK_GP(pThis)],
                                     dma_pos, cbToXfer, &cbXferred);
@@ -1597 +1640 @@
     {
         Log2(("DMA completed\n"));
-        PDMDevHlpDMASetDREQ(pThis->CTX_SUFF(pDevIns), pThis->uIsaDma, 0);
+        PDMDevHlpDMASetDREQ(pDevIns, pThis->uIsaDma, 0);
         pThis->IntrState.dma_intr = 1;
         pThis->AuxStat.dma_done   = 1;
-        elnkUpdateIrq(pThis);
+        elnkUpdateIrq(pDevIns, pThis);
     }
     else
     {
         Log(("DMA continuing: GPBufPtr=%u, lastpos=%u, cbXferred=%u\n", pThis->uGPBufPtr, uLastPos, cbXferred));
-        PDMDevHlpDMASchedule(pThis->CTX_SUFF(pDevIns));
+        PDMDevHlpDMASchedule(pDevIns);
     }
 
@@ -1625 +1668 @@
 {
     RT_NOREF(pvUser);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     int         rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
@@ -1638 +1681 @@
         {
             LogRel(("3C501#%d: The link is back up again after the restore.\n",
-                    pDevIns->iInstance));
-            Log(("#%d elnkTimerRestore: Clearing ERR and CERR after load. cLinkDownReported=%d\n",
-                 pDevIns->iInstance, pThis->cLinkDownReported));
+                    pThis->iInstance));
+            LogFunc(("#%d: Clearing ERR and CERR after load. cLinkDownReported=%d\n",
+                 pThis->iInstance, pThis->cLinkDownReported));
             pThis->Led.Actual.s.fError = 0;
         }
@@ -1646 +1689 @@
     else
         Log(("#%d elnkTimerRestore: cLinkDownReported=%d, wait another 1500ms...\n",
-             pDevIns->iInstance, pThis->cLinkDownReported));
+             pThis->iInstance, pThis->cLinkDownReported));
 
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -1659 +1702 @@
 static DECLCALLBACK(void) elnkInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
-    PELNKSTATE          pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE          pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     bool                fStationAddr = false;
     bool                fRecvBuffer  = false;
@@ -1679 +1722 @@
      */
     pHlp->pfnPrintf(pHlp,
-                    "3C501 #%d: port=%RTiop IRQ=%u DMA=%u mac-cfg=%RTmac %s%s\n",
-                    pDevIns->iInstance,
+                    "3C501 #%d: port=%RTiop IRQ=%u DMA=%u mac-cfg=%RTmac%s%s %s\n",
+                    pThis->iInstance,
                     pThis->IOPortBase, pThis->uIsaIrq, pThis->uIsaDma, &pThis->MacConfigured,
-                    pDevIns->fRCEnabled ? " RC" : "", pDevIns->fR0Enabled ? " R0" : "");
+                    pDevIns->fRCEnabled ? " RC" : "", pDevIns->fR0Enabled ? " RZ" : "",
+                    pThis->fDriverAttached ? "attached" : "unattached!");
 
     int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_INTERNAL_ERROR); /* Take it here so we know why we're hanging... */
@@ -1689 +1733 @@
     pHlp->pfnPrintf(pHlp, "  GP Buf Ptr : %u (masked %u)\n", pThis->uGPBufPtr, ELNK_GP(pThis));
     pHlp->pfnPrintf(pHlp, "  RCV Buf Ptr: %u\n", pThis->uRCVBufPtr);
-    pHlp->pfnPrintf(pHlp, "  Recv Command: %02X   Recv Status: %02X\n", pThis->RcvCmdReg,  pThis->RcvStatReg);
-    pHlp->pfnPrintf(pHlp, "  Xmit Command: %02X   Xmit Status: %02X\n", pThis->XmitCmdReg, pThis->XmitStatReg);
-    pHlp->pfnPrintf(pHlp, "  Aux  Command: %02X   Aux  Status: %02X\n", pThis->AuxCmdReg,  pThis->AuxStatReg);
+    pHlp->pfnPrintf(pHlp, "  Recv Command: %02X  Recv Status: %02X\n", pThis->RcvCmdReg,  pThis->RcvStatReg);
+    pHlp->pfnPrintf(pHlp, "  Xmit Command: %02X  Xmit Status: %02X\n", pThis->XmitCmdReg, pThis->XmitStatReg);
+    pHlp->pfnPrintf(pHlp, "  Aux  Command: %02X  Aux  Status: %02X\n", pThis->AuxCmdReg,  pThis->AuxStatReg);
 
     pHlp->pfnPrintf(pHlp, "  Address matching: %s\n", apszAddrMatch[pThis->RcvCmd.adr_match]);
     pHlp->pfnPrintf(pHlp, "  Buffer control  : %s\n", apszBuffCntrl[pThis->AuxCmd.buf_ctl]);
     pHlp->pfnPrintf(pHlp, "  Interrupt state : xmit=%u recv=%u dma=%u\n", pThis->IntrState.xmit_intr, pThis->IntrState.recv_intr, pThis->IntrState.dma_intr);
+    if (pThis->cLinkDownReported)
+        pHlp->pfnPrintf(pHlp, "  Link down count : %d\n", pThis->cLinkDownReported);
 
     /* Dump the station address. */
@@ -1730 +1776 @@
 
 
-static void elnkR3HardReset(PELNKSTATE pThis)
-{
-    LogFlow(("#%d elnkHardReset:\n", ELNK_INSTANCE));
+static void elnkR3HardReset(PPDMDEVINS pDevIns, PELNKSTATE pThis)
+{
+    LogFlowFunc(("#%d:\n", pThis->iInstance));
 
     /* Initialize the PROM */
@@ -1747 +1793 @@
     pThis->uRCVBufPtr = 0;
 
-    elnkSoftReset(pThis);
+    elnkSoftReset(pDevIns, pThis);
 }
 
@@ -1759 +1805 @@
  * renegotiate any DHCP lease.
  *
+ * @param  pDevIns      The device instance.
  * @param  pThis        The device instance data.
  */
-static void elnkTempLinkDown(PELNKSTATE pThis)
+static void elnkTempLinkDown(PPDMDEVINS pDevIns, PELNKSTATE pThis)
 {
     if (pThis->fLinkUp)
@@ -1768 +1815 @@
         pThis->cLinkDownReported = 0;
         pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
-        int rc = PDMDevHlpTimerSetMillies(ELNKSTATE_2_DEVINS(pThis), pThis->hTimerRestore, pThis->cMsLinkUpDelay);
+        int rc = PDMDevHlpTimerSetMillies(pDevIns, pThis->hTimerRestore, pThis->cMsLinkUpDelay);
         AssertRC(rc);
     }
@@ -1782 +1829 @@
 {
     RT_NOREF(uPass);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     pDevIns->pHlpR3->pfnSSMPutMem(pSSM, &pThis->MacConfigured, sizeof(pThis->MacConfigured));
     return VINF_SSM_DONT_CALL_AGAIN;
@@ -1795 +1842 @@
 {
     RT_NOREF(pSSM);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
 
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
@@ -1810 +1857 @@
 static DECLCALLBACK(int) elnkSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PELNKSTATE      pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
 
@@ -1838 +1885 @@
 static DECLCALLBACK(int) elnkLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     RT_NOREF(pSSM);
 
@@ -1855 +1902 @@
 static DECLCALLBACK(int) elnkLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PELNKSTATE      pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
-    PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PELNKSTATECC);
+    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
 
     if (   SSM_VERSION_MAJOR_CHANGED(uVersion, ELNK_SAVEDSTATE_VERSION)
@@ -1887 +1935 @@
     if (    memcmp(&Mac, &pThis->MacConfigured, sizeof(Mac))
         && (uPass == 0 || !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns)) )
-        LogRel(("3C501#%u: The mac address differs: config=%RTmac saved=%RTmac\n", ELNK_INSTANCE, &pThis->MacConfigured, &Mac));
+        LogRel(("3C501#%u: The mac address differs: config=%RTmac saved=%RTmac\n", pThis->iInstance, &pThis->MacConfigured, &Mac));
 
     if (uPass == SSM_PASS_FINAL)
     {
         /* update promiscuous mode. */
-        if (pThis->pDrvR3)
-            pThis->pDrvR3->pfnSetPromiscuousMode(pThis->pDrvR3, 0 /* promiscuous enabled */);
+        if (pThisCC->pDrv)
+            pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, 0 /* promiscuous enabled */);
 
         /* Indicate link down to the guest OS that all network connections have
            been lost, unless we've been teleported here. */
         if (!PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns))
-            elnkTempLinkDown(pThis);
+            elnkTempLinkDown(pDevIns, pThis);
     }
 
@@ -1914 +1962 @@
  *
  * @returns VBox status code.
- * @param   pThis           The device instance data.
- */
-static int elnkCanReceive(PELNKSTATE pThis)
-{
-    PPDMDEVINS pDevIns = ELNKSTATE_2_DEVINS(pThis);
+ * @param   pDevIns         The device instance data.
+ * @param   pThis           The shared instance data.
+ */
+static int elnkCanReceive(PPDMDEVINS pDevIns, PELNKSTATE pThis)
+{
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
@@ -1959 +2007 @@
 static DECLCALLBACK(int) elnkNet_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, INetworkDown);
-    PPDMDEVINS pDevIns = ELNKSTATE_2_DEVINS(pThis);
-
-    int rc = elnkCanReceive(pThis);
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, INetworkDown);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+
+    int rc = elnkCanReceive(pDevIns, pThis);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
@@ -1972 +2021 @@
     STAM_PROFILE_START(&pThis->StatRxOverflow, a);
     VMSTATE enmVMState;
-    while (RT_LIKELY(   (enmVMState = PDMDevHlpVMState(pThis->CTX_SUFF(pDevIns))) == VMSTATE_RUNNING
+    while (RT_LIKELY(   (enmVMState = PDMDevHlpVMState(pDevIns)) == VMSTATE_RUNNING
                      || enmVMState == VMSTATE_RUNNING_LS))
     {
-        int rc2 = elnkCanReceive(pThis);
+        int rc2 = elnkCanReceive(pDevIns, pThis);
         if (RT_SUCCESS(rc2))
         {
@@ -1981 +2030 @@
             break;
         }
-        LogFlow(("elnkNet_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
+        LogFlowFunc(("waiting cMillies=%u...\n", cMillies));
 
         /* Start the poll timer once which will remain active as long fMaybeOutOfSpace
@@ -2002 +2051 @@
 static DECLCALLBACK(int) elnkNet_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
 {
-    PELNKSTATE  pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, INetworkDown);
-    PPDMDEVINS  pDevIns = ELNKSTATE_2_DEVINS(pThis);
-    int         rc;
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, INetworkDown);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    int             rc;
 
     STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
@@ -2012 +2062 @@
     if (cb > 50) /* unqualified guess */
         pThis->Led.Asserted.s.fReading = pThis->Led.Actual.s.fReading = 1;
-    elnkReceiveLocked(pThis, (const uint8_t *)pvBuf, cb, false);
+    elnkReceiveLocked(pDevIns, pThis, (const uint8_t *)pvBuf, cb, false);
     pThis->Led.Actual.s.fReading = 0;
 
@@ -2027 +2077 @@
 static DECLCALLBACK(void) elnkNet_XmitPending(PPDMINETWORKDOWN pInterface)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, INetworkDown);
-    elnkXmitBuffer(pThis, true /*fOnWorkerThread*/);
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, INetworkDown);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+
+    elnkXmitBuffer(pDevIns, pThis, pThisCC, true /*fOnWorkerThread*/);
 }
 
@@ -2039 +2092 @@
 static DECLCALLBACK(int) elnkGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, INetworkConfig);
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, INetworkConfig);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+
+    LogFlowFunc(("#%d\n", pThis->iInstance));
     /// @todo This is broken!! We can't properly get the MAC address set by the guest
 #if 0
@@ -2055 +2112 @@
 static DECLCALLBACK(PDMNETWORKLINKSTATE) elnkGetLinkState(PPDMINETWORKCONFIG pInterface)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, INetworkConfig);
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, INetworkConfig);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+
     if (pThis->fLinkUp && !pThis->fLinkTempDown)
         return PDMNETWORKLINKSTATE_UP;
@@ -2072 +2132 @@
 static DECLCALLBACK(int) elnkSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, INetworkConfig);
-    bool fLinkUp;
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, INetworkConfig);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    bool            fLinkUp;
 
     AssertMsgReturn(enmState > PDMNETWORKLINKSTATE_INVALID && enmState <= PDMNETWORKLINKSTATE_DOWN_RESUME,
@@ -2080 +2142 @@
     if (enmState == PDMNETWORKLINKSTATE_DOWN_RESUME)
     {
-        elnkTempLinkDown(pThis);
+        elnkTempLinkDown(pDevIns, pThis);
         /*
          * Note that we do not notify the driver about the link state change because
@@ -2099 +2161 @@
             pThis->cLinkDownReported = 0;
             pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
-            int rc = PDMDevHlpTimerSetMillies(ELNKSTATE_2_DEVINS(pThis), pThis->hTimerRestore, pThis->cMsLinkUpDelay);
+            int rc = PDMDevHlpTimerSetMillies(pDevIns, pThis->hTimerRestore, pThis->cMsLinkUpDelay);
             AssertRC(rc);
         }
@@ -2108 +2170 @@
             pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
         }
-        Assert(!PDMDevHlpCritSectIsOwner(ELNKSTATE_2_DEVINS(pThis), &pThis->CritSect));
-        if (pThis->pDrvR3)
-            pThis->pDrvR3->pfnNotifyLinkChanged(pThis->pDrvR3, enmState);
+        Assert(!PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
+        if (pThisCC->pDrv)
+            pThisCC->pDrv->pfnNotifyLinkChanged(pThisCC->pDrv, enmState);
     }
     return VINF_SUCCESS;
@@ -2123 +2185 @@
 static DECLCALLBACK(int) elnkQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, ILeds);
+    PELNKSTATECC    pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, ILeds);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     if (iLUN == 0)
     {
@@ -2140 +2204 @@
 static DECLCALLBACK(void *) elnkQueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
 {
-    PELNKSTATE pThis = RT_FROM_MEMBER(pInterface, ELNKSTATE, IBase);
-    Assert(&pThis->IBase == pInterface);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThis->INetworkDown);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThis->INetworkConfig);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMILEDPORTS, &pThis->ILeds);
+    PELNKSTATECC pThisCC = RT_FROM_MEMBER(pInterface, ELNKSTATECC, IBase);
+    Assert(&pThisCC->IBase == pInterface);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThisCC->IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThisCC->INetworkDown);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThisCC->INetworkConfig);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMILEDPORTS, &pThisCC->ILeds);
     return NULL;
 }
@@ -2155 +2219 @@
  * @interface_method_impl{PDMDEVREG,pfnPowerOff}
  */
-static DECLCALLBACK(void) elnkPowerOff(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) elnkR3PowerOff(PPDMDEVINS pDevIns)
 {
     /* Poke thread waiting for buffer space. */
@@ -2167 +2231 @@
  * One port on the network card has been disconnected from the network.
  */
-static DECLCALLBACK(void) elnkDetach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
-{
+static DECLCALLBACK(void) elnkR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
+{
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PELNKSTATECC);
     RT_NOREF(fFlags);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
-    Log(("#%d elnkDetach:\n", ELNK_INSTANCE));
+    LogFlowFunc(("#%d:\n", pThis->iInstance));
 
     AssertLogRelReturnVoid(iLUN == 0);
@@ -2181 +2246 @@
      * Zero some important members.
      */
-    pThis->pDrvBase = NULL;
-    pThis->pDrvR3 = NULL;
-    pThis->pDrvR0 = NIL_RTR0PTR;
-    pThis->pDrvRC = NIL_RTRCPTR;
+    pThis->fDriverAttached = false;
+    pThisCC->pDrvBase = NULL;
+    pThisCC->pDrv     = NULL;
 
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -2194 +2258 @@
  * One port on the network card has been connected to a network.
  */
-static DECLCALLBACK(int) elnkAttach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
-{
+static DECLCALLBACK(int) elnkR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
+{
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PELNKSTATECC);
     RT_NOREF(fFlags);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
-    LogFlow(("#%d elnkAttach:\n", ELNK_INSTANCE));
+    LogFlowFunc(("#%d:\n", pThis->iInstance));
 
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
@@ -2208 +2273 @@
      * Attach the driver.
      */
-    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Network Port");
+    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThisCC->IBase, &pThisCC->pDrvBase, "Network Port");
     if (RT_SUCCESS(rc))
     {
-        pThis->pDrvR3 = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKUP);
-        AssertMsgStmt(pThis->pDrvR3, ("Failed to obtain the PDMINETWORKUP interface!\n"),
+        pThisCC->pDrv = PDMIBASE_QUERY_INTERFACE(pThisCC->pDrvBase, PDMINETWORKUP);
+        AssertMsgStmt(pThisCC->pDrv, ("Failed to obtain the PDMINETWORKUP interface!\n"),
                       rc = VERR_PDM_MISSING_INTERFACE_BELOW);
-        pThis->pDrvR0 = PDMIBASER0_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASER0), PDMINETWORKUP);
-        pThis->pDrvRC = PDMIBASERC_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASERC), PDMINETWORKUP);
+        pThis->fDriverAttached = true;
     }
     else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
@@ -2222 +2286 @@
         /* This should never happen because this function is not called
          * if there is no driver to attach! */
-        Log(("#%d No attached driver!\n", ELNK_INSTANCE));
+        Log(("#%d: No attached driver!\n", pThis->iInstance));
     }
 
@@ -2231 +2295 @@
      */
     if (RT_SUCCESS(rc))
-        elnkTempLinkDown(pThis);
+        elnkTempLinkDown(pDevIns, pThis);
 
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -2241 +2305 @@
  * @interface_method_impl{PDMDEVREG,pfnSuspend}
  */
-static DECLCALLBACK(void) elnkSuspend(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) elnkR3Suspend(PPDMDEVINS pDevIns)
 {
     /* Poke thread waiting for buffer space. */
@@ -2251 +2315 @@
  * @interface_method_impl{PDMDEVREG,pfnReset}
  */
-static DECLCALLBACK(void) elnkReset(PPDMDEVINS pDevIns)
-{
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+static DECLCALLBACK(void) elnkR3Reset(PPDMDEVINS pDevIns)
+{
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
     if (pThis->fLinkTempDown)
     {
@@ -2262 +2326 @@
 
     /** @todo How to flush the queues? */
-    elnkR3HardReset(pThis);
+    elnkR3HardReset(pDevIns, pThis);
 }
 
@@ -2269 +2333 @@
  * @interface_method_impl{PDMDEVREG,pfnRelocate}
  */
-static DECLCALLBACK(void) elnkRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
-{
-    RT_NOREF(offDelta);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
-    pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+static DECLCALLBACK(void) elnkR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+{
+    PELNKSTATERC pThisRC = PDMINS_2_DATA_RC(pDevIns, PELNKSTATERC);
+    pThisRC->pDrv += offDelta;
 }
 
@@ -2280 +2343 @@
  * @interface_method_impl{PDMDEVREG,pfnDestruct}
  */
-static DECLCALLBACK(int) elnkDestruct(PPDMDEVINS pDevIns)
+static DECLCALLBACK(int) elnkR3Destruct(PPDMDEVINS pDevIns)
 {
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
-    PELNKSTATE pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
 
     if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->CritSect))
@@ -2299 +2362 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int) elnkConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int) elnkR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    PELNKSTATE      pThis = PDMINS_2_DATA(pDevIns, PELNKSTATE);
-    PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
+    PELNKSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PELNKSTATE);
+    PELNKSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PELNKSTATECC);
+    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
     PPDMIBASE       pBase;
     char            szTmp[128];
@@ -2314 +2378 @@
     pThis->hEventOutOfRxSpace   = NIL_RTSEMEVENT;
     pThis->hIoPortsIsa          = NIL_IOMIOPORTHANDLE;
+    pThisCC->pDevIns            = pDevIns;
 
     /*
@@ -2367 +2432 @@
      * Initialize data (most of it anyway).
      */
-    pThis->pDevInsR3                        = pDevIns;
-    pThis->pDevInsR0                        = PDMDEVINS_2_R0PTR(pDevIns);
-    pThis->pDevInsRC                        = PDMDEVINS_2_RCPTR(pDevIns);
-    pThis->Led.u32Magic                     = PDMLED_MAGIC;
+    pThis->Led.u32Magic                       = PDMLED_MAGIC;
     /* IBase */
-    pThis->IBase.pfnQueryInterface          = elnkQueryInterface;
+    pThisCC->IBase.pfnQueryInterface          = elnkQueryInterface;
     /* INetworkPort */
-    pThis->INetworkDown.pfnWaitReceiveAvail = elnkNet_WaitReceiveAvail;
-    pThis->INetworkDown.pfnReceive          = elnkNet_Receive;
-    pThis->INetworkDown.pfnXmitPending      = elnkNet_XmitPending;
+    pThisCC->INetworkDown.pfnWaitReceiveAvail = elnkNet_WaitReceiveAvail;
+    pThisCC->INetworkDown.pfnReceive          = elnkNet_Receive;
+    pThisCC->INetworkDown.pfnXmitPending      = elnkNet_XmitPending;
     /* INetworkConfig */
-    pThis->INetworkConfig.pfnGetMac         = elnkGetMac;
-    pThis->INetworkConfig.pfnGetLinkState   = elnkGetLinkState;
-    pThis->INetworkConfig.pfnSetLinkState   = elnkSetLinkState;
+    pThisCC->INetworkConfig.pfnGetMac         = elnkGetMac;
+    pThisCC->INetworkConfig.pfnGetLinkState   = elnkGetLinkState;
+    pThisCC->INetworkConfig.pfnSetLinkState   = elnkSetLinkState;
     /* ILeds */
-    pThis->ILeds.pfnQueryStatusLed          = elnkQueryStatusLed;
+    pThisCC->ILeds.pfnQueryStatusLed          = elnkQueryStatusLed;
 
     /*
@@ -2445 +2507 @@
      * Register the info item.
      */
-    RTStrPrintf(szTmp, sizeof(szTmp), "elnk%d", pDevIns->iInstance);
+    RTStrPrintf(szTmp, sizeof(szTmp), "elnk%d", pThis->iInstance);
     PDMDevHlpDBGFInfoRegister(pDevIns, szTmp, "3C501 info", elnkInfo);
 
@@ -2451 +2513 @@
      * Attach status driver (optional).
      */
-    rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThis->IBase, &pBase, "Status Port");
+    rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThisCC->IBase, &pBase, "Status Port");
     if (RT_SUCCESS(rc))
         pThis->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
@@ -2464 +2526 @@
      * Attach driver.
      */
-    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Network Port");
+    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThisCC->IBase, &pThisCC->pDrvBase, "Network Port");
     if (RT_SUCCESS(rc))
     {
-        pThis->pDrvR3 = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKUP);
-        AssertMsgReturn(pThis->pDrvR3, ("Failed to obtain the PDMINETWORKUP interface!\n"),
+        pThisCC->pDrv = PDMIBASE_QUERY_INTERFACE(pThisCC->pDrvBase, PDMINETWORKUP);
+        AssertMsgReturn(pThisCC->pDrv, ("Failed to obtain the PDMINETWORKUP interface!\n"),
                         VERR_PDM_MISSING_INTERFACE_BELOW);
-        pThis->pDrvR0 = PDMIBASER0_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASER0), PDMINETWORKUP);
-        pThis->pDrvRC = PDMIBASERC_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASERC), PDMINETWORKUP);
+        pThis->fDriverAttached = true;
     }
     else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
@@ -2485 +2546 @@
      * Reset the device state. (Do after attaching.)
      */
-    elnkR3HardReset(pThis);
+    elnkR3HardReset(pDevIns, pThis);
 
     /*
@@ -2562 +2623 @@
     /* .uSharedVersion = */         42,
     /* .cbInstanceShared = */       sizeof(ELNKSTATE),
-    /* .cbInstanceCC = */           0,
-    /* .cbInstanceRC = */           0,
+    /* .cbInstanceCC = */           sizeof(ELNKSTATECC),
+    /* .cbInstanceRC = */           sizeof(ELNKSTATERC),
     /* .cMaxPciDevices = */         0,
     /* .cMaxMsixVectors = */        0,
@@ -2570 +2631 @@
     /* .pszRCMod = */               "VBoxDDRC.rc",
     /* .pszR0Mod = */               "VBoxDDR0.r0",
-    /* .pfnConstruct = */           elnkConstruct,
-    /* .pfnDestruct = */            elnkDestruct,
-    /* .pfnRelocate = */            elnkRelocate,
+    /* .pfnConstruct = */           elnkR3Construct,
+    /* .pfnDestruct = */            elnkR3Destruct,
+    /* .pfnRelocate = */            elnkR3Relocate,
     /* .pfnMemSetup = */            NULL,
     /* .pfnPowerOn = */             NULL,
-    /* .pfnReset = */               elnkReset,
-    /* .pfnSuspend = */             elnkSuspend,
+    /* .pfnReset = */               elnkR3Reset,
+    /* .pfnSuspend = */             elnkR3Suspend,
     /* .pfnResume = */              NULL,
-    /* .pfnAttach = */              elnkAttach,
-    /* .pfnDetach = */              elnkDetach,
+    /* .pfnAttach = */              elnkR3Attach,
+    /* .pfnDetach = */              elnkR3Detach,
     /* .pfnQueryInterface = */      NULL,
     /* .pfnInitComplete = */        NULL,
-    /* .pfnPowerOff = */            elnkPowerOff,
+    /* .pfnPowerOff = */            elnkR3PowerOff,
     /* .pfnSoftReset = */           NULL,
     /* .pfnReserved0 = */           NULL,

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

@@ -355 +355 @@
 /** Maximum frame size we handle */
 #define MAX_FRAME                       1536
-
-#define DPNICSTATE_2_DEVINS(pThis)      ((pThis)->CTX_SUFF(pDevIns))
-#define DPNIC_INSTANCE                  (DPNICSTATE_2_DEVINS(pThis)->iInstance)
 
 /* Size of the local RAM. */
@@ -831 +828 @@
 /**
  * DP8390-based card state.
- *
- * @extends     PDMPCIDEV
- * @implements  PDMIBASE
- * @implements  PDMINETWORKDOWN
- * @implements  PDMINETWORKCONFIG
- * @implements  PDMILEDPORTS
  */
 typedef struct DPNICSTATE
 {
-    /** Pointer to the device instance - R3. */
-    PPDMDEVINSR3                        pDevInsR3;
-    /** Pointer to the connector of the attached network driver - R3. */
-    PPDMINETWORKUPR3                    pDrvR3;
-    /** Pointer to the attached network driver. */
-    R3PTRTYPE(PPDMIBASE)                pDrvBase;
-    /** LUN\#0 + status LUN: The base interface. */
-    PDMIBASE                            IBase;
-    /** LUN\#0: The network port interface. */
-    PDMINETWORKDOWN                     INetworkDown;
-    /** LUN\#0: The network config port interface. */
-    PDMINETWORKCONFIG                   INetworkConfig;
     /** Restore timer.
      *  This is used to disconnect and reconnect the link after a restore. */
     TMTIMERHANDLE                       hTimerRestore;
-
-    /** Pointer to the device instance - R0. */
-    PPDMDEVINSR0                        pDevInsR0;
-    /** Receive signaller - R0. */
-    PPDMINETWORKUPR0                    pDrvR0;
-
-    /** Pointer to the device instance - RC. */
-    PPDMDEVINSRC                        pDevInsRC;
-    /** Receive signaller - RC. */
-    PPDMINETWORKUPRC                    pDrvRC;
 
     /** Transmit signaller. */
@@ -921 +890 @@
     RTMAC                               MacConfigured;
 
+    /** Set if DPNICSTATER3::pDrv is not NULL. */
+    bool                                fDriverAttached;
     /** The LED. */
     PDMLED                              Led;
@@ -983 +954 @@
 
 
+/**
+ * DP8390 state for ring-3.
+ *
+ * @implements  PDMIBASE
+ * @implements  PDMINETWORKDOWN
+ * @implements  PDMINETWORKCONFIG
+ * @implements  PDMILEDPORTS
+ */
+typedef struct DPNICSTATER3
+{
+    /** Pointer to the device instance. */
+    PPDMDEVINSR3                        pDevIns;
+    /** Pointer to the connector of the attached network driver. */
+    PPDMINETWORKUPR3                    pDrv;
+    /** Pointer to the attached network driver. */
+    R3PTRTYPE(PPDMIBASE)                pDrvBase;
+    /** LUN\#0 + status LUN: The base interface. */
+    PDMIBASE                            IBase;
+    /** LUN\#0: The network port interface. */
+    PDMINETWORKDOWN                     INetworkDown;
+    /** LUN\#0: The network config port interface. */
+    PDMINETWORKCONFIG                   INetworkConfig;
+
+    /** Status LUN: The LED ports. */
+    PDMILEDPORTS                        ILeds;
+    /** Partner of ILeds. */
+    R3PTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
+} DPNICSTATER3;
+/** Pointer to a DP8390 state structure for ring-3. */
+typedef DPNICSTATER3 *PDPNICSTATER3;
+
+
+/**
+ * DP8390 state for ring-0.
+ */
+typedef struct DPNICSTATER0
+{
+    /** Pointer to the connector of the attached network driver. */
+    PPDMINETWORKUPR0                    pDrv;
+} DPNICSTATER0;
+/** Pointer to a DP8390 state structure for ring-0. */
+typedef DPNICSTATER0 *PDPNICSTATER0;
+
+
+/**
+ * DP8390 state for raw-mode.
+ */
+typedef struct DPNICSTATERC
+{
+    /** Pointer to the connector of the attached network driver. */
+    PPDMINETWORKUPRC                    pDrv;
+} DPNICSTATERC;
+/** Pointer to a DP8390 state structure for raw-mode. */
+typedef DPNICSTATERC *PDPNICSTATERC;
+
+
+/** The DP8390 state structure for the current context. */
+typedef CTX_SUFF(DPNICSTATE) DPNICSTATECC;
+/** Pointer to a DP8390 state structure for the current
+ *  context. */
+typedef CTX_SUFF(PDPNICSTATE) PDPNICSTATECC;
+
+
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
@@ -990 +1024 @@
 *********************************************************************************************************************************/
 
-static int dp8390CoreAsyncXmitLocked(PDPNICSTATE pThis, bool fOnWorkerThread);
+static int dp8390CoreAsyncXmitLocked(PPDMDEVINS pDevIns, PDPNICSTATE pThis, PDPNICSTATECC pThisCC, bool fOnWorkerThread);
 
 /**
@@ -999 +1033 @@
 DECLINLINE(bool) dp8390IsLinkUp(PDPNICSTATE pThis)
 {
-    return pThis->pDrvR3 && !pThis->fLinkTempDown && pThis->fLinkUp;
+    return pThis->fDriverAttached && !pThis->fLinkTempDown && pThis->fLinkUp;
 }
 
@@ -1184 +1218 @@
  * Update the device IRQ line based on internal state.
  */
-static void dp8390CoreUpdateIrq(PDPNICSTATE pThis)
+static void dp8390CoreUpdateIrq(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     bool     fCoreIrqActive = false;
@@ -1207 +1241 @@
     fNicIrqActive = (fCoreIrqActive && !pThis->ga.gacfr.nim) || (pThis->ga.streg.dtc && !pThis->ga.gacfr.tcm);
 
-    Log2Func(("#%d set irq fNicIrqActive=%d (fCoreIrqActive=%d, fGaIrq=%d)\n", DPNIC_INSTANCE, fNicIrqActive, fCoreIrqActive, pThis->ga.fGaIrq));
+    Log2Func(("#%d set irq fNicIrqActive=%d (fCoreIrqActive=%d, fGaIrq=%d)\n", pThis->iInstance, fNicIrqActive, fCoreIrqActive, pThis->ga.fGaIrq));
 
     /* The IRQ line typically does not change. */
     if (RT_UNLIKELY(fNicIrqActive != pThis->fNicIrqActive))
     {
-        LogFunc(("#%d IRQ=%d, state=%d\n", DPNIC_INSTANCE, pThis->uIsaIrq, fNicIrqActive));
+        LogFunc(("#%d IRQ=%d, state=%d\n", pThis->iInstance, pThis->uIsaIrq, fNicIrqActive));
         /// @todo Handle IRQ 2/9 elsewhere
-        PDMDevHlpISASetIrq(DPNICSTATE_2_DEVINS(pThis), pThis->uIsaIrq == 2 ? 9 : pThis->uIsaIrq, fNicIrqActive);
+        PDMDevHlpISASetIrq(pDevIns, pThis->uIsaIrq == 2 ? 9 : pThis->uIsaIrq, fNicIrqActive);
         pThis->fNicIrqActive = fNicIrqActive;
     }
@@ -1224 +1258 @@
  * Perform a software reset of the NIC.
  */
-static void dp8390CoreReset(PDPNICSTATE pThis)
-{
-    LogFlowFunc(("#%d:\n", DPNIC_INSTANCE));
+static void dp8390CoreReset(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
+{
+    LogFlowFunc(("#%d:\n", pThis->iInstance));
 
     /* DP8390 or DP83901A datasheet, section 11.0. */
@@ -1243 +1277 @@
 
     /* Make sure the IRQ line us updated. */
-    dp8390CoreUpdateIrq(pThis);
+    dp8390CoreUpdateIrq(pDevIns, pThis);
 }
 
 #ifdef IN_RING3
 
-static DECLCALLBACK(void) dp8390WakeupReceive(PPDMDEVINS pDevIns)
-{
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
-    LogFlowFunc(("#%d\n", DPNIC_INSTANCE));
+static DECLCALLBACK(void) dp8390R3WakeupReceive(PPDMDEVINS pDevIns)
+{
+    PDPNICSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    LogFlowFunc(("#%d\n", pThis->iInstance));
     STAM_COUNTER_INC(&pThis->StatRxOverflowWakeup);
     if (pThis->hEventOutOfRxSpace != NIL_RTSEMEVENT)
@@ -1264 +1298 @@
 {
     RT_NOREF(pvUser);
-    dp8390WakeupReceive(pDevIns);
+    dp8390R3WakeupReceive(pDevIns);
 }
 
@@ -1276 +1310 @@
     if ((RT_LOBYTE(addr) + cb) > 256)
     {
-        LogFunc(("#%d: addr=%04X, cb=%X, cb!!\n", DPNIC_INSTANCE, addr, cb));
+        LogFunc(("#%d: addr=%04X, cb=%X, cb!!\n", pThis->iInstance, addr, cb));
         cb = 256 - RT_LOBYTE(addr);
     }
@@ -1292 +1326 @@
         }
         else
-            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else if (pThis->uDevType == DEV_NE2000)
@@ -1305 +1339 @@
         }
         else
-            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else if ((pThis->uDevType == DEV_WD8003) || (pThis->uDevType == DEV_WD8013))
@@ -1314 +1348 @@
             memcpy(pDst, &pThis->abLocalRAM[addr], cb);
         else
-            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else if (pThis->uDevType == DEV_3C503)
@@ -1328 +1362 @@
         }
         else
-            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring read at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else
@@ -1346 +1380 @@
     if ((RT_LOBYTE(addr) + cb) > 256)
     {
-        LogFunc(("#%d: addr=%04X, cb=%X, cb!!\n", DPNIC_INSTANCE, addr, cb));
+        LogFunc(("#%d: addr=%04X, cb=%X, cb!!\n", pThis->iInstance, addr, cb));
         cb = 256 - RT_LOBYTE(addr);
     }
@@ -1362 +1396 @@
         }
         else
-            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else if (pThis->uDevType == DEV_NE2000)
@@ -1375 +1409 @@
         }
         else
-            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else if ((pThis->uDevType == DEV_WD8003) || (pThis->uDevType == DEV_WD8013))
@@ -1384 +1418 @@
             memcpy(&pThis->abLocalRAM[addr], pSrc, cb);
         else
-            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else if (pThis->uDevType == DEV_3C503)
@@ -1398 +1432 @@
         }
         else
-            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", DPNIC_INSTANCE, addr, cb));
+            LogFunc(("#%d: Ignoring write at addr=%04X cb=%u!\n", pThis->iInstance, addr, cb));
     }
     else
@@ -1413 +1447 @@
 static void dp8390CoreReceiveBuf(PDPNICSTATE pThis, DP_RSR *pRsr, const uint8_t *src, unsigned cbLeft, bool fLast)
 {
-    LogFlow(("#%d: Initial CURR=%02X00 CLDA=%04X\n", DPNIC_INSTANCE, pThis->core.CURR, pThis->core.CLDA));
+    LogFlow(("#%d: Initial CURR=%02X00 CLDA=%04X\n", pThis->iInstance, pThis->core.CURR, pThis->core.CLDA));
 
     while (cbLeft)
@@ -1424 +1458 @@
         if (cbWrite > cbLeft)
             cbWrite = cbLeft;
-        Log2Func(("#%d: cbLeft=%d CURR=%02X00 CLDA=%04X\n", DPNIC_INSTANCE, cbLeft, pThis->core.CURR, pThis->core.CLDA));
+        Log2Func(("#%d: cbLeft=%d CURR=%02X00 CLDA=%04X\n", pThis->iInstance, cbLeft, pThis->core.CURR, pThis->core.CLDA));
         dpLocalRAMWriteBuf(pThis, pThis->core.CLDA, cbWrite, src);
         src += cbWrite;
@@ -1436 +1470 @@
         if (fLast && (cbWrite == cbLeft))
         {
-            Log3Func(("#%d: Round up: CLDA=%04X cbPage=%X\n", DPNIC_INSTANCE, pThis->core.CLDA, cbPage));
+            Log3Func(("#%d: Round up: CLDA=%04X cbPage=%X\n", pThis->iInstance, pThis->core.CLDA, cbPage));
             pThis->core.CLDA += cbPage;
         }
@@ -1442 +1476 @@
             pThis->core.CLDA += cbWrite;
 
-        Log3Func(("#%d: Final CURR=%02X00 CLDA=%04X\n", DPNIC_INSTANCE, pThis->core.CURR, pThis->core.CLDA));
+        Log3Func(("#%d: Final CURR=%02X00 CLDA=%04X\n", pThis->iInstance, pThis->core.CURR, pThis->core.CLDA));
         /* If at end of ring, wrap around. */
         if (pThis->core.clda.CLDA1 == pThis->core.PSTOP)
@@ -1454 +1488 @@
             pRsr->MPA = 1;  /* Indicates to caller that receive was aborted. */
             STAM_COUNTER_INC(&pThis->StatDropPktNoBuffer);
-            Log3Func(("#%d: PSTART=%02X00 PSTOP=%02X00 BNRY=%02X00 CURR=%02X00 -- overflow!\n", DPNIC_INSTANCE, pThis->core.PSTART, pThis->core.PSTOP, pThis->core.BNRY, pThis->core.CURR));
+            Log3Func(("#%d: PSTART=%02X00 PSTOP=%02X00 BNRY=%02X00 CURR=%02X00 -- overflow!\n", pThis->iInstance, pThis->core.PSTART, pThis->core.PSTOP, pThis->core.BNRY, pThis->core.CURR));
             break;
         }
@@ -1464 +1498 @@
  * Write incoming data into the packet buffer.
  */
-static void dp8390CoreReceiveLocked(PDPNICSTATE pThis, const uint8_t *src, size_t cbToRecv)
-{
-    PPDMDEVINS pDevIns = DPNICSTATE_2_DEVINS(pThis);
+static void dp8390CoreReceiveLocked(PPDMDEVINS pDevIns, PDPNICSTATE pThis, const uint8_t *src, size_t cbToRecv)
+{
     int is_padr = 0, is_bcast = 0, is_mcast = 0, is_prom = 0;
     int mc_type = 0;
@@ -1509 +1542 @@
     }
 
-    LogFlowFunc(("#%d: size on wire=%d\n", DPNIC_INSTANCE, cbToRecv));
+    LogFlowFunc(("#%d: size on wire=%d\n", pThis->iInstance, cbToRecv));
 
     /*
@@ -1527 +1560 @@
 
         nRSR = 0;
-        Log2Func(("#%d Packet passed address filter (is_padr=%d, is_bcast=%d, is_mcast=%d, is_prom=%d), size=%d\n", DPNIC_INSTANCE, is_padr, is_bcast, is_mcast, is_prom, cbToRecv));
+        Log2Func(("#%d Packet passed address filter (is_padr=%d, is_bcast=%d, is_mcast=%d, is_prom=%d), size=%d\n", pThis->iInstance, is_padr, is_bcast, is_mcast, is_prom, cbToRecv));
 
         if (is_bcast || mc_type)
@@ -1562 +1595 @@
             }
 
-            LogFlowFunc(("#%d: PSTART=%02X00 PSTOP=%02X00 BNRY=%02X00 CURR=%02X00\n", DPNIC_INSTANCE, pThis->core.PSTART, pThis->core.PSTOP, pThis->core.BNRY, pThis->core.CURR));
+            LogFlowFunc(("#%d: PSTART=%02X00 PSTOP=%02X00 BNRY=%02X00 CURR=%02X00\n", pThis->iInstance, pThis->core.PSTART, pThis->core.PSTOP, pThis->core.BNRY, pThis->core.CURR));
 
             /* All packets that passed the address filter are copied to local RAM.
@@ -1627 +1660 @@
 
         Log2Func(("Receive completed, size=%d, CURR=%02X00, RSR=%02X, ISR=%02X\n", cbToRecv, pThis->core.CURR, pThis->core.RSR, pThis->core.ISR));
-        dp8390CoreUpdateIrq(pThis);
+        dp8390CoreUpdateIrq(pDevIns, pThis);
     }
     else
     {
-        Log3Func(("#%d Packet did not pass address filter, size=%d\n", DPNIC_INSTANCE, cbToRecv));
+        Log3Func(("#%d Packet did not pass address filter, size=%d\n", pThis->iInstance, cbToRecv));
         STAM_COUNTER_INC(&pThis->StatDropPktNoMatch);
     }
@@ -1644 +1677 @@
  * @returns VBox status code.  VERR_TRY_AGAIN is returned if we're busy.
  *
- * @param   pThis               The device instance data.
+ * @param   pDevIns             The device instance data.
+ * @param   pThis               The device state data.
  * @param   fOnWorkerThread     Whether we're on a worker thread or on an EMT.
  */
-static int dp8390CoreXmitPacket(PDPNICSTATE pThis, bool fOnWorkerThread)
-{
+static int dp8390CoreXmitPacket(PPDMDEVINS pDevIns, PDPNICSTATE pThis, bool fOnWorkerThread)
+{
+    PDPNICSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDPNICSTATECC);
     RT_NOREF_PV(fOnWorkerThread);
     int rc;
@@ -1655 +1690 @@
      * Grab the xmit lock of the driver as well as the DP8390 device state.
      */
-    PPDMINETWORKUP pDrv = pThis->CTX_SUFF(pDrv);
+    PPDMINETWORKUP pDrv = pThisCC->pDrv;
     if (pDrv)
     {
@@ -1662 +1697 @@
             return rc;
     }
-    PPDMDEVINS pDevIns = DPNICSTATE_2_DEVINS(pThis);
     rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
     if (RT_SUCCESS(rc))
@@ -1669 +1703 @@
          * Do the transmitting.
          */
-        int rc2 = dp8390CoreAsyncXmitLocked(pThis, false /*fOnWorkerThread*/);
+        int rc2 = dp8390CoreAsyncXmitLocked(pDevIns, pThis, pThisCC, false /*fOnWorkerThread*/);
         AssertReleaseRC(rc2);
 
@@ -1694 +1728 @@
 static DECLCALLBACK(void) dpNicR3XmitTaskCallback(PPDMDEVINS pDevIns, void *pvUser)
 {
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE   pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     NOREF(pvUser);
 
@@ -1700 +1734 @@
      * Transmit if we can.
      */
-    dp8390CoreXmitPacket(pThis, true /*fOnWorkerThread*/);
+    dp8390CoreXmitPacket(pDevIns, pThis, true /*fOnWorkerThread*/);
 }
 
@@ -1711 +1745 @@
  * @returns See PPDMINETWORKUP::pfnAllocBuf.
  * @param   pThis       The device instance.
+ * @param   pThisCC     The device state for current context.
  * @param   cbMin       The minimum buffer size.
  * @param   fLoopback   Set if we're in loopback mode.
@@ -1717 +1752 @@
  *                      Always set.
  */
-DECLINLINE(int) dp8390XmitAllocBuf(PDPNICSTATE pThis, size_t cbMin, bool fLoopback,
+DECLINLINE(int) dp8390XmitAllocBuf(PDPNICSTATE pThis, PDPNICSTATECC pThisCC, size_t cbMin, bool fLoopback,
                                    PPDMSCATTERGATHER pSgLoop, PPPDMSCATTERGATHER ppSgBuf)
 {
@@ -1724 +1759 @@
     if (!fLoopback)
     {
-        PPDMINETWORKUP pDrv = pThis->CTX_SUFF(pDrv);
+        PPDMINETWORKUP pDrv = pThisCC->pDrv;
         if (RT_LIKELY(pDrv))
         {
@@ -1762 +1797 @@
  *
  * @returns See PDMINETWORKUP::pfnSendBuf.
- * @param   pThis           The device instance.
+ * @param   pDevIns         The device instance.
+ * @param   pThisCC         The current context device state.
  * @param   fLoopback       Set if we're in loopback mode.
  * @param   pSgBuf          The SG to send.
@@ -1768 +1804 @@
  *                          if an EMT.
  */
-DECLINLINE(int) dp8390CoreXmitSendBuf(PDPNICSTATE pThis, bool fLoopback, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
-{
+DECLINLINE(int) dp8390CoreXmitSendBuf(PPDMDEVINS pDevIns, PDPNICSTATECC pThisCC, bool fLoopback, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
+{
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int rc;
     STAM_REL_COUNTER_ADD(&pThis->StatTransmitBytes, pSgBuf->cbUsed);
@@ -1778 +1815 @@
             pThis->Led.Asserted.s.fWriting = pThis->Led.Actual.s.fWriting = 1;
 
-        PPDMINETWORKUP pDrv = pThis->CTX_SUFF(pDrv);
+        PPDMINETWORKUP pDrv = pThisCC->pDrv;
         if (RT_LIKELY(pDrv))
         {
@@ -1806 +1843 @@
         pThis->Led.Asserted.s.fReading = pThis->Led.Actual.s.fReading = 1;
 
-        LogFlowFunc(("#%d: loopback (DCR=%02X LB=%u TCR=%02X RCR=%02X, %u bytes)\n", DPNIC_INSTANCE, pCore->DCR, pCore->tcr.LB, pCore->TCR, pCore->RCR, pSgBuf->cbUsed));
+        LogFlowFunc(("#%d: loopback (DCR=%02X LB=%u TCR=%02X RCR=%02X, %u bytes)\n", pThis->iInstance, pCore->DCR, pCore->tcr.LB, pCore->TCR, pCore->RCR, pSgBuf->cbUsed));
         for (ofs = 0; ofs < pSgBuf->cbUsed; ofs += 16)
             Log(("  %04X: %.*Rhxs\n", ofs, ofs + 16 < pSgBuf->cbUsed ? 16 : pSgBuf->cbUsed - ofs, &pThis->abLoopBuf[ofs]));
@@ -1886 +1923 @@
                 /* Receiving side checks the FCS. */
                 fGoodFcs = !memcmp(&pktbuf[pktlen - 4], abFcs, sizeof(abFcs));
-                Log2Func(("#%d: Address matched (is_padr=%d, is_bcast=%d, is_mcast=%d, is_prom=%d), checking FCS (fGoodFcs=%RTbool)\n", DPNIC_INSTANCE, is_padr, is_bcast, is_mcast, is_prom, fGoodFcs));
+                Log2Func(("#%d: Address matched (is_padr=%d, is_bcast=%d, is_mcast=%d, is_prom=%d), checking FCS (fGoodFcs=%RTbool)\n", pThis->iInstance, is_padr, is_bcast, is_mcast, is_prom, fGoodFcs));
 
                 /* Now we have to update the FIFO. Since only 8 bytes are visible
@@ -1899 +1936 @@
                 nRsr.PRX = 1;   /* Weird but true, for non-matching address only! */
                 fAddrMatched = false;
-                Log3Func(("#%d: Address NOT matched, ignoring FCS errors.\n", DPNIC_INSTANCE));
+                Log3Func(("#%d: Address NOT matched, ignoring FCS errors.\n", pThis->iInstance));
             }
 
@@ -1954 +1991 @@
  * Reads the entire frame into the scatter gather buffer.
  */
-DECLINLINE(void) dp8390CoreXmitRead(PDPNICSTATE pThis, const unsigned uLocalAddr, const unsigned cbFrame, PPDMSCATTERGATHER pSgBuf, bool fLoopback)
-{
-    unsigned    uOfs = 0;
-    Assert(PDMDevHlpCritSectIsOwner(DPNICSTATE_2_DEVINS(pThis), &pThis->CritSect));
+DECLINLINE(void) dp8390CoreXmitRead(PPDMDEVINS pDevIns, const unsigned uLocalAddr, const unsigned cbFrame, PPDMSCATTERGATHER pSgBuf, bool fLoopback)
+{
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    unsigned        uOfs = 0;
+    Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
     Assert(pSgBuf->cbAvailable >= cbFrame);
 
     pSgBuf->cbUsed = cbFrame;
 
-    LogFlowFunc(("#%d: uLocalAddr=%04X cbFrame=%d\n", DPNIC_INSTANCE, uLocalAddr, cbFrame));
+    LogFlowFunc(("#%d: uLocalAddr=%04X cbFrame=%d\n", pThis->iInstance, uLocalAddr, cbFrame));
     /* Have to figure out where the address is in local RAM. */
     if (pThis->uDevType == DEV_NE1000)
@@ -1976 +2014 @@
         {
             /// @todo What are we supposed to do?!
-            LogFunc(("#%d: uOfs=%u, don't know what to do!!\n", DPNIC_INSTANCE, uOfs));
+            LogFunc(("#%d: uOfs=%u, don't know what to do!!\n", pThis->iInstance, uOfs));
         }
     }
@@ -1991 +2029 @@
         {
             /// @todo What are we supposed to do?!
-            LogFunc(("#%d: uOfs=%u, don't know what to do!!\n", DPNIC_INSTANCE, uOfs));
+            LogFunc(("#%d: uOfs=%u, don't know what to do!!\n", pThis->iInstance, uOfs));
         }
     }
@@ -2011 +2049 @@
         {
             /// @todo What are we supposed to do?!
-            LogFunc(("#%d: uOfs=%u, don't know what to do!!\n", DPNIC_INSTANCE, uOfs));
+            LogFunc(("#%d: uOfs=%u, don't know what to do!!\n", pThis->iInstance, uOfs));
         }
     }
@@ -2058 +2096 @@
  * Try to transmit a frame.
  */
-static void dp8390CoreStartTransmit(PDPNICSTATE pThis)
+static void dp8390CoreStartTransmit(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     /*
@@ -2067 +2105 @@
     pThis->core.NCR = 0;    /* Clear collision counter. */
 #if defined(IN_RING0) || defined(IN_RC)
-    if (!pThis->CTX_SUFF(pDrv))
-    {
-        int rc = PDMDevHlpTaskTrigger(pThis->CTX_SUFF(pDevIns), pThis->hXmitTask);
+    PDPNICSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDPNICSTATECC);
+    if (!pThisCC->pDrv)
+    {
+        int rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hXmitTask);
         AssertRC(rc);
     }
@@ -2075 +2114 @@
 #endif
     {
-        int rc = dp8390CoreXmitPacket(pThis, false /*fOnWorkerThread*/);
+        int rc = dp8390CoreXmitPacket(pDevIns, pThis, false /*fOnWorkerThread*/);
         if (rc == VERR_TRY_AGAIN)
             rc = VINF_SUCCESS;
@@ -2088 +2127 @@
  * @threads EMT.
  */
-static void dp8390CoreKickReceive(PDPNICSTATE pThis)
+static void dp8390CoreKickReceive(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     if (pThis->fMaybeOutOfSpace)
@@ -2094 +2133 @@
         LogFlow(("Poking receive thread.\n"));
 #ifdef IN_RING3
-        dp8390WakeupReceive(DPNICSTATE_2_DEVINS(pThis));
+        dp8390R3WakeupReceive(pDevIns);
 #else
-        int rc = PDMDevHlpTaskTrigger(pThis->CTX_SUFF(pDevIns), pThis->hCanRxTask);
+        int rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hCanRxTask);
         AssertRC(rc);
 #endif
@@ -2107 +2146 @@
  * @threads TX or EMT.
  */
-static int dp8390CoreAsyncXmitLocked(PDPNICSTATE pThis, bool fOnWorkerThread)
-{
-    Assert(PDMDevHlpCritSectIsOwner(DPNICSTATE_2_DEVINS(pThis), &pThis->CritSect));
+static int dp8390CoreAsyncXmitLocked(PPDMDEVINS pDevIns, PDPNICSTATE pThis, PDPNICSTATECC pThisCC, bool fOnWorkerThread)
+{
+    Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
 
     /*
@@ -2117 +2156 @@
     if (RT_UNLIKELY(!pThis->core.cr.TXP))
     {
-        LogFunc(("#%d: Nope, CR.TXP is off (fOnWorkerThread=%RTbool)\n", DPNIC_INSTANCE, fOnWorkerThread));
+        LogFunc(("#%d: Nope, CR.TXP is off (fOnWorkerThread=%RTbool)\n", pThis->iInstance, fOnWorkerThread));
         return VINF_SUCCESS;
     }
@@ -2144 +2183 @@
         unsigned    cb  = pThis->core.TBCR; /* Packet size. */
         const int   adr = RT_MAKE_U16(0, pThis->core.TPSR);
-        LogFunc(("#%d: cb=%d, adr=%04X\n", DPNIC_INSTANCE, cb, adr));
+        LogFunc(("#%d: cb=%d, adr=%04X\n", pThis->iInstance, cb, adr));
 
         if (RT_LIKELY(dp8390IsLinkUp(pThis) || fLoopback))
@@ -2157 +2196 @@
                 }
 
-                rc = dp8390XmitAllocBuf(pThis, cb, fLoopback, &SgLoop, &pSgBuf);
+                rc = dp8390XmitAllocBuf(pThis, pThisCC, cb, fLoopback, &SgLoop, &pSgBuf);
                 if (RT_SUCCESS(rc))
                 {
-                    dp8390CoreXmitRead(pThis, adr, cb, pSgBuf, fLoopback);
-                    rc = dp8390CoreXmitSendBuf(pThis, fLoopback, pSgBuf, fOnWorkerThread);
-                    Log2Func(("#%d: rc=%Rrc\n", DPNIC_INSTANCE, rc));
+                    dp8390CoreXmitRead(pDevIns, adr, cb, pSgBuf, fLoopback);
+                    rc = dp8390CoreXmitSendBuf(pDevIns, pThisCC, fLoopback, pSgBuf, fOnWorkerThread);
+                    Log2Func(("#%d: rc=%Rrc\n", pThis->iInstance, rc));
                 }
                 else if (rc == VERR_TRY_AGAIN)
                 {
                     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTransmit), a);
-                    LogFunc(("#%d: rc=%Rrc\n", DPNIC_INSTANCE, rc));
+                    LogFunc(("#%d: rc=%Rrc\n", pThis->iInstance, rc));
                     return VINF_SUCCESS;
                 }
@@ -2186 +2225 @@
                  * hardware does *not* limit the packet length.
                  */
-                LogRel(("DPNIC#%d: Attempt to transmit illegal giant frame (%u bytes) -> signaling error\n", DPNIC_INSTANCE, cb));
+                LogRel(("DPNIC#%d: Attempt to transmit illegal giant frame (%u bytes) -> signaling error\n", pThis->iInstance, cb));
                 pThis->core.tsr.OWC = 1;    /* Pretend there was an out-of-window collision. */
                 pThis->core.isr.TXE = 1;
@@ -2201 +2240 @@
         pThis->core.cr.TXP = 0;
         pThis->core.TBCR   = 0;
-        LogFlowFunc(("#%d: TSR=%02X, ISR=%02X\n", DPNIC_INSTANCE, pThis->core.TSR, pThis->core.ISR));
+        LogFlowFunc(("#%d: TSR=%02X, ISR=%02X\n", pThis->iInstance, pThis->core.TSR, pThis->core.ISR));
 
     } while (0);    /* No loop, because there isn't ever more than one packet to transmit. */
 
-    dp8390CoreUpdateIrq(pThis);
+    dp8390CoreUpdateIrq(pDevIns, pThis);
 
     /* If there's anything waiting, this should be a good time to recheck. */
-    dp8390CoreKickReceive(pThis);
+    dp8390CoreKickReceive(pDevIns, pThis);
 
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTransmit), a);
@@ -2218 +2257 @@
 
 
-static uint32_t dp8390CoreRead(PDPNICSTATE pThis, int ofs)
+static uint32_t dp8390CoreRead(PPDMDEVINS pDevIns, PDPNICSTATE pThis, int ofs)
 {
     uint8_t     val;
@@ -2259 +2298 @@
             val = pThis->core.CNTR0;
             pThis->core.CNTR0 = 0;  /* Cleared by reading. */
-            dp8390CoreUpdateIrq(pThis);
+            dp8390CoreUpdateIrq(pDevIns, pThis);
             return val;
         case DPR_P0_R_CNTR1:
             val = pThis->core.CNTR1;
             pThis->core.CNTR1 = 0;  /* Cleared by reading. */
-            dp8390CoreUpdateIrq(pThis);
+            dp8390CoreUpdateIrq(pDevIns, pThis);
             return val;
         case DPR_P0_R_CNTR2:
             val = pThis->core.CNTR2;
             pThis->core.CNTR2 = 0;  /* Cleared by reading. */
-            dp8390CoreUpdateIrq(pThis);
+            dp8390CoreUpdateIrq(pDevIns, pThis);
             return val;
         default:
@@ -2324 +2363 @@
 
 
-static int dp8390CoreWriteCR(PDPNICSTATE pThis, uint32_t val)
+static int dp8390CoreWriteCR(PPDMDEVINS pDevIns, PDPNICSTATE pThis, uint32_t val)
 {
     union {
@@ -2356 +2395 @@
 
         /* Unblock receive thread if necessary, possibly drop any packets. */
-        dp8390CoreKickReceive(pThis);
+        dp8390CoreKickReceive(pDevIns, pThis);
     }
     if (nCr.STA && !pThis->core.cr.STA)
@@ -2368 +2407 @@
 
         /* Unblock receive thread. */
-        dp8390CoreKickReceive(pThis);
+        dp8390CoreKickReceive(pDevIns, pThis);
     }
     if (nCr.TXP && !pThis->core.cr.TXP)
@@ -2374 +2413 @@
         /* Kick off a transmit. */
         pThis->core.cr.TXP = 1;     /* Indicate transmit in progress. */
-        dp8390CoreStartTransmit(pThis);
+        dp8390CoreStartTransmit(pDevIns, pThis);
     }
 
@@ -2415 +2454 @@
 }
 
-static int dp8390CoreWrite(PDPNICSTATE pThis, int ofs, uint32_t val)
+static int dp8390CoreWrite(PPDMDEVINS pDevIns, PDPNICSTATE pThis, int ofs, uint32_t val)
 {
     int     rc = VINF_SUCCESS;
     bool    fUpdateIRQ = false;
 
-    Log2Func(("#%d: page=%d reg=%X val=%02X\n", DPNIC_INSTANCE, pThis->core.cr.PS, ofs, val));
+    Log2Func(("#%d: page=%d reg=%X val=%02X\n", pThis->iInstance, pThis->core.cr.PS, ofs, val));
 
     /* Command Register exists in all pages. */
     if (ofs == DPR_CR)
     {
-        rc = dp8390CoreWriteCR(pThis, val);
+        rc = dp8390CoreWriteCR(pDevIns, pThis, val);
     }
     else if (pThis->core.cr.PS == 0)
@@ -2443 +2482 @@
                 pThis->core.BNRY = val;
                 /* Probably made more room in receive ring. */
-                dp8390CoreKickReceive(pThis);
+                dp8390CoreKickReceive(pDevIns, pThis);
             }
             break;
@@ -2538 +2577 @@
 
     if (fUpdateIRQ)
-        dp8390CoreUpdateIrq(pThis);
+        dp8390CoreUpdateIrq(pDevIns, pThis);
 
     return rc;
@@ -2679 +2718 @@
 
 
-static int neDataPortWrite(PDPNICSTATE pThis, uint16_t val)
+static int neDataPortWrite(PPDMDEVINS pDevIns, PDPNICSTATE pThis, uint16_t val)
 {
     /* Remote Write; ignored if Remote DMA command is not 'Write'. */
@@ -2713 +2752 @@
             pThis->core.isr.RDC = 1;
             pThis->core.cr.RD   = 0;
-            dp8390CoreUpdateIrq(pThis);
+            dp8390CoreUpdateIrq(pDevIns, pThis);
         }
     }
@@ -2720 +2759 @@
 
 
-static uint16_t neDataPortRead(PDPNICSTATE pThis)
+static uint16_t neDataPortRead(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     uint16_t    val = 0x1234;
@@ -2757 +2796 @@
             pThis->core.isr.RDC = 1;
             pThis->core.cr.RD   = 0;
-            dp8390CoreUpdateIrq(pThis);
+            dp8390CoreUpdateIrq(pDevIns, pThis);
         }
     }
@@ -2764 +2803 @@
 
 
-static int neResetPortWrite(PDPNICSTATE pThis)
+static int neResetPortWrite(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     LogFlowFunc(("\n"));
-    dp8390CoreReset(pThis);
+    dp8390CoreReset(pDevIns, pThis);
     return VINF_SUCCESS;
 }
 
 
-static int dpNeIoWrite(PDPNICSTATE pThis, uint32_t addr, uint32_t val)
+static int dpNeIoWrite(PPDMDEVINS pDevIns, PDPNICSTATE pThis, uint32_t addr, uint32_t val)
 {
     int     reg = addr & 0x0f;
     int     rc = VINF_SUCCESS;
 
-    Log2Func(("#%d: addr=%#06x val=%#04x\n", DPNIC_INSTANCE, addr, val & 0xff));
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
 
     /* The NE2000 has 8 bytes of data port followed by 8 bytes of reset port.
@@ -2786 +2825 @@
         reg >>= 1;
     if (reg & 0x04)
-        rc = neResetPortWrite(pThis);
+        rc = neResetPortWrite(pDevIns, pThis);
     else
-        rc = neDataPortWrite(pThis, val);
+        rc = neDataPortWrite(pDevIns, pThis, val);
 
     return rc;
@@ -2794 +2833 @@
 
 
-static uint32_t neIoRead(PDPNICSTATE pThis, uint32_t addr)
+static uint32_t neIoRead(PPDMDEVINS pDevIns, PDPNICSTATE pThis, uint32_t addr)
 {
     uint32_t    val = UINT32_MAX;
@@ -2808 +2847 @@
         val = 0x52; /// @todo Check what really happens
     else
-        val = neDataPortRead(pThis);
-
-    Log2Func(("#%d: addr=%#06x val=%#04x\n", DPNIC_INSTANCE, addr, val & 0xff));
+        val = neDataPortRead(pDevIns, pThis);
+
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
     return val;
 }
 
 
-static int wdIoWrite(PDPNICSTATE pThis, uint32_t addr, uint32_t val)
+static int wdIoWrite(PPDMDEVINS pDevIns, PDPNICSTATE pThis, uint32_t addr, uint32_t val)
 {
     int             reg = addr & 0xf;
@@ -2828 +2867 @@
     };
 
-    Log2Func(("#%d: addr=%#06x val=%#04x\n", DPNIC_INSTANCE, addr, val & 0xff));
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
 
     switch (reg)
@@ -2841 +2880 @@
         if (nCtrl1.RESET)
         {
-            dp8390CoreReset(pThis);
+            dp8390CoreReset(pDevIns, pThis);
             pThis->CTRL1 = 0;
         }
@@ -2919 +2958 @@
     }
 
-    Log2Func(("#%d: addr=%#06x val=%#04x\n", DPNIC_INSTANCE, addr, val & 0xff));
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
     return val;
 }
@@ -2970 +3009 @@
 }
 
-static void elWriteIdcfr(PDPNICSTATE pThis, PEL_GA pGa, uint8_t val)
+static void elWriteIdcfr(PPDMDEVINS pDevIns, PDPNICSTATE pThis, PEL_GA pGa, uint8_t val)
 {
     uint8_t     uOldIrq = pThis->uIsaIrq;
@@ -2981 +3020 @@
     if (uOldIrq != uNewIrq)
     {
-        LogFunc(("#%d Switching IRQ=%d -> IRQ=%d\n", DPNIC_INSTANCE, uOldIrq, uNewIrq));
+        LogFunc(("#%d Switching IRQ=%d -> IRQ=%d\n", pThis->iInstance, uOldIrq, uNewIrq));
         if (pThis->fNicIrqActive)
         {
             /* This probably isn't supposed to happen. */
-            LogFunc(("#%d Moving active IRQ!\n", DPNIC_INSTANCE));
+            LogFunc(("#%d Moving active IRQ!\n", pThis->iInstance));
             if (uOldIrq)
-                PDMDevHlpISASetIrq(DPNICSTATE_2_DEVINS(pThis), uOldIrq, 0);
+                PDMDevHlpISASetIrq(pDevIns, uOldIrq, 0);
             if (uNewIrq)
-                PDMDevHlpISASetIrq(DPNICSTATE_2_DEVINS(pThis), uNewIrq, 1);
+                PDMDevHlpISASetIrq(pDevIns, uNewIrq, 1);
         }
         pThis->uIsaIrq = uNewIrq;
@@ -2999 +3038 @@
     {
         /// @todo We can't really move the DRQ, what can we do?
-        LogFunc(("#%d Switching DRQ=%d -> DRQ=%d\n", DPNIC_INSTANCE, uOldDrq, uNewDrq));
+        LogFunc(("#%d Switching DRQ=%d -> DRQ=%d\n", pThis->iInstance, uOldDrq, uNewDrq));
         pThis->uElIsaDma = uNewDrq;
     }
@@ -3007 +3046 @@
 
 
-static void elWriteGacfr(PDPNICSTATE pThis, PEL_GA pGa, uint8_t val)
+static void elWriteGacfr(PPDMDEVINS pDevIns, PDPNICSTATE pThis, PEL_GA pGa, uint8_t val)
 {
     union {
@@ -3021 +3060 @@
         if (pThis->fNicIrqActive && !nGacfr.nim)
         {
-            LogFunc(("#%d: Unmasking active IRQ!\n", DPNIC_INSTANCE));
-            PDMDevHlpISASetIrq(DPNICSTATE_2_DEVINS(pThis), pThis->uIsaIrq, 1);
+            LogFunc(("#%d: Unmasking active IRQ!\n", pThis->iInstance));
+            PDMDevHlpISASetIrq(pDevIns, pThis->uIsaIrq, 1);
         }
         else if (pThis->fNicIrqActive && nGacfr.nim)
         {
-            LogFunc(("#%d: Masking active IRQ\n", DPNIC_INSTANCE));
-            PDMDevHlpISASetIrq(DPNICSTATE_2_DEVINS(pThis), pThis->uIsaIrq, 0);
+            LogFunc(("#%d: Masking active IRQ\n", pThis->iInstance));
+            PDMDevHlpISASetIrq(pDevIns, pThis->uIsaIrq, 0);
         }
     }
@@ -3034 +3073 @@
     if (nGacfr.rsel != pGa->gacfr.rsel)
     {
-        LogFunc(("#%d: rsel=%u mbs=%u\n", DPNIC_INSTANCE, nGacfr.rsel, nGacfr.mbs));
+        LogFunc(("#%d: rsel=%u mbs=%u\n", pThis->iInstance, nGacfr.rsel, nGacfr.mbs));
     }
 
@@ -3041 +3080 @@
 
 
-static void elSoftReset(PDPNICSTATE pThis)
+static void elSoftReset(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     PEL_GA      pGa = &pThis->ga;
@@ -3049 +3088 @@
     pGa->PSTR = pGa->PSPR = 0;
     pGa->DQTR = 0;
-    elWriteGacfr(pThis, pGa, 0);
+    elWriteGacfr(pDevIns, pThis, pGa, 0);
     pGa->STREG = ELNKII_GA_REV;
     pGa->VPTR0 = pGa->VPTR1 = pGa->VPTR2 = 0;
     pGa->DALSB = pGa->DAMSB = 0;
-    elWriteIdcfr(pThis, pGa, 0);
+    elWriteIdcfr(pDevIns, pThis, pGa, 0);
     pGa->GACR = 0x0B;   /* Low bit set = in reset state. */
     pGa->fGaIrq = false;
 
     /* Reset the NIC core. */
-    dp8390CoreReset(pThis);
-}
-
-
-static int elWriteGacr(PDPNICSTATE pThis, PEL_GA pGa, uint8_t val)
+    dp8390CoreReset(pDevIns, pThis);
+}
+
+
+static int elWriteGacr(PPDMDEVINS pDevIns, PDPNICSTATE pThis, PEL_GA pGa, uint8_t val)
 {
     union {
@@ -3075 +3114 @@
         /* When going out of reset, only clear the rst bit. 3C503 diagnostics checks for this. */
         if (nGacr.rst)
-            elSoftReset(pThis);
+            elSoftReset(pDevIns, pThis);
         else
             pGa->gacr.rst = 0;
@@ -3107 +3146 @@
         {
 #ifdef IN_RING3
-            PDMDevHlpDMASetDREQ(pThis->CTX_SUFF(pDevIns), pThis->uIsaDma, pGa->streg.dprdy);
+            PDMDevHlpDMASetDREQ(pDevIns, pThis->uIsaDma, pGa->streg.dprdy);
             if (pGa->streg.dprdy)
-                PDMDevHlpDMASchedule(pThis->CTX_SUFF(pDevIns));
-            LogFunc(("#%d: DREQ for channel %u set to %u\n", DPNIC_INSTANCE, pThis->uIsaDma, pGa->streg.dprdy));
+                PDMDevHlpDMASchedule(pDevIns);
+            LogFunc(("#%d: DREQ for channel %u set to %u\n", pThis->iInstance, pThis->uIsaDma, pGa->streg.dprdy));
 #else
             /* Must not get here. */
@@ -3180 +3219 @@
 
 
-static int elGaIoWrite(PDPNICSTATE pThis, uint32_t addr, uint32_t val)
+static int elGaIoWrite(PPDMDEVINS pDevIns, PDPNICSTATE pThis, uint32_t addr, uint32_t val)
 {
     int         reg = addr & 0xf;
@@ -3186 +3225 @@
     PEL_GA      pGa = &pThis->ga;
 
-    Log2Func(("#%d: addr=%#06x val=%#04x\n", DPNIC_INSTANCE, addr, val & 0xff));
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
 
     switch (reg)
@@ -3200 +3239 @@
         break;
     case GAR_GACFR:
-        elWriteGacfr(pThis, pGa, val);
+        elWriteGacfr(pDevIns, pThis, pGa, val);
         break;
     case GAR_GACR:
-        rc = elWriteGacr(pThis, pGa, val);
+        rc = elWriteGacr(pDevIns, pThis, pGa, val);
         break;
     case GAR_STREG:
@@ -3209 +3248 @@
         pThis->ga.streg.dtc = 0;
         pThis->ga.fGaIrq    = false;
-        dp8390CoreUpdateIrq(pThis);
+        dp8390CoreUpdateIrq(pDevIns, pThis);
         break;
     case GAR_IDCFR:
-        elWriteIdcfr(pThis, pGa, val);
+        elWriteIdcfr(pDevIns, pThis, pGa, val);
         break;
     case GAR_DAMSB:
@@ -3305 +3344 @@
     }
 
-    Log2Func(("#%d: addr=%#06x val=%#04x\n", DPNIC_INSTANCE, addr, val & 0xff));
+    Log2Func(("#%d: addr=%#06x val=%#04x\n", pThis->iInstance, addr, val & 0xff));
     return val;
 }
@@ -3316 +3355 @@
 neIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3327 +3366 @@
     {
         case 1:
-            *pu32 = neIoRead(pThis, reg);
+            *pu32 = neIoRead(pDevIns, pThis, reg);
             break;
         case 2:
@@ -3333 +3372 @@
             if (pThis->uDevType == DEV_NE1000)
             {
-                u8Lo = neIoRead(pThis, reg);
+                u8Lo = neIoRead(pDevIns, pThis, reg);
                 if (reg < 0xf)  // This logic is not entirely accurate (wraparound).
-                    u8Hi = neIoRead(pThis, reg + 1);
+                    u8Hi = neIoRead(pDevIns, pThis, reg + 1);
                 *pu32 = RT_MAKE_U16(u8Lo, u8Hi);
             }
             else
-                *pu32 = neIoRead(pThis, reg);
+                *pu32 = neIoRead(pDevIns, pThis, reg);
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "neIOPortRead: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: NE Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, *pu32, cb, rc));
+    Log2Func(("#%d: NE Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, *pu32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIORead), a);
     return rc;
@@ -3359 +3398 @@
 wdIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3380 +3419 @@
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "wdIOPortRead: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: WD Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, *pu32, cb, rc));
+    Log2Func(("#%d: WD Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, *pu32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIORead), a);
     return rc;
@@ -3397 +3436 @@
 elIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3418 +3457 @@
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "elIOPortRead: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: EL Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, *pu32, cb, rc));
+    Log2Func(("#%d: EL Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, *pu32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIORead), a);
     return rc;
@@ -3435 +3474 @@
 dp8390CoreIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3446 +3485 @@
     {
         case 1:
-            *pu32 = dp8390CoreRead(pThis, reg);
+            *pu32 = dp8390CoreRead(pDevIns, pThis, reg);
             break;
         case 2:
             /* Manually split word access. */
-            u8Lo = dp8390CoreRead(pThis, reg + 0);
+            u8Lo = dp8390CoreRead(pDevIns, pThis, reg + 0);
             /* This logic is not entirely accurate. */
             if (reg < 0xf)
-                u8Hi = dp8390CoreRead(pThis, reg + 1);
+                u8Hi = dp8390CoreRead(pDevIns, pThis, reg + 1);
             else
                 u8Hi = 0;
@@ -3459 +3498 @@
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "dp8390CoreIOPortRead: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, *pu32, cb, rc));
+    Log2Func(("#%d: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, *pu32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIORead), a);
     return rc;
@@ -3476 +3515 @@
 neIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3486 +3525 @@
     {
         case 1:
-            rc = dpNeIoWrite(pThis, Port, RT_LOBYTE(u32));
+            rc = dpNeIoWrite(pDevIns, pThis, Port, RT_LOBYTE(u32));
             break;
         case 2:
@@ -3492 +3531 @@
             if (pThis->uDevType == DEV_NE2000)
             {
-                rc = dpNeIoWrite(pThis, Port, RT_LOWORD(u32));
+                rc = dpNeIoWrite(pDevIns, pThis, Port, RT_LOWORD(u32));
             }
             else
             {
-                rc = dpNeIoWrite(pThis, reg + 0, RT_LOBYTE(u32));
+                rc = dpNeIoWrite(pDevIns, pThis, reg + 0, RT_LOBYTE(u32));
                 if (RT_SUCCESS(rc) && (reg < 0xf))
-                    rc = dpNeIoWrite(pThis, reg + 1, RT_HIBYTE(u32));
+                    rc = dpNeIoWrite(pDevIns, pThis, reg + 1, RT_HIBYTE(u32));
             }
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "neIOPortWrite: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: NE Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, u32, cb, rc));
+    Log2Func(("#%d: NE Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, u32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIOWrite), a);
     return rc;
@@ -3519 +3558 @@
 wdIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3529 +3568 @@
     {
         case 1:
-            rc = wdIoWrite(pThis, Port, RT_LOBYTE(u32));
+            rc = wdIoWrite(pDevIns, pThis, Port, RT_LOBYTE(u32));
             break;
         case 2:
             /* Manually split word access. */
-            rc = wdIoWrite(pThis, reg + 0, RT_LOBYTE(u32));
+            rc = wdIoWrite(pDevIns, pThis, reg + 0, RT_LOBYTE(u32));
             if (RT_SUCCESS(rc) && (reg < 0xf))
-                rc = wdIoWrite(pThis, reg + 1, RT_HIBYTE(u32));
+                rc = wdIoWrite(pDevIns, pThis, reg + 1, RT_HIBYTE(u32));
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "wdIOPortWrite: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: WD Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, u32, cb, rc));
+    Log2Func(("#%d: WD Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, u32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIOWrite), a);
     return rc;
@@ -3555 +3594 @@
 elIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3565 +3604 @@
     {
         case 1:
-            rc = elGaIoWrite(pThis, Port, RT_LOBYTE(u32));
+            rc = elGaIoWrite(pDevIns, pThis, Port, RT_LOBYTE(u32));
             break;
         case 2:
             /* Manually split word access. */
-            rc = elGaIoWrite(pThis, reg + 0, RT_LOBYTE(u32));
+            rc = elGaIoWrite(pDevIns, pThis, reg + 0, RT_LOBYTE(u32));
             if (RT_SUCCESS(rc) && (reg < 0xf))
-                rc = elGaIoWrite(pThis, reg + 1, RT_HIBYTE(u32));
+                rc = elGaIoWrite(pDevIns, pThis, reg + 1, RT_HIBYTE(u32));
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "elIOPortWrite: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: EL Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, u32, cb, rc));
+    Log2Func(("#%d: EL Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, u32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIOWrite), a);
     return rc;
@@ -3591 +3630 @@
 dp8390CoreIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc    = VINF_SUCCESS;
     int             reg   = Port & 0xf;
@@ -3601 +3640 @@
     {
         case 1:
-            rc = dp8390CoreWrite(pThis, reg, RT_LOBYTE(u32));
+            rc = dp8390CoreWrite(pDevIns, pThis, reg, RT_LOBYTE(u32));
             break;
         case 2:
             /* Manually split word access. */
-            rc = dp8390CoreWrite(pThis, reg + 0, RT_LOBYTE(u32));
+            rc = dp8390CoreWrite(pDevIns, pThis, reg + 0, RT_LOBYTE(u32));
             if (!RT_SUCCESS(rc))
                 break;
-            rc = dp8390CoreWrite(pThis, reg + 1, RT_HIBYTE(u32));
+            rc = dp8390CoreWrite(pDevIns, pThis, reg + 1, RT_HIBYTE(u32));
             break;
         default:
-            rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
+            rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS,
                                    "dp8390CoreIOPortWrite: unsupported operation size: offset=%#10x cb=%u\n",
                                    Port, cb);
     }
 
-    Log2Func(("#%d: Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", DPNIC_INSTANCE, Port, u32, cb, rc));
+    Log2Func(("#%d: Port=%RTiop u32=%#RX32 cb=%d rc=%Rrc\n", pThis->iInstance, Port, u32, cb, rc));
     STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatIOWrite), a);
     return rc;
@@ -3631 +3670 @@
 dpWdMmioFill(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, uint32_t u32Item, unsigned cbItem, unsigned cItems)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     Assert(PDMDevHlpCritSectIsOwner(pDevIns, pDevIns->CTX_SUFF(pCritSectRo)));
 
@@ -3646 +3685 @@
 static DECLCALLBACK(VBOXSTRICTRC) wdMemRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
 {
-    PDPNICSTATE     pThis   = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     uint8_t         *pbData = (uint8_t *)pv;
     NOREF(pvUser);
@@ -3655 +3694 @@
     if (pThis->ctrl1.MEME)
     {
-        Log3Func(("#%d: Reading %u bytes from address %X: [%.*Rhxs]\n", pDevIns->iInstance, cb, off, cb, &pThis->abLocalRAM[off & DPNIC_MEM_MASK]));
+        Log3Func(("#%d: Reading %u bytes from address %X: [%.*Rhxs]\n", pThis->iInstance, cb, off, cb, &pThis->abLocalRAM[off & DPNIC_MEM_MASK]));
         while (cb-- > 0)
             *pbData++ = pThis->abLocalRAM[off++ & DPNIC_MEM_MASK];
@@ -3672 +3711 @@
 static DECLCALLBACK(VBOXSTRICTRC) wdMemWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
 {
-    PDPNICSTATE     pThis  = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis  = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     uint8_t const   *pbSrc = (uint8_t const *)pv;
     NOREF(pvUser);
@@ -3681 +3720 @@
     if (pThis->ctrl1.MEME)
     {
-        Log3Func(("#%d: Writing %u bytes to address %X: [%.*Rhxs]\n", pDevIns->iInstance, cb, off, cb, pbSrc));
+        Log3Func(("#%d: Writing %u bytes to address %X: [%.*Rhxs]\n", pThis->iInstance, cb, off, cb, pbSrc));
         while (cb-- > 0)
             pThis->abLocalRAM[off++ & DPNIC_MEM_MASK] = *pbSrc++;
@@ -3697 +3736 @@
 static DECLCALLBACK(VBOXSTRICTRC) elMemRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
 {
-    PDPNICSTATE     pThis   = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     uint8_t         *pbData = (uint8_t *)pv;
     NOREF(pvUser);
@@ -3705 +3744 @@
     if (pThis->ga.gacfr.rsel)
     {
-        Log3Func(("#%d: Reading %u bytes from address %X\n", pDevIns->iInstance, cb, off));
+        Log3Func(("#%d: Reading %u bytes from address %X\n", pThis->iInstance, cb, off));
         while (cb-- > 0)
             *pbData++ = pThis->abLocalRAM[off++ & DPNIC_MEM_MASK];
@@ -3711 +3750 @@
     else
     {
-        Log3Func(("#%d: Ignoring read of %u bytes from address %X\n", pDevIns->iInstance, cb, off));
+        Log3Func(("#%d: Ignoring read of %u bytes from address %X\n", pThis->iInstance, cb, off));
         memset(pv, 0xff, cb);
     }
@@ -3724 +3763 @@
 static DECLCALLBACK(VBOXSTRICTRC) elMemWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
 {
-    PDPNICSTATE     pThis  = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis  = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     uint8_t const   *pbSrc = (uint8_t const *)pv;
     NOREF(pvUser);
@@ -3732 +3771 @@
     if (pThis->ga.gacfr.rsel)
     {
-        Log3Func(("#%d: Writing %u bytes to address %X\n", pDevIns->iInstance, cb, off));
+        Log3Func(("#%d: Writing %u bytes to address %X\n", pThis->iInstance, cb, off));
         while (cb-- > 0)
             pThis->abLocalRAM[off++ & DPNIC_MEM_MASK] = *pbSrc++;
@@ -3738 +3777 @@
     else
     {
-        Log3Func(("#%d: Ignoring write of %u bytes to address %X\n", pDevIns->iInstance, cb, off));
+        Log3Func(("#%d: Ignoring write of %u bytes to address %X\n", pThis->iInstance, cb, off));
     }
     return VINF_SUCCESS;
@@ -3878 +3917 @@
         pThis->ga.streg.dtc = 1;
         pThis->ga.fGaIrq    = true;
-        dp8390CoreUpdateIrq(pThis);
+        dp8390CoreUpdateIrq(pDevIns, pThis);
     }
     else
@@ -3903 +3942 @@
 {
     RT_NOREF(pvUser);
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
@@ -3916 +3955 @@
         {
             LogRel(("DPNIC#%d: The link is back up again after the restore.\n",
-                    pDevIns->iInstance));
-            LogFunc(("#%d: cLinkDownReported=%d\n", pDevIns->iInstance, pThis->cLinkDownReported));
+                    pThis->iInstance));
+            LogFunc(("#%d: cLinkDownReported=%d\n", pThis->iInstance, pThis->cLinkDownReported));
             pThis->Led.Actual.s.fError = 0;
         }
     }
     else
-        LogFunc(("#%d: cLinkDownReported=%d, wait another 1500ms...\n", pDevIns->iInstance, pThis->cLinkDownReported));
+        LogFunc(("#%d: cLinkDownReported=%d, wait another 1500ms...\n", pThis->iInstance, pThis->cLinkDownReported));
 
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -3935 +3974 @@
 static DECLCALLBACK(void) dpNicInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     bool            fRecvBuffer  = false;
     bool            fSendBuffer  = false;
@@ -3955 +3994 @@
      */
     pHlp->pfnPrintf(pHlp, "DPNIC #%d: %s port=%RTiop IRQ=%u",
-                    pDevIns->iInstance,
+                    pThis->iInstance,
                     aszModels[pThis->uDevType],
                     pThis->IOPortBase,
@@ -3963 +4002 @@
     if (pThis->uIsaDma)
         pHlp->pfnPrintf(pHlp, " DMA=%u", pThis->uIsaDma);
-    pHlp->pfnPrintf(pHlp, " mac-cfg=%RTmac %s\n",
+    pHlp->pfnPrintf(pHlp, " mac-cfg=%RTmac%s %s\n",
                     &pThis->MacConfigured,
-                    pDevIns->fR0Enabled ? "RZ" : "");
+                    pDevIns->fR0Enabled ? " RZ" : "",
+                    pThis->fDriverAttached ? "attached" : "unattached!");
 
     int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_INTERNAL_ERROR); /* Take it here so we know why we're hanging... */
@@ -4066 +4106 @@
     if (pThis->fMaybeOutOfSpace)
         pHlp->pfnPrintf(pHlp, "  Waiting for receive space\n");
+    if (pThis->cLinkDownReported)
+        pHlp->pfnPrintf(pHlp, "  Link down count %d\n", pThis->cLinkDownReported);
 
     if ((pThis->uDevType == DEV_WD8003) || (pThis->uDevType == DEV_WD8013))
@@ -4151 +4193 @@
 
 
-static void dpNicR3HardReset(PDPNICSTATE pThis)
-{
-    LogFlowFunc(("#%d:\n", DPNIC_INSTANCE));
+static void dpNicR3HardReset(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
+{
+    LogFlowFunc(("#%d:\n", pThis->iInstance));
 
     /* Initialize the PROM. Covers both NE1000 and NE2000. */
@@ -4223 +4265 @@
     memset(&pThis->core, 0, sizeof(pThis->core));
 
-    dp8390CoreReset(pThis);
+    dp8390CoreReset(pDevIns, pThis);
 }
 
@@ -4235 +4277 @@
  * renegotiate any DHCP lease.
  *
- * @param  pThis        The device instance data.
- */
-static void dp8390TempLinkDown(PDPNICSTATE pThis)
+ * @param  pDevIns      The device instance data.
+ * @param  pThis        The device state.
+ */
+static void dp8390TempLinkDown(PPDMDEVINS pDevIns, PDPNICSTATE pThis)
 {
     if (pThis->fLinkUp)
@@ -4244 +4287 @@
         pThis->cLinkDownReported = 0;
         pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
-        int rc = PDMDevHlpTimerSetMillies(DPNICSTATE_2_DEVINS(pThis), pThis->hTimerRestore, pThis->cMsLinkUpDelay);
+        int rc = PDMDevHlpTimerSetMillies(pDevIns, pThis->hTimerRestore, pThis->cMsLinkUpDelay);
         AssertRC(rc);
     }
@@ -4258 +4301 @@
 {
     RT_NOREF(uPass);
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     pDevIns->pHlpR3->pfnSSMPutMem(pSSM, &pThis->MacConfigured, sizeof(pThis->MacConfigured));
     return VINF_SSM_DONT_CALL_AGAIN;
@@ -4271 +4314 @@
 {
     RT_NOREF(pSSM);
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
 
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
@@ -4286 +4329 @@
 static DECLCALLBACK(int) dpNicSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
 
@@ -4359 +4402 @@
 static DECLCALLBACK(int) dpNicLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     RT_NOREF(pSSM);
 
@@ -4376 +4419 @@
 static DECLCALLBACK(int) dpNicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
-    PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDPNICSTATECC);
+    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
 
     if (SSM_VERSION_MAJOR_CHANGED(uVersion, DPNIC_SAVEDSTATE_VERSION))
@@ -4452 +4496 @@
     if (    memcmp(&Mac, &pThis->MacConfigured, sizeof(Mac))
         && (uPass == 0 || !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns)) )
-        LogRel(("DPNIC#%u: The mac address differs: config=%RTmac saved=%RTmac\n", DPNIC_INSTANCE, &pThis->MacConfigured, &Mac));
+        LogRel(("DPNIC#%u: The mac address differs: config=%RTmac saved=%RTmac\n", pThis->iInstance, &pThis->MacConfigured, &Mac));
 
     if (uPass == SSM_PASS_FINAL)
     {
         /* update promiscuous mode. */
-        if (pThis->pDrvR3)
-            pThis->pDrvR3->pfnSetPromiscuousMode(pThis->pDrvR3, 0 /* promiscuous enabled */);
+        if (pThisCC->pDrv)
+            pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, 0 /* promiscuous enabled */);
 
         /* Indicate link down to the guest OS that all network connections have
            been lost, unless we've been teleported here. */
         if (!PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns))
-            dp8390TempLinkDown(pThis);
+            dp8390TempLinkDown(pDevIns, pThis);
     }
 
@@ -4525 +4569 @@
                 free_pages = pCore->BNRY - pCore->CURR;
             }
-            Log2Func(("#%d: %u free pages (%u bytes)\n", DPNIC_INSTANCE, free_pages, free_pages * 256));
+            Log2Func(("#%d: %u free pages (%u bytes)\n", pThis->iInstance, free_pages, free_pages * 256));
 
             /* Six pages (1,536 bytes) is enough for the longest standard Ethernet frame
@@ -4533 +4577 @@
             {
                 rc = VERR_NET_NO_BUFFER_SPACE;
-                Log2Func(("#%d: Buffer space low, returning %Rrc!\n", DPNIC_INSTANCE, rc));
+                Log2Func(("#%d: Buffer space low, returning %Rrc!\n", pThis->iInstance, rc));
             }
         }
@@ -4548 +4592 @@
 static DECLCALLBACK(int) dpNicNet_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, INetworkDown);
-    PPDMDEVINS pDevIns = DPNICSTATE_2_DEVINS(pThis);
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, INetworkDown);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
 
     int rc = dp8390CanReceive(pDevIns, pThis);
@@ -4567 +4612 @@
     STAM_PROFILE_START(&pThis->StatRxOverflow, a);
     VMSTATE enmVMState;
-    while (RT_LIKELY(   (enmVMState = PDMDevHlpVMState(pThis->CTX_SUFF(pDevIns))) == VMSTATE_RUNNING
+    while (RT_LIKELY(   (enmVMState = PDMDevHlpVMState(pDevIns)) == VMSTATE_RUNNING
                      || enmVMState == VMSTATE_RUNNING_LS))
     {
@@ -4597 +4642 @@
 static DECLCALLBACK(int) dpNicNet_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
 {
-    PDPNICSTATE     pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, INetworkDown);
-    PPDMDEVINS      pDevIns = DPNICSTATE_2_DEVINS(pThis);
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, INetworkDown);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     int             rc;
 
@@ -4607 +4653 @@
     if (cb > 50) /* unqualified guess */
         pThis->Led.Asserted.s.fReading = pThis->Led.Actual.s.fReading = 1;
-    dp8390CoreReceiveLocked(pThis, (const uint8_t *)pvBuf, cb);
+    dp8390CoreReceiveLocked(pDevIns, pThis, (const uint8_t *)pvBuf, cb);
     pThis->Led.Actual.s.fReading = 0;
 
@@ -4622 +4668 @@
 static DECLCALLBACK(void) dpNicNet_XmitPending(PPDMINETWORKDOWN pInterface)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, INetworkDown);
-    dp8390CoreXmitPacket(pThis, true /*fOnWorkerThread*/);
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, INetworkDown);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    dp8390CoreXmitPacket(pDevIns, pThis, true /*fOnWorkerThread*/);
 }
 
@@ -4634 +4682 @@
 static DECLCALLBACK(int) dpNicGetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, INetworkConfig);
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, INetworkConfig);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+
+    LogFlowFunc(("#%d\n", pThis->iInstance));
     /// @todo This is broken!! We can't properly get the MAC address set by the guest
 #if 0
-    memcpy(pMac, pThis->aStationAddr, sizeof(*pMac));
+    memcpy(pMac, pThis->core.pg1.PAR, sizeof(*pMac));
 #else
     memcpy(pMac, pThis->aPROM, sizeof(*pMac));
@@ -4650 +4702 @@
 static DECLCALLBACK(PDMNETWORKLINKSTATE) dpNicGetLinkState(PPDMINETWORKCONFIG pInterface)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, INetworkConfig);
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, INetworkConfig);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+
     if (pThis->fLinkUp && !pThis->fLinkTempDown)
         return PDMNETWORKLINKSTATE_UP;
@@ -4667 +4722 @@
 static DECLCALLBACK(int) dpNicSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, INetworkConfig);
-    bool fLinkUp;
-
-    LogFlowFunc(("#%d\n", DPNIC_INSTANCE));
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, INetworkConfig);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    bool            fLinkUp;
+
+    LogFlowFunc(("#%d\n", pThis->iInstance));
     AssertMsgReturn(enmState > PDMNETWORKLINKSTATE_INVALID && enmState <= PDMNETWORKLINKSTATE_DOWN_RESUME,
                     ("Invalid link state: enmState=%d\n", enmState), VERR_INVALID_PARAMETER);
@@ -4676 +4733 @@
     if (enmState == PDMNETWORKLINKSTATE_DOWN_RESUME)
     {
-        dp8390TempLinkDown(pThis);
+        dp8390TempLinkDown(pDevIns, pThis);
         /*
          * Note that we do not notify the driver about the link state change because
@@ -4695 +4752 @@
             pThis->cLinkDownReported = 0;
             pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
-            int rc = PDMDevHlpTimerSetMillies(DPNICSTATE_2_DEVINS(pThis), pThis->hTimerRestore, pThis->cMsLinkUpDelay);
+            int rc = PDMDevHlpTimerSetMillies(pDevIns, pThis->hTimerRestore, pThis->cMsLinkUpDelay);
             AssertRC(rc);
         }
@@ -4704 +4761 @@
             pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
         }
-        Assert(!PDMDevHlpCritSectIsOwner(DPNICSTATE_2_DEVINS(pThis), &pThis->CritSect));
-        if (pThis->pDrvR3)
-            pThis->pDrvR3->pfnNotifyLinkChanged(pThis->pDrvR3, enmState);
+        Assert(!PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
+        if (pThisCC->pDrv)
+            pThisCC->pDrv->pfnNotifyLinkChanged(pThisCC->pDrv, enmState);
     }
     return VINF_SUCCESS;
@@ -4719 +4776 @@
 static DECLCALLBACK(int) dpNicQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, ILeds);
+    PDPNICSTATECC   pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, ILeds);
+    PPDMDEVINS      pDevIns = pThisCC->pDevIns;
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
     if (iLUN == 0)
     {
@@ -4736 +4795 @@
 static DECLCALLBACK(void *) dpNicQueryInterface(struct PDMIBASE *pInterface, const char *pszIID)
 {
-    PDPNICSTATE pThis = RT_FROM_MEMBER(pInterface, DPNICSTATE, IBase);
-    Assert(&pThis->IBase == pInterface);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThis->INetworkDown);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThis->INetworkConfig);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMILEDPORTS, &pThis->ILeds);
+    PDPNICSTATECC pThisCC = RT_FROM_MEMBER(pInterface, DPNICSTATECC, IBase);
+    Assert(&pThisCC->IBase == pInterface);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThisCC->IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThisCC->INetworkDown);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThisCC->INetworkConfig);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMILEDPORTS, &pThisCC->ILeds);
     return NULL;
 }
@@ -4751 +4810 @@
  * @interface_method_impl{PDMDEVREG,pfnPowerOff}
  */
-static DECLCALLBACK(void) dpNicPowerOff(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) dpNicR3PowerOff(PPDMDEVINS pDevIns)
 {
     /* Poke thread waiting for buffer space. */
-    dp8390WakeupReceive(pDevIns);
+    dp8390R3WakeupReceive(pDevIns);
 }
 
@@ -4763 +4822 @@
  * One port on the network card has been disconnected from the network.
  */
-static DECLCALLBACK(void) dpNicDetach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
-{
+static DECLCALLBACK(void) dpNicR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
+{
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDPNICSTATECC);
     RT_NOREF(fFlags);
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
-    LogFlowFunc(("#%d\n", DPNIC_INSTANCE));
+    LogFlowFunc(("#%d\n", pThis->iInstance));
 
     AssertLogRelReturnVoid(iLUN == 0);
@@ -4777 +4837 @@
      * Zero some important members.
      */
-    pThis->pDrvBase = NULL;
-    pThis->pDrvR3 = NULL;
-    pThis->pDrvR0 = NIL_RTR0PTR;
-    pThis->pDrvRC = NIL_RTRCPTR;
+    pThis->fDriverAttached = false;
+    pThisCC->pDrvBase = NULL;
+    pThisCC->pDrv     = NULL;
 
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -4790 +4849 @@
  * One port on the network card has been connected to a network.
  */
-static DECLCALLBACK(int) dpNicAttach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
-{
+static DECLCALLBACK(int) dpNicR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
+{
+    PDPNICSTATE      pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATECC    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDPNICSTATECC);
     RT_NOREF(fFlags);
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
-    LogFlowFunc(("#%d\n", DPNIC_INSTANCE));
+    LogFlowFunc(("#%d\n", pThis->iInstance));
 
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
@@ -4804 +4864 @@
      * Attach the driver.
      */
-    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Network Port");
+    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThisCC->IBase, &pThisCC->pDrvBase, "Network Port");
     if (RT_SUCCESS(rc))
     {
-        pThis->pDrvR3 = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKUP);
-        AssertMsgStmt(pThis->pDrvR3, ("Failed to obtain the PDMINETWORKUP interface!\n"),
+        pThisCC->pDrv = PDMIBASE_QUERY_INTERFACE(pThisCC->pDrvBase, PDMINETWORKUP);
+        AssertMsgStmt(pThisCC->pDrv, ("Failed to obtain the PDMINETWORKUP interface!\n"),
                       rc = VERR_PDM_MISSING_INTERFACE_BELOW);
-        pThis->pDrvR0 = PDMIBASER0_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASER0), PDMINETWORKUP);
-        pThis->pDrvRC = PDMIBASERC_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASERC), PDMINETWORKUP);
+        pThis->fDriverAttached = true;
     }
     else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
@@ -4818 +4877 @@
         /* This should never happen because this function is not called
          * if there is no driver to attach! */
-        LogFunc(("#%d No attached driver!\n", DPNIC_INSTANCE));
+        LogFunc(("#%d No attached driver!\n", pThis->iInstance));
     }
 
@@ -4827 +4886 @@
      */
     if (RT_SUCCESS(rc))
-        dp8390TempLinkDown(pThis);
+        dp8390TempLinkDown(pDevIns, pThis);
 
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -4837 +4896 @@
  * @interface_method_impl{PDMDEVREG,pfnSuspend}
  */
-static DECLCALLBACK(void) dpNicSuspend(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) dpNicR3Suspend(PPDMDEVINS pDevIns)
 {
     /* Poke thread waiting for buffer space. */
-    dp8390WakeupReceive(pDevIns);
+    dp8390R3WakeupReceive(pDevIns);
 }
 
@@ -4847 +4906 @@
  * @interface_method_impl{PDMDEVREG,pfnReset}
  */
-static DECLCALLBACK(void) dpNicReset(PPDMDEVINS pDevIns)
-{
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
-    LogFlowFunc(("#%d\n", DPNIC_INSTANCE));
+static DECLCALLBACK(void) dpNicR3Reset(PPDMDEVINS pDevIns)
+{
+    PDPNICSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    LogFlowFunc(("#%d\n", pThis->iInstance));
     if (pThis->fLinkTempDown)
     {
@@ -4858 +4917 @@
     }
 
-    dpNicR3HardReset(pThis);
+    dpNicR3HardReset(pDevIns, pThis);
 }
 
@@ -4865 +4924 @@
  * @interface_method_impl{PDMDEVREG,pfnRelocate}
  */
-static DECLCALLBACK(void) dpNicRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
-{
-    RT_NOREF(offDelta);
-    PDPNICSTATE pThis   = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
-    pThis->pDevInsRC    = PDMDEVINS_2_RCPTR(pDevIns);
+static DECLCALLBACK(void) dpNicR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+{
+    PDPNICSTATERC pThisRC = PDMINS_2_DATA_RC(pDevIns, PDPNICSTATERC);
+    pThisRC->pDrv += offDelta;
 }
 
@@ -4876 +4934 @@
  * @interface_method_impl{PDMDEVREG,pfnDestruct}
  */
-static DECLCALLBACK(int) dpNicDestruct(PPDMDEVINS pDevIns)
+static DECLCALLBACK(int) dpNicR3Destruct(PPDMDEVINS pDevIns)
 {
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
-    PDPNICSTATE pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
 
     if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->CritSect))
@@ -4895 +4953 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int) dpNicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int) dpNicR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PDPNICSTATE);
+    PDPNICSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDPNICSTATECC);
     PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
     PPDMIBASE       pBase;
@@ -4911 +4970 @@
     pThis->hIoPortsNic          = NIL_IOMIOPORTHANDLE;
     pThis->hIoPortsCore         = NIL_IOMIOPORTHANDLE;
+    pThisCC->pDevIns            = pDevIns;
 
     /*
@@ -5026 +5086 @@
      * Initialize data (most of it anyway).
      */
-    pThis->pDevInsR3                        = pDevIns;
-    pThis->pDevInsR0                        = PDMDEVINS_2_R0PTR(pDevIns);
-    pThis->pDevInsRC                        = PDMDEVINS_2_RCPTR(pDevIns);
-    pThis->Led.u32Magic                     = PDMLED_MAGIC;
+    pThis->Led.u32Magic                       = PDMLED_MAGIC;
     /* IBase */
-    pThis->IBase.pfnQueryInterface          = dpNicQueryInterface;
+    pThisCC->IBase.pfnQueryInterface          = dpNicQueryInterface;
     /* INetworkPort */
-    pThis->INetworkDown.pfnWaitReceiveAvail = dpNicNet_WaitReceiveAvail;
-    pThis->INetworkDown.pfnReceive          = dpNicNet_Receive;
-    pThis->INetworkDown.pfnXmitPending      = dpNicNet_XmitPending;
+    pThisCC->INetworkDown.pfnWaitReceiveAvail = dpNicNet_WaitReceiveAvail;
+    pThisCC->INetworkDown.pfnReceive          = dpNicNet_Receive;
+    pThisCC->INetworkDown.pfnXmitPending      = dpNicNet_XmitPending;
     /* INetworkConfig */
-    pThis->INetworkConfig.pfnGetMac         = dpNicGetMac;
-    pThis->INetworkConfig.pfnGetLinkState   = dpNicGetLinkState;
-    pThis->INetworkConfig.pfnSetLinkState   = dpNicSetLinkState;
+    pThisCC->INetworkConfig.pfnGetMac         = dpNicGetMac;
+    pThisCC->INetworkConfig.pfnGetLinkState   = dpNicGetLinkState;
+    pThisCC->INetworkConfig.pfnSetLinkState   = dpNicSetLinkState;
     /* ILeds */
-    pThis->ILeds.pfnQueryStatusLed          = dpNicQueryStatusLed;
+    pThisCC->ILeds.pfnQueryStatusLed          = dpNicQueryStatusLed;
 
     pThis->hIoPortsCore = NIL_IOMIOPORTHANDLE;
@@ -5176 +5233 @@
      * Register the info item.
      */
-    RTStrPrintf(szTmp, sizeof(szTmp), "dpnic%d", pDevIns->iInstance);
+    RTStrPrintf(szTmp, sizeof(szTmp), "dpnic%d", pThis->iInstance);
     PDMDevHlpDBGFInfoRegister(pDevIns, szTmp, "dpnic info", dpNicInfo);
 
@@ -5182 +5239 @@
      * Attach status driver (optional).
      */
-    rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThis->IBase, &pBase, "Status Port");
+    rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThisCC->IBase, &pBase, "Status Port");
     if (RT_SUCCESS(rc))
-        pThis->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
+        pThisCC->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
     else if (   rc != VERR_PDM_NO_ATTACHED_DRIVER
              && rc != VERR_PDM_CFG_MISSING_DRIVER_NAME)
@@ -5195 +5252 @@
      * Attach driver.
      */
-    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Network Port");
+    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThisCC->IBase, &pThisCC->pDrvBase, "Network Port");
     if (RT_SUCCESS(rc))
     {
-        pThis->pDrvR3 = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKUP);
-        AssertMsgReturn(pThis->pDrvR3, ("Failed to obtain the PDMINETWORKUP interface!\n"),
+        pThisCC->pDrv = PDMIBASE_QUERY_INTERFACE(pThisCC->pDrvBase, PDMINETWORKUP);
+        AssertMsgReturn(pThisCC->pDrv, ("Failed to obtain the PDMINETWORKUP interface!\n"),
                         VERR_PDM_MISSING_INTERFACE_BELOW);
-        pThis->pDrvR0 = PDMIBASER0_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASER0), PDMINETWORKUP);
-        pThis->pDrvRC = PDMIBASERC_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIBASERC), PDMINETWORKUP);
+        pThis->fDriverAttached = true;
     }
     else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
@@ -5216 +5272 @@
      * Reset the device state. (Do after attaching.)
      */
-    dpNicR3HardReset(pThis);
+    dpNicR3HardReset(pDevIns, pThis);
 
     /*
@@ -5343 +5399 @@
     /* .uSharedVersion = */         42,
     /* .cbInstanceShared = */       sizeof(DPNICSTATE),
-    /* .cbInstanceCC = */           0,
-    /* .cbInstanceRC = */           0,
+    /* .cbInstanceCC = */           sizeof(DPNICSTATECC),
+    /* .cbInstanceRC = */           sizeof(DPNICSTATERC),
     /* .cMaxPciDevices = */         0,
     /* .cMaxMsixVectors = */        0,
@@ -5351 +5407 @@
     /* .pszRCMod = */               "VBoxDDRC.rc",
     /* .pszR0Mod = */               "VBoxDDR0.r0",
-    /* .pfnConstruct = */           dpNicConstruct,
-    /* .pfnDestruct = */            dpNicDestruct,
-    /* .pfnRelocate = */            dpNicRelocate,
+    /* .pfnConstruct = */           dpNicR3Construct,
+    /* .pfnDestruct = */            dpNicR3Destruct,
+    /* .pfnRelocate = */            dpNicR3Relocate,
     /* .pfnMemSetup = */            NULL,
     /* .pfnPowerOn = */             NULL,
-    /* .pfnReset = */               dpNicReset,
-    /* .pfnSuspend = */             dpNicSuspend,
+    /* .pfnReset = */               dpNicR3Reset,
+    /* .pfnSuspend = */             dpNicR3Suspend,
     /* .pfnResume = */              NULL,
-    /* .pfnAttach = */              dpNicAttach,
-    /* .pfnDetach = */              dpNicDetach,
+    /* .pfnAttach = */              dpNicR3Attach,
+    /* .pfnDetach = */              dpNicR3Detach,
     /* .pfnQueryInterface = */      NULL,
     /* .pfnInitComplete = */        NULL,
-    /* .pfnPowerOff = */            dpNicPowerOff,
+    /* .pfnPowerOff = */            dpNicR3PowerOff,
     /* .pfnSoftReset = */           NULL,
     /* .pfnReserved0 = */           NULL,