diff options
author | Lioncash <mathew1800@gmail.com> | 2019-10-06 13:02:23 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-10-06 13:42:23 -0400 |
commit | 69f16ba50e3c52a17405670b976ac4ba63f58021 (patch) | |
tree | e64b63528a155da323ea02039ede638fb6994ecd /src/core/core.cpp | |
parent | deecd7f074a0547b8fc08a33fdc547eb63859e3e (diff) |
hle/service: Replace global system instance calls with instance-based ones
Migrates the HLE service code off the use of directly accessing the
global system instance where trivially able to do so.
This removes all usages of Core::CurrentProcess from the service code,
only 8 occurrences of this function exist elsewhere. There's still quite
a bit of "System::GetInstance()" being used, however this was able to
replace a few instances.
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r-- | src/core/core.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 75a7ffb973..a58ceb703d 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -111,7 +111,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, } struct System::Impl { explicit Impl(System& system) - : kernel{system}, cpu_core_manager{system}, applet_manager{system}, reporter{system} {} + : kernel{system}, fs_controller{system}, cpu_core_manager{system}, + applet_manager{system}, reporter{system} {} Cpu& CurrentCpuCore() { return cpu_core_manager.GetCurrentCore(); @@ -641,11 +642,11 @@ bool System::GetExitLock() const { return impl->exit_lock; } -void System::SetCurrentProcessBuildID(std::array<u8, 32> id) { +void System::SetCurrentProcessBuildID(const CurrentBuildProcessID& id) { impl->build_id = id; } -const std::array<u8, 32>& System::GetCurrentProcessBuildID() const { +const System::CurrentBuildProcessID& System::GetCurrentProcessBuildID() const { return impl->build_id; } |