From 79a212a3bce42bb368ba9a3b063a2f65359017b5 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Mon, 25 Jan 2010 16:38:34 +0000 Subject: [PATCH] SIF: - Adjust the IRQ cycles so ecco boots again. - Also stopped it from doing IRQ when the cycle counts are zero, since that >should< mean we had no transfer. In fact our SIF is commonly doing 0 sized memcpy's, probably due to the wrong approach we took with it. - Note that this could break games, so please test! (It does fix Eternal Poison though.) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2521 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/Sif.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pcsx2/Sif.cpp b/pcsx2/Sif.cpp index e81fabc719..3b13915bfc 100644 --- a/pcsx2/Sif.cpp +++ b/pcsx2/Sif.cpp @@ -250,8 +250,8 @@ static __forceinline void SIF0EEend(int &cycles) // Stop & signal interrupts on EE sif0.end = 0; eesifbusy[0] = false; - if (cycles == 0) DevCon.Warning("EESIF0cycles = 0"); - CPU_INT(5, cycles*BIAS); + if (cycles == 0) DevCon.Warning("EESIF0cycles = 0"); // No transfer happened + else CPU_INT(5, cycles*BIAS); // Hence no Interrupt } static __forceinline void SIF1EEend(int &cycles) @@ -263,8 +263,8 @@ static __forceinline void SIF1EEend(int &cycles) // Voodoocycles : Okami wants around 100 cycles when booting up // Other games reach like 50k cycles here, but the EE will long have given up by then and just retry. // (Cause of double interrupts on the EE) - if (cycles == 0) DevCon.Warning("EESIF1cycles = 0"); - CPU_INT(6, min((int)(cycles*BIAS), 384)); + if (cycles == 0) DevCon.Warning("EESIF1cycles = 0"); // No transfer happened + else CPU_INT(6, min((int)(cycles*BIAS), 384)); // Hence no Interrupt (fixes Eternal Poison reboot when selecting new game) } static __forceinline void SIF0IOPend(int &psxCycles) @@ -276,8 +276,8 @@ static __forceinline void SIF0IOPend(int &psxCycles) // iop is 1/8th the clock rate of the EE and psxcycles is in words (not quadwords) // So when we're all done, the equation looks like thus: //PSX_INT(IopEvt_SIF0, ( ( psxCycles*BIAS ) / 4 ) / 8); - if (psxCycles == 0) DevCon.Warning("IOPSIF0cycles = 0"); - PSX_INT(IopEvt_SIF0, psxCycles); + if (psxCycles == 0) DevCon.Warning("IOPSIF0cycles = 0"); // No transfer happened + else PSX_INT(IopEvt_SIF0, psxCycles); // Hence no Interrupt } static __forceinline void SIF1IOPend(int &psxCycles) @@ -290,8 +290,8 @@ static __forceinline void SIF1IOPend(int &psxCycles) //The *24 are needed for ecco the dolphin (CDVD hangs) and silver surfer (Pad not detected) //Greater than *35 break rebooting when trying to play Tekken5 arcade history //Total cycles over 1024 makes SIF too slow to keep up the sound stream in so3... - if (psxCycles == 0) DevCon.Warning("IOPSIF1cycles = 0"); - PSX_INT(IopEvt_SIF1, min((psxCycles * 24), 1024)); + if (psxCycles == 0) DevCon.Warning("IOPSIF1cycles = 0"); // No transfer happened + else PSX_INT(IopEvt_SIF1, min((psxCycles * 26), 1024)); // Hence no Interrupt } //General format of all the SIF#(EE/IOP)Dma functions is this: