nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

boot2: launch dmnt.gen2 over dmnt, when using htc

Browse source
This commit is contained in:
Michael Scire 2021-07-15 17:23:50 -07:00 committed by SciresM
parent b61797224d
commit 206516411f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
View file

@ -101,6 +101,7 @@ namespace ams::ncm {
static const SystemProgramId Manu; static const SystemProgramId Manu;
static const SystemProgramId Htc; static const SystemProgramId Htc;
static const SystemProgramId DmntGen2;
static const SystemProgramId DevServer; static const SystemProgramId DevServer;
}; };
@ -205,6 +206,7 @@ namespace ams::ncm {
inline constexpr const SystemProgramId SystemProgramId::Manu = { 0x010000000000B14Aul }; inline constexpr const SystemProgramId SystemProgramId::Manu = { 0x010000000000B14Aul };
inline constexpr const SystemProgramId SystemProgramId::Htc = { 0x010000000000B240ul }; inline constexpr const SystemProgramId SystemProgramId::Htc = { 0x010000000000B240ul };
inline constexpr const SystemProgramId SystemProgramId::DmntGen2 = { 0x010000000000D60Cul };
inline constexpr const SystemProgramId SystemProgramId::DevServer = { 0x010000000000D623ul }; inline constexpr const SystemProgramId SystemProgramId::DevServer = { 0x010000000000D623ul };
inline constexpr bool IsSystemProgramId(const ProgramId &program_id) { inline constexpr bool IsSystemProgramId(const ProgramId &program_id) {

11
libraries/libstratosphere/source/boot2/boot2_api.cpp
View file

@ -395,18 +395,17 @@ namespace ams::boot2 {
pm::bm::SetMaintenanceBoot(); 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. */ /* Check for and forward declare non-atmosphere mitm modules. */
DetectAndDeclareFutureMitms(); DetectAndDeclareFutureMitms();
/* Decide whether to launch tma or htc. */ /* Decide whether to launch tma or htc. */
if (IsHtcEnabled()) { if (IsHtcEnabled()) {
LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Htc, 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::Cs, ncm::StorageId::None), 0);
LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::DmntGen2, ncm::StorageId::None), 0);
} else { } 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. */ /* Decide whether to launch atmosphere or nintendo's log manager. */