Changeset 25891 in vbox for trunk/include/VBox

Timestamp:

Jan 18, 2010 1:07:21 PM (15 years ago)

Author:

vboxsync

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

56701

Message:

PDMDrv,*: multi context drivers, part 1.

Location:

trunk/include/VBox

Files:

• pdmcommon.h (modified) (1 diff)
• pdmdev.h (modified) (1 diff)
• pdmdrv.h (modified) (38 diffs)

trunk/include/VBox/pdmcommon.h ¶

@@ -49 +49 @@
 /** The attach/detach command is not a hotplug event. */
 #define PDM_TACH_FLAGS_NOT_HOT_PLUG     RT_BIT_32(0)
+/** Indicates that no attach or detach callbacks should be made.
+ * This is mostly for internal use.  */
+#define PDM_TACH_FLAGS_NO_CALLBACKS     RT_BIT_32(1)
 /* @} */
 

trunk/include/VBox/pdmdev.h ¶

@@ -3259 +3259 @@
     uint32_t                    u32Version;
     /** Device instance number. */
-    RTUINT                      iInstance;
+    uint32_t                    iInstance;
 
     /** Pointer the GC PDM Device API. */

trunk/include/VBox/pdmdrv.h ¶

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -55 +55 @@
  * @{
  */
+
+/** Pointer const PDM Driver API, ring-3. */
+typedef R3PTRTYPE(struct PDMDRVHLPR3 const *) PCPDMDRVHLPR3;
+/** Pointer const PDM Driver API, ring-0. */
+typedef R0PTRTYPE(struct PDMDRVHLPR0 const *) PCPDMDRVHLPR0;
+/** Pointer const PDM Driver API, raw-mode context. */
+typedef RCPTRTYPE(struct PDMDRVHLPRC const *) PCPDMDRVHLPRC;
+
 
 /**
@@ -242 +250 @@
 
 /** Current DRVREG version number. */
-#define PDM_DRVREG_VERSION  0x80020000
+#define PDM_DRVREG_VERSION  UINT32_C(0x80030000)
 
 /** PDM Driver Flags.
@@ -249 +257 @@
  * The bit count for the current host. */
 #if HC_ARCH_BITS == 32
-# define PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT     0x000000001
+# define PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT     UINT32_C(0x00000001)
 #elif HC_ARCH_BITS == 64
-# define PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT     0x000000002
+# define PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT     UINT32_C(0x00000002)
 #else
 # error Unsupported HC_ARCH_BITS value.
 #endif
 /** The host bit count mask. */
-#define PDM_DRVREG_FLAGS_HOST_BITS_MASK         0x000000003
+#define PDM_DRVREG_FLAGS_HOST_BITS_MASK         UINT32_C(0x00000003)
+/** This flag is used to indicate that the driver has a RC component. */
+#define PDM_DRVREG_FLAGS_RC                     UINT32_C(0x00000010)
+/** This flag is used to indicate that the driver has a R0 component. */
+#define PDM_DRVREG_FLAGS_R0                     UINT32_C(0x00000020)
 
 /** @} */
@@ -299 +311 @@
 
 /**
+ * PDM Driver Instance.
+ */
+typedef struct PDMDRVINS
+{
+    /** Structure version. PDM_DRVINS_VERSION defines the current version. */
+    uint32_t                    u32Version;
+    /** Driver instance number. */
+    uint32_t                    iInstance;
+
+    /** Pointer the PDM Driver API. */
+    RCPTRTYPE(PCPDMDRVHLPRC)    pDrvHlpRC;
+    /** Pointer to driver instance data. */
+    RCPTRTYPE(void *)           pvInstanceDataRC;
+
+    /** Pointer the PDM Driver API. */
+    R0PTRTYPE(PCPDMDRVHLPR0)    pDrvHlpR0;
+    /** Pointer to driver instance data. */
+    R0PTRTYPE(void *)           pvInstanceDataR0;
+
+    /** Pointer the PDM Driver API. */
+    R3PTRTYPE(PCPDMDRVHLPR3)    pDrvHlpR3;
+    /** Pointer to driver instance data. */
+    R3PTRTYPE(void *)           pvInstanceDataR3;
+
+    /** Pointer to driver registration structure.  */
+    R3PTRTYPE(PCPDMDRVREG)      pDrvReg;
+    /** Configuration handle. */
+    R3PTRTYPE(PCFGMNODE)        pCfgHandle;
+
+    /** Pointer to the base interface of the device/driver instance above. */
+    R3PTRTYPE(PPDMIBASE)        pUpBase;
+    /** Pointer to the base interface of the driver instance below. */
+    R3PTRTYPE(PPDMIBASE)        pDownBase;
+
+    /** The base interface of the driver.
+     * The driver constructor initializes this. */
+    PDMIBASE                    IBase;
+    /** Align the internal data more naturally. */
+    RTR3PTR                     R3PtrPadding;
+
+    /** Internal data. */
+    union
+    {
+#ifdef PDMDRVINSINT_DECLARED
+        PDMDRVINSINT            s;
+#endif
+        uint8_t                 padding[HC_ARCH_BITS == 32 ? 40 + 32 : 72 + 24];
+    } Internal;
+
+    /** Driver instance data. The size of this area is defined
+     * in the PDMDRVREG::cbInstanceData field. */
+    char                        achInstanceData[4];
+} PDMDRVINS;
+
+/** Current DRVREG version number. */
+#define PDM_DRVINS_VERSION      UINT32_C(0xa0020000)
+
+/** Converts a pointer to the PDMDRVINS::IBase to a pointer to PDMDRVINS. */
+#define PDMIBASE_2_PDMDRV(pInterface) ( (PPDMDRVINS)((char *)(pInterface) - RT_OFFSETOF(PDMDRVINS, IBase)) )
+
+
+
+
+/**
  * USB hub registration structure.
  */
@@ -339 +415 @@
 
 /** Current PDMUSBHUBREG version number. */
-#define PDM_USBHUBREG_VERSION       0xeb010000
+#define PDM_USBHUBREG_VERSION       UINT32_C(0xeb010000)
 
 
@@ -362 +438 @@
 
 /** Current PDMUSBHUBHLP version number. */
-#define PDM_USBHUBHLP_VERSION       0xea010000
-
-
-
-/**
- * Poller callback.
- *
- * @param   pDrvIns     The driver instance.
- */
-typedef DECLCALLBACK(void) FNPDMDRVPOLLER(PPDMDRVINS pDrvIns);
-/** Pointer to a FNPDMDRVPOLLER function. */
-typedef FNPDMDRVPOLLER *PFNPDMDRVPOLLER;
+#define PDM_USBHUBHLP_VERSION       UINT32_C(0xea010000)
+
 
 #ifdef IN_RING3
@@ -379 +445 @@
  * PDM Driver API.
  */
-typedef struct PDMDRVHLP
+typedef struct PDMDRVHLPR3
 {
     /** Structure version. PDM_DRVHLP_VERSION defines the current version. */
@@ -761 +827 @@
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
-} PDMDRVHLP;
-/** Pointer PDM Driver API. */
-typedef PDMDRVHLP *PPDMDRVHLP;
-/** Pointer const PDM Driver API. */
-typedef const PDMDRVHLP *PCPDMDRVHLP;
-
+} PDMDRVHLPR3;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLP_VERSION  0x90050000
-
-
-
-/**
- * PDM Driver Instance.
- */
-typedef struct PDMDRVINS
-{
-    /** Structure version. PDM_DRVINS_VERSION defines the current version. */
-    uint32_t                    u32Version;
-
-    /** Internal data. */
-    union
-    {
-#ifdef PDMDRVINSINT_DECLARED
-        PDMDRVINSINT            s;
-#endif
-        uint8_t                 padding[HC_ARCH_BITS == 32 ? 32 : 64];
-    } Internal;
-
-    /** Pointer the PDM Driver API. */
-    R3PTRTYPE(PCPDMDRVHLP)      pDrvHlp;
-    /** Pointer to driver registration structure.  */
-    R3PTRTYPE(PCPDMDRVREG)      pDrvReg;
-    /** Configuration handle. */
-    R3PTRTYPE(PCFGMNODE)        pCfgHandle;
-    /** Driver instance number. */
-    RTUINT                      iInstance;
-    /** Pointer to the base interface of the device/driver instance above. */
-    R3PTRTYPE(PPDMIBASE)        pUpBase;
-    /** Pointer to the base interface of the driver instance below. */
-    R3PTRTYPE(PPDMIBASE)        pDownBase;
-    /** The base interface of the driver.
-     * The driver constructor initializes this. */
-    PDMIBASE                    IBase;
-    /* padding to make achInstanceData aligned at 16 byte boundrary. */
-    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 3 : 1];
-    /** Pointer to driver instance data. */
-    R3PTRTYPE(void *)           pvInstanceData;
-    /** Driver instance data. The size of this area is defined
-     * in the PDMDRVREG::cbInstanceData field. */
-    char                        achInstanceData[4];
-} PDMDRVINS;
-
-/** Current DRVREG version number. */
-#define PDM_DRVINS_VERSION  0xa0010000
-
-/** Converts a pointer to the PDMDRVINS::IBase to a pointer to PDMDRVINS. */
-#define PDMIBASE_2_PDMDRV(pInterface) ( (PPDMDRVINS)((char *)(pInterface) - RT_OFFSETOF(PDMDRVINS, IBase)) )
+#define PDM_DRVHLPR3_VERSION    UINT32_C(0x90050000)
+
 
 /**
@@ -826 +839 @@
     va_list va;
     va_start(va, pszFormat);
-    pDrvIns->pDrvHlp->pfnVMSetErrorV(pDrvIns, rc, RT_SRC_POS_ARGS, pszFormat, va);
+    pDrvIns->CTX_SUFF(pDrvHlp)->pfnVMSetErrorV(pDrvIns, rc, RT_SRC_POS_ARGS, pszFormat, va);
     va_end(va);
     return rc;
@@ -836 +849 @@
 #define PDMDRV_SET_ERROR(pDrvIns, rc, pszError)  \
     PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, "%s", pszError)
+
+/**
+ * @copydoc PDMDRVHLP::pfnVMSetErrorV
+ */
+DECLINLINE(int) PDMDrvHlpVMSetErrorV(PPDMDRVINS pDrvIns, const int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va)
+{
+    return pDrvIns->CTX_SUFF(pDrvHlp)->pfnVMSetErrorV(pDrvIns, rc, RT_SRC_POS_ARGS, pszFormat, va);
+}
+
 
 /**
@@ -845 +867 @@
     int rc;
     va_start(va, pszFormat);
-    rc = pDrvIns->pDrvHlp->pfnVMSetRuntimeErrorV(pDrvIns, fFlags, pszErrorId, pszFormat, va);
+    rc = pDrvIns->CTX_SUFF(pDrvHlp)->pfnVMSetRuntimeErrorV(pDrvIns, fFlags, pszErrorId, pszFormat, va);
     va_end(va);
     return rc;
@@ -856 +878 @@
     PDMDrvHlpVMSetRuntimeError(pDrvIns, fFlags, pszErrorId, "%s", pszError)
 
+/**
+ * @copydoc PDMDRVHLP::pfnVMSetRuntimeErrorV
+ */
+DECLINLINE(int) PDMDrvHlpVMSetRuntimeErrorV(PPDMDRVINS pDrvIns, uint32_t fFlags, const char *pszErrorId, const char *pszFormat, va_list va)
+{
+    return pDrvIns->CTX_SUFF(pDrvHlp)->pfnVMSetRuntimeErrorV(pDrvIns, fFlags, pszErrorId, pszFormat, va);
+}
+
 #endif /* IN_RING3 */
 
