diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-01-31 02:07:54 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-02-02 18:37:01 +0100 |
commit | 664c79ff47054df845096e7e29d5cc437dfec2a2 (patch) | |
tree | 1ebd682a7e75c964f2ac98f2dffbc5adba037442 /src/core/hle/kernel/thread.cpp | |
parent | Service: Store function names as const char* instead of std::string (diff) | |
download | yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.tar yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.tar.gz yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.tar.bz2 yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.tar.lz yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.tar.xz yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.tar.zst yuzu-664c79ff47054df845096e7e29d5cc437dfec2a2.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 56950ebd4..1ea5589cb 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -248,14 +248,13 @@ static void ThreadWakeupCallback(u64 parameter, int cycles_late) { } -void WakeThreadAfterDelay(Thread* thread, s64 nanoseconds) { +void Thread::WakeAfterDelay(s64 nanoseconds) { // Don't schedule a wakeup if the thread wants to wait forever if (nanoseconds == -1) return; - _dbg_assert_(Kernel, thread != nullptr); u64 microseconds = nanoseconds / 1000; - CoreTiming::ScheduleEvent(usToCycles(microseconds), ThreadWakeupEventType, thread->GetHandle()); + CoreTiming::ScheduleEvent(usToCycles(microseconds), ThreadWakeupEventType, GetHandle()); } void Thread::ReleaseWaitObject(WaitObject* wait_object) { @@ -418,7 +417,7 @@ void Thread::SetPriority(s32 priority) { } } -Handle SetupIdleThread() { +SharedPtr<Thread> SetupIdleThread() { // We need to pass a few valid values to get around parameter checking in Thread::Create. auto thread_res = Thread::Create("idle", Memory::KERNEL_MEMORY_VADDR, THREADPRIO_LOWEST, 0, THREADPROCESSORID_0, 0, Kernel::DEFAULT_STACK_SIZE); @@ -427,7 +426,7 @@ Handle SetupIdleThread() { thread->idle = true; CallThread(thread.get()); - return thread->GetHandle(); + return thread; } SharedPtr<Thread> SetupMainThread(s32 priority, u32 stack_size) { |