diff options
| author | Twinaphex | 2014-12-20 20:43:18 +0100 |
|---|---|---|
| committer | Twinaphex | 2014-12-20 20:43:18 +0100 |
| commit | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch) | |
| tree | d38e169e68e48a3ccbf8a3805f9cb87197ed894a /plugins/spunull | |
| parent | 3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff) | |
| parent | 7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff) | |
| download | pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2 pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip | |
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'plugins/spunull')
| -rw-r--r-- | plugins/spunull/spunull.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/spunull/spunull.c b/plugins/spunull/spunull.c index 4390be3..96bd390 100644 --- a/plugins/spunull/spunull.c +++ b/plugins/spunull/spunull.c @@ -59,7 +59,7 @@ void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0; // 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; @@ -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++) @@ -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++) @@ -343,7 +343,7 @@ long CALLBACK SPUtest(void) return 0; } -void SPUasync(unsigned int cycle) +void SPUasync(unsigned int cycle, unsigned int flags) { } @@ -413,7 +413,7 @@ typedef struct ////////////////////////////////////////////////////////////////////////
-long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF) +long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF,unsigned int cycles) { int i; @@ -445,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) - 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; } |