summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-01-07 19:39:56 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-01-07 19:39:56 +0000
commit4f41d64f32bd76791d7c9689cf7746cd4d9d1eec (patch)
tree0e602a8099ec1bebc973b0f0629377faa3d38d75 /plugins
parent72ccda92aa0635788d340994bfdaa895379bd1b3 (diff)
downloadpcsxr-4f41d64f32bd76791d7c9689cf7746cd4d9d1eec.tar.gz
Caetla crash fix;
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82088 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/dfsound/registers.c3
-rwxr-xr-xplugins/dfsound/spu.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 9edd9e6e..f8943cf2 100755
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -454,6 +454,9 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
switch(r)
{
+ case H_SPUaddr:
+ return spuAddr>>3;
+
case H_SPUctrl:
return spuCtrl;
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 4dcb00b5..b8a04b74 100755
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -122,7 +122,7 @@ unsigned int bIrqHit = 0;
unsigned short spuCtrl=0; // some vars to store psx reg infos
unsigned short spuStat=0;
unsigned short spuIrq=0;
-unsigned long spuAddr=0xffffffff; // address into spu mem
+unsigned long spuAddr=0x200; // address into spu mem
int bEndThread=0; // thread handlers
int bThreadEnded=0;
int bSpuInit=0;
@@ -1333,7 +1333,7 @@ long CALLBACK SPUinit(void)
iVolume = 3;
iReverbOff = -1;
spuIrq = 0;
- spuAddr = 0xffffffff;
+ spuAddr = 0x200;
bEndThread = 0;
bThreadEnded = 0;
spuMemC = (unsigned char *)spuMem;