diff options
| author | 2020-09-16 08:19:25 -0400 | |
|---|---|---|
| committer | 2020-09-16 08:46:59 -0400 | |
| commit | 113a3972a6487430ab94f08a4a66742739ff48c2 (patch) | |
| tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nro.cpp | |
| parent | Merge pull request #4658 from lioncash/copy3 (diff) | |
| download | yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.tar.gz yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.tar.xz yuzu-113a3972a6487430ab94f08a4a66742739ff48c2.zip | |
core/loader: Remove dependencies on the global system instance
Now all that remains is:
18 instances in file_sys code
14 instances in GDB stub code (this can be tossed wholesale)
4 instances in HLE code
2 instances in settings code.
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 906544bc9..5ce279f81 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -208,7 +208,7 @@ bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& fi | |||
| 208 | return LoadNroImpl(process, file.ReadAllBytes(), file.GetName()); | 208 | return LoadNroImpl(process, file.ReadAllBytes(), file.GetName()); |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { | 211 | AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process, Core::System& system) { |
| 212 | if (is_loaded) { | 212 | if (is_loaded) { |
| 213 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 213 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 214 | } | 214 | } |
| @@ -218,7 +218,7 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { | |||
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | if (romfs != nullptr) { | 220 | if (romfs != nullptr) { |
| 221 | Core::System::GetInstance().GetFileSystemController().RegisterRomFS( | 221 | system.GetFileSystemController().RegisterRomFS( |
| 222 | std::make_unique<FileSys::RomFSFactory>(*this)); | 222 | std::make_unique<FileSys::RomFSFactory>(*this)); |
| 223 | } | 223 | } |
| 224 | 224 | ||