From a6ee791664e78112cd59fddd23252c4077c5271e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 22 May 2017 14:31:40 +1000 Subject: Goodbye MACHINE_CONFIG_FRAGMENT, it was nice knowing you. (nw) This is a pretty minimal change. The point where the root device is added has been moved from the MACHINE_CONFIG_START macro to the constructor of the machine configuration class (made possible by giving drivers their own device types). This isn't the final change in this area. The root device is still being handled specially in that its configuration comes from the game driver structure. This needs to be harmonised with regular devices. But that's a job for another day. --- src/mame/audio/alesis.cpp | 2 +- src/mame/audio/astrof.cpp | 6 ++-- src/mame/audio/atarijsa.cpp | 4 +-- src/mame/audio/bwidow.cpp | 4 +-- src/mame/audio/bzone.cpp | 2 +- src/mame/audio/cage.cpp | 2 +- src/mame/audio/carnival.cpp | 2 +- src/mame/audio/cclimber.cpp | 2 +- src/mame/audio/cinemat.cpp | 28 ++++++++--------- src/mame/audio/crbaloon.cpp | 2 +- src/mame/audio/csd.cpp | 2 +- src/mame/audio/dcs.cpp | 8 ++--- src/mame/audio/decobsmt.cpp | 2 +- src/mame/audio/depthch.cpp | 2 +- src/mame/audio/dkong.cpp | 6 ++-- src/mame/audio/dsbz80.cpp | 2 +- src/mame/audio/efo_zsu.cpp | 4 +-- src/mame/audio/exidy.cpp | 6 ++-- src/mame/audio/exidy440.cpp | 2 +- src/mame/audio/galaxian.cpp | 4 +-- src/mame/audio/gottlieb.cpp | 8 ++--- src/mame/audio/harddriv.cpp | 2 +- src/mame/audio/hng64.cpp | 2 +- src/mame/audio/hyprolyb.cpp | 2 +- src/mame/audio/invinco.cpp | 2 +- src/mame/audio/irem.cpp | 6 ++-- src/mame/audio/jedi.cpp | 2 +- src/mame/audio/leland.cpp | 8 ++--- src/mame/audio/mario.cpp | 4 +-- src/mame/audio/midway.cpp | 8 ++--- src/mame/audio/mw8080bw.cpp | 44 +++++++++++++------------- src/mame/audio/n8080.cpp | 6 ++-- src/mame/audio/namco52.cpp | 2 +- src/mame/audio/namco54.cpp | 2 +- src/mame/audio/pulsar.cpp | 2 +- src/mame/audio/qix.cpp | 4 +-- src/mame/audio/rax.cpp | 2 +- src/mame/audio/redalert.cpp | 10 +++--- src/mame/audio/s11c_bg.cpp | 2 +- src/mame/audio/scramble.cpp | 2 +- src/mame/audio/segag80r.cpp | 8 ++--- src/mame/audio/segam1audio.cpp | 2 +- src/mame/audio/segasnd.cpp | 6 ++-- src/mame/audio/spacefb.cpp | 2 +- src/mame/audio/spiders.cpp | 2 +- src/mame/audio/t5182.cpp | 4 +-- src/mame/audio/taito_en.cpp | 2 +- src/mame/audio/taito_zm.cpp | 2 +- src/mame/audio/targ.cpp | 4 +-- src/mame/audio/timeplt.cpp | 2 +- src/mame/audio/turbo.cpp | 6 ++-- src/mame/audio/vicdual-97271p.cpp | 2 +- src/mame/audio/vicdual.cpp | 4 +-- src/mame/audio/williams.cpp | 6 ++-- src/mame/audio/wpcsnd.cpp | 2 +- src/mame/audio/zaccaria.cpp | 2 +- src/mame/audio/zaxxon.cpp | 4 +-- src/mame/drivers/a2600.cpp | 2 +- src/mame/drivers/amstr_pc.cpp | 2 +- src/mame/drivers/amstrad.cpp | 2 +- src/mame/drivers/armedf.cpp | 2 +- src/mame/drivers/astrocde.cpp | 4 +-- src/mame/drivers/atpci.cpp | 2 +- src/mame/drivers/bbc.cpp | 2 +- src/mame/drivers/bebox.cpp | 2 +- src/mame/drivers/bfm_sc2.cpp | 6 ++-- src/mame/drivers/bfm_sc4.cpp | 2 +- src/mame/drivers/bitgraph.cpp | 4 +-- src/mame/drivers/by35.cpp | 2 +- src/mame/drivers/camplynx.cpp | 4 +-- src/mame/drivers/cbm2.cpp | 4 +-- src/mame/drivers/channelf.cpp | 2 +- src/mame/drivers/chihiro.cpp | 4 +-- src/mame/drivers/cmi.cpp | 2 +- src/mame/drivers/coco12.cpp | 4 +-- src/mame/drivers/cps3.cpp | 14 ++++----- src/mame/drivers/dccons.cpp | 2 +- src/mame/drivers/dooyong.cpp | 6 ++-- src/mame/drivers/equites.cpp | 2 +- src/mame/drivers/firebeat.cpp | 2 +- src/mame/drivers/fmtowns.cpp | 2 +- src/mame/drivers/force68k.cpp | 2 +- src/mame/drivers/fruitpc.cpp | 2 +- src/mame/drivers/galaxian.cpp | 4 +-- src/mame/drivers/galgames.cpp | 6 ++-- src/mame/drivers/gottlieb.cpp | 2 +- src/mame/drivers/harddriv.cpp | 36 ++++++++++----------- src/mame/drivers/hp9845.cpp | 2 +- src/mame/drivers/indigo.cpp | 2 +- src/mame/drivers/indy_indigo2.cpp | 4 +-- src/mame/drivers/itech8.cpp | 8 ++--- src/mame/drivers/konamigv.cpp | 2 +- src/mame/drivers/ksys573.cpp | 32 +++++++++---------- src/mame/drivers/lb186.cpp | 2 +- src/mame/drivers/m24.cpp | 2 +- src/mame/drivers/m72.cpp | 2 +- src/mame/drivers/magtouch.cpp | 2 +- src/mame/drivers/mappy.cpp | 4 +-- src/mame/drivers/metro.cpp | 4 +-- src/mame/drivers/mmodular.cpp | 2 +- src/mame/drivers/model2.cpp | 2 +- src/mame/drivers/mpu4.cpp | 54 ++++++++++++++++---------------- src/mame/drivers/msx.cpp | 34 ++++++++++---------- src/mame/drivers/mtouchxl.cpp | 2 +- src/mame/drivers/next.cpp | 2 +- src/mame/drivers/odyssey2.cpp | 2 +- src/mame/drivers/pc.cpp | 4 +-- src/mame/drivers/pc9801.cpp | 12 +++---- src/mame/drivers/pcat_dyn.cpp | 2 +- src/mame/drivers/pet.cpp | 8 ++--- src/mame/drivers/pg685.cpp | 4 +-- src/mame/drivers/pgm.cpp | 2 +- src/mame/drivers/rastersp.cpp | 2 +- src/mame/drivers/safarir.cpp | 2 +- src/mame/drivers/segahang.cpp | 6 ++-- src/mame/drivers/segas16b.cpp | 2 +- src/mame/drivers/segas32.cpp | 20 ++++++------ src/mame/drivers/segaxbd.cpp | 16 +++++----- src/mame/drivers/studio2.cpp | 2 +- src/mame/drivers/stv.cpp | 2 +- src/mame/drivers/sun4.cpp | 2 +- src/mame/drivers/system1.cpp | 2 +- src/mame/drivers/system16.cpp | 8 ++--- src/mame/drivers/taito.cpp | 2 +- src/mame/drivers/tandy1t.cpp | 10 +++--- src/mame/drivers/tispeak.cpp | 2 +- src/mame/drivers/tnzs.cpp | 2 +- src/mame/drivers/tosh1000.cpp | 2 +- src/mame/drivers/twinkle.cpp | 2 +- src/mame/drivers/vamphalf.cpp | 6 ++-- src/mame/drivers/vis.cpp | 4 +-- src/mame/drivers/wpc_an.cpp | 2 +- src/mame/machine/abc1600mac.cpp | 2 +- src/mame/machine/abc80kb.cpp | 2 +- src/mame/machine/alpha8201.cpp | 2 +- src/mame/machine/apollo.cpp | 6 ++-- src/mame/machine/apricotkb.cpp | 2 +- src/mame/machine/asic65.cpp | 2 +- src/mame/machine/at.cpp | 4 +-- src/mame/machine/atarifdc.cpp | 2 +- src/mame/machine/atarigen.cpp | 4 +-- src/mame/machine/beta.cpp | 2 +- src/mame/machine/c117.cpp | 2 +- src/mame/machine/cedar_magnet_flop.cpp | 2 +- src/mame/machine/cedar_magnet_plane.cpp | 2 +- src/mame/machine/cedar_magnet_sprite.cpp | 2 +- src/mame/machine/compiskb.cpp | 2 +- src/mame/machine/cuda.cpp | 2 +- src/mame/machine/dec_lk201.cpp | 2 +- src/mame/machine/decopincpu.cpp | 4 +-- src/mame/machine/dmv_keyb.cpp | 2 +- src/mame/machine/egret.cpp | 2 +- src/mame/machine/esqlcd.cpp | 2 +- src/mame/machine/esqpanel.cpp | 6 ++-- src/mame/machine/esqvfd.cpp | 4 +-- src/mame/machine/genpin.cpp | 2 +- src/mame/machine/hec2hrp.cpp | 2 +- src/mame/machine/hng64_net.cpp | 2 +- src/mame/machine/ibm6580_fdc.cpp | 2 +- src/mame/machine/ibm6580_kbd.cpp | 2 +- src/mame/machine/inder_sb.cpp | 2 +- src/mame/machine/inder_vid.cpp | 2 +- src/mame/machine/isbc_208.cpp | 2 +- src/mame/machine/isbc_215g.cpp | 2 +- src/mame/machine/iteagle_fpga.cpp | 6 ++-- src/mame/machine/jvs13551.cpp | 2 +- src/mame/machine/k573cass.cpp | 10 +++--- src/mame/machine/k573dio.cpp | 2 +- src/mame/machine/k7659kb.cpp | 2 +- src/mame/machine/km035.cpp | 2 +- src/mame/machine/m1comm.cpp | 2 +- src/mame/machine/m20_8086.cpp | 2 +- src/mame/machine/m24_kbd.cpp | 2 +- src/mame/machine/m24_z8000.cpp | 2 +- src/mame/machine/m2comm.cpp | 2 +- src/mame/machine/m3comm.cpp | 2 +- src/mame/machine/mackbd.cpp | 2 +- src/mame/machine/mega32x.cpp | 4 +-- src/mame/machine/megacd.cpp | 2 +- src/mame/machine/megacdcd.cpp | 2 +- src/mame/machine/megadriv.cpp | 6 ++-- src/mame/machine/midwayic.cpp | 2 +- src/mame/machine/mie.cpp | 2 +- src/mame/machine/mm1kb.cpp | 2 +- src/mame/machine/ms7004.cpp | 2 +- src/mame/machine/namco50.cpp | 2 +- src/mame/machine/namco51.cpp | 2 +- src/mame/machine/namco53.cpp | 2 +- src/mame/machine/namco62.cpp | 2 +- src/mame/machine/naomim2.cpp | 2 +- src/mame/machine/nmk004.cpp | 2 +- src/mame/machine/pc1512kb.cpp | 2 +- src/mame/machine/pc9801_118.cpp | 2 +- src/mame/machine/pc9801_26.cpp | 2 +- src/mame/machine/pc9801_86.cpp | 2 +- src/mame/machine/pcd_kbd.cpp | 2 +- src/mame/machine/pce_cd.cpp | 2 +- src/mame/machine/pcshare.cpp | 2 +- src/mame/machine/rx01.cpp | 2 +- src/mame/machine/s32comm.cpp | 2 +- src/mame/machine/st0016.cpp | 2 +- src/mame/machine/taito68705interface.cpp | 6 ++-- src/mame/machine/taitoio.cpp | 2 +- src/mame/machine/tandy2kb.cpp | 2 +- src/mame/machine/teleprinter.cpp | 2 +- src/mame/machine/thomson.cpp | 2 +- src/mame/machine/trs80m2kb.cpp | 2 +- src/mame/machine/v1050kb.cpp | 2 +- src/mame/machine/victor9k_fdc.cpp | 4 +-- src/mame/machine/victor9k_kb.cpp | 2 +- src/mame/machine/wangpckb.cpp | 2 +- src/mame/machine/x820kb.cpp | 2 +- src/mame/machine/xbox_pci.cpp | 2 +- src/mame/machine/zorbakbd.cpp | 2 +- src/mame/video/20pacgal.cpp | 2 +- src/mame/video/733_asr.cpp | 2 +- src/mame/video/911_vdt.cpp | 2 +- src/mame/video/abc1600.cpp | 4 +-- src/mame/video/abc80.cpp | 4 +-- src/mame/video/abc800.cpp | 8 ++--- src/mame/video/abc802.cpp | 4 +-- src/mame/video/abc806.cpp | 4 +-- src/mame/video/agat7.cpp | 2 +- src/mame/video/airraid_dev.cpp | 2 +- src/mame/video/amiga.cpp | 4 +-- src/mame/video/apollo.cpp | 4 +-- src/mame/video/bfm_adr2.cpp | 2 +- src/mame/video/bfm_dm01.cpp | 2 +- src/mame/video/cgc7900.cpp | 2 +- src/mame/video/cidelsa.cpp | 6 ++-- src/mame/video/comx35.cpp | 4 +-- src/mame/video/decodmd1.cpp | 2 +- src/mame/video/decodmd2.cpp | 2 +- src/mame/video/decodmd3.cpp | 2 +- src/mame/video/exidy440.cpp | 4 +-- src/mame/video/gameplan.cpp | 4 +-- src/mame/video/jedi.cpp | 2 +- src/mame/video/k1ge.cpp | 4 +-- src/mame/video/kyocera.cpp | 4 +-- src/mame/video/leland.cpp | 2 +- src/mame/video/madalien.cpp | 2 +- src/mame/video/mikromik.cpp | 4 +-- src/mame/video/mystston.cpp | 2 +- src/mame/video/newbrain.cpp | 2 +- src/mame/video/osi.cpp | 6 ++-- src/mame/video/pc1512.cpp | 2 +- src/mame/video/pc8401a.cpp | 4 +-- src/mame/video/pc_t1t.cpp | 4 +-- src/mame/video/pcd.cpp | 4 +-- src/mame/video/pecom.cpp | 2 +- src/mame/video/qix.cpp | 8 ++--- src/mame/video/redalert.cpp | 10 +++--- src/mame/video/stactics.cpp | 2 +- src/mame/video/stfight_dev.cpp | 2 +- src/mame/video/tia.cpp | 4 +-- src/mame/video/tmc1800.cpp | 8 ++--- src/mame/video/tmc600.cpp | 2 +- src/mame/video/v1050.cpp | 2 +- src/mame/video/vtvideo.cpp | 4 +-- src/mame/video/wpc_dmd.cpp | 2 +- 260 files changed, 530 insertions(+), 530 deletions(-) (limited to 'src/mame') diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index bc08e7f2ef5..28f93391e6b 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ALESIS_DM3AG, alesis_dm3ag_device, "alesis_dm3ag", "Alesis DM IMPLEMENTATION ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( alesis_dm3ag ) +static MACHINE_CONFIG_START( alesis_dm3ag ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker1", "rspeaker1") MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2") MCFG_SOUND_ADD("dac", PCM54HP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker1", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker1", 1.0) // PCM54HP DAC + R63/R73-75 + Sample and hold diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp index f64546700ea..aaa3a40f147 100644 --- a/src/mame/audio/astrof.cpp +++ b/src/mame/audio/astrof.cpp @@ -139,7 +139,7 @@ static const char *const astrof_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( astrof_audio ) +MACHINE_CONFIG_START( astrof_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(4) @@ -161,7 +161,7 @@ WRITE8_MEMBER(astrof_state::spfghmk2_audio_w) } -MACHINE_CONFIG_FRAGMENT( spfghmk2_audio ) +MACHINE_CONFIG_START( spfghmk2_audio ) /* nothing yet */ MACHINE_CONFIG_END @@ -195,7 +195,7 @@ WRITE8_MEMBER(astrof_state::tomahawk_audio_w) } -MACHINE_CONFIG_FRAGMENT( tomahawk_audio ) +MACHINE_CONFIG_START( tomahawk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index ca8a852e28c..86a3d08cd05 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -163,7 +163,7 @@ ADDRESS_MAP_END //************************************************************************** // Fully populated JSA-I, not used by anyone -MACHINE_CONFIG_FRAGMENT( jsa_i_config ) +MACHINE_CONFIG_START( jsa_i_config ) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) @@ -190,7 +190,7 @@ MACHINE_CONFIG_END // Fully populated JSA-II -MACHINE_CONFIG_FRAGMENT( jsa_ii_config ) +MACHINE_CONFIG_START( jsa_ii_config ) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp index 9c6e0b5506c..5a1849dd6ee 100644 --- a/src/mame/audio/bwidow.cpp +++ b/src/mame/audio/bwidow.cpp @@ -148,7 +148,7 @@ static DISCRETE_SOUND_START(gravitar) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( bwidow_audio ) +MACHINE_CONFIG_START( bwidow_audio ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -171,7 +171,7 @@ MACHINE_CONFIG_FRAGMENT( bwidow_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( gravitar_audio ) +MACHINE_CONFIG_START( gravitar_audio ) MCFG_SOUND_MODIFY("pokey1") MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(BW_R51, GRAV_C34, 5.0) /* BW_C31 ignored */ diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index 84d4d5d6cf1..bde95d02d83 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -397,7 +397,7 @@ WRITE8_MEMBER(bzone_state::bzone_sounds_w) } -MACHINE_CONFIG_FRAGMENT( bzone_audio ) +MACHINE_CONFIG_START( bzone_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 42a8c74c2c0..36cbf0c3655 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -626,7 +626,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( cage ) +MACHINE_CONFIG_START( cage ) /* basic machine hardware */ MCFG_CPU_ADD("cage", TMS32031, 33868800) diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp index 6a093bfd3bd..28aa4ffd5e0 100644 --- a/src/mame/audio/carnival.cpp +++ b/src/mame/audio/carnival.cpp @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( mboard_map, AS_PROGRAM, 8, vicdual_state ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( carnival_audio ) +MACHINE_CONFIG_START( carnival_audio ) /* music board */ MCFG_CPU_ADD("audiocpu", I8039, XTAL_3_579545MHz) diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp index d9f6eaa9f35..a7a2be05318 100644 --- a/src/mame/audio/cclimber.cpp +++ b/src/mame/audio/cclimber.cpp @@ -20,7 +20,7 @@ SAMPLES_START_CB_MEMBER( cclimber_audio_device::sh_start ) } } -MACHINE_CONFIG_FRAGMENT( cclimber_audio ) +MACHINE_CONFIG_START( cclimber_audio ) MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK/2) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(cclimber_audio_device, sample_select_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":speaker", 0.5) diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 6d1c65e1f61..3d757eb92f1 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -174,7 +174,7 @@ SOUND_RESET_MEMBER( cinemat_state, spacewar ) generic_init(&cinemat_state::spacewar_sound_w); } -MACHINE_CONFIG_FRAGMENT( spacewar_sound ) +MACHINE_CONFIG_START( spacewar_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, spacewar) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -222,7 +222,7 @@ SOUND_RESET_MEMBER( cinemat_state, barrier ) generic_init(&cinemat_state::barrier_sound_w); } -MACHINE_CONFIG_FRAGMENT( barrier_sound ) +MACHINE_CONFIG_START( barrier_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, barrier) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -275,7 +275,7 @@ SOUND_RESET_MEMBER( cinemat_state, speedfrk ) generic_init(&cinemat_state::speedfrk_sound_w); } -MACHINE_CONFIG_FRAGMENT( speedfrk_sound ) +MACHINE_CONFIG_START( speedfrk_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, speedfrk) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -344,7 +344,7 @@ SOUND_RESET_MEMBER( cinemat_state, starhawk ) generic_init(&cinemat_state::starhawk_sound_w); } -MACHINE_CONFIG_FRAGMENT( starhawk_sound ) +MACHINE_CONFIG_START( starhawk_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, starhawk) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -407,7 +407,7 @@ SOUND_RESET_MEMBER( cinemat_state, sundance ) generic_init(&cinemat_state::sundance_sound_w); } -MACHINE_CONFIG_FRAGMENT( sundance_sound ) +MACHINE_CONFIG_START( sundance_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, sundance) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -489,7 +489,7 @@ SOUND_RESET_MEMBER( cinemat_state, tailg ) generic_init(&cinemat_state::tailg_sound_w); } -MACHINE_CONFIG_FRAGMENT( tailg_sound ) +MACHINE_CONFIG_START( tailg_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, tailg) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -551,7 +551,7 @@ SOUND_RESET_MEMBER( cinemat_state, warrior ) generic_init(&cinemat_state::warrior_sound_w); } -MACHINE_CONFIG_FRAGMENT( warrior_sound ) +MACHINE_CONFIG_START( warrior_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, warrior) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -639,7 +639,7 @@ SOUND_RESET_MEMBER( cinemat_state, armora ) generic_init(&cinemat_state::armora_sound_w); } -MACHINE_CONFIG_FRAGMENT( armora_sound ) +MACHINE_CONFIG_START( armora_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, armora) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -724,7 +724,7 @@ SOUND_RESET_MEMBER( cinemat_state, ripoff ) generic_init(&cinemat_state::ripoff_sound_w); } -MACHINE_CONFIG_FRAGMENT( ripoff_sound ) +MACHINE_CONFIG_START( ripoff_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, ripoff) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -831,7 +831,7 @@ SOUND_RESET_MEMBER( cinemat_state, starcas ) generic_init(&cinemat_state::starcas_sound_w); } -MACHINE_CONFIG_FRAGMENT( starcas_sound ) +MACHINE_CONFIG_START( starcas_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, starcas) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -959,7 +959,7 @@ SOUND_RESET_MEMBER( cinemat_state, solarq ) generic_init(&cinemat_state::solarq_sound_w); } -MACHINE_CONFIG_FRAGMENT( solarq_sound ) +MACHINE_CONFIG_START( solarq_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, solarq) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1087,7 +1087,7 @@ SOUND_RESET_MEMBER( cinemat_state, boxingb ) generic_init(&cinemat_state::boxingb_sound_w); } -MACHINE_CONFIG_FRAGMENT( boxingb_sound ) +MACHINE_CONFIG_START( boxingb_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, boxingb) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1194,7 +1194,7 @@ SOUND_RESET_MEMBER( cinemat_state, wotw ) generic_init(&cinemat_state::wotw_sound_w); } -MACHINE_CONFIG_FRAGMENT( wotw_sound ) +MACHINE_CONFIG_START( wotw_sound ) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, wotw) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1308,7 +1308,7 @@ static const z80_daisy_config daisy_chain[] = }; -MACHINE_CONFIG_FRAGMENT( demon_sound ) +MACHINE_CONFIG_START( demon_sound ) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", Z80, 3579545) diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index 3ab1845fdcc..c0e049537b6 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -138,7 +138,7 @@ static DISCRETE_SOUND_START(crbaloon) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( crbaloon_audio ) +MACHINE_CONFIG_START( crbaloon_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index c008292d025..eb2e20efb98 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -35,7 +35,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_cheap_squeak_deluxe) +static MACHINE_CONFIG_START(midway_cheap_squeak_deluxe) MCFG_CPU_ADD("cpu", M68000, XTAL_16MHz/2) MCFG_CPU_PROGRAM_MAP(csdeluxe_map) diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index f91417f8525..6c679713b4f 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -452,7 +452,7 @@ ADDRESS_MAP_END *************************************/ /* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */ -MACHINE_CONFIG_FRAGMENT( dcs_audio_2k ) +MACHINE_CONFIG_START( dcs_audio_2k ) MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ @@ -498,7 +498,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dcs2_audio_2115 ) +MACHINE_CONFIG_START( dcs2_audio_2115 ) MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ @@ -536,7 +536,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dcs2_audio_dsio ) +MACHINE_CONFIG_START( dcs2_audio_dsio ) MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ @@ -573,7 +573,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dcs2_audio_denver ) +MACHINE_CONFIG_START( dcs2_audio_denver ) MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */ diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp index 6e1415f975a..bd0062dbf59 100644 --- a/src/mame/audio/decobsmt.cpp +++ b/src/mame/audio/decobsmt.cpp @@ -35,7 +35,7 @@ void decobsmt_device::bsmt_ready_callback() m_ourcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); /* BSMT is ready */ } -MACHINE_CONFIG_FRAGMENT( decobsmt ) +MACHINE_CONFIG_START( decobsmt ) MCFG_CPU_ADD(M6809_TAG, M6809, (3579580/2)) MCFG_CPU_PROGRAM_MAP(decobsmt_map) MCFG_CPU_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */ diff --git a/src/mame/audio/depthch.cpp b/src/mame/audio/depthch.cpp index d4a5bf5ca68..18a23c25b58 100644 --- a/src/mame/audio/depthch.cpp +++ b/src/mame/audio/depthch.cpp @@ -78,7 +78,7 @@ WRITE8_MEMBER( vicdual_state::depthch_audio_w ) } -MACHINE_CONFIG_FRAGMENT( depthch_audio ) +MACHINE_CONFIG_START( depthch_audio ) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 032e1a161fe..752a8d5472b 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1309,7 +1309,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( dkong2b_audio ) +MACHINE_CONFIG_START( dkong2b_audio ) /* sound latches */ MCFG_LATCH8_ADD("ls175.3d") /* sound cmd latch */ @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( dkongjr_audio ) +MACHINE_CONFIG_START( dkongjr_audio ) /* sound latches */ MCFG_LATCH8_ADD("ls174.3d") @@ -1423,7 +1423,7 @@ MACHINE_CONFIG_FRAGMENT( dkongjr_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( dkong3_audio ) +MACHINE_CONFIG_START( dkong3_audio ) MCFG_CPU_ADD("n2a03a", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(dkong3_sound1_map) diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp index d7e9726c636..3330cc865b7 100644 --- a/src/mame/audio/dsbz80.cpp +++ b/src/mame/audio/dsbz80.cpp @@ -32,7 +32,7 @@ static ADDRESS_MAP_START( dsbz80io_map, AS_IO, 8, dsbz80_device ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( dsbz80 ) +MACHINE_CONFIG_START( dsbz80 ) MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) /* unknown clock, but probably pretty slow considering the z80 does like nothing */ MCFG_CPU_PROGRAM_MAP(dsbz80_map) MCFG_CPU_IO_MAP(dsbz80io_map) diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index 57087816a7d..66b31213dcd 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -188,7 +188,7 @@ TIMER_CALLBACK_MEMBER(cedar_magnet_sound_device::reset_assert_callback) -static MACHINE_CONFIG_FRAGMENT( efo_zsu ) +static MACHINE_CONFIG_START( efo_zsu ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(zsu_map) MCFG_CPU_IO_MAP(zsu_io) @@ -237,7 +237,7 @@ static MACHINE_CONFIG_FRAGMENT( efo_zsu ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_sound ) +static MACHINE_CONFIG_START( cedar_magnet_sound ) MCFG_FRAGMENT_ADD(efo_zsu) MCFG_CPU_MODIFY("soundcpu") diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index 6a3435d98cc..aa425ab0767 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -737,7 +737,7 @@ static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8, venture_sound_device ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( venture_audio ) +MACHINE_CONFIG_START( venture_audio ) MCFG_CPU_ADD("audiocpu", M6502, 3579545/4) MCFG_CPU_PROGRAM_MAP(venture_audio_map) @@ -816,7 +816,7 @@ static ADDRESS_MAP_START( cvsd_iomap, AS_IO, 8, venture_sound_device ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( mtrap_cvsd_audio ) +MACHINE_CONFIG_START( mtrap_cvsd_audio ) MCFG_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK) MCFG_CPU_PROGRAM_MAP(cvsd_map) @@ -991,7 +991,7 @@ static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8, venture_sound_device ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( victory_audio ) +MACHINE_CONFIG_START( victory_audio ) MCFG_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(victory_audio_map) diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp index 14ef74c644c..ec0894613ad 100644 --- a/src/mame/audio/exidy440.cpp +++ b/src/mame/audio/exidy440.cpp @@ -873,7 +873,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( exidy440_audio ) +MACHINE_CONFIG_START( exidy440_audio ) MCFG_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK) MCFG_CPU_PROGRAM_MAP(exidy440_audio_map) diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index 2f84c831f9b..35d0bf0d736 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -495,7 +495,7 @@ void galaxian_sound_device::sound_stream_update(sound_stream &stream, stream_sam * *************************************/ -MACHINE_CONFIG_FRAGMENT( galaxian_audio ) +MACHINE_CONFIG_START( galaxian_audio ) MCFG_SOUND_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) @@ -505,7 +505,7 @@ MACHINE_CONFIG_FRAGMENT( galaxian_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mooncrst_audio ) +MACHINE_CONFIG_START( mooncrst_audio ) MCFG_SOUND_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index 1e8aed6785d..c55cccd02cd 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -89,7 +89,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r0 ) +MACHINE_CONFIG_START( gottlieb_sound_r0 ) // audio CPU MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // M6503 - clock is a gate, a resistor and a capacitor. Freq unknown. MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r0_map) @@ -292,7 +292,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1 ) +MACHINE_CONFIG_START( gottlieb_sound_r1 ) // audio CPU MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // the board can be set to /2 as well MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r1_map) @@ -309,7 +309,7 @@ MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1 ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1_with_votrax ) +MACHINE_CONFIG_START( gottlieb_sound_r1_with_votrax ) MCFG_FRAGMENT_ADD(gottlieb_sound_r1) // add the VOTRAX @@ -673,7 +673,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r2 ) +MACHINE_CONFIG_START( gottlieb_sound_r2 ) // audio CPUs MCFG_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4) MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r2_map) diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp index 690a8eef269..59fa633ac97 100644 --- a/src/mame/audio/harddriv.cpp +++ b/src/mame/audio/harddriv.cpp @@ -423,7 +423,7 @@ static ADDRESS_MAP_START( driversnd_dsp_io_map, AS_IO, 16, harddriv_sound_board_ ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( harddriv_snd ) +static MACHINE_CONFIG_START( harddriv_snd ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2) diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index d1e5e27bdaa..877c11ebf82 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -386,7 +386,7 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb) -MACHINE_CONFIG_FRAGMENT( hng64_audio ) +MACHINE_CONFIG_START( hng64_audio ) MCFG_CPU_ADD("audiocpu", V53A, 32000000/2) // V53A, 16? mhz! MCFG_CPU_PROGRAM_MAP(hng_sound_map) MCFG_CPU_IO_MAP(hng_sound_io) diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index 0baf0113634..244c34f90ea 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -103,7 +103,7 @@ void hyprolyb_adpcm_device::vck_callback( int st ) m_vck_ready = 0x80; } -MACHINE_CONFIG_FRAGMENT( hyprolyb_adpcm ) +MACHINE_CONFIG_START( hyprolyb_adpcm ) MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */ MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map) diff --git a/src/mame/audio/invinco.cpp b/src/mame/audio/invinco.cpp index 688cc5b9510..ebe8c899661 100644 --- a/src/mame/audio/invinco.cpp +++ b/src/mame/audio/invinco.cpp @@ -94,7 +94,7 @@ WRITE8_MEMBER( vicdual_state::invinco_audio_w ) } -MACHINE_CONFIG_FRAGMENT( invinco_audio ) +MACHINE_CONFIG_START( invinco_audio ) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 7675fef06cf..32e86ccf5a6 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -429,7 +429,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( irem_audio_base ) +static MACHINE_CONFIG_START( irem_audio_base ) /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ @@ -497,7 +497,7 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio ) +MACHINE_CONFIG_START( m52_sound_c_audio ) /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ @@ -531,7 +531,7 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( m52_large_audio) /* 10 yard fight */ +MACHINE_CONFIG_START( m52_large_audio) /* 10 yard fight */ /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp index 36c40902132..1e44c6c322d 100644 --- a/src/mame/audio/jedi.cpp +++ b/src/mame/audio/jedi.cpp @@ -190,7 +190,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( jedi_audio ) +MACHINE_CONFIG_START( jedi_audio ) MCFG_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(audio_map) diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 4ff229e9b8e..93e4c95512d 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -133,7 +133,7 @@ WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr1_w) set_clock_line(7, state); } -static MACHINE_CONFIG_FRAGMENT( leland_80186_sound ) +static MACHINE_CONFIG_START( leland_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u31 + ad7524.u46 MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u32 + ad7524.u47 @@ -174,7 +174,7 @@ static MACHINE_CONFIG_FRAGMENT( leland_80186_sound ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit1_2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( redline_80186_sound ) +static MACHINE_CONFIG_START( redline_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -224,7 +224,7 @@ static MACHINE_CONFIG_FRAGMENT( redline_80186_sound ) MCFG_PIT8253_CLK2(7000000) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( ataxx_80186_sound ) +static MACHINE_CONFIG_START( ataxx_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -251,7 +251,7 @@ static MACHINE_CONFIG_FRAGMENT( ataxx_80186_sound ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( wsf_80186_sound ) +static MACHINE_CONFIG_START( wsf_80186_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 30616e8eebb..d309c8f7402 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -628,7 +628,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( mario_audio ) +MACHINE_CONFIG_START( mario_audio ) #if USE_8039 MCFG_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */ @@ -671,7 +671,7 @@ MACHINE_CONFIG_FRAGMENT( mario_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( masao_audio ) +MACHINE_CONFIG_START( masao_audio ) MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */ MCFG_CPU_PROGRAM_MAP(masao_sound_map) diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index 8ec572c0a8d..8fda34e8d0d 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -376,7 +376,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( midway_ssio ) +static MACHINE_CONFIG_START( midway_ssio ) MCFG_CPU_ADD("cpu", Z80, SSIO_CLOCK/2/4) MCFG_CPU_PROGRAM_MAP(ssio_map) MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, SSIO_CLOCK/2/16/10) @@ -589,7 +589,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_sounds_good) +static MACHINE_CONFIG_START(midway_sounds_good) MCFG_CPU_ADD("cpu", M68000, SOUNDSGOOD_CLOCK/2) MCFG_CPU_PROGRAM_MAP(soundsgood_map) @@ -754,7 +754,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_turbo_cheap_squeak) +static MACHINE_CONFIG_START(midway_turbo_cheap_squeak) MCFG_CPU_ADD("cpu", M6809E, TURBOCS_CLOCK) MCFG_CPU_PROGRAM_MAP(turbocs_map) @@ -967,7 +967,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(midway_squawk_n_talk) +static MACHINE_CONFIG_START(midway_squawk_n_talk) MCFG_CPU_ADD("cpu", M6802, SQUAWKTALK_CLOCK) MCFG_CPU_PROGRAM_MAP(squawkntalk_map) diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 198536a4e30..719bbe3eb89 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -144,7 +144,7 @@ static const char *const seawolf_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( seawolf_audio ) +MACHINE_CONFIG_START( seawolf_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -198,7 +198,7 @@ static const char *const gunfight_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( gunfight_audio ) +MACHINE_CONFIG_START( gunfight_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -307,7 +307,7 @@ static DISCRETE_SOUND_START(tornbase) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( tornbase_audio ) +MACHINE_CONFIG_START( tornbase_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(tornbase) @@ -351,7 +351,7 @@ WRITE8_MEMBER(mw8080bw_state::tornbase_audio_w) * *************************************/ -MACHINE_CONFIG_FRAGMENT( zzzap_audio ) +MACHINE_CONFIG_START( zzzap_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MACHINE_CONFIG_END @@ -553,7 +553,7 @@ static DISCRETE_SOUND_START(maze) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( maze_audio ) +MACHINE_CONFIG_START( maze_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(maze) @@ -800,7 +800,7 @@ static DISCRETE_SOUND_START(boothill) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( boothill_audio ) +MACHINE_CONFIG_START( boothill_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(boothill) @@ -1030,7 +1030,7 @@ static DISCRETE_SOUND_START(checkmat) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( checkmat_audio ) +MACHINE_CONFIG_START( checkmat_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(checkmat) @@ -1241,7 +1241,7 @@ static DISCRETE_SOUND_START(desertgu) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( desertgu_audio ) +MACHINE_CONFIG_START( desertgu_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(desertgu) @@ -1506,7 +1506,7 @@ static DISCRETE_SOUND_START(dplay) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( dplay_audio ) +MACHINE_CONFIG_START( dplay_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(dplay) @@ -1547,7 +1547,7 @@ static const char *const gmissile_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( gmissile_audio ) +MACHINE_CONFIG_START( gmissile_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1640,7 +1640,7 @@ static const char *const m4_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( m4_audio ) +MACHINE_CONFIG_START( m4_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1895,7 +1895,7 @@ static const char *const clowns_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( clowns_audio ) +MACHINE_CONFIG_START( clowns_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2268,7 +2268,7 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1), DISCRETE_OUTPUT(NODE_90, 11000) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( spacwalk_audio ) +MACHINE_CONFIG_START( spacwalk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -2497,7 +2497,7 @@ static DISCRETE_SOUND_START(shuffle) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( shuffle_audio ) +MACHINE_CONFIG_START( shuffle_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -2677,7 +2677,7 @@ static DISCRETE_SOUND_START(dogpatch) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( dogpatch_audio ) +MACHINE_CONFIG_START( dogpatch_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(dogpatch) @@ -3182,7 +3182,7 @@ static DISCRETE_SOUND_START(spcenctr) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( spcenctr_audio ) +MACHINE_CONFIG_START( spcenctr_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) @@ -3268,7 +3268,7 @@ static const char *const phantom2_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( phantom2_audio ) +MACHINE_CONFIG_START( phantom2_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3398,7 +3398,7 @@ static DISCRETE_SOUND_START(bowler) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( bowler_audio ) +MACHINE_CONFIG_START( bowler_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -3513,7 +3513,7 @@ static const char *const invaders_sample_names[] = /* left in for all games that hack into invaders samples for audio */ -MACHINE_CONFIG_FRAGMENT( invaders_samples_audio ) +MACHINE_CONFIG_START( invaders_samples_audio ) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4095,7 +4095,7 @@ static DISCRETE_SOUND_START(invaders) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( invaders_audio ) +MACHINE_CONFIG_START( invaders_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) @@ -4513,7 +4513,7 @@ static DISCRETE_SOUND_START(blueshrk) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( blueshrk_audio ) +MACHINE_CONFIG_START( blueshrk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(blueshrk) @@ -4675,7 +4675,7 @@ static DISCRETE_SOUND_START(invad2ct) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( invad2ct_audio ) +MACHINE_CONFIG_START( invad2ct_audio ) MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp index 01aa23f4900..d566198c3e6 100644 --- a/src/mame/audio/n8080.cpp +++ b/src/mame/audio/n8080.cpp @@ -475,7 +475,7 @@ static ADDRESS_MAP_START( helifire_sound_io_map, AS_IO, 8, n8080_state ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( spacefev_sound ) +MACHINE_CONFIG_START( spacefev_sound ) MCFG_SOUND_START_OVERRIDE(n8080_state,spacefev) MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev) @@ -515,7 +515,7 @@ MACHINE_CONFIG_FRAGMENT( spacefev_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( sheriff_sound ) +MACHINE_CONFIG_START( sheriff_sound ) MCFG_SOUND_START_OVERRIDE(n8080_state,sheriff) MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff) @@ -553,7 +553,7 @@ MACHINE_CONFIG_FRAGMENT( sheriff_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( helifire_sound ) +MACHINE_CONFIG_START( helifire_sound ) MCFG_SOUND_START_OVERRIDE(n8080_state,helifire) MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire) diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp index 478e83bbb67..a79bcc7f51e 100644 --- a/src/mame/audio/namco52.cpp +++ b/src/mame/audio/namco52.cpp @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( namco_52xx_map_io, AS_IO, 8, namco_52xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_52xx ) +static MACHINE_CONFIG_START( namco_52xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_52xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp index 4c15b088928..1f485fc0f45 100644 --- a/src/mame/audio/namco54.cpp +++ b/src/mame/audio/namco54.cpp @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( namco_54xx_map_io, AS_IO, 8, namco_54xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_54xx ) +static MACHINE_CONFIG_START( namco_54xx ) MCFG_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_54xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/audio/pulsar.cpp b/src/mame/audio/pulsar.cpp index f6790efddf2..d378509156c 100644 --- a/src/mame/audio/pulsar.cpp +++ b/src/mame/audio/pulsar.cpp @@ -171,7 +171,7 @@ WRITE8_MEMBER( vicdual_state::pulsar_audio_2_w ) } -MACHINE_CONFIG_FRAGMENT( pulsar_audio ) +MACHINE_CONFIG_START( pulsar_audio ) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index c3d73176756..e8da3bd31cc 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -170,7 +170,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( qix_audio ) +MACHINE_CONFIG_START( qix_audio ) MCFG_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */ MCFG_CPU_PROGRAM_MAP(audio_map) @@ -204,7 +204,7 @@ MACHINE_CONFIG_FRAGMENT( qix_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( slither_audio ) +MACHINE_CONFIG_START( slither_audio ) MCFG_DEVICE_ADD("sndpia0", PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("P2")) MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_coinctl_w)) diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index 97cb5639558..1837bac6346 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -470,7 +470,7 @@ WRITE32_MEMBER(acclaim_rax_device::dmovlay_callback) * *************************************/ -MACHINE_CONFIG_FRAGMENT( rax ) +MACHINE_CONFIG_START( rax ) MCFG_CPU_ADD("adsp", ADSP2181, XTAL_16_67MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index 18bbe9d62ff..487b77d5764 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -176,7 +176,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( redalert_audio_m37b ) +static MACHINE_CONFIG_START( redalert_audio_m37b ) MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(redalert_audio_map) @@ -199,7 +199,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( redalert_audio_voice ) +static MACHINE_CONFIG_START( redalert_audio_voice ) MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(redalert_voice_map) @@ -218,7 +218,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( redalert_audio ) +MACHINE_CONFIG_START( redalert_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -235,7 +235,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( ww3_audio ) +MACHINE_CONFIG_START( ww3_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -341,7 +341,7 @@ SOUND_START_MEMBER( redalert_state, demoneye ) * *************************************/ -MACHINE_CONFIG_FRAGMENT( demoneye_audio ) +MACHINE_CONFIG_START( demoneye_audio ) MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(demoneye_audio_map) diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index 942d0378c16..66a82fb0b9d 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -62,7 +62,7 @@ void s11c_bg_device::data_w(uint8_t data) m_pia40->portb_w(data); } -MACHINE_CONFIG_FRAGMENT( s11c_bg ) +MACHINE_CONFIG_START( s11c_bg ) MCFG_CPU_ADD("bgcpu", M6809E, XTAL_8MHz) // MC68B09E (note: schematics show this as 8mhz/2, but games crash very quickly with that speed?) MCFG_CPU_PROGRAM_MAP(s11c_bg_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 03682cfac40..4b13ee9d1ab 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -290,7 +290,7 @@ static ADDRESS_MAP_START( ad2083_sound_io_map, AS_IO, 8, scramble_state ) AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay2", ay8910_device, address_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( ad2083_audio ) +MACHINE_CONFIG_START( ad2083_audio ) MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */ MCFG_CPU_PROGRAM_MAP(ad2083_sound_map) diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index 8b731584086..9db20176441 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -231,7 +231,7 @@ static const char *const astrob_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( astrob_sound_board ) +MACHINE_CONFIG_START( astrob_sound_board ) /* sound hardware */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -418,7 +418,7 @@ static const char *const sega005_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( 005_sound_board ) +MACHINE_CONFIG_START( 005_sound_board ) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, sega005_sound_a_w)) @@ -580,7 +580,7 @@ static const char *const spaceod_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( spaceod_sound_board ) +MACHINE_CONFIG_START( spaceod_sound_board ) /* sound hardware */ @@ -678,7 +678,7 @@ static const char *const monsterb_sample_names[] = * *************************************/ -MACHINE_CONFIG_FRAGMENT( monsterb_sound_board ) +MACHINE_CONFIG_START( monsterb_sound_board ) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, monsterb_sound_a_w)) MCFG_I8255_OUT_PORTB_CB(WRITE8(segag80r_state, monsterb_sound_b_w)) diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp index 2f38bf43bde..ac92d1c7d8b 100644 --- a/src/mame/audio/segam1audio.cpp +++ b/src/mame/audio/segam1audio.cpp @@ -42,7 +42,7 @@ static ADDRESS_MAP_START( mpcm2_map, AS_0, 8, segam1audio_device ) AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION(":m1pcm2", 0) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( segam1audio ) +MACHINE_CONFIG_START( segam1audio ) MCFG_CPU_ADD(M68000_TAG, M68000, 10000000) // verified on real h/w MCFG_CPU_PROGRAM_MAP(segam1audio_map) diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index ba9d4d86728..4ffc88c0ac4 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -215,7 +215,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( sega_speech_board ) +MACHINE_CONFIG_START( sega_speech_board ) /* CPU for the speech board */ MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ @@ -859,7 +859,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( segausb ) +MACHINE_CONFIG_START( segausb ) /* CPU for the usb board */ MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ @@ -889,7 +889,7 @@ static ADDRESS_MAP_START( usb_map_rom, AS_PROGRAM, 8, usb_sound_device ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION(":usbcpu", 0) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( segausb_rom ) +MACHINE_CONFIG_START( segausb_rom ) /* CPU for the usb board */ MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index 5a2ab7b9c68..0d6456bd040 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -77,7 +77,7 @@ static const char *const spacefb_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( spacefb_audio ) +MACHINE_CONFIG_START( spacefb_audio ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index 5daff51693b..a3ac004b972 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -205,7 +205,7 @@ WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w) } -MACHINE_CONFIG_FRAGMENT( spiders_audio ) +MACHINE_CONFIG_START( spiders_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index 1f20307f31a..ab1e5f4ee77 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -366,10 +366,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( t5182 ) +// MACHINE_CONFIG_START( t5182 ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( t5182 ) +MACHINE_CONFIG_START( t5182 ) MCFG_CPU_ADD("t5182_z80", Z80, T5182_CLOCK) MCFG_CPU_PROGRAM_MAP(t5182_map) MCFG_CPU_IO_MAP(t5182_io) diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index e6fc3cdf820..5a32174a117 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -293,7 +293,7 @@ WRITE_LINE_MEMBER(taito_en_device::duart_irq_handler) * *************************************/ -MACHINE_CONFIG_FRAGMENT( taito_en_sound ) +MACHINE_CONFIG_START( taito_en_sound ) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", M68000, XTAL_30_4761MHz / 2) diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp index 02ad6318778..87072257d33 100644 --- a/src/mame/audio/taito_zm.cpp +++ b/src/mame/audio/taito_zm.cpp @@ -168,7 +168,7 @@ WRITE16_MEMBER(taito_zoom_device::reg_address_w) ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( taito_zoom_sound ) +MACHINE_CONFIG_START( taito_zoom_sound ) /* basic machine hardware */ MCFG_TAITO_ZOOM_ADD("taito_zoom") diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp index b90290e78c6..34a9ddbf5ed 100644 --- a/src/mame/audio/targ.cpp +++ b/src/mame/audio/targ.cpp @@ -175,7 +175,7 @@ SAMPLES_START_CB_MEMBER(exidy_state::targ_audio_start) } -MACHINE_CONFIG_FRAGMENT( spectar_audio ) +MACHINE_CONFIG_START( spectar_audio ) MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -191,7 +191,7 @@ MACHINE_CONFIG_FRAGMENT( spectar_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( targ_audio ) +MACHINE_CONFIG_START( targ_audio ) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index fe8663c41da..6030ddae87c 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -169,7 +169,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( timeplt_sound ) +MACHINE_CONFIG_START( timeplt_sound ) /* basic machine hardware */ MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index 592b46399d8..53f86fd7274 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -183,7 +183,7 @@ static const char *const turbo_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( turbo_samples ) +MACHINE_CONFIG_START( turbo_samples ) /* this is the cockpit speaker configuration */ MCFG_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */ @@ -429,7 +429,7 @@ static const char *const subroc3d_sample_names[] = nullptr }; -MACHINE_CONFIG_FRAGMENT( subroc3d_samples ) +MACHINE_CONFIG_START( subroc3d_samples ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -574,7 +574,7 @@ static const char *const buckrog_sample_names[]= }; -MACHINE_CONFIG_FRAGMENT( buckrog_samples ) +MACHINE_CONFIG_START( buckrog_samples ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/audio/vicdual-97271p.cpp b/src/mame/audio/vicdual-97271p.cpp index 1819ef96e90..356c8685a03 100644 --- a/src/mame/audio/vicdual-97271p.cpp +++ b/src/mame/audio/vicdual-97271p.cpp @@ -72,7 +72,7 @@ enum // MACHINE FRAGMENTS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( nsub_audio ) +static MACHINE_CONFIG_START( nsub_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") /* samples */ diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index d79843ec974..941d5e368b0 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -111,7 +111,7 @@ static const char *const frogs_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( frogs_audio ) +MACHINE_CONFIG_START( frogs_audio ) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(frogs_sample_names) @@ -445,7 +445,7 @@ static DISCRETE_SOUND_START(headon) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( headon_audio ) +MACHINE_CONFIG_START( headon_audio ) MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(headon) diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 9095683eae1..c8c39525efe 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -207,7 +207,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( williams_cvsd_sound ) +static MACHINE_CONFIG_START( williams_cvsd_sound ) MCFG_CPU_ADD("cpu", M6809E, CVSD_MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(williams_cvsd_map) @@ -546,7 +546,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( williams_narc_sound ) +static MACHINE_CONFIG_START( williams_narc_sound ) MCFG_CPU_ADD("cpu0", M6809E, NARC_MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(williams_narc_master_map) @@ -820,7 +820,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound ) +static MACHINE_CONFIG_START( williams_adpcm_sound ) MCFG_CPU_ADD("cpu", M6809E, ADPCM_MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(williams_adpcm_map) diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp index 508d89cf027..718a6e66d7b 100644 --- a/src/mame/audio/wpcsnd.cpp +++ b/src/mame/audio/wpcsnd.cpp @@ -66,7 +66,7 @@ uint8_t wpcsnd_device::data_r() return m_reply; } -MACHINE_CONFIG_FRAGMENT( wpcsnd ) +MACHINE_CONFIG_START( wpcsnd ) MCFG_CPU_ADD("bgcpu", M6809E, XTAL_8MHz) // MC68B09E MCFG_CPU_PROGRAM_MAP(wpcsnd_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp index 805d7326090..0446b025496 100644 --- a/src/mame/audio/zaccaria.cpp +++ b/src/mame/audio/zaccaria.cpp @@ -144,7 +144,7 @@ ADDRESS_MAP_END // MACHINE FRAGMENTS //************************************************************************** -MACHINE_CONFIG_FRAGMENT(zac1b111xx_base_config) +MACHINE_CONFIG_START(zac1b111xx_base_config) MCFG_CPU_ADD("melodycpu", M6802, XTAL_3_579545MHz) // verified on pcb MCFG_CPU_PROGRAM_MAP(zac1b111xx_melody_base_map) diff --git a/src/mame/audio/zaxxon.cpp b/src/mame/audio/zaxxon.cpp index 0c0d194c877..b7c31175a7b 100644 --- a/src/mame/audio/zaxxon.cpp +++ b/src/mame/audio/zaxxon.cpp @@ -92,7 +92,7 @@ static const char *const zaxxon_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( zaxxon_samples ) +MACHINE_CONFIG_START( zaxxon_samples ) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(12) MCFG_SAMPLES_NAMES(zaxxon_sample_names) @@ -192,7 +192,7 @@ static const char *const congo_sample_names[] = }; -MACHINE_CONFIG_FRAGMENT( congo_samples ) +MACHINE_CONFIG_START( congo_samples ) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(congo_sample_names) diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index a76e57746b9..e3433338a3d 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -562,7 +562,7 @@ static SLOT_INTERFACE_START(a2600_cart) SLOT_INTERFACE_INTERNAL("a26_harmony", A26_ROM_HARMONY) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(a2600_cartslot) +static MACHINE_CONFIG_START(a2600_cartslot) MCFG_VCS_CARTRIDGE_ADD("cartslot", a2600_cart, nullptr) /* software lists */ diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp index aa773ecfab1..af95117aa6f 100644 --- a/src/mame/drivers/amstr_pc.cpp +++ b/src/mame/drivers/amstr_pc.cpp @@ -464,7 +464,7 @@ INPUT_PORTS_END // GFXDECODE_END // has it's own mouse -static MACHINE_CONFIG_FRAGMENT( cfg_com ) +static MACHINE_CONFIG_START( cfg_com ) MCFG_DEVICE_MODIFY("serport0") MCFG_SLOT_DEFAULT_OPTION(nullptr) MACHINE_CONFIG_END diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index ecf6684364e..eec93b4baf1 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -794,7 +794,7 @@ FLOPPY_FORMATS_MEMBER( amstrad_state::aleste_floppy_formats ) FLOPPY_MSX_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_FRAGMENT( cpcplus_cartslot ) +static MACHINE_CONFIG_START( cpcplus_cartslot ) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "gx4000_cart") MCFG_GENERIC_EXTENSIONS("bin,cpr") MCFG_GENERIC_MANDATORY diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 4b98a37cd28..f3937924e11 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -1237,7 +1237,7 @@ MACHINE_RESET_MEMBER(armedf_state,armedf) } -static MACHINE_CONFIG_FRAGMENT( terraf_sound ) +static MACHINE_CONFIG_START( terraf_sound ) MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_portmap) diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 999e109ad11..b3ddca0d109 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -1281,7 +1281,7 @@ static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( astrocade_mono_sound ) +static MACHINE_CONFIG_START( astrocade_mono_sound ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1291,7 +1291,7 @@ static MACHINE_CONFIG_FRAGMENT( astrocade_mono_sound ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( astrocade_stereo_sound ) +static MACHINE_CONFIG_START( astrocade_stereo_sound ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp index 0e56d6c398d..7f5f3ea70a7 100644 --- a/src/mame/drivers/atpci.cpp +++ b/src/mame/drivers/atpci.cpp @@ -22,7 +22,7 @@ public: }; -static MACHINE_CONFIG_FRAGMENT( tx_config ) +static MACHINE_CONFIG_START( tx_config ) MCFG_I82439TX_CPU( "maincpu" ) MCFG_I82439TX_REGION( "isa" ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 47f1cd92fa4..f38c17c00ce 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -810,7 +810,7 @@ WRITE_LINE_MEMBER(bbc_state::econet_clk_w) } // 4 x EPROM sockets (16K) in BBC-A, these should grow to 16 for BBC-B and later... -static MACHINE_CONFIG_FRAGMENT( bbc_eprom_sockets ) +static MACHINE_CONFIG_START( bbc_eprom_sockets ) MCFG_GENERIC_SOCKET_ADD("exp_rom1", generic_linear_slot, "bbc_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_LOAD(bbc_state, exp1_load) diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index dd094666a95..63dc8be2c42 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -118,7 +118,7 @@ static SLOT_INTERFACE_START( bebox_floppies ) SLOT_INTERFACE( "35hd", FLOPPY_35_HD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( mpc105_config ) +static MACHINE_CONFIG_START( mpc105_config ) MCFG_MPC105_CPU( "ppc1" ) MCFG_MPC105_BANK_BASE_DEFAULT( 0 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index b1745ca56b9..874a69605df 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -2186,17 +2186,17 @@ INPUT_PORTS_END // machine config fragments for different meters numbers ////////////////// /////////////////////////////////////////////////////////////////////////// -MACHINE_CONFIG_FRAGMENT( _3meters ) +MACHINE_CONFIG_START( _3meters ) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(3) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( _5meters ) +MACHINE_CONFIG_START( _5meters ) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(5) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( _8meters ) +MACHINE_CONFIG_START( _8meters ) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index dd70a20ec77..4dafa976eff 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -890,7 +890,7 @@ WRITE_LINE_MEMBER(sc4_state::bfmdm01_busy) // Must tie back to inputs somehow! } -MACHINE_CONFIG_FRAGMENT( sc4_common ) +MACHINE_CONFIG_START( sc4_common ) MCFG_CPU_ADD("maincpu", M68307, 16000000) // 68307! (EC000 core) MCFG_CPU_PROGRAM_MAP(sc4_map) MCFG_MC68307_SERIAL_A_TX_CALLBACK(WRITELINE(sc4_state, m68307_duart_txa)) diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index c0358962d35..1e8376dc073 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -480,7 +480,7 @@ void bitgraph_state::machine_reset() } -static MACHINE_CONFIG_FRAGMENT( bg_motherboard ) +static MACHINE_CONFIG_START( bg_motherboard ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ @@ -548,7 +548,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_motherboard ) MACHINE_CONFIG_END #ifdef UNUSED_FUNCTION -static MACHINE_CONFIG_FRAGMENT( bg_ppu ) +static MACHINE_CONFIG_START( bg_ppu ) MCFG_CPU_ADD(PPU_TAG, I8035, XTAL_6_9MHz) MCFG_CPU_IO_MAP(ppu_io) // MCFG_MCS48_PORT_T0_IN_CB(READLINE(bitgraph_state, ppu_t0_r)) diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index 77da1de80cb..b505ae44732 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -1118,7 +1118,7 @@ static MACHINE_CONFIG_START( by35 ) MCFG_TIMER_DRIVER_ADD("timer_d_pulse", by35_state, timer_d_pulse) // 555 Active pulse length MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( as2888_audio ) +MACHINE_CONFIG_START( as2888_audio ) MCFG_MACHINE_START_OVERRIDE( by35_state, as2888 ) diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index 5a7a584e23f..48160d95eb7 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -790,7 +790,7 @@ static SLOT_INTERFACE_START( camplynx_floppies ) SLOT_INTERFACE( "drive1", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( lynx_common ) +static MACHINE_CONFIG_START( lynx_common ) MCFG_PALETTE_ADD_3BIT_RGB("palette") /* sound hardware */ @@ -802,7 +802,7 @@ static MACHINE_CONFIG_FRAGMENT( lynx_common ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.02) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( lynx_disk ) +static MACHINE_CONFIG_START( lynx_disk ) MCFG_FD1793_ADD("fdc", XTAL_24MHz / 24) MCFG_FLOPPY_DRIVE_ADD("fdc:0", camplynx_floppies, "drive0", camplynx_state::camplynx_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 6114471f732..092d3cfb262 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -2258,7 +2258,7 @@ MACHINE_RESET_MEMBER( p500_state, p500 ) // MACHINE_CONFIG( 128k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 128k ) +static MACHINE_CONFIG_START( 128k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") MCFG_RAM_EXTRA_OPTIONS("256K") @@ -2269,7 +2269,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 256k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 256k ) +static MACHINE_CONFIG_START( 256k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("256K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp index d7b666415d3..b7c35635bce 100644 --- a/src/mame/drivers/channelf.cpp +++ b/src/mame/drivers/channelf.cpp @@ -199,7 +199,7 @@ static SLOT_INTERFACE_START(cf_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( channelf_cart ) +static MACHINE_CONFIG_START( channelf_cart ) /* cartridge */ MCFG_CHANNELF_CARTRIDGE_ADD("cartslot", cf_cart, nullptr) diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 8dd17281f4c..2de03b02cc7 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -1797,11 +1797,11 @@ SLOT_INTERFACE_START(usb_baseboard) SLOT_INTERFACE("xbox_controller", OHCI_GAME_CONTROLLER) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(an2131qc_configuration) +static MACHINE_CONFIG_START(an2131qc_configuration) MCFG_OHCI_HLEAN2131QC_REGION(":others", 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(an2131sc_configuration) +static MACHINE_CONFIG_START(an2131sc_configuration) MCFG_OHCI_HLEAN2131SC_REGION(":others", 0x2080) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index ea224fff911..873fc44f8b3 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -311,7 +311,7 @@ cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, dev { } -MACHINE_CONFIG_FRAGMENT( cmi01a_device ) +MACHINE_CONFIG_START( cmi01a_device ) MCFG_DEVICE_ADD("cmi01a_pia_0", PIA6821, 0) // pia_cmi01a_1_config MCFG_PIA_READCB1_HANDLER(READLINE(cmi01a_device, tri_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi01a_device, ws_dir_w)) diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index c9713688e42..4ed938d86b1 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -268,10 +268,10 @@ SLOT_INTERFACE_START( t4426_cart ) SLOT_INTERFACE_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( coco_sound ) +// MACHINE_CONFIG_START( coco_sound ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( coco_sound ) +MACHINE_CONFIG_START( coco_sound ) MCFG_SPEAKER_STANDARD_MONO("speaker") // 6-bit D/A: R10-15 = 10K, 20K, 40.2K, 80.6K, 162K, 324K (according to parts list); output also controls joysticks diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index f2468a0bc62..18727b38b81 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -2456,21 +2456,21 @@ SH2_DMA_KLUDGE_CB(cps3_state::dma_callback) } -static MACHINE_CONFIG_FRAGMENT( simm1_64mbit ) +static MACHINE_CONFIG_START( simm1_64mbit ) MCFG_FUJITSU_29F016A_ADD("simm1.0") MCFG_FUJITSU_29F016A_ADD("simm1.1") MCFG_FUJITSU_29F016A_ADD("simm1.2") MCFG_FUJITSU_29F016A_ADD("simm1.3") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm2_64mbit ) +static MACHINE_CONFIG_START( simm2_64mbit ) MCFG_FUJITSU_29F016A_ADD("simm2.0") MCFG_FUJITSU_29F016A_ADD("simm2.1") MCFG_FUJITSU_29F016A_ADD("simm2.2") MCFG_FUJITSU_29F016A_ADD("simm2.3") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm3_128mbit ) +static MACHINE_CONFIG_START( simm3_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm3.0") MCFG_FUJITSU_29F016A_ADD("simm3.1") MCFG_FUJITSU_29F016A_ADD("simm3.2") @@ -2481,7 +2481,7 @@ static MACHINE_CONFIG_FRAGMENT( simm3_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm3.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm4_128mbit ) +static MACHINE_CONFIG_START( simm4_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm4.0") MCFG_FUJITSU_29F016A_ADD("simm4.1") MCFG_FUJITSU_29F016A_ADD("simm4.2") @@ -2492,7 +2492,7 @@ static MACHINE_CONFIG_FRAGMENT( simm4_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm4.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm5_128mbit ) +static MACHINE_CONFIG_START( simm5_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.0") MCFG_FUJITSU_29F016A_ADD("simm5.1") MCFG_FUJITSU_29F016A_ADD("simm5.2") @@ -2503,12 +2503,12 @@ static MACHINE_CONFIG_FRAGMENT( simm5_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm5_32mbit ) +static MACHINE_CONFIG_START( simm5_32mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.0") MCFG_FUJITSU_29F016A_ADD("simm5.1") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( simm6_128mbit ) +static MACHINE_CONFIG_START( simm6_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm6.0") MCFG_FUJITSU_29F016A_ADD("simm6.1") MCFG_FUJITSU_29F016A_ADD("simm6.2") diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index dc5b8cfb785..eb681df73ad 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -568,7 +568,7 @@ static INPUT_PORTS_START( dc ) PORT_CONFSETTING( 0x03, "S-Video" ) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( gdrom_config ) +static MACHINE_CONFIG_START( gdrom_config ) MCFG_DEVICE_MODIFY("cdda") MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index d856e9a3fe4..6de798c6392 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -1413,7 +1413,7 @@ WRITE_LINE_MEMBER(dooyong_z80_ym2203_state::irqhandler_2203_2) ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( sound_2203 ) +MACHINE_CONFIG_START( sound_2203 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1429,7 +1429,7 @@ MACHINE_CONFIG_FRAGMENT( sound_2203 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( sound_2151 ) +MACHINE_CONFIG_START( sound_2151 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1443,7 +1443,7 @@ MACHINE_CONFIG_FRAGMENT( sound_2151 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( sound_2151_4mhz ) +MACHINE_CONFIG_START( sound_2151_4mhz ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index cf94437cccf..60f52720f88 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -1034,7 +1034,7 @@ static const char *const alphamc07_sample_names[] = #define MSM5232_BASE_VOLUME 1.0 // the sound board is the same in all games -static MACHINE_CONFIG_FRAGMENT( common_sound ) +static MACHINE_CONFIG_START( common_sound ) MCFG_CPU_ADD("audiocpu", I8085A, XTAL_6_144MHz) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index 8b8b1d4275a..d540e573892 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -1268,7 +1268,7 @@ WRITE_LINE_MEMBER( firebeat_state::ata_interrupt ) m_maincpu->set_input_line(INPUT_LINE_IRQ4, state); } -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY("cdda") MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index e798455731d..e320bb3fe07 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2687,7 +2687,7 @@ static GFXDECODE_START( towns ) GFXDECODE_ENTRY( "user", 0x180000, fnt_chars_16x16, 0, 16 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( towns_base ) +static MACHINE_CONFIG_START( towns_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I386, 16000000) MCFG_CPU_PROGRAM_MAP(towns_mem) diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 93aa110cd62..df819171453 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -391,7 +391,7 @@ WRITE_LINE_MEMBER (force68k_state::write_aciaremt_clock){ */ // Implementation of static 2 x 64K EPROM in sockets J10/J11 as 16 bit wide cartridge for easier // software handling. TODO: make configurable according to table above. -static MACHINE_CONFIG_FRAGMENT( fccpu1_eprom_sockets ) +static MACHINE_CONFIG_START( fccpu1_eprom_sockets ) MCFG_GENERIC_CARTSLOT_ADD("exp_rom1", generic_plain_slot, "fccpu1_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_WIDTH(GENERIC_ROM16_WIDTH) diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index 83db1e1ef05..eba2c395d02 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -117,7 +117,7 @@ static DEVICE_INPUT_DEFAULTS_START( fruitpc_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_FRAGMENT( fruitpc_sb_conf ) +static MACHINE_CONFIG_START( fruitpc_sb_conf ) MCFG_DEVICE_MODIFY("pc_joy") MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 8dc5ad18386..8a1a5c1aa85 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -5631,7 +5631,7 @@ static MACHINE_CONFIG_DERIVED( konami_base, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( konami_sound_1x_ay8910 ) +static MACHINE_CONFIG_START( konami_sound_1x_ay8910 ) /* 2nd CPU to drive sound */ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) @@ -5656,7 +5656,7 @@ static MACHINE_CONFIG_FRAGMENT( konami_sound_1x_ay8910 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( konami_sound_2x_ay8910 ) +static MACHINE_CONFIG_START( konami_sound_2x_ay8910 ) /* 2nd CPU to drive sound */ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index 4e1d7b2efde..663d2c81ea1 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -143,7 +143,7 @@ DEFINE_DEVICE_TYPE(GALGAMES_CART, galgames_cart_device, "starpak_cart", "Galaxy // BIOS "cart" -static MACHINE_CONFIG_FRAGMENT( bios ) +static MACHINE_CONFIG_START( bios ) MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") MACHINE_CONFIG_END @@ -169,7 +169,7 @@ DEFINE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device, "galgames_bios // STARPAK2 cart -static MACHINE_CONFIG_FRAGMENT( starpak2 ) +static MACHINE_CONFIG_START( starpak2 ) MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word) MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) @@ -200,7 +200,7 @@ DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starp // STARPAK3 cart -static MACHINE_CONFIG_FRAGMENT( starpak3 ) +static MACHINE_CONFIG_START( starpak3 ) MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w)) MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 01f8a174b66..d76aa5346d2 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -672,7 +672,7 @@ static const char *const qbert_knocker_names[] = nullptr /* end of array */ }; -MACHINE_CONFIG_FRAGMENT( qbert_knocker ) +MACHINE_CONFIG_START( qbert_knocker ) MCFG_SPEAKER_ADD("knocker", 0.0, 0.0, 1.0) MCFG_SOUND_ADD("knocker_sam", SAMPLES, 0) diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 11b9652fc94..62f2bf7bbb1 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -1416,7 +1416,7 @@ INTERRUPT_GEN_MEMBER(harddriv_state::video_int_gen) /* Driver board without MSP (used by Race Drivin' cockpit) */ -static MACHINE_CONFIG_FRAGMENT( driver_nomsp ) +static MACHINE_CONFIG_START( driver_nomsp ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4) @@ -1464,7 +1464,7 @@ MACHINE_CONFIG_END /* Driver board with MSP (used by Hard Drivin' cockpit) */ -static MACHINE_CONFIG_FRAGMENT( driver_msp ) +static MACHINE_CONFIG_START( driver_msp ) MCFG_FRAGMENT_ADD( driver_nomsp ) @@ -1482,7 +1482,7 @@ MACHINE_CONFIG_END /* Multisync board without MSP (used by STUN Runner, Steel Talons, Race Drivin' compact) */ -static MACHINE_CONFIG_FRAGMENT( multisync_nomsp ) +static MACHINE_CONFIG_START( multisync_nomsp ) MCFG_FRAGMENT_ADD( driver_nomsp ) @@ -1503,7 +1503,7 @@ MACHINE_CONFIG_END /* Multisync board with MSP (used by Hard Drivin' compact) */ -static MACHINE_CONFIG_FRAGMENT( multisync_msp ) +static MACHINE_CONFIG_START( multisync_msp ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1521,7 +1521,7 @@ MACHINE_CONFIG_END /* Multisync II board (used by Hard Drivin's Airborne) */ -static MACHINE_CONFIG_FRAGMENT( multisync2 ) +static MACHINE_CONFIG_START( multisync2 ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1544,7 +1544,7 @@ MACHINE_CONFIG_END *************************************/ /* ADSP/ADSP II boards (used by Hard/Race Drivin', STUN Runner) */ -static MACHINE_CONFIG_FRAGMENT( adsp ) +static MACHINE_CONFIG_START( adsp ) /* basic machine hardware */ MCFG_CPU_ADD("adsp", ADSP2100, XTAL_32MHz/4) @@ -1554,7 +1554,7 @@ MACHINE_CONFIG_END /* DS III/IV board (used by Steel Talons, Street Drivin' and Hard Drivin's Airborne) */ -static MACHINE_CONFIG_FRAGMENT( ds3 ) +static MACHINE_CONFIG_START( ds3 ) /* basic machine hardware */ MCFG_CPU_ADD("adsp", ADSP2101, XTAL_12MHz) @@ -1596,7 +1596,7 @@ MACHINE_CONFIG_END *************************************/ /* DSK board (used by Race Drivin') */ -static MACHINE_CONFIG_FRAGMENT( dsk ) +static MACHINE_CONFIG_START( dsk ) /* basic machine hardware */ MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz) @@ -1612,7 +1612,7 @@ MACHINE_CONFIG_END /* DSK II board (used by Hard Drivin's Airborne) */ -static MACHINE_CONFIG_FRAGMENT( dsk2 ) +static MACHINE_CONFIG_START( dsk2 ) /* basic machine hardware */ MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz) @@ -1631,14 +1631,14 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( harddriv ) +static MACHINE_CONFIG_START( harddriv ) MCFG_FRAGMENT_ADD( driver_msp ) /* basic machine hardware */ /* original driver board with MSP */ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( harddrivc ) +static MACHINE_CONFIG_START( harddrivc ) MCFG_FRAGMENT_ADD( multisync_msp ) /* basic machine hardware */ /* multisync board with MSP */ @@ -1646,7 +1646,7 @@ static MACHINE_CONFIG_FRAGMENT( harddrivc ) MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( racedriv ) +static MACHINE_CONFIG_START( racedriv ) MCFG_FRAGMENT_ADD( driver_nomsp ) /* basic machine hardware */ /* original driver board without MSP */ @@ -1655,7 +1655,7 @@ static MACHINE_CONFIG_FRAGMENT( racedriv ) MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( racedrivc ) +static MACHINE_CONFIG_START( racedrivc ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1666,7 +1666,7 @@ static MACHINE_CONFIG_FRAGMENT( racedrivc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( racedrivc_panorama_side ) +static MACHINE_CONFIG_START( racedrivc_panorama_side ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1683,7 +1683,7 @@ WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line) } -static MACHINE_CONFIG_FRAGMENT( stunrun ) +static MACHINE_CONFIG_START( stunrun ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1705,7 +1705,7 @@ static MACHINE_CONFIG_FRAGMENT( stunrun ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( steeltal ) +static MACHINE_CONFIG_START( steeltal ) MCFG_FRAGMENT_ADD( multisync_msp ) /* basic machine hardware */ /* multisync board with MSP */ @@ -1728,7 +1728,7 @@ static MACHINE_CONFIG_FRAGMENT( steeltal ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( strtdriv ) +static MACHINE_CONFIG_START( strtdriv ) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1740,7 +1740,7 @@ static MACHINE_CONFIG_FRAGMENT( strtdriv ) MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( hdrivair ) +static MACHINE_CONFIG_START( hdrivair ) MCFG_FRAGMENT_ADD( multisync2 ) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 90d979d6a36..1868f18712d 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -3601,7 +3601,7 @@ static ADDRESS_MAP_START(ppu_io_map , AS_IO , 16 , hp9845_base_state) AM_RANGE(HP_MAKE_IOADDR(T15_PA , 0) , HP_MAKE_IOADDR(T15_PA , 3)) AM_DEVREADWRITE("t15" , hp_taco_device , reg_r , reg_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(hp9845_base) +static MACHINE_CONFIG_START(hp9845_base) MCFG_CPU_ADD("lpu", HP_5061_3001, 5700000) MCFG_CPU_PROGRAM_MAP(global_mem_map) MCFG_HPHYBRID_SET_9845_BOOT(true) diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index 892b85a2977..a2eb302c1c7 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -568,7 +568,7 @@ static INPUT_PORTS_START( indigo ) PORT_BIT ( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^^mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index f5937b1d7b6..d87d46fd97e 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -182,7 +182,7 @@ ioport_constructor ioc2_device::device_input_ports() const return INPUT_PORTS_NAME(front_panel); } -MACHINE_CONFIG_FRAGMENT( ioc2_device ) +MACHINE_CONFIG_START( ioc2_device ) MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK, SCC_TXA_CLK, SCC_RXB_CLK, SCC_TXB_CLK) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr)) @@ -1475,7 +1475,7 @@ static INPUT_PORTS_START( ip225015 ) PORT_INCLUDE( at_keyboard ) /* IN4 - IN11 */ INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index d75b7071c19..e62cc184641 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -1697,7 +1697,7 @@ static MACHINE_CONFIG_DERIVED( itech8_core_hi, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 ) +static MACHINE_CONFIG_START( itech8_sound_ym2203 ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) @@ -1717,7 +1717,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2608b ) +static MACHINE_CONFIG_START( itech8_sound_ym2608b ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) @@ -1731,7 +1731,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2608b ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 ) +static MACHINE_CONFIG_START( itech8_sound_ym3812 ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) @@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812_external ) +static MACHINE_CONFIG_START( itech8_sound_ym3812_external ) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index 52176b87920..19fd49297f3 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -314,7 +314,7 @@ void konamigv_state::driver_start() save_item(NAME(m_btc_trackball_data)); } -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index dfd37ac2ef6..329f7db09ee 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -1496,7 +1496,7 @@ WRITE_LINE_MEMBER( ksys573_state::salarymc_lamp_clk ) m_salarymc_lamp_clk = state; } -static MACHINE_CONFIG_FRAGMENT( salarymc_cassette_install ) +static MACHINE_CONFIG_START( salarymc_cassette_install ) MCFG_DEVICE_MODIFY( DEVICE_SELF ) MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_clk ) ) MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_rst ) ) @@ -1577,7 +1577,7 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe3 ) m_hyperbbc_lamp_strobe3 = state; } -static MACHINE_CONFIG_FRAGMENT( hyperbbc_cassette_install ) +static MACHINE_CONFIG_START( hyperbbc_cassette_install ) MCFG_DEVICE_MODIFY( DEVICE_SELF ) MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe3 ) ) // line shared with x76f100 sda MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 scl @@ -1588,7 +1588,7 @@ static MACHINE_CONFIG_FRAGMENT( hyperbbc_cassette_install ) MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_start ) ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( hypbbc2p_cassette_install ) +static MACHINE_CONFIG_START( hypbbc2p_cassette_install ) MCFG_DEVICE_MODIFY( DEVICE_SELF ) MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 sda MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst @@ -1701,7 +1701,7 @@ ADC083X_INPUT_CB(konami573_cassette_xi_device::punchmania_inputs_callback) } -static MACHINE_CONFIG_FRAGMENT( punchmania_cassette_install ) +static MACHINE_CONFIG_START( punchmania_cassette_install ) MCFG_DEVICE_MODIFY( "adc0838" ) MCFG_ADC083X_INPUT_CB( konami573_cassette_xi_device, punchmania_inputs_callback ) MACHINE_CONFIG_END @@ -1992,7 +1992,7 @@ ADC083X_INPUT_CB(ksys573_state::analogue_inputs_callback) return 0; } -static MACHINE_CONFIG_FRAGMENT( cr589_config ) +static MACHINE_CONFIG_START( cr589_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) @@ -2073,25 +2073,25 @@ static MACHINE_CONFIG_DERIVED( k573a, konami573 ) MCFG_CPU_PROGRAM_MAP( konami573a_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard1_16mb ) +static MACHINE_CONFIG_START( pccard1_16mb ) MCFG_DEVICE_MODIFY( "pccard1" ) MCFG_SLOT_OPTION_ADD( "16mb", LINEAR_FLASH_PCCARD_16MB ) MCFG_SLOT_DEFAULT_OPTION( "16mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard1_32mb ) +static MACHINE_CONFIG_START( pccard1_32mb ) MCFG_DEVICE_MODIFY( "pccard1" ) MCFG_SLOT_OPTION_ADD( "32mb", LINEAR_FLASH_PCCARD_32MB ) MCFG_SLOT_DEFAULT_OPTION( "32mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard2_32mb ) +static MACHINE_CONFIG_START( pccard2_32mb ) MCFG_DEVICE_MODIFY( "pccard2" ) MCFG_SLOT_OPTION_ADD( "32mb", LINEAR_FLASH_PCCARD_32MB ) MCFG_SLOT_DEFAULT_OPTION( "32mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pccard2_64mb ) +static MACHINE_CONFIG_START( pccard2_64mb ) MCFG_DEVICE_MODIFY( "pccard2" ) MCFG_SLOT_OPTION_ADD( "64mb", LINEAR_FLASH_PCCARD_64MB ) MCFG_SLOT_DEFAULT_OPTION( "64mb" ) @@ -2108,44 +2108,44 @@ MACHINE_CONFIG_END // // Up to two carts can be used -static MACHINE_CONFIG_FRAGMENT( cassx ) +static MACHINE_CONFIG_START( cassx ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_X ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassxi ) +static MACHINE_CONFIG_START( cassxi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_XI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassy ) +static MACHINE_CONFIG_START( cassy ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_Y ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassyi ) +static MACHINE_CONFIG_START( cassyi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_YI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassyyi ) +static MACHINE_CONFIG_START( cassyyi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_YI ) MCFG_SLOT_OPTION_ADD( "install", KONAMI573_CASSETTE_YI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( casszi ) +static MACHINE_CONFIG_START( casszi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_ZI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cassxzi ) +static MACHINE_CONFIG_START( cassxzi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_ZI ) MCFG_SLOT_OPTION_ADD( "install", KONAMI573_CASSETTE_XI ) diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp index 7969c061306..f64fe453e8e 100644 --- a/src/mame/drivers/lb186.cpp +++ b/src/mame/drivers/lb186.cpp @@ -103,7 +103,7 @@ static SLOT_INTERFACE_START( lb186_floppies ) SLOT_INTERFACE("525dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ncr5380 ) +static MACHINE_CONFIG_START( ncr5380 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5380N_IRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, int1_w)) MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, drq0_w)) diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp index fbacf36ffeb..fb19281f910 100644 --- a/src/mame/drivers/m24.cpp +++ b/src/mame/drivers/m24.cpp @@ -238,7 +238,7 @@ FLOPPY_FORMATS_MEMBER( m24_state::floppy_formats ) FLOPPY_M20_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_FRAGMENT( cfg_m20_format ) +static MACHINE_CONFIG_START( cfg_m20_format ) MCFG_DEVICE_MODIFY("fdc:0") static_cast(device)->set_formats(m24_state::floppy_formats); diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index f09eb8e67eb..4394ccf5ef4 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -1838,7 +1838,7 @@ static GFXDECODE_START( majtitle ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( m72_audio_chips ) +static MACHINE_CONFIG_START( m72_audio_chips ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp index c4518a6f057..c3e4eaa190c 100644 --- a/src/mame/drivers/magtouch.cpp +++ b/src/mame/drivers/magtouch.cpp @@ -177,7 +177,7 @@ static DEVICE_INPUT_DEFAULTS_START( magtouch_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_FRAGMENT( magtouch_sb_conf ) +static MACHINE_CONFIG_START( magtouch_sb_conf ) MCFG_DEVICE_MODIFY("pc_joy") MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick MACHINE_CONFIG_END diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index 0cae9597044..9794e777f65 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -1666,7 +1666,7 @@ MACHINE_START_MEMBER(mappy_state,mappy) } -static MACHINE_CONFIG_FRAGMENT( superpac_common ) +static MACHINE_CONFIG_START( superpac_common ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ @@ -1832,7 +1832,7 @@ static MACHINE_CONFIG_START( phozon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( mappy_common ) +static MACHINE_CONFIG_START( mappy_common ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 73aab2891d9..490fb592c44 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -3723,7 +3723,7 @@ static MACHINE_CONFIG_DERIVED( batlbubl, msgogo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( metro_upd7810_sound ) +static MACHINE_CONFIG_START( metro_upd7810_sound ) MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_24MHz/2) MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r)) MCFG_CPU_PROGRAM_MAP(metro_sound_map) @@ -3733,7 +3733,7 @@ static MACHINE_CONFIG_FRAGMENT( metro_upd7810_sound ) MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(metro_state, metro_sound_rombank_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( daitorid_upd7810_sound ) +static MACHINE_CONFIG_START( daitorid_upd7810_sound ) MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_12MHz) MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r)) MCFG_CPU_PROGRAM_MAP(metro_sound_map) diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index a2f4db88480..25d01fdca68 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -1254,7 +1254,7 @@ static INPUT_PORTS_START( van16 ) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT ( chess_common ) +static MACHINE_CONFIG_START ( chess_common ) /* video hardware */ diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 8111224e35a..b970be54e1e 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -2453,7 +2453,7 @@ static ADDRESS_MAP_START( drive_io_map, AS_IO, 8, model2_state ) AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("driveadc", msm6253_device, d0_r, address_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( sj25_0207_01 ) +static MACHINE_CONFIG_START( sj25_0207_01 ) MCFG_CPU_ADD("drivecpu", Z80, XTAL_8MHz/2) // confirmed MCFG_CPU_PROGRAM_MAP(drive_map) MCFG_CPU_IO_MAP(drive_io_map) diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp index 45d3829be3a..9af32de9dac 100644 --- a/src/mame/drivers/mpu4.cpp +++ b/src/mame/drivers/mpu4.cpp @@ -2661,7 +2661,7 @@ ADDRESS_MAP_END MCFG_STEPPER_INDEX_PATTERN(0x00)\ MCFG_STEPPER_INIT_PHASE(2) -MACHINE_CONFIG_FRAGMENT( mpu4_std_3reel ) +MACHINE_CONFIG_START( mpu4_std_3reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2670,7 +2670,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_3reel ) +MACHINE_CONFIG_START( mpu4_type2_3reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2679,7 +2679,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_3reel ) +MACHINE_CONFIG_START( mpu4_type3_3reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2688,7 +2688,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_3reel ) +MACHINE_CONFIG_START( mpu4_type4_3reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2697,7 +2697,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_3reel ) +MACHINE_CONFIG_START( mpu4_bwb_3reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2706,7 +2706,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_4reel ) +MACHINE_CONFIG_START( mpu4_std_4reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2717,7 +2717,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_4reel ) +MACHINE_CONFIG_START( mpu4_type2_4reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2728,7 +2728,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_4reel ) +MACHINE_CONFIG_START( mpu4_type3_4reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2739,7 +2739,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_4reel ) +MACHINE_CONFIG_START( mpu4_type4_4reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2750,7 +2750,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_4reel ) +MACHINE_CONFIG_START( mpu4_bwb_4reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2761,7 +2761,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_5reel ) +MACHINE_CONFIG_START( mpu4_std_5reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2774,7 +2774,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_5reel ) +MACHINE_CONFIG_START( mpu4_type2_5reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2787,7 +2787,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_5reel ) +MACHINE_CONFIG_START( mpu4_type3_5reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2800,7 +2800,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_5reel ) +MACHINE_CONFIG_START( mpu4_type4_5reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2813,7 +2813,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_5reel ) +MACHINE_CONFIG_START( mpu4_bwb_5reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2826,7 +2826,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_6reel ) +MACHINE_CONFIG_START( mpu4_std_6reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2841,7 +2841,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_6reel ) +MACHINE_CONFIG_START( mpu4_type2_6reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2856,7 +2856,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_6reel ) +MACHINE_CONFIG_START( mpu4_type3_6reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2871,7 +2871,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_6reel ) +MACHINE_CONFIG_START( mpu4_type4_6reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2886,7 +2886,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_6reel ) +MACHINE_CONFIG_START( mpu4_bwb_6reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2902,7 +2902,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_6reel ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_std_7reel ) +MACHINE_CONFIG_START( mpu4_std_7reel ) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2921,7 +2921,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_std_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type2_7reel ) +MACHINE_CONFIG_START( mpu4_type2_7reel ) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2940,7 +2940,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type2_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type3_7reel ) +MACHINE_CONFIG_START( mpu4_type3_7reel ) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2959,7 +2959,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type3_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_type4_7reel ) +MACHINE_CONFIG_START( mpu4_type4_7reel ) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2978,7 +2978,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_type4_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_bwb_7reel ) +MACHINE_CONFIG_START( mpu4_bwb_7reel ) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2997,7 +2997,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_bwb_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_common ) +MACHINE_CONFIG_START( mpu4_common ) MCFG_TIMER_DRIVER_ADD_PERIODIC("50hz", mpu4_state, gen_50hz, attotime::from_hz(100)) MCFG_MSC1937_ADD("vfd",0) @@ -3066,7 +3066,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_common ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( mpu4_common2 ) +MACHINE_CONFIG_START( mpu4_common2 ) MCFG_DEVICE_ADD("ptm_ic3ss", PTM6840, MPU4_MASTER_CLOCK / 4) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) MCFG_PTM6840_OUT0_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c2)) diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index ce80ed060d1..3867ff51857 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1243,31 +1243,31 @@ WRITE_LINE_MEMBER(msx_state::turbo_w) #define MSX_VISIBLE_YBORDER_PIXELS 24 -static MACHINE_CONFIG_FRAGMENT( msx1_cartlist ) +static MACHINE_CONFIG_START( msx1_cartlist ) MCFG_SOFTWARE_LIST_ADD("cart_list", "msx1_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx1_floplist ) +static MACHINE_CONFIG_START( msx1_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx1_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2_cartlist ) +static MACHINE_CONFIG_START( msx2_cartlist ) MCFG_SOFTWARE_LIST_ADD("cart_list", "msx2_cart") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_crt_l", "msx1_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2_floplist ) +static MACHINE_CONFIG_START( msx2_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2p_floplist ) +static MACHINE_CONFIG_START( msx2p_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msxr_floplist ) +static MACHINE_CONFIG_START( msxr_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msxr_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2p_flp_l", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not? @@ -1284,12 +1284,12 @@ static SLOT_INTERFACE_START( msx_floppies ) SLOT_INTERFACE( "35ssdd", FLOPPY_35_SSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( msx_fd1793 ) +static MACHINE_CONFIG_START( msx_fd1793 ) MCFG_FD1793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_wd2793_force_ready ) +static MACHINE_CONFIG_START( msx_wd2793_force_ready ) // From NMS8245 schematics: // READY + HLT - pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low @@ -1297,11 +1297,11 @@ static MACHINE_CONFIG_FRAGMENT( msx_wd2793_force_ready ) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_wd2793 ) +static MACHINE_CONFIG_START( msx_wd2793 ) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_mb8877a ) +static MACHINE_CONFIG_START( msx_mb8877a ) // From CF-3300 FDC schematic: // READY + HLT - pulled high // -DDEN - pulled low @@ -1309,34 +1309,34 @@ static MACHINE_CONFIG_FRAGMENT( msx_mb8877a ) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_tc8566af ) +static MACHINE_CONFIG_START( msx_tc8566af ) MCFG_TC8566AF_ADD("fdc") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_microsol ) +static MACHINE_CONFIG_START( msx_microsol ) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_1_35_ssdd_drive ) +static MACHINE_CONFIG_START( msx_1_35_ssdd_drive ) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35ssdd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_1_35_dd_drive ) +static MACHINE_CONFIG_START( msx_1_35_dd_drive ) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_2_35_dd_drive ) +static MACHINE_CONFIG_START( msx_2_35_dd_drive ) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", msx_floppies, "35dd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx_ym2413 ) +static MACHINE_CONFIG_START( msx_ym2413 ) MCFG_SOUND_ADD("ym2413", YM2413, XTAL_21_4772MHz/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( msx2_64kb_vram ) +static MACHINE_CONFIG_START( msx2_64kb_vram ) MCFG_DEVICE_MODIFY("v9938") v9938_device::static_set_vram_size(*device, 0x10000); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp index 89e831aab3b..1f9f9d3f6cf 100644 --- a/src/mame/drivers/mtouchxl.cpp +++ b/src/mame/drivers/mtouchxl.cpp @@ -169,7 +169,7 @@ static SLOT_INTERFACE_START(mt6k_ata_devices) SLOT_INTERFACE("cdrom", ATAPI_FIXED_CDROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT(cdrom) +static MACHINE_CONFIG_START(cdrom) MCFG_DEVICE_MODIFY("ide:0") MCFG_DEVICE_SLOT_INTERFACE(mt6k_ata_devices, "cdrom", true) MCFG_DEVICE_MODIFY("ide:1") diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index c9ff2957252..124888d3b30 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -1008,7 +1008,7 @@ static SLOT_INTERFACE_START( next_scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ncr5390 ) +static MACHINE_CONFIG_START( ncr5390 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_irq)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_drq)) diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index a7a35b1b95a..f5091b9099d 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -650,7 +650,7 @@ GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( odyssey2_cartslot ) +static MACHINE_CONFIG_START( odyssey2_cartslot ) MCFG_O2_CARTRIDGE_ADD("cartslot", o2_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","odyssey2") diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 6945b4e914b..611f0e56bc7 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -421,14 +421,14 @@ static MACHINE_CONFIG_START( pccga ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_dual_720K ) +static MACHINE_CONFIG_START( cfg_dual_720K ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("35dd") MCFG_DEVICE_MODIFY("fdc:1") MCFG_SLOT_DEFAULT_OPTION("35dd") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_single_360K ) +static MACHINE_CONFIG_START( cfg_single_360K ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("525dd") MCFG_SLOT_FIXED(true) diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 71bb1dbb3b7..200cd82133a 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -3236,12 +3236,12 @@ SLOT_INTERFACE_START(pc9801_atapi_devices) SLOT_INTERFACE("pc9801_cd", PC9801_CD) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( pc9801_keyboard ) +static MACHINE_CONFIG_START( pc9801_keyboard ) MCFG_DEVICE_ADD("keyb", PC9801_KBD, 53) MCFG_PC9801_KBD_IRQ_CALLBACK(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_mouse ) +static MACHINE_CONFIG_START( pc9801_mouse ) MCFG_DEVICE_ADD("ppi8255_mouse", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(pc9801_state, ppi_mouse_porta_r)) MCFG_I8255_OUT_PORTA_CB(WRITE8(pc9801_state, ppi_mouse_porta_w)) @@ -3253,13 +3253,13 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_mouse ) MCFG_TIMER_DRIVER_ADD_PERIODIC("mouse_timer", pc9801_state, mouse_irq_cb, attotime::from_hz(120)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_cbus ) +static MACHINE_CONFIG_START( pc9801_cbus ) MCFG_PC9801CBUS_SLOT_ADD("cbus0", pc9801_cbus, "pc9801_26") MCFG_PC9801CBUS_SLOT_ADD("cbus1", pc9801_cbus, nullptr) // TODO: six max slots MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_sasi ) +static MACHINE_CONFIG_START( pc9801_sasi ) MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0) MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in") MCFG_SCSI_IO_HANDLER(WRITELINE(pc9801_state, write_sasi_io)) // bit2 @@ -3281,7 +3281,7 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_sasi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_ide ) +static MACHINE_CONFIG_START( pc9801_ide ) MCFG_ATA_INTERFACE_ADD("ide1", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(pc9801_state, ide1_irq_w)) MCFG_ATA_INTERFACE_ADD("ide2", pc9801_atapi_devices, "pc9801_cd", nullptr, false) @@ -3290,7 +3290,7 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_ide ) MCFG_SOFTWARE_LIST_ADD("cd_list","pc98_cd") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( pc9801_common ) +static MACHINE_CONFIG_START( pc9801_common ) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(MAIN_CLOCK_X1) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w)) diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index 48aa679321b..55958f3d9ad 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -147,7 +147,7 @@ static DEVICE_INPUT_DEFAULTS_START( pcat_dyn_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_FRAGMENT( pcat_dyn_sb_conf ) +static MACHINE_CONFIG_START( pcat_dyn_sb_conf ) MCFG_DEVICE_MODIFY("pc_joy") MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick MACHINE_CONFIG_END diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 11c015607c5..b4b1944484f 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1683,7 +1683,7 @@ MACHINE_RESET_MEMBER( cbm8296_state, cbm8296 ) // MACHINE_CONFIG( 4k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 4k ) +static MACHINE_CONFIG_START( 4k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4K") MCFG_RAM_EXTRA_OPTIONS("8K,16K,32K") @@ -1694,7 +1694,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 8k ) +static MACHINE_CONFIG_START( 8k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8K") MCFG_RAM_EXTRA_OPTIONS("16K,32K") @@ -1705,7 +1705,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 16k ) +static MACHINE_CONFIG_START( 16k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") MCFG_RAM_EXTRA_OPTIONS("32K") @@ -1716,7 +1716,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( 32k ) +static MACHINE_CONFIG_START( 32k ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("32K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp index 46d3559ebb3..8c2df754818 100644 --- a/src/mame/drivers/pg685.cpp +++ b/src/mame/drivers/pg685.cpp @@ -380,7 +380,7 @@ MC6845_UPDATE_ROW( pg685_state::crtc_update_row_oua12 ) // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT(pg685_backplane) +static MACHINE_CONFIG_START(pg685_backplane) MCFG_DEVICE_ADD("bppit", PIT8253, 0) MCFG_PIC8259_ADD("bppic", NOOP, VCC, NOOP) // ??? @@ -388,7 +388,7 @@ static MACHINE_CONFIG_FRAGMENT(pg685_backplane) MCFG_DEVICE_ADD("bpuart", MC2661, XTAL_4_9152MHz) // internal clock MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(pg685_module) +static MACHINE_CONFIG_START(pg685_module) MCFG_DEVICE_ADD("fdc", FD1797, XTAL_4MHz / 2) // divider guessed MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("mainpic", pic8259_device, ir4_w)) diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index d79d04b828a..f722c269fcd 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -504,7 +504,7 @@ MACHINE_RESET_MEMBER(pgm_state,pgm) m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } -MACHINE_CONFIG_FRAGMENT( pgmbase ) +MACHINE_CONFIG_START( pgmbase ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */ MCFG_CPU_PROGRAM_MAP(pgm_basic_mem) diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index ffce883e214..4c2cbd8ef9c 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -828,7 +828,7 @@ WRITE32_MEMBER(rastersp_state::ncr53c700_write) m_maincpu->space(AS_PROGRAM).write_dword(offset, data, mem_mask); } -static MACHINE_CONFIG_FRAGMENT( ncr53c700 ) +static MACHINE_CONFIG_START( ncr53c700 ) MCFG_DEVICE_CLOCK(66000000) MCFG_NCR53C7XX_IRQ_HANDLER(DEVWRITELINE(":", rastersp_state, scsi_irq)) MCFG_NCR53C7XX_HOST_READ(DEVREAD32(":", rastersp_state, ncr53c700_read)) diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index 754ec5fa16e..6b0324440b1 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -300,7 +300,7 @@ static const char *const safarir_sample_names[] = }; -static MACHINE_CONFIG_FRAGMENT( safarir_audio ) +static MACHINE_CONFIG_START( safarir_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index dbf08b70271..f1c12d15ab0 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -821,7 +821,7 @@ static MACHINE_CONFIG_DERIVED( endurord_base, sharrier_base ) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_board_2203 ) +static MACHINE_CONFIG_START( sound_board_2203 ) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -849,7 +849,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_board_2203 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_board_2203x2 ) +static MACHINE_CONFIG_START( sound_board_2203x2 ) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -887,7 +887,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_board_2203x2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_board_2151 ) +static MACHINE_CONFIG_START( sound_board_2151 ) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index d875f81b30a..087ca98212c 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -3675,7 +3675,7 @@ MACHINE_CONFIG_END // same as the above, but with custom Sega ICs -static MACHINE_CONFIG_FRAGMENT( rom_5797_fragment ) +static MACHINE_CONFIG_START( rom_5797_fragment ) MCFG_SEGA_315_5248_MULTIPLIER_ADD("multiplier") MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_1") MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_2") diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index 06bf5b4c351..f6658966dcf 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -2233,7 +2233,7 @@ GFXDECODE_END *************************************/ -static MACHINE_CONFIG_FRAGMENT( system32 ) +static MACHINE_CONFIG_START( system32 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V60, MASTER_CLOCK/2) @@ -2315,7 +2315,7 @@ static ADDRESS_MAP_START( system32_analog_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_analog ) +static MACHINE_CONFIG_START( system32_analog ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2353,7 +2353,7 @@ static ADDRESS_MAP_START( system32_trackball_map, AS_PROGRAM, 16, segas32_trackb AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_trackball ) +static MACHINE_CONFIG_START( system32_trackball ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2394,7 +2394,7 @@ static ADDRESS_MAP_START( system32_4player_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_4player ) +static MACHINE_CONFIG_START( system32_4player ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2428,7 +2428,7 @@ static ADDRESS_MAP_START( ga2_main_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_4player_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_v25 ) +static MACHINE_CONFIG_START( system32_v25 ) MCFG_FRAGMENT_ADD( system32_4player ) MCFG_CPU_MODIFY("maincpu") @@ -2458,7 +2458,7 @@ machine_config_constructor segas32_v25_state::device_mconfig_additions() const -static MACHINE_CONFIG_FRAGMENT( system32_upd7725 ) +static MACHINE_CONFIG_START( system32_upd7725 ) MCFG_FRAGMENT_ADD( system32_analog ) /* add a upd7725; this is on the 837-8341 daughterboard which plugs into the socket on the master pcb's rom board where an fd1149 could go */ @@ -2506,7 +2506,7 @@ static ADDRESS_MAP_START( system32_cd_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( system32_cd ) +static MACHINE_CONFIG_START( system32_cd ) MCFG_FRAGMENT_ADD( system32 ) MCFG_DEVICE_MODIFY("maincpu") @@ -2534,7 +2534,7 @@ machine_config_constructor segas32_cd_state::device_mconfig_additions() const -static MACHINE_CONFIG_FRAGMENT( multi32 ) +static MACHINE_CONFIG_START( multi32 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2) @@ -2629,7 +2629,7 @@ static ADDRESS_MAP_START( multi32_analog_map, AS_PROGRAM, 32, sega_multi32_analo AM_IMPORT_FROM(multi32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( multi32_analog ) +static MACHINE_CONFIG_START( multi32_analog ) MCFG_FRAGMENT_ADD(multi32) MCFG_DEVICE_MODIFY("maincpu") @@ -2678,7 +2678,7 @@ static ADDRESS_MAP_START( multi32_6player_map, AS_PROGRAM, 32, segas32_state ) AM_IMPORT_FROM(multi32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( multi32_6player ) +static MACHINE_CONFIG_START( multi32_6player ) MCFG_FRAGMENT_ADD(multi32) MCFG_DEVICE_MODIFY("maincpu") diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 9b049b8e79a..1c80e0f2bee 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -1679,7 +1679,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( xboard ) +static MACHINE_CONFIG_START( xboard ) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -1770,7 +1770,7 @@ static MACHINE_CONFIG_START( sega_xboard ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( xboard_fd1094 ) +static MACHINE_CONFIG_START( xboard_fd1094 ) MCFG_FRAGMENT_ADD( xboard ) @@ -1807,7 +1807,7 @@ MACHINE_CONFIG_END // GAME-SPECIFIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_FRAGMENT( aburner2 ) +static MACHINE_CONFIG_START( aburner2 ) MCFG_FRAGMENT_ADD( xboard ) // basic machine hardware @@ -1833,7 +1833,7 @@ static MACHINE_CONFIG_START( sega_aburner2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( lastsurv_fd1094 ) +static MACHINE_CONFIG_START( lastsurv_fd1094 ) MCFG_FRAGMENT_ADD( xboard_fd1094 ) @@ -1869,7 +1869,7 @@ static MACHINE_CONFIG_START( sega_lastsurv_fd1094 ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( lastsurv ) +static MACHINE_CONFIG_START( lastsurv ) MCFG_FRAGMENT_ADD( xboard ) @@ -1907,7 +1907,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( smgp_fd1094 ) +static MACHINE_CONFIG_START( smgp_fd1094 ) MCFG_FRAGMENT_ADD( xboard_fd1094 ) // basic machine hardware @@ -1954,7 +1954,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( smgp ) +static MACHINE_CONFIG_START( smgp ) MCFG_FRAGMENT_ADD( xboard ) // basic machine hardware @@ -2000,7 +2000,7 @@ static MACHINE_CONFIG_START( sega_smgp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( rascot ) +static MACHINE_CONFIG_START( rascot ) MCFG_FRAGMENT_ADD( xboard ) // basic machine hardware diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 8414b7cd9ad..a27ce2aa196 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -613,7 +613,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) /* Machine Drivers */ -static MACHINE_CONFIG_FRAGMENT( studio2_cartslot ) +static MACHINE_CONFIG_START( studio2_cartslot ) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "studio2_cart") MCFG_GENERIC_EXTENSIONS("st2,bin,rom") MCFG_GENERIC_LOAD(studio2_state, studio2_cart_load) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 98c0fa7e481..dd7349e47fc 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1120,7 +1120,7 @@ MACHINE_CONFIG_END MCFG_GENERIC_CARTSLOT_ADD(_tag, generic_plain_slot, "stv_cart") \ MCFG_GENERIC_LOAD(stv_state, _load) -MACHINE_CONFIG_FRAGMENT( stv_cartslot ) +MACHINE_CONFIG_START( stv_cartslot ) MCFG_STV_CARTSLOT_ADD("stv_slot1", stv_cart1) MCFG_STV_CARTSLOT_ADD("stv_slot2", stv_cart2) diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index d45eeabde98..925905db48a 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -1884,7 +1884,7 @@ static SLOT_INTERFACE_START( sun_scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( ncr5390 ) +static MACHINE_CONFIG_START( ncr5390 ) MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_irq)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_drq)) diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index f39469c7b79..74cfa64a318 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -2401,7 +2401,7 @@ MACHINE_CONFIG_END /* this describes the additional 8751 MCU when present */ -static MACHINE_CONFIG_FRAGMENT( mcu ) +static MACHINE_CONFIG_START( mcu ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 96c85244d8e..10f92a9e1a8 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2020,7 +2020,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_FRAGMENT( z80_ym2151 ) +static MACHINE_CONFIG_START( z80_ym2151 ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_map) @@ -2040,7 +2040,7 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::sound_cause_nmi) m_soundcpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_FRAGMENT( z80_ym2151_upd7759 ) +static MACHINE_CONFIG_START( z80_ym2151_upd7759 ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_7759_map) @@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_FRAGMENT( z80_ym2151_upd7759 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( datsu_ym2151_msm5205 ) +static MACHINE_CONFIG_START( datsu_ym2151_msm5205 ) /* TODO: - other games might use this sound configuration - speaker is likely to be mono for the bootlegs, not stereo. @@ -2082,7 +2082,7 @@ static MACHINE_CONFIG_FRAGMENT( datsu_ym2151_msm5205 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( datsu_2x_ym2203_msm5205 ) +static MACHINE_CONFIG_START( datsu_2x_ym2203_msm5205 ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(shinobi_datsu_sound_map) diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index 11982c96ccf..3bc835d1402 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -379,7 +379,7 @@ static MACHINE_CONFIG_DERIVED( taito4, taito ) MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( taito_ay_audio ) +static MACHINE_CONFIG_START( taito_ay_audio ) MCFG_CPU_MODIFY( "audiocpu" ) MCFG_CPU_PROGRAM_MAP(taito_sub_map5) diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 3fd4c678e09..0cb7ebc127a 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -601,7 +601,7 @@ static const gfx_layout t1000_charlayout = 8 }; -static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 ) +static MACHINE_CONFIG_START( cfg_fdc_35 ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("35dd") MCFG_SLOT_FIXED(true) @@ -609,7 +609,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 ) MCFG_DEVICE_REMOVE("fdc:1") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( cfg_fdc_525 ) +static MACHINE_CONFIG_START( cfg_fdc_525 ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_FIXED(true) @@ -620,7 +620,7 @@ static GFXDECODE_START( t1000 ) GFXDECODE_ENTRY( "gfx1", 0x0000, t1000_charlayout, 3, 1 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT(tandy1000_common) +static MACHINE_CONFIG_START(tandy1000_common) MCFG_DEVICE_ADD("mb", T1000_MOTHERBOARD, 0) t1000_mb_device::static_set_cputag(*device, "maincpu"); @@ -651,11 +651,11 @@ static MACHINE_CONFIG_FRAGMENT(tandy1000_common) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc_list","ibm5150") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(tandy1000_90key) +static MACHINE_CONFIG_START(tandy1000_90key) MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT(tandy1000_101key) +static MACHINE_CONFIG_START(tandy1000_101key) MCFG_AT_KEYB_ADD("pc_keyboard", 1, DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 50fc8c7d062..e17c4329115 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -1184,7 +1184,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_FRAGMENT( tms5110_route ) +static MACHINE_CONFIG_START( tms5110_route ) /* sound hardware */ MCFG_TMS5110_M0_CB(DEVWRITELINE("tms6100", tms6100_device, m0_w)) diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index c5e4ab3a3e9..c4f2501602d 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -871,7 +871,7 @@ static ADDRESS_MAP_START( mainbank_map, AS_PROGRAM, 8, tnzs_base_state ) AM_RANGE(0x08000, 0x1ffff) AM_ROM AM_REGION(":maincpu", 0x8000) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( tnzs_mainbank ) +MACHINE_CONFIG_START( tnzs_mainbank ) MCFG_DEVICE_ADD("mainbank", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(mainbank_map) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp index c322cc203fd..db28290152e 100644 --- a/src/mame/drivers/tosh1000.cpp +++ b/src/mame/drivers/tosh1000.cpp @@ -131,7 +131,7 @@ static ADDRESS_MAP_START( tosh1000_io, AS_IO, 8, tosh1000_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 ) +static MACHINE_CONFIG_START( cfg_fdc_35 ) MCFG_DEVICE_MODIFY("fdc:0") MCFG_SLOT_DEFAULT_OPTION("35dd") MCFG_SLOT_FIXED(true) diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index 60e32339fb0..5326a791d83 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -927,7 +927,7 @@ static void scsi_dma_write( twinkle_state *state, uint32_t *p_n_psxram, uint32_t } -static MACHINE_CONFIG_FRAGMENT( cdrom_config ) +static MACHINE_CONFIG_START( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^speakerleft", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^speakerright", 1.0 ) diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 9e83dade2a0..2dc2af6f5c4 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -1007,7 +1007,7 @@ static MACHINE_CONFIG_START( common ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", vamphalf) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_ym_oki ) +static MACHINE_CONFIG_START( sound_ym_oki ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", XTAL_28MHz/8) /* 3.5MHz */ @@ -1019,7 +1019,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_ym_oki ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_suplup ) +static MACHINE_CONFIG_START( sound_suplup ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */ @@ -1031,7 +1031,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_suplup ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( sound_qs1000 ) +static MACHINE_CONFIG_START( sound_qs1000 ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 3b8d1f51d48..e61fe6e2a6f 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -130,7 +130,7 @@ void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int pa } } -static MACHINE_CONFIG_FRAGMENT( vis_pcm_config ) +static MACHINE_CONFIG_START( vis_pcm_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) @@ -262,7 +262,7 @@ vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, d m_screen.set_tag("screen"); } -static MACHINE_CONFIG_FRAGMENT( vis_vga_config ) +static MACHINE_CONFIG_START( vis_vga_config ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, vis_vga_device, screen_update) diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index 226f887a25e..636b35bbc12 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -315,7 +315,7 @@ DRIVER_INIT_MEMBER(wpc_an_state,wpc_an) memcpy(fixed,&ROM[codeoff],0x8000); // copy static code from end of U6 ROM. } -static MACHINE_CONFIG_FRAGMENT( wpc_an_base ) +static MACHINE_CONFIG_START( wpc_an_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_an_map) diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index 3b3e812c53e..943dc69a98d 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8, abc1600_mac_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( abc1600_mac ) +static MACHINE_CONFIG_START( abc1600_mac ) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL_64MHz/8/10/20000/8/8 MACHINE_CONFIG_END diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp index d689ea88c1f..d172bc90dd3 100644 --- a/src/mame/machine/abc80kb.cpp +++ b/src/mame/machine/abc80kb.cpp @@ -125,7 +125,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( abc80_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc80_keyboard ) +static MACHINE_CONFIG_START( abc80_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, 4000000) MCFG_CPU_IO_MAP(abc80_keyboard_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index f277f989894..3549f08c7cf 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -313,7 +313,7 @@ void alpha_8201_device::device_start() } // machine config additions -static MACHINE_CONFIG_FRAGMENT(alpha8201) +static MACHINE_CONFIG_START(alpha8201) MCFG_CPU_ADD("mcu", HD44801, DERIVED_CLOCK(1,1)) // 8H MCFG_HMCS40_READ_R_CB(0, READ8(alpha_8201_device, mcu_data_r)) diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index db79e533abf..cb04e939cfb 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -1062,7 +1062,7 @@ static SLOT_INTERFACE_START(apollo_isa_cards) SLOT_INTERFACE("3c505", ISA16_3C505) // 3Com 3C505 Ethernet card SLOT_INTERFACE_END -MACHINE_CONFIG_FRAGMENT( common ) +MACHINE_CONFIG_START( common ) // configuration MUST be reset first ! MCFG_DEVICE_ADD(APOLLO_CONF_TAG, APOLLO_CONF, 0) @@ -1150,7 +1150,7 @@ MACHINE_CONFIG_FRAGMENT( common ) MACHINE_CONFIG_END // for machines with the keyboard and a graphics head -MACHINE_CONFIG_FRAGMENT( apollo ) +MACHINE_CONFIG_START( apollo ) MCFG_FRAGMENT_ADD(common) MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) @@ -1172,7 +1172,7 @@ static DEVICE_INPUT_DEFAULTS_START( apollo_terminal ) DEVICE_INPUT_DEFAULTS_END // for headless machines using a serial console -MACHINE_CONFIG_FRAGMENT( apollo_terminal ) +MACHINE_CONFIG_START( apollo_terminal ) MCFG_FRAGMENT_ADD(common) MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp index 9691e1c9941..18fa981a287 100644 --- a/src/mame/machine/apricotkb.cpp +++ b/src/mame/machine/apricotkb.cpp @@ -67,7 +67,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( apricot_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( apricot_keyboard ) +static MACHINE_CONFIG_START( apricot_keyboard ) #ifdef UPD7507_EMULATED MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz) MCFG_CPU_IO_MAP(apricot_keyboard_io) diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp index 47f7331ca02..8b1a974a9be 100644 --- a/src/mame/machine/asic65.cpp +++ b/src/mame/machine/asic65.cpp @@ -539,7 +539,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( asic65 ) +MACHINE_CONFIG_START( asic65 ) /* ASIC65 */ MCFG_CPU_ADD("asic65cpu", TMS32010, 20000000) diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp index a4287c23ae6..8e45cf2430b 100644 --- a/src/mame/machine/at.cpp +++ b/src/mame/machine/at.cpp @@ -46,14 +46,14 @@ void at_mb_device::device_start() i80286_cpu_device::static_set_a20_callback(*m_maincpu, i80286_cpu_device::a20_cb(&at_mb_device::a20_286, this)); } -MACHINE_CONFIG_FRAGMENT( at_softlists ) +MACHINE_CONFIG_START( at_softlists ) /* software lists */ MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( at_mb ) +static MACHINE_CONFIG_START( at_mb ) MCFG_DEVICE_ADD("pit8254", PIT8254, 0) MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w)) diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp index a965ea9c604..f80b569f539 100644 --- a/src/mame/machine/atarifdc.cpp +++ b/src/mame/machine/atarifdc.cpp @@ -735,7 +735,7 @@ static const floppy_interface atari_floppy_interface = "floppy_5_25" }; -static MACHINE_CONFIG_FRAGMENT( atari_fdc ) +static MACHINE_CONFIG_START( atari_fdc ) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(atari_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index 3b8aa98bc89..065969e5b84 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -904,7 +904,7 @@ atari_eeprom_2804_device::atari_eeprom_2804_device(const machine_config &mconfig // config fragment //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT(atari_eeprom_2804_config) +MACHINE_CONFIG_START(atari_eeprom_2804_config) MCFG_EEPROM_2804_ADD("eeprom") MACHINE_CONFIG_END @@ -929,7 +929,7 @@ atari_eeprom_2816_device::atari_eeprom_2816_device(const machine_config &mconfig // config fragment //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT(atari_eeprom_2816_config) +MACHINE_CONFIG_START(atari_eeprom_2816_config) MCFG_EEPROM_2816_ADD("eeprom") MACHINE_CONFIG_END diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp index 693e4c29488..42b92009bed 100644 --- a/src/mame/machine/beta.cpp +++ b/src/mame/machine/beta.cpp @@ -182,7 +182,7 @@ static SLOT_INTERFACE_START( beta_disk_floppies ) SLOT_INTERFACE( "drive3", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( beta_disk ) +static MACHINE_CONFIG_START( beta_disk ) MCFG_KR1818VG93_ADD("wd179x", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "drive0", beta_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index ccb493c583a..317cb6c6a91 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -26,7 +26,7 @@ two 6809s and as the reset generator for the entire system. #include "machine/c117.h" -static MACHINE_CONFIG_FRAGMENT( namco_c117 ) +static MACHINE_CONFIG_START( namco_c117 ) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END diff --git a/src/mame/machine/cedar_magnet_flop.cpp b/src/mame/machine/cedar_magnet_flop.cpp index a9b0d3a407a..9627968a204 100644 --- a/src/mame/machine/cedar_magnet_flop.cpp +++ b/src/mame/machine/cedar_magnet_flop.cpp @@ -16,7 +16,7 @@ cedar_magnet_flop_device::cedar_magnet_flop_device(const machine_config &mconfig } -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_flop ) +static MACHINE_CONFIG_START( cedar_magnet_flop ) MCFG_NVRAM_ADD_NO_FILL("floppy_nvram") MACHINE_CONFIG_END diff --git a/src/mame/machine/cedar_magnet_plane.cpp b/src/mame/machine/cedar_magnet_plane.cpp index 3d69bb43c5b..1bc1b78804c 100644 --- a/src/mame/machine/cedar_magnet_plane.cpp +++ b/src/mame/machine/cedar_magnet_plane.cpp @@ -69,7 +69,7 @@ WRITE8_MEMBER(cedar_magnet_plane_device::plane_portcf_w) m_cf_data = data; } -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_plane ) +static MACHINE_CONFIG_START( cedar_magnet_plane ) MCFG_CPU_ADD("planecpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_plane_map) MCFG_CPU_IO_MAP(cedar_magnet_plane_io) diff --git a/src/mame/machine/cedar_magnet_sprite.cpp b/src/mame/machine/cedar_magnet_sprite.cpp index ef653288022..939557a6f91 100644 --- a/src/mame/machine/cedar_magnet_sprite.cpp +++ b/src/mame/machine/cedar_magnet_sprite.cpp @@ -199,7 +199,7 @@ WRITE8_MEMBER(cedar_magnet_sprite_device::sprite_port9c_w) // printf("%s:sprite_port9c_w %02x\n", machine().describe_context(), data); } -static MACHINE_CONFIG_FRAGMENT( cedar_magnet_sprite ) +static MACHINE_CONFIG_START( cedar_magnet_sprite ) MCFG_CPU_ADD("spritecpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_sprite_map) MCFG_CPU_IO_MAP(cedar_magnet_sprite_io) diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp index ae4884da194..ac0172b07a1 100644 --- a/src/mame/machine/compiskb.cpp +++ b/src/mame/machine/compiskb.cpp @@ -55,7 +55,7 @@ const tiny_rom_entry *compis_keyboard_device::device_rom_region() const // MACHINE_DRIVER( compis_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( compis_keyboard ) +static MACHINE_CONFIG_START( compis_keyboard ) MCFG_CPU_ADD(I8748_TAG, I8748, 2016000) // XTAL_4_032MHz/2 ??? MCFG_MCS48_PORT_BUS_IN_CB(READ8(compis_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(compis_keyboard_device, bus_w)) diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index 7ef3d210cd3..b7a9f11e1c3 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -83,7 +83,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( cuda ) +static MACHINE_CONFIG_START( cuda ) MCFG_CPU_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control MCFG_CPU_PROGRAM_MAP(cuda_map) MACHINE_CONFIG_END diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index d1c95ed1e5c..f05b41d3d19 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -209,7 +209,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( lk201 ) +static MACHINE_CONFIG_START( lk201 ) MCFG_CPU_ADD(LK201_CPU_TAG, M68HC05EG, XTAL_4MHz) // actually 68HC05C4, clock verified by Lord_Nightmare MCFG_CPU_PROGRAM_MAP(lk201_map) diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index 4f9424cdc84..3c046787b88 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -197,7 +197,7 @@ WRITE8_MEMBER( decocpu_type1_device::solenoid2_w ) // todo } -static MACHINE_CONFIG_FRAGMENT( decocpu1 ) +static MACHINE_CONFIG_START( decocpu1 ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(decocpu1_map) @@ -245,7 +245,7 @@ static MACHINE_CONFIG_FRAGMENT( decocpu1 ) MCFG_NVRAM_ADD_1FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( decocpu2 ) +static MACHINE_CONFIG_START( decocpu2 ) MCFG_FRAGMENT_ADD(decocpu1) /* basic machine hardware */ diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp index f4fca72fc18..2d0e817fa1d 100644 --- a/src/mame/machine/dmv_keyb.cpp +++ b/src/mame/machine/dmv_keyb.cpp @@ -27,7 +27,7 @@ ROM_START( dmv_keyboard ) ROM_END -static MACHINE_CONFIG_FRAGMENT( dmv_keyboard ) +static MACHINE_CONFIG_START( dmv_keyboard ) MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_keyboard_device, port1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(dmv_keyboard_device, port2_r)) diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index 35852a1c8ef..7a52caa50b8 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -82,7 +82,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( egret ) +static MACHINE_CONFIG_START( egret ) MCFG_CPU_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control MCFG_CPU_PROGRAM_MAP(egret_map) MACHINE_CONFIG_END diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp index 7e81ca2705d..beb524aa863 100644 --- a/src/mame/machine/esqlcd.cpp +++ b/src/mame/machine/esqlcd.cpp @@ -13,7 +13,7 @@ DEFINE_DEVICE_TYPE(ESQ2X16_SQ1, esq2x16_sq1_device, "esq2x16_sq1", "Ensoniq 2x16 VFD (SQ-1 variant)") // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(esq2x16) +static MACHINE_CONFIG_START(esq2x16) MCFG_DEFAULT_LAYOUT(layout_esq2by16) MACHINE_CONFIG_END diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp index fe73622a722..5df6d26da71 100644 --- a/src/mame/machine/esqpanel.cpp +++ b/src/mame/machine/esqpanel.cpp @@ -200,7 +200,7 @@ void esqpanel_device::set_analog_value(offs_t offset, uint16_t value) /* panel with 1x22 VFD display used in the EPS-16 and EPS-16 Plus */ -static MACHINE_CONFIG_FRAGMENT(esqpanel1x22) +static MACHINE_CONFIG_START(esqpanel1x22) MCFG_ESQ1X22_ADD("vfd") MACHINE_CONFIG_END @@ -218,7 +218,7 @@ esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const ch /* panel with 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */ -static MACHINE_CONFIG_FRAGMENT(esqpanel2x40) +static MACHINE_CONFIG_START(esqpanel2x40) MCFG_ESQ2X40_ADD("vfd") MACHINE_CONFIG_END @@ -235,7 +235,7 @@ esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const ch } // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT(esqpanel2x16_sq1) +static MACHINE_CONFIG_START(esqpanel2x16_sq1) MCFG_ESQ2X16_SQ1_ADD("vfd") MACHINE_CONFIG_END // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index 06b8a4b3073..88038c8af54 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -191,7 +191,7 @@ void esqvfd_device::update_display() /* 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */ -static MACHINE_CONFIG_FRAGMENT(esq2x40) +static MACHINE_CONFIG_START(esq2x40) MCFG_DEFAULT_LAYOUT(layout_esq2by40) MACHINE_CONFIG_END @@ -291,7 +291,7 @@ esq2x40_device::esq2x40_device(const machine_config &mconfig, const char *tag, d /* 1x22 display from the VFX (not right, but it'll do for now) */ -static MACHINE_CONFIG_FRAGMENT(esq1x22) +static MACHINE_CONFIG_START(esq1x22) MCFG_DEFAULT_LAYOUT(layout_esq1by22) MACHINE_CONFIG_END diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp index 0322e35f971..fad813d653b 100644 --- a/src/mame/machine/genpin.cpp +++ b/src/mame/machine/genpin.cpp @@ -11,7 +11,7 @@ This is for common pinball machine coding. #include "speaker.h" -MACHINE_CONFIG_FRAGMENT( genpin_audio ) +MACHINE_CONFIG_START( genpin_audio ) MCFG_SPEAKER_STANDARD_MONO("mechvol") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/machine/hec2hrp.cpp b/src/mame/machine/hec2hrp.cpp index 14b0affeaa1..245f92c1417 100644 --- a/src/mame/machine/hec2hrp.cpp +++ b/src/mame/machine/hec2hrp.cpp @@ -803,7 +803,7 @@ static DISCRETE_SOUND_START( hec2hrp ) DISCRETE_OUTPUT(NODE_01, 5000) DISCRETE_SOUND_END -MACHINE_CONFIG_FRAGMENT( hector_audio ) +MACHINE_CONFIG_START( hector_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(0, "mono", 0.25) /* Sound level for cassette, as it is in mono => output channel=0*/ diff --git a/src/mame/machine/hng64_net.cpp b/src/mame/machine/hng64_net.cpp index 13f0628585d..295543d7a5f 100644 --- a/src/mame/machine/hng64_net.cpp +++ b/src/mame/machine/hng64_net.cpp @@ -140,7 +140,7 @@ void hng64_state::reset_net() m_mmub[5] = 0; // rolls back to 0xffff } -MACHINE_CONFIG_FRAGMENT( hng64_network ) +MACHINE_CONFIG_START( hng64_network ) MCFG_CPU_ADD("network", KL5C80A12, HNG64_MASTER_CLOCK / 4) /* KL5C80A12CFP - binary compatible with Z80. */ MCFG_CPU_PROGRAM_MAP(hng_comm_map) MCFG_CPU_IO_MAP(hng_comm_io_map) diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp index 732627f7eb1..f5b77cdf7e1 100644 --- a/src/mame/machine/ibm6580_fdc.cpp +++ b/src/mame/machine/ibm6580_fdc.cpp @@ -32,7 +32,7 @@ const tiny_rom_entry *dw_fdc_device::device_rom_region() const return ROM_NAME( dw_fdc ); } -static MACHINE_CONFIG_FRAGMENT( dw_fdc ) +static MACHINE_CONFIG_START( dw_fdc ) MCFG_CPU_ADD("mcu", I8048, XTAL_24MHz/4) // divisor is unverified // MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_fdc_device, bus_r)) // MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_fdc_device, bus_w)) diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp index 950a7d34695..73f9b6d7519 100644 --- a/src/mame/machine/ibm6580_kbd.cpp +++ b/src/mame/machine/ibm6580_kbd.cpp @@ -32,7 +32,7 @@ const tiny_rom_entry *dw_keyboard_device::device_rom_region() const return ROM_NAME( dw_keyboard ); } -static MACHINE_CONFIG_FRAGMENT( dw_keyboard ) +static MACHINE_CONFIG_START( dw_keyboard ) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) // XXX RC oscillator MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_keyboard_device, bus_w)) diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index 19087400189..49f73bc020a 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -207,7 +207,7 @@ ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( inder_sb ) +static MACHINE_CONFIG_START( inder_sb ) MCFG_CPU_ADD("audiocpu", Z80, 8000000) // unk freq MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(sound_map) diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp index bc3b7d3d97f..78262161f18 100644 --- a/src/mame/machine/inder_vid.cpp +++ b/src/mame/machine/inder_vid.cpp @@ -88,7 +88,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, inder_vid_device ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( inder_vid ) +static MACHINE_CONFIG_START( inder_vid ) MCFG_CPU_ADD("tms", TMS34010, XTAL_40MHz) MCFG_CPU_PROGRAM_MAP(megaphx_tms_map) MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */ diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp index f7f21f80c9f..82f90e2d0d8 100644 --- a/src/mame/machine/isbc_208.cpp +++ b/src/mame/machine/isbc_208.cpp @@ -28,7 +28,7 @@ static SLOT_INTERFACE_START( isbc_208_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_FRAGMENT( isbc_208 ) +static MACHINE_CONFIG_START( isbc_208 ) MCFG_DEVICE_ADD("dmac", AM9517A, XTAL_8MHz/4) MCFG_I8237_OUT_HREQ_CB(WRITELINE(isbc_208_device, hreq_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(isbc_208_device, out_eop_w)) diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp index 8d69ad6b53f..93fada6486f 100644 --- a/src/mame/machine/isbc_215g.cpp +++ b/src/mame/machine/isbc_215g.cpp @@ -350,7 +350,7 @@ WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_11_w) m_isbx_irq[3] = state ? true : false; } -static MACHINE_CONFIG_FRAGMENT( isbc_215g ) +static MACHINE_CONFIG_START( isbc_215g ) MCFG_CPU_ADD("u84", I8089, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(isbc_215g_mem) MCFG_CPU_IO_MAP(isbc_215g_io) diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 416ea1cfc90..bdaa6c2f4bd 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(ITEAGLE_FPGA, iteagle_fpga_device, "iteagle_fpga", "ITEagle FPGA") -MACHINE_CONFIG_FRAGMENT(iteagle_fpga) +MACHINE_CONFIG_START(iteagle_fpga) MCFG_NVRAM_ADD_0FILL("eagle2_rtc") // RS232 serial ports // The console terminal (com1) operates at 38400 baud @@ -615,7 +615,7 @@ DEVICE_ADDRESS_MAP_START(eeprom_map, 32, iteagle_eeprom_device) AM_RANGE(0x0000, 0x000F) AM_READWRITE(eeprom_r, eeprom_w) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( iteagle_eeprom ) +MACHINE_CONFIG_START( iteagle_eeprom ) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END @@ -734,7 +734,7 @@ WRITE32_MEMBER( iteagle_eeprom_device::eeprom_w ) // Attached Peripheral Controller //************************************ -MACHINE_CONFIG_FRAGMENT(eagle1) +MACHINE_CONFIG_START(eagle1) MCFG_NVRAM_ADD_0FILL("eagle1_rtc") MACHINE_CONFIG_END diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp index 586626a0376..ca1d9ff0dea 100644 --- a/src/mame/machine/jvs13551.cpp +++ b/src/mame/machine/jvs13551.cpp @@ -25,7 +25,7 @@ static INPUT_PORTS_START(sega_837_13551_coins) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, sega_837_13551_device, jvs13551_coin_2_w) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT(sega_837_13551) +MACHINE_CONFIG_START(sega_837_13551) MCFG_CPU_ADD("iomcu", TMP90PH44, 10000000) // unknown clock MACHINE_CONFIG_END diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp index e0ad9e5f590..52e481a930b 100644 --- a/src/mame/machine/k573cass.cpp +++ b/src/mame/machine/k573cass.cpp @@ -76,7 +76,7 @@ konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &m { } -static MACHINE_CONFIG_FRAGMENT( cassx ) +static MACHINE_CONFIG_START( cassx ) MCFG_X76F041_ADD( "eeprom" ) MACHINE_CONFIG_END @@ -125,7 +125,7 @@ konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config { } -static MACHINE_CONFIG_FRAGMENT( cassxi ) +static MACHINE_CONFIG_START( cassxi ) MCFG_X76F041_ADD( "eeprom" ) MCFG_DS2401_ADD( "id" ) MCFG_DEVICE_ADD( "adc0838", ADC0838, 0 ) @@ -198,7 +198,7 @@ konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &m { } -static MACHINE_CONFIG_FRAGMENT( cassy ) +static MACHINE_CONFIG_START( cassy ) MCFG_X76F100_ADD( "eeprom" ) MACHINE_CONFIG_END @@ -279,7 +279,7 @@ konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config { } -static MACHINE_CONFIG_FRAGMENT( cassyi ) +static MACHINE_CONFIG_START( cassyi ) MCFG_X76F100_ADD( "eeprom" ) MCFG_DS2401_ADD( "id" ) MACHINE_CONFIG_END @@ -312,7 +312,7 @@ konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config { } -static MACHINE_CONFIG_FRAGMENT( casszi ) +static MACHINE_CONFIG_START( casszi ) MCFG_DS2401_ADD( "id" ) MCFG_ZS01_ADD( "eeprom" ) MCFG_ZS01_DS2401( "id" ) diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 5df5bcfd84e..40ab1fcebc9 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -100,7 +100,7 @@ DEVICE_ADDRESS_MAP_START(amap, 16, k573dio_device) AM_RANGE(0xfe, 0xff) AM_WRITE(output_2_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( k573dio ) +static MACHINE_CONFIG_START( k573dio ) MCFG_MAS3507D_ADD( "mpeg" ) MCFG_DS2401_ADD( "digital_id" ) MACHINE_CONFIG_END diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp index a58e3c5d220..854fc6233dc 100644 --- a/src/mame/machine/k7659kb.cpp +++ b/src/mame/machine/k7659kb.cpp @@ -62,7 +62,7 @@ const tiny_rom_entry *k7659_keyboard_device::device_rom_region() const // MACHINE_DRIVER( k7659_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( k7659_keyboard ) +static MACHINE_CONFIG_START( k7659_keyboard ) MACHINE_CONFIG_END diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp index 6b144f5b4e2..9696bc9f0cb 100644 --- a/src/mame/machine/km035.cpp +++ b/src/mame/machine/km035.cpp @@ -53,7 +53,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( km035 ) +static MACHINE_CONFIG_START( km035 ) MCFG_CPU_ADD(KM035_CPU_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(km035_map) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(km035_device, bus_w)) diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp index c078bac817e..3d75e1ffe57 100644 --- a/src/mame/machine/m1comm.cpp +++ b/src/mame/machine/m1comm.cpp @@ -81,7 +81,7 @@ static ADDRESS_MAP_START( m1comm_io, AS_IO, 8, m1comm_device ) AM_RANGE(0xff, 0xff) AM_RAM ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( m1comm ) +MACHINE_CONFIG_START( m1comm ) MCFG_CPU_ADD(Z80_TAG, Z80, 8000000) /* 32 MHz / 4 */ MCFG_CPU_PROGRAM_MAP(m1comm_mem) MCFG_CPU_IO_MAP(m1comm_io) diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp index 891128bf1ad..73e3fc54923 100644 --- a/src/mame/machine/m20_8086.cpp +++ b/src/mame/machine/m20_8086.cpp @@ -55,7 +55,7 @@ static ADDRESS_MAP_START(i86_io, AS_IO, 16, m20_8086_device) AM_RANGE(0x7ffa, 0x7ffd) AM_WRITE(handshake_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( m20_8086 ) +static MACHINE_CONFIG_START( m20_8086 ) MCFG_CPU_ADD("8086", I8086, XTAL_24MHz/3) MCFG_CPU_PROGRAM_MAP(i86_prog) MCFG_CPU_IO_MAP(i86_io) diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp index 835d1216e2e..4811e3abc69 100644 --- a/src/mame/machine/m24_kbd.cpp +++ b/src/mame/machine/m24_kbd.cpp @@ -16,7 +16,7 @@ const tiny_rom_entry *m24_keyboard_device::device_rom_region() const return ROM_NAME( m24_keyboard ); } -static MACHINE_CONFIG_FRAGMENT( m24_keyboard ) +static MACHINE_CONFIG_START( m24_keyboard ) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(m24_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(m24_keyboard_device, p1_r)) diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp index 2edf10fe7c0..6cacac0ab24 100644 --- a/src/mame/machine/m24_z8000.cpp +++ b/src/mame/machine/m24_z8000.cpp @@ -63,7 +63,7 @@ static ADDRESS_MAP_START(z8000_io, AS_IO, 16, m24_z8000_device) AM_RANGE(0x8000, 0x83ff) AM_READWRITE(i86_io_r, i86_io_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( m24_z8000 ) +static MACHINE_CONFIG_START( m24_z8000 ) MCFG_CPU_ADD("z8000", Z8001, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(z8000_prog) MCFG_CPU_DATA_MAP(z8000_data) diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 3285e9a7dff..ee14ad4453f 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -171,7 +171,7 @@ Sega PC BD MODEL2 C-CRX COMMUNICATION 837-12839 #define VERBOSE 0 #include "logmacro.h" -MACHINE_CONFIG_FRAGMENT( m2comm ) +MACHINE_CONFIG_START( m2comm ) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp index 7017e16928a..44d64246d84 100644 --- a/src/mame/machine/m3comm.cpp +++ b/src/mame/machine/m3comm.cpp @@ -103,7 +103,7 @@ static ADDRESS_MAP_START( m3comm_mem, AS_PROGRAM, 16, m3comm_device ) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( m3comm ) +MACHINE_CONFIG_START( m3comm ) MCFG_CPU_ADD(M68K_TAG, M68000, 10000000) // random MCFG_CPU_PROGRAM_MAP(m3comm_mem) diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp index d6f35dbc6aa..43346bfd694 100644 --- a/src/mame/machine/mackbd.cpp +++ b/src/mame/machine/mackbd.cpp @@ -91,7 +91,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mackbd ) +static MACHINE_CONFIG_START( mackbd ) MCFG_CPU_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz" MCFG_CPU_PROGRAM_MAP(mackbd_map) MCFG_CPU_IO_MAP(mackbd_io_map) diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp index 5969e929393..5ec304d8fd8 100644 --- a/src/mame/machine/mega32x.cpp +++ b/src/mame/machine/mega32x.cpp @@ -1771,7 +1771,7 @@ const rom_entry *sega_32x_device::device_rom_region() const #define _32X_INTERLEAVE_LEVEL \ MCFG_QUANTUM_TIME(attotime::from_hz(1800000)) -static MACHINE_CONFIG_FRAGMENT( _32x_ntsc ) +static MACHINE_CONFIG_START( _32x_ntsc ) #ifndef _32X_SWAP_MASTER_SLAVE_HACK MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 ) @@ -1801,7 +1801,7 @@ static MACHINE_CONFIG_FRAGMENT( _32x_ntsc ) _32X_INTERLEAVE_LEVEL MACHINE_CONFIG_END -static MACHINE_CONFIG_FRAGMENT( _32x_pal ) +static MACHINE_CONFIG_START( _32x_pal ) #ifndef _32X_SWAP_MASTER_SLAVE_HACK MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 ) diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index dbb7665468a..c3c8fca02eb 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -285,7 +285,7 @@ static GFXDECODE_START( segacd ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( segacd_fragment ) +static MACHINE_CONFIG_START( segacd_fragment ) MCFG_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */ MCFG_CPU_PROGRAM_MAP(segacd_map) diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp index 7714e7d83ac..156fa98132c 100644 --- a/src/mame/machine/megacdcd.cpp +++ b/src/mame/machine/megacdcd.cpp @@ -1186,7 +1186,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( lc89510_temp_device::segacd_access_timer_callback -static MACHINE_CONFIG_FRAGMENT( lc89510_temp_fragment ) +static MACHINE_CONFIG_START( lc89510_temp_fragment ) MCFG_TIMER_DRIVER_ADD_PERIODIC("hock_timer", lc89510_temp_device, segacd_access_timer_callback, attotime::from_hz(75)) MCFG_SOUND_ADD( "cdda", CDDA, 0 ) diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index ec74ab33c5f..6c262a0a04a 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -886,12 +886,12 @@ IRQ_CALLBACK_MEMBER(md_base_state::genesis_int_callback) return (0x60+irqline*4)/4; // vector address } -MACHINE_CONFIG_FRAGMENT( megadriv_timers ) +MACHINE_CONFIG_START( megadriv_timers ) MCFG_TIMER_DEVICE_ADD("md_scan_timer", "gen_vdp", sega315_5313_device, megadriv_scanline_timer_callback) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( md_ntsc ) +MACHINE_CONFIG_START( md_ntsc ) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(megadriv_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) @@ -940,7 +940,7 @@ MACHINE_CONFIG_END /************ PAL hardware has a different master clock *************/ -MACHINE_CONFIG_FRAGMENT( md_pal ) +MACHINE_CONFIG_START( md_pal ) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(megadriv_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index 90268b9ec0d..15fc63ff119 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -249,7 +249,7 @@ WRITE8_MEMBER(midway_serial_pic_emu_device::write_c) // printf("%s: write_c %02x\n", space.machine().describe_context(), data); } -static MACHINE_CONFIG_FRAGMENT( midway_pic ) +static MACHINE_CONFIG_START( midway_pic ) MCFG_CPU_ADD("pic", PIC16C57, 12000000) /* ? Mhz */ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(midway_serial_pic_emu_device, write_a)) MCFG_PIC16C5x_READ_B_CB(READ8(midway_serial_pic_emu_device, read_b)) diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp index 6f020a7a2d2..7dd5cd450be 100644 --- a/src/mame/machine/mie.cpp +++ b/src/mame/machine/mie.cpp @@ -53,7 +53,7 @@ static ADDRESS_MAP_START( mie_port, AS_IO, 8, mie_device) AM_RANGE(0x91, 0x91) AM_READ(jvs_sense_r) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( mie ) +static MACHINE_CONFIG_START( mie ) MCFG_CPU_ADD("mie", Z80, DERIVED_CLOCK(1,1)) MCFG_CPU_PROGRAM_MAP(mie_map) MCFG_CPU_IO_MAP(mie_port) diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp index 4db233d9ea3..05f7f788764 100644 --- a/src/mame/machine/mm1kb.cpp +++ b/src/mame/machine/mm1kb.cpp @@ -57,7 +57,7 @@ bool mm1_keyoard_device::first_time = true; // MACHINE_DRIVER( mm1_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( mm1_keyboard ) +static MACHINE_CONFIG_START( mm1_keyboard ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("keyboard_and_chassis_sounds", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(2) diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp index 601643727eb..11be5b167e8 100644 --- a/src/mame/machine/ms7004.cpp +++ b/src/mame/machine/ms7004.cpp @@ -55,7 +55,7 @@ ADDRESS_MAP_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( ms7004 ) +static MACHINE_CONFIG_START( ms7004 ) MCFG_CPU_ADD(MS7004_CPU_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(ms7004_map) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ms7004_device, p1_w)) diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp index ae9f97338bd..13d7cd95d59 100644 --- a/src/mame/machine/namco50.cpp +++ b/src/mame/machine/namco50.cpp @@ -225,7 +225,7 @@ static ADDRESS_MAP_START( namco_50xx_map_io, AS_IO, 8, namco_50xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_50xx ) +static MACHINE_CONFIG_START( namco_50xx ) MCFG_CPU_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_50xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp index 9b0e0c9e285..8cf5e506898 100644 --- a/src/mame/machine/namco51.cpp +++ b/src/mame/machine/namco51.cpp @@ -329,7 +329,7 @@ static ADDRESS_MAP_START( namco_51xx_map_io, AS_IO, 8, namco_51xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_51xx ) +static MACHINE_CONFIG_START( namco_51xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_51xx_map_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp index 1b183a614a9..52319e0302f 100644 --- a/src/mame/machine/namco53.cpp +++ b/src/mame/machine/namco53.cpp @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( namco_53xx_map_io, AS_IO, 8,namco_53xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_53xx ) +static MACHINE_CONFIG_START( namco_53xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_CPU_IO_MAP(namco_53xx_map_io) MACHINE_CONFIG_END diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp index 680b1223f37..34876c9faac 100644 --- a/src/mame/machine/namco62.cpp +++ b/src/mame/machine/namco62.cpp @@ -30,7 +30,7 @@ static ADDRESS_MAP_START( namco_62xx_map_io, AS_IO, 8, namco_62xx_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( namco_62xx ) +static MACHINE_CONFIG_START( namco_62xx ) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 (TODO: Correct?) */ MCFG_CPU_IO_MAP(namco_62xx_map_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index e6d1e1198f2..b91f5101229 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -200,7 +200,7 @@ uint16_t naomi_m2_board::read_callback(uint32_t addr) } } -static MACHINE_CONFIG_FRAGMENT( naomim2 ) +static MACHINE_CONFIG_START( naomim2 ) MCFG_DEVICE_ADD("segam2crypt", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(naomi_m2_board, read_callback) MACHINE_CONFIG_END diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp index 84199d34ef1..7adedf9d279 100644 --- a/src/mame/machine/nmk004.cpp +++ b/src/mame/machine/nmk004.cpp @@ -81,7 +81,7 @@ static ADDRESS_MAP_START( nmk004_sound_io_map, AS_IO, 8, nmk004_device ) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( nmk004 ) +static MACHINE_CONFIG_START( nmk004 ) MCFG_CPU_ADD("mcu",TMP90840, DERIVED_CLOCK(1,1)) // Toshiba TMP90C840AF in QFP64 package with 8Kbyte internal ROM MCFG_CPU_PROGRAM_MAP(nmk004_sound_mem_map) MCFG_CPU_IO_MAP(nmk004_sound_io_map) diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp index 9b806435ab9..35c9a21a35f 100644 --- a/src/mame/machine/pc1512kb.cpp +++ b/src/mame/machine/pc1512kb.cpp @@ -50,7 +50,7 @@ const tiny_rom_entry *pc1512_keyboard_device::device_rom_region() const // MACHINE_DRIVER( pc1512_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( pc1512_keyboard ) +static MACHINE_CONFIG_START( pc1512_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_6MHz) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_device, kb_bus_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/pc9801_118.cpp b/src/mame/machine/pc9801_118.cpp index 2d2b9a015cd..fec79eedb75 100644 --- a/src/mame/machine/pc9801_118.cpp +++ b/src/mame/machine/pc9801_118.cpp @@ -46,7 +46,7 @@ WRITE_LINE_MEMBER(pc9801_118_device::pc9801_sound_irq) machine().device(":pic8259_slave")->ir4_w(state); } -static MACHINE_CONFIG_FRAGMENT( pc9801_118_config ) +static MACHINE_CONFIG_START( pc9801_118_config ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("opn3", YM2608, MAIN_CLOCK_X2*4) // actually YMF288, unknown clock / divider, might be X1 x 5 actually MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_118_device, pc9801_sound_irq)) diff --git a/src/mame/machine/pc9801_26.cpp b/src/mame/machine/pc9801_26.cpp index 5992a2daa7e..f6881285f9b 100644 --- a/src/mame/machine/pc9801_26.cpp +++ b/src/mame/machine/pc9801_26.cpp @@ -46,7 +46,7 @@ WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq) machine().device(":pic8259_slave")->ir4_w(state); } -static MACHINE_CONFIG_FRAGMENT( pc9801_26_config ) +static MACHINE_CONFIG_START( pc9801_26_config ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("opn", YM2203, MAIN_CLOCK_X1*2) // unknown clock / divider MCFG_YM2203_IRQ_HANDLER(WRITELINE(pc9801_26_device, pc9801_sound_irq)) diff --git a/src/mame/machine/pc9801_86.cpp b/src/mame/machine/pc9801_86.cpp index f94b6476c4b..cc5f5436dfd 100644 --- a/src/mame/machine/pc9801_86.cpp +++ b/src/mame/machine/pc9801_86.cpp @@ -48,7 +48,7 @@ WRITE_LINE_MEMBER(pc9801_86_device::sound_irq) machine().device(":pic8259_slave")->ir4_w(state || (m_pcmirq ? ASSERT_LINE : CLEAR_LINE)); } -static MACHINE_CONFIG_FRAGMENT( pc9801_86_config ) +static MACHINE_CONFIG_START( pc9801_86_config ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_86_device, sound_irq)) diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp index 41e1152e3e7..9b20689c4cc 100644 --- a/src/mame/machine/pcd_kbd.cpp +++ b/src/mame/machine/pcd_kbd.cpp @@ -26,7 +26,7 @@ static ADDRESS_MAP_START( pcd_keyboard_map, AS_PROGRAM, 8, pcd_keyboard_device ) AM_RANGE(0x000, 0xfff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( pcd_keyboard ) +static MACHINE_CONFIG_START( pcd_keyboard ) MCFG_CPU_ADD("mcu", I8035, 5760000*2) // FIXME: the mc2661 baud rate calculation MCFG_CPU_PROGRAM_MAP(pcd_keyboard_map) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pcd_keyboard_device, bus_r)) diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 8226802c2b3..81086e5d91b 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -241,7 +241,7 @@ void pce_cd_device::nvram_init(nvram_device &nvram, void *data, size_t size) } // TODO: left and right speaker tags should be passed from the parent config, instead of using the hard-coded ones below!?! -static MACHINE_CONFIG_FRAGMENT( pce_cd ) +static MACHINE_CONFIG_START( pce_cd ) MCFG_NVRAM_ADD_CUSTOM_DRIVER("bram", pce_cd_device, nvram_init) MCFG_CDROM_ADD("cdrom") diff --git a/src/mame/machine/pcshare.cpp b/src/mame/machine/pcshare.cpp index 73e1a14cbbd..c3dbd67e46c 100644 --- a/src/mame/machine/pcshare.cpp +++ b/src/mame/machine/pcshare.cpp @@ -135,7 +135,7 @@ ADDRESS_MAP_START( pcat32_io_common, AS_IO, 32, pcat_base_state ) AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE8("dma8237_2", am9517a_device, read, write, 0x00ff00ff) ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT(pcat_common) +MACHINE_CONFIG_START(pcat_common) MCFG_PIC8259_ADD( "pic8259_1", INPUTLINE("maincpu", 0), VCC, READ8(pcat_base_state, get_slave_ack) ) MCFG_PIC8259_ADD( "pic8259_2", DEVWRITELINE("pic8259_1", pic8259_device, ir2_w), GND, NOOP) MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 ) diff --git a/src/mame/machine/rx01.cpp b/src/mame/machine/rx01.cpp index f202793cf12..7aee467ef9a 100644 --- a/src/mame/machine/rx01.cpp +++ b/src/mame/machine/rx01.cpp @@ -34,7 +34,7 @@ static const floppy_interface rx01_floppy_interface = }; -MACHINE_CONFIG_FRAGMENT( rx01 ) +MACHINE_CONFIG_START( rx01 ) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(rx01_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mame/machine/s32comm.cpp b/src/mame/machine/s32comm.cpp index 66f55286f01..db4ff3d3f11 100644 --- a/src/mame/machine/s32comm.cpp +++ b/src/mame/machine/s32comm.cpp @@ -73,7 +73,7 @@ Sega System Multi32 Comm PCB 837-8792-91 #define VERBOSE 0 #include "logmacro.h" -MACHINE_CONFIG_FRAGMENT( s32comm ) +MACHINE_CONFIG_START( s32comm ) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index ef83a14aaf1..e57830d80c3 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -106,7 +106,7 @@ READ8_MEMBER(st0016_cpu_device::soundram_read) } /* CPU interface */ -static MACHINE_CONFIG_FRAGMENT( st0016_cpu ) +static MACHINE_CONFIG_START( st0016_cpu ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_PALETTE_ADD("palette", 16*16*4+1) diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp index 176dbe899b2..722759b5401 100644 --- a/src/mame/machine/taito68705interface.cpp +++ b/src/mame/machine/taito68705interface.cpp @@ -47,14 +47,14 @@ namespace { -MACHINE_CONFIG_FRAGMENT( taito68705 ) +MACHINE_CONFIG_START( taito68705 ) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTC_R_CB(READ8(taito68705_mcu_device, mcu_portc_r)) MCFG_M68705_PORTA_W_CB(WRITE8(taito68705_mcu_device, mcu_pa_w)) MCFG_M68705_PORTB_W_CB(WRITE8(taito68705_mcu_device, mcu_portb_w)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( arkanoid_68705p3 ) +MACHINE_CONFIG_START( arkanoid_68705p3 ) MCFG_CPU_ADD("mcu", M68705P3, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTB_R_CB(READ8(arkanoid_mcu_device_base, mcu_pb_r)) MCFG_M68705_PORTC_R_CB(READ8(arkanoid_mcu_device_base, mcu_pc_r)) @@ -62,7 +62,7 @@ MACHINE_CONFIG_FRAGMENT( arkanoid_68705p3 ) MCFG_M68705_PORTC_W_CB(WRITE8(arkanoid_mcu_device_base, mcu_pc_w)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( arkanoid_68705p5 ) +MACHINE_CONFIG_START( arkanoid_68705p5 ) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTB_R_CB(READ8(arkanoid_mcu_device_base, mcu_pb_r)) MCFG_M68705_PORTC_R_CB(READ8(arkanoid_mcu_device_base, mcu_pc_r)) diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index aa3b1940af7..0e62cacda02 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -48,7 +48,7 @@ Newer version of the I/O chip ? #include "machine/taitoio.h" -MACHINE_CONFIG_FRAGMENT( taitoio ) +MACHINE_CONFIG_START( taitoio ) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp index 395fd26c09b..35866e844f0 100644 --- a/src/mame/machine/tandy2kb.cpp +++ b/src/mame/machine/tandy2kb.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *tandy2k_keyboard_device::device_rom_region() const // MACHINE_DRIVER( tandy2k_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( tandy2k_keyboard ) +static MACHINE_CONFIG_START( tandy2k_keyboard ) MCFG_CPU_ADD(I8048_TAG, I8048, 1000000) // ? MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p1_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p2_w)) diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp index 0f55b706630..9de48e9ee5b 100644 --- a/src/mame/machine/teleprinter.cpp +++ b/src/mame/machine/teleprinter.cpp @@ -211,7 +211,7 @@ uint32_t teleprinter_device::tp_update(screen_device &device, bitmap_rgb32 &bitm /*************************************************************************** VIDEO HARDWARE ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( generic_teleprinter ) +MACHINE_CONFIG_START( generic_teleprinter ) MCFG_SCREEN_ADD(TELEPRINTER_SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 649a0b96789..7f8a1e62a96 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -607,7 +607,7 @@ to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char { } -static MACHINE_CONFIG_FRAGMENT( to7_io_line ) +static MACHINE_CONFIG_START( to7_io_line ) /// THIS PIO is part of CC 90-232 expansion MCFG_DEVICE_ADD(THOM_PIA_IO, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(to7_io_line_device, porta_in)) diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp index 40dabc57d11..d6dd379879b 100644 --- a/src/mame/machine/trs80m2kb.cpp +++ b/src/mame/machine/trs80m2kb.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *trs80m2_keyboard_device::device_rom_region() const // MACHINE_DRIVER( trs80m2_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( trs80m2_keyboard ) +static MACHINE_CONFIG_START( trs80m2_keyboard ) MCFG_CPU_ADD(I8021_TAG, I8021, 3000000) // 1000uH inductor connected across the XTAL inputs MCFG_MCS48_PORT_T1_IN_CB(READLINE(trs80m2_keyboard_device, kb_t1_r)) MCFG_MCS48_PORT_BUS_IN_CB(READ8(trs80m2_keyboard_device, kb_p0_r)) diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp index dab6e0bf902..d60678c9b14 100644 --- a/src/mame/machine/v1050kb.cpp +++ b/src/mame/machine/v1050kb.cpp @@ -72,7 +72,7 @@ DISCRETE_SOUND_END // MACHINE_DRIVER( v1050_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( v1050_keyboard ) +static MACHINE_CONFIG_START( v1050_keyboard ) MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_4_608MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(v1050_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(v1050_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index 53f78ad57f7..fd97ccc7f09 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -155,10 +155,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( victor_9000_fdc ) +// MACHINE_CONFIG_START( victor_9000_fdc ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( victor_9000_fdc ) +static MACHINE_CONFIG_START( victor_9000_fdc ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_30MHz/6) MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_device, floppy_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p1_w)) diff --git a/src/mame/machine/victor9k_kb.cpp b/src/mame/machine/victor9k_kb.cpp index 291cab8d8ec..534b4cd271a 100644 --- a/src/mame/machine/victor9k_kb.cpp +++ b/src/mame/machine/victor9k_kb.cpp @@ -380,7 +380,7 @@ const tiny_rom_entry *victor_9000_keyboard_device::device_rom_region() const // MACHINE_DRIVER( victor9k_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( victor9k_keyboard ) +static MACHINE_CONFIG_START( victor9k_keyboard ) MCFG_CPU_ADD(I8021_TAG, I8021, XTAL_3_579545MHz) // P0 is unconnected on pcb MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_device, kb_p1_r)) diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp index d5567615b7a..42ee9200859 100644 --- a/src/mame/machine/wangpckb.cpp +++ b/src/mame/machine/wangpckb.cpp @@ -112,7 +112,7 @@ ADDRESS_MAP_END // MACHINE_DRIVER( wangpc_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( wangpc_keyboard ) +static MACHINE_CONFIG_START( wangpc_keyboard ) MCFG_CPU_ADD(I8051_TAG, I8051, XTAL_4MHz) MCFG_CPU_IO_MAP(wangpc_keyboard_io) MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_device, mcs51_tx_callback)) diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp index 22f9f9d6823..1377ea38a5e 100644 --- a/src/mame/machine/x820kb.cpp +++ b/src/mame/machine/x820kb.cpp @@ -84,7 +84,7 @@ const tiny_rom_entry *xerox_820_keyboard_device::device_rom_region() const // MACHINE_DRIVER( xerox_820_keyboard ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( xerox_820_keyboard ) +static MACHINE_CONFIG_START( xerox_820_keyboard ) MCFG_CPU_ADD(I8748_TAG, I8048, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index 25462638f47..f330b602403 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -682,7 +682,7 @@ DEVICE_ADDRESS_MAP_START(mcpx_ide_io, 32, mcpx_ide_device) AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT(mcpx_ide) +static MACHINE_CONFIG_START(mcpx_ide) MCFG_DEVICE_ADD("ide", BUS_MASTER_IDE_CONTROLLER, 0) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(mcpx_ide_device, ide_interrupt)) MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE("maincpu", AS_PROGRAM) diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp index f552c3014e7..b9c95958b50 100644 --- a/src/mame/machine/zorbakbd.cpp +++ b/src/mame/machine/zorbakbd.cpp @@ -237,7 +237,7 @@ INPUT_PORTS_START(zorba_keyboard) INPUT_PORTS_END -MACHINE_CONFIG_FRAGMENT(zorba_keyboard) +MACHINE_CONFIG_START(zorba_keyboard) // MC68705P3S MCFG_CPU_ADD("mcu", M68705P3, XTAL_3_579545MHz) MCFG_M68705_PORTA_R_CB(READ8(zorba_keyboard_device, mcu_pa_r)); diff --git a/src/mame/video/20pacgal.cpp b/src/mame/video/20pacgal.cpp index 142b9aea817..d0c0f6b50c0 100644 --- a/src/mame/video/20pacgal.cpp +++ b/src/mame/video/20pacgal.cpp @@ -428,7 +428,7 @@ uint32_t _20pacgal_state::screen_update_20pacgal(screen_device &screen, bitmap_r * *************************************/ -MACHINE_CONFIG_FRAGMENT( 20pacgal_video ) +MACHINE_CONFIG_START( 20pacgal_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index eb87ffe6acb..b00287e68ae 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -710,7 +710,7 @@ uint32_t asr733_device::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -static MACHINE_CONFIG_FRAGMENT( asr733 ) +static MACHINE_CONFIG_START( asr733 ) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(asr733_device, asr733) diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index ed17d6a32a6..9899ffde3a4 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -798,7 +798,7 @@ INPUT_PORTS_START( vdt911 ) PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(not on US keyboard)") PORT_CODE(KEYCODE_PLUS_PAD) INPUT_PORTS_END -static MACHINE_CONFIG_FRAGMENT( vdt911 ) +static MACHINE_CONFIG_START( vdt911 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index 93f37116251..edb726f9dcd 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -188,10 +188,10 @@ MC6845_ON_UPDATE_ADDR_CHANGED( abc1600_mover_device::crtc_update ) } //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc1600_mover ) +// MACHINE_CONFIG_START( abc1600_mover ) //------------------------------------------------- -static MACHINE_CONFIG_FRAGMENT( abc1600_mover ) +static MACHINE_CONFIG_START( abc1600_mover ) MCFG_DEFAULT_LAYOUT(layout_abc1600) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp index d1ba7f3be0e..e84ca90c5cf 100644 --- a/src/mame/video/abc80.cpp +++ b/src/mame/video/abc80.cpp @@ -189,10 +189,10 @@ uint32_t abc80_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc80_video ) +// MACHINE_CONFIG_START( abc80_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc80_video ) +MACHINE_CONFIG_START( abc80_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(abc80_state, screen_update) diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index 39ba7db31f5..71b77531a3a 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -171,10 +171,10 @@ PALETTE_INIT_MEMBER( abc800c_state, abc800c ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc800c_video ) +// MACHINE_CONFIG_START( abc800c_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc800c_video ) +MACHINE_CONFIG_START( abc800c_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(abc800c_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) @@ -292,10 +292,10 @@ uint32_t abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc800m_video ) +// MACHINE_CONFIG_START( abc800m_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc800m_video ) +MACHINE_CONFIG_START( abc800m_video ) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp index d9c88a039b2..146eae30db6 100644 --- a/src/mame/video/abc802.cpp +++ b/src/mame/video/abc802.cpp @@ -200,10 +200,10 @@ uint32_t abc802_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc802_video ) +// MACHINE_CONFIG_START( abc802_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc802_video ) +MACHINE_CONFIG_START( abc802_video ) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp index 547a73d27f0..266fbd70562 100644 --- a/src/mame/video/abc806.cpp +++ b/src/mame/video/abc806.cpp @@ -486,10 +486,10 @@ PALETTE_INIT_MEMBER( abc806_state, abc806 ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( abc806_video ) +// MACHINE_CONFIG_START( abc806_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( abc806_video ) +MACHINE_CONFIG_START( abc806_video ) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/agat7.cpp b/src/mame/video/agat7.cpp index 76d5c8e04b6..57dd227cbe4 100644 --- a/src/mame/video/agat7.cpp +++ b/src/mame/video/agat7.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device, "agat7video", "Agat-7 Video") -MACHINE_CONFIG_FRAGMENT(agat7video) +MACHINE_CONFIG_START(agat7video) MCFG_SCREEN_ADD("a7screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_10_5MHz, 672, 0, 512, 312, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(agat7video_device, screen_update) diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp index 3750b5e296d..02c60fe3004 100644 --- a/src/mame/video/airraid_dev.cpp +++ b/src/mame/video/airraid_dev.cpp @@ -58,7 +58,7 @@ static GFXDECODE_START( cshooter ) GFXDECODE_ENTRY( "fg_gfx", 0, char16layout, 0, 16 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( airraid_vid ) +static MACHINE_CONFIG_START( airraid_vid ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index 0f7b6b9a192..349cda7262a 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -1096,7 +1096,7 @@ void amiga_state::update_screenmode() // MACHINE DRIVER FRAGMENTS //************************************************************************** -MACHINE_CONFIG_FRAGMENT( pal_video ) +MACHINE_CONFIG_START( pal_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS ( @@ -1108,7 +1108,7 @@ MACHINE_CONFIG_FRAGMENT( pal_video ) MCFG_SCREEN_PALETTE("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( ntsc_video ) +MACHINE_CONFIG_START( ntsc_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS ( diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index a87c625530d..313feee0c24 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1712,7 +1712,7 @@ void apollo_graphics_15i::register_vblank_callback() MACHINE DRIVERS ***************************************************************************/ -MACHINE_CONFIG_FRAGMENT( apollo_graphics ) +MACHINE_CONFIG_START( apollo_graphics ) MCFG_DEFAULT_LAYOUT( layout_apollo_15i ) MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) @@ -1882,7 +1882,7 @@ void apollo_graphics_15i::device_reset() //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( apollo_mono19i ) +MACHINE_CONFIG_START( apollo_mono19i ) MCFG_DEFAULT_LAYOUT( layout_apollo ) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index 092aadd0c18..a8245c5658c 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -542,7 +542,7 @@ ADDRESS_MAP_END /////////////////////////////////////////////////////////////////////////// -static MACHINE_CONFIG_FRAGMENT( adder2 ) +static MACHINE_CONFIG_START( adder2 ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE( 400, 280) MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 280-1) diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp index c82a3b59cb1..347deec8d4f 100644 --- a/src/mame/video/bfm_dm01.cpp +++ b/src/mame/video/bfm_dm01.cpp @@ -287,7 +287,7 @@ INTERRUPT_GEN_MEMBER( bfm_dm01_device::nmi_line_assert ) m_matrixcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_FRAGMENT( bdmdm01 ) +static MACHINE_CONFIG_START( bdmdm01 ) MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/ MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap) MCFG_CPU_PERIODIC_INT_DRIVER(bfm_dm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */ diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp index 828e0b4f063..2068d535b63 100644 --- a/src/mame/video/cgc7900.cpp +++ b/src/mame/video/cgc7900.cpp @@ -222,7 +222,7 @@ GFXDECODE_END MACHINE_DRIVER( cgc7900_video ) -------------------------------------------------*/ -MACHINE_CONFIG_FRAGMENT( cgc7900_video ) +MACHINE_CONFIG_START( cgc7900_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp index 8ddeb581583..1bf1203bcbc 100644 --- a/src/mame/video/cidelsa.cpp +++ b/src/mame/video/cidelsa.cpp @@ -148,7 +148,7 @@ WRITE8_MEMBER( draco_state::psg_pb_w ) /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( destryer_video ) +MACHINE_CONFIG_START( destryer_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, DESTRYER_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) @@ -162,7 +162,7 @@ MACHINE_CONFIG_FRAGMENT( destryer_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( altair_video ) +MACHINE_CONFIG_START( altair_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, ALTAIR_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) @@ -176,7 +176,7 @@ MACHINE_CONFIG_FRAGMENT( altair_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( draco_video ) +MACHINE_CONFIG_START( draco_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, DRACO_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024) diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp index 013809140f5..68b2c662b78 100644 --- a/src/mame/video/comx35.cpp +++ b/src/mame/video/comx35.cpp @@ -88,7 +88,7 @@ void comx35_state::video_start() /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( comx35_pal_video ) +MACHINE_CONFIG_START( comx35_pal_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) /* sound hardware */ @@ -108,7 +108,7 @@ MACHINE_CONFIG_FRAGMENT( comx35_pal_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( comx35_ntsc_video ) +MACHINE_CONFIG_START( comx35_ntsc_video ) MCFG_CDP1869_SCREEN_NTSC_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_NTSC) /* sound hardware */ diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index 47d2bb5857b..e24050f735a 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -204,7 +204,7 @@ static ADDRESS_MAP_START( decodmd1_io_map, AS_IO, 8, decodmd_type1_device ) AM_RANGE(0x00, 0xff) AM_READWRITE(dmd_port_r, dmd_port_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( decodmd1 ) +static MACHINE_CONFIG_START( decodmd1 ) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(decodmd1_map) diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp index 3e0d94137b0..5ba6a61bc72 100644 --- a/src/mame/video/decodmd2.cpp +++ b/src/mame/video/decodmd2.cpp @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( decodmd2_map, AS_PROGRAM, 8, decodmd_type2_device ) AM_RANGE(0x8000, 0xffff) AM_ROMBANK("dmdbank2") // last 32k of ROM ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( decodmd2 ) +static MACHINE_CONFIG_START( decodmd2 ) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", M6809E, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(decodmd2_map) diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp index 72f6e068cc3..05519fdbc48 100644 --- a/src/mame/video/decodmd3.cpp +++ b/src/mame/video/decodmd3.cpp @@ -130,7 +130,7 @@ static ADDRESS_MAP_START( decodmd3_map, AS_PROGRAM, 16, decodmd_type3_device ) AM_RANGE(0x00c00020, 0x00c00021) AM_READWRITE(latch_r,status_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( decodmd3 ) +static MACHINE_CONFIG_START( decodmd3 ) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(decodmd3_map) diff --git a/src/mame/video/exidy440.cpp b/src/mame/video/exidy440.cpp index 5420a665b26..7a405a48ec3 100644 --- a/src/mame/video/exidy440.cpp +++ b/src/mame/video/exidy440.cpp @@ -458,7 +458,7 @@ uint32_t exidy440_state::screen_update_topsecex(screen_device &screen, bitmap_in * *************************************/ -MACHINE_CONFIG_FRAGMENT( exidy440_video ) +MACHINE_CONFIG_START( exidy440_video ) MCFG_VIDEO_START_OVERRIDE(exidy440_state,exidy440) MCFG_PALETTE_ADD("palette", 256) @@ -470,7 +470,7 @@ MACHINE_CONFIG_FRAGMENT( exidy440_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( topsecex_video ) +MACHINE_CONFIG_START( topsecex_video ) MCFG_VIDEO_START_OVERRIDE(exidy440_state,topsecex) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 8d70e38120c..5ad2ae90136 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -315,7 +315,7 @@ VIDEO_RESET_MEMBER(gameplan_state,gameplan) * *************************************/ -MACHINE_CONFIG_FRAGMENT( gameplan_video ) +MACHINE_CONFIG_START( gameplan_video ) MCFG_VIDEO_START_OVERRIDE(gameplan_state,gameplan) MCFG_VIDEO_RESET_OVERRIDE(gameplan_state,gameplan) @@ -325,7 +325,7 @@ MACHINE_CONFIG_FRAGMENT( gameplan_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( leprechn_video ) +MACHINE_CONFIG_START( leprechn_video ) MCFG_VIDEO_START_OVERRIDE(gameplan_state,leprechn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_leprechn) diff --git a/src/mame/video/jedi.cpp b/src/mame/video/jedi.cpp index 44d537d4ff3..0597d14cd8c 100644 --- a/src/mame/video/jedi.cpp +++ b/src/mame/video/jedi.cpp @@ -348,7 +348,7 @@ uint32_t jedi_state::screen_update_jedi(screen_device &screen, bitmap_rgb32 &bit * *************************************/ -MACHINE_CONFIG_FRAGMENT( jedi_video ) +MACHINE_CONFIG_START( jedi_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(64*8, 262) /* verify vert size */ diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index 15baa56265b..c653ccfd443 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -877,7 +877,7 @@ k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const { } -static MACHINE_CONFIG_FRAGMENT( k1ge ) +static MACHINE_CONFIG_START( k1ge ) MCFG_PALETTE_ADD("palette", 8 ) MCFG_PALETTE_INIT_OWNER(k1ge_device, k1ge) MACHINE_CONFIG_END @@ -900,7 +900,7 @@ k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_ { } -static MACHINE_CONFIG_FRAGMENT( k2ge ) +static MACHINE_CONFIG_START( k2ge ) MCFG_PALETTE_ADD("palette", 4096 ) MCFG_PALETTE_INIT_OWNER(k2ge_device, k2ge) MACHINE_CONFIG_END diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp index cddcd55380e..1c5448d41d4 100644 --- a/src/mame/video/kyocera.cpp +++ b/src/mame/video/kyocera.cpp @@ -47,7 +47,7 @@ static ADDRESS_MAP_START( tandy200_lcdc, AS_0, 8, tandy200_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( kc85_video ) +MACHINE_CONFIG_START( kc85_video ) MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(44) MCFG_SCREEN_UPDATE_DRIVER(kc85_state, screen_update) @@ -75,7 +75,7 @@ MACHINE_CONFIG_FRAGMENT( kc85_video ) // MCFG_HD44103_SLAVE_ADD( "m12", "m11", SCREEN_TAG, HD44103_FS_HIGH, HD44103_DUTY_1_32) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( tandy200_video ) +MACHINE_CONFIG_START( tandy200_video ) MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(80) MCFG_SCREEN_UPDATE_DRIVER(tandy200_state, screen_update) diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp index 4683e7f9361..f3c5caf9a2d 100644 --- a/src/mame/video/leland.cpp +++ b/src/mame/video/leland.cpp @@ -530,7 +530,7 @@ uint32_t leland_state::screen_update_ataxx(screen_device &screen, bitmap_ind16 & * *************************************/ -MACHINE_CONFIG_FRAGMENT( leland_video ) +MACHINE_CONFIG_START( leland_video ) MCFG_VIDEO_START_OVERRIDE(leland_state,leland) diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index f6edc99d19c..3505d18a0eb 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -368,7 +368,7 @@ static GFXDECODE_START( madalien ) GFXDECODE_END -MACHINE_CONFIG_FRAGMENT( madalien_video ) +MACHINE_CONFIG_START( madalien_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 336, 0, 256, 288, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(madalien_state, screen_update_madalien) diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp index d32320a69ff..f70ed61b135 100644 --- a/src/mame/video/mikromik.cpp +++ b/src/mame/video/mikromik.cpp @@ -125,10 +125,10 @@ PALETTE_INIT_MEMBER( mm1_state, mm1 ) //------------------------------------------------- -// MACHINE_CONFIG_FRAGMENT( mm1m6_video ) +// MACHINE_CONFIG_START( mm1m6_video ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( mm1m6_video ) +MACHINE_CONFIG_START( mm1m6_video ) MCFG_SCREEN_ADD( SCREEN_TAG, RASTER ) MCFG_SCREEN_REFRESH_RATE( 50 ) MCFG_SCREEN_UPDATE_DRIVER(mm1_state, screen_update) diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index 6db2153176f..e592668a459 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -309,7 +309,7 @@ GFXDECODE_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( mystston_video ) +MACHINE_CONFIG_START( mystston_video ) MCFG_VIDEO_START_OVERRIDE(mystston_state,mystston) MCFG_VIDEO_RESET_OVERRIDE(mystston_state,mystston) diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 89353d8ccb5..42cbfd3d4cc 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -186,7 +186,7 @@ GFXDECODE_END /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( newbrain_video ) +MACHINE_CONFIG_START( newbrain_video ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(newbrain_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/video/osi.cpp b/src/mame/video/osi.cpp index 9a38db647c5..a8d3f791a70 100644 --- a/src/mame/video/osi.cpp +++ b/src/mame/video/osi.cpp @@ -146,7 +146,7 @@ uint32_t uk101_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( osi600_video ) +MACHINE_CONFIG_START( osi600_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(X1/256/256) // 60 Hz MCFG_SCREEN_UPDATE_DRIVER(sb2m600_state, screen_update) @@ -157,7 +157,7 @@ MACHINE_CONFIG_FRAGMENT( osi600_video ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( uk101_video ) +MACHINE_CONFIG_START( uk101_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DRIVER(uk101_state, screen_update) @@ -168,7 +168,7 @@ MACHINE_CONFIG_FRAGMENT( uk101_video ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( osi630_video ) +MACHINE_CONFIG_START( osi630_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(X1/256/256) // 60 Hz MCFG_SCREEN_UPDATE_DRIVER(sb2m600_state, screen_update) diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp index bd3d34c0bea..c8df887616e 100644 --- a/src/mame/video/pc1512.cpp +++ b/src/mame/video/pc1512.cpp @@ -593,7 +593,7 @@ uint32_t pc1512_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap // MACHINE_CONFIG( pc1512 ) //------------------------------------------------- -MACHINE_CONFIG_FRAGMENT( pc1512_video ) +MACHINE_CONFIG_START( pc1512_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(pc1512_state, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) diff --git a/src/mame/video/pc8401a.cpp b/src/mame/video/pc8401a.cpp index 1e0cac81864..dfa76bf8308 100644 --- a/src/mame/video/pc8401a.cpp +++ b/src/mame/video/pc8401a.cpp @@ -56,7 +56,7 @@ ADDRESS_MAP_END /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( pc8401a_video ) +MACHINE_CONFIG_START( pc8401a_video ) // MCFG_DEFAULT_LAYOUT(layout_pc8401a) MCFG_PALETTE_ADD("palette", 2) @@ -73,7 +73,7 @@ MACHINE_CONFIG_FRAGMENT( pc8401a_video ) MCFG_SED1330_ADD(SED1330_TAG, 0, SCREEN_TAG, pc8401a_lcdc) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( pc8500_video ) +MACHINE_CONFIG_START( pc8500_video ) MCFG_DEFAULT_LAYOUT(layout_pc8500) MCFG_PALETTE_ADD("palette", 2+8) diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp index 69d026a5ce8..7f638d168de 100644 --- a/src/mame/video/pc_t1t.cpp +++ b/src/mame/video/pc_t1t.cpp @@ -115,7 +115,7 @@ static ADDRESS_MAP_START(vram_map, AS_0, 8, pcvideo_t1000_device) AM_RANGE(0x20000, 0x3ffff) AM_NOP ADDRESS_MAP_END -MACHINE_CONFIG_FRAGMENT( pcvideo_t1000 ) +MACHINE_CONFIG_START( pcvideo_t1000 ) MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update ) @@ -143,7 +143,7 @@ machine_config_constructor pcvideo_t1000_device::device_mconfig_additions() cons return MACHINE_CONFIG_NAME( pcvideo_t1000 ); } -MACHINE_CONFIG_FRAGMENT( pcvideo_pcjr ) +MACHINE_CONFIG_START( pcvideo_pcjr ) MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index 1b6f5ae318f..4b9854e4ae2 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -99,7 +99,7 @@ ioport_constructor pcd_video_device::device_input_ports() const return INPUT_PORTS_NAME(pcd_mouse); } -static MACHINE_CONFIG_FRAGMENT( pcd_video ) +static MACHINE_CONFIG_START( pcd_video ) MCFG_CPU_ADD("graphics", I8741, XTAL_16MHz/2) MCFG_MCS48_PORT_P1_IN_CB(READ8(pcd_video_device, p1_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcd_video_device, p2_w)) @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( pcx_vram, AS_0, 8, pcx_video_device ) AM_RANGE(0x0000, 0x07ff) AM_READWRITE(vram_r, vram_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( pcx_video ) +static MACHINE_CONFIG_START( pcx_video ) MCFG_CPU_ADD("graphics", I8031, XTAL_24MHz/2) MCFG_CPU_PROGRAM_MAP(pcx_vid_map) MCFG_CPU_IO_MAP(pcx_vid_io) diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp index 434dca9c60a..ed9ebe87e20 100644 --- a/src/mame/video/pecom.cpp +++ b/src/mame/video/pecom.cpp @@ -90,7 +90,7 @@ VIDEO_START_MEMBER(pecom_state,pecom) save_pointer(NAME(m_charram.get()), PECOM_CHAR_RAM_SIZE); } -MACHINE_CONFIG_FRAGMENT( pecom_video ) +MACHINE_CONFIG_START( pecom_video ) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) MCFG_VIDEO_START_OVERRIDE(pecom_state,pecom) diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp index 1477cd89f01..7f62213aa08 100644 --- a/src/mame/video/qix.cpp +++ b/src/mame/video/qix.cpp @@ -376,7 +376,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( qix_video ) +MACHINE_CONFIG_START( qix_video ) MCFG_CPU_ADD("videocpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MCFG_CPU_PROGRAM_MAP(qix_video_map) @@ -396,20 +396,20 @@ MACHINE_CONFIG_FRAGMENT( qix_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( kram3_video ) +MACHINE_CONFIG_START( kram3_video ) MCFG_CPU_REPLACE("videocpu", M6809E, MAIN_CLOCK_OSC/4) /* 1.25 MHz */ MCFG_CPU_PROGRAM_MAP(kram3_video_map) MCFG_M6809E_LIC_CB(WRITELINE(qix_state,kram3_lic_videocpu_changed)) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( zookeep_video ) +MACHINE_CONFIG_START( zookeep_video ) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_PROGRAM_MAP(zookeep_video_map) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( slither_video ) +MACHINE_CONFIG_START( slither_video ) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */ MCFG_CPU_PROGRAM_MAP(slither_video_map) diff --git a/src/mame/video/redalert.cpp b/src/mame/video/redalert.cpp index e49aac2843f..e5c3d671b47 100644 --- a/src/mame/video/redalert.cpp +++ b/src/mame/video/redalert.cpp @@ -402,7 +402,7 @@ uint32_t redalert_state::screen_update_panther(screen_device &screen, bitmap_rgb * *************************************/ -static MACHINE_CONFIG_FRAGMENT( redalert_video_common ) +static MACHINE_CONFIG_START( redalert_video_common ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -411,14 +411,14 @@ static MACHINE_CONFIG_FRAGMENT( redalert_video_common ) MCFG_SCREEN_UPDATE_DRIVER(redalert_state, screen_update_redalert) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( redalert_video ) +MACHINE_CONFIG_START( redalert_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) MCFG_FRAGMENT_ADD( redalert_video_common ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( ww3_video ) +MACHINE_CONFIG_START( ww3_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state, ww3 ) MCFG_FRAGMENT_ADD( redalert_video_common ) @@ -432,7 +432,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_FRAGMENT( demoneye_video ) +MACHINE_CONFIG_START( demoneye_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) MCFG_SCREEN_ADD("screen", RASTER) @@ -444,7 +444,7 @@ MACHINE_CONFIG_FRAGMENT( demoneye_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( panther_video ) +MACHINE_CONFIG_START( panther_video ) MCFG_VIDEO_START_OVERRIDE(redalert_state,ww3) diff --git a/src/mame/video/stactics.cpp b/src/mame/video/stactics.cpp index 64755130256..63b93d41b99 100644 --- a/src/mame/video/stactics.cpp +++ b/src/mame/video/stactics.cpp @@ -405,7 +405,7 @@ uint32_t stactics_state::screen_update(screen_device &screen, bitmap_ind16 &bitm * *************************************/ -MACHINE_CONFIG_FRAGMENT( stactics_video ) +MACHINE_CONFIG_START( stactics_video ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp index 5a89418055f..0bc3521ecfb 100644 --- a/src/mame/video/stfight_dev.cpp +++ b/src/mame/video/stfight_dev.cpp @@ -109,7 +109,7 @@ static GFXDECODE_START( stfight ) GFXDECODE_ENTRY( "spr_gfx", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END -static MACHINE_CONFIG_FRAGMENT( stfight_vid ) +static MACHINE_CONFIG_START( stfight_vid ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index 601bdb7b1f1..d6d572d63da 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -373,7 +373,7 @@ tia_pal_video_device::tia_pal_video_device(const machine_config &mconfig, const { } -static MACHINE_CONFIG_FRAGMENT( tia_pal ) +static MACHINE_CONFIG_START( tia_pal ) MCFG_PALETTE_ADD("palette", TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(tia_pal_video_device, tia_pal) MACHINE_CONFIG_END @@ -400,7 +400,7 @@ tia_ntsc_video_device::tia_ntsc_video_device(const machine_config &mconfig, cons { } -static MACHINE_CONFIG_FRAGMENT( tia_ntsc ) +static MACHINE_CONFIG_START( tia_ntsc ) MCFG_PALETTE_ADD("palette", TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(tia_ntsc_video_device, tia_ntsc) MACHINE_CONFIG_END diff --git a/src/mame/video/tmc1800.cpp b/src/mame/video/tmc1800.cpp index e7f855f10e8..4e2e55b8186 100644 --- a/src/mame/video/tmc1800.cpp +++ b/src/mame/video/tmc1800.cpp @@ -36,7 +36,7 @@ uint32_t osc1000b_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( tmc1800_video ) +MACHINE_CONFIG_START( tmc1800_video ) MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_1_75MHz) MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_CDP1861_DMA_OUT_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT)) @@ -44,7 +44,7 @@ MACHINE_CONFIG_FRAGMENT( tmc1800_video ) MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_1_75MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( osc1000b_video ) +MACHINE_CONFIG_START( osc1000b_video ) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(osc1000b_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) @@ -52,7 +52,7 @@ MACHINE_CONFIG_FRAGMENT( osc1000b_video ) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( tmc2000_video ) +MACHINE_CONFIG_START( tmc2000_video ) MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz) MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update) @@ -62,7 +62,7 @@ MACHINE_CONFIG_FRAGMENT( tmc2000_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_FRAGMENT( nano_video ) +MACHINE_CONFIG_START( nano_video ) MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz) MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update) diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index 1c7d1fd2642..a8d9e5f590c 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -126,7 +126,7 @@ static GFXDECODE_START( tmc600 ) GFXDECODE_ENTRY( "chargen", 0x0000, tmc600_charlayout, 0, 36 ) GFXDECODE_END -MACHINE_CONFIG_FRAGMENT( tmc600_video ) +MACHINE_CONFIG_START( tmc600_video ) // video hardware MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) MCFG_TIMER_DRIVER_ADD_PERIODIC("blink", tmc600_state, blink_tick, attotime::from_hz(2)) diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index 46c91e5a485..1b2fa821be9 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -109,7 +109,7 @@ void v1050_state::video_start() /* Machine Drivers */ -MACHINE_CONFIG_FRAGMENT( v1050_video ) +MACHINE_CONFIG_START( v1050_video ) MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, XTAL_15_36MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index 79b9019987c..03f7de2ab96 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -880,7 +880,7 @@ TIMER_CALLBACK_MEMBER(vt100_video_device::lba7_change) m_lba7 = (m_lba7) ? 0 : 1; } -static MACHINE_CONFIG_FRAGMENT(vt100_video) +static MACHINE_CONFIG_START(vt100_video) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END @@ -894,7 +894,7 @@ machine_config_constructor vt100_video_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(vt100_video); } -static MACHINE_CONFIG_FRAGMENT(rainbow_video) +static MACHINE_CONFIG_START(rainbow_video) MCFG_PALETTE_ADD("palette", 4) MACHINE_CONFIG_END diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp index 755c4b7fbc4..022579744af 100644 --- a/src/mame/video/wpc_dmd.cpp +++ b/src/mame/video/wpc_dmd.cpp @@ -18,7 +18,7 @@ DEVICE_ADDRESS_MAP_START( registers, 8, wpc_dmd_device ) AM_RANGE(7, 7) AM_WRITE(visible_page_w) ADDRESS_MAP_END -static MACHINE_CONFIG_FRAGMENT( wpc_dmd ) +static MACHINE_CONFIG_START( wpc_dmd ) MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) -- cgit v1.2.3