diff --git a/scripts/src/video.lua b/scripts/src/video.lua index d4c4920002a..e1c5160b439 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -1038,7 +1038,8 @@ if (VIDEOS["VOODOO"]~=null) then files { MAME_DIR .. "src/devices/video/voodoo.cpp", MAME_DIR .. "src/devices/video/voodoo.h", - MAME_DIR .. "src/devices/video/vooddefs.h", + MAME_DIR .. "src/devices/video/vooddefs.ipp", + MAME_DIR .. "src/devices/video/voodoo_rast.ipp", } end diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index da5856f7be6..f9e53e3ff99 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -1386,41 +1386,42 @@ files { MAME_DIR .. "src/mame/drivers/mpu4sw.cpp", MAME_DIR .. "src/mame/drivers/mpu4union.cpp", MAME_DIR .. "src/mame/drivers/mpu4vid.cpp", + MAME_DIR .. "src/mame/includes/mpu5.h", MAME_DIR .. "src/mame/drivers/mpu5.cpp", - MAME_DIR .. "src/mame/drivers/mpu5.hxx", + MAME_DIR .. "src/mame/drivers/mpu5sw.cpp", } createMAMEProjects(_target, _subtarget, "bfm") files { MAME_DIR .. "src/mame/drivers/bfcobra.cpp", - MAME_DIR .. "src/mame/machine/bfm_comn.cpp", - MAME_DIR .. "src/mame/machine/bfm_comn.h", + MAME_DIR .. "src/mame/includes/bfm_ad5.h", + MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp", + MAME_DIR .. "src/mame/drivers/bfm_ad5sw.cpp", MAME_DIR .. "src/mame/drivers/bfm_sc1.cpp", MAME_DIR .. "src/mame/drivers/bfm_sc2.cpp", - MAME_DIR .. "src/mame/video/bfm_adr2.cpp", - MAME_DIR .. "src/mame/video/bfm_adr2.h", - MAME_DIR .. "src/mame/drivers/bfm_sc4.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc5.cpp", - MAME_DIR .. "src/mame/includes/bfm_sc5.h", - MAME_DIR .. "src/mame/drivers/bfm_sc5sw.hxx", - MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp", - MAME_DIR .. "src/mame/includes/bfm_ad5.h", - MAME_DIR .. "src/mame/drivers/bfm_ad5sw.hxx", - MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp", - MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h", MAME_DIR .. "src/mame/includes/bfm_sc4.h", + MAME_DIR .. "src/mame/drivers/bfm_sc4.cpp", + MAME_DIR .. "src/mame/includes/bfm_sc5.h", + MAME_DIR .. "src/mame/drivers/bfm_sc5.cpp", + MAME_DIR .. "src/mame/drivers/bfm_sc5sw.cpp", MAME_DIR .. "src/mame/drivers/bfm_swp.cpp", MAME_DIR .. "src/mame/drivers/bfmsys83.cpp", MAME_DIR .. "src/mame/drivers/bfmsys85.cpp", - MAME_DIR .. "src/mame/machine/sec.cpp", - MAME_DIR .. "src/mame/machine/sec.h", - MAME_DIR .. "src/mame/machine/bfm_bd1.cpp", - MAME_DIR .. "src/mame/machine/bfm_bd1.h", - MAME_DIR .. "src/mame/machine/bfm_bda.cpp", - MAME_DIR .. "src/mame/machine/bfm_bda.h", - MAME_DIR .. "src/mame/video/bfm_dm01.cpp", - MAME_DIR .. "src/mame/video/bfm_dm01.h", MAME_DIR .. "src/mame/drivers/rastersp.cpp", + MAME_DIR .. "src/mame/machine/bfm_bd1.h", + MAME_DIR .. "src/mame/machine/bfm_bd1.cpp", + MAME_DIR .. "src/mame/machine/bfm_bda.h", + MAME_DIR .. "src/mame/machine/bfm_bda.cpp", + MAME_DIR .. "src/mame/machine/bfm_comn.h", + MAME_DIR .. "src/mame/machine/bfm_comn.cpp", + MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h", + MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp", + MAME_DIR .. "src/mame/machine/sec.h", + MAME_DIR .. "src/mame/machine/sec.cpp", + MAME_DIR .. "src/mame/video/bfm_adr2.h", + MAME_DIR .. "src/mame/video/bfm_adr2.cpp", + MAME_DIR .. "src/mame/video/bfm_dm01.h", + MAME_DIR .. "src/mame/video/bfm_dm01.cpp", } createMAMEProjects(_target, _subtarget, "bmc") @@ -2624,12 +2625,12 @@ files { createMAMEProjects(_target, _subtarget, "maygay") files { - MAME_DIR .. "src/mame/drivers/maygay1b.cpp", MAME_DIR .. "src/mame/includes/maygay1b.h", - MAME_DIR .. "src/mame/drivers/maygay1b.hxx", + MAME_DIR .. "src/mame/drivers/maygay1b.cpp", + MAME_DIR .. "src/mame/drivers/maygay1bsw.cpp", MAME_DIR .. "src/mame/drivers/maygayv1.cpp", MAME_DIR .. "src/mame/drivers/maygayep.cpp", - MAME_DIR .. "src/mame/drivers/maygaysw.cpp", + MAME_DIR .. "src/mame/drivers/maygayew.cpp", MAME_DIR .. "src/mame/drivers/mmm.cpp", } diff --git a/src/devices/video/vooddefs.h b/src/devices/video/vooddefs.ipp similarity index 99% rename from src/devices/video/vooddefs.h rename to src/devices/video/vooddefs.ipp index dccda7696f7..07487f2bbf8 100644 --- a/src/devices/video/vooddefs.h +++ b/src/devices/video/vooddefs.ipp @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_VOODDEFS_H -#define MAME_VIDEO_VOODDEFS_H +#ifndef MAME_VIDEO_VOODDEFS_IPP +#define MAME_VIDEO_VOODDEFS_IPP #pragma once @@ -3173,4 +3173,4 @@ inline rgbaint_t ATTR_FORCE_INLINE voodoo_device::tmu_state::combineTexture(cons return blend_color; } -#endif // MAME_VIDEO_VOODDEFS_H +#endif // MAME_VIDEO_VOODDEFS_IPP diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 36ac805d218..92d937346d5 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -144,7 +144,7 @@ bits(7:4) and bit(24)), X, and Y: #include "emu.h" #include "voodoo.h" -#include "vooddefs.h" +#include "vooddefs.ipp" #include "screen.h" @@ -242,7 +242,7 @@ uint32_t voodoo_reciplog[(2 << RECIPLOG_LOOKUP_BITS) + 2]; #define RASTERIZER_ENTRY(fbzcp, alpha, fog, fbz, tex0, tex1) \ RASTERIZER(fbzcp##_##alpha##_##fog##_##fbz##_##tex0##_##tex1, (((tex0) == 0xffffffff) ? 0 : ((tex1) == 0xffffffff) ? 1 : 2), fbzcp, fbz, alpha, fog, tex0, tex1) -#include "voodoo_rast.hxx" +#include "voodoo_rast.ipp" #undef RASTERIZER_ENTRY @@ -259,7 +259,7 @@ uint32_t voodoo_reciplog[(2 << RECIPLOG_LOOKUP_BITS) + 2]; const voodoo_device::raster_info voodoo_device::predef_raster_table[] = { -#include "voodoo_rast.hxx" +#include "voodoo_rast.ipp" { nullptr } }; diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h index 87720ccd38d..e9a568af501 100644 --- a/src/devices/video/voodoo.h +++ b/src/devices/video/voodoo.h @@ -1837,7 +1837,7 @@ protected: static void raster_##name(void *destbase, int32_t y, const poly_extent *extent, const void *extradata, int threadid); #define RASTERIZER_ENTRY(fbzcp, alpha, fog, fbz, tex0, tex1) \ RASTERIZER_HEADER(fbzcp##_##alpha##_##fog##_##fbz##_##tex0##_##tex1) -#include "voodoo_rast.hxx" +#include "voodoo_rast.ipp" #undef RASTERIZER_ENTRY diff --git a/src/devices/video/voodoo_rast.hxx b/src/devices/video/voodoo_rast.ipp similarity index 99% rename from src/devices/video/voodoo_rast.hxx rename to src/devices/video/voodoo_rast.ipp index e9aaa5eed8f..849e3990cf4 100644 --- a/src/devices/video/voodoo_rast.hxx +++ b/src/devices/video/voodoo_rast.ipp @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles + /*************************************************************************** GAME-SPECIFIC RASTERIZERS ***************************************************************************/ diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt index 6bef3a91417..486bcbc59d4 100644 --- a/src/mame/arcade.flt +++ b/src/mame/arcade.flt @@ -117,11 +117,11 @@ belatra.cpp berzerk.cpp bestleag.cpp bfcobra.cpp -bfm_ad5.cpp +bfm_ad5sw.cpp bfm_sc1.cpp bfm_sc2.cpp bfm_sc4.cpp -bfm_sc5.cpp +bfm_sc5sw.cpp bfm_swp.cpp bfmsys83.cpp bfmsys85.cpp @@ -709,9 +709,9 @@ mastboy.cpp mastboyo.cpp matmania.cpp maxaflex.cpp -maygay1b.cpp +maygay1bsw.cpp maygayep.cpp -maygaysw.cpp +maygayew.cpp maygayv1.cpp mazerbla.cpp mcatadv.cpp @@ -802,7 +802,7 @@ mpu4plasma.cpp mpu4sw.cpp mpu4union.cpp mpu4vid.cpp -mpu5.cpp +mpu5sw.cpp mquake.cpp mrdo.cpp mrflea.cpp diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp index 4df532d8829..22f2e998b4e 100644 --- a/src/mame/drivers/bfm_ad5.cpp +++ b/src/mame/drivers/bfm_ad5.cpp @@ -115,7 +115,6 @@ A21 |30| CE1 #include "emu.h" #include "includes/bfm_ad5.h" -#include "includes/bfm_sc4.h" #include "machine/mcf5206e.h" #include "machine/bfm_sc45_helper.h" #include "speaker.h" @@ -192,5 +191,3 @@ void adder5_state::bfm_ad5(machine_config &config) SPEAKER(config, "rspeaker").front_right(); /* unknown sound */ } - -#include "bfm_ad5sw.hxx" diff --git a/src/mame/drivers/bfm_ad5sw.hxx b/src/mame/drivers/bfm_ad5sw.cpp similarity index 99% rename from src/mame/drivers/bfm_ad5sw.hxx rename to src/mame/drivers/bfm_ad5sw.cpp index 3ed0a706de6..a809b7dc762 100644 --- a/src/mame/drivers/bfm_ad5sw.hxx +++ b/src/mame/drivers/bfm_ad5sw.cpp @@ -12,10 +12,11 @@ Many sound roms are missing! */ +#include "emu.h" +#include "includes/bfm_ad5.h" +#include "includes/bfm_sc4.h" // TODO: untangle from this -INPUT_PORTS_EXTERN( bfm_ad5 ); - #define ad5plds \ ROM_REGION( 0x400, "plds", 0 ) \ ROM_LOAD( "75585130_gal20v8c.ic29", 0x000, 0x157, CRC(d3a6d883) SHA1(5a968c34958bfe415e372bfa11004f82b29366ff) ) /* on SC5 main board */ \ diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp index 3ebf69fc9d5..2a91c2bc2e6 100644 --- a/src/mame/drivers/bfm_sc5.cpp +++ b/src/mame/drivers/bfm_sc5.cpp @@ -357,5 +357,3 @@ void bfm_sc5_state::bfm_sc5(machine_config &config) YMZ280B(config, m_ymz, 16000000); // ?? Mhz m_ymz->add_route(ALL_OUTPUTS, "mono", 1.0); } - -#include "bfm_sc5sw.hxx" diff --git a/src/mame/drivers/bfm_sc5sw.hxx b/src/mame/drivers/bfm_sc5sw.cpp similarity index 99% rename from src/mame/drivers/bfm_sc5sw.hxx rename to src/mame/drivers/bfm_sc5sw.cpp index acc155db98f..5280fe1392e 100644 --- a/src/mame/drivers/bfm_sc5sw.hxx +++ b/src/mame/drivers/bfm_sc5sw.cpp @@ -11,10 +11,11 @@ Many sound roms are missing! */ +#include "emu.h" +#include "includes/bfm_sc5.h" +#include "includes/bfm_sc4.h" // TODO: untangle from this -INPUT_PORTS_EXTERN( bfm_sc5 ); - #define sc5pld \ ROM_REGION( 0x157, "pld", 0 ) \ ROM_LOAD( "75585130_gal20v8c.ic29", 0x000, 0x157, CRC(d3a6d883) SHA1(5a968c34958bfe415e372bfa11004f82b29366ff) ) diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index 6be81bbb2d6..cd519e5a75c 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -73,72 +73,18 @@ ******************************************************************************************/ #include "emu.h" #include "includes/maygay1b.h" + #include "machine/74259.h" #include "speaker.h" +//#define VERBOSE 1 +#include "logmacro.h" + #include "maygay1b.lh" -#include "m1albsqp.lh" -#include "m1apollo2.lh" -#include "m1bargnc.lh" -#include "m1bghou.lh" -#include "m1bigdel.lh" -#include "m1calypsa.lh" -#include "m1casclb.lh" -#include "m1casroy1.lh" -#include "m1chain.lh" -#include "m1cik51o.lh" -#include "m1clbfvr.lh" -#include "m1cluecb1.lh" -#include "m1cluedo4.lh" -#include "m1cluessf.lh" -#include "m1coro21n.lh" -#include "m1cororrk.lh" -#include "m1dkong91n.lh" -#include "m1dxmono51o.lh" -#include "m1eastndl.lh" -#include "m1eastqv3.lh" -#include "m1fantfbb.lh" -#include "m1fightb.lh" -#include "m1frexplc.lh" -#include "m1gladg.lh" -#include "m1grescb.lh" -#include "m1guvnor.lh" -#include "m1hotpoth.lh" -#include "m1htclb.lh" -#include "m1imclb.lh" -#include "m1infern.lh" -#include "m1inwinc.lh" -#include "m1itjobc.lh" -#include "m1itskob.lh" -#include "m1jpmult.lh" -#include "m1lucknon.lh" -#include "m1luxorb.lh" -#include "m1manhat.lh" -#include "m1monclb.lh" -#include "m1mongam.lh" -#include "m1monmon.lh" -#include "m1monou.lh" -#include "m1nhp.lh" -#include "m1nudbnke.lh" -#include "m1omega.lh" -#include "m1onbusa.lh" -#include "m1pinkpc.lh" -#include "m1przeeb.lh" -#include "m1retpp.lh" -#include "m1search.lh" -#include "m1sptlgtc.lh" -#include "m1startr.lh" -#include "m1sudnima.lh" -#include "m1taknot.lh" -#include "m1thatlfc.lh" -#include "m1topstr.lh" -#include "m1triviax.lh" -#include "m1trtr.lh" -#include "m1ttcash.lh" -#include "m1wldzner.lh" -#include "m1wotwa.lh" +#define M1_MASTER_CLOCK (XTAL(8'000'000)) +#define M1_DUART_CLOCK (XTAL(3'686'400)) // not yet working //#define USE_MCU @@ -917,5 +863,3 @@ void maygay1b_state::init_m1() m_maincpu->space(AS_PROGRAM).install_write_handler(0x2420, 0x2421, write8_delegate(FUNC(maygay1b_state::m1ab_no_oki_w), this)); } } - -#include "maygay1b.hxx" diff --git a/src/mame/drivers/maygay1b.hxx b/src/mame/drivers/maygay1bsw.cpp similarity index 99% rename from src/mame/drivers/maygay1b.hxx rename to src/mame/drivers/maygay1bsw.cpp index 44a5d9c3f2c..68ce2808760 100644 --- a/src/mame/drivers/maygay1b.hxx +++ b/src/mame/drivers/maygay1bsw.cpp @@ -20,7 +20,69 @@ */ -INPUT_PORTS_EXTERN( maygay_m1 ); +#include "emu.h" +#include "includes/maygay1b.h" + +#include "m1albsqp.lh" +#include "m1apollo2.lh" +#include "m1bargnc.lh" +#include "m1bghou.lh" +#include "m1bigdel.lh" +#include "m1calypsa.lh" +#include "m1casclb.lh" +#include "m1casroy1.lh" +#include "m1chain.lh" +#include "m1cik51o.lh" +#include "m1clbfvr.lh" +#include "m1cluecb1.lh" +#include "m1cluedo4.lh" +#include "m1cluessf.lh" +#include "m1coro21n.lh" +#include "m1cororrk.lh" +#include "m1dkong91n.lh" +#include "m1dxmono51o.lh" +#include "m1eastndl.lh" +#include "m1eastqv3.lh" +#include "m1fantfbb.lh" +#include "m1fightb.lh" +#include "m1frexplc.lh" +#include "m1gladg.lh" +#include "m1grescb.lh" +#include "m1guvnor.lh" +#include "m1hotpoth.lh" +#include "m1htclb.lh" +#include "m1imclb.lh" +#include "m1infern.lh" +#include "m1inwinc.lh" +#include "m1itjobc.lh" +#include "m1itskob.lh" +#include "m1jpmult.lh" +#include "m1lucknon.lh" +#include "m1luxorb.lh" +#include "m1manhat.lh" +#include "m1monclb.lh" +#include "m1mongam.lh" +#include "m1monmon.lh" +#include "m1monou.lh" +#include "m1nhp.lh" +#include "m1nudbnke.lh" +#include "m1omega.lh" +#include "m1onbusa.lh" +#include "m1pinkpc.lh" +#include "m1przeeb.lh" +#include "m1retpp.lh" +#include "m1search.lh" +#include "m1sptlgtc.lh" +#include "m1startr.lh" +#include "m1sudnima.lh" +#include "m1taknot.lh" +#include "m1thatlfc.lh" +#include "m1topstr.lh" +#include "m1triviax.lh" +#include "m1trtr.lh" +#include "m1ttcash.lh" +#include "m1wldzner.lh" +#include "m1wotwa.lh" #define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL|MACHINE_CLICKABLE_ARTWORK diff --git a/src/mame/drivers/maygaysw.cpp b/src/mame/drivers/maygayew.cpp similarity index 100% rename from src/mame/drivers/maygaysw.cpp rename to src/mame/drivers/maygayew.cpp diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp index c2c4badb570..6b109190886 100644 --- a/src/mame/drivers/mpu5.cpp +++ b/src/mame/drivers/mpu5.cpp @@ -137,206 +137,12 @@ Switches Aux-RS232 Aux Port Alpha Vend-Bus #include "emu.h" +#include "includes/mpu5.h" -#include "machine/68340.h" -#include "machine/sec.h" #include "speaker.h" #include "mpu5.lh" -// MFME2MAME layouts: -#include "m5addams.lh" -#include "m5all41d.lh" -#include "m5arab.lh" -#include "m5austin11.lh" -#include "m5barkng.lh" -#include "m5barmy.lh" -#include "m5baxe04.lh" -#include "m5bbro.lh" -#include "m5bbrocl.lh" -#include "m5beansa.lh" -#include "m5bigchs.lh" -#include "m5biggam.lh" -#include "m5bling.lh" -#include "m5blkwht11.lh" -#include "m5bnzclb.lh" -#include "m5btlbnk.lh" -#include "m5bttf.lh" -#include "m5bwaves.lh" -#include "m5carou.lh" -#include "m5cashat.lh" -#include "m5cashrn.lh" -#include "m5cbw.lh" -#include "m5centcl.lh" -#include "m5circlb33.lh" -#include "m5circus0a.lh" -#include "m5clifhn.lh" -#include "m5clown11.lh" -#include "m5codft.lh" -#include "m5cosclb.lh" -#include "m5crzkni.lh" -#include "m5cshkcb.lh" -#include "m5cshstx.lh" -#include "m5dblqtsb.lh" -#include "m5devil.lh" -#include "m5dick10.lh" -#include "m5doshpk05.lh" -#include "m5egr.lh" -#include "m5elband.lh" -#include "m5elim.lh" -#include "m5evgrhr.lh" -#include "m5ewn.lh" -#include "m5extrm.lh" -#include "m5fiddle.lh" -#include "m5fire.lh" -#include "m5firebl.lh" -#include "m5flipcr.lh" -#include "m5fortby.lh" -#include "m5frnzy.lh" -#include "m5funsun.lh" -#include "m5gdrag.lh" -#include "m5ggems20.lh" -#include "m5gimmie.lh" -#include "m5grush.lh" -#include "m5grush5.lh" -#include "m5gsstrk07.lh" -#include "m5gstrik.lh" -#include "m5hellrz.lh" -#include "m5hgl14.lh" -#include "m5hiclau.lh" -#include "m5hifly.lh" -#include "m5hilok.lh" -#include "m5hisprt.lh" -#include "m5hlsumo.lh" -#include "m5holy.lh" -#include "m5hopidl.lh" -#include "m5hotslt.lh" -#include "m5hotstf.lh" -#include "m5hypvip.lh" -#include "m5jackbx.lh" -#include "m5jackp2.lh" -#include "m5jackpt.lh" -#include "m5jlyjwl.lh" -#include "m5jmpgem01.lh" -#include "m5kingqc06.lh" -#include "m5kkebab.lh" -#include "m5korma.lh" -#include "m5loony.lh" -#include "m5loot.lh" -#include "m5lotta.lh" -#include "m5martns07.lh" -#include "m5mega.lh" -#include "m5mmak06.lh" -#include "m5monmst.lh" -#include "m5mpfc.lh" -#include "m5mprio.lh" -#include "m5neptun.lh" -#include "m5nnww.lh" -#include "m5oohaah.lh" -#include "m5oohrio.lh" -#include "m5openbx05.lh" -#include "m5overld.lh" -#include "m5peepsh.lh" -#include "m5piefac.lh" -#include "m5piefcr.lh" -#include "m5ppussy.lh" -#include "m5psyccl01.lh" -#include "m5psycho.lh" -#include "m5ptyani.lh" -#include "m5qdrawb.lh" -#include "m5qshot04.lh" -#include "m5ratpka.lh" -#include "m5razdz10.lh" -#include "m5redbal.lh" -#include "m5redrcka.lh" -#include "m5resfrg.lh" -#include "m5revo13.lh" -#include "m5rfymc.lh" -#include "m5rgclb12.lh" -#include "m5rhrgt02.lh" -#include "m5ritj.lh" -#include "m5rollup.lh" -#include "m5rollx.lh" -#include "m5rthh.lh" -#include "m5rub.lh" -#include "m5rwb.lh" -#include "m5scharg.lh" -#include "m5seven.lh" -#include "m5shark.lh" -#include "m5sheik.lh" -#include "m5skulcl20.lh" -#include "m5sondra.lh" -#include "m5speccl.lh" -#include "m5spiker.lh" -#include "m5spins.lh" -#include "m5squids06.lh" -#include "m5sstrk.lh" -#include "m5starcl.lh" -#include "m5stars26.lh" -#include "m5stax.lh" -#include "m5supnov.lh" -#include "m5supro.lh" -#include "m5tbird.lh" -#include "m5tempcl.lh" -#include "m5tempp.lh" -#include "m5tempt2.lh" -#include "m5tictacbwb.lh" -#include "m5trail.lh" -#include "m5ultimo04.lh" -#include "m5upover.lh" -#include "m5vampup.lh" -#include "m5vertgo.lh" -#include "m5wking05.lh" -#include "m5wonga.lh" -#include "m5wthing20.lh" -#include "m5xchn.lh" -#include "m5xfact11.lh" - - -class mpu5_state : public driver_device -{ -public: - mpu5_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) - , m_maincpu(*this, "maincpu") - , m_sec(*this, "sec") - { } - - void mpu5(machine_config &config); - -private: - DECLARE_READ32_MEMBER(mpu5_mem_r); - DECLARE_WRITE32_MEMBER(mpu5_mem_w); - - DECLARE_READ32_MEMBER(asic_r32); - DECLARE_READ8_MEMBER(asic_r8); - DECLARE_WRITE32_MEMBER(asic_w32); - DECLARE_WRITE8_MEMBER(asic_w8); - - DECLARE_READ32_MEMBER(pic_r); - DECLARE_WRITE32_MEMBER(pic_w); - - virtual void machine_start() override; - void mpu5_map(address_map &map); - - uint32_t* m_cpuregion; - std::unique_ptr m_mainram; - - uint8_t m_led_strobe_temp; - uint8_t m_led_strobe; - uint8_t m_pic_clk; - bool m_pic_transfer_in_progress; - uint8_t m_pic_bit1; - uint8_t m_pic_data; - uint8_t m_pic_clocked_bits; - uint8_t m_pic_stored_input; - uint8_t m_pic_output_bit; - uint8_t m_input_strobe; - - // devices - required_device m_maincpu; - required_device m_sec; -}; READ8_MEMBER(mpu5_state::asic_r8) { @@ -654,5 +460,3 @@ void mpu5_state::mpu5(machine_config &config) SPEAKER(config, "rspeaker").front_right(); /* unknown sound */ } - -#include "mpu5.hxx" diff --git a/src/mame/drivers/mpu5.hxx b/src/mame/drivers/mpu5sw.cpp similarity index 99% rename from src/mame/drivers/mpu5.hxx rename to src/mame/drivers/mpu5sw.cpp index e655174fdd3..495a8c0ab44 100644 --- a/src/mame/drivers/mpu5.hxx +++ b/src/mame/drivers/mpu5sw.cpp @@ -75,8 +75,156 @@ CON2 = Male DB9 for stake/jackpot D13 | | 12V D15 |_| 12V */ +#include "emu.h" +#include "includes/mpu5.h" -INPUT_PORTS_EXTERN( mpu5 ); +// MFME2MAME layouts: +#include "m5addams.lh" +#include "m5all41d.lh" +#include "m5arab.lh" +#include "m5austin11.lh" +#include "m5barkng.lh" +#include "m5barmy.lh" +#include "m5baxe04.lh" +#include "m5bbro.lh" +#include "m5bbrocl.lh" +#include "m5beansa.lh" +#include "m5bigchs.lh" +#include "m5biggam.lh" +#include "m5bling.lh" +#include "m5blkwht11.lh" +#include "m5bnzclb.lh" +#include "m5btlbnk.lh" +#include "m5bttf.lh" +#include "m5bwaves.lh" +#include "m5carou.lh" +#include "m5cashat.lh" +#include "m5cashrn.lh" +#include "m5cbw.lh" +#include "m5centcl.lh" +#include "m5circlb33.lh" +#include "m5circus0a.lh" +#include "m5clifhn.lh" +#include "m5clown11.lh" +#include "m5codft.lh" +#include "m5cosclb.lh" +#include "m5crzkni.lh" +#include "m5cshkcb.lh" +#include "m5cshstx.lh" +#include "m5dblqtsb.lh" +#include "m5devil.lh" +#include "m5dick10.lh" +#include "m5doshpk05.lh" +#include "m5egr.lh" +#include "m5elband.lh" +#include "m5elim.lh" +#include "m5evgrhr.lh" +#include "m5ewn.lh" +#include "m5extrm.lh" +#include "m5fiddle.lh" +#include "m5fire.lh" +#include "m5firebl.lh" +#include "m5flipcr.lh" +#include "m5fortby.lh" +#include "m5frnzy.lh" +#include "m5funsun.lh" +#include "m5gdrag.lh" +#include "m5ggems20.lh" +#include "m5gimmie.lh" +#include "m5grush.lh" +#include "m5grush5.lh" +#include "m5gsstrk07.lh" +#include "m5gstrik.lh" +#include "m5hellrz.lh" +#include "m5hgl14.lh" +#include "m5hiclau.lh" +#include "m5hifly.lh" +#include "m5hilok.lh" +#include "m5hisprt.lh" +#include "m5hlsumo.lh" +#include "m5holy.lh" +#include "m5hopidl.lh" +#include "m5hotslt.lh" +#include "m5hotstf.lh" +#include "m5hypvip.lh" +#include "m5jackbx.lh" +#include "m5jackp2.lh" +#include "m5jackpt.lh" +#include "m5jlyjwl.lh" +#include "m5jmpgem01.lh" +#include "m5kingqc06.lh" +#include "m5kkebab.lh" +#include "m5korma.lh" +#include "m5loony.lh" +#include "m5loot.lh" +#include "m5lotta.lh" +#include "m5martns07.lh" +#include "m5mega.lh" +#include "m5mmak06.lh" +#include "m5monmst.lh" +#include "m5mpfc.lh" +#include "m5mprio.lh" +#include "m5neptun.lh" +#include "m5nnww.lh" +#include "m5oohaah.lh" +#include "m5oohrio.lh" +#include "m5openbx05.lh" +#include "m5overld.lh" +#include "m5peepsh.lh" +#include "m5piefac.lh" +#include "m5piefcr.lh" +#include "m5ppussy.lh" +#include "m5psyccl01.lh" +#include "m5psycho.lh" +#include "m5ptyani.lh" +#include "m5qdrawb.lh" +#include "m5qshot04.lh" +#include "m5ratpka.lh" +#include "m5razdz10.lh" +#include "m5redbal.lh" +#include "m5redrcka.lh" +#include "m5resfrg.lh" +#include "m5revo13.lh" +#include "m5rfymc.lh" +#include "m5rgclb12.lh" +#include "m5rhrgt02.lh" +#include "m5ritj.lh" +#include "m5rollup.lh" +#include "m5rollx.lh" +#include "m5rthh.lh" +#include "m5rub.lh" +#include "m5rwb.lh" +#include "m5scharg.lh" +#include "m5seven.lh" +#include "m5shark.lh" +#include "m5sheik.lh" +#include "m5skulcl20.lh" +#include "m5sondra.lh" +#include "m5speccl.lh" +#include "m5spiker.lh" +#include "m5spins.lh" +#include "m5squids06.lh" +#include "m5sstrk.lh" +#include "m5starcl.lh" +#include "m5stars26.lh" +#include "m5stax.lh" +#include "m5supnov.lh" +#include "m5supro.lh" +#include "m5tbird.lh" +#include "m5tempcl.lh" +#include "m5tempp.lh" +#include "m5tempt2.lh" +#include "m5tictacbwb.lh" +#include "m5trail.lh" +#include "m5ultimo04.lh" +#include "m5upover.lh" +#include "m5vampup.lh" +#include "m5vertgo.lh" +#include "m5wking05.lh" +#include "m5wonga.lh" +#include "m5wthing20.lh" +#include "m5xchn.lh" +#include "m5xfact11.lh" /* Empire diff --git a/src/mame/includes/bfm_ad5.h b/src/mame/includes/bfm_ad5.h index f4dd9cc0825..d2bb9f29744 100644 --- a/src/mame/includes/bfm_ad5.h +++ b/src/mame/includes/bfm_ad5.h @@ -28,4 +28,6 @@ private: required_device m_maincpu; }; +INPUT_PORTS_EXTERN( bfm_ad5 ); + #endif // MAME_INCLUDES_BFM_AD5_H diff --git a/src/mame/includes/bfm_sc5.h b/src/mame/includes/bfm_sc5.h index d096b452d21..aba4445eebf 100644 --- a/src/mame/includes/bfm_sc5.h +++ b/src/mame/includes/bfm_sc5.h @@ -1,25 +1,30 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#include "cpu/m68000/m68000.h" +#ifndef MAME_INCLUDES_BFM_SC5_H +#define MAME_INCLUDES_BFM_SC5_H + +#pragma once + #include "includes/bfm_sc4.h" +#include "cpu/m68000/m68000.h" class bfm_sc5_state : public bfm_sc45_state { public: bfm_sc5_state(const machine_config &mconfig, device_type type, const char *tag) - : bfm_sc45_state(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : bfm_sc45_state(mconfig, type, tag) + , m_maincpu(*this, "maincpu") { } + void init_sc5(); + void bfm_sc5(machine_config &config); - void sc5_map(address_map &map); + protected: + void sc5_map(address_map &map); - -public: required_device m_maincpu; - void init_sc5(); DECLARE_READ8_MEMBER( sc5_10202F0_r ); DECLARE_WRITE8_MEMBER( sc5_10202F0_w ); DECLARE_WRITE16_MEMBER( sc5_duart_w ); @@ -33,3 +38,7 @@ public: DECLARE_READ8_MEMBER(bfm_sc5_duart_input_r); DECLARE_WRITE8_MEMBER(bfm_sc5_duart_output_w); }; + +INPUT_PORTS_EXTERN( bfm_sc5 ); + +#endif // MAME_INCLUDES_BFM_SC5_H diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h index 0704820ec9c..b3c3809e084 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -5,13 +5,6 @@ #pragma once - -#define VERBOSE 0 -#define LOG(x) do { if (VERBOSE) logerror x; } while (0) - -#define M1_MASTER_CLOCK (XTAL(8'000'000)) -#define M1_DUART_CLOCK (XTAL(3'686'400)) - #include "cpu/m6809/m6809.h" #include "machine/i8279.h" @@ -30,6 +23,7 @@ #include "cpu/mcs51/mcs51.h" #include "sound/okim6295.h" + class maygay1b_state : public driver_device { public: @@ -151,4 +145,6 @@ private: void m1_nec_memmap(address_map &map); }; +INPUT_PORTS_EXTERN( maygay_m1 ); + #endif // MAME_INCLUDES_MAYGAY1B_H diff --git a/src/mame/includes/mpu5.h b/src/mame/includes/mpu5.h new file mode 100644 index 00000000000..5bcddd816a7 --- /dev/null +++ b/src/mame/includes/mpu5.h @@ -0,0 +1,59 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood +#ifndef MAME_INCLUDES_MPU5_H +#define MAME_INCLUDES_MPU5_H + +#pragma once + +#include "machine/68340.h" +#include "machine/sec.h" + + +class mpu5_state : public driver_device +{ +public: + mpu5_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_sec(*this, "sec") + { } + + void mpu5(machine_config &config); + +private: + DECLARE_READ32_MEMBER(mpu5_mem_r); + DECLARE_WRITE32_MEMBER(mpu5_mem_w); + + DECLARE_READ32_MEMBER(asic_r32); + DECLARE_READ8_MEMBER(asic_r8); + DECLARE_WRITE32_MEMBER(asic_w32); + DECLARE_WRITE8_MEMBER(asic_w8); + + DECLARE_READ32_MEMBER(pic_r); + DECLARE_WRITE32_MEMBER(pic_w); + + virtual void machine_start() override; + void mpu5_map(address_map &map); + + uint32_t* m_cpuregion; + std::unique_ptr m_mainram; + + uint8_t m_led_strobe_temp; + uint8_t m_led_strobe; + uint8_t m_pic_clk; + bool m_pic_transfer_in_progress; + uint8_t m_pic_bit1; + uint8_t m_pic_data; + uint8_t m_pic_clocked_bits; + uint8_t m_pic_stored_input; + uint8_t m_pic_output_bit; + uint8_t m_input_strobe; + + // devices + required_device m_maincpu; + required_device m_sec; +}; + +INPUT_PORTS_EXTERN( mpu5 ); + +#endif // MAME_INCLUDES_MPU5_H diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 4fc12474eb6..35ee5bdb952 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -3117,7 +3117,7 @@ qosb // 1992 BFM quizvadr // 1991 BFM trebltop // 1991 BFM -@source:bfm_ad5.cpp +@source:bfm_ad5sw.cpp ad5bpfpm // Bullseye Pounds For Points (Mazooma) ad5bpfpma // ad5bpfpmb // @@ -7196,7 +7196,7 @@ sc4ziggye // sc4ziggyf // sc4ziggyg // -@source:bfm_sc5.cpp +@source:bfm_sc5sw.cpp sc5_3414 // sc5_3434 // sc5_3435 // @@ -19297,7 +19297,7 @@ mf_bdash // (c) 1984 Exidy / First Star Software mf_brist // (c) 1983 Exidy / First Star Software mf_flip // (c) 1983 Exidy / First Star Software -@source:maygay1b.cpp +@source:maygay1bsw.cpp m1albsq // Albert Square (Maygay) m1albsq1 // m1albsq1p // @@ -21176,7 +21176,7 @@ ep_xspotb // ep_xtra // X-tra X-tra (Maygay) ep_xtraa // -@source:maygaysw.cpp +@source:maygayew.cpp mg_alad // Aladdin's Cave mg_bb // Big Break mg_ewg // Each Way Gambler @@ -28230,7 +28230,7 @@ v4vgpok // Vegas Poker (prototype release 2) v4wize // Wize Move (v1.3d) v4wizea // Wize Move -@source:mpu5.cpp +@source:mpu5sw.cpp m55050 // Fifty Fifty (Bwb) m5aceclb // Ace Of Clubs (Empire) m5aceclba //