aboutsummaryrefslogtreecommitdiff
path: root/plugins/dfsound
diff options
context:
space:
mode:
authornotaz2011-07-27 20:10:49 +0300
committernotaz2011-07-30 02:43:26 +0300
commit78c60846942cad7d41d6d23a7c3d2b905ee4b822 (patch)
tree322d134e79433a6769ad7fead0e6d473f4500fea /plugins/dfsound
parent3fc2a4c27be8c8cd5f8cf53a0d56c263275b8501 (diff)
downloadpcsx_rearmed-78c60846942cad7d41d6d23a7c3d2b905ee4b822.tar.gz
pcsx_rearmed-78c60846942cad7d41d6d23a7c3d2b905ee4b822.tar.bz2
pcsx_rearmed-78c60846942cad7d41d6d23a7c3d2b905ee4b822.zip
spu: handle non-playing channel irqs
Diffstat (limited to 'plugins/dfsound')
-rw-r--r--plugins/dfsound/spu.c47
1 files changed, 47 insertions, 0 deletions
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index f9c13d4..780b091 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -656,6 +656,53 @@ ENDX: ;
}
}
+ // advance "stopped" channels that can cause irqs
+ // (all chans are always playing on the real thing..)
+ if(!bIRQReturn && (spuCtrl&CTRL_IRQ))
+ for(ch=0;ch<MAXCHAN;ch++)
+ {
+ if(dwChannelOn&(1<<ch)) continue; // already handled
+ if(s_chan[ch].pCurr == (unsigned char *)-1)
+ continue;
+ if(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
+ continue;
+
+ if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency?
+ VoiceChangeFrequency(ch);
+
+ s_chan[ch].spos += s_chan[ch].sinc * NSSIZE;
+ while(s_chan[ch].spos >= 28 * 0x10000)
+ {
+ unsigned char *start=s_chan[ch].pCurr;
+ int flags = start[1];
+
+ // Tron Bonne hack, probably wrong (could be wrong memory contents..)
+ if(flags & ~7) flags = 0;
+
+ if(start == pSpuIrq)
+ {
+ do_irq();
+ bIRQReturn = 1;
+ }
+ else if((flags & 1) && start == s_chan[ch].pLoop)
+ {
+ // looping on self
+ s_chan[ch].pCurr=(unsigned char *)-1;
+ break;
+ }
+
+ if((flags&4) && !s_chan[ch].bIgnoreLoop)
+ s_chan[ch].pLoop=start;
+
+ s_chan[ch].pCurr += 16;
+
+ if(flags & 1)
+ s_chan[ch].pCurr = s_chan[ch].pLoop;
+
+ s_chan[ch].spos -= 28 * 0x10000;
+ }
+ }
+
if(bIRQReturn && iSPUIRQWait) // special return for "spu irq - wait for cpu action"
{
iSpuAsyncWait=1;