ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved the compatibility of USIO for old versions of games

This commit is contained in:
brian218 2022-10-10 00:10:41 +08:00 committed by Megamouse
parent 36b1004e26
commit b117a6d4cd
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rpcs3/Emu/Io/usio.cpp
View File

@ -221,10 +221,10 @@ void usb_device_usio::translate_input()
void usb_device_usio::usio_write(u8 channel, u16 reg, const std::vector<u8>& data) void usb_device_usio::usio_write(u8 channel, u16 reg, const std::vector<u8>& data)
{ {
auto write_memory = [&](std::vector<u8>& memory) auto write_memory = [&](std::vector<u8>& memory, bool exact_size = true)
{ {
ensure(data.size() == memory.size()); ensure(data.size() == memory.size() || (data.size() <= memory.size() && !exact_size));
memcpy(memory.data(), data.data(), memory.size()); memcpy(memory.data(), data.data(), data.size());
}; };
const auto get_u16 = [&](std::string_view usio_func) -> u16 const auto get_u16 = [&](std::string_view usio_func) -> u16
@ -289,7 +289,7 @@ void usb_device_usio::usio_write(u8 channel, u16 reg, const std::vector<u8>& dat
{ {
case 0x0000: case 0x0000:
{ {
write_memory(g_fxo->get<usio_memory>().backup_memory); write_memory(g_fxo->get<usio_memory>().backup_memory, false);
break; break;
} }
case 0x0180: case 0x0180:
@ -324,6 +324,20 @@ void usb_device_usio::usio_read(u8 channel, u16 reg, u16 size)
} }
}; };
auto push_vector = [&](std::vector<u8>& memory)
{
std::vector<u8> buffer;
u16 left = size;
while (left > 0)
{
u16 to_push = std::min(left, static_cast<u16>(64));
buffer.resize(to_push);
memcpy(buffer.data(), memory.data() + (size - left), buffer.size());
q_replies.push(buffer);
left -= to_push;
}
};
if (channel == 0) if (channel == 0)
{ {
switch (reg) switch (reg)
@ -389,20 +403,14 @@ void usb_device_usio::usio_read(u8 channel, u16 reg, u16 size)
{ {
case 0x0000: case 0x0000:
{ {
ensure(size == 0xB8); ensure(size <= 0xB8);
std::vector<u8> buffer[3]; push_vector(g_fxo->get<usio_memory>().backup_memory);
for (int i = 0; i < 3; i++)
{
buffer[i].resize(i < 2 ? 64 : 56);
memcpy(buffer[i].data(), g_fxo->get<usio_memory>().backup_memory.data() + i * 64, buffer[i].size());
q_replies.push(buffer[i]);
}
break; break;
} }
case 0x0180: case 0x0180:
{ {
ensure(size == 0x28); ensure(size == 0x28);
q_replies.push(g_fxo->get<usio_memory>().last_game_status); push_vector(g_fxo->get<usio_memory>().last_game_status);
break; break;
} }
case 0x0200: case 0x0200: