input: add usio config file

No sticks yet

rpcs3/Emu/Io/usio.cpp

@@ -6,7 +6,7 @@
 #include "Input/pad_thread.h"
 #include "Emu/IdManager.h"
 
-LOG_CHANNEL(usio_log);
+LOG_CHANNEL(usio_log, "USIO");
 
 struct usio_memory
 {
@@ -81,6 +81,11 @@ usb_device_usio::usb_device_usio(const std::array<u8, 7>& location)
 	g_fxo->get<usio_memory>().last_game_status.clear();
 	g_fxo->get<usio_memory>().last_game_status.resize(0x28);
 	load_backup();
+
+	if (!m_cfg.load())
+	{
+		usio_log.notice("Could not load usio config. Using defaults.");
+	}
 }
 
 usb_device_usio::~usb_device_usio()
@@ -161,102 +166,90 @@ void usb_device_usio::translate_input()
 			return;
 		}
 
-		const auto& pad = handler->GetPads()[pad_number];
+		const auto& pad = ::at32(handler->GetPads(), pad_number);
 		if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
 		{
 			return;
 		}
 
-		const std::size_t offset = (player * 8);
+		const auto& cfg = ::at32(m_cfg.players, pad_number);
+		const std::size_t offset = (player * 8ULL);
 
 		for (const Button& button : pad->m_buttons)
 		{
-			switch (button.m_offset)
+			if (const auto btn = cfg->find_button(button.m_offset, button.m_outKeyCode))
 			{
-			case CELL_PAD_BTN_OFFSET_DIGITAL1:
+				switch (btn.value())
-				if (player == 0)
 				{
-					switch (button.m_outKeyCode)
+				case usio_btn::test:
-					{
+					if (player != 0) break;
-					case CELL_PAD_CTRL_SELECT:
+					if (button.m_pressed && !test_key_pressed) // Solve the need to hold the Test key
-						if (button.m_pressed && !test_key_pressed) // Solve the need to hold the Test key
+						test_on = !test_on;
-							test_on = !test_on;
+					test_key_pressed = button.m_pressed;
-						test_key_pressed = button.m_pressed;
+					break;
-						break;
+				case usio_btn::coin:
-					case CELL_PAD_CTRL_LEFT:
+					if (player != 0) break;
-						if (button.m_pressed && !coin_key_pressed) // Ensure only one coin is inserted each time the Coin key is pressed
+					if (button.m_pressed && !coin_key_pressed) // Ensure only one coin is inserted each time the Coin key is pressed
-							coin_counter++;
+						coin_counter++;
-						coin_key_pressed = button.m_pressed;
+					coin_key_pressed = button.m_pressed;
-						break;
+					break;
-					default:
+				case usio_btn::enter:
-						if (button.m_pressed)
+					if (player == 0 && button.m_pressed)
-						{
+						test_keys |= 0x200; // Enter
-							switch (button.m_outKeyCode)
+					break;
-							{
+				case usio_btn::up:
-							case CELL_PAD_CTRL_START:
+					if (player == 0 && button.m_pressed)
-								test_keys |= 0x200; // Enter
+						test_keys |= 0x2000; // Up
-								break;
+					break;
-							case CELL_PAD_CTRL_UP:
+				case usio_btn::down:
-								test_keys |= 0x2000; // Up
+					if (player == 0 && button.m_pressed)
-								break;
+						test_keys |= 0x1000; // Down
-							case CELL_PAD_CTRL_DOWN:
+					break;
-								test_keys |= 0x1000; // Down
+				case usio_btn::service:
-								break;
+					if (player == 0 && button.m_pressed)
-							case CELL_PAD_CTRL_RIGHT:
+						test_keys |= 0x4000; // Service
-								test_keys |= 0x4000; // Service
+					break;
-								break;
+				case usio_btn::strong_hit_side_left:
-							default:
+					// Strong hit side left
-								break;
+					if (button.m_pressed)
-							}
-						}
-						break;
-					}
-				}
-				break;
-			case CELL_PAD_BTN_OFFSET_DIGITAL2:
-				if (button.m_pressed)
-				{
-					switch (button.m_outKeyCode)
-					{
-					case CELL_PAD_CTRL_SQUARE:
-						// Strong hit side left
 						std::memcpy(input_buf.data() + 32 + offset, &c_big_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_CROSS:
+				case usio_btn::strong_hit_center_right:
-						// Strong hit center right
+					// Strong hit center right
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 36 + offset, &c_big_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_CIRCLE:
+				case usio_btn::strong_hit_side_right:
-						// Strong hit side right
+					// Strong hit side right
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 38 + offset, &c_big_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_TRIANGLE:
+				case usio_btn::strong_hit_center_left:
-						// Strong hit center left
+					// Strong hit center left
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 34 + offset, &c_big_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_L1:
+				case usio_btn::small_hit_center_left:
-						// Small hit center left
+					// Small hit center left
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 34 + offset, &c_small_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_R1:
+				case usio_btn::small_hit_center_right:
-						// Small hit center right
+					// Small hit center right
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 36 + offset, &c_small_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_L2:
+				case usio_btn::small_hit_side_left:
-						// Small hit side left
+					// Small hit side left
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 32 + offset, &c_small_hit, sizeof(u16));
-						break;
+					break;
-					case CELL_PAD_CTRL_R2:
+				case usio_btn::small_hit_side_right:
-						// Small hit side right
+					// Small hit side right
+					if (button.m_pressed)
 						std::memcpy(input_buf.data() + 38 + offset, &c_small_hit, sizeof(u16));
-						break;
+					break;
-					default:
-						break;
-					}
 				}
-				break;
-			default:
-				break;
 			}
 		}
 	};

