diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-20 09:15:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 09:15:52 -0700 |
| commit | 741cae1e1d2f63bdc997e20f9a482a5e4a2a4aca (patch) | |
| tree | a7f6dd62b32264acab3229c42dd990b29e0b814f /src/core/hle/kernel/address_arbiter.cpp | |
| parent | a1805ceb0b8c661cf2a7846c8ce6f83de435d13e (diff) | |
| parent | dbfe82773d98fadac481cd9061f5eda98aebf308 (diff) | |
Merge pull request #734 from lioncash/thread
thread: Convert ThreadStatus into an enum class
Diffstat (limited to 'src/core/hle/kernel/address_arbiter.cpp')
| -rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index dcc68aabf..233fdab25 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -20,7 +20,7 @@ namespace AddressArbiter { static ResultCode WaitForAddress(VAddr address, s64 timeout) { SharedPtr<Thread> current_thread = GetCurrentThread(); current_thread->arb_wait_address = address; - current_thread->status = THREADSTATUS_WAIT_ARB; + current_thread->status = ThreadStatus::WaitArb; current_thread->wakeup_callback = nullptr; current_thread->WakeAfterDelay(timeout); @@ -65,7 +65,7 @@ static void WakeThreads(std::vector<SharedPtr<Thread>>& waiting_threads, s32 num // Signal the waiting threads. for (size_t i = 0; i < last; i++) { - ASSERT(waiting_threads[i]->status == THREADSTATUS_WAIT_ARB); + ASSERT(waiting_threads[i]->status == ThreadStatus::WaitArb); waiting_threads[i]->SetWaitSynchronizationResult(RESULT_SUCCESS); waiting_threads[i]->arb_wait_address = 0; waiting_threads[i]->ResumeFromWait(); |
