X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=5157412182c2a4a2db126b4b8661f693a159a27a;hb=1d5d35bc9d0d3d84873cd1d31870d09248ddc05b;hp=5ec941525c234a4963471cee79f11853ac1c2092;hpb=b64fb8912577f6f1e856bf255b6bd96e4e977203;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 5ec94152..51574121 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -15,12 +15,18 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef __P_SOUND_EXTERNALS_H__
+#define __P_SOUND_EXTERNALS_H__
+
 #include <stdint.h>
 
 /////////////////////////////////////////////////////////
 // generic defines
 /////////////////////////////////////////////////////////
 
+//#define log_unhandled printf
+#define log_unhandled(...)
+
 #ifdef __GNUC__
 #define noinline __attribute__((noinline))
 #define unlikely(x) __builtin_expect((x), 0)
@@ -194,7 +200,7 @@ typedef struct
  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    dwChannelsAudible;    // not silent channels
  unsigned int    dwChannelDead;        // silent+not useful channels
 
  unsigned char * pSpuBuffer;
@@ -232,7 +238,9 @@ typedef struct
  unsigned short  regArea[0x400];
 } SPUInfo;
 
-#define regAreaGet(ch,offset) \
+#define regAreaGet(offset) \
+  spu.regArea[((offset) - 0xc00)>>1]
+#define regAreaGetCh(ch, offset) \
   spu.regArea[((ch<<4)|(offset))>>1]
 
 ///////////////////////////////////////////////////////////
@@ -254,3 +262,4 @@ void schedule_next_irq(void);
 
 #endif
 
+#endif /* __P_SOUND_EXTERNALS_H__ */