From aa01c57ae9d73e41b65d37860ca6fbb91caba33a Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 17 Jan 2015 22:23:49 -0500
Subject: Kernel: Separate WaitSynchronization into Wait and Acquire methods.

---
 src/core/hle/kernel/semaphore.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/kernel/semaphore.cpp')

diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 288928441..6464b2580 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -32,18 +32,27 @@ public:
         return available_count > 0;
     }
 
-    ResultVal<bool> WaitSynchronization(unsigned index) override {
+    ResultVal<bool> Wait(unsigned index) override {
         bool wait = !IsAvailable();
 
         if (wait) {
             Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_SEMA, this, index);
             AddWaitingThread(GetCurrentThread());
-        } else {
-            --available_count;
         }
 
         return MakeResult<bool>(wait);
     }
+
+    ResultVal<bool> Acquire() override {
+        bool res = false;
+
+        if (IsAvailable()) {
+            --available_count;
+            res = true;
+        }
+
+        return MakeResult<bool>(res);
+    }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3