From 4caff51710a793c6c2c1069ddd6e92185aa731fe Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 31 Mar 2020 15:10:44 -0400
Subject: core: memory: Move to Core::Memory namespace.

- helpful to disambiguate Kernel::Memory namespace.
---
 src/core/core.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/core/core.h')

diff --git a/src/core/core.h b/src/core/core.h
index 8d862a8e6..c2bdef07e 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -36,9 +36,10 @@ class AppLoader;
 enum class ResultStatus : u16;
 } // namespace Loader
 
-namespace Memory {
+namespace Core::Memory {
 struct CheatEntry;
-} // namespace Memory
+class Memory;
+} // namespace Core::Memory
 
 namespace Service {
 
@@ -86,10 +87,6 @@ namespace Core::Hardware {
 class InterruptManager;
 }
 
-namespace Memory {
-class Memory;
-}
-
 namespace Core {
 
 class ARM_Interface;
@@ -230,10 +227,10 @@ public:
     const ExclusiveMonitor& Monitor() const;
 
     /// Gets a mutable reference to the system memory instance.
-    Memory::Memory& Memory();
+    Core::Memory::Memory& Memory();
 
     /// Gets a constant reference to the system memory instance.
-    const Memory::Memory& Memory() const;
+    const Core::Memory::Memory& Memory() const;
 
     /// Gets a mutable reference to the GPU interface
     Tegra::GPU& GPU();
-- 
cgit v1.2.3


From dc25c86556c36dd23224d88234afc9ecbf780719 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Thu, 2 Apr 2020 22:00:41 -0400
Subject: core: device_manager: Add a simple class to manage device RAM.

---
 src/core/core.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/core/core.h')

diff --git a/src/core/core.h b/src/core/core.h
index c2bdef07e..6cd93000a 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -91,6 +91,7 @@ namespace Core {
 
 class ARM_Interface;
 class CoreManager;
+class DeviceMemory;
 class ExclusiveMonitor;
 class FrameLimiter;
 class PerfStats;
@@ -256,6 +257,12 @@ public:
     /// Gets the global scheduler
     const Kernel::GlobalScheduler& GlobalScheduler() const;
 
+    /// Gets the manager for the guest device memory
+    DeviceMemory& GetDeviceMemory();
+
+    /// Gets the manager for the guest device memory
+    const DeviceMemory& GetDeviceMemory() const;
+
     /// Provides a pointer to the current process
     Kernel::Process* CurrentProcess();
 
-- 
cgit v1.2.3


From 11c02a50e9fa71e4bfac1268a15ee424501b6118 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Wed, 8 Apr 2020 19:18:10 -0400
Subject: core: system: Rename GetDeviceManager -> DeviceManager.

- More consistent with other system components.
---
 src/core/core.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/core.h')

diff --git a/src/core/core.h b/src/core/core.h
index 6cd93000a..acc53d6a1 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -258,10 +258,10 @@ public:
     const Kernel::GlobalScheduler& GlobalScheduler() const;
 
     /// Gets the manager for the guest device memory
-    DeviceMemory& GetDeviceMemory();
+    Core::DeviceMemory& DeviceMemory();
 
     /// Gets the manager for the guest device memory
-    const DeviceMemory& GetDeviceMemory() const;
+    const Core::DeviceMemory& DeviceMemory() const;
 
     /// Provides a pointer to the current process
     Kernel::Process* CurrentProcess();
-- 
cgit v1.2.3