rpcs3/Emu/Io/usio.h

@@ -2,6 +2,7 @@
 
 #include "Emu/system_utils.hpp"
 #include "Emu/Io/usb_device.h"
+#include "Emu/Io/usio_config.h"
 
 class usb_device_usio : public usb_device_emulated
 {
@@ -28,4 +29,5 @@ private:
 	le_t<u16> coin_counter = 0;
 	const std::string usio_backup_path = rpcs3::utils::get_hdd1_dir() + "/caches/usiobackup.bin";
 	std::vector<u8> response;
+	cfg_usios m_cfg;
 };

rpcs3/Emu/Io/usio_config.cpp

@@ -0,0 +1,87 @@
+#include "stdafx.h"
+#include "usio_config.h"
+
+LOG_CHANNEL(usio_log, "USIO");
+
+std::optional<usio_btn> cfg_usio::find_button(u32 offset, u32 keycode) const
+{
+	if (const auto it = buttons.find(offset); it != buttons.cend())
+	{
+		if (const auto it2 = it->second.find(keycode); it2 != it->second.cend())
+		{
+			return it2->second;
+		}
+	}
+
+	return std::nullopt;
+}
+
+bool cfg_usios::load()
+{
+	bool result = false;
+	const std::string cfg_name = fs::get_config_dir() + "config/usio.yml";
+	usio_log.notice("Loading usio config: %s", cfg_name);
+
+	from_default();
+
+	for (cfg_usio* player : players)
+	{
+		player->buttons.clear();
+	}
+
+	if (fs::file cfg_file{ cfg_name, fs::read })
+	{
+		if (std::string content = cfg_file.to_string(); !content.empty())
+		{
+			result = from_string(content);
+		}
+	}
+	else
+	{
+		save();
+	}
+
+	for (cfg_usio* player : players)
+	{
+		const auto set_button = [&player](pad_button pbtn, usio_btn bbtn)
+		{
+			const u32 offset = pad_button_offset(pbtn);
+			const u32 keycode = pad_button_keycode(pbtn);
+			player->buttons[(offset >> 8) & 0xFF][keycode & 0xFF] = bbtn;
+		};
+		set_button(player->test, usio_btn::test);
+		set_button(player->coin, usio_btn::coin);
+		set_button(player->enter, usio_btn::enter);
+		set_button(player->up, usio_btn::up);
+		set_button(player->down, usio_btn::down);
+		set_button(player->service, usio_btn::service);
+		set_button(player->strong_hit_side_left, usio_btn::strong_hit_side_left);
+		set_button(player->strong_hit_side_right, usio_btn::strong_hit_side_right);
+		set_button(player->strong_hit_center_left, usio_btn::strong_hit_center_left);
+		set_button(player->strong_hit_center_right, usio_btn::strong_hit_center_right);
+		set_button(player->small_hit_side_left, usio_btn::small_hit_side_left);
+		set_button(player->small_hit_side_right, usio_btn::small_hit_side_right);
+		set_button(player->small_hit_center_left, usio_btn::small_hit_center_left);
+		set_button(player->small_hit_center_right, usio_btn::small_hit_center_right);
+	}
+
+	return result;
+}
+
+void cfg_usios::save() const
+{
+	const std::string cfg_name = fs::get_config_dir() + "config/usio.yml";
+	usio_log.notice("Saving usio config to '%s'", cfg_name);
+
+	if (!fs::create_path(fs::get_parent_dir(cfg_name)))
+	{
+		usio_log.fatal("Failed to create path: %s (%s)", cfg_name, fs::g_tls_error);
+	}
+
+	fs::pending_file cfg_file(cfg_name);
+
+	if (!cfg_file.file || (cfg_file.file.write(to_string()), !cfg_file.commit()))
+	{
+		usio_log.error("Failed to save usio config to '%s' (error=%s)", cfg_name, fs::g_tls_error);
+	}
+}

