boot2: launch omm before am

This commit is contained in:
Michael Scire 2022-03-22 11:09:46 -07:00 committed by SciresM
parent 81005fa3f8
commit 07f91f0a83
2 changed files with 4 additions and 0 deletions

View file

@ -96,6 +96,7 @@ namespace ams::ncm {
static const SystemProgramId Nd; static const SystemProgramId Nd;
static const SystemProgramId Ngct; static const SystemProgramId Ngct;
static const SystemProgramId Pgl; static const SystemProgramId Pgl;
static const SystemProgramId Omm;
static const SystemProgramId End; static const SystemProgramId End;
@ -201,6 +202,7 @@ namespace ams::ncm {
inline constexpr const SystemProgramId SystemProgramId::Nd = { 0x0100000000000040ul }; inline constexpr const SystemProgramId SystemProgramId::Nd = { 0x0100000000000040ul };
inline constexpr const SystemProgramId SystemProgramId::Ngct = { 0x0100000000000041ul }; inline constexpr const SystemProgramId SystemProgramId::Ngct = { 0x0100000000000041ul };
inline constexpr const SystemProgramId SystemProgramId::Pgl = { 0x0100000000000042ul }; inline constexpr const SystemProgramId SystemProgramId::Pgl = { 0x0100000000000042ul };
inline constexpr const SystemProgramId SystemProgramId::Omm = { 0x0100000000000045ul };
inline constexpr const SystemProgramId SystemProgramId::End = { 0x01000000000007FFul }; inline constexpr const SystemProgramId SystemProgramId::End = { 0x01000000000007FFul };

View file

@ -34,6 +34,7 @@ namespace ams::boot2 {
constexpr size_t NumPreSdCardLaunchPrograms = util::size(PreSdCardLaunchPrograms); constexpr size_t NumPreSdCardLaunchPrograms = util::size(PreSdCardLaunchPrograms);
constexpr const ncm::SystemProgramId AdditionalLaunchPrograms[] = { constexpr const ncm::SystemProgramId AdditionalLaunchPrograms[] = {
ncm::SystemProgramId::Omm, /* omm */
ncm::SystemProgramId::Am, /* am */ ncm::SystemProgramId::Am, /* am */
ncm::SystemProgramId::NvServices, /* nvservices */ ncm::SystemProgramId::NvServices, /* nvservices */
ncm::SystemProgramId::NvnFlinger, /* nvnflinger */ ncm::SystemProgramId::NvnFlinger, /* nvnflinger */
@ -77,6 +78,7 @@ namespace ams::boot2 {
constexpr size_t NumAdditionalLaunchPrograms = util::size(AdditionalLaunchPrograms); constexpr size_t NumAdditionalLaunchPrograms = util::size(AdditionalLaunchPrograms);
constexpr const ncm::SystemProgramId AdditionalMaintenanceLaunchPrograms[] = { constexpr const ncm::SystemProgramId AdditionalMaintenanceLaunchPrograms[] = {
ncm::SystemProgramId::Omm, /* omm */
ncm::SystemProgramId::Am, /* am */ ncm::SystemProgramId::Am, /* am */
ncm::SystemProgramId::NvServices, /* nvservices */ ncm::SystemProgramId::NvServices, /* nvservices */
ncm::SystemProgramId::NvnFlinger, /* nvnflinger */ ncm::SystemProgramId::NvnFlinger, /* nvnflinger */