summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2019-03-24 18:11:32 -0400
committerGravatar Lioncash2019-03-24 18:12:17 -0400
commitc5d41fd812d7eb1a04f36b76c08fe971cee0868c (patch)
tree420a9ba00464d14b55e4346ae3951c61f7999cdc /src/core/hle/kernel/kernel.cpp
parentMerge pull request #2232 from lioncash/transfer-memory (diff)
downloadyuzu-c5d41fd812d7eb1a04f36b76c08fe971cee0868c.tar.gz
yuzu-c5d41fd812d7eb1a04f36b76c08fe971cee0868c.tar.xz
yuzu-c5d41fd812d7eb1a04f36b76c08fe971cee0868c.zip
core/core_timing: Make callback parameters consistent
In some cases, our callbacks were using s64 as a parameter, and in other cases, they were using an int, which is inconsistent. To make all callbacks consistent, we can just use an s64 as the type for late cycles, given it gets rid of the need to cast internally. While we're at it, also resolve some signed/unsigned conversions that were occurring related to the callback registration.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 4d224d01d..a7e4ddc05 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -29,7 +29,7 @@ namespace Kernel {
29 * @param thread_handle The handle of the thread that's been awoken 29 * @param thread_handle The handle of the thread that's been awoken
30 * @param cycles_late The number of CPU cycles that have passed since the desired wakeup time 30 * @param cycles_late The number of CPU cycles that have passed since the desired wakeup time
31 */ 31 */
32static void ThreadWakeupCallback(u64 thread_handle, [[maybe_unused]] int cycles_late) { 32static void ThreadWakeupCallback(u64 thread_handle, [[maybe_unused]] s64 cycles_late) {
33 const auto proper_handle = static_cast<Handle>(thread_handle); 33 const auto proper_handle = static_cast<Handle>(thread_handle);
34 const auto& system = Core::System::GetInstance(); 34 const auto& system = Core::System::GetInstance();
35 35