diff options
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 4 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 189f7d5f5..bf4c8353c 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -186,8 +186,8 @@ Thread* NextThread() { | |||
| 186 | return Kernel::g_object_pool.GetFast<Thread>(next); | 186 | return Kernel::g_object_pool.GetFast<Thread>(next); |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | /// Puts a thread in the wait state for the given type/reason | 189 | /// Puts the current thread in the wait state for the given type |
| 190 | void WaitCurThread(WaitType wait_type, const char* reason) { | 190 | void WaitCurrentThread(WaitType wait_type) { |
| 191 | Thread* t = GetCurrentThread(); | 191 | Thread* t = GetCurrentThread(); |
| 192 | t->wait_type = wait_type; | 192 | t->wait_type = wait_type; |
| 193 | ChangeThreadState(t, ThreadStatus(THREADSTATUS_WAIT | (t->status & THREADSTATUS_SUSPEND))); | 193 | ChangeThreadState(t, ThreadStatus(THREADSTATUS_WAIT | (t->status & THREADSTATUS_SUSPEND))); |
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index d54f47aaf..9628f165d 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -53,8 +53,8 @@ Handle SetupMainThread(s32 priority, int stack_size=Kernel::DEFAULT_STACK_SIZE); | |||
| 53 | /// Reschedules to the next available thread (call after current thread is suspended) | 53 | /// Reschedules to the next available thread (call after current thread is suspended) |
| 54 | void Reschedule(); | 54 | void Reschedule(); |
| 55 | 55 | ||
| 56 | /// Puts a thread in the wait state for the given type/reason | 56 | /// Puts the current thread in the wait state for the given type |
| 57 | void WaitCurThread(WaitType wait_type, const char* reason); | 57 | void WaitCurrentThread(WaitType wait_type); |
| 58 | 58 | ||
| 59 | /// Resumes a thread from waiting by marking it as "ready" | 59 | /// Resumes a thread from waiting by marking it as "ready" |
| 60 | void ResumeThreadFromWait(Handle handle); | 60 | void ResumeThreadFromWait(Handle handle); |
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index b1854a36e..8018a43a2 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -108,7 +108,7 @@ Result CloseHandle(Handle handle) { | |||
| 108 | Result WaitSynchronization1(Handle handle, s64 nano_seconds) { | 108 | Result WaitSynchronization1(Handle handle, s64 nano_seconds) { |
| 109 | DEBUG_LOG(SVC, "(UNIMPLEMENTED) WaitSynchronization1 called handle=0x%08X, nanoseconds=%d", | 109 | DEBUG_LOG(SVC, "(UNIMPLEMENTED) WaitSynchronization1 called handle=0x%08X, nanoseconds=%d", |
| 110 | handle, nano_seconds); | 110 | handle, nano_seconds); |
| 111 | Kernel::WaitCurThread(WAITTYPE_SYNCH, "WaitSynchronization1"); // TODO(bunnei): Is this correct? | 111 | Kernel::WaitCurrentThread(WAITTYPE_SYNCH); // TODO(bunnei): Is this correct? |
| 112 | return 0; | 112 | return 0; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| @@ -123,7 +123,7 @@ Result WaitSynchronizationN(void* _out, void* _handles, u32 handle_count, u32 wa | |||
| 123 | for (u32 i = 0; i < handle_count; i++) { | 123 | for (u32 i = 0; i < handle_count; i++) { |
| 124 | DEBUG_LOG(SVC, "\thandle[%d]=0x%08X", i, handles[i]); | 124 | DEBUG_LOG(SVC, "\thandle[%d]=0x%08X", i, handles[i]); |
| 125 | } | 125 | } |
| 126 | Kernel::WaitCurThread(WAITTYPE_SYNCH, "WaitSynchronizationN"); // TODO(bunnei): Is this correct? | 126 | Kernel::WaitCurrentThread(WAITTYPE_SYNCH); // TODO(bunnei): Is this correct? |
| 127 | return 0; | 127 | return 0; |
| 128 | } | 128 | } |
| 129 | 129 | ||