From 85001bf71f5c10bc0c1840e2bb3c35f0cea63b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 5 Dec 2023 23:14:41 +0100
Subject: [PATCH] Remove some redundant uses of MOBILE_DEVICE. Goal is to one
 day get rid of that define.

---
 Common/UI/UIScreen.cpp       | 5 +++--
 Core/Config.cpp              | 2 +-
 Core/HLE/sceKernelModule.cpp | 4 ----
 Core/KeyMap.cpp              | 2 +-
 Core/System.cpp              | 2 --
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Common/UI/UIScreen.cpp b/Common/UI/UIScreen.cpp
index 0d2e3d8e6ef7..c49dee977c30 100644
--- a/Common/UI/UIScreen.cpp
+++ b/Common/UI/UIScreen.cpp
@@ -1,6 +1,9 @@
 #include <algorithm>
+
+#include "Common/Log.h"
 #include "Common/System/Display.h"
 #include "Common/System/System.h"
+#include "Common/System/Request.h"
 #include "Common/Input/InputState.h"
 #include "Common/Input/KeyCodes.h"
 #include "Common/Math/curves.h"
@@ -10,8 +13,6 @@
 #include "Common/UI/Root.h"
 #include "Common/Data/Text/I18n.h"
 #include "Common/Render/DrawBuffer.h"
-#include "Common/Log.h"
-#include <Common/System/Request.h>
 
 static const bool ClickDebug = false;
 
diff --git a/Core/Config.cpp b/Core/Config.cpp
index 3fbd12c029dd..5c99453e84fe 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -184,7 +184,7 @@ static bool DefaultVSync() {
 }
 
 static bool DefaultEnableStateUndo() {
-#ifdef MOBILE_DEVICE
+#ifdef PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS)
 	// Off on mobile to save disk space.
 	return false;
 #endif
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index cbb81ed0981b..87cf486f4a95 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -1405,10 +1405,6 @@ static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 load
 
 	if (!module->isFake) {
 		bool scan = true;
-#if defined(MOBILE_DEVICE)
-		scan = g_Config.bFuncReplacements;
-#endif
-
 		// If the ELF has debug symbols, don't add entries to the symbol table.
 		bool insertSymbols = scan && !reader.LoadSymbols();
 		std::vector<SectionID> codeSections = reader.GetCodeSections();
diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp
index 7d46dfb51504..5a9235d620b7 100644
--- a/Core/KeyMap.cpp
+++ b/Core/KeyMap.cpp
@@ -408,8 +408,8 @@ const KeyMap_IntStrPair psp_button_names[] = {
 	{VIRTKEY_SPEED_CUSTOM2, "Alt speed 2"},
 	{VIRTKEY_SPEED_ANALOG, "Analog speed"},
 	{VIRTKEY_PAUSE, "Pause"},
-#ifndef MOBILE_DEVICE
 	{VIRTKEY_FRAME_ADVANCE, "Frame Advance"},
+#if !defined(MOBILE_DEVICE)
 	{VIRTKEY_RECORD, "Audio/Video Recording" },
 #endif
 	{VIRTKEY_REWIND, "Rewind"},
diff --git a/Core/System.cpp b/Core/System.cpp
index 0c7bf42fb4c9..8421cb297e5e 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -566,11 +566,9 @@ void PSP_Shutdown() {
 	if (coreState == CORE_RUNNING)
 		Core_Stop();
 
-#ifndef MOBILE_DEVICE
 	if (g_Config.bFuncHashMap) {
 		MIPSAnalyst::StoreHashMap();
 	}
-#endif
 
 	if (pspIsIniting)
 		Core_NotifyLifecycle(CoreLifecycle::START_COMPLETE);