Changeset 81382 in vbox

Timestamp:

Oct 19, 2019 11:57:59 PM (5 years ago)

Author:

vboxsync

Message:

PDMDEVHLPR3: Added PDMDevHlpTimerSetCritSect. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (4 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -2272 +2272 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 25, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 26, 0)
 
 /**
@@ -2985 +2985 @@
     DECLR3CALLBACKMEMBER(int,      pfnTimerStop,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer));
     DECLR3CALLBACKMEMBER(void,     pfnTimerUnlock,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer));
+    DECLR3CALLBACKMEMBER(int,      pfnTimerSetCritSect,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PPDMCRITSECT pCritSect));
     DECLR3CALLBACKMEMBER(int,      pfnTimerSave,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PSSMHANDLE pSSM));
     DECLR3CALLBACKMEMBER(int,      pfnTimerLoad,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PSSMHANDLE pSSM));
@@ -6004 +6005 @@
  * @copydoc PDMDEVHLPR3::pfnTMTimerCreate
  */
-DECLINLINE(int) PDMDevHlpTMTimerCreate(PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser, uint32_t fFlags,
-                                       const char *pszDesc, PPTMTIMERR3 ppTimer)
+DECLINLINE(int) PDMDevHlpTMTimerCreate(PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser,
+                                       uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
 {
     return pDevIns->pHlpR3->pfnTMTimerCreate(pDevIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
@@ -6166 +6167 @@
 
 #ifdef IN_RING3
+
+/**
+ * @copydoc PDMDEVHLPR3::pfnTimerSetCritSect
+ */
+DECLINLINE(int) PDMDevHlpTimerSetCritSect(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PPDMCRITSECT pCritSect)
+{
+    return pDevIns->pHlpR3->pfnTimerSetCritSect(pDevIns, hTimer, pCritSect);
+}
 
 /**

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -1062 +1062 @@
 {
     TMTimerUnlock(pdmR3DevHlp_TimerToPtr(pDevIns, hTimer));
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnTimerSetCritSect} */
+static DECLCALLBACK(int) pdmR3DevHlp_TimerSetCritSect(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PPDMCRITSECT pCritSect)
+{
+    return TMR3TimerSetCritSect(pdmR3DevHlp_TimerToPtr(pDevIns, hTimer), pCritSect);
 }
 
@@ -4248 +4255 @@
     pdmR3DevHlp_TimerStop,
     pdmR3DevHlp_TimerUnlock,
+    pdmR3DevHlp_TimerSetCritSect,
     pdmR3DevHlp_TimerSave,
     pdmR3DevHlp_TimerLoad,
@@ -4689 +4697 @@
     pdmR3DevHlp_TimerStop,
     pdmR3DevHlp_TimerUnlock,
+    pdmR3DevHlp_TimerSetCritSect,
     pdmR3DevHlp_TimerSave,
     pdmR3DevHlp_TimerLoad,