Changeset 26305 in vbox for trunk/src/VBox/Devices/Network/DevPCNet.cpp

Timestamp:

Feb 5, 2010 7:00:45 PM (15 years ago)

Author:

vboxsync

Message:

pdmnetif.h & users: sketched out a new interface that is intended to be similar to the ring-0 and raw-mode context interfaces (working on driver allocated buffers during xmit).

File:

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

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

@@ -115 +115 @@
  * @extends     PCIDEVICE
  * @implements  PDMIBASE
- * @implements  PDMINETWORKPORT
+ * @implements  PDMINETWORKDOWN
  * @implements  PDMINETWORKCONFIG
  * @implements  PDMILEDPORTS
@@ -204 +204 @@
     PTMTIMERR3                          pTimerRestore;
     /** Pointer to the connector of the attached network driver. */
-    R3PTRTYPE(PPDMINETWORKCONNECTOR)    pDrv;
+    R3PTRTYPE(PPDMINETWORKUP)    pDrv;
     /** Pointer to the attached network driver. */
     R3PTRTYPE(PPDMIBASE)                pDrvBase;
@@ -210 +210 @@
     PDMIBASE                            IBase;
     /** LUN\#0: The network port interface. */
-    PDMINETWORKPORT                     INetworkPort;
+    PDMINETWORKDOWN                     INetworkDown;
     /** LUN\#0: The network config port interface. */
     PDMINETWORKCONFIG                   INetworkConfig;
@@ -2164 +2164 @@
         pThis->Led.Asserted.s.fWriting = pThis->Led.Actual.s.fWriting = 1;
 
-    pThis->pDrv->pfnSend(pThis->pDrv, pThis->pvSendFrame, pThis->cbSendFrame);
+    pThis->pDrv->pfnSendDeprecated(pThis->pDrv, pThis->pvSendFrame, pThis->cbSendFrame);
     STAM_REL_COUNTER_ADD(&pThis->StatTransmitBytes, pThis->cbSendFrame);
     pThis->Led.Actual.s.fWriting = 0;
@@ -4488 +4488 @@
     Assert(&pThis->IBase == pInterface);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKPORT, &pThis->INetworkPort);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThis->INetworkDown);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThis->INetworkConfig);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMILEDPORTS, &pThis->ILeds);
@@ -4494 +4494 @@
 }
 
-/** Converts a pointer to PCNetState::INetworkPort to a PCNetState pointer. */
-#define INETWORKPORT_2_DATA(pInterface)  ( (PCNetState *)((uintptr_t)pInterface - RT_OFFSETOF(PCNetState, INetworkPort)) )
+/** Converts a pointer to PCNetState::INetworkDown to a PCNetState pointer. */
+#define INETWORKPORT_2_DATA(pInterface)  ( (PCNetState *)((uintptr_t)pInterface - RT_OFFSETOF(PCNetState, INetworkDown)) )
 
 
@@ -4535 +4535 @@
  *
  */
-static DECLCALLBACK(int) pcnetWaitReceiveAvail(PPDMINETWORKPORT pInterface, RTMSINTERVAL cMillies)
+static DECLCALLBACK(int) pcnetWaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
     PCNetState *pThis = INETWORKPORT_2_DATA(pInterface);
@@ -4583 +4583 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) pcnetReceive(PPDMINETWORKPORT pInterface, const void *pvBuf, size_t cb)
+static DECLCALLBACK(int) pcnetReceive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
 {
     PCNetState *pThis = INETWORKPORT_2_DATA(pInterface);
@@ -4820 +4820 @@
 #endif
         }
-        pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKCONNECTOR);
-        AssertMsgStmt(pThis->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
+        pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKUP);
+        AssertMsgStmt(pThis->pDrv, ("Failed to obtain the PDMINETWORKUP interface!\n"),
                       rc = VERR_PDM_MISSING_INTERFACE_BELOW);
     }
@@ -5010 +5010 @@
     pThis->IBase.pfnQueryInterface          = pcnetQueryInterface;
     /* INeworkPort */
-    pThis->INetworkPort.pfnWaitReceiveAvail = pcnetWaitReceiveAvail;
-    pThis->INetworkPort.pfnReceive          = pcnetReceive;
+    pThis->INetworkDown.pfnWaitReceiveAvail = pcnetWaitReceiveAvail;
+    pThis->INetworkDown.pfnReceive          = pcnetReceive;
     /* INetworkConfig */
     pThis->INetworkConfig.pfnGetMac         = pcnetGetMac;
@@ -5201 +5201 @@
 #endif
         }
-        pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKCONNECTOR);
-        AssertMsgReturn(pThis->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
+        pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKUP);
+        AssertMsgReturn(pThis->pDrv, ("Failed to obtain the PDMINETWORKUP interface!\n"),
                         VERR_PDM_MISSING_INTERFACE_BELOW);
     }