From b110d2176c68d8efe572766e9b7edd80e3dd4298 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 2 Dec 2018 22:13:50 -0500 Subject: 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() --- src/core/loader/nro.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/core/loader/nro.h') 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 { class NACP; } +namespace Kernel { +class Process; +} + namespace Loader { /// Loads an NRO file @@ -41,10 +45,11 @@ public: ResultStatus ReadTitle(std::string& title) override; bool IsRomFSUpdatable() const override; - static bool LoadNro(const std::vector& data, const std::string& name, VAddr load_base); + static bool LoadNro(Kernel::Process& process, const std::vector& data, + const std::string& name, VAddr load_base); private: - bool LoadNro(const FileSys::VfsFile& file, VAddr load_base); + bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base); std::vector icon_data; std::unique_ptr nacp; -- cgit v1.2.3