summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar LC2020-10-20 22:08:53 -0400
committerGravatar GitHub2020-10-20 22:08:53 -0400
commit2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch)
tree0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/core/hle/kernel/svc.cpp
parentkernel: Fix build with recent compiler flag changes (diff)
parentRevert "core: Fix clang build" (diff)
downloadyuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.gz
yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.xz
yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.zip
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index b8623e831..bafd1ced7 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -482,8 +482,7 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr
482static ResultCode WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, 482static ResultCode WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address,
483 s32 handle_count, u32 timeout_high, Handle* index) { 483 s32 handle_count, u32 timeout_high, Handle* index) {
484 const s64 nano_seconds{(static_cast<s64>(timeout_high) << 32) | static_cast<s64>(timeout_low)}; 484 const s64 nano_seconds{(static_cast<s64>(timeout_high) << 32) | static_cast<s64>(timeout_low)};
485 return WaitSynchronization(system, index, handles_address, static_cast<u32>(handle_count), 485 return WaitSynchronization(system, index, handles_address, handle_count, nano_seconds);
486 nano_seconds);
487} 486}
488 487
489/// Resumes a thread waiting on WaitSynchronization 488/// Resumes a thread waiting on WaitSynchronization
@@ -2003,7 +2002,7 @@ static ResultCode GetThreadCoreMask(Core::System& system, Handle thread_handle,
2003 return ERR_INVALID_HANDLE; 2002 return ERR_INVALID_HANDLE;
2004 } 2003 }
2005 2004
2006 *core = static_cast<u32>(thread->GetIdealCore()); 2005 *core = thread->GetIdealCore();
2007 *mask = thread->GetAffinityMask(); 2006 *mask = thread->GetAffinityMask();
2008 2007
2009 return RESULT_SUCCESS; 2008 return RESULT_SUCCESS;
@@ -2071,7 +2070,7 @@ static ResultCode SetThreadCoreMask(Core::System& system, Handle thread_handle,
2071 return ERR_INVALID_HANDLE; 2070 return ERR_INVALID_HANDLE;
2072 } 2071 }
2073 2072
2074 return thread->SetCoreAndAffinityMask(static_cast<s32>(core), affinity_mask); 2073 return thread->SetCoreAndAffinityMask(core, affinity_mask);
2075} 2074}
2076 2075
2077static ResultCode SetThreadCoreMask32(Core::System& system, Handle thread_handle, u32 core, 2076static ResultCode SetThreadCoreMask32(Core::System& system, Handle thread_handle, u32 core,