spu: rework irq handling and loop reloading

[pcsx_rearmed.git] / plugins / dfsound / externals.h

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 4ce39bb..3cb388c 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -35,16 +35,10 @@
 // spu defines\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-// sound buffer sizes\r
-// 400 ms complete sound buffer\r
-#define SOUNDSIZE   70560\r
-// 137 ms test buffer... if less than that is buffered, a new upload will happen\r
-#define TESTSIZE    24192\r
-\r
 // num of channels\r
 #define MAXCHAN     24\r
 \r
-// ~ 1 ms of data\r
+// ~ FRAG_MSECS ms of data\r
 // note: must be even due to the way reverb works now\r
 #define FRAG_MSECS 2\r
 #define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1)\r
@@ -115,6 +109,7 @@ typedef struct
  unsigned int      bRVBActive:1;                       // reverb active flag\r
  unsigned int      bNoise:1;                           // noise active flag\r
  unsigned int      bFMod:2;                            // freq mod (0=off, 1=sound channel, 2=freq channel)\r
+ unsigned int      prevflags:3;                        // flags from previous block\r
 \r
  int               iLeftVolume;                        // left volume\r
  int               iRightVolume;                       // right volume\r
@@ -202,15 +197,11 @@ extern unsigned char * pSpuBuffer;
 \r
 extern int        iVolume;\r
 extern int        iXAPitch;\r
-extern int        iUseTimer;\r
-extern int        iSPUIRQWait;\r
-extern int        iDebugMode;\r
-extern int        iRecordMode;\r
 extern int        iUseReverb;\r
 extern int        iUseInterpolation;\r
 // MISC\r
 \r
-extern int iSpuAsyncWait;\r
+extern int had_dma;\r
 \r
 extern SPUCHAN s_chan[];\r
 extern REVERBInfo rvb;\r
@@ -220,8 +211,6 @@ extern unsigned short spuCtrl;
 extern unsigned short spuStat;\r
 extern unsigned short spuIrq;\r
 extern unsigned long  spuAddr;\r
-extern int      bEndThread; \r
-extern int      bThreadEnded;\r
 extern int      bSpuInit;\r
 extern unsigned int dwNewChannel;\r
 extern unsigned int dwChannelOn;\r