Replace g_kernel with Core::Global etc.

2020-02-13 17:38:21 +08:00
parent e707685c2a
commit 3e752002c4
15 changed files with 43 additions and 17 deletions
@@ -11,10 +11,11 @@
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/timer.h"
+#include "core/global.h"

 namespace Kernel {

-Timer::Timer() : kernel(*g_kernel), timer_manager(g_kernel->GetTimerManager()) {}
+Timer::Timer() : kernel(Core::Global<KernelSystem>()), timer_manager(Core::Global<KernelSystem>().GetTimerManager()) {}
 Timer::~Timer() {
    Cancel();
    timer_manager.timer_callback_table.erase(callback_id);