X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=32c07dbde67d28702ef86f91b76a01d534886148;hb=20ed712f92d53fa7d51a4b805af997f5770077ae;hp=8816a51ce23fa4be3e9b2a631cf9679402ef3ba4;hpb=3de08a09ec3cd4d9573b2c5826dc3c05fe7f5852;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 8816a51c..32c07dbd 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -130,6 +130,14 @@ typedef struct
 
  SPUCHAN_orig s_chan[MAXCHAN];   
 
+ uint32_t   cycles_dma_end;
+ uint32_t   decode_dirty_ch;
+ uint32_t   dwNoiseVal;
+ uint32_t   dwNoiseCount;
+ uint32_t   XARepeat;
+ uint32_t   XALastVal;
+ uint32_t   last_keyon_cycles;
+
 } SPUOSSFreeze_t;
 
 ////////////////////////////////////////////////////////////////////////
@@ -250,6 +258,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye
                                                        // save mode:
+   regAreaGet(H_SPUctrl) = spu.spuCtrl;
+   regAreaGet(H_SPUstat) = spu.spuStat;
    memcpy(pF->cSPURam,spu.spuMem,0x80000);             // copy common infos
    memcpy(pF->cSPUPort,spu.regArea,0x200);
 
@@ -312,6 +322,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  memcpy(spu.spuMem,pF->cSPURam,0x80000);               // get ram
  memcpy(spu.regArea,pF->cSPUPort,0x200);
  spu.bMemDirty = 1;
+ spu.spuCtrl = regAreaGet(H_SPUctrl);
+ spu.spuStat = regAreaGet(H_SPUstat);
 
  if (!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
    pFO = LoadStateV5(pF, cycles);
@@ -329,18 +341,35 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
   FeedCDDA((void *)pF->xaS.pcm, pFO->cdda_left * 4);
  }
 
+ // not in old savestates
+ spu.cycles_dma_end = 0;
+ spu.decode_dirty_ch = spu.dwChannelsAudible & 0x0a;
+ spu.dwNoiseVal = 0;
+ spu.dwNoiseCount = 0;
+ spu.XARepeat = 0;
+ spu.XALastVal = 0;
+ spu.last_keyon_cycles = cycles - 16*786u;
+ if (pFO && pF->ulFreezeSize >= sizeof(*pF) + sizeof(*pFO)) {
+  spu.cycles_dma_end = pFO->cycles_dma_end;
+  spu.decode_dirty_ch = pFO->decode_dirty_ch;
+  spu.dwNoiseVal = pFO->dwNoiseVal;
+  spu.dwNoiseCount = pFO->dwNoiseCount;
+  spu.XARepeat = pFO->XARepeat;
+  spu.XALastVal = pFO->XALastVal;
+  spu.last_keyon_cycles = pFO->last_keyon_cycles;
+ }
+
  // repair some globals
  for(i=0;i<=62;i+=2)
   load_register(H_Reverb+i, cycles);
  load_register(H_SPUReverbAddr, cycles);
  load_register(H_SPUrvolL, cycles);
  load_register(H_SPUrvolR, cycles);
-
- load_register(H_SPUctrl, cycles);
- load_register(H_SPUstat, cycles);
  load_register(H_CDLeft, cycles);
  load_register(H_CDRight, cycles);
 
+ // reverb
+ spu.rvb->StartAddr = regAreaGet(H_SPUReverbAddr) << 2;
  if (spu.rvb->CurrAddr < spu.rvb->StartAddr)
   spu.rvb->CurrAddr = spu.rvb->StartAddr;
  // fix to prevent new interpolations from crashing
@@ -383,6 +412,7 @@ static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles)
    spu.s_chan[i].pCurr+=(uintptr_t)spu.spuMemC;
    spu.s_chan[i].pLoop+=(uintptr_t)spu.spuMemC;
   }
+
  return pFO;
 }