diff options
| author | 2018-12-02 22:13:50 -0500 | |
|---|---|---|
| committer | 2018-12-02 22:18:52 -0500 | |
| commit | b110d2176c68d8efe572766e9b7edd80e3dd4298 (patch) | |
| tree | 7bd18c66f920000e940a7bb32ad63e4ce7401cd6 /src/core/loader/nro.h | |
| parent | Merge pull request #1827 from ReinUsesLisp/clip-and-shader (diff) | |
| download | yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.gz yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.xz yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.zip | |
loader/nro: Remove dependency on the System class
Load() is already given the process instance as a parameter, so instead
of coupling the class to the System class, we can just forward that
parameter to LoadNro()
Diffstat (limited to 'src/core/loader/nro.h')
| -rw-r--r-- | src/core/loader/nro.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h index 3e6959302..6a63d1a7a 100644 --- a/src/core/loader/nro.h +++ b/src/core/loader/nro.h | |||
| @@ -14,6 +14,10 @@ namespace FileSys { | |||
| 14 | class NACP; | 14 | class NACP; |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | namespace Kernel { | ||
| 18 | class Process; | ||
| 19 | } | ||
| 20 | |||
| 17 | namespace Loader { | 21 | namespace Loader { |
| 18 | 22 | ||
| 19 | /// Loads an NRO file | 23 | /// Loads an NRO file |
| @@ -41,10 +45,11 @@ public: | |||
| 41 | ResultStatus ReadTitle(std::string& title) override; | 45 | ResultStatus ReadTitle(std::string& title) override; |
| 42 | bool IsRomFSUpdatable() const override; | 46 | bool IsRomFSUpdatable() const override; |
| 43 | 47 | ||
| 44 | static bool LoadNro(const std::vector<u8>& data, const std::string& name, VAddr load_base); | 48 | static bool LoadNro(Kernel::Process& process, const std::vector<u8>& data, |
| 49 | const std::string& name, VAddr load_base); | ||
| 45 | 50 | ||
| 46 | private: | 51 | private: |
| 47 | bool LoadNro(const FileSys::VfsFile& file, VAddr load_base); | 52 | bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base); |
| 48 | 53 | ||
| 49 | std::vector<u8> icon_data; | 54 | std::vector<u8> icon_data; |
| 50 | std::unique_ptr<FileSys::NACP> nacp; | 55 | std::unique_ptr<FileSys::NACP> nacp; |