move config structs to own files and clean up some headers

Utilities/Config.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Config.h"
 
 #include "yaml-cpp/yaml.h"

Utilities/Thread.cpp

@@ -1,7 +1,4 @@
 #include "stdafx.h"
-#include "Emu/Memory/vm.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/RawSPUThread.h"

Utilities/sysinfo.cpp

@@ -1,7 +1,7 @@
 #include "sysinfo.h"
 #include "StrFmt.h"
 #include "File.h"
-#include "Emu/System.h"
+#include "Emu/system_config.h"
 
 #ifdef _WIN32
 #include "windows.h"

rpcs3/Crypto/unself.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "aes.h"
 #include "sha1.h"
 #include "utils.h"

rpcs3/Emu/Audio/AL/OpenALBackend.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 
 #include "OpenALBackend.h"
 

rpcs3/Emu/Audio/ALSA/ALSABackend.cpp

@@ -3,7 +3,7 @@
 #endif
 
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/system_config.h"
 
 #include "ALSABackend.h"
 

rpcs3/Emu/Audio/AudioBackend.cpp

@@ -0,0 +1,68 @@
+#include "stdafx.h"
+#include "AudioBackend.h"
+#include "Emu/system_config.h"
+
+/*
+ * Helper methods
+ */
+u32 AudioBackend::get_sampling_rate()
+{
+	const u32 sampling_period_multiplier_u32 = g_cfg.audio.sampling_period_multiplier;
+
+	if (sampling_period_multiplier_u32 == 100)
+		return DEFAULT_AUDIO_SAMPLING_RATE;
+
+	const f32 sampling_period_multiplier = sampling_period_multiplier_u32 / 100.0f;
+	const f32 sampling_rate_multiplier = 1.0f / sampling_period_multiplier;
+	return static_cast<u32>(DEFAULT_AUDIO_SAMPLING_RATE * sampling_rate_multiplier);
+}
+
+u32 AudioBackend::get_sample_size()
+{
+	return g_cfg.audio.convert_to_u16 ? sizeof(u16) : sizeof(float);
+}
+
+u32 AudioBackend::get_channels()
+{
+	return g_cfg.audio.downmix_to_2ch ? 2 : 8;
+}
+
+bool AudioBackend::has_capability(u32 cap) const
+{
+	return (cap & GetCapabilities()) == cap;
+}
+
+void AudioBackend::dump_capabilities(std::string& out) const
+{
+	u32 count = 0;
+	u32 capabilities = GetCapabilities();
+
+	if (capabilities & PLAY_PAUSE_FLUSH)
+	{
+		fmt::append(out, "PLAY_PAUSE_FLUSH");
+		count++;
+	}
+
+	if (capabilities & IS_PLAYING)
+	{
+		fmt::append(out, "%sIS_PLAYING", count > 0 ? " | " : "");
+		count++;
+	}
+
+	if (capabilities & GET_NUM_ENQUEUED_SAMPLES)
+	{
+		fmt::append(out, "%sGET_NUM_ENQUEUED_SAMPLES", count > 0 ? " | " : "");
+		count++;
+	}
+
+	if (capabilities & SET_FREQUENCY_RATIO)
+	{
+		fmt::append(out, "%sSET_FREQUENCY_RATIO", count > 0 ? " | " : "");
+		count++;
+	}
+
+	if (count == 0)
+	{
+		fmt::append(out, "NONE");
+	}
+}

