mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-22 10:22:08 +00:00
Code Issues Releases Activity

ro: only hold sm session open when needed

Browse source
This commit is contained in:
Michael Scire 2019-04-22 13:17:57 -07:00
parent 30485f1df9
commit 13c825a8bb
2 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
stratosphere/ro/source/ro_main.cpp
View file

@ -69,32 +69,29 @@ void __appInit(void) {
SetFirmwareVersionForLibnx(); SetFirmwareVersionForLibnx();
rc = smInitialize(); DoWithSmSession([&]() {
if (R_FAILED(rc)) { rc = setsysInitialize();
std::abort();
}
rc = setsysInitialize();
if (R_FAILED(rc)) {
std::abort();
}
rc = fsInitialize();
if (R_FAILED(rc)) {
std::abort();
}
if (GetRuntimeFirmwareVersion() < FirmwareVersion_300) {
rc = pminfoInitialize();
if (R_FAILED(rc)) { if (R_FAILED(rc)) {
std::abort(); std::abort();
} }
}
rc = fsdevMountSdmc(); rc = fsInitialize();
if (R_FAILED(rc)) { if (R_FAILED(rc)) {
std::abort(); std::abort();
} }
if (GetRuntimeFirmwareVersion() < FirmwareVersion_300) {
rc = pminfoInitialize();
if (R_FAILED(rc)) {
std::abort();
}
}
rc = fsdevMountSdmc();
if (R_FAILED(rc)) {
std::abort();
}
});
CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION); CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION);
} }
@ -106,7 +103,6 @@ void __appExit(void) {
pminfoExit(); pminfoExit();
} }
setsysExit(); setsysExit();
smExit();
} }
/* Helpers to create RO objects. */ /* Helpers to create RO objects. */

8
stratosphere/ro/source/ro_registration.cpp
View file

@ -30,9 +30,11 @@ static Registration::RoProcessContext g_process_contexts[Registration::MaxSessio
static bool g_is_development_hardware, g_is_development_function_enabled; static bool g_is_development_hardware, g_is_development_function_enabled;
void Registration::Initialize() { void Registration::Initialize() {
if (R_FAILED(splInitialize())) { DoWithSmSession([&]() {
std::abort(); if (R_FAILED(splInitialize())) {
} std::abort();
}
});
ON_SCOPE_EXIT { splExit(); }; ON_SCOPE_EXIT { splExit(); };
if (R_FAILED(splIsDevelopment(&g_is_development_hardware))) { if (R_FAILED(splIsDevelopment(&g_is_development_hardware))) {