diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 52ff9688a7..7e719c05e3 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -2150,13 +2150,13 @@ void __KernelReturnFromThread() int sceKernelExitThread(int exitStatus) { if (!__KernelIsDispatchEnabled() && sceKernelGetCompiledSdkVersion() > 0x0307FFFF) - return ERROR_KERNEL_WAIT_CAN_NOT_WAIT; + return hleLogError(SCEKERNEL, SCE_KERNEL_ERROR_CAN_NOT_WAIT); PSPThread *thread = __GetCurrentThread(); _dbg_assert_msg_(thread != NULL, "Exited from a NULL thread."); INFO_LOG(SCEKERNEL, "sceKernelExitThread(%d)", exitStatus); if (exitStatus < 0) { - exitStatus = ERROR_KERNEL_ILLEGAL_ARGUMENT; + exitStatus = SCE_KERNEL_ERROR_ILLEGAL_ARGUMENT; } __KernelStopThread(currentThread, exitStatus, "thread exited"); diff --git a/Core/HLE/sceKernelThread.h b/Core/HLE/sceKernelThread.h index 37d1065a20..4c11a613fe 100644 --- a/Core/HLE/sceKernelThread.h +++ b/Core/HLE/sceKernelThread.h @@ -77,8 +77,6 @@ struct SceKernelSysClock { u32_le hi; }; -static const int ERROR_KERNEL_WAIT_CAN_NOT_WAIT = 0x800201a7; -static const int ERROR_KERNEL_ILLEGAL_ARGUMENT = 0x800200d2; // TODO: Map these to PSP wait types. Most of these are wrong. // remember to update the waitTypeNames array in sceKernelThread.cpp when changing these