spu: fix a wrong assumption

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

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