bugfixes, state load for new mode

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index fb6b99c..a9f0927 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -883,14 +883,13 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   return YM2612Write_(a, d);\r
 }\r
 \r
-// TODO: savestates\r
+\r
 #define ym2612_read_local() \\r
   if (xcycles >= timer_a_next_oflow) \\r
     ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \\r
   if (xcycles >= timer_b_next_oflow) \\r
     ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2\r
 \r
-\r
 u32 ym2612_read_local_z80(void)\r
 {\r
   int xcycles = z80_cyclesDone() << 8;\r
@@ -913,6 +912,23 @@ u32 ym2612_read_local_68k(void)
   return ym2612.OPN.ST.status;\r
 }\r
 \r
+// TODO: new ym2612 savestates\r
+void ym2612_unpack_state(void)\r
+{\r
+  int i;\r
+  YM2612PicoStateLoad();\r
+\r
+  // feed all the registers and update internal state\r
+  for (i = 0x20; i < 0xC0; i++) {\r
+    ym2612_write_local(0, i, 0);\r
+    ym2612_write_local(1, ym2612.REGS[i], 0);\r
+  }\r
+  for (i = 0x30; i < 0xC0; i++) {\r
+    ym2612_write_local(2, i, 0);\r
+    ym2612_write_local(3, ym2612.REGS[i|0x100], 0);\r
+  }\r
+}\r
+\r
 // -----------------------------------------------------------------\r
 //                        z80 memhandlers\r
 \r