summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-04-25 22:42:34 -0400
committerGravatar GitHub2018-04-25 22:42:34 -0400
commitdd6c67c62764f3974185a1fd361690e5065dceb2 (patch)
tree1c4b2d5bbf760c4ee1205363ff5f040615d9254b /src/core/hle/kernel/timer.cpp
parentMerge pull request #387 from Subv/maxwell_2d (diff)
parentkernel/shared_memory: Remove unnecessary semicolon at end of ConvertPermissio... (diff)
downloadyuzu-dd6c67c62764f3974185a1fd361690e5065dceb2.tar.gz
yuzu-dd6c67c62764f3974185a1fd361690e5065dceb2.tar.xz
yuzu-dd6c67c62764f3974185a1fd361690e5065dceb2.zip
Merge pull request #398 from lioncash/kernel
kernel: Migrate logging macros to fmt-compatible ones
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
-rw-r--r--src/core/hle/kernel/timer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 8da745634..ad58bf043 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -77,7 +77,7 @@ void Timer::WakeupAllWaitingThreads() {
77} 77}
78 78
79void Timer::Signal(int cycles_late) { 79void Timer::Signal(int cycles_late) {
80 LOG_TRACE(Kernel, "Timer %u fired", GetObjectId()); 80 NGLOG_TRACE(Kernel, "Timer {} fired", GetObjectId());
81 81
82 signaled = true; 82 signaled = true;
83 83
@@ -97,7 +97,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) {
97 timer_callback_handle_table.Get<Timer>(static_cast<Handle>(timer_handle)); 97 timer_callback_handle_table.Get<Timer>(static_cast<Handle>(timer_handle));
98 98
99 if (timer == nullptr) { 99 if (timer == nullptr) {
100 LOG_CRITICAL(Kernel, "Callback fired for invalid timer %08" PRIx64, timer_handle); 100 NGLOG_CRITICAL(Kernel, "Callback fired for invalid timer {:016X}", timer_handle);
101 return; 101 return;
102 } 102 }
103 103