summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-04-08 19:18:10 -0400
committerGravatar bunnei2020-04-17 00:59:32 -0400
commit11c02a50e9fa71e4bfac1268a15ee424501b6118 (patch)
tree890ea4242933bd374e95fec7f2f0a1f4a89deffb /src/core/core.cpp
parentkernel: transfer_memory: Refactor for new VMM. (diff)
downloadyuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.gz
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.xz
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.zip
core: system: Rename GetDeviceManager -> DeviceManager.
- More consistent with other system components.
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index f58d05c6b..f9f8a3000 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -141,7 +141,7 @@ struct System::Impl {
141 ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) { 141 ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) {
142 LOG_DEBUG(HW_Memory, "initialized OK"); 142 LOG_DEBUG(HW_Memory, "initialized OK");
143 143
144 device_memory = std::make_unique<DeviceMemory>(system); 144 device_memory = std::make_unique<Core::DeviceMemory>(system);
145 145
146 core_timing.Initialize(); 146 core_timing.Initialize();
147 kernel.Initialize(); 147 kernel.Initialize();
@@ -350,7 +350,7 @@ struct System::Impl {
350 std::unique_ptr<Loader::AppLoader> app_loader; 350 std::unique_ptr<Loader::AppLoader> app_loader;
351 std::unique_ptr<Tegra::GPU> gpu_core; 351 std::unique_ptr<Tegra::GPU> gpu_core;
352 std::unique_ptr<Hardware::InterruptManager> interrupt_manager; 352 std::unique_ptr<Hardware::InterruptManager> interrupt_manager;
353 std::unique_ptr<DeviceMemory> device_memory; 353 std::unique_ptr<Core::DeviceMemory> device_memory;
354 Core::Memory::Memory memory; 354 Core::Memory::Memory memory;
355 CpuManager cpu_manager; 355 CpuManager cpu_manager;
356 bool is_powered_on = false; 356 bool is_powered_on = false;
@@ -477,11 +477,11 @@ Kernel::Process* System::CurrentProcess() {
477 return impl->kernel.CurrentProcess(); 477 return impl->kernel.CurrentProcess();
478} 478}
479 479
480DeviceMemory& System::GetDeviceMemory() { 480Core::DeviceMemory& System::DeviceMemory() {
481 return *impl->device_memory; 481 return *impl->device_memory;
482} 482}
483 483
484const DeviceMemory& System::GetDeviceMemory() const { 484const Core::DeviceMemory& System::DeviceMemory() const {
485 return *impl->device_memory; 485 return *impl->device_memory;
486} 486}
487 487