From 206516411f894d304949b653891bfe1cc2d60bd5 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Thu, 15 Jul 2021 17:23:50 -0700 Subject: [PATCH] boot2: launch dmnt.gen2 over dmnt, when using htc --- .../stratosphere/ncm/ncm_system_content_meta_id.hpp | 2 ++ libraries/libstratosphere/source/boot2/boot2_api.cpp | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp index ee6ed273c..502d9e57e 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp @@ -101,6 +101,7 @@ namespace ams::ncm { static const SystemProgramId Manu; static const SystemProgramId Htc; + static const SystemProgramId DmntGen2; static const SystemProgramId DevServer; }; @@ -205,6 +206,7 @@ namespace ams::ncm { inline constexpr const SystemProgramId SystemProgramId::Manu = { 0x010000000000B14Aul }; inline constexpr const SystemProgramId SystemProgramId::Htc = { 0x010000000000B240ul }; + inline constexpr const SystemProgramId SystemProgramId::DmntGen2 = { 0x010000000000D60Cul }; inline constexpr const SystemProgramId SystemProgramId::DevServer = { 0x010000000000D623ul }; inline constexpr bool IsSystemProgramId(const ProgramId &program_id) { diff --git a/libraries/libstratosphere/source/boot2/boot2_api.cpp b/libraries/libstratosphere/source/boot2/boot2_api.cpp index 0270873aa..aeb7f5c76 100644 --- a/libraries/libstratosphere/source/boot2/boot2_api.cpp +++ b/libraries/libstratosphere/source/boot2/boot2_api.cpp @@ -395,18 +395,17 @@ namespace ams::boot2 { pm::bm::SetMaintenanceBoot(); } - /* Launch Atmosphere dmnt, using NcmStorageId_None to force SD card boot. */ - LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Dmnt, ncm::StorageId::None), 0); - /* Check for and forward declare non-atmosphere mitm modules. */ DetectAndDeclareFutureMitms(); /* Decide whether to launch tma or htc. */ if (IsHtcEnabled()) { - LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Htc, ncm::StorageId::None), 0); - LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Cs, ncm::StorageId::None), 0); + LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Htc, ncm::StorageId::None), 0); + LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Cs, ncm::StorageId::None), 0); + LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::DmntGen2, ncm::StorageId::None), 0); } else { - LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Tma, ncm::StorageId::BuiltInSystem), 0); + LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Dmnt, ncm::StorageId::None), 0); + LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Tma, ncm::StorageId::BuiltInSystem), 0); } /* Decide whether to launch atmosphere or nintendo's log manager. */