thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct errors from sceKernelCancelVTimerHandler().

Browse source
This commit is contained in:
Unknown W. Brackets 2013-10-17 00:36:17 -07:00
parent 7edebd1c2f
commit c9755d7886
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Core/HLE/sceKernelVTimer.cpp
View file

@ -75,17 +75,20 @@ u64 __getVTimerCurrentTime(VTimer* vt) {
return vt->nvt.current + __getVTimerRunningTime(vt);
}
void __cancelVTimer(SceUID id) {
int __KernelCancelVTimer(SceUID id) {
u32 error;
VTimer *vt = kernelObjects.Get<VTimer>(id, error);
if (error)
return;
// TODO: 0 returns a different error code, except inside the handler?
// Also, inside the handler returns that same different error code for the timer?
if (!vt)
return error;
CoreTiming::UnscheduleEvent(vtimerTimer, id);
vt->nvt.schedule = 0;
vt->nvt.handlerAddr = 0;
vt->nvt.commonAddr = 0;
return 0;
}
void __KernelScheduleVTimer(VTimer *vt, u64 schedule) {
@ -151,7 +154,7 @@ public:
vtimers.pop_front();
if (result == 0)
__cancelVTimer(vtimerID);
__KernelCancelVTimer(vtimerID);
else
__rescheduleVTimer(vtimerID, result);
}
@ -440,9 +443,7 @@ u32 sceKernelCancelVTimerHandler(u32 uid) {
DEBUG_LOG(SCEKERNEL, "sceKernelCancelVTimerHandler(%08x)", uid);
//__cancelVTimer checks if uid is valid
__cancelVTimer(uid);
return 0;
return __KernelCancelVTimer(uid);
}
u32 sceKernelReferVTimerStatus(u32 uid, u32 statusAddr) {