Merge pull request #202 from bunnei/scheduler-cleanup

Scheduler cleanup

1 files changed, 7 insertions, 3 deletions

diff --git a/src/core/core.h b/src/core/core.h
index f63cc47cc..ada23b347 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -7,6 +7,7 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
+#include "core/hle/kernel/scheduler.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
 #include "core/perf_stats.h"
@@ -107,6 +108,10 @@ public:
         return *gpu_core;
     }
 
+    Kernel::Scheduler& Scheduler() {
+        return *scheduler;
+    }
+
     PerfStats perf_stats;
     FrameLimiter frame_limiter;
 
@@ -140,9 +145,8 @@ private:
     /// AppLoader used to load the current executing application
     std::unique_ptr<Loader::AppLoader> app_loader;
 
-    ///< ARM11 CPU core
-    std::unique_ptr<ARM_Interface> cpu_core;
-
+    std::shared_ptr<ARM_Interface> cpu_core;
+    std::unique_ptr<Kernel::Scheduler> scheduler;
     std::unique_ptr<Tegra::GPU> gpu_core;
 
     /// When true, signals that a reschedule should happen