notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
spu: remove some hacks
[pcsx_rearmed.git] / plugins / dfsound / registers.c
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index b9c1256..20a7c14 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -35,10 +35,28 @@ static void ReverbOn(int start,int end,unsigned short val);
 // WRITE REGISTERS: called by main emu\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)\r
+static const uint32_t ignore_dupe[8] = {\r
+ // ch 0-15  c40         c80         cc0\r
+ 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f,\r
+ // ch 16-24 d40         control     reverb\r
+ 0x7f7f7f7f, 0x7f7f7f7f, 0xff05ff0f, 0xffffffff\r
+};\r
+\r
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,\r
+ unsigned int cycles)\r
 {\r
- const unsigned long r=reg&0xfff;\r
- regArea[(r-0xc00)>>1] = val;\r
+ int r = reg & 0xfff;\r
+ int rofs = (r - 0xc00) >> 1;\r
+ int changed = regArea[rofs] != val;\r
+ regArea[rofs] = val;\r
+\r
+ if (!changed && (ignore_dupe[rofs >> 5] & (1 << (rofs & 0x1f))))\r
+  return;\r
+ // zero keyon/keyoff?\r
+ if (val == 0 && (r & 0xff8) == 0xd88)\r
+  return;\r
+\r
+ do_samples_if_needed(cycles);\r
 \r
  if(r>=0x0c00 && r<0x0d80)                             // some channel info?\r
   {\r
@@ -56,7 +74,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
      //------------------------------------------------// pitch\r
      case 4:                                           \r
        SetPitch(ch,val);\r
-       break;\r
+       goto upd_irq;\r
      //------------------------------------------------// start\r
      case 6:      \r
        // taken from regArea later\r
@@ -93,7 +111,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
      //------------------------------------------------//\r
      case 14:                                          // loop?\r
        s_chan[ch].pLoop=spuMemC+((val&~1)<<3);\r
-       break;\r
+       goto upd_irq;\r
      //------------------------------------------------//\r
     }\r
    return;\r
@@ -113,8 +131,11 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
       break;\r
     //-------------------------------------------------//\r
     case H_SPUctrl:\r
-      if(!(spuCtrl & CTRL_IRQ))\r
+      if (!(spuCtrl & CTRL_IRQ)) {\r
         spuStat&=~STAT_IRQ;\r
+        if (val & CTRL_IRQ)\r
+         schedule_next_irq();\r
+      }\r
       spuCtrl=val;\r
       break;\r
     //-------------------------------------------------//\r
@@ -132,18 +153,14 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
          {\r
           rvb.StartAddr=(unsigned long)val<<2;\r
           rvb.CurrAddr=rvb.StartAddr;\r
-          // sync-with-decode-buffers hack..\r
-          if(rvb.StartAddr==0x3ff00)\r
-            rvb.CurrAddr+=decode_pos/2;\r
          }\r
        }\r
-      rvb.dirty = 1;\r
-      break;\r
+      goto rvbd;\r
     //-------------------------------------------------//\r
     case H_SPUirqAddr:\r
       spuIrq = val;\r
       pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf);\r
-      break;\r
+      goto upd_irq;\r
     //-------------------------------------------------//\r
     case H_SPUrvolL:\r
       rvb.VolLeft=val;\r
@@ -229,42 +246,48 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
       ReverbOn(16,24,val);\r
       break;\r
     //-------------------------------------------------//\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+10  : rvb.ACC_COEF_C=(short)val;     break;\r
