Fixed encrypted ROM error messages.
This commit is contained in:
parent
4857eb441b
commit
e523c76cc8
|
@ -100,11 +100,13 @@ public:
|
||||||
* Loads the system mode that this application needs.
|
* Loads the system mode that this application needs.
|
||||||
* This function defaults to 2 (96MB allocated to the application) if it can't read the
|
* This function defaults to 2 (96MB allocated to the application) if it can't read the
|
||||||
* information.
|
* information.
|
||||||
* @returns Optional with the kernel system mode
|
* @param boost::optional<u32> Reference to Boost optional to store system mode.
|
||||||
|
* @ return Result of operation.
|
||||||
*/
|
*/
|
||||||
virtual boost::optional<u32> LoadKernelSystemMode() {
|
virtual ResultStatus LoadKernelSystemMode(boost::optional<u32>& system_mode) {
|
||||||
// 96MB allocated to the application.
|
// 96MB allocated to the application.
|
||||||
return 2;
|
system_mode = 2;
|
||||||
|
return ResultStatus::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -121,12 +121,19 @@ FileType AppLoader_NCCH::IdentifyType(FileUtil::IOFile& file) {
|
||||||
return FileType::Error;
|
return FileType::Error;
|
||||||
}
|
}
|
||||||
|
|
||||||
boost::optional<u32> AppLoader_NCCH::LoadKernelSystemMode() {
|
ResultStatus AppLoader_NCCH::LoadKernelSystemMode(boost::optional<u32>& system_mode) {
|
||||||
if (!is_loaded) {
|
if (!is_loaded) {
|
||||||
if (LoadExeFS() != ResultStatus::Success)
|
ResultStatus res = LoadExeFS();
|
||||||
return boost::none;
|
if (res != ResultStatus::Success) {
|
||||||
|
// Set the system mode as invalid.
|
||||||
|
system_mode = boost::none;
|
||||||
|
// Return the error code.
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
return exheader_header.arm11_system_local_caps.system_mode.Value();
|
}
|
||||||
|
// Set the system mode as the one from the exheader.
|
||||||
|
system_mode = exheader_header.arm11_system_local_caps.system_mode.Value();
|
||||||
|
return ResultStatus::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultStatus AppLoader_NCCH::LoadExec() {
|
ResultStatus AppLoader_NCCH::LoadExec() {
|
||||||
|
|
|
@ -179,9 +179,10 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads the Exheader and returns the system mode for this application.
|
* Loads the Exheader and returns the system mode for this application.
|
||||||
* @return Optional with the kernel system mode
|
* @param boost::optional<u32> Reference to Boost optional to store system mode.
|
||||||
|
* @return Result of operation.
|
||||||
*/
|
*/
|
||||||
boost::optional<u32> LoadKernelSystemMode() override;
|
ResultStatus LoadKernelSystemMode(boost::optional<u32>& system_mode) override;
|
||||||
|
|
||||||
ResultStatus ReadCode(std::vector<u8>& buffer) override;
|
ResultStatus ReadCode(std::vector<u8>& buffer) override;
|
||||||
|
|
||||||
|
|
Reference in New Issue