notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add some missing license headers
[pcsx_rearmed.git] / plugins / dfsound / registers.c
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 210adb2..bb64658 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -57,7 +57,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
  if (val == 0 && (r & 0xff8) == 0xd88)\r
   return;\r
 \r
- do_samples_if_needed(cycles);\r
+ do_samples_if_needed(cycles, 0);\r
 \r
  if(r>=0x0c00 && r<0x0d80)                             // some channel info?\r
   {\r
@@ -85,10 +85,10 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
        {\r
         const unsigned long lval=val;\r
         //---------------------------------------------//\r
-        s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; \r
-        s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;\r
-        s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;\r
-        s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;\r
+        spu.s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0;\r
+        spu.s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;\r
+        spu.s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;\r
+        spu.s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;\r
         //---------------------------------------------//\r
        }\r
       break;\r
@@ -98,11 +98,11 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
        const unsigned long lval=val;\r
 \r
        //----------------------------------------------//\r
-       s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;\r
-       s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;\r
-       s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;\r
-       s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;\r
-       s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;\r
+       spu.s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;\r
+       spu.s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;\r
+       spu.s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;\r
+       spu.s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;\r
+       spu.s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;\r
        //----------------------------------------------//\r
       }\r
      break;\r
@@ -111,7 +111,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
        break;\r
      //------------------------------------------------//\r
      case 14:                                          // loop?\r
-       s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);\r
+       spu.s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);\r
        goto upd_irq;\r
      //------------------------------------------------//\r
     }\r
@@ -126,9 +126,9 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       break;\r
     //-------------------------------------------------//\r
     case H_SPUdata:\r
-      spu.spuMem[spu.spuAddr>>1] = val;\r
-      spu.spuAddr+=2;\r
-      if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
+      *(unsigned short *)(spu.spuMemC + spu.spuAddr) = val;\r
+      spu.spuAddr += 2;\r
+      spu.spuAddr &= 0x7fffe;\r
       break;\r
     //-------------------------------------------------//\r
     case H_SPUctrl:\r
@@ -145,17 +145,6 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       break;\r
     //-------------------------------------------------//\r
     case H_SPUReverbAddr:\r
-      if(val==0xFFFF || val<=0x200)\r
-       {rvb.StartAddr=rvb.CurrAddr=0;}\r
-      else\r
-       {\r
-        const long iv=(unsigned long)val<<2;\r
-        if(rvb.StartAddr!=iv)\r
-         {\r
-          rvb.StartAddr=(unsigned long)val<<2;\r
-          rvb.CurrAddr=rvb.StartAddr;\r
-         }\r
-       }\r
       goto rvbd;\r
     //-------------------------------------------------//\r
     case H_SPUirqAddr:\r
@@ -163,11 +152,11 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       goto upd_irq;\r
     //-------------------------------------------------//\r
     case H_SPUrvolL:\r
-      rvb.VolLeft=val;\r
+      spu.rvb->VolLeft=val;\r
       break;\r
     //-------------------------------------------------//\r
     case H_SPUrvolR:\r
-      rvb.VolRight=val;\r
+      spu.rvb->VolRight=val;\r
       break;\r
     //-------------------------------------------------//\r
 \r
@@ -246,38 +235,38 @@ 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;         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
+    case H_Reverb+0   : goto rvbd;\r
+    case H_Reverb+2   : goto rvbd;\r
+    case H_Reverb+4   : spu.rvb->IIR_ALPHA=(short)val;   break;\r
+    case H_Reverb+6   : spu.rvb->ACC_COEF_A=(short)val;  break;\r
+    case H_Reverb+8   : spu.rvb->ACC_COEF_B=(short)val;  break;\r
+    case H_Reverb+10  : spu.rvb->ACC_COEF_C=(short)val;  break;\r
+    case H_Reverb+12  : spu.rvb->ACC_COEF_D=(short)val;  break;\r
+    case H_Reverb+14  : spu.rvb->IIR_COEF=(short)val;    break;\r
+    case H_Reverb+16  : spu.rvb->FB_ALPHA=(short)val;    break;\r
+    case H_Reverb+18  : spu.rvb->FB_X=(short)val;        break;\r
+    case H_Reverb+20  : goto rvbd;\r
+    case H_Reverb+22  : goto rvbd;\r
+    case H_Reverb+24  : goto rvbd;\r
+    case H_Reverb+26  : goto rvbd;\r
+    case H_Reverb+28  : goto rvbd;\r
+    case H_Reverb+30  : goto rvbd;\r
+    case H_Reverb+32  : goto rvbd;\r
+    case H_Reverb+34  : goto rvbd;\r
+    case H_Reverb+36  : goto rvbd;\r
+    case H_Reverb+38  : goto rvbd;\r
+    case H_Reverb+40  : goto rvbd;\r
+    case H_Reverb+42  : goto rvbd;\r
+    case H_Reverb+44  : goto rvbd;\r
+    case H_Reverb+46  : goto rvbd;\r
+    case H_Reverb+48  : goto rvbd;\r
+    case H_Reverb+50  : goto rvbd;\r
+    case H_Reverb+52  : goto rvbd;\r
+    case H_Reverb+54  : goto rvbd;\r
+    case H_Reverb+56  : goto rvbd;\r
+    case H_Reverb+58  : goto rvbd;\r
+    case H_Reverb+60  : spu.rvb->IN_COEF_L=(short)val;   break;\r
+    case H_Reverb+62  : spu.rvb->IN_COEF_R=(short)val;   break;\r
    }\r
  return;\r
 \r
@@ -287,7 +276,7 @@ upd_irq:
  return;\r
 \r
 rvbd:\r
