summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2017-01-05 19:17:06 +0100
committerSubv <subv2112@gmail.com>2017-01-05 19:17:06 +0100
commit5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb (patch)
tree2eab95cf5db820bbc09475eb88f614d11940e95e /src/core
parentMerge pull request #2393 from Subv/synch (diff)
downloadyuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.tar
yuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.tar.gz
yuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.tar.bz2
yuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.tar.lz
yuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.tar.xz
yuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.tar.zst
yuzu-5e2a8ebabf52fc05eca41cafad1c85478a0c5dbb.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/thread.cpp23
-rw-r--r--src/core/hle/kernel/thread.h9
2 files changed, 0 insertions, 32 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 9109bd10b..7b351ed5e 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -66,21 +66,6 @@ Thread* GetCurrentThread() {
}
/**
- * Check if a thread is waiting on the specified wait object
- * @param thread The thread to test
- * @param wait_object The object to test against
- * @return True if the thread is waiting, false otherwise
- */
-static bool CheckWait_WaitObject(const Thread* thread, WaitObject* wait_object) {
- if (thread->status != THREADSTATUS_WAIT_SYNCH_ALL &&
- thread->status != THREADSTATUS_WAIT_SYNCH_ANY)
- return false;
-
- auto itr = std::find(thread->wait_objects.begin(), thread->wait_objects.end(), wait_object);
- return itr != thread->wait_objects.end();
-}
-
-/**
* Check if the specified thread is waiting on the specified address to be arbitrated
* @param thread The thread to test
* @param wait_address The address to test against
@@ -249,14 +234,6 @@ void WaitCurrentThread_Sleep() {
thread->status = THREADSTATUS_WAIT_SLEEP;
}
-void WaitCurrentThread_WaitSynchronization(std::vector<SharedPtr<WaitObject>> wait_objects,
- bool wait_set_output) {
- Thread* thread = GetCurrentThread();
- thread->wait_set_output = wait_set_output;
- thread->wait_objects = std::move(wait_objects);
- thread->status = THREADSTATUS_WAIT_SYNCH_ANY;
-}
-
void WaitCurrentThread_ArbitrateAddress(VAddr wait_address) {
Thread* thread = GetCurrentThread();
thread->wait_address = wait_address;
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index af72b76ea..6d395585d 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -246,15 +246,6 @@ Thread* GetCurrentThread();
void WaitCurrentThread_Sleep();
/**
- * Waits the current thread from a WaitSynchronization call
- * @param wait_objects Kernel objects that we are waiting on
- * @param wait_set_output If true, set the output parameter on thread wakeup (for
- * WaitSynchronizationN only)
- */
-void WaitCurrentThread_WaitSynchronization(std::vector<SharedPtr<WaitObject>> wait_objects,
- bool wait_set_output);
-
-/**
* Waits the current thread from an ArbitrateAddress call
* @param wait_address Arbitration address used to resume from wait
*/