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
spunull: Add missing callback and fix prototypes
[pcsx_rearmed.git]
/
plugins
/
spunull
/
spunull.c
diff --git
a/plugins/spunull/spunull.c
b/plugins/spunull/spunull.c
index
96bd390
..
38cd44b
100644
(file)
--- a/
plugins/spunull/spunull.c
+++ b/
plugins/spunull/spunull.c
@@
-53,7
+53,7
@@
char * pConfigFile=0;
////////////////////////////////////////////////////////////////////////
void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq
////////////////////////////////////////////////////////////////////////
void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq
-void (CALLBACK *cddavCallback)(
unsigned short,unsigned
short)=0;
+void (CALLBACK *cddavCallback)(
short,
short)=0;
////////////////////////////////////////////////////////////////////////
// CODE AREA
////////////////////////////////////////////////////////////////////////
// CODE AREA
@@
-182,7
+182,7
@@
void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned i
////////////////////////////////////////////////////////////////////////
\r
////////////////////////////////////////////////////////////////////////
\r
-unsigned short CALLBACK SPUreadRegister(unsigned long reg)
+unsigned short CALLBACK SPUreadRegister(unsigned long reg
, unsigned int cycles
)
{
unsigned long r=reg&0xfff;
{
unsigned long r=reg&0xfff;
@@
-280,7
+280,12
@@
void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize,unsigned int cy
// XA AUDIO
////////////////////////////////////////////////////////////////////////
// XA AUDIO
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap)
+void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap, unsigned int cycles, int is_start)
+{
+}
+
+void CALLBACK SPUsetCDvol(unsigned char ll, unsigned char lr,
+ unsigned char rl, unsigned char rr, unsigned int cycle)
{
}
{
}
@@
-347,7
+352,7
@@
void SPUasync(unsigned int cycle, unsigned int flags)
{
}
{
}
-int SPUplayCDDAchannel(short *pcm, int nbytes)
+int SPUplayCDDAchannel(short *pcm, int nbytes
, unsigned int cycle, int is_start
)
{
return -1;
}
{
return -1;
}
@@
-361,7
+366,7
@@
void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
irqCallback = callback;
}
irqCallback = callback;
}
-void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(
unsigned short,unsigned
short))
+void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(
short,
short))
{
cddavCallback = CDDAVcallback;
}
{
cddavCallback = CDDAVcallback;
}
@@
-537,3
+542,7
@@
void CALLBACK SPUstopChannels2(unsigned short channels)
{
//SoundOff(16,24,channels);
}
{
//SoundOff(16,24,channels);
}
+
+void CALLBACK SPUregisterScheduleCb(void (CALLBACK *callback)(unsigned int))
+{
+}