spu: avoid NULL pSpuIrq
[pcsx_rearmed.git] / plugins / dfsound / spu.c
index 0f952fb..2c13ca1 100644 (file)
@@ -4,6 +4,9 @@
     begin                : Wed May 15 2002
     copyright            : (C) 2002 by Pete Bernert
     email                : BlackDove@addcom.de
+
+ Portions (C) GraÅžvydas "notaz" Ignotas, 2010-2012
+
  ***************************************************************************/
 /***************************************************************************
  *                                                                         *
 #define _IN_SPU
 
 #include "externals.h"
-#include "cfg.h"
-#include "dsoundoss.h"
-#include "regs.h"
+#include "registers.h"
+#include "out.h"
+#include "arm_features.h"
+#include "spu_config.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #define N_(x) (x)
 #endif
 
+#ifdef __ARM_ARCH_7A__
+ #define ssat32_to_16(v) \
+  asm("ssat %0,#16,%1" : "=r" (v) : "r" (v))
+#else
+ #define ssat32_to_16(v) do { \
+  if (v < -32768) v = -32768; \
+  else if (v > 32767) v = 32767; \
+ } while (0)
+#endif
+
+#define PSXCLK 33868800        /* 33.8688 MHz */
+
+// intended to be ~1 frame
+#define IRQ_NEAR_BLOCKS 32
+
 /*
 #if defined (USEMACOSX)
 static char * libraryName     = N_("Mac OS X Sound");
@@ -54,51 +73,14 @@ static char * libraryInfo     = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete B
 
 // globals
 
-// psx buffer / addresses
-
-unsigned short  regArea[10000];
-unsigned short  spuMem[256*1024];
-unsigned char * spuMemC;
-unsigned char * pSpuIrq=0;
-unsigned char * pSpuBuffer;
-unsigned char * pMixIrq=0;
-
-// user settings
-
-int             iVolume=3;
-int             iXAPitch=1;
-int             iUseTimer=2;
-int             iSPUIRQWait=1;
-int             iDebugMode=0;
-int             iRecordMode=0;
-int             iUseReverb=2;
-int             iUseInterpolation=2;
+SPUInfo         spu;
+SPUConfig       spu_config;
 
 // MAIN infos struct for each channel
 
 SPUCHAN         s_chan[MAXCHAN+1];                     // channel + 1 infos (1 is security for fmod handling)
 REVERBInfo      rvb;
 
-unsigned long   dwNoiseVal=1;                          // global noise generator
-int             iSpuAsyncWait=0;
-
-unsigned short  spuCtrl=0;                             // some vars to store psx reg infos
-unsigned short  spuStat=0;
-unsigned short  spuIrq=0;
-unsigned long   spuAddr=0xffffffff;                    // address into spu mem
-int             bEndThread=0;                          // thread handlers
-int             bThreadEnded=0;
-int             bSpuInit=0;
-int             bSPUIsOpen=0;
-
-static pthread_t thread = (pthread_t)-1;               // thread id (linux)
-
-unsigned long dwNewChannel=0;                          // flags for faster testing, if new channel starts
-unsigned long dwChannelOn=0;
-
-void (CALLBACK *irqCallback)(void)=0;                  // func of main emu, called on spu irq
-void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0;
-
 // certain globals (were local before, but with the new timeproc I need em global)
 
 static const int f[8][2] = {   {    0,  0  },
@@ -106,14 +88,11 @@ static const int f[8][2] = {   {    0,  0  },
                         {  115, -52 },
                         {   98, -55 },
                         {  122, -60 } };
+int ChanBuf[NSSIZE];
 int SSumLR[NSSIZE*2];
 int iFMod[NSSIZE];
-int iCycle = 0;
-short * pS;
 
-int lastch=-1;             // last channel processed on spu irq in timer mode
-static int lastns=0;       // last ns pos
-static int iSecureStart=0; // secure start counter
+#define CDDA_BUFFER_SIZE (16384 * sizeof(uint32_t)) // must be power of 2
 
 ////////////////////////////////////////////////////////////////////////
 // CODE AREA
@@ -203,9 +182,10 @@ INLINE void InterpolateUp(int ch)
    s_chan[ch].SB[32]=0;
 
    s_chan[ch].SB[28]=(s_chan[ch].SB[28]*s_chan[ch].sinc)/0x20000L;
-   if(s_chan[ch].sinc<=0x8000)
-        s_chan[ch].SB[29]=s_chan[ch].SB[30]-(s_chan[ch].SB[28]*((0x10000/s_chan[ch].sinc)-1));
-   else s_chan[ch].SB[29]+=s_chan[ch].SB[28];
+   //if(s_chan[ch].sinc<=0x8000)
+   //     s_chan[ch].SB[29]=s_chan[ch].SB[30]-(s_chan[ch].SB[28]*((0x10000/s_chan[ch].sinc)-1));
+   //else
+   s_chan[ch].SB[29]+=s_chan[ch].SB[28];
   }
  else                                                  // no flags? add bigger val (if possible), calc smaller step, set flag1
   s_chan[ch].SB[29]+=s_chan[ch].SB[28];
@@ -228,8 +208,8 @@ INLINE void InterpolateDown(int ch)
 ////////////////////////////////////////////////////////////////////////
 // helpers for gauss interpolation
 
-#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos])
-#define gval(x) (((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3])
+#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos&3])
+#define gval(x) ((int)((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3])
 
 #include "gauss_i.h"
 
@@ -237,6 +217,26 @@ INLINE void InterpolateDown(int ch)
 
 #include "xa.c"
 
+static void do_irq(void)
+{
+ //if(!(spu.spuStat & STAT_IRQ))
+ {
+  spu.spuStat |= STAT_IRQ;                             // asserted status?
+  if(spu.irqCallback) spu.irqCallback();
+ }
+}
+
+static int check_irq(int ch, unsigned char *pos)
+{
+ if((spu.spuCtrl & CTRL_IRQ) && pos == spu.pSpuIrq)
+ {
+  //printf("ch%d irq %04x\n", ch, pos - spu.spuMemC);
+  do_irq();
+  return 1;
+ }
+ return 0;
+}
+
 ////////////////////////////////////////////////////////////////////////
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
@@ -251,82 +251,41 @@ INLINE void StartSound(int ch)
  //s_chan[ch].bStop=0;
  //s_chan[ch].bOn=1;
 
- s_chan[ch].s_1=0;                                     // init mixing vars
- s_chan[ch].s_2=0;
+ s_chan[ch].SB[26]=0;                                  // init mixing vars
+ s_chan[ch].SB[27]=0;
  s_chan[ch].iSBPos=28;
 
  s_chan[ch].SB[29]=0;                                  // init our interpolation helpers
  s_chan[ch].SB[30]=0;
 
- if(iUseInterpolation>=2)                              // gauss interpolation?
+ if(spu_config.iUseInterpolation>=2)                   // gauss interpolation?
       {s_chan[ch].spos=0x30000L;s_chan[ch].SB[28]=0;}  // -> start with more decoding
  else {s_chan[ch].spos=0x10000L;s_chan[ch].SB[31]=0;}  // -> no/simple interpolation starts with one 44100 decoding
 
dwNewChannel&=~(1<<ch);                               // clear new channel bit
spu.dwNewChannel&=~(1<<ch);                           // clear new channel bit
 }
 
 ////////////////////////////////////////////////////////////////////////
 // ALL KIND OF HELPERS
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void VoiceChangeFrequency(int ch)
+INLINE int FModChangeFrequency(int ch,int ns)
 {
- s_chan[ch].iUsedFreq=s_chan[ch].iActFreq;             // -> take it and calc steps
- s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;
- if(!s_chan[ch].sinc) s_chan[ch].sinc=1;
- if(iUseInterpolation==1) s_chan[ch].SB[32]=1;         // -> freq change in simle imterpolation mode: set flag
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE void FModChangeFrequency(int ch,int ns)
-{
- int NP=s_chan[ch].iRawPitch;
+ unsigned int NP=s_chan[ch].iRawPitch;
+ int sinc;
 
  NP=((32768L+iFMod[ns])*NP)/32768L;
 
  if(NP>0x3fff) NP=0x3fff;
  if(NP<0x1)    NP=0x1;
 
- NP=(44100L*NP)/(4096L);                               // calc frequency
-
- s_chan[ch].iActFreq=NP;
- s_chan[ch].iUsedFreq=NP;
- s_chan[ch].sinc=(((NP/10)<<16)/4410);
- if(!s_chan[ch].sinc) s_chan[ch].sinc=1;
- if(iUseInterpolation==1)                              // freq change in simple interpolation mode
- s_chan[ch].SB[32]=1;
+ sinc=NP<<4;                                           // calc frequency
+ if(spu_config.iUseInterpolation==1)                   // freq change in simple interpolation mode
+  s_chan[ch].SB[32]=1;
  iFMod[ns]=0;
-}                    
-
-////////////////////////////////////////////////////////////////////////
-
-// noise handler... just produces some noise data
-// surely wrong... and no noise frequency (spuCtrl&0x3f00) will be used...
-// and sometimes the noise will be used as fmod modulation... pfff
 
-INLINE int iGetNoiseVal(int ch)
-{
- int fa;
-
- if((dwNoiseVal<<=1)&0x80000000L)
-  {
-   dwNoiseVal^=0x0040001L;
-   fa=((dwNoiseVal>>2)&0x7fff);
-   fa=-fa;
-  }
- else fa=(dwNoiseVal>>2)&0x7fff;
-
- // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
- fa=s_chan[ch].iOldNoise+((fa-s_chan[ch].iOldNoise)/((0x001f-((spuCtrl&0x3f00)>>9))+1));
- if(fa>32767L)  fa=32767L;
- if(fa<-32767L) fa=-32767L;              
- s_chan[ch].iOldNoise=fa;
-
- if(iUseInterpolation<2)                               // no gauss/cubic interpolation?
- s_chan[ch].SB[29] = fa;                               // -> store noise val in "current sample" slot
- return fa;
-}                                 
+ return sinc;
+}                    
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -336,14 +295,9 @@ INLINE void StoreInterpolationVal(int ch,int fa)
   s_chan[ch].SB[29]=fa;
  else
   {
-   if((spuCtrl&0x4000)==0) fa=0;                       // muted?
-   else                                                // else adjust
-    {
-     if(fa>32767L)  fa=32767L;
-     if(fa<-32767L) fa=-32767L;              
-    }
+   ssat32_to_16(fa);
 
-   if(iUseInterpolation>=2)                            // gauss/cubic interpolation
+   if(spu_config.iUseInterpolation>=2)                 // gauss/cubic interpolation
     {     
      int gpos = s_chan[ch].SB[28];
      gval0 = fa;          
@@ -351,7 +305,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
      s_chan[ch].SB[28] = gpos;
     }
    else
-   if(iUseInterpolation==1)                            // simple interpolation
+   if(spu_config.iUseInterpolation==1)                 // simple interpolation
     {
      s_chan[ch].SB[28] = 0;                    
      s_chan[ch].SB[29] = s_chan[ch].SB[30];            // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour'
@@ -365,19 +319,19 @@ INLINE void StoreInterpolationVal(int ch,int fa)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int iGetInterpolationVal(int ch)
+INLINE int iGetInterpolationVal(int ch, int spos)
 {
  int fa;
 
  if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
 
- switch(iUseInterpolation)
+ switch(spu_config.iUseInterpolation)
   {   
    //--------------------------------------------------//
    case 3:                                             // cubic interpolation
     {
      long xd;int gpos;
-     xd = ((s_chan[ch].spos) >> 1)+1;
+     xd = (spos >> 1)+1;
      gpos = s_chan[ch].SB[28];
 
      fa  = gval(3) - 3*gval(2) + 3*gval(1) - gval0;
@@ -396,9 +350,9 @@ INLINE int iGetInterpolationVal(int ch)
    case 2:                                             // gauss interpolation
     {
      int vl, vr;int gpos;
-     vl = (s_chan[ch].spos >> 6) & ~3;
+     vl = (spos >> 6) & ~3;
      gpos = s_chan[ch].SB[28];
-     vr=(gauss[vl]*gval0)&~2047;
+     vr=(gauss[vl]*(int)gval0)&~2047;
      vr+=(gauss[vl+1]*gval(1))&~2047;
      vr+=(gauss[vl+2]*gval(2))&~2047;
      vr+=(gauss[vl+3]*gval(3))&~2047;
@@ -423,351 +377,555 @@ INLINE int iGetInterpolationVal(int ch)
  return fa;
 }
 
-////////////////////////////////////////////////////////////////////////
-// MAIN SPU FUNCTION
-// here is the main job handler... thread, timer or direct func call
-// basically the whole sound processing is done in this fat func!
-////////////////////////////////////////////////////////////////////////
+static void decode_block_data(int *dest, const unsigned char *src, int predict_nr, int shift_factor)
+{
+ int nSample;
+ int fa, s_1, s_2, d, s;
 
-// 5 ms waiting phase, if buffer is full and no new sound has to get started
-// .. can be made smaller (smallest val: 1 ms), but bigger waits give
-// better performance
+ s_1 = dest[27];
+ s_2 = dest[26];
 
-#define PAUSE_W 5
-#define PAUSE_L 5000
+ for (nSample = 0; nSample < 28; src++)
+ {
+  d = (int)*src;
+  s = (int)(signed short)((d & 0x0f) << 12);
 
-////////////////////////////////////////////////////////////////////////
+  fa = s >> shift_factor;
+  fa += ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
+  s_2=s_1;s_1=fa;
+
+  dest[nSample++] = fa;
 
-static void *MAINThread(void *arg)
+  s = (int)(signed short)((d & 0xf0) << 8);
+  fa = s >> shift_factor;
+  fa += ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
+  s_2=s_1;s_1=fa;
+
+  dest[nSample++] = fa;
+ }
+}
+
+static int decode_block(int ch)
 {
- int s_1,s_2,fa,ns,ns_from,ns_to;
-#if !defined(_MACOSX) && !defined(__arm__)
- int voldiv = iVolume;
-#else
- const int voldiv = 2;
-#endif
- unsigned char * start;unsigned int nSample;
- int ch,predict_nr,shift_factor,flags,d,s;
- int bIRQReturn=0;
+ unsigned char *start;
+ int predict_nr,shift_factor,flags;
+ int stop = 0;
+ int ret = 0;
 
- while(!bEndThread)                                    // until we are shutting down
-  {
-   // ok, at the beginning we are looking if there is
-   // enuff free place in the dsound/oss buffer to
-   // fill in new data, or if there is a new channel to start.
-   // if not, we wait (thread) or return (timer/spuasync)
-   // until enuff free place is available/a new channel gets
-   // started
-
-   if(dwNewChannel)                                    // new channel should start immedately?
-    {                                                  // (at least one bit 0 ... MAXCHANNEL is set?)
-     iSecureStart++;                                   // -> set iSecure
-     if(iSecureStart>5) iSecureStart=0;                //    (if it is set 5 times - that means on 5 tries a new samples has been started - in a row, we will reset it, to give the sound update a chance)
-    }
-   else iSecureStart=0;                                // 0: no new channel should start
+ start = s_chan[ch].pCurr;                 // set up the current pos
+ if(start == spu.spuMemC)                  // ?
+  stop = 1;
 
-   while(!iSecureStart && !bEndThread &&               // no new start? no thread end?
-         (SoundGetBytesBuffered()>TESTSIZE))           // and still enuff data in sound buffer?
-    {
-     iSecureStart=0;                                   // reset secure
+ if(s_chan[ch].prevflags&1)                // 1: stop/loop
+ {
+  if(!(s_chan[ch].prevflags&2))
+   stop = 1;
 
-     if(iUseTimer) return 0;                           // linux no-thread mode? bye
-     usleep(PAUSE_L);                                  // else sleep for x ms (linux)
+  start = s_chan[ch].pLoop;
+ }
+ else
+  ret = check_irq(ch, start);              // hack, see check_irq below..
 
-     if(dwNewChannel) iSecureStart=1;                  // if a new channel kicks in (or, of course, sound buffer runs low), we will leave the loop
-    }
+ if(stop)
+ {
+  spu.dwChannelOn &= ~(1<<ch);             // -> turn everything off
+  s_chan[ch].bStop = 1;
+  s_chan[ch].ADSRX.EnvelopeVol = 0;
+ }
 
-   //--------------------------------------------------// continue from irq handling in timer mode? 
+ predict_nr=(int)start[0];
+ shift_factor=predict_nr&0xf;
+ predict_nr >>= 4;
 
-   ns_from=0;
-   ns_to=NSSIZE;
-   ch=0;
-   if(lastch>=0)                                       // will be -1 if no continue is pending
-    {
-     ch=lastch; ns_from=lastns+1; lastch=-1;           // -> setup all kind of vars to continue
-    }
+ decode_block_data(s_chan[ch].SB, start + 2, predict_nr, shift_factor);
 
-   //--------------------------------------------------//
-   //- main channel loop                              -// 
-   //--------------------------------------------------//
-    {
-     for(;ch<MAXCHAN;ch++)                             // loop em all... we will collect 1 ms of sound of each playing channel
-      {
-       if(dwNewChannel&(1<<ch)) StartSound(ch);        // start new sound
-       if(!(dwChannelOn&(1<<ch))) continue;            // channel not playing? next
+ flags=(int)start[1];
+ if(flags&4)
+  s_chan[ch].pLoop=start;                  // loop adress
 
-       if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq)   // new psx frequency?
-        VoiceChangeFrequency(ch);
+ start+=16;
 
-       for(ns=ns_from;ns<ns_to;ns++)                   // loop until 1 ms of data is reached
-        {
-         int sval;
+ if(flags&1) {                             // 1: stop/loop
+  start = s_chan[ch].pLoop;
+  ret |= check_irq(ch, start);             // hack.. :(
+ }
 
-         if(s_chan[ch].bFMod==1 && iFMod[ns])          // fmod freq channel
-          FModChangeFrequency(ch,ns);
+ if (start - spu.spuMemC >= 0x80000)
+  start = spu.spuMemC;
 
-         while(s_chan[ch].spos>=0x10000L)
-          {
-           if(s_chan[ch].iSBPos==28)                   // 28 reached?
-            {
-             start=s_chan[ch].pCurr;                   // set up the current pos
-
-             if (start == (unsigned char*)-1)          // special "stop" sign
-              {
-               dwChannelOn&=~(1<<ch);                  // -> turn everything off
-               s_chan[ch].ADSRX.EnvelopeVol=0;
-               goto ENDX;                              // -> and done for this channel
-              }
-
-             s_chan[ch].iSBPos=0;
-
-             //////////////////////////////////////////// spu irq handler here? mmm... do it later
-
-             s_1=s_chan[ch].s_1;
-             s_2=s_chan[ch].s_2;
-
-             predict_nr=(int)*start;start++;
-             shift_factor=predict_nr&0xf;
-             predict_nr >>= 4;
-             flags=(int)*start;start++;
-
-             // -------------------------------------- // 
-
-             for (nSample=0;nSample<28;start++)      
-              {
-               d=(int)*start;
-               s=((d&0xf)<<12);
-               if(s&0x8000) s|=0xffff0000;
-
-               fa=(s >> shift_factor);
-               fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
-               s_2=s_1;s_1=fa;
-               s=((d & 0xf0) << 8);
-
-               s_chan[ch].SB[nSample++]=fa;
-
-               if(s&0x8000) s|=0xffff0000;
-               fa=(s>>shift_factor);
-               fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
-               s_2=s_1;s_1=fa;
-
-               s_chan[ch].SB[nSample++]=fa;
-              }
-
-             //////////////////////////////////////////// irq check
-
-             if(irqCallback && (spuCtrl&0x40))         // some callback and irq active?
-              {
-               if((pSpuIrq >  start-16 &&              // irq address reached?
-                   pSpuIrq <= start) ||
-                  ((flags&1) &&                        // special: irq on looping addr, when stop/loop flag is set 
-                   (pSpuIrq >  s_chan[ch].pLoop-16 &&
-                    pSpuIrq <= s_chan[ch].pLoop)))
-               {
-                 irqCallback();                        // -> call main emu
-
-                 if(iSPUIRQWait)                       // -> option: wait after irq for main emu
-                  {
-                   iSpuAsyncWait=1;
-                   bIRQReturn=1;
-                   lastch=ch; 
-                   lastns=ns;
-                   ns_to=ns+1;
-                  }
-                }
-              }
-
-             //////////////////////////////////////////// flag handler
-
-             if((flags&4) && (!s_chan[ch].bIgnoreLoop))
-              s_chan[ch].pLoop=start-16;               // loop adress
-
-             if(flags&1)                               // 1: stop/loop
-              {
-               // We play this block out first...
-               //if(!(flags&2))                          // 1+2: do loop... otherwise: stop
-               if((flags!=3 && flags!=7)               // PETE: if we don't check exactly for 3, loop hang ups will happen (DQ4, for example)
-                  || s_chan[ch].pLoop==NULL)           // and checking if pLoop is set avoids crashes, yeah
-                {
-                 start = (unsigned char*)-1;
-                 // Actua Soccer 2, Jungle Book, other games that check for this condition
-                 s_chan[ch].ADSRX.EnvelopeVol = 0;
-                }
-               else
-                {
-                 start = s_chan[ch].pLoop;
-                }
-              }
-
-             if (start - spuMemC >= 0x80000)
-              start = (unsigned char*)-1;
-
-             s_chan[ch].pCurr=start;                   // store values for next cycle
-             s_chan[ch].s_1=s_1;
-             s_chan[ch].s_2=s_2;
-            }
-
-           fa=s_chan[ch].SB[s_chan[ch].iSBPos++];      // get sample data
-
-           StoreInterpolationVal(ch,fa);               // store val for later interpolation
-
-           s_chan[ch].spos -= 0x10000L;
-          }
+ s_chan[ch].pCurr = start;                 // store values for next cycle
+ s_chan[ch].prevflags = flags;
 
-         if(s_chan[ch].bNoise)
-              fa=iGetNoiseVal(ch);                     // get noise val
-         else fa=iGetInterpolationVal(ch);             // get sample val
+ return ret;
+}
 
-         sval = (MixADSR(ch) * fa) / 1023;  // mix adsr
+// do block, but ignore sample data
+static int skip_block(int ch)
+{
+ unsigned char *start = s_chan[ch].pCurr;
+ int flags = start[1];
+ int ret = check_irq(ch, start);
 
-         if(s_chan[ch].bFMod==2)                       // fmod freq channel
-          iFMod[ns]=sval;                              // -> store 1T sample data, use that to do fmod on next channel
-         else                                          // no fmod freq channel
-          {
-           //////////////////////////////////////////////
-           // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
+ if(s_chan[ch].prevflags & 1)
+  start = s_chan[ch].pLoop;
 
-           SSumLR[ns*2]  +=(sval*s_chan[ch].iLeftVolume)/0x4000L;
-           SSumLR[ns*2+1]+=(sval*s_chan[ch].iRightVolume)/0x4000L;
+ if(flags & 4)
+  s_chan[ch].pLoop = start;
 
-           //////////////////////////////////////////////
-           // now let us store sound data for reverb    
+ start += 16;
 
-           if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,sval);
-          }
+ if(flags & 1)
+  start = s_chan[ch].pLoop;
 
-         ////////////////////////////////////////////////
-         // ok, go on until 1 ms data of this channel is collected
+ s_chan[ch].pCurr = start;
+ s_chan[ch].prevflags = flags;
 
-         s_chan[ch].spos += s_chan[ch].sinc;
-        }
-ENDX:   ;
-      }
-    }
+ return ret;
+}
 
-    if(bIRQReturn)                            // special return for "spu irq - wait for cpu action"
-     {
-      bIRQReturn=0;
-      if(iUseTimer!=2)
-       { 
-        DWORD dwWatchTime=timeGetTime_spu()+2500;
-
-        while(iSpuAsyncWait && !bEndThread && 
-              timeGetTime_spu()<dwWatchTime)
-            usleep(1000L);
-       continue;
-       }
-      else
-       {
-        return 0;
-       }
-     }
+// if irq is going to trigger sooner than in upd_samples, set upd_samples
+static void scan_for_irq(int ch, unsigned int *upd_samples)
+{
+ int pos, sinc, sinc_inv, end;
+ unsigned char *block;
+ int flags;
+
+ block = s_chan[ch].pCurr;
+ pos = s_chan[ch].spos;
+ sinc = s_chan[ch].sinc;
+ end = pos + *upd_samples * sinc;
+
+ pos += (28 - s_chan[ch].iSBPos) << 16;
+ while (pos < end)
+ {
+  if (block == spu.pSpuIrq)
+   break;
+  flags = block[1];
+  block += 16;
+  if (flags & 1) {                          // 1: stop/loop
+   block = s_chan[ch].pLoop;
+   if (block == spu.pSpuIrq)                // hack.. (see decode_block)
+    break;
+  }
+  pos += 28 << 16;
+ }
 
+ if (pos < end)
+ {
+  sinc_inv = s_chan[ch].sinc_inv;
+  if (sinc_inv == 0)
+   sinc_inv = s_chan[ch].sinc_inv = (0x80000000u / (uint32_t)sinc) << 1;
 
-  //---------------------------------------------------//
-  //- here we have another 1 ms of sound data
-  //---------------------------------------------------//
-  // mix XA infos (if any)
+  pos -= s_chan[ch].spos;
+  *upd_samples = (((uint64_t)pos * sinc_inv) >> 32) + 1;
+  //xprintf("ch%02d: irq sched: %3d %03d\n",
+  // ch, *upd_samples, *upd_samples * 60 * 263 / 44100);
+ }
+}
 
-  MixXA();
-  
-  ///////////////////////////////////////////////////////
-  // mix all channels (including reverb) into one buffer
+#define make_do_samples(name, fmod_code, interp_start, interp1_code, interp2_code, interp_end) \
+static noinline int do_samples_##name(int ch, int ns, int ns_to) \
+{                                            \
+ int sinc = s_chan[ch].sinc;                 \
+ int spos = s_chan[ch].spos;                 \
+ int sbpos = s_chan[ch].iSBPos;              \
+ int *SB = s_chan[ch].SB;                    \
+ int ret = -1;                               \
+ int d, fa;                                  \
+ interp_start;                               \
+                                             \
+ for (; ns < ns_to; ns++)                    \
+ {                                           \
+  fmod_code;                                 \
+                                             \
+  spos += sinc;                              \
+  while (spos >= 0x10000)                    \
+  {                                          \
+   fa = SB[sbpos++];                         \
+   if(sbpos >= 28)                           \
+   {                                         \
+    sbpos = 0;                               \
+    d = decode_block(ch);                    \
+    if(d)                                    \
+     ret = /*ns_to =*/ ns + 1;               \
+   }                                         \
+                                             \
+   interp1_code;                             \
+   spos -= 0x10000;                          \
+  }                                          \
+                                             \
+  interp2_code;                              \
+ }                                           \
+                                             \
+ s_chan[ch].sinc = sinc;                     \
+ s_chan[ch].spos = spos;                     \
+ s_chan[ch].iSBPos = sbpos;                  \
+ interp_end;                                 \
+                                             \
+ return ret;                                 \
+}
 
