X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=2f3028eefba5de6c1a5cddef31b3da0e2b56a397;hp=3cb388c51da23e9367ef61f53f61e6182067d1e5;hb=92ca1ba64e939942ab05aaa3d578f0d165634275;hpb=e4f075af4e4ba79332c72809d3bb4ba6e2895253

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 3cb388c5..2f3028ee 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -21,6 +21,14 @@
 // generic defines
 /////////////////////////////////////////////////////////
 
+#ifdef __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
@@ -48,24 +56,6 @@
 ///////////////////////////////////////////////////////////
 
 // ADSR INFOS PER CHANNEL
-typedef struct
-{
- int            AttackModeExp;
- long           AttackTime;
- long           DecayTime;
- long           SustainLevel;
- int            SustainModeExp;
- long           SustainModeDec;
- long           SustainTime;
- int            ReleaseModeExp;
- unsigned long  ReleaseVal;
- long           ReleaseTime;
- long           ReleaseStartTime; 
- long           ReleaseVol; 
- long           lTime;
- long           lVolume;
-} ADSRInfo;
-
 typedef struct
 {
  unsigned char  State:2;
@@ -202,15 +192,15 @@ extern int        iUseInterpolation;
 // MISC
 
 extern int had_dma;
+extern int decode_pos;
 
 extern SPUCHAN s_chan[];
 extern REVERBInfo rvb;
 
-extern unsigned long dwNoiseVal;
 extern unsigned short spuCtrl;
 extern unsigned short spuStat;
 extern unsigned short spuIrq;
-extern unsigned long  spuAddr;
+extern unsigned int   spuAddr;
 extern int      bSpuInit;
 extern unsigned int dwNewChannel;
 extern unsigned int dwChannelOn;
@@ -239,9 +229,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;