From abc439bcaf89126785e24f37a19ad59bd3a18555 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Dec 2021 11:11:50 +0100 Subject: [PATCH] md, fix ssf2 mapping setup when loading a savestate --- cpu/cyclone | 2 +- pico/carthw/carthw.c | 9 ++++++--- pico/cd/libchdr | 2 +- pico/sound/emu2413 | 2 +- platform/common/dr_libs | 2 +- platform/common/minimp3 | 2 +- platform/libpicofe | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cpu/cyclone b/cpu/cyclone index 94a9d9a8..1f03ed6a 160000 --- a/cpu/cyclone +++ b/cpu/cyclone @@ -1 +1 @@ -Subproject commit 94a9d9a888e72cbfa4db12113cd113cf5e154f7f +Subproject commit 1f03ed6a49252bfb900c4d3932094308e1c5b375 diff --git a/pico/carthw/carthw.c b/pico/carthw/carthw.c index 83cb2da3..0cee14b1 100644 --- a/pico/carthw/carthw.c +++ b/pico/carthw/carthw.c @@ -71,9 +71,12 @@ static void carthw_ssf2_mem_setup(void) static void carthw_ssf2_statef(void) { - int i; - for (i = 1; i < 8; i++) - carthw_ssf2_write8(0xa130f0 | (i << 1), carthw_ssf2_banks[i]); + int i, reg; + for (i = 1; i < 8; i++) { + reg = carthw_ssf2_banks[i]; + carthw_ssf2_banks[i] = i; + carthw_ssf2_write8(0xa130f1 | (i << 1), reg); + } } static void carthw_ssf2_unload(void) diff --git a/pico/cd/libchdr b/pico/cd/libchdr index ff3175dd..929a8d65 160000 --- a/pico/cd/libchdr +++ b/pico/cd/libchdr @@ -1 +1 @@ -Subproject commit ff3175ddb040b1a967c665a28868b16bf5aa97dd +Subproject commit 929a8d6523a7d21ea9e035f43211cd759e072053 diff --git a/pico/sound/emu2413 b/pico/sound/emu2413 index 9f253489..4062e93e 160000 --- a/pico/sound/emu2413 +++ b/pico/sound/emu2413 @@ -1 +1 @@ -Subproject commit 9f25348936e691252afcfc992069c5a4810bf3f2 +Subproject commit 4062e93e9316ee5c488167ade5a83753e5f07ae3 diff --git a/platform/common/dr_libs b/platform/common/dr_libs index b20f7512..9497270f 160000 --- a/platform/common/dr_libs +++ b/platform/common/dr_libs @@ -1 +1 @@ -Subproject commit b20f7512a69b732ab4082c05e01fc29d42333fae +Subproject commit 9497270f581f43e6b795ce5d98d8764861fb6a50 diff --git a/platform/common/minimp3 b/platform/common/minimp3 index ef9e212f..afb604c0 160000 --- a/platform/common/minimp3 +++ b/platform/common/minimp3 @@ -1 +1 @@ -Subproject commit ef9e212fa29bb72d23558da21bb5694fd2d01768 +Subproject commit afb604c06bc8beb145fecd42c0ceb5bda8795144 diff --git a/platform/libpicofe b/platform/libpicofe index aa471f7f..e87e15f1 160000 --- a/platform/libpicofe +++ b/platform/libpicofe @@ -1 +1 @@ -Subproject commit aa471f7f59f3dcc3cf0b6efc6213e53ea0453c9c +Subproject commit e87e15f1702e4182ebabb1ab9df1fb9ff13a2e95