From 1f7a04f05a488b7d457d356f9bf2dda296cd6b92 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 14 Jan 2015 23:41:33 -0500 Subject: Thread: Keep track of multiple wait objects. --- src/core/hle/kernel/thread.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/hle/kernel/thread.h') diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index daaeb26a..9ec96c18 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -96,7 +96,7 @@ public: s32 processor_id; WaitType wait_type; - Object* wait_object; + std::vector> wait_objects; VAddr wait_address; std::string name; @@ -128,7 +128,7 @@ Thread* GetCurrentThread(); * @param wait_type Type of wait * @param wait_object Kernel object that we are waiting on, defaults to current thread */ -void WaitCurrentThread(WaitType wait_type, Object* wait_object = GetCurrentThread()); +void WaitCurrentThread(WaitType wait_type, WaitObject* wait_object = GetCurrentThread()); /** * Schedules an event to wake up the specified thread after the specified delay. @@ -143,7 +143,7 @@ void WakeThreadAfterDelay(Thread* thread, s64 nanoseconds); * @param wait_object Kernel object that we are waiting on * @param wait_address Arbitration address used to resume from wait */ -void WaitCurrentThread(WaitType wait_type, Object* wait_object, VAddr wait_address); +void WaitCurrentThread(WaitType wait_type, WaitObject* wait_object, VAddr wait_address); -- cgit v1.2.3