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
Use actual labels for input types
[pcsx_rearmed.git]
/
plugins
/
spunull
/
spunull.c
diff --git
a/plugins/spunull/spunull.c
b/plugins/spunull/spunull.c
index
be798c5
..
96bd390
100644
(file)
--- a/
plugins/spunull/spunull.c
+++ b/
plugins/spunull/spunull.c
@@
-59,7
+59,7
@@
void (CALLBACK *cddavCallback)(unsigned short,unsigned 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;
@@
-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++)
@@
-343,12
+343,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)
{
{
+ return -1;
}
////////////////////////////////////////////////////////////////////////
}
////////////////////////////////////////////////////////////////////////
@@
-412,7
+413,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
+445,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;
}