Changeset 87763 in vbox

Timestamp:

Feb 15, 2021 11:40:44 PM (4 years ago)

Author:

vboxsync

Message:

VMM/TM: Removed unused TMR3TimerCreateExternal api. bugref:9943

Location:

trunk

Files:

• include/VBox/vmm/tm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/TM.cpp (modified) (3 diffs)
• src/VBox/VMM/include/TMInternal.h (modified) (2 diffs)

trunk/include/VBox/vmm/tm.h

@@ -279 +279 @@
 VMM_INT_DECL(int)       TMR3TimerCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer);
 VMMR3DECL(int)          TMR3TimerCreateInternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMERINT pfnCallback, void *pvUser, const char *pszDesc, PPTMTIMERR3 ppTimer);
-VMMR3DECL(PTMTIMERR3)   TMR3TimerCreateExternal(PVM pVM, TMCLOCK enmClock, PFNTMTIMEREXT pfnCallback, void *pvUser, const char *pszDesc);
 VMMR3DECL(int)          TMR3TimerDestroy(PTMTIMER pTimer);
 VMM_INT_DECL(int)       TMR3TimerDestroyDevice(PVM pVM, PPDMDEVINS pDevIns);

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

@@ -1745 +1745 @@
 }
 
-/**
- * Creates an external timer.
- *
- * @returns Timer handle on success.
- * @returns NULL on failure.
- * @param   pVM             The cross context VM structure.
- * @param   enmClock        The clock to use on this timer.
- * @param   pfnCallback     Callback function.
- * @param   pvUser          User argument.
- * @param   pszDesc         Pointer to description string which must stay around
- *                          until the timer is fully destroyed (i.e. a bit after TMTimerDestroy()).
- */
-VMMR3DECL(PTMTIMERR3) TMR3TimerCreateExternal(PVM pVM, TMCLOCK enmClock,
-                                              PFNTMTIMEREXT pfnCallback, void *pvUser, const char *pszDesc)
-{
-    /*
-     * Allocate and init stuff.
-     */
-    PTMTIMERR3 pTimer;
-    int rc = tmr3TimerCreate(pVM, enmClock, 0 /*fFlags*/, pszDesc, &pTimer);
-    if (RT_SUCCESS(rc))
-    {
-        pTimer->enmType             = TMTIMERTYPE_EXTERNAL;
-        pTimer->u.External.pfnTimer = pfnCallback;
-        pTimer->pvUser              = pvUser;
-        Log(("TM: Created external timer %p clock %d callback %p '%s'\n", pTimer, enmClock, pfnCallback, pszDesc));
-        return pTimer;
-    }
-
-    return NULL;
-}
-
 
 /**
@@ -2316 +2284 @@
                 case TMTIMERTYPE_DRV:       pTimer->u.Drv.pfnTimer(pTimer->u.Drv.pDrvIns, pTimer, pTimer->pvUser); break;
                 case TMTIMERTYPE_INTERNAL:  pTimer->u.Internal.pfnTimer(pVM, pTimer, pTimer->pvUser); break;
-                case TMTIMERTYPE_EXTERNAL:  pTimer->u.External.pfnTimer(pTimer->pvUser); break;
                 default:
                     AssertMsgFailed(("Invalid timer type %d (%s)\n", pTimer->enmType, pTimer->pszDesc));
@@ -2501 +2468 @@
             case TMTIMERTYPE_DRV:       pTimer->u.Drv.pfnTimer(pTimer->u.Drv.pDrvIns, pTimer, pTimer->pvUser); break;
             case TMTIMERTYPE_INTERNAL:  pTimer->u.Internal.pfnTimer(pVM, pTimer, pTimer->pvUser); break;
-            case TMTIMERTYPE_EXTERNAL:  pTimer->u.External.pfnTimer(pTimer->pvUser); break;
             default:
                 AssertMsgFailed(("Invalid timer type %d (%s)\n", pTimer->enmType, pTimer->pszDesc));

trunk/src/VBox/VMM/include/TMInternal.h

@@ -57 +57 @@
     TMTIMERTYPE_DRV,
     /** Internal timer . */
-    TMTIMERTYPE_INTERNAL,
-    /** External timer. */
-    TMTIMERTYPE_EXTERNAL
+    TMTIMERTYPE_INTERNAL
 } TMTIMERTYPE;
 
@@ -164 +162 @@
             R3PTRTYPE(PFNTMTIMERINT)    pfnTimer;
         } Internal;
-
-        /** TMTIMERTYPE_EXTERNAL. */
-        struct
-        {
-            /** Callback. */
-            R3PTRTYPE(PFNTMTIMEREXT)    pfnTimer;
-        } External;
     } u;