From 44d80b6fb038216e410ab633ec80d7e8b2dd7bd2 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Tue, 15 May 2018 14:53:07 +0700 Subject: [PATCH] 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) --- scripts/src/cpu.lua | 7 ------- scripts/src/machine.lua | 14 ++++++++++++++ scripts/target/mame/arcade.lua | 1 + scripts/target/mame/mess.lua | 1 + scripts/target/mame/tiny.lua | 1 + src/devices/bus/abcbus/fd2.h | 2 +- src/devices/bus/abcbus/hdc.h | 2 +- src/devices/bus/abcbus/lux10828.h | 2 +- src/devices/bus/abcbus/lux21046.h | 2 +- src/devices/bus/abcbus/lux21056.h | 2 +- src/devices/bus/ecbbus/grip.h | 2 +- src/devices/bus/imi7000/imi5000h.h | 2 +- src/devices/bus/tiki100/exp.h | 2 +- src/devices/cpu/z180/z180.h | 2 +- src/devices/cpu/z80/z80.h | 2 +- src/devices/machine/ldv1000.cpp | 2 +- src/devices/machine/scnxx562.h | 2 +- src/devices/machine/z80ctc.cpp | 1 - src/devices/machine/z80ctc.h | 2 +- src/devices/{cpu/z80 => machine}/z80daisy.cpp | 0 src/devices/{cpu/z80 => machine}/z80daisy.h | 9 ++++----- .../{cpu/z80 => machine}/z80daisy_generic.cpp | 0 .../{cpu/z80 => machine}/z80daisy_generic.h | 6 +++--- src/devices/machine/z80dart.h | 2 +- src/devices/machine/z80dma.h | 2 +- src/devices/machine/z80pio.h | 2 +- src/devices/machine/z80scc.h | 2 +- src/devices/machine/z80sio.h | 2 +- src/devices/machine/z80sti.h | 2 +- src/devices/machine/z8536.h | 2 +- src/mame/audio/cinemat.cpp | 2 +- src/mame/audio/efo_zsu.h | 2 +- src/mame/drivers/altos2.cpp | 2 +- src/mame/drivers/altos5.cpp | 2 +- src/mame/drivers/ampro.cpp | 2 +- src/mame/drivers/astrocde.cpp | 2 +- src/mame/drivers/attache.cpp | 2 +- src/mame/drivers/avt.cpp | 2 +- src/mame/drivers/babbage.cpp | 2 +- src/mame/drivers/bbcbc.cpp | 2 +- src/mame/drivers/bcs3.cpp | 2 +- src/mame/drivers/bigbord2.cpp | 2 +- src/mame/drivers/binbug.cpp | 2 +- src/mame/drivers/br8641.cpp | 2 +- src/mame/drivers/cchasm.cpp | 2 +- src/mame/drivers/ccs300.cpp | 2 +- src/mame/drivers/cedar_magnet.cpp | 2 +- src/mame/drivers/czk80.cpp | 2 +- src/mame/drivers/dlair.cpp | 2 +- src/mame/drivers/dmax8000.cpp | 2 +- src/mame/drivers/dsb46.cpp | 2 +- src/mame/drivers/einstein.cpp | 4 ++-- src/mame/drivers/gp_1.cpp | 2 +- src/mame/drivers/gp_2.cpp | 2 +- src/mame/drivers/hazelgr.cpp | 2 +- src/mame/drivers/jankenmn.cpp | 2 +- src/mame/drivers/m5.cpp | 2 +- src/mame/drivers/mc8020.cpp | 2 +- src/mame/drivers/mc8030.cpp | 2 +- src/mame/drivers/meritm.cpp | 2 +- src/mame/drivers/mtx.cpp | 2 +- src/mame/drivers/nanos.cpp | 2 +- src/mame/drivers/onyx.cpp | 2 +- src/mame/drivers/osbexec.cpp | 2 +- src/mame/drivers/p8k.cpp | 2 +- src/mame/drivers/pcm.cpp | 2 +- src/mame/drivers/pipeline.cpp | 2 +- src/mame/drivers/polyplay.cpp | 2 +- src/mame/drivers/pulsar.cpp | 2 +- src/mame/drivers/rc702.cpp | 2 +- src/mame/drivers/superslave.cpp | 2 +- src/mame/drivers/ts802.cpp | 2 +- src/mame/drivers/ts803.cpp | 2 +- src/mame/drivers/ts816.cpp | 2 +- src/mame/drivers/univac.cpp | 2 +- src/mame/drivers/z9001.cpp | 2 +- src/mame/includes/abc80.h | 2 +- src/mame/includes/abc80x.h | 2 +- src/mame/includes/aussiebyte.h | 2 +- src/mame/includes/c80.h | 2 +- src/mame/includes/huebler.h | 2 +- src/mame/includes/kaypro.h | 2 +- src/mame/includes/kc.h | 3 +-- src/mame/includes/lc80.h | 2 +- src/mame/includes/llc.h | 2 +- src/mame/includes/mbee.h | 2 +- src/mame/includes/mcr.h | 2 +- src/mame/includes/mpf1.h | 2 +- src/mame/includes/newbrain.h | 2 +- src/mame/includes/poly880.h | 2 +- src/mame/includes/prof80.h | 2 +- src/mame/includes/senjyo.h | 2 +- src/mame/includes/super6.h | 2 +- src/mame/includes/super80.h | 2 +- src/mame/includes/tiki100.h | 2 +- src/mame/includes/tranz330.h | 2 +- src/mame/includes/trs80m2.h | 2 +- src/mame/includes/vcs80.h | 2 +- src/mame/includes/x1.h | 2 +- src/mame/includes/xerox820.h | 2 +- src/mame/machine/cedar_magnet_board.h | 2 +- src/mame/machine/cedar_magnet_sprite.h | 2 +- src/mame/machine/inder_sb.h | 2 +- 103 files changed, 118 insertions(+), 111 deletions(-) rename src/devices/{cpu/z80 => machine}/z80daisy.cpp (100%) rename src/devices/{cpu/z80 => machine}/z80daisy.h (96%) rename src/devices/{cpu/z80 => machine}/z80daisy_generic.cpp (100%) rename src/devices/{cpu/z80 => machine}/z80daisy_generic.h (92%) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index e6b5868c719..132c32861a7 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -2407,17 +2407,12 @@ end -------------------------------------------------- -- Zilog Z80 --@src/devices/cpu/z80/z80.h,CPUS["Z80"] = true ---@src/devices/cpu/z80/z80daisy.h,CPUS["Z80"] = true -------------------------------------------------- if (CPUS["Z80"]~=null) then files { MAME_DIR .. "src/devices/cpu/z80/z80.cpp", MAME_DIR .. "src/devices/cpu/z80/z80.h", - MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp", - MAME_DIR .. "src/devices/cpu/z80/z80daisy.h", - MAME_DIR .. "src/devices/cpu/z80/z80daisy_generic.cpp", - MAME_DIR .. "src/devices/cpu/z80/z80daisy_generic.h", MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.cpp", MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.h", MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.cpp", @@ -2468,8 +2463,6 @@ if (CPUS["Z180"]~=null) then MAME_DIR .. "src/devices/cpu/z180/z180ops.h", MAME_DIR .. "src/devices/cpu/z180/z180tbl.h", MAME_DIR .. "src/devices/cpu/z180/z180xy.hxx", - MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp", - MAME_DIR .. "src/devices/cpu/z80/z80daisy.h", } end diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 62ff60637c0..95c2f99c582 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -3516,3 +3516,17 @@ if (MACHINES["OUTPUT_LATCH"]~=null) then MAME_DIR .. "src/devices/machine/output_latch.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/z80daisy.h,MACHINES["Z80DAISY"] = true +--------------------------------------------------- + +if (MACHINES["Z80DAISY"]~=null) then + files { + MAME_DIR .. "src/devices/machine/z80daisy.cpp", + MAME_DIR .. "src/devices/machine/z80daisy.h", + MAME_DIR .. "src/devices/machine/z80daisy_generic.cpp", + MAME_DIR .. "src/devices/machine/z80daisy_generic.h", + } +end diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 36fa466c2cb..ffa0fc69264 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -621,6 +621,7 @@ MACHINES["INPUT_MERGER"] = true MACHINES["K054321"] = true MACHINES["ADC0844"] = true MACHINES["GEN_FIFO"] = true +MACHINES["Z80DAISY"] = true -------------------------------------------------- -- specify available bus cores diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index afc668a659d..ef261429238 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -637,6 +637,7 @@ MACHINES["INPUT_MERGER"] = true MACHINES["ADC0844"] = true MACHINES["28FXXX"] = true -- MACHINES["GEN_FIFO"] = true +MACHINES["Z80DAISY"] = true -------------------------------------------------- -- specify available bus cores diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua index 89f29aface1..22e7b29cb01 100644 --- a/scripts/target/mame/tiny.lua +++ b/scripts/target/mame/tiny.lua @@ -71,6 +71,7 @@ MACHINES["GEN_LATCH"] = true MACHINES["OUTPUT_LATCH"] = true MACHINES["TICKET"] = true MACHINES["WATCHDOG"] = true +MACHINES["Z80DAISY"] = true -------------------------------------------------- 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(*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 similarity index 100% rename from src/devices/cpu/z80/z80daisy.cpp rename to src/devices/machine/z80daisy.cpp diff --git a/src/devices/cpu/z80/z80daisy.h b/src/devices/machine/z80daisy.h similarity index 96% rename from src/devices/cpu/z80/z80daisy.h rename to src/devices/machine/z80daisy.h index f0a1bf780cd..439b1022f44 100644 --- a/src/devices/cpu/z80/z80daisy.h +++ b/src/devices/machine/z80daisy.h @@ -8,12 +8,11 @@ ***************************************************************************/ +#ifndef MAME_MACHINE_Z80DAISY_H +#define MAME_MACHINE_Z80DAISY_H + #pragma once -#ifndef __Z80DAISY_H__ -#define __Z80DAISY_H__ - - //************************************************************************** // CONSTANTS @@ -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 similarity index 100% rename from src/devices/cpu/z80/z80daisy_generic.cpp rename to src/devices/machine/z80daisy_generic.cpp diff --git a/src/devices/cpu/z80/z80daisy_generic.h b/src/devices/machine/z80daisy_generic.h similarity index 92% rename from src/devices/cpu/z80/z80daisy_generic.h rename to 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" diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 68d999b434c..171de55408f 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -22,7 +22,7 @@ #include "includes/cinemat.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "speaker.h" diff --git a/src/mame/audio/efo_zsu.h b/src/mame/audio/efo_zsu.h index 219cc1beb91..1bfa2111487 100644 --- a/src/mame/audio/efo_zsu.h +++ b/src/mame/audio/efo_zsu.h @@ -7,7 +7,7 @@ #pragma once #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/gen_latch.h" #include "machine/40105.h" diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp index 79cd29713ab..bd3063f343f 100644 --- a/src/mame/drivers/altos2.cpp +++ b/src/mame/drivers/altos2.cpp @@ -16,7 +16,7 @@ Keyboard: P8035L CPU, undumped 2716 labelled "358_2758", XTAL marked "4608-300-1 #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" #include "machine/clock.h" diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index f0f81f33994..a0a2391e14e 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index e596f6bb9ca..8aa098b91b2 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -24,7 +24,7 @@ ToDo: #include "emu.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" #include "machine/wd_fdc.h" diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index c2e3025aa1f..d4d882d6d91 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -117,7 +117,7 @@ #include "includes/astrocde.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/nvram.h" #include "machine/74259.h" diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 51085bfad74..2f2f145b5ae 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -67,7 +67,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "bus/rs232/rs232.h" #include "machine/am9517a.h" #include "machine/clock.h" diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp index f07083299bb..2705902e91d 100644 --- a/src/mame/drivers/avt.cpp +++ b/src/mame/drivers/avt.cpp @@ -418,7 +418,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "video/mc6845.h" diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp index 4879a58178a..212be497e07 100644 --- a/src/mame/drivers/babbage.cpp +++ b/src/mame/drivers/babbage.cpp @@ -27,7 +27,7 @@ #include "machine/timer.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "babbage.lh" #define MAIN_CLOCK 25e5 diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp index 0b739a4fcf3..f1f09355898 100644 --- a/src/mame/drivers/bbcbc.cpp +++ b/src/mame/drivers/bbcbc.cpp @@ -31,7 +31,7 @@ #include "cpu/z80/z80.h" #include "video/tms9928a.h" #include "machine/z80pio.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "softlist.h" diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index 22214e186eb..49048b0c316 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -50,7 +50,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "imagedev/cassette.h" #include "screen.h" diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 1c73812a6e2..19c31ef7186 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -72,7 +72,7 @@ X - change banks #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/74259.h" #include "machine/clock.h" #include "machine/keyboard.h" diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 602dd0fc9e5..0901fbe52b6 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -53,7 +53,7 @@ #include "emu.h" #include "bus/rs232/keyboard.h" #include "cpu/s2650/s2650.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp index f69fceadb1d..784bf0ab3f1 100644 --- a/src/mame/drivers/br8641.cpp +++ b/src/mame/drivers/br8641.cpp @@ -24,7 +24,7 @@ ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "sound/beep.h" diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp index 36acac5643e..b87c198dcb9 100644 --- a/src/mame/drivers/cchasm.cpp +++ b/src/mame/drivers/cchasm.cpp @@ -18,7 +18,7 @@ #include "includes/cchasm.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/m68000/m68000.h" #include "machine/6840ptm.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp index 8343f16b21d..753e9e26f0d 100644 --- a/src/mame/drivers/ccs300.cpp +++ b/src/mame/drivers/ccs300.cpp @@ -20,7 +20,7 @@ Since IM2 is used, it is assumed there are Z80 peripherals on board. #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp index e84cb28c374..a70217fc28f 100644 --- a/src/mame/drivers/cedar_magnet.cpp +++ b/src/mame/drivers/cedar_magnet.cpp @@ -104,7 +104,7 @@ I suspect the additional memory was an afterthought. #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "machine/bankdev.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index c84f66972fc..0227b4aa6a7 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -43,7 +43,7 @@ I/O ports: These ranges are what is guessed #include "emu.h" #include "cpu/z80/z80.h" #include "machine/upd765.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "machine/z80dart.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index e2b22408788..6be80bd004a 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -37,7 +37,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/ldv1000.h" #include "machine/ldstub.h" #include "machine/watchdog.h" diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index cbe4cca37d2..cbd6aac265a 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -26,7 +26,7 @@ What there is of the schematic shows no sign of a daisy chain or associated inte #include "emu.h" #include "cpu/z80/z80.h" #include "machine/wd_fdc.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "machine/z80dart.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp index b9460da2744..cb2fdfab783 100644 --- a/src/mame/drivers/dsb46.cpp +++ b/src/mame/drivers/dsb46.cpp @@ -30,7 +30,7 @@ Both roms contain Z80 code. #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80sio.h" #include "machine/clock.h" diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index c464caef448..648cb61afa1 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -12,8 +12,8 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" -#include "cpu/z80/z80daisy_generic.h" +#include "machine/z80daisy.h" +#include "machine/z80daisy_generic.h" #include "bus/centronics/ctronics.h" #include "bus/einstein/pipe/pipe.h" #include "bus/einstein/userport/userport.h" diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index 72ff9c4745c..7b9c91b54ba 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -23,7 +23,7 @@ ToDo: #include "machine/genpin.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/i8255.h" #include "machine/timer.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp index dda31d99109..d3ba29e39b8 100644 --- a/src/mame/drivers/gp_2.cpp +++ b/src/mame/drivers/gp_2.cpp @@ -36,7 +36,7 @@ ToDo: #include "emu.h" #include "machine/genpin.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/i8255.h" #include "machine/timer.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp index 9496437a143..39d345451e6 100644 --- a/src/mame/drivers/hazelgr.cpp +++ b/src/mame/drivers/hazelgr.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/clock.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index 91e32d1c14b..51fcaafb088 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -147,7 +147,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/i8255.h" #include "sound/dac.h" diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index b462037f4b4..9417492d954 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -278,7 +278,7 @@ Few other notes: #include "includes/m5.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "sound/sn76496.h" #include "video/tms9928a.h" diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp index 8d93bff6333..4f611844ee0 100644 --- a/src/mame/drivers/mc8020.cpp +++ b/src/mame/drivers/mc8020.cpp @@ -17,7 +17,7 @@ ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/clock.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp index eff74040e1d..2b65c6ead82 100644 --- a/src/mame/drivers/mc8030.cpp +++ b/src/mame/drivers/mc8030.cpp @@ -19,7 +19,7 @@ The asp ctc needs at least 2 triggers. The purpose of the zve pio is unknown. #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "screen.h" #include "machine/clock.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 20e1b135e05..001d469f427 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -175,7 +175,7 @@ Not all regional versions are available for each Megatouch series #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/ds1204.h" #include "machine/i8255.h" #include "machine/ins8250.h" diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 5bab0f31bec..74b5c782b24 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -25,7 +25,7 @@ #include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/ram.h" diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index ef7dfd2b1c9..02ba9f8dfb6 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/ram.h" #include "machine/timer.h" #include "machine/upd765.h" diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 82ffac4177e..7cb100c5b6e 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -38,7 +38,7 @@ To Do: #include "cpu/z8000/z8000.h" #include "machine/clock.h" #include "bus/rs232/rs232.h" -//#include "cpu/z80/z80daisy.h" +//#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index f5caec07feb..d31a8f2dec4 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -10,7 +10,7 @@ #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/6821pia.h" #include "machine/input_merger.h" #include "machine/pit8253.h" diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index bde0bdb5639..79d0deef044 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -47,7 +47,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/z8000/z8000.h" #include "machine/upd765.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 29a9347d4be..f012b56bfd4 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -54,7 +54,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "machine/k7659kb.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index be7c78008f2..27acef0d319 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -69,7 +69,7 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "cpu/m6805/m68705.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/i8255.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index 9f494c62735..45d9e92b971 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -130,7 +130,7 @@ playing the automaton. Bits 0-2 of PORTB control the organ. #include "includes/polyplay.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index a89d40df53b..68d2c46e03c 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -38,7 +38,7 @@ X - Test off-board memory banks #include "emu.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80dart.h" #include "machine/msm5832.h" #include "machine/i8255.h" diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index 3bfcf0ba9a6..b10f0ce2a71 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -22,7 +22,7 @@ Issues: #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/7474.h" #include "machine/am9517a.h" #include "machine/clock.h" diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index 028247d6f40..f01dfe921e3 100644 --- a/src/mame/drivers/superslave.cpp +++ b/src/mame/drivers/superslave.cpp @@ -24,7 +24,7 @@ Oxx,yy = Out port #include "bus/rs232/rs232.h" //#include "bus/s100/s100.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/am9519.h" #include "machine/com8116.h" #include "machine/ram.h" diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index 5af715a55f1..eab513a9b10 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -23,7 +23,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/terminal.h" #include "machine/z80dma.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 571ef3dfecf..fe5ca66fa87 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -48,7 +48,7 @@ PAGE SEL bit in PORT0 set to 1: #include "machine/clock.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/keyboard.h" #include "machine/timer.h" #include "machine/z80dart.h" diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp index 432074ebd90..1aa9bf9dcf5 100644 --- a/src/mame/drivers/ts816.cpp +++ b/src/mame/drivers/ts816.cpp @@ -20,7 +20,7 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" #include "machine/terminal.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index b6af5a4d1ab..4923d3f3828 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -37,7 +37,7 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/clock.h" #include "machine/nvram.h" #include "machine/z80ctc.h" diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 66014e4c59d..6e6cdb8d312 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -29,7 +29,7 @@ ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "machine/timer.h" #include "machine/z80ctc.h" diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index 899a47e7e92..996eb7c99a8 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -14,7 +14,7 @@ #include "bus/abcbus/abcbus.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/flopdrv.h" #include "imagedev/printer.h" #include "imagedev/cassette.h" diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h index cbfcc876502..dc4fa94ed29 100644 --- a/src/mame/includes/abc80x.h +++ b/src/mame/includes/abc80x.h @@ -8,7 +8,7 @@ #include "bus/abcbus/abcbus.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/mcs48/mcs48.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index d4299e8b82e..ce4ecad9ef0 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -14,7 +14,7 @@ #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/clock.h" #include "machine/msm5832.h" diff --git a/src/mame/includes/c80.h b/src/mame/includes/c80.h index 8f01e136c2f..bacc2d2e130 100644 --- a/src/mame/includes/c80.h +++ b/src/mame/includes/c80.h @@ -5,7 +5,7 @@ #define MAME_INCLUDES_C80_H #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "imagedev/cassette.h" #include "machine/ram.h" diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h index 5eae7b79551..80c9d190098 100644 --- a/src/mame/includes/huebler.h +++ b/src/mame/includes/huebler.h @@ -12,7 +12,7 @@ #define Z80PIO2_TAG "z80pio2" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "machine/ram.h" #include "machine/timer.h" diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h index 3ec3b3ef303..1026d283edc 100644 --- a/src/mame/includes/kaypro.h +++ b/src/mame/includes/kaypro.h @@ -6,7 +6,7 @@ #pragma once #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "bus/centronics/ctronics.h" #include "imagedev/snapquik.h" diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index da6f7316a50..f975a6301ad 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -16,13 +16,12 @@ // Components #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/ram.h" #include "machine/kc_keyb.h" #include "machine/rescap.h" -#include "cpu/z80/z80daisy.h" #include "sound/spkrdev.h" #include "sound/wave.h" #include "screen.h" diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h index b554251aa05..cab65551cdf 100644 --- a/src/mame/includes/lc80.h +++ b/src/mame/includes/lc80.h @@ -6,7 +6,7 @@ #pragma once #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "machine/ram.h" #include "machine/z80pio.h" diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h index 76395b4414c..f407e402694 100644 --- a/src/mame/includes/llc.h +++ b/src/mame/includes/llc.h @@ -13,7 +13,7 @@ #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/k7659kb.h" #include "machine/ram.h" #include "machine/z80ctc.h" diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index b561b7cfe8a..fcecfb87871 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -12,7 +12,7 @@ #include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 7a250f1d286..260144a4c2f 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -7,7 +7,7 @@ **************************************************************************/ #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/timer.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h index a0b74e5129f..419f43a0bb7 100644 --- a/src/mame/includes/mpf1.h +++ b/src/mame/includes/mpf1.h @@ -8,7 +8,7 @@ #include "machine/spchrom.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "machine/i8255.h" #include "machine/timer.h" diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h index 855172f266d..1ae535ab884 100644 --- a/src/mame/includes/newbrain.h +++ b/src/mame/includes/newbrain.h @@ -9,7 +9,7 @@ #include "bus/newbrain/exp.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/cop400/cop400.h" #include "imagedev/cassette.h" #include "machine/rescap.h" diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h index ce58f7f8462..477c0bcd469 100644 --- a/src/mame/includes/poly880.h +++ b/src/mame/includes/poly880.h @@ -7,7 +7,7 @@ #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "machine/z80pio.h" #include "machine/z80ctc.h" diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h index a219a72b571..c3d776d9f45 100644 --- a/src/mame/includes/prof80.h +++ b/src/mame/includes/prof80.h @@ -8,7 +8,7 @@ #include "bus/ecbbus/ecbbus.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/prof80mmu.h" #include "machine/74259.h" #include "machine/ram.h" diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index a0af87bdfeb..51141ffcc4e 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni #include "sound/dac.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "machine/z80ctc.h" diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h index 0963c5187f0..3a1050a0281 100644 --- a/src/mame/includes/super6.h +++ b/src/mame/includes/super6.h @@ -6,7 +6,7 @@ #pragma once #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/com8116.h" #include "machine/ram.h" #include "machine/timer.h" diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index 3f3f17a21df..bf8997d3786 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -7,7 +7,7 @@ #include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/buffer.h" diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h index ed769f848e4..35861655818 100644 --- a/src/mame/includes/tiki100.h +++ b/src/mame/includes/tiki100.h @@ -9,7 +9,7 @@ #include "bus/rs232/rs232.h" #include "bus/tiki100/exp.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "formats/tiki100_dsk.h" #include "imagedev/cassette.h" #include "machine/ram.h" diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h index 300aebd97f1..e9a9d4a0e6f 100644 --- a/src/mame/includes/tranz330.h +++ b/src/mame/includes/tranz330.h @@ -7,7 +7,7 @@ #pragma once #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" #include "machine/z80pio.h" diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h index d3fc4e130b7..9288f90533a 100644 --- a/src/mame/includes/trs80m2.h +++ b/src/mame/includes/trs80m2.h @@ -7,7 +7,7 @@ #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/mcs48/mcs48.h" #include "cpu/m68000/m68000.h" #include "bus/centronics/ctronics.h" diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h index b4eaec42f08..904e5829997 100644 --- a/src/mame/includes/vcs80.h +++ b/src/mame/includes/vcs80.h @@ -7,7 +7,7 @@ #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "machine/ram.h" #include "machine/bankdev.h" diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index 5b75dd36626..7a1235b1446 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -14,7 +14,7 @@ #include "bus/generic/carts.h" #include "bus/generic/slot.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "imagedev/flopdrv.h" #include "machine/bankdev.h" diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index 8c89efae738..f3d657da253 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -8,7 +8,7 @@ #include "bus/scsi/sa1403d.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "cpu/i86/i86.h" #include "machine/com8116.h" #include "machine/ram.h" diff --git a/src/mame/machine/cedar_magnet_board.h b/src/mame/machine/cedar_magnet_board.h index 08cc36d9a9a..de063591ea4 100644 --- a/src/mame/machine/cedar_magnet_board.h +++ b/src/mame/machine/cedar_magnet_board.h @@ -9,7 +9,7 @@ #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" class cedar_magnet_board_interface : public device_interface { diff --git a/src/mame/machine/cedar_magnet_sprite.h b/src/mame/machine/cedar_magnet_sprite.h index 08b9c17eccc..6b14d1d7dd4 100644 --- a/src/mame/machine/cedar_magnet_sprite.h +++ b/src/mame/machine/cedar_magnet_sprite.h @@ -8,7 +8,7 @@ #include "machine/cedar_magnet_board.h" #include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "machine/z80pio.h" #include "machine/bankdev.h" diff --git a/src/mame/machine/inder_sb.h b/src/mame/machine/inder_sb.h index 6b61da99032..fff245dd830 100644 --- a/src/mame/machine/inder_sb.h +++ b/src/mame/machine/inder_sb.h @@ -10,7 +10,7 @@ #include "cpu/z80/z80.h" #include "machine/z80ctc.h" -#include "cpu/z80/z80daisy.h" +#include "machine/z80daisy.h" #include "sound/dac.h"