From 2398e753bf50787210e4c8d9a6895c072bc1d2db Mon Sep 17 00:00:00 2001 From: Eladash <18193363+elad335@users.noreply.github.com> Date: Sat, 30 Dec 2023 20:23:54 +0200 Subject: [PATCH] Savestates/cellPad: Save old controller state --- rpcs3/Emu/Cell/Modules/cellPad.cpp | 3 ++- rpcs3/Emu/Cell/Modules/cellPad.h | 2 ++ rpcs3/Emu/savestate_utils.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp index 02a1646aae..f0063b2168 100644 --- a/rpcs3/Emu/Cell/Modules/cellPad.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp @@ -58,6 +58,7 @@ extern void sys_io_serialize(utils::serial& ar); pad_info::pad_info(utils::serial& ar) : max_connect(ar) , port_setting(ar) + , reported_info(ar) { sys_io_serialize(ar); } @@ -66,7 +67,7 @@ void pad_info::save(utils::serial& ar) { USING_SERIALIZATION_VERSION(sys_io); - ar(max_connect, port_setting); + ar(max_connect, port_setting, reported_info); sys_io_serialize(ar); } diff --git a/rpcs3/Emu/Cell/Modules/cellPad.h b/rpcs3/Emu/Cell/Modules/cellPad.h index 6219ada00a..0fdd4b23a7 100644 --- a/rpcs3/Emu/Cell/Modules/cellPad.h +++ b/rpcs3/Emu/Cell/Modules/cellPad.h @@ -49,6 +49,8 @@ struct pad_data_internal u32 device_type; u32 pclass_type; u32 pclass_profile; + + ENABLE_BITWISE_SERIALIZATION; }; struct CellPadInfo diff --git a/rpcs3/Emu/savestate_utils.cpp b/rpcs3/Emu/savestate_utils.cpp index d38b91306f..c070283598 100644 --- a/rpcs3/Emu/savestate_utils.cpp +++ b/rpcs3/Emu/savestate_utils.cpp @@ -79,7 +79,7 @@ SERIALIZATION_VER(cellGcm, 19, 1) SERIALIZATION_VER(sysPrxForUser, 20, 1) SERIALIZATION_VER(cellSaveData, 21, 1) SERIALIZATION_VER(cellAudioOut, 22, 1) -SERIALIZATION_VER(sys_io, 23, 1) +SERIALIZATION_VER(sys_io, 23, 2) // Misc versions for HLE/LLE not included so main version would not invalidated SERIALIZATION_VER(LLE, 24, 1)