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

Fix compile errors from last commit. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2285 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2009-12-02 14:33:13 +00:00
parent 0f9a600cbd
commit 5c0cbea1c2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/IopHw.h
View File

@ -269,8 +269,7 @@ enum IOPCountRegs
enum IopEventId enum IopEventId
{ {
IopEvt_SIFhack = 1, // The SIF likes to fall asleep and never wake up. This sends intermittent SBUS flags to rewake it. IopEvt_SIFhack = 1 // The SIF likes to fall asleep and never wake up. This sends intermittent SBUS flags to rewake it.
, IopEvt_Cdvd = 5 // General Cdvd commands (Seek, Standby, Break, etc) , IopEvt_Cdvd = 5 // General Cdvd commands (Seek, Standby, Break, etc)
, IopEvt_SIF0 = 9 , IopEvt_SIF0 = 9
, IopEvt_SIF1 = 10 , IopEvt_SIF1 = 10

2
pcsx2/R3000A.cpp
View File

@ -273,7 +273,7 @@ __releaseinline void psxBranchTest()
// No need to execute the SIFhack after cpuExceptions, since these by nature break SIF's // No need to execute the SIFhack after cpuExceptions, since these by nature break SIF's
// thread sleep hangs and allow the IOP to "come back to life." // thread sleep hangs and allow the IOP to "come back to life."
psxRegs.interrupt &= ~IopEvt_SIFhack psxRegs.interrupt &= ~IopEvt_SIFhack;
} }
else if( IopEvt_SIFhack && (psxRegs.interrupt & IopEvt_SIFhack) ) else if( IopEvt_SIFhack && (psxRegs.interrupt & IopEvt_SIFhack) )
{ {