- rvb.dirty = 1; // recalculate on next update\r
+ spu.rvb->dirty = 1; // recalculate on next update\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -307,15 +296,15 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
        const int ch=(r>>4)-0xc0;\r
        if(spu.dwNewChannel&(1<<ch)) return 1;          // we are started, but not processed? return 1\r
        if((spu.dwChannelOn&(1<<ch)) &&                 // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well\r
-          !s_chan[ch].ADSRX.EnvelopeVol)\r
+          !spu.s_chan[ch].ADSRX.EnvelopeVol)\r
         return 1;\r
-       return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);\r
+       return (unsigned short)(spu.s_chan[ch].ADSRX.EnvelopeVol>>16);\r
       }\r
 \r
      case 14:                                          // get loop address\r
       {\r
        const int ch=(r>>4)-0xc0;\r
-       return (unsigned short)((s_chan[ch].pLoop-spu.spuMemC)>>3);\r
+       return (unsigned short)((spu.s_chan[ch].pLoop-spu.spuMemC)>>3);\r
       }\r
     }\r
   }\r
@@ -333,9 +322,9 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
 \r
     case H_SPUdata:\r
      {\r
-      unsigned short s=spu.spuMem[spu.spuAddr>>1];\r
-      spu.spuAddr+=2;\r
-      if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
+      unsigned short s = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
+      spu.spuAddr += 2;\r
+      spu.spuAddr &= 0x7fffe;\r
       return s;\r
      }\r
 \r
@@ -362,16 +351,9 @@ static void SoundOn(int start,int end,unsigned short val)
   {\r
    if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!\r
     {\r
-     // do this here, not in StartSound\r
-     // - fixes fussy timing issues\r
-     s_chan[ch].bStop=0;\r
-     s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
-     s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
-     s_chan[ch].prevflags=2;\r
-\r
+     spu.s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
+     if (spu_config.idiablofix == 0) spu.s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
      spu.dwNewChannel|=(1<<ch);\r
-     spu.dwChannelOn|=1<<ch;\r
-     spu.dwChannelDead&=~(1<<ch);\r
     }\r
   }\r
 }\r
@@ -385,9 +367,9 @@ static void SoundOff(int start,int end,unsigned short val)
  int ch;\r
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels\r
   {\r
-   if(val&1)                                           // && s_chan[i].bOn)  mmm...\r
+   if(val&1)\r
     {\r
-     s_chan[ch].bStop=1;\r
+     spu.s_chan[ch].ADSRX.State = ADSR_RELEASE;\r
 \r
      // Jungle Book - Rhythm 'n Groove\r
      // - turns off buzzing sound (loop hangs)\r
@@ -410,15 +392,15 @@ static void FModOn(int start,int end,unsigned short val)
     {\r
      if(ch>0) \r
       {\r
-       s_chan[ch].bFMod=1;                             // --> sound channel\r
-       s_chan[ch-1].bFMod=2;                           // --> freq channel\r
+       spu.s_chan[ch].bFMod=1;                         // --> sound channel\r
+       spu.s_chan[ch-1].bFMod=2;                       // --> freq channel\r
       }\r
     }\r
    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
+     spu.s_chan[ch].bFMod=0;                           // --> turn off fmod\r
+     if(ch>0&&spu.s_chan[ch-1].bFMod==2)\r
+      spu.s_chan[ch-1].bFMod=0;\r
     }\r
   }\r
 }\r
@@ -433,7 +415,7 @@ static void NoiseOn(int start,int end,unsigned short val)
 \r
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels\r
   {\r
-   s_chan[ch].bNoise=val&1;                            // -> noise on/off\r
+   spu.s_chan[ch].bNoise=val&1;                        // -> noise on/off\r
   }\r
 }\r
 \r
@@ -463,7 +445,7 @@ static void SetVolumeL(unsigned char ch,short vol)     // LEFT VOLUME
   }\r
 \r
  vol&=0x3fff;\r
- s_chan[ch].iLeftVolume=vol;                           // store volume\r
+ spu.s_chan[ch].iLeftVolume=vol;                       // store volume\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -489,7 +471,7 @@ static void SetVolumeR(unsigned char ch,short vol)     // RIGHT VOLUME
 \r
  vol&=0x3fff;\r
 \r
- s_chan[ch].iRightVolume=vol;\r
+ spu.s_chan[ch].iRightVolume=vol;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -502,10 +484,11 @@ static void SetPitch(int ch,unsigned short val)               // SET PITCH
  if(val>0x3fff) NP=0x3fff;                             // get pitch val\r
  else           NP=val;\r
 \r
- s_chan[ch].iRawPitch=NP;\r
- s_chan[ch].sinc=(NP<<4)|8;\r
- s_chan[ch].sinc_inv=0;\r
- if(spu_config.iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag\r
+ spu.s_chan[ch].iRawPitch=NP;\r
+ spu.s_chan[ch].sinc=(NP<<4)|8;\r
+ spu.s_chan[ch].sinc_inv=0;\r
+ if (spu_config.iUseInterpolation == 1)\r
+  spu.SB[ch * SB_SIZE + 32] = 1; // -> freq change in simple interpolation mode: set flag\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -518,6 +501,6 @@ static void ReverbOn(int start,int end,unsigned short val)
 \r
  for(ch=start;ch<end;ch++,val>>=1)                     // loop channels\r
   {\r
-   s_chan[ch].bReverb=val&1;                           // -> reverb on/off\r
+   spu.s_chan[ch].bReverb=val&1;                       // -> reverb on/off\r
   }\r
 }\r
ARM optimized PCSX fork