X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=36b8995923829ee677865cdd7b3e1fbe57d3406a;hb=HEAD;hp=c4afad83014275cd0e1b268b58b25e776a1f07cb;hpb=38e4048faeaccf7fdc6084f64866f2ea52bb97f1;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index c4afad83..36b89959 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -107,7 +107,7 @@ typedef struct
  ADSRInfoEx_orig   ADSRX;                              // next ADSR settings (will be moved to active on sample start)
 } SPUCHAN_orig;
 
-typedef struct
+typedef struct SPUFreeze
 {
  char          szSPUName[8];
  uint32_t ulFreezeVersion;
@@ -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;
 
 ////////////////////////////////////////////////////////////////////////
@@ -228,8 +236,8 @@ static void load_register(unsigned long reg, unsigned int cycles)
 // SPUFREEZE: called by main emu on savestate load/save
 ////////////////////////////////////////////////////////////////////////
 
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
- uint32_t cycles)
+long CALLBACK SPUfreeze(unsigned int ulFreezeMode, SPUFreeze_t * pF,
+ unsigned int cycles)
 {
  SPUOSSFreeze_t * pFO = NULL;
  int i;
@@ -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);
 
@@ -293,6 +303,13 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
    pFO->xa_left = xa_left;
    pFO->cdda_left = cdda_left;
    pFO->cycles_played = spu.cycles_played;
+   pFO->cycles_dma_end = spu.cycles_dma_end;
+   pFO->decode_dirty_ch = spu.decode_dirty_ch;
+   pFO->dwNoiseVal = spu.dwNoiseVal;
+   pFO->dwNoiseCount = spu.dwNoiseCount;
+   pFO->XARepeat = spu.XARepeat;
+   pFO->XALastVal = spu.XALastVal;
+   pFO->last_keyon_cycles = spu.last_keyon_cycles;
 
    for(i=0;i<MAXCHAN;i++)
     {
@@ -312,6 +329,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);
@@ -319,6 +338,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
  spu.XAPlay = spu.XAFeed = spu.XAStart;
  spu.CDDAPlay = spu.CDDAFeed = spu.CDDAStart;
+ spu.cdClearSamples = 512;
  if (pFO && pFO->xa_left && pF->xaS.nsamples) {        // start xa again
   FeedXA(&pF->xaS);
   spu.XAPlay = spu.XAFeed - pFO->xa_left;
@@ -329,18 +349,37 @@ 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
  spu.interpolation = -1;
 
@@ -381,6 +420,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;
 }