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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index fbf9d181..4832fac8 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -21,7 +21,7 @@
 // generic defines
 /////////////////////////////////////////////////////////
 
-#if 0 //def __GNUC__
+#ifdef __GNUC__
 #define noinline __attribute__((noinline))
 #define unlikely(x) __builtin_expect((x), 0)
 #else
@@ -46,37 +46,24 @@
 // 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;
+enum ADSR_State {
+ ADSR_ATTACK = 0,
+ ADSR_DECAY = 1,
+ ADSR_SUSTAIN = 2,
+ ADSR_RELEASE = 3,
+};
 
+// ADSR INFOS PER CHANNEL
 typedef struct
 {
- unsigned char  State:2;
+ unsigned char  State:2;                               // ADSR_State
  unsigned char  AttackModeExp:1;
  unsigned char  SustainModeExp:1;
  unsigned char  SustainIncrease:1;
@@ -108,11 +95,11 @@ 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
 
- unsigned int      bStop:1;                            // is channel stopped (sample _can_ still be playing, ADSR Release phase)
  unsigned int      bReverb:1;                          // can we do reverb on this channel? must have ctrl register bit, to get active
  unsigned int      bRVBActive:1;                       // reverb active flag
  unsigned int      bNoise:1;                           // noise active flag
@@ -123,8 +110,6 @@ typedef struct
  int               iRightVolume;                       // right volume
  ADSRInfoEx        ADSRX;
  int               iRawPitch;                          // raw pitch (0...3fff)
-
- int               SB[32+4];
 } SPUCHAN;
 
 ///////////////////////////////////////////////////////////
@@ -185,87 +170,89 @@ typedef struct
 } 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;
-
-#define regAreaGet(ch,offset) \
-  regArea[((ch<<4)|(offset))>>1]
-
-// user settings
-
-extern int        iVolume;
-extern int        iXAPitch;
-extern int        iUseReverb;
-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 int      bSpuInit;
-extern unsigned int dwNewChannel;
-extern unsigned int dwChannelOn;
-extern unsigned int dwPendingChanOff;
-extern unsigned int dwChannelDead;
-
-extern int      SSumR[];
-extern int      SSumL[];
-extern int      iCycle;
-extern short *  pS;
+#define SB_SIZE (32 + 4)
 
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
-
-#endif
+typedef struct
+{
+ unsigned short  spuCtrl;
+ unsigned short  spuStat;
+
+ unsigned int    spuAddr;
+ union {
+  unsigned char  *spuMemC;
+  unsigned short *spuMem;
+ };
+ unsigned char * pSpuIrq;
+
+ unsigned int    cycles_played;
+ int             decode_pos;
+ int             decode_dirty_ch;
+ unsigned int    bSpuInit:1;
+ unsigned int    bSPUIsOpen:1;
+
+ 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
+
+ unsigned char * pSpuBuffer;
+ short         * pS;
+
+ void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ void (CALLBACK *scheduleCallback)(unsigned int);
+
+ xa_decode_t   * xapGlobal;
+ unsigned int  * XAFeed;
+ unsigned int  * XAPlay;
+ unsigned int  * XAStart;
+ unsigned int  * XAEnd;
+
+ unsigned int  * CDDAFeed;
+ unsigned int  * CDDAPlay;
+ unsigned int  * CDDAStart;
+ unsigned int  * CDDAEnd;
+
+ unsigned int    XARepeat;
+ unsigned int    XALastVal;
+
+ int             iLeftXAVol;
+ int             iRightXAVol;
+
+ SPUCHAN       * s_chan;
+ int           * SB;
+
+ int           * RVB;
+ int           * SSumLR;
+
+ int             pad[29];
+ unsigned short  regArea[0x400];
+} SPUInfo;
 
 ///////////////////////////////////////////////////////////
-// XA.C globals
+// SPU.C globals
 ///////////////////////////////////////////////////////////
 
-#ifndef _IN_XA
+#ifndef _IN_SPU
 
-extern xa_decode_t   * xapGlobal;
+extern SPUInfo spu;
+extern REVERBInfo rvb;
 
-extern uint32_t * XAFeed;
-extern uint32_t * XAPlay;
-extern uint32_t * XAStart;
-extern uint32_t * XAEnd;
+void do_samples(unsigned int cycles_to, int do_sync);
+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, sync) \
+ do { \
+  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \
+   do_samples(c, sync); \
+ } while (0)
 
 #endif
 
-///////////////////////////////////////////////////////////
-// REVERB.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_REVERB
-
-extern int *          sRVBPlay;
-extern int *          sRVBEnd;
-extern int *          sRVBStart;
-
-#endif