CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

core: system: Rename GetDeviceManager -> DeviceManager. 

- More consistent with other system components.
merge-requests/60/head
bunnei 2020-04-08 19:18:10 +07:00
parent 3fcc4cab4f
commit 11c02a50e9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.cpp
Unescape Escape View File

@ -141,7 +141,7 @@ struct System::Impl {
ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) { ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) {
LOG_DEBUG(HW_Memory, "initialized OK"); LOG_DEBUG(HW_Memory, "initialized OK");
device_memory = std::make_unique<DeviceMemory>(system); device_memory = std::make_unique<Core::DeviceMemory>(system);
core_timing.Initialize(); core_timing.Initialize();
kernel.Initialize(); kernel.Initialize();
@ -350,7 +350,7 @@ struct System::Impl {
std::unique_ptr<Loader::AppLoader> app_loader; std::unique_ptr<Loader::AppLoader> app_loader;
std::unique_ptr<Tegra::GPU> gpu_core; std::unique_ptr<Tegra::GPU> gpu_core;
std::unique_ptr<Hardware::InterruptManager> interrupt_manager; std::unique_ptr<Hardware::InterruptManager> interrupt_manager;
std::unique_ptr<DeviceMemory> device_memory; std::unique_ptr<Core::DeviceMemory> device_memory;
Core::Memory::Memory memory; Core::Memory::Memory memory;
CpuManager cpu_manager; CpuManager cpu_manager;
bool is_powered_on = false; bool is_powered_on = false;
@ -477,11 +477,11 @@ Kernel::Process* System::CurrentProcess() {
return impl->kernel.CurrentProcess(); return impl->kernel.CurrentProcess();
} }
DeviceMemory& System::GetDeviceMemory() { Core::DeviceMemory& System::DeviceMemory() {
return *impl->device_memory; return *impl->device_memory;
} }
const DeviceMemory& System::GetDeviceMemory() const { const Core::DeviceMemory& System::DeviceMemory() const {
return *impl->device_memory; return *impl->device_memory;
} }

4
src/core/core.h
Unescape Escape View File

@ -258,10 +258,10 @@ public:
const Kernel::GlobalScheduler& GlobalScheduler() const; const Kernel::GlobalScheduler& GlobalScheduler() const;
/// Gets the manager for the guest device memory /// Gets the manager for the guest device memory
DeviceMemory& GetDeviceMemory(); Core::DeviceMemory& DeviceMemory();
/// Gets the manager for the guest device memory /// Gets the manager for the guest device memory
const DeviceMemory& GetDeviceMemory() const; const Core::DeviceMemory& DeviceMemory() const;
/// Provides a pointer to the current process /// Provides a pointer to the current process
Kernel::Process* CurrentProcess(); Kernel::Process* CurrentProcess();

2
src/core/hle/kernel/memory/page_table.cpp
Unescape Escape View File

@ -937,7 +937,7 @@ ResultVal<VAddr> PageTable::AllocateAndMapMemory(std::size_t needed_num_pages, s
} }
PAddr PageTable::GetPhysicalAddr(VAddr addr) { PAddr PageTable::GetPhysicalAddr(VAddr addr) {
return system.GetDeviceMemory().GetPhysicalAddr(addr); return system.DeviceMemory().GetPhysicalAddr(addr);
} }
ResultCode PageTable::InitializeMemoryLayout(VAddr start, VAddr end) { ResultCode PageTable::InitializeMemoryLayout(VAddr start, VAddr end) {