Make the model option ini-only.

Move PSP_MODEL_FAT and PSP_MODEL_SLIM to Config.h.
Default to a PSP Slim, and enable 64 megs of memory by default.

Core/Config.cpp

@@ -294,8 +294,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
 	}
 	
 	IniFile::Section *pspConfig = iniFile.GetOrCreateSection("SystemParam");
-	// 0 = PSP Fat, 1 = PSP Slim
-	pspConfig->Get("PSPModel", &iPSPModel, 0);
+	pspConfig->Get("PSPModel", &iPSPModel, PSP_MODEL_SLIM);
 	pspConfig->Get("NickName", &sNickName, "PPSSPP");
 	pspConfig->Get("proAdhocServer", &proAdhocServer, "localhost");
 	pspConfig->Get("MacAddress", &localMacAddress, "01:02:03:04:05:06");

Core/Config.h

@@ -27,6 +27,8 @@ extern const char *PPSSPP_GIT_VERSION;
 #endif
 
 const int MAX_CONFIG_VOLUME = 8;
+const int PSP_MODEL_FAT = 0;
+const int PSP_MODEL_SLIM = 1;
 
 namespace http {
 	class Download;

Core/HLE/scePower.cpp

@@ -45,9 +45,6 @@ const int PSP_POWER_CB_BATTERY_FULL = 0x00000064;
 
 const int POWER_CB_AUTO = -1;
 
-const int PSP_MODEL_FAT	= 0;
-const int PSP_MODEL_SLIM = 1;
-
 const int numberOfCBPowerSlots = 16;
 const int numberOfCBPowerSlotsPrivate = 32;
 

Core/MemMap.h

@@ -82,6 +82,9 @@ enum
 	RAM_NORMAL_SIZE = 0x02000000,
 	RAM_NORMAL_MASK = RAM_NORMAL_SIZE - 1,
 
+	// Used if the PSP model is PSP-2000 (Slim).
+	RAM_DOUBLE_SIZE = RAM_NORMAL_SIZE * 2,
+
 	VRAM_SIZE       = 0x200000,
 	VRAM_MASK       = VRAM_SIZE - 1,
 

Core/PSPLoaders.cpp

@@ -41,6 +41,7 @@
 #include "HLE/sceKernelModule.h"
 #include "HLE/sceKernelMemory.h"
 #include "ELF/ParamSFO.h"
+#include "Core/Config.h"
 
 // We gather the game info before actually loading/booting the ISO
 // to determine if the emulator should enable extra memory and

Core/System.cpp

@@ -153,7 +153,11 @@ void CPU_Init() {
 
 	// Default memory settings
 	// Seems to be the safest place currently..
-	Memory::g_MemorySize = Memory::RAM_NORMAL_SIZE; // 32 MB of ram by default
+	if (g_Config.iPSPModel == PSP_MODEL_FAT)
+		Memory::g_MemorySize = Memory::RAM_NORMAL_SIZE; // 32 MB of ram by default
+	else
+		Memory::g_MemorySize = Memory::RAM_DOUBLE_SIZE;
+
 	g_RemasterMode = false;
 	g_DoubleTextureCoordinates = false;
 

UI/GameSettingsScreen.cpp

@@ -295,9 +295,6 @@ void GameSettingsScreen::CreateViews() {
 	systemSettings->Add(new PopupMultiChoice(&g_Config.iTimeFormat, s->T("Time Format"), timeFormat, 1, 2, s, screenManager()));
 	static const char *buttonPref[] = { "Use O to confirm", "Use X to confirm" };
 	systemSettings->Add(new PopupMultiChoice(&g_Config.iButtonPreference, s->T("Confirmation Button"), buttonPref, 0, 2, s, screenManager()));
-	static const char *pspModels[] = { "PSP-1000 (Fat)", "PSP-2000 (Slim)" };
-	systemSettings->Add(new PopupMultiChoice(&g_Config.iPSPModel, s->T("PSP Model"), pspModels, 0, 2, s, screenManager()));
-
 }
 
 UI::EventReturn GameSettingsScreen::OnRenderingMode(UI::EventParams &e) {