Remove IopCommon.h added proper includes to files. Removing circle includes in several files that sometimes was several layers deep

pcsx2/CDVD/BlockdumpFileReader.cpp

@@ -15,7 +15,6 @@
 
 #include "PrecompiledHeader.h"
 #include "AsyncFileReader.h"
-#include "IopCommon.h"
 #include "IsoFileFormats.h"
 #include "common/FileSystem.h"
 

pcsx2/CDVD/CDVD.cpp

@@ -14,7 +14,10 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
+#include "IopHw.h"
+#include "IopDma.h"
 
 #include <memory>
 #include <ctype.h>
@@ -433,7 +436,6 @@ static __fi void _reloadElfInfo(wxString elfpath)
 	// binary).
 }
 
-
 static __fi void _reloadPSXElfInfo(wxString elfpath)
 {
 	// Now's a good time to reload the ELF info...

pcsx2/CDVD/CDVD.h

@@ -17,7 +17,6 @@
 #pragma once
 
 
-#include "IopCommon.h"
 #include "CDVDaccess.h"
 
 #define btoi(b) ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */

pcsx2/CDVD/CDVDaccess.cpp

@@ -15,7 +15,6 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
 
 #define ENABLE_TIMESTAMPS
 

pcsx2/CDVD/CDVDdiscReader.cpp

@@ -15,6 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "CDVDdiscReader.h"
+#include "CDVD/CDVD.h"
 
 #include <condition_variable>
 

pcsx2/CDVD/CDVDdiscReader.h

@@ -16,7 +16,6 @@
 #ifndef __CDVD_DISC_READER_H__
 #define __CDVD_DISC_READER_H__
 
-#include "IopCommon.h"
 
 #if defined(_WIN32)
 #define NOMINMAX

pcsx2/CDVD/CDVDdiscThread.cpp

@@ -15,6 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "CDVDdiscReader.h"
+#include "CDVD/CDVD.h"
 
 #include <atomic>
 #include <condition_variable>

pcsx2/CDVD/CDVDisoReader.cpp

@@ -24,6 +24,7 @@
 
 #include "CDVDisoReader.h"
 #include "AsyncFileReader.h"
+#include "CDVD/CDVD.h"
 
 #include <cstring>
 #include <array>

pcsx2/CDVD/CDVDisoReader.h

@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 
-#include "IopCommon.h"
 #include "IsoFileFormats.h"
 
 #endif

pcsx2/CDVD/CdRom.cpp

@@ -14,10 +14,13 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 
 #include "CdRom.h"
 #include "CDVD.h"
+#include "IopHw.h"
+#include "IopDma.h"
 
 //THIS ALL IS FOR THE CDROM REGISTERS HANDLING
 

pcsx2/CDVD/CdRom.h

@@ -16,7 +16,6 @@
 #ifndef __CDROM_H__
 #define __CDROM_H__
 
-#include "IopCommon.h"
 #include "CDVDaccess.h"
 
 // Not used.

pcsx2/CDVD/InputIsoFile.cpp

@@ -15,7 +15,6 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
 #include "IsoFileFormats.h"
 
 #include <errno.h>

pcsx2/CDVD/Linux/IOCtlSrc.cpp

@@ -15,6 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "CDVD/CDVDdiscReader.h"
+#include "CDVD/CDVD.h"
 
 #ifdef __linux__
 #include <linux/cdrom.h>

pcsx2/CDVD/OutputIsoFile.cpp

@@ -15,7 +15,6 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
 #include "IsoFileFormats.h"
 #include "common/FileSystem.h"
 #include "common/StringUtil.h"

pcsx2/CDVD/Windows/IOCtlSrc.cpp

@@ -15,6 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "CDVD/CDVDdiscReader.h"
+#include "CDVD/CDVD.h"
 
 #include <winioctl.h>
 #include <ntddcdvd.h>

pcsx2/CMakeLists.txt

@@ -213,7 +213,6 @@ set(pcsx2Headers
 	HostDisplay.h
 	Hw.h
 	IopBios.h
-	IopCommon.h
 	IopCounters.h
 	IopDma.h
 	IopGte.h

pcsx2/Dump.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "Common.h"
 
 #include "Counters.h"
 #include "iCore.h"

pcsx2/FW.cpp

@@ -14,7 +14,8 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "IopDma.h"
+#include "R3000A.h"
 #include <stdlib.h>
 #include <string>
 using namespace std;

pcsx2/Hw.cpp

@@ -20,7 +20,6 @@
 #include "newVif.h"
 #include "IPU/IPUdma.h"
 #include "Gif_Unit.h"
-#include "IopCommon.h"
 #include "SPU2/spu2.h"
 
 using namespace R5900;

pcsx2/HwRead.cpp

@@ -17,7 +17,7 @@
 #include "PrecompiledHeader.h"
 #include "Common.h"
 #include "Hardware.h"
-#include "IopCommon.h"
+#include "IopHw.h"
 #include "ps2/HwInternal.h"
 #include "ps2/eeHwTraceLog.inl"
 

pcsx2/HwWrite.cpp

@@ -18,7 +18,8 @@
 #include "Common.h"
 #include "Hardware.h"
 #include "Gif_Unit.h"
-#include "IopCommon.h"
+#include "IopMem.h"
+
 #include "ps2/HwInternal.h"
 #include "ps2/eeHwTraceLog.inl"
 
@@ -26,6 +27,9 @@
 #include "SPU2/spu2.h"
 #include "R3000A.h"
 
+#include "CDVD/CdRom.h"
+#include "CDVD/CDVD.h"
+
 using namespace R5900;
 
 // Shift the middle 8 bits (bits 4-12) into the lower 8 bits.

pcsx2/IPU/IPU.h

@@ -17,6 +17,7 @@
 
 #include "IPU_Fifo.h"
 #include "IPUdma.h"
+#include "Common.h"
 
 #define ipumsk( src ) ( (src) & 0xff )
 #define ipucase( src ) case ipumsk(src)

pcsx2/IopBios.cpp

@@ -15,8 +15,11 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "R5900.h" // for g_GameStarted
+#include "IopBios.h"
+#include "IopMem.h"
 
 #include <ctype.h>
 #include <string.h>

pcsx2/IopCommon.h

@@ -1,36 +0,0 @@
-/*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2010  PCSX2 Dev Team
- *
- *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU Lesser General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with PCSX2.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "R3000A.h"
-#include "Common.h"
-
-#include "CDVD/CDVD.h"
-#include "CDVD/CdRom.h"
-
-#include "IopDma.h"
-#include "IopMem.h"
-#include "IopHw.h"
-#include "IopBios.h"
-#include "IopCounters.h"
-#include "IopSio2.h"
-#include "IopGte.h"
-//#define PSXCLK	 9216000	/* 36.864 Mhz */
-//#define PSXCLK	186864000	/* 36.864 Mhz */
-
-// Uncomment to make pcsx2 print each spu2 interrupt it receives
-//#define SPU2IRQTEST
-

pcsx2/IopCounters.cpp

@@ -19,10 +19,14 @@
 // The EventText function will pick it up.
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "SPU2/spu2.h"
 #include "DEV9/DEV9.h"
 #include "USB/USB.h"
+#include "IopHw.h"
+#include "IopDma.h"
+#include "CDVD/CDVD.h"
 
 #include <math.h>
 

pcsx2/IopDma.cpp

@@ -14,8 +14,12 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "SPU2/spu2.h"
+#include "IopCounters.h"
+#include "IopHw.h"
+#include "IopDma.h"
 
 #include "Sif.h"
 #include "DEV9/DEV9.h"

pcsx2/IopGte.cpp

@@ -18,8 +18,9 @@
 //#include <stdlib.h>
 //#include <math.h>
 #include "IopGte.h"
-//#include "R3000A.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "IopMem.h"
+
 #include "common/MathUtils.h"
 #ifdef GTE_DUMP
 #define G_OP(name,delay) fprintf(gteLog, "* : %08X : %02d : %s\n", psxRegs.code, delay, name);

pcsx2/IopHw.cpp

@@ -15,11 +15,19 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 
 #include "iR5900.h"
 #include "Sio.h"
 #include "Mdec.h"
+#include "IopSio2.h"
+#include "IopCounters.h"
+#include "IopHw.h"
+#include "IopDma.h"
+#include "CDVD/CdRom.h"
+#include "CDVD/CDVD.h"
+
 
 // NOTE: Any modifications to read/write fns should also go into their const counterparts
 // found in iPsxHw.cpp.

pcsx2/IopIrq.cpp

@@ -14,9 +14,12 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
 #include "DEV9/DEV9.h"
 #include "USB/USB.h"
+#include "IopHw.h"
+#include "IopDma.h"
+#include "Common.h"
+#include "R3000A.h"
 
 using namespace R3000A;
 

pcsx2/IopMem.cpp

@@ -15,10 +15,12 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "ps2/pgif.h" // for PSX kernel TTY in iopMemWrite32
 #include "SPU2/spu2.h"
 #include "DEV9/DEV9.h"
+#include "IopHw.h"
 
 uptr *psxMemWLUT = NULL;
 const uptr *psxMemRLUT = NULL;

pcsx2/IopSio2.cpp

@@ -15,10 +15,13 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "Common.h"
 
 #include "Sio.h"
 #include "sio_internal.h"
+#include "IopSio2.h"
+#include "IopHw.h"
+#include "IopDma.h"
 
 sio2Struct sio2;
 

pcsx2/Mdec.cpp

@@ -22,9 +22,10 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "Common.h"
 
-#include "IopCommon.h"
 #include "Mdec.h"
+#include "IopHw.h"
 
 struct {
 	u32 command;

pcsx2/Memory.cpp

@@ -37,7 +37,7 @@ BIOS
 #include "PrecompiledHeader.h"
 #include <wx/file.h>
 
-#include "IopCommon.h"
+#include "IopHw.h"
 #include "GS.h"
 #include "VUmicro.h"
 #include "MTVU.h"

pcsx2/Patch.cpp

@@ -18,7 +18,6 @@
 #define _PC_ // disables MIPS opcode macros.
 
 #include "common/StringUtil.h"
-#include "IopCommon.h"
 #include "Patch.h"
 #include "Config.h"
 

pcsx2/Patch_Memory.cpp

@@ -17,8 +17,9 @@
 
 #define _PC_	// disables MIPS opcode macros.
 
-#include "IopCommon.h"
+#include "Common.h"
 #include "Patch.h"
+#include "IopMem.h"
 
 u32 SkipCount = 0, IterationCount = 0;
 u32 IterationIncrement = 0, ValueIncrement = 0;

pcsx2/R3000A.cpp

@@ -15,12 +15,20 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 
 #include "Sio.h"
 #include "Sif.h"
 #include "DebugTools/Breakpoints.h"
 #include "R5900OpcodeTables.h"
+#include "IopSio2.h"
+#include "IopCounters.h"
+#include "IopBios.h"
+#include "IopHw.h"
+#include "IopDma.h"
+#include "CDVD/CdRom.h"
+#include "CDVD/CDVD.h"
 
 using namespace R3000A;
 

pcsx2/R3000AInterpreter.cpp

@@ -15,12 +15,15 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "Config.h"
 #include "System/SysThreads.h"
 
 #include "R5900OpcodeTables.h"
 #include "DebugTools/Breakpoints.h"
+#include "IopBios.h"
+#include "IopHw.h"
 
 using namespace R3000A;
 

pcsx2/R3000AOpcodeTables.cpp

@@ -15,7 +15,9 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "IopGte.h"
+#include "IopMem.h"
 
 // Note: Branch instructions of the Interpreter are defined externally because
 // the recompiler shouldn't be using them (it isn't entirely safe, due to the

pcsx2/RDebug/deci2_dbgp.cpp

@@ -16,7 +16,6 @@
 
 #include "PrecompiledHeader.h"
 
-#include "IopCommon.h"
 #include "VUmicro.h"
 #include "deci2.h"
 

pcsx2/RDebug/deci2_iloadp.cpp

@@ -16,7 +16,6 @@
 
 #include "PrecompiledHeader.h"
 
-#include "IopCommon.h"
 #include "IopBios2.h"
 #include "deci2.h"
 

pcsx2/SPU2/Dma.cpp

@@ -16,7 +16,8 @@
 #include "PrecompiledHeader.h"
 #include "Global.h"
 #include "Dma.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "IopHw.h"
 
 #include "spu2.h" // temporary until I resolve cyclePtr/TimeUpdate dependencies.
 

pcsx2/SPU2/spu2.h

@@ -17,6 +17,7 @@
 
 #include "common/Threading.h"
 #include "SaveState.h"
+#include "IopCounters.h"
 
 extern Threading::MutexRecursive mtx_SPU2Status;
 

pcsx2/SPU2/spu2sys.cpp

@@ -24,7 +24,9 @@
 #include "Global.h"
 #include "Dma.h"
 #include "IopDma.h"
-#include "IopCommon.h"
+#include "IopCounters.h"
+#include "R3000A.h"
+#include "IopHw.h"
 
 #include "spu2.h" // needed until I figure out a nice solution for irqcallback dependencies.
 

pcsx2/SaveState.cpp

@@ -15,7 +15,7 @@
 
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
 #include "SaveState.h"
 
 #include "ps2/BiosTools.h"
@@ -24,6 +24,7 @@
 #include "MTVU.h"
 #include "Cache.h"
 #include "Config.h"
+#include "CDVD/CDVD.h"
 
 #include "Elfheader.h"
 #include "Counters.h"

pcsx2/Sif.cpp

@@ -17,7 +17,8 @@
 
 #define _PC_	// disables MIPS opcode macros.
 
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "Sif.h"
 
 void sifReset()

pcsx2/Sif0.cpp

@@ -17,8 +17,10 @@
 
 #define _PC_	// disables MIPS opcode macros.
 
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "Sif.h"
+#include "IopHw.h"
 
 _sif sif0;
 

pcsx2/Sif1.cpp

@@ -17,8 +17,10 @@
 
 #define _PC_	// disables MIPS opcode macros.
 
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "Sif.h"
+#include "IopHw.h"
 
 _sif sif1;
 

pcsx2/Sio.cpp

@@ -14,7 +14,9 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "IopHw.h"
+#include "IopDma.h"
 
 #include "Common.h"
 #include "Sio.h"

pcsx2/System.cpp

@@ -15,7 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "Common.h"
-#include "IopCommon.h"
+#include "R3000A.h"
 #include "VUmicro.h"
 #include "newVif.h"
 #include "MTVU.h"
@@ -26,6 +26,7 @@
 
 #include "common/MemsetFast.inl"
 #include "common/Perf.h"
+#include "CDVD/CDVD.h"
 
 #ifdef PCSX2_CORE
 #include "GSDumpReplayer.h"

pcsx2/pcsx2.vcxproj

@@ -1001,7 +1001,6 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="Config.h" />
     <ClInclude Include="Dump.h" />
-    <ClInclude Include="IopCommon.h" />
     <ClInclude Include="SaveState.h" />
     <ClInclude Include="SingleRegisterTypes.h" />
     <ClInclude Include="System.h" />

pcsx2/pcsx2.vcxproj.filters

@@ -1795,9 +1795,6 @@
     <ClInclude Include="Dump.h">
       <Filter>System\Include</Filter>
     </ClInclude>
-    <ClInclude Include="IopCommon.h">
-      <Filter>System\Include</Filter>
-    </ClInclude>
     <ClInclude Include="SaveState.h">
       <Filter>System\Include</Filter>
     </ClInclude>

pcsx2/pcsx2core.vcxproj

@@ -627,7 +627,6 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="Config.h" />
     <ClInclude Include="Dump.h" />
-    <ClInclude Include="IopCommon.h" />
     <ClInclude Include="SaveState.h" />
     <ClInclude Include="SingleRegisterTypes.h" />
     <ClInclude Include="System.h" />

pcsx2/pcsx2core.vcxproj.filters

@@ -1283,9 +1283,6 @@
     <ClInclude Include="Dump.h">
       <Filter>System\Include</Filter>
     </ClInclude>
-    <ClInclude Include="IopCommon.h">
-      <Filter>System\Include</Filter>
-    </ClInclude>
     <ClInclude Include="SaveState.h">
       <Filter>System\Include</Filter>
     </ClInclude>

pcsx2/ps2/Iop/IopHwRead.cpp

@@ -23,6 +23,9 @@
 #include "SPU2/spu2.h"
 #include "DEV9/DEV9.h"
 #include "USB/USB.h"
+#include "IopCounters.h"
+#include "IopSio2.h"
+#include "IopDma.h"
 
 #include "ps2/pgif.h"
 #include "Mdec.h"

pcsx2/ps2/Iop/IopHwWrite.cpp

@@ -22,6 +22,10 @@
 #include "SPU2/spu2.h"
 #include "DEV9/DEV9.h"
 #include "USB/USB.h"
+#include "IopCounters.h"
+#include "IopSio2.h"
+#include "IopDma.h"
+#include "R3000A.h"
 
 #include "ps2/pgif.h"
 #include "Mdec.h"

pcsx2/ps2/Iop/IopHw_Internal.h

@@ -15,7 +15,8 @@
 
 #pragma once
 
-#include "IopCommon.h"
+#include "Common.h"
+#include "IopHw.h"
 
 namespace IopMemory {
 namespace Internal {

pcsx2/ps2/Iop/PsxBios.cpp

@@ -14,7 +14,9 @@
 */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
+#include "Common.h"
+#include "R3000A.h"
+#include "IopMem.h"
 
 static std::string psxout_buf;
 

pcsx2/ps2/pgif.cpp

@@ -18,6 +18,9 @@
 #include "ps2/Iop/IopHw_Internal.h"
 #include "ps2/HwInternal.h"
 #include "ps2/pgif.h"
+#include "IopHw.h"
+#include "IopDma.h"
+#include "Common.h"
 
 //NOTES (TODO):
 /*

pcsx2/sif2.cpp

@@ -17,8 +17,10 @@
 
 #define _PC_	// disables MIPS opcode macros.
 
-#include "IopCommon.h"
+#include "R3000A.h"
+#include "Common.h"
 #include "Sif.h"
+#include "IopHw.h"
 
 _sif sif2;
 

pcsx2/sio_internal.h

@@ -14,6 +14,7 @@
  */
 
 #pragma once
+#include "IopSio2.h"
 
 // sio_internal.h -- contains defines and structs used by sio and sio2, which
 // are of little or no use to the rest of the world.

pcsx2/windows/VCprojects/IopSif.cpp

@@ -14,8 +14,8 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "IopCommon.h"
 
+#include "Common.h"
 #include "Sif.h"
 
 #if FALSE

pcsx2/x86/iR3000A.cpp

@@ -21,10 +21,14 @@
 #include "PrecompiledHeader.h"
 
 #include "iR3000A.h"
+#include "R3000A.h"
 #include "BaseblockEx.h"
 #include "System/RecTypes.h"
 #include "System/SysThreads.h"
 #include "R5900OpcodeTables.h"
+#include "IopBios.h"
+#include "IopHw.h"
+#include "Common.h"
 
 #include <time.h>
 
@@ -32,7 +36,6 @@
 #include <sys/types.h>
 #endif
 
-#include "IopCommon.h"
 #include "iCore.h"
 
 #include "Config.h"

pcsx2/x86/iR3000Atables.cpp

@@ -17,10 +17,10 @@
 #include "PrecompiledHeader.h"
 #include <time.h>
 
-#include "IopCommon.h"
 #include "iR3000A.h"
 #include "IopMem.h"
 #include "IopDma.h"
+#include "IopGte.h"
 
 using namespace x86Emitter;
 

pcsx2/x86/ix86-32/iR5900-32.cpp

@@ -17,6 +17,7 @@
 
 #include "Common.h"
 #include "Memory.h"
+#include "R3000A.h"
 
 #include "R5900Exceptions.h"
 #include "R5900OpcodeTables.h"