X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fregisters.c;h=bb64658d7f96f4a68ed426bebc8ad969f0046b3d;hp=7a49b1ca5fc2279fde1f1911d40d18105514dffd;hb=c2502333b2e56e520bb9ecc2f931a639eee415d7;hpb=de4a0279efefdd2e4595c8fc27f1564f4bff9341

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 7a49b1ca..bb64658d 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -145,17 +145,6 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       break;
     //-------------------------------------------------//
     case H_SPUReverbAddr:
-      if(val==0xFFFF || val<=0x200)
-       {rvb.StartAddr=rvb.CurrAddr=0;}
-      else
-       {
-        const long iv=(unsigned long)val<<2;
-        if(rvb.StartAddr!=iv)
-         {
-          rvb.StartAddr=(unsigned long)val<<2;
-          rvb.CurrAddr=rvb.StartAddr;
-         }
-       }
       goto rvbd;
     //-------------------------------------------------//
     case H_SPUirqAddr:
@@ -163,11 +152,11 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       goto upd_irq;
     //-------------------------------------------------//
     case H_SPUrvolL:
-      rvb.VolLeft=val;
+      spu.rvb->VolLeft=val;
       break;
     //-------------------------------------------------//
     case H_SPUrvolR:
-      rvb.VolRight=val;
+      spu.rvb->VolRight=val;
       break;
     //-------------------------------------------------//
 
@@ -246,38 +235,38 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       ReverbOn(16,24,val);
       break;
     //-------------------------------------------------//
-    case H_Reverb+0   : rvb.FB_SRC_A=val*4;         goto rvbd;
-    case H_Reverb+2   : rvb.FB_SRC_B=val*4;         goto rvbd;
-    case H_Reverb+4   : rvb.IIR_ALPHA=(short)val;   goto rvbd;
-    case H_Reverb+6   : rvb.ACC_COEF_A=(short)val;  goto rvbd;
-    case H_Reverb+8   : rvb.ACC_COEF_B=(short)val;  goto rvbd;
-    case H_Reverb+10  : rvb.ACC_COEF_C=(short)val;  goto rvbd;
-    case H_Reverb+12  : rvb.ACC_COEF_D=(short)val;  goto rvbd;
-    case H_Reverb+14  : rvb.IIR_COEF=(short)val;    goto rvbd;
-    case H_Reverb+16  : rvb.FB_ALPHA=(short)val;    goto rvbd;
-    case H_Reverb+18  : rvb.FB_X=(short)val;        goto rvbd;
-    case H_Reverb+20  : rvb.IIR_DEST_A0=val*4;      goto rvbd;
-    case H_Reverb+22  : rvb.IIR_DEST_A1=val*4;      goto rvbd;
-    case H_Reverb+24  : rvb.ACC_SRC_A0=val*4;       goto rvbd;
-    case H_Reverb+26  : rvb.ACC_SRC_A1=val*4;       goto rvbd;
-    case H_Reverb+28  : rvb.ACC_SRC_B0=val*4;       goto rvbd;
-    case H_Reverb+30  : rvb.ACC_SRC_B1=val*4;       goto rvbd;
-    case H_Reverb+32  : rvb.IIR_SRC_A0=val*4;       goto rvbd;
-    case H_Reverb+34  : rvb.IIR_SRC_A1=val*4;       goto rvbd;
-    case H_Reverb+36  : rvb.IIR_DEST_B0=val*4;      goto rvbd;
-    case H_Reverb+38  : rvb.IIR_DEST_B1=val*4;      goto rvbd;
-    case H_Reverb+40  : rvb.ACC_SRC_C0=val*4;       goto rvbd;
-    case H_Reverb+42  : rvb.ACC_SRC_C1=val*4;       goto rvbd;
-    case H_Reverb+44  : rvb.ACC_SRC_D0=val*4;       goto rvbd;
-    case H_Reverb+46  : rvb.ACC_SRC_D1=val*4;       goto rvbd;
-    case H_Reverb+48  : rvb.IIR_SRC_B1=val*4;       goto rvbd;
-    case H_Reverb+50  : rvb.IIR_SRC_B0=val*4;       goto rvbd;
-    case H_Reverb+52  : rvb.MIX_DEST_A0=val*4;      goto rvbd;
-    case H_Reverb+54  : rvb.MIX_DEST_A1=val*4;      goto rvbd;
-    case H_Reverb+56  : rvb.MIX_DEST_B0=val*4;      goto rvbd;
-    case H_Reverb+58  : rvb.MIX_DEST_B1=val*4;      goto rvbd;
-    case H_Reverb+60  : rvb.IN_COEF_L=(short)val;   goto rvbd;
-    case H_Reverb+62  : rvb.IN_COEF_R=(short)val;   goto rvbd;
+    case H_Reverb+0   : goto rvbd;
+    case H_Reverb+2   : goto rvbd;
+    case H_Reverb+4   : spu.rvb->IIR_ALPHA=(short)val;   break;
+    case H_Reverb+6   : spu.rvb->ACC_COEF_A=(short)val;  break;
+    case H_Reverb+8   : spu.rvb->ACC_COEF_B=(short)val;  break;
+    case H_Reverb+10  : spu.rvb->ACC_COEF_C=(short)val;  break;
+    case H_Reverb+12  : spu.rvb->ACC_COEF_D=(short)val;  break;
+    case H_Reverb+14  : spu.rvb->IIR_COEF=(short)val;    break;
+    case H_Reverb+16  : spu.rvb->FB_ALPHA=(short)val;    break;
+    case H_Reverb+18  : spu.rvb->FB_X=(short)val;        break;
+    case H_Reverb+20  : goto rvbd;
+    case H_Reverb+22  : goto rvbd;
+    case H_Reverb+24  : goto rvbd;
+    case H_Reverb+26  : goto rvbd;
+    case H_Reverb+28  : goto rvbd;
+    case H_Reverb+30  : goto rvbd;
+    case H_Reverb+32  : goto rvbd;
+    case H_Reverb+34  : goto rvbd;
+    case H_Reverb+36  : goto rvbd;
+    case H_Reverb+38  : goto rvbd;
+    case H_Reverb+40  : goto rvbd;
+    case H_Reverb+42  : goto rvbd;
+    case H_Reverb+44  : goto rvbd;
+    case H_Reverb+46  : goto rvbd;
+    case H_Reverb+48  : goto rvbd;
+    case H_Reverb+50  : goto rvbd;
+    case H_Reverb+52  : goto rvbd;
+    case H_Reverb+54  : goto rvbd;
+    case H_Reverb+56  : goto rvbd;
+    case H_Reverb+58  : goto rvbd;
+    case H_Reverb+60  : spu.rvb->IN_COEF_L=(short)val;   break;
+    case H_Reverb+62  : spu.rvb->IN_COEF_R=(short)val;   break;
    }
  return;
 
@@ -287,7 +276,7 @@ upd_irq:
  return;
 
 rvbd:
- rvb.dirty = 1; // recalculate on next update
+ spu.rvb->dirty = 1; // recalculate on next update
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -363,7 +352,7 @@ static void SoundOn(int start,int end,unsigned short val)
    if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!
     {
      spu.s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
-     spu.s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);
+     if (spu_config.idiablofix == 0) spu.s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);
      spu.dwNewChannel|=(1<<ch);
     }
   }