Merge pull request #123 from gameblabla/diablofix_hack

[pcsx_rearmed.git] / plugins / dfsound / externals.h

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 7935cb9..2db75ac 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -28,6 +28,11 @@
 #define noinline\r
 #define unlikely(x) x\r
 #endif\r
+#if defined(__GNUC__) && !defined(_TMS320C6X)\r
+#define preload __builtin_prefetch\r
+#else\r
+#define preload(...)\r
+#endif\r
 \r
 #define PSE_LT_SPU                  4\r
 #define PSE_SPU_ERR_SUCCESS         0\r
@@ -53,10 +58,17 @@
 // struct defines\r
 ///////////////////////////////////////////////////////////\r
 \r
+enum ADSR_State {\r
+ ADSR_ATTACK = 0,\r
+ ADSR_DECAY = 1,\r
+ ADSR_SUSTAIN = 2,\r
+ ADSR_RELEASE = 3,\r
+};\r
+\r
 // ADSR INFOS PER CHANNEL\r
 typedef struct\r
 {\r
- unsigned char  State:2;\r
+ unsigned char  State:2;                               // ADSR_State\r
  unsigned char  AttackModeExp:1;\r
  unsigned char  SustainModeExp:1;\r
  unsigned char  SustainIncrease:1;\r
@@ -93,7 +105,6 @@ typedef struct
  unsigned char *   pCurr;                              // current pos in sound mem\r
  unsigned char *   pLoop;                              // loop ptr in sound mem\r
 \r
- unsigned int      bStop:1;                            // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
  unsigned int      bReverb:1;                          // can we do reverb on this channel? must have ctrl register bit, to get active\r
  unsigned int      bRVBActive:1;                       // reverb active flag\r
  unsigned int      bNoise:1;                           // noise active flag\r
@@ -104,8 +115,6 @@ typedef struct
  int               iRightVolume;                       // right volume\r
  ADSRInfoEx        ADSRX;\r
  int               iRawPitch;                          // raw pitch (0...3fff)\r
-\r
- int               SB[32+4];\r
 } SPUCHAN;\r
 \r
 ///////////////////////////////////////////////////////////\r
@@ -117,8 +126,6 @@ typedef struct
 \r
  int VolLeft;\r
  int VolRight;\r
- int iRVBLeft;\r
- int iRVBRight;\r
 \r
  int FB_SRC_A;       // (offset)\r
  int FB_SRC_B;       // (offset)\r
@@ -155,27 +162,26 @@ typedef struct
 \r
  int dirty;          // registers changed\r
 \r
- // normalized offsets\r
- int nIIR_DEST_A0, nIIR_DEST_A1, nIIR_DEST_B0, nIIR_DEST_B1,\r
-       nACC_SRC_A0, nACC_SRC_A1, nACC_SRC_B0, nACC_SRC_B1, \r
-       nIIR_SRC_A0, nIIR_SRC_A1, nIIR_SRC_B0, nIIR_SRC_B1,\r
-       nACC_SRC_C0, nACC_SRC_C1, nACC_SRC_D0, nACC_SRC_D1,\r
-       nMIX_DEST_A0, nMIX_DEST_A1, nMIX_DEST_B0, nMIX_DEST_B1;\r
  // MIX_DEST_xx - FB_SRC_x\r
- int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;\r
+ int FB_SRC_A0, FB_SRC_A1, FB_SRC_B0, FB_SRC_B1;\r
 } REVERBInfo;\r
 \r
 ///////////////////////////////////////////////////////////\r
 \r
 // psx buffers / addresses\r
 \r
+#define SB_SIZE (32 + 4)\r
+\r
 typedef struct\r
 {\r
  unsigned short  spuCtrl;\r
  unsigned short  spuStat;\r
 \r
  unsigned int    spuAddr;\r
- unsigned char * spuMemC;\r
+ union {\r
+  unsigned char  *spuMemC;\r
+  unsigned short *spuMem;\r
+ };\r
  unsigned char * pSpuIrq;\r
 \r
  unsigned int    cycles_played;\r
@@ -183,6 +189,7 @@ typedef struct
  int             decode_dirty_ch;\r
  unsigned int    bSpuInit:1;\r
  unsigned int    bSPUIsOpen:1;\r
+ unsigned int    bMemDirty:1;          // had external write to SPU RAM\r
 \r
  unsigned int    dwNoiseVal;           // global noise generator\r
  unsigned int    dwNoiseCount;\r
@@ -197,8 +204,6 @@ typedef struct
  void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
  void (CALLBACK *scheduleCallback)(unsigned int);\r
 \r
- int           * sRVBStart;\r
-\r
  xa_decode_t   * xapGlobal;\r
  unsigned int  * XAFeed;\r
  unsigned int  * XAPlay;\r
@@ -216,9 +221,15 @@ typedef struct
  int             iLeftXAVol;\r
  int             iRightXAVol;\r
 \r
- int             pad[32];\r
+ SPUCHAN       * s_chan;\r
+ REVERBInfo    * rvb;\r
+\r
+ // buffers\r
+ int           * SB;\r
+ int           * SSumLR;\r
+\r
+ int             pad[29];\r
  unsigned short  regArea[0x400];\r
- unsigned short  spuMem[256*1024];\r
 } SPUInfo;\r
 \r
 ///////////////////////////////////////////////////////////\r
@@ -228,19 +239,17 @@ typedef struct
 #ifndef _IN_SPU\r
 \r
 extern SPUInfo spu;\r
-extern SPUCHAN s_chan[];\r
-extern REVERBInfo rvb;\r
 \r
-void do_samples(unsigned int cycles_to);\r
+void do_samples(unsigned int cycles_to, int do_sync);\r
 void schedule_next_irq(void);\r
 \r
 #define regAreaGet(ch,offset) \\r
   spu.regArea[((ch<<4)|(offset))>>1]\r
 \r
-#define do_samples_if_needed(c) \\r
+#define do_samples_if_needed(c, sync) \\r
  do { \\r
-  if ((int)((c) - spu.cycles_played) >= 16 * 768) \\r
-   do_samples(c); \\r
+  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
+   do_samples(c, sync); \\r
  } while (0)\r
 \r
 #endif\r