From 5448332009cb8d87dd3c637961fa1de9f0435d57 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 10 Dec 2019 20:36:19 -0800 Subject: [PATCH] pm: increase dmnt sessions. sm: remove session limit hack --- stratosphere/pm/source/pm_main.cpp | 10 +++++----- stratosphere/sm/source/impl/sm_service_manager.cpp | 7 ------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/stratosphere/pm/source/pm_main.cpp b/stratosphere/pm/source/pm_main.cpp index 9d89df62f..22a813187 100644 --- a/stratosphere/pm/source/pm_main.cpp +++ b/stratosphere/pm/source/pm_main.cpp @@ -163,23 +163,23 @@ namespace { using ServerOptions = sf::hipc::DefaultServerManagerOptions; constexpr sm::ServiceName ShellServiceName = sm::ServiceName::Encode("pm:shell"); - constexpr size_t ShellMaxSessions = 3; + constexpr size_t ShellMaxSessions = 8; /* Official maximum is 3. */ constexpr sm::ServiceName DebugMonitorServiceName = sm::ServiceName::Encode("pm:dmnt"); - constexpr size_t DebugMonitorMaxSessions = 3; + constexpr size_t DebugMonitorMaxSessions = 16; constexpr sm::ServiceName BootModeServiceName = sm::ServiceName::Encode("pm:bm"); - constexpr size_t BootModeMaxSessions = 6; + constexpr size_t BootModeMaxSessions = 8; /* Official maximum is 4. */ constexpr sm::ServiceName InformationServiceName = sm::ServiceName::Encode("pm:info"); - constexpr size_t InformationMaxSessions = 32 - (ShellMaxSessions + DebugMonitorMaxSessions + BootModeMaxSessions); + constexpr size_t InformationMaxSessions = 64 - (ShellMaxSessions + DebugMonitorMaxSessions + BootModeMaxSessions); static_assert(InformationMaxSessions >= 16, "InformationMaxSessions"); /* pm:shell, pm:dmnt, pm:bm, pm:info. */ constexpr size_t NumServers = 4; constexpr size_t MaxSessions = ShellMaxSessions + DebugMonitorMaxSessions + BootModeMaxSessions + InformationMaxSessions; - static_assert(MaxSessions == 32, "MaxSessions"); + static_assert(MaxSessions == 64, "MaxSessions"); sf::hipc::ServerManager g_server_manager; } diff --git a/stratosphere/sm/source/impl/sm_service_manager.cpp b/stratosphere/sm/source/impl/sm_service_manager.cpp index 7b6994c47..cc792a910 100644 --- a/stratosphere/sm/source/impl/sm_service_manager.cpp +++ b/stratosphere/sm/source/impl/sm_service_manager.cpp @@ -399,13 +399,6 @@ namespace ams::sm::impl { /* Don't try to register something already registered. */ R_UNLESS(!HasServiceInfo(service), sm::ResultAlreadyRegistered()); - /* Adjust session limit, if compile flags tell us to. */ -#ifdef SM_MINIMUM_SESSION_LIMIT - if (max_sessions < SM_MINIMUM_SESSION_LIMIT) { - max_sessions = SM_MINIMUM_SESSION_LIMIT; - } -#endif - /* Get free service. */ ServiceInfo *free_service = GetFreeServiceInfo(); R_UNLESS(free_service != nullptr, sm::ResultOutOfServices());