summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 4aceee785..20d64f3b0 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -19,6 +19,7 @@
19#include "core/file_sys/vfs_concat.h" 19#include "core/file_sys/vfs_concat.h"
20#include "core/file_sys/vfs_real.h" 20#include "core/file_sys/vfs_real.h"
21#include "core/gdbstub/gdbstub.h" 21#include "core/gdbstub/gdbstub.h"
22#include "core/hardware_interrupt_manager.h"
22#include "core/hle/kernel/client_port.h" 23#include "core/hle/kernel/client_port.h"
23#include "core/hle/kernel/kernel.h" 24#include "core/hle/kernel/kernel.h"
24#include "core/hle/kernel/process.h" 25#include "core/hle/kernel/process.h"
@@ -151,7 +152,7 @@ struct System::Impl {
151 if (!renderer->Init()) { 152 if (!renderer->Init()) {
152 return ResultStatus::ErrorVideoCore; 153 return ResultStatus::ErrorVideoCore;
153 } 154 }
154 155 interrupt_manager = std::make_unique<Core::Hardware::InterruptManager>(system);
155 gpu_core = VideoCore::CreateGPU(system); 156 gpu_core = VideoCore::CreateGPU(system);
156 157
157 is_powered_on = true; 158 is_powered_on = true;
@@ -298,6 +299,7 @@ struct System::Impl {
298 std::unique_ptr<VideoCore::RendererBase> renderer; 299 std::unique_ptr<VideoCore::RendererBase> renderer;
299 std::unique_ptr<Tegra::GPU> gpu_core; 300 std::unique_ptr<Tegra::GPU> gpu_core;
300 std::shared_ptr<Tegra::DebugContext> debug_context; 301 std::shared_ptr<Tegra::DebugContext> debug_context;
302 std::unique_ptr<Core::Hardware::InterruptManager> interrupt_manager;
301 CpuCoreManager cpu_core_manager; 303 CpuCoreManager cpu_core_manager;
302 bool is_powered_on = false; 304 bool is_powered_on = false;
303 305
@@ -444,6 +446,14 @@ const Tegra::GPU& System::GPU() const {
444 return *impl->gpu_core; 446 return *impl->gpu_core;
445} 447}
446 448
449Core::Hardware::InterruptManager& System::InterruptManager() {
450 return *impl->interrupt_manager;
451}
452
453const Core::Hardware::InterruptManager& System::InterruptManager() const {
454 return *impl->interrupt_manager;
455}
456
447VideoCore::RendererBase& System::Renderer() { 457VideoCore::RendererBase& System::Renderer() {
448 return *impl->renderer; 458 return *impl->renderer;
449} 459}