summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/svc.cpp4
-rw-r--r--src/core/hle/kernel/svc_wrap.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index c43135856..f328ce111 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -409,7 +409,7 @@ static ResultCode GetProcessId32(Core::System& system, u32* out_process_id_low,
409 409
410/// Wait for the given handles to synchronize, timeout after the specified nanoseconds 410/// Wait for the given handles to synchronize, timeout after the specified nanoseconds
411static ResultCode WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, 411static ResultCode WaitSynchronization(Core::System& system, s32* index, VAddr handles_address,
412 u64 num_handles, s64 nano_seconds) { 412 s32 num_handles, s64 nano_seconds) {
413 LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}", 413 LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}",
414 handles_address, num_handles, nano_seconds); 414 handles_address, num_handles, nano_seconds);
415 415
@@ -434,7 +434,7 @@ static ResultCode WaitSynchronization(Core::System& system, s32* index, VAddr ha
434 434
435 // Ensure handles are closed when we're done. 435 // Ensure handles are closed when we're done.
436 SCOPE_EXIT({ 436 SCOPE_EXIT({
437 for (u64 i = 0; i < num_handles; ++i) { 437 for (s32 i = 0; i < num_handles; ++i) {
438 kernel.UnregisterInUseObject(objs[i]); 438 kernel.UnregisterInUseObject(objs[i]);
439 objs[i]->Close(); 439 objs[i]->Close();
440 } 440 }
diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h
index 913b16494..6e62e656f 100644
--- a/src/core/hle/kernel/svc_wrap.h
+++ b/src/core/hle/kernel/svc_wrap.h
@@ -248,10 +248,10 @@ void SvcWrap64(Core::System& system) {
248} 248}
249 249
250// Used by WaitSynchronization 250// Used by WaitSynchronization
251template <ResultCode func(Core::System&, s32*, u64, u64, s64)> 251template <ResultCode func(Core::System&, s32*, u64, s32, s64)>
252void SvcWrap64(Core::System& system) { 252void SvcWrap64(Core::System& system) {
253 s32 param_1 = 0; 253 s32 param_1 = 0;
254 const u32 retval = func(system, &param_1, Param(system, 1), static_cast<u32>(Param(system, 2)), 254 const u32 retval = func(system, &param_1, Param(system, 1), static_cast<s32>(Param(system, 2)),
255 static_cast<s64>(Param(system, 3))) 255 static_cast<s64>(Param(system, 3)))
256 .raw; 256 .raw;
257 257