fatal: fix payload size, pm: take from application instead of applet

This commit is contained in:
Michael Scire 2019-01-24 08:33:06 -08:00
parent b2fb42e39d
commit 08d1e9b880
2 changed files with 4 additions and 8 deletions

View file

@ -18,7 +18,7 @@
#include <switch.h> #include <switch.h>
#include <stratosphere.hpp> #include <stratosphere.hpp>
#define IRAM_PAYLOAD_MAX_SIZE 0x30000 #define IRAM_PAYLOAD_MAX_SIZE 0x2F000
#define IRAM_PAYLOAD_BASE 0x40010000ull #define IRAM_PAYLOAD_BASE 0x40010000ull
class FatalPayloadManager { class FatalPayloadManager {

View file

@ -179,15 +179,11 @@ void ResourceLimitUtils::InitializeLimits() {
} }
} }
/* Atmosphere: Allocate extra memory (24 MiB) to SYSTEM away from Applet. */ /* Atmosphere: Allocate extra memory (24 MiB) to SYSTEM away from Application. */
for (unsigned int i = 0; i < 6; i++) { for (unsigned int i = 0; i < 6; i++) {
g_memory_resource_limits[i][0] += ATMOSPHERE_EXTRA_SYSTEM_MEMORY_FOR_SYSMODULES; g_memory_resource_limits[i][0] += ATMOSPHERE_EXTRA_SYSTEM_MEMORY_FOR_SYSMODULES;
/* On < 4.0.0, taking from application instead of applet fixes a rare hang on boot. */ /* Taking from application instead of applet fixes a rare hang on boot on < 4.0.0. */
if (kernelAbove400()) { g_memory_resource_limits[i][1] -= ATMOSPHERE_EXTRA_SYSTEM_MEMORY_FOR_SYSMODULES;
g_memory_resource_limits[i][2] -= ATMOSPHERE_EXTRA_SYSTEM_MEMORY_FOR_SYSMODULES;
} else {
g_memory_resource_limits[i][1] -= ATMOSPHERE_EXTRA_SYSTEM_MEMORY_FOR_SYSMODULES;
}
} }
/* Set resource limits. */ /* Set resource limits. */