* *\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
#define MAXCHAN 24\r
\r
// note: must be even due to the way reverb works now\r
-#define NSSIZE ((44100 / 50 + 16) & ~1)\r
+#define NSSIZE ((44100 / 50 + 32) & ~1)\r
\r
///////////////////////////////////////////////////////////\r
// struct defines\r
\r
///////////////////////////////////////////////////////////\r
\r
-// Tmp Flags\r
-\r
-// used for debug channel muting\r
-#define FLAG_MUTE 1\r
-\r
-// used for simple interpolation\r
-#define FLAG_IPOL0 2\r
-#define FLAG_IPOL1 4\r
-\r
-///////////////////////////////////////////////////////////\r
-\r
// MAIN CHANNEL STRUCT\r
typedef struct\r
{\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
- int iLeftVolume; // left volume\r
- int iRightVolume; // right volume\r
+ unsigned int bIgnoreLoop:1; // Ignore loop\r
+ unsigned int bStarting:1; // starting after keyon\r
+ union {\r
+ struct {\r
+ int iLeftVolume; // left volume\r
+ int iRightVolume; // right volume\r
+ };\r
+ int iVolume[2];\r
+ };\r
ADSRInfoEx ADSRX;\r
int iRawPitch; // raw pitch (0...3fff)\r
} SPUCHAN;\r
\r
int dirty; // registers changed\r
\r
- // normalized offsets\r
- int nIIR_DEST_A0, nIIR_DEST_A1, nIIR_DEST_B0, nIIR_DEST_B1,\r
- nACC_SRC_A0, nACC_SRC_A1, nACC_SRC_B0, nACC_SRC_B1, \r
- nIIR_SRC_A0, nIIR_SRC_A1, nIIR_SRC_B0, nIIR_SRC_B1,\r
- nACC_SRC_C0, nACC_SRC_C1, nACC_SRC_D0, nACC_SRC_D1,\r
- nMIX_DEST_A0, nMIX_DEST_A1, nMIX_DEST_B0, nMIX_DEST_B1;\r
// MIX_DEST_xx - FB_SRC_x\r
- int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;\r
+ int FB_SRC_A0, FB_SRC_A1, FB_SRC_B0, FB_SRC_B1;\r
} REVERBInfo;\r
\r
///////////////////////////////////////////////////////////\r
\r
// psx buffers / addresses\r
\r
-#define SB_SIZE (32 + 4)\r
+typedef union\r
+{\r
+ int SB[28 + 4 + 4];\r
+ struct {\r
+ int sample[28];\r
+ union {\r
+ struct {\r
+ int pos;\r
+ int val[4];\r
+ } gauss;\r
+ int simple[5]; // 28-32\r
+ } interp;\r
+ int sinc_old;\r
+ };\r
+} sample_buf;\r
\r
typedef struct\r
{\r
unsigned short spuStat;\r
\r
unsigned int spuAddr;\r
- union {\r
- unsigned char *spuMemC;\r
- unsigned short *spuMem;\r
- };\r
- unsigned char * pSpuIrq;\r
\r
unsigned int cycles_played;\r
+ unsigned int cycles_dma_end;\r
int decode_pos;\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
- unsigned int dwChannelOn; // not silent channels\r
+ unsigned int dwChannelsAudible; // not silent channels\r
unsigned int dwChannelDead; // silent+not useful channels\r
\r
+ unsigned int XARepeat;\r
+ unsigned int XALastVal;\r
+\r
+ int iLeftXAVol;\r
+ int iRightXAVol;\r
+\r
+ int cdClearSamples; // extra samples to clear the capture buffers\r
+ struct { // channel volume in the cd controller\r
+ unsigned char ll, lr, rl, rr; // see cdr.Attenuator* in cdrom.c\r
+ } cdv; // applied on spu side for easier emulation\r
+\r
+ unsigned int last_keyon_cycles;\r
+\r
+ union {\r
+ unsigned char *spuMemC;\r
+ unsigned short *spuMem;\r
+ };\r
+ unsigned char * pSpuIrq;\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
+ SPUCHAN * s_chan;\r
+ REVERBInfo * rvb;\r
+\r
+ int * SSumLR;\r
+\r
+ void (CALLBACK *irqCallback)(int);\r
+ //void (CALLBACK *cddavCallback)(short, short);\r
void (CALLBACK *scheduleCallback)(unsigned int);\r
\r
- xa_decode_t * xapGlobal;\r
+ const xa_decode_t * xapGlobal;\r
unsigned int * XAFeed;\r
unsigned int * XAPlay;\r
unsigned int * XAStart;\r
unsigned int * CDDAStart;\r
unsigned int * CDDAEnd;\r
\r
- unsigned int XARepeat;\r
- unsigned int XALastVal;\r
-\r
- int iLeftXAVol;\r
- int iRightXAVol;\r
-\r
- SPUCHAN * s_chan;\r
- REVERBInfo * rvb;\r
+ unsigned short regArea[0x400];\r
\r
- // buffers\r
- int * SB;\r
- int * SSumLR;\r
+ sample_buf sb[MAXCHAN];\r
+ int interpolation;\r
\r
- int pad[29];\r
- unsigned short regArea[0x400];\r
+#if P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)\r
+ sample_buf * sb_thread;\r
+ sample_buf sb_thread_[MAXCHAN];\r
+#endif\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
extern SPUInfo spu;\r
\r
-void do_samples(unsigned int cycles_to, int do_sync);\r
+void do_samples(unsigned int cycles_to, int force_no_thread);\r
void schedule_next_irq(void);\r
+void check_irq_io(unsigned int addr);\r
+void do_irq_io(int cycles_after);\r
\r
-#define regAreaGet(ch,offset) \\r
- spu.regArea[((ch<<4)|(offset))>>1]\r
-\r
-#define do_samples_if_needed(c, sync) \\r
+#define do_samples_if_needed(c, no_thread, samples) \\r
do { \\r
- if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
- do_samples(c, sync); \\r
+ if ((no_thread) || (int)((c) - spu.cycles_played) >= (samples) * 768) \\r
+ do_samples(c, no_thread); \\r
} while (0)\r
\r
#endif\r
\r
+void FeedXA(const xa_decode_t *xap);\r
+void FeedCDDA(unsigned char *pcm, int nBytes);\r
+\r
+#endif /* __P_SOUND_EXTERNALS_H__ */\r
notaz.gp2x.de / pcsx_rearmed.git / blobdiff