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

@@ -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
 

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

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

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

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
 
 
 --------------------------------------------------

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"

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"
 
 

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"

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"

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"
 
 

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"

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"
 

src/devices/bus/tiki100/exp.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 
 

src/devices/cpu/z180/z180.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 
 enum

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);

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"
 
 
 

src/devices/machine/scnxx562.h

@@ -41,7 +41,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 #include "diserial.h"
 
 //**************************************************************************

src/devices/machine/z80ctc.cpp

@@ -10,7 +10,6 @@
 
 #include "emu.h"
 #include "z80ctc.h"
-#include "cpu/z80/z80daisy.h"
 
 
 

src/devices/machine/z80ctc.h

@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 
 //**************************************************************************

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

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

src/devices/machine/z80dart.h

@@ -147,7 +147,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 #include "diserial.h"
 
 

src/devices/machine/z80dma.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 
 //**************************************************************************

src/devices/machine/z80pio.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 
 //**************************************************************************

src/devices/machine/z80scc.h

@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 #include "diserial.h"
 
 //**************************************************************************

src/devices/machine/z80sio.h

@@ -57,7 +57,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 //**************************************************************************
 //  DEVICE CONFIGURATION MACROS

src/devices/machine/z80sti.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 #include "diserial.h"
 
 

src/devices/machine/z8536.h

@@ -56,7 +56,7 @@
 
 #pragma once
 
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
 
 
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"