summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2018-05-15 14:53:07 +0700
committer Vas Crabb <cuavas@users.noreply.github.com>2018-05-15 17:53:07 +1000
commit44d80b6fb038216e410ab633ec80d7e8b2dd7bd2 (patch)
tree7345c41c047145e8072d46fe39537ba1e22549e0 /src/devices
parent37c6acfdad3fddcc28b0589bd61b523d26e40df7 (diff)
proposal: move z80daisy* to devices/machine (#3572)
* proposal: move z80daisy* to devices/machine Seems to me this is a machine, not a CPU? Main reason was to stop the Z80 CPU from being dragged into systems that don't have one just because they use a Z80 family peripheral. * missed this one (nw) * missed a spot (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/abcbus/fd2.h2
-rw-r--r--src/devices/bus/abcbus/hdc.h2
-rw-r--r--src/devices/bus/abcbus/lux10828.h2
-rw-r--r--src/devices/bus/abcbus/lux21046.h2
-rw-r--r--src/devices/bus/abcbus/lux21056.h2
-rw-r--r--src/devices/bus/ecbbus/grip.h2
-rw-r--r--src/devices/bus/imi7000/imi5000h.h2
-rw-r--r--src/devices/bus/tiki100/exp.h2
-rw-r--r--src/devices/cpu/z180/z180.h2
-rw-r--r--src/devices/cpu/z80/z80.h2
-rw-r--r--src/devices/machine/ldv1000.cpp2
-rw-r--r--src/devices/machine/scnxx562.h2
-rw-r--r--src/devices/machine/z80ctc.cpp1
-rw-r--r--src/devices/machine/z80ctc.h2
-rw-r--r--src/devices/machine/z80daisy.cpp (renamed from src/devices/cpu/z80/z80daisy.cpp)0
-rw-r--r--src/devices/machine/z80daisy.h (renamed from src/devices/cpu/z80/z80daisy.h)9
-rw-r--r--src/devices/machine/z80daisy_generic.cpp (renamed from src/devices/cpu/z80/z80daisy_generic.cpp)0
-rw-r--r--src/devices/machine/z80daisy_generic.h (renamed from src/devices/cpu/z80/z80daisy_generic.h)6
-rw-r--r--src/devices/machine/z80dart.h2
-rw-r--r--src/devices/machine/z80dma.h2
-rw-r--r--src/devices/machine/z80pio.h2
-rw-r--r--src/devices/machine/z80scc.h2
-rw-r--r--src/devices/machine/z80sio.h2
-rw-r--r--src/devices/machine/z80sti.h2
-rw-r--r--src/devices/machine/z8536.h2
25 files changed, 27 insertions, 29 deletions
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index dfe8b3e66e4..b9a2dd85181 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -13,7 +13,7 @@
#include "abcbus.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "formats/abcfd2_dsk.h"
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"
diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h
index a8a1c6ca17b..2f082286fa4 100644
--- a/src/devices/bus/abcbus/hdc.h
+++ b/src/devices/bus/abcbus/hdc.h
@@ -13,7 +13,7 @@
#include "abcbus.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "bus/scsi/scsihd.h"
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index 22a9959402d..7e26d29357a 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -13,7 +13,7 @@
#include "abcbus.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "formats/abc800_dsk.h"
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index 57e60ccabb9..d6964347676 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -13,7 +13,7 @@
#include "abcbus.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "formats/abc800_dsk.h"
#include "machine/wd_fdc.h"
#include "machine/z80dma.h"
diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
index 78e4b0d2b33..8961f8864a6 100644
--- a/src/devices/bus/abcbus/lux21056.h
+++ b/src/devices/bus/abcbus/lux21056.h
@@ -14,7 +14,7 @@
#include "abcbus.h"
#include "bus/scsi/scsi.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80dma.h"
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index 476d97ca9b0..ac8c949440a 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -15,7 +15,7 @@
#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/i8255.h"
#include "machine/keyboard.h"
#include "machine/z80sti.h"
diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h
index b098167ef06..c3e38eea6af 100644
--- a/src/devices/bus/imi7000/imi5000h.h
+++ b/src/devices/bus/imi7000/imi5000h.h
@@ -15,7 +15,7 @@
#include "imi7000.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h
index f849a8c5fb5..5636ce6e5a7 100644
--- a/src/devices/bus/tiki100/exp.h
+++ b/src/devices/bus/tiki100/exp.h
@@ -14,7 +14,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h
index fe8f05f8749..ae1476762a6 100644
--- a/src/devices/cpu/z180/z180.h
+++ b/src/devices/cpu/z180/z180.h
@@ -5,7 +5,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
enum
diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h
index b24e8244309..a1482fc10a4 100644
--- a/src/devices/cpu/z80/z80.h
+++ b/src/devices/cpu/z80/z80.h
@@ -5,7 +5,7 @@
#pragma once
-#include "z80daisy.h"
+#include "machine/z80daisy.h"
#define MCFG_Z80_SET_IRQACK_CALLBACK(_devcb) \
devcb = &downcast<z80_device &>(*device).set_irqack_cb(DEVCB_##_devcb);
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index ad53d21a099..48b8c5d73ce 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -21,7 +21,7 @@
#include "machine/i8255.h"
#include "machine/z80ctc.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
diff --git a/src/devices/machine/scnxx562.h b/src/devices/machine/scnxx562.h
index c47dbaf2798..fe4f5442a87 100644
--- a/src/devices/machine/scnxx562.h
+++ b/src/devices/machine/scnxx562.h
@@ -41,7 +41,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "diserial.h"
//**************************************************************************
diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp
index 7191c864cb9..840855a6ee0 100644
--- a/src/devices/machine/z80ctc.cpp
+++ b/src/devices/machine/z80ctc.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "z80ctc.h"
-#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h
index 76e4e66e2d1..158028c9e9f 100644
--- a/src/devices/machine/z80ctc.h
+++ b/src/devices/machine/z80ctc.h
@@ -28,7 +28,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
//**************************************************************************
diff --git a/src/devices/cpu/z80/z80daisy.cpp b/src/devices/machine/z80daisy.cpp
index 069b1b60b00..069b1b60b00 100644
--- a/src/devices/cpu/z80/z80daisy.cpp
+++ b/src/devices/machine/z80daisy.cpp
diff --git a/src/devices/cpu/z80/z80daisy.h b/src/devices/machine/z80daisy.h
index f0a1bf780cd..439b1022f44 100644
--- a/src/devices/cpu/z80/z80daisy.h
+++ b/src/devices/machine/z80daisy.h
@@ -8,11 +8,10 @@
***************************************************************************/
-#pragma once
-
-#ifndef __Z80DAISY_H__
-#define __Z80DAISY_H__
+#ifndef MAME_MACHINE_Z80DAISY_H
+#define MAME_MACHINE_Z80DAISY_H
+#pragma once
//**************************************************************************
@@ -114,4 +113,4 @@ private:
};
-#endif
+#endif // MAME_MACHINE_Z80DAISY_H
diff --git a/src/devices/cpu/z80/z80daisy_generic.cpp b/src/devices/machine/z80daisy_generic.cpp
index 3a5b6562f30..3a5b6562f30 100644
--- a/src/devices/cpu/z80/z80daisy_generic.cpp
+++ b/src/devices/machine/z80daisy_generic.cpp
diff --git a/src/devices/cpu/z80/z80daisy_generic.h b/src/devices/machine/z80daisy_generic.h
index 24fa5b98d90..e30cef85139 100644
--- a/src/devices/cpu/z80/z80daisy_generic.h
+++ b/src/devices/machine/z80daisy_generic.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef MAME_DEVICES_CPU_Z80_Z80DAISY_GENERIC_H
-#define MAME_DEVICES_CPU_Z80_Z80DAISY_GENERIC_H
+#ifndef MAME_MACHINE_Z80DAISY_GENERIC_H
+#define MAME_MACHINE_Z80DAISY_GENERIC_H
#pragma once
@@ -67,4 +67,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(Z80DAISY_GENERIC, z80daisy_generic_device)
-#endif // MAME_DEVICES_CPU_Z80_Z80DAISY_GENERIC_H
+#endif // MAME_MACHINE_Z80DAISY_GENERIC_H
diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h
index b0fcc13489f..425f353fa0a 100644
--- a/src/devices/machine/z80dart.h
+++ b/src/devices/machine/z80dart.h
@@ -147,7 +147,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "diserial.h"
diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h
index 0cdc020e9ef..d119f3800d8 100644
--- a/src/devices/machine/z80dma.h
+++ b/src/devices/machine/z80dma.h
@@ -34,7 +34,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
//**************************************************************************
diff --git a/src/devices/machine/z80pio.h b/src/devices/machine/z80pio.h
index f5fde912f21..0fbfb246951 100644
--- a/src/devices/machine/z80pio.h
+++ b/src/devices/machine/z80pio.h
@@ -34,7 +34,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
//**************************************************************************
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index 72b3c46b184..f37921fe293 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -35,7 +35,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "diserial.h"
//**************************************************************************
diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h
index bbabea203a9..f8a17dbfe8e 100644
--- a/src/devices/machine/z80sio.h
+++ b/src/devices/machine/z80sio.h
@@ -57,7 +57,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
//**************************************************************************
// DEVICE CONFIGURATION MACROS
diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h
index 2d1dea133b9..794c5623a2e 100644
--- a/src/devices/machine/z80sti.h
+++ b/src/devices/machine/z80sti.h
@@ -34,7 +34,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "diserial.h"
diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h
index f1d742065f0..be819b55ade 100644
--- a/src/devices/machine/z8536.h
+++ b/src/devices/machine/z8536.h
@@ -56,7 +56,7 @@
#pragma once
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"