Changeset 28320 in vbox for trunk/include

Timestamp:

Apr 14, 2010 6:26:24 PM (15 years ago)

Author:

vboxsync

Message:

Network/D*,VMM: Moving the TX threads, part 1.

Location:

trunk/include/VBox

Files:

• pdmifs.h (modified) (10 diffs)
• pdmnetifs.h (modified) (2 diffs)

trunk/include/VBox/pdmifs.h

@@ -118 +118 @@
         if (RTUuidCompare2Strs((pszIID), InterfaceType##_IID) == 0) \
         { \
-            InterfaceType *pReturnInterfaceTypeCheck = (pInterface); \
+            P##InterfaceType pReturnInterfaceTypeCheck = (pInterface); \
             return pReturnInterfaceTypeCheck; \
         } \
@@ -159 +159 @@
  * @returns PDMIBASERC::pfnQueryInterface return value.
  *
- * @param   pIBaseRC        Pointer to the base ring-0 interface.
- * @param   InterfaceType   The interface type name.  The interface ID is
- *                          derived from this by appending _IID.
+ * @param   pIBaseRC        Pointer to the base raw-mode context interface.  Can
+ *                          be NULL.
+ * @param   InterfaceType   The interface type base name, no trailing RC.  The
+ *                          interface ID is derived from this by appending _IID.
  *
  * @remarks Unlike PDMIBASE_QUERY_INTERFACE, this macro is not able to do any
@@ -167 +168 @@
  */
 #define PDMIBASERC_QUERY_INTERFACE(pIBaseRC, InterfaceType)  \
-    ( (InterfaceType *)(pIBaseRC)->pfnQueryInterface(pIBaseRC, InterfaceType##_IID ) )
+    ( (P##InterfaceType##RC)((pIBaseRC) ? (pIBaseRC)->pfnQueryInterface(pIBaseRC, InterfaceType##_IID) : NIL_RTRCPTR) )
 
 /**
@@ -177 +178 @@
  * @param   pIns            Pointer to the instance data.
  * @param   pszIID          The ID of the interface that is being queried.
- * @param   InterfaceType   The interface type name.  The interface ID is
- *                          derived from this by appending _IID.
+ * @param   InterfaceType   The interface type base name, no trailing RC.  The
+ *                          interface ID is derived from this by appending _IID.
  * @param   pInterface      The interface address expression.  This must resolve
  *                          to some address within the instance data.
+ * @remarks Don't use with PDMIBASE.
  */
 #define PDMIBASERC_RETURN_INTERFACE(pIns, pszIID, InterfaceType, pInterface)  \
@@ -187 +189 @@
         if (RTUuidCompare2Strs((pszIID), InterfaceType##_IID) == 0) \
         { \
-            InterfaceType *pReturnInterfaceTypeCheck = (pInterface); \
+            InterfaceType##RC *pReturnInterfaceTypeCheck = (pInterface); \
             return (uintptr_t)pReturnInterfaceTypeCheck \
                  - PDMINS_2_DATA(pIns, uintptr_t) \
@@ -229 +231 @@
  * @returns PDMIBASER0::pfnQueryInterface return value.
  *
- * @param   pIBaseR0        Pointer to the base ring-0 interface.
- * @param   InterfaceType   The interface type name.  The interface ID is
- *                          derived from this by appending _IID.
+ * @param   pIBaseR0        Pointer to the base ring-0 interface.  Can be NULL.
+ * @param   InterfaceType   The interface type base name, no trailing R0.  The
+ *                          interface ID is derived from this by appending _IID.
  *
  * @remarks Unlike PDMIBASE_QUERY_INTERFACE, this macro is not able to do any
@@ -237 +239 @@
  */
 #define PDMIBASER0_QUERY_INTERFACE(pIBaseR0, InterfaceType)  \
-    ( (InterfaceType *)(pIBaseR0)->pfnQueryInterface(pIBaseR0, InterfaceType##_IID ) )
+    ( (P##InterfaceType##R0)((pIBaseR0) ? (pIBaseR0)->pfnQueryInterface(pIBaseR0, InterfaceType##_IID) : NIL_RTR0PTR) )
 
 /**
@@ -247 +249 @@
  * @param   pIns            Pointer to the instance data.
  * @param   pszIID          The ID of the interface that is being queried.
- * @param   InterfaceType   The interface type name.  The interface ID is
- *                          derived from this by appending _IID.
+ * @param   InterfaceType   The interface type base name, no trailing R0.  The
+ *                          interface ID is derived from this by appending _IID.
  * @param   pInterface      The interface address expression.  This must resolve
  *                          to some address within the instance data.
+ * @remarks Don't use with PDMIBASE.
  */
 #define PDMIBASER0_RETURN_INTERFACE(pIns, pszIID, InterfaceType, pInterface)  \
@@ -257 +260 @@
         if (RTUuidCompare2Strs((pszIID), InterfaceType##_IID) == 0) \
         { \
-            InterfaceType *pReturnInterfaceTypeCheck = (pInterface); \
+            InterfaceType##R0 *pReturnInterfaceTypeCheck = (pInterface); \
             return (uintptr_t)pReturnInterfaceTypeCheck \
                  - PDMINS_2_DATA(pIns, uintptr_t) \
@@ -1507 +1510 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnNotifyStatusLinesChanged,(PPDMICHARPORT pInterface, uint32_t fNewStatusLines));
-    
+
     /**
      * Notify the device when the driver buffer is full.

trunk/include/VBox/pdmnetifs.h

@@ -177 +177 @@
 
 /** Pointer to a network connector interface */
-typedef struct PDMINETWORKUP *PPDMINETWORKUP;
+typedef R3PTRTYPE(struct PDMINETWORKUP *) PPDMINETWORKUPR3;
+/** Pointer to a network connector interface, ring-0 context. */
+typedef R0PTRTYPE(struct PDMINETWORKUPR0 *) PPDMINETWORKUPR0;
+/** Pointer to a network connector interface, raw-mode context. */
+typedef RCPTRTYPE(struct PDMINETWORKUPRC *) PPDMINETWORKUPRC;
+/** Pointer to a current context network connector interface. */
+typedef CTX_SUFF(PPDMINETWORKUP) PPDMINETWORKUP;
+
 /**
  * Network connector interface (up).
@@ -307 +314 @@
 
 } PDMINETWORKUP;
+
+/** Ring-0 edition of PDMINETWORKUP. */
+typedef struct PDMINETWORKUPR0
+{
+    /** @copydoc PDMINETWORKUP::pfnBeginXmit */
+    DECLR0CALLBACKMEMBER(int,  pfnBeginXmit,(PPDMINETWORKUPR0 pInterface, bool fOnWorkerThread));
+    /** @copydoc PDMINETWORKUP::pfnAllocBuf */
+    DECLR0CALLBACKMEMBER(int,  pfnAllocBuf,(PPDMINETWORKUPR0 pInterface, size_t cbMin, PCPDMNETWORKGSO pGso,
+                                            PPPDMSCATTERGATHER ppSgBuf));
+    /** @copydoc PDMINETWORKUP::pfnFreeBuf */
+    DECLR0CALLBACKMEMBER(int,  pfnFreeBuf,(PPDMINETWORKUPR0 pInterface, PPDMSCATTERGATHER pSgBuf));
+    /** @copydoc PDMINETWORKUP::pfnSendBuf */
+    DECLR0CALLBACKMEMBER(int,  pfnSendBuf,(PPDMINETWORKUPR0 pInterface, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread));
+    /** @copydoc PDMINETWORKUP::pfnEndBuf */
+    DECLR0CALLBACKMEMBER(void, pfnEndXmit,(PPDMINETWORKUPR0 pInterface));
+    /** @copydoc PDMINETWORKUP::pfnSetPromiscuousMode */
+    DECLR0CALLBACKMEMBER(void, pfnSetPromiscuousMode,(PPDMINETWORKUPR0 pInterface, bool fPromiscuous));
+} PDMINETWORKUPR0;
+
+/** Raw-mode context edition of PDMINETWORKUP. */
+typedef struct PDMINETWORKUPRC
+{
+    /** @copydoc PDMINETWORKUP::pfnBeginXmit */
+    DECLRCCALLBACKMEMBER(int,  pfnBeginXmit,(PPDMINETWORKUPRC pInterface, bool fOnWorkerThread));
+    /** @copydoc PDMINETWORKUP::pfnAllocBuf */
+    DECLRCCALLBACKMEMBER(int,  pfnAllocBuf,(PPDMINETWORKUPRC pInterface, size_t cbMin, PCPDMNETWORKGSO pGso,
+                                            PPPDMSCATTERGATHER ppSgBuf));
+    /** @copydoc PDMINETWORKUP::pfnFreeBuf */
+    DECLRCCALLBACKMEMBER(int,  pfnFreeBuf,(PPDMINETWORKUPRC pInterface, PPDMSCATTERGATHER pSgBuf));
+    /** @copydoc PDMINETWORKUP::pfnSendBuf */
+    DECLRCCALLBACKMEMBER(int,  pfnSendBuf,(PPDMINETWORKUPRC pInterface, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread));
+    /** @copydoc PDMINETWORKUP::pfnEndBuf */
+    DECLRCCALLBACKMEMBER(void, pfnEndXmit,(PPDMINETWORKUPRC pInterface));
+    /** @copydoc PDMINETWORKUP::pfnSetPromiscuousMode */
+    DECLRCCALLBACKMEMBER(void, pfnSetPromiscuousMode,(PPDMINETWORKUPRC pInterface, bool fPromiscuous));
+} PDMINETWORKUPRC;
+
 /** PDMINETWORKUP interface ID. */
 #define PDMINETWORKUP_IID                       "67e7e7a8-2594-4649-a1e3-7cee680c6083"