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()
This commit is contained in:
parent
7ce17b2cf6
commit
b110d2176c
2 changed files with 13 additions and 10 deletions
|
@ -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<u8>& data, const std::string& name, VAddr load_base);
|
||||
static bool LoadNro(Kernel::Process& process, const std::vector<u8>& 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<u8> icon_data;
|
||||
std::unique_ptr<FileSys::NACP> nacp;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue