citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

thread: renamed "WaitCurThread" to "WaitCurrentThread", removed unused "reason" argument

This commit is contained in:
bunnei 2014-05-22 19:36:56 -04:00
parent 7c0b006076
commit b99ac2c3d6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/kernel/thread.cpp
View File

@ -186,8 +186,8 @@ Thread* NextThread() {
return Kernel::g_object_pool.GetFast<Thread>(next); return Kernel::g_object_pool.GetFast<Thread>(next);
} }
/// Puts a thread in the wait state for the given type/reason /// Puts the current thread in the wait state for the given type
void WaitCurThread(WaitType wait_type, const char* reason) { void WaitCurrentThread(WaitType wait_type) {
Thread* t = GetCurrentThread(); Thread* t = GetCurrentThread();
t->wait_type = wait_type; t->wait_type = wait_type;
ChangeThreadState(t, ThreadStatus(THREADSTATUS_WAIT | (t->status & THREADSTATUS_SUSPEND))); ChangeThreadState(t, ThreadStatus(THREADSTATUS_WAIT | (t->status & THREADSTATUS_SUSPEND)));

4
src/core/hle/kernel/thread.h
View File

@ -53,8 +53,8 @@ Handle SetupMainThread(s32 priority, int stack_size=Kernel::DEFAULT_STACK_SIZE);
/// Reschedules to the next available thread (call after current thread is suspended) /// Reschedules to the next available thread (call after current thread is suspended)
void Reschedule(); void Reschedule();
/// Puts a thread in the wait state for the given type/reason /// Puts the current thread in the wait state for the given type
void WaitCurThread(WaitType wait_type, const char* reason); void WaitCurrentThread(WaitType wait_type);
/// Resumes a thread from waiting by marking it as "ready" /// Resumes a thread from waiting by marking it as "ready"
void ResumeThreadFromWait(Handle handle); void ResumeThreadFromWait(Handle handle);

4
src/core/hle/svc.cpp
View File

@ -108,7 +108,7 @@ Result CloseHandle(Handle handle) {
Result WaitSynchronization1(Handle handle, s64 nano_seconds) { Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
DEBUG_LOG(SVC, "(UNIMPLEMENTED) WaitSynchronization1 called handle=0x%08X, nanoseconds=%d", DEBUG_LOG(SVC, "(UNIMPLEMENTED) WaitSynchronization1 called handle=0x%08X, nanoseconds=%d",
handle, nano_seconds); handle, nano_seconds);
Kernel::WaitCurThread(WAITTYPE_SYNCH, "WaitSynchronization1"); // TODO(bunnei): Is this correct? Kernel::WaitCurrentThread(WAITTYPE_SYNCH); // TODO(bunnei): Is this correct?
return 0; return 0;
} }
@ -123,7 +123,7 @@ Result WaitSynchronizationN(void* _out, void* _handles, u32 handle_count, u32 wa
for (u32 i = 0; i < handle_count; i++) { for (u32 i = 0; i < handle_count; i++) {
DEBUG_LOG(SVC, "\thandle[%d]=0x%08X", i, handles[i]); DEBUG_LOG(SVC, "\thandle[%d]=0x%08X", i, handles[i]);
} }
Kernel::WaitCurThread(WAITTYPE_SYNCH, "WaitSynchronizationN"); // TODO(bunnei): Is this correct? Kernel::WaitCurrentThread(WAITTYPE_SYNCH); // TODO(bunnei): Is this correct?
return 0; return 0;
} }