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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 3cb388c5..7935cb99 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
@@ -38,34 +46,14 @@
 // num of channels
 #define MAXCHAN     24
 
-// ~ 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)
+#define NSSIZE ((44100 / 50 + 16) & ~1)
 
 ///////////////////////////////////////////////////////////
 // struct defines
 ///////////////////////////////////////////////////////////
 
 // 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;
@@ -100,6 +88,7 @@ typedef struct
  int               iSBPos;                             // mixing stuff
  int               spos;
  int               sinc;
+ int               sinc_inv;
 
  unsigned char *   pCurr;                              // current pos in sound mem
  unsigned char *   pLoop;                              // loop ptr in sound mem
@@ -176,90 +165,83 @@ typedef struct
  int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;
 } REVERBInfo;
 
-///////////////////////////////////////////////////////////
-// SPU.C globals
 ///////////////////////////////////////////////////////////
 
-#ifndef _IN_SPU
-
 // psx buffers / addresses
 
-extern unsigned short  regArea[];                        
-extern unsigned short  spuMem[];
-extern unsigned char * spuMemC;
-extern unsigned char * pSpuIrq;
-extern unsigned char * pSpuBuffer;
+typedef struct
+{
+ unsigned short  spuCtrl;
+ unsigned short  spuStat;
 
-#define regAreaGet(ch,offset) \
-  regArea[((ch<<4)|(offset))>>1]
+ unsigned int    spuAddr;
+ unsigned char * spuMemC;
+ unsigned char * pSpuIrq;
 
-// user settings
+ unsigned int    cycles_played;
+ int             decode_pos;
+ int             decode_dirty_ch;
+ unsigned int    bSpuInit:1;
+ unsigned int    bSPUIsOpen:1;
 
-extern int        iVolume;
-extern int        iXAPitch;
-extern int        iUseReverb;
-extern int        iUseInterpolation;
-// MISC
+ unsigned int    dwNoiseVal;           // global noise generator
+ unsigned int    dwNoiseCount;
+ unsigned int    dwNewChannel;         // flags for faster testing, if new channel starts
+ unsigned int    dwChannelOn;          // not silent channels
+ unsigned int    dwChannelDead;        // silent+not useful channels
 
-extern int had_dma;
+ unsigned char * pSpuBuffer;
+ short         * pS;
 
-extern SPUCHAN s_chan[];
-extern REVERBInfo rvb;
+ void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ void (CALLBACK *scheduleCallback)(unsigned int);
 
-extern unsigned long dwNoiseVal;
-extern unsigned short spuCtrl;
-extern unsigned short spuStat;
-extern unsigned short spuIrq;
-extern unsigned long  spuAddr;
-extern int      bSpuInit;
-extern unsigned int dwNewChannel;
-extern unsigned int dwChannelOn;
-extern unsigned int dwPendingChanOff;
-extern unsigned int dwChannelDead;
+ int           * sRVBStart;
 
-extern int      SSumR[];
-extern int      SSumL[];
-extern int      iCycle;
-extern short *  pS;
+ xa_decode_t   * xapGlobal;
+ unsigned int  * XAFeed;
+ unsigned int  * XAPlay;
+ unsigned int  * XAStart;
+ unsigned int  * XAEnd;
 
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ unsigned int  * CDDAFeed;
+ unsigned int  * CDDAPlay;
+ unsigned int  * CDDAStart;
+ unsigned int  * CDDAEnd;
 
-#endif
+ unsigned int    XARepeat;
+ unsigned int    XALastVal;
+
+ int             iLeftXAVol;
+ int             iRightXAVol;
+
+ int             pad[32];
+ unsigned short  regArea[0x400];
+ unsigned short  spuMem[256*1024];
+} SPUInfo;
 
 ///////////////////////////////////////////////////////////
-// XA.C globals
+// SPU.C globals
 ///////////////////////////////////////////////////////////
 
-#ifndef _IN_XA
-
-extern xa_decode_t   * xapGlobal;
+#ifndef _IN_SPU
 
-extern uint32_t * XAFeed;
-extern uint32_t * XAPlay;
-extern uint32_t * XAStart;
-extern uint32_t * XAEnd;
+extern SPUInfo spu;
+extern SPUCHAN s_chan[];
+extern REVERBInfo rvb;
 
-extern uint32_t   XARepeat;
-extern uint32_t   XALastVal;
+void do_samples(unsigned int cycles_to);
+void schedule_next_irq(void);
 
-extern uint32_t * CDDAFeed;
-extern uint32_t * CDDAPlay;
-extern uint32_t * CDDAStart;
-extern uint32_t * CDDAEnd;
+#define regAreaGet(ch,offset) \
+  spu.regArea[((ch<<4)|(offset))>>1]
 
-extern int           iLeftXAVol;
-extern int           iRightXAVol;
+#define do_samples_if_needed(c) \
+ do { \
+  if ((int)((c) - spu.cycles_played) >= 16 * 768) \
+   do_samples(c); \
+ } while (0)
 
 #endif
 
-///////////////////////////////////////////////////////////
-// REVERB.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_REVERB
-
-extern int *          sRVBPlay;
-extern int *          sRVBEnd;
-extern int *          sRVBStart;
-
-#endif