From 406ea42c43ef508f10687b0916a1371a6255b023 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 14 Mar 2012 13:10:14 +0000
Subject: [PATCH] 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
---
 pcsx2/CDVD/CDVD.cpp | 3 ---
 pcsx2/IopIrq.cpp    | 4 ----
 pcsx2/Sif0.cpp      | 3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp
index 63550938b7..3a8ab4892b 100644
--- a/pcsx2/CDVD/CDVD.cpp
+++ b/pcsx2/CDVD/CDVD.cpp
@@ -70,7 +70,6 @@ static void cdvdSetIrq( uint id = (1<<Irq_CommandComplete) )
 {
 	cdvd.PwOff |= id;
 	iopIntcIrq( 2 );
-	hwIntcIrq(INTC_SBUS);
 	psxSetNextBranchDelta( 20 );
 }
 
@@ -779,7 +778,6 @@ __fi void cdvdActionInterrupt()
 
 	cdvd.PwOff |= 1<<Irq_CommandComplete;
 	psxHu32(0x1070)|= 0x4;
-	hwIntcIrq(INTC_SBUS);
 }
 
 // inlined due to being referenced in only one place.
@@ -868,7 +866,6 @@ __fi void cdvdReadInterrupt()
 	{
 		cdvd.PwOff |= 1<<Irq_CommandComplete;
 		psxHu32(0x1070)|= 0x4;
-		hwIntcIrq(INTC_SBUS);
 
 		HW_DMA3_CHCR &= ~0x01000000;
 		psxDmaInterrupt(3);
diff --git a/pcsx2/IopIrq.cpp b/pcsx2/IopIrq.cpp
index 6ed9be3ab6..b915db9d8a 100644
--- a/pcsx2/IopIrq.cpp
+++ b/pcsx2/IopIrq.cpp
@@ -23,7 +23,6 @@ void dev9Interrupt()
 	if ((dev9Handler != NULL) && (dev9Handler() != 1)) return;
 
 	iopIntcIrq(13);
-	hwIntcIrq(INTC_SBUS);
 }
 
 void dev9Irq(int cycles)
@@ -36,7 +35,6 @@ void usbInterrupt()
 	if (usbHandler != NULL && (usbHandler() != 1)) return;
 
 	iopIntcIrq(22);
-	hwIntcIrq(INTC_SBUS);
 }
 
 void usbIrq(int cycles)
@@ -47,7 +45,6 @@ void usbIrq(int cycles)
 void fwIrq()
 {
 	iopIntcIrq(24);
-	hwIntcIrq(INTC_SBUS);
 }
 
 void spu2Irq()
@@ -56,7 +53,6 @@ void spu2Irq()
 		Console.Warning("spu2Irq");
 	#endif
 	iopIntcIrq(9);
-	hwIntcIrq(INTC_SBUS);
 }
 
 void iopIntcIrq(uint irqType)
diff --git a/pcsx2/Sif0.cpp b/pcsx2/Sif0.cpp
index 27691e5d15..408c34565b 100644
--- a/pcsx2/Sif0.cpp
+++ b/pcsx2/Sif0.cpp
@@ -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.
 	// Legend of Legaia doesn't throw a warning either :)
 	sif0.ee.end = false;
-        //hwIntcIrq(INTC_SBUS); // not sure, so let's not
-		SIF0Dma();
+	SIF0Dma();
 
 }