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 262411db8..d7f43f5ec 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"
@@ -150,7 +151,7 @@ struct System::Impl {
150 if (!renderer->Init()) { 151 if (!renderer->Init()) {
151 return ResultStatus::ErrorVideoCore; 152 return ResultStatus::ErrorVideoCore;
152 } 153 }
153 154 interrupt_manager = std::make_unique<Core::Hardware::InterruptManager>(system);
154 gpu_core = VideoCore::CreateGPU(system); 155 gpu_core = VideoCore::CreateGPU(system);
155 156
156 is_powered_on = true; 157 is_powered_on = true;
@@ -297,6 +298,7 @@ struct System::Impl {
297 std::unique_ptr<VideoCore::RendererBase> renderer; 298 std::unique_ptr<VideoCore::RendererBase> renderer;
298 std::unique_ptr<Tegra::GPU> gpu_core; 299 std::unique_ptr<Tegra::GPU> gpu_core;
299 std::shared_ptr<Tegra::DebugContext> debug_context; 300 std::shared_ptr<Tegra::DebugContext> debug_context;
301 std::unique_ptr<Core::Hardware::InterruptManager> interrupt_manager;
300 CpuCoreManager cpu_core_manager; 302 CpuCoreManager cpu_core_manager;
301 bool is_powered_on = false; 303 bool is_powered_on = false;
302 304
@@ -440,6 +442,14 @@ const Tegra::GPU& System::GPU() const {
440 return *impl->gpu_core; 442 return *impl->gpu_core;
441} 443}
442 444
445Core::Hardware::InterruptManager& System::InterruptManager() {
446 return *impl->interrupt_manager;
447}
448
449const Core::Hardware::InterruptManager& System::InterruptManager() const {
450 return *impl->interrupt_manager;
451}
452
443VideoCore::RendererBase& System::Renderer() { 453VideoCore::RendererBase& System::Renderer() {
444 return *impl->renderer; 454 return *impl->renderer;
445} 455}