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

Removed internal iop event enum assignments which just confuse readers and 

traces of an old hack.
This commit is contained in:
Pseudonym 2016-10-11 18:52:05 +01:00
parent 679f3347bb
commit 733fd79f46
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcsx2/IopHw.h
View File

@ -312,19 +312,18 @@ static dma_mbc& hw_dma12 = (dma_mbc&) iopHw[0x1550];
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_SIF2,
, IopEvt_SIF2 = 2 IopEvt_Cdvd, // General Cdvd commands (Seek, Standby, Break, etc)
, IopEvt_Cdvd = 5 // General Cdvd commands (Seek, Standby, Break, etc) IopEvt_SIF0,
, IopEvt_SIF0 = 9 IopEvt_SIF1,
, IopEvt_SIF1 = 10 IopEvt_Dma11,
, IopEvt_Dma11 = 11 IopEvt_Dma12,
, IopEvt_Dma12 = 12 IopEvt_SIO,
, IopEvt_SIO = 16 IopEvt_Cdrom,
, IopEvt_Cdrom = 17 IopEvt_CdromRead,
, IopEvt_CdromRead = 18 IopEvt_CdvdRead,
, IopEvt_CdvdRead = 19 IopEvt_DEV9,
, IopEvt_DEV9 = 20 IopEvt_USB,
, IopEvt_USB = 21
}; };
extern void PSX_INT( IopEventId n, s32 ecycle); extern void PSX_INT( IopEventId n, s32 ecycle);

4
pcsx2/R3000A.cpp
View File

@ -221,10 +221,6 @@ __ri void iopEventTest()
PSXCPU_LOG("Interrupt: %x %x", psxHu32(0x1070), psxHu32(0x1074)); PSXCPU_LOG("Interrupt: %x %x", psxHu32(0x1070), psxHu32(0x1074));
psxException(0, 0); psxException(0, 0);
iopEventAction = true; iopEventAction = true;
// 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."
psxRegs.interrupt &= ~IopEvt_SIFhack;
} }
} }
} }