archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

USIO Input Enhancement

Browse source
This commit is contained in:
brian218 2022-10-21 01:50:14 +08:00 • committed by Megamouse
parent 0da81d22d3
commit 85e11ca341
2 changed files with 57 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

55
rpcs3/Emu/Io/usio.cpp
View file

@ -145,8 +145,9 @@ void usb_device_usio::translate_input()
const auto handler = pad::get_current_handler(); const auto handler = pad::get_current_handler();
std::vector<u8> input_buf = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; std::vector<u8> input_buf = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
constexpr le_t<u16> c_small_hit = 0x4A0; constexpr le_t<u16> c_small_hit = 0x4D0;
constexpr le_t<u16> c_big_hit = 0xA40; constexpr le_t<u16> c_big_hit = 0x1800;
le_t<u16> test_keys = 0x0000;
auto translate_from_pad = [&](u8 pad_number, u8 player) auto translate_from_pad = [&](u8 pad_number, u8 player)
{ {
@ -165,9 +166,50 @@ void usb_device_usio::translate_input()
for (const Button& button : pad->m_buttons) for (const Button& button : pad->m_buttons)
{ {
switch (button.m_offset)
{
case CELL_PAD_BTN_OFFSET_DIGITAL1:
if (player == 0)
{
switch (button.m_outKeyCode)
{
case CELL_PAD_CTRL_SELECT:
if (button.m_pressed && !test_key_pressed) // Solve the need to hold the Test key
test_on = !test_on;
test_key_pressed = button.m_pressed;
break;
case CELL_PAD_CTRL_LEFT:
if (button.m_pressed && !coin_key_pressed) // Ensure only one coin is inserted each time the Coin key is pressed
coin_counter++;
coin_key_pressed = button.m_pressed;
break;
default:
if (button.m_pressed) if (button.m_pressed)
{ {
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2) switch (button.m_outKeyCode)
{
case CELL_PAD_CTRL_START:
test_keys |= 0x200; // Enter
break;
case CELL_PAD_CTRL_UP:
test_keys |= 0x2000; // Up
break;
case CELL_PAD_CTRL_DOWN:
test_keys |= 0x1000; // Down
break;
case CELL_PAD_CTRL_RIGHT:
test_keys |= 0x4000; // Service
break;
default:
break;
}
}
break;
}
}
break;
case CELL_PAD_BTN_OFFSET_DIGITAL2:
if (button.m_pressed)
{ {
switch (button.m_outKeyCode) switch (button.m_outKeyCode)
{ {
@ -207,6 +249,9 @@ void usb_device_usio::translate_input()
break; break;
} }
} }
break;
default:
break;
} }
} }
}; };
@ -214,6 +259,10 @@ void usb_device_usio::translate_input()
translate_from_pad(0, 0); translate_from_pad(0, 0);
translate_from_pad(1, 1); translate_from_pad(1, 1);
test_keys |= test_on ? 0x80 : 0x00;
std::memcpy(input_buf.data(), &test_keys, sizeof(u16));
std::memcpy(input_buf.data() + 16, &coin_counter, sizeof(u16));
q_replies.push(input_buf); q_replies.push(input_buf);
q_replies.push({0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}); q_replies.push({0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
} }

4
rpcs3/Emu/Io/usio.h
View file

@ -21,6 +21,10 @@ private:
void usio_read(u8 channel, u16 reg, u16 size); void usio_read(u8 channel, u16 reg, u16 size);
private: private:
bool test_on = false;
bool test_key_pressed = false;
bool coin_key_pressed = false;
le_t<u16> coin_counter = 0;
std::string usio_backup_path; std::string usio_backup_path;
fs::file usio_backup_file; fs::file usio_backup_file;
std::queue<std::vector<u8>> q_replies; std::queue<std::vector<u8>> q_replies;