diff options
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 30230d65a..e68b9f16a 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 5 | #include <cinttypes> | 6 | #include <cinttypes> |
| 6 | #include <map> | 7 | #include <map> |
| 7 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| @@ -16,6 +17,7 @@ | |||
| 16 | #include "core/hle/kernel/client_session.h" | 17 | #include "core/hle/kernel/client_session.h" |
| 17 | #include "core/hle/kernel/errors.h" | 18 | #include "core/hle/kernel/errors.h" |
| 18 | #include "core/hle/kernel/event.h" | 19 | #include "core/hle/kernel/event.h" |
| 20 | #include "core/hle/kernel/handle_table.h" | ||
| 19 | #include "core/hle/kernel/memory.h" | 21 | #include "core/hle/kernel/memory.h" |
| 20 | #include "core/hle/kernel/mutex.h" | 22 | #include "core/hle/kernel/mutex.h" |
| 21 | #include "core/hle/kernel/process.h" | 23 | #include "core/hle/kernel/process.h" |
| @@ -27,6 +29,7 @@ | |||
| 27 | #include "core/hle/kernel/thread.h" | 29 | #include "core/hle/kernel/thread.h" |
| 28 | #include "core/hle/kernel/timer.h" | 30 | #include "core/hle/kernel/timer.h" |
| 29 | #include "core/hle/kernel/vm_manager.h" | 31 | #include "core/hle/kernel/vm_manager.h" |
| 32 | #include "core/hle/kernel/wait_object.h" | ||
| 30 | #include "core/hle/result.h" | 33 | #include "core/hle/result.h" |
| 31 | #include "core/hle/service/service.h" | 34 | #include "core/hle/service/service.h" |
| 32 | 35 | ||
| @@ -244,7 +247,7 @@ static ResultCode CloseHandle(Kernel::Handle handle) { | |||
| 244 | 247 | ||
| 245 | /// Wait for a handle to synchronize, timeout after the specified nanoseconds | 248 | /// Wait for a handle to synchronize, timeout after the specified nanoseconds |
| 246 | static ResultCode WaitSynchronization1(Kernel::Handle handle, s64 nano_seconds) { | 249 | static ResultCode WaitSynchronization1(Kernel::Handle handle, s64 nano_seconds) { |
| 247 | auto object = Kernel::g_handle_table.GetWaitObject(handle); | 250 | auto object = Kernel::g_handle_table.Get<Kernel::WaitObject>(handle); |
| 248 | Kernel::Thread* thread = Kernel::GetCurrentThread(); | 251 | Kernel::Thread* thread = Kernel::GetCurrentThread(); |
| 249 | 252 | ||
| 250 | if (object == nullptr) | 253 | if (object == nullptr) |
| @@ -299,7 +302,7 @@ static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 ha | |||
| 299 | std::vector<ObjectPtr> objects(handle_count); | 302 | std::vector<ObjectPtr> objects(handle_count); |
| 300 | 303 | ||
| 301 | for (int i = 0; i < handle_count; ++i) { | 304 | for (int i = 0; i < handle_count; ++i) { |
| 302 | auto object = Kernel::g_handle_table.GetWaitObject(handles[i]); | 305 | auto object = Kernel::g_handle_table.Get<Kernel::WaitObject>(handles[i]); |
| 303 | if (object == nullptr) | 306 | if (object == nullptr) |
| 304 | return ERR_INVALID_HANDLE; | 307 | return ERR_INVALID_HANDLE; |
| 305 | objects[i] = object; | 308 | objects[i] = object; |