summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2018-07-22 20:20:45 +0100
committer smf- <smf-@users.noreply.github.com>2018-07-22 20:21:20 +0100
commit38369086a617978cafac8997289333f72c207399 (patch)
treebb0ce878c60e35fa733c621b5a5377470b062cc4 /src
parentd37ee67533f7f06b13d30475e6b5eeff1c7a6d4c (diff)
Take 2. Use include files to get class definition instead of relying purely on forward declarations to allow building on MSVC, solving the circular reference problem using forward declarations of own classes before the #include where necessary. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/mips/ps2vif1.cpp2
-rw-r--r--src/devices/cpu/mips/ps2vif1.h6
-rw-r--r--src/devices/cpu/mips/ps2vu.cpp2
-rw-r--r--src/devices/cpu/mips/ps2vu.h7
-rw-r--r--src/devices/machine/ps2dma.cpp1
-rw-r--r--src/devices/machine/ps2dma.h3
-rw-r--r--src/devices/machine/ps2intc.cpp3
-rw-r--r--src/devices/machine/ps2intc.h2
-rw-r--r--src/devices/machine/ps2mc.h1
-rw-r--r--src/devices/machine/ps2pad.h1
-rw-r--r--src/devices/video/ps2gif.cpp3
-rw-r--r--src/devices/video/ps2gif.h6
-rw-r--r--src/devices/video/ps2gs.cpp5
-rw-r--r--src/devices/video/ps2gs.h7
14 files changed, 20 insertions, 29 deletions
diff --git a/src/devices/cpu/mips/ps2vif1.cpp b/src/devices/cpu/mips/ps2vif1.cpp
index 203511141b7..d8e7827cdae 100644
--- a/src/devices/cpu/mips/ps2vif1.cpp
+++ b/src/devices/cpu/mips/ps2vif1.cpp
@@ -14,8 +14,6 @@
#include "emu.h"
#include "ps2vif1.h"
-#include "ps2vu.h"
-#include "video/ps2gs.h"
#include "video/ps2gif.h"
DEFINE_DEVICE_TYPE(SONYPS2_VIF1, ps2_vif1_device, "ps2vif1", "PlayStation 2 VIF1")
diff --git a/src/devices/cpu/mips/ps2vif1.h b/src/devices/cpu/mips/ps2vif1.h
index 6241381e7dc..90ec1417ded 100644
--- a/src/devices/cpu/mips/ps2vif1.h
+++ b/src/devices/cpu/mips/ps2vif1.h
@@ -14,8 +14,10 @@
#pragma once
-class ps2_gs_device;
-class sonyvu1_device;
+class ps2_vif1_device;
+
+#include "video/ps2gs.h"
+#include "ps2vu.h"
class ps2_vif1_device : public device_t, public device_execute_interface
{
diff --git a/src/devices/cpu/mips/ps2vu.cpp b/src/devices/cpu/mips/ps2vu.cpp
index 491af559fc9..6f3803b92a0 100644
--- a/src/devices/cpu/mips/ps2vu.cpp
+++ b/src/devices/cpu/mips/ps2vu.cpp
@@ -12,8 +12,6 @@
#include "emu.h"
#include "ps2vu.h"
-#include "ps2vif1.h"
-#include "video/ps2gs.h"
#include "video/ps2gif.h"
#include "vudasm.h"
#include "debugger.h"
diff --git a/src/devices/cpu/mips/ps2vu.h b/src/devices/cpu/mips/ps2vu.h
index 04b94c9a5f1..c2e99668ffd 100644
--- a/src/devices/cpu/mips/ps2vu.h
+++ b/src/devices/cpu/mips/ps2vu.h
@@ -14,8 +14,11 @@
#pragma once
-class ps2_gs_device;
-class ps2_vif1_device;
+class sonyvu0_device;
+class sonyvu1_device;
+
+#include "video/ps2gs.h"
+#include "ps2vif1.h"
enum
{
diff --git a/src/devices/machine/ps2dma.cpp b/src/devices/machine/ps2dma.cpp
index 86cc249798a..678f106025e 100644
--- a/src/devices/machine/ps2dma.cpp
+++ b/src/devices/machine/ps2dma.cpp
@@ -12,7 +12,6 @@
#include "emu.h"
#include "ps2dma.h"
-#include "ps2sif.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/ps2vif1.h"
#include "video/ps2gif.h"
diff --git a/src/devices/machine/ps2dma.h b/src/devices/machine/ps2dma.h
index 1eeec4f4f2a..10470fd52fa 100644
--- a/src/devices/machine/ps2dma.h
+++ b/src/devices/machine/ps2dma.h
@@ -16,8 +16,7 @@
#include "cpu/mips/ps2vu.h"
#include "video/ps2gs.h"
-
-class ps2_sif_device;
+#include "ps2sif.h"
class ps2_dmac_device : public device_t, public device_execute_interface
{
diff --git a/src/devices/machine/ps2intc.cpp b/src/devices/machine/ps2intc.cpp
index 15581ce3936..f9053f60d2d 100644
--- a/src/devices/machine/ps2intc.cpp
+++ b/src/devices/machine/ps2intc.cpp
@@ -12,9 +12,6 @@
#include "emu.h"
#include "ps2intc.h"
-#include "cpu/mips/ps2vu.h"
-
-
DEFINE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device, "ps2intc", "PlayStation 2 EE INTC")
ps2_intc_device::ps2_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/ps2intc.h b/src/devices/machine/ps2intc.h
index 078061fbb9d..f6ec945741e 100644
--- a/src/devices/machine/ps2intc.h
+++ b/src/devices/machine/ps2intc.h
@@ -14,6 +14,8 @@
#pragma once
+class ps2_intc_device;
+
#include "cpu/mips/mips3.h"
class ps2_intc_device : public device_t
diff --git a/src/devices/machine/ps2mc.h b/src/devices/machine/ps2mc.h
index b3f120f62a1..ef38dea72c2 100644
--- a/src/devices/machine/ps2mc.h
+++ b/src/devices/machine/ps2mc.h
@@ -14,7 +14,6 @@
#pragma once
-
class ps2_mc_device : public device_t
{
public:
diff --git a/src/devices/machine/ps2pad.h b/src/devices/machine/ps2pad.h
index dcfb8125052..2b384fd0818 100644
--- a/src/devices/machine/ps2pad.h
+++ b/src/devices/machine/ps2pad.h
@@ -14,7 +14,6 @@
#pragma once
-
class ps2_pad_device : public device_t
{
public:
diff --git a/src/devices/video/ps2gif.cpp b/src/devices/video/ps2gif.cpp
index bfc404d2627..82ee34e267e 100644
--- a/src/devices/video/ps2gif.cpp
+++ b/src/devices/video/ps2gif.cpp
@@ -12,9 +12,6 @@
#include "emu.h"
#include "ps2gif.h"
-#include "ps2gs.h"
-#include "cpu/mips/ps2vu.h"
-
DEFINE_DEVICE_TYPE(SONYPS2_GIF, ps2_gif_device, "ps2gif", "Playstation 2 GIF")
ps2_gif_device::ps2_gif_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/video/ps2gif.h b/src/devices/video/ps2gif.h
index 813a67a4678..d6275d759ac 100644
--- a/src/devices/video/ps2gif.h
+++ b/src/devices/video/ps2gif.h
@@ -14,8 +14,10 @@
#pragma once
-class ps2_gs_device;
-class sonyvu1_device;
+class ps2_gif_device;
+
+#include "ps2gs.h"
+#include "cpu/mips/ps2vu.h"
class ps2_gif_device : public device_t, public device_execute_interface
{
diff --git a/src/devices/video/ps2gs.cpp b/src/devices/video/ps2gs.cpp
index aa83adff58b..79a7653dafa 100644
--- a/src/devices/video/ps2gs.cpp
+++ b/src/devices/video/ps2gs.cpp
@@ -12,11 +12,6 @@
#include "emu.h"
#include "ps2gs.h"
-#include "ps2gif.h"
-#include "machine/ps2intc.h"
-#include "cpu/mips/ps2vu.h"
-
-
DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
/*static*/ const size_t ps2_gs_device::FORMAT_PIXEL_WIDTHS[] = {
diff --git a/src/devices/video/ps2gs.h b/src/devices/video/ps2gs.h
index 77de9f40a6f..a68ae9913df 100644
--- a/src/devices/video/ps2gs.h
+++ b/src/devices/video/ps2gs.h
@@ -14,10 +14,11 @@
#pragma once
+class ps2_gs_device;
-class ps2_intc_device;
-class ps2_gif_device;
-class sonyvu1_device;
+#include "ps2gif.h"
+#include "machine/ps2intc.h"
+#include "cpu/mips/ps2vu.h"
class ps2_gs_device : public device_t
{