From 8b32b9eadf360de1cb688f2dfa770209e143c30e Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 23 Feb 2021 04:19:15 -0800 Subject: [PATCH] kern: Increase reserved system memory, require mesosphere for htc/tma --- .../source/board/nintendo/nx/kern_k_system_control.cpp | 2 +- libraries/libstratosphere/source/boot2/boot2_api.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp b/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp index 783ef1904..8120957dd 100644 --- a/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp +++ b/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp @@ -397,7 +397,7 @@ namespace ams::kern::board::nintendo::nx { }(); /* Return (possibly) adjusted size. */ - constexpr size_t ExtraSystemMemoryForAtmosphere = 33_MB; + constexpr size_t ExtraSystemMemoryForAtmosphere = 40_MB; return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize; } diff --git a/libraries/libstratosphere/source/boot2/boot2_api.cpp b/libraries/libstratosphere/source/boot2/boot2_api.cpp index 04b359045..671ad4996 100644 --- a/libraries/libstratosphere/source/boot2/boot2_api.cpp +++ b/libraries/libstratosphere/source/boot2/boot2_api.cpp @@ -384,7 +384,7 @@ namespace ams::boot2 { DetectAndDeclareFutureMitms(); /* Device whether to launch tma or htc. */ - if (IsHtcEnabled()) { + if (svc::IsKernelMesosphere() && IsHtcEnabled()) { LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Htc, ncm::StorageId::None), 0); } else { LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Tma, ncm::StorageId::None), 0);