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
libretro: improve retro_memory_map
[pcsx_rearmed.git]
/
plugins
/
spunull
/
spunull.c
diff --git
a/plugins/spunull/spunull.c
b/plugins/spunull/spunull.c
index
be798c5
..
38cd44b
100644
(file)
--- a/
plugins/spunull/spunull.c
+++ b/
plugins/spunull/spunull.c
@@
-53,13
+53,13
@@
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
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val
, unsigned int cycles
)
{
unsigned long r=reg&0xfff;
regArea[(r-0xc00)>>1] = val;
{
unsigned long r=reg&0xfff;
regArea[(r-0xc00)>>1] = val;
@@
-182,7
+182,7
@@
void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
////////////////////////////////////////////////////////////////////////
\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;
@@
-252,7
+252,7
@@
void CALLBACK SPUwriteDMA(unsigned short val)
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)
+void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize
,unsigned int cycles
)
{
int i;
for(i=0;i<iSize;i++)
{
int i;
for(i=0;i<iSize;i++)
@@
-265,7
+265,7
@@
void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
+void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize
,unsigned int cycles
)
{
int i;
for(i=0;i<iSize;i++)
{
int i;
for(i=0;i<iSize;i++)
@@
-280,7
+280,12
@@
void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
// 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)
{
}
{
}
@@
-343,12
+348,13
@@
long CALLBACK SPUtest(void)
return 0;
}
return 0;
}
-void SPUasync(unsigned int cycle)
+void SPUasync(unsigned int cycle
, unsigned int flags
)
{
}
{
}
-
void SPUplayCDDAchannel(short *pcm, int nbytes
)
+
int SPUplayCDDAchannel(short *pcm, int nbytes, unsigned int cycle, int is_start
)
{
{
+ return -1;
}
////////////////////////////////////////////////////////////////////////
}
////////////////////////////////////////////////////////////////////////
@@
-360,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;
}
@@
-412,7
+418,7
@@
typedef struct
////////////////////////////////////////////////////////////////////////
\r
////////////////////////////////////////////////////////////////////////
\r
-long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF)
+long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF
,unsigned int cycles
)
{
int i;
{
int i;
@@
-444,10
+450,10
@@
long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF)
for(i=0;i<0x100;i++)
{
if(i!=H_SPUon1-0xc00 && i!=H_SPUon2-0xc00)
for(i=0;i<0x100;i++)
{
if(i!=H_SPUon1-0xc00 && i!=H_SPUon2-0xc00)
- SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
+ SPUwriteRegister(0x1f801c00+i*2,regArea[i]
,cycles
);
}
}
- SPUwriteRegister(H_SPUon1,regArea[(H_SPUon1-0xc00)/2]);
- SPUwriteRegister(H_SPUon2,regArea[(H_SPUon2-0xc00)/2]);
+ SPUwriteRegister(H_SPUon1,regArea[(H_SPUon1-0xc00)/2]
,cycles
);
+ SPUwriteRegister(H_SPUon2,regArea[(H_SPUon2-0xc00)/2]
,cycles
);
return 1;
}
return 1;
}
@@
-536,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))
+{
+}