diff options
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 13d02e75f..1deeee154 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include "core/file_sys/savedata_factory.h" | 27 | #include "core/file_sys/savedata_factory.h" |
| 28 | #include "core/file_sys/vfs_concat.h" | 28 | #include "core/file_sys/vfs_concat.h" |
| 29 | #include "core/file_sys/vfs_real.h" | 29 | #include "core/file_sys/vfs_real.h" |
| 30 | #include "core/hardware_interrupt_manager.h" | ||
| 31 | #include "core/hid/hid_core.h" | 30 | #include "core/hid/hid_core.h" |
| 32 | #include "core/hle/kernel/k_memory_manager.h" | 31 | #include "core/hle/kernel/k_memory_manager.h" |
| 33 | #include "core/hle/kernel/k_process.h" | 32 | #include "core/hle/kernel/k_process.h" |
| @@ -226,7 +225,6 @@ struct System::Impl { | |||
| 226 | 225 | ||
| 227 | service_manager = std::make_shared<Service::SM::ServiceManager>(kernel); | 226 | service_manager = std::make_shared<Service::SM::ServiceManager>(kernel); |
| 228 | services = std::make_unique<Service::Services>(service_manager, system); | 227 | services = std::make_unique<Service::Services>(service_manager, system); |
| 229 | interrupt_manager = std::make_unique<Hardware::InterruptManager>(system); | ||
| 230 | 228 | ||
| 231 | // Initialize time manager, which must happen after kernel is created | 229 | // Initialize time manager, which must happen after kernel is created |
| 232 | time_manager.Initialize(); | 230 | time_manager.Initialize(); |
| @@ -454,7 +452,6 @@ struct System::Impl { | |||
| 454 | std::unique_ptr<Loader::AppLoader> app_loader; | 452 | std::unique_ptr<Loader::AppLoader> app_loader; |
| 455 | std::unique_ptr<Tegra::GPU> gpu_core; | 453 | std::unique_ptr<Tegra::GPU> gpu_core; |
| 456 | std::unique_ptr<Tegra::Host1x::Host1x> host1x_core; | 454 | std::unique_ptr<Tegra::Host1x::Host1x> host1x_core; |
| 457 | std::unique_ptr<Hardware::InterruptManager> interrupt_manager; | ||
| 458 | std::unique_ptr<Core::DeviceMemory> device_memory; | 455 | std::unique_ptr<Core::DeviceMemory> device_memory; |
| 459 | std::unique_ptr<AudioCore::AudioCore> audio_core; | 456 | std::unique_ptr<AudioCore::AudioCore> audio_core; |
| 460 | Core::Memory::Memory memory; | 457 | Core::Memory::Memory memory; |
| @@ -680,14 +677,6 @@ const Tegra::Host1x::Host1x& System::Host1x() const { | |||
| 680 | return *impl->host1x_core; | 677 | return *impl->host1x_core; |
| 681 | } | 678 | } |
| 682 | 679 | ||
| 683 | Core::Hardware::InterruptManager& System::InterruptManager() { | ||
| 684 | return *impl->interrupt_manager; | ||
| 685 | } | ||
| 686 | |||
| 687 | const Core::Hardware::InterruptManager& System::InterruptManager() const { | ||
| 688 | return *impl->interrupt_manager; | ||
| 689 | } | ||
| 690 | |||
| 691 | VideoCore::RendererBase& System::Renderer() { | 680 | VideoCore::RendererBase& System::Renderer() { |
| 692 | return impl->gpu_core->Renderer(); | 681 | return impl->gpu_core->Renderer(); |
| 693 | } | 682 | } |