aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/thread.h
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-01-14 23:41:33 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-01-21 18:42:04 -0500
commit1f7a04f05a488b7d457d356f9bf2dda296cd6b92 (patch)
treeab6bffea6b9f85039af93f4f809c4d657f192d8f /src/core/hle/kernel/thread.h
parent14cbbf4d9b8e07f9f2d679bcf66c2180463ae57c (diff)
Thread: Keep track of multiple wait objects.
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r--src/core/hle/kernel/thread.h6
1 files changed, 3 insertions, 3 deletions
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<SharedPtr<WaitObject>> 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);