aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-06-02 17:54:07 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-06-02 17:54:07 -0400
commit477b0caca4f0db084ab2d2dfb866fd81e5839228 (patch)
tree2d8ebb55b280edbd18b0227b70437c678f782b10 /src/core/hle/svc.cpp
parent4819e9a60f36ac4ec1a7cb3d30008353ab03bf14 (diff)
svc: updated WaitSynchronizationN to properly use first pointer argument
Diffstat (limited to 'src/core/hle/svc.cpp')
-rw-r--r--src/core/hle/svc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 1f36c7ac..c8eb8ea8 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -147,7 +147,7 @@ Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
Result WaitSynchronizationN(void* _out, void* _handles, u32 handle_count, u32 wait_all,
s64 nano_seconds) {
// TODO(bunnei): Do something with nano_seconds, currently ignoring this
-
+ s32* out = (s32*)_out;
Handle* handles = (Handle*)_handles;
bool unlock_all = true;
@@ -167,7 +167,7 @@ Result WaitSynchronizationN(void* _out, void* _handles, u32 handle_count, u32 wa
Result res = object->WaitSynchronization(&wait);
if (!wait && !wait_all) {
- Core::g_app_core->SetReg(1, i);
+ *out = i;
return 0;
} else {
unlock_all = false;
@@ -175,7 +175,7 @@ Result WaitSynchronizationN(void* _out, void* _handles, u32 handle_count, u32 wa
}
if (wait_all && unlock_all) {
- Core::g_app_core->SetReg(1, handle_count);
+ *out = handle_count;
return 0;
}