From 4803dfdce1fe555c4ee7948af42f5b4014e84b57 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 24 Oct 2013 01:10:46 -0700 Subject: [PATCH] Use CoreTiming::GetGlobalTimeUs() for vtimers. --- Core/HLE/sceKernelVTimer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/HLE/sceKernelVTimer.cpp b/Core/HLE/sceKernelVTimer.cpp index aefc83c8a2..b7db9152f1 100644 --- a/Core/HLE/sceKernelVTimer.cpp +++ b/Core/HLE/sceKernelVTimer.cpp @@ -70,7 +70,7 @@ u64 __getVTimerRunningTime(VTimer *vt) { if (vt->nvt.active == 0) return 0; - return cyclesToUs(CoreTiming::GetTicks()) - vt->nvt.base; + return CoreTiming::GetGlobalTimeUs() - vt->nvt.base; } u64 __getVTimerCurrentTime(VTimer* vt) { @@ -102,11 +102,11 @@ void __KernelScheduleVTimer(VTimer *vt, u64 schedule) { if (schedule < __getVTimerCurrentTime(vt)) cyclesIntoFuture = usToCycles(200); else { - u64 goalTicks = usToCycles(vt->nvt.base + schedule - vt->nvt.current); - if (goalTicks < CoreTiming::GetTicks()) + u64 goalUs = vt->nvt.base + schedule - vt->nvt.current; + if (goalUs < CoreTiming::GetGlobalTimeUs()) cyclesIntoFuture = usToCycles(200); else - cyclesIntoFuture = goalTicks - CoreTiming::GetTicks(); + cyclesIntoFuture = usToCycles(goalUs - CoreTiming::GetGlobalTimeUs()); } CoreTiming::ScheduleEvent(cyclesIntoFuture, vtimerTimer, vt->GetUID()); @@ -369,7 +369,7 @@ u64 sceKernelSetVTimerTimeWide(SceUID uid, u64 timeClock) { void __startVTimer(VTimer *vt) { vt->nvt.active = 1; - vt->nvt.base = cyclesToUs(CoreTiming::GetTicks()); + vt->nvt.base = CoreTiming::GetGlobalTimeUs(); if (vt->nvt.handlerAddr != 0) __KernelScheduleVTimer(vt, vt->nvt.schedule);