From f4df51e5223578e206574234c0b8d1af300c3324 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 14 Feb 2018 22:40:47 +1100 Subject: (nw) screw you macros and the horse you rode in on There's no voodoo involved in derived machine configurations and fragments any more. The macros were just obfuscating things at this point. --- src/mame/drivers/expro02.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'src/mame/drivers/expro02.cpp') diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index 9918c346fea..2e27f905203 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -948,7 +948,8 @@ MACHINE_CONFIG_START(expro02_state::expro02) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::comad, expro02) +MACHINE_CONFIG_START(expro02_state::comad) + expro02(config); /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fantasia_map) @@ -964,20 +965,23 @@ MACHINE_CONFIG_DERIVED(expro02_state::comad, expro02) MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(0)) /* a guess, and certainly wrong */ MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::comad_noview2, comad) +MACHINE_CONFIG_START(expro02_state::comad_noview2) + comad(config); MCFG_DEVICE_REMOVE("view2_0") MCFG_GFXDECODE_MODIFY("gfxdecode", expro02_noview2) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::fantasia, comad_noview2) +MACHINE_CONFIG_START(expro02_state::fantasia) + comad_noview2(config); MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(10000000) MCFG_CPU_PROGRAM_MAP(comad_map) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::supmodel, comad_noview2) +MACHINE_CONFIG_START(expro02_state::supmodel) + comad_noview2(config); MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(supmodel_map) MCFG_OKIM6295_REPLACE("oki", 1584000, PIN7_HIGH) // clock frequency & pin 7 not verified @@ -985,17 +989,20 @@ MACHINE_CONFIG_DERIVED(expro02_state::supmodel, comad_noview2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::smissw, comad_noview2) // 951127 PCB, 12 & 16 clocks +MACHINE_CONFIG_START(expro02_state::smissw) // 951127 PCB, 12 & 16 clocks + comad_noview2(config); MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(smissw_map) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::fantsia2, comad_noview2) +MACHINE_CONFIG_START(expro02_state::fantsia2) + comad_noview2(config); MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fantsia2_map) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::galhustl, comad_noview2) +MACHINE_CONFIG_START(expro02_state::galhustl) + comad_noview2(config); MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(galhustl_map) MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified @@ -1006,7 +1013,8 @@ MACHINE_CONFIG_DERIVED(expro02_state::galhustl, comad_noview2) MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update_zipzap) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(expro02_state::zipzap, comad_noview2) +MACHINE_CONFIG_START(expro02_state::zipzap) + comad_noview2(config); /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(zipzap_map) -- cgit v1.2.3