@@ -863 +893 @@
  */
 #ifdef VBOX_STRICT
-# define PDMDRV_ASSERT_EMT(pDrvIns)  pDrvIns->pDrvHlp->pfnAssertEMT(pDrvIns, __FILE__, __LINE__, __FUNCTION__)
+# define PDMDRV_ASSERT_EMT(pDrvIns)  pDrvIns->CTX_SUFF(pDrvHlp)->pfnAssertEMT(pDrvIns, __FILE__, __LINE__, __FUNCTION__)
 #else
 # define PDMDRV_ASSERT_EMT(pDrvIns)  do { } while (0)
@@ -872 +902 @@
  */
 #ifdef VBOX_STRICT
-# define PDMDRV_ASSERT_OTHER(pDrvIns)  pDrvIns->pDrvHlp->pfnAssertOther(pDrvIns, __FILE__, __LINE__, __FUNCTION__)
+# define PDMDRV_ASSERT_OTHER(pDrvIns)  pDrvIns->CTX_SUFF(pDrvHlp)->pfnAssertOther(pDrvIns, __FILE__, __LINE__, __FUNCTION__)
 #else
 # define PDMDRV_ASSERT_OTHER(pDrvIns)  do { } while (0)
@@ -885 +915 @@
 DECLINLINE(int) PDMDrvHlpAttach(PPDMDRVINS pDrvIns, uint32_t fFlags, PPDMIBASE *ppBaseInterface)
 {
-    return pDrvIns->pDrvHlp->pfnAttach(pDrvIns, fFlags, ppBaseInterface);
+    return pDrvIns->pDrvHlpR3->pfnAttach(pDrvIns, fFlags, ppBaseInterface);
 }
 
