notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gpu_neon: do list resubmit detection
[pcsx_rearmed.git] / plugins / dfsound / registers.c
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index c790525..83b9e43 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -22,7 +22,6 @@
 #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
@@ -191,6 +190,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
@@ -210,11 +211,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
           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
@@ -301,19 +303,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
       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
@@ -322,30 +313,33 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
     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
@@ -376,7 +370,6 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      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
@@ -481,6 +474,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
ARM optimized PCSX fork