-  for (ns = 0; ns < NSSIZE*2; )
-   {
-    SSumLR[ns] += MixREVERBLeft(ns/2);
+#define fmod_recv_check \
+  if(s_chan[ch].bFMod==1 && iFMod[ns]) \
+    sinc = FModChangeFrequency(ch,ns)
 
-    d = SSumLR[ns] / voldiv; SSumLR[ns] = 0;
-    if (d < -32767) d = -32767; if (d > 32767) d = 32767;
-    *pS++ = d;
-    ns++;
+make_do_samples(default, fmod_recv_check, ,
+  StoreInterpolationVal(ch, fa),
+  ChanBuf[ns] = iGetInterpolationVal(ch, spos), )
+make_do_samples(noint, , fa = s_chan[ch].SB[29], , ChanBuf[ns] = fa, s_chan[ch].SB[29] = fa)
 
-    SSumLR[ns] += MixREVERBRight();
+#define simple_interp_store \
+  s_chan[ch].SB[28] = 0; \
+  s_chan[ch].SB[29] = s_chan[ch].SB[30]; \
+  s_chan[ch].SB[30] = s_chan[ch].SB[31]; \
+  s_chan[ch].SB[31] = fa; \
+  s_chan[ch].SB[32] = 1
 
-    d = SSumLR[ns] / voldiv; SSumLR[ns] = 0;
-    if(d < -32767) d = -32767; if(d > 32767) d = 32767;
-    *pS++ = d;
-    ns++;
-   }
+#define simple_interp_get \
+  if(sinc<0x10000)          /* -> upsampling? */ \
+       InterpolateUp(ch);   /* --> interpolate up */ \
+  else InterpolateDown(ch); /* --> else down */ \
+  ChanBuf[ns] = s_chan[ch].SB[29]
+
+make_do_samples(simple, , ,
+  simple_interp_store, simple_interp_get, )
+
+static noinline int do_samples_noise(int ch, int ns, int ns_to)
+{
+ int level, shift, bit;
+ int ret = -1, d;
+
+ s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns);
+ while (s_chan[ch].spos >= 28*0x10000)
+ {
+  d = skip_block(ch);
+  if (d)
+   ret = ns_to;
+  s_chan[ch].spos -= 28*0x10000;
+ }
+
+ // modified from DrHell/shalma, no fraction
+ level = (spu.spuCtrl >> 10) & 0x0f;
+ level = 0x8000 >> level;
+
+ for (; ns < ns_to; ns++)
+ {
+  spu.dwNoiseCount += 2;
+  if (spu.dwNoiseCount >= level)
+  {
+   spu.dwNoiseCount -= level;
+   shift = (spu.dwNoiseVal >> 10) & 0x1f;
+   bit = (0x69696969 >> shift) & 1;
+   if (spu.dwNoiseVal & 0x8000)
+    bit ^= 1;
+   spu.dwNoiseVal = (spu.dwNoiseVal << 1) | bit;
+  }
+
+  ChanBuf[ns] = (signed short)spu.dwNoiseVal;
+ }
+
+ return ret;
+}
+
+#ifdef HAVE_ARMV5
+// asm code; lv and rv must be 0-3fff
+extern void mix_chan(int start, int count, int lv, int rv);
+extern void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb);
+#else
+static void mix_chan(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
 
-  //////////////////////////////////////////////////////                   
+ while (count--)
+  {
+   int sval = *src++;
+
+   l = (sval * lv) >> 14;
+   r = (sval * rv) >> 14;
+   *dst++ += l;
+   *dst++ += r;
+  }
+}
+
+static void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb)
+{
+ int *dst = SSumLR + start * 2;
+ int *drvb = rvb + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+  {
+   int sval = *src++;
+
+   l = (sval * lv) >> 14;
+   r = (sval * rv) >> 14;
+   *dst++ += l;
+   *dst++ += r;
+   *drvb++ += l;
+   *drvb++ += r;
+  }
+}
+#endif
+
+// 0x0800-0x0bff  Voice 1
+// 0x0c00-0x0fff  Voice 3
+static noinline void do_decode_bufs(int which, int start, int count)
+{
+ const int *src = ChanBuf + start;
+ unsigned short *dst = &spu.spuMem[0x800/2 + which*0x400/2];
+ int cursor = spu.decode_pos + start;
+
+ while (count-- > 0)
+  {
+   cursor &= 0x1ff;
+   dst[cursor] = *src++;
+   cursor++;
+  }
+
+ // decode_pos is updated and irqs are checked later, after voice loop
+}
+
+////////////////////////////////////////////////////////////////////////
+// MAIN SPU FUNCTION
+// here is the main job handler...
+// basically the whole sound processing is done in this fat func!
+////////////////////////////////////////////////////////////////////////
+
+void do_samples(unsigned int cycles_to)
+{
+ const int ns_from = 0;
+ int ns,ns_to,ns_len;
+ int volmult = spu_config.iVolume;
+ int ch,d,silentch;
+ int cycle_diff;
+
+ cycle_diff = cycles_to - spu.cycles_played;
+ if (cycle_diff < -2*1048576 || cycle_diff > 2*1048576)
+  {
+   //xprintf("desync %u %d\n", cycles_to, cycle_diff);
+   spu.cycles_played = cycles_to;
+   return;
+  }
+
+ if (cycle_diff < 2 * 768)
+  return;
+
+ ns_to = (cycle_diff / 768 + 1) & ~1;
+ if (ns_to > NSSIZE) {
+  // should never happen
+  //xprintf("ns_to oflow %d %d\n", ns_to, NSSIZE);
+  ns_to = NSSIZE;
+ }
+
+  //////////////////////////////////////////////////////
   // special irq handling in the decode buffers (0x0000-0x1000)
-  // we know: 
+  // we know:
   // the decode buffers are located in spu memory in the following way:
   // 0x0000-0x03ff  CD audio left
   // 0x0400-0x07ff  CD audio right
   // 0x0800-0x0bff  Voice 1
   // 0x0c00-0x0fff  Voice 3
   // and decoded data is 16 bit for one sample
-  // we assume: 
+  // we assume:
   // even if voices 1/3 are off or no cd audio is playing, the internal
   // play positions will move on and wrap after 0x400 bytes.
-  // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and 
+  // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and
   // increase this pointer on each sample by 2 bytes. If this pointer
   // (or 0x400 offsets of this pointer) hits the spuirq address, we generate
-  // an IRQ. Only problem: the "wait for cpu" option is kinda hard to do here
-  // in some of Peops timer modes. So: we ignore this option here (for now).
+  // an IRQ.
 
-  if(pMixIrq && irqCallback)
+  if (unlikely((spu.spuCtrl & CTRL_IRQ)
+       && spu.pSpuIrq < spu.spuMemC+0x1000))
    {
-    for(ns=0;ns<NSSIZE;ns++)
+    int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
+    int left = (irq_pos - spu.decode_pos) & 0x1ff;
+    if (0 < left && left <= ns_to)
      {
-      if((spuCtrl&0x40) && pSpuIrq && pSpuIrq<spuMemC+0x1000)                 
-       {
-        for(ch=0;ch<4;ch++)
-         {
-          if(pSpuIrq>=pMixIrq+(ch*0x400) && pSpuIrq<pMixIrq+(ch*0x400)+2)
-           irqCallback();
-         }
-       }
-      pMixIrq+=2;if(pMixIrq>spuMemC+0x3ff) pMixIrq=spuMemC;
+      //xprintf("decoder irq %x\n", spu.decode_pos);
+      do_irq();
      }
    }
 
-  InitREVERB();
+  InitREVERB(ns_to);
+
+  {
+   silentch=~(spu.dwChannelOn|spu.dwNewChannel);
+
+   //--------------------------------------------------//
+   //- main channel loop                              -// 
+   //--------------------------------------------------//
+    {
+     for(ch=0;ch<MAXCHAN;ch++)                         // loop em all...
+      {
+       if(spu.dwNewChannel&(1<<ch)) StartSound(ch);    // start new sound
+       if(!(spu.dwChannelOn&(1<<ch))) continue;        // channel not playing? next
+
+       if(s_chan[ch].bNoise)
+        do_samples_noise(ch, ns_from, ns_to);
+       else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==0))
+        do_samples_noint(ch, ns_from, ns_to);
+       else if(s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==1)
+        do_samples_simple(ch, ns_from, ns_to);
+       else
+        do_samples_default(ch, ns_from, ns_to);
+
+       ns_len = ns_to - ns_from;
+
+       MixADSR(ch, ns_from, ns_to);
+
+       if(ch==1 || ch==3)
+        {
+         do_decode_bufs(ch/2, ns_from, ns_len);
+         spu.decode_dirty_ch |= 1<<ch;
+        }
 
-  // feed the sound
-  // wanna have around 1/60 sec (16.666 ms) updates
-  if (iCycle++ > 16)
+       if(s_chan[ch].bFMod==2)                         // fmod freq channel
+        memcpy(&iFMod[ns_from], &ChanBuf[ns_from], ns_len * sizeof(iFMod[0]));
+       if(s_chan[ch].bRVBActive)
+        mix_chan_rvb(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, spu.sRVBStart);
+       else
+        mix_chan(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
+      }
+    }
+
+    // advance "stopped" channels that can cause irqs
+    // (all chans are always playing on the real thing..)
+    if(spu.spuCtrl&CTRL_IRQ)
+     for(ch=0;ch<MAXCHAN;ch++)
+      {
+       if(!(silentch&(1<<ch))) continue;               // already handled
+       if(spu.dwChannelDead&(1<<ch)) continue;
+       if(s_chan[ch].pCurr > spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq)
+        continue;
+
+       s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns_from);
+       while(s_chan[ch].spos >= 28 * 0x10000)
+        {
+         unsigned char *start = s_chan[ch].pCurr;
+
+         skip_block(ch);
+         if(start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000)
+          {
+           // looping on self or stopped(?)
+           spu.dwChannelDead |= 1<<ch;
+           s_chan[ch].spos = 0;
+           break;
+          }
+
+         s_chan[ch].spos -= 28 * 0x10000;
+        }
+      }
+
+  if(unlikely(silentch & spu.decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
    {
-    SoundFeedStreamData((unsigned char *)pSpuBuffer,
-                        ((unsigned char *)pS) - ((unsigned char *)pSpuBuffer));
-    pS = (short *)pSpuBuffer;
-    iCycle = 0;
+    memset(&spu.spuMem[0x800/2], 0, 0x400);
+    spu.decode_dirty_ch &= ~(1<<1);
    }
+  if(unlikely(silentch & spu.decode_dirty_ch & (1<<3)))
+   {
+    memset(&spu.spuMem[0xc00/2], 0, 0x400);
+    spu.decode_dirty_ch &= ~(1<<3);
+   }
+
+  //---------------------------------------------------//
+  // mix XA infos (if any)
+
+  MixXA(ns_to);
+  
+  ///////////////////////////////////////////////////////
+  // mix all channels (including reverb) into one buffer
+
+  if(spu_config.iUseReverb)
+   REVERBDo(ns_to);
+
+  if((spu.spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
+   {
+    memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
+    spu.pS += ns_to * 2;
+   }
+  else
+  for (ns = 0; ns < ns_to * 2; )
+   {
+    d = SSumLR[ns]; SSumLR[ns] = 0;
+    d = d * volmult >> 10;
+    ssat32_to_16(d);
+    *spu.pS++ = d;
+    ns++;
+
+    d = SSumLR[ns]; SSumLR[ns] = 0;
+    d = d * volmult >> 10;
+    ssat32_to_16(d);
+    *spu.pS++ = d;
+    ns++;
+   }
+
+  spu.cycles_played += ns_to * 768;
+
+  spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff;
  }
+}
 
- // end of big main loop...
+void schedule_next_irq(void)
+{
+ unsigned int upd_samples;
+ int ch;
 
- bThreadEnded = 1;
+ if (spu.scheduleCallback == NULL)
+  return;
 
- return 0;
+ upd_samples = 44100 / 50;
+
+ for (ch = 0; ch < MAXCHAN; ch++)
+ {
+  if (spu.dwChannelDead & (1 << ch))
+   continue;
+  if ((unsigned long)(spu.pSpuIrq - s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
+    && (unsigned long)(spu.pSpuIrq - s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
+   continue;
+
+  scan_for_irq(ch, &upd_samples);
+ }
+
+ if (unlikely(spu.pSpuIrq < spu.spuMemC + 0x1000))
+ {
+  int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
+  int left = (irq_pos - spu.decode_pos) & 0x1ff;
+  if (0 < left && left < upd_samples) {
+   //xprintf("decode: %3d (%3d/%3d)\n", left, spu.decode_pos, irq_pos);
+   upd_samples = left;
+  }
+ }
+
+ if (upd_samples < 44100 / 50)
+  spu.scheduleCallback(upd_samples * 768);
 }
 
 // SPU ASYNC... even newer epsxe func
 //  1 time every 'cycle' cycles... harhar
 
-void CALLBACK SPUasync(unsigned long cycle)
+// rearmed: called dynamically now
+
+void CALLBACK SPUasync(unsigned int cycle, unsigned int flags)
 {
- if(iSpuAsyncWait)
-  {
-   iSpuAsyncWait++;
-   if(iSpuAsyncWait<=16) return;
-   iSpuAsyncWait=0;
-  }
+ do_samples(cycle);
 
- if(iUseTimer==2)                                      // special mode, only used in Linux by this spu (or if you enable the experimental Windows mode)
-  {
-   if(!bSpuInit) return;                               // -> no init, no call
+ if (spu.spuCtrl & CTRL_IRQ)
+  schedule_next_irq();
 
-   MAINThread(0);                                      // -> linux high-compat mode
+ if (flags & 1) {
+  out_current->feed(spu.pSpuBuffer, (unsigned char *)spu.pS - spu.pSpuBuffer);
+  spu.pS = (short *)spu.pSpuBuffer;
 
-   // abuse iSpuAsyncWait mechanism to reduce calls to above function
-   // to make it do larger chunks
-   // note: doing it less often than once per frame causes skips
-   iSpuAsyncWait=1;
+  if (spu_config.iTempo) {
+   if (!out_current->busy())
+    // cause more samples to be generated
+    // (and break some games because of bad sync)
+    spu.cycles_played -= 44100 / 60 / 2 * 768;
   }
+ }
 }
 
 // SPU UPDATE... new epsxe func
@@ -781,7 +939,6 @@ void CALLBACK SPUasync(unsigned long cycle)
 
 void CALLBACK SPUupdate(void)
 {
- SPUasync(0);
 }
 
 // XA AUDIO
@@ -795,45 +952,20 @@ void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap)
 }
 
 // CDDA AUDIO
-void CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes)
+int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes)
 {
- if (!pcm)      return;
- if (nbytes<=0) return;
+ if (!pcm)      return -1;
+ if (nbytes<=0) return -1;
 
- FeedCDDA((unsigned char *)pcm, nbytes);
return FeedCDDA((unsigned char *)pcm, nbytes);
 }
 
-// SETUPTIMER: init of certain buffers and threads/timers
-void SetupTimer(void)
+// to be called after state load
+void ClearWorkingState(void)
 {
  memset(SSumLR,0,sizeof(SSumLR));                      // init some mixing buffers
- memset(iFMod,0,NSSIZE*sizeof(int));
- pS=(short *)pSpuBuffer;                               // setup soundbuffer pointer
-
- bEndThread=0;                                         // init thread vars
- bThreadEnded=0; 
- bSpuInit=1;                                           // flag: we are inited
-
- if(!iUseTimer)                                        // linux: use thread
-  {
-   pthread_create(&thread, NULL, MAINThread, NULL);
-  }
-}
-
-// REMOVETIMER: kill threads/timers
-void RemoveTimer(void)
-{
- bEndThread=1;                                         // raise flag to end thread
-
- if(!iUseTimer)                                        // linux tread?
-  {
-   int i=0;
-   while(!bThreadEnded && i<2000) {usleep(1000L);i++;} // -> wait until thread has ended
-   if(thread!=(pthread_t)-1) {pthread_cancel(thread);thread=(pthread_t)-1;}  // -> cancel thread anyway
-  }
-
- bThreadEnded=0;                                       // no more spu is running
- bSpuInit=0;
+ memset(iFMod,0,sizeof(iFMod));     
+ spu.pS=(short *)spu.pSpuBuffer;                       // setup soundbuffer pointer
 }
 
 // SETUPSTREAMS: init most of the spu buffers
@@ -841,53 +973,46 @@ void SetupStreams(void)
 { 
  int i;
 
- pSpuBuffer=(unsigned char *)malloc(32768);            // alloc mixing buffer
-
- if(iUseReverb==1) i=88200*2;
- else              i=NSSIZE*2;
+ spu.pSpuBuffer = (unsigned char *)malloc(32768);      // alloc mixing buffer
+ spu.sRVBStart = (int *)malloc(NSSIZE*2*4);            // alloc reverb buffer
+ memset(spu.sRVBStart,0,NSSIZE*2*4);
 
- sRVBStart = (int *)malloc(i*4);                       // alloc reverb buffer
- memset(sRVBStart,0,i*4);
- sRVBEnd  = sRVBStart + i;
- sRVBPlay = sRVBStart;
-
- XAStart =                                             // alloc xa buffer
+ spu.XAStart =                                         // alloc xa buffer
   (uint32_t *)malloc(44100 * sizeof(uint32_t));
XAEnd   = XAStart + 44100;
XAPlay  = XAStart;
XAFeed  = XAStart;
spu.XAEnd   = spu.XAStart + 44100;
spu.XAPlay  = spu.XAStart;
spu.XAFeed  = spu.XAStart;
 
CDDAStart =                                           // alloc cdda buffer
-  (uint32_t *)malloc(16384 * sizeof(uint32_t));
CDDAEnd   = CDDAStart + 16384;
CDDAPlay  = CDDAStart;
CDDAFeed  = CDDAStart;
spu.CDDAStart =                                       // alloc cdda buffer
+  (uint32_t *)malloc(CDDA_BUFFER_SIZE);
spu.CDDAEnd   = spu.CDDAStart + 16384;
spu.CDDAPlay  = spu.CDDAStart;
spu.CDDAFeed  = spu.CDDAStart;
 
  for(i=0;i<MAXCHAN;i++)                                // loop sound channels
   {
-// we don't use mutex sync... not needed, would only 
-// slow us down:
-//   s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
    s_chan[i].ADSRX.SustainLevel = 0xf;                 // -> init sustain
-   s_chan[i].pLoop=spuMemC;
-   s_chan[i].pStart=spuMemC;
-   s_chan[i].pCurr=spuMemC;
+   s_chan[i].ADSRX.SustainIncrease = 1;
+   s_chan[i].pLoop=spu.spuMemC;
+   s_chan[i].pCurr=spu.spuMemC;
   }
 
-  pMixIrq=spuMemC;                                     // enable decoded buffer irqs by setting the address
+ ClearWorkingState();
+
+ spu.bSpuInit=1;                                       // flag: we are inited
 }
 
 // REMOVESTREAMS: free most buffer
 void RemoveStreams(void)
 { 
- free(pSpuBuffer);                                     // free mixing buffer
- pSpuBuffer = NULL;
- free(sRVBStart);                                      // free reverb buffer
- sRVBStart = NULL;
- free(XAStart);                                        // free XA buffer
- XAStart = NULL;
- free(CDDAStart);                                      // free CDDA buffer
- CDDAStart = NULL;
+ free(spu.pSpuBuffer);                                 // free mixing buffer
spu.pSpuBuffer = NULL;
+ free(spu.sRVBStart);                                  // free reverb buffer
+ spu.sRVBStart = NULL;
+ free(spu.XAStart);                                    // free XA buffer
spu.XAStart = NULL;
+ free(spu.CDDAStart);                                  // free CDDA buffer
spu.CDDAStart = NULL;
 }
 
 // INIT/EXIT STUFF
@@ -895,38 +1020,31 @@ void RemoveStreams(void)
 // SPUINIT: this func will be called first by the main emu
 long CALLBACK SPUinit(void)
 {
- spuMemC = (unsigned char *)spuMem;                    // just small setup
+ spu.spuMemC = (unsigned char *)spu.spuMem;            // just small setup
  memset((void *)&rvb, 0, sizeof(REVERBInfo));
  InitADSR();
 
- iVolume = 3;
- iReverbOff = -1;
- spuIrq = 0;
- spuAddr = 0xffffffff;
- bEndThread = 0;
- bThreadEnded = 0;
- spuMemC = (unsigned char *)spuMem;
- pMixIrq = 0;
- memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
- pSpuIrq = 0;
- //iSPUIRQWait = 0;
- lastch = -1;
-
- //ReadConfigSPU();                                      // read user stuff
+ spu.spuAddr = 0xffffffff;
+ spu.decode_pos = 0;
+ memset((void *)s_chan, 0, sizeof(s_chan));
+ spu.pSpuIrq = spu.spuMemC;
+
  SetupStreams();                                       // prepare streaming
 
+ if (spu_config.iVolume == 0)
+  spu_config.iVolume = 768; // 1024 is 1.0
+
  return 0;
 }
 
 // SPUOPEN: called by main emu after init
 long CALLBACK SPUopen(void)
 {
- if (bSPUIsOpen) return 0;                             // security for some stupid main emus
+ if (spu.bSPUIsOpen) return 0;                         // security for some stupid main emus
 
  SetupSound();                                         // setup sound (before init!)
- SetupTimer();                                         // timer for feeding data
 
- bSPUIsOpen = 1;
spu.bSPUIsOpen = 1;
 
  return PSE_SPU_ERR_SUCCESS;
 }
@@ -934,12 +1052,11 @@ long CALLBACK SPUopen(void)
 // SPUCLOSE: called before shutdown
 long CALLBACK SPUclose(void)
 {
- if (!bSPUIsOpen) return 0;                            // some security
+ if (!spu.bSPUIsOpen) return 0;                        // some security
 
bSPUIsOpen = 0;                                       // no more open
spu.bSPUIsOpen = 0;                                   // no more open
 
- RemoveTimer();                                        // no more feeding
- RemoveSound();                                        // no more sound handling
+ out_current->finish();                                // no more sound handling
 
  return 0;
 }
@@ -949,6 +1066,7 @@ long CALLBACK SPUshutdown(void)
 {
  SPUclose();
  RemoveStreams();                                      // no more streaming
+ spu.bSpuInit=0;
 
  return 0;
 }
@@ -985,12 +1103,17 @@ void CALLBACK SPUabout(void)
 // passes a callback that should be called on SPU-IRQ/cdda volume change
 void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
 {
- irqCallback = callback;
spu.irqCallback = callback;
 }
 
 void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short))
 {
- cddavCallback = CDDAVcallback;
+ spu.cddavCallback = CDDAVcallback;
+}
+
+void CALLBACK SPUregisterScheduleCb(void (CALLBACK *callback)(unsigned int))
+{
+ spu.scheduleCallback = callback;
 }
 
 // COMMON PLUGIN INFO FUNCS
@@ -1016,4 +1139,27 @@ char * SPUgetLibInfos(void)
 }
 */
 
+// debug
+void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int *noise_chans_out)
+{
+ int ch = 0, fmod_chans = 0, noise_chans = 0, irq_chans = 0;
+
+ for(;ch<MAXCHAN;ch++)
+ {
+  if (!(spu.dwChannelOn & (1<<ch)))
+   continue;
+  if (s_chan[ch].bFMod == 2)
+   fmod_chans |= 1 << ch;
+  if (s_chan[ch].bNoise)
+   noise_chans |= 1 << ch;
+  if((spu.spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= spu.pSpuIrq && s_chan[ch].pLoop <= spu.pSpuIrq)
+   irq_chans |= 1 << ch;
+ }
+
+ *chans_out = spu.dwChannelOn;
+ *run_chans = ~spu.dwChannelOn & ~spu.dwChannelDead & irq_chans;
+ *fmod_chans_out = fmod_chans;
+ *noise_chans_out = noise_chans;
+}
+
 // vim:shiftwidth=1:expandtab