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

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 7a49b1ca..6b62247f 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -112,6 +112,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
      //------------------------------------------------//
      case 14:                                          // loop?
        spu.s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);
+       spu.s_chan[ch].bIgnoreLoop = 1;
        goto upd_irq;
      //------------------------------------------------//
     }
@@ -145,17 +146,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 +153,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;
     //-------------------------------------------------//
 
@@ -214,12 +204,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       break;
     //-------------------------------------------------//
     case H_CDLeft:
-      spu.iLeftXAVol=val  & 0x7fff;
-      if(spu.cddavCallback) spu.cddavCallback(0,val);
+      spu.iLeftXAVol=(int16_t)val;
+      if(spu.cddavCallback) spu.cddavCallback(0,(int16_t)val);
       break;
     case H_CDRight:
-      spu.iRightXAVol=val & 0x7fff;
-      if(spu.cddavCallback) spu.cddavCallback(1,val);
+      spu.iRightXAVol=(int16_t)val;
+      if(spu.cddavCallback) spu.cddavCallback(1,(int16_t)val);
       break;
     //-------------------------------------------------//
     case H_FMod1:
@@ -246,38 +236,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 +277,7 @@ upd_irq:
  return;
 
 rvbd:
- rvb.dirty = 1; // recalculate on next update
+ spu.rvb->dirty = 1; // recalculate on next update
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -306,7 +296,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
       {
        const int ch=(r>>4)-0xc0;
        if(spu.dwNewChannel&(1<<ch)) return 1;          // we are started, but not processed? return 1
-       if((spu.dwChannelOn&(1<<ch)) &&                 // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+       if((spu.dwChannelsAudible&(1<<ch)) &&           // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
           !spu.s_chan[ch].ADSRX.EnvelopeVol)
         return 1;
        return (unsigned short)(spu.s_chan[ch].ADSRX.EnvelopeVol>>16);
@@ -326,7 +316,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      return spu.spuCtrl;
 
     case H_SPUstat:
-     return spu.spuStat;
+     return (spu.spuStat & ~0x3F) | (spu.spuCtrl & 0x3F);
         
     case H_SPUaddr:
      return (unsigned short)(spu.spuAddr>>3);
@@ -360,10 +350,9 @@ static void SoundOn(int start,int end,unsigned short val)
 
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels
   {
-   if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!
+   if((val&1) && regAreaGetCh(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);
+     spu.s_chan[ch].bIgnoreLoop = 0;
      spu.dwNewChannel|=(1<<ch);
     }
   }
@@ -495,11 +484,14 @@ static void SetPitch(int ch,unsigned short val)               // SET PITCH
  if(val>0x3fff) NP=0x3fff;                             // get pitch val
  else           NP=val;
 
- spu.s_chan[ch].iRawPitch=NP;
- spu.s_chan[ch].sinc=(NP<<4)|8;
- spu.s_chan[ch].sinc_inv=0;
- if (spu_config.iUseInterpolation == 1)
-  spu.SB[ch * SB_SIZE + 32] = 1; // -> freq change in simple interpolation mode: set flag
+ spu.s_chan[ch].iRawPitch = NP;
+ spu.s_chan[ch].sinc = NP << 4;
+ spu.s_chan[ch].sinc_inv = 0;
+ spu.SB[ch * SB_SIZE + 32] = 1; // -> freq change in simple interpolation mode: set flag
+ if (val)
+  spu.dwChannelsAudible |= 1u << ch;
+ else
+  spu.dwChannelsAudible &= ~(1u << ch);
 }
 
 ////////////////////////////////////////////////////////////////////////