From c770f25ccb4755f6a6861037fbfdfdac55191348 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 18 Dec 2022 16:50:02 -0500 Subject: kernel: remove TimeManager --- src/core/hle/kernel/k_hardware_timer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/core/hle/kernel/k_hardware_timer.cpp') diff --git a/src/core/hle/kernel/k_hardware_timer.cpp b/src/core/hle/kernel/k_hardware_timer.cpp index afa777f9a..6bba79ea0 100644 --- a/src/core/hle/kernel/k_hardware_timer.cpp +++ b/src/core/hle/kernel/k_hardware_timer.cpp @@ -5,15 +5,13 @@ #include "core/core_timing.h" #include "core/hle/kernel/k_hardware_timer.h" #include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/time_manager.h" namespace Kernel { void KHardwareTimer::Initialize() { // Create the timing callback to register with CoreTiming. m_event_type = Core::Timing::CreateEvent( - "KHardwareTimer::Callback", - [this](std::uintptr_t timer_handle, s64, std::chrono::nanoseconds) { + "KHardwareTimer::Callback", [](std::uintptr_t timer_handle, s64, std::chrono::nanoseconds) { reinterpret_cast(timer_handle)->DoTask(); return std::nullopt; }); @@ -21,6 +19,7 @@ void KHardwareTimer::Initialize() { void KHardwareTimer::Finalize() { this->DisableInterrupt(); + m_event_type.reset(); } void KHardwareTimer::DoTask() { @@ -64,7 +63,7 @@ void KHardwareTimer::DisableInterrupt() { m_wakeup_time = std::numeric_limits::max(); } -s64 KHardwareTimer::GetTick() { +s64 KHardwareTimer::GetTick() const { return m_kernel.System().CoreTiming().GetGlobalTimeNs().count(); } -- cgit v1.2.3