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

Savestates: Fix config_event_entry compatibility

Browse source
This commit is contained in:
Eladash 2023-08-24 19:59:24 +03:00 • committed by Elad Ashkenazi
parent 5fde96d563
commit 68c70dd1b9
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/Cell/Modules/cellPad.cpp
View file

@ -53,14 +53,19 @@ void fmt_class_string<CellPadFilterError>::format(std::string& out, u64 arg)
}); });
} }
extern void sys_io_serialize(utils::serial& ar);
pad_info::pad_info(utils::serial& ar) pad_info::pad_info(utils::serial& ar)
: max_connect(ar) : max_connect(ar)
, port_setting(ar) , port_setting(ar)
{ {
sys_io_serialize(ar);
} }
void pad_info::save(utils::serial& ar) void pad_info::save(utils::serial& ar)
{ {
USING_SERIALIZATION_VERSION(sys_io);
ar(max_connect, port_setting); ar(max_connect, port_setting);
} }

18
rpcs3/Emu/Cell/Modules/sys_io_.cpp
View file

@ -23,16 +23,30 @@ struct libio_sys_config
~libio_sys_config() noexcept ~libio_sys_config() noexcept
{ {
} }
void save_or_load(utils::serial& ar)
{
ar(init_ctr, ppu_id, queue_id);
}
}; };
extern void sys_io_serialize(utils::serial& ar)
{
// Do not assign a serialization tag for now, call it from cellPad serialization
g_fxo->get<libio_sys_config>().save_or_load(ar);
}
extern void cellPad_NotifyStateChange(u32 index, u32 state); extern void cellPad_NotifyStateChange(u32 index, u32 state);
void config_event_entry(ppu_thread& ppu) void config_event_entry(ppu_thread& ppu)
{ {
auto& cfg = g_fxo->get<libio_sys_config>(); auto& cfg = g_fxo->get<libio_sys_config>();
// Ensure awake if (!ppu.loaded_from_savestate)
ppu.check_state(); {
// Ensure awake
ppu.check_state();
}
while (!sys_event_queue_receive(ppu, cfg.queue_id, vm::null, 0)) while (!sys_event_queue_receive(ppu, cfg.queue_id, vm::null, 0))
{ {

9
rpcs3/Emu/savestate_utils.cpp
View file

@ -18,7 +18,7 @@ struct serial_ver_t
std::set<s32> compatible_versions; std::set<s32> compatible_versions;
}; };
static std::array<serial_ver_t, 23> s_serial_versions; static std::array<serial_ver_t, 26> s_serial_versions;
#define SERIALIZATION_VER(name, identifier, ...) \ #define SERIALIZATION_VER(name, identifier, ...) \
\ \
@ -35,7 +35,7 @@ static std::array<serial_ver_t, 23> s_serial_versions;
return ::s_serial_versions[identifier].current_version;\ return ::s_serial_versions[identifier].current_version;\
} }
SERIALIZATION_VER(global_version, 0, 13) // For stuff not listed here SERIALIZATION_VER(global_version, 0, 14) // For stuff not listed here
SERIALIZATION_VER(ppu, 1, 1) SERIALIZATION_VER(ppu, 1, 1)
SERIALIZATION_VER(spu, 2, 1) SERIALIZATION_VER(spu, 2, 1)
SERIALIZATION_VER(lv2_sync, 3, 1) SERIALIZATION_VER(lv2_sync, 3, 1)
@ -73,6 +73,11 @@ SERIALIZATION_VER(cellGcm, 19, 1)
SERIALIZATION_VER(sysPrxForUser, 20, 1) SERIALIZATION_VER(sysPrxForUser, 20, 1)
SERIALIZATION_VER(cellSaveData, 21, 1) SERIALIZATION_VER(cellSaveData, 21, 1)
SERIALIZATION_VER(cellAudioOut, 22, 1) SERIALIZATION_VER(cellAudioOut, 22, 1)
SERIALIZATION_VER(sys_io, 23, 1)
// Misc versions for HLE/LLE not included so main version would not invalidated
SERIALIZATION_VER(LLE, 24, 1)
SERIALIZATION_VER(HLE, 25, 1)
std::vector<std::pair<u16, u16>> get_savestate_versioning_data(const fs::file& file) std::vector<std::pair<u16, u16>> get_savestate_versioning_data(const fs::file& file)
{ {