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
gpu_neon: gpu info reads, some bugfixes
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
freeze.c
diff --git
a/plugins/dfsound/freeze.c
b/plugins/dfsound/freeze.c
index
cb0d75e
..
41c6f16
100644
(file)
--- a/
plugins/dfsound/freeze.c
+++ b/
plugins/dfsound/freeze.c
@@
-121,7
+121,7
@@
extern int lastch;
\r
// we want to retain compatibility between versions,
\r
// so use original channel struct
\r
\r
// we want to retain compatibility between versions,
\r
// so use original channel struct
\r
-static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
\r
+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
{
\r
memset(d, 0, sizeof(*d));
\r
d->bNew = !!(dwNewChannel & (1<<ch));
\r
@@
-141,15
+141,11
@@
static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
d->bIgnoreLoop = s->bIgnoreLoop;
\r
d->iRightVolume = s->iRightVolume;
\r
d->iRawPitch = s->iRawPitch;
\r
d->bIgnoreLoop = s->bIgnoreLoop;
\r
d->iRightVolume = s->iRightVolume;
\r
d->iRawPitch = s->iRawPitch;
\r
- d->s_1 = s->
s_1;
\r
- d->s_2 = s->
s_2
;
\r
+ d->s_1 = s->
SB[27]; // yes it's reversed
\r
+ d->s_2 = s->
SB[26]
;
\r
d->bRVBActive = s->bRVBActive;
\r
d->bRVBActive = s->bRVBActive;
\r
- d->iRVBOffset = s->iRVBOffset;
\r
- d->iRVBRepeat = s->iRVBRepeat;
\r
d->bNoise = s->bNoise;
\r
d->bFMod = s->bFMod;
\r
d->bNoise = s->bNoise;
\r
d->bFMod = s->bFMod;
\r
- d->iRVBNum = s->iRVBNum;
\r
- d->iOldNoise = s->iOldNoise;
\r
d->ADSRX.State = s->ADSRX.State;
\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;
\r
d->ADSRX.State = s->ADSRX.State;
\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;
\r
@@
-164,7
+160,7
@@
static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
d->ADSRX.lVolume = d->bOn; // hmh
\r
}
\r
\r
d->ADSRX.lVolume = d->bOn; // hmh
\r
}
\r
\r
-static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
\r
+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
{
\r
memset(d, 0, sizeof(*d));
\r
if (s->bNew) dwNewChannel |= 1<<ch;
\r
@@
-172,9
+168,9
@@
static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
d->spos = s->spos;
\r
d->sinc = s->sinc;
\r
memcpy(d->SB, s->SB, sizeof(d->SB));
\r
d->spos = s->spos;
\r
d->sinc = s->sinc;
\r
memcpy(d->SB, s->SB, sizeof(d->SB));
\r
- d->pStart =
s->pStart
;
\r
- d->pCurr =
s->pCurr
;
\r
- d->pLoop =
s->pLoop
;
\r
+ d->pStart =
(void *)((long)s->pStart & 0x7fff0)
;
\r
+ d->pCurr =
(void *)((long)s->pCurr & 0x7fff0)
;
\r
+ d->pLoop =
(void *)((long)s->pLoop & 0x7fff0)
;
\r
if (s->bOn) dwChannelOn |= 1<<ch;
\r
d->bStop = s->bStop;
\r
d->bReverb = s->bReverb;
\r
if (s->bOn) dwChannelOn |= 1<<ch;
\r
d->bStop = s->bStop;
\r
d->bReverb = s->bReverb;
\r
@@
-184,15
+180,9
@@
static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
d->bIgnoreLoop = s->bIgnoreLoop;
\r
d->iRightVolume = s->iRightVolume;
\r
d->iRawPitch = s->iRawPitch;
\r
d->bIgnoreLoop = s->bIgnoreLoop;
\r
d->iRightVolume = s->iRightVolume;
\r
d->iRawPitch = s->iRawPitch;
\r
- d->s_1 = s->s_1;
\r
- d->s_2 = s->s_2;
\r
d->bRVBActive = s->bRVBActive;
\r
d->bRVBActive = s->bRVBActive;
\r
- d->iRVBOffset = s->iRVBOffset;
\r
- d->iRVBRepeat = s->iRVBRepeat;
\r
d->bNoise = s->bNoise;
\r
d->bFMod = s->bFMod;
\r
d->bNoise = s->bNoise;
\r
d->bFMod = s->bFMod;
\r
- d->iRVBNum = s->iRVBNum;
\r
- d->iOldNoise = s->iOldNoise;
\r
d->ADSRX.State = s->ADSRX.State;
\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;
\r
d->ADSRX.State = s->ADSRX.State;
\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;
\r
@@
-247,6
+237,9
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
pFO->spuAddr=spuAddr;
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
\r
\r
pFO->spuAddr=spuAddr;
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
\r
\r
+ dwChannelOn&=~dwPendingChanOff;
\r
+ dwPendingChanOff=0;
\r
+
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);
\r
for(i=0;i<MAXCHAN;i++)
\r
{
\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);
\r
@@
-275,6
+268,7
@@
long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
SPUplayADPCMchannel(&pF->xaS);
\r
\r
xapGlobal=0;
\r
SPUplayADPCMchannel(&pF->xaS);
\r
\r
xapGlobal=0;
\r
+ dwPendingChanOff=0;
\r
\r
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
\r
LoadStateV5(pF);
\r
\r
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
\r
LoadStateV5(pF);
\r
@@
-311,7
+305,7
@@
void LoadStateV5(SPUFreeze_t * pF)
pFO=(SPUOSSFreeze_t *)(pF+1);
\r
\r
spuIrq = pFO->spuIrq;
\r
pFO=(SPUOSSFreeze_t *)(pF+1);
\r
\r
spuIrq = pFO->spuIrq;
\r
- if(pFO->pSpuIrq) pSpuIrq =
pFO->pSpuIrq+spuMemC
; else pSpuIrq=NULL;
\r
+ if(pFO->pSpuIrq) pSpuIrq =
spuMemC+((long)pFO->pSpuIrq&0x7fff0)
; else pSpuIrq=NULL;
\r
\r
if(pFO->spuAddr)
\r
{
\r
\r
if(pFO->spuAddr)
\r
{
\r