spu: put globals into a structure

[pcsx_rearmed.git] / plugins / dfsound / freeze.c

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 9fa29f0..b865b84 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -139,7 +139,7 @@ void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format
 static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
 {\r
  memset(d, 0, sizeof(*d));\r
- d->bNew = !!(dwNewChannel & (1<<ch));\r
+ d->bNew = !!(spu.dwNewChannel & (1<<ch));\r
  d->iSBPos = s->iSBPos;\r
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
@@ -147,7 +147,7 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->iStart = (regAreaGet(ch,6)&~1)<<3;\r
  d->iCurr = 0; // set by the caller\r
  d->iLoop = 0; // set by the caller\r
- d->bOn = !!(dwChannelOn & (1<<ch));\r
+ d->bOn = !!(spu.dwChannelOn & (1<<ch));\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
  d->iActFreq = 1;\r
@@ -179,7 +179,7 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
 static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
 {\r
  memset(d, 0, sizeof(*d));\r
- if (s->bNew) dwNewChannel |= 1<<ch;\r
+ if (s->bNew) spu.dwNewChannel |= 1<<ch;\r
  d->iSBPos = s->iSBPos;\r
  if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;\r
  d->spos = s->spos;\r
@@ -208,14 +208,14 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
  d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
  d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
- if (s->bOn) dwChannelOn |= 1<<ch;\r
+ if (s->bOn) spu.dwChannelOn |= 1<<ch;\r
  else d->ADSRX.EnvelopeVol = 0;\r
 }\r
 \r
 // force load from regArea to variables\r
 static void load_register(unsigned long reg, unsigned int cycles)\r
 {\r
- unsigned short *r = &regArea[((reg & 0xfff) - 0xc00) >> 1];\r
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];\r
  *r ^= 1;\r
  SPUwriteRegister(reg, *r ^ 1, cycles);\r
 }\r
@@ -244,31 +244,31 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
                                                        // save mode:\r
    do_samples(cycles);\r
 \r
-   memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos\r
-   memcpy(pF->cSPUPort,regArea,0x200);\r
+   memcpy(pF->cSPURam,spu.spuMem,0x80000);             // copy common infos\r
+   memcpy(pF->cSPUPort,spu.regArea,0x200);\r
 \r
-   if(xapGlobal && XAPlay!=XAFeed)                     // some xa\r
+   if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed)         // some xa\r
     {\r
-     pF->xaS=*xapGlobal;     \r
+     pF->xaS=*spu.xapGlobal;\r
     }\r
    else \r
    memset(&pF->xaS,0,sizeof(xa_decode_t));             // or clean xa\r
 \r
    pFO=(SPUOSSFreeze_t *)(pF+1);                       // store special stuff\r
 \r
-   pFO->spuIrq=spuIrq;\r
-   if(pSpuIrq)  pFO->pSpuIrq  = (unsigned long)pSpuIrq-(unsigned long)spuMemC;\r
+   pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];\r
+   if(spu.pSpuIrq) pFO->pSpuIrq  = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC;\r
 \r
-   pFO->spuAddr=spuAddr;\r
+   pFO->spuAddr=spu.spuAddr;\r
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
 \r
    for(i=0;i<MAXCHAN;i++)\r
     {\r
      save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
      if(s_chan[i].pCurr)\r
-      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r
+      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spu.spuMemC;\r
      if(s_chan[i].pLoop)\r
-      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;\r
+      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC;\r
     }\r
 \r
    return 1;\r
@@ -277,13 +277,13 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
                                                        \r
  if(ulFreezeMode!=0) return 0;                         // bad mode? bye\r
 \r
- memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram\r
- memcpy(regArea,pF->cSPUPort,0x200);\r
+ memcpy(spu.spuMem,pF->cSPURam,0x80000);               // get ram\r
+ memcpy(spu.regArea,pF->cSPUPort,0x200);\r
 \r
  if(pF->xaS.nsamples<=4032)                            // start xa again\r
   SPUplayADPCMchannel(&pF->xaS);\r
 \r
- xapGlobal=0;\r
+ spu.xapGlobal=0;\r
 \r
  if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
    LoadStateV5(pF);\r
@@ -305,7 +305,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
 \r
  ClearWorkingState();\r
- cycles_played = cycles;\r
+ spu.cycles_played = cycles;\r
 \r
  return 1;\r
 }\r
@@ -318,24 +318,23 @@ void LoadStateV5(SPUFreeze_t * pF)
 \r
  pFO=(SPUOSSFreeze_t *)(pF+1);\r
 \r
- spuIrq = pFO->spuIrq;\r
- if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;\r
+ if(pFO->pSpuIrq) spu.pSpuIrq = spu.spuMemC+((long)pFO->pSpuIrq&0x7fff0); else spu.pSpuIrq=NULL;\r
 \r
  if(pFO->spuAddr)\r
   {\r
-   spuAddr = pFO->spuAddr;\r
-   if (spuAddr == 0xbaadf00d) spuAddr = 0;\r
+   spu.spuAddr = pFO->spuAddr;\r
+   if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0;\r
   }\r
 \r
- dwNewChannel=0;\r
- dwChannelOn=0;\r
- dwChannelDead=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
  for(i=0;i<MAXCHAN;i++)\r
   {\r
    load_channel(&s_chan[i],&pFO->s_chan[i],i);\r
 \r
-   s_chan[i].pCurr+=(unsigned long)spuMemC;\r
-   s_chan[i].pLoop+=(unsigned long)spuMemC;\r
+   s_chan[i].pCurr+=(unsigned long)spu.spuMemC;\r
+   s_chan[i].pLoop+=(unsigned long)spu.spuMemC;\r
   }\r
 }\r
 \r
@@ -348,13 +347,13 @@ void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
  for(i=0;i<MAXCHAN;i++)\r
   {\r
    s_chan[i].bStop=0;\r
-   s_chan[i].pLoop=spuMemC;\r
+   s_chan[i].pLoop=spu.spuMemC;\r
   }\r
 \r
- dwNewChannel=0;\r
- dwChannelOn=0;\r
- dwChannelDead=0;\r
- pSpuIrq=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
+ spu.pSpuIrq=0;\r
 \r
  for(i=0;i<0xc0;i++)\r
   {\r