RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

USIO Backup Minor Optimization

Browse Source
This commit is contained in:
brian218 2022-09-30 00:38:16 +08:00 committed by Ivan
parent d8897c585d
commit 50e1e6596e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ usb_device_usio::usb_device_usio(const std::array<u8, 7>& location)
g_fxo->get<usio_memory>().backup_memory.resize(0xB8);
g_fxo->get<usio_memory>().last_game_status.resize(0x28);
load_backup(rpcs3::utils::get_hdd1_dir() + "/caches/usiobackup.bin");
load_backup();
}
usb_device_usio::~usb_device_usio()
@ -105,13 +105,13 @@ void usb_device_usio::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue
extern bool is_input_allowed();
void usb_device_usio::load_backup(const std::string& path)
void usb_device_usio::load_backup()
{
usio_backup_file.open(path, fs::create + fs::read + fs::write + fs::lock);
usio_backup_path = rpcs3::utils::get_hdd1_dir() + "/caches/usiobackup.bin";
if (!usio_backup_file)
if (!usio_backup_file.open(usio_backup_path, fs::read + fs::write + fs::lock))
{
usio_log.error("Failed to load the USIO Backup file: %s", path);
usio_log.trace("Failed to load the USIO Backup file: %s", usio_backup_path);
return;
}
@ -119,7 +119,7 @@ void usb_device_usio::load_backup(const std::string& path)
if (usio_backup_file.size() != file_size)
{
usio_log.notice("Invalid USIO Backup file detected. Treating it as an empty file: %s", path);
usio_log.trace("Invalid USIO Backup file detected. Treating it as an empty file: %s", usio_backup_path);
usio_backup_file.trunc(file_size);
return;
}
@ -458,6 +458,11 @@ void usb_device_usio::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, Us
// The latency varies per operation but it doesn't seem to matter for this device so let's go fast!
transfer->expected_time = get_timestamp();
if (!usio_backup_path.empty() && !usio_backup_file && !usio_backup_file.open(usio_backup_path, fs::create + fs::read + fs::write + fs::lock))
{
usio_log.error("Failed to create a new USIO Backup file: %s", usio_backup_path);
}
switch (endpoint)
{
case 0x01:

3
rpcs3/Emu/Io/usio.h
View File

@ -14,13 +14,14 @@ public:
void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
private:
void load_backup(const std::string& path);
void load_backup();
void save_backup();
void translate_input();
void usio_write(u8 channel, u16 reg, const std::vector<u8>& data);
void usio_read(u8 channel, u16 reg, u16 size);
private:
std::string usio_backup_path;
fs::file usio_backup_file;
std::queue<std::vector<u8>> q_replies;
};