From bcf8175ee944de6e4dfb8f802ea12fa5bf6dca21 Mon Sep 17 00:00:00 2001
From: kub <derkub@gmail.com>
Date: Mon, 10 Mar 2025 20:13:59 +0100
Subject: [PATCH] core, fix sound save/load for gp2x

---
 pico/memory.c       | 39 ++++++++++++++++++++++++++++-----------
 pico/pico_int.h     |  1 +
 pico/sound/ym2612.h |  1 +
 pico/state.c        |  6 ++++++
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/pico/memory.c b/pico/memory.c
index 87b847f2..167779a2 100644
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -1376,11 +1376,11 @@ static u32 ym2612_read_local_68k(void)
   return ym2612.OPN.ST.status;
 }
 
-int ym2612_pack_timers(void *buf, size_t size)
+void ym2612_pack_state_old(void)
 {
   // timers are saved as tick counts, in 16.16 int format
   int tac, tat = 0, tbc, tbt = 0, busy = 0;
-  size_t b = 0;
+
   tac = 1024 - ym2612.OPN.ST.TA;
   tbc = 256  - ym2612.OPN.ST.TB;
   if (Pico.t.ym2612_busy > 0)
@@ -1391,20 +1391,37 @@ int ym2612_pack_timers(void *buf, size_t size)
     tbt = ((Pico.t.timer_b_step - Pico.t.timer_b_next_oflow) * ((1LL<<32)/TIMER_B_TICK_ZCYCLES+1))>>16;
   elprintf(EL_YMTIMER, "save: timer a %i/%i", tat >> 16, tac);
   elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc);
+
 #ifdef __GP2X__
   if (PicoIn.opt & POPT_EXT_FM)
     YM2612PicoStateSave2_940(tat, tbt);
   else
 #endif
-  {
-    //YM2612PicoStateSave2(tat, tbt, busy);
-    assert(size >= 16);
-    save_u16(buf, &b, ym2612.OPN.ST.TA);
-    save_u16(buf, &b, ym2612.OPN.ST.TB);
-    save_u32(buf, &b, tat);
-    save_u32(buf, &b, tbt);
-    save_u32(buf, &b, busy);
-  }
+    YM2612PicoStateSave2(tat, tbt, busy);
+}
+
+int ym2612_pack_timers(void *buf, size_t size)
+{
+  // timers are saved as tick counts, in 16.16 int format
+  int tac, tat = 0, tbc, tbt = 0, busy = 0;
+  size_t b = 0;
+  tac = 1024 - ym2612.OPN.ST.TA;
+  tbc = 256  - ym2612.OPN.ST.TB;
+  if (Pico.t.ym2612_busy > 0)
+    busy = cycles_z80_to_68k(Pico.t.ym2612_busy);
+  if (Pico.t.timer_a_next_oflow != TIMER_NO_OFLOW)
+    tat = ((Pico.t.timer_a_step - Pico.t.timer_a_next_oflow) * ((1LL<<32)/TIMER_A_TICK_ZCYCLES+1))>>16;
+  if (Pico.t.timer_b_next_oflow != TIMER_NO_OFLOW)
+    tbt = ((Pico.t.timer_b_step - Pico.t.timer_b_next_oflow) * ((1LL<<32)/TIMER_B_TICK_ZCYCLES+1))>>16;
+  elprintf(EL_YMTIMER, "save: timer a %i/%i", tat >> 16, tac);
+  elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc);
+
+  assert(size >= 16);
+  save_u16(buf, &b, ym2612.OPN.ST.TA);
+  save_u16(buf, &b, ym2612.OPN.ST.TB);
+  save_u32(buf, &b, tat);
+  save_u32(buf, &b, tbt);
+  save_u32(buf, &b, busy);
   return b;
 }
 
diff --git a/pico/pico_int.h b/pico/pico_int.h
index 612783a6..585cb089 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -906,6 +906,7 @@ void cdda_start_play(int lba_base, int lba_offset, int lb_len);
 void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new);
 int  ym2612_pack_timers(void *buf_, size_t size);
 void ym2612_unpack_timers(const void *buf_, size_t size);
+void ym2612_pack_state_old(void);
 void ym2612_unpack_state_old(void);
 
 #define TIMER_NO_OFLOW 0x70000000
diff --git a/pico/sound/ym2612.h b/pico/sound/ym2612.h
index bdf53be8..b270cae7 100644
--- a/pico/sound/ym2612.h
+++ b/pico/sound/ym2612.h
@@ -183,6 +183,7 @@ void YM2612PicoStateLoad_(void);
 
 void *YM2612GetRegs(void);
 int  YM2612PicoStateLoad2(int *tat, int *tbt, int *busy);
+void YM2612PicoStateSave2(int tat, int tbt, int busy);
 size_t YM2612PicoStateSave3(void *buf_, size_t size);
 void   YM2612PicoStateLoad3(const void *buf_, size_t size);
 
diff --git a/pico/state.c b/pico/state.c
index e1d7fe16..914fc41b 100644
--- a/pico/state.c
+++ b/pico/state.c
@@ -258,11 +258,17 @@ static int state_save(void *file)
       CHECKED_WRITE(CHUNK_PICO_PCM, len, buf2);
       CHECKED_WRITE(CHUNK_PICO, sizeof(PicoPicohw), &PicoPicohw);
     } else {
+#ifdef __GP2X__
+      ym2612_pack_state_old();
+      ym_regs = YM2612GetRegs();
+      CHECKED_WRITE(CHUNK_FM, 0x200+4, ym_regs);
+#else
       // write fm state first since timer load needs OPN.ST.mode
       len = YM2612PicoStateSave3(buf2, CHUNK_LIMIT_W);
       CHECKED_WRITE(CHUNK_FMv3, len, buf2);
       len = ym2612_pack_timers(buf2, CHUNK_LIMIT_W);
       CHECKED_WRITE(CHUNK_FM_TIMERS, len, buf2);
+#endif
     }
 
     if (!(PicoIn.opt & POPT_DIS_IDLE_DET))
-- 
2.39.5