ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Atn Jake: Please review. Quick patch to counter problems reported with r1116. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1123 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-03 05:28:13 +00:00
parent a65543399c
commit 8504f4e9bd
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Misc.cpp
View File

@ -437,7 +437,7 @@ void CycleFrameLimit(int dir)
const char* limitMsg; const char* limitMsg;
u32 newOptions; u32 newOptions;
u32 curFrameLimit = Config.Options & PCSX2_FRAMELIMIT_MASK; u32 curFrameLimit = Config.Options & PCSX2_FRAMELIMIT_MASK;
u32 newFrameLimit; u32 newFrameLimit = 0;
static u32 oldFrameLimit = PCSX2_FRAMELIMIT_LIMIT; static u32 oldFrameLimit = PCSX2_FRAMELIMIT_LIMIT;
if( dir == 0 ) { if( dir == 0 ) {

14
pcsx2/ps2/Iop/IopHwRead.cpp
View File

@ -399,7 +399,7 @@ u32 __fastcall iopHwRead32_Page8( u32 addr )
{ {
switch( masked_addr ) switch( masked_addr )
{ {
mcase(0x1f801264): // unknown / reserved. mcase(HW_SIO2_FIFO): // 0x1f801264 wouldn't make it here, so I assume you mean 01f808264, which is fifo, Jake...
ret = psxHu32(addr); ret = psxHu32(addr);
break; break;
@ -431,7 +431,17 @@ u32 __fastcall iopHwRead32_Page8( u32 addr )
ret = sio2_getIntr(); ret = sio2_getIntr();
break; break;
jNO_DEFAULT; mcase(0x1f80847c): // I'm adding this to try to counter reports of pcsx2 crashing when this address is called.
Console::Error("iopHwRead32_Page8: Calling 0x1f80847c for some unknown reason.");
ret = psxHu32(addr);
break;
// Do we really want to assert here, if it's an unknown address?
//jNO_DEFAULT;
default:
Console::Error("iopHwRead32_Page8: Why are we calling 0x%x?", params addr);
ret = psxHu32(addr);
break;
} }
} }
} }