notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cdrom: change GetlocL behavior
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
freeze.c
diff --git
a/plugins/dfsound/freeze.c
b/plugins/dfsound/freeze.c
index
5b4267b
..
51e9fd7
100644
(file)
--- a/
plugins/dfsound/freeze.c
+++ b/
plugins/dfsound/freeze.c
@@
-119,6
+119,7
@@
typedef struct
typedef struct
\r
{
\r
unsigned short spuIrq;
\r
typedef struct
\r
{
\r
unsigned short spuIrq;
\r
+ unsigned short decode_pos;
\r
uint32_t pSpuIrq;
\r
uint32_t spuAddr;
\r
uint32_t dummy1;
\r
uint32_t pSpuIrq;
\r
uint32_t spuAddr;
\r
uint32_t dummy1;
\r
@@
-144,10
+145,10
@@
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
d->spos = s->spos;
\r
d->sinc = s->sinc;
\r
memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);
\r
d->spos = s->spos;
\r
d->sinc = s->sinc;
\r
memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);
\r
- d->iStart = (regAreaGet
(ch,6)&~1)<<
3;
\r
+ d->iStart = (regAreaGet
Ch(ch, 6) & ~1) <<
3;
\r
d->iCurr = 0; // set by the caller
\r
d->iLoop = 0; // set by the caller
\r
d->iCurr = 0; // set by the caller
\r
d->iLoop = 0; // set by the caller
\r
- d->bOn = !!(spu.dwChannel
On
& (1<<ch));
\r
+ d->bOn = !!(spu.dwChannel
sAudible
& (1<<ch));
\r
d->bStop = s->ADSRX.State == ADSR_RELEASE;
\r
d->bReverb = s->bReverb;
\r
d->iActFreq = 1;
\r
d->bStop = s->ADSRX.State == ADSR_RELEASE;
\r
d->bReverb = s->bReverb;
\r
d->iActFreq = 1;
\r
@@
-186,8
+187,8
@@
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
d->sinc = s->sinc;
\r
d->sinc_inv = 0;
\r
memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);
\r
d->sinc = s->sinc;
\r
d->sinc_inv = 0;
\r
memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);
\r
- d->pCurr = (void *)((
long
)s->iCurr & 0x7fff0);
\r
- d->pLoop = (void *)((
long
)s->iLoop & 0x7fff0);
\r
+ d->pCurr = (void *)((
uintptr_t
)s->iCurr & 0x7fff0);
\r
+ d->pLoop = (void *)((
uintptr_t
)s->iLoop & 0x7fff0);
\r
d->bReverb = s->bReverb;
\r
d->iLeftVolume = s->iLeftVolume;
\r
d->iRightVolume = s->iRightVolume;
\r
d->bReverb = s->bReverb;
\r
d->iLeftVolume = s->iLeftVolume;
\r
d->iRightVolume = s->iRightVolume;
\r
@@
-208,7
+209,7
@@
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
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
\r
- if (s->bOn) spu.dwChannel
On
|= 1<<ch;
\r
+ if (s->bOn) spu.dwChannel
sAudible
|= 1<<ch;
\r
else d->ADSRX.EnvelopeVol = 0;
\r
}
\r
\r
else d->ADSRX.EnvelopeVol = 0;
\r
}
\r
\r
@@
-231,6
+232,8
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
\r
if(!pF) return 0; // first check
\r
\r
\r
if(!pF) return 0; // first check
\r
\r
+ do_samples(cycles, 1);
\r
+
\r
if(ulFreezeMode) // info or save?
\r
{//--------------------------------------------------//
\r
if(ulFreezeMode==1)
\r
if(ulFreezeMode) // info or save?
\r
{//--------------------------------------------------//
\r
if(ulFreezeMode==1)
\r
@@
-242,8
+245,6
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye
\r
// save mode:
\r
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye
\r
// save mode:
\r
- do_samples(cycles, 1);
\r
-
\r
memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos
\r
memcpy(pF->cSPUPort,spu.regArea,0x200);
\r
\r
memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos
\r
memcpy(pF->cSPUPort,spu.regArea,0x200);
\r
\r
@@
-257,10
+258,11
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff
\r
\r
pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];
\r
pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff
\r
\r
pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];
\r
- if(spu.pSpuIrq) pFO->pSpuIrq
= (unsigned long)spu.pSpuIrq-(unsigned long)
spu.spuMemC;
\r
+ if(spu.pSpuIrq) pFO->pSpuIrq
= spu.pSpuIrq -
spu.spuMemC;
\r
\r
pFO->spuAddr=spu.spuAddr;
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
\r
\r
pFO->spuAddr=spu.spuAddr;
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
\r
+ pFO->decode_pos = spu.decode_pos;
\r
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
@@
-279,9
+281,10
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
\r
memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram
\r
memcpy(spu.regArea,pF->cSPUPort,0x200);
\r
\r
memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram
\r
memcpy(spu.regArea,pF->cSPUPort,0x200);
\r
+ spu.bMemDirty = 1;
\r
\r
if(pF->xaS.nsamples<=4032) // start xa again
\r
\r
if(pF->xaS.nsamples<=4032) // start xa again
\r
- SPUplayADPCMchannel(&pF->xaS);
\r
+ SPUplayADPCMchannel(&pF->xaS
, spu.cycles_played, 0
);
\r
\r
spu.xapGlobal=0;
\r
\r
\r
spu.xapGlobal=0;
\r
\r
@@
-328,16
+331,17
@@
void LoadStateV5(SPUFreeze_t * pF)
if (pFO->spuAddr == 0xbaadf00d) spu.spuAddr = 0;
\r
else spu.spuAddr = pFO->spuAddr & 0x7fffe;
\r
}
\r
if (pFO->spuAddr == 0xbaadf00d) spu.spuAddr = 0;
\r
else spu.spuAddr = pFO->spuAddr & 0x7fffe;
\r
}
\r
+ spu.decode_pos = pFO->decode_pos & 0x1ff;
\r
\r
spu.dwNewChannel=0;
\r
\r
spu.dwNewChannel=0;
\r
- spu.dwChannel
On
=0;
\r
+ spu.dwChannel
sAudible
=0;
\r
spu.dwChannelDead=0;
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
load_channel(&spu.s_chan[i],&pFO->s_chan[i],i);
\r
\r
spu.dwChannelDead=0;
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
load_channel(&spu.s_chan[i],&pFO->s_chan[i],i);
\r
\r
- spu.s_chan[i].pCurr+=(u
nsigned long
)spu.spuMemC;
\r
- spu.s_chan[i].pLoop+=(u
nsigned long
)spu.spuMemC;
\r
+ spu.s_chan[i].pCurr+=(u
intptr_t
)spu.spuMemC;
\r
+ spu.s_chan[i].pLoop+=(u
intptr_t
)spu.spuMemC;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-353,7
+357,7
@@
void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
}
\r
\r
spu.dwNewChannel=0;
\r
}
\r
\r
spu.dwNewChannel=0;
\r
- spu.dwChannel
On
=0;
\r
+ spu.dwChannel
sAudible
=0;
\r
spu.dwChannelDead=0;
\r
spu.pSpuIrq=spu.spuMemC;
\r
\r
spu.dwChannelDead=0;
\r
spu.pSpuIrq=spu.spuMemC;
\r
\r