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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 7935cb99..2db75ac2 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -28,6 +28,11 @@
 #define noinline
 #define unlikely(x) x
 #endif
+#if defined(__GNUC__) && !defined(_TMS320C6X)
+#define preload __builtin_prefetch
+#else
+#define preload(...)
+#endif
 
 #define PSE_LT_SPU                  4
 #define PSE_SPU_ERR_SUCCESS         0
@@ -53,10 +58,17 @@
 // struct defines
 ///////////////////////////////////////////////////////////
 
+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;
@@ -93,7 +105,6 @@ typedef struct
  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
@@ -104,8 +115,6 @@ typedef struct
  int               iRightVolume;                       // right volume
  ADSRInfoEx        ADSRX;
  int               iRawPitch;                          // raw pitch (0...3fff)
-
- int               SB[32+4];
 } SPUCHAN;
 
 ///////////////////////////////////////////////////////////
@@ -117,8 +126,6 @@ typedef struct
 
  int VolLeft;
  int VolRight;
- int iRVBLeft;
- int iRVBRight;
 
  int FB_SRC_A;       // (offset)
  int FB_SRC_B;       // (offset)
@@ -155,27 +162,26 @@ typedef struct
 
  int dirty;          // registers changed
 
- // normalized offsets
- int nIIR_DEST_A0, nIIR_DEST_A1, nIIR_DEST_B0, nIIR_DEST_B1,
- 	nACC_SRC_A0, nACC_SRC_A1, nACC_SRC_B0, nACC_SRC_B1, 
-	nIIR_SRC_A0, nIIR_SRC_A1, nIIR_SRC_B0, nIIR_SRC_B1,
-	nACC_SRC_C0, nACC_SRC_C1, nACC_SRC_D0, nACC_SRC_D1,
-	nMIX_DEST_A0, nMIX_DEST_A1, nMIX_DEST_B0, nMIX_DEST_B1;
  // MIX_DEST_xx - FB_SRC_x
- int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;
+ int FB_SRC_A0, FB_SRC_A1, FB_SRC_B0, FB_SRC_B1;
 } REVERBInfo;
 
 ///////////////////////////////////////////////////////////
 
 // psx buffers / addresses
 
+#define SB_SIZE (32 + 4)
+
 typedef struct
 {
  unsigned short  spuCtrl;
  unsigned short  spuStat;
 
  unsigned int    spuAddr;
- unsigned char * spuMemC;
+ union {
+  unsigned char  *spuMemC;
+  unsigned short *spuMem;
+ };
  unsigned char * pSpuIrq;
 
  unsigned int    cycles_played;
@@ -183,6 +189,7 @@ typedef struct
  int             decode_dirty_ch;
  unsigned int    bSpuInit:1;
  unsigned int    bSPUIsOpen:1;
+ unsigned int    bMemDirty:1;          // had external write to SPU RAM
 
  unsigned int    dwNoiseVal;           // global noise generator
  unsigned int    dwNoiseCount;
@@ -197,8 +204,6 @@ typedef struct
  void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
  void (CALLBACK *scheduleCallback)(unsigned int);
 
- int           * sRVBStart;
-
  xa_decode_t   * xapGlobal;
  unsigned int  * XAFeed;
  unsigned int  * XAPlay;
@@ -216,9 +221,15 @@ typedef struct
  int             iLeftXAVol;
  int             iRightXAVol;
 
- int             pad[32];
+ SPUCHAN       * s_chan;
+ REVERBInfo    * rvb;
+
+ // buffers
+ int           * SB;
+ int           * SSumLR;
+
+ int             pad[29];
  unsigned short  regArea[0x400];
- unsigned short  spuMem[256*1024];
 } SPUInfo;
 
 ///////////////////////////////////////////////////////////
@@ -228,19 +239,17 @@ typedef struct
 #ifndef _IN_SPU
 
 extern SPUInfo spu;
-extern SPUCHAN s_chan[];
-extern REVERBInfo rvb;
 
-void do_samples(unsigned int cycles_to);
+void do_samples(unsigned int cycles_to, int do_sync);
 void schedule_next_irq(void);
 
 #define regAreaGet(ch,offset) \
   spu.regArea[((ch<<4)|(offset))>>1]
 
-#define do_samples_if_needed(c) \
+#define do_samples_if_needed(c, sync) \
  do { \
-  if ((int)((c) - spu.cycles_played) >= 16 * 768) \
-   do_samples(c); \
+  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \
+   do_samples(c, sync); \
  } while (0)
 
 #endif