diff options
| author | 2015-01-20 17:41:12 -0500 | |
|---|---|---|
| committer | 2015-01-21 20:47:49 -0500 | |
| commit | c68eb1569549ae49ae25c6c29cec2e10d8329f2d (patch) | |
| tree | 4a8683aac99095884acaf488aa4d059f861138b3 /src/core/hle/kernel/kernel.h | |
| parent | Event: Fix implementation of "non-sticky" events. (diff) | |
| download | yuzu-c68eb1569549ae49ae25c6c29cec2e10d8329f2d.tar.gz yuzu-c68eb1569549ae49ae25c6c29cec2e10d8329f2d.tar.xz yuzu-c68eb1569549ae49ae25c6c29cec2e10d8329f2d.zip | |
WaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" pure virtual.
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index ca9ccf4bf..1bb0b55bd 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -117,22 +117,16 @@ class WaitObject : public Object { | |||
| 117 | public: | 117 | public: |
| 118 | 118 | ||
| 119 | /** | 119 | /** |
| 120 | * Check if this object is available | 120 | * Check if the current thread should wait until the object is available |
| 121 | * @return True if the current thread should wait due to this object being unavailable | 121 | * @return True if the current thread should wait due to this object being unavailable |
| 122 | */ | 122 | */ |
| 123 | virtual ResultVal<bool> Wait() { | 123 | virtual ResultVal<bool> ShouldWait() = 0; |
| 124 | LOG_ERROR(Kernel, "(UNIMPLEMENTED)"); | ||
| 125 | return UnimplementedFunction(ErrorModule::Kernel); | ||
| 126 | } | ||
| 127 | 124 | ||
| 128 | /** | 125 | /** |
| 129 | * Acquire/lock the this object if it is available | 126 | * Acquire/lock the object if it is available |
| 130 | * @return True if we were able to acquire this object, otherwise false | 127 | * @return True if we were able to acquire this object, otherwise false |
| 131 | */ | 128 | */ |
| 132 | virtual ResultVal<bool> Acquire() { | 129 | virtual ResultVal<bool> Acquire() = 0; |
| 133 | LOG_ERROR(Kernel, "(UNIMPLEMENTED)"); | ||
| 134 | return UnimplementedFunction(ErrorModule::Kernel); | ||
| 135 | } | ||
| 136 | 130 | ||
| 137 | /** | 131 | /** |
| 138 | * Add a thread to wait on this object | 132 | * Add a thread to wait on this object |