- Timestamp:
- Feb 15, 2021 11:49:16 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
include/VBox/vmm/tm.h (modified) (1 diff)
-
src/VBox/VMM/VMMAll/TMAll.cpp (modified) (1 diff)
-
src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)
-
src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)
-
src/VBox/VMM/VMMR3/PDMUsb.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/vmm/tm.h
r87763 r87764 257 257 VMMDECL(uint64_t) TMTimerFromNano(PTMTIMER pTimer, uint64_t cNanoSecs); 258 258 VMMDECL(uint64_t) TMTimerFromMicro(PTMTIMER pTimer, uint64_t cMicroSecs); 259 VMMDECL(uint64_t) TMTimerFromMilli(P TMTIMER pTimer, uint64_t cMilliSecs);259 VMMDECL(uint64_t) TMTimerFromMilli(PVMCC pVM, PTMTIMER pTimer, uint64_t cMilliSecs); 260 260 261 261 VMMDECL(bool) TMTimerPollBool(PVMCC pVM, PVMCPUCC pVCpu); -
trunk/src/VBox/VMM/VMMAll/TMAll.cpp
r87760 r87764 2534 2534 * 2535 2535 * @returns timer clock ticks. 2536 * @param pVM The cross context VM structure. 2536 2537 * @param pTimer Timer handle as returned by one of the create functions. 2537 2538 * @param cMilliSecs The millisecond value ticks to convert. 2538 2539 * @remark There could be rounding and overflow errors here. 2539 2540 */ 2540 VMMDECL(uint64_t) TMTimerFromMilli(PTMTIMER pTimer, uint64_t cMilliSecs) 2541 { 2541 VMMDECL(uint64_t) TMTimerFromMilli(PVMCC pVM, PTMTIMER pTimer, uint64_t cMilliSecs) 2542 { 2543 RT_NOREF(pVM); 2544 Assert(pVM == pTimer->CTX_SUFF(pVM)); 2542 2545 #ifdef IN_RING0 2543 2546 Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0); -
trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp
r87760 r87764 423 423 } 424 424 425 426 425 /** @interface_method_impl{PDMDEVHLPR0,pfnTimerFromMicro} */ 427 426 static DECLCALLBACK(uint64_t) pdmR0DevHlp_TimerFromMicro(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, uint64_t cMicroSecs) … … 434 433 static DECLCALLBACK(uint64_t) pdmR0DevHlp_TimerFromMilli(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, uint64_t cMilliSecs) 435 434 { 436 return TMTimerFromMilli(pdmR0DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs); 435 PDMDEV_ASSERT_DEVINS(pDevIns); 436 return TMTimerFromMilli(pDevIns->Internal.s.pGVM, pdmR0DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs); 437 437 } 438 438 -
trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
r87760 r87764 467 467 static DECLCALLBACK(uint64_t) pdmR3DevHlp_TimerFromMilli(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, uint64_t cMilliSecs) 468 468 { 469 return TMTimerFromMilli(pdmR3DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs); 469 PDMDEV_ASSERT_DEVINS(pDevIns); 470 return TMTimerFromMilli(pDevIns->Internal.s.pVMR3, pdmR3DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs); 470 471 } 471 472 -
trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp
r87762 r87764 1862 1862 static DECLCALLBACK(uint64_t) pdmR3UsbHlp_TimerFromMilli(PPDMUSBINS pUsbIns, TMTIMERHANDLE hTimer, uint64_t cMilliSecs) 1863 1863 { 1864 return TMTimerFromMilli(pdmR3UsbHlp_TimerToPtr(pUsbIns, hTimer), cMilliSecs); 1864 PDMUSB_ASSERT_USBINS(pUsbIns); 1865 return TMTimerFromMilli(pUsbIns->Internal.s.pVM, pdmR3UsbHlp_TimerToPtr(pUsbIns, hTimer), cMilliSecs); 1865 1866 } 1866 1867
Note:
See TracChangeset
for help on using the changeset viewer.

