Explorar o código

Kernel: Remove a few global instances from the kernel.

Fernando Sahmkow %!s(int64=6) %!d(string=hai) anos
pai
achega
a1630ab53e
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      src/core/hle/kernel/thread.cpp
  2. 1 1
      src/core/hle/kernel/wait_object.cpp

+ 1 - 1
src/core/hle/kernel/thread.cpp

@@ -355,7 +355,7 @@ void Thread::SetActivity(ThreadActivity value) {
         // Set status if not waiting
         // Set status if not waiting
         if (status == ThreadStatus::Ready || status == ThreadStatus::Running) {
         if (status == ThreadStatus::Ready || status == ThreadStatus::Running) {
             SetStatus(ThreadStatus::Paused);
             SetStatus(ThreadStatus::Paused);
-            Core::System::GetInstance().PrepareReschedule(processor_id);
+            kernel.PrepareReschedule(processor_id);
         }
         }
     } else if (status == ThreadStatus::Paused) {
     } else if (status == ThreadStatus::Paused) {
         // Ready to reschedule
         // Ready to reschedule

+ 1 - 1
src/core/hle/kernel/wait_object.cpp

@@ -95,7 +95,7 @@ void WaitObject::WakeupWaitingThread(std::shared_ptr<Thread> thread) {
     }
     }
     if (resume) {
     if (resume) {
         thread->ResumeFromWait();
         thread->ResumeFromWait();
-        Core::System::GetInstance().PrepareReschedule(thread->GetProcessorID());
+        kernel.PrepareReschedule(thread->GetProcessorID());
     }
     }
 }
 }