diff options
| author | 2015-01-14 19:22:50 -0500 | |
|---|---|---|
| committer | 2015-01-21 18:41:00 -0500 | |
| commit | c22bac6398ff1705992fc44b2c29775c84cff662 (patch) | |
| tree | e20da7e6e1824c19b7ced73f43815397749ffae7 /src/core/hle/kernel/thread.h | |
| parent | Merge pull request #491 from archshift/hidspvr (diff) | |
| download | yuzu-c22bac6398ff1705992fc44b2c29775c84cff662.tar.gz yuzu-c22bac6398ff1705992fc44b2c29775c84cff662.tar.xz yuzu-c22bac6398ff1705992fc44b2c29775c84cff662.zip | |
Kernel: Added WaitObject and changed "waitable" objects inherit from it.
Diffstat (limited to 'src/core/hle/kernel/thread.h')
| -rw-r--r-- | src/core/hle/kernel/thread.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 8c9f63aa5..daaeb26a4 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -52,7 +52,7 @@ enum WaitType { | |||
| 52 | 52 | ||
| 53 | namespace Kernel { | 53 | namespace Kernel { |
| 54 | 54 | ||
| 55 | class Thread : public Kernel::Object { | 55 | class Thread : public WaitObject { |
| 56 | public: | 56 | public: |
| 57 | static ResultVal<SharedPtr<Thread>> Create(std::string name, VAddr entry_point, s32 priority, | 57 | static ResultVal<SharedPtr<Thread>> Create(std::string name, VAddr entry_point, s32 priority, |
| 58 | u32 arg, s32 processor_id, VAddr stack_top, u32 stack_size); | 58 | u32 arg, s32 processor_id, VAddr stack_top, u32 stack_size); |
| @@ -99,8 +99,6 @@ public: | |||
| 99 | Object* wait_object; | 99 | Object* wait_object; |
| 100 | VAddr wait_address; | 100 | VAddr wait_address; |
| 101 | 101 | ||
| 102 | std::vector<SharedPtr<Thread>> waiting_threads; | ||
| 103 | |||
| 104 | std::string name; | 102 | std::string name; |
| 105 | 103 | ||
| 106 | /// Whether this thread is intended to never actually be executed, i.e. always idle | 104 | /// Whether this thread is intended to never actually be executed, i.e. always idle |