spu: put globals into a structure

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

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 9096399..7935cb9 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -165,96 +165,83 @@ typedef struct
  int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;\r
 } REVERBInfo;\r
 \r
-///////////////////////////////////////////////////////////\r
-// SPU.C globals\r
 ///////////////////////////////////////////////////////////\r
 \r
-#ifndef _IN_SPU\r
-\r
 // psx buffers / addresses\r
 \r
-extern unsigned short  regArea[];                        \r
-extern unsigned short  spuMem[];\r
-extern unsigned char * spuMemC;\r
-extern unsigned char * pSpuIrq;\r
-extern unsigned char * pSpuBuffer;\r
+typedef struct\r
+{\r
+ unsigned short  spuCtrl;\r
+ unsigned short  spuStat;\r
 \r
-#define regAreaGet(ch,offset) \\r
-  regArea[((ch<<4)|(offset))>>1]\r
+ unsigned int    spuAddr;\r
+ unsigned char * spuMemC;\r
+ unsigned char * pSpuIrq;\r
 \r
-// user settings\r
+ unsigned int    cycles_played;\r
+ int             decode_pos;\r
+ int             decode_dirty_ch;\r
+ unsigned int    bSpuInit:1;\r
+ unsigned int    bSPUIsOpen:1;\r
 \r
-extern int        iVolume;\r
-extern int        iXAPitch;\r
-extern int        iUseReverb;\r
-extern int        iUseInterpolation;\r
-// MISC\r
+ unsigned int    dwNoiseVal;           // global noise generator\r
+ unsigned int    dwNoiseCount;\r
+ unsigned int    dwNewChannel;         // flags for faster testing, if new channel starts\r
+ unsigned int    dwChannelOn;          // not silent channels\r
+ unsigned int    dwChannelDead;        // silent+not useful channels\r
 \r
-extern int decode_pos;\r
+ unsigned char * pSpuBuffer;\r
+ short         * pS;\r
 \r
-extern SPUCHAN s_chan[];\r
-extern REVERBInfo rvb;\r
+ void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq\r
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ void (CALLBACK *scheduleCallback)(unsigned int);\r
 \r
-extern unsigned short spuCtrl;\r
-extern unsigned short spuStat;\r
-extern unsigned short spuIrq;\r
-extern unsigned int   spuAddr;\r
-extern int      bSpuInit;\r
-extern unsigned int dwNewChannel;\r
-extern unsigned int dwChannelOn;\r
-extern unsigned int dwPendingChanOff;\r
-extern unsigned int dwChannelDead;\r
+ int           * sRVBStart;\r
 \r
-extern int      SSumR[];\r
-extern int      SSumL[];\r
-extern short *  pS;\r
+ xa_decode_t   * xapGlobal;\r
+ unsigned int  * XAFeed;\r
+ unsigned int  * XAPlay;\r
+ unsigned int  * XAStart;\r
+ unsigned int  * XAEnd;\r
 \r
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ unsigned int  * CDDAFeed;\r
+ unsigned int  * CDDAPlay;\r
+ unsigned int  * CDDAStart;\r
+ unsigned int  * CDDAEnd;\r
 \r
-extern unsigned int cycles_played;\r
+ unsigned int    XARepeat;\r
+ unsigned int    XALastVal;\r
 \r
-void do_samples(unsigned int cycles_to);\r
-void schedule_next_irq(void);\r
-\r
-#define do_samples_if_needed(c) \\r
- do { \\r
-  if ((int)((c) - cycles_played) >= 16 * 768) \\r
-   do_samples(c); \\r
- } while (0)\r
+ int             iLeftXAVol;\r
+ int             iRightXAVol;\r
 \r
-#endif\r
+ int             pad[32];\r
+ unsigned short  regArea[0x400];\r
+ unsigned short  spuMem[256*1024];\r
+} SPUInfo;\r
 \r
 ///////////////////////////////////////////////////////////\r
-// XA.C globals\r
+// SPU.C globals\r
 ///////////////////////////////////////////////////////////\r
 \r
-#ifndef _IN_XA\r
+#ifndef _IN_SPU\r
 \r
-extern xa_decode_t   * xapGlobal;\r
+extern SPUInfo spu;\r
+extern SPUCHAN s_chan[];\r
+extern REVERBInfo rvb;\r
 \r
-extern uint32_t * XAFeed;\r
-extern uint32_t * XAPlay;\r
-extern uint32_t * XAStart;\r
-extern uint32_t * XAEnd;\r
+void do_samples(unsigned int cycles_to);\r
+void schedule_next_irq(void);\r
 \r
-extern uint32_t * CDDAFeed;\r
-extern uint32_t * CDDAPlay;\r
-extern uint32_t * CDDAStart;\r
-extern uint32_t * CDDAEnd;\r
+#define regAreaGet(ch,offset) \\r
+  spu.regArea[((ch<<4)|(offset))>>1]\r
 \r
-extern int           iLeftXAVol;\r
-extern int           iRightXAVol;\r
+#define do_samples_if_needed(c) \\r
+ do { \\r
+  if ((int)((c) - spu.cycles_played) >= 16 * 768) \\r
+   do_samples(c); \\r
+ } while (0)\r
 \r
 #endif\r
 \r
-///////////////////////////////////////////////////////////\r
-// REVERB.C globals\r
-///////////////////////////////////////////////////////////\r
-\r
-#ifndef _IN_REVERB\r
-\r
-extern int *          sRVBPlay;\r
-extern int *          sRVBEnd;\r
-extern int *          sRVBStart;\r
-\r
-#endif\r