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

Tests with Grandia Extreme's debugger suggest that SBUS interrupts *never* fire. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5128 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2012-03-14 13:10:14 +00:00
parent ef37720cb9
commit 406ea42c43
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/CDVD/CDVD.cpp
View File

@ -70,7 +70,6 @@ static void cdvdSetIrq( uint id = (1<<Irq_CommandComplete) )
{ {
cdvd.PwOff |= id; cdvd.PwOff |= id;
iopIntcIrq( 2 ); iopIntcIrq( 2 );
hwIntcIrq(INTC_SBUS);
psxSetNextBranchDelta( 20 ); psxSetNextBranchDelta( 20 );
} }
@ -779,7 +778,6 @@ __fi void cdvdActionInterrupt()
cdvd.PwOff |= 1<<Irq_CommandComplete; cdvd.PwOff |= 1<<Irq_CommandComplete;
psxHu32(0x1070)|= 0x4; psxHu32(0x1070)|= 0x4;
hwIntcIrq(INTC_SBUS);
} }
// inlined due to being referenced in only one place. // inlined due to being referenced in only one place.
@ -868,7 +866,6 @@ __fi void cdvdReadInterrupt()
{ {
cdvd.PwOff |= 1<<Irq_CommandComplete; cdvd.PwOff |= 1<<Irq_CommandComplete;
psxHu32(0x1070)|= 0x4; psxHu32(0x1070)|= 0x4;
hwIntcIrq(INTC_SBUS);
HW_DMA3_CHCR &= ~0x01000000; HW_DMA3_CHCR &= ~0x01000000;
psxDmaInterrupt(3); psxDmaInterrupt(3);

4
pcsx2/IopIrq.cpp
View File

@ -23,7 +23,6 @@ void dev9Interrupt()
if ((dev9Handler != NULL) && (dev9Handler() != 1)) return; if ((dev9Handler != NULL) && (dev9Handler() != 1)) return;
iopIntcIrq(13); iopIntcIrq(13);
hwIntcIrq(INTC_SBUS);
} }
void dev9Irq(int cycles) void dev9Irq(int cycles)
@ -36,7 +35,6 @@ void usbInterrupt()
if (usbHandler != NULL && (usbHandler() != 1)) return; if (usbHandler != NULL && (usbHandler() != 1)) return;
iopIntcIrq(22); iopIntcIrq(22);
hwIntcIrq(INTC_SBUS);
} }
void usbIrq(int cycles) void usbIrq(int cycles)
@ -47,7 +45,6 @@ void usbIrq(int cycles)
void fwIrq() void fwIrq()
{ {
iopIntcIrq(24); iopIntcIrq(24);
hwIntcIrq(INTC_SBUS);
} }
void spu2Irq() void spu2Irq()
@ -56,7 +53,6 @@ void spu2Irq()
Console.Warning("spu2Irq"); Console.Warning("spu2Irq");
#endif #endif
iopIntcIrq(9); iopIntcIrq(9);
hwIntcIrq(INTC_SBUS);
} }
void iopIntcIrq(uint irqType) void iopIntcIrq(uint irqType)

3
pcsx2/Sif0.cpp
View File

@ -359,7 +359,6 @@ __fi void dmaSIF0()
// (as it should always be at the beginning of a DMA). using "if iop is busy" flags breaks Tom Clancy Rainbow Six. // (as it should always be at the beginning of a DMA). using "if iop is busy" flags breaks Tom Clancy Rainbow Six.
// Legend of Legaia doesn't throw a warning either :) // Legend of Legaia doesn't throw a warning either :)
sif0.ee.end = false; sif0.ee.end = false;
//hwIntcIrq(INTC_SBUS); // not sure, so let's not SIF0Dma();
SIF0Dma();
} }