diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 5eda33fa8..4192a03bb 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1548,22 +1548,6 @@ void __KernelLoadContext(ThreadContext *ctx, bool vfpuEnabled) currentMIPS->llBit = 0; } -u32 __KernelResumeThreadFromWait(SceUID threadID) -{ - u32 error; - Thread *t = kernelObjects.Get(threadID, error); - if (t) - { - t->resumeFromWait(); - return 0; - } - else - { - ERROR_LOG(SCEKERNEL, "__KernelResumeThreadFromWait(%d): bad thread: %08x", threadID, error); - return error; - } -} - u32 __KernelResumeThreadFromWait(SceUID threadID, u32 retval) { u32 error; @@ -1655,7 +1639,7 @@ void hleScheduledWakeup(u64 userdata, int cyclesLate) SceUID threadID = (SceUID)userdata; u32 error; if (__KernelGetWaitID(threadID, WAITTYPE_DELAY, error) == threadID) - __KernelResumeThreadFromWait(threadID); + __KernelResumeThreadFromWait(threadID, 0); } void __KernelScheduleWakeup(SceUID threadID, s64 usFromNow) @@ -2543,7 +2527,7 @@ int sceKernelWakeupThread(SceUID uid) DEBUG_LOG(SCEKERNEL,"sceKernelWakeupThread(%i) - wakeupCount incremented to %i", uid, t->nt.wakeupCount); } else { VERBOSE_LOG(SCEKERNEL,"sceKernelWakeupThread(%i) - woke thread at %i", uid, t->nt.wakeupCount); - __KernelResumeThreadFromWait(uid); + __KernelResumeThreadFromWait(uid, 0); hleReSchedule("thread woken up"); } return 0; diff --git a/Core/HLE/sceKernelThread.h b/Core/HLE/sceKernelThread.h index f750b11f0..ce452d9fd 100644 --- a/Core/HLE/sceKernelThread.h +++ b/Core/HLE/sceKernelThread.h @@ -151,8 +151,7 @@ const char *__KernelGetThreadName(SceUID threadID); void __KernelSaveContext(ThreadContext *ctx, bool vfpuEnabled); void __KernelLoadContext(ThreadContext *ctx, bool vfpuEnabled); -u32 __KernelResumeThreadFromWait(SceUID threadID); // can return an error value -u32 __KernelResumeThreadFromWait(SceUID threadID, u32 retval); +u32 __KernelResumeThreadFromWait(SceUID threadID, u32 retval); // can return an error value u32 __KernelResumeThreadFromWait(SceUID threadID, u64 retval); inline u32 __KernelResumeThreadFromWait(SceUID threadID, int retval)