spu: parametrize sample generation, interpolation

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

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index c36c27e..87f7558 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -191,6 +191,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
       break;\r
     //-------------------------------------------------//\r
     case H_SPUctrl:\r
+      if(!(spuCtrl & CTRL_IRQ))\r
+        spuStat&=~STAT_IRQ;\r
       spuCtrl=val;\r
       break;\r
     //-------------------------------------------------//\r
@@ -214,7 +216,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
     //-------------------------------------------------//\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
@@ -480,6 +482,8 @@ void FModOn(int start,int end,unsigned short val)      // FMOD ON PSX COMMAND
    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