From 5176c455a9a5f058eb1b0da5f4918578e58b7716 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 9 Oct 2021 13:21:55 -0700
Subject: [PATCH] Io: Remove setting to disable I/O on thread.

---
 Core/Config.cpp           |  1 -
 Core/Config.h             |  1 -
 Core/HLE/sceIo.cpp        | 10 ++++------
 Core/Reporting.cpp        |  2 --
 UI/GameSettingsScreen.cpp |  1 -
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index 305098f47cdd..54d5e495976b 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -604,7 +604,6 @@ static bool DefaultSasThread() {
 static ConfigSetting cpuSettings[] = {
 	ReportedConfigSetting("CPUCore", &g_Config.iCpuCore, &DefaultCpuCore, true, true),
 	ReportedConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, true, true),
-	ReportedConfigSetting("SeparateIOThread", &g_Config.bSeparateIOThread, true, true, true),
 	ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, true, true),
 	ConfigSetting("FastMemoryAccess", &g_Config.bFastMemory, true, true, true),
 	ReportedConfigSetting("FunctionReplacements", &g_Config.bFuncReplacements, true, true, true),
diff --git a/Core/Config.h b/Core/Config.h
index 7bbbf27984ae..b6bf7f062e06 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -118,7 +118,6 @@ struct Config {
 	uint32_t uJitDisableFlags;
 
 	bool bSeparateSASThread;
-	bool bSeparateIOThread;
 	int iIOTimingMethod;
 	int iLockedCPUSpeed;
 	bool bAutoSaveSymbolMap;
diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
index 37eda68a428d..63cf0bd161b4 100644
--- a/Core/HLE/sceIo.cpp
+++ b/Core/HLE/sceIo.cpp
@@ -665,12 +665,10 @@ void __IoInit() {
 
 	memset(fds, 0, sizeof(fds));
 
-	ioManagerThreadEnabled = g_Config.bSeparateIOThread;
-	ioManager.SetThreadEnabled(ioManagerThreadEnabled);
-	if (ioManagerThreadEnabled) {
-		Core_ListenLifecycle(&__IoWakeManager);
-		ioManagerThread = new std::thread(&__IoManagerThread);
-	}
+	ioManagerThreadEnabled = true;
+	ioManager.SetThreadEnabled(true);
+	Core_ListenLifecycle(&__IoWakeManager);
+	ioManagerThread = new std::thread(&__IoManagerThread);
 
 	__KernelRegisterWaitTypeFuncs(WAITTYPE_ASYNCIO, __IoAsyncBeginCallback, __IoAsyncEndCallback);
 
diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index ad24579f4acf..fc02b27f3137 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -527,8 +527,6 @@ namespace Reporting
 			return false;
 		if (g_Config.uJitDisableFlags != 0)
 			return false;
-		if (!g_Config.bSeparateIOThread)
-			return false;
 		// Don't allow builds without version info from git.  They're useless for reporting.
 		if (strcmp(PPSSPP_GIT_VERSION, "unknown") == 0)
 			return false;
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index cc087fb0dc14..c227c8f79dcb 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -998,7 +998,6 @@ void GameSettingsScreen::CreateViews() {
 
 	static const char *ioTimingMethods[] = { "Fast (lag on slow storage)", "Host (bugs, less lag)", "Simulate UMD delays" };
 	View *ioTimingMethod = systemSettings->Add(new PopupMultiChoice(&g_Config.iIOTimingMethod, sy->T("IO timing method"), ioTimingMethods, 0, ARRAY_SIZE(ioTimingMethods), sy->GetName(), screenManager()));
-	ioTimingMethod->SetEnabledPtr(&g_Config.bSeparateIOThread);
 	systemSettings->Add(new CheckBox(&g_Config.bForceLagSync, sy->T("Force real clock sync (slower, less lag)")));
 	PopupSliderChoice *lockedMhz = systemSettings->Add(new PopupSliderChoice(&g_Config.iLockedCPUSpeed, 0, 1000, sy->T("Change CPU Clock", "Change CPU Clock (unstable)"), screenManager(), sy->T("MHz, 0:default")));
 	lockedMhz->OnChange.Add([&](UI::EventParams &) {