-    case H_Reverb+12  : rvb.ACC_COEF_D=(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=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
+    case H_Reverb+0   : rvb.FB_SRC_A=val*4;         goto rvbd;\r
+    case H_Reverb+2   : rvb.FB_SRC_B=val*4;         goto rvbd;\r
+    case H_Reverb+4   : rvb.IIR_ALPHA=(short)val;   goto rvbd;\r
+    case H_Reverb+6   : rvb.ACC_COEF_A=(short)val;  goto rvbd;\r
+    case H_Reverb+8   : rvb.ACC_COEF_B=(short)val;  goto rvbd;\r
+    case H_Reverb+10  : rvb.ACC_COEF_C=(short)val;  goto rvbd;\r
+    case H_Reverb+12  : rvb.ACC_COEF_D=(short)val;  goto rvbd;\r
+    case H_Reverb+14  : rvb.IIR_COEF=(short)val;    goto rvbd;\r
+    case H_Reverb+16  : rvb.FB_ALPHA=(short)val;    goto rvbd;\r
+    case H_Reverb+18  : rvb.FB_X=(short)val;        goto rvbd;\r
+    case H_Reverb+20  : rvb.IIR_DEST_A0=val*4;      goto rvbd;\r
+    case H_Reverb+22  : rvb.IIR_DEST_A1=val*4;      goto rvbd;\r
+    case H_Reverb+24  : rvb.ACC_SRC_A0=val*4;       goto rvbd;\r
+    case H_Reverb+26  : rvb.ACC_SRC_A1=val*4;       goto rvbd;\r
+    case H_Reverb+28  : rvb.ACC_SRC_B0=val*4;       goto rvbd;\r
+    case H_Reverb+30  : rvb.ACC_SRC_B1=val*4;       goto rvbd;\r
+    case H_Reverb+32  : rvb.IIR_SRC_A0=val*4;       goto rvbd;\r
+    case H_Reverb+34  : rvb.IIR_SRC_A1=val*4;       goto rvbd;\r
+    case H_Reverb+36  : rvb.IIR_DEST_B0=val*4;      goto rvbd;\r
+    case H_Reverb+38  : rvb.IIR_DEST_B1=val*4;      goto rvbd;\r
+    case H_Reverb+40  : rvb.ACC_SRC_C0=val*4;       goto rvbd;\r
+    case H_Reverb+42  : rvb.ACC_SRC_C1=val*4;       goto rvbd;\r
+    case H_Reverb+44  : rvb.ACC_SRC_D0=val*4;       goto rvbd;\r
+    case H_Reverb+46  : rvb.ACC_SRC_D1=val*4;       goto rvbd;\r
+    case H_Reverb+48  : rvb.IIR_SRC_B1=val*4;       goto rvbd;\r
+    case H_Reverb+50  : rvb.IIR_SRC_B0=val*4;       goto rvbd;\r
+    case H_Reverb+52  : rvb.MIX_DEST_A0=val*4;      goto rvbd;\r
+    case H_Reverb+54  : rvb.MIX_DEST_A1=val*4;      goto rvbd;\r
+    case H_Reverb+56  : rvb.MIX_DEST_B0=val*4;      goto rvbd;\r
+    case H_Reverb+58  : rvb.MIX_DEST_B1=val*4;      goto rvbd;\r
+    case H_Reverb+60  : rvb.IN_COEF_L=(short)val;   goto rvbd;\r
+    case H_Reverb+62  : rvb.IN_COEF_R=(short)val;   goto rvbd;\r
    }\r
+ return;\r
+\r
+upd_irq:\r
+ if (spuCtrl & CTRL_IRQ)\r
+  schedule_next_irq();\r
+ return;\r
 \r
- if ((r & ~0x3f) == H_Reverb)\r
-  rvb.dirty = 1; // recalculate on next update\r
+rvbd:\r
+ rvb.dirty = 1; // recalculate on next update\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -484,6 +507,7 @@ static void SetPitch(int ch,unsigned short val)               // SET PITCH
 \r
  s_chan[ch].iRawPitch=NP;\r
  s_chan[ch].sinc=(NP<<4)|8;\r
+ s_chan[ch].sinc_inv=0;\r
  if(iUseInterpolation==1) s_chan[ch].SB[32]=1;         // -> freq change in simple interpolation mode: set flag\r
 }\r
 \r
ARM optimized PCSX fork