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/hle/service/filesystem/filesystem.h | |
| 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/hle/service/filesystem/filesystem.h')
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/core/hle/service/filesystem/filesystem.h index e6b49d8a2..1b0a6a949 100644 --- a/src/core/hle/service/filesystem/filesystem.h +++ b/src/core/hle/service/filesystem/filesystem.h @@ -10,6 +10,10 @@ #include "core/file_sys/vfs.h" #include "core/hle/result.h" +namespace Core { +class System; +} + namespace FileSys { class BISFactory; class RegisteredCache; @@ -52,7 +56,7 @@ enum class ImageDirectoryId : u32 { class FileSystemController { public: - FileSystemController(); + explicit FileSystemController(Core::System& system_); ~FileSystemController(); ResultCode RegisterRomFS(std::unique_ptr<FileSys::RomFSFactory>&& factory); @@ -125,6 +129,8 @@ private: std::unique_ptr<FileSys::XCI> gamecard; std::unique_ptr<FileSys::RegisteredCache> gamecard_registered; std::unique_ptr<FileSys::PlaceholderCache> gamecard_placeholder; + + Core::System& system; }; void InstallInterfaces(Core::System& system); |
