diff options
| author | bunnei <bunneidev@gmail.com> | 2020-07-18 07:45:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 07:45:10 +0200 |
| commit | 4a8cb9a70671db5684dadf10061f3c3cf1d27741 (patch) | |
| tree | 76ff712dc903f71245bd6108519b125ca6fac99e /src/core/hle/kernel/time_manager.cpp | |
| parent | Merge pull request #4373 from lioncash/allocator (diff) | |
| parent | core_timing: Remove unused data member (diff) | |
| download | yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.tar yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.tar.gz yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.tar.bz2 yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.tar.lz yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.tar.xz yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.tar.zst yuzu-4a8cb9a70671db5684dadf10061f3c3cf1d27741.zip | |
Diffstat (limited to 'src/core/hle/kernel/time_manager.cpp')
| -rw-r--r-- | src/core/hle/kernel/time_manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/time_manager.cpp b/src/core/hle/kernel/time_manager.cpp index 941305e8e..88b01b751 100644 --- a/src/core/hle/kernel/time_manager.cpp +++ b/src/core/hle/kernel/time_manager.cpp @@ -16,7 +16,7 @@ namespace Kernel { TimeManager::TimeManager(Core::System& system_) : system{system_} { time_manager_event_type = Core::Timing::CreateEvent( - "Kernel::TimeManagerCallback", [this](u64 thread_handle, [[maybe_unused]] s64 cycles_late) { + "Kernel::TimeManagerCallback", [this](u64 thread_handle, std::chrono::nanoseconds) { SchedulerLock lock(system.Kernel()); Handle proper_handle = static_cast<Handle>(thread_handle); if (cancelled_events[proper_handle]) { @@ -34,7 +34,8 @@ void TimeManager::ScheduleTimeEvent(Handle& event_handle, Thread* timetask, s64 ASSERT(timetask); ASSERT(timetask->GetStatus() != ThreadStatus::Ready); ASSERT(timetask->GetStatus() != ThreadStatus::WaitMutex); - system.CoreTiming().ScheduleEvent(nanoseconds, time_manager_event_type, event_handle); + system.CoreTiming().ScheduleEvent(std::chrono::nanoseconds{nanoseconds}, + time_manager_event_type, event_handle); } else { event_handle = InvalidHandle; } |