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

Fix bug from r1116 [essentially a misplaced jNO_DEFAULT directive]. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1129 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-05-04 02:06:35 +00:00
parent 3a7865ac3f
commit 66a8c03ded
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,10 +399,6 @@ u32 __fastcall iopHwRead32_Page8( u32 addr )
{ {
switch( masked_addr ) switch( masked_addr )
{ {
mcase(HW_SIO2_FIFO): // 0x1f801264 wouldn't make it here, so I assume you mean 01f808264, which is fifo, Jake...
ret = psxHu32(addr);
break;
mcase(HW_SIO2_CTRL): mcase(HW_SIO2_CTRL):
ret = sio2_getCtrl(); ret = sio2_getCtrl();
break; break;
@ -431,15 +427,7 @@ u32 __fastcall iopHwRead32_Page8( u32 addr )
ret = sio2_getIntr(); ret = sio2_getIntr();
break; break;
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: default:
Console::Error("iopHwRead32_Page8: Why are we calling 0x%x?", params addr);
ret = psxHu32(addr); ret = psxHu32(addr);
break; break;
} }

8
pcsx2/windows/VCprojects/pcsx2_2008.vcproj
View File

@ -1584,10 +1584,6 @@
<Filter <Filter
Name="GS" Name="GS"
> >
<File
RelativePath="..\..\Gif.cpp"
>
</File>
<File <File
RelativePath="..\..\GS.cpp" RelativePath="..\..\GS.cpp"
> >
@ -2140,6 +2136,10 @@
<Filter <Filter
Name="DMAC" Name="DMAC"
> >
<File
RelativePath="..\..\Gif.cpp"
>
</File>
<Filter <Filter
Name="Vif" Name="Vif"
> >