X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=fbf9d1819fc370f8e6c9a8e06e8c078fa87020ba;hp=18521ce4e1b51548b04051971e568600313169b1;hb=efce366c5b6596b9542c4fe8c69695191dab5d5a;hpb=6d75977b13fede33db381324c610561c6e723a8b

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 18521ce4..fbf9d181 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -21,6 +21,14 @@
 // generic defines
 /////////////////////////////////////////////////////////
 
+#if 0 //def __GNUC__
+#define noinline __attribute__((noinline))
+#define unlikely(x) __builtin_expect((x), 0)
+#else
+#define noinline
+#define unlikely(x) x
+#endif
+
 #define PSE_LT_SPU                  4
 #define PSE_SPU_ERR_SUCCESS         0
 #define PSE_SPU_ERR                 -60
@@ -35,16 +43,10 @@
 // spu defines
 ////////////////////////////////////////////////////////////////////////
 
-// sound buffer sizes
-// 400 ms complete sound buffer
-#define SOUNDSIZE   70560
-// 137 ms test buffer... if less than that is buffered, a new upload will happen
-#define TESTSIZE    24192
-
 // num of channels
 #define MAXCHAN     24
 
-// ~ 1 ms of data
+// ~ FRAG_MSECS ms of data
 // note: must be even due to the way reverb works now
 #define FRAG_MSECS 2
 #define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1)
@@ -115,7 +117,7 @@ typedef struct
  unsigned int      bRVBActive:1;                       // reverb active flag
  unsigned int      bNoise:1;                           // noise active flag
  unsigned int      bFMod:2;                            // freq mod (0=off, 1=sound channel, 2=freq channel)
- unsigned int      bJump:1;                            // last decoded block jumped
+ unsigned int      prevflags:3;                        // flags from previous block
 
  int               iLeftVolume;                        // left volume
  int               iRightVolume;                       // right volume
@@ -203,14 +205,12 @@ extern unsigned char * pSpuBuffer;
 
 extern int        iVolume;
 extern int        iXAPitch;
-extern int        iSPUIRQWait;
-extern int        iDebugMode;
-extern int        iRecordMode;
 extern int        iUseReverb;
 extern int        iUseInterpolation;
 // MISC
 
-extern int iSpuAsyncWait;
+extern int had_dma;
+extern int decode_pos;
 
 extern SPUCHAN s_chan[];
 extern REVERBInfo rvb;
@@ -248,9 +248,6 @@ extern uint32_t * XAPlay;
 extern uint32_t * XAStart;
 extern uint32_t * XAEnd;
 
-extern uint32_t   XARepeat;
-extern uint32_t   XALastVal;
-
 extern uint32_t * CDDAFeed;
 extern uint32_t * CDDAPlay;
 extern uint32_t * CDDAStart;