diff options
author | bunnei <bunneidev@gmail.com> | 2015-01-18 13:25:51 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-01-21 20:47:38 -0500 |
commit | e5a9f1c64483e01b7856c581ae5685d0c5ad88dc (patch) | |
tree | 6ab483afc7aa00bdcff51f0d6b7015b9edd5e5bf /src/core/hle/kernel/semaphore.cpp | |
parent | 6deb1a0119eb4f17490ed2603d5a608bcf71413a (diff) |
Kernel: Get rid of WaitTypes and simplify lots of code, removing hacks.
Diffstat (limited to 'src/core/hle/kernel/semaphore.cpp')
-rw-r--r-- | src/core/hle/kernel/semaphore.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp index 42b5cf70..6ccdb2a8 100644 --- a/src/core/hle/kernel/semaphore.cpp +++ b/src/core/hle/kernel/semaphore.cpp @@ -32,15 +32,8 @@ public: return available_count > 0; } - ResultVal<bool> Wait(bool wait_thread) override { - bool wait = !IsAvailable(); - - if (wait && wait_thread) { - Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_SEMA, this); - AddWaitingThread(GetCurrentThread()); - } - - return MakeResult<bool>(wait); + ResultVal<bool> Wait() override { + return MakeResult<bool>(!IsAvailable()); } ResultVal<bool> Acquire() override { |