diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 71e446ec7ca..88c49accc82 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -5062,3 +5062,25 @@ if (MACHINES["SAA7191"]~=null) then MAME_DIR .. "src/devices/machine/saa7191.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/segacrpt_device.h,MACHINES["SEGACRPT"] = true +--------------------------------------------------- +if (MACHINES["SEGACRPT"]~=null) then + files { + MAME_DIR .. "src/devices/machine/segacrpt_device.cpp", + MAME_DIR .. "src/devices/machine/segacrpt_device.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/segacrp2_device.h,MACHINES["SEGACRP2"] = true +--------------------------------------------------- +if (MACHINES["SEGACRP2"]~=null) then + files { + MAME_DIR .. "src/devices/machine/segacrp2_device.cpp", + MAME_DIR .. "src/devices/machine/segacrp2_device.h", + } +end diff --git a/src/mame/shared/segacrp2_device.cpp b/src/devices/machine/segacrp2_device.cpp similarity index 100% rename from src/mame/shared/segacrp2_device.cpp rename to src/devices/machine/segacrp2_device.cpp diff --git a/src/mame/shared/segacrp2_device.h b/src/devices/machine/segacrp2_device.h similarity index 100% rename from src/mame/shared/segacrp2_device.h rename to src/devices/machine/segacrp2_device.h diff --git a/src/mame/shared/segacrpt_device.cpp b/src/devices/machine/segacrpt_device.cpp similarity index 100% rename from src/mame/shared/segacrpt_device.cpp rename to src/devices/machine/segacrpt_device.cpp diff --git a/src/mame/shared/segacrpt_device.h b/src/devices/machine/segacrpt_device.h similarity index 100% rename from src/mame/shared/segacrpt_device.h rename to src/devices/machine/segacrpt_device.h diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index 872c4dc3b67..9f48e1ba650 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -215,12 +215,11 @@ #include "emu.h" #include "goldstar.h" -#include "segacrp2_device.h" -#include "segacrpt_device.h" - #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" #include "machine/nvram.h" +#include "machine/segacrp2_device.h" +#include "machine/segacrpt_device.h" #include "sound/ay8910.h" #include "sound/okim6295.h" #include "sound/sn76496.h" diff --git a/src/mame/kiwako/jongkyo.cpp b/src/mame/kiwako/jongkyo.cpp index 57b947b0d18..25901e3c1fc 100644 --- a/src/mame/kiwako/jongkyo.cpp +++ b/src/mame/kiwako/jongkyo.cpp @@ -28,8 +28,7 @@ #include "emu.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/mame.lst b/src/mame/mame.lst index baee015ffa0..3506e4855e8 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -11933,7 +11933,7 @@ waidrive // 2005.01 WaiWai Drive xtrmhnt2 // 2006.09 Extreme Hunting 2 Tournament Edition xtrmhunt // 2004.09 Extreme Hunting -@source:segacons/dccons.cpp +@source:sega/dccons.cpp dc // 1999 Sega Dreamcast (USA) dcdev // 1998 Sega HKT-0120 Sega Dreamcast Development Box dceu // 1999 Sega Dreamcast (Europe) @@ -23053,7 +23053,7 @@ mechattu1 // A8002 'MA' (c) 1989 a51site4 // ?? (c) 1998 a51site4a // Sept.11,1998 (c) 1998 -@source:segacons/mdconsole.cpp +@source:sega/mdconsole.cpp 32x // 1994 Sega 32X (USA) 32x_mcd // 1995 Sega Mega-CD (Europe w/32X addon) 32x_mcdj // 1994 Sega Mega-CD (Japan w/32X addon) @@ -23100,7 +23100,7 @@ ssf2mdb // MegaDrive-based hack topshoot // (c) 1995 Sun Mixing twinktmb // MegaDrive-based hack -@source:segacons/megadriv_rad.cpp +@source:sega/megadriv_rad.cpp rad_sf2 // (c)2004 Radica rad_sf2p // (c)2004 Radica rad_gen1 // (c)2004 Radica @@ -23115,10 +23115,10 @@ msi_sf2 dgunl3227 ra145 -@source:segacons/megadriv_sunplus_hybrid.cpp +@source:sega/megadriv_sunplus_hybrid.cpp reactmd -@source:segacons/megadriv_vt_hybrid.cpp +@source:sega/megadriv_vt_hybrid.cpp sarc110 sarc110a @@ -37779,10 +37779,10 @@ wg3dhfe // (c) 1996 Atari Games @source:skeleton/seattlecmp.cpp scp300f // Seattle SCP-300F -@source:segacons/sega_beena.cpp +@source:sega/sega_beena.cpp beena // -@source:segacons/sega_sawatte.cpp +@source:sega/sega_sawatte.cpp sawatte // @source:sega/segaatom.cpp @@ -37949,13 +37949,13 @@ toutrunj1 // 1987 (FD1094) toutrunj1d // bootleg toutrunjd // bootleg -@source:segacons/segapico.cpp +@source:sega/segapico.cpp copera // 1993 Sega / Yamaha pico // 1994 Sega Pico (Europe) picoj // 1993 Sega Pico (Japan) picou // 1994 Sega Pico (USA) -@source:segacons/segapm.cpp +@source:sega/segapm.cpp segapm // 1996 Sega Picture Magic (32x type hardware) @source:sega/segas16a.cpp @@ -38869,7 +38869,7 @@ sfkick // (c) 1988 Haesung/HJ Corp sfkicka // (c) 198? Haesung spinkick // (c) 1988 Haesung/Seojin -@source:segacons/sg1000.cpp +@source:sega/sg1000.cpp omv1000 // Tsukuda Original Othello Multivision FG-1000 omv2000 // Tsukuda Original Othello Multivision FG-2000 sc3000 // Sega SC-3000 (Japan) @@ -40547,7 +40547,7 @@ svisionp // svisions // tvlinkp // -@source:segacons/svmu.cpp +@source:sega/svmu.cpp svmu // 1998 Sega Visual Memory Unit @source:namco/sweetland.cpp diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 18aae54476e..75418b7471e 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -674,17 +674,17 @@ sanyo/phc25.cpp saturn/st17xx.cpp sega/saturn.cpp sega/sms.cpp -segacons/dccons.cpp -segacons/mdconsole.cpp -segacons/megadriv_rad.cpp -segacons/megadriv_sunplus_hybrid.cpp -segacons/megadriv_vt_hybrid.cpp -segacons/sega_beena.cpp -segacons/sega_sawatte.cpp -segacons/segapico.cpp -segacons/segapm.cpp -segacons/sg1000.cpp -segacons/svmu.cpp +sega/dccons.cpp +sega/mdconsole.cpp +sega/megadriv_rad.cpp +sega/megadriv_sunplus_hybrid.cpp +sega/megadriv_vt_hybrid.cpp +sega/sega_beena.cpp +sega/sega_sawatte.cpp +sega/segapico.cpp +sega/segapm.cpp +sega/sg1000.cpp +sega/svmu.cpp sequential/prophet600.cpp sfrj/galaxy.cpp sfrj/galeb.cpp diff --git a/src/mame/nichibut/cclimber.h b/src/mame/nichibut/cclimber.h index 5cc7cd3721c..91c88100c49 100644 --- a/src/mame/nichibut/cclimber.h +++ b/src/mame/nichibut/cclimber.h @@ -5,8 +5,7 @@ #pragma once -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "machine/74259.h" #include "machine/gen_latch.h" diff --git a/src/mame/nichibut/jangou.cpp b/src/mame/nichibut/jangou.cpp index 2b473e5947c..46ef242d6d7 100644 --- a/src/mame/nichibut/jangou.cpp +++ b/src/mame/nichibut/jangou.cpp @@ -27,8 +27,7 @@ $c088-$c095 player tiles #include "emu.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/pacman/pengo.cpp b/src/mame/pacman/pengo.cpp index 05283372185..fdf27ed3a3a 100644 --- a/src/mame/pacman/pengo.cpp +++ b/src/mame/pacman/pengo.cpp @@ -66,8 +66,7 @@ #include "emu.h" #include "pacman.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" diff --git a/src/mame/sanritsu/appoooh.cpp b/src/mame/sanritsu/appoooh.cpp index 751bb7b2f64..06dd27b12f4 100644 --- a/src/mame/sanritsu/appoooh.cpp +++ b/src/mame/sanritsu/appoooh.cpp @@ -165,8 +165,7 @@ Language #include "emu.h" -#include "segacrp2_device.h" - +#include "machine/segacrp2_device.h" #include "cpu/z80/z80.h" #include "sound/msm5205.h" #include "sound/sn76496.h" diff --git a/src/mame/sega/angelkds.cpp b/src/mame/sega/angelkds.cpp index 943bc7f3ef1..8e1571658af 100644 --- a/src/mame/sega/angelkds.cpp +++ b/src/mame/sega/angelkds.cpp @@ -128,9 +128,8 @@ Dumped by Chackn #include "emu.h" -#include "segacrp2_device.h" - #include "cpu/z80/z80.h" +#include "machine/segacrp2_device.h" #include "machine/i8255.h" #include "sound/ymopn.h" diff --git a/src/mame/sega/calorie.cpp b/src/mame/sega/calorie.cpp index d4f57ec7708..734defb6bce 100644 --- a/src/mame/sega/calorie.cpp +++ b/src/mame/sega/calorie.cpp @@ -82,7 +82,7 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "segacrp2_device.h" +#include "machine/segacrp2_device.h" #include "sound/ay8910.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/shared/dc-ctrl.cpp b/src/mame/sega/dc-ctrl.cpp similarity index 100% rename from src/mame/shared/dc-ctrl.cpp rename to src/mame/sega/dc-ctrl.cpp diff --git a/src/mame/shared/dc-ctrl.h b/src/mame/sega/dc-ctrl.h similarity index 100% rename from src/mame/shared/dc-ctrl.h rename to src/mame/sega/dc-ctrl.h diff --git a/src/mame/shared/dc.cpp b/src/mame/sega/dc.cpp similarity index 100% rename from src/mame/shared/dc.cpp rename to src/mame/sega/dc.cpp diff --git a/src/mame/shared/dc.h b/src/mame/sega/dc.h similarity index 100% rename from src/mame/shared/dc.h rename to src/mame/sega/dc.h diff --git a/src/mame/shared/dc_g2if.cpp b/src/mame/sega/dc_g2if.cpp similarity index 100% rename from src/mame/shared/dc_g2if.cpp rename to src/mame/sega/dc_g2if.cpp diff --git a/src/mame/shared/dc_g2if.h b/src/mame/sega/dc_g2if.h similarity index 100% rename from src/mame/shared/dc_g2if.h rename to src/mame/sega/dc_g2if.h diff --git a/src/mame/segacons/dccons.cpp b/src/mame/sega/dccons.cpp similarity index 100% rename from src/mame/segacons/dccons.cpp rename to src/mame/sega/dccons.cpp diff --git a/src/mame/segacons/dccons.h b/src/mame/sega/dccons.h similarity index 100% rename from src/mame/segacons/dccons.h rename to src/mame/sega/dccons.h diff --git a/src/mame/segacons/dccons_m.cpp b/src/mame/sega/dccons_m.cpp similarity index 100% rename from src/mame/segacons/dccons_m.cpp rename to src/mame/sega/dccons_m.cpp diff --git a/src/mame/shared/maple-dc.cpp b/src/mame/sega/maple-dc.cpp similarity index 100% rename from src/mame/shared/maple-dc.cpp rename to src/mame/sega/maple-dc.cpp diff --git a/src/mame/shared/maple-dc.h b/src/mame/sega/maple-dc.h similarity index 100% rename from src/mame/shared/maple-dc.h rename to src/mame/sega/maple-dc.h diff --git a/src/mame/shared/mapledev.cpp b/src/mame/sega/mapledev.cpp similarity index 100% rename from src/mame/shared/mapledev.cpp rename to src/mame/sega/mapledev.cpp diff --git a/src/mame/shared/mapledev.h b/src/mame/sega/mapledev.h similarity index 100% rename from src/mame/shared/mapledev.h rename to src/mame/sega/mapledev.h diff --git a/src/mame/segacons/mdconsole.cpp b/src/mame/sega/mdconsole.cpp similarity index 100% rename from src/mame/segacons/mdconsole.cpp rename to src/mame/sega/mdconsole.cpp diff --git a/src/mame/segacons/mdconsole.h b/src/mame/sega/mdconsole.h similarity index 100% rename from src/mame/segacons/mdconsole.h rename to src/mame/sega/mdconsole.h diff --git a/src/mame/segacons/megacd.cpp b/src/mame/sega/megacd.cpp similarity index 100% rename from src/mame/segacons/megacd.cpp rename to src/mame/sega/megacd.cpp diff --git a/src/mame/segacons/megacd.h b/src/mame/sega/megacd.h similarity index 100% rename from src/mame/segacons/megacd.h rename to src/mame/sega/megacd.h diff --git a/src/mame/shared/megadriv.cpp b/src/mame/sega/megadriv.cpp similarity index 100% rename from src/mame/shared/megadriv.cpp rename to src/mame/sega/megadriv.cpp diff --git a/src/mame/shared/megadriv.h b/src/mame/sega/megadriv.h similarity index 100% rename from src/mame/shared/megadriv.h rename to src/mame/sega/megadriv.h diff --git a/src/mame/segacons/megadriv_rad.cpp b/src/mame/sega/megadriv_rad.cpp similarity index 100% rename from src/mame/segacons/megadriv_rad.cpp rename to src/mame/sega/megadriv_rad.cpp diff --git a/src/mame/segacons/megadriv_rad.h b/src/mame/sega/megadriv_rad.h similarity index 100% rename from src/mame/segacons/megadriv_rad.h rename to src/mame/sega/megadriv_rad.h diff --git a/src/mame/segacons/megadriv_sunplus_hybrid.cpp b/src/mame/sega/megadriv_sunplus_hybrid.cpp similarity index 100% rename from src/mame/segacons/megadriv_sunplus_hybrid.cpp rename to src/mame/sega/megadriv_sunplus_hybrid.cpp diff --git a/src/mame/segacons/megadriv_vt_hybrid.cpp b/src/mame/sega/megadriv_vt_hybrid.cpp similarity index 100% rename from src/mame/segacons/megadriv_vt_hybrid.cpp rename to src/mame/sega/megadriv_vt_hybrid.cpp diff --git a/src/mame/shared/mie.cpp b/src/mame/sega/mie.cpp similarity index 100% rename from src/mame/shared/mie.cpp rename to src/mame/sega/mie.cpp diff --git a/src/mame/shared/mie.h b/src/mame/sega/mie.h similarity index 100% rename from src/mame/shared/mie.h rename to src/mame/sega/mie.h diff --git a/src/mame/shared/naomig1.cpp b/src/mame/sega/naomig1.cpp similarity index 100% rename from src/mame/shared/naomig1.cpp rename to src/mame/sega/naomig1.cpp diff --git a/src/mame/shared/naomig1.h b/src/mame/sega/naomig1.h similarity index 100% rename from src/mame/shared/naomig1.h rename to src/mame/sega/naomig1.h diff --git a/src/mame/shared/powervr2.cpp b/src/mame/sega/powervr2.cpp similarity index 100% rename from src/mame/shared/powervr2.cpp rename to src/mame/sega/powervr2.cpp diff --git a/src/mame/shared/powervr2.h b/src/mame/sega/powervr2.h similarity index 100% rename from src/mame/shared/powervr2.h rename to src/mame/sega/powervr2.h diff --git a/src/mame/segacons/sega_beena.cpp b/src/mame/sega/sega_beena.cpp similarity index 100% rename from src/mame/segacons/sega_beena.cpp rename to src/mame/sega/sega_beena.cpp diff --git a/src/mame/segacons/sega_sawatte.cpp b/src/mame/sega/sega_sawatte.cpp similarity index 100% rename from src/mame/segacons/sega_sawatte.cpp rename to src/mame/sega/sega_sawatte.cpp diff --git a/src/mame/sega/segae.cpp b/src/mame/sega/segae.cpp index 2be20a5cc9f..abe3d0d6c32 100644 --- a/src/mame/sega/segae.cpp +++ b/src/mame/sega/segae.cpp @@ -301,7 +301,7 @@ GND 8A 8B GND #include "machine/adc0804.h" #include "machine/i8255.h" #include "machine/rescap.h" -#include "segacrp2_device.h" +#include "machine/segacrp2_device.h" #include "machine/upd4701.h" #include "video/315_5124.h" #include "speaker.h" diff --git a/src/mame/sega/segag80r.cpp b/src/mame/sega/segag80r.cpp index bb542d23a8d..13a2197bbbc 100644 --- a/src/mame/sega/segag80r.cpp +++ b/src/mame/sega/segag80r.cpp @@ -110,8 +110,7 @@ #include "segag80r.h" #include "segag80_m.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "speaker.h" diff --git a/src/mame/segacons/segapico.cpp b/src/mame/sega/segapico.cpp similarity index 100% rename from src/mame/segacons/segapico.cpp rename to src/mame/sega/segapico.cpp diff --git a/src/mame/segacons/segapm.cpp b/src/mame/sega/segapm.cpp similarity index 100% rename from src/mame/segacons/segapm.cpp rename to src/mame/sega/segapm.cpp diff --git a/src/mame/sega/segas16a.cpp b/src/mame/sega/segas16a.cpp index a75393e9566..6c348bcd930 100644 --- a/src/mame/sega/segas16a.cpp +++ b/src/mame/sega/segas16a.cpp @@ -153,7 +153,7 @@ Tetris - - - - EPR12169 EPR12170 - #include "fd1089.h" #include "fd1094.h" #include "machine/nvram.h" -#include "segacrp2_device.h" +#include "machine/segacrp2_device.h" #include "sound/dac.h" #include "speaker.h" diff --git a/src/mame/segacons/sg1000.cpp b/src/mame/sega/sg1000.cpp similarity index 100% rename from src/mame/segacons/sg1000.cpp rename to src/mame/sega/sg1000.cpp diff --git a/src/mame/segacons/sg1000.h b/src/mame/sega/sg1000.h similarity index 100% rename from src/mame/segacons/sg1000.h rename to src/mame/sega/sg1000.h diff --git a/src/mame/sega/sg1000a.cpp b/src/mame/sega/sg1000a.cpp index 2480d61567d..9f98d03f096 100644 --- a/src/mame/sega/sg1000a.cpp +++ b/src/mame/sega/sg1000a.cpp @@ -271,12 +271,11 @@ End #include "emu.h" -#include "segacrpt_device.h" - #include "cpu/z80/z80.h" #include "sound/sn76496.h" #include "video/tms9928a.h" #include "machine/i8255.h" +#include "machine/segacrpt_device.h" #include "speaker.h" diff --git a/src/mame/sega/suprloco.cpp b/src/mame/sega/suprloco.cpp index fa16728f4e9..162409dbc67 100644 --- a/src/mame/sega/suprloco.cpp +++ b/src/mame/sega/suprloco.cpp @@ -24,8 +24,7 @@ Sega PCB 834-5137 #include "emu.h" #include "suprloco.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "sound/sn76496.h" diff --git a/src/mame/segacons/svmu.cpp b/src/mame/sega/svmu.cpp similarity index 100% rename from src/mame/segacons/svmu.cpp rename to src/mame/sega/svmu.cpp diff --git a/src/mame/sega/system1.cpp b/src/mame/sega/system1.cpp index 78faadbfa1c..b996734243f 100644 --- a/src/mame/sega/system1.cpp +++ b/src/mame/sega/system1.cpp @@ -306,8 +306,7 @@ seem to have access to. #include "emu.h" #include "system1.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/z80/mc8123.h" #include "sound/sn76496.h" diff --git a/src/mame/sega/system1.h b/src/mame/sega/system1.h index 8f4de2cfca7..8c73c21de14 100644 --- a/src/mame/sega/system1.h +++ b/src/mame/sega/system1.h @@ -10,7 +10,8 @@ #include "machine/z80pio.h" #include "machine/gen_latch.h" #include "machine/i8255.h" -#include "segacrp2_device.h" +#include "machine/segacrpt_device.h" +#include "machine/segacrp2_device.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/turbo.cpp b/src/mame/sega/turbo.cpp index a910d04423c..6c7cf360ddd 100644 --- a/src/mame/sega/turbo.cpp +++ b/src/mame/sega/turbo.cpp @@ -149,8 +149,7 @@ #include "emu.h" #include "turbo.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "machine/74259.h" #include "machine/i8279.h" diff --git a/src/mame/sega/zaxxon.cpp b/src/mame/sega/zaxxon.cpp index 02538231aa7..fd1ad7164ad 100644 --- a/src/mame/sega/zaxxon.cpp +++ b/src/mame/sega/zaxxon.cpp @@ -257,9 +257,8 @@ #include "zaxxon.h" #include "segausb.h" -#include "segacrpt_device.h" - #include "cpu/z80/z80.h" +#include "machine/segacrpt_device.h" #include "machine/gen_latch.h" #include "machine/i8255.h" #include "sound/samples.h" diff --git a/src/mame/tehkan/pbaction.cpp b/src/mame/tehkan/pbaction.cpp index 5484fa963ab..1039c46369a 100644 --- a/src/mame/tehkan/pbaction.cpp +++ b/src/mame/tehkan/pbaction.cpp @@ -97,8 +97,7 @@ Stephh's notes (based on the game Z80 code and some tests) : #include "emu.h" #include "pbaction.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "machine/74259.h" #include "sound/ay8910.h" #include "screen.h" diff --git a/src/mame/tehkan/senjyo.cpp b/src/mame/tehkan/senjyo.cpp index c8854f5742a..784929b32b9 100644 --- a/src/mame/tehkan/senjyo.cpp +++ b/src/mame/tehkan/senjyo.cpp @@ -80,8 +80,7 @@ I/O read/write #include "emu.h" #include "senjyo.h" -#include "segacrpt_device.h" - +#include "machine/segacrpt_device.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h"