ym2612 full saves wip

[picodrive.git] / Pico / Area.c

diff --git a/Pico/Area.c b/Pico/Area.c
index 0ec25ec..040154e 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -138,7 +138,6 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
 \r
     // Pack, scan and unpack the cpu data:\r
     if((PmovAction&3)==1) PicoAreaPackCpu(cpu, 0);\r
-    //SekInit();     // notaz: do we really have to do this here?\r
     //PicoMemInit();\r
     SCAN_VAR(cpu,"cpu")\r
     if((PmovAction&3)==2) PicoAreaUnpackCpu(cpu, 0);\r
@@ -146,8 +145,7 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
     SCAN_VAR(Pico.m    ,"misc")\r
     SCAN_VAR(Pico.video,"video")\r
 \r
-    // notaz: save/load z80, YM2612, sn76496 states instead of Pico.s (which is unused anyway)\r
-    if(PicoOpt&7) {\r
+    if (PicoOpt&7) {\r
       if((PmovAction&3)==1) z80_pack(cpu_z80);\r
       ret = SCAN_VAR(cpu_z80,"cpu_z80")\r
       // do not unpack if we fail to load z80 state\r
@@ -156,11 +154,12 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
         else    z80_unpack(cpu_z80);\r
       }\r
     }\r
-    if(PicoOpt&3)\r
+    if (PicoOpt&3)\r
       ScanVar(sn76496_regs,28*4,"SN76496state", PmovFile, PmovAction); // regs and other stuff\r
-    if(PicoOpt&1) {\r
+    if (PicoOpt&1) {\r
+      if((PmovAction&3)==1) ym2612_pack_state();\r
       ScanVar(ym2612_regs, 0x200+4, "YM2612state", PmovFile, PmovAction); // regs + addr line\r
-      if((PmovAction&3)==2) YM2612PicoStateLoad(); // reload YM2612 state from it's regs\r
+      if((PmovAction&3)==2) ym2612_unpack_state(); // reload YM2612 state from it's regs\r
     }\r
   }\r
 \r
@@ -176,7 +175,7 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;\r
   unsigned char head[32];\r
 \r
-  if ((PicoMCD & 1) || carthw_chunks != NULL)\r
+  if ((PicoAHW & PAHW_MCD) || carthw_chunks != NULL)\r
   {\r
     if (PmovAction&1) return PicoCdSaveState(PmovFile);\r
     if (PmovAction&2) {\r