Core: Refactor code for shutting down internal PS2 components.

pcsx2/Hw.cpp

@@ -18,7 +18,6 @@
 
 #include "Hardware.h"
 #include "newVif.h"
-#include "IPU/IPUdma.h"
 #include "Gif_Unit.h"
 #include "SPU2/spu2.h"
 
@@ -76,8 +75,8 @@ void hwReset()
 	vif0Reset();
 	vif1Reset();
 	gif_fifo.init();
-	// needed for legacy DMAC
-	ipuDmaReset();
+	rcntInit();
+
 }
 
 __fi uint intcInterrupt()

pcsx2/IPU/IPU.cpp

@@ -75,6 +75,7 @@ void ipuReset()
 
 	ipu_fifo.init();
 	ipu_cmd.clear();
+	ipuDmaReset();
 }
 
 void ReportIPU()

pcsx2/R5900.cpp

@@ -101,10 +101,10 @@ void cpuReset()
 	EEsCycle = 0;
 	EEoCycle = cpuRegs.cycle;
 
-	pgifInit();
-	hwReset();
-	rcntInit();
 	psxReset();
+	pgifInit();
+
+	hwReset();
 
 	extern void Deci2Reset();		// lazy, no good header for it yet.
 	Deci2Reset();
@@ -130,11 +130,6 @@ void cpuReset()
 	g_eeloadMain = 0, g_eeloadExec = 0, g_osdsys_str = 0;
 }
 
-void cpuShutdown()
-{
-	hwShutdown();
-}
-
 __ri void cpuException(u32 code, u32 bd)
 {
 	bool errLevel2, checkStatus;

pcsx2/System.cpp

@@ -473,6 +473,8 @@ void SysMainMemory::DecommitAll()
 	// to the ring. Let's call it an extra safety valve :)
 	vu1Thread.Reset();
 
+	hwShutdown();
+
 	m_ee.Decommit();
 	m_iop.Decommit();
 	m_vu.Decommit();