X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fregisters.c;fp=plugins%2Fdfsound%2Fregisters.c;h=4588fa7c29f518c881d31f5e7d36c7e8028f91a6;hp=7a49b1ca5fc2279fde1f1911d40d18105514dffd;hb=05c7cec77522f04857f655474574469a5e66661d;hpb=09159d99cd07a084d8643f87c6c23e86c79060ff

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 7a49b1ca..4588fa7c 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -146,14 +146,14 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
     //-------------------------------------------------//
     case H_SPUReverbAddr:
       if(val==0xFFFF || val<=0x200)
-       {rvb.StartAddr=rvb.CurrAddr=0;}
+       {spu.rvb->StartAddr=spu.rvb->CurrAddr=0;}
       else
        {
         const long iv=(unsigned long)val<<2;
-        if(rvb.StartAddr!=iv)
+        if(spu.rvb->StartAddr!=iv)
          {
-          rvb.StartAddr=(unsigned long)val<<2;
-          rvb.CurrAddr=rvb.StartAddr;
+          spu.rvb->StartAddr=(unsigned long)val<<2;
+          spu.rvb->CurrAddr=spu.rvb->StartAddr;
          }
        }
       goto rvbd;
@@ -163,11 +163,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 +246,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   : spu.rvb->FB_SRC_A=val*4;         goto rvbd;
+    case H_Reverb+2   : spu.rvb->FB_SRC_B=val*4;         goto rvbd;
+    case H_Reverb+4   : spu.rvb->IIR_ALPHA=(short)val;   goto rvbd;
+    case H_Reverb+6   : spu.rvb->ACC_COEF_A=(short)val;  goto rvbd;
+    case H_Reverb+8   : spu.rvb->ACC_COEF_B=(short)val;  goto rvbd;
+    case H_Reverb+10  : spu.rvb->ACC_COEF_C=(short)val;  goto rvbd;
+    case H_Reverb+12  : spu.rvb->ACC_COEF_D=(short)val;  goto rvbd;
+    case H_Reverb+14  : spu.rvb->IIR_COEF=(short)val;    goto rvbd;
+    case H_Reverb+16  : spu.rvb->FB_ALPHA=(short)val;    goto rvbd;
+    case H_Reverb+18  : spu.rvb->FB_X=(short)val;        goto rvbd;
+    case H_Reverb+20  : spu.rvb->IIR_DEST_A0=val*4;      goto rvbd;
+    case H_Reverb+22  : spu.rvb->IIR_DEST_A1=val*4;      goto rvbd;
+    case H_Reverb+24  : spu.rvb->ACC_SRC_A0=val*4;       goto rvbd;
+    case H_Reverb+26  : spu.rvb->ACC_SRC_A1=val*4;       goto rvbd;
+    case H_Reverb+28  : spu.rvb->ACC_SRC_B0=val*4;       goto rvbd;
+    case H_Reverb+30  : spu.rvb->ACC_SRC_B1=val*4;       goto rvbd;
+    case H_Reverb+32  : spu.rvb->IIR_SRC_A0=val*4;       goto rvbd;
+    case H_Reverb+34  : spu.rvb->IIR_SRC_A1=val*4;       goto rvbd;
+    case H_Reverb+36  : spu.rvb->IIR_DEST_B0=val*4;      goto rvbd;
+    case H_Reverb+38  : spu.rvb->IIR_DEST_B1=val*4;      goto rvbd;
+    case H_Reverb+40  : spu.rvb->ACC_SRC_C0=val*4;       goto rvbd;
+    case H_Reverb+42  : spu.rvb->ACC_SRC_C1=val*4;       goto rvbd;
+    case H_Reverb+44  : spu.rvb->ACC_SRC_D0=val*4;       goto rvbd;
+    case H_Reverb+46  : spu.rvb->ACC_SRC_D1=val*4;       goto rvbd;
+    case H_Reverb+48  : spu.rvb->IIR_SRC_B1=val*4;       goto rvbd;
+    case H_Reverb+50  : spu.rvb->IIR_SRC_B0=val*4;       goto rvbd;
+    case H_Reverb+52  : spu.rvb->MIX_DEST_A0=val*4;      goto rvbd;
+    case H_Reverb+54  : spu.rvb->MIX_DEST_A1=val*4;      goto rvbd;
+    case H_Reverb+56  : spu.rvb->MIX_DEST_B0=val*4;      goto rvbd;
+    case H_Reverb+58  : spu.rvb->MIX_DEST_B1=val*4;      goto rvbd;
+    case H_Reverb+60  : spu.rvb->IN_COEF_L=(short)val;   goto rvbd;
+    case H_Reverb+62  : spu.rvb->IN_COEF_R=(short)val;   goto rvbd;
    }
  return;
 
@@ -287,7 +287,7 @@ upd_irq:
  return;
 
 rvbd:
- rvb.dirty = 1; // recalculate on next update
+ spu.rvb->dirty = 1; // recalculate on next update
 }
 
 ////////////////////////////////////////////////////////////////////////