// 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
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
short * pS;\r
\r
void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq\r
- void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ void (CALLBACK *cddavCallback)(short, short);\r
void (CALLBACK *scheduleCallback)(unsigned int);\r
\r
xa_decode_t * xapGlobal;\r
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