summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/server_session.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-18 07:45:10 +0200
committerGitHub <noreply@github.com>2020-07-18 07:45:10 +0200
commit4a8cb9a70671db5684dadf10061f3c3cf1d27741 (patch)
tree76ff712dc903f71245bd6108519b125ca6fac99e /src/core/hle/kernel/server_session.cpp
parentMerge pull request #4373 from lioncash/allocator (diff)
parentcore_timing: Remove unused data member (diff)
downloadyuzu-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/server_session.cpp')
-rw-r--r--src/core/hle/kernel/server_session.cpp6
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 7b23a6889..af22f4c33 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;
}