#include "externals.h"\r
#include "registers.h"\r
#include "regs.h"\r
-#include "reverb.h"\r
\r
/*\r
// adsr time values (in ms) by James Higgs ... see the end of\r
break;\r
//-------------------------------------------------//\r
case H_SPUctrl:\r
+ if(!(spuCtrl & CTRL_IRQ))\r
+ spuStat&=~STAT_IRQ;\r
spuCtrl=val;\r
break;\r
//-------------------------------------------------//\r
rvb.CurrAddr=rvb.StartAddr;\r
}\r
}\r
+ rvb.dirty = 1;\r
break;\r
//-------------------------------------------------//\r
case H_SPUirqAddr:\r
spuIrq = val;\r
- pSpuIrq=spuMemC+((unsigned long) val<<3);\r
+ pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf);\r
break;\r
//-------------------------------------------------//\r
case H_SPUrvolL:\r
ReverbOn(16,24,val);\r
break;\r
//-------------------------------------------------//\r
- case H_Reverb+0:\r
-\r
- rvb.FB_SRC_A=val;\r
-\r
- // OK, here's the fake REVERB stuff...\r
- // depending on effect we do more or less delay and repeats... bah\r
- // still... better than nothing :)\r
-\r
- SetREVERB(val);\r
- break;\r
-\r
-\r
- case H_Reverb+2 : rvb.FB_SRC_B=(short)val; break;\r
+ case H_Reverb+0 : rvb.FB_SRC_A=val*4; break;\r
+ case H_Reverb+2 : rvb.FB_SRC_B=val*4; break;\r
case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break;\r
case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break;\r
case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break;\r
case H_Reverb+14 : rvb.IIR_COEF=(short)val; break;\r
case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break;\r
case H_Reverb+18 : rvb.FB_X=(short)val; break;\r
- case H_Reverb+20 : rvb.IIR_DEST_A0=(short)val; break;\r
- case H_Reverb+22 : rvb.IIR_DEST_A1=(short)val; break;\r
- case H_Reverb+24 : rvb.ACC_SRC_A0=(short)val; break;\r
- case H_Reverb+26 : rvb.ACC_SRC_A1=(short)val; break;\r
- case H_Reverb+28 : rvb.ACC_SRC_B0=(short)val; break;\r
- case H_Reverb+30 : rvb.ACC_SRC_B1=(short)val; break;\r
- case H_Reverb+32 : rvb.IIR_SRC_A0=(short)val; break;\r
- case H_Reverb+34 : rvb.IIR_SRC_A1=(short)val; break;\r
- case H_Reverb+36 : rvb.IIR_DEST_B0=(short)val; break;\r
- case H_Reverb+38 : rvb.IIR_DEST_B1=(short)val; break;\r
- case H_Reverb+40 : rvb.ACC_SRC_C0=(short)val; break;\r
- case H_Reverb+42 : rvb.ACC_SRC_C1=(short)val; break;\r
- case H_Reverb+44 : rvb.ACC_SRC_D0=(short)val; break;\r
- case H_Reverb+46 : rvb.ACC_SRC_D1=(short)val; break;\r
- case H_Reverb+48 : rvb.IIR_SRC_B1=(short)val; break;\r
- case H_Reverb+50 : rvb.IIR_SRC_B0=(short)val; break;\r
- case H_Reverb+52 : rvb.MIX_DEST_A0=(short)val; break;\r
- case H_Reverb+54 : rvb.MIX_DEST_A1=(short)val; break;\r
- case H_Reverb+56 : rvb.MIX_DEST_B0=(short)val; break;\r
- case H_Reverb+58 : rvb.MIX_DEST_B1=(short)val; break;\r
+ case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; break;\r
+ case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; break;\r
+ case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; break;\r
+ case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; break;\r
+ case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; break;\r
+ case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; break;\r
+ case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; break;\r
+ case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; break;\r
+ case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; break;\r
+ case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; break;\r
+ case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; break;\r
+ case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; break;\r
+ case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; break;\r
+ case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; break;\r
+ case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; break;\r
+ case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; break;\r
+ case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; break;\r
+ case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; break;\r
+ case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; break;\r
+ case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; break;\r
case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break;\r
case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break;\r
}\r
\r
+ if ((r & ~0x3f) == H_Reverb)\r
+ rvb.dirty = 1; // recalculate on next update\r
+\r
iSpuAsyncWait=0;\r
}\r
\r
case 14: // get loop address\r
{\r
const int ch=(r>>4)-0xc0;\r
- if(s_chan[ch].pLoop==NULL) return 0;\r
return (unsigned short)((s_chan[ch].pLoop-spuMemC)>>3);\r
}\r
}\r
else\r
{\r
s_chan[ch].bFMod=0; // --> turn off fmod\r
+ if(ch>0&&s_chan[ch-1].bFMod==2)\r
+ s_chan[ch-1].bFMod=0;\r
}\r
}\r
}\r