rpcs3/Emu/Audio/AudioBackend.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Utilities/types.h"
-#include "Emu/System.h"
 
 enum : u32
 {
@@ -89,65 +88,13 @@ public:
 	/*
 	 * Helper methods
 	 */
-	static u32 get_sampling_rate()
-	{
-		const u32 sampling_period_multiplier_u32 = g_cfg.audio.sampling_period_multiplier;
+	static u32 get_sampling_rate();
 
-		if (sampling_period_multiplier_u32 == 100)
-			return DEFAULT_AUDIO_SAMPLING_RATE;
+	static u32 get_sample_size();
 
-		const f32 sampling_period_multiplier = sampling_period_multiplier_u32 / 100.0f;
-		const f32 sampling_rate_multiplier = 1.0f / sampling_period_multiplier;
-		return static_cast<u32>(DEFAULT_AUDIO_SAMPLING_RATE * sampling_rate_multiplier);
-	}
+	static u32 get_channels();
 
-	static u32 get_sample_size()
-	{
-		return g_cfg.audio.convert_to_u16 ? sizeof(u16) : sizeof(float);
-	}
+	bool has_capability(u32 cap) const;
 
-	static u32 get_channels()
-	{
-		return g_cfg.audio.downmix_to_2ch ? 2 : 8;
-	}
-
-	bool has_capability(u32 cap) const
-	{
-		return (cap & GetCapabilities()) == cap;
-	}
-
-	void dump_capabilities(std::string& out) const
-	{
-		u32 count = 0;
-		u32 capabilities = GetCapabilities();
-
-		if (capabilities & PLAY_PAUSE_FLUSH)
-		{
-			fmt::append(out, "PLAY_PAUSE_FLUSH");
-			count++;
-		}
-
-		if (capabilities & IS_PLAYING)
-		{
-			fmt::append(out, "%sIS_PLAYING", count > 0 ? " | " : "");
-			count++;
-		}
-
-		if (capabilities & GET_NUM_ENQUEUED_SAMPLES)
-		{
-			fmt::append(out, "%sGET_NUM_ENQUEUED_SAMPLES", count > 0 ? " | " : "");
-			count++;
-		}
-
-		if (capabilities & SET_FREQUENCY_RATIO)
-		{
-			fmt::append(out, "%sSET_FREQUENCY_RATIO", count > 0 ? " | " : "");
-			count++;
-		}
-
-		if (count == 0)
-		{
-			fmt::append(out, "NONE");
-		}
-	}
+	void dump_capabilities(std::string& out) const;
 };

rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp

@@ -3,6 +3,8 @@
 #endif
 
 #include "FAudioBackend.h"
+#include "Emu/system_config.h"
+#include "Emu/System.h"
 
 LOG_CHANNEL(FAudio_, "FAudio");
 

rpcs3/Emu/Audio/XAudio2/XAudio27Backend.cpp

@@ -5,6 +5,7 @@
 #include "Utilities/Log.h"
 #include "Utilities/StrFmt.h"
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 
 #include "XAudio2Backend.h"
 #include "3rdparty/XAudio2_7/XAudio2.h"

rpcs3/Emu/Audio/XAudio2/XAudio28Backend.cpp

@@ -5,6 +5,7 @@
 #include "Utilities/Log.h"
 #include "Utilities/StrFmt.h"
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 
 #include "XAudio2Backend.h"
 #include "3rdparty/minidx12/Include/xaudio2.h"

