From 7f4dc2f670c289da93b300d86ef386d711d44b98 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Tue, 29 Jan 2019 20:35:11 +0100 Subject: src/mame: removed all instances of MCFG_DEVICE_REMOVE in the mame part of the tree (nw) --- src/devices/machine/genpc.cpp | 9 +++++---- src/mame/drivers/alg.cpp | 2 +- src/mame/drivers/amiga.cpp | 34 +++++++++++++++++----------------- src/mame/drivers/amstrad.cpp | 4 ++-- src/mame/drivers/apple2.cpp | 6 +++--- src/mame/drivers/arkanoid.cpp | 2 +- src/mame/drivers/armedf.cpp | 7 ++++--- src/mame/drivers/atom.cpp | 8 ++++---- src/mame/drivers/bfm_sc2.cpp | 28 ++++++++++++++++------------ src/mame/drivers/byvid.cpp | 2 +- src/mame/drivers/cninja.cpp | 2 +- src/mame/drivers/cps1.cpp | 10 +++++----- src/mame/drivers/cps2.cpp | 6 ++---- src/mame/drivers/ddenlovr.cpp | 2 +- src/mame/drivers/fastfred.cpp | 6 +++--- src/mame/drivers/fccpu30.cpp | 10 +++++----- src/mame/drivers/fidel68k.cpp | 4 ++-- src/mame/drivers/galivan.cpp | 7 ++++--- src/mame/drivers/glasgow.cpp | 2 +- src/mame/drivers/gng.cpp | 2 +- src/mame/drivers/gundealr.cpp | 7 ++++--- src/mame/drivers/highvdeo.cpp | 2 +- src/mame/drivers/hx20.cpp | 2 +- src/mame/drivers/ibmpc.cpp | 2 +- src/mame/drivers/igspoker.cpp | 2 +- src/mame/drivers/intv.cpp | 8 ++++---- src/mame/drivers/lasso.cpp | 4 ++-- src/mame/drivers/lsasquad.cpp | 2 +- src/mame/drivers/m5.cpp | 2 +- src/mame/drivers/magicard.cpp | 2 +- src/mame/drivers/markham.cpp | 4 ++-- src/mame/drivers/mbee.cpp | 8 ++++---- src/mame/drivers/mc10.cpp | 2 +- src/mame/drivers/megadriv.cpp | 12 ++++++------ src/mame/drivers/mrdo.cpp | 7 ++++--- src/mame/drivers/mz700.cpp | 4 ++-- src/mame/drivers/namcos22.cpp | 2 +- src/mame/drivers/odyssey2.cpp | 4 ++-- src/mame/drivers/okean240.cpp | 4 ++-- src/mame/drivers/pacman.cpp | 4 ++-- src/mame/drivers/pc.cpp | 8 ++++---- src/mame/drivers/prestige.cpp | 2 +- src/mame/drivers/progolf.cpp | 2 +- src/mame/drivers/puckpkmn.cpp | 2 +- src/mame/drivers/retofinv.cpp | 4 ++-- src/mame/drivers/sauro.cpp | 2 +- src/mame/drivers/scramble.cpp | 12 ++++++------ src/mame/drivers/segas16a.cpp | 6 +++--- src/mame/drivers/segas16b.cpp | 4 ++-- src/mame/drivers/seta2.cpp | 2 +- src/mame/drivers/sg1000.cpp | 2 +- src/mame/drivers/shootout.cpp | 2 +- src/mame/drivers/sigmab98.cpp | 2 +- src/mame/drivers/silvmil.cpp | 4 ++-- src/mame/drivers/slapfght.cpp | 4 ++-- src/mame/drivers/sms.cpp | 18 +++++++++--------- src/mame/drivers/spec128.cpp | 2 +- src/mame/drivers/sprint2.cpp | 12 ++++++------ src/mame/drivers/ssfindo.cpp | 2 +- src/mame/drivers/tandy1t.cpp | 2 +- src/mame/drivers/terracre.cpp | 2 +- src/mame/drivers/ti85.cpp | 11 ++++++----- src/mame/drivers/trs80.cpp | 2 +- src/mame/drivers/trs80m3.cpp | 2 +- src/mame/drivers/tx1.cpp | 2 +- src/mame/drivers/witch.cpp | 8 ++++---- src/mame/drivers/wiz.cpp | 2 +- src/mame/drivers/wswan.cpp | 4 ++-- src/mame/drivers/xain.cpp | 2 +- 69 files changed, 187 insertions(+), 179 deletions(-) diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index e76a51bd62c..cdd381f1cfe 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -910,12 +910,13 @@ pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, device_typ // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(pc_noppi_mb_device::device_add_mconfig) +void pc_noppi_mb_device::device_add_mconfig(machine_config &config) +{ ibm5160_mb_device::device_add_mconfig(config); - MCFG_DEVICE_REMOVE("pc_kbdc") - MCFG_DEVICE_REMOVE("ppi8255") -MACHINE_CONFIG_END + config.device_remove("pc_kbdc"); + config.device_remove("ppi8255"); +} static INPUT_PORTS_START( pc_noppi_mb ) INPUT_PORTS_END diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index f3b47b777bc..d12a48319e2 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -375,7 +375,7 @@ MACHINE_CONFIG_START(alg_state::picmatic) MCFG_DEVICE_REPLACE("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_DEVICE_PROGRAM_MAP(main_map_picmatic) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); pal_video(config); MCFG_DEVICE_MODIFY("amiga") diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 8fa3b4ca2f6..0e6e599926e 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -1655,7 +1655,7 @@ MACHINE_CONFIG_START(a1000_state::a1000n) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("amiga") MCFG_DEVICE_CLOCK(amiga_state::CLK_C1_NTSC) @@ -1705,7 +1705,7 @@ MACHINE_CONFIG_START(a2000_state::a2000n) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("amiga") MCFG_DEVICE_CLOCK(amiga_state::CLK_C1_NTSC) @@ -1740,7 +1740,7 @@ MACHINE_CONFIG_START(a500_state::a500n) a500(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("amiga") MCFG_DEVICE_CLOCK(amiga_state::CLK_C1_NTSC) @@ -1817,7 +1817,7 @@ MACHINE_CONFIG_START(cdtv_state::cdtvn) cdtv(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("amiga") MCFG_DEVICE_CLOCK(amiga_state::CLK_C1_NTSC) @@ -1855,7 +1855,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a3000_state::a3000n) a3000(config); - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); m_cia_0->set_clock(amiga_state::CLK_E_NTSC); m_cia_1->set_clock(amiga_state::CLK_E_NTSC); @@ -1892,7 +1892,7 @@ MACHINE_CONFIG_START(a500p_state::a500pn) a500p(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("amiga") MCFG_DEVICE_CLOCK(amiga_state::CLK_C1_NTSC) @@ -1940,7 +1940,7 @@ MACHINE_CONFIG_START(a600_state::a600n) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_MODIFY("gayle") MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("amiga") MCFG_DEVICE_CLOCK(amiga_state::CLK_C1_NTSC) @@ -1969,7 +1969,7 @@ MACHINE_CONFIG_START(a1200_state::a1200) MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) MCFG_SCREEN_NO_PALETTE - MCFG_DEVICE_REMOVE("palette") + config.device_remove("palette"); MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) @@ -2003,7 +2003,7 @@ MACHINE_CONFIG_START(a1200_state::a1200n) MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2) MCFG_DEVICE_MODIFY("gayle") MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) @@ -2034,7 +2034,7 @@ MACHINE_CONFIG_START(a4000_state::a4000) MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) MCFG_SCREEN_NO_PALETTE - MCFG_DEVICE_REMOVE("palette") + config.device_remove("palette"); MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) @@ -2055,7 +2055,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a4000_state::a4000n) a4000(config); - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) @@ -2071,7 +2071,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a4000_state::a400030) a4000(config); // main cpu - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_DEVICE_ADD("maincpu", M68EC030, XTAL(50'000'000) / 2) MCFG_DEVICE_PROGRAM_MAP(a400030_mem) @@ -2080,7 +2080,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a4000_state::a400030n) a400030(config); - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) @@ -2116,7 +2116,7 @@ MACHINE_CONFIG_START(cd32_state::cd32) MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) MCFG_SCREEN_NO_PALETTE - MCFG_DEVICE_REMOVE("palette") + config.device_remove("palette"); MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) @@ -2136,7 +2136,7 @@ MACHINE_CONFIG_START(cd32_state::cd32n) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2) - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) @@ -2152,7 +2152,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a4000_state::a4000t) a4000(config); // main cpu - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_DEVICE_ADD("maincpu", M68040, XTAL(50'000'000) / 2) MCFG_DEVICE_PROGRAM_MAP(a4000t_mem) @@ -2162,7 +2162,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a4000_state::a4000tn) a4000(config); - MCFG_DEVICE_REMOVE("screen") + config.device_remove("screen"); ntsc_video(config); MCFG_DEVICE_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga) diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 366ddb89d96..d4f2155dc09 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -1166,7 +1166,7 @@ MACHINE_CONFIG_START(amstrad_state::aleste) m_palette->set_entries(32+64); m_palette->set_init(FUNC(amstrad_state::aleste_palette)); - MCFG_DEVICE_ADD("rtc", MC146818, 4.194304_MHz_XTAL) + MC146818(config, m_rtc, 4.194304_MHz_XTAL); I8272A(config.replace(), m_fdc, 16_MHz_XTAL / 4, true); @@ -1180,7 +1180,7 @@ MACHINE_CONFIG_START(amstrad_state::aleste) FLOPPY_CONNECTOR(config, "upd765:0", aleste_floppies, "35dd", amstrad_state::aleste_floppy_formats); FLOPPY_CONNECTOR(config, "upd765:1", aleste_floppies, "35dd", amstrad_state::aleste_floppy_formats); - MCFG_DEVICE_REMOVE("flop_list") + config.device_remove("flop_list"); MCFG_SOFTWARE_LIST_ADD("flop_list", "aleste") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cpc_list", "cpc_flop") diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 13a98deed69..ee91323df9b 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -1478,9 +1478,9 @@ static MACHINE_CONFIG_START( laba2p ) apple2p(config); MCFG_MACHINE_START_OVERRIDE(apple2_state,laba2p) - MCFG_DEVICE_REMOVE("sl0") - MCFG_DEVICE_REMOVE("sl3") - MCFG_DEVICE_REMOVE("sl6") + config.device_remove("sl0"); + config.device_remove("sl3"); + config.device_remove("sl6"); // A2BUS_LAB_80COL("sl3", A2BUS_LAB_80COL).set_onboard(m_a2bus); A2BUS_IWM_FDC("sl6", A2BUS_IWM_FDC).set_onboard(m_a2bus); diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index f66b40b9867..0c30290981a 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -1408,7 +1408,7 @@ MACHINE_CONFIG_START(arkanoid_state::bootleg) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bootleg_map) - MCFG_DEVICE_REMOVE("mcu") + config.device_remove("mcu"); MACHINE_CONFIG_END void arkanoid_state::aysnd(machine_config &config) diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 17b1766d8ed..959d098491a 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -1349,10 +1349,11 @@ MACHINE_CONFIG_START(armedf_state::terrafjb) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -MACHINE_CONFIG_START(armedf_state::terrafb) +void armedf_state::terrafb(machine_config &config) +{ terraf(config); - MCFG_DEVICE_REMOVE("nb1414m4") -MACHINE_CONFIG_END + config.device_remove("nb1414m4"); +} MACHINE_CONFIG_START(armedf_state::kozure) diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index d8c6350407e..0e766b2248d 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -788,7 +788,7 @@ MACHINE_CONFIG_START(atomeb_state::atomeb) MCFG_DEVICE_PROGRAM_MAP(atomeb_mem) /* cartridges */ - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_ATOM_ROM_ADD("rom_a0", ext_load<0x0>) MCFG_ATOM_ROM_ADD("rom_a1", ext_load<0x1>) @@ -873,9 +873,9 @@ void atom_state::atombb(machine_config &config) // MCFG_DEVICE_PROGRAM_MAP(prophet_mem) // // /* fdc */ -// MCFG_DEVICE_REMOVE(I8271_TAG) -// MCFG_DEVICE_REMOVE(I8271_TAG ":0") -// MCFG_DEVICE_REMOVE(I8271_TAG ":1") +// config.device_remove(I8271_TAG); +// config.device_remove(I8271_TAG ":0"); +// config.device_remove(I8271_TAG ":1"); // // /* internal ram */ // MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index e427608f631..9031721b472 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -3787,21 +3787,23 @@ MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2) MACHINE_CONFIG_END #if 0 -MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2_3m) +void bfm_sc2_awp_state::scorpion2_3m(machine_config &config) +{ scorpion2(config); - MCFG_DEVICE_REMOVE("meters") + config.device_remove("meters"); _3meters(config); -MACHINE_CONFIG_END +} #endif /* machine driver for scorpion3 board */ -MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion3) +void bfm_sc2_awp_state::scorpion3(machine_config &config) +{ scorpion2(config); - MCFG_DEVICE_REMOVE("meters") + config.device_remove("meters"); _5meters(config); -MACHINE_CONFIG_END +} /* machine driver for scorpion2 board + matrix board */ @@ -3844,17 +3846,19 @@ MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01) _8meters(config); MACHINE_CONFIG_END -MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01_3m) +void bfm_sc2_dmd_state::scorpion2_dm01_3m(machine_config &config) +{ scorpion2_dm01(config); - MCFG_DEVICE_REMOVE("meters") + config.device_remove("meters"); _3meters(config); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01_5m) +void bfm_sc2_dmd_state::scorpion2_dm01_5m(machine_config &config) +{ scorpion2_dm01(config); - MCFG_DEVICE_REMOVE("meters") + config.device_remove("meters"); _5meters(config); -MACHINE_CONFIG_END +} void bfm_sc2_novid_state::sc2awp_common_init(int reels, int decrypt) { diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp index ad017774b79..999cfb45e00 100644 --- a/src/mame/drivers/byvid.cpp +++ b/src/mame/drivers/byvid.cpp @@ -813,7 +813,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(by133_state::granny) babypac(config); - MCFG_DEVICE_REMOVE("videocpu") + config.device_remove("videocpu"); MCFG_DEVICE_ADD("videocpu", MC6809, XTAL(8'000'000)) // MC68B09P (XTAL value hard to read) MCFG_DEVICE_PROGRAM_MAP(granny_map) diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index 6f2b1e92b90..e1aadd80bfe 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -972,7 +972,7 @@ MACHINE_CONFIG_START(cninja_state::cninjabl2) m_ioprot->soundlatch_irq_cb().set_inputline(m_audiocpu, INPUT_LINE_IRQ0); - MCFG_DEVICE_REMOVE("ymsnd") + config.device_remove("ymsnd"); MCFG_DEVICE_REPLACE("oki1", OKIM6295, XTAL(32'220'000) / 32, okim6295_device::PIN7_LOW) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index f8c3ddeef83..ee3487f8514 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -3476,14 +3476,14 @@ MACHINE_CONFIG_START(cps_state::qsound) EEPROM_93C46_8BIT(config, "eeprom"); /* sound hardware */ - MCFG_DEVICE_REMOVE("mono") + config.device_remove("mono"); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_REMOVE("soundlatch") - MCFG_DEVICE_REMOVE("soundlatch2") - MCFG_DEVICE_REMOVE("2151") - MCFG_DEVICE_REMOVE("oki") + config.device_remove("soundlatch"); + config.device_remove("soundlatch2"); + config.device_remove("2151"); + config.device_remove("oki"); MCFG_DEVICE_ADD("qsound", QSOUND) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index 43339646889..09f2683f708 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -1342,11 +1342,9 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cps2_state::gigaman2) cps2(config); - MCFG_DEVICE_REMOVE("audiocpu") + config.device_remove("audiocpu"); // gigaman2 has an AT89C4051 (8051) MCU as an audio cpu, no qsound. - MCFG_DEVICE_REMOVE("qsound") - - MCFG_DEVICE_MODIFY("maincpu") + config.device_remove("qsound"); MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(32'000'000)/32, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 18a0acb72da..b9a52077718 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -10442,7 +10442,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hparadis) maincpu.out_pb_callback().set(FUNC(ddenlovr_state::hparadis_select_w)); // the RTC seems unused - MCFG_DEVICE_REMOVE("rtc") + config.device_remove("rtc"); MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hparadis) MACHINE_CONFIG_END diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp index 097c52458fb..3cd6921cf56 100644 --- a/src/mame/drivers/fastfred.cpp +++ b/src/mame/drivers/fastfred.cpp @@ -685,14 +685,14 @@ MACHINE_CONFIG_START(fastfred_state::jumpcoas) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(jumpcoas_map) - MCFG_DEVICE_REMOVE("audiocpu") + config.device_remove("audiocpu"); /* video hardware */ subdevice("gfxdecode")->set_info(gfx_jumpcoas); /* sound hardware */ - MCFG_DEVICE_REMOVE("soundlatch") - MCFG_DEVICE_REMOVE("ay8910.2") + config.device_remove("soundlatch"); + config.device_remove("ay8910.2"); MACHINE_CONFIG_END MACHINE_CONFIG_START(fastfred_state::imago) diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index a51e6973ecf..b2515727109 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -768,7 +768,7 @@ MACHINE_CONFIG_START(cpu30_state::cpu30x) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL(16'777'216)) /* 16.7 MHz from description, crystal needs verification */ -// MCFG_DEVICE_REMOVE("") +// config.device_remove(""); // dual ported ram m_ram->set_default_size("1M").set_extra_options("1M, 2M, 4M"); @@ -832,10 +832,10 @@ void cpu30_state::cpu30lite4(machine_config &config) { cpu30zbe(config); // Enable these when added to main config -// MCFG_DEVICE_REMOVE("fpu") -// MCFG_DEVICE_REMOVE("scsi") -// MCFG_DEVICE_REMOVE("eth") -// MCFG_DEVICE_REMOVE("fdc") +// config.device_remove("fpu"); +// config.device_remove("scsi"); +// config.device_remove("eth"); +// config.device_remove("fdc"); // dual ported ram m_ram->set_default_size("4M").set_extra_options("256K, 512K, 1M, 2M, 4M, 8M, 16M, 32M"); } diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index 10338d351b9..6f4ffd359d8 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -694,8 +694,8 @@ MACHINE_CONFIG_START(fidel68k_state::eagv11) MCFG_DEVICE_PROGRAM_MAP(eagv11_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel68k_state, irq2_line_hold, 600) - MCFG_DEVICE_REMOVE("irq_on") // 8.25us is too long - MCFG_DEVICE_REMOVE("irq_off") + config.device_remove("irq_on"); // 8.25us is too long + config.device_remove("irq_off"); MACHINE_CONFIG_END diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 75a20127ed5..b752b5c836b 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -536,11 +536,12 @@ MACHINE_CONFIG_START(galivan_state::ninjemak) MACHINE_CONFIG_END -MACHINE_CONFIG_START(galivan_state::youmab) +void galivan_state::youmab(machine_config &config) +{ ninjemak(config); - MCFG_DEVICE_REMOVE("nb1414m4") -MACHINE_CONFIG_END + config.device_remove("nb1414m4"); +} /*************************************************************************** Game driver(s) diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp index de24e2ddf58..9c2dfd42a71 100644 --- a/src/mame/drivers/glasgow.cpp +++ b/src/mame/drivers/glasgow.cpp @@ -343,7 +343,7 @@ MACHINE_CONFIG_START(amsterd_state::dallas32) MCFG_DEVICE_REPLACE("maincpu", M68020, 14_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(dallas32_mem) - MCFG_DEVICE_REMOVE("nmi_timer") + config.device_remove("nmi_timer"); TIMER(config, "nmi_timer").configure_periodic(FUNC(amsterd_state::update_nmi32), attotime::from_hz(50)); MACHINE_CONFIG_END diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 11b6df45206..7103fbbdba0 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -435,7 +435,7 @@ MACHINE_CONFIG_START(gng_state::diamond) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(diamond_map) - MCFG_DEVICE_REMOVE("mainlatch") + config.device_remove("mainlatch"); MACHINE_CONFIG_END diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp index d101d091b55..22b3de1f363 100644 --- a/src/mame/drivers/gundealr.cpp +++ b/src/mame/drivers/gundealr.cpp @@ -537,10 +537,11 @@ MACHINE_CONFIG_START(gundealr_state::yamyam) TIMER(config, "mcusim").configure_periodic(FUNC(gundealr_state::yamyam_mcu_sim), attotime::from_hz(6000000/60)); /* 6mhz confirmed */ MACHINE_CONFIG_END -MACHINE_CONFIG_START(gundealr_state::gundealrbl) +void gundealr_state::gundealrbl(machine_config &config) +{ yamyam(config); - MCFG_DEVICE_REMOVE("mcusim") -MACHINE_CONFIG_END + config.device_remove("mcusim"); +} /*************************************************************************** diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 45dc366f227..11550c5014a 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -1306,7 +1306,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(highvdeo_state::ciclone) tv_tcf(config); - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_DEVICE_ADD("maincpu", I80186, 20000000 ) // ? MCFG_DEVICE_PROGRAM_MAP(tv_tcf_map) diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp index 03370850007..18d4c1a9b9b 100644 --- a/src/mame/drivers/hx20.cpp +++ b/src/mame/drivers/hx20.cpp @@ -911,7 +911,7 @@ MACHINE_CONFIG_START(hx20_state::cm6000) m_maincpu->set_addrmap(AS_PROGRAM, &hx20_state::cm6000_mem); // optional rom - MCFG_DEVICE_REMOVE("optrom") + config.device_remove("optrom"); // software lists MCFG_SOFTWARE_LIST_REMOVE("epson_cpm_list") diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp index 99fe6fa41aa..f078351a8c0 100644 --- a/src/mame/drivers/ibmpc.cpp +++ b/src/mame/drivers/ibmpc.cpp @@ -327,7 +327,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ibmpc_state::ibm5140) ibm5150(config); /* software lists */ - MCFG_DEVICE_REMOVE( "disk_list" ) + config.device_remove( "disk_list" ); MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5140") MACHINE_CONFIG_END diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index 95e7766f590..4669c9448b2 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -1974,7 +1974,7 @@ MACHINE_CONFIG_START(igspoker_state::number10) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(number10_io_map) - MCFG_DEVICE_REMOVE("ppi") + config.device_remove("ppi"); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(igspoker_state, screen_update_cpokerpk) diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp index 988e9eec581..51bc760ca21 100644 --- a/src/mame/drivers/intv.cpp +++ b/src/mame/drivers/intv.cpp @@ -507,7 +507,7 @@ MACHINE_CONFIG_START(intv_state::intvoice) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_PROGRAM_MAP(intvoice_mem) - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_DEVICE_ADD("voice", INTV_ROM_VOICE, 0) MACHINE_CONFIG_END @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(intv_state::intvecs) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(intvecs_mem) - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_DEVICE_ADD("ecs", INTV_ROM_ECS, 0) sp0256_device &speech(SP0256(config, "speech", 3120000)); @@ -527,8 +527,8 @@ MACHINE_CONFIG_START(intv_state::intvecs) //CASSETTE(config, "cassette"); /* software lists */ - MCFG_DEVICE_REMOVE("cart_list") - MCFG_DEVICE_REMOVE("ecs_list") + config.device_remove("cart_list"); + config.device_remove("ecs_list"); MCFG_SOFTWARE_LIST_ADD("cart_list", "intvecs") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("intv_list", "intv") MACHINE_CONFIG_END diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 1adaac2ab58..b24e35076f3 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -599,8 +599,8 @@ MACHINE_CONFIG_START(lasso_state::pinbo) MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_chameleo) /* sound hardware */ - MCFG_DEVICE_REMOVE("sn76489.1") - MCFG_DEVICE_REMOVE("sn76489.2") + config.device_remove("sn76489.1"); + config.device_remove("sn76489.2"); AY8910(config, "ay1", XTAL(18'000'000)/12).add_route(ALL_OUTPUTS, "speaker", 0.55); AY8910(config, "ay2", XTAL(18'000'000)/12).add_route(ALL_OUTPUTS, "speaker", 0.55); diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index 603bb9f4161..66964d34c0e 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -615,7 +615,7 @@ MACHINE_CONFIG_START(lsasquad_state::storming) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(storming_map) - MCFG_DEVICE_REMOVE("bmcu") + config.device_remove("bmcu"); AY8910(config.replace(), "aysnd", MASTER_CLOCK / 8).add_route(ALL_OUTPUTS, "mono", 0.12); // AY-3-8910A MACHINE_CONFIG_END diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 47ffe6a5944..3dfab55f816 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -1524,7 +1524,7 @@ MACHINE_CONFIG_START(brno_state::brno) FLOPPY_CONNECTOR(config, WD2797_TAG":0", brno_floppies, "35hd", brno_state::floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, WD2797_TAG":1", brno_floppies, "35hd", brno_state::floppy_formats).enable_sound(true); // only one floppy drive - //MCFG_DEVICE_REMOVE(WD2797_TAG":1") + //config.device_remove(WD2797_TAG":1"); //MCFG_SNAPSHOT_ADD("snapshot", brno_state, brno, "rmd", 0) diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index 5c32e4dd1d4..e08bbb3cf7e 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -1023,7 +1023,7 @@ MACHINE_CONFIG_START(magicard_state::hotslots) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(hotslots_mem) - MCFG_DEVICE_REMOVE("saa") + config.device_remove("saa"); YMZ284(config, "ssg", 4000000).add_route(ALL_OUTPUTS, "mono", 1.0); MACHINE_CONFIG_END diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp index f9e1e002b16..4ea407f5fbe 100644 --- a/src/mame/drivers/markham.cpp +++ b/src/mame/drivers/markham.cpp @@ -579,12 +579,12 @@ MACHINE_CONFIG_START(markham_state::strnskil) markham(config); /* basic machine hardware */ - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK/2) /* 4.000MHz */ MCFG_DEVICE_PROGRAM_MAP(strnskil_master_map) TIMER(config, "scantimer").configure_scanline(FUNC(markham_state::strnskil_scanline), "screen", 0, 1); - MCFG_DEVICE_REMOVE("subcpu") + config.device_remove("subcpu"); MCFG_DEVICE_ADD("subcpu", Z80, CPU_CLOCK/2) /* 4.000MHz */ MCFG_DEVICE_PROGRAM_MAP(strnskil_slave_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(markham_state, irq0_line_hold, 2*(PIXEL_CLOCK/HTOTAL/VTOTAL)) diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index aa4c4e6c69e..3fd8884996b 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -827,8 +827,8 @@ MACHINE_CONFIG_START(mbee_state::mbee256) MCFG_DEVICE_IO_MAP(mbee256_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee256) - MCFG_DEVICE_REMOVE("fdc:0") - MCFG_DEVICE_REMOVE("fdc:1") + config.device_remove("fdc:0"); + config.device_remove("fdc:1"); FLOPPY_CONNECTOR(config, m_floppy0, mbee_floppies, "35dd", floppy_image_device::default_floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, m_floppy1, mbee_floppies, "35dd", floppy_image_device::default_floppy_formats).enable_sound(true); MACHINE_CONFIG_END @@ -839,8 +839,8 @@ MACHINE_CONFIG_START(mbee_state::mbeett) MCFG_DEVICE_PROGRAM_MAP(mbeett_mem) MCFG_DEVICE_IO_MAP(mbeett_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbeett) - MCFG_DEVICE_REMOVE("quickload") - MCFG_DEVICE_REMOVE("quickload2") + config.device_remove("quickload"); + config.device_remove("quickload2"); SCC8530(config, "scc", 4000000); // clock unknown MACHINE_CONFIG_END diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index 1a71c0b3413..78264d034ec 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -592,7 +592,7 @@ MACHINE_CONFIG_START(mc10_state::alice90) /* Software lists */ MCFG_SOFTWARE_LIST_MODIFY("cass_list", "alice90") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("alice32_cass", "alice32") - MCFG_DEVICE_REMOVE("mc10_cass") + config.device_remove("mc10_cass"); MACHINE_CONFIG_END } diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp index 59c40968a60..0db98a050a0 100644 --- a/src/mame/drivers/megadriv.cpp +++ b/src/mame/drivers/megadriv.cpp @@ -619,7 +619,7 @@ MACHINE_CONFIG_START(md_cons_state::genesis_32x) // we need to remove and re-add the YM because the balance is different // due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) - MCFG_DEVICE_REMOVE("ymsnd") + config.device_remove("ymsnd"); MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2) @@ -656,7 +656,7 @@ MACHINE_CONFIG_START(md_cons_state::mdj_32x) // we need to remove and re-add the sound system because the balance is different // due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) - MCFG_DEVICE_REMOVE("ymsnd") + config.device_remove("ymsnd"); MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2) @@ -693,7 +693,7 @@ MACHINE_CONFIG_START(md_cons_state::md_32x) // we need to remove and re-add the sound system because the balance is different // due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) - MCFG_DEVICE_REMOVE("ymsnd") + config.device_remove("ymsnd"); MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2) @@ -804,7 +804,7 @@ MACHINE_CONFIG_START(md_cons_state::genesis_32x_scd) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "_32x_cart") MCFG_GENERIC_EXTENSIONS("32x,bin") MCFG_GENERIC_LOAD(md_cons_state, _32x_cart) @@ -823,7 +823,7 @@ MACHINE_CONFIG_START(md_cons_state::md_32x_scd) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "_32x_cart") MCFG_GENERIC_EXTENSIONS("32x,bin") MCFG_GENERIC_LOAD(md_cons_state, _32x_cart) @@ -842,7 +842,7 @@ MACHINE_CONFIG_START(md_cons_state::mdj_32x_scd) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "_32x_cart") MCFG_GENERIC_EXTENSIONS("32x,bin") MCFG_GENERIC_LOAD(md_cons_state, _32x_cart) diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index 7a26840f18c..679bccc5686 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -201,10 +201,11 @@ MACHINE_CONFIG_START(mrdo_state::mrdo) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -MACHINE_CONFIG_START(mrdo_state::mrlo) +void mrdo_state::mrlo(machine_config &config) +{ mrdo(config); - //MCFG_DEVICE_REMOVE("pal16r6") -MACHINE_CONFIG_END + //config.device_remove("pal16r6"); +} diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 94ec41c7902..25249470664 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -431,7 +431,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mz_state::mz800) mz700(config); - MCFG_DEVICE_REMOVE("banke") + config.device_remove("banke"); /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -449,7 +449,7 @@ MACHINE_CONFIG_START(mz_state::mz800) MCFG_DEVICE_ADD("sn76489n", SN76489, XTAL(17'734'470)/5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_DEVICE_REMOVE("cass_list") + config.device_remove("cass_list"); MCFG_SOFTWARE_LIST_ADD("cass_list","mz800_cass") /* devices */ diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 7b70bba6833..065f4f172be 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -3961,7 +3961,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22s) TIMER(config, "mcu_irq").configure_scanline(FUNC(namcos22_state::mcu_irq), "screen", 0, 240); MCFG_QUANTUM_TIME(attotime::from_hz(9000)) // erratic inputs otherwise, probably mcu vs maincpu shareram - MCFG_DEVICE_REMOVE("iomcu") + config.device_remove("iomcu"); MB87078(config, m_mb87078); m_mb87078->gain_changed().set(FUNC(namcos22_state::mb87078_gain_changed)); diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index 11cb183ecce..f25f508cb09 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -785,7 +785,7 @@ MACHINE_CONFIG_START(g7400_state::g7400) m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40); odyssey2_cartslot(config); - MCFG_DEVICE_REMOVE("cart_list") + config.device_remove("cart_list"); MCFG_SOFTWARE_LIST_ADD("cart_list","g7400") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("ody2_list","odyssey2") MACHINE_CONFIG_END @@ -832,7 +832,7 @@ MACHINE_CONFIG_START(g7400_state::odyssey3) m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40); odyssey2_cartslot(config); - MCFG_DEVICE_REMOVE("cart_list") + config.device_remove("cart_list"); MCFG_SOFTWARE_LIST_ADD("cart_list","g7400") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("ody2_list","odyssey2") MACHINE_CONFIG_END diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index ce1a6af84e8..7361dce0fd6 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -571,8 +571,8 @@ MACHINE_CONFIG_START(okean240_state::okean240) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(okean240_io) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_okean240) - MCFG_DEVICE_REMOVE("uart") - MCFG_DEVICE_REMOVE("rs232") + config.device_remove("uart"); + config.device_remove("rs232"); subdevice("pit")->out_handler<1>().set_nop(); generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0)); keyboard.set_keyboard_callback(FUNC(okean240_state::kbd_put)); diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index fe318404144..2d04b3bc995 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -3741,7 +3741,7 @@ MACHINE_CONFIG_START(pacman_state::vanvan) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, vblank_nmi)) /* sound hardware */ - MCFG_DEVICE_REMOVE("namco") + config.device_remove("namco"); MCFG_DEVICE_ADD("sn1", SN76496, 1789750) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) @@ -3799,7 +3799,7 @@ MACHINE_CONFIG_START(pacman_state::s2650games) MCFG_VIDEO_START_OVERRIDE(pacman_state,s2650games) /* sound hardware */ - MCFG_DEVICE_REMOVE("namco") + config.device_remove("namco"); MCFG_DEVICE_ADD("sn1", SN76496, MASTER_CLOCK/6) /* 1H */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index f87530af968..c5f1b1739db 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -330,7 +330,7 @@ INPUT_PORTS_END MACHINE_CONFIG_START(pc_state::bondwell) pccga(config); - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_CPU_PC(pc8, pc8, I8088, 4772720) // turbo? MACHINE_CONFIG_END @@ -486,7 +486,7 @@ Options: 8087 FPU, EagleNet File server, EightPort serial card, High Resolution MACHINE_CONFIG_START(pc_state::eagle1600) pccga(config); - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_CPU_PC(pc16, pc16, I8086, 8000000) MACHINE_CONFIG_END @@ -556,7 +556,7 @@ void pc_state::epc_io(address_map &map) MACHINE_CONFIG_START(pc_state::epc) pccga(config); - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_CPU_PC(pc8, epc, I8088, 4772720) MCFG_DEVICE_MODIFY("isa1") MCFG_SLOT_DEFAULT_OPTION("ega") @@ -823,7 +823,7 @@ Options: 8087 FPU MACHINE_CONFIG_START(pc_state::olytext30) pccga(config); - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_CPU_PC(pc8, pc8, V20, XTAL(14'318'181)/3) /* 4,77 MHz */ MCFG_DEVICE_MODIFY("isa2") MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_single_720K) diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp index ebea2c78cce..93f9527b02e 100644 --- a/src/mame/drivers/prestige.cpp +++ b/src/mame/drivers/prestige.cpp @@ -837,7 +837,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(prestige_state::princ) prestige_base(config); - MCFG_DEVICE_REMOVE("cartslot") + config.device_remove("cartslot"); MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "princ_cart") MCFG_SOFTWARE_LIST_ADD("cart_list", "princ") MACHINE_CONFIG_END diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index e84624d7d4f..3cc87bf0fb2 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -459,7 +459,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(progolf_state::progolfa) progolf(config); - MCFG_DEVICE_REMOVE("maincpu") /* different encrypted cpu to progolf */ + config.device_remove("maincpu"); /* different encrypted cpu to progolf */ MCFG_DEVICE_ADD("maincpu", DECO_CPU6, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */ MCFG_DEVICE_PROGRAM_MAP(main_cpu) MACHINE_CONFIG_END diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp index ff51a3480e4..52680f21141 100644 --- a/src/mame/drivers/puckpkmn.cpp +++ b/src/mame/drivers/puckpkmn.cpp @@ -286,7 +286,7 @@ MACHINE_CONFIG_START(md_boot_state::puckpkmn) MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_bootleg) - MCFG_DEVICE_REMOVE("genesis_snd_z80") + config.device_remove("genesis_snd_z80"); MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(4'000'000) / 4, okim6295_device::PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index 1a7f11b9174..ec9af125baa 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -481,7 +481,7 @@ MACHINE_CONFIG_START(retofinv_state::retofinvb_nomcu) m_mainlatch->q_out_cb<3>().set_nop(); - MCFG_DEVICE_REMOVE("68705") + config.device_remove("68705"); MACHINE_CONFIG_END /* bootleg which has different pallete clut and also has no mcu */ @@ -492,7 +492,7 @@ MACHINE_CONFIG_START(retofinv_state::retofinvb1_nomcu) m_mainlatch->q_out_cb<3>().set_nop(); - MCFG_DEVICE_REMOVE("68705") + config.device_remove("68705"); MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index f36aa333811..1a7f7215a59 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -537,7 +537,7 @@ MACHINE_CONFIG_START(sauro_state::saurob) MCFG_DEVICE_PROGRAM_MAP(saurob_sound_map) /* sound hardware */ - MCFG_DEVICE_REMOVE("speech") + config.device_remove("speech"); MACHINE_CONFIG_END diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 7ff3f630e95..59830f7b872 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -1452,8 +1452,8 @@ MACHINE_CONFIG_START(scramble_state::hotshock) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(hotshock_map) - MCFG_DEVICE_REMOVE( "ppi8255_0" ) - MCFG_DEVICE_REMOVE( "ppi8255_1" ) + config.device_remove( "ppi8255_0" ); + config.device_remove( "ppi8255_1" ); MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_IO_MAP(hotshock_sound_io_map) @@ -1504,9 +1504,9 @@ MACHINE_CONFIG_START(scramble_state::triplep) MCFG_DEVICE_PROGRAM_MAP(triplep_map) MCFG_DEVICE_IO_MAP(triplep_io_map) - MCFG_DEVICE_REMOVE("audiocpu") - MCFG_DEVICE_REMOVE("ppi8255_1") - MCFG_DEVICE_REMOVE("konami_7474") + config.device_remove("audiocpu"); + config.device_remove("ppi8255_1"); + config.device_remove("konami_7474"); /* video hardware */ m_palette->set_entries(32+64+2+0); // 32 for characters, 64 for stars, 2 for bullets @@ -1520,7 +1520,7 @@ MACHINE_CONFIG_START(scramble_state::triplep) MCFG_SOUND_ROUTES_RESET() MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_DEVICE_REMOVE("8910.2") + config.device_remove("8910.2"); MACHINE_CONFIG_END MACHINE_CONFIG_START(scramble_state::mariner) diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index 4ee9138801e..6c2e5ce6b8f 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -2098,9 +2098,9 @@ void segas16a_state::system16a_no7751p(machine_config &config) /* static MACHINE_CONFIG_START( system16a_i8751_no7751 ) system16a_i8751(config); - MCFG_DEVICE_REMOVE("n7751") - MCFG_DEVICE_REMOVE("dac") - MCFG_DEVICE_REMOVE("vref") + config.device_remove("n7751"); + config.device_remove("dac"); + config.device_remove("vref"); MCFG_DEVICE_REPLACE("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index f7273528d27..19da5a0e2e8 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -9822,8 +9822,8 @@ MACHINE_CONFIG_START(isgsm_state::isgsm) system16b(config); // basic machine hardware - MCFG_DEVICE_REMOVE("maincpu") - MCFG_DEVICE_REMOVE("mapper") + config.device_remove("maincpu"); + config.device_remove("mapper"); MCFG_DEVICE_ADD("maincpu", M68000, 16000000) // no obvious CPU, but seems to be clocked faster than an original system16 based on the boot times MCFG_DEVICE_PROGRAM_MAP(isgsm_map) diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index b624190a8b8..2f828e94884 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -2419,7 +2419,7 @@ MACHINE_CONFIG_START(seta2_state::ablastb) MCFG_DEVICE_PROGRAM_MAP(ablastb_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta2_state, irq2_line_hold) - MCFG_DEVICE_REMOVE("tmp68301") + config.device_remove("tmp68301"); MACHINE_CONFIG_END MACHINE_CONFIG_START(seta2_state::reelquak) diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index e9c7e66c310..b196d534f21 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -570,7 +570,7 @@ MACHINE_CONFIG_START(sg1000_state::omv) MCFG_DEVICE_PROGRAM_MAP(omv_map) MCFG_DEVICE_IO_MAP(omv_io_map) - MCFG_DEVICE_REMOVE(CARTSLOT_TAG) + config.device_remove(CARTSLOT_TAG); MCFG_OMV_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, nullptr) m_ram->set_default_size("2K"); diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index 63f4cd949b9..7e762fed197 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -341,7 +341,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(shootout_state::shootouk) shootouj(config); /* the Korean 'bootleg' has the usual DECO222 style encryption */ - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_DEVICE_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb) MCFG_DEVICE_PROGRAM_MAP(shootouj_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index e93b056a7cb..3f943a88cc4 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -2898,7 +2898,7 @@ MACHINE_CONFIG_START(sigmab98_state::dashhero) MCFG_DEVICE_PROGRAM_MAP( gegege_mem_map ) MCFG_DEVICE_IO_MAP( dashhero_io_map ) - MCFG_DEVICE_REMOVE("nvram") // FIXME: does not survive between sessions otherwise + config.device_remove("nvram"); // FIXME: does not survive between sessions otherwise MACHINE_CONFIG_END diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index ed75b00ef21..730a13026d0 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -450,13 +450,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(silvmil_state::puzzlove) silvmil(config); - MCFG_DEVICE_REMOVE("audiocpu") + config.device_remove("audiocpu"); MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000)) /* Verified */ MCFG_DEVICE_PROGRAM_MAP(silvmil_sound_map) m_sprgen->set_bootleg_type(1); - MCFG_DEVICE_REMOVE("oki") + config.device_remove("oki"); MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(4'000'000)/4, okim6295_device::PIN7_HIGH) /* Verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index 2aae8d40ba2..31dd8bf7b08 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -999,7 +999,7 @@ MACHINE_CONFIG_START(slapfght_state::tigerhb1) MCFG_DEVICE_PROGRAM_MAP(tigerhb1_map) MCFG_DEVICE_IO_MAP(io_map_nomcu) - MCFG_DEVICE_REMOVE("bmcu") + config.device_remove("bmcu"); MACHINE_CONFIG_END MACHINE_CONFIG_START(slapfght_state::tigerhb2) @@ -1072,7 +1072,7 @@ MACHINE_CONFIG_START(slapfght_state::slapfighb1) MCFG_DEVICE_PROGRAM_MAP(slapfighb1_map) MCFG_DEVICE_IO_MAP(io_map_nomcu) - MCFG_DEVICE_REMOVE("bmcu") + config.device_remove("bmcu"); MACHINE_CONFIG_END MACHINE_CONFIG_START(slapfght_state::slapfighb2) diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index 2f6ef3333d0..fdad2f1975d 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -638,8 +638,8 @@ MACHINE_CONFIG_START(smssdisp_state::sms_sdisp) /* Both CPUs seem to communicate with the VDP etc? */ MCFG_DEVICE_IO_MAP(sms_io) - MCFG_DEVICE_REMOVE("mycard") - MCFG_DEVICE_REMOVE("smsexp") + config.device_remove("mycard"); + config.device_remove("smsexp"); MCFG_SMS_CARTRIDGE_ADD("slot2", sms_cart, nullptr) MCFG_SMS_CARTRIDGE_ADD("slot3", sms_cart, nullptr) @@ -902,7 +902,7 @@ MACHINE_CONFIG_START(sms_state::sms2_kr) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(smskr_io) - MCFG_DEVICE_REMOVE("slot") + config.device_remove("slot"); MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list2","sg1000") @@ -917,9 +917,9 @@ MACHINE_CONFIG_START(sms_state::sms1_kr) // need to replace the cartridge slot with the Japanese version, so to // keep the usual media order, remove and reinsert all of them. - MCFG_DEVICE_REMOVE("slot") - MCFG_DEVICE_REMOVE("mycard") - MCFG_DEVICE_REMOVE("smsexp") + config.device_remove("slot"); + config.device_remove("mycard"); + config.device_remove("smsexp"); MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, nullptr) MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr) MCFG_SMS_EXPANSION_ADD("smsexp", sms_expansion_devices, nullptr) @@ -954,9 +954,9 @@ MACHINE_CONFIG_START(sms_state::sg1000m3) // Remove and reinsert all media slots, as done with the sms1_kr config, // and also replace the expansion slot with the SG-1000 version. - MCFG_DEVICE_REMOVE("slot") - MCFG_DEVICE_REMOVE("mycard") - MCFG_DEVICE_REMOVE("smsexp") + config.device_remove("slot"); + config.device_remove("mycard"); + config.device_remove("smsexp"); MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, nullptr) MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr) MCFG_SG1000_EXPANSION_ADD("sgexp", sg1000_expansion_devices, nullptr, false) diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index 1b54426da55..5f3981b5dec 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -299,7 +299,7 @@ GFXDECODE_END MACHINE_CONFIG_START(spectrum_state::spectrum_128) spectrum(config); - MCFG_DEVICE_REMOVE("maincpu") + config.device_remove("maincpu"); MCFG_DEVICE_ADD("maincpu", Z80, X1_128_SINCLAIR / 5) MCFG_DEVICE_PROGRAM_MAP(spectrum_128_mem) diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index c10ed7f9300..3f0d733e6df 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -530,11 +530,11 @@ MACHINE_CONFIG_START(sprint2_state::sprint1) sprint2(config); /* sound hardware */ - MCFG_DEVICE_REMOVE("lspeaker") - MCFG_DEVICE_REMOVE("rspeaker") + config.device_remove("lspeaker"); + config.device_remove("rspeaker"); SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_REMOVE("discrete") + config.device_remove("discrete"); MCFG_DEVICE_ADD("discrete", DISCRETE, sprint1_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -545,11 +545,11 @@ MACHINE_CONFIG_START(sprint2_state::dominos) sprint2(config); /* sound hardware */ - MCFG_DEVICE_REMOVE("lspeaker") - MCFG_DEVICE_REMOVE("rspeaker") + config.device_remove("lspeaker"); + config.device_remove("rspeaker"); SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_REMOVE("discrete") + config.device_remove("discrete"); MCFG_DEVICE_ADD("discrete", DISCRETE, dominos_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp index abb19fd6dc0..376ef33e65c 100644 --- a/src/mame/drivers/ssfindo.cpp +++ b/src/mame/drivers/ssfindo.cpp @@ -824,7 +824,7 @@ MACHINE_CONFIG_START(ssfindo_state::ppcar) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(ppcar_map) - MCFG_DEVICE_REMOVE("i2cmem") + config.device_remove("i2cmem"); MACHINE_CONFIG_END MACHINE_CONFIG_START(ssfindo_state::tetfight) diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index eb07e4b6e65..aeb23b81f97 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -775,7 +775,7 @@ MACHINE_CONFIG_START(tandy1000_state::t1000tx) MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_DEVICE_IO_MAP(tandy1000tx_io) - MCFG_DEVICE_REMOVE("pc_keyboard") + config.device_remove("pc_keyboard"); tandy1000_90key(config); MACHINE_CONFIG_END diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index 065d931c2c5..f08b89a34b6 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -497,7 +497,7 @@ MACHINE_CONFIG_START(terracre_state::ym2203) MCFG_DEVICE_MODIFY("audiocpu") MCFG_DEVICE_IO_MAP(sound_2203_io_map) - MCFG_DEVICE_REMOVE("ymsnd") + config.device_remove("ymsnd"); MCFG_DEVICE_ADD("ym1", YM2203, XTAL(16'000'000)/4) MCFG_SOUND_ROUTE(0, "speaker", 0.2) diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index 589a3279514..c48836e0d1d 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(ti85_state::ti81v2) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(ti81v2_io) - MCFG_DEVICE_REMOVE("linkport") + config.device_remove("linkport"); MACHINE_CONFIG_END MACHINE_CONFIG_START(ti85_state::ti83) @@ -748,11 +748,12 @@ MACHINE_CONFIG_START(ti85_state::ti84pse) MCFG_MACHINE_START_OVERRIDE(ti85_state, ti84pse ) MACHINE_CONFIG_END -MACHINE_CONFIG_START(ti85_state::ti73) +void ti85_state::ti73(machine_config &config) +{ ti83p(config); - MCFG_DEVICE_REMOVE("linkport") - //MCFG_TI73SERIAL_ADD( "tiserial" ) -MACHINE_CONFIG_END + config.device_remove("linkport"); + //TI73SERIAL(config, "tiserial"); +} ROM_START (ti73) ROM_REGION (0x80000, "flash",0) diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 054a6e1754f..f9edf27948a 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -571,7 +571,7 @@ MACHINE_CONFIG_START(trs80_state::sys80) model1(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(sys80_io) - MCFG_DEVICE_REMOVE("brg") + config.device_remove("brg"); MACHINE_CONFIG_END MACHINE_CONFIG_START(trs80_state::ht1080z) diff --git a/src/mame/drivers/trs80m3.cpp b/src/mame/drivers/trs80m3.cpp index bf4dd1eff79..8a4500ab729 100644 --- a/src/mame/drivers/trs80m3.cpp +++ b/src/mame/drivers/trs80m3.cpp @@ -427,7 +427,7 @@ MACHINE_CONFIG_START(trs80m3_state::model4p) m_m4p_bank->set_addr_width(19); m_m4p_bank->set_stride(0x10000); - MCFG_DEVICE_REMOVE("quickload") + config.device_remove("quickload"); MACHINE_CONFIG_END MACHINE_CONFIG_START(trs80m3_state::cp500) diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index a9fde4d80b8..ac7ca3804b7 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -208,7 +208,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(tx1_state::tx1j) tx1(config); - MCFG_DEVICE_REMOVE("soundbrd") + config.device_remove("soundbrd"); MCFG_DEVICE_ADD("soundbrd", TX1J_SOUND, TX1_PIXEL_CLOCK) MACHINE_CONFIG_END diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index 82bc8fc8c98..15bf51bfefa 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -1044,10 +1044,10 @@ MACHINE_CONFIG_START(keirinou_state::keirinou) ay2.port_b_write_callback().set(FUNC(witch_state::yscroll_w)); ay2.add_route(ALL_OUTPUTS, "mono", 0.5); - MCFG_DEVICE_REMOVE("essnd") - MCFG_DEVICE_REMOVE("msm") - MCFG_DEVICE_REMOVE("ym1") - MCFG_DEVICE_REMOVE("ym2") + config.device_remove("essnd"); + config.device_remove("msm"); + config.device_remove("ym1"); + config.device_remove("ym2"); MACHINE_CONFIG_END ROM_START( witch ) diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index eae8b307de5..9cdd53bd070 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -858,7 +858,7 @@ MACHINE_CONFIG_START(wiz_state::stinger) MCFG_SCREEN_UPDATE_DRIVER(wiz_state, screen_update_stinger) /* sound hardware */ - MCFG_DEVICE_REMOVE("8910.3") + config.device_remove("8910.3"); MCFG_DEVICE_ADD("discrete", DISCRETE, stinger_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index 424afbf473f..763bbf58d98 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -177,8 +177,8 @@ MACHINE_CONFIG_START(wscolor_state::wscolor) palette.set_init(FUNC(wscolor_state::wscolor_palette)); /* software lists */ - MCFG_DEVICE_REMOVE("cart_list") - MCFG_DEVICE_REMOVE("wsc_list") + config.device_remove("cart_list"); + config.device_remove("wsc_list"); MCFG_SOFTWARE_LIST_ADD("cart_list","wscolor") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("ws_list","wswan") MACHINE_CONFIG_END diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp index 74eae071c24..24d4958fb3e 100644 --- a/src/mame/drivers/xain.cpp +++ b/src/mame/drivers/xain.cpp @@ -523,7 +523,7 @@ MACHINE_CONFIG_START(xain_state::xsleenab) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(bootleg_map) - MCFG_DEVICE_REMOVE("mcu") + config.device_remove("mcu"); MACHINE_CONFIG_END -- cgit v1.2.3