summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-30 00:10:06 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-30 00:10:06 +0200
commit9453223075e100a94b274613f1da0c47f747edf5 (patch)
treee65fa84679813cbb9f8bea10bcaab49d07753325
parentKernel: Extract dynamic Object pointer cast into its own function (diff)
downloadyuzu-9453223075e100a94b274613f1da0c47f747edf5.tar
yuzu-9453223075e100a94b274613f1da0c47f747edf5.tar.gz
yuzu-9453223075e100a94b274613f1da0c47f747edf5.tar.bz2
yuzu-9453223075e100a94b274613f1da0c47f747edf5.tar.lz
yuzu-9453223075e100a94b274613f1da0c47f747edf5.tar.xz
yuzu-9453223075e100a94b274613f1da0c47f747edf5.tar.zst
yuzu-9453223075e100a94b274613f1da0c47f747edf5.zip
-rw-r--r--src/core/hle/kernel/kernel.h9
-rw-r--r--src/core/hle/svc.cpp4
2 files changed, 2 insertions, 11 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index d8929259e..4344264dc 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -252,15 +252,6 @@ public:
return DynamicObjectCast<T>(GetGeneric(handle));
}
- /**
- * Looks up a handle while verifying that it is an object that a thread can wait on
- * @return Pointer to the looked-up object, or `nullptr` if the handle is not valid or it is
- * not a waitable object.
- */
- SharedPtr<WaitObject> GetWaitObject(Handle handle) const {
- return DynamicObjectCast<WaitObject>(GetGeneric(handle));
- }
-
/// Closes all handles held in this table.
void Clear();
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<Kernel::WaitObject>(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<ObjectPtr> 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<Kernel::WaitObject>(handles[i]);
if (object == nullptr)
return ERR_INVALID_HANDLE;
objects[i] = object;