@@ -896 +926 @@
 DECLINLINE(int) PDMDrvHlpNoAttach(PPDMDRVINS pDrvIns)
 {
-    return pDrvIns->pDrvHlp->pfnAttach(pDrvIns, 0, NULL);
+    return pDrvIns->pDrvHlpR3->pfnAttach(pDrvIns, 0, NULL);
 }
 
@@ -904 +934 @@
 DECLINLINE(int) PDMDrvHlpDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
-    return pDrvIns->pDrvHlp->pfnDetach(pDrvIns, fFlags);
+    return pDrvIns->pDrvHlpR3->pfnDetach(pDrvIns, fFlags);
 }
 
@@ -912 +942 @@
 DECLINLINE(int) PDMDrvHlpDetachSelf(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
-    return pDrvIns->pDrvHlp->pfnDetachSelf(pDrvIns, fFlags);
+    return pDrvIns->pDrvHlpR3->pfnDetachSelf(pDrvIns, fFlags);
+}
+
+/**
+ * @copydoc PDMDRVHLP::pfnMountPrepare
+ */
+DECLINLINE(int) PDMDrvHlpMountPrepare(PPDMDRVINS pDrvIns, const char *pszFilename, const char *pszCoreDriver)
+{
+    return pDrvIns->pDrvHlpR3->pfnMountPrepare(pDrvIns, pszFilename, pszCoreDriver);
 }
 
