summaryrefslogtreecommitdiff
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-18 13:56:40 -0500
committerGravatar bunnei2015-01-21 20:47:45 -0500
commit254e4ebd58a31e8462b70799f95f096d0d0038f2 (patch)
treee8e475ec7af1ba2df06b7f44298408f51a89a116 /src/core/hle/svc.cpp
parentKernel: Get rid of WaitTypes and simplify lots of code, removing hacks. (diff)
downloadyuzu-254e4ebd58a31e8462b70799f95f096d0d0038f2.tar.gz
yuzu-254e4ebd58a31e8462b70799f95f096d0d0038f2.tar.xz
yuzu-254e4ebd58a31e8462b70799f95f096d0d0038f2.zip
AddressArbiter: Changed to Kernel::Object, big cleanup, removed code that made no sense.
Diffstat (limited to 'src/core/hle/svc.cpp')
-rw-r--r--src/core/hle/svc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 2d5f41af6..cf029bf69 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -105,7 +105,7 @@ static Result SendSyncRequest(Handle handle) {
105 105
106 ResultVal<bool> wait = session->SyncRequest(); 106 ResultVal<bool> wait = session->SyncRequest();
107 if (wait.Succeeded() && *wait) { 107 if (wait.Succeeded() && *wait) {
108 Kernel::WaitCurrentThread(); // TODO(bunnei): Is this correct? 108 Kernel::WaitCurrentThread_Sleep(); // TODO(bunnei): Is this correct?
109 } 109 }
110 110
111 return wait.Code().raw; 111 return wait.Code().raw;
@@ -196,7 +196,7 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count,
196 // NOTE: This should deadlock the current thread if no timeout was specified 196 // NOTE: This should deadlock the current thread if no timeout was specified
197 if (!wait_all) { 197 if (!wait_all) {
198 wait_thread = true; 198 wait_thread = true;
199 Kernel::WaitCurrentThread(); 199 Kernel::WaitCurrentThread_Sleep();
200 } 200 }
201 } 201 }
202 202
@@ -450,7 +450,7 @@ static void SleepThread(s64 nanoseconds) {
450 LOG_TRACE(Kernel_SVC, "called nanoseconds=%lld", nanoseconds); 450 LOG_TRACE(Kernel_SVC, "called nanoseconds=%lld", nanoseconds);
451 451
452 // Sleep current thread and check for next thread to schedule 452 // Sleep current thread and check for next thread to schedule
453 Kernel::WaitCurrentThread(); 453 Kernel::WaitCurrentThread_Sleep();
454 454
455 // Create an event to wake the thread up after the specified nanosecond delay has passed 455 // Create an event to wake the thread up after the specified nanosecond delay has passed
456 Kernel::WakeThreadAfterDelay(Kernel::GetCurrentThread(), nanoseconds); 456 Kernel::WakeThreadAfterDelay(Kernel::GetCurrentThread(), nanoseconds);