summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/process.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2019-04-17 07:21:19 -0400
committerGravatar Lioncash2019-04-17 09:30:56 -0400
commitc268ffd831bc8771585934e7e24da0f7e150936e (patch)
treeee35a6da18561f3b3d7a43a37081f7f175e62314 /src/core/hle/kernel/process.cpp
parentkernel/svc: Migrate svcCancelSynchronization behavior to a thread function (diff)
downloadyuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.gz
yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.xz
yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.zip
kernel/thread: Unify wait synchronization types
This is a holdover from Citra, where the 3DS has both WaitSynchronization1 and WaitSynchronizationN. The switch only has one form of wait synchronizing (literally WaitSynchonization). This allows us to throw out code that doesn't apply at all to the Switch kernel. Because of this unnecessary dichotomy within the wait synchronization utilities, we were also neglecting to properly handle waiting on multiple objects. While we're at it, we can also scrub out any lingering references to WaitSynchronization1/WaitSynchronizationN in comments, and change them to WaitSynchronization (or remove them if the mention no longer applies).
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
-rw-r--r--src/core/hle/kernel/process.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 4e94048da..0ace3d21c 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -150,8 +150,7 @@ void Process::PrepareForTermination() {
150 continue; 150 continue;
151 151
152 // TODO(Subv): When are the other running/ready threads terminated? 152 // TODO(Subv): When are the other running/ready threads terminated?
153 ASSERT_MSG(thread->GetStatus() == ThreadStatus::WaitSynchAny || 153 ASSERT_MSG(thread->GetStatus() == ThreadStatus::WaitSynch,
154 thread->GetStatus() == ThreadStatus::WaitSynchAll,
155 "Exiting processes with non-waiting threads is currently unimplemented"); 154 "Exiting processes with non-waiting threads is currently unimplemented");
156 155
157 thread->Stop(); 156 thread->Stop();