@@ -920 +958 @@
 DECLINLINE(VMSTATE) PDMDrvHlpVMState(PPDMDRVINS pDrvIns)
 {
-    return pDrvIns->pDrvHlp->pfnVMState(pDrvIns);
+    return pDrvIns->CTX_SUFF(pDrvHlp)->pfnVMState(pDrvIns);
 }
 
@@ -928 +966 @@
 DECLINLINE(bool) PDMDrvHlpVMTeleportedAndNotFullyResumedYet(PPDMDRVINS pDrvIns)
 {
-    return pDrvIns->pDrvHlp->pfnVMTeleportedAndNotFullyResumedYet(pDrvIns);
+    return pDrvIns->pDrvHlpR3->pfnVMTeleportedAndNotFullyResumedYet(pDrvIns);
 }
 
@@ -937 +975 @@
                                         PFNPDMQUEUEDRV pfnCallback, const char *pszName, PPDMQUEUE *ppQueue)
 {
-    return pDrvIns->pDrvHlp->pfnPDMQueueCreate(pDrvIns, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, ppQueue);
+    return pDrvIns->pDrvHlpR3->pfnPDMQueueCreate(pDrvIns, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, ppQueue);
 }
 
@@ -945 +983 @@
 DECLINLINE(uint64_t) PDMDrvHlpTMGetVirtualFreq(PPDMDRVINS pDrvIns)
 {
-    return pDrvIns->pDrvHlp->pfnTMGetVirtualFreq(pDrvIns);
+    return pDrvIns->pDrvHlpR3->pfnTMGetVirtualFreq(pDrvIns);
 }
 
@@ -953 +991 @@
 DECLINLINE(uint64_t) PDMDrvHlpTMGetVirtualTime(PPDMDRVINS pDrvIns)
 {
-    return pDrvIns->pDrvHlp->pfnTMGetVirtualTime(pDrvIns);
+    return pDrvIns->pDrvHlpR3->pfnTMGetVirtualTime(pDrvIns);
 }
 
