X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=4f4fa5682d5861e6a7190c11acb318e84e7ee7e3;hb=de89bf45d7b961e63abdffa79962e9951e8bf432;hp=17646693913752b64b90830cd2e9f1f030990146;hpb=03e4f2a349247334666c87abe3a908df72d23051;p=picodrive.git

diff --git a/Pico/Area.c b/Pico/Area.c
index 1764669..4f4fa56 100644
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -28,6 +28,8 @@ areaeof   *areaEof   = (areaeof *) 0;
 areaseek  *areaSeek  = (areaseek *) 0;
 areaclose *areaClose = (areaclose *) 0;
 
+void (*PicoLoadStateHook)(void) = NULL;
+
 
 // Scan one variable and callback
 static int ScanVar(void *data,int len,char *name,void *PmovFile,int PmovAction)
@@ -136,7 +138,6 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
 
     // Pack, scan and unpack the cpu data:
     if((PmovAction&3)==1) PicoAreaPackCpu(cpu, 0);
-    //SekInit();     // notaz: do we really have to do this here?
     //PicoMemInit();
     SCAN_VAR(cpu,"cpu")
     if((PmovAction&3)==2) PicoAreaUnpackCpu(cpu, 0);
@@ -158,7 +159,7 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
       ScanVar(sn76496_regs,28*4,"SN76496state", PmovFile, PmovAction); // regs and other stuff
     if(PicoOpt&1) {
       ScanVar(ym2612_regs, 0x200+4, "YM2612state", PmovFile, PmovAction); // regs + addr line
-      if((PmovAction&3)==2) YM2612PicoStateLoad(); // reload YM2612 state from it's regs
+      if((PmovAction&3)==2) ym2612_unpack_state(); // reload YM2612 state from it's regs
     }
   }
 
@@ -174,10 +175,14 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;
   unsigned char head[32];
 
-  if (PicoMCD & 1)
+  if ((PicoAHW & PAHW_MCD) || carthw_chunks != NULL)
   {
     if (PmovAction&1) return PicoCdSaveState(PmovFile);
-    if (PmovAction&2) return PicoCdLoadState(PmovFile);
+    if (PmovAction&2) {
+      int ret = PicoCdLoadState(PmovFile);
+      if (PicoLoadStateHook) PicoLoadStateHook();
+      return ret;
+    }
   }
 
   memset(head,0,sizeof(head));
@@ -197,6 +202,8 @@ int PmovState(int PmovAction, void *PmovFile)
   // Scan memory areas:
   PicoAreaScan(PmovAction, *(unsigned int *)(head+0x8), PmovFile);
 
+  if ((PmovAction&2) && PicoLoadStateHook) PicoLoadStateHook();
+
   return 0;
 }