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.h | |
| 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.h')
| -rw-r--r-- | src/core/loader/nro.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h index 4593d48fb..a2aab2ecc 100644 --- a/src/core/loader/nro.h +++ b/src/core/loader/nro.h | |||
| @@ -10,6 +10,10 @@ | |||
| 10 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 11 | #include "core/loader/loader.h" | 11 | #include "core/loader/loader.h" |
| 12 | 12 | ||
| 13 | namespace Core { | ||
| 14 | class System; | ||
| 15 | } | ||
| 16 | |||
| 13 | namespace FileSys { | 17 | namespace FileSys { |
| 14 | class NACP; | 18 | class NACP; |
| 15 | } | 19 | } |
| @@ -37,7 +41,7 @@ public: | |||
| 37 | return IdentifyType(file); | 41 | return IdentifyType(file); |
| 38 | } | 42 | } |
| 39 | 43 | ||
| 40 | LoadResult Load(Kernel::Process& process) override; | 44 | LoadResult Load(Kernel::Process& process, Core::System& system) override; |
| 41 | 45 | ||
| 42 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; | 46 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; |
| 43 | ResultStatus ReadProgramId(u64& out_program_id) override; | 47 | ResultStatus ReadProgramId(u64& out_program_id) override; |