@@ -961 +999 @@
 DECLINLINE(int) PDMDrvHlpTMTimerCreate(PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
 {
-    return pDrvIns->pDrvHlp->pfnTMTimerCreate(pDrvIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
+    return pDrvIns->pDrvHlpR3->pfnTMTimerCreate(pDrvIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
 }
 
@@ -978 +1016 @@
                                      PFNSSMDRVSAVEEXEC pfnSaveExec, PFNSSMDRVLOADEXEC pfnLoadExec)
 {
-    return pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, uVersion, cbGuess,
-                                            NULL /*pfnLivePrep*/, NULL /*pfnLiveExec*/, NULL /*pfnLiveVote*/,
-                                            NULL /*pfnSavePrep*/, pfnSaveExec,          NULL /*pfnSaveDone*/,
-                                            NULL /*pfnLoadPrep*/, pfnLoadExec,          NULL /*pfnLoadDone*/);
+    return pDrvIns->pDrvHlpR3->pfnSSMRegister(pDrvIns, uVersion, cbGuess,
+                                              NULL /*pfnLivePrep*/, NULL /*pfnLiveExec*/, NULL /*pfnLiveVote*/,
+                                              NULL /*pfnSavePrep*/, pfnSaveExec,          NULL /*pfnSaveDone*/,
+                                              NULL /*pfnLoadPrep*/, pfnLoadExec,          NULL /*pfnLoadDone*/);
 }
 
@@ -992 +1030 @@
                                        PFNSSMDRVLOADPREP pfnLoadPrep, PFNSSMDRVLOADEXEC pfnLoadExec, PFNSSMDRVLOADDONE pfnLoadDone)
 {
-    return pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, uVersion, cbGuess,
-                                            pfnLivePrep, pfnLiveExec, pfnLiveVote,
-                                            pfnSavePrep, pfnSaveExec, pfnSaveDone,
-                                            pfnLoadPrep, pfnLoadExec, pfnLoadDone);
+    return pDrvIns->pDrvHlpR3->pfnSSMRegister(pDrvIns, uVersion, cbGuess,
+                                              pfnLivePrep, pfnLiveExec, pfnLiveVote,
+                                              pfnSavePrep, pfnSaveExec, pfnSaveDone,
+                                              pfnLoadPrep, pfnLoadExec, pfnLoadDone);
 }
 
@@ -1007 +1045 @@
 DECLINLINE(int) PDMDrvHlpSSMRegisterLoadDone(PPDMDRVINS pDrvIns, PFNSSMDRVLOADDONE pfnLoadDone)
 {
-    return pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, 0 /*uVersion*/, 0 /*cbGuess*/,
-                                            NULL /*pfnLivePrep*/, NULL /*pfnLiveExec*/, NULL /*pfnLiveVote*/,
-                                            NULL /*pfnSavePrep*/, NULL /*pfnSaveExec*/, NULL /*pfnSaveDone*/,
-                                            NULL /*pfnLoadPrep*/, NULL /*pfnLoadExec*/, pfnLoadDone);
+    return pDrvIns->pDrvHlpR3->pfnSSMRegister(pDrvIns, 0 /*uVersion*/, 0 /*cbGuess*/,
+                                              NULL /*pfnLivePrep*/, NULL /*pfnLiveExec*/, NULL /*pfnLiveVote*/,
+                                              NULL /*pfnSavePrep*/, NULL /*pfnSaveExec*/, NULL /*pfnSaveDone*/,
+                                              NULL /*pfnLoadPrep*/, NULL /*pfnLoadExec*/, pfnLoadDone);
 }
 
@@ -1018 +1056 @@
 DECLINLINE(void) PDMDrvHlpSTAMRegister(PPDMDRVINS pDrvIns, void *pvSample, STAMTYPE enmType, const char *pszName, STAMUNIT enmUnit, const char *pszDesc)
 {
-    pDrvIns->pDrvHlp->pfnSTAMRegister(pDrvIns, pvSample, enmType, pszName, enmUnit, pszDesc);
+    pDrvIns->pDrvHlpR3->pfnSTAMRegister(pDrvIns, pvSample, enmType, pszName, enmUnit, pszDesc);
 }
 
