Start moving devices out of src/mame/shared to more appropriate places

scripts/src/bus.lua

@@ -463,6 +463,8 @@ if (BUSES["ATA"]~=null) then
 		MAME_DIR .. "src/devices/bus/ata/atapihle.h",
 		MAME_DIR .. "src/devices/bus/ata/cr589.cpp",
 		MAME_DIR .. "src/devices/bus/ata/cr589.h",
+		MAME_DIR .. "src/devices/bus/ata/gdrom.cpp",
+		MAME_DIR .. "src/devices/bus/ata/gdrom.h",
 		MAME_DIR .. "src/devices/bus/ata/idehd.cpp",
 		MAME_DIR .. "src/devices/bus/ata/idehd.h",
 		MAME_DIR .. "src/devices/bus/ata/px320a.cpp",

scripts/src/cpu.lua

@@ -2720,6 +2720,8 @@ if (CPUS["Z80"]~=null or CPUS["KC80"]~=null) then
 		MAME_DIR .. "src/devices/cpu/z80/ez80.h",
 		MAME_DIR .. "src/devices/cpu/z80/lz8420m.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/lz8420m.h",
+		MAME_DIR .. "src/devices/cpu/z80/mc8123.cpp",
+		MAME_DIR .. "src/devices/cpu/z80/mc8123.h",
 		MAME_DIR .. "src/devices/cpu/z80/r800.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/r800.h",
 	}

scripts/src/machine.lua

