diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-07-27 23:36:08 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-07-27 23:37:49 -0400 |
| commit | 2258f33ee46a44181256b6058faba96cc3b8dcf8 (patch) | |
| tree | 1ba1387a1888fe76a8cc5b542f30921a65841ea5 | |
| parent | 6b35317ff3ec51a0d28181094ee73634e639d658 (diff) | |
device_memory: Remove unused system member
This isn't used by anything in particular, so it can be removed.
| -rw-r--r-- | src/core/core.cpp | 2 | ||||
| -rw-r--r-- | src/core/device_memory.cpp | 5 | ||||
| -rw-r--r-- | src/core/device_memory.h | 8 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index e598c0e2b6..42277e2cd0 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -146,7 +146,7 @@ struct System::Impl { ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) { LOG_DEBUG(HW_Memory, "initialized OK"); - device_memory = std::make_unique<Core::DeviceMemory>(system); + device_memory = std::make_unique<Core::DeviceMemory>(); is_multicore = Settings::values.use_multi_core.GetValue(); is_async_gpu = is_multicore || Settings::values.use_asynchronous_gpu_emulation.GetValue(); diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp index 51097ced35..0c4b440ed7 100644 --- a/src/core/device_memory.cpp +++ b/src/core/device_memory.cpp @@ -2,14 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/core.h" #include "core/device_memory.h" -#include "core/memory.h" namespace Core { -DeviceMemory::DeviceMemory(System& system) : buffer{DramMemoryMap::Size}, system{system} {} - +DeviceMemory::DeviceMemory() : buffer{DramMemoryMap::Size} {} DeviceMemory::~DeviceMemory() = default; } // namespace Core diff --git a/src/core/device_memory.h b/src/core/device_memory.h index 9efa088d00..5b1ae28f3d 100644 --- a/src/core/device_memory.h +++ b/src/core/device_memory.h @@ -4,14 +4,11 @@ #pragma once -#include "common/assert.h" -#include "common/common_funcs.h" +#include "common/common_types.h" #include "common/virtual_buffer.h" namespace Core { -class System; - namespace DramMemoryMap { enum : u64 { Base = 0x80000000ULL, @@ -26,7 +23,7 @@ enum : u64 { class DeviceMemory : NonCopyable { public: - explicit DeviceMemory(Core::System& system); + explicit DeviceMemory(); ~DeviceMemory(); template <typename T> @@ -45,7 +42,6 @@ public: private: Common::VirtualBuffer<u8> buffer; - Core::System& system; }; } // namespace Core |