From bdaa6f335f24ebf79768cef709374dbff279dcce Mon Sep 17 00:00:00 2001 From: Sacha Date: Tue, 10 Dec 2013 23:22:31 +1000 Subject: [PATCH] Linux 32-bit fix. We cannot allocate > 32MB for 32-bit mmap implementations which is causing issues getting SLIM to work. Also, we should explicitly disable in case it is stuck in someones ppsspp.ini. See: http://lxr.free-electrons.com/source/tools/perf/util/session.c#L1290 --- Core/Config.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 57d3ca1816..50d92f884e 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -316,10 +316,10 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { network->Get("EnableWlan", &bEnableWlan, false); IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam"); -#if !defined(ARM) || defined(__SYMBIAN32__) pspConfig->Get("PSPModel", &iPSPModel, PSP_MODEL_SLIM); -#else - pspConfig->Get("PSPModel", &iPSPModel, PSP_MODEL_FAT); +#if !defined(_M_X64) && !defined(_WIN32) && !defined(__SYMBIAN32__) + // 32-bit mmap cannot map more than 32MB contiguous + iPSPModel = PSP_MODEL_FAT; #endif pspConfig->Get("NickName", &sNickName, "PPSSPP"); pspConfig->Get("proAdhocServer", &proAdhocServer, "localhost");