@@ -5018,6 +5018,28 @@ if (MACHINES["AT_MB"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/bacta_datalogger.h,MACHINES["BACTA_DATALOGGER"] = true
+---------------------------------------------------
+if (MACHINES["BACTA_DATALOGGER"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/bacta_datalogger.cpp",
+		MAME_DIR .. "src/devices/machine/bacta_datalogger.h",
+	}
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/nmk112.h,MACHINES["NMK112"] = true
+---------------------------------------------------
+if (MACHINES["NMK112"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/nmk112.cpp",
+		MAME_DIR .. "src/devices/machine/nmk112.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/saa7191.h,MACHINES["SAA7191"] = true

scripts/src/video.lua

@@ -591,6 +591,30 @@ if (VIDEOS["IMS_CVC"]~=null) then
 	}
 end
 
+--------------------------------------------------
+--
+--@src/devices/video/k051316.h,VIDEOS["K051316"] = true
+--------------------------------------------------
+
+if (VIDEOS["K051316"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/k051316.cpp",
+		MAME_DIR .. "src/devices/video/k051316.h",
+	}
+end
+
+--------------------------------------------------
+--
+--@src/devices/video/k053936.h,VIDEOS["K053936"] = true
+--------------------------------------------------
+
+if (VIDEOS["K053936"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/k053936.cpp",
+		MAME_DIR .. "src/devices/video/k053936.h",
+	}
+end
+
 --------------------------------------------------
 --
 --@src/devices/video/lc7582.h,VIDEOS["LC7582"] = true
@@ -1000,6 +1024,18 @@ if (VIDEOS["TLC34076"]~=null) then
 	}
 end
 
+--------------------------------------------------
+--
+--@src/devices/video/tmap038.h,VIDEOS["TMAP038"] = true
+--------------------------------------------------
+
+if (VIDEOS["TMAP038"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/tmap038.cpp",
+		MAME_DIR .. "src/devices/video/tmap038.h",
+	}
+end
+
 --------------------------------------------------
 --
 --@src/devices/video/tms34061.h,VIDEOS["TMS34061"] = true

scripts/target/mame/mame.lua

@@ -393,6 +393,8 @@ VIDEOS["I82730"] = true
 VIDEOS["I8275"] = true
 VIDEOS["IMS_CVC"] = true
 VIDEOS["JANGOU_BLITTER"] = true
+VIDEOS["K051316"] = true
+VIDEOS["K053936"] = true
 VIDEOS["LC7582"] = true
 VIDEOS["LC7985"] = true
 VIDEOS["M50458"] = true
@@ -436,6 +438,7 @@ VIDEOS["T6963C"] = true
 VIDEOS["T6A04"] = true
 VIDEOS["TEA1002"] = true
 VIDEOS["TLC34076"] = true
+VIDEOS["TMAP038"] = true
 VIDEOS["TMS34061"] = true
 VIDEOS["TMS3556"] = true
 VIDEOS["TMS9927"] = true
@@ -512,6 +515,7 @@ MACHINES["AT_KEYBC"] = true
 MACHINES["AT_MB"] = true
 MACHINES["AUTOCONFIG"] = true
 MACHINES["AY31015"] = true
+MACHINES["BACTA_DATALOGGER"] = true
 MACHINES["BANKDEV"] = true
 MACHINES["BIM68153"] = true
 MACHINES["BITMAP_PRINTER"] = true

src/devices/bus/ata/gdrom.h

@@ -6,12 +6,12 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_GDROM_H
+#ifndef MAME_BUS_ATA_GDROM_H
-#define MAME_MACHINE_GDROM_H
+#define MAME_BUS_ATA_GDROM_H
 
 #pragma once
 
-#include "bus/ata/atapicdr.h"
+#include "atapicdr.h"
 
 class gdrom_device : public atapi_cdrom_device
 {
@@ -43,4 +43,4 @@ private:
 
 DECLARE_DEVICE_TYPE(GDROM, gdrom_device)
 
-#endif // MAME_MACHINE_GDROM_H
+#endif // MAME_BUS_ATA_GDROM_H

src/devices/cpu/z80/mc8123.h

@@ -6,12 +6,12 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_MC8123
+#ifndef MAME_CPU_Z80_MC8123_H
-#define MAME_MACHINE_MC8123
+#define MAME_CPU_Z80_MC8123_H
 
 #pragma once
 
-#include "cpu/z80/z80.h"
+#include "z80.h"
 
 class mc8123_device : public z80_device
 {
@@ -40,4 +40,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MC8123, mc8123_device)
 
-#endif // MAME_MACHINE_MC8123
+#endif // MAME_CPU_Z80_MC8123_H

src/devices/machine/bacta_datalogger.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:James Wallace
-#ifndef MAME_BACTA_DATALOGGER_H
+#ifndef MAME_MACHINE_BACTA_DATALOGGER_H
-#define MAME_BACTA_DATALOGGER_H
+#define MAME_MACHINE_BACTA_DATALOGGER_H
 
 #include "diserial.h"
 
@@ -36,4 +36,4 @@ private:
 
 DECLARE_DEVICE_TYPE(BACTA_DATALOGGER, bacta_datalogger_device)
 
-#endif // MAME_BACTA_DATALOGGER_H
+#endif // MAME_MACHINE_BACTA_DATALOGGER_H

src/mame/atlus/patapata.cpp

@@ -18,9 +18,9 @@ maybe close to jalmah.cpp?
 */
 
 #include "emu.h"
-#include "nmk112.h"
 
 #include "cpu/m68000/m68000.h"
+#include "machine/nmk112.h"
 #include "machine/timer.h"
 #include "sound/okim6295.h"
 

src/mame/barcrest/mpu4.h

@@ -5,11 +5,10 @@
 #include "mpu4_characteriser_pal.h"
 #include "mpu4_characteriser_pal_bwb.h"
 
-#include "bacta_datalogger.h"
-
 #include "cpu/m6809/m6809.h"
 #include "machine/6821pia.h"
 #include "machine/6840ptm.h"
+#include "machine/bacta_datalogger.h"
 #include "machine/mc68681.h"
 #include "machine/meters.h"
 #include "machine/nvram.h"

src/mame/bfm/rastersp.cpp

@@ -17,13 +17,13 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "bacta_datalogger.h"
 
 #include "bus/nscsi/cd.h"
 #include "bus/nscsi/hd.h"
 #include "cpu/i386/i386.h"
 #include "cpu/tms32031/tms32031.h"
 #include "machine/53c7xx.h"
+#include "machine/bacta_datalogger.h"
 #include "machine/mc146818.h"
 #include "machine/nvram.h"
 #include "machine/timer.h"

src/mame/jpm/guab.cpp

@@ -36,11 +36,10 @@
 
 #include "emu.h"
 
-#include "bacta_datalogger.h"
-
 #include "cpu/m68000/m68000.h"
 #include "formats/guab_dsk.h"
 #include "imagedev/floppy.h"
+#include "machine/bacta_datalogger.h"
 #include "machine/6840ptm.h"
 #include "machine/6850acia.h"
 #include "machine/clock.h"

src/mame/jpm/jpmimpct.h

@@ -10,9 +10,8 @@
 
 #pragma once
 
-#include "bacta_datalogger.h"
-
 #include "cpu/tms34010/tms34010.h"
+#include "machine/bacta_datalogger.h"
 #include "machine/i8255.h"
 #include "machine/mc68681.h"
 #include "machine/meters.h"

src/mame/jpm/jpmsys5.cpp

@@ -35,8 +35,7 @@
 #include "emu.h"
 #include "jpmsys5.h"
 
-#include "bacta_datalogger.h"
+#include "machine/bacta_datalogger.h"
-
 #include "machine/clock.h"
 #include "machine/input_merger.h"
 #include "sound/saa1099.h"

src/mame/konami/88games.h

@@ -12,7 +12,7 @@
 
 #include "cpu/m6809/konami.h"
 #include "sound/upd7759.h"
-#include "k051316.h"
+#include "video/k051316.h"
 #include "k051960.h"
 #include "k052109.h"
 #include "konami_helper.h"

src/mame/konami/ajax.cpp

@@ -15,7 +15,6 @@
 #include "emu.h"
 
 #include "konamipt.h"
-#include "k051316.h"
 #include "k051960.h"
 #include "k052109.h"
 #include "konami_helper.h"
@@ -27,6 +26,7 @@
 #include "machine/watchdog.h"
 #include "sound/k007232.h"
 #include "sound/ymopm.h"
+#include "video/k051316.h"
 
 #include "emupal.h"
 #include "speaker.h"

src/mame/konami/bottom9.cpp

@@ -17,7 +17,6 @@
 #include "emu.h"
 
 #include "konamipt.h"
-#include "k051316.h"
 #include "k051960.h"
 #include "k052109.h"
 #include "konami_helper.h"
@@ -27,6 +26,7 @@
 #include "machine/gen_latch.h"
 #include "machine/watchdog.h"
 #include "sound/k007232.h"
+#include "video/k051316.h"
 
 #include "emupal.h"
 #include "screen.h"

src/mame/konami/chqflag.h

@@ -13,7 +13,7 @@
 #include "machine/bankdev.h"
 #include "sound/k007232.h"
 #include "k051960.h"
-#include "k051316.h"
+#include "video/k051316.h"
 #include "k051733.h"
 #include "konami_helper.h"
 #include "emupal.h"

src/mame/konami/dbz.h

@@ -14,7 +14,7 @@
 #include "machine/timer.h"
 #include "k054156_k054157_k056832.h"
 #include "k053246_k053247_k055673.h"
-#include "k053936.h"
+#include "video/k053936.h"
 #include "k053251.h"
 #include "konami_helper.h"
 #include "tilemap.h"

src/mame/konami/divebomb.h

@@ -15,7 +15,7 @@
 #include "machine/gen_latch.h"
 #include "machine/input_merger.h"
 #include "sound/sn76496.h"
-#include "k051316.h"
+#include "video/k051316.h"
 #include "emupal.h"
 #include "tilemap.h"
 

src/mame/konami/konamigx.h

@@ -13,7 +13,7 @@
 #include "sound/k054539.h"
 #include "k053246_k053247_k055673.h"
 #include "k053250.h"
-#include "k053936.h"
+#include "video/k053936.h"
 #include "k054156_k054157_k056832.h"
 #include "k054338.h"
 #include "k055555.h"

src/mame/konami/overdriv.cpp

@@ -30,8 +30,8 @@
 
 #include "machine/k053252.h"
 #include "machine/timer.h"
-#include "k051316.h"
 #include "k053246_k053247_k055673.h"
+#include "k053250.h"
 #include "k053251.h"
 #include "konami_helper.h"
 
@@ -42,7 +42,7 @@
 #include "machine/rescap.h"
 #include "sound/k053260.h"
 #include "sound/ymopm.h"
-#include "k053250.h"
+#include "video/k051316.h"
 
 #include "emupal.h"
 #include "screen.h"

src/mame/konami/plygonet.cpp

@@ -72,7 +72,7 @@
 #include "machine/k056230.h"
 #include "machine/watchdog.h"
 #include "sound/k054539.h"
-#include "k053936.h"
+#include "video/k053936.h"
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/konami/rollerg.cpp

@@ -14,7 +14,6 @@
 
 #include "emu.h"
 
-#include "k051316.h"
 #include "k053244_k053245.h"
 #include "konami_helper.h"
 
@@ -24,6 +23,7 @@
 #include "machine/watchdog.h"
 #include "sound/k053260.h"
 #include "sound/ymopl.h"
+#include "video/k051316.h"
 
 #include "emupal.h"
 #include "speaker.h"

src/mame/konami/rungun.h

@@ -13,7 +13,7 @@
 #include "sound/k054539.h"
 #include "machine/k053252.h"
 #include "k053246_k053247_k055673.h"
-#include "k053936.h"
+#include "video/k053936.h"
 #include "machine/k054321.h"
 #include "konami_helper.h"
 #include "emupal.h"

src/mame/konami/tmnt.h

@@ -14,7 +14,7 @@
 #include "k052109.h"
 #include "k051960.h"
 #include "k053251.h"
-#include "k053936.h"
+#include "video/k053936.h"
 #include "k054000.h"
 #include "konami_helper.h"
 #include "emupal.h"

src/mame/konami/ultraman.h

@@ -13,7 +13,7 @@
 #include "machine/gen_latch.h"
 #include "machine/input_merger.h"
 #include "k051960.h"
-#include "k051316.h"
+#include "video/k051316.h"
 #include "konami_helper.h"
 
 class ultraman_state : public driver_device

src/mame/konami/wecleman.h

@@ -7,7 +7,7 @@
 
 #include "machine/timer.h"
 #include "sound/k007232.h"
-#include "k051316.h"
+#include "video/k051316.h"
 #include "k007452.h"
 #include "emupal.h"
 #include "screen.h"

src/mame/metro/metro.h

@@ -10,8 +10,6 @@
 
 #pragma once
 
-#include "k053936.h"
-
 #include "machine/eepromser.h"
 #include "machine/gen_latch.h"
 #include "machine/timer.h"
@@ -19,6 +17,7 @@
 #include "sound/okim6295.h"
 #include "sound/ymopm.h"
 #include "video/imagetek_i4100.h"
+#include "video/k053936.h"
 
 #include "screen.h"
 #include "tilemap.h"

src/mame/misc/cave.cpp

@@ -87,10 +87,9 @@ Versions known to exist but not dumped:
 #include "emu.h"
 #include "cave.h"
 
-#include "nmk112.h"
-
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
+#include "machine/nmk112.h"
 #include "machine/nvram.h"
 #include "machine/watchdog.h"
 #include "sound/ymopm.h"

src/mame/misc/cave.h

@@ -11,16 +11,14 @@
 
 ***************************************************************************/
 
-#include "tmap038.h"
-
 #include "machine/eepromser.h"
 #include "machine/gen_latch.h"
 #include "machine/timer.h"
 #include "sound/okim6295.h"
+#include "video/tmap038.h"
 
 #include "emupal.h"
 #include "screen.h"
-#include "tilemap.h"
 
 class cave_state : public driver_device
 {

src/mame/misc/freekick.cpp

@@ -109,8 +109,7 @@ TODO:
 #include "emu.h"
 #include "freekick.h"
 
-#include "mc8123.h"
+#include "cpu/z80/mc8123.h"
-
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 #include "sound/sn76496.h"

src/mame/misc/mcatadv.h

@@ -5,12 +5,10 @@
 
 #pragma once
 
-#include "tmap038.h"
-
 #include "machine/watchdog.h"
+#include "video/tmap038.h"
 
 #include "emupal.h"
-#include "tilemap.h"
 
 class mcatadv_state : public driver_device
 {

src/mame/nmk/nmk16.cpp

@@ -200,12 +200,11 @@ Reference of music tempo:
 
 #include "nmk004.h"
 
-#include "nmk112.h"
-
 #include "cpu/m68000/m68000.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "cpu/tlcs90/tlcs90.h"
 #include "cpu/z80/z80.h"
+#include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "sound/ymopm.h"
 #include "sound/ymopn.h"

src/mame/nmk/powerins.cpp

@@ -35,11 +35,10 @@ TODO:
 
 #include "powerins.h"
 
-#include "nmk112.h"
-
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/gen_latch.h"
+#include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "sound/ymopn.h"
 #include "speaker.h"

src/mame/nmk/quizpani.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "nmk112.h"
+#include "machine/nmk112.h"
 
 #include "tilemap.h"
 

src/mame/sanritsu/chinsan.cpp

@@ -21,8 +21,7 @@
 
 #include "emu.h"
 
-#include "mc8123.h"
+#include "cpu/z80/mc8123.h"
-
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 #include "machine/nvram.h"

src/mame/sega/naomigd.h

@@ -11,7 +11,7 @@
 #include "machine/eepromser.h"
 #include "315-6154.h"
 #include "machine/idectrl.h"
-#include "gdrom.h"
+#include "bus/ata/gdrom.h"
 
 // For ide gdrom controller
 

src/mame/sega/segae.cpp

@@ -296,10 +296,10 @@ GND  8A 8B GND
 #include "emu.h"
 #include "segaipt.h"
 
+#include "cpu/z80/mc8123.h"
 #include "cpu/z80/z80.h"
 #include "machine/adc0804.h"
 #include "machine/i8255.h"
-#include "mc8123.h"
 #include "machine/rescap.h"
 #include "segacrp2_device.h"
 #include "machine/upd4701.h"

src/mame/sega/segas16b.cpp

@@ -873,7 +873,7 @@ S11 S13 S15 S17  |EPR12194 -        -        -        EPR12195 -        -
 #include "segas16b.h"
 #include "segaipt.h"
 
-#include "mc8123.h"
+#include "cpu/z80/mc8123.h"
 #include "sound/okim6295.h"
 #include "speaker.h"
 

src/mame/sega/system1.cpp

@@ -306,9 +306,9 @@ seem to have access to.
 #include "emu.h"
 #include "system1.h"
 
-#include "mc8123.h"
 #include "segacrpt_device.h"
 
+#include "cpu/z80/mc8123.h"
 #include "sound/sn76496.h"
 
 #include "speaker.h"

src/mame/segacons/dccons.cpp

@@ -50,8 +50,8 @@
 #include "dccons.h"
 
 #include "dc-ctrl.h"
-#include "gdrom.h"
 
+#include "bus/ata/gdrom.h"
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
 #include "cpu/sh/sh4.h"

src/mame/segacons/dccons.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include "dc.h"
-#include "gdrom.h"
 
 #include "bus/ata/ataintf.h"
 #include "imagedev/chd_cd.h"

src/mame/upl/ninjakd2.cpp

@@ -153,8 +153,7 @@ TODO:
 #include "emu.h"
 #include "ninjakd2.h"
 
-#include "mc8123.h"
+#include "cpu/z80/mc8123.h"
-
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"
 

src/mame/vsystem/crshrace.h

@@ -7,11 +7,10 @@
 
 #include "vsystem_spr.h"
 
-#include "k053936.h"
-
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"
 #include "video/bufsprite.h"
+#include "video/k053936.h"
 
 #include "emupal.h"
 #include "tilemap.h"

src/mame/vsystem/f1gp.h

@@ -8,10 +8,9 @@
 #include "vsystem_spr.h"
 #include "vsystem_spr2.h"
 
-#include "k053936.h"
-
 #include "machine/6850acia.h"
 #include "machine/gen_latch.h"
+#include "video/k053936.h"
 
 #include "emupal.h"
 #include "tilemap.h"

src/mame/vsystem/suprslam.h

@@ -12,9 +12,8 @@
 
 #include "vsystem_spr.h"
 
-#include "k053936.h"
-
 #include "machine/gen_latch.h"
+#include "video/k053936.h"
 
 #include "tilemap.h"
 

src/mame/vsystem/tail2nos.cpp

@@ -18,13 +18,12 @@
 
 #include "vsystem_gga.h"
 
-#include "k051316.h"
-
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "machine/6850acia.h"
 #include "machine/gen_latch.h"
 #include "sound/ymopn.h"
+#include "video/k051316.h"
 
 #include "emupal.h"
 #include "screen.h"