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

USIO: Fixed BACKUP MEMORY ERROR for some games (#14248)

Browse source
This commit is contained in:
brian218 2023-07-23 17:17:49 +08:00 • committed by GitHub
parent 38a5313ed2
commit 70b124cfa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,10 +40,18 @@ void fmt_class_string<usio_btn>::format(std::string& out, u64 arg)
struct usio_memory struct usio_memory
{ {
std::vector<u8> backup_memory; std::vector<u8> backup_memory;
std::vector<u8> last_game_status;
usio_memory(const usio_memory&) = delete; usio_memory(const usio_memory&) = delete;
usio_memory& operator=(const usio_memory&) = delete; usio_memory& operator=(const usio_memory&) = delete;
void init()
{
backup_memory.clear();
backup_memory.resize(chip_size * chip_count);
}
static constexpr usz chip_size = 0x10000;
static constexpr usz chip_count = 0x10;
}; };
usb_device_usio::usb_device_usio(const std::array<u8, 7>& location) usb_device_usio::usb_device_usio(const std::array<u8, 7>& location)
@ -105,10 +113,6 @@ usb_device_usio::usb_device_usio(const std::array<u8, 7>& location)
.wMaxPacketSize = 0x0008, .wMaxPacketSize = 0x0008,
.bInterval = 16})); .bInterval = 16}));
g_fxo->get<usio_memory>().backup_memory.clear();
g_fxo->get<usio_memory>().backup_memory.resize(0xB8);
g_fxo->get<usio_memory>().last_game_status.clear();
g_fxo->get<usio_memory>().last_game_status.resize(0x28);
load_backup(); load_backup();
} }
@ -135,6 +139,8 @@ extern bool is_input_allowed();
void usb_device_usio::load_backup() void usb_device_usio::load_backup()
{ {
g_fxo->get<usio_memory>().init();
fs::file usio_backup_file; fs::file usio_backup_file;
if (!usio_backup_file.open(usio_backup_path, fs::read)) if (!usio_backup_file.open(usio_backup_path, fs::read))
@ -196,7 +202,7 @@ void usb_device_usio::translate_input()
return; return;
} }
const std::size_t offset = (player * 8ULL); const usz offset = (player * 8ULL);
const auto& cfg = ::at32(g_cfg_usio.players, pad_number); const auto& cfg = ::at32(g_cfg_usio.players, pad_number);
cfg->handle_input(pad, false, [&](usio_btn btn, u16 /*value*/, bool pressed) cfg->handle_input(pad, false, [&](usio_btn btn, u16 /*value*/, bool pressed)
@ -352,23 +358,14 @@ void usb_device_usio::usio_write(u8 channel, u16 reg, std::vector<u8>& data)
} }
else if (channel >= 2) else if (channel >= 2)
{ {
usio_log.trace("Usio write of sram(chip: %d, addr: 0x%04X)", channel - 2, reg); const u8 chip = channel - 2;
if (channel == 2) usio_log.trace("Usio write of sram(chip: %d, addr: 0x%04X)", chip, reg);
{ auto& memory = g_fxo->get<usio_memory>().backup_memory;
switch (reg) const usz addr_end = reg + data.size();
{ if (data.size() > 0 && chip < usio_memory::chip_count && addr_end <= usio_memory::chip_size)
case 0x0000: std::memcpy(&memory[usio_memory::chip_size * chip + reg], data.data(), data.size());
{ else
write_memory(g_fxo->get<usio_memory>().backup_memory); usio_log.error("Usio sram invalid write operation(chip: %d, addr: 0x%04X, size: %x)", chip, reg, data.size());
break;
}
case 0x0180:
{
write_memory(g_fxo->get<usio_memory>().last_game_status);
break;
}
}
}
} }
else else
{ {
@ -434,50 +431,14 @@ void usb_device_usio::usio_read(u8 channel, u16 reg, u16 size)
} }
else if (channel >= 2) else if (channel >= 2)
{ {
u8 chip = channel - 2; const u8 chip = channel - 2;
usio_log.trace("Usio read of sram(chip: %d, addr: 0x%04X)", chip, reg); usio_log.trace("Usio read of sram(chip: %d, addr: 0x%04X)", chip, reg);
switch (chip) auto& memory = g_fxo->get<usio_memory>().backup_memory;
{ const usz addr_end = reg + size;
case 0: if (size > 0 && chip < usio_memory::chip_count && addr_end <= usio_memory::chip_size)
{ response.insert(response.end(), memory.begin() + (usio_memory::chip_size * chip + reg), memory.begin() + (usio_memory::chip_size * chip + addr_end));
switch (reg) else
{ usio_log.error("Usio sram invalid read operation(chip: %d, addr: 0x%04X, size: %x)", chip, reg, size);
case 0x0000:
{
response = g_fxo->get<usio_memory>().backup_memory;
break;
}
case 0x0180:
{
response = g_fxo->get<usio_memory>().last_game_status;
break;
}
case 0x0200:
{
//ensure(size == 0x100);
// No data returned
break;
}
case 0x1000:
{
//ensure(size == 0x1000);
// No data returned
break;
}
default:
{
usio_log.error("Unhandled read of sram(chip: %d, addr: 0x%04X)", channel - 2, reg);
break;
}
}
break;
}
default:
{
usio_log.error("Unhandled read of sram(chip: %d, addr: 0x%04X)", channel - 2, reg);
break;
}
}
} }
else else
{ {