summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-11-03 11:59:07 +0100
committerGitHub <noreply@github.com>2021-11-03 11:59:07 +0100
commit863e2e2b4f81dc09d878b53572025b4687413830 (patch)
tree366d8b1c68b27939d86b95c308989b877618c7aa /src
parentMerge pull request #7262 from FernandoS27/Buffalo-buffalo-Buffalo-buffalo-buffalo (diff)
parentsvc: Correct WaitSynchronization num_handles param type (diff)
downloadyuzu-863e2e2b4f81dc09d878b53572025b4687413830.tar
yuzu-863e2e2b4f81dc09d878b53572025b4687413830.tar.gz
yuzu-863e2e2b4f81dc09d878b53572025b4687413830.tar.bz2
yuzu-863e2e2b4f81dc09d878b53572025b4687413830.tar.lz
yuzu-863e2e2b4f81dc09d878b53572025b4687413830.tar.xz
yuzu-863e2e2b4f81dc09d878b53572025b4687413830.tar.zst
yuzu-863e2e2b4f81dc09d878b53572025b4687413830.zip
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,
/// Wait for the given handles to synchronize, timeout after the specified nanoseconds
static ResultCode WaitSynchronization(Core::System& system, s32* index, VAddr handles_address,
- u64 num_handles, s64 nano_seconds) {
+ s32 num_handles, s64 nano_seconds) {
LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}",
handles_address, num_handles, nano_seconds);
@@ -434,7 +434,7 @@ static ResultCode WaitSynchronization(Core::System& system, s32* index, VAddr ha
// Ensure handles are closed when we're done.
SCOPE_EXIT({
- for (u64 i = 0; i < num_handles; ++i) {
+ for (s32 i = 0; i < num_handles; ++i) {
kernel.UnregisterInUseObject(objs[i]);
objs[i]->Close();
}
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) {
}
// Used by WaitSynchronization
-template <ResultCode func(Core::System&, s32*, u64, u64, s64)>
+template <ResultCode func(Core::System&, s32*, u64, s32, s64)>
void SvcWrap64(Core::System& system) {
s32 param_1 = 0;
- const u32 retval = func(system, &param_1, Param(system, 1), static_cast<u32>(Param(system, 2)),
+ const u32 retval = func(system, &param_1, Param(system, 1), static_cast<s32>(Param(system, 2)),
static_cast<s64>(Param(system, 3)))
.raw;