notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psxinterpreter: use cycle_multiplier also
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
externals.h
diff --git
a/plugins/dfsound/externals.h
b/plugins/dfsound/externals.h
index
8bbf4e0
..
1cfef66
100644
(file)
--- a/
plugins/dfsound/externals.h
+++ b/
plugins/dfsound/externals.h
@@
-21,6
+21,9
@@
// generic defines
\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
#ifdef __GNUC__
\r
#define noinline __attribute__((noinline))
\r
#define unlikely(x) __builtin_expect((x), 0)
\r
@@
-110,7
+113,7
@@
typedef struct
unsigned int bNoise:1; // noise active flag
\r
unsigned int bFMod:2; // freq mod (0=off, 1=sound channel, 2=freq channel)
\r
unsigned int prevflags:3; // flags from previous block
\r
unsigned int bNoise:1; // noise active flag
\r
unsigned int bFMod:2; // freq mod (0=off, 1=sound channel, 2=freq channel)
\r
unsigned int prevflags:3; // flags from previous block
\r
-
\r
+ unsigned int bIgnoreLoop:1; // Ignore loop
\r
int iLeftVolume; // left volume
\r
int iRightVolume; // right volume
\r
ADSRInfoEx ADSRX;
\r
int iLeftVolume; // left volume
\r
int iRightVolume; // right volume
\r
ADSRInfoEx ADSRX;
\r
@@
-189,18
+192,19
@@
typedef struct
int decode_dirty_ch;
\r
unsigned int bSpuInit:1;
\r
unsigned int bSPUIsOpen:1;
\r
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
unsigned int dwNewChannel; // flags for faster testing, if new channel starts
\r
\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 dwChannel
On;
// not silent channels
\r
+ unsigned int dwChannel
sAudible;
// 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
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
void (CALLBACK *scheduleCallback)(unsigned int);
\r
\r
xa_decode_t * xapGlobal;
\r
@@
-231,6
+235,11
@@
typedef struct
unsigned short regArea[0x400];
\r
} SPUInfo;
\r
\r
unsigned short regArea[0x400];
\r
} SPUInfo;
\r
\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
// SPU.C globals
\r
///////////////////////////////////////////////////////////
\r
///////////////////////////////////////////////////////////
\r
// SPU.C globals
\r
///////////////////////////////////////////////////////////
\r
@@
-242,9
+251,6
@@
extern SPUInfo spu;
void do_samples(unsigned int cycles_to, int do_sync);
\r
void schedule_next_irq(void);
\r
\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, sync) \
\r
do { \
\r
if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \
\r
#define do_samples_if_needed(c, sync) \
\r
do { \
\r
if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \
\r