rpcs3/Emu/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_library(rpcs3_emu
 	IdManager.cpp
 	System.cpp
+	system_config.cpp
 	VFS.cpp
 	GDB.cpp
 	title.cpp
@@ -90,6 +91,7 @@ target_sources(rpcs3_emu PRIVATE
 # Audio
 target_sources(rpcs3_emu PRIVATE
 	Audio/AudioDumper.cpp
+	Audio/AudioBackend.cpp
 	Audio/AL/OpenALBackend.cpp
 )
 
@@ -338,6 +340,7 @@ target_link_libraries(rpcs3_emu
 
 # Io
 target_sources(rpcs3_emu PRIVATE
+	Io/pad_config.cpp
 	Io/KeyboardHandler.cpp
 	Io/PadHandler.cpp
 	Io/usb_device.cpp

rpcs3/Emu/CPU/CPUThread.cpp

@@ -2,6 +2,7 @@
 #include "CPUThread.h"
 
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Memory/vm_locking.h"
 #include "Emu/IdManager.h"
 #include "Emu/GDB.h"

rpcs3/Emu/Cell/MFC.cpp

@@ -1,12 +1,6 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "MFC.h"
 
-#include "Utilities/sysinfo.h"
-#include "Emu/Memory/vm.h"
-#include "Emu/Cell/SPUThread.h"
-#include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/System.h"
-
 template <>
 void fmt_class_string<MFC>::format(std::string& out, u64 arg)
 {

rpcs3/Emu/Cell/Modules/cellAdec.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_sync.h"

rpcs3/Emu/Cell/Modules/cellAtrac.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellAtrac.h"

rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellAtracMulti.h"

rpcs3/Emu/Cell/Modules/cellAudio.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_process.h"

rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
 #include "Emu/RSX/rsx_utils.h"

rpcs3/Emu/Cell/Modules/cellBgdl.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellBgdl.h"

rpcs3/Emu/Cell/Modules/cellCamera.cpp

@@ -1,11 +1,9 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "cellCamera.h"
 
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_event.h"
 #include "Emu/IdManager.h"
-#include "Emu/Io/PadHandler.h"
-#include "Emu/System.h"
 
 LOG_CHANNEL(cellCamera);
 

rpcs3/Emu/Cell/Modules/cellCrossController.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 #include "cellSysutil.h"
 #include "cellCrossController.h"

rpcs3/Emu/Cell/Modules/cellDmux.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_sync.h"

rpcs3/Emu/Cell/Modules/cellFiber.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellFiber.h"

rpcs3/Emu/Cell/Modules/cellFont.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include <stb_truetype.h>

rpcs3/Emu/Cell/Modules/cellFs.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellGame.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellGcmSys.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellGem.cpp

@@ -1,11 +1,8 @@
 #include "stdafx.h"
 #include "cellGem.h"
-
 #include "cellCamera.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
+
 #include "Emu/Cell/PPUModule.h"
-#include "Input/pad_thread.h"
 #include "Emu/Io/MouseHandler.h"
 #include "Emu/RSX/GSRender.h"
 #include "Utilities/Timer.h"

rpcs3/Emu/Cell/Modules/cellGifDec.cpp

@@ -1,5 +1,5 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellJpgDec.cpp

@@ -1,5 +1,5 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellKb.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellMic.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Utilities/StrUtil.h"
 

rpcs3/Emu/Cell/Modules/cellMouse.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/lv2/sys_sync.h"

rpcs3/Emu/Cell/Modules/cellMusic.cpp

@@ -1,6 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_lwmutex.h"
 #include "Emu/Cell/lv2/sys_lwcond.h"

rpcs3/Emu/Cell/Modules/cellNetCtl.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
 

rpcs3/Emu/Cell/Modules/cellOskDialog.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/RSX/Overlays/overlays.h"
 #include "Input/pad_thread.h"

rpcs3/Emu/Cell/Modules/cellPad.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_process.h"

rpcs3/Emu/Cell/Modules/cellPamf.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellPngDec.cpp

@@ -1,5 +1,5 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellPrint.cpp

@@ -1,6 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 #include "cellSysutil.h"
 

rpcs3/Emu/Cell/Modules/cellResc.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellRudp.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellSail.cpp

@@ -1,5 +1,5 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellSail.h"

rpcs3/Emu/Cell/Modules/cellSaveData.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/PPUModule.h"

rpcs3/Emu/Cell/Modules/cellScreenshot.cpp

@@ -5,8 +5,6 @@
 
 #include "cellScreenshot.h"
 
-
-
 LOG_CHANNEL(cellScreenshot);
 
 template<>
@@ -27,6 +25,36 @@ void fmt_class_string<CellScreenShotError>::format(std::string& out, u64 arg)
 	});
 }
 
+
+std::string screenshot_manager::get_overlay_path() const
+{
+	return vfs::get(overlay_dir_name + overlay_file_name);
+}
+
+std::string screenshot_manager::get_photo_title() const
+{
+	std::string photo = photo_title;
+	if (photo.empty())
+		photo = Emu.GetTitle();
+	return photo;
+}
+
+std::string screenshot_manager::get_game_title() const
+{
+	std::string game = game_title;
+	if (game.empty())
+		game = Emu.GetTitle();
+	return game;
+}
+
+std::string screenshot_manager::get_screenshot_path() const
+{
+	// TODO: make sure the file can be saved, add suffix and increase counter if file exists
+	// TODO: maybe find a proper home for these
+	return fs::get_config_dir() + "/screenshots/cell/" + get_photo_title() + ".png";
+}
+
+
 error_code cellScreenShotSetParameter(vm::cptr<CellScreenShotSetParam> param)
 {
 	cellScreenshot.warning("cellScreenShotSetParameter(param=*0x%x)", param);

rpcs3/Emu/Cell/Modules/cellScreenshot.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Emu/Memory/vm_ptr.h"
+#include "Emu/VFS.h"
 
 // Return Codes
 enum CellScreenShotError : u32
@@ -40,31 +40,8 @@ struct screenshot_manager
 	std::string overlay_dir_name;
 	std::string overlay_file_name;
 
-	std::string get_overlay_path() const
-	{
-		return vfs::get(overlay_dir_name + overlay_file_name);
-	}
-
-	std::string get_photo_title() const
-	{
-		std::string photo = photo_title;
-		if (photo.empty())
-			photo = Emu.GetTitle();
-		return photo;
-	}
-
-	std::string get_game_title() const
-	{
-		std::string game = game_title;
-		if (game.empty())
-			game = Emu.GetTitle();
-		return game;
-	}
-
-	std::string get_screenshot_path() const
-	{
-		// TODO: make sure the file can be saved, add suffix and increase counter if file exists
-		// TODO: maybe find a proper home for these
-		return fs::get_config_dir() + "/screenshots/cell/" + get_photo_title() + ".png";
-	}
+	std::string get_overlay_path() const;
+	std::string get_photo_title() const;
+	std::string get_game_title() const;
+	std::string get_screenshot_path() const;
 };

rpcs3/Emu/Cell/Modules/cellSearch.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "cellMusic.h"

rpcs3/Emu/Cell/Modules/cellSpurs.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Utilities/asm.h"

rpcs3/Emu/Cell/Modules/cellSpursJq.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_lwmutex.h"

rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp

@@ -1,6 +1,5 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Loader/ELF.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/SPUThread.h"

rpcs3/Emu/Cell/Modules/cellSync.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Utilities/asm.h"
 #include "Emu/Cell/lv2/sys_event.h"

rpcs3/Emu/Cell/Modules/cellSync2.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellSync2.h"

rpcs3/Emu/Cell/Modules/cellSysCache.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellSysmodule.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 LOG_CHANNEL(cellSysmodule);

rpcs3/Emu/Cell/Modules/cellSysutil.cpp

@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/IdManager.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_process.h"
@@ -221,7 +223,7 @@ error_code cellSysutilGetSystemParamInt(CellSysutilParamId id, vm::ptr<s32> valu
 	break;
 
 	case CELL_SYSUTIL_SYSTEMPARAM_ID_ENTER_BUTTON_ASSIGN:
-		*value = g_cfg.sys.enter_button_assignment;
+		*value = static_cast<s32>(g_cfg.sys.enter_button_assignment.get());
 	break;
 
 	case CELL_SYSUTIL_SYSTEMPARAM_ID_DATE_FORMAT:

rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/cellUserInfo.cpp

@@ -1,5 +1,6 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "cellUserInfo.h"

rpcs3/Emu/Cell/Modules/cellVdec.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_sync.h"

rpcs3/Emu/Cell/Modules/cellVideoOut.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/system_config_types.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
 #include "Emu/RSX/rsx_utils.h"

rpcs3/Emu/Cell/Modules/cellVideoPlayerUtility.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 LOG_CHANNEL(cellVideoPlayerUtility);

rpcs3/Emu/Cell/Modules/cellVoice.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_event.h"

rpcs3/Emu/Cell/Modules/cellVpost.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/libmedi.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 LOG_CHANNEL(libmedi);

rpcs3/Emu/Cell/Modules/libmixer.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_sync.h"
 

rpcs3/Emu/Cell/Modules/sceNp.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "sysPrxForUser.h"

rpcs3/Emu/Cell/Modules/sceNpClans.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
 

rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_mutex.h"

rpcs3/Emu/Cell/Modules/sys_game.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_mutex.h"

rpcs3/Emu/Cell/Modules/sys_heap.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 

rpcs3/Emu/Cell/Modules/sys_libc.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 LOG_CHANNEL(sys_libc);

rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp

@@ -1,6 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "sys_lv2dbg.h"

rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp

@@ -1,6 +1,4 @@
-#include "stdafx.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_lwmutex.h"

rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp

@@ -1,7 +1,4 @@
-#include "stdafx.h"
-#include "Emu/Memory/vm.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_lwmutex.h"

rpcs3/Emu/Cell/Modules/sys_mempool.cpp

@@ -2,8 +2,6 @@
 
 #include "Utilities/StrUtil.h"
 
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_mutex.h"

rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
 

rpcs3/Emu/Cell/Modules/sys_prx_.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_lwmutex.h"

rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "sysPrxForUser.h"

rpcs3/Emu/Cell/Modules/sys_spinlock.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "sysPrxForUser.h"

rpcs3/Emu/Cell/Modules/sys_spu_.cpp

@@ -1,5 +1,5 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/RawSPUThread.h"

rpcs3/Emu/Cell/PPUInterpreter.cpp

@@ -2,7 +2,7 @@
 #include "PPUInterpreter.h"
 
 #include "Emu/Memory/vm_reservation.h"
-#include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "PPUThread.h"
 #include "Utilities/asm.h"
 #include "Emu/Cell/Common.h"

rpcs3/Emu/Cell/PPUModule.cpp

@@ -6,8 +6,7 @@
 #include "Crypto/sha1.h"
 #include "Crypto/unself.h"
 #include "Loader/ELF.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
+#include "Emu/VFS.h"
 
 #include "Emu/Cell/PPUOpcodes.h"
 #include "Emu/Cell/PPUAnalyser.h"

rpcs3/Emu/Cell/PPUThread.cpp

@@ -4,8 +4,7 @@
 #include "Utilities/JIT.h"
 #include "Crypto/sha1.h"
 #include "Emu/Memory/vm_reservation.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
+#include "Emu/VFS.h"
 #include "PPUThread.h"
 #include "PPUInterpreter.h"
 #include "PPUAnalyser.h"

rpcs3/Emu/Cell/RawSPUThread.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include "Emu/Memory/vm.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Loader/ELF.h"
 

rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SPUASMJITRecompiler.h"
 
-#include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/IdManager.h"
 
 #include "SPUDisAsm.h"

rpcs3/Emu/Cell/SPUInterpreter.cpp

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "SPUInterpreter.h"
 
-#include "Emu/System.h"
 #include "Utilities/JIT.h"
 #include "Utilities/sysinfo.h"
 #include "Utilities/asm.h"

rpcs3/Emu/Cell/SPURecompiler.cpp

@@ -2,6 +2,7 @@
 #include "SPURecompiler.h"
 
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/IdManager.h"
 #include "Crypto/sha1.h"
 #include "Utilities/StrUtil.h"

rpcs3/Emu/Cell/SPUThread.cpp

@@ -3,7 +3,6 @@
 #include "Utilities/sysinfo.h"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Memory/vm_reservation.h"
-#include "Emu/System.h"
 
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUThread.h"

rpcs3/Emu/Cell/lv2/lv2.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Memory/vm_ptr.h"
 
 #include "Emu/Cell/PPUFunction.h"

rpcs3/Emu/Cell/lv2/sys_bdemu.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Memory/vm.h"
 
 #include "Emu/Cell/ErrorCodes.h"

rpcs3/Emu/Cell/lv2/sys_cond.cpp

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "sys_cond.h"
 
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/IPC.h"
 

rpcs3/Emu/Cell/lv2/sys_config.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
 

rpcs3/Emu/Cell/lv2/sys_console.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Cell/ErrorCodes.h"
 
 #include "sys_console.h"

rpcs3/Emu/Cell/lv2/sys_event.cpp

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "sys_event.h"
 
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/IPC.h"
 

rpcs3/Emu/Cell/lv2/sys_event_flag.cpp

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "sys_event_flag.h"
 
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/IPC.h"
 

rpcs3/Emu/Cell/lv2/sys_gamepad.cpp

@@ -1,10 +1,6 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "sys_gamepad.h"
 
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
-
-
 LOG_CHANNEL(sys_gamepad);
 
 u32 sys_gamepad_ycon_initalize(vm::ptr<uint8_t> in, vm::ptr<uint8_t> out)

rpcs3/Emu/Cell/lv2/sys_gpio.cpp

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "sys_gpio.h"
 
-#include "Emu/System.h"
 #include "Emu/Cell/ErrorCodes.h"
 
 LOG_CHANNEL(sys_gpio);

rpcs3/Emu/Cell/lv2/sys_hid.cpp

@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Emu/System.h"
+#include "stdafx.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/Cell/ErrorCodes.h"