From 58a3adcdd2eed9d31cd441186af872a0a8924e73 Mon Sep 17 00:00:00 2001
From: bunnei <ericbunnie@gmail.com>
Date: Mon, 26 May 2014 22:12:46 -0400
Subject: kernel: updated SyncRequest to take boolean thread wait result as a
 parameter

---
 src/core/hle/kernel/kernel.h   |  9 ++++++++-
 src/core/hle/kernel/mutex.cpp  |  8 ++++++--
 src/core/hle/kernel/thread.cpp |  8 ++++++--
 src/core/hle/service/service.h |  7 ++++---
 src/core/hle/svc.cpp           | 11 +++++++++--
 5 files changed, 33 insertions(+), 10 deletions(-)

(limited to 'src/core/hle')

diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 786d3abf..4acc9f22 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -47,7 +47,14 @@ public:
     virtual const char *GetTypeName() { return "[BAD KERNEL OBJECT TYPE]"; }
     virtual const char *GetName() { return "[UNKNOWN KERNEL OBJECT]"; }
     virtual Kernel::HandleType GetHandleType() const = 0;
-    virtual Result SyncRequest() = 0;
+
+    /**
+     * Synchronize kernel object 
+     * @param wait Boolean wait set if current thread should wait as a result of sync operation
+     * @return Result of operation, 0 on success, otherwise error code
+     */
+    virtual Result SyncRequest(bool* wait) = 0;
+
 };
 
 class ObjectPool : NonCopyable {
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index fa924404..5465b7a3 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -24,8 +24,12 @@ public:
     Handle lock_thread;                         ///< Handle to thread that currently has mutex
     std::vector<Handle> waiting_threads;        ///< Threads that are waiting for the mutex
 
-    /// Synchronize kernel object 
-    Result SyncRequest() {
+    /**
+     * Synchronize kernel object 
+     * @param wait Boolean wait set if current thread should wait as a result of sync operation
+     * @return Result of operation, 0 on success, otherwise error code
+     */
+    Result SyncRequest(bool* wait) {
         return 0;
     }
 };
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index b9dd9fac..56c7755c 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -36,8 +36,12 @@ public:
     inline bool IsWaiting() const { return (status & THREADSTATUS_WAIT) != 0; }
     inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; }
 
-    /// Synchronize kernel object 
-    Result SyncRequest() {
+    /**
+     * Synchronize kernel object 
+     * @param wait Boolean wait set if current thread should wait as a result of sync operation
+     * @return Result of operation, 0 on success, otherwise error code
+     */
+    Result SyncRequest(bool* wait) {
         return 0;
     }
 
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index c970ace4..12ef51b9 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -76,10 +76,11 @@ public:
     }
 
     /**
-     * Called when svcSendSyncRequest is called, loads command buffer and executes comand
-     * @return Return result of svcSendSyncRequest passed back to user app
+     * Synchronize kernel object 
+     * @param wait Boolean wait set if current thread should wait as a result of sync operation
+     * @return Result of operation, 0 on success, otherwise error code
      */
-    Result SyncRequest() {
+    Result SyncRequest(bool* wait) {
         u32* cmd_buff = GetCommandBuffer();
         auto itr = m_functions.find(cmd_buff[0]);
 
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 6f72a6eb..e566036e 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -92,11 +92,18 @@ Result ConnectToPort(void* out, const char* port_name) {
 
 /// Synchronize to an OS service
 Result SendSyncRequest(Handle handle) {
+    bool wait = false;
     Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle);
+
     DEBUG_LOG(SVC, "SendSyncRequest called handle=0x%08X");
     _assert_msg_(KERNEL, object, "SendSyncRequest called, but kernel object is NULL!");
-    object->SyncRequest();
-    return 0;
+
+    Result res = object->SyncRequest(&wait);
+    if (wait) {
+        Kernel::WaitCurrentThread(WAITTYPE_SYNCH); // TODO(bunnei): Is this correct?
+    }
+
+    return res;
 }
 
 /// Close a handle
-- 
cgit v1.2.3