@@ -1029 +1067 @@
     va_list va;
     va_start(va, pszName);
-    pDrvIns->pDrvHlp->pfnSTAMRegisterV(pDrvIns, pvSample, enmType, enmVisibility, enmUnit, pszDesc, pszName, va);
+    pDrvIns->pDrvHlpR3->pfnSTAMRegisterV(pDrvIns, pvSample, enmType, enmVisibility, enmUnit, pszDesc, pszName, va);
     va_end(va);
 }
@@ -1038 +1076 @@
 DECLINLINE(int) PDMDrvHlpSTAMDeregister(PPDMDRVINS pDrvIns, void *pvSample)
 {
-    return pDrvIns->pDrvHlp->pfnSTAMDeregister(pDrvIns, pvSample);
+    return pDrvIns->pDrvHlpR3->pfnSTAMDeregister(pDrvIns, pvSample);
+}
+
+/**
+ * @copydoc PDMDRVHLP::pfnSUPCallVMMR0Ex
+ */
+DECLINLINE(int) PDMDrvHlpSUPCallVMMR0Ex(PPDMDRVINS pDrvIns, unsigned uOperation, void *pvArg, unsigned cbArg)
+{
+    return pDrvIns->pDrvHlpR3->pfnSUPCallVMMR0Ex(pDrvIns, uOperation, pvArg, cbArg);
 }
 
@@ -1046 +1092 @@
 DECLINLINE(int) PDMDrvHlpUSBRegisterHub(PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp)
 {
-    return pDrvIns->pDrvHlp->pfnUSBRegisterHub(pDrvIns, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp);
+    return pDrvIns->pDrvHlpR3->pfnUSBRegisterHub(pDrvIns, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp);
 }
 
@@ -1054 +1100 @@
 DECLINLINE(int) PDMDrvHlpSetAsyncNotification(PPDMDRVINS pDrvIns, PFNPDMDRVASYNCNOTIFY pfnAsyncNotify)
 {
-    return pDrvIns->pDrvHlp->pfnSetAsyncNotification(pDrvIns, pfnAsyncNotify);
+    return pDrvIns->pDrvHlpR3->pfnSetAsyncNotification(pDrvIns, pfnAsyncNotify);
 }
 
@@ -1062 +1108 @@
 DECLINLINE(void) PDMDrvHlpAsyncNotificationCompleted(PPDMDRVINS pDrvIns)
 {
-    pDrvIns->pDrvHlp->pfnAsyncNotificationCompleted(pDrvIns);
+    pDrvIns->pDrvHlpR3->pfnAsyncNotificationCompleted(pDrvIns);
 }
 
@@ -1071 +1117 @@
                                          PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
 {
-    return pDrvIns->pDrvHlp->pfnPDMThreadCreate(pDrvIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
-}
-
-#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
+    return pDrvIns->pDrvHlpR3->pfnPDMThreadCreate(pDrvIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
+}
+
+# ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
 /**
  * @copydoc PDMDRVHLP::pfnPDMAsyncCompletionTemplateCreate
@@ -1081 +1127 @@
                                                           PFNPDMASYNCCOMPLETEDRV pfnCompleted, void *pvTemplateUser, const char *pszDesc)
 {
-    return pDrvIns->pDrvHlp->pfnPDMAsyncCompletionTemplateCreate(pDrvIns, ppTemplate, pfnCompleted, pvTemplateUser, pszDesc);
-}
-#endif
-
-#endif /* IN_RING3 */
-
+    return pDrvIns->pDrvHlpR3->pfnPDMAsyncCompletionTemplateCreate(pDrvIns, ppTemplate, pfnCompleted, pvTemplateUser, pszDesc);
+}
+# endif
 
 
@@ -1115 +1158 @@
 
 /** Current version of the PDMDRVREGCB structure.  */
-#define PDM_DRVREG_CB_VERSION 0xb0010000
+#define PDM_DRVREG_CB_VERSION   UINT32_C(0xb0010000)
 
 
@@ -1132 +1175 @@
 VMMR3DECL(int) PDMR3RegisterDrivers(PVM pVM, FNPDMVBOXDRIVERSREGISTER pfnCallback);
 
+#endif /* IN_RING3 */
+
 /** @} */