diff options
| author | bunnei <bunneidev@gmail.com> | 2020-07-18 01:45:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 01:45:10 -0400 |
| commit | 01588e3e91c68f148bf43efdbfb7bb883a7a27f2 (patch) | |
| tree | 76ff712dc903f71245bd6108519b125ca6fac99e /src/core/hle/kernel/server_session.cpp | |
| parent | ca13092ccc13817e6e580ba629ce376daa4f4caa (diff) | |
| parent | 66e6dccc66eea2b098fb59eadc609652d0319f82 (diff) | |
Merge pull request #4348 from lioncash/nano
core_timing: Make usage of nanoseconds more consistent in the interface
Diffstat (limited to 'src/core/hle/kernel/server_session.cpp')
| -rw-r--r-- | src/core/hle/kernel/server_session.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 7b23a6889e..af22f4c33a 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -34,7 +34,7 @@ ResultVal<std::shared_ptr<ServerSession>> ServerSession::Create(KernelCore& kern std::shared_ptr<ServerSession> session{std::make_shared<ServerSession>(kernel)}; session->request_event = Core::Timing::CreateEvent( - name, [session](u64 userdata, s64 cycles_late) { session->CompleteSyncRequest(); }); + name, [session](u64, std::chrono::nanoseconds) { session->CompleteSyncRequest(); }); session->name = std::move(name); session->parent = std::move(parent); @@ -184,8 +184,8 @@ ResultCode ServerSession::CompleteSyncRequest() { ResultCode ServerSession::HandleSyncRequest(std::shared_ptr<Thread> thread, Core::Memory::Memory& memory) { - ResultCode result = QueueSyncRequest(std::move(thread), memory); - const u64 delay = kernel.IsMulticore() ? 0U : 20000U; + const ResultCode result = QueueSyncRequest(std::move(thread), memory); + const auto delay = std::chrono::nanoseconds{kernel.IsMulticore() ? 0 : 20000}; Core::System::GetInstance().CoreTiming().ScheduleEvent(delay, request_event, {}); return result; } |
