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=d3bcbc6b9bdf77b0d2da5380ff5749b9c07737e9;hb=8a55ebcc07d4f860633db8c77bb9e16bcfa03313;hpb=de4a0279efefdd2e4595c8fc27f1564f4bff9341

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index d3bcbc6b..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
@@ -121,8 +126,6 @@ typedef struct
 
  int VolLeft;
  int VolRight;
- int iRVBLeft;
- int iRVBRight;
 
  int FB_SRC_A;       // (offset)
  int FB_SRC_B;       // (offset)
@@ -159,14 +162,8 @@ 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;
 
 ///////////////////////////////////////////////////////////
@@ -192,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;
@@ -206,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;
@@ -226,9 +222,13 @@ typedef struct
  int             iRightXAVol;
 
  SPUCHAN       * s_chan;
+ REVERBInfo    * rvb;
+
+ // buffers
  int           * SB;
+ int           * SSumLR;
 
- int             pad[30];
+ int             pad[29];
  unsigned short  regArea[0x400];
 } SPUInfo;
 
@@ -239,7 +239,6 @@ typedef struct
 #ifndef _IN_SPU
 
 extern SPUInfo spu;
-extern REVERBInfo rvb;
 
 void do_samples(unsigned int cycles_to, int do_sync);
 void schedule_next_irq(void);