summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/mutex.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-18 19:25:51 +0100
committerbunnei <bunneidev@gmail.com>2015-01-22 02:47:38 +0100
commite5a9f1c64483e01b7856c581ae5685d0c5ad88dc (patch)
tree6ab483afc7aa00bdcff51f0d6b7015b9edd5e5bf /src/core/hle/kernel/mutex.cpp
parentWaitSynchronizationN: Improved comments (diff)
downloadyuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar
yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.gz
yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.bz2
yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.lz
yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.xz
yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.zst
yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.zip
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
-rw-r--r--src/core/hle/kernel/mutex.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index f97c69a78..4a1eaca37 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -26,7 +26,7 @@ public:
Handle lock_thread; ///< Handle to thread that currently has mutex
std::string name; ///< Name of mutex (optional)
- ResultVal<bool> Wait(bool wait_thread) override;
+ ResultVal<bool> Wait() override;
ResultVal<bool> Acquire() override;
};
@@ -156,12 +156,7 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
return handle;
}
-ResultVal<bool> Mutex::Wait(bool wait_thread) {
- if (locked && wait_thread) {
- AddWaitingThread(GetCurrentThread());
- Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_MUTEX, this);
- }
-
+ResultVal<bool> Mutex::Wait() {
return MakeResult<bool>(locked);
}