From 9453223075e100a94b274613f1da0c47f747edf5 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 29 May 2017 15:10:06 -0700 Subject: Kernel: Removed HandleTable::GetWaitObject This isn't necessary anymore since plain Get works correctly for WaitObjects. --- src/core/hle/svc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/svc.cpp') diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 30230d65a..243c54c6e 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -244,7 +244,7 @@ static ResultCode CloseHandle(Kernel::Handle handle) { /// Wait for a handle to synchronize, timeout after the specified nanoseconds static ResultCode WaitSynchronization1(Kernel::Handle handle, s64 nano_seconds) { - auto object = Kernel::g_handle_table.GetWaitObject(handle); + auto object = Kernel::g_handle_table.Get(handle); Kernel::Thread* thread = Kernel::GetCurrentThread(); if (object == nullptr) @@ -299,7 +299,7 @@ static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 ha std::vector objects(handle_count); for (int i = 0; i < handle_count; ++i) { - auto object = Kernel::g_handle_table.GetWaitObject(handles[i]); + auto object = Kernel::g_handle_table.Get(handles[i]); if (object == nullptr) return ERR_INVALID_HANDLE; objects[i] = object; -- cgit v1.2.3 From 64ecf81a3cf6d6e0a4e4e915e1da2f0bcf2f1cb4 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 29 May 2017 15:45:30 -0700 Subject: Kernel: Move WaitObject to a separate file Now that HandleTable doesn't directly depend on WaitObject anymore, this can be separated from the main kernel.h header. --- src/core/hle/svc.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core/hle/svc.cpp') diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 243c54c6e..83767677f 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -27,6 +27,7 @@ #include "core/hle/kernel/thread.h" #include "core/hle/kernel/timer.h" #include "core/hle/kernel/vm_manager.h" +#include "core/hle/kernel/wait_object.h" #include "core/hle/result.h" #include "core/hle/service/service.h" -- cgit v1.2.3 From be031989ee9384786fb9ed380dab9a260ad69fd5 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 29 May 2017 16:45:42 -0700 Subject: Kernel: Move HandleTable to a separate file --- src/core/hle/svc.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/hle/svc.cpp') diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 83767677f..e68b9f16a 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include "common/logging/log.h" @@ -16,6 +17,7 @@ #include "core/hle/kernel/client_session.h" #include "core/hle/kernel/errors.h" #include "core/hle/kernel/event.h" +#include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/memory.h" #include "core/hle/kernel/mutex.h" #include "core/hle/kernel/process.h" -- cgit v1.2.3