rpcs3/Emu/Io/usio_config.h

@@ -0,0 +1,63 @@
+#pragma once
+
+#include "Utilities/Config.h"
+#include "pad_types.h"
+
+#include <array>
+
+enum class usio_btn
+{
+	test,
+	coin,
+	enter,
+	up,
+	down,
+	service,
+	strong_hit_side_left,
+	strong_hit_side_right,
+	strong_hit_center_left,
+	strong_hit_center_right,
+	small_hit_side_left,
+	small_hit_side_right,
+	small_hit_center_left,
+	small_hit_center_right
+};
+
+struct cfg_usio final : cfg::node
+{
+	cfg_usio(node* owner, const std::string& name) : cfg::node(owner, name) {}
+
+	cfg::_enum<pad_button> test{ this, "Test", pad_button::select };
+	cfg::_enum<pad_button> coin{ this, "Coin", pad_button::dpad_left };
+	cfg::_enum<pad_button> enter{ this, "Enter", pad_button::start };
+	cfg::_enum<pad_button> up{ this, "Up", pad_button::dpad_up };
+	cfg::_enum<pad_button> down{ this, "Down", pad_button::dpad_down };
+	cfg::_enum<pad_button> service{ this, "Service", pad_button::dpad_right };
+	cfg::_enum<pad_button> strong_hit_side_left{ this, "Strong Hit Side Left", pad_button::square };
+	cfg::_enum<pad_button> strong_hit_side_right{ this, "Strong Hit Side Right", pad_button::circle };
+	cfg::_enum<pad_button> strong_hit_center_left{ this, "Strong Hit Center Left", pad_button::triangle };
+	cfg::_enum<pad_button> strong_hit_center_right{ this, "Strong Hit Center Right", pad_button::cross };
+	cfg::_enum<pad_button> small_hit_side_left{ this, "Small Hit Side Left", pad_button::L2 };
+	cfg::_enum<pad_button> small_hit_side_right{ this, "Small Hit Side Right", pad_button::R2 };
+	cfg::_enum<pad_button> small_hit_center_left{ this, "Small Hit Center Left", pad_button::L1 };
+	cfg::_enum<pad_button> small_hit_center_right{ this, "Small Hit Center Right", pad_button::R1 };
+
+	std::map<u32, std::map<u32, usio_btn>> buttons;
+	std::optional<usio_btn> find_button(u32 offset, u32 keycode) const;
+};
+
+struct cfg_usios final : cfg::node
+{
+	cfg_usio player1{ this, "Player 1" };
+	cfg_usio player2{ this, "Player 2" };
+	cfg_usio player3{ this, "Player 3" };
+	cfg_usio player4{ this, "Player 4" };
+	cfg_usio player5{ this, "Player 5" };
+	cfg_usio player6{ this, "Player 6" };
+	cfg_usio player7{ this, "Player 7" };
+
+	std::array<cfg_usio*, 7> players{ &player1, &player2, &player3, &player4, &player5, &player6, &player7 }; // Thanks gcc!
+
+	bool load();
+	void save() const;
+};

rpcs3/emucore.vcxproj

@@ -86,6 +86,7 @@
     <ClCompile Include="Emu\Io\KeyboardHandler.cpp" />
     <ClCompile Include="Emu\Io\pad_config.cpp" />
     <ClCompile Include="Emu\Io\pad_config_types.cpp" />
+    <ClCompile Include="Emu\Io\usio_config.cpp" />
     <ClCompile Include="Emu\IPC_config.cpp" />
     <ClCompile Include="Emu\IPC_socket.cpp" />
     <ClCompile Include="Emu\localized_string.cpp" />
@@ -529,6 +530,7 @@
     <ClInclude Include="Emu\Io\Keyboard.h" />
     <ClInclude Include="Emu\Io\pad_config.h" />
     <ClInclude Include="Emu\Io\pad_config_types.h" />
+    <ClInclude Include="Emu\Io\usio_config.h" />
     <ClInclude Include="Emu\IPC_config.h" />
     <ClInclude Include="Emu\IPC_socket.h" />
     <ClInclude Include="Emu\localized_string.h" />

rpcs3/emucore.vcxproj.filters

@@ -1174,6 +1174,9 @@
     <ClCompile Include="Emu\Io\ghltar_config.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\Io\usio_config.cpp">
+      <Filter>Emu\Io</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -2365,6 +2368,9 @@
     <ClInclude Include="Emu\Io\ghltar_config.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\Io\usio_config.h">
+      <Filter>Emu\Io</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">