summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-09 01:18:10 +0200
committerbunnei <bunneidev@gmail.com>2020-04-17 06:59:32 +0200
commit11c02a50e9fa71e4bfac1268a15ee424501b6118 (patch)
tree890ea4242933bd374e95fec7f2f0a1f4a89deffb /src/core/core.cpp
parentkernel: transfer_memory: Refactor for new VMM. (diff)
downloadyuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.gz
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.bz2
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.lz
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.xz
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.tar.zst
yuzu-11c02a50e9fa71e4bfac1268a15ee424501b6118.zip
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 {
ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) {
LOG_DEBUG(HW_Memory, "initialized OK");
- device_memory = std::make_unique<DeviceMemory>(system);
+ device_memory = std::make_unique<Core::DeviceMemory>(system);
core_timing.Initialize();
kernel.Initialize();
@@ -350,7 +350,7 @@ struct System::Impl {
std::unique_ptr<Loader::AppLoader> app_loader;
std::unique_ptr<Tegra::GPU> gpu_core;
std::unique_ptr<Hardware::InterruptManager> interrupt_manager;
- std::unique_ptr<DeviceMemory> device_memory;
+ std::unique_ptr<Core::DeviceMemory> device_memory;
Core::Memory::Memory memory;
CpuManager cpu_manager;
bool is_powered_on = false;
@@ -477,11 +477,11 @@ Kernel::Process* System::CurrentProcess() {
return impl->kernel.CurrentProcess();
}
-DeviceMemory& System::GetDeviceMemory() {
+Core::DeviceMemory& System::DeviceMemory() {
return *impl->device_memory;
}
-const DeviceMemory& System::GetDeviceMemory() const {
+const Core::DeviceMemory& System::DeviceMemory() const {
return *impl->device_memory;
}