diff options
author | 2008-07-19 05:26:09 +0000 | |
---|---|---|
committer | 2008-07-19 05:26:09 +0000 | |
commit | 5bb72fa08e09c451e31c5c7c682d35ea81e99af1 (patch) | |
tree | 6b7a192dc0725f8b69d6fc2a362c30725303cf22 | |
parent | 73aaf0db7e51053f0dc7a475b1cb138931c1fd7e (diff) |
Changed MDRV_CPU_ADD to require a tag. Removed MDRV_CPU_ADD_TAG.
Tagged all CPUs. Now I will take a break until my fingers stop
cramping. :)
979 files changed, 2770 insertions, 3137 deletions
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index b8172a8f648..4cbdfd6ec6d 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -243,13 +243,10 @@ union _machine_config_token /* add/modify/remove/replace CPUs */ -#define MDRV_CPU_ADD_TAG(_tag, _type, _clock) \ +#define MDRV_CPU_ADD(_tag, _type, _clock) \ TOKEN_UINT64_PACK3(MCONFIG_TOKEN_CPU_ADD, 8, CPU_##_type, 24, _clock, 32), \ TOKEN_STRING(_tag), -#define MDRV_CPU_ADD(_type, _clock) \ - MDRV_CPU_ADD_TAG(NULL, _type, _clock) - #define MDRV_CPU_MODIFY(_tag) \ TOKEN_UINT32_PACK1(MCONFIG_TOKEN_CPU_MODIFY, 8), \ TOKEN_STRING(_tag), diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 820b1cfa589..c91e83f1a52 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -796,7 +796,7 @@ static const struct YM2151interface ym2151_interface = MACHINE_DRIVER_START( jsa_i_stereo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("jsa", M6502, JSA_MASTER_CLOCK/2) + MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(atarijsa1_map,0) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14) @@ -841,7 +841,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( jsa_i_mono_speech ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("jsa", M6502, JSA_MASTER_CLOCK/2) + MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(atarijsa1_map,0) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14) @@ -862,7 +862,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( jsa_ii_mono ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("jsa", M6502, JSA_MASTER_CLOCK/2) + MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(atarijsa2_map,0) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14) @@ -905,7 +905,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( jsa_iiis_stereo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("jsa", M6502, JSA_MASTER_CLOCK/2) + MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(atarijsa3s_map,0) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14) diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 468fecb6e96..2bf03bcadb1 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -642,7 +642,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( cage ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cage", TMS32031, 33868800) + MDRV_CPU_ADD("cage", TMS32031, 33868800) /* audio CPU */ MDRV_CPU_CONFIG(cage_config) MDRV_CPU_PROGRAM_MAP(cage_map,0) diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c index 4da940e41c3..ba5d0325f26 100644 --- a/src/mame/audio/carnival.c +++ b/src/mame/audio/carnival.c @@ -296,7 +296,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( carnival_audio ) - MDRV_CPU_ADD_TAG("audio", I8039, 3579545) + MDRV_CPU_ADD("audio", I8039, 3579545) MDRV_CPU_PROGRAM_MAP(carnival_audio_map,0) MDRV_CPU_IO_MAP(carnival_audio_io_map,0) diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c index 55ca1ae8703..7b53a5647ab 100644 --- a/src/mame/audio/cinemat.c +++ b/src/mame/audio/cinemat.c @@ -1558,7 +1558,7 @@ static const struct z80_irq_daisy_chain daisy_chain[] = MACHINE_DRIVER_START( demon_sound ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_CONFIG(daisy_chain) MDRV_CPU_PROGRAM_MAP(demon_sound_map,0) MDRV_CPU_IO_MAP(demon_sound_ports,0) diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 655d3005e04..cd39389ee64 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -590,7 +590,7 @@ ADDRESS_MAP_END /* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */ MACHINE_DRIVER_START( dcs_audio_2k ) - MDRV_CPU_ADD_TAG("dcs", ADSP2105, XTAL_10MHz) + MDRV_CPU_ADD("dcs", ADSP2105, XTAL_10MHz) MDRV_CPU_PROGRAM_MAP(dcs_2k_program_map,0) MDRV_CPU_DATA_MAP(dcs_2k_data_map,0) @@ -628,7 +628,7 @@ MACHINE_DRIVER_END *************************************/ MACHINE_DRIVER_START( dcs2_audio_2115 ) - MDRV_CPU_ADD_TAG("dcs2", ADSP2115, XTAL_16MHz) + MDRV_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz) MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map,0) MDRV_CPU_DATA_MAP(dcs2_2115_data_map,0) @@ -658,7 +658,7 @@ MACHINE_DRIVER_END *************************************/ MACHINE_DRIVER_START( dcs2_audio_dsio ) - MDRV_CPU_ADD_TAG("dsio", ADSP2181, XTAL_32MHz) + MDRV_CPU_ADD("dsio", ADSP2181, XTAL_32MHz) MDRV_CPU_PROGRAM_MAP(dsio_program_map,0) MDRV_CPU_DATA_MAP(dsio_data_map,0) MDRV_CPU_IO_MAP(dsio_io_map,0) @@ -681,7 +681,7 @@ MACHINE_DRIVER_END *************************************/ MACHINE_DRIVER_START( dcs2_audio_denver ) - MDRV_CPU_ADD_TAG("denver", ADSP2181, XTAL_33_333MHz) + MDRV_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz) MDRV_CPU_PROGRAM_MAP(denver_program_map,0) MDRV_CPU_DATA_MAP(denver_data_map,0) MDRV_CPU_IO_MAP(denver_io_map,0) diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index b0a8b48ca52..58eaccac760 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -1305,7 +1305,7 @@ static const struct TMS5110interface tms5110_interface = MACHINE_DRIVER_START( dkong2b_audio ) - MDRV_CPU_ADD_TAG("sound", I8035,I8035_CLOCK) + MDRV_CPU_ADD("sound", I8035,I8035_CLOCK) MDRV_CPU_PROGRAM_MAP(dkong_sound_map,0) MDRV_CPU_IO_MAP(dkong_sound_io_map, 0) @@ -1343,7 +1343,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( dkongjr_audio ) - MDRV_CPU_ADD_TAG("sound", I8035,I8035_CLOCK) + MDRV_CPU_ADD("sound", I8035,I8035_CLOCK) MDRV_CPU_PROGRAM_MAP(dkong_sound_map,0) MDRV_CPU_IO_MAP(dkongjr_sound_io_map, 0) @@ -1360,11 +1360,11 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( dkong3_audio ) - MDRV_CPU_ADD_TAG("n2a03a", N2A03,N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD_TAG("n2a03b", N2A03,N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("n2a03b", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(dkong3_sound2_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index 1151846a484..dbe09a6ff9f 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -835,7 +835,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( venture_audio ) - MDRV_CPU_ADD_TAG("audio", M6502, 3579545/4) + MDRV_CPU_ADD("audio", M6502, 3579545/4) MDRV_CPU_PROGRAM_MAP(venture_audio_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -895,7 +895,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( mtrap_cvsd_audio ) - MDRV_CPU_ADD_TAG("cvsd", Z80, CVSD_Z80_CLOCK) + MDRV_CPU_ADD("cvsd", Z80, CVSD_Z80_CLOCK) MDRV_CPU_PROGRAM_MAP(cvsd_map,0) MDRV_CPU_IO_MAP(cvsd_iomap,0) @@ -1030,7 +1030,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( victory_audio ) - MDRV_CPU_ADD_TAG("audio", M6502, VICTORY_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", M6502, VICTORY_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(victory_audio_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c index 5c9d4f13068..ac8ff6ca3db 100644 --- a/src/mame/audio/exidy440.c +++ b/src/mame/audio/exidy440.c @@ -930,7 +930,7 @@ static const struct CustomSound_interface custom_interface = MACHINE_DRIVER_START( exidy440_audio ) - MDRV_CPU_ADD_TAG("audio", M6809, EXIDY440_AUDIO_CLOCK) + MDRV_CPU_ADD("audio", M6809, EXIDY440_AUDIO_CLOCK) MDRV_CPU_PROGRAM_MAP(exidy440_audio_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index d33c5ea96bf..04e0bc8fb9c 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -363,7 +363,7 @@ static MACHINE_DRIVER_START( irem_audio_base ) MDRV_SOUND_START(irem_audio) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_IO_MAP(irem_sound_portmap,0) /* sound hardware */ @@ -391,7 +391,7 @@ MACHINE_DRIVER_START( m52_sound_c_audio ) MDRV_SOUND_START(irem_audio) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_IO_MAP(irem_sound_portmap,0) MDRV_CPU_PROGRAM_MAP(m52_small_sound_map,0) diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index 81576dd105d..2c6b9050611 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -199,7 +199,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( jedi_audio ) - MDRV_CPU_ADD_TAG("audio", M6502, JEDI_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", M6502, JEDI_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_SOUND_START(jedi) diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 6ccdb795a5e..4cbdc927da0 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -448,9 +448,9 @@ static const struct AY8910interface ay8910_interface = MACHINE_DRIVER_START( mario_audio ) #if USE_8039 - MDRV_CPU_ADD_TAG("audio", I8039, I8035_CLOCK) /* audio CPU */ /* 730 kHz */ + MDRV_CPU_ADD("audio", I8039, I8035_CLOCK) /* audio CPU */ /* 730 kHz */ #else - MDRV_CPU_ADD_TAG("audio", M58715, I8035_CLOCK) /* audio CPU */ /* 730 kHz */ + MDRV_CPU_ADD("audio", M58715, I8035_CLOCK) /* audio CPU */ /* 730 kHz */ #endif MDRV_CPU_PROGRAM_MAP(mario_sound_map, 0) MDRV_CPU_IO_MAP(mario_sound_io_map, 0) @@ -467,7 +467,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( masao_audio ) - MDRV_CPU_ADD_TAG("audio", Z80,24576000/16) /* audio CPU */ /* ???? */ + MDRV_CPU_ADD("audio", Z80,24576000/16) /* audio CPU */ /* ???? */ MDRV_CPU_PROGRAM_MAP(masao_sound_map,0) MDRV_SOUND_START(mario) diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index 050bfedcf25..9688095d247 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -488,7 +488,7 @@ ADDRESS_MAP_END /********* machine driver ***********/ MACHINE_DRIVER_START(mcr_ssio) - MDRV_CPU_ADD_TAG("ssio", Z80, SSIO_CLOCK/2/4) + MDRV_CPU_ADD("ssio", Z80, SSIO_CLOCK/2/4) MDRV_CPU_PROGRAM_MAP(ssio_map,0) MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10) @@ -608,7 +608,7 @@ static const pia6821_interface csdeluxe_pia_intf = /********* machine driver ***********/ MACHINE_DRIVER_START(chip_squeak_deluxe) - MDRV_CPU_ADD_TAG("csd", M68000, CSDELUXE_CLOCK/2) + MDRV_CPU_ADD("csd", M68000, CSDELUXE_CLOCK/2) MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -617,7 +617,7 @@ MACHINE_DRIVER_START(chip_squeak_deluxe) MACHINE_DRIVER_END MACHINE_DRIVER_START(chip_squeak_deluxe_stereo) - MDRV_CPU_ADD_TAG("csd", M68000, CSDELUXE_CLOCK/2) + MDRV_CPU_ADD("csd", M68000, CSDELUXE_CLOCK/2) MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0) MDRV_SOUND_ADD("csd", DAC, 0) @@ -715,7 +715,7 @@ static const pia6821_interface soundsgood_pia_intf = /********* machine driver ***********/ MACHINE_DRIVER_START(sounds_good) - MDRV_CPU_ADD_TAG("sg", M68000, SOUNDSGOOD_CLOCK/2) + MDRV_CPU_ADD("sg", M68000, SOUNDSGOOD_CLOCK/2) MDRV_CPU_PROGRAM_MAP(soundsgood_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -804,7 +804,7 @@ static const pia6821_interface turbocs_pia_intf = /********* machine driver ***********/ MACHINE_DRIVER_START(turbo_chip_squeak) - MDRV_CPU_ADD_TAG("tcs", M6809E, TURBOCS_CLOCK) + MDRV_CPU_ADD("tcs", M6809E, TURBOCS_CLOCK) MDRV_CPU_PROGRAM_MAP(turbocs_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -952,7 +952,7 @@ static const pia6821_interface squawkntalk_pia1_intf = /********* machine driver ***********/ MACHINE_DRIVER_START(squawk_n_talk) - MDRV_CPU_ADD_TAG("snt", M6802, SQUAWKTALK_CLOCK) + MDRV_CPU_ADD("snt", M6802, SQUAWKTALK_CLOCK) MDRV_CPU_PROGRAM_MAP(squawkntalk_map,0) /* only used on Discs of Tron, which is stereo */ diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c index 96ae094c1ce..cb5c0025ef5 100644 --- a/src/mame/audio/n8080.c +++ b/src/mame/audio/n8080.c @@ -546,7 +546,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( spacefev_sound ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("audio", I8035, 6000000) + MDRV_CPU_ADD("audio", I8035, 6000000) MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0) MDRV_CPU_IO_MAP(n8080_sound_io_map, 0) @@ -567,7 +567,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( sheriff_sound ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("audio", I8035, 6000000) + MDRV_CPU_ADD("audio", I8035, 6000000) MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0) MDRV_CPU_IO_MAP(n8080_sound_io_map, 0) @@ -588,7 +588,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( helifire_sound ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("audio", I8035, 6000000) + MDRV_CPU_ADD("audio", I8035, 6000000) MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0) MDRV_CPU_IO_MAP(helifire_sound_io_map, 0) diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h index e8ade7a1dfb..744ae31b409 100644 --- a/src/mame/audio/namcoc7x.h +++ b/src/mame/audio/namcoc7x.h @@ -34,13 +34,13 @@ static const struct C352interface namcoc7x_c352_interface = \ ROM_LOAD( "pr1data.8k", 0x80000, 0x80000, BAD_DUMP CRC(2e5767a4) SHA1(390bf05c90044d841fe2dd4a427177fa1570b9a6) ) #define NAMCO_C7X_MCU(clock) \ - MDRV_CPU_ADD_TAG("mcu", M37702, clock) \ + MDRV_CPU_ADD("mcu", M37702, clock) \ MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_map, 0) \ MDRV_CPU_IO_MAP(namcoc7x_mcu_io, 0) \ MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2) #define NAMCO_C7X_MCU_SHARED(clock) \ - MDRV_CPU_ADD_TAG("mcu", M37702, clock) \ + MDRV_CPU_ADD("mcu", M37702, clock) \ MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map, 0) \ MDRV_CPU_IO_MAP(namcoc7x_mcu_io, 0) \ MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2) diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c index 9dc4bde7b7d..c917f4227f6 100644 --- a/src/mame/audio/qix.c +++ b/src/mame/audio/qix.c @@ -103,7 +103,7 @@ ADDRESS_MAP_END *************************************/ MACHINE_DRIVER_START( qix_audio ) - MDRV_CPU_ADD_TAG("audio", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */ + MDRV_CPU_ADD("audio", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */ MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_SPEAKER_STANDARD_STEREO("left", "right") diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c index 8d1db53e11c..387492b60ae 100644 --- a/src/mame/audio/redalert.c +++ b/src/mame/audio/redalert.c @@ -215,11 +215,11 @@ static SOUND_START( redalert ) MACHINE_DRIVER_START( redalert_audio ) - MDRV_CPU_ADD_TAG("audio", M6502, REDALERT_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", M6502, REDALERT_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(redalert_audio_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) - MDRV_CPU_ADD_TAG("voice", 8085A, REDALERT_VOICE_CPU_CLOCK) + MDRV_CPU_ADD("voice", 8085A, REDALERT_VOICE_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(redalert_voice_map,0) MDRV_SOUND_START( redalert ) @@ -366,7 +366,7 @@ static SOUND_RESET( demoneye ) MACHINE_DRIVER_START( demoneye_audio ) - MDRV_CPU_ADD_TAG("audio", M6802, DEMONEYE_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", M6802, DEMONEYE_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(demoneye_audio_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */ diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c index fc1dd70e9fe..c1164f5b399 100644 --- a/src/mame/audio/scramble.c +++ b/src/mame/audio/scramble.c @@ -424,7 +424,7 @@ static SOUND_START( ad2083 ) MACHINE_DRIVER_START( ad2083_audio ) - MDRV_CPU_ADD_TAG("audio", Z80, 14318000/8) /* 1.78975 MHz */ + MDRV_CPU_ADD("audio", Z80, 14318000/8) /* 1.78975 MHz */ MDRV_CPU_PROGRAM_MAP(ad2083_sound_map,0) MDRV_CPU_IO_MAP(ad2083_sound_io_map,0) diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c index f0181fa7f97..b44fd0bba77 100644 --- a/src/mame/audio/segag80r.c +++ b/src/mame/audio/segag80r.c @@ -838,7 +838,7 @@ MACHINE_DRIVER_START( monsterb_sound_board ) MDRV_DEVICE_CONFIG( monsterb_ppi_intf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("audio", N7751, 6000000) + MDRV_CPU_ADD("audio", N7751, 6000000) MDRV_CPU_PROGRAM_MAP(monsterb_7751_map,0) MDRV_CPU_IO_MAP(monsterb_7751_portmap,0) diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c index 384badac670..756aa30f074 100644 --- a/src/mame/audio/segasnd.c +++ b/src/mame/audio/segasnd.c @@ -280,7 +280,7 @@ static const struct sp0250_interface sp0250_interface = MACHINE_DRIVER_START( sega_speech_board ) /* CPU for the speech board */ - MDRV_CPU_ADD_TAG("audio", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ + MDRV_CPU_ADD("audio", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ MDRV_CPU_PROGRAM_MAP(speech_map, 0) MDRV_CPU_IO_MAP(speech_portmap, 0) @@ -918,7 +918,7 @@ static const struct CustomSound_interface usb_custom_interface = MACHINE_DRIVER_START( sega_universal_sound_board ) /* CPU for the usb board */ - MDRV_CPU_ADD_TAG("usb", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ + MDRV_CPU_ADD("usb", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ MDRV_CPU_PROGRAM_MAP(usb_map, 0) MDRV_CPU_IO_MAP(usb_portmap, 0) diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index 812cc6dceda..c1ea5231c04 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -77,23 +77,23 @@ extern const struct YM2203interface seibu_ym2203_interface; #define SEIBU_SOUND_SYSTEM_CPU(freq) \ - MDRV_CPU_ADD_TAG("audio", Z80, freq) \ + MDRV_CPU_ADD("audio", Z80, freq) \ MDRV_CPU_PROGRAM_MAP(seibu_sound_map,0) \ #define SEIBU2_SOUND_SYSTEM_CPU(freq) \ - MDRV_CPU_ADD_TAG("audio", Z80, freq) \ + MDRV_CPU_ADD("audio", Z80, freq) \ MDRV_CPU_PROGRAM_MAP(seibu2_sound_map,0) \ #define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \ - MDRV_CPU_ADD_TAG("audio", Z80, freq) \ + MDRV_CPU_ADD("audio", Z80, freq) \ MDRV_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map,0) \ #define SEIBU3_SOUND_SYSTEM_CPU(freq) \ - MDRV_CPU_ADD_TAG("audio", Z80, freq) \ + MDRV_CPU_ADD("audio", Z80, freq) \ MDRV_CPU_PROGRAM_MAP(seibu3_sound_map,0) \ #define SEIBU3A_SOUND_SYSTEM_CPU(freq) \ - MDRV_CPU_ADD_TAG("audio", Z80, freq) \ + MDRV_CPU_ADD("audio", Z80, freq) \ MDRV_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map,0) \ #define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2,region) \ diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h index 96e033061a6..7ba03515ec7 100644 --- a/src/mame/audio/taito_en.h +++ b/src/mame/audio/taito_en.h @@ -12,7 +12,7 @@ void f3_68681_reset(void); void taito_f3_soundsystem_reset(running_machine *machine); #define TAITO_F3_SOUND_SYSTEM_CPU(freq) \ - MDRV_CPU_ADD_TAG("audio", M68000, freq) \ + MDRV_CPU_ADD("audio", M68000, freq) \ MDRV_CPU_PROGRAM_MAP(f3_sound_map,0) \ diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index 1f71c2ed103..e8afb80f8a1 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -173,7 +173,7 @@ static const struct AY8910interface timeplt_ay8910_interface = MACHINE_DRIVER_START( timeplt_sound ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("tpsound",Z80,MASTER_CLOCK/8) + MDRV_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(timeplt_sound_map,0) MDRV_SOUND_START(timeplt) diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index 06ccc02bb2e..bf6a4dd455c 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -190,7 +190,7 @@ static const struct YM2151interface adpcm_ym2151_interface = ****************************************************************************/ MACHINE_DRIVER_START( williams_cvsd_sound ) - MDRV_CPU_ADD_TAG("cvsd", M6809E, CVSD_MASTER_CLOCK) + MDRV_CPU_ADD("cvsd", M6809E, CVSD_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(williams_cvsd_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -208,10 +208,10 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( williams_narc_sound ) - MDRV_CPU_ADD_TAG("narc1", M6809E, NARC_MASTER_CLOCK) + MDRV_CPU_ADD("narc1", M6809E, NARC_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(williams_narc_master_map,0) - MDRV_CPU_ADD_TAG("narc2", M6809E, NARC_MASTER_CLOCK) + MDRV_CPU_ADD("narc2", M6809E, NARC_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(williams_narc_slave_map,0) MDRV_SPEAKER_STANDARD_STEREO("left", "right") @@ -236,7 +236,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START( williams_adpcm_sound ) - MDRV_CPU_ADD_TAG("adpcm", M6809E, ADPCM_MASTER_CLOCK) + MDRV_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(williams_adpcm_map,0) MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 343b1e2b854..5285df7e49c 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -270,11 +270,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( 1942 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */ + MDRV_CPU_ADD("main", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(c1942_map, 0) MDRV_CPU_VBLANK_INT_HACK(c1942_interrupt,2) - MDRV_CPU_ADD_TAG("audio", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 2c32437f77f..f8699497842 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -250,11 +250,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( 1943 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, XTAL_24MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_24MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(c1943_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio", Z80, XTAL_24MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_24MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 26cc382a63c..f92df9c24e3 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -232,7 +232,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( k3 ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(k3_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 555a58faad0..7fac5c745aa 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -295,7 +295,7 @@ static MACHINE_DRIVER_START( 20pacgal ) MDRV_DRIVER_DATA(_20pacgal_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z180, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", Z180, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(20pacgal_map,0) MDRV_CPU_IO_MAP(20pacgal_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 8f7f93f20ee..e3246604223 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -192,7 +192,7 @@ static const struct YM2610interface ym2610_interface = }; static MACHINE_DRIVER_START( drill ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000 ) + MDRV_CPU_ADD("main", M68000, 16000000 ) MDRV_CPU_PROGRAM_MAP(drill_map,0) MDRV_CPU_VBLANK_INT("main", drill_interrupt) MDRV_GFXDECODE(2mindril) diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index fbfd804bb7a..8cbc29b2254 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -34,7 +34,7 @@ static VIDEO_UPDATE( 39in1 ) } static MACHINE_DRIVER_START( 39in1 ) - MDRV_CPU_ADD_TAG("main", ARM7, 200000000) // actually Xscale PXA255, but ARM7 is a compatible subset + MDRV_CPU_ADD("main", ARM7, 200000000) // actually Xscale PXA255, but ARM7 is a compatible subset MDRV_CPU_PROGRAM_MAP(39in1_map,0) MDRV_PALETTE_LENGTH(32768) diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 94934c694e4..37ef69e4f7d 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -1023,15 +1023,15 @@ static const struct MSM5232interface msm5232_interface = static MACHINE_DRIVER_START( 40love ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000/2) /* OK */ + MDRV_CPU_ADD("main",Z80,8000000/2) /* OK */ MDRV_CPU_PROGRAM_MAP(40love_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* OK */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* OK */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */ - MDRV_CPU_ADD_TAG("mcu",M68705,18432000/6) /* OK */ + MDRV_CPU_ADD("mcu",M68705,18432000/6) /* OK */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_INTERLEAVE(100) /* high interleave to ensure proper synchronization of CPUs */ @@ -1079,15 +1079,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( undoukai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000/2) + MDRV_CPU_ADD("main",Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(undoukai_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) + MDRV_CPU_ADD("audio",Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */ -// MDRV_CPU_ADD_TAG("mcu",M68705,18432000/6) +// MDRV_CPU_ADD("mcu",M68705,18432000/6) // MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_MACHINE_RESET(ta7630) /* init machine */ diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index fe25f9d0f58..0d949ef57e7 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -159,7 +159,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( 4enraya ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000/2) + MDRV_CPU_ADD("main",Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 480dbfd96c9..243fc5b404f 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -271,11 +271,11 @@ static const struct upd7759_interface upd7759_interface_2 = static MACHINE_DRIVER_START( 88games ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", k88games_interrupt) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(88games) diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index d6aceb3ce75..8464e486010 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -309,7 +309,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( ace ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 18000000 / 9) /* 2 MHz ? */ + MDRV_CPU_ADD("main", 8080, 18000000 / 9) /* 2 MHz ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) /* video hardware */ diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 8b7998a238d..918f90d74b6 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -545,7 +545,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( acefruit ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 2500000) /* 2.5MHz */ + MDRV_CPU_ADD("main", Z80, 2500000) /* 2.5MHz */ MDRV_CPU_PROGRAM_MAP(acefruit_map,0) MDRV_CPU_IO_MAP(acefruit_io,0) MDRV_GFXDECODE(acefruit) diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index 66d63891834..bb56a36eb08 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -517,7 +517,7 @@ static INTERRUPT_GEN( acommand_irq ) static MACHINE_DRIVER_START( acommand ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,12000000) + MDRV_CPU_ADD("main",M68000,12000000) MDRV_CPU_PROGRAM_MAP(acommand,0) MDRV_CPU_VBLANK_INT_HACK(acommand_irq,2) diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 7f9b159e3a0..e2b79bda8d8 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -349,11 +349,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( actfancr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",H6280,21477200/3) /* Should be accurate */ + MDRV_CPU_ADD("main",H6280,21477200/3) /* Should be accurate */ MDRV_CPU_PROGRAM_MAP(actfan_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* VBL */ - MDRV_CPU_ADD_TAG("audio",M6502, 1500000) /* Should be accurate */ + MDRV_CPU_ADD("audio",M6502, 1500000) /* Should be accurate */ MDRV_CPU_PROGRAM_MAP(dec0_s_map,0) /* video hardware */ @@ -392,11 +392,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( triothep ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */ + MDRV_CPU_ADD("main",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(triothep_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* VBL */ - MDRV_CPU_ADD_TAG("audio",M6502, XTAL_12MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("audio",M6502, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(dec0_s_map,0) /* video hardware */ diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index f3d4b879efa..955ffb3fc9b 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -156,7 +156,7 @@ static INPUT_PORTS_START( skattv ) INPUT_PORTS_END static MACHINE_DRIVER_START( skattv ) - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(skattv_mem, 0) diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index aece24414e9..81e0bc179c9 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -231,11 +231,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( formatz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, XTAL_10MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("main", M6809, XTAL_10MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", aeroboto_interrupt) - MDRV_CPU_ADD_TAG("audio", M6809, XTAL_10MHz/16) /* verified on pcb */ + MDRV_CPU_ADD("audio", M6809, XTAL_10MHz/16) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 35abde6d0fe..4ddc1607057 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1324,11 +1324,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( pspikes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pspikes_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0) /* IRQs are triggered by the YM2610 */ @@ -1363,7 +1363,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( spikes91 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(spikes91_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ @@ -1394,7 +1394,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pspikesb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pspikesb_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ @@ -1422,7 +1422,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pspikesc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pspikesc_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ @@ -1450,11 +1450,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( karatblz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(karatblz_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0) /* IRQs are triggered by the YM2610 */ @@ -1488,11 +1488,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( spinlbrk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(spinlbrk_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* there are vectors for 3 and 4 too */ - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0) /* IRQs are triggered by the YM2610 */ @@ -1526,11 +1526,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( turbofrc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (verified on pcb) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(turbofrc_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD_TAG("audio",Z80,5000000) /* 5 MHz (verified on pcb) */ + MDRV_CPU_ADD("audio",Z80,5000000) /* 5 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0) /* IRQs are triggered by the YM2610 */ @@ -1564,11 +1564,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerofgtb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(aerofgtb_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(aerofgt_sound_portmap,0) /* IRQs are triggered by the YM2610 */ @@ -1603,11 +1603,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerofgt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (verified on pcb) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(aerofgt_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD_TAG("audio",Z80,5000000) /* 5 MHz (verified on pcb) */ + MDRV_CPU_ADD("audio",Z80,5000000) /* 5 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(aerofgt_sound_portmap,0) /* IRQs are triggered by the YM2610 */ @@ -1642,11 +1642,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerfboot ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(aerfboot_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map,0) /* video hardware */ @@ -1674,7 +1674,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerfboo2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(aerfboo2_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -1703,11 +1703,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wbbc97 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("main",M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(wbbc97_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio",Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wbbc97_sound_map,0) /* IRQs are triggered by the YM3812 */ diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 10f98d6b866..ec65b2af468 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -603,17 +603,17 @@ static MACHINE_RESET( airbustr ) static MACHINE_DRIVER_START( airbustr ) // basic machine hardware - MDRV_CPU_ADD_TAG("master", Z80, 6000000) // ??? + MDRV_CPU_ADD("master", Z80, 6000000) // ??? MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_IO_MAP(master_io_map, 0) MDRV_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ? - MDRV_CPU_ADD_TAG("slave", Z80, 6000000) // ??? + MDRV_CPU_ADD("slave", Z80, 6000000) // ??? MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_CPU_IO_MAP(slave_io_map, 0) MDRV_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ? - MDRV_CPU_ADD_TAG("audio", Z80, 6000000) // ??? + MDRV_CPU_ADD("audio", Z80, 6000000) // ??? MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_IO_MAP(sound_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // nmi are caused by sub cpu writing a sound command diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index ff923dbe501..5de60317a0a 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -228,14 +228,14 @@ static const struct K007232_interface k007232_interface_2 = static MACHINE_DRIVER_START( ajax ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 12/4 MHz*/ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* 12/4 MHz*/ MDRV_CPU_PROGRAM_MAP(ajax_main_map,0) MDRV_CPU_VBLANK_INT("main", ajax_interrupt) /* IRQs triggered by the 051960 */ - MDRV_CPU_ADD_TAG("sub", M6809, 3000000) /* ? */ + MDRV_CPU_ADD("sub", M6809, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(ajax_sub_map,0) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) /* 3.58 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.58 MHz */ MDRV_CPU_PROGRAM_MAP(ajax_sound_map,0) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index 4904b0034e2..a3344300233 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -427,12 +427,12 @@ static MACHINE_RESET( aleck64 ) static MACHINE_DRIVER_START( aleck64 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R4600BE, 93750000) + MDRV_CPU_ADD("main", R4600BE, 93750000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(n64_map, 0) MDRV_CPU_VBLANK_INT("main", n64_vblank) - MDRV_CPU_ADD_TAG("rsp", RSP, 62500000) + MDRV_CPU_ADD("rsp", RSP, 62500000) MDRV_CPU_CONFIG(n64_rsp_config) MDRV_CPU_PROGRAM_MAP(rsp_map, 0) diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index a915c8aa51f..0d9fd97d4b1 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -465,7 +465,7 @@ static const struct CustomSound_interface amiga_custom_interface = static MACHINE_DRIVER_START( alg_r1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK) + MDRV_CPU_ADD("main", M68000, AMIGA_68000_NTSC_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map_r1,0) MDRV_MACHINE_START(alg) diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index a84301cf3bf..d68559fff54 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -239,11 +239,11 @@ static MACHINE_DRIVER_START( aliens ) /* external clock should be 12MHz probably, CPU internal divider and precise cycle timings */ /* are unknown though. 3MHz is too low, sprites flicker in the pseudo-3D levels */ - MDRV_CPU_ADD_TAG("main", KONAMI, 6000000) /* ? */ + MDRV_CPU_ADD("main", KONAMI, 6000000) /* ? */ MDRV_CPU_PROGRAM_MAP(aliens_map,0) MDRV_CPU_VBLANK_INT("main", aliens_interrupt) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(aliens_sound_map,0) MDRV_MACHINE_RESET(aliens) diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 126bbd57fa8..38954544965 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -1990,11 +1990,11 @@ static INTERRUPT_GEN( alpha68k_interrupt ) static MACHINE_DRIVER_START( sstingry ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* 24MHz/4? */ + MDRV_CPU_ADD("main", M68000, 6000000) /* 24MHz/4? */ MDRV_CPU_PROGRAM_MAP(kyros_map,0) MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sstingry_sound_map,0) MDRV_CPU_IO_MAP(kyros_sound_portmap,0) //AT @@ -2039,11 +2039,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kyros ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* 24MHz/4? */ + MDRV_CPU_ADD("main", M68000, 6000000) /* 24MHz/4? */ MDRV_CPU_PROGRAM_MAP(kyros_map,0) MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(kyros_sound_map,0) MDRV_CPU_IO_MAP(kyros_sound_portmap,0) //AT @@ -2087,11 +2087,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jongbou ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(kyros_map,0) MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(jongbou_sound_map,0) MDRV_CPU_IO_MAP(jongbou_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) // guess, controls sound speed @@ -2122,11 +2122,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( alpha68k_I ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* 24MHz/4? */ + MDRV_CPU_ADD("main", M68000, 6000000) /* 24MHz/4? */ MDRV_CPU_PROGRAM_MAP(alpha68k_I_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */ - MDRV_CPU_ADD(Z80, 4000000) // 4Mhz seems to yield the correct tone + MDRV_CPU_ADD("audio", Z80, 4000000) // 4Mhz seems to yield the correct tone MDRV_CPU_PROGRAM_MAP(alpha68k_I_s_map,0) /* video hardware */ @@ -2154,12 +2154,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( alpha68k_II ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* Correct */ + MDRV_CPU_ADD("main", M68000, 8000000) /* Correct */ MDRV_CPU_PROGRAM_MAP(alpha68k_II_map,0) MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */ - MDRV_CPU_ADD(Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ - /* audio CPU */ /* Correct?? */ + MDRV_CPU_ADD("audio", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500) //AT @@ -2203,11 +2202,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( alpha68k_II_gm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(alpha68k_II_map, 0) MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4) - MDRV_CPU_ADD(Z80, 4000000*2) + MDRV_CPU_ADD("audio", Z80, 4000000*2) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500) @@ -2245,11 +2244,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( alpha68k_V ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0) MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */ - MDRV_CPU_ADD(Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ + MDRV_CPU_ADD("audio", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT @@ -2286,11 +2285,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( alpha68k_V_sb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0) MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */ - MDRV_CPU_ADD(Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ + MDRV_CPU_ADD("audio", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT @@ -2327,11 +2326,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tnexspce ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 9000000) /* Confirmed 18 MHz/2 */ + MDRV_CPU_ADD("main", M68000, 9000000) /* Confirmed 18 MHz/2 */ MDRV_CPU_PROGRAM_MAP(tnexspce_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(tnexspce_sound_map,0) MDRV_CPU_IO_MAP(tnexspce_sound_portmap,0) diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c index 0292f633dba..b35924650a7 100644 --- a/src/mame/drivers/ambush.c +++ b/src/mame/drivers/ambush.c @@ -183,7 +183,7 @@ static const struct AY8910interface ay8910_interface_2 = static MACHINE_DRIVER_START( ambush ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.00 MHz??? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index 876b914cd42..bdee3c97c83 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1016,7 +1016,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( ampoker2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/2) /* 3 MHz */ + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/2) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(ampoker2_map, 0) MDRV_CPU_IO_MAP(ampoker2_io_map, 0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1536) diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index 5f9c6c9ff9f..9d0d75887ce 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -255,12 +255,12 @@ static const struct YM2151interface amspdwy_ym2151_interface = static MACHINE_DRIVER_START( amspdwy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,3000000) + MDRV_CPU_ADD("main", Z80,3000000) MDRV_CPU_PROGRAM_MAP(amspdwy_map,0) MDRV_CPU_IO_MAP(amspdwy_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */ - MDRV_CPU_ADD(Z80,3000000) /* Can't be disabled: the YM2151 timers must work */ + MDRV_CPU_ADD("audio", Z80,3000000) /* Can't be disabled: the YM2151 timers must work */ MDRV_CPU_PROGRAM_MAP(amspdwy_sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index 548c1d58725..cae8534e801 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -599,12 +599,12 @@ GFXDECODE_END */ static MACHINE_DRIVER_START( angelkds ) - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* 8MHz? 6 seems too slow? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* 8MHz? 6 seems too slow? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 8 MHz? */ + MDRV_CPU_ADD("sub", Z80, 4000000) /* 8 MHz? */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_IO_MAP(sub_portmap,0) diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index bebb63e1024..e549d5658bc 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -213,7 +213,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( appoooh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ + MDRV_CPU_ADD("main", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) @@ -415,7 +415,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( robowres ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ + MDRV_CPU_ADD("main", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index ffe2139d5b3..182c8d06b12 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -348,11 +348,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( aquarium ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) + MDRV_CPU_ADD("main", M68000, 32000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD("audio", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(snd_map,0) MDRV_CPU_IO_MAP(snd_portmap,0) diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index 0619c2acc22..b96e51bae9d 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -352,7 +352,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( arabian ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_OSC/4) + MDRV_CPU_ADD("main", Z80, MAIN_OSC/4) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index 2988387ad5b..f7a37e3642e 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -344,7 +344,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( arcadecl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index e0710308ad9..a2fa66f76f9 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -283,7 +283,7 @@ static const struct CustomSound_interface amiga_custom_interface = static MACHINE_DRIVER_START( arcadia ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK) + MDRV_CPU_ADD("main", M68000, AMIGA_68000_NTSC_CLOCK) MDRV_CPU_PROGRAM_MAP(amiga_map,0) MDRV_MACHINE_RESET(amiga) diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index 0095196f485..ab412dc9f15 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -701,11 +701,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( argus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(argus_map,0) MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("audio", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(sound_map_a,0) MDRV_CPU_IO_MAP(sound_portmap_1,0) @@ -738,11 +738,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( valtric ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(valtric_map,0) MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("audio", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(sound_map_a,0) MDRV_CPU_IO_MAP(sound_portmap_2,0) @@ -781,11 +781,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( butasan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(butasan_map,0) MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("audio", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(sound_map_b,0) MDRV_CPU_IO_MAP(sound_portmap_2,0) @@ -824,11 +824,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bombsa ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(bombsa_map,0) MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) - MDRV_CPU_ADD(Z80, 12000000 / 2) /* maybe CPU speeds are reversed? Probably not (ajg) */ + MDRV_CPU_ADD("audio", Z80, 12000000 / 2) /* maybe CPU speeds are reversed? Probably not (ajg) */ MDRV_CPU_PROGRAM_MAP(sound_map_c,0) MDRV_CPU_IO_MAP(sound_portmap_2,0) diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index edf05391f84..b84326ba45b 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -748,11 +748,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( arkanoid ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(arkanoid_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcu_map, 0) MDRV_INTERLEAVE(100) // 100 CPU slices per second to synchronize between the MCU and the main CPU diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 604bf8747a2..87965303898 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -755,11 +755,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( terraf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(terraf_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) @@ -796,16 +796,16 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( terrafb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(terrafb_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz???? */ + MDRV_CPU_ADD("extra", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(terrafb_extraz80_map,0) MDRV_CPU_IO_MAP(terrafb_extraz80_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) @@ -843,12 +843,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kodure ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(kodure_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3072000) - /* audio CPU */ /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) @@ -885,12 +884,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( armedf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(armedf_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3072000) - /* audio CPU */ /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) @@ -927,11 +925,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cclimbr2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) @@ -968,11 +966,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( legion ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(legion_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) @@ -1009,12 +1007,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( legiono ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(legiono_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 3072000) - /* audio CPU */ /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c index d12d4a6c39e..31106775d70 100644 --- a/src/mame/drivers/artmagic.c +++ b/src/mame/drivers/artmagic.c @@ -696,10 +696,10 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( artmagic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK_25MHz/2) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK_25MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD_TAG("tms", TMS34010, MASTER_CLOCK_40MHz) + MDRV_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(tms_map,0) diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 0114f985443..84c6b4cdc1a 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -338,11 +338,11 @@ static DRIVER_INIT( ashnojoe ) static MACHINE_DRIVER_START( ashnojoe ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz (verified on pcb) */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(ashnojoe_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (verified on pcb) */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 86297fe10b0..3e824e776af 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -254,11 +254,11 @@ static const struct K053260_interface k053260_interface = static MACHINE_DRIVER_START( asterix ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", asterix_interrupt) - MDRV_CPU_ADD(Z80, 8000000) + MDRV_CPU_ADD("audio", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_NVRAM_HANDLER(asterix) diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index a32e37769bc..9ef0c66af63 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -585,7 +585,7 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( asteroid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(asteroid_map,0) MDRV_CPU_PERIODIC_INT(asteroid_interrupt, (double)MASTER_CLOCK/4096/12) diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 2badb20d8ea..0b7a4ca7c61 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -508,7 +508,7 @@ static const struct Samplesinterface astinvad_samples_interface = static MACHINE_DRIVER_START( kamikaze ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(kamikaze_map,0) MDRV_CPU_IO_MAP(kamikaze_portmap,0) @@ -548,7 +548,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( spaceint ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK) /* a guess */ + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK) /* a guess */ MDRV_CPU_PROGRAM_MAP(spaceint_map,0) MDRV_CPU_IO_MAP(spaceint_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index 7c24629cf68..5ba0b9146ed 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -1260,7 +1260,7 @@ static const struct z80_irq_daisy_chain tenpin_daisy_chain[] = static MACHINE_DRIVER_START( astrocade_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, ASTROCADE_CLOCK/4) + MDRV_CPU_ADD("main", Z80, ASTROCADE_CLOCK/4) /* each game has its own map */ MDRV_MACHINE_START(astrocde) @@ -1465,7 +1465,7 @@ static MACHINE_DRIVER_START( tenpindx ) MDRV_CPU_PROGRAM_MAP(profpac_map,0) MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound,0) - MDRV_CPU_ADD(Z80, ASTROCADE_CLOCK/4) /* real clock unknown */ + MDRV_CPU_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */ MDRV_CPU_CONFIG(tenpin_daisy_chain) MDRV_CPU_PROGRAM_MAP(tenpin_sub_map,0) MDRV_CPU_IO_MAP(tenpin_sub_io_map,0) diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index cc7a79c2288..7d2dfbaf46e 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -252,7 +252,7 @@ static NVRAM_HANDLER( showhand ) static MACHINE_DRIVER_START( astrocorp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_25_601712MHz / 2) + MDRV_CPU_ADD("main", M68000, XTAL_25_601712MHz / 2) MDRV_CPU_PROGRAM_MAP(astrocorp_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 6238f1cb247..84e907d5185 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -839,7 +839,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, MAIN_CPU_CLOCK) MDRV_TIMER_ADD_SCANLINE("VBLANK", irq_callback, "main", VBSTART, 0) /* video hardware */ diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 93172c45499..6eae2571be1 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -785,11 +785,11 @@ static VIDEO_EOF( asuka ) static MACHINE_DRIVER_START( bonzeadv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* checked on PCB */ + MDRV_CPU_ADD("main", M68000, 8000000) /* checked on PCB */ MDRV_CPU_PROGRAM_MAP(bonzeadv_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80,4000000) /* sound CPU, also required for test mode */ + MDRV_CPU_ADD("audio", Z80,4000000) /* sound CPU, also required for test mode */ MDRV_CPU_PROGRAM_MAP(bonzeadv_z80_map,0) MDRV_INTERLEAVE(10) @@ -823,11 +823,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( asuka ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(asuka_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(z80_map,0) MDRV_INTERLEAVE(10) @@ -864,11 +864,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cadash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(cadash_map,0) MDRV_CPU_VBLANK_INT("main", cadash_interrupt) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0) MDRV_INTERLEAVE(10) @@ -901,11 +901,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mofflott ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(asuka_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_map,0) MDRV_INTERLEAVE(10) @@ -942,11 +942,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( galmedes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(asuka_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0) MDRV_INTERLEAVE(10) @@ -979,11 +979,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( eto ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(eto_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index 5d85e8de3e3..85e4952b518 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -560,7 +560,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( atarifb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 750000) + MDRV_CPU_ADD("main", M6502, 750000) MDRV_CPU_PROGRAM_MAP(atarifb_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index 9c608bf6de9..ed4259be7f0 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -422,7 +422,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( atarig1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index e6dc0eef326..cf31d82ae12 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -517,7 +517,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( atarig42 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 6f5f207d5d1..7970a4cceec 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -804,7 +804,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( atarigt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, ATARI_CLOCK_50MHz/2) + MDRV_CPU_ADD("main", M68EC020, ATARI_CLOCK_50MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_PERIODIC_INT(atarigen_scanline_int_gen, 250) diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 7d36e5c653d..95a5d2e55fb 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -1430,7 +1430,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( atarigx2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, ATARI_CLOCK_14MHz) + MDRV_CPU_ADD("main", M68EC020, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index fcbfb51e6ab..62db2bb8aea 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -700,11 +700,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( atarisy1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68010, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) - MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) + MDRV_CPU_ADD("audio", M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(atarisy1) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index d6037be0d88..70d2e50f069 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -1138,12 +1138,12 @@ static const struct t11_setup t11_data = static MACHINE_DRIVER_START( atarisy2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", T11, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", T11, MASTER_CLOCK/2) MDRV_CPU_CONFIG(t11_data) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", vblank_int) - MDRV_CPU_ADD_TAG("sound", M6502, SOUND_CLOCK/8) + MDRV_CPU_ADD("sound", M6502, SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)MASTER_CLOCK/2/16/16/16/10) diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c index 8e4b6e85c4d..45f8d32574d 100644 --- a/src/mame/drivers/ataxx.c +++ b/src/mame/drivers/ataxx.c @@ -307,15 +307,15 @@ static const struct CustomSound_interface i80186_custom_interface = static MACHINE_DRIVER_START( ataxx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("master", Z80, 6000000) + MDRV_CPU_ADD("master", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(master_map_program,0) MDRV_CPU_IO_MAP(master_map_io,0) - MDRV_CPU_ADD_TAG("slave", Z80, 6000000) + MDRV_CPU_ADD("slave", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(slave_map_program,0) MDRV_CPU_IO_MAP(slave_map_io,0) - MDRV_CPU_ADD_TAG("sound", I80186, XTAL_16MHz) + MDRV_CPU_ADD("sound", I80186, XTAL_16MHz) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(leland_80186_map_program,0) MDRV_CPU_IO_MAP(ataxx_80186_map_io,0) diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 92b52b7e3f0..ef6c351119c 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -342,7 +342,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( atetris ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,MASTER_CLOCK/8) + MDRV_CPU_ADD("main", M6502,MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_START(atetris) @@ -378,7 +378,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( atetrsb2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,BOOTLEG_CLOCK/8) + MDRV_CPU_ADD("main", M6502,BOOTLEG_CLOCK/8) MDRV_CPU_PROGRAM_MAP(atetrsb2_map,0) MDRV_MACHINE_START(atetris) diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c index 53e1a4df620..bab35ea0bc0 100644 --- a/src/mame/drivers/attckufo.c +++ b/src/mame/drivers/attckufo.c @@ -128,7 +128,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( attckufo ) - MDRV_CPU_ADD_TAG("main", M6502, 14318181/14) + MDRV_CPU_ADD("main", M6502, 14318181/14) MDRV_CPU_PROGRAM_MAP(cpu_map, 0) MDRV_CPU_PERIODIC_INT(attckufo_raster_interrupt, 15625) diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index 17ac8882429..2cc8dcf54d5 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -217,7 +217,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( avalnche ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,12096000/16) /* clock input is the "2H" signal divided by two */ + MDRV_CPU_ADD("main", M6502,12096000/16) /* clock input is the "2H" signal divided by two */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(avalnche_interrupt,8) diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index 02afef6f7c8..f7abdc69d5d 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -148,11 +148,11 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( aztarac ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, 2000000) + MDRV_CPU_ADD("audio", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_PERIODIC_INT(aztarac_snd_timed_irq, 100) diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 4cdd03baf53..61ea06f3e86 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -483,7 +483,7 @@ static INTERRUPT_GEN( deco32_vbl_interrupt ) static MACHINE_DRIVER_START( backfire ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) /* Unconfirmed */ + MDRV_CPU_ADD("main", ARM, 28000000/4) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(backfire_map,0) MDRV_CPU_VBLANK_INT("left", deco32_vbl_interrupt) /* or is it "right?" */ diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 9d24c77a2c7..08db8a1503a 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -436,11 +436,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( badlands ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", vblank_int) - MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) + MDRV_CPU_ADD("audio", M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_MACHINE_RESET(badlands) @@ -652,11 +652,11 @@ static MACHINE_RESET( badlandb ) static MACHINE_DRIVER_START( badlandb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 2800000/2) + MDRV_CPU_ADD("main", M68000, 2800000/2) MDRV_CPU_PROGRAM_MAP(bootleg_map,0) MDRV_CPU_VBLANK_INT("main", vblank_int) -// MDRV_CPU_ADD(Z80, 2800000/8) +// MDRV_CPU_ADD("audio", Z80, 2800000/8) // MDRV_CPU_PROGRAM_MAP(bootleg_soundmap,0) MDRV_MACHINE_RESET(badlandb) diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index a8336f884f8..d5a68aa4ea2 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -459,7 +459,7 @@ static const struct TMS5110interface tms5110_interface = static MACHINE_DRIVER_START( bagman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -495,7 +495,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pickin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pickin_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -550,7 +550,7 @@ z80 static MACHINE_DRIVER_START( botanic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pickin_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index bcf23abf86a..457e96b39d5 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -1174,12 +1174,11 @@ static const struct cem3394_interface cem_interface = static MACHINE_DRIVER_START( balsente ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 5000000/4) + MDRV_CPU_ADD("main", M6809, 5000000/4) MDRV_CPU_PROGRAM_MAP(cpu1_map,0) MDRV_CPU_VBLANK_INT("main", balsente_update_analog_inputs) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(cpu2_io_map,0) @@ -1233,7 +1232,7 @@ static MACHINE_DRIVER_START( shrike ) /* basic machine hardware */ MDRV_IMPORT_FROM(balsente) - MDRV_CPU_ADD_TAG("68k", M68000, 8000000) + MDRV_CPU_ADD("68k", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(shrike68k_map,0) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index f34b5df3863..b3d41affb46 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -257,7 +257,7 @@ static MACHINE_DRIVER_START( bankp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, BANKP_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, BANKP_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(bankp_map, 0) MDRV_CPU_IO_MAP(bankp_io_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 6def226e30e..4cc8968e196 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -393,11 +393,11 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( baraduke ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,49152000/32) + MDRV_CPU_ADD("main", M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(baraduke_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(HD63701,49152000/8) + MDRV_CPU_ADD("mcu", HD63701,49152000/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index d126da1be89..01b4ebfc9ba 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -242,7 +242,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( batman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(batman) diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 19a961c4a35..207a56191ab 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -255,11 +255,11 @@ static const struct YM3526interface ym3526_interface = static MACHINE_DRIVER_START( battlane ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1250000) /* 1.25 MHz ? */ + MDRV_CPU_ADD("main", M6809, 1250000) /* 1.25 MHz ? */ MDRV_CPU_PROGRAM_MAP(battlane_map, 0) MDRV_CPU_VBLANK_INT("main", battlane_cpu1_interrupt) - MDRV_CPU_ADD(M6809, 1250000) /* 1.25 MHz ? */ + MDRV_CPU_ADD("sub", M6809, 1250000) /* 1.25 MHz ? */ MDRV_CPU_PROGRAM_MAP(battlane_map, 0) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index ccb2ea72c95..8a22e81d0a9 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -245,12 +245,12 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( battlera ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H6280,21477200/3) + MDRV_CPU_ADD("main", H6280,21477200/3) MDRV_CPU_PROGRAM_MAP(battlera_map,0) MDRV_CPU_IO_MAP(battlera_portmap,0) MDRV_CPU_VBLANK_INT_HACK(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */ - MDRV_CPU_ADD(H6280,21477200/3) + MDRV_CPU_ADD("audio", H6280,21477200/3) MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index c3ef37588e4..f4ecfa46ccc 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -208,7 +208,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( battlex ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */ + MDRV_CPU_ADD("main", Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* controls game speed? */ diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index ee0ba070299..522773ac6ef 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -261,12 +261,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( battlnts ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* ? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* ? */ MDRV_CPU_PROGRAM_MAP(battlnts_readmem,battlnts_writemem) MDRV_CPU_VBLANK_INT("main", battlnts_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(battlnts_readmem_sound,battlnts_writemem_sound) /* video hardware */ diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 4fda66754e8..1a0d5854012 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -727,12 +727,11 @@ static VIDEO_EOF( mechatt ) static MACHINE_DRIVER_START( bbusters ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bbuster_readmem,bbuster_writemem) MDRV_CPU_VBLANK_INT_HACK(bbuster,4) - MDRV_CPU_ADD(Z80,4000000) /* Accurate */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,4000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -771,12 +770,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mechatt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(mechatt_readmem,mechatt_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80,4000000) /* Accurate */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,4000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sounda_readport,sounda_writeport) diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c index 0a94d5edd50..f525b3e9d26 100644 --- a/src/mame/drivers/beaminv.c +++ b/src/mame/drivers/beaminv.c @@ -316,7 +316,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( beaminv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 2000000) /* 2 MHz ? */ + MDRV_CPU_ADD("main", Z80, 2000000) /* 2 MHz ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index 7714f98e5e3..4904361b977 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -409,7 +409,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( beathead ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ASAP, ATARI_CLOCK_14MHz) + MDRV_CPU_ADD("main", ASAP, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(beathead) diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index 5bfacf6fef2..9cbf54afcc1 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -89,11 +89,11 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( beezer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1000000) /* 1 MHz */ + MDRV_CPU_ADD("main", M6809, 1000000) /* 1 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(beezer_interrupt,128) - MDRV_CPU_ADD(M6809, 1000000) /* 1 MHz */ + MDRV_CPU_ADD("audio", M6809, 1000000) /* 1 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) /* video hardware */ diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index ae9e8175e9b..291e2fc44ee 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -861,7 +861,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( berzerk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(berzerk_map,0) MDRV_CPU_IO_MAP(berzerk_io_map,0) diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 58450e57085..001f11838d8 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -313,7 +313,7 @@ static GFXDECODE_START( bestleag ) GFXDECODE_END static MACHINE_DRIVER_START( bestleag ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bestleag_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index adc937ad0f8..c7b5e2863e4 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -1719,12 +1719,12 @@ static INTERRUPT_GEN( vblank_gen ) } static MACHINE_DRIVER_START( bfcobra ) - MDRV_CPU_ADD_TAG("main", Z80, Z80_XTAL) + MDRV_CPU_ADD("main", Z80, Z80_XTAL) MDRV_CPU_PROGRAM_MAP(z80_prog_map, 0) MDRV_CPU_IO_MAP(z80_io_map, 0) MDRV_CPU_VBLANK_INT("main", vblank_gen) - MDRV_CPU_ADD(M6809, M6809_XTAL) + MDRV_CPU_ADD("audio", M6809, M6809_XTAL) MDRV_CPU_PROGRAM_MAP(m6809_prog_map, 0) MDRV_CPU_PERIODIC_INT(timer_irq, 1000) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 1a749e9bdc2..32719a08e60 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -2226,7 +2226,7 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( scorpion2_vid ) MDRV_MACHINE_RESET( init ) // main scorpion2 board initialisation MDRV_INTERLEAVE(16) // needed for serial communication !! - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz MDRV_CPU_PROGRAM_MAP(memmap_vid,0) // setup scorpion2 board memorymap MDRV_CPU_PERIODIC_INT(timer_irq, 1000) // generate 1000 IRQ's per second @@ -2247,7 +2247,7 @@ static MACHINE_DRIVER_START( scorpion2_vid ) MDRV_PALETTE_INIT(adder2) MDRV_GFXDECODE(adder2) - MDRV_CPU_ADD_TAG("adder2", M6809, MASTER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz + MDRV_CPU_ADD("adder2", M6809, MASTER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz MDRV_CPU_PROGRAM_MAP(adder2_memmap,0) // setup adder2 board memorymap MDRV_CPU_VBLANK_INT("ADDER", adder2_vbl) // board has a VBL IRQ diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 577f1d49898..400c798a500 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -476,24 +476,23 @@ static const struct MSM5232interface msm5232_interface = static MACHINE_DRIVER_START( bigevglf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10000000/2) /* 5 MHz ? */ + MDRV_CPU_ADD("main", Z80,10000000/2) /* 5 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(bigevglf_readport,bigevglf_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* vblank */ - MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz ? */ + MDRV_CPU_ADD("sub", Z80,10000000/2) /* 5 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_sub,writemem_sub) MDRV_CPU_IO_MAP(bigevglf_sub_readport,bigevglf_sub_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* vblank */ - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz ? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ???; 2 irqs/frame give good music tempo but also SOUND ERROR in test mode, 4 irqs/frame give SOUND OK in test mode but music seems to be running too fast */ - MDRV_CPU_ADD(M68705,2000000) /* ??? */ + MDRV_CPU_ADD("mcu", M68705,2000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - interleaving is forced on the fly */ diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 507d51b5195..fb894a22b0e 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -418,13 +418,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( bigfghtr ) - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3072000) - /* audio CPU */ /* 3.072 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(soundmem,0) MDRV_CPU_IO_MAP(soundport,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index 8760e66a639..6c94cee674b 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -222,7 +222,7 @@ GFXDECODE_END /* Machine Driver */ static MACHINE_DRIVER_START( bigstrkb ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bigstrkb_readmem,bigstrkb_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 57e6c3e8f43..70463dfa353 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -346,12 +346,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( bionicc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */ + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(bionicc_interrupt,8) /* audio CPU */ - MDRV_CPU_ADD(Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */ + MDRV_CPU_ADD("audio", Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* FIXME: interrupt timing * schematics indicate that nmi_line is set on M680000 access with AB1=1 diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index a21b19411b5..ac5b2b6451c 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -338,7 +338,7 @@ static const struct YMZ280Binterface ymz280b_intf = static MACHINE_DRIVER_START( bishi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */ + MDRV_CPU_ADD("main", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(bishi_interrupt, 2) diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 03ff83071e2..37c5134c9ef 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -441,7 +441,7 @@ static INTERRUPT_GEN( bishjan_interrupt ) } static MACHINE_DRIVER_START( bishjan ) - MDRV_CPU_ADD_TAG("main", H83044, 44100000/3) + MDRV_CPU_ADD("main", H83044, 44100000/3) MDRV_CPU_PROGRAM_MAP( bishjan_map, 0 ) MDRV_CPU_VBLANK_INT_HACK(bishjan_interrupt,2) diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index aeea3b70122..1fdc8a2dc3a 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -445,13 +445,12 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( bking ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */ + MDRV_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(bking_map,0) MDRV_CPU_IO_MAP(bking_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_6MHz/2) /* 3 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_6MHz/2) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(bking_audio_map,0) /* interrupts (from Jungle King hardware, might be wrong): */ /* - no interrupts synced with vblank */ @@ -494,7 +493,7 @@ static MACHINE_DRIVER_START( bking3 ) MDRV_CPU_MODIFY("main_cpu") MDRV_CPU_IO_MAP(bking3_io_map,0) - MDRV_CPU_ADD(M68705, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */ + MDRV_CPU_ADD("mcu", M68705, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */ MDRV_CPU_PROGRAM_MAP(m68705_map,0) MDRV_MACHINE_RESET(buggychl) diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 8b294177db5..bc82eb2119f 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -478,11 +478,11 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static MACHINE_DRIVER_START( blackt96 ) - MDRV_CPU_ADD_TAG("main", M68000, 18000000 /2) + MDRV_CPU_ADD("main", M68000, 18000000 /2) MDRV_CPU_PROGRAM_MAP(blackt96_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(PIC16C57, 8000000) /* ? */ + MDRV_CPU_ADD("audio", PIC16C57, 8000000) /* ? */ MDRV_CPU_FLAGS(CPU_DISABLE) MDRV_CPU_IO_MAP(sound_io_map, 0) diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index ec3ea69f444..cb0adb038fb 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -338,12 +338,11 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( bladestl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 24000000/2) /* 24MHz/2 (?) */ + MDRV_CPU_ADD("main", HD6309, 24000000/2) /* 24MHz/2 (?) */ MDRV_CPU_PROGRAM_MAP(bladestl_readmem,bladestl_writemem) MDRV_CPU_VBLANK_INT_HACK(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */ - MDRV_CPU_ADD(M6809, 2000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(bladestl_readmem_sound,bladestl_writemem_sound) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index 8c5e843cea5..64471ed5d3d 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -252,13 +252,12 @@ static MACHINE_START( blktiger ) static MACHINE_DRIVER_START( blktiger ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_24MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_24MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mem_map, 0) MDRV_CPU_IO_MAP(port_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_mem_map, 0) MDRV_MACHINE_START(blktiger) diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 65acbc1f5b7..37ccd1b9da2 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -383,7 +383,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( blmbycar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(blmbycar_readmem,blmbycar_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) @@ -413,7 +413,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( watrball ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(watrball_readmem,watrball_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 4beb78ae84b..f27939a435c 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -455,7 +455,7 @@ static PALETTE_INIT( bw ) static MACHINE_DRIVER_START( blockade ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 2079000) + MDRV_CPU_ADD("main", 8080, 2079000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", blockade_interrupt) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 66ecc9308c8..8e3053e67b4 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -208,12 +208,11 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( blockhl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI,3000000) /* Konami custom 052526 */ + MDRV_CPU_ADD("main", KONAMI,3000000) /* Konami custom 052526 */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", blockhl_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(blockhl) diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index b6cf8c9df7c..b646a72635c 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -200,12 +200,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( blockout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/ + MDRV_CPU_ADD("main", M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(blockout_interrupt,2) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c index cd935cf088e..cb910dc9ce4 100644 --- a/src/mame/drivers/bloodbro.c +++ b/src/mame/drivers/bloodbro.c @@ -453,7 +453,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( bloodbro ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bloodbro_map, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index 7ffbffbfc3e..5e0a370479f 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -202,7 +202,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( blstroid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index 420e5880180..261aa397baf 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -272,11 +272,11 @@ static const struct AY8910interface ay8910_interface_2 = static MACHINE_DRIVER_START( blueprnt ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 7000000/2) // 3.5 MHz + MDRV_CPU_ADD("main", Z80, 7000000/2) // 3.5 MHz MDRV_CPU_PROGRAM_MAP(blueprnt_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 10000000/2/2/2) // 1.25 MHz (2H) + MDRV_CPU_ADD("audio", Z80, 10000000/2/2/2) // 1.25 MHz (2H) MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // IRQs connected to 32V // NMIs are caused by the main CPU diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index f3ba7682b4a..52c12828a1d 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -494,7 +494,7 @@ static INTERRUPT_GEN( bmc_interrupt ) } static MACHINE_DRIVER_START( bmcbowl ) - MDRV_CPU_ADD_TAG("main", M68000, 21477270/2 ) + MDRV_CPU_ADD("main", M68000, 21477270/2 ) MDRV_CPU_PROGRAM_MAP(bmcbowl_mem,0) MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,2) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 19ee84cbb58..19f5a1ba024 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1336,11 +1336,11 @@ static MACHINE_RESET( ms32 ) static MACHINE_DRIVER_START( bnstars ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V70, 20000000) // 20MHz + MDRV_CPU_ADD("main", V70, 20000000) // 20MHz MDRV_CPU_PROGRAM_MAP(bnstars_map,0) MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32) -// MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ +// MDRV_CPU_ADD("audio", Z80, 4000000) /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(bnstars_z80_map, 0) MDRV_INTERLEAVE(1000) diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index fc448bb8e5c..68f89eb132e 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -226,7 +226,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( bogeyman ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6502, 2000000) // 12 MHz clock on board + MDRV_CPU_ADD("main", M6502, 2000000) // 12 MHz clock on board MDRV_CPU_PROGRAM_MAP(bogeyman_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index 04cdd9bbace..a1601961b67 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -331,12 +331,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( bombjack ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 3072000) - /* audio CPU */ /* 3.072 MHz????? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz????? */ MDRV_CPU_PROGRAM_MAP(bombjack_sound_readmem,bombjack_sound_writemem) MDRV_CPU_IO_MAP(0,bombjack_sound_writeport) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 67be21f9e01..bfcfbb8ed8f 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -301,11 +301,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( boogwing ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* DE102 */ + MDRV_CPU_ADD("main", M68000, 14000000) /* DE102 */ MDRV_CPU_PROGRAM_MAP(boogwing_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/4) + MDRV_CPU_ADD("audio", H6280,32220000/4) MDRV_CPU_PROGRAM_MAP(sound_readmem, sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index fcacd3d7d6d..24c97d4b6df 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -401,12 +401,11 @@ static const struct K007232_interface k007232_interface_2 = static MACHINE_DRIVER_START( bottom9 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ? */ + MDRV_CPU_ADD("main", M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(bottom9_readmem,bottom9_writemem) MDRV_CPU_VBLANK_INT("main", bottom9_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(bottom9_sound_readmem,bottom9_sound_writemem) MDRV_CPU_VBLANK_INT_HACK(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */ diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 93b6e7ffe50..cf3d96b47db 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -289,7 +289,7 @@ GFXDECODE_END static MACHINE_DRIVER_START(boxer) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) + MDRV_CPU_ADD("main", M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(boxer_map, 0) /* video hardware */ diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index aa706ca7506..e0d7124c93b 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -388,11 +388,11 @@ static const struct YM3526interface ym3526_interface = static MACHINE_DRIVER_START( brkthru ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(brkthru_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ + MDRV_CPU_ADD("audio", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ @@ -426,11 +426,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( darwin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(darwin_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ + MDRV_CPU_ADD("audio", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index 5f0447da279..d98bae571c8 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -209,7 +209,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( bsktball ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,750000) + MDRV_CPU_ADD("main", M6502,750000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(bsktball_interrupt,8) diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index a76e98a3185..40e242c7ae1 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1141,11 +1141,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( btime ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) + MDRV_CPU_ADD("main", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(btime_map,0) /* audio CPU */ - MDRV_CPU_ADD_TAG("audio", M6502, 500000) + MDRV_CPU_ADD("audio", M6502, 500000) MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index b2a43e619eb..e3f947655c0 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -337,11 +337,11 @@ static const tms34010_config tms_config = static MACHINE_DRIVER_START( btoads ) - MDRV_CPU_ADD_TAG("main", TMS34020, CPU_CLOCK/2) + MDRV_CPU_ADD("main", TMS34020, CPU_CLOCK/2) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD(Z80, SOUND_CLOCK/4) + MDRV_CPU_ADD("audio", Z80, SOUND_CLOCK/4) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_assert, 183) diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index cc4f019b8bb..3bb09c01d9f 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -688,16 +688,15 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( tokio ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, MAIN_XTAL/4) // 6 MHz + MDRV_CPU_ADD("main", Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(tokio_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz + MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(tokio_slave_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_XTAL/8) - /* audio CPU */ // 3 MHz + MDRV_CPU_ADD("audio", Z80, MAIN_XTAL/8) // 3 MHz MDRV_CPU_PROGRAM_MAP(tokio_sound_map, 0) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203 MDRV_INTERLEAVE(100) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs @@ -729,19 +728,18 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bublbobl ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, MAIN_XTAL/4) // 6 MHz + MDRV_CPU_ADD("main", Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(master_map, 0) // IRQs are triggered by the MCU - MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz + MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_XTAL/8) - /* audio CPU */ // 3 MHz + MDRV_CPU_ADD("audio", Z80, MAIN_XTAL/8) // 3 MHz MDRV_CPU_PROGRAM_MAP(sound_map, 0) // IRQs are triggered by the YM2203 - MDRV_CPU_ADD_TAG("mcu", M6801, 4000000) // actually 6801U4 // xtal is 4MHz, divided by 4 internally + MDRV_CPU_ADD("mcu", M6801, 4000000) // actually 6801U4 // xtal is 4MHz, divided by 4 internally MDRV_CPU_PROGRAM_MAP(mcu_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) // comes from the same clock that latches the INT pin on the second Z80 @@ -789,7 +787,7 @@ static MACHINE_DRIVER_START( bub68705 ) MDRV_IMPORT_FROM(bublbobl) MDRV_CPU_REMOVE("mcu") - MDRV_CPU_ADD_TAG("mcu", M68705, 4000000) // xtal is 4MHz, divided by 4 internally + MDRV_CPU_ADD("mcu", M68705, 4000000) // xtal is 4MHz, divided by 4 internally MDRV_CPU_PROGRAM_MAP(bootlegmcu_map, 0) MDRV_CPU_VBLANK_INT_HACK(bublbobl_m68705_interrupt, 2) // ??? should come from the same clock which latches the INT pin on the second Z80 MACHINE_DRIVER_END diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 56b5cdd3651..9081c439b5a 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -403,17 +403,16 @@ static const struct MSM5232interface msm5232_interface = static MACHINE_DRIVER_START( buggychl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz??? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */ /* nmi is caused by the main cpu */ - MDRV_CPU_ADD(M68705,8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) /* video hardware */ diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c index eef127ff47d..2732ca807a4 100644 --- a/src/mame/drivers/bwidow.c +++ b/src/mame/drivers/bwidow.c @@ -683,7 +683,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( bwidow ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK / 8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(bwidow_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12) diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 5055a492277..713b82ccdf0 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -389,16 +389,15 @@ static MACHINE_RESET( bwing ) static MACHINE_DRIVER_START( bwing ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6809, 2000000) + MDRV_CPU_ADD("main", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(bwp1_readmem, bwp1_writemem) MDRV_CPU_VBLANK_INT_HACK(bwp1_interrupt, 3) - MDRV_CPU_ADD(M6809, 2000000) + MDRV_CPU_ADD("sub", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(bwp2_readmem, bwp2_writemem) // MDRV_CPU_VBLANK_INT("main", irq1_line_assert) // vblank triggers FIRQ on CPU2 by design (unused) - MDRV_CPU_ADD(DECO16, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", DECO16, 2000000) MDRV_CPU_PROGRAM_MAP(bwp3_readmem, bwp3_writemem) MDRV_CPU_IO_MAP(bwp3_readport, bwp3_writeport) MDRV_CPU_PERIODIC_INT(bwp3_interrupt, 1000) diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index b855b87e115..a058bd97ed6 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -575,7 +575,7 @@ static const struct CustomSound_interface redbaron_custom_interface = static MACHINE_DRIVER_START( bzone ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK / 8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(bzone_map,0) MDRV_CPU_PERIODIC_INT(bzone_interrupt, (double)MASTER_CLOCK / 4096 / 12) diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index 65784c1c88f..f95ce4ad0fa 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -501,12 +501,11 @@ static const struct MSM5205interface msm5205_interface_2 = static MACHINE_DRIVER_START( cabal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(seibu_sound_1) @@ -546,20 +545,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cabalbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cabalbl_main_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cabalbl_sound_map,0) /* there are 2x z80s for the ADPCM */ - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("adpcm1", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cabalbl_talk1_map,0) MDRV_CPU_IO_MAP(cabalbl_talk1_portmap,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("adpcm2", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cabalbl_talk2_map,0) MDRV_CPU_IO_MAP(cabalbl_talk2_portmap,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000) diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 9ad81bab533..e386d948aa0 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -1909,7 +1909,7 @@ static const struct AY8910interface sys905_ay8912_intf = static MACHINE_DRIVER_START( sys903 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, CPU_CLOCK) /* confirmed */ + MDRV_CPU_ADD("main", M6502, CPU_CLOCK) /* confirmed */ MDRV_CPU_PROGRAM_MAP(sys903_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 01e9e4e8414..e74f42f0950 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -360,11 +360,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( calorie ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(calorie_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,3000000) /* 3 MHz */ + MDRV_CPU_ADD("audio", Z80,3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(calorie_sound_map,0) MDRV_CPU_IO_MAP(calorie_sound_io_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 64) diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 20cae3493ab..6f6f7de800c 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -235,7 +235,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( canyon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) + MDRV_CPU_ADD("main", M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_WATCHDOG_VBLANK_INIT(8) diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 5e2b196fa85..4d2699088f9 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -353,12 +353,12 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( capbowl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809E, MASTER_CLOCK) + MDRV_CPU_ADD("main", M6809E, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(capbowl_map,0) MDRV_CPU_VBLANK_INT("main", capbowl_interrupt) /* audio CPU */ - MDRV_CPU_ADD(M6809E, MASTER_CLOCK) + MDRV_CPU_ADD("audio", M6809E, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(capbowl) diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index cc6f7dfad1c..439e8a8888d 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -194,7 +194,7 @@ static PALETTE_INIT(cardline) static MACHINE_DRIVER_START( cardline ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8051,12000000) + MDRV_CPU_ADD("main", I8051,12000000) MDRV_CPU_PROGRAM_MAP(mem_prg,0) MDRV_CPU_DATA_MAP(mem_data,0) MDRV_CPU_IO_MAP(mem_io,0) diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index d1129ed03c0..1a7affe9118 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -184,12 +184,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( carjmbre ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) + MDRV_CPU_ADD("main", Z80,18432000/6) MDRV_CPU_PROGRAM_MAP(carjmbre_readmem,carjmbre_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 1500000) MDRV_CPU_PROGRAM_MAP(carjmbre_sound_readmem,carjmbre_sound_writemem) MDRV_CPU_IO_MAP(carjmbre_sound_readport,carjmbre_sound_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index 9bbe9026278..fe4f0ad0b0a 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -236,7 +236,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( carpolo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,11289000/12) /* 940.75 kHz */ + MDRV_CPU_ADD("main", M6502,11289000/12) /* 940.75 kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", carpolo_timer_interrupt) /* this not strictly VBLANK, but it's supposed to happen 60 diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index ea75ace30aa..fb37f4eb818 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -290,7 +290,7 @@ static PALETTE_INIT(carrera) static MACHINE_DRIVER_START( carrera ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,MASTER_CLOCK/6) + MDRV_CPU_ADD("main", Z80,MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 4046b0c4da6..e5751cb7be5 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -2000,7 +2000,7 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( dfeveron ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dfeveron_readmem,dfeveron_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2039,7 +2039,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ddonpach ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(ddonpach_readmem,ddonpach_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2078,7 +2078,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( donpachi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(donpachi_readmem,donpachi_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2122,7 +2122,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( esprade ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(esprade_readmem,esprade_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2161,7 +2161,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gaia ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(gaia_readmem,gaia_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2199,7 +2199,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( guwange ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(guwange_readmem,guwange_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2237,12 +2237,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hotdogst ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(hotdogst_readmem,hotdogst_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(hotdogst_sound_readmem,hotdogst_sound_writemem) MDRV_CPU_IO_MAP(hotdogst_sound_readport,hotdogst_sound_writeport) @@ -2292,7 +2291,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( korokoro ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(korokoro_readmem,korokoro_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) @@ -2331,12 +2330,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mazinger ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(mazinger_readmem,mazinger_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) - MDRV_CPU_ADD(Z80, 4000000) -// /* audio CPU */ // Bidirectional communication + MDRV_CPU_ADD("audio", Z80, 4000000) // Bidirectional communication MDRV_CPU_PROGRAM_MAP(mazinger_sound_readmem,mazinger_sound_writemem) MDRV_CPU_IO_MAP(mazinger_sound_readport,mazinger_sound_writeport) @@ -2388,12 +2386,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( metmqstr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000 / 2) + MDRV_CPU_ADD("main", M68000,32000000 / 2) MDRV_CPU_PROGRAM_MAP(metmqstr_readmem,metmqstr_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) - MDRV_CPU_ADD(Z80,32000000 / 4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,32000000 / 4) MDRV_CPU_PROGRAM_MAP(metmqstr_sound_readmem,metmqstr_sound_writemem) MDRV_CPU_IO_MAP(metmqstr_sound_readport,metmqstr_sound_writeport) @@ -2446,12 +2443,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pwrinst2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(pwrinst2_readmem,pwrinst2_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) - MDRV_CPU_ADD(Z80,16000000 / 2) - /* audio CPU */ /* 8 MHz */ + MDRV_CPU_ADD("audio", Z80,16000000 / 2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(pwrinst2_sound_readmem,pwrinst2_sound_writemem) MDRV_CPU_IO_MAP(pwrinst2_sound_readport,pwrinst2_sound_writeport) @@ -2506,12 +2502,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sailormn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(sailormn_readmem,sailormn_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) - MDRV_CPU_ADD(Z80, 8000000) -// /* audio CPU */ // Bidirectional Communication + MDRV_CPU_ADD("audio", Z80, 8000000) // Bidirectional Communication MDRV_CPU_PROGRAM_MAP(sailormn_sound_readmem,sailormn_sound_writemem) MDRV_CPU_IO_MAP(sailormn_sound_readport,sailormn_sound_writeport) @@ -2561,7 +2556,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( uopoko ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(uopoko_readmem,uopoko_writemem) MDRV_CPU_VBLANK_INT("main", cave_interrupt) diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 63c1828d97a..0445edd7bbc 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -200,7 +200,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( cball ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 12096000 / 16) /* ? */ + MDRV_CPU_ADD("main", M6800, 12096000 / 16) /* ? */ MDRV_CPU_PROGRAM_MAP(cpu_map, 0) MDRV_MACHINE_RESET(cball) diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 373bce14edc..834f323b22e 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -240,7 +240,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( cbasebal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 6000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(cbasebal_map,0) MDRV_CPU_IO_MAP(cbasebal_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 6d61407bbc5..565f493017a 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -343,11 +343,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( twocrude ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* Custom chip 59 */ + MDRV_CPU_ADD("main", M68000, 12000000) /* Custom chip 59 */ MDRV_CPU_PROGRAM_MAP(twocrude_readmem,twocrude_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ - MDRV_CPU_ADD(H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ + MDRV_CPU_ADD("audio", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 5401c5cc34e..3a63144bf45 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -467,7 +467,7 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( ccastles ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_START(ccastles) diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c index 683c3744448..c044ed342c7 100644 --- a/src/mame/drivers/cchasm.c +++ b/src/mame/drivers/cchasm.c @@ -152,10 +152,10 @@ static MACHINE_DRIVER_START( cchasm ) MDRV_MACHINE_START(cchasm) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */ + MDRV_CPU_ADD("main", M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */ MDRV_CPU_PROGRAM_MAP(memmap,0) - MDRV_CPU_ADD(Z80,3584229) /* 3.58 MHz (from schematics) */ + MDRV_CPU_ADD("audio", Z80,3584229) /* 3.58 MHz (from schematics) */ MDRV_CPU_CONFIG(daisy_chain) MDRV_CPU_PROGRAM_MAP(sound_memmap,0) MDRV_CPU_IO_MAP(sound_portmap,0) diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index 735ae34c798..efe69cbf8d5 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -1066,7 +1066,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( root ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(cclimber_map,0) MDRV_CPU_IO_MAP(cclimber_portmap,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) @@ -1129,7 +1129,7 @@ static MACHINE_DRIVER_START( yamato ) MDRV_CPU_PROGRAM_MAP(yamato_map,0) MDRV_CPU_IO_MAP(yamato_portmap,0) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz ? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 3.072 MHz ? */ MDRV_CPU_PROGRAM_MAP(yamato_audio_map,0) MDRV_CPU_IO_MAP(yamato_audio_portmap,0) @@ -1170,11 +1170,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( swimmer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(swimmer_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80,4000000/2) + MDRV_CPU_ADD("audio", Z80,4000000/2) MDRV_CPU_PROGRAM_MAP(swimmer_audio_map,0) MDRV_CPU_IO_MAP(swimmer_audio_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 5621cd76f1c..1c6070f351f 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -1624,7 +1624,7 @@ static const struct POKEYinterface warlords_pokey_interface = static MACHINE_DRIVER_START( centiped ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */ + MDRV_CPU_ADD("main", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */ MDRV_CPU_PROGRAM_MAP(centiped_map,0) MDRV_MACHINE_START(centiped) @@ -1753,7 +1753,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bullsdrt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 12096000/8) + MDRV_CPU_ADD("main", S2650, 12096000/8) MDRV_CPU_PROGRAM_MAP(bullsdrt_map,0) MDRV_CPU_IO_MAP(bullsdrt_port_map,0) diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index a5f2ae006ed..1fd78223478 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -262,9 +262,9 @@ static MACHINE_DRIVER_START( chaknpop ) /* basic machine hardware */ /* the real board is 3.072MHz, but it is faster for MAME */ - //MDRV_CPU_ADD_TAG("main", Z80, 18432000 / 6) /* 3.072 MHz */ - MDRV_CPU_ADD_TAG("main", Z80, 2350000) - //MDRV_CPU_ADD_TAG("main", Z80, 2760000) + //MDRV_CPU_ADD("main", Z80, 18432000 / 6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 2350000) + //MDRV_CPU_ADD("main", Z80, 2760000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index f36c7569776..ee0029519cb 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -252,7 +252,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( cham24 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", N2A03, N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("main", N2A03, N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(cham24_map, 0) MDRV_MACHINE_RESET( cham24 ) diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 3dc06893807..dd00223cb9e 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -611,12 +611,12 @@ static MACHINE_DRIVER_START( talbot ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) + MDRV_CPU_ADD("main", Z80, XTAL_18_432MHz/6) MDRV_CPU_PROGRAM_MAP(talbot_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* MCU */ - MDRV_CPU_ADD_TAG(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8) + MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) /* video hardware */ @@ -645,12 +645,12 @@ static MACHINE_DRIVER_START( champbas ) /* basic machine hardware */ /* main cpu */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) + MDRV_CPU_ADD("main", Z80, XTAL_18_432MHz/6) MDRV_CPU_PROGRAM_MAP(champbas_main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* audio CPU */ - MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6) + MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) MDRV_CPU_PROGRAM_MAP(champbas_sub_map,0) /* video hardware */ @@ -684,7 +684,7 @@ static MACHINE_DRIVER_START( champmcu ) MDRV_IMPORT_FROM(champbas) /* MCU */ - MDRV_CPU_ADD_TAG(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8) + MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) /* to MCU timeout champbbj */ @@ -695,17 +695,17 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( exctsccr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4.0 MHz (?) */ MDRV_CPU_PROGRAM_MAP(exctsccr_main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 4123456) /* ??? with 4 MHz, nested NMIs might happen */ + MDRV_CPU_ADD("audio", Z80, 4123456) /* ??? with 4 MHz, nested NMIs might happen */ MDRV_CPU_PROGRAM_MAP(exctsccr_sub_map,0) MDRV_CPU_IO_MAP(0,exctsccr_sound_writeport) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000) /* 4 kHz, updates the dac */ /* MCU */ - MDRV_CPU_ADD_TAG(CPUTAG_MCU, ALPHA8301, XTAL_18_432MHz/6/8) + MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8301, XTAL_18_432MHz/6/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_MACHINE_START(exctsccr) @@ -751,11 +751,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( exctsccb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) + MDRV_CPU_ADD("main", Z80, XTAL_18_432MHz/6) MDRV_CPU_PROGRAM_MAP(exctsccb_main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6) + MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) MDRV_CPU_PROGRAM_MAP(champbas_sub_map,0) /* video hardware */ diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 16b089e8527..69b645b7f19 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -331,7 +331,7 @@ static const struct x1_010_interface champbwl_sound_intf = static MACHINE_DRIVER_START( champbwl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 16000000/4) /* 4MHz */ + MDRV_CPU_ADD("main", Z80, 16000000/4) /* 4MHz */ MDRV_CPU_PROGRAM_MAP(champbwl_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 151bcd9c34e..5c493467d8b 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -496,11 +496,11 @@ static INTERRUPT_GEN( chl_interrupt ) static MACHINE_DRIVER_START( changela ) - MDRV_CPU_ADD_TAG("main", Z80,5000000) + MDRV_CPU_ADD("main", Z80,5000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(chl_interrupt,4) - MDRV_CPU_ADD(M68705,2500000) + MDRV_CPU_ADD("mcu", M68705,2500000) MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) MDRV_MACHINE_RESET(changela) diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c index 85def072405..fca504cfd52 100644 --- a/src/mame/drivers/cheekyms.c +++ b/src/mame/drivers/cheekyms.c @@ -120,7 +120,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( cheekyms ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,5000000/2) /* 2.5 MHz */ + MDRV_CPU_ADD("main", Z80,5000000/2) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c index a8b6f4fbef6..915e8bf5393 100644 --- a/src/mame/drivers/cherrym.c +++ b/src/mame/drivers/cherrym.c @@ -373,7 +373,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( cmv801 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // ??? + MDRV_CPU_ADD("main", Z80, 8000000/2) // ??? MDRV_CPU_PROGRAM_MAP(cm_map, 0) MDRV_CPU_IO_MAP(cm_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c index a251885e2af..06cdec5c0aa 100644 --- a/src/mame/drivers/cherrym2.c +++ b/src/mame/drivers/cherrym2.c @@ -353,7 +353,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( cm2v841 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // ??? + MDRV_CPU_ADD("main", Z80, 8000000/2) // ??? MDRV_CPU_PROGRAM_MAP(cm_map, 0) MDRV_CPU_IO_MAP(cm_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 6e9c9c41697..ac04ea5c582 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -494,14 +494,14 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( chinagat ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */ + MDRV_CPU_ADD("main", HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", chinagat_interrupt) - MDRV_CPU_ADD(HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */ + MDRV_CPU_ADD("sub", HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD(Z80, 3579545) /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_INTERLEAVE(100) /* heavy interleaving to sync up sprite<->main cpu's */ @@ -538,17 +538,17 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( saiyugb1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ + MDRV_CPU_ADD("main", M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", chinagat_interrupt) - MDRV_CPU_ADD(M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ + MDRV_CPU_ADD("sub", M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD(Z80, 3579545) /* 3.579545 MHz oscillator */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz oscillator */ MDRV_CPU_PROGRAM_MAP(saiyugb1_sound_map,0) - MDRV_CPU_ADD(I8048,9263750/3) /* 3.087916 MHz (9.263750 MHz oscillator) */ + MDRV_CPU_ADD("mcu", I8048,9263750/3) /* 3.087916 MHz (9.263750 MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(i8748_map,0) MDRV_CPU_IO_MAP(i8748_portmap,0) @@ -586,14 +586,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( saiyugb2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */ + MDRV_CPU_ADD("main", M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", chinagat_interrupt) - MDRV_CPU_ADD(M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */ + MDRV_CPU_ADD("sub", M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD(Z80, 3579545) /* 3.579545 MHz oscillator */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz oscillator */ MDRV_CPU_PROGRAM_MAP(ym2203c_sound_map,0) MDRV_INTERLEAVE(100) /* heavy interleaving to sync up sprite<->main cpu's */ diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index f7654544c15..98b223d52a0 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -461,7 +461,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( chinsan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10000000/2) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,10000000/2) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(chinsan_map,0) MDRV_CPU_IO_MAP(chinsan_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 11a1ecccf87..ae2ae66c592 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -360,12 +360,11 @@ static const struct K007232_interface k007232_interface_2 = static MACHINE_DRIVER_START( chqflag ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */ + MDRV_CPU_ADD("main", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(chqflag_readmem,chqflag_writemem) MDRV_CPU_VBLANK_INT_HACK(chqflag_interrupt,16) /* ? */ - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chqflag_readmem_sound,chqflag_writemem_sound) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index d5b3d2e2fe1..9c997f6498f 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -589,7 +589,7 @@ static MACHINE_DRIVER_START( destryer ) // basic system hardware - MDRV_CPU_ADD_TAG("main", CDP1802, DESTRYER_CHR1) + MDRV_CPU_ADD("main", CDP1802, DESTRYER_CHR1) MDRV_CPU_PROGRAM_MAP(destryer_map, 0) MDRV_CPU_IO_MAP(destryer_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) @@ -615,7 +615,7 @@ static MACHINE_DRIVER_START( destryea ) // basic system hardware - MDRV_CPU_ADD_TAG("main", CDP1802, DESTRYER_CHR1) + MDRV_CPU_ADD("main", CDP1802, DESTRYER_CHR1) MDRV_CPU_PROGRAM_MAP(destryea_map, 0) MDRV_CPU_IO_MAP(destryer_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) @@ -641,7 +641,7 @@ static MACHINE_DRIVER_START( altair ) // basic system hardware - MDRV_CPU_ADD_TAG("main", CDP1802, ALTAIR_CHR1) + MDRV_CPU_ADD("main", CDP1802, ALTAIR_CHR1) MDRV_CPU_PROGRAM_MAP(altair_map, 0) MDRV_CPU_IO_MAP(altair_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) @@ -680,7 +680,7 @@ static MACHINE_DRIVER_START( draco ) // basic system hardware - MDRV_CPU_ADD_TAG("main", CDP1802, DRACO_CHR1) + MDRV_CPU_ADD("main", CDP1802, DRACO_CHR1) MDRV_CPU_PROGRAM_MAP(draco_map, 0) MDRV_CPU_IO_MAP(draco_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) @@ -689,7 +689,7 @@ static MACHINE_DRIVER_START( draco ) MDRV_MACHINE_START(draco) MDRV_MACHINE_RESET(cidelsa) - MDRV_CPU_ADD(COP420, DRACO_SND_CHR1) // COP402N + MDRV_CPU_ADD("audio", COP420, DRACO_SND_CHR1) // COP402N MDRV_CPU_PROGRAM_MAP(draco_sound_map, 0) MDRV_CPU_IO_MAP(draco_sound_io_map, 0) MDRV_CPU_CONFIG(draco_cop_intf) diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index e64afe74d40..4df4966caff 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -980,7 +980,7 @@ static const struct CCPUConfig config_jmi = static MACHINE_DRIVER_START( cinemat_nojmi_4k ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", CCPU, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", CCPU, MASTER_CLOCK/4) MDRV_CPU_CONFIG(config_nojmi) MDRV_CPU_PROGRAM_MAP(program_map_4k,0) MDRV_CPU_DATA_MAP(data_map,0) diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 070c94a9045..e8dc13fb988 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -271,7 +271,7 @@ static INTERRUPT_GEN( ripcord_interrupt ) static MACHINE_DRIVER_START( circus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,11289000/16) /* 705.562kHz */ + MDRV_CPU_ADD("main", M6502,11289000/16) /* 705.562kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -306,7 +306,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( robotbwl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,11289000/16) /* 705.562kHz */ + MDRV_CPU_ADD("main", M6502,11289000/16) /* 705.562kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -340,7 +340,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( crash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,11289000/16) /* 705.562kHz */ + MDRV_CPU_ADD("main", M6502,11289000/16) /* 705.562kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) @@ -374,7 +374,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ripcord ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 705562) /* 11.289MHz / 16 */ + MDRV_CPU_ADD("main", M6502, 705562) /* 11.289MHz / 16 */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) //MDRV_CPU_VBLANK_INT("main", ripcord_interrupt) //AT diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 5f983439b7a..55231c8a63e 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -320,13 +320,13 @@ DISCRETE_SOUND_END static MACHINE_DRIVER_START( circusc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 2 MHz */ + MDRV_CPU_ADD("main", M6809, 2048000) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_WATCHDOG_VBLANK_INIT(8) /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ - MDRV_CPU_ADD(Z80,14318180/4) + MDRV_CPU_ADD("audio", Z80,14318180/4) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_START(circusc) diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index 7236997eae2..a8fd02ce261 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -1747,19 +1747,19 @@ static INTERRUPT_GEN( cischeat_interrupt ) static MACHINE_DRIVER_START( bigrun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu1", M68000, 10000000) + MDRV_CPU_ADD("cpu1", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(bigrun_readmem,bigrun_writemem) MDRV_CPU_VBLANK_INT_HACK(cischeat_interrupt,CISCHEAT_INTERRUPT_NUM) - MDRV_CPU_ADD_TAG("cpu2", M68000, 10000000) + MDRV_CPU_ADD("cpu2", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(bigrun_readmem2,bigrun_writemem2) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("cpu3", M68000, 10000000) + MDRV_CPU_ADD("cpu3", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(bigrun_readmem3,bigrun_writemem3) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", M68000, 6000000) + MDRV_CPU_ADD("sound", M68000, 6000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(bigrun_sound_readmem,bigrun_sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM) @@ -1863,7 +1863,7 @@ static MACHINE_DRIVER_START( f1gpstr2 ) MDRV_CPU_MODIFY("sound") MDRV_CPU_PROGRAM_MAP(f1gpstr2_sound_readmem,f1gpstr2_sound_writemem) - MDRV_CPU_ADD_TAG("cpu5", M68000, 10000000) + MDRV_CPU_ADD("cpu5", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(f1gpstr2_io_readmem,f1gpstr2_io_writemem) MACHINE_DRIVER_END @@ -1893,7 +1893,7 @@ static INTERRUPT_GEN( interrupt_scudhamm ) static MACHINE_DRIVER_START( scudhamm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000, 12000000) + MDRV_CPU_ADD("main",M68000, 12000000) MDRV_CPU_PROGRAM_MAP(readmem_scudhamm,writemem_scudhamm) MDRV_CPU_VBLANK_INT_HACK(interrupt_scudhamm,INTERRUPT_NUM_SCUDHAMM) diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index ad624fb7b53..1c97099aae5 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -214,12 +214,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( citycon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 2.048 MHz ??? */ + MDRV_CPU_ADD("main", M6809, 2048000) /* 2.048 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6809, 640000) - /* audio CPU */ /* 0.640 MHz ??? */ + MDRV_CPU_ADD("audio", M6809, 640000) /* 0.640 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index 0541551a096..3b170a081a1 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -303,7 +303,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( clayshoo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */ + MDRV_CPU_ADD("main", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 5b0b326c521..09a03c48b65 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -736,7 +736,7 @@ extern const discrete_sound_block cliffhgr_discrete_interface[]; static MACHINE_DRIVER_START( cliffhgr ) - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4MHz */ MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainport,0) MDRV_CPU_VBLANK_INT("main", cliff_vsync) diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index 1149a5c944b..58cd603ebce 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -325,11 +325,11 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( cloak ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,1000000) /* 1 MHz ???? */ + MDRV_CPU_ADD("main", M6502,1000000) /* 1 MHz ???? */ MDRV_CPU_PROGRAM_MAP(master_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) - MDRV_CPU_ADD(M6502,1250000) /* 1.25 MHz ???? */ + MDRV_CPU_ADD("slave", M6502,1250000) /* 1.25 MHz ???? */ MDRV_CPU_PROGRAM_MAP(slave_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index 7f9e6e8563d..f61b3162ba8 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -457,7 +457,7 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( cloud9 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(cloud9_map,0) MDRV_MACHINE_START(cloud9) diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c index 1e85a27edfc..1de54f24438 100644 --- a/src/mame/drivers/clshroad.c +++ b/src/mame/drivers/clshroad.c @@ -282,12 +282,11 @@ static const struct CustomSound_interface custom_interface = static MACHINE_DRIVER_START( firebatl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* ? */ + MDRV_CPU_ADD("main", Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(clshroad_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ - MDRV_CPU_ADD(Z80, 3000000) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(clshroad_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ @@ -319,12 +318,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( clshroad ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/4) /* ? real speed unknown. 3MHz is too low and causes problems */ + MDRV_CPU_ADD("main", Z80, 18432000/4) /* ? real speed unknown. 3MHz is too low and causes problems */ MDRV_CPU_PROGRAM_MAP(clshroad_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ - MDRV_CPU_ADD(Z80, 18432000/6) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 18432000/6) /* ? */ MDRV_CPU_PROGRAM_MAP(clshroad_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 7e090111224..942ed27a701 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -779,12 +779,11 @@ static const struct YM2151interface ym2151_interface2 = static MACHINE_DRIVER_START( cninja ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(cninja_readmem,cninja_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(H6280,32220000/8) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", H6280,32220000/8) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(cninja) @@ -828,12 +827,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( stoneage ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(cninja_readmem,cninja_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(stoneage_s_readmem,stoneage_s_writemem) MDRV_MACHINE_RESET(cninja) @@ -874,12 +872,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( edrandy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(edrandy_readmem,edrandy_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(H6280,32220000/8) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", H6280,32220000/8) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(cninja) @@ -923,12 +920,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( robocop2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(robocop2_readmem,robocop2_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(H6280,32220000/8) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", H6280,32220000/8) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(cninja) @@ -975,12 +971,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mutantf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(mutantf_readmem,mutantf_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280,32220000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem_mutantf,sound_writemem_mutantf) /* video hardware */ diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 7307fe29b2e..f7cf009fc57 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -716,16 +716,15 @@ static MACHINE_RESET( zerotrgt ) static MACHINE_DRIVER_START( cntsteer ) - MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ? */ + MDRV_CPU_ADD("main", M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ - MDRV_CPU_ADD(M6809, 2000000) /* ? */ + MDRV_CPU_ADD("sub", M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map,0) // MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ -// MDRV_CPU_ADD(M6502, 1500000) /* ? */ -// /* audio CPU */ +// MDRV_CPU_ADD("audio", M6502, 1500000) /* ? */ // MDRV_CPU_PROGRAM_MAP(sound_map,0) // MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* ? */ // should be interrupt, 16? @@ -751,16 +750,15 @@ static MACHINE_DRIVER_START( cntsteer ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( zerotrgt ) - MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ? */ + MDRV_CPU_ADD("main", M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ - MDRV_CPU_ADD(M6809, 2000000) /* ? */ + MDRV_CPU_ADD("sub", M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map,0) // MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ - MDRV_CPU_ADD(M6502, 1500000) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) /* ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,16) /* ? */ // should be interrupt, 16? MDRV_CPU_PERIODIC_INT(sound_interrupt, 1000) diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index ee1f0bcfa9d..03880cd6caa 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -630,7 +630,7 @@ static const struct AY8910interface ay8912_interface = }; static MACHINE_DRIVER_START( coinmstr ) - MDRV_CPU_ADD_TAG("cpu",Z80,8000000) // ? + MDRV_CPU_ADD("cpu",Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(coinmstr_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 98f48646d71..4e99467a4a4 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -991,15 +991,15 @@ static const struct jaguar_config dsp_config = static MACHINE_DRIVER_START( cojagr3k ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R3041BE, R3000_CLOCK) + MDRV_CPU_ADD("main", R3041BE, R3000_CLOCK) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(r3000_map,0) - MDRV_CPU_ADD(JAGUARGPU, JAGUAR_CLOCK/2) + MDRV_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK/2) MDRV_CPU_CONFIG(gpu_config) MDRV_CPU_PROGRAM_MAP(gpu_map,0) - MDRV_CPU_ADD(JAGUARDSP, JAGUAR_CLOCK/2) + MDRV_CPU_ADD("audio", JAGUARDSP, JAGUAR_CLOCK/2) MDRV_CPU_CONFIG(dsp_config) MDRV_CPU_PROGRAM_MAP(dsp_map,0) diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 48580fe58e7..511a11090de 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -668,12 +668,11 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( combasc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 3 MHz? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* 3 MHz? */ MDRV_CPU_PROGRAM_MAP(combasc_readmem,combasc_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,3579545) /* 3.579545 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(combasc_readmem_sound,combasc_writemem_sound) MDRV_INTERLEAVE(20) @@ -711,12 +710,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( combascb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 3 MHz? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* 3 MHz? */ MDRV_CPU_PROGRAM_MAP(combascb_readmem,combascb_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,3579545) /* 3.579545 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(combasc_readmem_sound,combasc_writemem_sound) /* FAKE */ MDRV_INTERLEAVE(20) diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c index e2ba266dc83..d269da57a9a 100644 --- a/src/mame/drivers/comebaby.c +++ b/src/mame/drivers/comebaby.c @@ -77,7 +77,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( comebaby ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/ + MDRV_CPU_ADD("main", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/ MDRV_CPU_PROGRAM_MAP(comebaby_map, 0) /* video hardware */ diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 646b28b3a26..c76df5b51ad 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -239,12 +239,11 @@ static INTERRUPT_GEN( commando_interrupt ) static MACHINE_DRIVER_START( commando ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, PHI_MAIN) // ??? + MDRV_CPU_ADD("main", Z80, PHI_MAIN) // ??? MDRV_CPU_PROGRAM_MAP(commando_map, 0) MDRV_CPU_VBLANK_INT("main", commando_interrupt) - MDRV_CPU_ADD(Z80, PHI_B) // 3 MHz - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, PHI_B) // 3 MHz MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 859781e8c67..27ef17e3da1 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -212,7 +212,7 @@ static const struct YM2203interface ym2203_interface = }; static MACHINE_DRIVER_START( compgolf ) - MDRV_CPU_ADD_TAG("main", M6809, 2000000) + MDRV_CPU_ADD("main", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 97420298e56..585ad8a2e49 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -246,12 +246,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( contra ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) + MDRV_CPU_ADD("main", M6809, 1500000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6809, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index de70a78445a..d5cbaf80545 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -684,11 +684,11 @@ static const tms34010_config tms_config_coolpool = static MACHINE_DRIVER_START( amerdart ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, 40000000) + MDRV_CPU_ADD("main", TMS34010, 40000000) MDRV_CPU_CONFIG(tms_config_amerdart) MDRV_CPU_PROGRAM_MAP(amerdart_map,0) - MDRV_CPU_ADD(TMS32010, 15000000/2) + MDRV_CPU_ADD("dsp", TMS32010, 15000000/2) MDRV_CPU_FLAGS(CPU_DISABLE) MDRV_CPU_PROGRAM_MAP(amerdart_dsp_map,0) @@ -713,11 +713,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( coolpool ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, 40000000) + MDRV_CPU_ADD("main", TMS34010, 40000000) MDRV_CPU_CONFIG(tms_config_coolpool) MDRV_CPU_PROGRAM_MAP(coolpool_map,0) - MDRV_CPU_ADD(TMS32026,40000000) + MDRV_CPU_ADD("dsp", TMS32026,40000000) MDRV_CPU_PROGRAM_MAP(dsp_program_map,0) MDRV_CPU_IO_MAP(dsp_io_map,0) diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 71a9568dec3..96ca8d5d3fc 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -154,14 +154,14 @@ static MACHINE_RESET ( coolridr ) } static MACHINE_DRIVER_START( coolridr ) - MDRV_CPU_ADD_TAG("main", SH2, 28000000) // ?? mhz + MDRV_CPU_ADD("main", SH2, 28000000) // ?? mhz MDRV_CPU_PROGRAM_MAP(system_h1_map,0) MDRV_CPU_VBLANK_INT_HACK(system_h1, 2) - MDRV_CPU_ADD_TAG("sound", M68000, 12000000) // ?? mhz + MDRV_CPU_ADD("sound", M68000, 12000000) // ?? mhz MDRV_CPU_PROGRAM_MAP(system_h1_sound_map,0) - MDRV_CPU_ADD_TAG("sub", SH2, 8000000) // SH7032 HD6417032F20!! ?? mhz + MDRV_CPU_ADD("sub", SH2, 8000000) // SH7032 HD6417032F20!! ?? mhz MDRV_CPU_PROGRAM_MAP(coolridr_submap,0) MDRV_CPU_VBLANK_INT_HACK(system_h1_sub, 2) diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index 7a4a45436ae..40682a4bb02 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -414,13 +414,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( cop01 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* ???? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* ???? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -455,13 +454,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mightguy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* ???? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(mightguy_readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* ???? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(mightguy_sound_readport,mightguy_sound_writeport) diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c index c83e8cdf480..0b328b37f9d 100644 --- a/src/mame/drivers/copsnrob.c +++ b/src/mame/drivers/copsnrob.c @@ -257,7 +257,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( copsnrob ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,14318180/16) /* 894886.25 kHz */ + MDRV_CPU_ADD("main", M6502,14318180/16) /* 894886.25 kHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) /* video hardware */ diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 71834cccef9..936b4e196fa 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -987,7 +987,7 @@ static const struct Samplesinterface cosmicg_samples_interface = static MACHINE_DRIVER_START( cosmic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10816000/6) /* 1.802 MHz*/ + MDRV_CPU_ADD("main", Z80,10816000/6) /* 1.802 MHz*/ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1047,7 +1047,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cosmicg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS9980, 1228500) + MDRV_CPU_ADD("main", TMS9980, 1228500) /* 9.828 MHz Crystal */ /* R Nabet : huh ? This would imply the crystal frequency is somehow divided by 2 before being fed to the tms9904 or tms9980. Also, I have never heard of a tms9900/9980 operating under diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c index 9af57fde869..496d2cc5441 100644 --- a/src/mame/drivers/couple.c +++ b/src/mame/drivers/couple.c @@ -434,7 +434,7 @@ static GFXDECODE_START( couple ) GFXDECODE_END static MACHINE_DRIVER_START( couple ) - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* ?? */ + MDRV_CPU_ADD("main", Z80,18432000/6) /* ?? */ MDRV_CPU_PROGRAM_MAP(merit_mem,0) MDRV_CPU_IO_MAP(merit_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index 90362893350..ee85d34cfa7 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -164,12 +164,12 @@ static const struct YM2203interface ym2203_interface_1 = static MACHINE_DRIVER_START( cowrace ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(mem_map_cowrace,0) MDRV_CPU_IO_MAP(io_map_cowrace,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(mem_map_sound_cowrace,0) MDRV_CPU_IO_MAP(io_map_sound_cowrace,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // NMI by main CPU diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 58877114dd5..2dfa1fe1234 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -3607,11 +3607,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( cps1_10MHz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", cps1_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 3579545) + MDRV_CPU_ADD("sound", Z80, 3579545) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sub_map,0) @@ -3692,11 +3692,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cpspicb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", cps1_qsound_interrupt) - MDRV_CPU_ADD_TAG("sound", PIC16C57, 12000000) + MDRV_CPU_ADD("sound", PIC16C57, 12000000) MDRV_CPU_FLAGS(CPU_DISABLE) /* no valid dumps .. */ /* video hardware */ @@ -3767,11 +3767,11 @@ static const struct MSM5205interface msm5205_interface2 = static MACHINE_DRIVER_START( sf2mdt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", cps1_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 3579545) + MDRV_CPU_ADD("sound", Z80, 3579545) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sf2mdt_z80map,0) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index d12246ff04b..654260c33bd 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -1235,12 +1235,12 @@ static const struct m68k_encryption_interface cps2_encryption = static MACHINE_DRIVER_START( cps2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_CONFIG(cps2_encryption) MDRV_CPU_PROGRAM_MAP(cps2_readmem,cps2_writemem) MDRV_CPU_VBLANK_INT_HACK(cps2_interrupt,262) // 262 /* ??? interrupts per frame */ - MDRV_CPU_ADD(Z80, 8000000) + MDRV_CPU_ADD("audio", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(qsound_sub_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 251) /* 251 is good (see 'mercy mercy mercy'section of sgemf attract mode for accurate sound sync */ diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index d79818ae9de..ea3080029e7 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2671,7 +2671,7 @@ static NVRAM_HANDLER( cps3 ) static MACHINE_DRIVER_START( cps3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the intenral multiplier to 4x (this should probably be handled in the core..) + MDRV_CPU_ADD("main", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the intenral multiplier to 4x (this should probably be handled in the core..) MDRV_CPU_PROGRAM_MAP(cps3_map,0) MDRV_CPU_VBLANK_INT("main", cps3_vbl_interrupt) MDRV_CPU_PERIODIC_INT(cps3_other_interrupt,80) /* ?source? */ diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index c5038157d10..77d8adbe5d7 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -360,7 +360,7 @@ static MACHINE_RESET( crballoon ) static MACHINE_DRIVER_START( crbaloon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CRBALOON_MASTER_XTAL / 3) + MDRV_CPU_ADD("main", Z80, CRBALOON_MASTER_XTAL / 3) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 3976fbc1937..80938c87882 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -363,11 +363,11 @@ static const struct MSM5205interface msm5205_intf = static MACHINE_DRIVER_START( crgolf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,MASTER_CLOCK/3/2) + MDRV_CPU_ADD("main", Z80,MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,MASTER_CLOCK/3/2) + MDRV_CPU_ADD("audio", Z80,MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 00fa2f1fb67..453fd8b6db1 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -365,12 +365,11 @@ static const struct K007232_interface k007232_interface = static MACHINE_DRIVER_START( crimfght ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(crimfght_readmem,crimfght_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3579545) /* verified with PCB */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* verified with PCB */ MDRV_CPU_PROGRAM_MAP(crimfght_readmem_sound,crimfght_writemem_sound) MDRV_MACHINE_RESET(crimfght) diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 34a0cc7cf60..e2fe15ee954 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -403,12 +403,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( crospang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14318180/2) + MDRV_CPU_ADD("main", M68000, 14318180/2) MDRV_CPU_PROGRAM_MAP(crospang_readmem,crospang_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 14318180/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 14318180/4) MDRV_CPU_PROGRAM_MAP(crospang_sound_readmem,crospang_sound_writemem) MDRV_CPU_IO_MAP(crospang_sound_readport,crospang_sound_writeport) @@ -441,12 +440,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bestri ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14318180/2) + MDRV_CPU_ADD("main", M68000, 14318180/2) MDRV_CPU_PROGRAM_MAP(bestri_readmem,bestri_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 14318180/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 14318180/4) MDRV_CPU_PROGRAM_MAP(crospang_sound_readmem,crospang_sound_writemem) MDRV_CPU_IO_MAP(crospang_sound_readport,crospang_sound_writeport) diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index f416cf42e4e..f2f13318938 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -622,12 +622,11 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( crshrace ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("main", M68000,16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 3cfb3a0fbbf..c9682fc7b8e 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -804,7 +804,7 @@ static const struct VR0Interface vr0_interface = static MACHINE_DRIVER_START( crystal ) - MDRV_CPU_ADD_TAG("main", SE3208, 43000000) + MDRV_CPU_ADD("main", SE3208, 43000000) MDRV_CPU_PROGRAM_MAP(crystal_mem,0) MDRV_CPU_VBLANK_INT("main", crystal_interrupt) diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index eeb412d56f1..616c711b13c 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -469,12 +469,12 @@ static GFXDECODE_START( cshooter ) GFXDECODE_END static MACHINE_DRIVER_START( cshooter ) - MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80,XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2) - MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80,XTAL_14_31818MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(s_readmem,s_writemem) MDRV_CPU_IO_MAP(s_readport,s_writeport) @@ -500,12 +500,12 @@ static MACHINE_DRIVER_START( cshooter ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( airraid ) - MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80,XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(arreadmem,arwritemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2) - MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80,XTAL_14_31818MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(s2_readmem,s2_writemem) MDRV_CPU_IO_MAP(s_readport,s_writeport) diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c index 3de4714b84d..596f2760e45 100644 --- a/src/mame/drivers/csk.c +++ b/src/mame/drivers/csk.c @@ -736,7 +736,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( cpoker ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80, 3579545) + MDRV_CPU_ADD("main",Z80, 3579545) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(cpoker_map,0) MDRV_CPU_VBLANK_INT_HACK(cpoker_interrupt,8) diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index 4ecc8bdc83f..9b252e6daaf 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -227,7 +227,7 @@ static const struct CustomSound_interface amiga_custom_interface = static MACHINE_DRIVER_START( cd32 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */ + MDRV_CPU_ADD("main", M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */ MDRV_CPU_PROGRAM_MAP(cd32_map,0) MDRV_MACHINE_RESET(amiga) diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index b9f2b43dc7a..7b86fda72cd 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -357,7 +357,7 @@ static INTERRUPT_GEN( cultures_interrupt ) static MACHINE_DRIVER_START( cultures ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 8.000 MHz */ + MDRV_CPU_ADD("main", Z80, MCLK/2) /* 8.000 MHz */ MDRV_CPU_PROGRAM_MAP(cultures_map,0) MDRV_CPU_IO_MAP(cultures_io_map,0) MDRV_CPU_VBLANK_INT("main", cultures_interrupt) diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 255f3f802bf..546c052c0b6 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -1012,16 +1012,16 @@ GFXDECODE_END static MACHINE_DRIVER_START( cvs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 894886.25) + MDRV_CPU_ADD("main", S2650, 894886.25) MDRV_CPU_PROGRAM_MAP(cvs_main_cpu_map,0) MDRV_CPU_IO_MAP(cvs_main_cpu_io_map,0) MDRV_CPU_VBLANK_INT("main", cvs_main_cpu_interrupt) - MDRV_CPU_ADD(S2650, 894886.25) + MDRV_CPU_ADD("audio", S2650, 894886.25) MDRV_CPU_PROGRAM_MAP(cvs_dac_cpu_map,0) MDRV_CPU_IO_MAP(cvs_dac_cpu_io_map,0) - MDRV_CPU_ADD(S2650, 894886.25) + MDRV_CPU_ADD("speech", S2650, 894886.25) MDRV_CPU_PROGRAM_MAP(cvs_speech_cpu_map,0) MDRV_CPU_IO_MAP(cvs_speech_cpu_io_map,0) diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index 489787db1d8..350910a33df 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -433,18 +433,18 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( cyberbal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) + MDRV_CPU_ADD("audio", M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)ATARI_CLOCK_14MHz/4/4/16/16/14) - MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(extra_map,0) MDRV_CPU_VBLANK_INT("left", atarigen_video_int_gen) /* or is it "right?" */ - MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(sound_68k_map,0) MDRV_CPU_PERIODIC_INT(cyberbal_sound_68k_irq_gen, 10000) @@ -492,7 +492,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cyberb2p ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(cyberb2p_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index c9e7a9bfd20..21fef86025b 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -563,15 +563,15 @@ static const struct Y8950interface y8950_interface = { }; static MACHINE_DRIVER_START( cybertnk ) - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) + MDRV_CPU_ADD("main", M68000,20000000/2) MDRV_CPU_PROGRAM_MAP(master_mem,0) MDRV_CPU_VBLANK_INT_HACK(master_irq,2) - MDRV_CPU_ADD(M68000,20000000/2) + MDRV_CPU_ADD("slave", M68000,20000000/2) MDRV_CPU_PROGRAM_MAP(slave_mem,0) MDRV_CPU_VBLANK_INT_HACK(slave_irq,2) - MDRV_CPU_ADD(Z80,3579500) + MDRV_CPU_ADD("audio", Z80,3579500) MDRV_CPU_PROGRAM_MAP(sound_mem,0) MDRV_INTERLEAVE(100)//arbitrary value,needed to get the communication to work diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index deda89b6530..9fc3e13ffc4 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -401,12 +401,12 @@ static struct MSM5205interface msm_interface = static MACHINE_DRIVER_START( dacholer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* ? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* ? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(snd_map, 0) MDRV_CPU_IO_MAP(snd_io_map, 0) MDRV_CPU_VBLANK_INT("main",sound_irq) diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c index dd8e9b50dbf..de18ba8a453 100644 --- a/src/mame/drivers/dambustr.c +++ b/src/mame/drivers/dambustr.c @@ -181,7 +181,7 @@ static DRIVER_INIT(dambustr) static MACHINE_DRIVER_START( dambustr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(dambustr_readmem, dambustr_writemem) MDRV_MACHINE_RESET(galaxold) diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index a6fc387b60c..d7ad72a2a86 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -836,20 +836,18 @@ static const struct YM2203interface ym2203_interface_2 = static MACHINE_DRIVER_START( darius ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8 MHz ? */ + MDRV_CPU_ADD("main", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_readmem,darius_writemem) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz ? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_sound_readmem,darius_sound_writemem) - MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ + MDRV_CPU_ADD("cpub", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_cpub_readmem,darius_cpub_writemem) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ? */ - /* audio CPU */ /* ADPCM player using MSM5205 */ + MDRV_CPU_ADD("adpcm", Z80,8000000/2) /* 4 MHz ? */ /* ADPCM player using MSM5205 */ MDRV_CPU_PROGRAM_MAP(darius_sound2_readmem,darius_sound2_writemem) MDRV_CPU_IO_MAP(darius_sound2_readport,darius_sound2_writeport) diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 66ec8a5409f..212adc042ed 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -593,7 +593,7 @@ static INTERRUPT_GEN( darkhors ) } static MACHINE_DRIVER_START( darkhors ) - MDRV_CPU_ADD_TAG("main", M68EC020, 12000000) // 36MHz/3 ?? + MDRV_CPU_ADD("main", M68EC020, 12000000) // 36MHz/3 ?? MDRV_CPU_PROGRAM_MAP(darkhors_readmem,darkhors_writemem) MDRV_CPU_VBLANK_INT_HACK(darkhors,3) diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index 2bd3cfb66f2..f22e80e80bc 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -247,11 +247,11 @@ static INTERRUPT_GEN( darkmist_interrupt ) static MACHINE_DRIVER_START( darkmist ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(memmap, 0) MDRV_CPU_VBLANK_INT_HACK(darkmist_interrupt,2) - MDRV_CPU_ADD_TAG(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ + MDRV_CPU_ADD(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(t5182_map, 0) MDRV_CPU_IO_MAP(t5182_io, 0) diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index 906cf1961ec..d161c4e5ec0 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -286,12 +286,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( darkseal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) /* Custom chip 59 */ + MDRV_CPU_ADD("main", M68000,12000000) /* Custom chip 59 */ MDRV_CPU_PROGRAM_MAP(darkseal_readmem,darkseal_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(H6280, 32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index b85d7f38ebb..82785f241c7 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -553,16 +553,15 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( dassault ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* Accurate */ + MDRV_CPU_ADD("main", M68000, 14000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(dassault_readmem,dassault_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(M68000, 14000000) /* Accurate */ + MDRV_CPU_ADD("sub", M68000, 14000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(dassault_sub_readmem,dassault_sub_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(H6280,32220000/8) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", H6280,32220000/8) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(140) /* 140 CPU slices per frame */ diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index e229d38485e..4f40719fdb3 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -538,11 +538,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( dblewing ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* DE102 */ + MDRV_CPU_ADD("main", M68000, 14000000) /* DE102 */ MDRV_CPU_PROGRAM_MAP(dblewing_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 90c02100bb0..22209485d3d 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -437,12 +437,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( dbz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dbz_readmem,dbz_writemem) MDRV_CPU_VBLANK_INT_HACK(dbz_interrupt,2) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(dbz_sound_readmem, dbz_sound_writemem) MDRV_CPU_IO_MAP(0,dbz_sound_writeport) diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 703ffaae7ea..12b8ce3c480 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -396,11 +396,11 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( dcheese ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MAIN_OSC) + MDRV_CPU_ADD("main", M68000, MAIN_OSC) MDRV_CPU_PROGRAM_MAP(main_cpu_map,0) MDRV_CPU_VBLANK_INT("main", dcheese_vblank) - MDRV_CPU_ADD(M6809, SOUND_OSC/16) + MDRV_CPU_ADD("audio", M6809, SOUND_OSC/16) MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 480) /* accurate for fredmem */ diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c index d20695c40e3..f163a38b1f0 100644 --- a/src/mame/drivers/dcon.c +++ b/src/mame/drivers/dcon.c @@ -275,7 +275,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( dcon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -304,7 +304,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sdgndmps ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c index 62ef45d330f..1e23a9353c8 100644 --- a/src/mame/drivers/dday.c +++ b/src/mame/drivers/dday.c @@ -258,7 +258,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( dday ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 2000000) /* 2 MHz ? */ + MDRV_CPU_ADD("main", Z80, 2000000) /* 2 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) /* video hardware */ diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 45ccb974eb4..b6625550370 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -401,12 +401,11 @@ static INTERRUPT_GEN( ddayjlc_snd_interrupt ) } static MACHINE_DRIVER_START( ddayjlc ) - MDRV_CPU_ADD_TAG("main", Z80,12000000/3) + MDRV_CPU_ADD("main", Z80,12000000/3) MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_VBLANK_INT("main", ddayjlc_interrupt) - MDRV_CPU_ADD(Z80, 12000000/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 12000000/4) MDRV_CPU_PROGRAM_MAP(sound_cpu,0) MDRV_CPU_VBLANK_INT("main", ddayjlc_snd_interrupt) diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 30d99545077..6bbbab8c863 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -186,7 +186,7 @@ static INTERRUPT_GEN( ddealer_interrupt ) } static MACHINE_DRIVER_START( ddealer ) - MDRV_CPU_ADD_TAG("main" , M68000, 10000000) + MDRV_CPU_ADD("main" , M68000, 10000000) MDRV_CPU_PROGRAM_MAP(ddealer,0) MDRV_CPU_VBLANK_INT("main", ddealer_interrupt) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 112) diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 92d9d070aa5..a57e42b4d86 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -6533,7 +6533,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( ddenlovr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,24000000 / 2) + MDRV_CPU_ADD("main",M68000,24000000 / 2) MDRV_CPU_PROGRAM_MAP(ddenlovr_readmem,ddenlovr_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) @@ -6652,7 +6652,7 @@ static INTERRUPT_GEN( rtc_irq ) static MACHINE_DRIVER_START( quizchq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(quizchq_readmem,quizchq_writemem) MDRV_CPU_IO_MAP(quizchq_readport,quizchq_writeport) MDRV_CPU_VBLANK_INT("main", quizchq_irq) @@ -6725,12 +6725,12 @@ static INTERRUPT_GEN( mmpanic_irq ) static MACHINE_DRIVER_START( mmpanic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) + MDRV_CPU_ADD("main", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(mmpanic_readmem,mmpanic_writemem) MDRV_CPU_IO_MAP(mmpanic_readport,mmpanic_writeport) MDRV_CPU_VBLANK_INT("main", mmpanic_irq) - MDRV_CPU_ADD_TAG("sound", Z80, 3579545) + MDRV_CPU_ADD("sound", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(mmpanic_sound_readmem,mmpanic_sound_writemem) MDRV_CPU_IO_MAP(mmpanic_sound_readport,mmpanic_sound_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // NMI by main cpu @@ -6797,7 +6797,7 @@ static INTERRUPT_GEN( hanakanz_irq ) static MACHINE_DRIVER_START( hanakanz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000) // TMPZ84C015BF-8 + MDRV_CPU_ADD("main",Z80,8000000) // TMPZ84C015BF-8 MDRV_CPU_PROGRAM_MAP(hanakanz_readmem,hanakanz_writemem) MDRV_CPU_IO_MAP(hanakanz_readport,hanakanz_writeport) MDRV_CPU_VBLANK_INT("main", hanakanz_irq) diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index 3d418b5f561..b74dda51054 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -971,13 +971,13 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( ddragon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, MAIN_CLOCK) /* 12MHz / 4 internally */ + MDRV_CPU_ADD("main", HD6309, MAIN_CLOCK) /* 12MHz / 4 internally */ MDRV_CPU_PROGRAM_MAP(ddragon_map,0) - MDRV_CPU_ADD_TAG("sub", HD63701, MAIN_CLOCK/2) /* 6Mhz / 4 internally */ + MDRV_CPU_ADD("sub", HD63701, MAIN_CLOCK/2) /* 6Mhz / 4 internally */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD_TAG("sound", M6809, MAIN_CLOCK/2) /* 6MHz / 4 internally */ + MDRV_CPU_ADD("sound", M6809, MAIN_CLOCK/2) /* 6MHz / 4 internally */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_INTERLEAVE(1000) /* heavy interleaving to sync up sprite<->main cpu's */ @@ -1036,13 +1036,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ddgn6809 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MAIN_CLOCK) /* 12MHz / 4 internally */ + MDRV_CPU_ADD("main", M6809, MAIN_CLOCK) /* 12MHz / 4 internally */ MDRV_CPU_PROGRAM_MAP(ddragon_map,0) - MDRV_CPU_ADD_TAG("sub", M6809, MAIN_CLOCK/2) /* 6Mhz / 4 internally */ + MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK/2) /* 6Mhz / 4 internally */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD_TAG("sound", M6809, MAIN_CLOCK/2) /* 6MHz / 4 internally */ + MDRV_CPU_ADD("sound", M6809, MAIN_CLOCK/2) /* 6MHz / 4 internally */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_INTERLEAVE(1000) /* heavy interleaving to sync up sprite<->main cpu's */ @@ -1082,13 +1082,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ddragon2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, MAIN_CLOCK) /* 12MHz / 4 internally */ + MDRV_CPU_ADD("main", HD6309, MAIN_CLOCK) /* 12MHz / 4 internally */ MDRV_CPU_PROGRAM_MAP(dd2_map,0) - MDRV_CPU_ADD_TAG("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */ + MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(dd2_sub_map,0) - MDRV_CPU_ADD_TAG("sound", Z80, 3579545) + MDRV_CPU_ADD("sound", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(dd2_sound_map,0) MDRV_INTERLEAVE(1000) /* heavy interleaving to sync up sprite<->main cpu's */ @@ -1125,7 +1125,7 @@ static MACHINE_DRIVER_START( darktowr ) MDRV_IMPORT_FROM(ddragon) /* basic machine hardware */ - MDRV_CPU_ADD(M68705,XTAL_4MHz) + MDRV_CPU_ADD("mcu", M68705,XTAL_4MHz) MDRV_CPU_PROGRAM_MAP(mcu_map,0) /* video hardware */ diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index 4012ea6a18b..82d8e4fd782 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -484,11 +484,11 @@ static INTERRUPT_GEN( ddragon3_cpu_interrupt ) { /* 6:0x177e - 5:0x176a */ static MACHINE_DRIVER_START( ddragon3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) // Guess + MDRV_CPU_ADD("main", M68000, 12000000) // Guess MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_VBLANK_INT_HACK(ddragon3_cpu_interrupt, 2) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) // Guess (confirmed on bootleg) + MDRV_CPU_ADD("audio", Z80, 3579545) // Guess (confirmed on bootleg) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_sound, writemem_sound) diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index 5e9c1a2d75a..b2ad4181036 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -347,15 +347,15 @@ static const struct VLM5030interface vlm5030_interface = static MACHINE_DRIVER_START( ddribble ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu0,writemem_cpu0) MDRV_CPU_VBLANK_INT("main", ddrible_interrupt_0) - MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("cpu1", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) MDRV_CPU_VBLANK_INT("main", ddrible_interrupt_1) - MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("cpu2", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) MDRV_INTERLEAVE(100) /* we need heavy synch */ diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c index fa24da779b3..fb28af48472 100644 --- a/src/mame/drivers/ddz.c +++ b/src/mame/drivers/ddz.c @@ -52,7 +52,7 @@ static const struct VR0Interface vr0_interface = static MACHINE_DRIVER_START( ddz ) - MDRV_CPU_ADD_TAG("main", SE3208, 43000000) + MDRV_CPU_ADD("main", SE3208, 43000000) MDRV_CPU_PROGRAM_MAP(ddz_mem,0) MDRV_CPU_VBLANK_INT("main", ddz_interrupt) diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c index b42839ecd0f..2ba2c149fea 100644 --- a/src/mame/drivers/deadang.c +++ b/src/mame/drivers/deadang.c @@ -279,11 +279,11 @@ static INTERRUPT_GEN( deadang_interrupt ) static MACHINE_DRIVER_START( deadang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ + MDRV_CPU_ADD("main", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2) - MDRV_CPU_ADD(V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ + MDRV_CPU_ADD("sub", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 9c174c87090..2c019aab8c3 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -927,12 +927,11 @@ static const struct YM3812interface ym3812b_interface = static MACHINE_DRIVER_START( hbarrel ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem) /* video hardware */ @@ -970,12 +969,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( baddudes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem) /* video hardware */ @@ -1013,12 +1011,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( birdtry ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem) /* video hardware */ @@ -1056,15 +1053,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( robocop ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem) - MDRV_CPU_ADD(H6280,21477200/16) /* 21.4772MHz clock */ + MDRV_CPU_ADD("sub", H6280,21477200/16) /* 21.4772MHz clock */ MDRV_CPU_PROGRAM_MAP(robocop_sub_readmem,robocop_sub_writemem) MDRV_INTERLEAVE(50) /* Interleave between HuC6280 & 68000 */ @@ -1104,12 +1100,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( robocopb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem) /* video hardware */ @@ -1147,15 +1142,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hippodrm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem) - MDRV_CPU_ADD(H6280,21477200/16) /* 21.4772MHz clock */ + MDRV_CPU_ADD("sub", H6280,21477200/16) /* 21.4772MHz clock */ MDRV_CPU_PROGRAM_MAP(hippodrm_sub_readmem,hippodrm_sub_writemem) MDRV_INTERLEAVE(5) /* Interleave between H6280 & 68000 */ @@ -1195,12 +1189,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( slyspy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ + MDRV_CPU_ADD("main", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ MDRV_CPU_PROGRAM_MAP(slyspy_readmem,slyspy_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(H6280, XTAL_12MHz/2/3) - /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ + MDRV_CPU_ADD("audio", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ MDRV_CPU_PROGRAM_MAP(slyspy_s_readmem,slyspy_s_writemem) /* video hardware */ @@ -1238,12 +1231,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( midres ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ + MDRV_CPU_ADD("main", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ MDRV_CPU_PROGRAM_MAP(midres_readmem,midres_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(H6280, XTAL_24MHz/4/3) - /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ + MDRV_CPU_ADD("audio", H6280, XTAL_24MHz/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ MDRV_CPU_PROGRAM_MAP(midres_s_readmem,midres_s_writemem) /* video hardware */ diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index e51fcf5fd84..1e994d24f53 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -2084,12 +2084,11 @@ static INTERRUPT_GEN( oscar_interrupt ) static MACHINE_DRIVER_START( cobracom ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) + MDRV_CPU_ADD("main", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(cobra_readmem,cobra_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,dec8_s_writemem) /* NMIs are caused by the main CPU */ @@ -2126,12 +2125,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ghostb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) + MDRV_CPU_ADD("main", HD6309, 3000000*4) MDRV_CPU_PROGRAM_MAP(ghostb_readmem,ghostb_writemem) MDRV_CPU_VBLANK_INT("main", ghostb_interrupt) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,dec8_s_writemem) /* NMIs are caused by the main CPU */ @@ -2170,12 +2168,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( srdarwin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,2000000) /* MC68A09EP */ + MDRV_CPU_ADD("main", M6809,2000000) /* MC68A09EP */ MDRV_CPU_PROGRAM_MAP(srdarwin_readmem,srdarwin_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,dec8_s_writemem) /* NMIs are caused by the main CPU */ @@ -2212,12 +2209,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gondo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309,3000000*4) /* HD63C09EP */ + MDRV_CPU_ADD("main", HD6309,3000000*4) /* HD63C09EP */ MDRV_CPU_PROGRAM_MAP(gondo_readmem,gondo_writemem) MDRV_CPU_VBLANK_INT("main", gondo_interrupt) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,oscar_s_writemem) /* NMIs are caused by the main CPU */ @@ -2255,15 +2251,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( oscar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", HD6309, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(oscar_readmem,oscar_writemem) MDRV_CPU_VBLANK_INT("main", oscar_interrupt) - MDRV_CPU_ADD(HD6309, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", HD6309, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(oscar_sub_readmem,oscar_sub_writemem) - MDRV_CPU_ADD(M6502, XTAL_12MHz/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, XTAL_12MHz/8) MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,oscar_s_writemem) /* NMIs are caused by the main CPU */ MDRV_INTERLEAVE(40) /* 40 CPU slices per frame */ @@ -2301,14 +2296,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lastmiss ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) + MDRV_CPU_ADD("main", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(lastmiss_readmem,lastmiss_writemem) - MDRV_CPU_ADD(M6809, 2000000) + MDRV_CPU_ADD("sub", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(lastmiss_sub_readmem,lastmiss_sub_writemem) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(ym3526_s_readmem,ym3526_s_writemem) /* NMIs are caused by the main CPU */ MDRV_INTERLEAVE(200) @@ -2346,14 +2340,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( shackled ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) + MDRV_CPU_ADD("main", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(shackled_readmem,shackled_writemem) - MDRV_CPU_ADD(M6809, 2000000) + MDRV_CPU_ADD("sub", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(shackled_sub_readmem,shackled_sub_writemem) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(ym3526_s_readmem,ym3526_s_writemem) /* NMIs are caused by the main CPU */ MDRV_INTERLEAVE(80) @@ -2391,15 +2384,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( csilver ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, XTAL_12MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("main", M6809, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(csilver_readmem,csilver_writemem) - MDRV_CPU_ADD(M6809, XTAL_12MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("sub", M6809, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(csilver_sub_readmem,csilver_sub_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(csilver_s_readmem,csilver_s_writemem) /* NMIs are caused by the main CPU */ MDRV_INTERLEAVE(100) @@ -2441,12 +2433,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( garyoret ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309,3000000*4) /* HD63C09EP */ + MDRV_CPU_ADD("main", HD6309,3000000*4) /* HD63C09EP */ MDRV_CPU_PROGRAM_MAP(garyoret_readmem,garyoret_writemem) MDRV_CPU_VBLANK_INT("main", gondo_interrupt) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,oscar_s_writemem) /* NMIs are caused by the main CPU */ diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 28e395bc489..8c7c6b34d1b 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -421,7 +421,7 @@ static INTERRUPT_GEN( deco32_vbl_interrupt ) static MACHINE_DRIVER_START( hvysmsh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000) /* Unconfirmed */ + MDRV_CPU_ADD("main", ARM, 28000000) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(hvysmsh_map,0) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) @@ -460,7 +460,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wcvol95 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000) /* Unconfirmed */ + MDRV_CPU_ADD("main", ARM, 28000000) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(wcvol95_map,0) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index caace6ff2d0..709addb3259 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1872,12 +1872,11 @@ static INTERRUPT_GEN( tattass_snd_interrupt ) static MACHINE_DRIVER_START( captaven ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) + MDRV_CPU_ADD("main", ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(captaven_readmem,captaven_writemem) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) - MDRV_CPU_ADD(H6280, 32220000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(deco32) @@ -1920,12 +1919,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fghthist ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) + MDRV_CPU_ADD("main", ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(fghthist_readmem,fghthist_writemem) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) - MDRV_CPU_ADD(H6280, 32220000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_NVRAM_HANDLER(93C46) @@ -1967,11 +1965,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fghthsta ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) + MDRV_CPU_ADD("main", ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(fghthsta_memmap,0) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) - MDRV_CPU_ADD(H6280, 32220000/8) /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_NVRAM_HANDLER(93C46) @@ -2013,12 +2011,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dragngun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) + MDRV_CPU_ADD("main", ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(dragngun_readmem,dragngun_writemem) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) - MDRV_CPU_ADD(H6280, 32220000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(deco32) @@ -2067,12 +2064,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lockload ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) + MDRV_CPU_ADD("main", ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(lockload_readmem,lockload_writemem) MDRV_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2 - MDRV_CPU_ADD(H6280, 32220000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(deco32) @@ -2121,12 +2117,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tattass ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) /* Unconfirmed */ + MDRV_CPU_ADD("main", ARM, 28000000/4) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(tattass_readmem,tattass_writemem) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) - MDRV_CPU_ADD(M6809, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 2000000) MDRV_CPU_PROGRAM_MAP(sound_readmem_tattass,sound_writemem_tattass) MDRV_CPU_PERIODIC_INT(tattass_snd_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */ @@ -2159,11 +2154,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nslasher ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM, 28322000/4) + MDRV_CPU_ADD("main", ARM, 28322000/4) MDRV_CPU_PROGRAM_MAP(nslasher_readmem,nslasher_writemem) MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) - MDRV_CPU_ADD(Z80, 32220000/9) + MDRV_CPU_ADD("audio", Z80, 32220000/9) MDRV_CPU_PROGRAM_MAP(nslasher_sound,0) MDRV_CPU_IO_MAP(nslasher_io_sound,0) diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 41f1ee502ce..088075310fb 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -432,7 +432,7 @@ static const struct YMZ280Binterface ymz280b_intf = static MACHINE_DRIVER_START( avengrgs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH2,42000000/2) /* 21 MHz clock confirmed on real board */ + MDRV_CPU_ADD("main", SH2,42000000/2) /* 21 MHz clock confirmed on real board */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_MACHINE_RESET(mlc) @@ -464,7 +464,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mlc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */ + MDRV_CPU_ADD("main", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_MACHINE_RESET(mlc) diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index 39594b0f8a5..bd3564a2a96 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -383,13 +383,13 @@ static PALETTE_INIT( decocass ) static MACHINE_DRIVER_START( decocass ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,750000) + MDRV_CPU_ADD("main", M6502,750000) MDRV_CPU_PROGRAM_MAP(decocass_map,0) - MDRV_CPU_ADD(M6502,500000) /* 500 kHz */ + MDRV_CPU_ADD("audio", M6502,500000) /* 500 kHz */ MDRV_CPU_PROGRAM_MAP(decocass_sound_map,0) - MDRV_CPU_ADD(I8X41,500000*15) /* 500 kHz ( I doubt it is 400kHz Al! )*/ + MDRV_CPU_ADD("mcu", I8X41,500000*15) /* 500 kHz ( I doubt it is 400kHz Al! )*/ MDRV_CPU_PROGRAM_MAP(decocass_mcu_map,0) MDRV_CPU_IO_MAP(decocass_mcu_portmap,0) diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index 327556b2e80..e498802ccc1 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -321,11 +321,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( deniam16b ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,25000000/2) /* ??? */ + MDRV_CPU_ADD("main", M68000,25000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(deniam16b_readmem,deniam16b_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80,25000000/4) /* (makes logicpro music tempo correct) */ + MDRV_CPU_ADD("audio", Z80,25000000/4) /* (makes logicpro music tempo correct) */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -360,7 +360,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( deniam16c ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,25000000/2) /* ??? */ + MDRV_CPU_ADD("main", M68000,25000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(deniam16c_readmem,deniam16c_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 9c0056a14e1..1db8c068212 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -339,7 +339,7 @@ static PALETTE_INIT( destroyr ) static MACHINE_DRIVER_START( destroyr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 12096000 / 16) + MDRV_CPU_ADD("main", M6800, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(destroyr_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert, 4) diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c index 1838bc923f4..45580aab147 100644 --- a/src/mame/drivers/dgpix.c +++ b/src/mame/drivers/dgpix.c @@ -296,7 +296,7 @@ static VIDEO_UPDATE( dgpix ) } static MACHINE_DRIVER_START( dgpix ) - MDRV_CPU_ADD_TAG("main", E132XT, 20000000*4) /* 4x internal multiplier */ + MDRV_CPU_ADD("main", E132XT, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(cpu_map,0) MDRV_CPU_IO_MAP(io_map,0) diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 731114950db..9926a427060 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -194,11 +194,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( dietgo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */ + MDRV_CPU_ADD("main", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(dietgo_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */ + MDRV_CPU_ADD("audio", H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 8abaaba05de..d47183ffd9b 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -474,12 +474,12 @@ static const struct MSM5205interface discoboy_msm5205_interface = static MACHINE_DRIVER_START( discoboy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz? */ + MDRV_CPU_ADD("audio", Z80,10000000/2) /* 5 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 04c8ac79f7f..3b9c700ac5b 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -192,12 +192,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( diverboy ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* guess */ + MDRV_CPU_ADD("main", M68000, 12000000) /* guess */ MDRV_CPU_PROGRAM_MAP(diverboy_readmem,diverboy_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(snd_readmem,snd_writemem) MDRV_GFXDECODE(diverboy) diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 9071e2bd957..02a45ef706f 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -826,17 +826,17 @@ static INTERRUPT_GEN( djboy_interrupt ) } static MACHINE_DRIVER_START( djboy ) - MDRV_CPU_ADD_TAG("main", Z80,6000000) + MDRV_CPU_ADD("main", Z80,6000000) MDRV_CPU_PROGRAM_MAP(cpu0_am,0) MDRV_CPU_IO_MAP(cpu0_port_am,0) MDRV_CPU_VBLANK_INT_HACK(djboy_interrupt,2) - MDRV_CPU_ADD(Z80,6000000) + MDRV_CPU_ADD("cpu1", Z80,6000000) MDRV_CPU_PROGRAM_MAP(cpu1_am,0) MDRV_CPU_IO_MAP(cpu1_port_am,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD("cpu2", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(cpu2_am,0) MDRV_CPU_IO_MAP(cpu2_port_am,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index b2f7bd6aedb..43e360b110f 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -1226,8 +1226,8 @@ static MACHINE_DRIVER_START( djmain ) /* basic machine hardware */ // popn3 works 9.6 MHz or slower in some songs */ - //MDRV_CPU_ADD_TAG("main", M68EC020, 18432000/2) /* 9.216 MHz!? */ - MDRV_CPU_ADD_TAG("main", M68EC020, 32000000/4) /* 8.000 MHz!? */ + //MDRV_CPU_ADD("main", M68EC020, 18432000/2) /* 9.216 MHz!? */ + MDRV_CPU_ADD("main", M68EC020, 32000000/4) /* 8.000 MHz!? */ MDRV_CPU_PROGRAM_MAP(memory_map, 0) MDRV_CPU_VBLANK_INT("main", vb_interrupt) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index f0cfc4e3ec9..75133766bdb 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -1596,7 +1596,7 @@ static MACHINE_DRIVER_START( dkong_base ) MDRV_DRIVER_DATA(dkong_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CLOCK_1H) + MDRV_CPU_ADD("main", Z80, CLOCK_1H) MDRV_CPU_PROGRAM_MAP(dkong_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) @@ -1683,7 +1683,7 @@ static MACHINE_DRIVER_START( dkong3 ) MDRV_DRIVER_DATA(dkong_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_8MHz / 2) /* verified in schematics */ + MDRV_CPU_ADD("main", Z80, XTAL_8MHz / 2) /* verified in schematics */ MDRV_CPU_PROGRAM_MAP(dkong3_map, 0) MDRV_CPU_IO_MAP(0, dkong3_io_map) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 028ccabff3c..ea936424fa1 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -803,7 +803,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( dlair ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK_US/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK_US/4) MDRV_CPU_PROGRAM_MAP(dlus_map,0) MDRV_CPU_VBLANK_INT("main", vblank_callback) MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16) @@ -841,7 +841,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dleuro ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK_EURO/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK_EURO/4) MDRV_CPU_CONFIG(dleuro_daisy_chain) MDRV_CPU_PROGRAM_MAP(dleuro_map,0) MDRV_CPU_IO_MAP(dleuro_io_map,0) diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 84b6e2e61fb..575d918bfa8 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -175,7 +175,7 @@ static INTERRUPT_GEN( dderby_interrupt ) static MACHINE_DRIVER_START( dderby ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(memmap,0) MDRV_CPU_VBLANK_INT("main", dderby_interrupt) diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index e186505181c..1b3d5040f87 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -650,17 +650,17 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( docastle ) // basic machine hardware -// MDRV_CPU_ADD_TAG("main", Z80, 4000000) // 4 MHz - MDRV_CPU_ADD_TAG("main", Z80, 3980000) // make dip switches work in docastle and dorunrun and fix dorunru2 attract sequence +// MDRV_CPU_ADD("main", Z80, 4000000) // 4 MHz + MDRV_CPU_ADD("main", Z80, 3980000) // make dip switches work in docastle and dorunrun and fix dorunru2 attract sequence MDRV_CPU_PROGRAM_MAP(docastle_map, 0) MDRV_CPU_IO_MAP(docastle_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("slave", Z80, 4000000) // 4 MHz + MDRV_CPU_ADD("slave", Z80, 4000000) // 4 MHz MDRV_CPU_PROGRAM_MAP(docastle_map2, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 8) - MDRV_CPU_ADD(Z80, 4000000) // 4 MHz + MDRV_CPU_ADD("cpu3", Z80, 4000000) // 4 MHz MDRV_CPU_PROGRAM_MAP(docastle_map3, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index c613e427117..ac30c647125 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -241,11 +241,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( dogfgt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ???? */ + MDRV_CPU_ADD("main", M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */ - MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */ + MDRV_CPU_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 3e1fb0ba7ee..670a0137128 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -255,7 +255,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( dominob ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) + MDRV_CPU_ADD("main", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(memmap, 0) MDRV_CPU_IO_MAP(portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index ebb0924d8a4..3c4407da6cb 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -981,12 +981,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lastday ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(lastday_readmem,lastday_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(lastday_sound_readmem,lastday_sound_writemem) MDRV_MACHINE_START(lastday) @@ -1015,12 +1014,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gulfstrm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(gulfstrm_readmem,pollux_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(lastday_sound_readmem,lastday_sound_writemem) MDRV_MACHINE_START(lastday) @@ -1049,12 +1047,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pollux ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(pollux_readmem,pollux_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(pollux_sound_readmem,pollux_sound_writemem) MDRV_MACHINE_START(lastday) @@ -1083,12 +1080,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bluehawk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(bluehawk_readmem,bluehawk_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_readmem,bluehawk_sound_writemem) MDRV_MACHINE_START(lastday) @@ -1117,12 +1113,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( flytiger ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(flytiger_readmem,flytiger_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_readmem,bluehawk_sound_writemem) MDRV_MACHINE_START(lastday) @@ -1151,12 +1146,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( primella ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(primella_readmem,primella_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_readmem,bluehawk_sound_writemem) MDRV_MACHINE_START(lastday) @@ -1191,12 +1185,11 @@ static INTERRUPT_GEN( rshark_interrupt ) static MACHINE_DRIVER_START( rshark ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* measured on super-x */ + MDRV_CPU_ADD("main", M68000, 8000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(rshark_readmem,rshark_writemem) MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */ - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* measured on super-x */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_readmem,bluehawk_sound_writemem) /* video hardware */ @@ -1223,12 +1216,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( superx ) // dif mem map /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* measured on super-x */ + MDRV_CPU_ADD("main", M68000, 8000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(superx_readmem,superx_writemem) MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */ - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* measured on super-x */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_readmem,bluehawk_sound_writemem) /* video hardware */ @@ -1255,12 +1247,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( popbingo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(popbingo_readmem,popbingo_writemem) MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */ - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* measured on super-x */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_readmem,bluehawk_sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index bb8e38c76d0..c91c9216d7f 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -211,7 +211,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( dorachan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 2000000) + MDRV_CPU_ADD("main", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(dorachan_map,0) MDRV_CPU_IO_MAP(dorachan_io_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index 2bff3b09e0c..6b067bf2343 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -65,7 +65,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( dotrikun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index 514835f48a0..35647d0a292 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -328,7 +328,7 @@ static PALETTE_INIT( dragrace ) static MACHINE_DRIVER_START( dragrace ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 12096000 / 12) + MDRV_CPU_ADD("main", M6800, 12096000 / 12) MDRV_CPU_PROGRAM_MAP(dragrace_readmem, dragrace_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) MDRV_WATCHDOG_VBLANK_INIT(8) diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index efba57e13f4..15e7255256c 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -445,7 +445,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( dreamwld ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", M68EC020, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(dreamwld_map, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) // 4, 5, or 6, all point to the same place diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index a08b93ef026..a2bf3a180e7 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -358,11 +358,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( drgnmst ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* Confirmed */ + MDRV_CPU_ADD("main", M68000, 12000000) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(drgnmst_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(PIC16C55, 32000000/8) /* Confirmed */ + MDRV_CPU_ADD("audio", PIC16C55, 32000000/8) /* Confirmed */ /* Program and Data Maps are internal to the MCU */ MDRV_CPU_IO_MAP(drgnmst_sound_io_map, 0) diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 0f8941ed69e..bcead69f035 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -301,7 +301,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( dribling ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) + MDRV_CPU_ADD("main", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", dribling_irq_gen) diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index 7f370fcf7ea..e612155980e 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -229,7 +229,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( drmicro ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,MCLK/6) /* 3.072MHz? */ + MDRV_CPU_ADD("main", Z80,MCLK/6) /* 3.072MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", drmicro_interrupt) diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 8e53bedd6d9..524d58a4be3 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -250,7 +250,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( drtomy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* ? MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(drtomy_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 889456422fb..8ab5256a1ce 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -220,7 +220,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( drw80pkr ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", I8039, 7864300) + MDRV_CPU_ADD("main", I8039, 7864300) MDRV_CPU_PROGRAM_MAP(drw80pkr_map, 0) MDRV_CPU_IO_MAP(drw80pkr_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 40c0b54596f..0f8031c1d54 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -674,7 +674,7 @@ static const struct AY8910interface dunhuang_ay8910_interface = static MACHINE_DRIVER_START( dunhuang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) + MDRV_CPU_ADD("main", Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(dunhuang_map,0) MDRV_CPU_IO_MAP(dunhuang_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index e82b64e367f..c9f873377a7 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -689,7 +689,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( dwarfd ) /* basic machine hardware */ /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ - MDRV_CPU_ADD_TAG("main", 8085A, 10595000/3*2) /* ? MHz */ + MDRV_CPU_ADD("main", 8085A, 10595000/3*2) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(mem_map, 0) MDRV_CPU_IO_MAP(io_map, 0) diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index c423cc26299..94f1cdf54bc 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -196,12 +196,11 @@ static PALETTE_INIT( dynadice ) } static MACHINE_DRIVER_START( dynadice ) - MDRV_CPU_ADD_TAG("main", 8080,18432000/8) + MDRV_CPU_ADD("main", 8080,18432000/8) MDRV_CPU_PROGRAM_MAP(dynadice_map,0) MDRV_CPU_IO_MAP(dynadice_io_map,0) - MDRV_CPU_ADD(Z80,18432000/6) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,18432000/6) MDRV_CPU_PROGRAM_MAP(dynadice_sound_map,0) MDRV_CPU_IO_MAP(dynadice_sound_io_map,0) diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 1b7dc5685f2..a846f06501f 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -3626,7 +3626,7 @@ static const struct MSM5205interface hanamai_msm5205_interface = static MACHINE_DRIVER_START( hanamai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,22000000 / 4) /* 5.5MHz */ + MDRV_CPU_ADD("main",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0) MDRV_CPU_IO_MAP(hanamai_io_map,0) MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ @@ -3683,7 +3683,7 @@ static const struct AY8910interface hnoridur_ay8910_interface = static MACHINE_DRIVER_START( hnoridur ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,22000000 / 4) /* 5.5MHz */ + MDRV_CPU_ADD("main",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(hnoridur_mem_map,0) MDRV_CPU_IO_MAP(hnoridur_io_map,0) MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ @@ -3741,7 +3741,7 @@ static const struct YM2203interface sprtmtch_ym2203_interface = static MACHINE_DRIVER_START( sprtmtch ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,22000000 / 4) /* 5.5MHz */ + MDRV_CPU_ADD("main", Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0) MDRV_CPU_IO_MAP(sprtmtch_io_map,0) MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ @@ -3781,7 +3781,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mjfriday ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,24000000/4) /* 6 MHz? */ + MDRV_CPU_ADD("main",Z80,24000000/4) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0) MDRV_CPU_IO_MAP(mjfriday_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -3921,12 +3921,12 @@ static const struct MSM5205interface jantouki_msm5205_interface = static MACHINE_DRIVER_START( jantouki ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,22000000 / 4) /* 5.5MHz */ + MDRV_CPU_ADD("main",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(jantouki_mem_map,0) MDRV_CPU_IO_MAP(jantouki_io_map,0) MDRV_CPU_VBLANK_INT("top", jantouki_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ - MDRV_CPU_ADD_TAG("sound",Z80,22000000 / 4) /* 5.5MHz */ + MDRV_CPU_ADD("sound",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(jantouki_sound_mem_map,0) MDRV_CPU_IO_MAP(jantouki_sound_io_map,0) MDRV_CPU_VBLANK_INT("top", jantouki_sound_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ @@ -4089,7 +4089,7 @@ static const struct AY8910interface htengoku_ay8910_interface = static MACHINE_DRIVER_START( htengoku ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,20000000 / 4) + MDRV_CPU_ADD("main",Z80,20000000 / 4) MDRV_CPU_PROGRAM_MAP(yarunara_mem_map,0) MDRV_CPU_IO_MAP(htengoku_io_map,0) MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ @@ -4152,7 +4152,7 @@ static const struct AY8910interface tenkai_ay8910_interface = static MACHINE_DRIVER_START( tenkai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",TMP91640, 21472700 / 2) + MDRV_CPU_ADD("main",TMP91640, 21472700 / 2) MDRV_CPU_PROGRAM_MAP(tenkai_map,0) MDRV_CPU_IO_MAP(tenkai_io_map,0) MDRV_CPU_VBLANK_INT_HACK(tenkai_interrupt,3) diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c index dfe7906daa9..c1feaf110ac 100644 --- a/src/mame/drivers/dynduke.c +++ b/src/mame/drivers/dynduke.c @@ -268,11 +268,11 @@ static INTERRUPT_GEN( dynduke_interrupt ) static MACHINE_DRIVER_START( dynduke ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", V30, 16000000/2) // NEC V30-8 CPU + MDRV_CPU_ADD("main", V30, 16000000/2) // NEC V30-8 CPU MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_VBLANK_INT("main", dynduke_interrupt) - MDRV_CPU_ADD_TAG("slave", V30, 16000000/2) // NEC V30-8 CPU + MDRV_CPU_ADD("slave", V30, 16000000/2) // NEC V30-8 CPU MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_CPU_VBLANK_INT("main", dynduke_interrupt) diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index d55bd7275cf..360fe1bb035 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -385,12 +385,12 @@ static MACHINE_RESET( egghunt ) static MACHINE_DRIVER_START( egghunt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz ?*/ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz ?*/ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // or 2 like mitchell.c? - MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz ?*/ + MDRV_CPU_ADD("audio", Z80,12000000/2) /* 6 MHz ?*/ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(egghunt) diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index 5c3506f9e55..ae78d771930 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -230,7 +230,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( embargo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 625000) + MDRV_CPU_ADD("main", S2650, 625000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 9aaedcda45c..16fecd2b5db 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -563,10 +563,10 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( enigma2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(engima2_main_cpu_map,0) - MDRV_CPU_ADD(Z80, 2500000) + MDRV_CPU_ADD("audio", Z80, 2500000) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map,0) @@ -592,11 +592,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( enigma2a ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, CPU_CLOCK) + MDRV_CPU_ADD("main", 8080, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(engima2a_main_cpu_map,0) MDRV_CPU_IO_MAP(engima2a_main_cpu_io_map,0) - MDRV_CPU_ADD(Z80, 2500000) + MDRV_CPU_ADD("audio", Z80, 2500000) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map,0) diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 130019c0ab5..ef07e564b46 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -256,7 +256,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( eolith45 ) - MDRV_CPU_ADD_TAG("cpu", E132N, 45000000) /* 45 MHz */ + MDRV_CPU_ADD("cpu", E132N, 45000000) /* 45 MHz */ MDRV_CPU_PROGRAM_MAP(eolith_map,0) MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262) diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index 695aa52c91d..7c1728a0676 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -164,7 +164,7 @@ static PALETTE_INIT( eolith16 ) static MACHINE_DRIVER_START( eolith16 ) - MDRV_CPU_ADD_TAG("main", E116T, 60000000) /* no internal multiplier */ + MDRV_CPU_ADD("main", E116T, 60000000) /* no internal multiplier */ MDRV_CPU_PROGRAM_MAP(eolith16_map,0) MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262) diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index 146b30f542d..8d991e2df81 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -358,7 +358,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( epos ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 11000000/4) /* 2.75 MHz (see notes) */ + MDRV_CPU_ADD("main", Z80, 11000000/4) /* 2.75 MHz (see notes) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -382,7 +382,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dealer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 11000000/4) /* 2.75 MHz (see notes) */ + MDRV_CPU_ADD("main", Z80, 11000000/4) /* 2.75 MHz (see notes) */ MDRV_CPU_PROGRAM_MAP(dealer_readmem,dealer_writemem) MDRV_CPU_IO_MAP(dealer_readport,dealer_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index 9f36b17bc43..a786028eaef 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -413,11 +413,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( eprom ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) - MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(extra_map,0) MDRV_INTERLEAVE(100) @@ -447,7 +447,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( klaxp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) @@ -477,7 +477,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( guts ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(guts_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 3a00ff77ca7..258432ff767 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -1153,7 +1153,7 @@ static const struct Samplesinterface alphamc07_samples_interface = // the sound board is the same in all games static MACHINE_DRIVER_START( common_sound ) - MDRV_CPU_ADD_TAG("audio", 8085A, XTAL_6_144MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", 8085A, XTAL_6_144MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) @@ -1196,13 +1196,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( equites ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */ MDRV_CPU_PROGRAM_MAP(equites_map,0) MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2) MDRV_IMPORT_FROM(common_sound) - MDRV_CPU_ADD(ALPHA8301, 4000000/8) + MDRV_CPU_ADD("mcu", ALPHA8301, 4000000/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) /* video hardware */ @@ -1234,13 +1234,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( splndrbt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(splndrbt_map, 0) MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2) MDRV_IMPORT_FROM(common_sound) - MDRV_CPU_ADD(ALPHA8301, 4000000/8) + MDRV_CPU_ADD("mcu", ALPHA8301, 4000000/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) /* video hardware */ diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c index f6e9215defe..46d5dbfeb33 100644 --- a/src/mame/drivers/ertictac.c +++ b/src/mame/drivers/ertictac.c @@ -381,7 +381,7 @@ static VIDEO_UPDATE( ertictac ) static MACHINE_DRIVER_START( ertictac ) - MDRV_CPU_ADD_TAG("main", ARM, 16000000) /* guess */ + MDRV_CPU_ADD("main", ARM, 16000000) /* guess */ MDRV_CPU_PROGRAM_MAP(ertictac_map,0) MDRV_CPU_VBLANK_INT("main", ertictac_interrupt) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 8359d094aa9..4d77f04b557 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -570,12 +570,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( multchmp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000, 16000000) + MDRV_CPU_ADD("main",M68000, 16000000) MDRV_CPU_PROGRAM_MAP(multchmp_readmem,multchmp_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(multchmp_sound_readmem,multchmp_sound_writemem) MDRV_CPU_IO_MAP(multchmp_sound_readport,multchmp_sound_writeport) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* IRQ By Main CPU */ diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index b61ddc54079..7901ec59e1b 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -282,7 +282,7 @@ static INTERRUPT_GEN( vblank_callback_esh ) /* DRIVER */ static MACHINE_DRIVER_START( esh ) /* main cpu */ - MDRV_CPU_ADD_TAG("main", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */ + MDRV_CPU_ADD("main", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */ MDRV_CPU_PROGRAM_MAP(z80_0_mem,0) MDRV_CPU_IO_MAP(z80_0_io,0) MDRV_CPU_VBLANK_INT("main", vblank_callback_esh) diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index 32c0a07d4c2..fd8215a21ae 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -313,11 +313,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( espial ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(espial_readmem,espial_writemem) MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2) - MDRV_CPU_ADD(Z80, 3072000) /* 2 MHz?????? */ + MDRV_CPU_ADD("audio", Z80, 3072000) /* 2 MHz?????? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,4) diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 4a4e5219b85..0075f28cdae 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -237,7 +237,7 @@ static INTERRUPT_GEN( ettrivia_interrupt ) } static MACHINE_DRIVER_START( ettrivia ) - MDRV_CPU_ADD_TAG("main", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected + MDRV_CPU_ADD("main", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected MDRV_CPU_PROGRAM_MAP(cpu_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", ettrivia_interrupt) diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index 8c32d3971e0..1f583e4e339 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -223,12 +223,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( exedexes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(exedexes_interrupt,2) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* 3 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index ff3a7520c48..6b36e1e6447 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -278,10 +278,10 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( exerion ) - MDRV_CPU_ADD_TAG("main", Z80, EXERION_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, EXERION_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD(Z80, EXERION_CPU_CLOCK) + MDRV_CPU_ADD("sub", Z80, EXERION_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(sub_map,0) /* video hardware */ diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index 9dfd6ebcc30..d9ca0d06c96 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -774,7 +774,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, EXIDY_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, EXIDY_CPU_CLOCK) MDRV_CPU_VBLANK_INT("main", exidy_vblank_interrupt) /* video hardware */ diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c index d9d89676224..20ba7f56939 100644 --- a/src/mame/drivers/exidy440.c +++ b/src/mame/drivers/exidy440.c @@ -998,7 +998,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( exidy440 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M6809, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(exidy440_map,0) MDRV_CPU_VBLANK_INT("main", exidy440_vblank_interrupt) diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 7f757ab28da..69a8f8f99e9 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -308,7 +308,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( galsnew ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(galsnew,0) MDRV_CPU_VBLANK_INT_HACK(galsnew_interrupt,3) diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index e3971c06460..23d95c06fda 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -302,11 +302,11 @@ static INTERRUPT_GEN( exprraid_interrupt ) static MACHINE_DRIVER_START( exprraid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("main", M6502, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_VBLANK_INT("main", exprraid_interrupt) - MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz ??? */ + MDRV_CPU_ADD("slave", M6809, 2000000) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(slave_map, 0) /* IRQs are caused by the YM3526 */ diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index e3c4d442c62..e7829781ec8 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -475,18 +475,18 @@ static const tms34010_config slave_config = static MACHINE_DRIVER_START( exterm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, 40000000) + MDRV_CPU_ADD("main", TMS34010, 40000000) MDRV_CPU_CONFIG(master_config) MDRV_CPU_PROGRAM_MAP(master_map,0) - MDRV_CPU_ADD(TMS34010, 40000000) + MDRV_CPU_ADD("slave", TMS34010, 40000000) MDRV_CPU_CONFIG(slave_config) MDRV_CPU_PROGRAM_MAP(slave_map,0) - MDRV_CPU_ADD(M6502, 2000000) + MDRV_CPU_ADD("audio", M6502, 2000000) MDRV_CPU_PROGRAM_MAP(sound_master_map,0) - MDRV_CPU_ADD(M6502, 2000000) + MDRV_CPU_ADD("audioslave", M6502, 2000000) MDRV_CPU_PROGRAM_MAP(sound_slave_map,0) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index b3aff04d44a..a673248553f 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -325,18 +325,18 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( exzisus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz ??? */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpua_readmem,cpua_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ + MDRV_CPU_ADD("cpub", Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpub_readmem,cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ + MDRV_CPU_ADD("cpuc", Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpuc_readmem,cpuc_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index c8dd2cbf353..fa1f121d83a 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -149,7 +149,7 @@ static INPUT_PORTS_START( mosaicf2 ) INPUT_PORTS_END static MACHINE_DRIVER_START( mosaicf2 ) - MDRV_CPU_ADD_TAG("main", E132XN, 20000000*4) /* 4x internal multiplier */ + MDRV_CPU_ADD("main", E132XN, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(common_map,0) MDRV_CPU_IO_MAP(mosaicf2_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 326c4f92445..6605e30bc04 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -565,16 +565,15 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( f1gp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,XTAL_20MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main",M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(f1gp_readmem1,f1gp_writemem1) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(M68000,XTAL_20MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,XTAL_20MHz/4) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,XTAL_20MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -608,11 +607,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( f1gpb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,10000000) /* 10 MHz ??? */ + MDRV_CPU_ADD("main",M68000,10000000) /* 10 MHz ??? */ MDRV_CPU_PROGRAM_MAP(f1gpb_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(M68000,10000000) /* 10 MHz ??? */ + MDRV_CPU_ADD("sub", M68000,10000000) /* 10 MHz ??? */ MDRV_CPU_PROGRAM_MAP(f1gpb_cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index b9c412c43d9..a09635eb85f 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -808,12 +808,12 @@ static INTERRUPT_GEN( fantland_sound_irq ) static MACHINE_DRIVER_START( fantland ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8086, 8000000) // ? + MDRV_CPU_ADD("main", I8086, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_map, 0) MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ - MDRV_CPU_ADD(I8088, 8000000) // ? + MDRV_CPU_ADD("audio", I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_sound_map, 0) MDRV_CPU_IO_MAP(fantland_sound_iomap, 0) MDRV_CPU_PERIODIC_INT(fantland_sound_irq, 8000) @@ -860,12 +860,12 @@ static const struct YM2151interface galaxygn_ym2151_interface = static MACHINE_DRIVER_START( galaxygn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8088, 8000000) // ? + MDRV_CPU_ADD("main", I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(galaxygn_map, 0) MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ - MDRV_CPU_ADD(I8088, 8000000) // ? + MDRV_CPU_ADD("audio", I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_sound_map, 0) MDRV_CPU_IO_MAP(fantland_sound_iomap, 0) // IRQ by YM2151, NMI when soundlatch is written @@ -914,12 +914,12 @@ static MACHINE_RESET( borntofi ) static MACHINE_DRIVER_START( borntofi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] + MDRV_CPU_ADD("main", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] MDRV_CPU_PROGRAM_MAP(borntofi_map, 0) MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ - MDRV_CPU_ADD(I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] + MDRV_CPU_ADD("audio", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] MDRV_CPU_PROGRAM_MAP(borntofi_sound_map, 0) MDRV_MACHINE_RESET(borntofi) @@ -960,12 +960,12 @@ static const struct YM3526interface wheelrun_ym3526_interface = static MACHINE_DRIVER_START( wheelrun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V20, XTAL_18MHz/2) // D701080C-8 (V20) + MDRV_CPU_ADD("main", V20, XTAL_18MHz/2) // D701080C-8 (V20) MDRV_CPU_PROGRAM_MAP(wheelrun_map, 0) MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ - MDRV_CPU_ADD(Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B) + MDRV_CPU_ADD("audio", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B) MDRV_CPU_PROGRAM_MAP(wheelrun_sound_map, 0) // IRQ by YM3526, NMI when soundlatch is written diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index 11f039e6d6b..e8200418607 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -557,11 +557,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( fastfred ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CLOCK/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, CLOCK/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(fastfred_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD_TAG("audio", Z80, CLOCK/12) + MDRV_CPU_ADD("audio", Z80, CLOCK/12) /* audio CPU */ /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index b1428ba399f..06da3e8c723 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -277,7 +277,7 @@ static const struct K007232_interface k007232_interface_2 = static MACHINE_DRIVER_START( fastlane ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 24MHz/8? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* 24MHz/8? */ MDRV_CPU_PROGRAM_MAP(fastlane_readmem,fastlane_writemem) MDRV_CPU_VBLANK_INT_HACK(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */ diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index f730ce85d32..58b84e01a5b 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -282,10 +282,10 @@ GFXDECODE_END static MACHINE_DRIVER_START( fcombat ) - MDRV_CPU_ADD_TAG("main", Z80, 10000000/3) + MDRV_CPU_ADD("main", Z80, 10000000/3) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD(Z80, 10000000/3) + MDRV_CPU_ADD("audio", Z80, 10000000/3) MDRV_CPU_PROGRAM_MAP(audio_map,0) /* video hardware */ diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index b33d4c98371..75095c0e0d8 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -662,11 +662,11 @@ static const struct MSM5205interface msm5205_interface2 = static MACHINE_DRIVER_START( fcrash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(fcrash_map,0) MDRV_CPU_VBLANK_INT("main", cps1_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 24000000/6) /* ? */ + MDRV_CPU_ADD("sound", Z80, 24000000/6) /* ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ @@ -711,11 +711,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kodb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(kodb_map,0) MDRV_CPU_VBLANK_INT("main", cps1_interrupt) -// MDRV_CPU_ADD_TAG("sound", Z80, 3579545) +// MDRV_CPU_ADD("sound", Z80, 3579545) /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(sub_map,0) diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c index 2e85e40bff8..9823574fa07 100644 --- a/src/mame/drivers/fgoal.c +++ b/src/mame/drivers/fgoal.c @@ -355,7 +355,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( fgoal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 10065000 / 10) /* ? */ + MDRV_CPU_ADD("main", M6800, 10065000 / 10) /* ? */ MDRV_CPU_PROGRAM_MAP(cpu_map, 0) MDRV_MACHINE_RESET(fgoal) diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c index f41a422e805..38273449bf3 100644 --- a/src/mame/drivers/filetto.c +++ b/src/mame/drivers/filetto.c @@ -733,7 +733,7 @@ static INTERRUPT_GEN( filetto_irq ) static MACHINE_DRIVER_START( filetto ) - MDRV_CPU_ADD_TAG("main", I8088, 8000000) + MDRV_CPU_ADD("main", I8088, 8000000) MDRV_CPU_PROGRAM_MAP(filetto_map,0) MDRV_CPU_IO_MAP(filetto_io,0) MDRV_CPU_VBLANK_INT_HACK(filetto_irq,200) diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index d9daf108616..20165a04ef7 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -404,12 +404,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( finalizr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,18432000/6) /* ??? */ + MDRV_CPU_ADD("main", M6809,18432000/6) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */ - MDRV_CPU_ADD(I8039,18432000/2) /* 9.216MHz clkin ?? */ - /* audio CPU */ /* DAC */ + MDRV_CPU_ADD("audio", I8039,18432000/2) /* 9.216MHz clkin ?? */ MDRV_CPU_PROGRAM_MAP(i8039_readmem,i8039_writemem) MDRV_CPU_IO_MAP(i8039_readport,i8039_writeport) diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c index 486d7a8ea87..cb9a7b69d64 100644 --- a/src/mame/drivers/findout.c +++ b/src/mame/drivers/findout.c @@ -451,7 +451,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( findout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 88a38446a23..f0ab0aac83f 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -2018,7 +2018,7 @@ static MACHINE_RESET( firebeat ) static MACHINE_DRIVER_START(firebeat) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GCX, 66000000) + MDRV_CPU_ADD("main", PPC403GCX, 66000000) MDRV_CPU_PROGRAM_MAP(firebeat_map, 0) MDRV_CPU_VBLANK_INT("main", firebeat_interrupt) @@ -2057,7 +2057,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START(firebeat2) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GCX, 66000000) + MDRV_CPU_ADD("main", PPC403GCX, 66000000) MDRV_CPU_PROGRAM_MAP(firebeat_map, 0) MDRV_CPU_VBLANK_INT("left", firebeat_interrupt) @@ -2102,7 +2102,7 @@ static MACHINE_DRIVER_START(firebeat_spu) MDRV_IMPORT_FROM(firebeat) - MDRV_CPU_ADD_TAG("audio", M68000, 16000000) + MDRV_CPU_ADD("audio", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(spu_map, 0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 396f5f6df24..bae5285ed01 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -576,12 +576,11 @@ static INTERRUPT_GEN( bootleg ) static MACHINE_DRIVER_START( firetrap ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(firetrap,2) - MDRV_CPU_ADD(M6502,3072000/2) - /* audio CPU */ /* 1.536 MHz? */ + MDRV_CPU_ADD("audio", M6502,3072000/2) /* 1.536 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* IRQs are caused by the ADPCM chip */ /* NMIs are caused by the main CPU */ @@ -616,12 +615,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( firetpbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_bootleg,writemem_bootleg) MDRV_CPU_VBLANK_INT("main", bootleg) - MDRV_CPU_ADD(M6502,3072000/2) - /* audio CPU */ /* 1.536 MHz? */ + MDRV_CPU_ADD("audio", M6502,3072000/2) /* 1.536 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* IRQs are caused by the ADPCM chip */ /* NMIs are caused by the main CPU */ diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index 663442099cb..5ad0eb573c8 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -871,7 +871,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( firetrk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, FIRETRK_CPU_CLOCK_1MHZ) /* 750Khz during service mode */ + MDRV_CPU_ADD("main", M6800, FIRETRK_CPU_CLOCK_1MHZ) /* 750Khz during service mode */ MDRV_CPU_PROGRAM_MAP(firetrk_map, 0) MDRV_CPU_VBLANK_INT("main", firetrk_interrupt) MDRV_WATCHDOG_VBLANK_INIT(5) diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index dd2a97d0a5f..6865634d0e7 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -750,12 +750,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( fitfight ) - MDRV_CPU_ADD_TAG("main",M68000, 12000000) + MDRV_CPU_ADD("main",M68000, 12000000) MDRV_CPU_PROGRAM_MAP(fitfight_main_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(sound_cpu_config) MDRV_CPU_PROGRAM_MAP(snd_mem, 0) MDRV_CPU_IO_MAP(snd_io, 0) @@ -784,7 +783,7 @@ static MACHINE_DRIVER_START( fitfight ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( bbprot ) - MDRV_CPU_ADD_TAG("main",M68000, 12000000) + MDRV_CPU_ADD("main",M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bbprot_main_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 9328b43722f..21176a70890 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -284,11 +284,11 @@ static const struct K007232_interface k007232_interface = static MACHINE_DRIVER_START( flkatck ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */ + MDRV_CPU_ADD("main", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */ MDRV_CPU_PROGRAM_MAP(flkatck_readmem,flkatck_writemem) MDRV_CPU_VBLANK_INT("main", flkatck_interrupt) - MDRV_CPU_ADD(Z80,3579545) /* NEC D780C-1, 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80,3579545) /* NEC D780C-1, 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(flkatck_readmem_sound,flkatck_writemem_sound) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c index b3e032344e0..6d92d250cc2 100644 --- a/src/mame/drivers/flower.c +++ b/src/mame/drivers/flower.c @@ -233,17 +233,17 @@ static const struct CustomSound_interface custom_interface = static MACHINE_DRIVER_START( flower ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000) + MDRV_CPU_ADD("main", Z80,8000000) MDRV_CPU_PROGRAM_MAP(flower_cpu1,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,10) // MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) //nmis stuff up the writes to shared ram - MDRV_CPU_ADD(Z80,8000000) + MDRV_CPU_ADD("sub", Z80,8000000) MDRV_CPU_PROGRAM_MAP(flower_cpu2,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80,8000000) + MDRV_CPU_ADD("audio", Z80,8000000) MDRV_CPU_PROGRAM_MAP(flower_sound_cpu,0) MDRV_CPU_PERIODIC_INT(sn_irq, 90) /* periodic interrupt, don't know about the frequency */ diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index ea407db4306..1b2db648e93 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -652,17 +652,16 @@ static const struct MSM5232interface msm5232_interface = static MACHINE_DRIVER_START( flstory ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL_10_733MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80,XTAL_10_733MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(flstory_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,XTAL_8MHz/2) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ - MDRV_CPU_ADD(M68705,XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(flstory_m68705_map,0) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -711,16 +710,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( onna34ro ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10733000/2) /* ??? */ + MDRV_CPU_ADD("main", Z80,10733000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(onna34ro_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ -// MDRV_CPU_ADD(M68705,4000000) /* ??? */ +// MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */ // MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -769,16 +767,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( victnine ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(victnine_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ -// MDRV_CPU_ADD(M68705,4000000) /* ??? */ +// MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */ // MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 893b71d1ace..4390196f644 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -255,7 +255,7 @@ static PALETTE_INIT( flyball ) static MACHINE_DRIVER_START( flyball ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) + MDRV_CPU_ADD("main", M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(flyball_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index 0a6e2987525..48b762d21cf 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -374,7 +374,7 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( foodf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 311534745b6..76687ffeea5 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -142,7 +142,7 @@ static VIDEO_UPDATE(fortecar) static MACHINE_DRIVER_START( fortecar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(fortecar_map,0) MDRV_CPU_IO_MAP(fortecar_ports,0) diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index e49cde09350..3060f4187b6 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -658,7 +658,7 @@ GFXDECODE_END *************************************/ static MACHINE_DRIVER_START( base ) - MDRV_CPU_ADD_TAG("main",Z80, 18432000/6) //confirmed + MDRV_CPU_ADD("main",Z80, 18432000/6) //confirmed MDRV_CPU_PROGRAM_MAP(pbillrd_readmem,pbillrd_writemem) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 50*3) //?? MDRV_CPU_VBLANK_INT("main", freekick_irqgen) diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index ac34a1bd37a..b4c6ae7c178 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -702,16 +702,15 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( fromanc2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16.00 MHz */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_main,fromanc2_writemem_main) MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) - MDRV_CPU_ADD(Z80,32000000/4) - /* audio CPU */ /* 8.00 MHz */ + MDRV_CPU_ADD("audio", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sound,fromanc2_writemem_sound) MDRV_CPU_IO_MAP(fromanc2_readport_sound,fromanc2_writeport_sound) - MDRV_CPU_ADD(Z80,32000000/4) /* 8.00 MHz */ + MDRV_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sub,fromanc2_writemem_sub) MDRV_CPU_IO_MAP(fromanc2_readport_sub,fromanc2_writeport_sub) @@ -755,16 +754,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fromancr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16.00 MHz */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromancr_readmem_main,fromancr_writemem_main) MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) - MDRV_CPU_ADD(Z80,32000000/4) - /* audio CPU */ /* 8.00 MHz */ + MDRV_CPU_ADD("audio", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sound,fromanc2_writemem_sound) MDRV_CPU_IO_MAP(fromanc2_readport_sound,fromanc2_writeport_sound) - MDRV_CPU_ADD(Z80,32000000/4) /* 8.00 MHz */ + MDRV_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sub,fromanc2_writemem_sub) MDRV_CPU_IO_MAP(fromanc2_readport_sub,fromanc2_writeport_sub) @@ -807,12 +805,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fromanc4 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16.00 MHz */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc4_readmem_main,fromanc4_writemem_main) MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) - MDRV_CPU_ADD(Z80,32000000/4) - /* audio CPU */ /* 8.00 MHz */ + MDRV_CPU_ADD("audio", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sound,fromanc2_writemem_sound) MDRV_CPU_IO_MAP(fromanc2_readport_sound,fromanc2_writeport_sound) diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index f7bc95fc1b7..55dd3105e80 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -1057,11 +1057,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( nekkyoku ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 Mhz ? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(nekkyoku_readmem_main,nekkyoku_writemem_main) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ + MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(nekkyoku_readmem_sub,nekkyoku_writemem_sub) MDRV_CPU_IO_MAP(nekkyoku_readport_sub,nekkyoku_writeport_sub) @@ -1095,11 +1095,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( idolmj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 Mhz ? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_main,fromance_writemem_main) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ + MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_sub,fromance_writemem_sub) MDRV_CPU_IO_MAP(fromance_readport_sub,idolmj_writeport_sub) @@ -1133,11 +1133,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fromance ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 Mhz ? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_main,fromance_writemem_main) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ + MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_sub,fromance_writemem_sub) MDRV_CPU_IO_MAP(fromance_readport_sub,fromance_writeport_sub) diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index 0a1e60b04a3..f61c31b31fc 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -303,7 +303,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( funkybee ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index fd660e3e21d..08a5b58dd10 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -365,12 +365,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( funkyjet ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* 28 MHz crystal */ + MDRV_CPU_ADD("main", M68000, 14000000) /* 28 MHz crystal */ MDRV_CPU_PROGRAM_MAP(funkyjet_readmem,funkyjet_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index f470604a4b3..528438efccf 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -1673,7 +1673,7 @@ static const struct AY8910interface ay8910_intf = static MACHINE_DRIVER_START( funworld ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M65SC02, MASTER_CLOCK/8) /* 2MHz */ + MDRV_CPU_ADD("main", M65SC02, MASTER_CLOCK/8) /* 2MHz */ MDRV_CPU_PROGRAM_MAP(funworld_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index e2119555880..b9d8c96d68a 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -244,12 +244,12 @@ static DRIVER_INIT( funybubl ) static MACHINE_DRIVER_START( funybubl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz?? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz?? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz?? */ MDRV_CPU_PROGRAM_MAP(soundreadmem,soundwritemem) /* video hardware */ diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 4bd0e268658..64c2d82110c 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -562,11 +562,10 @@ static MACHINE_RESET( fuuki16 ) static MACHINE_DRIVER_START( fuuki16 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(fuuki16_readmem,fuuki16_writemem) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(fuuki16_sound_readmem,fuuki16_sound_writemem) MDRV_CPU_IO_MAP(fuuki16_sound_readport,fuuki16_sound_writeport) diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index ba56485397f..8f0869a7ed2 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -604,10 +604,10 @@ static const struct YMF262interface ymf262_interface = static MACHINE_DRIVER_START( fuuki32 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, CPU_CLOCK) /* 20MHz verified */ + MDRV_CPU_ADD("main", M68EC020, CPU_CLOCK) /* 20MHz verified */ MDRV_CPU_PROGRAM_MAP(fuuki32_readmem,fuuki32_writemem) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */ + MDRV_CPU_ADD("sound", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */ MDRV_CPU_PROGRAM_MAP(fuuki32_sound_readmem,fuuki32_sound_writemem) MDRV_CPU_IO_MAP(fuuki32_sound_readport,fuuki32_sound_writeport) diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 9220a280005..ff514172f2a 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -217,12 +217,11 @@ GFXDECODEINFO(0x100000,64) static MACHINE_DRIVER_START( bigkarnk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* MC68000P10, 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* MC68000P10, 10 MHz */ MDRV_CPU_PROGRAM_MAP(bigkarnk_readmem,bigkarnk_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(M6809, 8867000/4) /* 68B09, 2.21675 MHz? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 8867000/4) /* 68B09, 2.21675 MHz? */ MDRV_CPU_PROGRAM_MAP(bigkarnk_readmem_snd,bigkarnk_writemem_snd) MDRV_INTERLEAVE(10) @@ -472,7 +471,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( maniacsq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(maniacsq_readmem,maniacsq_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -725,7 +724,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( squash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* MC68000P12, 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* MC68000P12, 12 MHz */ MDRV_CPU_PROGRAM_MAP(squash_readmem,squash_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -893,7 +892,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( thoop ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* MC68000P12, 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* MC68000P12, 12 MHz */ MDRV_CPU_PROGRAM_MAP(squash_readmem,thoop_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 1420c0a0b69..309adec5d19 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -165,7 +165,7 @@ static const struct gaelcosnd_interface maniacsq_snd_interface = static MACHINE_DRIVER_START( maniacsq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 26000000/2) /* 13 MHz? */ + MDRV_CPU_ADD("main", M68000, 26000000/2) /* 13 MHz? */ MDRV_CPU_PROGRAM_MAP(maniacsq_readmem, maniacsq_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -292,7 +292,7 @@ static const struct gaelcosnd_interface bang_snd_interface = static MACHINE_DRIVER_START( bang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 30000000/2) /* 15 MHz */ + MDRV_CPU_ADD("main", M68000, 30000000/2) /* 15 MHz */ MDRV_CPU_PROGRAM_MAP(bang_readmem, bang_writemem) MDRV_CPU_VBLANK_INT_HACK(bang_interrupt, 6) @@ -497,7 +497,7 @@ static const struct gaelcosnd_interface alighunt_snd_interface = static MACHINE_DRIVER_START( alighunt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(alighunt_readmem, alighunt_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -750,7 +750,7 @@ static const struct gaelcosnd_interface touchgo_snd_interface = static MACHINE_DRIVER_START( touchgo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 32000000/2) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(touchgo_readmem, touchgo_writemem) MDRV_CPU_VBLANK_INT("left", irq6_line_hold) @@ -953,7 +953,7 @@ static const struct gaelcosnd_interface snowboar_snd_interface = static MACHINE_DRIVER_START( snowboar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 30000000/2) /* 15 MHz */ + MDRV_CPU_ADD("main", M68000, 30000000/2) /* 15 MHz */ MDRV_CPU_PROGRAM_MAP(snowboar_readmem, snowboar_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -1205,7 +1205,7 @@ static const struct gaelcosnd_interface wrally2_snd_interface = static MACHINE_DRIVER_START( wrally2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 26000000/2) /* 13 MHz */ + MDRV_CPU_ADD("main", M68000, 26000000/2) /* 13 MHz */ MDRV_CPU_PROGRAM_MAP(wrally2_readmem, wrally2_writemem) MDRV_CPU_VBLANK_INT("left", irq6_line_hold) diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 720255e2cc2..c10569f6758 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -916,15 +916,15 @@ static const struct tms32031_config tms_config = static MACHINE_DRIVER_START( gaelco3d ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 15000000) + MDRV_CPU_ADD("main", M68000, 15000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", vblank_gen) - MDRV_CPU_ADD_TAG("tms", TMS32031, 60000000) + MDRV_CPU_ADD("tms", TMS32031, 60000000) MDRV_CPU_PROGRAM_MAP(tms_map,0) MDRV_CPU_CONFIG(tms_config) - MDRV_CPU_ADD_TAG("adsp", ADSP2115, 16000000) + MDRV_CPU_ADD("adsp", ADSP2115, 16000000) MDRV_CPU_PROGRAM_MAP(adsp_program_map,0) MDRV_CPU_DATA_MAP(adsp_data_map, 0) diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index f32d48eb4b5..df52a7e23a5 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -974,12 +974,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( shadoww ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 18432000/2) /* 9.216 MHz */ + MDRV_CPU_ADD("main", M68000, 18432000/2) /* 9.216 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* IRQs are triggered by the YM2203 */ @@ -1034,12 +1033,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( drgnbowl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 20000000/2) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 20000000/2) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(drgnbowl_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 12000000/2) /* 6 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(drgnbowl_sound_map,0) MDRV_CPU_IO_MAP(drgnbowl_sound_port_map,0) diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 116fd732fe0..29bbcc572d0 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -1646,28 +1646,28 @@ static const struct Samplesinterface battles_samples_interface = static MACHINE_DRIVER_START( bosco ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(bosco_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(bosco_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub2", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(bosco_map,0) - MDRV_CPU_ADD_TAG(CPUTAG_50XX, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_50XX, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program,0) MDRV_CPU_DATA_MAP(namco_50xx_map_data,0) MDRV_CPU_IO_MAP(namco_50xx_map_io,0) - MDRV_CPU_ADD_TAG(CPUTAG_50XX_2, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_50XX_2, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_50xx_2_map_program,0) MDRV_CPU_DATA_MAP(namco_50xx_2_map_data,0) MDRV_CPU_IO_MAP(namco_50xx_2_map_io,0) - MDRV_CPU_ADD_TAG(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0) MDRV_CPU_DATA_MAP(namco_54xx_map_data,0) MDRV_CPU_IO_MAP(namco_54xx_map_io,0) @@ -1715,18 +1715,18 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( galaga ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaga_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaga_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub2", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaga_map,0) - MDRV_CPU_ADD_TAG(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0) MDRV_CPU_DATA_MAP(namco_54xx_map_data,0) MDRV_CPU_IO_MAP(namco_54xx_map_io,0) @@ -1773,7 +1773,7 @@ static MACHINE_DRIVER_START( galagab ) MDRV_CPU_REMOVE(CPUTAG_54XX) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub3", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem4_galaga,writemem4_galaga) /* sound hardware */ @@ -1784,23 +1784,23 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( xevious ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(xevious_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(xevious_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub2", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(xevious_map,0) - MDRV_CPU_ADD_TAG(CPUTAG_50XX, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_50XX, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program,0) MDRV_CPU_DATA_MAP(namco_50xx_map_data,0) MDRV_CPU_IO_MAP(namco_50xx_map_io,0) - MDRV_CPU_ADD_TAG(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0) MDRV_CPU_DATA_MAP(namco_54xx_map_data,0) MDRV_CPU_IO_MAP(namco_54xx_map_io,0) @@ -1847,7 +1847,7 @@ static MACHINE_DRIVER_START( battles ) MDRV_CPU_REMOVE(CPUTAG_50XX) MDRV_CPU_REMOVE(CPUTAG_54XX) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub3", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem4_battles,writemem4_battles) MDRV_CPU_VBLANK_INT("main", battles_interrupt_4) @@ -1868,15 +1868,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( digdug ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(digdug_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(digdug_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub2", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(digdug_map,0) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -1913,7 +1913,7 @@ static MACHINE_DRIVER_START( dzigzag ) /* basic machine hardware */ MDRV_IMPORT_FROM(digdug) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("sub3", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem4_dzigzag,writemem4_dzigzag) MACHINE_DRIVER_END diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index b43032af9da..bf7c7bb4141 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -351,7 +351,7 @@ static NVRAM_HANDLER( galastrm ) static MACHINE_DRIVER_START( galastrm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(galastrm_readmem,galastrm_writemem) MDRV_CPU_VBLANK_INT("main", galastrm_interrupt) /* VBL */ diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c index c88ae0ca0bf..f2acaf4cbe7 100644 --- a/src/mame/drivers/galaxia.c +++ b/src/mame/drivers/galaxia.c @@ -143,7 +143,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( galaxia ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650,2000000) /* ? MHz */ + MDRV_CPU_ADD("main", S2650,2000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index b9d22a5101f..d5d0fd31d32 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -1748,7 +1748,7 @@ DISCRETE_SOUND_END static MACHINE_DRIVER_START( galaxian_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, GALAXIAN_PIXEL_CLOCK/3/2) + MDRV_CPU_ADD("main", Z80, GALAXIAN_PIXEL_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(galaxian_map,0) MDRV_CPU_VBLANK_INT("main", interrupt_gen) @@ -1797,7 +1797,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( konami_sound_1x_ay8910 ) /* 2nd CPU to drive sound */ - MDRV_CPU_ADD_TAG("sound", Z80, KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("sound", Z80, KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(frogger_sound_map,0) MDRV_CPU_IO_MAP(frogger_sound_portmap,0) @@ -1817,7 +1817,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( konami_sound_2x_ay8910 ) /* 2nd CPU to drive sound */ - MDRV_CPU_ADD_TAG("sound", Z80, KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("sound", Z80, KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(konami_sound_map,0) MDRV_CPU_IO_MAP(konami_sound_portmap,0) @@ -1910,7 +1910,7 @@ static MACHINE_DRIVER_START( checkman ) MDRV_IMPORT_FROM(mooncrst) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 1620000) /* 1.62 MHz */ + MDRV_CPU_ADD("audio", Z80, 1620000) /* 1.62 MHz */ MDRV_CPU_PROGRAM_MAP(checkman_sound_map,0) MDRV_CPU_IO_MAP(checkman_sound_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMIs are triggered by the main CPU */ @@ -1925,7 +1925,7 @@ static MACHINE_DRIVER_START( checkmaj ) MDRV_IMPORT_FROM(galaxian) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 1620000) + MDRV_CPU_ADD("audio", Z80, 1620000) MDRV_CPU_PROGRAM_MAP(checkmaj_sound_map,0) MDRV_TIMER_ADD_SCANLINE("irq0", checkmaj_irq0_gen, "main", 0, 8) @@ -1960,7 +1960,7 @@ static MACHINE_DRIVER_START( kingball ) MDRV_IMPORT_FROM(mooncrst) /* basic machine hardware */ - MDRV_CPU_ADD(Z80,5000000/2) + MDRV_CPU_ADD("audio", Z80,5000000/2) MDRV_CPU_PROGRAM_MAP(kingball_sound_map,0) MDRV_CPU_IO_MAP(kingball_sound_portmap,0) @@ -2060,7 +2060,7 @@ static MACHINE_DRIVER_START( explorer ) MDRV_CPU_PROGRAM_MAP(theend_map,0) /* 2nd CPU to drive sound */ - MDRV_CPU_ADD(Z80,KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("audio", Z80,KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(konami_sound_map,0) MDRV_CPU_IO_MAP(konami_sound_portmap,0) @@ -2102,7 +2102,7 @@ static MACHINE_DRIVER_START( sfx ) MDRV_CPU_PROGRAM_MAP(sfx_map,0) /* 3rd CPU for the sample player */ - MDRV_CPU_ADD(Z80, KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("audio", Z80, KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sfx_sample_map,0) MDRV_CPU_IO_MAP(sfx_sample_portmap,0) diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index 6f19860e7dd..57500ed25d7 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -2304,7 +2304,7 @@ static const struct AY8910interface bongo_ay8910_interface = static MACHINE_DRIVER_START( galaxold_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaxold_readmem,galaxold_writemem) MDRV_MACHINE_RESET(galaxold) @@ -2468,7 +2468,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( drivfrcg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 18432000/6) + MDRV_CPU_ADD("main", S2650, 18432000/6) MDRV_CPU_PROGRAM_MAP(drivfrcg,0) MDRV_CPU_IO_MAP(drivfrcg_io,0) MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) @@ -2514,7 +2514,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hunchbkg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, PIXEL_CLOCK/2) + MDRV_CPU_ADD("main", S2650, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(hunchbkg,0) MDRV_CPU_IO_MAP(hunchbkg_io,0) MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) @@ -2545,8 +2545,7 @@ static MACHINE_DRIVER_START( harem ) MDRV_CPU_PROGRAM_MAP(harem_cpu1,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 1620000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 1620000) MDRV_CPU_PROGRAM_MAP(harem_cpu2,0) MDRV_CPU_IO_MAP(harem_cpu2_io,0) @@ -2577,7 +2576,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( racknrol ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, PIXEL_CLOCK/2) + MDRV_CPU_ADD("main", S2650, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(racknrol,0) MDRV_CPU_IO_MAP(racknrol_io,0) MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) @@ -2635,7 +2634,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hexpoola ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, PIXEL_CLOCK/2) + MDRV_CPU_ADD("main", S2650, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(racknrol,0) MDRV_CPU_IO_MAP(hexpoola_io,0) MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 92c9a54edf4..2ee415571d7 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -556,13 +556,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( galivan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */ @@ -600,13 +599,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ninjemak ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,ninjemak_writemem) MDRV_CPU_IO_MAP(ninjemak_readport,ninjemak_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */ diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 835ef2afa8e..ad53707e284 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -460,11 +460,11 @@ static INTERRUPT_GEN( galpani2_interrupt2 ) static MACHINE_DRIVER_START( galpani2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(galpani2_mem1, 0) MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt,GALPANI2_INTERRUPTS_NUM) - MDRV_CPU_ADD(M68000, 16000000) /* 16MHz */ + MDRV_CPU_ADD("sub", M68000, 16000000) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(galpani2_mem2, 0) MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt2,GALPANI2_INTERRUPTS_NUM2) diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 7f3a6445d3d..afe4f59fbca 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -370,7 +370,7 @@ static const struct YMZ280Binterface ymz280b_intf = }; static MACHINE_DRIVER_START( galpani3 ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) // ? (from which clock?) + MDRV_CPU_ADD("main", M68000, 16000000) // ? (from which clock?) MDRV_CPU_PROGRAM_MAP(galpani3_map,0) MDRV_CPU_VBLANK_INT_HACK(galpani3_vblank, 3) diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index ba2eb642b58..d648c02e379 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -930,7 +930,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( galpanic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(galpanic,0) MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2) diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 09142ca4c0f..ff86cb4499a 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -278,12 +278,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( galspnbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* also has vector for 6, but it does nothing */ - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(audio_map,0) /* NMI is caused by the main CPU */ diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index b0149986fcb..d204bf3abb1 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -633,7 +633,7 @@ static const struct pit8253_config gamecstl_pit8254_config = static MACHINE_DRIVER_START(gamecstl) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PENTIUM, 200000000) + MDRV_CPU_ADD("main", PENTIUM, 200000000) MDRV_CPU_PROGRAM_MAP(gamecstl_map, 0) MDRV_CPU_IO_MAP(gamecstl_io, 0) diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index 804f5315715..53da22edce4 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -1172,10 +1172,10 @@ static MACHINE_DRIVER_START( gameplan ) MDRV_DRIVER_DATA(gameplan_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, GAMEPLAN_MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, GAMEPLAN_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(gameplan_main_map,0) - MDRV_CPU_ADD_TAG("audio", M6502, GAMEPLAN_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", M6502, GAMEPLAN_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(gameplan_audio_map,0) MDRV_MACHINE_START(gameplan) diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 3526c826bca..bd4a745576d 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -540,15 +540,15 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( gaplus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 24576000/16) /* 1.536 MHz */ + MDRV_CPU_ADD("main", M6809, 24576000/16) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) MDRV_CPU_VBLANK_INT("main", gaplus_interrupt_1) - MDRV_CPU_ADD(M6809, 24576000/16) /* 1.536 MHz */ + MDRV_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(M6809, 24576000/16) /* 1.536 MHz */ + MDRV_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu3,writemem_cpu3) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index 65ce6e7242c..b0cec31213f 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -402,7 +402,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( gat ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/24) /* guess */ + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/24) /* guess */ MDRV_CPU_PROGRAM_MAP(gat_map, 0) MDRV_CPU_IO_MAP(gat_portmap,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index cb9f1872285..e4879ba9ea1 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -527,11 +527,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( gauntlet ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68010, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) - MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) + MDRV_CPU_ADD("audio", M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(gauntlet) diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 8007d3b3cdd..9c20686bb94 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -550,7 +550,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( gberet ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) // X1S (generated by a custom IC) + MDRV_CPU_ADD("main", Z80, 18432000/6) // X1S (generated by a custom IC) MDRV_CPU_PROGRAM_MAP(gberet_map, 0) MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 32) // 1 IRQ + 16 NMI (generated by a custom IC) diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 3ec8d746928..81d80e27ee2 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -299,12 +299,11 @@ static const struct K007232_interface k007232_interface = static MACHINE_DRIVER_START( gbusters ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* Konami custom 052526 */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* Konami custom 052526 */ MDRV_CPU_PROGRAM_MAP(gbusters_readmem,gbusters_writemem) MDRV_CPU_VBLANK_INT("main", gbusters_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* ? */ MDRV_CPU_PROGRAM_MAP(gbusters_readmem_sound,gbusters_writemem_sound) MDRV_MACHINE_RESET(gbusters) diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index a5de71bedf6..f4a294aba8c 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -379,7 +379,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( gcpinbal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16 MHz ? */ + MDRV_CPU_ADD("main", M68000, 32000000/2) /* 16 MHz ? */ MDRV_CPU_PROGRAM_MAP(gcpinbal_readmem,gcpinbal_writemem) MDRV_CPU_VBLANK_INT("main", gcpinbal_interrupt) diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c index 3b3b65d6866..856bb07298b 100644 --- a/src/mame/drivers/genesis.c +++ b/src/mame/drivers/genesis.c @@ -651,11 +651,11 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( genesis_base ) /*basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK / 7) MDRV_CPU_PROGRAM_MAP(genesis_readmem, genesis_writemem) MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK / 15) MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */ diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index 76763ed5b5f..c1272bfed79 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -468,7 +468,7 @@ static MACHINE_RESET( gselect ) } static MACHINE_DRIVER_START( getrivia ) - MDRV_CPU_ADD_TAG("cpu",Z80,4000000) /* 4 MHz */ + MDRV_CPU_ADD("cpu",Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(getrivia_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index 9028bc94cfb..ee3ec3f4abb 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -482,7 +482,7 @@ static INTERRUPT_GEN( bballoon_interrupt ) static MACHINE_DRIVER_START( bballoon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM7, 24000000) + MDRV_CPU_ADD("main", ARM7, 24000000) MDRV_CPU_PROGRAM_MAP(bballoon_map,0) MDRV_CPU_VBLANK_INT("main", bballoon_interrupt) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index e1fded78e21..dc7ded80735 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -341,12 +341,11 @@ static const struct K054539interface k054539_interface = static MACHINE_DRIVER_START( gijoe ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* Confirmed */ + MDRV_CPU_ADD("main", M68000, 16000000) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_VBLANK_INT("main", gijoe_interrupt) - MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ /* Amuse & confirmed. z80e */ + MDRV_CPU_ADD("audio", Z80, 8000000) /* Amuse & confirmed. z80e */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_START(gijoe) diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index a6fcb27c98e..6a0d7c5708b 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -349,12 +349,11 @@ static const struct Y8950interface y8950_interface = static MACHINE_DRIVER_START( ginganin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 6000000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */ - MDRV_CPU_ADD(M6809, 1000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 1000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(ginganin_sound_interrupt,60) /* Takahiro Nogi. 1999/09/27 (1 -> 60) */ diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 72fff7da529..ae4d1639b48 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -684,18 +684,17 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( ppking ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(ppking_cpu1_map,0) MDRV_CPU_IO_MAP(ppking_cpu1_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_12MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(ppking_cpu2_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6809, XTAL_12MHz/16) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, XTAL_12MHz/16) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(ppking_cpu3_map,0) MDRV_INTERLEAVE(100) @@ -734,17 +733,16 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gladiatr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(gladiatr_cpu1_map,0) MDRV_CPU_IO_MAP(gladiatr_cpu1_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_12MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(gladiatr_cpu2_io,0) - MDRV_CPU_ADD(M6809, XTAL_12MHz/16) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, XTAL_12MHz/16) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(gladiatr_cpu3_map,0) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index d9828766f61..c8df1894be2 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -201,7 +201,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( glass ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz (M680000 P12) */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz (M680000 P12) */ MDRV_CPU_PROGRAM_MAP(glass_readmem,glass_writemem) MDRV_CPU_VBLANK_INT("main", glass_interrupt) diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 1e99bb5350f..352ac0b98f7 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -340,12 +340,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( gng ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz ? */ + MDRV_CPU_ADD("main", M6809, 1500000) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index eef2c9a9dc9..d53304041b7 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -167,7 +167,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( go2000 ) - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(go2000_readmem,go2000_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 1de75ff9082..7770506891f 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -314,12 +314,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( goal92 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) + MDRV_CPU_ADD("main", M68000,12000000) MDRV_CPU_PROGRAM_MAP(goal92_readmem,goal92_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* VBL */ - MDRV_CPU_ADD(Z80, 2500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 2500000) MDRV_CPU_PROGRAM_MAP(sound_cpu,0) /* IRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 4dbd798002e..fd0e896f944 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -271,12 +271,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( goindol ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 7ce7c0cd900..9571da702e0 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -286,7 +286,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( goldstar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3579545)//(4000000?) + MDRV_CPU_ADD("main", Z80, 3579545)//(4000000?) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -322,7 +322,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( goldstbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3579545)//(4000000?) + MDRV_CPU_ADD("main", Z80, 3579545)//(4000000?) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -357,7 +357,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( moonlght ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3579545)//(4000000?) + MDRV_CPU_ADD("main", Z80, 3579545)//(4000000?) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c index 2f469a23d0e..5dad7e0e8b2 100644 --- a/src/mame/drivers/gomoku.c +++ b/src/mame/drivers/gomoku.c @@ -168,7 +168,7 @@ static const struct CustomSound_interface custom_interface = static MACHINE_DRIVER_START( gomoku ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/12) /* 1.536 MHz ? */ + MDRV_CPU_ADD("main", Z80, 18432000/12) /* 1.536 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_gomoku, writemem_gomoku) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 2643cde773b..696216721f0 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -271,7 +271,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( good ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000 /2) + MDRV_CPU_ADD("main", M68000, 16000000 /2) MDRV_CPU_PROGRAM_MAP(good_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 36979c3e056..359a7dafa1c 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -275,7 +275,7 @@ static INTERRUPT_GEN( goodejan_interrupt ) static MACHINE_DRIVER_START( goodejan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30, GOODEJAN_MHZ2/2) + MDRV_CPU_ADD("main", V30, GOODEJAN_MHZ2/2) MDRV_CPU_PROGRAM_MAP(goodejan_map,0) MDRV_CPU_IO_MAP(goodejan_io_map,0) MDRV_CPU_VBLANK_INT_HACK(goodejan_interrupt,2) diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index d9a2d77b65a..ea529f01477 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -274,12 +274,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( gotcha ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,14318180) /* 14.31818 MHz */ + MDRV_CPU_ADD("main", M68000,14318180) /* 14.31818 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80,6000000) /* 6 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) // MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index 7845983d0fa..c1fc559f655 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -1520,12 +1520,12 @@ static const struct sp0250_interface sp0250_interface = static MACHINE_DRIVER_START( gottlieb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8088, 5000000) /* 5 MHz */ + MDRV_CPU_ADD("main", I8088, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(gottlieb_map,0) MDRV_CPU_VBLANK_INT("main", gottlieb_interrupt) /* audio CPU */ - MDRV_CPU_ADD_TAG("sound", M6502, 3579545/4) /* the board can be set to /2 as well */ + MDRV_CPU_ADD("sound", M6502, 3579545/4) /* the board can be set to /2 as well */ MDRV_CPU_PROGRAM_MAP(gottlieb_sound_map,0) /* NMIs are triggered by the Votrax SC-01 */ @@ -1598,15 +1598,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gottlieb2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8088, 5000000) /* 5 MHz */ + MDRV_CPU_ADD("main", I8088, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(gottlieb_map,0) MDRV_CPU_VBLANK_INT("main", gottlieb_interrupt) - MDRV_CPU_ADD_TAG("sound", M6502, 1000000) /* 1 MHz */ + MDRV_CPU_ADD("sound", M6502, 1000000) /* 1 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(stooges_sound_map,0) - MDRV_CPU_ADD_TAG("sound2", M6502, 1000000) /* 1 MHz */ + MDRV_CPU_ADD("sound2", M6502, 1000000) /* 1 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(stooges_sound2_map,0) diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index 47dd02302f9..4255b6d553f 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -198,7 +198,7 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( gotya ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* 3.072 MHz ??? */ + MDRV_CPU_ADD("main", Z80,18432000/6) /* 3.072 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index daf7de896e1..3b2998926d7 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -430,7 +430,7 @@ GFXDECODE_END /* DRIVER */ static MACHINE_DRIVER_START( gpworld ) /* main cpu */ - MDRV_CPU_ADD_TAG("main", Z80, GUESSED_CLOCK) + MDRV_CPU_ADD("main", Z80, GUESSED_CLOCK) MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainport,0) MDRV_CPU_VBLANK_INT("main", vblank_callback_gpworld) diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index f03701bda29..3572d3d6091 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -338,16 +338,16 @@ static const struct K007232_interface k007232_interface = static MACHINE_DRIVER_START( gradius3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(gradius3_map,0) MDRV_CPU_VBLANK_INT("main", cpuA_interrupt) - MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("sub", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(gradius3_map2,0) MDRV_CPU_VBLANK_INT_HACK(cpuB_interrupt,2) /* has three interrupt vectors, 1 2 and 4 */ /* 4 is triggered by cpu A, the others are unknown but */ /* required for the game to run. */ - MDRV_CPU_ADD(Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(gradius3_s_map,0) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index a465f22f71a..920c790cfc8 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -674,19 +674,19 @@ static MACHINE_DRIVER_START( grchamp ) /* basic machine hardware */ /* CPU BOARD */ - MDRV_CPU_ADD_TAG("main", Z80, PIXEL_CLOCK/2) + MDRV_CPU_ADD("main", Z80, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", grchamp_cpu0_interrupt) /* GAME BOARD */ - MDRV_CPU_ADD(Z80, PIXEL_CLOCK/2) + MDRV_CPU_ADD("sub", Z80, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_IO_MAP(sub_portmap,0) MDRV_CPU_VBLANK_INT("main", grchamp_cpu1_interrupt) /* SOUND BOARD */ - MDRV_CPU_ADD(Z80, SOUND_CLOCK/2) + MDRV_CPU_ADD("audio", Z80, SOUND_CLOCK/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16) diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c index 0531241fdea..f2913b12844 100644 --- a/src/mame/drivers/gridlee.c +++ b/src/mame/drivers/gridlee.c @@ -434,7 +434,7 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( gridlee ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, BALSENTE_CPU_CLOCK) + MDRV_CPU_ADD("main", M6809, BALSENTE_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) MDRV_MACHINE_RESET(gridlee) diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index b199f2bcd03..9f0a907613c 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -406,7 +406,7 @@ static INTERRUPT_GEN( groundfx_interrupt ) static MACHINE_DRIVER_START( groundfx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(groundfx_readmem,groundfx_writemem) MDRV_CPU_VBLANK_INT("main", groundfx_interrupt) diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 4782e346e88..21137a58fe3 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -410,7 +410,7 @@ static VIDEO_UPDATE(gstream) } static MACHINE_DRIVER_START( gstream ) - MDRV_CPU_ADD_TAG("main", E132XT, 16000000*4) /* 4x internal multiplier */ + MDRV_CPU_ADD("main", E132XT, 16000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(gstream_32bit_map,0) MDRV_CPU_IO_MAP(gstream_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 8caa7ce025f..f03e822a9fd 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -574,12 +574,11 @@ INPUT_PORTS_END /*** MACHINE DRIVER **********************************************************/ static MACHINE_DRIVER_START( gstriker ) - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -615,12 +614,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vgoal ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(vgoal_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 6e501aec268..5b17c8f8c80 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -694,18 +694,17 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( gsword ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_18MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu1_map,0) MDRV_CPU_IO_MAP(cpu1_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_18MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_18MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(cpu2_io_map,0) MDRV_CPU_VBLANK_INT_HACK(gsword_snd_interrupt,4) - MDRV_CPU_ADD(Z80, XTAL_18MHz/6) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_18MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu3_map,0) MDRV_INTERLEAVE(200) /* Allow time for 2nd cpu to interleave*/ @@ -750,13 +749,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( josvolly ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18000000/6) /* ? */ + MDRV_CPU_ADD("main", Z80, 18000000/6) /* ? */ MDRV_CPU_PROGRAM_MAP(cpu1_map,0) MDRV_CPU_IO_MAP(josvolly_cpu1_io_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) - MDRV_CPU_ADD(Z80, 12000000/4) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 12000000/4) /* ? */ MDRV_CPU_PROGRAM_MAP(josvolly_cpu2_map,0) MDRV_CPU_IO_MAP(josvolly_cpu2_io_map,0) // MDRV_CPU_VBLANK_INT("main", gsword_snd_interrupt) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 2e3196b58bd..b338f302aa9 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -905,14 +905,14 @@ static MACHINE_RESET( gticlub ) static MACHINE_DRIVER_START( gticlub ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MDRV_CPU_ADD("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_PROGRAM_MAP(gticlub_map, 0) MDRV_CPU_VBLANK_INT("main", gticlub_vblank) - MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */ + MDRV_CPU_ADD("audio", M68000, 64000000/4) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(sharc_map, 0) @@ -951,17 +951,17 @@ static MACHINE_RESET( hangplt ) static MACHINE_DRIVER_START( hangplt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MDRV_CPU_ADD("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_PROGRAM_MAP(gticlub_map, 0) - MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */ + MDRV_CPU_ADD("audio", M68000, 64000000/4) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp1", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(hangplt_sharc0_map, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp2", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(hangplt_sharc1_map, 0) diff --git a/src/mame/drivers/gtipoker.c b/src/mame/drivers/gtipoker.c index ca14094d662..5d337e46234 100644 --- a/src/mame/drivers/gtipoker.c +++ b/src/mame/drivers/gtipoker.c @@ -54,7 +54,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( gtipoker ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(gtipoker_memmap,0) MDRV_CPU_IO_MAP(gtipoker_iomap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index c812ddd4c1f..c2364ed1fc2 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -750,7 +750,7 @@ static MACHINE_RESET( guab ) static MACHINE_DRIVER_START( guab ) /* TODO: Verify clock */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(guab_map, 0) MDRV_MACHINE_START(guab) diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c index d2a05e63e8a..2787eafabe8 100644 --- a/src/mame/drivers/gumbo.c +++ b/src/mame/drivers/gumbo.c @@ -307,7 +307,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( gumbo ) - MDRV_CPU_ADD_TAG("main", M68000, 14318180 /2) // or 10mhz? ? + MDRV_CPU_ADD("main", M68000, 14318180 /2) // or 10mhz? ? MDRV_CPU_PROGRAM_MAP(gumbo_readmem,gumbo_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // all the same diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index 73b603cd3c6..60d31cbe170 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -373,7 +373,7 @@ static NVRAM_HANDLER( gunbustr ) static MACHINE_DRIVER_START( gunbustr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(gunbustr_readmem,gunbustr_writemem) MDRV_CPU_VBLANK_INT("main", gunbustr_interrupt) /* VBL */ diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 27b5a41e014..076f30e4025 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -462,7 +462,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( gundealr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* 8 MHz ??? */ + MDRV_CPU_ADD("main", Z80, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT_HACK(yamyam_interrupt,4) /* ? */ diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index 81f2509beed..7813230fe40 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -120,7 +120,7 @@ static INTERRUPT_GEN( gunpey_interrupt ) static MACHINE_DRIVER_START( gunpey ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30, 57242400 / 4) + MDRV_CPU_ADD("main", V30, 57242400 / 4) MDRV_CPU_PROGRAM_MAP(mem_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", gunpey_interrupt) diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index 03f208fe4f4..8df7e85c754 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -286,12 +286,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( gunsmoke ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 4000000) // 4 MHz + MDRV_CPU_ADD("main", Z80, 4000000) // 4 MHz MDRV_CPU_PROGRAM_MAP(gunsmoke_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3000000) // 3 MHz - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) // 3 MHz MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index eeed597cf62..cc8b3fc0cfb 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -517,21 +517,19 @@ DISCRETE_SOUND_END static MACHINE_DRIVER_START( gyruss ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz ??? */ + MDRV_CPU_ADD("syb", M6809, 2000000) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(audio_cpu1_map,0) MDRV_CPU_IO_MAP(audio_cpu1_io_map,0) - MDRV_CPU_ADD(I8039,8000000) - /* audio CPU */ /* 8MHz crystal */ + MDRV_CPU_ADD("audio2", I8039,8000000) /* 8MHz crystal */ MDRV_CPU_PROGRAM_MAP(audio_cpu2_map,0) MDRV_CPU_IO_MAP(audio_cpu2_io_map,0) diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c index b4a9086cf5b..e241ebd058c 100644 --- a/src/mame/drivers/hal21.c +++ b/src/mame/drivers/hal21.c @@ -697,16 +697,15 @@ static MACHINE_RESET( aso ) static MACHINE_DRIVER_START( aso ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(aso_cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(aso_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(aso_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -741,16 +740,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hal21 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(hal21_cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(hal21_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(hal21_sound_map,0) MDRV_CPU_IO_MAP(hal21_sound_portmap,0) MDRV_CPU_VBLANK_INT("main", hal21_sound_interrupt) diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 5bee7c790b0..ef48c4f7d54 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1951,11 +1951,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( halleys ) - MDRV_CPU_ADD_TAG("main", M6809, XTAL_19_968MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("main", M6809, XTAL_19_968MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_VBLANK_INT_HACK(halleys_interrupt, 4) - MDRV_CPU_ADD(Z80, XTAL_6MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_6MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem, sound_writemem) MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16)) diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index 81ba40ab991..0e99bfd1ecd 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -207,7 +207,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( hanaawas ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* 3.072 MHz ??? */ + MDRV_CPU_ADD("main", Z80,18432000/6) /* 3.072 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c index c39b6ddaf41..2fc621d488c 100644 --- a/src/mame/drivers/hanaroku.c +++ b/src/mame/drivers/hanaroku.c @@ -240,7 +240,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( hanaroku ) - MDRV_CPU_ADD_TAG("main", Z80,6000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,6000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index 0611386a8c4..4b91285523e 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -961,12 +961,12 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( driver_nomsp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68010, 32000000/4) + MDRV_CPU_ADD("main", M68010, 32000000/4) MDRV_CPU_PROGRAM_MAP(driver_68k_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_PERIODIC_INT(hd68k_irq_gen, (double)32000000/16/16/16/16/2) - MDRV_CPU_ADD_TAG("gsp", TMS34010, 48000000) + MDRV_CPU_ADD("gsp", TMS34010, 48000000) MDRV_CPU_PROGRAM_MAP(driver_gsp_map,0) MDRV_CPU_CONFIG(gsp_config_driver) @@ -994,7 +994,7 @@ static MACHINE_DRIVER_START( driver_msp ) MDRV_IMPORT_FROM(driver_nomsp) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("msp", TMS34010, 50000000) + MDRV_CPU_ADD("msp", TMS34010, 50000000) MDRV_CPU_PROGRAM_MAP(driver_msp_map,0) MDRV_CPU_CONFIG(msp_config) MACHINE_DRIVER_END @@ -1023,7 +1023,7 @@ static MACHINE_DRIVER_START( multisync_msp ) MDRV_IMPORT_FROM(multisync_nomsp) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("msp", TMS34010, 50000000) + MDRV_CPU_ADD("msp", TMS34010, 50000000) MDRV_CPU_PROGRAM_MAP(driver_msp_map,0) MDRV_CPU_CONFIG(msp_config) MACHINE_DRIVER_END @@ -1053,7 +1053,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( adsp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("adsp", ADSP2100, 8000000) + MDRV_CPU_ADD("adsp", ADSP2100, 8000000) MDRV_CPU_PROGRAM_MAP(adsp_program_map,0) MDRV_CPU_DATA_MAP(adsp_data_map,0) MACHINE_DRIVER_END @@ -1063,7 +1063,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ds3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("adsp", ADSP2101, 12000000) + MDRV_CPU_ADD("adsp", ADSP2101, 12000000) MDRV_CPU_PROGRAM_MAP(ds3_program_map,0) MDRV_CPU_DATA_MAP(ds3_data_map,0) @@ -1075,15 +1075,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ds4 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("adsp", ADSP2101, 12000000) + MDRV_CPU_ADD("adsp", ADSP2101, 12000000) MDRV_CPU_PROGRAM_MAP(ds3_program_map,0) MDRV_CPU_DATA_MAP(ds3_data_map,0) -// MDRV_CPU_ADD_TAG("sound", ADSP2105, 10000000) +// MDRV_CPU_ADD("sound", ADSP2105, 10000000) // /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(ds3snd_program_map,0) -// MDRV_CPU_ADD_TAG("sounddsp", ADSP2105, 10000000) +// MDRV_CPU_ADD("sounddsp", ADSP2105, 10000000) // /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(ds3snd_program_map,0) @@ -1108,7 +1108,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dsk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("dsp32", DSP32C, 40000000) + MDRV_CPU_ADD("dsp32", DSP32C, 40000000) MDRV_CPU_CONFIG(dsp32c_config) MDRV_CPU_PROGRAM_MAP(dsk_dsp32_map,0) @@ -1121,7 +1121,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dsk2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("dsp32", DSP32C, 40000000) + MDRV_CPU_ADD("dsp32", DSP32C, 40000000) MDRV_CPU_CONFIG(dsp32c_config) MDRV_CPU_PROGRAM_MAP(dsk2_dsp32_map,0) @@ -1140,10 +1140,10 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( driversnd ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", M68000, 16000000/2) + MDRV_CPU_ADD("sound", M68000, 16000000/2) MDRV_CPU_PROGRAM_MAP(driversnd_68k_map,0) - MDRV_CPU_ADD_TAG("sounddsp", TMS32010, 20000000) + MDRV_CPU_ADD("sounddsp", TMS32010, 20000000) MDRV_CPU_PROGRAM_MAP(driversnd_dsp_program_map,0) /* Data Map is internal to the CPU */ MDRV_CPU_IO_MAP(driversnd_dsp_io_map,0) diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 5dd6f2f2227..d60c358b958 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -266,12 +266,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( hcastle ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* Derived from 24 MHz clock */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* Derived from 24 MHz clock */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c index 54a94d61861..7342c314245 100644 --- a/src/mame/drivers/hexa.c +++ b/src/mame/drivers/hexa.c @@ -136,7 +136,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( hexa ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ??????? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ??????? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index 0ba699cf73f..22d5745c67f 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -282,7 +282,7 @@ static INTERRUPT_GEN( hexion_interrupt ) static MACHINE_DRIVER_START( hexion ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,24000000/4) /* Z80B 6 MHz */ + MDRV_CPU_ADD("main", Z80,24000000/4) /* Z80B 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(hexion_interrupt,3) /* both IRQ and NMI are used */ diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c index 394652309c5..d2678f9ecee 100644 --- a/src/mame/drivers/higemaru.c +++ b/src/mame/drivers/higemaru.c @@ -173,7 +173,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( higemaru ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? Main xtal is 12MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ? Main xtal is 12MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(higemaru_interrupt,2) diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index aaab7cbd970..2ed215d21b0 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -283,7 +283,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( hikaru ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH4, CPU_CLOCK) + MDRV_CPU_ADD("main", SH4, CPU_CLOCK) // MDRV_CPU_CONFIG(sh4cpu_config) MDRV_CPU_PROGRAM_MAP(hikaru_map,0) // MDRV_CPU_IO_MAP(hikaru_port,0) diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index c6890f08436..4404ddd7671 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -300,7 +300,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( hitme ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 8945000/16) + MDRV_CPU_ADD("main", 8080, 8945000/16) MDRV_CPU_PROGRAM_MAP(hitme_map,0) MDRV_CPU_IO_MAP(hitme_portmap,0) diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 3c736778aed..6dcc4c6d1a0 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -586,7 +586,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( hnayayoi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 20000000/4 ) /* 5 MHz ???? */ + MDRV_CPU_ADD("main", Z80, 20000000/4 ) /* 5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(hnayayoi_readmem,hnayayoi_writemem) MDRV_CPU_IO_MAP(hnayayoi_readport,hnayayoi_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index e49661187a9..156d67fa80c 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1516,15 +1516,15 @@ static MACHINE_RESET(hyperneo) static MACHINE_DRIVER_START( hng64 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R4600BE, MASTER_CLOCK) // actually R4300 + MDRV_CPU_ADD("main", R4600BE, MASTER_CLOCK) // actually R4300 MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(hng_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq_start,3) - MDRV_CPU_ADD(V30,8000000) // v53, 16? mhz! + MDRV_CPU_ADD("audio", V30,8000000) // v53, 16? mhz! MDRV_CPU_PROGRAM_MAP(hng_sound_map,0) - MDRV_CPU_ADD(Z80,MASTER_CLOCK/4) /* KL5C80A12CFP - binary compatible with Z80. */ + MDRV_CPU_ADD("comm", Z80,MASTER_CLOCK/4) /* KL5C80A12CFP - binary compatible with Z80. */ MDRV_CPU_PROGRAM_MAP(hng_comm_map,0) MDRV_CPU_IO_MAP(hng_comm_io_map, 0) diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c index f02547b20ec..b72844cbe3d 100644 --- a/src/mame/drivers/holeland.c +++ b/src/mame/drivers/holeland.c @@ -305,7 +305,7 @@ static const struct AY8910interface ay8910_interface_2 = static MACHINE_DRIVER_START( holeland ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -374,7 +374,7 @@ Notes: static MACHINE_DRIVER_START( crzrally ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 20000000/4) /* 5 MHz */ + MDRV_CPU_ADD("main", Z80, 20000000/4) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(crzrally_readmem,crzrally_writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 403a928dcbb..0198b0aa9ad 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -1225,12 +1225,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( mrokumei ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 16000000/4) /* 4MHz ? */ + MDRV_CPU_ADD("main", M6809, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(mrokumei_readmem,mrokumei_writemem) MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ - MDRV_CPU_ADD(Z80, 16000000/4) /* 4MHz ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(mrokumei_sound_readmem,mrokumei_sound_writemem) MDRV_CPU_IO_MAP(mrokumei_sound_readport,mrokumei_sound_writeport) @@ -1289,11 +1288,11 @@ static const UPD7810_CONFIG upd_config = static MACHINE_DRIVER_START( reikaids ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 16000000/4) /* 4MHz ? */ + MDRV_CPU_ADD("main", M6809, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(reikaids_readmem,reikaids_writemem) MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ - MDRV_CPU_ADD(UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */ + MDRV_CPU_ADD("audio", UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */ MDRV_CPU_CONFIG(upd_config) MDRV_CPU_PROGRAM_MAP(reikaids_upd7807_readmem,reikaids_upd7807_writemem) MDRV_CPU_IO_MAP(reikaids_upd7807_readport,reikaids_upd7807_writeport) @@ -1339,11 +1338,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pteacher ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 16000000/4) /* 4MHz ? */ + MDRV_CPU_ADD("main", M6809, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(pteacher_readmem,pteacher_writemem) MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ - MDRV_CPU_ADD_TAG("sound", UPD7807, 9000000) /* 9MHz ? */ + MDRV_CPU_ADD("sound", UPD7807, 9000000) /* 9MHz ? */ MDRV_CPU_CONFIG(upd_config) MDRV_CPU_PROGRAM_MAP(pteacher_upd7807_readmem,pteacher_upd7807_writemem) MDRV_CPU_IO_MAP(pteacher_upd7807_readport,pteacher_upd7807_writeport) diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 4188465e98e..0bfab751440 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -186,7 +186,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( homerun ) - MDRV_CPU_ADD_TAG("main", Z80, 5000000) + MDRV_CPU_ADD("main", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(homerun_memmap, 0) MDRV_CPU_IO_MAP(homerun_iomap, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index ec1ff13995d..0f8b69063af 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -1045,13 +1045,13 @@ static NVRAM_HANDLER( hornet ) static MACHINE_DRIVER_START( hornet ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MDRV_CPU_ADD("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_PROGRAM_MAP(hornet_map, 0) - MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */ + MDRV_CPU_ADD("audio", M68000, 64000000/4) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(sharc0_map, 0) @@ -1108,7 +1108,7 @@ static MACHINE_DRIVER_START( hornet_2board ) MDRV_IMPORT_FROM(hornet) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp2", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(sharc1_map, 0) diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index a356a21dabc..5740061b360 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -189,7 +189,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( hotblock ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8088, 10000000) + MDRV_CPU_ADD("main", I8088, 10000000) MDRV_CPU_PROGRAM_MAP(hotblock_map, 0) MDRV_CPU_IO_MAP(hotblock_io,0) MDRV_CPU_VBLANK_INT("main", hotblocks_irq) diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c index afae1792960..8a3f9d59023 100644 --- a/src/mame/drivers/hshavoc.c +++ b/src/mame/drivers/hshavoc.c @@ -132,10 +132,10 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( genesis_base ) /*basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK / 7) MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK / 15) MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */ diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c index 7d21d67666a..c786a552b7e 100644 --- a/src/mame/drivers/hyhoo.c +++ b/src/mame/drivers/hyhoo.c @@ -269,7 +269,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( hyhoo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000/1) /* 5.00 MHz ?? */ + MDRV_CPU_ADD("main", Z80, 5000000/1) /* 5.00 MHz ?? */ MDRV_CPU_PROGRAM_MAP(readmem_hyhoo, writemem_hyhoo) MDRV_CPU_IO_MAP(readport_hyhoo, writeport_hyhoo) MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index 234412dc382..a35315d7d6b 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -401,12 +401,11 @@ static const struct VLM5030interface hyperspt_vlm5030_interface = static MACHINE_DRIVER_START( hyperspt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(hyperspt_readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,XTAL_14_31818MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_NVRAM_HANDLER(hyperspt) diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 4daf6ff3ab0..a3199e26c7a 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -719,11 +719,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( hyprduel ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* 10MHz */ + MDRV_CPU_ADD("main", M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(hyprduel_readmem,hyprduel_writemem) MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES) - MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */ + MDRV_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(hyprduel_readmem2,hyprduel_writemem2) MDRV_MACHINE_RESET(hyprduel) @@ -760,11 +760,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( magerror ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* 10MHz */ + MDRV_CPU_ADD("main", M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(magerror_readmem,magerror_writemem) MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES) - MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */ + MDRV_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(magerror_readmem2,magerror_writemem2) MDRV_MACHINE_RESET(hyprduel) diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c index 4ba6b362c7b..f42055c2b4a 100644 --- a/src/mame/drivers/igs_180.c +++ b/src/mame/drivers/igs_180.c @@ -686,7 +686,7 @@ static MACHINE_RESET( igs_180 ) static MACHINE_DRIVER_START( igs_180 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z180, XTAL_16MHz / 2) + MDRV_CPU_ADD("main", Z180, XTAL_16MHz / 2) MDRV_CPU_PROGRAM_MAP(igs_180_map,0) MDRV_CPU_IO_MAP(igs_180_portmap,0) MDRV_CPU_VBLANK_INT_HACK(igs_180_interrupt,2) diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 1d707cbc1c0..96c7ec4c870 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -2355,7 +2355,7 @@ GFXDECODE_END */ static MACHINE_DRIVER_START( igs_base ) - MDRV_CPU_ADD_TAG("main",M68000, 22000000/3) + MDRV_CPU_ADD("main",M68000, 22000000/3) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 45d13826d00..ae9962415dc 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -364,7 +364,7 @@ static INTERRUPT_GEN( igs_majhong_interrupt ) static MACHINE_DRIVER_START( igs_majhong ) - MDRV_CPU_ADD_TAG("main",ARM7, 20000000) + MDRV_CPU_ADD("main",ARM7, 20000000) MDRV_CPU_PROGRAM_MAP(igs_majhong_map,0) diff --git a/src/mame/drivers/igs_m68.c b/src/mame/drivers/igs_m68.c index 5c4844b1155..0a3569971ec 100644 --- a/src/mame/drivers/igs_m68.c +++ b/src/mame/drivers/igs_m68.c @@ -39,7 +39,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( igs_m68 ) - MDRV_CPU_ADD_TAG("main", M68000, 22000000 /2) // 11mhz + MDRV_CPU_ADD("main", M68000, 22000000 /2) // 11mhz MDRV_CPU_PROGRAM_MAP(igs_m68_map,0) //MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index 857729ae8db..136989c9db0 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -193,11 +193,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( ikki ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.000MHz */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(ikki_cpu1,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) - MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ + MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(ikki_cpu2,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index b2885f84327..1ab9b75f6fb 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -405,12 +405,12 @@ static const ppi8255_interface ppi8255_intf = static MACHINE_DRIVER_START( imolagp ) - MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? */ + MDRV_CPU_ADD("main", Z80,8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(imolagp_master,0) MDRV_CPU_IO_MAP(readport_master,0) MDRV_CPU_VBLANK_INT_HACK(master_interrupt,4) - MDRV_CPU_ADD(Z80,8000000) /* ? */ + MDRV_CPU_ADD("slave", Z80,8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(imolagp_slave,0) MDRV_CPU_IO_MAP(readport_slave,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index a2dc44dd9e4..74c362645b6 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -88,7 +88,7 @@ static VIDEO_UPDATE(intrscti) static MACHINE_DRIVER_START( intrscti ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 6b353d3b75d..32a57e18093 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -398,12 +398,11 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( inufuku ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16.00 MHz */ + MDRV_CPU_ADD("main", M68000, 32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(inufuku_readmem, inufuku_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 32000000/4) /* 8.00 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(inufuku_readmem_sound, inufuku_writemem_sound) MDRV_CPU_IO_MAP(inufuku_readport_sound, inufuku_writeport_sound) /* IRQs are triggered by the YM2610 */ diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index 0cd4771261e..04172ece14f 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -296,7 +296,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( iqblock ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16) @@ -328,7 +328,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cabaret ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z180,12000000/2) /* 6 MHz , appears to use Z180 instructions */ + MDRV_CPU_ADD("main", Z180,12000000/2) /* 6 MHz , appears to use Z180 instructions */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16) @@ -360,7 +360,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pokerigs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z180,12000000/2) /* 6 MHz */ + MDRV_CPU_ADD("main", Z180,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(pokerigs_portmap,0) MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16) diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c index 9a1afaa1c4f..2b6e256b8ea 100644 --- a/src/mame/drivers/irobot.c +++ b/src/mame/drivers/irobot.c @@ -296,7 +296,7 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( irobot ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,1500000) + MDRV_CPU_ADD("main", M6809,1500000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_MACHINE_RESET(irobot) diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index 566190dcde1..3b067fbd0c6 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -442,11 +442,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( ironhors ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */ + MDRV_CPU_ADD("main", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */ MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_VBLANK_INT_HACK(ironhors_interrupt,8) - MDRV_CPU_ADD_TAG("sound",Z80,18432000/6) + MDRV_CPU_ADD("sound",Z80,18432000/6) /* audio CPU */ /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_CPU_IO_MAP(slave_io_map, 0) diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index ea2f8b33ac3..979bece9ef4 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -328,18 +328,18 @@ static INTERRUPT_GEN( vblank_callback_istellar ) /* DRIVER */ static MACHINE_DRIVER_START( istellar ) /* main cpu */ - MDRV_CPU_ADD_TAG("main", Z80, GUESSED_CLOCK) + MDRV_CPU_ADD("main", Z80, GUESSED_CLOCK) MDRV_CPU_PROGRAM_MAP(z80_0_mem,0) MDRV_CPU_IO_MAP(z80_0_io,0) MDRV_CPU_VBLANK_INT("main", vblank_callback_istellar) /* sound cpu */ - MDRV_CPU_ADD(Z80, GUESSED_CLOCK) + MDRV_CPU_ADD("audio", Z80, GUESSED_CLOCK) MDRV_CPU_PROGRAM_MAP(z80_1_mem,0) MDRV_CPU_IO_MAP(z80_1_io,0) /* ldp comm cpu */ - MDRV_CPU_ADD(Z80, GUESSED_CLOCK) + MDRV_CPU_ADD("sub", Z80, GUESSED_CLOCK) MDRV_CPU_PROGRAM_MAP(z80_2_mem,0) MDRV_CPU_IO_MAP(z80_2_io,0) diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 238a41cf595..9aca5a31cf7 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -1533,11 +1533,11 @@ static const struct ES5506interface es5506_interface = static MACHINE_DRIVER_START( timekill ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, CPU_CLOCK) + MDRV_CPU_ADD("main", M68000, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(timekill_map,0) MDRV_CPU_VBLANK_INT("main", generate_int1) - MDRV_CPU_ADD_TAG("sound", M6809, SOUND_CLOCK/8) + MDRV_CPU_ADD("sound", M6809, SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(itech32) @@ -1585,13 +1585,13 @@ static MACHINE_DRIVER_START( drivedge ) MDRV_CPU_PROGRAM_MAP(drivedge_map,0) MDRV_CPU_VBLANK_INT_HACK(NULL,0) - MDRV_CPU_ADD(TMS32031, TMS_CLOCK) + MDRV_CPU_ADD("dsp1", TMS32031, TMS_CLOCK) MDRV_CPU_PROGRAM_MAP(drivedge_tms1_map,0) - MDRV_CPU_ADD(TMS32031, TMS_CLOCK) + MDRV_CPU_ADD("dsp2", TMS32031, TMS_CLOCK) MDRV_CPU_PROGRAM_MAP(drivedge_tms2_map,0) -// MDRV_CPU_ADD(M6803, 8000000/4) -- network CPU +// MDRV_CPU_ADD("comm", M6803, 8000000/4) -- network CPU MDRV_MACHINE_RESET(drivedge) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 4794d0a5c76..414bde21e09 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -1723,7 +1723,7 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( itech8_core_lo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, CLOCK_8MHz/4) + MDRV_CPU_ADD("main", M6809, CLOCK_8MHz/4) MDRV_CPU_PROGRAM_MAP(tmslo_map,0) MDRV_CPU_VBLANK_INT("main", generate_nmi) @@ -1761,7 +1761,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( itech8_sound_ym2203 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", M6809, CLOCK_8MHz/4) + MDRV_CPU_ADD("sound", M6809, CLOCK_8MHz/4) MDRV_CPU_PROGRAM_MAP(sound2203_map,0) /* sound hardware */ @@ -1777,7 +1777,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( itech8_sound_ym3812 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", M6809, CLOCK_8MHz/4) + MDRV_CPU_ADD("sound", M6809, CLOCK_8MHz/4) MDRV_CPU_PROGRAM_MAP(sound3812_map,0) /* sound hardware */ @@ -1790,7 +1790,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( itech8_sound_ym3812_external ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", M6809, CLOCK_8MHz/4) + MDRV_CPU_ADD("sound", M6809, CLOCK_8MHz/4) MDRV_CPU_PROGRAM_MAP(sound3812_external_map,0) /* sound hardware */ @@ -1847,7 +1847,7 @@ static MACHINE_DRIVER_START( slikshot_hi ) MDRV_IMPORT_FROM(itech8_core_hi) MDRV_IMPORT_FROM(itech8_sound_ym2203) - MDRV_CPU_ADD(Z80, CLOCK_8MHz/2) + MDRV_CPU_ADD("sub", Z80, CLOCK_8MHz/2) MDRV_CPU_PROGRAM_MAP(slikz80_mem_map,0) MDRV_CPU_IO_MAP(slikz80_io_map,0) @@ -1864,7 +1864,7 @@ static MACHINE_DRIVER_START( slikshot_lo ) MDRV_IMPORT_FROM(itech8_core_lo) MDRV_IMPORT_FROM(itech8_sound_ym2203) - MDRV_CPU_ADD(Z80, CLOCK_8MHz/2) + MDRV_CPU_ADD("sub", Z80, CLOCK_8MHz/2) MDRV_CPU_PROGRAM_MAP(slikz80_mem_map,0) MDRV_CPU_IO_MAP(slikz80_io_map,0) diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c index ecfcb297499..dc144efe1d3 100644 --- a/src/mame/drivers/itgambl2.c +++ b/src/mame/drivers/itgambl2.c @@ -193,7 +193,7 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( itgambl2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a H8/3337 core ATM */ + MDRV_CPU_ADD("main", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a H8/3337 core ATM */ MDRV_CPU_PROGRAM_MAP(itgambl2_map,0) /* video hardware */ diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c index 4c1839e1c6d..f0520cbae4f 100644 --- a/src/mame/drivers/itgambl3.c +++ b/src/mame/drivers/itgambl3.c @@ -172,7 +172,7 @@ MACHINE_RESET( itgambl3 ) static MACHINE_DRIVER_START( itgambl3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */ + MDRV_CPU_ADD("main", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */ MDRV_CPU_PROGRAM_MAP(itgambl3_map,0) /* video hardware */ diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c index 7a922d0e7c5..e6f10165bca 100644 --- a/src/mame/drivers/itgamble.c +++ b/src/mame/drivers/itgamble.c @@ -182,7 +182,7 @@ static MACHINE_RESET( itgamble ) static MACHINE_DRIVER_START( itgamble ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H83044, MAIN_CLOCK/2) /* probably the wrong CPU */ + MDRV_CPU_ADD("main", H83044, MAIN_CLOCK/2) /* probably the wrong CPU */ MDRV_CPU_PROGRAM_MAP(itgamble_map,0) /* video hardware */ diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index a237e4a0a5b..0d404dacabe 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -875,12 +875,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( jack ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18000000/6) /* 3 MHz */ + MDRV_CPU_ADD("main", Z80, 18000000/6) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* jack needs 1 or its too fast */ - MDRV_CPU_ADD(Z80,18000000/12) - /* audio CPU */ /* 1.5 MHz */ + MDRV_CPU_ADD("audio", Z80,18000000/12) /* 1.5 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index b5ba42b2c5a..68ea90a23b0 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -301,11 +301,11 @@ static INTERRUPT_GEN( jackal_interrupt ) static MACHINE_DRIVER_START( jackal ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/12) // verified on pcb + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/12) // verified on pcb MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_VBLANK_INT("main", jackal_interrupt) - MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) // verified on pcb + MDRV_CPU_ADD("slave", M6809, MASTER_CLOCK/12) // verified on pcb MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index e8db791ccf2..17c1b9a1fac 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -173,7 +173,7 @@ static INTERRUPT_GEN( jackpool_interrupt ) static MACHINE_DRIVER_START( jackpool ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) // ? + MDRV_CPU_ADD("main", M68000, 12000000) // ? MDRV_CPU_PROGRAM_MAP(jackpool_readmem,jackpool_writemem) MDRV_CPU_VBLANK_INT_HACK(jackpool_interrupt,3) // ? diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index eb89c4a1e1e..2ebe503763e 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -240,7 +240,7 @@ static MACHINE_START( jailbrek ) static MACHINE_DRIVER_START( jailbrek ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/12) + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/12) MDRV_CPU_PROGRAM_MAP(jailbrek_map, 0) MDRV_CPU_VBLANK_INT("main", jb_interrupt) MDRV_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */ diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index ebe0c422391..fdd4ef15ea0 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -815,7 +815,7 @@ static MACHINE_RESET (daireika) } static MACHINE_DRIVER_START( jalmah ) - MDRV_CPU_ADD_TAG("main" , M68000, 8000000) /* 68000-8 */ + MDRV_CPU_ADD("main" , M68000, 8000000) /* 68000-8 */ MDRV_CPU_PROGRAM_MAP(jalmah,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index de3be3560fb..b5f74f26b5c 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -746,11 +746,11 @@ static const struct YMZ280Binterface ymz280b_intf = static MACHINE_DRIVER_START( jchan ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(jchan_main,0) MDRV_CPU_VBLANK_INT_HACK(jchan_vblank, 2) - MDRV_CPU_ADD(M68000, 16000000) + MDRV_CPU_ADD("sub", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(jchan_sub,0) MDRV_GFXDECODE(jchan) diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c index 76fc97455ce..d062cee13fe 100644 --- a/src/mame/drivers/jcross.c +++ b/src/mame/drivers/jcross.c @@ -256,16 +256,15 @@ GFXDECODE_END static MACHINE_DRIVER_START( jcross ) - MDRV_CPU_ADD_TAG("main", Z80, 3360000) + MDRV_CPU_ADD("main", Z80, 3360000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3360000) + MDRV_CPU_ADD("sub", Z80, 3360000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 244) diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index ab2f7d22977..20121742593 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -346,7 +346,7 @@ static MACHINE_DRIVER_START( jedi ) MDRV_DRIVER_DATA(jedi_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, JEDI_MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, JEDI_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_INTERLEAVE(4) diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 177bc2a2ba2..236a5e611b6 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -398,7 +398,7 @@ static INTERRUPT_GEN( jollyjgr_interrupt ) } static MACHINE_DRIVER_START( jollyjgr ) - MDRV_CPU_ADD_TAG("main", Z80, 3579545) /* 3,579545 MHz */ + MDRV_CPU_ADD("main", Z80, 3579545) /* 3,579545 MHz */ MDRV_CPU_PROGRAM_MAP(jollyjgr_map,0) MDRV_CPU_VBLANK_INT("main", jollyjgr_interrupt) diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 76e7a01a4d9..bee78b6cb83 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -591,7 +591,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( jongkyo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,JONGKYO_CLOCK/4) + MDRV_CPU_ADD("main", Z80,JONGKYO_CLOCK/4) MDRV_CPU_PROGRAM_MAP(jongkyo_memmap,0) MDRV_CPU_IO_MAP(jongkyo_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index 1694d7c8b52..0d243825ac3 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -860,10 +860,10 @@ static const tms34010_config tms_config = *************************************/ static MACHINE_DRIVER_START( jpmimpct ) - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(m68k_program_map, 0) - MDRV_CPU_ADD(TMS34010, 40000000) + MDRV_CPU_ADD("dsp", TMS34010, 40000000) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(tms_program_map, 0) diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 09773221eb3..db4b5839670 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -265,7 +265,7 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( jrpacman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index 27bc7526290..7f246f1a5dd 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -335,16 +335,14 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( junofrst ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz ??? */ + MDRV_CPU_ADD("main", M6809, 1500000) /* 1.5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318000/8) - /* audio CPU */ /* 1.78975 MHz */ + MDRV_CPU_ADD("audio", Z80,14318000/8) /* 1.78975 MHz */ MDRV_CPU_PROGRAM_MAP(audio_map,0) - MDRV_CPU_ADD(I8039,8000000) - /* audio CPU */ /* 8MHz crystal */ + MDRV_CPU_ADD("mcu", I8039,8000000) /* 8MHz crystal */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_io_map,0) diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 76d388f6225..59c9f238736 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1692,7 +1692,7 @@ static const struct AY8910interface ay8910_intf_eeprom = static MACHINE_DRIVER_START( berlwall ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* MC68000P12 */ + MDRV_CPU_ADD("main", M68000, 12000000) /* MC68000P12 */ MDRV_CPU_PROGRAM_MAP(berlwall,0) MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) @@ -1739,7 +1739,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bakubrkr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bakubrkr,0) MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) @@ -1795,11 +1795,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blazeon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) /* TMP68HC000-12 */ + MDRV_CPU_ADD("main", M68000,12000000) /* TMP68HC000-12 */ MDRV_CPU_PROGRAM_MAP(blazeon,0) MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) - MDRV_CPU_ADD(Z80,4000000) /* D780C-2 */ + MDRV_CPU_ADD("audio", Z80,4000000) /* D780C-2 */ MDRV_CPU_PROGRAM_MAP(blazeon_soundmem,0) MDRV_CPU_IO_MAP(blazeon_soundport,0) @@ -1848,7 +1848,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gtmr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("gtmr", M68000, XTAL_16MHz) /* verified on pcb */ + MDRV_CPU_ADD("gtmr", M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(gtmr_readmem,gtmr_writemem) MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) @@ -1940,7 +1940,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mgcrystl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mgcrystl,0) MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) @@ -2010,7 +2010,7 @@ static INTERRUPT_GEN( shogwarr_interrupt ) static MACHINE_DRIVER_START( shogwarr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(shogwarr,0) MDRV_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM) diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index 666746e1694..5aae1ff6a12 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -370,11 +370,11 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( nomcu ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MASTER_CLOCK/8) + MDRV_CPU_ADD("audio", Z80, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( mcu ) MDRV_MACHINE_START(kangaroo_mcu) - MDRV_CPU_ADD(MB8841, MASTER_CLOCK/4/12) + MDRV_CPU_ADD("mcu", MB8841, MASTER_CLOCK/4/12) MDRV_CPU_FLAGS(CPU_DISABLE) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index a9dd83d715e..ba73f6e76e8 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -687,12 +687,11 @@ static MACHINE_RESET( karnov ) static MACHINE_DRIVER_START( karnov ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(karnov_readmem,karnov_writemem) MDRV_CPU_VBLANK_INT("main", karnov_interrupt) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", M6502, 1500000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(karnov_s_readmem,karnov_s_writemem) MDRV_MACHINE_RESET(karnov) @@ -729,12 +728,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wndrplnt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(karnov_readmem,karnov_writemem) MDRV_CPU_VBLANK_INT("main", karnov_interrupt) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", M6502, 1500000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(karnov_s_readmem,karnov_s_writemem) MDRV_MACHINE_RESET(karnov) diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index df122115434..8571e3f8b0d 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -440,13 +440,12 @@ static INTERRUPT_GEN( sound_int ) { static MACHINE_DRIVER_START( kchampvs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ + MDRV_CPU_ADD("main", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", kc_interrupt) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* 12MHz / 4 = 3.0 MHz */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) /* irq's triggered from main cpu */ @@ -488,13 +487,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kchamp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ + MDRV_CPU_ADD("main", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ MDRV_CPU_PROGRAM_MAP(kc_readmem,kc_writemem) MDRV_CPU_IO_MAP(kc_readport,kc_writeport) MDRV_CPU_VBLANK_INT("main", kc_interrupt) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* 12MHz / 4 = 3.0 MHz */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ MDRV_CPU_PROGRAM_MAP(kc_sound_readmem,kc_sound_writemem) MDRV_CPU_IO_MAP(kc_sound_readport,kc_sound_writeport) MDRV_CPU_PERIODIC_INT(sound_int, 125) /* Hz */ diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index a877df52fef..21d5c40ad9e 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -665,12 +665,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( kickgoal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_PERIODIC_INT(kickgoal_interrupt, 240) - MDRV_CPU_ADD(PIC16C57, 12000000/4) /* 3MHz ? */ + MDRV_CPU_ADD("audio", PIC16C57, 12000000/4) /* 3MHz ? */ MDRV_CPU_FLAGS(CPU_DISABLE) /* Disables since the internal rom isn't dumped */ /* Program and Data Maps are internal to the MCU */ MDRV_CPU_IO_MAP(kickgoal_sound_io_map, 0) @@ -701,11 +701,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( actionhw ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(PIC16C57, XTAL_12MHz/3) /* verified on pcb */ + MDRV_CPU_ADD("audio", PIC16C57, XTAL_12MHz/3) /* verified on pcb */ MDRV_CPU_FLAGS(CPU_DISABLE) /* Disables since the internal rom isn't dumped */ /* Program and Data Maps are internal to the MCU */ MDRV_CPU_IO_MAP(actionhw_io_map, 0) diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 8257d22f327..57b3e85e9d4 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -552,20 +552,19 @@ static INTERRUPT_GEN( kingofb_interrupt ) { static MACHINE_DRIVER_START( kingofb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(video_readmem,video_writemem) MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(sprite_readmem,sprite_writemem) MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4.0 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */ @@ -603,20 +602,19 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ringking ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(rk_main_readmem,rk_main_writemem) MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(rk_video_readmem,rk_video_writemem) MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(rk_sprite_readmem,rk_sprite_writemem) MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4.0 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(rk_sound_readport,rk_sound_writeport) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */ diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c index bba57d468a5..792d7b6bf3f 100644 --- a/src/mame/drivers/kingpin.c +++ b/src/mame/drivers/kingpin.c @@ -145,13 +145,13 @@ static const TMS9928a_interface tms9928a_interface = static MACHINE_DRIVER_START( kingpin ) /* MAIN CPU */ - MDRV_CPU_ADD_TAG("main", Z80, 3579545) + MDRV_CPU_ADD("main", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(kingpin_program_map,0) MDRV_CPU_IO_MAP(kingpin_readport,kingpin_writeport) MDRV_CPU_VBLANK_INT("main", kingpin_video_interrupt) /* SOUND CPU */ - MDRV_CPU_ADD(Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(kingpin_sound_map,0) /*MDRV_CPU_IO_MAP(readport2,writeport2)*/ diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 697affe1c2f..33a2a2ee45f 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -643,7 +643,7 @@ static const mips3_config config = static MACHINE_DRIVER_START( kinst ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R4600LE, MASTER_CLOCK*2) + MDRV_CPU_ADD("main", R4600LE, MASTER_CLOCK*2) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_start) diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c index 0969e06344e..445d2abd7be 100644 --- a/src/mame/drivers/kinstb.c +++ b/src/mame/drivers/kinstb.c @@ -202,10 +202,10 @@ static const struct CustomSound_interface snes_sound_interface = static MACHINE_DRIVER_START( kinstb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", G65816, 3580000) /* 2.68Mhz, also 3.58Mhz */ + MDRV_CPU_ADD("main", G65816, 3580000) /* 2.68Mhz, also 3.58Mhz */ MDRV_CPU_PROGRAM_MAP(kinstb_map, 0) - MDRV_CPU_ADD_TAG("sound", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ + MDRV_CPU_ADD("sound", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(spc_mem, 0) diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index f7325d8dde0..3e743b4cde0 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -196,7 +196,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( klax ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 39934522b81..5009cca5b53 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -263,11 +263,11 @@ static MACHINE_DRIVER_START( kncljoe ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_6MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_6MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("sound", M6803, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("sound", M6803, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(sound_nmi, (double)3970) //measured 3.970 kHz diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index d448a6876a4..989208868d8 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -202,7 +202,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( koftball ) - MDRV_CPU_ADD_TAG("main", M68000, 21477270/2 ) + MDRV_CPU_ADD("main", M68000, 21477270/2 ) MDRV_CPU_PROGRAM_MAP(koftball_mem,0) MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,3) diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 7e4de169a42..e0fb16aeddf 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -258,7 +258,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( koikoi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,KOIKOI_CRYSTAL/4) /* ?? */ + MDRV_CPU_ADD("main", Z80,KOIKOI_CRYSTAL/4) /* ?? */ MDRV_CPU_PROGRAM_MAP(readmem, 0) MDRV_CPU_IO_MAP(readport, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index e9d75b96e42..533aab45d42 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -368,11 +368,11 @@ static MACHINE_RESET( konamigq ) static MACHINE_DRIVER_START( konamigq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz ) + MDRV_CPU_ADD("main", PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( konamigq_map, 0 ) MDRV_CPU_VBLANK_INT("main", psx_vblank) - MDRV_CPU_ADD_TAG( "sound", M68000, 8000000 ) + MDRV_CPU_ADD( "sound", M68000, 8000000 ) /* audio CPU */ MDRV_CPU_PROGRAM_MAP( sndreadmem, sndwritemem ) MDRV_CPU_PERIODIC_INT( irq2_line_hold, 480 ) diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 583a87af0cf..0e3ab5ccdd9 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -342,7 +342,7 @@ static const struct PSXSPUinterface konamigv_psxspu_interface = static MACHINE_DRIVER_START( konamigv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz ) + MDRV_CPU_ADD("main", PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( konamigv_map, 0 ) MDRV_CPU_VBLANK_INT("main", psx_vblank) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index e5d37fc92ef..7f8ce479f2a 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1310,11 +1310,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( konamigx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 24000000) + MDRV_CPU_ADD("main", M68EC020, 24000000) MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type2_map) MDRV_CPU_VBLANK_INT("main", konamigx_vbinterrupt) - MDRV_CPU_ADD_TAG("sound", M68000, 8000000) + MDRV_CPU_ADD("sound", M68000, 8000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(gxsndmap, 0) MDRV_CPU_PERIODIC_INT(irq2_line_hold, 480) diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index 95dba4cc463..6a4a8864a29 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -1133,12 +1133,12 @@ static INTERRUPT_GEN(m2) static MACHINE_DRIVER_START( m2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC602, 33000000) /* actually PPC602, 66MHz */ + MDRV_CPU_ADD("main", PPC602, 33000000) /* actually PPC602, 66MHz */ MDRV_CPU_CONFIG(ppc602_config) MDRV_CPU_PROGRAM_MAP(m2_main, 0) MDRV_CPU_VBLANK_INT("main", m2) - MDRV_CPU_ADD(PPC602, 33000000) /* actually PPC602, 66MHz */ + MDRV_CPU_ADD("sub", PPC602, 33000000) /* actually PPC602, 66MHz */ MDRV_CPU_CONFIG(ppc602_config) MDRV_CPU_PROGRAM_MAP(m2_main, 0) diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c index a61de790d82..db65cbb9d8c 100644 --- a/src/mame/drivers/kopunch.c +++ b/src/mame/drivers/kopunch.c @@ -165,7 +165,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( kopunch ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 4000000) /* 4 MHz ???? appears to use 8080 instructions, not z80 */ + MDRV_CPU_ADD("main", 8080, 4000000) /* 4 MHz ???? appears to use 8080 instructions, not z80 */ MDRV_CPU_PROGRAM_MAP(kopunch_map,0) MDRV_CPU_IO_MAP(kopunch_io_map,0) MDRV_CPU_VBLANK_INT_HACK(kopunch_interrupt,4) /* ??? */ diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 1c2cce91f88..c8c29a949fc 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -243,12 +243,11 @@ static GFXDECODE_START( ksayakyu ) GFXDECODE_END static MACHINE_DRIVER_START( ksayakyu ) - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) + MDRV_CPU_ADD("main", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(maincpu_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 80000000/2) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 80000000/2) MDRV_CPU_PROGRAM_MAP(soundcpu_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 5001a21c79d..8a33fbae8e2 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -2722,7 +2722,7 @@ static DRIVER_INIT( salarymc ) static MACHINE_DRIVER_START( konami573 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz ) + MDRV_CPU_ADD("main", PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( konami573_map, 0 ) MDRV_CPU_VBLANK_INT("main", sys573_vblank) diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 428831640d2..db082471d8e 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -497,12 +497,12 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( gyrodine ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(0,gyrodine_portmap) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD_TAG("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(gyrodine_sub_map,0) MDRV_CPU_IO_MAP(gyrodine_sub_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index dd14da2d3fb..89e8e1635a6 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -253,7 +253,7 @@ static const struct YM2203interface ym2203_interface_2 = static MACHINE_DRIVER_START( labyrunr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 24MHz/8? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* 24MHz/8? */ MDRV_CPU_PROGRAM_MAP(labyrunr_readmem,labyrunr_writemem) MDRV_CPU_VBLANK_INT_HACK(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */ diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index 36b8640da98..8c8e68a1daf 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -669,7 +669,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( ladybug ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(ladybug_map,0) /* video hardware */ @@ -701,11 +701,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sraider ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sraider_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sraider_cpu2_map,0) MDRV_CPU_IO_MAP(sraider_cpu2_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index 3f92928f514..ddd0d65e746 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -281,12 +281,11 @@ static GFXDECODE_START( ladyfrog ) GFXDECODE_END static MACHINE_DRIVER_START( ladyfrog ) - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) + MDRV_CPU_ADD("main", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index e73f34877aa..af47bd4b01f 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -128,7 +128,7 @@ static INTERRUPT_GEN( laserbas_interrupt ) } static MACHINE_DRIVER_START( laserbas ) - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(laserbas_memory,0) MDRV_CPU_IO_MAP(laserbas_io,0) MDRV_CPU_VBLANK_INT_HACK(laserbas_interrupt,2) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index f68044ad10b..84462e34a74 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -695,7 +695,7 @@ static INTERRUPT_GEN( zaccaria_cb1_toggle ) static MACHINE_DRIVER_START( laserbat ) - MDRV_CPU_ADD_TAG("main", S2650, 14318180/4) // ??? + MDRV_CPU_ADD("main", S2650, 14318180/4) // ??? MDRV_CPU_PROGRAM_MAP(laserbat_map,0) MDRV_CPU_IO_MAP(laserbat_io_map,0) MDRV_CPU_VBLANK_INT("main", laserbat_interrupt) @@ -729,12 +729,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( catnmous ) - MDRV_CPU_ADD_TAG("main", S2650, 14318000/4) /* ? */ + MDRV_CPU_ADD("main", S2650, 14318000/4) /* ? */ MDRV_CPU_PROGRAM_MAP(laserbat_map,0) MDRV_CPU_IO_MAP(catnmous_io_map,0) MDRV_CPU_VBLANK_INT("main", laserbat_interrupt) - MDRV_CPU_ADD(M6802,3580000) /* ? */ + MDRV_CPU_ADD("audio", M6802,3580000) /* ? */ MDRV_CPU_PROGRAM_MAP(catnmous_sound_map,0) MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle, (double)3580000/4096) diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index 8f9c45bda8b..ca7e2ac01ad 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -465,11 +465,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 11289000/16) /* guess */ + MDRV_CPU_ADD("main", M6502, 11289000/16) /* guess */ MDRV_CPU_PROGRAM_MAP(lasso_main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio", M6502, 600000) + MDRV_CPU_ADD("audio", M6502, 600000) MDRV_CPU_PROGRAM_MAP(lasso_audio_map, 0) MDRV_INTERLEAVE(100) @@ -503,7 +503,7 @@ static MACHINE_DRIVER_START( lasso ) /* basic machine hardware */ MDRV_IMPORT_FROM(base) - MDRV_CPU_ADD_TAG("blitter", M6502, 11289000/16) /* guess */ + MDRV_CPU_ADD("blitter", M6502, 11289000/16) /* guess */ MDRV_CPU_PROGRAM_MAP(lasso_coprocessor_map,0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index e6af5214388..4312a93f7d6 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -266,12 +266,11 @@ static INTERRUPT_GEN( madgear_interrupt ) static MACHINE_DRIVER_START( lastduel ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* Could be 8 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* Could be 8 MHz */ MDRV_CPU_PROGRAM_MAP(lastduel_readmem,lastduel_writemem) MDRV_CPU_VBLANK_INT_HACK(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */ - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* Accurate */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* Accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -306,12 +305,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( madgear ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* Accurate */ + MDRV_CPU_ADD("main", M68000, 10000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(madgear_readmem,madgear_writemem) MDRV_CPU_VBLANK_INT_HACK(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */ - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mg_sound_readmem,mg_sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 16d6f05137a..515c7891afd 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -461,7 +461,7 @@ static INTERRUPT_GEN( unknown_interrupt ) } static MACHINE_DRIVER_START( lastfght ) - MDRV_CPU_ADD_TAG("main", H83044, 32000000/2) + MDRV_CPU_ADD("main", H83044, 32000000/2) MDRV_CPU_PROGRAM_MAP( lastfght_map, 0 ) MDRV_CPU_VBLANK_INT_HACK(unknown_interrupt,2) diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index 353c65e5756..d13d2be44f1 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -614,7 +614,7 @@ static PALETTE_INIT( lazercmd ) static MACHINE_DRIVER_START( lazercmd ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650,8064000/12) /* 672 kHz? */ + MDRV_CPU_ADD("main", S2650,8064000/12) /* 672 kHz? */ /* Main Clock is 8MHz divided by 12 but memory and IO access is only possible within the line and frame blanking period @@ -649,7 +649,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( medlanes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650,8064000/12) /* 672 kHz? */ + MDRV_CPU_ADD("main", S2650,8064000/12) /* 672 kHz? */ /* Main Clock is 8MHz divided by 12 but memory and IO access is only possible within the line and frame blanking period @@ -684,7 +684,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bbonk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650,8064000/12) /* 672 kHz? */ + MDRV_CPU_ADD("main", S2650,8064000/12) /* 672 kHz? */ /* Main Clock is 8MHz divided by 12 but memory and IO access is only possible within the line and frame blanking period diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 7b54c7d6768..a62ee5bbb91 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -1037,7 +1037,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( legionna ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* ??? */ + MDRV_CPU_ADD("main", M68000,20000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(legionna_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ @@ -1069,7 +1069,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( heatbrl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* ??? */ + MDRV_CPU_ADD("main", M68000,20000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(heatbrl_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ @@ -1100,7 +1100,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( godzilla ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 20000000/2) + MDRV_CPU_ADD("main", M68000, 20000000/2) MDRV_CPU_PROGRAM_MAP(godzilla_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -1131,7 +1131,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( denjinmk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 20000000/2) + MDRV_CPU_ADD("main", M68000, 20000000/2) MDRV_CPU_PROGRAM_MAP(denjinmk_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -1162,7 +1162,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sdgndmrb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 20000000/2) + MDRV_CPU_ADD("main", M68000, 20000000/2) MDRV_CPU_PROGRAM_MAP(sdgndmrb_map, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -1194,7 +1194,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cupsoc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) + MDRV_CPU_ADD("main", M68000,20000000/2) MDRV_CPU_PROGRAM_MAP(cupsoc_mem,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ @@ -1226,13 +1226,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cupsocbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) + MDRV_CPU_ADD("main", M68000,12000000) MDRV_CPU_PROGRAM_MAP(cupsocbl_mem,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* VBL */ /*Different Sound hardware*/ //SEIBU_SOUND_SYSTEM_CPU(14318180/4) - MDRV_CPU_ADD(Z80,14318180/4) + MDRV_CPU_ADD("audio", Z80,14318180/4) MDRV_CPU_PROGRAM_MAP(cupsocbl_sound_mem,0) //MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index bfd65e4f500..ee0a521bdc9 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -718,12 +718,12 @@ static const struct CustomSound_interface redline_custom_interface = static MACHINE_DRIVER_START( leland ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("master", Z80, MASTER_CLOCK/2) + MDRV_CPU_ADD("master", Z80, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(master_map_program,0) MDRV_CPU_IO_MAP(master_map_io,0) MDRV_CPU_VBLANK_INT("main", leland_master_interrupt) - MDRV_CPU_ADD_TAG("slave", Z80, MASTER_CLOCK/2) + MDRV_CPU_ADD("slave", Z80, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(slave_small_map_program,0) MDRV_CPU_IO_MAP(slave_map_io,0) @@ -756,7 +756,7 @@ static MACHINE_DRIVER_START( redline ) /* basic machine hardware */ MDRV_IMPORT_FROM(leland) - MDRV_CPU_ADD_TAG("sound", I80186, MCU_CLOCK) + MDRV_CPU_ADD("sound", I80186, MCU_CLOCK) MDRV_CPU_PROGRAM_MAP(leland_80186_map_program,0) MDRV_CPU_IO_MAP(redline_80186_map_io,0) diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index 5767850ed2c..5d79ab57aff 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -272,12 +272,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( lemmings ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(lemmings_readmem,lemmings_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(M6809,32220000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809,32220000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index de3ce18a2a0..9d76b1c6020 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -656,11 +656,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( lethalen ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, MAIN_CLOCK/2) // ??? + MDRV_CPU_ADD("main", HD6309, MAIN_CLOCK/2) // ??? MDRV_CPU_PROGRAM_MAP(le_main, 0) MDRV_CPU_VBLANK_INT("main", lethalen_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 8000000) + MDRV_CPU_ADD("sound", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(le_sound, 0) MDRV_MACHINE_START(lethalen) diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c index 2cc9ca9f2fd..bbb229b500f 100644 --- a/src/mame/drivers/lethalj.c +++ b/src/mame/drivers/lethalj.c @@ -519,7 +519,7 @@ static const tms34010_config tms_config_lethalj = static MACHINE_DRIVER_START( gameroom ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, MASTER_CLOCK) + MDRV_CPU_ADD("main", TMS34010, MASTER_CLOCK) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(lethalj_map,0) diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 2272cfb831c..e12e3b06971 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -341,13 +341,13 @@ static INTERRUPT_GEN( vblank_callback_lgp ) /* DRIVER */ static MACHINE_DRIVER_START( lgp ) /* main cpu */ - MDRV_CPU_ADD_TAG("main", Z80, CPU_PCB_CLOCK) + MDRV_CPU_ADD("main", Z80, CPU_PCB_CLOCK) MDRV_CPU_PROGRAM_MAP(main_program_map,0) MDRV_CPU_IO_MAP(main_io_map,0) MDRV_CPU_VBLANK_INT("main", vblank_callback_lgp) /* sound cpu */ - MDRV_CPU_ADD(Z80, SOUND_PCB_CLOCK) + MDRV_CPU_ADD("audio", Z80, SOUND_PCB_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_program_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 7dc94d7fe69..58eeca4c9a1 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -520,12 +520,12 @@ static INTERRUPT_GEN( deco16_interrupt ) static MACHINE_DRIVER_START( liberate ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",DECO16, 2000000) + MDRV_CPU_ADD("main",DECO16, 2000000) MDRV_CPU_PROGRAM_MAP(liberate_readmem,liberate_writemem) MDRV_CPU_IO_MAP(deco16_readport,deco16_writeport) MDRV_CPU_VBLANK_INT("main", deco16_interrupt) - MDRV_CPU_ADD_TAG("sound",M6502, 1500000) + MDRV_CPU_ADD("sound",M6502, 1500000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) @@ -560,7 +560,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( liberatb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) + MDRV_CPU_ADD("main", M6502, 2000000) MDRV_CPU_PROGRAM_MAP(liberatb_readmem,liberatb_writemem) MDRV_CPU_VBLANK_INT("main", deco16_interrupt) @@ -578,7 +578,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( prosoccr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", DECO16, 3000000) + MDRV_CPU_ADD("main", DECO16, 3000000) MDRV_CPU_PROGRAM_MAP(liberate_readmem,liberate_writemem) MDRV_CPU_IO_MAP(deco16_readport,deco16_writeport) @@ -592,12 +592,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( prosport ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", DECO16, 2000000) + MDRV_CPU_ADD("main", DECO16, 2000000) MDRV_CPU_PROGRAM_MAP(prosport_readmem,prosport_writemem) MDRV_CPU_IO_MAP(deco16_readport,deco16_writeport) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c index 7b32cb393d0..ea768706825 100644 --- a/src/mame/drivers/liberatr.c +++ b/src/mame/drivers/liberatr.c @@ -382,7 +382,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( liberatr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */ + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */ MDRV_CPU_PROGRAM_MAP(liberatr_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index b0cc9c56a43..15fde61fec9 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -475,7 +475,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( limenko ) - MDRV_CPU_ADD_TAG("main", E132XN, 20000000*4) /* 4x internal multiplier */ + MDRV_CPU_ADD("main", E132XN, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(limenko_map,0) MDRV_CPU_IO_MAP(limenko_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -500,12 +500,12 @@ static MACHINE_DRIVER_START( limenko ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( spotty ) - MDRV_CPU_ADD_TAG("main", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */ + MDRV_CPU_ADD("main", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */ MDRV_CPU_PROGRAM_MAP(spotty_map,0) MDRV_CPU_IO_MAP(spotty_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(I8051, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", I8051, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(spotty_sound_prg_map, 0) MDRV_CPU_DATA_MAP(0, 0) MDRV_CPU_IO_MAP(spotty_sound_io_map,0) diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 67caf3bfe37..6c45bb76094 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -359,7 +359,7 @@ static VIDEO_UPDATE(littlerb) } static MACHINE_DRIVER_START( littlerb ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(littlerb_main, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index a8dfb685ced..594fdfe53d2 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -307,15 +307,15 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( lkage ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,6000000) + MDRV_CPU_ADD("main", Z80,6000000) MDRV_CPU_PROGRAM_MAP(lkage,0) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD("audio", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) /* IRQs are triggered by the YM2203 */ - MDRV_CPU_ADD(M68705,4000000) /* ??? */ + MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) /* video hardware */ @@ -352,12 +352,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lkageb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,6000000) + MDRV_CPU_ADD("main", Z80,6000000) MDRV_CPU_PROGRAM_MAP(lkage,0) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD("audio", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) /* IRQs are triggered by the YM2203 */ diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index 0becb6499b3..df8a82a1b87 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -476,16 +476,16 @@ static const struct YM2203interface ym2203_interface = *************************************/ static MACHINE_DRIVER_START( lockon ) - MDRV_CPU_ADD_TAG("main", V30, XTAL_16MHz / 2) + MDRV_CPU_ADD("main", V30, XTAL_16MHz / 2) MDRV_CPU_PROGRAM_MAP(main_v30, 0) - MDRV_CPU_ADD(V30, XTAL_16MHz / 2) + MDRV_CPU_ADD("ground", V30, XTAL_16MHz / 2) MDRV_CPU_PROGRAM_MAP(ground_v30, 0) - MDRV_CPU_ADD(V30, XTAL_16MHz / 2) + MDRV_CPU_ADD("object", V30, XTAL_16MHz / 2) MDRV_CPU_PROGRAM_MAP(object_v30, 0) - MDRV_CPU_ADD(Z80, XTAL_16MHz / 4) + MDRV_CPU_ADD("audio", Z80, XTAL_16MHz / 4) MDRV_CPU_PROGRAM_MAP(sound_prg, 0) MDRV_CPU_IO_MAP(sound_io, 0) diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index f17357161fa..b53b57a8f86 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -589,16 +589,16 @@ static MACHINE_DRIVER_START( looping ) MDRV_DRIVER_DATA(looping_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS9995, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", TMS9995, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(looping_map,0) MDRV_CPU_IO_MAP(looping_io_map,0) MDRV_CPU_VBLANK_INT("main", looping_interrupt) - MDRV_CPU_ADD(TMS9980, SOUND_CLOCK/4) + MDRV_CPU_ADD("audio", TMS9980, SOUND_CLOCK/4) MDRV_CPU_PROGRAM_MAP(looping_sound_map,0) MDRV_CPU_IO_MAP(looping_sound_io_map,0) - MDRV_CPU_ADD(COP420, COP_CLOCK) + MDRV_CPU_ADD("mcu", COP420, COP_CLOCK) MDRV_CPU_PROGRAM_MAP(looping_cop_map,0) MDRV_CPU_DATA_MAP(looping_cop_data_map,0) MDRV_CPU_CONFIG(looping_cop_intf) diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 215c9b29082..ca8486eeeaa 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -437,11 +437,11 @@ static const struct YM3812interface lordgun_ym3812_interface = }; static MACHINE_DRIVER_START( lordgun ) - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(lordgun_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 5000000) + MDRV_CPU_ADD("sound", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(lordgun_soundmem_map,0) MDRV_CPU_IO_MAP(lordgun_soundio_map,0) diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index 447e3a5a2cc..17801307039 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -559,15 +559,14 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( lsasquad ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz? */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* IRQs are triggered by the YM2203 */ - MDRV_CPU_ADD(M68705,4000000) /* ? */ + MDRV_CPU_ADD("mcu", M68705,4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_INTERLEAVE(500) /* 500 CPU slices per frame - an high value to ensure proper */ @@ -605,12 +604,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( daikaiju ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) + MDRV_CPU_ADD("main", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(mem_daikaiju, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) MDRV_CPU_PROGRAM_MAP(sound_mem_daikaiju, 0) /* IRQs are triggered by the YM2203 */ diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 4a0a42d77bf..300e291fba9 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -647,7 +647,7 @@ static VIDEO_UPDATE(ltcasino) static MACHINE_DRIVER_START( ltcasino ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,2000000) /* ? MHz */ + MDRV_CPU_ADD("main", M6502,2000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c index ac43ad9a734..fdac048977c 100644 --- a/src/mame/drivers/lucky74.c +++ b/src/mame/drivers/lucky74.c @@ -833,7 +833,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( lucky74 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/8) /* guess */ + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/8) /* guess */ MDRV_CPU_PROGRAM_MAP(lucky74_map, 0) MDRV_CPU_IO_MAP(lucky74_portmap,0) MDRV_CPU_VBLANK_INT("main", nmi_interrupt) diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c index 66de01305c0..36f13200e85 100644 --- a/src/mame/drivers/lucky8.c +++ b/src/mame/drivers/lucky8.c @@ -356,7 +356,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( lucky8 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 12000000/4) // ??? Runs far too fast + MDRV_CPU_ADD("main", Z80, 12000000/4) // ??? Runs far too fast MDRV_CPU_PROGRAM_MAP(lucky8_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c index 805e7d1232a..2e7f975a24d 100644 --- a/src/mame/drivers/lvcards.c +++ b/src/mame/drivers/lvcards.c @@ -469,7 +469,7 @@ static const struct AY8910interface lcay8910_interface = static MACHINE_DRIVER_START( lvcards ) // basic machine hardware - MDRV_CPU_ADD_TAG("main",Z80, 18432000/6) // 3.072 MHz ? + MDRV_CPU_ADD("main",Z80, 18432000/6) // 3.072 MHz ? MDRV_CPU_PROGRAM_MAP(lvcards_map, 0) MDRV_CPU_IO_MAP(lvcards_io_map, 0) diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index b4c906c8e30..b9ef0770493 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -756,11 +756,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( lwings ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", lwings_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) + MDRV_CPU_ADD("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) @@ -804,7 +804,7 @@ static MACHINE_DRIVER_START( trojan ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem,trojan_writemem) - MDRV_CPU_ADD_TAG("adpcm", Z80, 4000000) // 3.579545 Mhz (?) + MDRV_CPU_ADD("adpcm", Z80, 4000000) // 3.579545 Mhz (?) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(adpcm_readmem,adpcm_writemem) MDRV_CPU_IO_MAP(adpcm_readport,adpcm_writeport) diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 749fe6386d5..aad63d517ca 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -750,7 +750,7 @@ static MACHINE_DRIVER_START( m10 ) MDRV_DRIVER_DATA(m10_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,IREMM10_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502,IREMM10_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(m10_main,0) MDRV_MACHINE_RESET(irem) @@ -797,7 +797,7 @@ static MACHINE_DRIVER_START( m15 ) MDRV_DRIVER_DATA(m10_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,IREMM15_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502,IREMM15_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(m15_main,0) MDRV_MACHINE_RESET(irem) diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 92f5f44cc3c..fdf96f445c2 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -480,11 +480,11 @@ static const nec_config firebarr_config ={ rtypeleo_decryption_table, }; static MACHINE_DRIVER_START( firebarr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V33, 28000000/2) /* NEC V33, 28MHz clock */ + MDRV_CPU_ADD("main", V33, 28000000/2) /* NEC V33, 28MHz clock */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_ADD_TAG("sound", V30, 14318000/2) + MDRV_CPU_ADD("sound", V30, 14318000/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_CONFIG(firebarr_config) diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c index a12b77750eb..39f3b7c12c6 100644 --- a/src/mame/drivers/m52.c +++ b/src/mame/drivers/m52.c @@ -383,7 +383,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( m52 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/6) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c index c450208cb13..9b28b023acb 100644 --- a/src/mame/drivers/m57.c +++ b/src/mame/drivers/m57.c @@ -225,7 +225,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( m57 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c index 1ff4ac13e7e..d17fd1a0289 100644 --- a/src/mame/drivers/m58.c +++ b/src/mame/drivers/m58.c @@ -190,7 +190,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( yard ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(yard_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index 751a387a19e..e7bdfe855ca 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -1305,7 +1305,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( ldrun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24000000/6) + MDRV_CPU_ADD("main", Z80, 24000000/6) MDRV_CPU_PROGRAM_MAP(ldrun_readmem,ldrun_writemem) MDRV_CPU_IO_MAP(kungfum_readport,kungfum_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index d47fe7f736f..e640ae25c66 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -625,12 +625,12 @@ static void snd_irq(running_machine *machine, int num) static MACHINE_DRIVER_START( m63 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */ + MDRV_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(m63_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* audio CPU */ - MDRV_CPU_ADD_TAG("soundcpu",I8039,XTAL_12MHz/4) /* ????? */ + MDRV_CPU_ADD("soundcpu",I8039,XTAL_12MHz/4) /* ????? */ MDRV_CPU_PROGRAM_MAP(i8039_map,0) MDRV_CPU_IO_MAP(i8039_port_map,0) MDRV_CPU_PERIODIC_INT(snd_irq, 60) @@ -670,12 +670,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fghtbskt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/4) /* 3 MHz */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/4) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(fghtbskt_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* audio CPU */ - MDRV_CPU_ADD(I8039,XTAL_12MHz/4) /* ????? */ + MDRV_CPU_ADD("audio", I8039,XTAL_12MHz/4) /* ????? */ MDRV_CPU_PROGRAM_MAP(i8039_map,0) MDRV_CPU_IO_MAP(i8039_port_map,0) MDRV_CPU_PERIODIC_INT(snd_irq, 60/2) diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 79ee0b2b276..1ba12514f04 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -1638,11 +1638,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( rtype ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(rtype_map,0) MDRV_CPU_IO_MAP(m72_portmap,0) - MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) /* IRQs are generated by main Z80 and YM2151 */ @@ -1703,11 +1703,11 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( m72 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(m72_map,0) MDRV_CPU_IO_MAP(m72_portmap,0) - MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ @@ -1743,7 +1743,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( m72_8751 ) MDRV_IMPORT_FROM(m72) - MDRV_CPU_ADD_TAG("mcu",I8751, 8000000) + MDRV_CPU_ADD("mcu",I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) @@ -1753,11 +1753,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dkgenm72 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(m72_map,0) MDRV_CPU_IO_MAP(m72_portmap,0) - MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ @@ -1794,11 +1794,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( xmultipl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(xmultipl_map,0) MDRV_CPU_IO_MAP(m72_portmap,0) - MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -1835,11 +1835,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dbreed ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(dbreed_map,0) MDRV_CPU_IO_MAP(hharry_portmap,0) - MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -1875,11 +1875,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dbreed72 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(dbreed72_map,0) MDRV_CPU_IO_MAP(m72_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -1916,11 +1916,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rtype2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(rtype2_map,0) MDRV_CPU_IO_MAP(rtype2_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -1956,11 +1956,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( majtitle ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(majtitle_map,0) MDRV_CPU_IO_MAP(majtitle_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -1996,11 +1996,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hharry ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(hharry_map,0) MDRV_CPU_IO_MAP(hharry_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -2037,11 +2037,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hharryu ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(hharryu_map,0) MDRV_CPU_IO_MAP(rtype2_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -2078,11 +2078,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( poundfor ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ MDRV_CPU_PROGRAM_MAP(rtype2_map,0) MDRV_CPU_IO_MAP(poundfor_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(poundfor_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ @@ -2118,11 +2118,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cosmccop ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,MASTER_CLOCK/2/2) + MDRV_CPU_ADD("main", V30,MASTER_CLOCK/2/2) MDRV_CPU_PROGRAM_MAP(kengo_map,0) MDRV_CPU_IO_MAP(kengo_portmap,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index d9ba9c8ecd3..76d49600106 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -192,7 +192,7 @@ static DRIVER_INIT( m79amb ) static MACHINE_DRIVER_START( m79amb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 1996800) + MDRV_CPU_ADD("main", 8080, 1996800) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", m79amb_interrupt) diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index 3b68532d616..46248be4525 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -750,13 +750,12 @@ static INTERRUPT_GEN( bomblord_interrupt ) /* Basic hardware -- no decryption table is setup for CPU */ static MACHINE_DRIVER_START( m90 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */ + MDRV_CPU_ADD("main", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) MDRV_CPU_VBLANK_INT("main", m90_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -831,15 +830,14 @@ static const nec_config bomberman_config ={ bomberman_decryption_table, }; static MACHINE_DRIVER_START( bombrman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */ + MDRV_CPU_ADD("main", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */ MDRV_CPU_CONFIG(bomberman_config) MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) MDRV_CPU_VBLANK_INT("main", m90_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -877,15 +875,14 @@ static const nec_config dynablaster_config ={ dynablaster_decryption_table, }; static MACHINE_DRIVER_START( bbmanw ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */ + MDRV_CPU_ADD("main", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */ MDRV_CPU_CONFIG(dynablaster_config) MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) MDRV_CPU_VBLANK_INT("main", m90_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(bbmanw_sound_readport,bbmanw_sound_writeport) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ @@ -941,13 +938,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dynablsb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,32000000/4) + MDRV_CPU_ADD("main", V30,32000000/4) MDRV_CPU_PROGRAM_MAP(dynablsb_main_cpu,0) MDRV_CPU_IO_MAP(dynablsb_cpu_io,0) MDRV_CPU_VBLANK_INT("main", m90_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index 04e15d0eac9..e7e4a9f02c0 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -959,11 +959,11 @@ void m92_sprite_interrupt(running_machine *machine) static MACHINE_DRIVER_START( m92 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",V33,18000000/2) /* NEC V33, 18 MHz clock */ + MDRV_CPU_ADD("main",V33,18000000/2) /* NEC V33, 18 MHz clock */ MDRV_CPU_PROGRAM_MAP(m92_map,0) MDRV_CPU_IO_MAP(m92_portmap,0) - MDRV_CPU_ADD_TAG("sound" ,V30, 14318180/2) /* 14.31818 MHz */ + MDRV_CPU_ADD("sound" ,V30, 14318180/2) /* 14.31818 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_START(m92) diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 349f2165978..4b589c038b3 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -531,12 +531,11 @@ static const struct ES5506interface es5506_interface = static MACHINE_DRIVER_START( macrossp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 50000000/2) /* 25 MHz */ + MDRV_CPU_ADD("main", M68EC020, 50000000/2) /* 25 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) // there are others ... - MDRV_CPU_ADD(M68000, 32000000/2) /* 16 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M68000, 32000000/2) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 211e48080b4..65da3db7140 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -347,7 +347,7 @@ static const struct ST0016interface st0016_interface = static MACHINE_DRIVER_START( macs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000) /* 8 MHz ? */ + MDRV_CPU_ADD("main",Z80,8000000) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(macs_mem,0) MDRV_CPU_IO_MAP(macs_io,0) diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index 94fceff0425..e7a95fb3087 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -175,11 +175,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( madalien ) /* main CPU */ - MDRV_CPU_ADD_TAG("main", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */ + MDRV_CPU_ADD("main", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */ MDRV_CPU_PROGRAM_MAP(main_map, 0) /* audio CPU */ - MDRV_CPU_ADD(M6502, SOUND_CLOCK / 8) /* 512kHz */ + MDRV_CPU_ADD("audio", M6502, SOUND_CLOCK / 8) /* 512kHz */ MDRV_CPU_PROGRAM_MAP(audio_map, 0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 800) /* unknown due to incomplete schematics */ diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index 3db8d423695..34a9ab333ac 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -284,12 +284,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( madmotor ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */ + MDRV_CPU_ADD("main", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */ MDRV_CPU_PROGRAM_MAP(madmotor_readmem,madmotor_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ - MDRV_CPU_ADD(H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index b8845181dc4..227c3b6a1cd 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -343,7 +343,7 @@ static GFXDECODE_START( magic10 ) GFXDECODE_END static MACHINE_DRIVER_START( magic10 ) - MDRV_CPU_ADD_TAG("cpu", M68000, 10000000) // ? + MDRV_CPU_ADD("cpu", M68000, 10000000) // ? MDRV_CPU_PROGRAM_MAP(magic10_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 2da59636a0a..f8307b8eb86 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -648,7 +648,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( magicfly ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/12) /* guess */ + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/12) /* guess */ MDRV_CPU_PROGRAM_MAP(magicfly_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c index ca9bcd84527..8e5c71cf798 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -364,12 +364,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( magmax ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(magmax_readmem,magmax_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,XTAL_20MHz/8) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,XTAL_20MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(magmax_soundreadmem,magmax_soundwritemem) MDRV_CPU_IO_MAP(magmax_soundreadport,magmax_soundwriteport) diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 89c838d3549..eaea537e3d6 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -707,12 +707,11 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( mainevt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* ?? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* ?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", mainevt_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,8) /* ??? */ @@ -748,12 +747,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( devstors ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* ?? */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* ?? */ MDRV_CPU_PROGRAM_MAP(dv_readmem,dv_writemem) MDRV_CPU_VBLANK_INT("main", dv_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(dv_sound_readmem,dv_sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index 4c7f39fbb3f..da779061533 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -371,12 +371,11 @@ static GFXDECODE_START( mainsnk ) GFXDECODE_END static MACHINE_DRIVER_START( mainsnk ) - MDRV_CPU_ADD_TAG("main", Z80, 3360000) + MDRV_CPU_ADD("main", Z80, 3360000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,4000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 244) diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index 8b96c7f38cf..dde52592da7 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -340,7 +340,7 @@ static const struct SN76477interface sn76477_intf = static MACHINE_DRIVER_START( malzak ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 3800000/4) + MDRV_CPU_ADD("main", S2650, 3800000/4) MDRV_CPU_PROGRAM_MAP(malzak_map,0) MDRV_CPU_IO_MAP(malzak_io_map,0) diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index ec31db98dc8..9564ae4d49a 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -1570,11 +1570,11 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( superpac ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ + MDRV_CPU_ADD("main", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(superpac_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips - MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ + MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(superpac_cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) @@ -1617,15 +1617,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( phozon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, PIXEL_CLOCK/4) /* MAIN CPU */ + MDRV_CPU_ADD("main", M6809, PIXEL_CLOCK/4) /* MAIN CPU */ MDRV_CPU_PROGRAM_MAP(phozon_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips - MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* SOUND CPU */ + MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* SOUND CPU */ MDRV_CPU_PROGRAM_MAP(phozon_cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* SUB CPU */ + MDRV_CPU_ADD("sub2", M6809, PIXEL_CLOCK/4) /* SUB CPU */ MDRV_CPU_PROGRAM_MAP(phozon_cpu3_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) @@ -1658,11 +1658,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mappy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ + MDRV_CPU_ADD("main", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(mappy_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips - MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ + MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(mappy_cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index 0d1dea43d7f..db6802a1b8b 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -508,7 +508,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( marineb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(marineb_map,0) MDRV_CPU_IO_MAP(marineb_io_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 55c89a95bd7..2a6af8c8474 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -584,7 +584,7 @@ static VIDEO_UPDATE( marinedt ) static MACHINE_DRIVER_START( marinedt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10000000/4) + MDRV_CPU_ADD("main", Z80,10000000/4) MDRV_CPU_PROGRAM_MAP(marinedt_readmem,marinedt_writemem) MDRV_CPU_IO_MAP(marinedt_readport,marinedt_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index 74b20b0a7fa..3fe29e5275d 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -345,7 +345,7 @@ static MACHINE_DRIVER_START( mario_base ) MDRV_DRIVER_DATA(mario_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, Z80_CLOCK) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, Z80_CLOCK) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mario_map, 0) MDRV_CPU_IO_MAP(0,mario_writeport) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c index 2cc6f400bf8..87c4680dcd4 100644 --- a/src/mame/drivers/markham.c +++ b/src/mame/drivers/markham.c @@ -198,11 +198,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( markham ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.000MHz */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(readmem1,writemem1) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ + MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c index 35d56655fcd..61e021f4c29 100644 --- a/src/mame/drivers/marvins.c +++ b/src/mame/drivers/marvins.c @@ -510,16 +510,15 @@ GFXDECODE_END static MACHINE_DRIVER_START( marvins ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3360000) /* 3.36 MHz */ + MDRV_CPU_ADD("main", Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(marvins_cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3360000) /* 3.36 MHz */ + MDRV_CPU_ADD("sub", Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(marvins_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_assert, 244) // schematics show a separate 244Hz timer @@ -560,15 +559,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vangrd2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3360000) /* 3.36 MHz */ + MDRV_CPU_ADD("main", Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(madcrash_cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("sub", Z80, 3360000) /* 3.36 MHz */ + MDRV_CPU_ADD("sub", Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(madcrash_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio", Z80, 4000000) /* 4.0 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_PERIODIC_INT(nmi_line_assert, 244) diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 6ffd41de35f..ee6acf6c685 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -858,7 +858,7 @@ static MACHINE_RESET( mastboy ) static MACHINE_DRIVER_START( mastboy ) - MDRV_CPU_ADD_TAG("main", Z180, 12000000/2) /* HD647180X0CP6-1M1R */ + MDRV_CPU_ADD("main", Z180, 12000000/2) /* HD647180X0CP6-1M1R */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(port_readmem,0) MDRV_CPU_VBLANK_INT("main", mastboy_interrupt) diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index fe2b7800b70..37634178695 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -321,12 +321,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( matmania ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ???? */ + MDRV_CPU_ADD("main", M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(matmania_readmem,matmania_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6502, 1200000) - /* audio CPU */ /* 1.2 MHz ???? */ + MDRV_CPU_ADD("audio", M6502, 1200000) /* 1.2 MHz ???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,15) /* ???? */ /* IRQs are caused by the main CPU */ @@ -377,15 +376,14 @@ static const struct YM3526interface ym3526_interface = static MACHINE_DRIVER_START( maniach ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ???? */ + MDRV_CPU_ADD("main", M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(maniach_readmem,maniach_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6809, 1500000) - /* audio CPU */ /* 1.5 MHz ???? */ + MDRV_CPU_ADD("audio", M6809, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(maniach_sound_readmem,maniach_sound_writemem) /* IRQs are caused by the main CPU */ - MDRV_CPU_ADD(M68705, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */ + MDRV_CPU_ADD("mcu", M68705, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */ MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) MDRV_INTERLEAVE(100) /* 100 CPU slice per frame - high interleaving to sync main and mcu */ diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index 3a38c524bb1..36391181632 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -429,11 +429,11 @@ static const struct POKEYinterface pokey_interface = { static MACHINE_DRIVER_START( a600xl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, FREQ_17_EXACT) + MDRV_CPU_ADD("main", M6502, FREQ_17_EXACT) MDRV_CPU_PROGRAM_MAP(a600xl_mem, 0) MDRV_CPU_VBLANK_INT_HACK(a800xl_interrupt, TOTAL_LINES_60HZ) - MDRV_CPU_ADD(M68705, 3579545) + MDRV_CPU_ADD("mcu", M68705, 3579545) MDRV_CPU_PROGRAM_MAP(mcu_mem,0) /* video hardware */ diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 35103eaa16e..0a02d5f8704 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -282,7 +282,7 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( mayumi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 5.000 MHz ? */ + MDRV_CPU_ADD("main", Z80, MCLK/2) /* 5.000 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", mayumi_interrupt) diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 43cf8df97bb..cc2b6e2f5ea 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -1493,16 +1493,16 @@ static const struct AY8910interface ay8912_interface_2 = static MACHINE_DRIVER_START( mazerbla ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz, NMI, IM1 INT */ + MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz, NMI, IM1 INT */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) MDRV_CPU_IO_MAP(readport_cpu2,writeport_cpu2) //MDRV_CPU_PERIODIC_INT(irq0_line_hold, 400 ) /* frequency in Hz */ - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz, no NMI, IM1 INT */ + MDRV_CPU_ADD("sub2", Z80, 4000000) /* 4 MHz, no NMI, IM1 INT */ MDRV_CPU_PROGRAM_MAP(readmem_cpu3,writemem_cpu3) MDRV_CPU_IO_MAP(readport_cpu3,writeport_cpu3_mb) /* (vblank related ??) int generated by a custom video processor @@ -1536,15 +1536,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( greatgun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(gg_readport,gg_writeport) - MDRV_CPU_ADD(Z80, 14318000 / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */ + MDRV_CPU_ADD("audio", Z80, 14318000 / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_PERIODIC_INT(sound_interrupt, (double)14318180/16/16/16/16 ) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz, no NMI, IM1 INT */ + MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz, no NMI, IM1 INT */ MDRV_CPU_PROGRAM_MAP(readmem_cpu3,writemem_cpu3) MDRV_CPU_IO_MAP(readport_cpu3,writeport_cpu3_gg) /* (vblank related ??) int generated by a custom video processor diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 55d64113bfd..7e5202e38ad 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -492,11 +492,11 @@ static const struct YM2610interface mcatadv_ym2610_interface = static MACHINE_DRIVER_START( mcatadv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcatadv_readmem,mcatadv_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, XTAL_16MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("sound", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcatadv_sound_readmem,mcatadv_sound_writemem) MDRV_CPU_IO_MAP(mcatadv_sound_readport,mcatadv_sound_writeport) diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index 6a0c220f32c..fce222123e6 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -1508,7 +1508,7 @@ static const struct Samplesinterface journey_samples_interface = static MACHINE_DRIVER_START( mcr_90009 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_OSC_MCR_I/8) + MDRV_CPU_ADD("main", Z80, MAIN_OSC_MCR_I/8) MDRV_CPU_CONFIG(mcr_daisy_chain) MDRV_CPU_PROGRAM_MAP(cpu_90009_map,0) MDRV_CPU_IO_MAP(cpu_90009_portmap,0) @@ -1596,7 +1596,7 @@ static MACHINE_DRIVER_START( mcr_91490_ipu ) MDRV_IMPORT_FROM(mcr_91490_snt) MDRV_MACHINE_START(nflfoot) - MDRV_CPU_ADD_TAG("ipu", Z80, 7372800/2) + MDRV_CPU_ADD("ipu", Z80, 7372800/2) MDRV_CPU_CONFIG(mcr_ipu_daisy_chain) MDRV_CPU_PROGRAM_MAP(ipu_91695_map,0) MDRV_CPU_IO_MAP(ipu_91695_portmap,0) diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index 3defe3c3531..ac50fcfece0 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -1052,7 +1052,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mcr3_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/4) MDRV_CPU_CONFIG(mcr_daisy_chain) MDRV_CPU_VBLANK_INT_HACK(mcr_interrupt,2) diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 3a758aa1b8a..78c4788f1b2 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -880,7 +880,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( zwackery ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 7652400) /* should be XTAL_16MHz/2 */ + MDRV_CPU_ADD("main", M68000, 7652400) /* should be XTAL_16MHz/2 */ MDRV_CPU_PROGRAM_MAP(zwackery_map,0) MDRV_CPU_VBLANK_INT("main", mcr68_interrupt) @@ -910,7 +910,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mcr68 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 7723800) + MDRV_CPU_ADD("main", M68000, 7723800) MDRV_CPU_PROGRAM_MAP(mcr68_map,0) MDRV_CPU_VBLANK_INT("main", mcr68_interrupt) diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c index cbec956765e..722acc89152 100644 --- a/src/mame/drivers/meadows.c +++ b/src/mame/drivers/meadows.c @@ -587,12 +587,11 @@ static const struct Samplesinterface bowl3d_samples_interface = static MACHINE_DRIVER_START( meadows ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 5000000/8) /* 5MHz / 8 = 625 kHz */ + MDRV_CPU_ADD("main", S2650, 5000000/8) /* 5MHz / 8 = 625 kHz */ MDRV_CPU_PROGRAM_MAP(meadows_main_map,0) MDRV_CPU_VBLANK_INT("main", meadows_interrupt) /* one interrupt per frame!? */ - MDRV_CPU_ADD(S2650, 5000000/8) - /* audio CPU */ /* 5MHz / 8 = 625 kHz */ + MDRV_CPU_ADD("audio", S2650, 5000000/8) /* 5MHz / 8 = 625 kHz */ MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072) @@ -627,7 +626,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( minferno ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 5000000/8/3) /* 5MHz / 8 = 625 kHz */ + MDRV_CPU_ADD("main", S2650, 5000000/8/3) /* 5MHz / 8 = 625 kHz */ MDRV_CPU_PROGRAM_MAP(minferno_main_map,0) MDRV_CPU_IO_MAP(minferno_io_map,0) MDRV_CPU_VBLANK_INT("main", minferno_interrupt) diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index bda69a9a712..0101df8390c 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -1032,7 +1032,7 @@ static const struct pit8253_config mediagx_pit8254_config = static MACHINE_DRIVER_START(mediagx) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", MEDIAGX, 166000000) + MDRV_CPU_ADD("main", MEDIAGX, 166000000) MDRV_CPU_PROGRAM_MAP(mediagx_map, 0) MDRV_CPU_IO_MAP(mediagx_io, 0) diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 3e67155ee18..113a58b4921 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -2956,7 +2956,7 @@ INPUT_PORTS_END MACHINE_DRIVER_START( megdsvp ) MDRV_IMPORT_FROM(megadriv) - MDRV_CPU_ADD(SSP1601, MASTER_CLOCK / 7 * 3) /* ~23 MHz (guessed) */ + MDRV_CPU_ADD("svp", SSP1601, MASTER_CLOCK / 7 * 3) /* ~23 MHz (guessed) */ MDRV_CPU_PROGRAM_MAP(svp_ssp_map, 0) MDRV_CPU_IO_MAP(svp_ext_map, 0) /* IRQs are not used by this CPU */ @@ -5015,11 +5015,11 @@ static NVRAM_HANDLER( megadriv ) MACHINE_DRIVER_START( megadriv ) - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) /* 7.67 MHz */ + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK / 7) /* 7.67 MHz */ MDRV_CPU_PROGRAM_MAP(megadriv_readmem,megadriv_writemem) /* IRQs are handled via the timers */ - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) /* 3.58 MHz */ + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK / 15) /* 3.58 MHz */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) MDRV_CPU_IO_MAP(z80_portmap,0) /* IRQ handled via the timers */ @@ -5082,10 +5082,10 @@ MACHINE_DRIVER_START( _32x ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(_32x_readmem,_32x_writemem) - MDRV_CPU_ADD_TAG("SH2main", SH2, 10000000 ) + MDRV_CPU_ADD("SH2main", SH2, 10000000 ) MDRV_CPU_PROGRAM_MAP(sh2main_readmem,sh2main_writemem) - MDRV_CPU_ADD_TAG("SH2slave", SH2, 10000000 ) + MDRV_CPU_ADD("SH2slave", SH2, 10000000 ) MDRV_CPU_PROGRAM_MAP(sh2slave_readmem,sh2slave_writemem) MACHINE_DRIVER_END diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 68a9b79da34..d339669bf86 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -764,7 +764,7 @@ static MACHINE_DRIVER_START( mpnew ) /* The Megaplay has an extra BIOS cpu which drives an SMS VDP which includes an SN76496 for sound */ - MDRV_CPU_ADD_TAG("megaplay_bios", Z80, MASTER_CLOCK / 15) /* ?? */ + MDRV_CPU_ADD("megaplay_bios", Z80, MASTER_CLOCK / 15) /* ?? */ MDRV_CPU_PROGRAM_MAP(megaplay_bios_readmem, megaplay_bios_writemem) MDRV_CPU_IO_MAP(megaplay_bios_readport,megaplay_bios_writeport) MDRV_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262) diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index f51e52371cf..892ee20887f 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -616,11 +616,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( system_A ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */ + MDRV_CPU_ADD("main", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */ MDRV_CPU_PROGRAM_MAP(readmem_A,writemem_A) MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A) - MDRV_CPU_ADD_TAG("sound", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */ + MDRV_CPU_ADD("sound", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem_A,sound_writemem_A) @@ -726,7 +726,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( system_D ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, SYS_D_CPU_CLOCK) /* 8MHz */ + MDRV_CPU_ADD("main", M68000, SYS_D_CPU_CLOCK) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(readmem_D,writemem_D) MDRV_CPU_VBLANK_INT("main", interrupt_D) @@ -788,12 +788,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( system_Z ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */ + MDRV_CPU_ADD("main", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */ MDRV_CPU_PROGRAM_MAP(readmem_A,writemem_A) MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A) - MDRV_CPU_ADD(Z80, 3000000) /* OSC 12MHz divided by 4 ??? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* OSC 12MHz divided by 4 ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem_z80,sound_writemem_z80) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index b54c37dca4d..49654cefe11 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( megatech ) MDRV_IMPORT_FROM(megadriv) /* Megatech has an extra SMS based bios *and* an additional screen */ - MDRV_CPU_ADD_TAG("megatech_bios", Z80, MASTER_CLOCK / 15) /* ?? */ + MDRV_CPU_ADD("megatech_bios", Z80, MASTER_CLOCK / 15) /* ?? */ MDRV_CPU_PROGRAM_MAP(megatech_bios_map, 0) MDRV_CPU_IO_MAP(megatech_bios_portmap,0) diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 361ccf14080..4a2b5247e59 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -314,17 +314,16 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( megazone ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 18432000/9) /* 2 MHz */ + MDRV_CPU_ADD("main", M6809, 18432000/9) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,18432000/6) /* Z80 Clock is derived from the H1 signal */ + MDRV_CPU_ADD("audio", Z80,18432000/6) /* Z80 Clock is derived from the H1 signal */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(I8039,14318000/2) - /* audio CPU */ /* 1/2 14MHz crystal */ + MDRV_CPU_ADD("dac", I8039,14318000/2) /* 1/2 14MHz crystal */ MDRV_CPU_PROGRAM_MAP(i8039_readmem,i8039_writemem) MDRV_CPU_IO_MAP(i8039_readport,i8039_writeport) diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 7c5c4426eba..0eeab8363b6 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -305,11 +305,11 @@ static MACHINE_RESET( meijinsn ) static MACHINE_DRIVER_START( meijinsn ) - MDRV_CPU_ADD_TAG("main", M68000, 9000000 ) + MDRV_CPU_ADD("main", M68000, 9000000 ) MDRV_CPU_PROGRAM_MAP(meijinsn_map, 0) MDRV_CPU_VBLANK_INT_HACK(meijinsn_interrupt,2) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(meijinsn_sound_map,0) MDRV_CPU_IO_MAP(meijinsn_sound_io_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 733cc428efa..14e338f8ca0 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -799,7 +799,7 @@ static const struct AY8910interface merit_ay8912_interface = static MACHINE_DRIVER_START( pitboss ) - MDRV_CPU_ADD_TAG("main",Z80,2500000) /* ?? */ + MDRV_CPU_ADD("main",Z80,2500000) /* ?? */ MDRV_CPU_PROGRAM_MAP(pitboss_map,0) MDRV_CPU_IO_MAP(trvwhiz_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 9bf761c4de4..d7b61c3a408 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -881,7 +881,7 @@ static NVRAM_HANDLER(meritm_crt260) #define MSX2_VISIBLE_YBORDER_PIXELS 14 * 2 static MACHINE_DRIVER_START(meritm_crt250) - MDRV_CPU_ADD_TAG("main", Z80, SYSTEM_CLK/6) + MDRV_CPU_ADD("main", Z80, SYSTEM_CLK/6) MDRV_CPU_PROGRAM_MAP(meritm_crt250_map,0) MDRV_CPU_IO_MAP(meritm_crt250_io_map,0) MDRV_CPU_CONFIG(meritm_daisy_chain) diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index ac5518fe693..11780fb880f 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -253,7 +253,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mermaid ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 4000000) // ??? + MDRV_CPU_ADD("main", Z80, 4000000) // ??? MDRV_CPU_PROGRAM_MAP(mermaid_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 68b7b4a4e12..e589be38c83 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -314,11 +314,11 @@ static MACHINE_RESET( metlclsh ) static MACHINE_DRIVER_START( metlclsh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) // ? + MDRV_CPU_ADD("main", M6809, 1500000) // ? MDRV_CPU_PROGRAM_MAP(metlclsh_readmem, metlclsh_writemem) // IRQ by YM3526, NMI by cpu #2 - MDRV_CPU_ADD(M6809, 1500000) // ? + MDRV_CPU_ADD("sub", M6809, 1500000) // ? MDRV_CPU_PROGRAM_MAP(metlclsh_readmem2, metlclsh_writemem2) MDRV_CPU_VBLANK_INT_HACK(metlclsh_interrupt2,2) // IRQ by cpu #1, NMI by coins insertion diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 0d6e7bdea71..059cda1a628 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -3763,7 +3763,7 @@ static const UPD7810_CONFIG metro_cpu_config = static MACHINE_DRIVER_START( balcube ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(balcube_readmem,balcube_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ @@ -3796,7 +3796,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bangball ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(bangball_readmem,bangball_writemem) MDRV_CPU_VBLANK_INT("main", bangball_interrupt) @@ -3829,7 +3829,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( batlbubl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(batlbubl_readmem,batlbubl_writemem) MDRV_CPU_VBLANK_INT("main", bangball_interrupt) @@ -3861,12 +3861,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( daitorid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(daitorid_readmem,daitorid_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(daitorid_snd_readmem,daitorid_snd_writemem) MDRV_CPU_IO_MAP(daitorid_snd_readport,daitorid_snd_writeport) @@ -3905,12 +3904,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dharma ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(dharma_readmem,dharma_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -3948,12 +3946,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( karatour ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(karatour_readmem,karatour_writemem) MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -3991,12 +3988,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( 3kokushi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(kokushi_readmem,kokushi_writemem) MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4034,12 +4030,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lastfort ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(lastfort_readmem,lastfort_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4076,12 +4071,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lastforg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(lastforg_readmem,lastforg_writemem) MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4118,7 +4112,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dokyusei ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dokyusei_readmem,dokyusei_writemem) MDRV_CPU_VBLANK_INT_HACK(dokyusei_interrupt,2) /* ? */ @@ -4168,7 +4162,7 @@ static NVRAM_HANDLER( dokyusp ) static MACHINE_DRIVER_START( dokyusp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dokyusp_readmem,dokyusp_writemem) MDRV_CPU_VBLANK_INT("main", gakusai_interrupt) @@ -4206,7 +4200,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gakusai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(gakusai_readmem,gakusai_writemem) MDRV_CPU_VBLANK_INT("main", gakusai_interrupt) @@ -4244,7 +4238,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gakusai2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(gakusai2_readmem,gakusai2_writemem) MDRV_CPU_VBLANK_INT("main", gakusai_interrupt) @@ -4282,12 +4276,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pangpoms ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(pangpoms_readmem,pangpoms_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4325,12 +4318,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( poitto ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(poitto_readmem,poitto_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4368,12 +4360,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pururun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(pururun_readmem,pururun_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(daitorid_snd_readmem,daitorid_snd_writemem) MDRV_CPU_IO_MAP(daitorid_snd_readport,daitorid_snd_writeport) @@ -4412,12 +4403,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( skyalert ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(skyalert_readmem,skyalert_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4455,12 +4445,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( toride2g ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(toride2g_readmem,toride2g_writemem) MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ - MDRV_CPU_ADD(UPD7810, 12000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", UPD7810, 12000000) MDRV_CPU_CONFIG(metro_cpu_config) MDRV_CPU_PROGRAM_MAP(metro_snd_readmem,metro_snd_writemem) MDRV_CPU_IO_MAP(metro_snd_readport,metro_snd_writeport) @@ -4498,7 +4487,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mouja ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(mouja_readmem,mouja_writemem) MDRV_CPU_VBLANK_INT("main", mouja_interrupt) @@ -4534,12 +4523,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blzntrnd ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(blzntrnd_readmem,blzntrnd_writemem) MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ - MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_readmem, blzntrnd_sound_writemem) MDRV_CPU_IO_MAP(blzntrnd_sound_readport, blzntrnd_sound_writeport) @@ -4574,12 +4562,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gstrik2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(blzntrnd_readmem,blzntrnd_writemem) MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ - MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_readmem, blzntrnd_sound_writemem) MDRV_CPU_IO_MAP(blzntrnd_sound_readport, blzntrnd_sound_writeport) @@ -4644,7 +4631,7 @@ static INTERRUPT_GEN( puzzlet_interrupt ) static MACHINE_DRIVER_START( puzzlet ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz + MDRV_CPU_ADD("main", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz MDRV_CPU_PROGRAM_MAP(puzzlet_map,0) MDRV_CPU_IO_MAP(puzzlet_io_map,0) diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index 1c529545de6..dfebf0f2aa3 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -370,18 +370,18 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( mexico86 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */ + MDRV_CPU_ADD("main",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_ADD(Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */ + MDRV_CPU_ADD("audio", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("mcu", M68705, 4000000) /* xtal is 4MHz, divided by 4 internally */ + MDRV_CPU_ADD("mcu", M68705, 4000000) /* xtal is 4MHz, divided by 4 internally */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_CPU_VBLANK_INT_HACK(mexico86_m68705_interrupt,2) - MDRV_CPU_ADD_TAG("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */ + MDRV_CPU_ADD("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */ MDRV_CPU_PROGRAM_MAP(sub_cpu_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index eb37295e4e8..005216d16b8 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -291,7 +291,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mgolf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) /* ? */ + MDRV_CPU_ADD("main", M6502, 12096000 / 16) /* ? */ MDRV_CPU_PROGRAM_MAP(cpu_map, 0) MDRV_MACHINE_RESET(mgolf) diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index 125d6860dab..2b1b00cf4ce 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -518,10 +518,10 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( mhavoc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */ + MDRV_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(alpha_map, 0) - MDRV_CPU_ADD_TAG("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */ + MDRV_CPU_ADD("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */ MDRV_CPU_PROGRAM_MAP(gamma_map, 0) MDRV_MACHINE_RESET(mhavoc) diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 2e41ef0b2db..ac1da44a0ef 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -859,15 +859,15 @@ static const tms34010_config vgb_config = static MACHINE_DRIVER_START( micro3d ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000 ) + MDRV_CPU_ADD("main", M68000, 12000000 ) MDRV_CPU_PROGRAM_MAP(hostmem,0) MDRV_CPU_VBLANK_INT("main", micro3d_vblank) - MDRV_CPU_ADD(TMS34010, 40000000) + MDRV_CPU_ADD("vgb", TMS34010, 40000000) MDRV_CPU_CONFIG(vgb_config) MDRV_CPU_PROGRAM_MAP(vgbmem,0) - MDRV_CPU_ADD(I8051, 11059000) + MDRV_CPU_ADD("audio", I8051, 11059000) MDRV_CPU_PROGRAM_MAP(soundmem_prg,0) MDRV_CPU_DATA_MAP(soundmem_data,0) MDRV_CPU_IO_MAP(soundmem_io,0) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 0396702885c..96608103e32 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -440,7 +440,7 @@ static const struct YMZ280Binterface ymz280b_interface = static MACHINE_DRIVER_START( livequiz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 24000000 / 2) + MDRV_CPU_ADD("main", M68000, 24000000 / 2) MDRV_CPU_PROGRAM_MAP(mem_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c index e2a1bc1a902..aabb478c249 100644 --- a/src/mame/drivers/midtunit.c +++ b/src/mame/drivers/midtunit.c @@ -603,7 +603,7 @@ static const tms34010_config tms_config = static MACHINE_DRIVER_START( tunit_core ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, CPU_CLOCK) + MDRV_CPU_ADD("main", TMS34010, CPU_CLOCK) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 74e52dfa856..7a7847a1081 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -1008,7 +1008,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( midvcommon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS32031, CPU_CLOCK) + MDRV_CPU_ADD("main", TMS32031, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(midvunit_map,0) MDRV_MACHINE_START(midvunit) diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c index 1927cb14acc..a3bb50e52e5 100644 --- a/src/mame/drivers/midwunit.c +++ b/src/mame/drivers/midwunit.c @@ -633,7 +633,7 @@ static const tms34010_config tms_config = static MACHINE_DRIVER_START( wunit ) - MDRV_CPU_ADD_TAG("main", TMS34010, 50000000) + MDRV_CPU_ADD("main", TMS34010, 50000000) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c index 3b51e0e3343..e0c71981001 100644 --- a/src/mame/drivers/midxunit.c +++ b/src/mame/drivers/midxunit.c @@ -192,7 +192,7 @@ static const tms34010_config tms_config = static MACHINE_DRIVER_START( midxunit ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34020, 40000000) + MDRV_CPU_ADD("main", TMS34020, 40000000) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c index 6cfcab1a345..afa73d13504 100644 --- a/src/mame/drivers/midyunit.c +++ b/src/mame/drivers/midyunit.c @@ -1016,7 +1016,7 @@ static const tms34010_config yunit_tms_config = static MACHINE_DRIVER_START( zunit ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, FAST_MASTER_CLOCK) + MDRV_CPU_ADD("main", TMS34010, FAST_MASTER_CLOCK) MDRV_CPU_CONFIG(zunit_tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) @@ -1049,7 +1049,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( yunit_core ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, SLOW_MASTER_CLOCK) + MDRV_CPU_ADD("main", TMS34010, SLOW_MASTER_CLOCK) MDRV_CPU_CONFIG(yunit_tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) @@ -1136,7 +1136,7 @@ static MACHINE_DRIVER_START( mkyawdim ) /* basic machine hardware */ MDRV_IMPORT_FROM(yunit_core) - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("audio", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(yawdim_sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index 038ab1776ce..e912cbb19b1 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -1113,7 +1113,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( midzeus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS32032, CPU_CLOCK) + MDRV_CPU_ADD("main", TMS32032, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(zeus_map,0) MDRV_CPU_VBLANK_INT("main", display_irq) @@ -1139,7 +1139,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( midzeus2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS32032, CPU_CLOCK) + MDRV_CPU_ADD("main", TMS32032, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(zeus2_map,0) MDRV_CPU_VBLANK_INT("main", display_irq) diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index 36d92653401..388cec247c2 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -244,12 +244,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( mikie ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6809, 1250000) // ??? MC68A09E + MDRV_CPU_ADD("main", M6809, 1250000) // ??? MC68A09E MDRV_CPU_PROGRAM_MAP(mikie_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, CLK) // 3.58 MHz - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, CLK) // 3.58 MHz MDRV_CPU_PROGRAM_MAP(sound_map, 0) // video hardware diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 4682a4ec53f..5540692eab0 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -254,7 +254,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( miniboy7 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* guess */ + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/16) /* guess */ MDRV_CPU_PROGRAM_MAP(miniboy7_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index cec4be9224c..eb6d6e20c0a 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -70,7 +70,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( minivadr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,24000000 / 6) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80,24000000 / 6) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(minivadr_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 9c29bfb3f5d..1c6a24f8f87 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -346,7 +346,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mirage ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 28000000/2) + MDRV_CPU_ADD("main", M68000, 28000000/2) MDRV_CPU_PROGRAM_MAP(mirage_readmem,mirage_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index fe516fcbfc5..c4abbbb7312 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -177,7 +177,7 @@ static INPUT_PORTS_START( mirax ) INPUT_PORTS_END static MACHINE_DRIVER_START( mirax ) - MDRV_CPU_ADD_TAG("main", Z80, 12000000) // audio cpu ? + MDRV_CPU_ADD("main", Z80, 12000000) // audio cpu ? MDRV_CPU_PROGRAM_MAP(memory_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2) diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 347f1481a17..453f9c0df01 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -355,16 +355,15 @@ static INTERRUPT_GEN( missb2_interrupt ) static MACHINE_DRIVER_START( missb2 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, MAIN_XTAL/4) // 6 MHz + MDRV_CPU_ADD("main", Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz + MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_XTAL/8) - /* audio CPU */ // 3 MHz + MDRV_CPU_ADD("audio", Z80, MAIN_XTAL/8) // 3 MHz MDRV_CPU_PROGRAM_MAP(sound_map, 0) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_VBLANK_INT("main", missb2_interrupt) diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index 4e30c1f66ce..b0ab87aff0f 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -887,7 +887,7 @@ static const struct POKEYinterface pokey_interface = static MACHINE_DRIVER_START( missile ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_START(missile) diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 94bff4e0554..dfcd3e403c5 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -1131,7 +1131,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mgakuen ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* ??? */ + MDRV_CPU_ADD("main", Z80, 6000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(mgakuen_readmem,mgakuen_writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ @@ -1165,7 +1165,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80, 8000000) /* (verified on pcb) */ + MDRV_CPU_ADD("main",Z80, 8000000) /* (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ @@ -1241,7 +1241,7 @@ static MACHINE_DRIVER_START( spangbl ) MDRV_CPU_IO_MAP(spangb_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("sound",Z80, 8000000) + MDRV_CPU_ADD("sound",Z80, 8000000) MDRV_CPU_PROGRAM_MAP(spangb_sound_memmap,0 ) MDRV_CPU_IO_MAP(spangb_sound_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1263,14 +1263,13 @@ static MACHINE_DRIVER_START( mstworld ) /* it doesn't glitch with the clock speed set to 4x normal, however this is incorrect.. the interrupt handling (and probably various irq flags / vbl flags handling etc.) is more likely wrong.. the game appears to run too fast anyway .. */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000*4) + MDRV_CPU_ADD("main", Z80, 6000000*4) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(mstworld_readport,mstworld_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,6000000) /* 6 MHz? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,6000000) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(mstworld_sound_readmem,mstworld_sound_writemem) /* video hardware */ @@ -1299,7 +1298,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( marukin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* Super Pang says 8MHZ ORIGINAL BOARD */ + MDRV_CPU_ADD("main", Z80, 8000000) /* Super Pang says 8MHZ ORIGINAL BOARD */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index a91452bf99a..0a756b5703c 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -355,7 +355,7 @@ static const struct CustomSound_interface adpcm_interface = static MACHINE_DRIVER_START( mjkjidai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10000000/2) /* 5 MHz ??? */ + MDRV_CPU_ADD("main", Z80,10000000/2) /* 5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 701072746ec..56377e7e475 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -311,7 +311,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( mjsister ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 6.000 MHz */ + MDRV_CPU_ADD("main", Z80, MCLK/2) /* 6.000 MHz */ MDRV_CPU_PROGRAM_MAP(mjsister_readmem,mjsister_writemem) MDRV_CPU_IO_MAP(mjsister_readport,mjsister_writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c index 1c511549a18..0aef940325f 100644 --- a/src/mame/drivers/mjsiyoub.c +++ b/src/mame/drivers/mjsiyoub.c @@ -84,11 +84,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( mjsiyoub ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/4) + MDRV_CPU_ADD("main", Z80,18432000/4) MDRV_CPU_PROGRAM_MAP(readmem1,writemem1) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,18432000/4) + MDRV_CPU_ADD("sub", Z80,18432000/4) MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index df4a19d8fc3..ce5a96106db 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -361,18 +361,18 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( mlanding ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000 ) /* 12 MHz ??? (guess) */ + MDRV_CPU_ADD("main", M68000, 12000000 ) /* 12 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_mem, 0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 4000000 ) /* 4 MHz ??? (guess) */ + MDRV_CPU_ADD("z80", Z80, 4000000 ) /* 4 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_z80_mem,0) - MDRV_CPU_ADD(M68000, 12000000 ) /* 12 MHz ??? (guess) */ + MDRV_CPU_ADD("sub", M68000, 12000000 ) /* 12 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_sub_mem,0) MDRV_CPU_VBLANK_INT_HACK(irq6_line_hold,7) - MDRV_CPU_ADD(Z80, 4000000 ) /* 4 MHz ??? (guess) */ + MDRV_CPU_ADD("z80sub", Z80, 4000000 ) /* 4 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_z80_sub_mem,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 0f4aa2ea78d..aeee3357008 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -1506,12 +1506,12 @@ ROM_START( wingwara ) ROM_END static MACHINE_DRIVER_START( model1 ) - MDRV_CPU_ADD_TAG("main", V60, 16000000) + MDRV_CPU_ADD("main", V60, 16000000) MDRV_CPU_PROGRAM_MAP(model1_mem, 0) MDRV_CPU_IO_MAP(model1_io, 0) MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2) - MDRV_CPU_ADD(M68000, 10000000) // verified on real h/w + MDRV_CPU_ADD("audio", M68000, 10000000) // verified on real h/w MDRV_CPU_PROGRAM_MAP(model1_snd, 0) MDRV_MACHINE_RESET(model1) @@ -1550,15 +1550,15 @@ static MACHINE_DRIVER_START( model1 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model1_vr ) - MDRV_CPU_ADD_TAG("main", V60, 16000000) + MDRV_CPU_ADD("main", V60, 16000000) MDRV_CPU_PROGRAM_MAP(model1_vr_mem, 0) MDRV_CPU_IO_MAP(model1_vr_io, 0) MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2) - MDRV_CPU_ADD(M68000, 10000000) // verified on real h/w + MDRV_CPU_ADD("audio", M68000, 10000000) // verified on real h/w MDRV_CPU_PROGRAM_MAP(model1_snd, 0) - MDRV_CPU_ADD(MB86233, 16000000) + MDRV_CPU_ADD("tgp", MB86233, 16000000) MDRV_CPU_CONFIG(model1_vr_tgp_config) MDRV_CPU_PROGRAM_MAP(model1_vr_tgp_map, 0) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 74f53db3abc..a2dc2e9977e 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1788,14 +1788,14 @@ static const struct mb86233_config tgp_config = /* original Model 2 */ static MACHINE_DRIVER_START( model2o ) - MDRV_CPU_ADD_TAG("main", I960, 25000000) + MDRV_CPU_ADD("main", I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2o_mem) MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2) - MDRV_CPU_ADD(M68000, 10000000) + MDRV_CPU_ADD("audio", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(model1_snd, 0) - MDRV_CPU_ADD(MB86233, 16000000) + MDRV_CPU_ADD("tgp", MB86233, 16000000) MDRV_CPU_CONFIG(tgp_config) MDRV_CPU_PROGRAM_MAP(copro_tgp_map, 0) @@ -1835,14 +1835,14 @@ MACHINE_DRIVER_END /* 2A-CRX */ static MACHINE_DRIVER_START( model2a ) - MDRV_CPU_ADD_TAG("main", I960, 25000000) + MDRV_CPU_ADD("main", I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2a_crx_mem) MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model2_snd, 0) - MDRV_CPU_ADD(MB86233, 16000000) + MDRV_CPU_ADD("tgp", MB86233, 16000000) MDRV_CPU_CONFIG(tgp_config) MDRV_CPU_PROGRAM_MAP(copro_tgp_map, 0) @@ -1879,18 +1879,18 @@ static const sharc_config sharc_cfg = /* 2B-CRX */ static MACHINE_DRIVER_START( model2b ) - MDRV_CPU_ADD_TAG("main", I960, 25000000) + MDRV_CPU_ADD("main", I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2b_crx_mem) MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model2_snd, 0) - MDRV_CPU_ADD(ADSP21062, 40000000) + MDRV_CPU_ADD("dsp", ADSP21062, 40000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(copro_sharc_map, 0) - //MDRV_CPU_ADD(ADSP21062, 40000000) + //MDRV_CPU_ADD("dsp2", ADSP21062, 40000000) //MDRV_CPU_CONFIG(sharc_cfg) //MDRV_CPU_DATA_MAP(geo_sharc_map, 0) @@ -1923,11 +1923,11 @@ MACHINE_DRIVER_END /* 2C-CRX */ static MACHINE_DRIVER_START( model2c ) - MDRV_CPU_ADD_TAG("main", I960, 25000000) + MDRV_CPU_ADD("main", I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2c_crx_mem) MDRV_CPU_VBLANK_INT_HACK(model2c_interrupt,3) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model2_snd, 0) MDRV_MACHINE_RESET(model2c) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 81cc633026d..353988f3a0b 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4237,12 +4237,12 @@ static const powerpc_config model3_2x = }; static MACHINE_DRIVER_START( model3_10 ) - MDRV_CPU_ADD_TAG("main", PPC603E, 66000000) + MDRV_CPU_ADD("main", PPC603E, 66000000) MDRV_CPU_CONFIG(model3_10) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) MDRV_INTERLEAVE(10) @@ -4276,12 +4276,12 @@ static MACHINE_DRIVER_START( model3_10 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model3_15 ) - MDRV_CPU_ADD_TAG("main", PPC603E, 100000000) + MDRV_CPU_ADD("main", PPC603E, 100000000) MDRV_CPU_CONFIG(model3_15) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) MDRV_MACHINE_START(model3_15) @@ -4313,12 +4313,12 @@ static MACHINE_DRIVER_START( model3_15 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model3_20 ) - MDRV_CPU_ADD_TAG("main", PPC603R, 166000000) + MDRV_CPU_ADD("main", PPC603R, 166000000) MDRV_CPU_CONFIG(model3_2x) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) MDRV_MACHINE_START(model3_20) @@ -4350,12 +4350,12 @@ static MACHINE_DRIVER_START( model3_20 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model3_21 ) - MDRV_CPU_ADD_TAG("main", PPC603R, 166000000) + MDRV_CPU_ADD("main", PPC603R, 166000000) MDRV_CPU_CONFIG(model3_2x) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("audio", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) MDRV_MACHINE_START(model3_21) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 2d91c651bd0..065837f3d2e 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -212,7 +212,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mogura ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,3000000) /* 3 MHz */ + MDRV_CPU_ADD("main", Z80,3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 97589a0b1cd..b91ccd611b1 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -195,7 +195,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mole ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6502, 4000000) // ??? + MDRV_CPU_ADD("main", M6502, 4000000) // ??? MDRV_CPU_PROGRAM_MAP(mole_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index 90e0dcb5db4..cb6b21c0ce8 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -259,12 +259,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( momoko ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.0MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5.0MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 2500000) - /* audio CPU */ /* 2.5MHz */ + MDRV_CPU_ADD("audio", Z80, 2500000) /* 2.5MHz */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) /* video hardware */ diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index e44ce1e816c..53b49a67029 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -574,11 +574,11 @@ static MACHINE_RESET( moo ) static MACHINE_DRIVER_START( moo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", moo_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 8000000) + MDRV_CPU_ADD("sound", Z80, 8000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -618,7 +618,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( moobl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16100000) + MDRV_CPU_ADD("main", M68000, 16100000) MDRV_CPU_PROGRAM_MAP(readmembl,writemembl) MDRV_CPU_VBLANK_INT("main", moobl_interrupt) diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index 0c468bad8fc..e0499157f08 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -290,7 +290,7 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( mosaic ) - MDRV_CPU_ADD_TAG("main", Z180, 7000000) /* ??? */ + MDRV_CPU_ADD("main", Z180, 7000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 2d0a1ca9c23..78389e37e41 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -200,14 +200,13 @@ GFXDECODE_END static MACHINE_DRIVER_START( mouser ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", mouser_nmi_interrupt) /* NMI is masked externally */ - MDRV_CPU_ADD(Z80, 4000000) /* ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) MDRV_CPU_IO_MAP(readport2,writeport2) - /* audio CPU */ MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? This controls the sound tempo */ /* video hardware */ diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 98c9cd9d325..35710b99bb6 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -1401,7 +1401,7 @@ static MACHINE_DRIVER_START( mpu4mod2 ) MDRV_MACHINE_START(mpu4mod2) MDRV_MACHINE_RESET(mpu4) - MDRV_CPU_ADD_TAG("main", M6809, MPU4_MASTER_CLOCK/4) + MDRV_CPU_ADD("main", M6809, MPU4_MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(mod2_memmap,0) MDRV_TIMER_ADD_PERIODIC("50HZ",gen_50hz, HZ(100)) diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 96a90178674..77bca1f4cd6 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -1670,7 +1670,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( mpu4_vid ) - MDRV_CPU_ADD_TAG("main", M6809, MPU4_MASTER_CLOCK/4 ) + MDRV_CPU_ADD("main", M6809, MPU4_MASTER_CLOCK/4 ) MDRV_CPU_PROGRAM_MAP(mpu4_6809_map,0) MDRV_TIMER_ADD_PERIODIC("50HZ",gen_50hz, HZ(100)) @@ -1683,7 +1683,7 @@ static MACHINE_DRIVER_START( mpu4_vid ) MDRV_SCREEN_VISIBLE_AREA(0*8, 63*8-1, 0*8, 37*8-1) MDRV_SCREEN_REFRESH_RATE(50) - MDRV_CPU_ADD_TAG("video", M68000, VIDEO_MASTER_CLOCK ) + MDRV_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK ) MDRV_CPU_PROGRAM_MAP(mpu4_68k_map,0) MDRV_CPU_VBLANK_INT("main", mpu4_vid_irq) @@ -1717,7 +1717,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dealem ) MDRV_MACHINE_START(mpu4mod2) /* main mpu4 board initialisation */ MDRV_MACHINE_RESET(mpu4_vid) - MDRV_CPU_ADD_TAG("main", M6809, MPU4_MASTER_CLOCK/4) + MDRV_CPU_ADD("main", M6809, MPU4_MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(dealem_memmap,0) MDRV_TIMER_ADD_PERIODIC("50HZ",gen_50hz, HZ(100)) diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index 2d93cde6278..f1c1d73ce09 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -351,7 +351,7 @@ static MACHINE_RESET(mquake) static MACHINE_DRIVER_START( mquake ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK) + MDRV_CPU_ADD("main", M68000, AMIGA_68000_NTSC_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(mquake) diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index 4d18c4fc206..0638bff65cf 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -176,7 +176,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mrdo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 8fafd79a44b..df498b173b1 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -279,12 +279,12 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( mrflea ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI resets the game */ - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD("sub", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem_io,writemem_io) MDRV_CPU_IO_MAP(readport_io,writeport_io) MDRV_CPU_VBLANK_INT_HACK(mrflea_io_interrupt,2) diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c index 91afe07b39d..89b9cbd1ca5 100644 --- a/src/mame/drivers/mrjong.c +++ b/src/mame/drivers/mrjong.c @@ -179,7 +179,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mrjong ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,15468000/6) /* 2.578 MHz?? */ + MDRV_CPU_ADD("main", Z80,15468000/6) /* 2.578 MHz?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 3b9a6d6e998..28c89bf94d2 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -1399,12 +1399,11 @@ static MACHINE_RESET( ms32 ) static MACHINE_DRIVER_START( ms32 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V70, 20000000) // 20MHz + MDRV_CPU_ADD("main", V70, 20000000) // 20MHz MDRV_CPU_PROGRAM_MAP(ms32_readmem,ms32_writemem) MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(ms32_snd_readmem, ms32_snd_writemem) MDRV_INTERLEAVE(1000) diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 74f8ac24836..b86214a7e79 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -518,17 +518,16 @@ static const struct MSM5232interface msm5232_interface = static MACHINE_DRIVER_START( msisaac ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* source of IRQs is unknown */ #ifdef USE_MCU - MDRV_CPU_ADD(M68705,8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) #endif diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index db299b42715..1770ae6fab1 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -427,12 +427,11 @@ static const struct YM2151interface ym2151_interface = }; static MACHINE_DRIVER_START( mugsmash ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(mugsmash_readmem,mugsmash_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* Guess */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* Guess */ MDRV_CPU_PROGRAM_MAP(snd_readmem,snd_writemem) MDRV_GFXDECODE(mugsmash) diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 35d0e486f76..cef05d6f322 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -568,7 +568,7 @@ static MACHINE_RESET( multigm3 ) static MACHINE_DRIVER_START( multigam ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", N2A03, N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("main", N2A03, N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(multigam_map, 0) MDRV_MACHINE_RESET( multigam ) diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 0788c970057..c3692fb7c10 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -281,12 +281,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( munchmo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3750000) /* ? */ + MDRV_CPU_ADD("main", Z80, 3750000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(mnchmobl_interrupt,2) - MDRV_CPU_ADD(Z80, 3750000) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3750000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT("main", nmi_line_assert) diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index f17ed34f1bc..dbbfcf2cc31 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -194,7 +194,7 @@ static VIDEO_UPDATE(murogem) static MACHINE_DRIVER_START( murogem ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6802,8000000) /* ? MHz */ + MDRV_CPU_ADD("main", M6802,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(murogem_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c index 94518344ba1..64733ea8d76 100644 --- a/src/mame/drivers/mustache.c +++ b/src/mame/drivers/mustache.c @@ -204,11 +204,11 @@ static INTERRUPT_GEN( assert_irq ) static MACHINE_DRIVER_START( mustache ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(memmap, 0) MDRV_CPU_VBLANK_INT("main", assert_irq) - MDRV_CPU_ADD_TAG(CPUTAG_T5182,Z80, T5182_CLOCK) + MDRV_CPU_ADD(CPUTAG_T5182,Z80, T5182_CLOCK) MDRV_CPU_PROGRAM_MAP(t5182_map, 0) MDRV_CPU_IO_MAP(t5182_io, 0) diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c index 74e07e45ce8..f0164fd0046 100644 --- a/src/mame/drivers/mw8080bw.c +++ b/src/mame/drivers/mw8080bw.c @@ -222,7 +222,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( mw8080bw_root ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",8080,MW8080BW_CPU_CLOCK) + MDRV_CPU_ADD("main",8080,MW8080BW_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_START(mw8080bw) MDRV_MACHINE_RESET(mw8080bw) diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 5159b21a1ba..8bf58a864cd 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -450,7 +450,7 @@ static VIDEO_UPDATE( mwarr ) } static MACHINE_DRIVER_START( mwarr ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(mwarr_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index b48f8b26edd..80b647a8b51 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -211,7 +211,7 @@ static MACHINE_DRIVER_START( mystston ) MDRV_DRIVER_DATA(mystston_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) /* video hardware */ diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 5d8b4df63ef..12d49b52432 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -934,11 +934,11 @@ static MACHINE_RESET(gaiapols) static MACHINE_DRIVER_START( mystwarr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz (confirmed) */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz (confirmed) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(mystwarr_interrupt, 3) - MDRV_CPU_ADD_TAG("sound", Z80, 8000000) + MDRV_CPU_ADD("sound", Z80, 8000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 480) diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c index 644fe3b71a6..1b150d9510b 100644 --- a/src/mame/drivers/n8080.c +++ b/src/mame/drivers/n8080.c @@ -76,7 +76,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( spacefev ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 20160000 / 10) + MDRV_CPU_ADD("main", 8080, 20160000 / 10) MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) MDRV_CPU_VBLANK_INT_HACK(interrupt, 2) @@ -101,7 +101,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sheriff ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 20160000 / 10) + MDRV_CPU_ADD("main", 8080, 20160000 / 10) MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) MDRV_CPU_VBLANK_INT_HACK(interrupt, 2) @@ -126,7 +126,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( helifire ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 20160000 / 10) + MDRV_CPU_ADD("main", 8080, 20160000 / 10) MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) MDRV_CPU_VBLANK_INT_HACK(interrupt, 2) diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index 6de27c191e7..cd3feae9b23 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -351,7 +351,7 @@ static MACHINE_RESET( namcofl ) NAMCO_C7X_HARDWARE static MACHINE_DRIVER_START( namcofl ) - MDRV_CPU_ADD_TAG("main", I960, 20000000) // i80960KA-20 == 20 MHz part + MDRV_CPU_ADD("main", I960, 20000000) // i80960KA-20 == 20 MHz part MDRV_CPU_PROGRAM_MAP(namcofl_mem, 0) NAMCO_C7X_MCU_SHARED( 16384000 ) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 21bdd458f37..55d94fed60c 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -1281,11 +1281,11 @@ static const struct C140interface C140_interface_typeA = /* cropped at sides */ static MACHINE_DRIVER_START( namcona1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 50113000/4) + MDRV_CPU_ADD("main", M68000, 50113000/4) MDRV_CPU_PROGRAM_MAP(namcona1_main_map,0) MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5) - MDRV_CPU_ADD(M37710, 50113000/4) + MDRV_CPU_ADD("mcu", M37710, 50113000/4) MDRV_CPU_PROGRAM_MAP(namcona1_mcu_map, 0) MDRV_CPU_IO_MAP( namcona1_mcu_io_map, 0 ) MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 2) @@ -1375,7 +1375,7 @@ static struct NAMCONAinterface NAMCONA_interface = static MACHINE_DRIVER_START( namcona2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 50113000/4) + MDRV_CPU_ADD("main", M68000, 50113000/4) MDRV_CPU_PROGRAM_MAP(namcona2_readmem,namcona2_writemem) MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5) diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index b1ca65d2fa1..59f63037565 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -748,7 +748,7 @@ ADDRESS_MAP_END /* namconb2_readmem */ NAMCO_C7X_HARDWARE static MACHINE_DRIVER_START( namconb1 ) - MDRV_CPU_ADD_TAG("main", M68EC020,MASTER_CLOCK_HZ/2) + MDRV_CPU_ADD("main", M68EC020,MASTER_CLOCK_HZ/2) MDRV_CPU_PROGRAM_MAP(namconb1_am,0) MDRV_CPU_VBLANK_INT("main", namconb1_interrupt) @@ -772,7 +772,7 @@ static MACHINE_DRIVER_START( namconb1 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( namconb2 ) - MDRV_CPU_ADD_TAG("main", M68EC020,MASTER_CLOCK_HZ/2) + MDRV_CPU_ADD("main", M68EC020,MASTER_CLOCK_HZ/2) MDRV_CPU_PROGRAM_MAP(namconb2_am,0) MDRV_CPU_VBLANK_INT("main", namconb2_interrupt) diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index aaa53d220f0..3dd89796259 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -293,12 +293,12 @@ static DRIVER_INIT( namcond1 ) static MACHINE_DRIVER_START( namcond1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(namcond1_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_PERIODIC_INT(ygv608_timed_interrupt, 1000) - MDRV_CPU_ADD(H83002, 16384000 ) + MDRV_CPU_ADD("mcu", H83002, 16384000 ) MDRV_CPU_PROGRAM_MAP( nd1h8rwmap, 0 ) MDRV_CPU_IO_MAP( nd1h8iomap, 0 ) MDRV_CPU_VBLANK_INT("main", mcu_interrupt) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 244cb4a9b13..5a7a2243c24 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -973,19 +973,19 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( ns1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,49152000/32) + MDRV_CPU_ADD("main", M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(M6809,49152000/32) + MDRV_CPU_ADD("sub", M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(sub_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(M6809,49152000/32) + MDRV_CPU_ADD("audio", M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD_TAG("MCU",HD63701,49152000/8) + MDRV_CPU_ADD("MCU",HD63701,49152000/8) MDRV_CPU_PROGRAM_MAP(mcu_map, 0) MDRV_CPU_IO_MAP(mcu_port_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index 4c88a5a7eaa..52ce6744bfa 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -377,7 +377,7 @@ static MACHINE_RESET( namcos10 ) static MACHINE_DRIVER_START( namcos10 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_101_4912MHz ) + MDRV_CPU_ADD("main", PSXCPU, XTAL_101_4912MHz ) MDRV_CPU_PROGRAM_MAP( namcos10_map, 0 ) MDRV_CPU_VBLANK_INT("main", psx_vblank) diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index a8a67cf7379..64bee05f57b 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -876,7 +876,7 @@ NAMCO_C7X_HARDWARE static MACHINE_DRIVER_START( coh100 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz ) + MDRV_CPU_ADD("main", PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( namcos11_map, 0 ) MDRV_CPU_VBLANK_INT("main", namcos11_vblank) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index a32461f35f2..017c1c58333 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1472,11 +1472,11 @@ static DRIVER_INIT( ghlpanic ) static MACHINE_DRIVER_START( coh700 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", CXD8661R, XTAL_100MHz ) + MDRV_CPU_ADD("main", CXD8661R, XTAL_100MHz ) MDRV_CPU_PROGRAM_MAP( namcos12_map, 0 ) MDRV_CPU_VBLANK_INT("main", psx_vblank) - MDRV_CPU_ADD(H83002, 14745600 ) /* verified 14.7456 MHz */ + MDRV_CPU_ADD("sub", H83002, 14745600 ) /* verified 14.7456 MHz */ MDRV_CPU_PROGRAM_MAP( s12h8rwmap, 0 ) MDRV_CPU_IO_MAP( s12h8iomap, 0 ) MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 6180cc2458c..e9ecacbcc31 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -1576,20 +1576,20 @@ via software as INT1 /*************************************************************/ static MACHINE_DRIVER_START( default ) - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_default_am,common_default_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000, 12288000) + MDRV_CPU_ADD("slave", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_default_am,common_default_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) // Sound handling + MDRV_CPU_ADD("audio", M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) - MDRV_CPU_ADD(HD63705,2048000) // I/O handling + MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1650,20 +1650,20 @@ static MACHINE_DRIVER_START( default3 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( gollygho ) - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_default_am,common_default_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000, 12288000) + MDRV_CPU_ADD("slave", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_default_am,common_default_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) // Sound handling + MDRV_CPU_ADD("audio", M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) - MDRV_CPU_ADD(HD63705,2048000) // I/O handling + MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1700,20 +1700,20 @@ static MACHINE_DRIVER_START( gollygho ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( finallap ) - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_finallap_am,common_finallap_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000, 12288000) + MDRV_CPU_ADD("slave", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_finallap_am,common_finallap_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) // Sound handling + MDRV_CPU_ADD("audio", M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) - MDRV_CPU_ADD(HD63705,2048000) // I/O handling + MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1750,20 +1750,20 @@ static MACHINE_DRIVER_START( finallap ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( sgunner ) - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_sgunner_am,common_sgunner_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000, 12288000) + MDRV_CPU_ADD("slave", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_sgunner_am,common_sgunner_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) // Sound handling + MDRV_CPU_ADD("audio", M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) - MDRV_CPU_ADD(HD63705,2048000) // I/O handling + MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1800,20 +1800,20 @@ static MACHINE_DRIVER_START( sgunner ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( luckywld ) - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_luckywld_am,common_luckywld_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000, 12288000) + MDRV_CPU_ADD("slave", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_luckywld_am,common_luckywld_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) /* Sound handling */ + MDRV_CPU_ADD("audio", M6809,3072000) /* Sound handling */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) - MDRV_CPU_ADD(HD63705,2048000) /* I/O handling */ + MDRV_CPU_ADD("mcu", HD63705,2048000) /* I/O handling */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1850,20 +1850,20 @@ static MACHINE_DRIVER_START( luckywld ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( metlhawk ) - MDRV_CPU_ADD_TAG("main", M68000, 12288000) + MDRV_CPU_ADD("main", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_metlhawk_am,common_metlhawk_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000, 12288000) + MDRV_CPU_ADD("slave", M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_metlhawk_am,common_metlhawk_am) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) /* Sound handling */ + MDRV_CPU_ADD("audio", M6809,3072000) /* Sound handling */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) - MDRV_CPU_ADD(HD63705,2048000) /* I/O handling */ + MDRV_CPU_ADD("mcu", HD63705,2048000) /* I/O handling */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 7f633b8c1be..bbb26b00388 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1535,29 +1535,29 @@ static const struct C140interface C140_interface_typeB = }; static MACHINE_DRIVER_START( s21base ) - MDRV_CPU_ADD_TAG("main", M68000,12288000) /* Master */ + MDRV_CPU_ADD("main", M68000,12288000) /* Master */ MDRV_CPU_PROGRAM_MAP(namcos21_68k_master, namcos21_68k_common) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000,12288000) /* Slave */ + MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */ MDRV_CPU_PROGRAM_MAP(namcos21_68k_slave, namcos21_68k_common) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) /* Sound */ + MDRV_CPU_ADD("audio", M6809,3072000) /* Sound */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) - MDRV_CPU_ADD(HD63705,2048000) /* IO */ + MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(TMS32025,24000000) /* 24 MHz? overclocked */ + MDRV_CPU_ADD("dspmaster", TMS32025,24000000) /* 24 MHz? overclocked */ MDRV_CPU_PROGRAM_MAP(master_dsp_program,0) MDRV_CPU_DATA_MAP(master_dsp_data,0) MDRV_CPU_IO_MAP(master_dsp_io,0) - MDRV_CPU_ADD(TMS32025,24000000*4) /* 24 MHz?; overclocked */ + MDRV_CPU_ADD("dspslave", TMS32025,24000000*4) /* 24 MHz?; overclocked */ MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0) MDRV_CPU_DATA_MAP(slave_dsp_data,0) MDRV_CPU_IO_MAP(slave_dsp_io,0) @@ -1614,24 +1614,24 @@ static MACHINE_DRIVER_START( poly_c140_typeB ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( driveyes ) - MDRV_CPU_ADD_TAG("main", M68000,12288000) /* Master */ + MDRV_CPU_ADD("main", M68000,12288000) /* Master */ MDRV_CPU_PROGRAM_MAP(driveyes_68k_master, driveyes_68k_common) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000,12288000) /* Slave */ + MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */ MDRV_CPU_PROGRAM_MAP(driveyes_68k_slave, driveyes_68k_common) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) /* Sound */ + MDRV_CPU_ADD("audio", M6809,3072000) /* Sound */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) - MDRV_CPU_ADD(HD63705,2048000) /* IO */ + MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(TMS32025,24000000*2) /* 24 MHz? overclocked */ + MDRV_CPU_ADD("dsp", TMS32025,24000000*2) /* 24 MHz? overclocked */ MDRV_CPU_PROGRAM_MAP(winrun_dsp_program,0) MDRV_CPU_DATA_MAP(winrun_dsp_data,0) MDRV_CPU_IO_MAP(winrun_dsp_io,0) @@ -1669,29 +1669,29 @@ static MACHINE_DRIVER_START( driveyes ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( winrun_c140_typeB ) - MDRV_CPU_ADD_TAG("main", M68000,12288000) /* Master */ + MDRV_CPU_ADD("main", M68000,12288000) /* Master */ MDRV_CPU_PROGRAM_MAP(am_master_winrun,0) MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) - MDRV_CPU_ADD(M68000,12288000) /* Slave */ + MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */ MDRV_CPU_PROGRAM_MAP(am_slave_winrun,0) MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) - MDRV_CPU_ADD(M6809,3072000) /* Sound */ + MDRV_CPU_ADD("audio", M6809,3072000) /* Sound */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) - MDRV_CPU_ADD(HD63705,2048000) /* IO */ + MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(TMS32025,24000000) /* 24 MHz? overclocked */ + MDRV_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz? overclocked */ MDRV_CPU_PROGRAM_MAP(winrun_dsp_program,0) MDRV_CPU_DATA_MAP(winrun_dsp_data,0) MDRV_CPU_IO_MAP(winrun_dsp_io,0) - MDRV_CPU_ADD(M68000,12288000) /* graphics coprocessor */ + MDRV_CPU_ADD("gpu", M68000,12288000) /* graphics coprocessor */ MDRV_CPU_PROGRAM_MAP(am_gpu_winrun,0) MDRV_CPU_VBLANK_INT("main", namcos2_68k_gpu_vblank) diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index c709c05b6a8..cf02636f034 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2660,22 +2660,22 @@ static const struct C352interface c352_interface = }; static MACHINE_DRIVER_START( namcos22s ) - MDRV_CPU_ADD_TAG("main", M68EC020,SS22_MASTER_CLOCK/2) + MDRV_CPU_ADD("main", M68EC020,SS22_MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(namcos22s_am,0) MDRV_CPU_VBLANK_INT_HACK(namcos22s_interrupt,2) - MDRV_CPU_ADD_TAG("master", TMS32025,SS22_MASTER_CLOCK) + MDRV_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(master_dsp_program,0) MDRV_CPU_DATA_MAP(master_dsp_data,0) MDRV_CPU_IO_MAP(master_dsp_io,0) MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD) - MDRV_CPU_ADD_TAG("slave", TMS32025,SS22_MASTER_CLOCK) + MDRV_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0) MDRV_CPU_DATA_MAP(slave_dsp_data,0) MDRV_CPU_IO_MAP(slave_dsp_io,0) - MDRV_CPU_ADD_TAG("mcu", M37710, SS22_MASTER_CLOCK/3) + MDRV_CPU_ADD("mcu", M37710, SS22_MASTER_CLOCK/3) MDRV_CPU_PROGRAM_MAP(mcu_program, 0) MDRV_CPU_IO_MAP( mcu_io, 0 ) MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3) @@ -3075,22 +3075,22 @@ static MACHINE_RESET(namcos22) } static MACHINE_DRIVER_START( namcos22 ) - MDRV_CPU_ADD_TAG("main", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */ + MDRV_CPU_ADD("main", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */ MDRV_CPU_PROGRAM_MAP(namcos22_am,0) MDRV_CPU_VBLANK_INT_HACK(namcos22_interrupt,2) - MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK) /* ? */ + MDRV_CPU_ADD("dspmaster", TMS32025,SS22_MASTER_CLOCK) /* ? */ MDRV_CPU_PROGRAM_MAP(master_dsp_program,0) MDRV_CPU_DATA_MAP(master_dsp_data,0) MDRV_CPU_IO_MAP(master_dsp_io,0) MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD) - MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK) /* ? */ + MDRV_CPU_ADD("dspslave", TMS32025,SS22_MASTER_CLOCK) /* ? */ MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0) MDRV_CPU_DATA_MAP(slave_dsp_data,0) MDRV_CPU_IO_MAP(slave_dsp_io,0) - MDRV_CPU_ADD(M37702, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0 + MDRV_CPU_ADD("mcu", M37702, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0 MDRV_CPU_PROGRAM_MAP( mcu_s22_program, 0 ) MDRV_CPU_IO_MAP( mcu_s22_io, 0 ) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 5354c9cd957..cefaf64ec73 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1027,11 +1027,11 @@ static const struct C352interface c352_interface = static MACHINE_DRIVER_START( s23 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R4650BE, 166000000) + MDRV_CPU_ADD("main", R4650BE, 166000000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(ss23_map, 0) - MDRV_CPU_ADD(H83002, 14745600 ) + MDRV_CPU_ADD("audio", H83002, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 ) MDRV_CPU_IO_MAP( s23h8iomap, 0 ) MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) @@ -1065,12 +1065,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ss23 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R4650BE, 166000000) + MDRV_CPU_ADD("main", R4650BE, 166000000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(ss23_map, 0) MDRV_CPU_VBLANK_INT("main", namcos23_interrupt) - MDRV_CPU_ADD(H83002, 14745600 ) + MDRV_CPU_ADD("audio", H83002, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 ) MDRV_CPU_IO_MAP( s23h8iomap, 0 ) MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index 8fb8439edfa..6f860cdb54c 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -1063,15 +1063,15 @@ static const struct namco_63701x_interface namco_63701x_interface = static MACHINE_DRIVER_START( hopmappy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu1", M6809, 49152000/32) + MDRV_CPU_ADD("cpu1", M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(cpu1_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD_TAG("cpu2", M6809, 49152000/32) + MDRV_CPU_ADD("cpu2", M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(hopmappy_cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD_TAG("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ + MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(hopmappy_mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 5cb097a51fb..dd6c199b857 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -769,13 +769,13 @@ static MACHINE_RESET( naomi ) static MACHINE_DRIVER_START( naomi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH4, CPU_CLOCK) // SH4!!! + MDRV_CPU_ADD("main", SH4, CPU_CLOCK) // SH4!!! MDRV_CPU_CONFIG(sh4cpu_config) MDRV_CPU_PROGRAM_MAP(naomi_map,0) MDRV_CPU_IO_MAP(naomi_port,0) MDRV_CPU_VBLANK_INT("main", naomi_vblank) - MDRV_CPU_ADD_TAG("sound", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8. + MDRV_CPU_ADD("sound", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8. MDRV_CPU_PROGRAM_MAP(dc_audio_map, 0) MDRV_MACHINE_START( dc ) diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c index dbd777fb969..ed76e734935 100644 --- a/src/mame/drivers/naughtyb.c +++ b/src/mame/drivers/naughtyb.c @@ -379,7 +379,7 @@ static const struct TMS36XXinterface tms3615_interface = static MACHINE_DRIVER_START( naughtyb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ + MDRV_CPU_ADD("main", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", naughtyb_interrupt) @@ -416,7 +416,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( popflame ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ + MDRV_CPU_ADD("main", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ MDRV_CPU_PROGRAM_MAP(readmem,popflame_writemem) MDRV_CPU_VBLANK_INT("main", naughtyb_interrupt) diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index f5ee5436370..b1b9b547fed 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -2811,7 +2811,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( NBMJDRV_4096 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.00 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5.00 MHz */ MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_MACHINE_RESET(nb1413m3) @@ -2926,7 +2926,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mbmj_p16bit_LCD ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.00 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5.00 MHz */ MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_p16bit_LCD) diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 4bcb92d524a..c7cf48d3066 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -2725,7 +2725,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( gionbana ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 20000000/4) /* 5.00 MHz ? */ + MDRV_CPU_ADD("main", Z80, 20000000/4) /* 5.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_gionbana, writemem_gionbana) MDRV_CPU_IO_MAP(readport_gionbana, writeport_gionbana) // MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 132) // nmiclock = 60 diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index ea6620360d1..1501966ab94 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -1591,7 +1591,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( nbmjdrv1 ) // galkoku /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 25000000/5) /* 5.00 MHz ? */ + MDRV_CPU_ADD("main", Z80, 25000000/5) /* 5.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_galkoku, writemem_galkoku) MDRV_CPU_IO_MAP(readport_galkoku, writeport_galkoku) // MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) @@ -1625,13 +1625,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nbmjdrv2 ) // pstadium /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000/2) /* 3.00 MHz */ + MDRV_CPU_ADD("main", Z80, 6000000/2) /* 3.00 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_pstadium, writemem_pstadium) MDRV_CPU_IO_MAP(readport_pstadium, writeport_pstadium) MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) - MDRV_CPU_ADD(Z80, 3900000) /* 4.00 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3900000) /* 4.00 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem_nbmj8991, sound_writemem_nbmj8991) MDRV_CPU_IO_MAP(sound_readport_nbmj8991, sound_writeport_nbmj8991) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 128) diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index ecf67d50532..f04192fddda 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -3655,14 +3655,13 @@ static const struct z80_irq_daisy_chain daisy_chain_sound[] = static MACHINE_DRIVER_START( NBMJDRV1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 12000000/2) /* TMPZ84C011, 6.00 MHz */ + MDRV_CPU_ADD("main", Z80, 12000000/2) /* TMPZ84C011, 6.00 MHz */ MDRV_CPU_CONFIG(daisy_chain_main) MDRV_CPU_PROGRAM_MAP(readmem_sailorws, writemem_sailorws) MDRV_CPU_IO_MAP(readport_sailorws, writeport_sailorws) MDRV_CPU_VBLANK_INT("main", ctc0_trg1) /* vblank is connect to ctc triggfer */ - MDRV_CPU_ADD(Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */ MDRV_CPU_CONFIG(daisy_chain_sound) MDRV_CPU_PROGRAM_MAP(sound_readmem, sound_writemem) MDRV_CPU_IO_MAP(sound_readport, sound_writeport) diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index e99af1db617..5ef33b86fc7 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -2149,13 +2149,12 @@ static const struct K007232_interface k007232_interface = static MACHINE_DRIVER_START( nemesis ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216 MHz? */ // 14318180/2, /* From schematics, should be accurate */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nemesis_interrupt) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* From schematics, should be accurate */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* From schematics, should be accurate */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* fixed */ MDRV_MACHINE_RESET(nemesis) @@ -2198,12 +2197,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( konamigt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(konamigt_readmem,konamigt_writemem) MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(nemesis) @@ -2242,12 +2240,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( salamand ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216MHz */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216MHz */ MDRV_CPU_PROGRAM_MAP(salamand_readmem,salamand_writemem) MDRV_CPU_VBLANK_INT("main", salamand_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sal_sound_readmem,sal_sound_writemem) MDRV_MACHINE_RESET(nemesis) @@ -2293,12 +2290,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blkpnthr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(blkpnthr_readmem,blkpnthr_writemem) MDRV_CPU_VBLANK_INT("main", blkpnthr_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sal_sound_readmem,sal_sound_writemem) MDRV_MACHINE_RESET(nemesis) @@ -2339,12 +2335,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( citybomb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(citybomb_readmem,citybomb_writemem) MDRV_CPU_VBLANK_INT("main", salamand_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(city_sound_readmem,city_sound_writemem) MDRV_MACHINE_RESET(nemesis) @@ -2389,12 +2384,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nyanpani ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(nyanpani_readmem,nyanpani_writemem) MDRV_CPU_VBLANK_INT("main", salamand_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(city_sound_readmem,city_sound_writemem) MDRV_MACHINE_RESET(nemesis) @@ -2439,11 +2433,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gx400 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216MHz */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216MHz */ MDRV_CPU_PROGRAM_MAP(gx400_readmem,gx400_writemem) MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3) - MDRV_CPU_ADD(Z80,14318180/4) /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(gx400_sound_readmem,gx400_sound_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* interrupts are triggered by the main CPU */ @@ -2487,12 +2481,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rf2_gx400 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216MHz */ + MDRV_CPU_ADD("main", M68000,18432000/2) /* 9.216MHz */ MDRV_CPU_PROGRAM_MAP(rf2_gx400_readmem,rf2_gx400_writemem) MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(gx400_sound_readmem,gx400_sound_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* interrupts are triggered by the main CPU */ @@ -2535,12 +2528,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hcrash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,18432000/3) /* 6.144MHz */ + MDRV_CPU_ADD("main", M68000,18432000/3) /* 6.144MHz */ MDRV_CPU_PROGRAM_MAP(hcrash_map,0) MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sal_sound_readmem,sal_sound_writemem) MDRV_MACHINE_RESET(nemesis) diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index e177fd873a9..80666b0ff8a 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -1234,10 +1234,10 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( neogeo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, NEOGEO_MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M68000, NEOGEO_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD_TAG("audio", Z80, NEOGEO_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", Z80, NEOGEO_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_CPU_IO_MAP(auido_io_map,0) diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index 3aab66001f8..bc13c555f02 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -121,7 +121,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( news ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 4d0592c0493..d8e55945e4a 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -931,11 +931,11 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( ninjakd2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK_12/2) /* verified */ + MDRV_CPU_ADD("main", Z80, MAIN_CLOCK_12/2) /* verified */ MDRV_CPU_PROGRAM_MAP(ninjakd2_main_cpu,0) MDRV_CPU_VBLANK_INT("main", ninjakd2_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, MAIN_CLOCK_5) /* verified */ + MDRV_CPU_ADD("sound", Z80, MAIN_CLOCK_5) /* verified */ MDRV_CPU_PROGRAM_MAP(ninjakd2_sound_cpu,0) MDRV_CPU_IO_MAP(ninjakd2_sound_io,0) diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 9fcd841525c..22d7cd835d2 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -622,15 +622,14 @@ Darius2: arbitrary interleaving of 10 to keep cpus synced. static MACHINE_DRIVER_START( ninjaw ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8 MHz ? */ + MDRV_CPU_ADD("main", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(ninjaw_readmem,ninjaw_writemem) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 16/4 MHz ? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 16/4 MHz ? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ + MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(ninjaw_cpub_readmem,ninjaw_cpub_writemem) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) @@ -696,15 +695,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( darius2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8 MHz ? */ + MDRV_CPU_ADD("main", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius2_readmem,darius2_writemem) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ + MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius2_cpub_readmem,darius2_cpub_writemem) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c index 9442012da30..47d13b17817 100644 --- a/src/mame/drivers/nitedrvr.c +++ b/src/mame/drivers/nitedrvr.c @@ -146,7 +146,7 @@ static MACHINE_RESET( nitedrvr ) static MACHINE_DRIVER_START( nitedrvr ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6502, 12096000/12) // 1 MHz + MDRV_CPU_ADD("main", M6502, 12096000/12) // 1 MHz MDRV_CPU_PROGRAM_MAP(nitedrvr_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_WATCHDOG_VBLANK_INIT(3) diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 18b55b9fe37..3b3752b34cd 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -821,13 +821,12 @@ static const struct z80_irq_daisy_chain daisy_chain_sound[] = static MACHINE_DRIVER_START( niyanpai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12288000/2) /* TMP68301, 6.144 MHz */ + MDRV_CPU_ADD("main", M68000, 12288000/2) /* TMP68301, 6.144 MHz */ MDRV_CPU_PROGRAM_MAP(niyanpai_readmem,niyanpai_writemem) MDRV_CPU_VBLANK_INT("main", niyanpai_interrupt) - MDRV_CPU_ADD(Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */ + MDRV_CPU_ADD("audio", Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */ MDRV_CPU_CONFIG(daisy_chain_sound) - /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem, sound_writemem) MDRV_CPU_IO_MAP(sound_readport, sound_writeport) diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 283d978ee03..e75cdcfc05f 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -982,11 +982,11 @@ static MACHINE_RESET( nmg5 ) static MACHINE_DRIVER_START( nmg5 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(nmg5_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("sound", Z80, 4000000) /* 4 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(nmg5_sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 42ac188ce81..1bdb183f7df 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -3516,13 +3516,12 @@ static INTERRUPT_GEN( nmk_interrupt ) static MACHINE_DRIVER_START( tharrier ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(tharrier_readmem,tharrier_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) MDRV_CPU_PROGRAM_MAP(tharrier_sound_readmem,tharrier_sound_writemem) MDRV_CPU_IO_MAP(tharrier_sound_readport,tharrier_sound_writeport) @@ -3566,13 +3565,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( manybloc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10? MHz - check */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10? MHz - check */ MDRV_CPU_PROGRAM_MAP(manybloc_readmem,manybloc_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,56)/* this needs to equal the framerate on this, rather than being double it .. */ - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3000000) MDRV_CPU_PROGRAM_MAP(tharrier_sound_readmem,tharrier_sound_writemem) MDRV_CPU_IO_MAP(tharrier_sound_readport,tharrier_sound_writeport) @@ -3613,7 +3611,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mustang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(mustang_map,0) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -3658,7 +3656,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mustangb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(mustangb_map,0) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -3740,7 +3738,7 @@ Notes: static MACHINE_DRIVER_START( bioship ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */ + MDRV_CPU_ADD("main", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */ MDRV_CPU_PROGRAM_MAP(bioship_readmem,bioship_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -3784,7 +3782,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vandyke ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -3828,12 +3826,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vandykeb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ - MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ + MDRV_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */ MDRV_CPU_FLAGS(CPU_DISABLE) //MDRV_MACHINE_RESET(NMK004) // no NMK004 @@ -3864,7 +3862,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( acrobatm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz (verified on pcb) */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(acrobatm_readmem,acrobatm_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -3910,7 +3908,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tdragonb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(tdragon_readmem,tdragonb_writemem) //MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) @@ -3942,7 +3940,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tdragon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_8MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_8MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tdragon_readmem,tdragon_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) //MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3987,12 +3985,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ssmissin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 Mhz */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 Mhz */ MDRV_CPU_PROGRAM_MAP(ssmissin_readmem,ssmissin_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) /* input related */ - MDRV_CPU_ADD(Z80, 8000000/2) /* 4 Mhz */ + MDRV_CPU_ADD("audio", Z80, 8000000/2) /* 4 Mhz */ MDRV_CPU_PROGRAM_MAP(ssmissin_sound_readmem,ssmissin_sound_writemem) MDRV_MACHINE_RESET(nmk16) @@ -4024,7 +4022,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( strahl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ? */ MDRV_CPU_PROGRAM_MAP(strahl_readmem,strahl_writemem) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -4069,7 +4067,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hachamf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(hachamf_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -4114,7 +4112,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( macross ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(macross_readmem,macross_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ @@ -4159,7 +4157,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gunnail ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz? */ MDRV_CPU_PROGRAM_MAP(gunnail_map, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) @@ -4204,13 +4202,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( macross2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(macross2_readmem,macross2_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz ? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(macross2_sound_readmem,macross2_sound_writemem) MDRV_CPU_IO_MAP(macross2_sound_readport,macross2_sound_writeport) @@ -4250,13 +4247,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tdragon2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(macross2_readmem,macross2_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(macross2_sound_readmem,macross2_sound_writemem) MDRV_CPU_IO_MAP(macross2_sound_readport,macross2_sound_writeport) @@ -4296,12 +4292,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( raphero ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* 14 MHz measured */ + MDRV_CPU_ADD("main", M68000, 14000000) /* 14 MHz measured */ MDRV_CPU_PROGRAM_MAP(macross2_readmem,raphero_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ - MDRV_CPU_ADD_TAG("sound",TMP90841, 8000000) + MDRV_CPU_ADD("sound",TMP90841, 8000000) MDRV_CPU_PROGRAM_MAP(raphero_sound_mem_map,0) MDRV_MACHINE_RESET(nmk16) @@ -4340,7 +4336,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bjtwin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, 10000000) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bjtwin_readmem,bjtwin_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */ @@ -4853,11 +4849,11 @@ static const struct YM2151interface afega_ym2151_intf = static MACHINE_DRIVER_START( stagger1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */ + MDRV_CPU_ADD("main", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(afega,0) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) - MDRV_CPU_ADD(Z80, XTAL_4MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_4MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(afega_sound_cpu,0) /* video hardware */ @@ -4920,12 +4916,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( firehawk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) + MDRV_CPU_ADD("main", M68000,12000000) MDRV_CPU_PROGRAM_MAP(afega,0) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) - MDRV_CPU_ADD(Z80,4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,4000000) MDRV_CPU_PROGRAM_MAP(firehawk_sound_cpu,0) /* video hardware */ @@ -4960,12 +4955,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( twinactn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) + MDRV_CPU_ADD("main", M68000,12000000) MDRV_CPU_PROGRAM_MAP(twinactn_map,0) MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(twinactn_sound_cpu,0) /* video hardware */ diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index 2944362cc33..e943bc64324 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -702,7 +702,7 @@ static const struct AY8910interface pkunwar_ay8910_interface_2 = static MACHINE_DRIVER_START( nova2001 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics + MDRV_CPU_ADD("main", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics MDRV_CPU_PROGRAM_MAP(nova2001_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -735,11 +735,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ninjakun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz + MDRV_CPU_ADD("main", Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(ninjakun_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz + MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(ninjakun_cpu2_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */ @@ -776,7 +776,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pkunwar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz + MDRV_CPU_ADD("main", Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(pkunwar_map,0) MDRV_CPU_IO_MAP(pkunwar_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -810,12 +810,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( raiders5 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz + MDRV_CPU_ADD("main", Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(raiders5_cpu1_map,0) MDRV_CPU_IO_MAP(raiders5_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz + MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(raiders5_cpu2_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */ diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 4acab99bc94..8f4267ce3ef 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -412,10 +412,10 @@ static const struct CustomSound_interface snes_sound_interface = static MACHINE_DRIVER_START( snes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", G65816, 3580000) /* 2.68Mhz, also 3.58Mhz */ + MDRV_CPU_ADD("main", G65816, 3580000) /* 2.68Mhz, also 3.58Mhz */ MDRV_CPU_PROGRAM_MAP(snes_map, 0) - MDRV_CPU_ADD_TAG("sound", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ + MDRV_CPU_ADD("sound", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(spc_mem, 0) diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 4c3cfdd782a..8a800149493 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -1089,13 +1089,13 @@ static MACHINE_RESET( nwktr ) static MACHINE_DRIVER_START( nwktr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MDRV_CPU_ADD("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_PROGRAM_MAP(nwktr_map, 0) - MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */ + MDRV_CPU_ADD("audio", M68000, 64000000/4) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(sharc_map, 0) diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index e393ba29803..22f4f42e632 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -769,20 +769,19 @@ GFXDECODE_END static MACHINE_DRIVER_START( nycaptor ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* ??? */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) + MDRV_CPU_ADD("sub", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(readmem_sub,writemem_sub) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ generated by ??? */ - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ - MDRV_CPU_ADD(M68705,2000000) + MDRV_CPU_ADD("mcu", M68705,2000000) MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -831,22 +830,21 @@ static MACHINE_DRIVER_START( nycaptor ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( cyclshtg ) - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) + MDRV_CPU_ADD("main", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(cyclshtg_readmem,cyclshtg_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) + MDRV_CPU_ADD("sub", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(cyclshtg_readmem_sub,cyclshtg_writemem_sub) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) #ifdef USE_MCU - MDRV_CPU_ADD(M68705,2000000) + MDRV_CPU_ADD("mcu", M68705,2000000) MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) #endif @@ -893,19 +891,18 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bronx ) - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) + MDRV_CPU_ADD("main", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(bronx_readmem, bronx_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) + MDRV_CPU_ADD("sub", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(bronx_readmem_sub, bronx_writemem_sub) MDRV_CPU_IO_MAP(bronx_io, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index d3d21ec9db8..8be9d2f4a5f 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -665,14 +665,14 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( nyny ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */ + MDRV_CPU_ADD("main", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */ MDRV_CPU_PROGRAM_MAP(nyny_main_map,0) MDRV_CPU_PERIODIC_INT(update_pia_1, 25) - MDRV_CPU_ADD(M6802, AUDIO_CPU_1_CLOCK) + MDRV_CPU_ADD("audio", M6802, AUDIO_CPU_1_CLOCK) MDRV_CPU_PROGRAM_MAP(nyny_audio_1_map,0) - MDRV_CPU_ADD(M6802, AUDIO_CPU_2_CLOCK) + MDRV_CPU_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK) MDRV_CPU_PROGRAM_MAP(nyny_audio_2_map,0) MDRV_MACHINE_START(nyny) diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index 9fe8a172e5b..67377c7801f 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -405,7 +405,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( offtwall ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(offtwall) diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index 78fc4e1f2a6..5f276bf6d29 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -330,7 +330,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( ohmygod ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index d847287f8a0..d201a75ee12 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -875,7 +875,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( ojankohs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 MHz ? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_ojankohs,writemem_ojankohs) MDRV_CPU_IO_MAP(readport_ojankohs,writeport_ojankohs) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -912,7 +912,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ojankoy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 MHz ? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_ojankoy,writemem_ojankoy) MDRV_CPU_IO_MAP(readport_ojankohs,writeport_ojankoy) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -950,7 +950,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ccasino ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 MHz ? */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_ojankoy,writemem_ojankoy) MDRV_CPU_IO_MAP(readport_ccasino,writeport_ccasino) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -987,7 +987,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ojankoc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.00 MHz */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* 4.00 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_ojankoc,writemem_ojankoc) MDRV_CPU_IO_MAP(readport_ojankoc,writeport_ojankoc) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index c0e4f598074..91e96f1f659 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -366,12 +366,11 @@ static INTERRUPT_GEN( olibochu_interrupt ) static MACHINE_DRIVER_START( olibochu ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ?? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(olibochu_interrupt,2) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz ?? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ?? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index ae0fcbf59be..20e5218b41e 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -479,7 +479,7 @@ static MACHINE_DRIVER_START( omegrace ) /* main CPU */ /* XTAL101 Crystal @ 12mhz */ /* through 74LS161, Pin 13 = divide by 4 */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/4) + MDRV_CPU_ADD("main", Z80,12000000/4) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_IO_MAP(port_map, 0) MDRV_CPU_PERIODIC_INT(irq0_line_hold,250) @@ -488,7 +488,7 @@ static MACHINE_DRIVER_START( omegrace ) /* XTAL101 Crystal @ 12mhz */ /* through 74LS161, Pin 12 = divide by 8 */ /* Fed to CPU as 1.5mhz though line J4-D */ - MDRV_CPU_ADD(Z80,12000000/8) + MDRV_CPU_ADD("audio", Z80,12000000/8) MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_IO_MAP(sound_port, 0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse,250) diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index ec48143c9eb..9fd7be9d605 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -369,11 +369,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( oneshot ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(oneshot_readmem,oneshot_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("audio", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(snd_readmem, snd_writemem) MDRV_GFXDECODE(oneshot) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 2fce4784d40..cc936caf427 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -275,13 +275,12 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( onetwo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_cpu,0) MDRV_CPU_IO_MAP(sound_cpu_io,0) diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index d4b077712cd..d96128722a4 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -558,11 +558,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( opwolf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000 ) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000 ) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(opwolf_readmem,opwolf_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 4000000 ) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000 ) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -607,14 +607,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( opwolfb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(opwolfb_readmem,opwolfb_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sub_z80_readmem,sub_z80_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 5fbf8d4c00b..1f8ecca2e7e 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -291,7 +291,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( orbit ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, MASTER_CLOCK / 16) + MDRV_CPU_ADD("main", M6800, MASTER_CLOCK / 16) MDRV_CPU_PROGRAM_MAP(orbit_map, 0) MDRV_CPU_VBLANK_INT("main", orbit_interrupt) diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index a791020855b..677824045b2 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -240,7 +240,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( othldrby ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index e8dc7b0b2fa..a8989690d2c 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -705,13 +705,12 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( othunder ) /* basic machine hardware */ -// MDRV_CPU_ADD_TAG("main", M68000, 24000000/2 ) /* 12 MHz */ - MDRV_CPU_ADD_TAG("main", M68000, 13000000 ) /* fixes garbage graphics on startup */ +// MDRV_CPU_ADD("main", M68000, 24000000/2 ) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 13000000 ) /* fixes garbage graphics on startup */ MDRV_CPU_PROGRAM_MAP(othunder_map,0) MDRV_CPU_VBLANK_INT("main", vblank_interrupt) - MDRV_CPU_ADD(Z80,16000000/4 ) /* 4 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,16000000/4 ) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(z80_sound_map,0) MDRV_NVRAM_HANDLER(othunder) diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 14f230b79e0..d03b6d260cd 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -398,15 +398,15 @@ static const struct K053260_interface k053260_interface = static MACHINE_DRIVER_START( overdriv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(overdriv_readmem,overdriv_writemem) MDRV_CPU_VBLANK_INT_HACK(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */ - MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("sub", M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(overdriv_readmem2,overdriv_writemem2) MDRV_CPU_VBLANK_INT("main", cpuB_interrupt) /* IRQ 5 and 6 are generated by the main CPU. */ /* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */ - MDRV_CPU_ADD(M6809,3579545/2) /* 1.789 MHz?? This might be the right speed, but ROM testing */ + MDRV_CPU_ADD("audio", M6809,3579545/2) /* 1.789 MHz?? This might be the right speed, but ROM testing */ /* takes a little too much (the counter wraps from 0000 to 9999). */ /* This might just mean that the video refresh rate is less than */ /* 60 fps, that's how I fixed it for now. */ diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index 71a440da168..5f58fd92f37 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -414,11 +414,11 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( pacland ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 49152000/32) /* 1.536 MHz */ + MDRV_CPU_ADD("main", M6809, 49152000/32) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(HD63701, 49152000/8) /* 1.536 MHz? */ + MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* 1.536 MHz? */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 8489bd8f976..1c5d7c694dd 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -3066,7 +3066,7 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( pacman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/6) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(pacman_map,0) MDRV_CPU_IO_MAP(0,writeport) MDRV_CPU_VBLANK_INT_HACK(pacman_interrupt,2) @@ -3232,7 +3232,7 @@ static MACHINE_DRIVER_START( s2650games ) MDRV_IMPORT_FROM(pacman) MDRV_CPU_REMOVE("main") - MDRV_CPU_ADD_TAG("main", S2650, MASTER_CLOCK/6/2) /* 2H */ + MDRV_CPU_ADD("main", S2650, MASTER_CLOCK/6/2) /* 2H */ MDRV_CPU_PROGRAM_MAP(s2650games_map,0) MDRV_CPU_VBLANK_INT("main", s2650_interrupt) diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index 0e1c168147d..29d16f8e888 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -380,20 +380,18 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( pandoras ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,18432000/6) /* CPU A */ + MDRV_CPU_ADD("main", M6809,18432000/6) /* CPU A */ MDRV_CPU_PROGRAM_MAP(pandoras_readmem_a,pandoras_writemem_a) MDRV_CPU_VBLANK_INT("main", pandoras_interrupt_a) - MDRV_CPU_ADD(M6809,18432000/6) /* CPU B */ + MDRV_CPU_ADD("sub", M6809,18432000/6) /* CPU B */ MDRV_CPU_PROGRAM_MAP(pandoras_readmem_b,pandoras_writemem_b) MDRV_CPU_VBLANK_INT("main", pandoras_interrupt_b) - MDRV_CPU_ADD(Z80,14318000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,14318000/8) MDRV_CPU_PROGRAM_MAP(pandoras_readmem_snd,pandoras_writemem_snd) - MDRV_CPU_ADD(I8039,14318000/2) - /* audio CPU */ + MDRV_CPU_ADD("mcu", I8039,14318000/2) MDRV_CPU_PROGRAM_MAP(i8039_readmem,i8039_writemem) MDRV_CPU_IO_MAP(i8039_readport,i8039_writeport) diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c index 47a63d86750..63ac86f1075 100644 --- a/src/mame/drivers/pangofun.c +++ b/src/mame/drivers/pangofun.c @@ -111,7 +111,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( pangofun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I486, 14318180*2) /* I486 ?? Mhz */ + MDRV_CPU_ADD("main", I486, 14318180*2) /* I486 ?? Mhz */ MDRV_CPU_PROGRAM_MAP(pangofun_map, 0) /* video hardware */ diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 75bde0c7029..3051c7e7509 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -356,11 +356,11 @@ static GFXDECODE_START( panicr ) GFXDECODE_END static MACHINE_DRIVER_START( panicr ) - MDRV_CPU_ADD_TAG("main", V20,16000000/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */ + MDRV_CPU_ADD("main", V20,16000000/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */ MDRV_CPU_PROGRAM_MAP(panicr_map,0) MDRV_CPU_VBLANK_INT_HACK(panicr_interrupt,2) - MDRV_CPU_ADD_TAG(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ + MDRV_CPU_ADD(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(t5182_map, 0) MDRV_CPU_IO_MAP(t5182_io, 0) diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index d7d6c56211f..d172c9e99b8 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -537,7 +537,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( paradise ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */ MDRV_CPU_PROGRAM_MAP(paradise_map,0) MDRV_CPU_IO_MAP(paradise_readport,paradise_writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No nmi routine */ diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c index 612a5a51620..8227a20e44b 100644 --- a/src/mame/drivers/paranoia.c +++ b/src/mame/drivers/paranoia.c @@ -130,18 +130,18 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( paranoia ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H6280, PCE_MAIN_CLOCK/3) + MDRV_CPU_ADD("main", H6280, PCE_MAIN_CLOCK/3) MDRV_CPU_PROGRAM_MAP(pce_mem, 0) MDRV_CPU_IO_MAP(pce_io, 0) MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF) MDRV_INTERLEAVE(1) - MDRV_CPU_ADD(8085A, 18000000/3) + MDRV_CPU_ADD("sub", 8085A, 18000000/3) MDRV_CPU_PROGRAM_MAP(paranoia_8085_map,0) MDRV_CPU_IO_MAP(paranoia_8085_io_map,0) - MDRV_CPU_ADD(Z80, 18000000/6) + MDRV_CPU_ADD("sub2", Z80, 18000000/6) MDRV_CPU_PROGRAM_MAP(paranoia_z80_map,0) MDRV_CPU_IO_MAP(paranoia_z80_io_map,0) diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index c625485a4f9..7d877a79076 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -297,12 +297,11 @@ static const struct K053260_interface k053260_interface = static MACHINE_DRIVER_START( parodius ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 053248 */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* 053248 */ MDRV_CPU_PROGRAM_MAP(parodius_readmem,parodius_writemem) MDRV_CPU_VBLANK_INT("main", parodius_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(parodius_readmem_sound,parodius_writemem_sound) /* NMIs are triggered by the 053260 */ diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index c0f0bbd57ac..b0fcc57414d 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -387,7 +387,7 @@ static VIDEO_UPDATE( pasha2 ) } static MACHINE_DRIVER_START( pasha2 ) - MDRV_CPU_ADD_TAG("main", E116XT, 20000000*4) /* 4x internal multiplier */ + MDRV_CPU_ADD("main", E116XT, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(pasha2_map,0) MDRV_CPU_IO_MAP(pasha2_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c index 219771d9cbe..e2120e039bf 100644 --- a/src/mame/drivers/pass.c +++ b/src/mame/drivers/pass.c @@ -271,12 +271,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( pass ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14318180/2 ) + MDRV_CPU_ADD("main", M68000, 14318180/2 ) MDRV_CPU_PROGRAM_MAP(pass_readmem,pass_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* all the same */ - MDRV_CPU_ADD(Z80, 14318180/4 ) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 14318180/4 ) MDRV_CPU_PROGRAM_MAP(pass_sound_readmem,pass_sound_writemem) MDRV_CPU_IO_MAP(pass_sound_readport,pass_sound_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index d5909b82144..755a77dfd29 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -195,7 +195,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( pastelg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 19968000/8) /* 2.496 MHz ? */ + MDRV_CPU_ADD("main", Z80, 19968000/8) /* 2.496 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_pastelg, writemem_pastelg) MDRV_CPU_IO_MAP(readport_pastelg, writeport_pastelg) // MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3 diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index bea7c69dc08..cffe1b5d185 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -265,12 +265,11 @@ static INTERRUPT_GEN( pbaction_interrupt ) static MACHINE_DRIVER_START( pbaction ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 3072000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3072000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) MDRV_CPU_VBLANK_INT_HACK(pbaction_interrupt,2) /* ??? */ diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index 9caaebea2a4..d9e0749e7c0 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -236,12 +236,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( pcktgal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) + MDRV_CPU_ADD("main", M6502, 2000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* IRQs are caused by the ADPCM chip */ /* NMIs are caused by the main CPU */ diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index b1d792ce815..f4c0504f4ce 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -346,7 +346,7 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( pengo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/6) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(pengo_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index f6f1c0ac4c2..98447765106 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -1002,7 +1002,7 @@ static MACHINE_RESET( peplus ) static MACHINE_DRIVER_START( peplus ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", I8052, 3686400*2) + MDRV_CPU_ADD("main", I8052, 3686400*2) MDRV_CPU_PROGRAM_MAP(peplus_map, 0) MDRV_CPU_DATA_MAP(peplus_datamap, 0) MDRV_CPU_IO_MAP(peplus_iomap, 0) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index c9cc1f439b6..5d47e7f4d22 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -1536,11 +1536,11 @@ static MACHINE_RESET ( pgm ) static MACHINE_DRIVER_START( pgm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 20000000) /* 20 mhz! verified on real board */ + MDRV_CPU_ADD("main", M68000, 20000000) /* 20 mhz! verified on real board */ MDRV_CPU_PROGRAM_MAP(pgm_mem,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 8468000) + MDRV_CPU_ADD("sound", Z80, 8468000) MDRV_CPU_PROGRAM_MAP(z80_mem, 0) MDRV_CPU_IO_MAP(z80_io, 0) /* audio CPU */ @@ -1607,7 +1607,7 @@ static MACHINE_DRIVER_START( kov2 ) MDRV_CPU_PROGRAM_MAP(kov2_mem,0) /* protection CPU */ - MDRV_CPU_ADD_TAG("prot", ARM7, 20000000) // ??? + MDRV_CPU_ADD("prot", ARM7, 20000000) // ??? MDRV_CPU_PROGRAM_MAP(arm7_map, 0) MACHINE_DRIVER_END @@ -1618,7 +1618,7 @@ static MACHINE_DRIVER_START( kovsh ) MDRV_CPU_PROGRAM_MAP(kovsh_mem,0) /* protection CPU */ - MDRV_CPU_ADD_TAG("prot", ARM7, 20000000) // ??? + MDRV_CPU_ADD("prot", ARM7, 20000000) // ??? MDRV_CPU_PROGRAM_MAP(kovsh_arm7_map, 0) MACHINE_DRIVER_END @@ -1630,7 +1630,7 @@ static MACHINE_DRIVER_START( cavepgm ) MDRV_CPU_PROGRAM_MAP(cavepgm_mem,0) /* protection CPU */ -// MDRV_CPU_ADD_TAG("prot", ARM7, 20000000) // ??? +// MDRV_CPU_ADD("prot", ARM7, 20000000) // ??? // MDRV_CPU_PROGRAM_MAP(arm7_map, 0) MACHINE_DRIVER_END #endif diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index 8a3080e2629..2de7da1fd08 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -440,7 +440,7 @@ static MACHINE_RESET( phoenix ) static MACHINE_DRIVER_START( phoenix ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8085A, CPU_CLOCK) /* 2.75 MHz */ + MDRV_CPU_ADD("main", 8085A, CPU_CLOCK) /* 2.75 MHz */ MDRV_CPU_PROGRAM_MAP(phoenix_memory_map, 0) MDRV_MACHINE_RESET(phoenix) @@ -506,7 +506,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( survival ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8085A, CPU_CLOCK) /* 5.50 MHz */ + MDRV_CPU_ADD("main", 8085A, CPU_CLOCK) /* 5.50 MHz */ MDRV_CPU_PROGRAM_MAP(survival_memory_map, 0) MDRV_MACHINE_RESET(phoenix) diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index 9f1b91ea7ee..3f6fff312c2 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -455,7 +455,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( pingpong ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu",Z80,18432000/6) /* 3.072 MHz (probably) */ + MDRV_CPU_ADD("cpu",Z80,18432000/6) /* 3.072 MHz (probably) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */ diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index bffc2951851..cc11e80a8c3 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -560,13 +560,12 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( pipedrm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) + MDRV_CPU_ADD("main", Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318000/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,14318000/4) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) @@ -600,13 +599,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hatris ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) + MDRV_CPU_ADD("main", Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318000/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,14318000/4) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(hatris_sound_portmap,0) diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 3eacabbc6b4..1ab4cd7b309 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -372,16 +372,16 @@ static MACHINE_RESET( pipeline ) static MACHINE_DRIVER_START( pipeline ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 7372800/2) + MDRV_CPU_ADD("main", Z80, 7372800/2) MDRV_CPU_PROGRAM_MAP(cpu0_mem, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 7372800/2) + MDRV_CPU_ADD("audio", Z80, 7372800/2) MDRV_CPU_CONFIG(daisy_chain_sound) MDRV_CPU_PROGRAM_MAP(cpu1_mem, 0) MDRV_CPU_IO_MAP(sound_port, 0) - MDRV_CPU_ADD(M68705, 7372800/2) + MDRV_CPU_ADD("mcu", M68705, 7372800/2) MDRV_CPU_PROGRAM_MAP(mcu_mem, 0) MDRV_DEVICE_ADD( "ppi8255_0", PPI8255 ) diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index a773890353f..5a019a8c210 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -285,7 +285,7 @@ GFXDECODE_END /* Machine Driver + Related bits */ static MACHINE_DRIVER_START( pirates ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16mhz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16mhz */ MDRV_CPU_PROGRAM_MAP(pirates_readmem,pirates_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c index bd655992d9f..fd5d9565403 100644 --- a/src/mame/drivers/pitnrun.c +++ b/src/mame/drivers/pitnrun.c @@ -259,17 +259,16 @@ static GFXDECODE_START( pitnrun ) GFXDECODE_END static MACHINE_DRIVER_START( pitnrun ) - MDRV_CPU_ADD_TAG("main", Z80,XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80,XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", pitnrun_nmi_source) - MDRV_CPU_ADD(Z80, XTAL_5MHz/2) /* verified on pcb */ - + MDRV_CPU_ADD("audio", Z80, XTAL_5MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M68705,XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) MDRV_MACHINE_RESET(pitnrun) diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 6abb7381754..eab4a52cdde 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -286,7 +286,7 @@ static MACHINE_RESET( pkscramble) static MACHINE_DRIVER_START( pkscramble ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000 ) + MDRV_CPU_ADD("main", M68000, 8000000 ) MDRV_CPU_PROGRAM_MAP(pkscramble_map,0) //MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* only valid irq */ diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index 40281f19126..fb3e4768990 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -342,7 +342,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( pktgaldx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(pktgaldx_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -377,7 +377,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pktgaldb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(pktgaldb_readmem,pktgaldb_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c index 5a7e2b8609b..1559bf19993 100644 --- a/src/mame/drivers/playch10.c +++ b/src/mame/drivers/playch10.c @@ -685,12 +685,12 @@ static const struct NESinterface nes_interface = static MACHINE_DRIVER_START( playch10 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // 4 MHz + MDRV_CPU_ADD("main", Z80, 8000000/2) // 4 MHz MDRV_CPU_PROGRAM_MAP(bios_map, 0) MDRV_CPU_IO_MAP(bios_io_map, 0) MDRV_CPU_VBLANK_INT("top", playch10_interrupt) - MDRV_CPU_ADD(N2A03, N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("cart", N2A03, N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(cart_map, 0) MDRV_MACHINE_RESET(pc10) diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index e0f74d4c335..3ceecea1e30 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -965,11 +965,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( bigtwin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(bigtwin_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ + MDRV_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ MDRV_CPU_IO_MAP(playmark_sound_io_map, 0) @@ -999,11 +999,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wbeachvl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(wbeachvl_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) -// MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ +// MDRV_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ // MDRV_CPU_IO_MAP(playmark_sound_io_map, 0) @@ -1034,11 +1034,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( excelsr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(excelsr_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ + MDRV_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ MDRV_CPU_IO_MAP(playmark_sound_io_map, 0) @@ -1067,11 +1067,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hotmind ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(hotmind_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(PIC16C57, XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("mcu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */ /* Program and Data Maps are internal to the MCU */ MDRV_CPU_IO_MAP(playmark_sound_io_map, 0) @@ -1102,11 +1102,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hrdtimes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) -// MDRV_CPU_ADD(PIC16C57, XTAL_24MHz/2) /* verified on pcb */ +// MDRV_CPU_ADD("mcu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */ /* Program and Data Maps are internal to the MCU */ // MDRV_CPU_IO_MAP(playmark_sound_io_map, 0) diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index c7d99a3a667..130e18bbdcc 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -685,16 +685,16 @@ static GFXDECODE_START( plygonet ) GFXDECODE_END static MACHINE_DRIVER_START( plygonet ) - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */ MDRV_CPU_PROGRAM_MAP(polygonet_map, 0) MDRV_CPU_VBLANK_INT_HACK(polygonet_interrupt, 2) - MDRV_CPU_ADD(DSP56156, 10000000) /* should be 40.0 MHz */ + MDRV_CPU_ADD("dsp", DSP56156, 10000000) /* should be 40.0 MHz */ MDRV_CPU_FLAGS(CPU_DISABLE) MDRV_CPU_PROGRAM_MAP(dsp56156_p_map, 0) MDRV_CPU_DATA_MAP(dsp56156_d_map, 0) - MDRV_CPU_ADD_TAG("sound", Z80, 8000000) + MDRV_CPU_ADD("sound", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_PERIODIC_INT(audio_interrupt, 480) diff --git a/src/mame/drivers/pmpoker.c b/src/mame/drivers/pmpoker.c index 9acc00b9614..9bc5623d8db 100644 --- a/src/mame/drivers/pmpoker.c +++ b/src/mame/drivers/pmpoker.c @@ -984,7 +984,7 @@ static const pia6821_interface pia1_intf = static MACHINE_DRIVER_START( pmpoker ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* guess */ + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK/16) /* guess */ MDRV_CPU_PROGRAM_MAP(pmpoker_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 6034516ba1b..95b8cf864fc 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -452,7 +452,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( pntnpuzl ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000)//?? + MDRV_CPU_ADD("main", M68000, 12000000)//?? MDRV_CPU_PROGRAM_MAP(pntnpuzl_map,0) MDRV_CPU_VBLANK_INT("main", pntnpuzl_irq) // irq1 = coin irq2 = service irq4 = coin diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index 32027d274bd..100c2d9021f 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -246,11 +246,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( pokechmp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 4000000) + MDRV_CPU_ADD("main", M6502, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, 4000000) + MDRV_CPU_ADD("audio", M6502, 4000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 53631ecc0df..4cd6c5456b8 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -840,20 +840,20 @@ static const struct CustomSound_interface custom_interface = static MACHINE_DRIVER_START( polepos ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24576000/8) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 24576000/8) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(z80_map,0) MDRV_CPU_IO_MAP(z80_io,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */ - MDRV_CPU_ADD(Z8000, 24576000/8) /* 3.072 MHz */ + MDRV_CPU_ADD("sub", Z8000, 24576000/8) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(z8002_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z8000, 24576000/8) /* 3.072 MHz */ + MDRV_CPU_ADD("sub2", Z8000, 24576000/8) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(z8002_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD_TAG(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ + MDRV_CPU_ADD(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0) MDRV_CPU_DATA_MAP(namco_54xx_map_data,0) MDRV_CPU_IO_MAP(namco_54xx_map_io,0) diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 22264ddac1c..5d45d95f28c 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -463,7 +463,7 @@ static const struct r3000_config config = static MACHINE_DRIVER_START( policetr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R3000BE, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", R3000BE, MASTER_CLOCK/2) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(policetr_map,0) MDRV_CPU_VBLANK_INT("main", irq4_gen) diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c index 118ba015d20..66d184a6236 100644 --- a/src/mame/drivers/polyplay.c +++ b/src/mame/drivers/polyplay.c @@ -289,7 +289,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( polyplay ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 9830400/4) + MDRV_CPU_ADD("main", Z80, 9830400/4) MDRV_CPU_PROGRAM_MAP(polyplay_map,0) MDRV_CPU_IO_MAP(polyplay_io_map,0) MDRV_CPU_PERIODIC_INT(periodic_interrupt,75) diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index f8ba9ddc4e9..8534e7bdc16 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -214,7 +214,7 @@ static PALETTE_INIT( poolshrk ) static MACHINE_DRIVER_START( poolshrk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 11055000 / 8) /* ? */ + MDRV_CPU_ADD("main", M6800, 11055000 / 8) /* ? */ MDRV_CPU_PROGRAM_MAP(poolshrk_cpu_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c index a6a08b1ae59..40189b6cbdf 100644 --- a/src/mame/drivers/pooyan.c +++ b/src/mame/drivers/pooyan.c @@ -213,7 +213,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( pooyan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", pooyan_interrupt) diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index 52a63335626..197482730b9 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -483,7 +483,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( skyskipr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(skyskipr_readmem,skyskipr_writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", popeye_interrupt) diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index 9fe0540f002..a6b84020a51 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -310,12 +310,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( popper ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) + MDRV_CPU_ADD("main", Z80,18432000/6) MDRV_CPU_PROGRAM_MAP(popper_readmem,popper_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80,18432000/12) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,18432000/12) MDRV_CPU_PROGRAM_MAP(popper_sound_readmem,popper_sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) //NMIs caused by the main CPU diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c index c97d124b5b3..ef6dafeaf48 100644 --- a/src/mame/drivers/portrait.c +++ b/src/mame/drivers/portrait.c @@ -248,12 +248,11 @@ static GFXDECODE_START( portrait ) GFXDECODE_END static MACHINE_DRIVER_START( portrait ) - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(portrait_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(I8039, 3120000) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", I8039, 3120000) /* ? */ MDRV_CPU_PROGRAM_MAP(portrait_sound_map,0) diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index d6c4443fd76..e7c927f9357 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -411,7 +411,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( powerbal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(powerbal_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -439,7 +439,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( magicstk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(magicstk_main_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c index abce318896a..d1ead3e45ec 100644 --- a/src/mame/drivers/powerins.c +++ b/src/mame/drivers/powerins.c @@ -350,11 +350,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( powerins ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(powerins_readmem,powerins_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 6000000) /* 6 MHz */ + MDRV_CPU_ADD("sound", Z80, 6000000) /* 6 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_snd,writemem_snd) MDRV_CPU_IO_MAP(powerins_io_snd,0) diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 2ce67871e1f..71ee635b236 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -344,12 +344,12 @@ static VIDEO_UPDATE( ppmast93 ) static MACHINE_DRIVER_START( ppmast93 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,5000000) /* 5 MHz */ + MDRV_CPU_ADD("main", Z80,5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(ppmast93_cpu1_map,0) MDRV_CPU_IO_MAP(ppmast93_cpu1_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,5000000) /* 5 MHz */ + MDRV_CPU_ADD("sub", Z80,5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(ppmast93_cpu2_map,0) MDRV_CPU_IO_MAP(ppmast93_cpu2_io,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000) diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index 99464298438..9e906367728 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -234,11 +234,11 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( prehisle ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_18MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_18MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(prehisle_readmem,prehisle_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, XTAL_4MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_4MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(prehisle_sound_readmem,prehisle_sound_writemem) MDRV_CPU_IO_MAP(prehisle_sound_readport,prehisle_sound_writeport) diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 2058b598008..ae4e9396d8a 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -189,11 +189,11 @@ static INTERRUPT_GEN( progolf_interrupt ) static MACHINE_DRIVER_START( progolf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* ? */ + MDRV_CPU_ADD("main", M6502, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) // MDRV_CPU_VBLANK_INT("main", progolf_interrupt) -// MDRV_CPU_ADD(M6502, 500000) +// MDRV_CPU_ADD("audio", M6502, 500000) // MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) // MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 4087a17d20d..98c248284ca 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -1562,12 +1562,11 @@ static const struct YM2610interface sngkace_ym2610_interface = static MACHINE_DRIVER_START( sngkace ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(sngkace_sound_readmem,sngkace_sound_writemem) MDRV_CPU_IO_MAP(sngkace_sound_readport,sngkace_sound_writeport) @@ -1616,12 +1615,11 @@ static const struct YM2610interface gunbird_ym2610_interface = static MACHINE_DRIVER_START( gunbird ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* ! LZ8420M (Z80 core) ! */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */ MDRV_CPU_PROGRAM_MAP(gunbird_sound_readmem,gunbird_sound_writemem) MDRV_CPU_IO_MAP(gunbird_sound_readport,gunbird_sound_writeport) @@ -1678,12 +1676,11 @@ static const struct YMF278B_interface ymf278b_interface = static MACHINE_DRIVER_START( s1945 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* ! LZ8420M (Z80 core) ! */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */ MDRV_CPU_PROGRAM_MAP(gunbird_sound_readmem,gunbird_sound_writemem) MDRV_CPU_IO_MAP(s1945_sound_readport,s1945_sound_writeport) diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 56ac1b6a42c..292b6629355 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -489,7 +489,7 @@ static const struct YMF278B_interface ymf278b_interface = static MACHINE_DRIVER_START( ps4big ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH2, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", SH2, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(ps4_readmem,ps4_writemem) MDRV_CPU_VBLANK_INT("left", psikyosh_interrupt) diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 5e36c4810f1..beb75a39cfd 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -595,7 +595,7 @@ static const struct YMF278B_interface ymf278b_interface = static MACHINE_DRIVER_START( psikyo3v1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH2, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", SH2, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(ps3v1_readmem,ps3v1_writemem) MDRV_CPU_VBLANK_INT("main", psikyosh_interrupt) diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 19c49014d72..2da929453bd 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -553,12 +553,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( psychic5 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) + MDRV_CPU_ADD("main", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2) - MDRV_CPU_ADD(Z80, 6000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index e3c8a2672f3..685e8a91fbb 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -445,13 +445,12 @@ static MACHINE_RESET( pturn ) } static MACHINE_DRIVER_START( pturn ) - MDRV_CPU_ADD_TAG("main", Z80, 12000000/3) + MDRV_CPU_ADD("main", Z80, 12000000/3) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", pturn_main_intgen) MDRV_MACHINE_RESET(pturn) - MDRV_CPU_ADD(Z80, 12000000/3) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 12000000/3) MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT_HACK(pturn_sub_intgen,3) diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 1e950991014..1c3020b9c26 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -156,7 +156,7 @@ static const struct YM3438interface ym3438_intf = static MACHINE_DRIVER_START( puckpkmn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000, MASTER_CLOCK/7) /*???*/ + MDRV_CPU_ADD("main",M68000, MASTER_CLOCK/7) /*???*/ MDRV_CPU_PROGRAM_MAP(puckpkmn_readmem,puckpkmn_writemem) MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index 233cf019b59..087c9fbc2a9 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -700,13 +700,12 @@ static const struct VLM5030interface vlm5030_interface = static MACHINE_DRIVER_START( punchout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(punchout_map,0) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("top", nmi_line_pulse) - MDRV_CPU_ADD(N2A03, N2A03_DEFAULTCLOCK) - /* audio CPU */ + MDRV_CPU_ADD("audio", N2A03, N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT("top", nmi_line_pulse) diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 8f541bf21c3..e2982c0c60f 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -451,17 +451,16 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( pushman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) /* ElSemi. Reversed the CPU order so the sound callback works with bballs */ - MDRV_CPU_ADD(M68705, 4000000) /* No idea */ + MDRV_CPU_ADD("mcu", M68705, 4000000) /* No idea */ MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) MDRV_INTERLEAVE(60) @@ -494,12 +493,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bballs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(bballs_readmem,bballs_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index fdbd12782c7..c534f4e1aac 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -656,7 +656,7 @@ static MACHINE_RESET( qdrmfgp2 ) static MACHINE_DRIVER_START( qdrmfgp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16.000 MHz */ + MDRV_CPU_ADD("main", M68000, 32000000/2) /* 16.000 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(qdrmfgp_interrupt, 2) @@ -691,7 +691,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( qdrmfgp2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16.000 MHz */ + MDRV_CPU_ADD("main", M68000, 32000000/2) /* 16.000 MHz */ MDRV_CPU_PROGRAM_MAP(gp2_readmem,gp2_writemem) MDRV_CPU_VBLANK_INT("main", qdrmfgp2_interrupt) diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index 5bc6b51a2da..61cc02e3403 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -547,7 +547,7 @@ static MACHINE_DRIVER_START( qix ) MDRV_DRIVER_DATA(qix_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ + MDRV_CPU_ADD("main", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) /* high interleave needed to ensure correct text in service mode */ @@ -571,7 +571,7 @@ static MACHINE_DRIVER_START( mcu ) /* basic machine hardware */ MDRV_IMPORT_FROM(qix) - MDRV_CPU_ADD(M68705, COIN_CLOCK_OSC) /* 1.00 MHz */ + MDRV_CPU_ADD("mcu", M68705, COIN_CLOCK_OSC) /* 1.00 MHz */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_MACHINE_START(qixmcu) diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index 70c3c59e399..95ded37b268 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -237,7 +237,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( quantum ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 2) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK / 2) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_PERIODIC_INT(irq1_line_hold, (double)MASTER_CLOCK / 4096 / 12) diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index 4dabbb57257..d2717578ca5 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -342,12 +342,12 @@ static INTERRUPT_GEN( quasar_interrupt ) static MACHINE_DRIVER_START( quasar ) - MDRV_CPU_ADD_TAG("main", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */ + MDRV_CPU_ADD("main", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */ MDRV_CPU_PROGRAM_MAP(quasar,0) MDRV_CPU_IO_MAP(quasar_io,0) MDRV_CPU_VBLANK_INT("main", quasar_interrupt) - MDRV_CPU_ADD_TAG("sound",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */ + MDRV_CPU_ADD("sound",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_IO_MAP(readport_sound,writeport_sound) diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index 5fb8b858f39..855a1b688fc 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -460,7 +460,7 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( quizdna ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 8.000 MHz */ + MDRV_CPU_ADD("main", Z80, MCLK/2) /* 8.000 MHz */ MDRV_CPU_PROGRAM_MAP(quizdna_readmem,quizdna_writemem) MDRV_CPU_IO_MAP(quizdna_readport,quizdna_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 82a82cbe929..4805b350bb0 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -186,7 +186,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( quizo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL1/2) + MDRV_CPU_ADD("main", Z80,XTAL1/2) MDRV_CPU_PROGRAM_MAP(memmap, 0) MDRV_CPU_IO_MAP(portmap, 0) diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index b6dbb86fe44..368795de63c 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -247,7 +247,7 @@ static MACHINE_RESET( quizpani ) } static MACHINE_DRIVER_START( quizpani ) - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(quizpani_readmem,quizpani_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,164) // music tempo diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index f665c0f5db6..96a5610e18e 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -536,11 +536,11 @@ INPUT_PORTS_END *************************************/ static MACHINE_DRIVER_START( r2dtank ) - MDRV_CPU_ADD_TAG("main", M6809,3000000) /* ?? too fast ? */ + MDRV_CPU_ADD("main", M6809,3000000) /* ?? too fast ? */ MDRV_CPU_PROGRAM_MAP(r2dtank_main_map,0) /* audio CPU */ - MDRV_CPU_ADD(M6802,3000000) /* ?? */ + MDRV_CPU_ADD("audio", M6802,3000000) /* ?? */ MDRV_CPU_PROGRAM_MAP(r2dtank_audio_map,0) MDRV_MACHINE_START(r2dtank) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index a41b3c500a9..502405e6fcb 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -1066,7 +1066,7 @@ static INTERRUPT_GEN( rabbit_interrupts ) } static MACHINE_DRIVER_START( rabbit ) - MDRV_CPU_ADD_TAG("main",M68EC020,24000000) /* 24 MHz */ + MDRV_CPU_ADD("main",M68EC020,24000000) /* 24 MHz */ MDRV_CPU_PROGRAM_MAP(rabbit_readmem,rabbit_writemem) MDRV_CPU_VBLANK_INT_HACK(rabbit_interrupts,262) /* (rabbit) */ diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index 08e7c9b0576..2d8a05f5547 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -235,11 +235,11 @@ static VIDEO_EOF( raiden ) static MACHINE_DRIVER_START( raiden ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ + MDRV_CPU_ADD("main", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", raiden_interrupt) - MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ + MDRV_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT("main", raiden_interrupt) @@ -274,11 +274,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( raidena ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ + MDRV_CPU_ADD("main", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(alt_map,0) MDRV_CPU_VBLANK_INT("main", raiden_interrupt) - MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ + MDRV_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT("main", raiden_interrupt) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 66ee00a0939..d34ef5fd881 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -987,7 +987,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( raiden2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,XTAL_32MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", V30,XTAL_32MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(raiden2_mem, 0) MDRV_CPU_VBLANK_INT("main", raiden2_interrupt) @@ -2126,7 +2126,7 @@ static INTERRUPT_GEN( rdx_v33_interrupt ) static MACHINE_DRIVER_START( rdx_v33 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V33, 32000000/2 ) // ? + MDRV_CPU_ADD("main", V33, 32000000/2 ) // ? MDRV_CPU_PROGRAM_MAP(rdx_v33_map, 0) MDRV_CPU_VBLANK_INT("main", rdx_v33_interrupt) diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index ada8cc52de7..d973c428469 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -609,11 +609,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( rainbow ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rainbow_readmem,rainbow_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rainbow_s_readmem,rainbow_s_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -646,11 +646,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jumping ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/3) /* not verified but matches original */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/3) /* not verified but matches original */ MDRV_CPU_PROGRAM_MAP(jumping_readmem,jumping_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6) /* not verified but music tempo matches original */ + MDRV_CPU_ADD("audio", Z80, XTAL_18_432MHz/6) /* not verified but music tempo matches original */ MDRV_CPU_PROGRAM_MAP(jumping_sound_readmem,jumping_sound_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough ? */ diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 87cd08d7579..f415182319c 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -839,7 +839,7 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( rallyx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(rallyx_map,0) MDRV_CPU_IO_MAP(0,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) @@ -877,7 +877,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jungler ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(jungler_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index 3034bf5bdd2..a7596efd007 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -382,7 +382,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( rampart ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 2c2673443f3..8d3b55ba33f 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -378,11 +378,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( rastan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rastan_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rastan_s_map,0) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index f3fb92a7c92..931179ed2cb 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -498,7 +498,7 @@ static NVRAM_HANDLER( syf ) static MACHINE_DRIVER_START( rbmk ) - MDRV_CPU_ADD_TAG("main", M68000, 22000000 /2) + MDRV_CPU_ADD("main", M68000, 22000000 /2) MDRV_CPU_PROGRAM_MAP(rbmk_mem,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c index f9b0fe79084..534647b221c 100644 --- a/src/mame/drivers/rcasino.c +++ b/src/mame/drivers/rcasino.c @@ -295,7 +295,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( rcasino ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // ??? + MDRV_CPU_ADD("main", Z80, 8000000/2) // ??? MDRV_CPU_PROGRAM_MAP(rcasino_map, 0) MDRV_CPU_IO_MAP(rcasino_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index ca68e52a01e..6b0ffef4a58 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -119,7 +119,7 @@ static MACHINE_DRIVER_START( rcorsair ) /* Main CPU is probably inside Custom Block with program code, unknown type */ - MDRV_CPU_ADD_TAG("main", 8085A,8000000) /* Sound CPU? */ + MDRV_CPU_ADD("main", 8085A,8000000) /* Sound CPU? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index 2af43d177c0..3399ba1aee9 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -681,7 +681,7 @@ static INTERRUPT_GEN( realbrk_interrupt ) static MACHINE_DRIVER_START( realbrk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,32000000 / 2) /* !! TMP68301 !! */ + MDRV_CPU_ADD("main",M68000,32000000 / 2) /* !! TMP68301 !! */ MDRV_CPU_PROGRAM_MAP(realbrk_mem,base_mem) MDRV_CPU_VBLANK_INT("main", realbrk_interrupt) diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c index 3381d606ffa..6056316ea07 100644 --- a/src/mame/drivers/redalert.c +++ b/src/mame/drivers/redalert.c @@ -272,7 +272,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( redalert ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(redalert_main_map,0) MDRV_CPU_VBLANK_INT("main", redalert_vblank_interrupt) @@ -287,7 +287,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( demoneye ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(demoneye_main_map,0) MDRV_CPU_VBLANK_INT("main", redalert_vblank_interrupt) diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index 98b0b32a3d4..bae54eb6e4b 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -348,7 +348,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( zerohour ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(zero_readmem,zero_writemem) MDRV_CPU_VBLANK_INT("main", redclash_interrupt) @@ -375,7 +375,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( redclash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", redclash_interrupt) diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index 1297d3b4e4c..afc7a41f389 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -342,7 +342,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( relief ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(relief) diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index 10c5613612a..8f3fa6cc01b 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -791,12 +791,11 @@ static MACHINE_RESET( renegade ) static MACHINE_DRIVER_START( renegade ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12000000/8) /* 1.5 MHz (measured) */ + MDRV_CPU_ADD("main", M6502, 12000000/8) /* 1.5 MHz (measured) */ MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) MDRV_CPU_VBLANK_INT_HACK(renegade_interrupt,2) - MDRV_CPU_ADD(M6809, 12000000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 12000000/8) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* IRQs are caused by the main CPU */ MDRV_MACHINE_START(renegade) diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index fae092e4821..fb24ab041a6 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -338,19 +338,19 @@ GFXDECODE_END static MACHINE_DRIVER_START( retofinv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz? */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz? */ + MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz? */ + MDRV_CPU_ADD("audio", Z80, 18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2) - MDRV_CPU_ADD_TAG("68705", M68705,18432000/6) /* 3.072 MHz? */ + MDRV_CPU_ADD("68705", M68705,18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 186a9f1569b..78883a3b8a2 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -449,7 +449,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( rmhaihai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,20000000/4) /* 5 MHz ??? */ + MDRV_CPU_ADD("main",Z80,20000000/4) /* 5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c index 9f994c41b4e..16d27cf76b5 100644 --- a/src/mame/drivers/rockola.c +++ b/src/mame/drivers/rockola.c @@ -1077,7 +1077,7 @@ static MACHINE_RESET( pballoon ) static MACHINE_DRIVER_START( sasuke ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M6502, 11289000/16) // 700 kHz + MDRV_CPU_ADD("main", M6502, 11289000/16) // 700 kHz MDRV_CPU_PROGRAM_MAP(sasuke_map, 0) MDRV_CPU_VBLANK_INT_HACK(satansat_interrupt, 2) @@ -1151,8 +1151,8 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vanguard ) // basic machine hardware - //MDRV_CPU_ADD_TAG("main", M6502, 11289000/8) // 1.4 MHz - MDRV_CPU_ADD_TAG("main", M6502, 930000) // adjusted + //MDRV_CPU_ADD("main", M6502, 11289000/8) // 1.4 MHz + MDRV_CPU_ADD("main", M6502, 930000) // adjusted MDRV_CPU_PROGRAM_MAP(vanguard_map, 0) MDRV_CPU_VBLANK_INT_HACK(rockola_interrupt, 2) diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index a3540c9f234..efa150c5e2f 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -292,12 +292,11 @@ static const struct VLM5030interface vlm5030_interface = static MACHINE_DRIVER_START( rockrage ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 24MHz/8 */ + MDRV_CPU_ADD("main", HD6309, 3000000*4) /* 24MHz/8 */ MDRV_CPU_PROGRAM_MAP(rockrage_readmem,rockrage_writemem) MDRV_CPU_VBLANK_INT("main", rockrage_interrupt) - MDRV_CPU_ADD(M6809, 1500000) /* 24MHz/16 */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 1500000) /* 24MHz/16 */ MDRV_CPU_PROGRAM_MAP(rockrage_readmem_sound,rockrage_writemem_sound) /* video hardware */ diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index ac3c65bfda8..0e9034e9eac 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -220,7 +220,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( rocnrope ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1600000) /* 1.6 MHz??? Attract mode depends on this to work correctly */ + MDRV_CPU_ADD("main", M6809, 1600000) /* 1.6 MHz??? Attract mode depends on this to work correctly */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 3e31065e6d6..61ef0a541be 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -814,11 +814,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( rohga ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(rohga_readmem,rohga_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ + MDRV_CPU_ADD("audio", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -859,11 +859,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wizdfire ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(wizdfire_readmem,wizdfire_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ + MDRV_CPU_ADD("audio", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -904,11 +904,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nitrobal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(nitrobal_readmem,nitrobal_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ + MDRV_CPU_ADD("audio", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -949,11 +949,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( schmeisr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(schmeisr_readmem,schmeisr_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ + MDRV_CPU_ADD("audio", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index fbb5975340f..2232ab955c0 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -245,12 +245,11 @@ static const struct K053260_interface k053260_interface = static MACHINE_DRIVER_START( rollerg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) /* NMIs are generated by the 053260 */ MDRV_MACHINE_RESET(rollerg) diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index 83024b0789d..6a8ad93774b 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -237,12 +237,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( rollrace ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL_24MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80,XTAL_24MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80,XTAL_24MHz/16) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,XTAL_24MHz/16) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_snd,writemem_snd) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c index aeeb93850aa..ed26900863e 100644 --- a/src/mame/drivers/rotaryf.c +++ b/src/mame/drivers/rotaryf.c @@ -149,7 +149,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( rotaryf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",8085A,4000000) /* 8080? */ /* 2 MHz? */ + MDRV_CPU_ADD("main",8085A,4000000) /* 8080? */ /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(rotaryf_map,0) MDRV_CPU_IO_MAP(rotaryf_io_map,0) MDRV_CPU_VBLANK_INT_HACK(rotaryf_interrupt,5) diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index 6ac9d33f02a..76b54f1c3e7 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -609,12 +609,12 @@ static const struct SN76477interface sn76477_interface = static MACHINE_DRIVER_START( route16 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ + MDRV_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ MDRV_CPU_PROGRAM_MAP(route16_cpu1_map,0) MDRV_CPU_IO_MAP(cpu1_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ + MDRV_CPU_ADD("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ MDRV_CPU_PROGRAM_MAP(route16_cpu2_map,0) /* video hardware */ diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index dd8436d6074..d024fc8b795 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -2216,7 +2216,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( royalmah ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 3.00 MHz ? */ + MDRV_CPU_ADD("main", Z80, 3000000) /* 3.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(royalmah_map,0) MDRV_CPU_IO_MAP(royalmah_iomap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index 3908454d577..0277bdc0df3 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -504,10 +504,10 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( rpunch ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("audio", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_MACHINE_RESET(rpunch) diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c index 8db8d2ebc4c..0e718210be8 100644 --- a/src/mame/drivers/runaway.c +++ b/src/mame/drivers/runaway.c @@ -352,7 +352,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( runaway ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 8) /* ? */ + MDRV_CPU_ADD("main", M6502, 12096000 / 8) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_MACHINE_RESET(runaway) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 599635d1ef3..82cd0cab3ae 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -328,11 +328,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( rng ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(rngreadmem,rngwritemem) MDRV_CPU_VBLANK_INT("main", rng_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 10000000) // 8Mhz (10Mhz is much safer in self-test due to heavy sync) + MDRV_CPU_ADD("sound", Z80, 10000000) // 8Mhz (10Mhz is much safer in self-test due to heavy sync) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_PERIODIC_INT(audio_interrupt, 480) diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index b4b46f6b68a..525a3a89c6b 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -262,7 +262,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( safarir ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 3072000) /* 3 MHz ? */ + MDRV_CPU_ADD("main", 8080, 3072000) /* 3 MHz ? */ MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_MACHINE_START(safarir) diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index cbe6f2e503c..bec7f722dbb 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -436,11 +436,11 @@ static const struct YM2203interface ym2203_intf_sandscrp = static MACHINE_DRIVER_START( sandscrp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) /* TMP68HC000N-12 */ + MDRV_CPU_ADD("main", M68000,12000000) /* TMP68HC000N-12 */ MDRV_CPU_PROGRAM_MAP(sandscrp,0) MDRV_CPU_VBLANK_INT("main", sandscrp_interrupt) - MDRV_CPU_ADD(Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */ + MDRV_CPU_ADD("audio", Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */ MDRV_CPU_PROGRAM_MAP(sandscrp_soundmem,0) MDRV_CPU_IO_MAP(sandscrp_soundport,0) diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index e1dbdcb81e0..aa4bfb21d41 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -233,7 +233,7 @@ static VIDEO_START( sangho ) static MACHINE_DRIVER_START(pzlestar) - MDRV_CPU_ADD_TAG("main", Z80,8000000) // ? + MDRV_CPU_ADD("main", Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(readmem, 0) MDRV_CPU_IO_MAP(readport_pzlestar,writeport_pzlestar) MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262) @@ -266,7 +266,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START(sexyboom ) - MDRV_CPU_ADD_TAG("main", Z80,8000000) // ? + MDRV_CPU_ADD("main", Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(readmem, 0) MDRV_CPU_IO_MAP(readport_sexyboom,writeport_sexyboom) MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262) diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index 7c1cd48ec32..8169f2c80b8 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -362,7 +362,7 @@ static INTERRUPT_GEN( sauro_interrupt ) static MACHINE_DRIVER_START( tecfri ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) // 4 MHz??? + MDRV_CPU_ADD("main", Z80, 4000000) // 4 MHz??? MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ @@ -403,8 +403,7 @@ static MACHINE_DRIVER_START( sauro ) MDRV_CPU_PROGRAM_MAP(sauro_readmem, sauro_writemem) MDRV_CPU_IO_MAP(sauro_readport, sauro_writeport) - MDRV_CPU_ADD(Z80, 4000000) // 4 MHz? - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) // 4 MHz? MDRV_CPU_PROGRAM_MAP(sauro_sound_readmem, sauro_sound_writemem) MDRV_CPU_VBLANK_INT_HACK(sauro_interrupt, 8) // ? diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index 618a3414f2c..ca2272e336d 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -236,12 +236,11 @@ static const struct VLM5030interface sbasketb_vlm5030_interface = static MACHINE_DRIVER_START( sbasketb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1400000) /* 1.400 MHz ??? */ + MDRV_CPU_ADD("main", M6809, 1400000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318000/4) - /* audio CPU */ /* 3.5795 MHz */ + MDRV_CPU_ADD("audio", Z80,14318000/4) /* 3.5795 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index f1e5f45f010..58029dbe931 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -328,7 +328,7 @@ static PALETTE_INIT( sbowling ) static MACHINE_DRIVER_START( sbowling ) - MDRV_CPU_ADD_TAG("main", 8080, 19968000/10 ) + MDRV_CPU_ADD("main", 8080, 19968000/10 ) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) MDRV_CPU_VBLANK_INT_HACK(sbw_interrupt, 2) diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index aba4504c123..d485ba7fd5c 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -477,7 +477,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( sbrkout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */ + MDRV_CPU_ADD("main", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_START(sbrkout) diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index bcfc8736f5a..aec5d1dc9b3 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -227,7 +227,7 @@ INPUT_PORTS_END /* machine driver */ static MACHINE_DRIVER_START( sbugger ) - MDRV_CPU_ADD_TAG("main", 8085A, 6000000) /* 3.00 MHz??? */ + MDRV_CPU_ADD("main", 8085A, 6000000) /* 3.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME) diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index b487d54bc2f..6657e6343d8 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -1114,11 +1114,10 @@ static const struct AY8910interface scobra_ay8910_interface_2 = static MACHINE_DRIVER_START( type1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(type1_readmem,type1_writemem) - MDRV_CPU_ADD(Z80,14318000/8) - /* audio CPU */ /* 1.78975 MHz */ + MDRV_CPU_ADD("audio", Z80,14318000/8) /* 1.78975 MHz */ MDRV_CPU_PROGRAM_MAP(scobra_sound_readmem,scobra_sound_writemem) MDRV_CPU_IO_MAP(scobra_sound_readport,scobra_sound_writeport) @@ -1253,10 +1252,10 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hustler ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(hustler_readmem,hustler_writemem) - MDRV_CPU_ADD_TAG("sound",Z80,14318000/8) + MDRV_CPU_ADD("sound",Z80,14318000/8) /* audio CPU */ /* 1.78975 MHz */ MDRV_CPU_PROGRAM_MAP(hustler_sound_readmem,hustler_sound_writemem) MDRV_CPU_IO_MAP(hustler_sound_readport,hustler_sound_writeport) diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index ef22b6de22d..d9a43b1cbbc 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -223,12 +223,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( scotrsht ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", M6809, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(scotrsht_map,0) MDRV_CPU_VBLANK_INT("main", scotrsht_interrupt) - MDRV_CPU_ADD(Z80, 18432000/6) - /* audio CPU */ /* 3.072 MHz */ + MDRV_CPU_ADD("audio", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(scotrsht_sound_map,0) MDRV_CPU_IO_MAP(scotrsht_sound_port,0) diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c index 33c016622bb..665405df616 100644 --- a/src/mame/drivers/scramble.c +++ b/src/mame/drivers/scramble.c @@ -1855,10 +1855,10 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( scramble ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(scramble_readmem,scramble_writemem) - MDRV_CPU_ADD_TAG("audio", Z80, 14318000/8) /* 1.78975 MHz */ + MDRV_CPU_ADD("audio", Z80, 14318000/8) /* 1.78975 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(scramble_sound_readmem,scramble_sound_writemem) MDRV_CPU_IO_MAP(scramble_sound_readport,scramble_sound_writeport) @@ -2209,7 +2209,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ad2083 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(ad2083_map,0) MDRV_MACHINE_RESET(galaxold) diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index c380984ccd0..58f442bd17c 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -231,7 +231,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( dommy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) + MDRV_CPU_ADD("main", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dommy_readmem,dommy_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) @@ -264,7 +264,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( scregg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) + MDRV_CPU_ADD("main", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(eggs_readmem,eggs_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c index 26dbd1e2c11..bf8114c3a50 100644 --- a/src/mame/drivers/sderby.c +++ b/src/mame/drivers/sderby.c @@ -251,7 +251,7 @@ static GFXDECODE_START( sderby ) GFXDECODE_END static MACHINE_DRIVER_START( sderby ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(sderby_readmem,sderby_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( sderby ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( pmroulet ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(roulette_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index 9dbe70cadff..6d97581706d 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -2458,7 +2458,7 @@ static const mips3_config config = static MACHINE_DRIVER_START( seattle_common ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R5000LE, SYSTEM_CLOCK*3) + MDRV_CPU_ADD("main", R5000LE, SYSTEM_CLOCK*3) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(seattle_map,0) diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 8d89a68bf6b..0ef4bd9c9a5 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -1369,7 +1369,7 @@ static const struct YM3438interface ym3438_intf = static MACHINE_DRIVER_START( segac ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XL2_CLOCK/6) + MDRV_CPU_ADD("main", M68000, XL2_CLOCK/6) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index df9a8ac8478..ad5cb030b1f 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -2040,7 +2040,7 @@ static VIDEO_UPDATE(systeme) static MACHINE_DRIVER_START( systeme ) - MDRV_CPU_ADD_TAG("z80", Z80, 10738600/2) /* correct for hangonjr, and astroflash/transformer at least */ + MDRV_CPU_ADD("z80", Z80, 10738600/2) /* correct for hangonjr, and astroflash/transformer at least */ MDRV_CPU_PROGRAM_MAP(systeme_readmem,systeme_writemem) MDRV_CPU_IO_MAP(sms_readport,sms_writeport) diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index 5b42ff23143..0819cde5da6 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -850,7 +850,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( g80r_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, VIDEO_CLOCK/4) + MDRV_CPU_ADD("main", Z80, VIDEO_CLOCK/4) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", segag80r_vblank_start) @@ -963,7 +963,7 @@ static MACHINE_DRIVER_START( sindbadm ) /* sound boards */ - MDRV_CPU_ADD(Z80, SINDBADM_SOUND_CLOCK/2) + MDRV_CPU_ADD("audio", Z80, SINDBADM_SOUND_CLOCK/2) MDRV_CPU_PROGRAM_MAP(sindbadm_sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c index 6eac167ffae..8b3352080eb 100644 --- a/src/mame/drivers/segag80v.c +++ b/src/mame/drivers/segag80v.c @@ -920,7 +920,7 @@ static const struct Samplesinterface zektor_samples_interface = static MACHINE_DRIVER_START( g80v_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, CPU_CLOCK/2) + MDRV_CPU_ADD("main", Z80, CPU_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 01ea35af762..597e8ceeefc 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -871,11 +871,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( hangon_base ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK_25MHz/4) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK_25MHz/4) MDRV_CPU_PROGRAM_MAP(hangon_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sub", M68000, MASTER_CLOCK_25MHz/4) + MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK_25MHz/4) MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_MACHINE_RESET(hangon) @@ -918,7 +918,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_board_2203 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK_8MHz/2) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK_8MHz/2) MDRV_CPU_PROGRAM_MAP(sound_map_2203,0) MDRV_CPU_IO_MAP(sound_portmap_2203,0) @@ -946,7 +946,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_board_2203x2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK_8MHz/2) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK_8MHz/2) MDRV_CPU_PROGRAM_MAP(sound_map_2151,0) MDRV_CPU_IO_MAP(sound_portmap_2203x2,0) @@ -984,7 +984,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_board_2151 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK_8MHz/2) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK_8MHz/2) MDRV_CPU_PROGRAM_MAP(sound_map_2151,0) MDRV_CPU_IO_MAP(sound_portmap_2151,0) @@ -1030,7 +1030,7 @@ static MACHINE_DRIVER_START( sharrier ) MDRV_IMPORT_FROM(sharrier_base) MDRV_IMPORT_FROM(sound_board_2203) - MDRV_CPU_ADD_TAG("mcu", I8751, 8000000) + MDRV_CPU_ADD("mcu", I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 19aa8dcd262..4e72130146e 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -342,7 +342,7 @@ GFXDECODE_END /* DRIVER */ static MACHINE_DRIVER_START( astron ) /* main cpu */ - MDRV_CPU_ADD_TAG("main", Z80, SCHEMATIC_CLOCK/4) + MDRV_CPU_ADD("main", Z80, SCHEMATIC_CLOCK/4) MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainport,0) MDRV_CPU_VBLANK_INT("main", vblank_callback_astron) diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 71e33ed5e5c..a86c7e06b72 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -816,13 +816,13 @@ GFXDECODE_END static MACHINE_DRIVER_START( outrundx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(outrun_map,0) - MDRV_CPU_ADD_TAG("sub", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK/4) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK/4) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 02682544d7d..4e75e154274 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -1771,16 +1771,16 @@ GFXDECODE_END static MACHINE_DRIVER_START( system16a ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system16a_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) + MDRV_CPU_ADD("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_ADD_TAG("n7751", N7751, 6000000) + MDRV_CPU_ADD("n7751", N7751, 6000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(n7751_map,0) MDRV_CPU_IO_MAP(n7751_portmap,0) @@ -1831,7 +1831,7 @@ static MACHINE_DRIVER_START( system16a_8751 ) MDRV_CPU_MODIFY("main") MDRV_CPU_VBLANK_INT("main", i8751_main_cpu_vblank) - MDRV_CPU_ADD_TAG("mcu", I8751, 8000000) + MDRV_CPU_ADD("mcu", I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index afe88c299fe..0e128b57e4d 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -3243,11 +3243,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( system16b ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK_10MHz) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK_10MHz) MDRV_CPU_PROGRAM_MAP(system16b_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK_10MHz/2) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK_10MHz/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) @@ -3282,7 +3282,7 @@ static MACHINE_DRIVER_START( system16b_8751 ) MDRV_CPU_MODIFY("main") MDRV_CPU_VBLANK_INT("main", i8751_main_cpu_vblank) - MDRV_CPU_ADD_TAG("mcu", I8751, MASTER_CLOCK_8MHz) + MDRV_CPU_ADD("mcu", I8751, MASTER_CLOCK_8MHz) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 0346deb074d..55376a9fbb3 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -1266,11 +1266,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( system18 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system18_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 8000000) + MDRV_CPU_ADD("sound", Z80, 8000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) @@ -1310,7 +1310,7 @@ static MACHINE_DRIVER_START( system18_8751 ) MDRV_CPU_MODIFY("main") MDRV_CPU_VBLANK_INT_HACK(NULL,0) - MDRV_CPU_ADD(I8751, 8000000) + MDRV_CPU_ADD("mcu", I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index 86316d231fa..5722f493b9b 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -1897,11 +1897,11 @@ static const struct YM2151interface ym2151_interface = *************************************/ static MACHINE_DRIVER_START( system24 ) - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system24_cpu1_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq_vbl, 2) - MDRV_CPU_ADD(M68000, 10000000) + MDRV_CPU_ADD("sub", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system24_cpu2_map, 0) MDRV_INTERLEAVE(4) diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index d19697749df..ea2574625bf 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -2160,11 +2160,11 @@ static READ16_HANDLER( dual_pcb_masterslave ) static MACHINE_DRIVER_START( system32 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V60, MASTER_CLOCK/2) + MDRV_CPU_ADD("main", V60, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(system32_map,0) MDRV_CPU_VBLANK_INT("main", start_of_vblank_int) - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(system32_sound_map,0) MDRV_CPU_IO_MAP(system32_sound_portmap,0) @@ -2206,7 +2206,7 @@ static MACHINE_DRIVER_START( system32_v25 ) MDRV_IMPORT_FROM(system32) /* add a V25 for protection */ - MDRV_CPU_ADD(V25, 10000000) + MDRV_CPU_ADD("mcu", V25, 10000000) MDRV_CPU_PROGRAM_MAP(ga2_v25_map,0) MACHINE_DRIVER_END @@ -2214,11 +2214,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( multi32 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V70, MULTI32_CLOCK/2) + MDRV_CPU_ADD("main", V70, MULTI32_CLOCK/2) MDRV_CPU_PROGRAM_MAP(multi32_map,0) MDRV_CPU_VBLANK_INT("left", start_of_vblank_int) - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(multi32_sound_map,0) MDRV_CPU_IO_MAP(multi32_sound_portmap,0) diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index 9e075713b38..8fc46c50d3f 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -1122,13 +1122,13 @@ GFXDECODE_END static MACHINE_DRIVER_START( xboard ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD_TAG("sub", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK/4) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK/4) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) @@ -1165,7 +1165,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( smgp ) MDRV_IMPORT_FROM(xboard) - MDRV_CPU_ADD_TAG("comm", Z80, 4000000) + MDRV_CPU_ADD("comm", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(smgp_comm_map,0) MDRV_CPU_IO_MAP(smgp_comm_portmap,0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index b3cfbc50f3d..04820ee3e89 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -961,16 +961,16 @@ static const struct SEGAPCMinterface segapcm_interface = static MACHINE_DRIVER_START( yboard ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD_TAG("subx", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("subx", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(subx_map,0) - MDRV_CPU_ADD_TAG("suby", M68000, MASTER_CLOCK/4) + MDRV_CPU_ADD("suby", M68000, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(suby_map,0) - MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK/8) + MDRV_CPU_ADD("sound", Z80, SOUND_CLOCK/8) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 54841f06971..09d7d5e0b27 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1769,11 +1769,11 @@ static MACHINE_RESET( spi ) static MACHINE_DRIVER_START( spi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",I386, 50000000/2) /* Intel 386DX, 25MHz */ + MDRV_CPU_ADD("main",I386, 50000000/2) /* Intel 386DX, 25MHz */ MDRV_CPU_PROGRAM_MAP(spi_map, 0) MDRV_CPU_VBLANK_INT("main", spi_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 28636360/4) + MDRV_CPU_ADD("sound", Z80, 28636360/4) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(spisound_map, 0) @@ -2088,7 +2088,7 @@ static MACHINE_RESET( seibu386 ) static MACHINE_DRIVER_START( seibu386 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I386, 40000000) /* AMD 386DX, 40MHz */ + MDRV_CPU_ADD("main", I386, 40000000) /* AMD 386DX, 40MHz */ MDRV_CPU_PROGRAM_MAP(seibu386_map, 0) MDRV_CPU_VBLANK_INT("main", spi_interrupt) diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index 100da372324..53159cd0651 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -402,12 +402,12 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( nvram ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz? */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("mcu", NSC8105, 6000000) /* ??? */ + MDRV_CPU_ADD("mcu", NSC8105, 6000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(mcu_nvram_map,0) MDRV_INTERLEAVE(20) /* 20 CPU slices per frame - an high value to ensure proper */ diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index e267b70f61e..097d27fae5f 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -285,7 +285,7 @@ static INTERRUPT_GEN( sengokmj_interrupt ) static MACHINE_DRIVER_START( sengokmj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30, 16000000/2) /* V30-8 */ + MDRV_CPU_ADD("main", V30, 16000000/2) /* V30-8 */ MDRV_CPU_PROGRAM_MAP(sengokmj_map,0) MDRV_CPU_IO_MAP(sengokmj_io_map,0) MDRV_CPU_VBLANK_INT("main", sengokmj_interrupt) diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index 3299fa4bc44..25122a3bf55 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -647,11 +647,11 @@ static const struct Samplesinterface senjyo_samples_interface = static MACHINE_DRIVER_START( senjyo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", senjyo_interrupt) - MDRV_CPU_ADD_TAG("sub", Z80, 2000000) + MDRV_CPU_ADD("sub", Z80, 2000000) MDRV_CPU_CONFIG(daisy_chain) /* audio CPU */ /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 78b1b4802e0..ca0c4462b49 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -6715,11 +6715,11 @@ static INTERRUPT_GEN( tndrcade_sub_interrupt ) static MACHINE_DRIVER_START( tndrcade ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(tndrcade_readmem,tndrcade_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ + MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(tndrcade_sub_readmem,tndrcade_sub_writemem) MDRV_CPU_VBLANK_INT_HACK(tndrcade_sub_interrupt,TNDRCADE_SUB_INTERRUPTS_NUM) @@ -6765,11 +6765,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( twineagl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) - MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ + MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(twineagl_sub_readmem,twineagl_sub_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) @@ -6807,11 +6807,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( downtown ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) - MDRV_CPU_ADD(M65C02, XTAL_16MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(downtown_sub_readmem,downtown_sub_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) @@ -6867,11 +6867,11 @@ static INTERRUPT_GEN( calibr50_interrupt ) static MACHINE_DRIVER_START( usclssic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(usclssic_readmem,usclssic_writemem) MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM) - MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ + MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(calibr50_sub_readmem,calibr50_sub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI caused by main cpu when writing to the sound latch */ @@ -6914,11 +6914,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( calibr50 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(calibr50_readmem,calibr50_writemem) MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM) - MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ + MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(calibr50_sub_readmem,calibr50_sub_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* IRQ: 4/frame NMI: when the 68k writes the sound latch */ @@ -6958,11 +6958,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( metafox ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) - MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ + MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(metafox_sub_readmem,metafox_sub_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) @@ -7001,7 +7001,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( atehate ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(atehate_readmem,atehate_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7042,7 +7042,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blandia ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(blandia_readmem,blandia_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) @@ -7075,7 +7075,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blandiap ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(blandiap_readmem,blandiap_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) @@ -7112,7 +7112,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blockcar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(blockcar_readmem,blockcar_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) @@ -7147,7 +7147,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( daioh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(daioh_readmem,daioh_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7187,7 +7187,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( drgnunit ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(drgnunit_readmem,drgnunit_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7221,7 +7221,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( qzkklgy2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(drgnunit_readmem,drgnunit_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7257,7 +7257,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( eightfrc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7297,7 +7297,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( extdwnhl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(extdwnhl_readmem,extdwnhl_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7349,7 +7349,7 @@ static MACHINE_RESET( wrofaero ) { uPD71054_timer_init(); } static MACHINE_DRIVER_START( gundhara ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) #if __uPD71054_TIMER // MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) @@ -7398,7 +7398,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jjsquawk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7434,7 +7434,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kamenrid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(kamenrid_readmem,kamenrid_writemem) MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) @@ -7474,7 +7474,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( orbs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14318180/2) /* 7.143 MHz */ + MDRV_CPU_ADD("main", M68000, 14318180/2) /* 7.143 MHz */ MDRV_CPU_PROGRAM_MAP(orbs_readmem,orbs_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7509,7 +7509,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( krzybowl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(krzybowl_readmem,krzybowl_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7545,7 +7545,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( madshark ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(madshark_readmem,madshark_writemem) MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) @@ -7587,7 +7587,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( msgundam ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(msgundam_readmem,msgundam_writemem) #if __uPD71054_TIMER MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) @@ -7632,7 +7632,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( oisipuzl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(oisipuzl_readmem,oisipuzl_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7668,7 +7668,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( triplfun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(triplfun_readmem,triplfun_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) @@ -7702,7 +7702,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kiwame ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(kiwame_readmem,kiwame_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* lev 1-7 are the same. WARNING: the interrupt table is written to. */ @@ -7741,7 +7741,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rezon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -7779,7 +7779,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( thunderl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -7810,11 +7810,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wiggie ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 16000000/4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(wiggie_sound_readmem,wiggie_sound_writemem) /* video hardware */ @@ -7843,7 +7843,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wits ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -7879,7 +7879,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( umanclub ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(umanclub_readmem,umanclub_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) @@ -7914,12 +7914,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( utoukond ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(utoukond_readmem,utoukond_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) - MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 16000000/4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(utoukond_sound_readmem,utoukond_sound_writemem) MDRV_CPU_IO_MAP(utoukond_sound_readport,utoukond_sound_writeport) @@ -7959,7 +7958,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( wrofaero ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) #if __uPD71054_TIMER MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) @@ -8009,7 +8008,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( zingzip ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) @@ -8044,7 +8043,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pairlove ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(pairlove_readmem,pairlove_writemem) MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) @@ -8088,7 +8087,7 @@ static INTERRUPT_GEN( crazyfgt_interrupt ) static MACHINE_DRIVER_START( crazyfgt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(crazyfgt_map,0) MDRV_CPU_VBLANK_INT_HACK(crazyfgt_interrupt,1+5) @@ -8147,7 +8146,7 @@ static INTERRUPT_GEN( inttoote_interrupt ) static MACHINE_DRIVER_START( inttoote ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(inttoote_map,0) MDRV_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1) diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 73000e7624c..dd4f71e0e09 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -1810,7 +1810,7 @@ static const struct x1_010_interface x1_010_sound_intf = static MACHINE_DRIVER_START( mj4simai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",M68000,50000000/3) /* !! TMP68301 @ 16.666666MHz !! */ + MDRV_CPU_ADD("main",M68000,50000000/3) /* !! TMP68301 @ 16.666666MHz !! */ MDRV_CPU_PROGRAM_MAP(mj4simai_readmem,mj4simai_writemem) MDRV_CPU_VBLANK_INT("main", seta2_interrupt) diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 001d0d88608..5e3e9bab204 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -817,16 +817,15 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( sf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? xtal is 3.579545MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* ? xtal is 3.579545MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* NMIs are caused by the main CPU */ - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? xtal is 3.579545MHz */ + + MDRV_CPU_ADD("audio2", Z80, 3579545) /* ? xtal is 3.579545MHz */ MDRV_CPU_PROGRAM_MAP(sound2_readmem,sound2_writemem) MDRV_CPU_IO_MAP(sound2_readport,sound2_writeport) MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000) diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index 2d13ffbc7a9..dc722f0a3be 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -80,11 +80,11 @@ static VIDEO_UPDATE( sfkick ) static MACHINE_DRIVER_START( sfkick ) - MDRV_CPU_ADD_TAG("main", Z80,8000000) // ? + MDRV_CPU_ADD("main", Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(readmem,writemem) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - //MDRV_CPU_ADD(Z80,8000000) // ? + //MDRV_CPU_ADD("sub", Z80,8000000) // ? //MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index 4473aa5c185..f19d603f2e8 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -266,7 +266,7 @@ static const TMS9928a_interface tms9928a_interface = *************************************/ static MACHINE_DRIVER_START( sg1000a ) - MDRV_CPU_ADD_TAG("main", Z80, 3579545) /* 3.579545 Mhz */ + MDRV_CPU_ADD("main", Z80, 3579545) /* 3.579545 Mhz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", sg100a_interrupt) diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c index 610cb2df9eb..673000b32ff 100644 --- a/src/mame/drivers/sgladiat.c +++ b/src/mame/drivers/sgladiat.c @@ -144,15 +144,15 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( sgladiat ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sgladiat_cpuA_map,0) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("sub", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(sgladiat_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", snk_irq_BA) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sgladiat_sound_map,0) MDRV_CPU_IO_MAP(sgladiat_sound_portmap,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 244) // Marvin's frequency, sounds ok diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index 3341ff254a5..268e44a7d25 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -551,12 +551,11 @@ static INTERRUPT_GEN( shadfrce_interrupt ) { static MACHINE_DRIVER_START( shadfrce ) - MDRV_CPU_ADD_TAG("main", M68000, 28000000/2) /* ? Guess - CPU is rated for 16MHz */ + MDRV_CPU_ADD("main", M68000, 28000000/2) /* ? Guess - CPU is rated for 16MHz */ MDRV_CPU_PROGRAM_MAP(shadfrce_readmem,shadfrce_writemem) MDRV_CPU_VBLANK_INT_HACK(shadfrce_interrupt,2) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_GFXDECODE(shadfrce) diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 8f67ad7cdce..175d554f351 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -500,7 +500,7 @@ static const struct YM3438interface ym3438_interface = static MACHINE_DRIVER_START( shangha3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(shangha3_readmem,shangha3_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -536,11 +536,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( heberpop ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(heberpop_readmem,heberpop_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(heberpop_sound_readmem,heberpop_sound_writemem) MDRV_CPU_IO_MAP(heberpop_sound_readport,heberpop_sound_writeport) /* NMI triggered by YM3438 */ @@ -578,11 +578,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blocken ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(blocken_readmem,blocken_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(heberpop_sound_readmem,heberpop_sound_writemem) MDRV_CPU_IO_MAP(heberpop_sound_readport,heberpop_sound_writeport) /* NMI triggered by YM3438 */ diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index 7dacfc198a8..a230e547cc8 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -987,7 +987,7 @@ static const struct YM2203interface sh_ym2203_interface = static MACHINE_DRIVER_START( shanghai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,16000000/2) /* ? */ + MDRV_CPU_ADD("main", V30,16000000/2) /* ? */ MDRV_CPU_PROGRAM_MAP(shanghai_map,0) MDRV_CPU_IO_MAP(shanghai_portmap,0) MDRV_CPU_VBLANK_INT("main", shanghai_interrupt) @@ -1020,7 +1020,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( shangha2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,16000000/2) /* ? */ + MDRV_CPU_ADD("main", V30,16000000/2) /* ? */ MDRV_CPU_PROGRAM_MAP(shangha2_map,0) MDRV_CPU_IO_MAP(shangha2_portmap,0) MDRV_CPU_VBLANK_INT("main", shanghai_interrupt) @@ -1052,7 +1052,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kothello ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,16000000/2) /* ? */ + MDRV_CPU_ADD("main", V30,16000000/2) /* ? */ MDRV_CPU_PROGRAM_MAP(kothello_map, 0) MDRV_CPU_VBLANK_INT("main", shanghai_interrupt) diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 33a55d2f3cd..edb50bc9be0 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -384,16 +384,16 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( chinhero ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chinhero_main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chinhero_bbx_map,0) MDRV_CPU_IO_MAP(chinhero_bbx_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio", Z80, XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chinhero_sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) @@ -474,7 +474,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( dynamski ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* ? */ + MDRV_CPU_ADD("main", Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(dynamski_map,0) MDRV_CPU_IO_MAP(dynamski_portmap,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c index b0537f0e2db..ba830faa60b 100644 --- a/src/mame/drivers/shaolins.c +++ b/src/mame/drivers/shaolins.c @@ -218,7 +218,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( shaolins ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */ diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index 27455210e9b..be723594f77 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -241,13 +241,12 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( shisen ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz ? */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3579645) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579645) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index 949df465bc0..33a8d17396a 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -311,12 +311,11 @@ static INTERRUPT_GEN( shootout_interrupt ) static MACHINE_DRIVER_START( shootout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz? */ + MDRV_CPU_ADD("main", M6502, 2000000) /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", shootout_interrupt) /* nmi's are triggered at coin up */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -346,7 +345,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( shootouj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz? */ + MDRV_CPU_ADD("main", M6502, 2000000) /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem_alt,writemem_alt) MDRV_CPU_VBLANK_INT("main", shootout_interrupt) /* nmi's are triggered at coin up */ diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index b4e955573ff..b30c2991bd1 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -374,17 +374,17 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( shougi ) - MDRV_CPU_ADD_TAG("main", Z80,10000000/4) + MDRV_CPU_ADD("main", Z80,10000000/4) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", shougi_vblank_nmi) - MDRV_CPU_ADD(Z80,10000000/4) + MDRV_CPU_ADD("sub", Z80,10000000/4) MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_IO_MAP(readport_sub,0) /* NMIs triggered in shougi_vblank_nmi() */ /* MCU */ - MDRV_CPU_ADD(ALPHA8201, 10000000/4/8) + MDRV_CPU_ADD("mcu", ALPHA8201, 10000000/4/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 331fdf8f19f..b7d00a199f9 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -280,7 +280,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( shuuz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(shuuz) diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index 5f35e5b83d7..990a20fd27c 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -719,12 +719,11 @@ static const struct YM2151interface whizz_ym2151_interface = static MACHINE_DRIVER_START( sidearms ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -765,12 +764,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( turtship ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(turtship_readmem,turtship_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -810,12 +808,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( whizz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(whizz_readmem,whizz_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(whizz_sound_readmem,whizz_sound_writemem) MDRV_CPU_IO_MAP(whizz_readport,whizz_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index 1109255791c..8de174c0dbe 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -292,12 +292,11 @@ static const struct YM3526interface ym3526_interface = static MACHINE_DRIVER_START( sidepckt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* 2 MHz */ + MDRV_CPU_ADD("main", M6809, 2000000) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ /* 1.5 MHz */ + MDRV_CPU_ADD("audio", M6502, 1500000) /* 1.5 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* NMIs are triggered by the main cpu */ @@ -331,12 +330,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sidepctj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* 2 MHz */ + MDRV_CPU_ADD("main", M6809, 2000000) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,j_writemem) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ /* 1.5 MHz */ + MDRV_CPU_ADD("audio", M6502, 1500000) /* 1.5 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* NMIs are triggered by the main cpu */ diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 9ac93bfc01f..be7ff9cdb43 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -370,7 +370,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( silkroad ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 730f82b9a62..cd3cfb81629 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -479,7 +479,7 @@ static INTERRUPT_GEN( simpl156_vbl_interrupt ) static MACHINE_DRIVER_START( chainrec ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("DE156", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */ + MDRV_CPU_ADD("DE156", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */ MDRV_CPU_PROGRAM_MAP(chainrec_map,0) MDRV_CPU_VBLANK_INT("main", simpl156_vbl_interrupt) diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 19202c5a3f3..04bd999545f 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -262,11 +262,11 @@ static INTERRUPT_GEN( simpsons_irq ) static MACHINE_DRIVER_START( simpsons ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */ + MDRV_CPU_ADD("main", KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */ - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(z80_map,0) /* NMIs are generated by the 053260 */ diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index 36a756f1163..0a68e86eee1 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -255,7 +255,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( skullxbo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 92973d4488e..9a0d61a1a47 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -261,7 +261,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static MACHINE_DRIVER_START( skyarmy ) - MDRV_CPU_ADD_TAG("main", Z80,4000000) + MDRV_CPU_ADD("main", Z80,4000000) MDRV_CPU_PROGRAM_MAP(skyarmy_readmem,skyarmy_writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c index 6a112be88a6..42cb9a296e0 100644 --- a/src/mame/drivers/skydiver.c +++ b/src/mame/drivers/skydiver.c @@ -369,7 +369,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( skydiver ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800,3000000/4) /* ???? */ + MDRV_CPU_ADD("main", M6800,3000000/4) /* ???? */ MDRV_CPU_PROGRAM_MAP(skydiver_map, 0) MDRV_CPU_VBLANK_INT_HACK(skydiver_interrupt, 5) MDRV_WATCHDOG_VBLANK_INIT(8) // 128V clocks the same as VBLANK diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 80cb77ba168..f525d42cfcb 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -254,12 +254,11 @@ static INTERRUPT_GEN( skyfox_interrupt ) static MACHINE_DRIVER_START( skyfox ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(skyfox_readmem,skyfox_writemem) MDRV_CPU_VBLANK_INT("main", skyfox_interrupt) /* NMI caused by coin insertion */ - MDRV_CPU_ADD(Z80, 1748000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 1748000) MDRV_CPU_PROGRAM_MAP(skyfox_sound_readmem,skyfox_sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index 0ccb3b056f8..b24034bbea3 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -451,11 +451,11 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( skykid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,49152000/32) + MDRV_CPU_ADD("main", M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(skykid_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(HD63701,49152000/8) /* or compatible 6808 with extra instructions */ + MDRV_CPU_ADD("mcu", HD63701,49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index f144b39c1e5..c59814f48d6 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -429,7 +429,7 @@ static INTERRUPT_GEN( skylncr_vblank_interrupt ) static MACHINE_DRIVER_START( skylncr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 12000000/4) + MDRV_CPU_ADD("main", Z80, 12000000/4) MDRV_CPU_PROGRAM_MAP(mem_map_skylncr,0) MDRV_CPU_IO_MAP(io_map_skylncr,0) MDRV_CPU_VBLANK_INT("main", skylncr_vblank_interrupt) diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index 36752cdf60c..91da8c51389 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -261,7 +261,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( skyraid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 12) + MDRV_CPU_ADD("main", M6502, 12096000 / 12) MDRV_CPU_PROGRAM_MAP(skyraid_readmem, skyraid_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index f051f20fa51..e78f5b50dd2 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -831,12 +831,12 @@ static VIDEO_EOF( perfrman ) static MACHINE_DRIVER_START( perfrman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */ + MDRV_CPU_ADD("main", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(perfrman_readmem,perfrman_writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */ + MDRV_CPU_ADD("audio", Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(perfrman_sound_readmem,perfrman_sound_writemem) MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt,4) /* music speed, verified */ @@ -878,12 +878,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tigerhb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) + MDRV_CPU_ADD("main", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem) MDRV_CPU_IO_MAP(readport,tigerh_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD("audio", Z80, 6000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */ @@ -924,16 +924,16 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tigerh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_36MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_36MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem) MDRV_CPU_IO_MAP(tigerh_readport,tigerh_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_36MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */ - MDRV_CPU_ADD(M68705,XTAL_36MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -974,12 +974,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( slapfigh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80, XTAL_36MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main",Z80, XTAL_36MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_36MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt, 3) diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index cdb579465e2..408e944f836 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -554,12 +554,11 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( slapshot ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14346000) /* 28.6860 MHz / 2 ??? */ + MDRV_CPU_ADD("main", M68000, 14346000) /* 28.6860 MHz / 2 ??? */ MDRV_CPU_PROGRAM_MAP(slapshot_readmem,slapshot_writemem) MDRV_CPU_VBLANK_INT("main", slapshot_interrupt) - MDRV_CPU_ADD(Z80,32000000/8) - /* audio CPU */ /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80,32000000/8) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) MDRV_INTERLEAVE(10) @@ -596,12 +595,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( opwolf3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14346000) /* 28.6860 MHz / 2 ??? */ + MDRV_CPU_ADD("main", M68000, 14346000) /* 28.6860 MHz / 2 ??? */ MDRV_CPU_PROGRAM_MAP(opwolf3_readmem,opwolf3_writemem) MDRV_CPU_VBLANK_INT("main", slapshot_interrupt) - MDRV_CPU_ADD(Z80,32000000/8) - /* audio CPU */ /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80,32000000/8) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 3125b1d7a51..3d7987dff61 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -536,11 +536,11 @@ static INTERRUPT_GEN( sliver_int ) } static MACHINE_DRIVER_START( sliver ) - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(sliver_map,0) MDRV_CPU_VBLANK_INT_HACK(sliver_int,3) - MDRV_CPU_ADD(I8051, 8000000) + MDRV_CPU_ADD("audio", I8051, 8000000) MDRV_CPU_PROGRAM_MAP(soundmem_prg,0) MDRV_CPU_DATA_MAP(soundmem_data,0) MDRV_CPU_IO_MAP(soundmem_io,0) diff --git a/src/mame/drivers/smstrv.c b/src/mame/drivers/smstrv.c index 13d1a736b95..0977a1bd80e 100644 --- a/src/mame/drivers/smstrv.c +++ b/src/mame/drivers/smstrv.c @@ -226,7 +226,7 @@ static const ppi8255_interface ppi8255_intf[2] = static MACHINE_DRIVER_START( smstrv ) - MDRV_CPU_ADD_TAG("main", I8088,24000000/2) + MDRV_CPU_ADD("main", I8088,24000000/2) MDRV_CPU_PROGRAM_MAP(smstrv_map,0) // MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 2138587ad0c..7d6bf444514 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -815,16 +815,15 @@ GFXDECODE_END static MACHINE_DRIVER_START( tnk3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(YM3526_sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) @@ -859,16 +858,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( athena ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) @@ -907,16 +905,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ikari ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -955,16 +952,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( victroad ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1003,16 +999,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gwar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_8MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1049,17 +1044,16 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bermudat ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // 5MHz gives CPUB higher priority or ROM test will fail if the first NMI is triggered too early by CPUA - MDRV_CPU_ADD(Z80, 5000000) + MDRV_CPU_ADD("sub", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1096,16 +1090,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( psychos ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) @@ -1142,16 +1135,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( chopper1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1188,15 +1180,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tdfever ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", snk_irq_AB) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1236,16 +1228,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tdfever2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", snk_irq_AB) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("sub", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1284,16 +1275,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fsoccer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_8MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(Y8950_sound_map, 0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 3efd8c1862b..6ae716e52ec 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -599,11 +599,11 @@ static const struct upd7759_interface upd7759_interface = static MACHINE_DRIVER_START( pow ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_18MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_18MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(pow_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, XTAL_8MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sound", Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c index 3b577127a97..d0cba3d2e92 100644 --- a/src/mame/drivers/snookr10.c +++ b/src/mame/drivers/snookr10.c @@ -721,7 +721,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( snookr10 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */ + MDRV_CPU_ADD("main", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */ MDRV_CPU_PROGRAM_MAP(snookr10_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index 4e6a7315388..bc1fa5794bd 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -1553,11 +1553,11 @@ static MACHINE_RESET (finalttr) static MACHINE_DRIVER_START( snowbros ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 Mhz - confirmed */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 Mhz - confirmed */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3) - MDRV_CPU_ADD_TAG("sound", Z80, 6000000) /* 6 MHz - confirmed */ + MDRV_CPU_ADD("sound", Z80, 6000000) /* 6 MHz - confirmed */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -1651,11 +1651,11 @@ See included pics static MACHINE_DRIVER_START( honeydol ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(honeydol_readmem,honeydol_writemem) MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) + MDRV_CPU_ADD("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(honeydol_sound_readmem,honeydol_sound_writemem) MDRV_CPU_IO_MAP(honeydol_sound_readport,honeydol_sound_writeport) @@ -1691,11 +1691,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( twinadv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) // or 12 + MDRV_CPU_ADD("main", M68000, 16000000) // or 12 MDRV_CPU_PROGRAM_MAP(twinadv_readmem,twinadv_writemem) MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) + MDRV_CPU_ADD("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(twinadv_sound_readmem,twinadv_sound_writemem) MDRV_CPU_IO_MAP(twinadv_sound_readport,twinadv_sound_writeport) @@ -1772,7 +1772,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( snowbro3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16mhz or 12mhz ? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16mhz or 12mhz ? */ MDRV_CPU_PROGRAM_MAP(readmem3,writemem3) MDRV_CPU_VBLANK_INT_HACK(snowbro3_interrupt,3) diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index 87147a3d7c0..98a4707da85 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -204,11 +204,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( solomon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz (?????) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4.0 MHz (?????) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 3072000) + MDRV_CPU_ADD("audio", Z80, 3072000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? */ diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index e5b5f3a2550..6fcd7afa414 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -228,12 +228,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( sonson ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,12000000/6) /* 2 MHz ??? */ + MDRV_CPU_ADD("main", M6809,12000000/6) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6809,12000000/6) - /* audio CPU */ /* 2 MHz ??? */ + MDRV_CPU_ADD("audio", M6809,12000000/6) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c index 6b2c2a4097a..d31f6ab4ba1 100644 --- a/src/mame/drivers/spacefb.c +++ b/src/mame/drivers/spacefb.c @@ -357,11 +357,11 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( spacefb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, SPACEFB_MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, SPACEFB_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(spacefb_main_map,0) MDRV_CPU_IO_MAP(spacefb_main_io_map,0) - MDRV_CPU_ADD(I8035, SPACEFB_AUDIO_CPU_CLOCK) + MDRV_CPU_ADD("audio", I8035, SPACEFB_AUDIO_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(spacefb_audio_map,0) MDRV_CPU_IO_MAP(spacefb_audio_io_map,0) diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 286a8a5e7c4..bce43b45852 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -364,7 +364,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( spaceg ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,2500000) /* 2.5 MHz */ + MDRV_CPU_ADD("main", Z80,2500000) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(readwritemem,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* 60 Hz NMIs (verified) */ diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index cea1b7933aa..fb96c1bfe51 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -353,12 +353,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( spbactn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(spbactn_readmem,spbactn_writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index 6d20c459459..f26e3430cd3 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -258,12 +258,11 @@ static MACHINE_DRIVER_START( spcforce ) /* basic machine hardware */ /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ - MDRV_CPU_ADD_TAG("main", 8085A, 8000000 * 2) /* 4.00 MHz??? */ + MDRV_CPU_ADD("main", 8085A, 8000000 * 2) /* 4.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq3_line_hold) - MDRV_CPU_ADD(I8035,6144000) - /* audio CPU */ /* divisor ??? */ + MDRV_CPU_ADD("audio", I8035,6144000) /* divisor ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index c78a1fb0241..6882541e832 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -433,12 +433,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( spdodgeb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,12000000/6) /* 2MHz ? */ + MDRV_CPU_ADD("main", M6502,12000000/6) /* 2MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */ - MDRV_CPU_ADD(M6809,12000000/6) - /* audio CPU */ /* 2MHz ? */ + MDRV_CPU_ADD("audio", M6809,12000000/6) /* 2MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 528741be4d1..fc4a7090256 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -267,7 +267,7 @@ static GFXDECODE_START( speedatk ) GFXDECODE_END static MACHINE_DRIVER_START( speedatk ) - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) + MDRV_CPU_ADD("main", Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c index 2dbc991e93d..8678721295b 100644 --- a/src/mame/drivers/speedbal.c +++ b/src/mame/drivers/speedbal.c @@ -228,12 +228,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( speedbal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_cpu_map,0) MDRV_CPU_IO_MAP(main_cpu_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 2660000) /* 2.66 MHz ??? Maybe yes */ + MDRV_CPU_ADD("audio", Z80, 2660000) /* 2.66 MHz ??? Maybe yes */ MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0) MDRV_CPU_IO_MAP(sound_cpu_io_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index e32b7172dd7..2211f6ac9c3 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -302,12 +302,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( speedspn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,6000000) /* 6 MHz */ + MDRV_CPU_ADD("main",Z80,6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport, writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("audio", Z80,6000000) /* 6 MHz */ + MDRV_CPU_ADD("audio", Z80,6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) /* video hardware */ diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index 13eed70f9a4..a3c980a744d 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -267,13 +267,13 @@ static MACHINE_RESET(speglsht) static MACHINE_DRIVER_START( speglsht ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80, 8000000) /* 8 MHz ? */ + MDRV_CPU_ADD("main",Z80, 8000000) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(st0016_mem,0) MDRV_CPU_IO_MAP(st0016_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(R3000LE, 25000000) + MDRV_CPU_ADD("sub", R3000LE, 25000000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(speglsht_mem,0) MDRV_CPU_VBLANK_INT("main", irq4_gen) diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index 06603332e18..24fc93ff830 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -689,12 +689,12 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( spiders ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2800000) + MDRV_CPU_ADD("main", M6809, 2800000) MDRV_CPU_PROGRAM_MAP(spiders_main_map,0) MDRV_CPU_PERIODIC_INT(update_pia_1, 25) /* audio CPU */ - MDRV_CPU_ADD(M6802, 3000000) + MDRV_CPU_ADD("audio", M6802, 3000000) MDRV_CPU_PROGRAM_MAP(spiders_audio_map,0) MDRV_MACHINE_START(spiders) diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index b064360e1ad..d5040f67255 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -433,12 +433,11 @@ static const struct MSM5205interface splash_msm5205_interface = static MACHINE_DRIVER_START( splash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz (24/2) */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz (24/2) */ MDRV_CPU_PROGRAM_MAP(splash_readmem,splash_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80,30000000/8) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,30000000/8) MDRV_CPU_PROGRAM_MAP(splash_readmem_sound,splash_writemem_sound) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ @@ -485,12 +484,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( roldfrog ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz - verified */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz - verified */ MDRV_CPU_PROGRAM_MAP(roldfrog_readmem,roldfrog_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80,3000000) /* 3 MHz - verified */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,3000000) /* 3 MHz - verified */ MDRV_CPU_PROGRAM_MAP(roldf_sound_map,0) MDRV_CPU_IO_MAP(roldf_sound_io_map,0) // MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ @@ -524,12 +522,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( funystrp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz (24/2) */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz (24/2) */ MDRV_CPU_PROGRAM_MAP(funystrp_readmem,funystrp_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) -// MDRV_CPU_ADD(Z80,30000000/8) -// /* audio CPU */ +// MDRV_CPU_ADD("audio", Z80,30000000/8) // MDRV_CPU_PROGRAM_MAP(splash_readmem_sound,splash_writemem_sound) // MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 4423a077cf8..e604f20d2a5 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -301,12 +301,12 @@ static MACHINE_START( sprcros2 ) static MACHINE_DRIVER_START( sprcros2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,10000000/2) + MDRV_CPU_ADD("main", Z80,10000000/2) MDRV_CPU_PROGRAM_MAP(sprcros2_m_readmem,sprcros2_m_writemem) MDRV_CPU_IO_MAP(sprcros2_m_readport,sprcros2_m_writeport) MDRV_CPU_VBLANK_INT_HACK(sprcros2_m_interrupt,2) //1 nmi + 1 irq - MDRV_CPU_ADD(Z80,10000000/2) + MDRV_CPU_ADD("audio", Z80,10000000/2) MDRV_CPU_PROGRAM_MAP(sprcros2_s_readmem,sprcros2_s_writemem) MDRV_CPU_IO_MAP(0,sprcros2_s_writeport) MDRV_CPU_VBLANK_INT_HACK(sprcros2_s_interrupt,2) //2 nmis diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index dd5ae95bf1a..e62eaa6754c 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -501,7 +501,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( sprint2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) + MDRV_CPU_ADD("main", M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_VBLANK_INT("main", sprint2) MDRV_WATCHDOG_VBLANK_INIT(8) diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c index f573a7360be..ec97a9e2bde 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -404,7 +404,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( sprint4 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, PIXEL_CLOCK / 8) + MDRV_CPU_ADD("main", M6502, PIXEL_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(sprint4_cpu_map, 0) MDRV_WATCHDOG_VBLANK_INIT(8) diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index bf1e9adb34a..52ed1fe5f7c 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -465,7 +465,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( sprint8 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 11055000 / 11) /* ? */ + MDRV_CPU_ADD("main", M6800, 11055000 / 11) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_MACHINE_RESET(sprint8) diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index aa041f05038..3971468078f 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -536,12 +536,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( spy ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 3000000) /* ? */ + MDRV_CPU_ADD("main", M6809, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(spy_readmem,spy_writemem) MDRV_CPU_VBLANK_INT("main", spy_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(spy_sound_readmem,spy_sound_writemem) /* nmi by the sound chip */ diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 3fd59b2c64c..01b8d52066e 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -1066,7 +1066,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( srmp2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8.00 MHz */ + MDRV_CPU_ADD("main", M68000,16000000/2) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(srmp2_readmem,srmp2_writemem) MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */ @@ -1104,7 +1104,7 @@ static MACHINE_DRIVER_START( srmp3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3500000) /* 3.50 MHz ? */ + MDRV_CPU_ADD("main", Z80, 3500000) /* 3.50 MHz ? */ // 4000000, /* 4.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(srmp3_readmem,srmp3_writemem) MDRV_CPU_IO_MAP(srmp3_readport,srmp3_writeport) @@ -1143,7 +1143,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mjyuugi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8.00 MHz */ + MDRV_CPU_ADD("main", M68000,16000000/2) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(mjyuugi_readmem,mjyuugi_writemem) MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */ diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 2401fe012b0..e657e98db82 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -631,12 +631,12 @@ static const struct r3000_config config = static MACHINE_DRIVER_START( srmp5 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000) + MDRV_CPU_ADD("main",Z80,8000000) MDRV_CPU_PROGRAM_MAP(st0016_mem,0) MDRV_CPU_IO_MAP(st0016_io,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(R3000LE, 25000000) + MDRV_CPU_ADD("sub", R3000LE, 25000000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(srmp5_mem,0) MDRV_CPU_VBLANK_INT("main", irq4_gen) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 02e6f281384..2ddcdb6b64b 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -682,7 +682,7 @@ static const struct NiLe_interface nile_interface = }; static MACHINE_DRIVER_START( srmp6 ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(srmp6,0) MDRV_CPU_VBLANK_INT_HACK(srmp6_interrupt,2) diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index fee2710676f..1cb731cfabd 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -256,12 +256,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( srumbler ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz (?) */ + MDRV_CPU_ADD("main", M6809, 1500000) /* 1.5 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(srumbler_interrupt,2) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* 3 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index 27282bae900..ce16bf237ee 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -598,7 +598,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( ssfindo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM7, 54000000) // guess... + MDRV_CPU_ADD("main", ARM7, 54000000) // guess... MDRV_CPU_PROGRAM_MAP(ssfindo_map,0) MDRV_CPU_VBLANK_INT("main", ssfindo_interrupt) @@ -621,7 +621,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ppcar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", ARM7, 54000000) // guess... + MDRV_CPU_ADD("main", ARM7, 54000000) // guess... MDRV_CPU_PROGRAM_MAP(ppcar_map,0) MDRV_CPU_VBLANK_INT("main", ssfindo_interrupt) diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index dfb2bd10c8a..724194e5908 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -344,12 +344,11 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( sshangha ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 28000000/2) + MDRV_CPU_ADD("main", M68000, 28000000/2) MDRV_CPU_PROGRAM_MAP(sshangha_readmem,sshangha_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 16000000/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 16000000/4) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_RESET(sshangha) /* init machine */ diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 909938b20ee..c409cce33de 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -255,7 +255,7 @@ static INPUT_PORTS_START( ssingles ) INPUT_PORTS_END static MACHINE_DRIVER_START( ssingles ) - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(ssingles_map,0) MDRV_CPU_IO_MAP(ssingles_io_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index f3f6c53fc4a..0890e52e61a 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -728,11 +728,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( sslam ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(sslam_program_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(I8051, 12000000) + MDRV_CPU_ADD("audio", I8051, 12000000) MDRV_CPU_FLAGS(CPU_DISABLE) /* Internal code is not dumped - 2 boards were protected */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(0,0) @@ -762,11 +762,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( powerbls ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(powerbls_map, 0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(I8051, 12000000) + MDRV_CPU_ADD("audio", I8051, 12000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index ec16310e5a9..0cc26b4db83 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -233,12 +233,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( ssozumo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1200000) /* 1.2 MHz ???? */ + MDRV_CPU_ADD("main", M6502, 1200000) /* 1.2 MHz ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", ssozumo_interrupt) - MDRV_CPU_ADD(M6502, 975000) - /* audio CPU */ /* 975 kHz ?? */ + MDRV_CPU_ADD("audio", M6502, 975000) /* 975 kHz ?? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c index 36d2851c6a3..1fd3aadad20 100644 --- a/src/mame/drivers/sspeedr.c +++ b/src/mame/drivers/sspeedr.c @@ -219,7 +219,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( sspeedr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 19968000 / 8) + MDRV_CPU_ADD("main", Z80, 19968000 / 8) MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_IO_MAP(readport, writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index 82c68c7b2a6..9c42d9aaf21 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -164,7 +164,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( ssrj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) + MDRV_CPU_ADD("main", Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 15fe9917bb6..eeeaea507fd 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -181,7 +181,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( sstrangr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",8080,1996800) /* clock is a guess, taken from mw8080bw */ + MDRV_CPU_ADD("main",8080,1996800) /* clock is a guess, taken from mw8080bw */ MDRV_CPU_PROGRAM_MAP(sstrangr_map,0) MDRV_CPU_IO_MAP(sstrangr_io_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 001d28bdad8..0cb1ca6579f 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -2795,7 +2795,7 @@ static DRIVER_INIT( jsk ) { init_ssv(); static MACHINE_DRIVER_START( ssv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V60, 16000000) /* Based on STA-0001 & STA-0001B System boards */ + MDRV_CPU_ADD("main", V60, 16000000) /* Based on STA-0001 & STA-0001B System boards */ MDRV_CPU_VBLANK_INT_HACK(ssv_interrupt,2) /* Vblank */ MDRV_MACHINE_RESET(ssv) @@ -3077,7 +3077,7 @@ static MACHINE_DRIVER_START( jsk ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(jsk_readmem, jsk_writemem) - MDRV_CPU_ADD(V810,25000000) + MDRV_CPU_ADD("sub", V810,25000000) MDRV_CPU_PROGRAM_MAP(jsk_v810_mem, 0) /* video hardware */ diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index a9aab0c9481..00f28462d9a 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -418,7 +418,7 @@ static const struct ST0016interface st0016_interface = static MACHINE_DRIVER_START( st0016 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000) /* 8 MHz ? */ + MDRV_CPU_ADD("main",Z80,8000000) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(st0016_mem,0) MDRV_CPU_IO_MAP(st0016_io,0) @@ -450,7 +450,7 @@ static MACHINE_DRIVER_START( mayjinsn ) MDRV_IMPORT_FROM(st0016) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(st0016_m2_io,0) - MDRV_CPU_ADD(V810, 10000000)//25 Mhz ? + MDRV_CPU_ADD("sub", V810, 10000000)//25 Mhz ? MDRV_CPU_PROGRAM_MAP(v810_mem,0) MDRV_INTERLEAVE(1) MACHINE_DRIVER_END diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c index e4a667a46d8..c7bf1ada964 100644 --- a/src/mame/drivers/stactics.c +++ b/src/mame/drivers/stactics.c @@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( stactics ) MDRV_DRIVER_DATA(stactics_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 1933560) + MDRV_CPU_ADD("main", 8080, 1933560) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", stactics_interrupt) diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 5d224fea8a0..9cc96d60a74 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -245,12 +245,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( stadhero ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold)/* VBL */ - MDRV_CPU_ADD(M6502, 1500000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(audio_map,0) /* video hardware */ diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c index 90ed1957c79..75da8743fa7 100644 --- a/src/mame/drivers/starcrus.c +++ b/src/mame/drivers/starcrus.c @@ -170,7 +170,7 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( starcrus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080,9750000/9) /* 8224 chip is a divide by 9 */ + MDRV_CPU_ADD("main", 8080,9750000/9) /* 8224 chip is a divide by 9 */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c index ceb4dc0475f..380b4d27a4f 100644 --- a/src/mame/drivers/starfire.c +++ b/src/mame/drivers/starfire.c @@ -263,7 +263,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( starfire ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, STARFIRE_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, STARFIRE_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 2ffa607cd00..24e3ea2716b 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( starshp1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, STARSHP1_CPU_CLOCK) + MDRV_CPU_ADD("main", M6502, STARSHP1_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_VBLANK_INT("main", starshp1_interrupt) diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c index b1042561a1a..5f992c913b0 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -375,13 +375,12 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( starwars ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK / 8) + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12) MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(CLOCK_3KHZ / 128)) - MDRV_CPU_ADD(M6809, MASTER_CLOCK / 8) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, MASTER_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_RESET(starwars) diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index ea67a54052c..e9546b0047d 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -604,7 +604,7 @@ static INTERRUPT_GEN( statriv2_interrupt ) static MACHINE_DRIVER_START( statriv2 ) /* basic machine hardware */ /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ - MDRV_CPU_ADD_TAG("main",8085A,12400000*2) /* 12.4MHz / 4? */ + MDRV_CPU_ADD("main",8085A,12400000*2) /* 12.4MHz / 4? */ MDRV_CPU_PROGRAM_MAP(statriv2_readmem,statriv2_writemem) MDRV_CPU_IO_MAP(statriv2_readport,statriv2_writeport) MDRV_CPU_VBLANK_INT("main", statriv2_interrupt) diff --git a/src/mame/drivers/steaser.c b/src/mame/drivers/steaser.c index 888e71e65c4..3fdd5c7e985 100644 --- a/src/mame/drivers/steaser.c +++ b/src/mame/drivers/steaser.c @@ -229,7 +229,7 @@ static INTERRUPT_GEN( steaser_irq ) } static MACHINE_DRIVER_START( steaser ) - MDRV_CPU_ADD_TAG("main", M68000, 11059200 ) + MDRV_CPU_ADD("main", M68000, 11059200 ) MDRV_CPU_PROGRAM_MAP(steaser_map,0) MDRV_CPU_VBLANK_INT_HACK(steaser_irq,4) diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c index eac5b991ea1..0bab407a80b 100644 --- a/src/mame/drivers/stepstag.c +++ b/src/mame/drivers/stepstag.c @@ -120,11 +120,11 @@ static VIDEO_UPDATE(stepstag) static MACHINE_DRIVER_START( stepstag ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000 ) //?? + MDRV_CPU_ADD("main", M68000, 16000000 ) //?? MDRV_CPU_PROGRAM_MAP(stepstag_readmem,stepstag_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) // 4 & 6 valid - MDRV_CPU_ADD(M68000, 16000000 ) //?? + MDRV_CPU_ADD("sub", M68000, 16000000 ) //?? MDRV_CPU_PROGRAM_MAP(stepstag_sub_readmem,stepstag_sub_writemem) /* video hardware */ diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index 2aa785cb2cc..ca5c535c64e 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -454,12 +454,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( stfight ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 3 MHz */ + MDRV_CPU_ADD("main", Z80, 3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) MDRV_CPU_VBLANK_INT("main", stfight_vb_interrupt) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* 3 MHz */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) MDRV_CPU_PERIODIC_INT(irq0_line_hold,120) diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index 815b8873867..dca71d6a0ef 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -240,7 +240,7 @@ static NVRAM_HANDLER( stlforce ) static MACHINE_DRIVER_START( stlforce ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu", M68000, 15000000) + MDRV_CPU_ADD("cpu", M68000, 15000000) MDRV_CPU_PROGRAM_MAP(stlforce_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index 7ecea43a3e6..127e828d3da 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -335,11 +335,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( strnskil ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.000MHz */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(strnskil_readmem1,strnskil_writemem1) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) - MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ + MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(strnskil_readmem2,strnskil_writemem2) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 5c956873fe7..ee38a157508 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2576,16 +2576,16 @@ static MACHINE_RESET( stv ) static MACHINE_DRIVER_START( stv ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz + MDRV_CPU_ADD("main", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz MDRV_CPU_PROGRAM_MAP(stv_mem, 0) MDRV_CPU_VBLANK_INT_HACK(stv_interrupt,264)/*264 lines,224 display lines*/ MDRV_CPU_CONFIG(sh2_conf_master) - MDRV_CPU_ADD(SH2, MASTER_CLOCK_352/2) // 28.6364 MHz + MDRV_CPU_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz MDRV_CPU_PROGRAM_MAP(stv_mem, 0) MDRV_CPU_CONFIG(sh2_conf_slave) - MDRV_CPU_ADD(M68000, MASTER_CLOCK_352/5) //11.46 MHz + MDRV_CPU_ADD("audio", M68000, MASTER_CLOCK_352/5) //11.46 MHz MDRV_CPU_PROGRAM_MAP(sound_mem, 0) MDRV_MACHINE_START(stv) diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index b307b88e6a6..0a0ea608d29 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -184,7 +184,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( subs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,12096000/16) /* clock input is the "4H" signal */ + MDRV_CPU_ADD("main", M6502,12096000/16) /* clock input is the "4H" signal */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(subs_interrupt,4) diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 197998fa734..ecf991bedb3 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -263,7 +263,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( victor5 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z180, XTAL_12MHz / 3) // 4 MHz? + MDRV_CPU_ADD("main", Z180, XTAL_12MHz / 3) // 4 MHz? MDRV_CPU_PROGRAM_MAP(victor5_map,0) MDRV_CPU_IO_MAP(subsino_iomap,0) @@ -303,7 +303,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( srider ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z180, XTAL_12MHz / 3) // 4 MHz? + MDRV_CPU_ADD("main", Z180, XTAL_12MHz / 3) // 4 MHz? MDRV_CPU_PROGRAM_MAP(srider_map,0) MDRV_CPU_IO_MAP(subsino_iomap,0) diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 964daf366d0..0ab943e3190 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -852,21 +852,18 @@ static INTERRUPT_GEN( bssoccer_interrupt ) static MACHINE_DRIVER_START( bssoccer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(bssoccer_readmem,bssoccer_writemem) MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2) - MDRV_CPU_ADD(Z80, 3579545) /* Z80B */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* Z80B */ MDRV_CPU_PROGRAM_MAP(bssoccer_sound_readmem,bssoccer_sound_writemem) - MDRV_CPU_ADD(Z80, 5000000) /* Z80B */ - /* audio CPU */ + MDRV_CPU_ADD("pcm1", Z80, 5000000) /* Z80B */ MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_readmem,bssoccer_pcm_1_writemem) MDRV_CPU_IO_MAP(bssoccer_pcm_1_readport,bssoccer_pcm_1_writeport) - MDRV_CPU_ADD(Z80, 5000000) /* Z80B */ - /* audio CPU */ + MDRV_CPU_ADD("pcm2", Z80, 5000000) /* Z80B */ MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_2_readmem,bssoccer_pcm_2_writemem) MDRV_CPU_IO_MAP(bssoccer_pcm_2_readport,bssoccer_pcm_2_writeport) @@ -915,16 +912,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( uballoon ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(uballoon_readmem,uballoon_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* ? */ MDRV_CPU_PROGRAM_MAP(uballoon_sound_readmem,uballoon_sound_writemem) - MDRV_CPU_ADD(Z80, 5000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("pcm", Z80, 5000000) /* ? */ MDRV_CPU_PROGRAM_MAP(uballoon_pcm_1_readmem,uballoon_pcm_1_writemem) MDRV_CPU_IO_MAP(uballoon_pcm_1_readport,uballoon_pcm_1_writeport) @@ -968,17 +963,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sunaq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 24000000/4) + MDRV_CPU_ADD("main", M68000, 24000000/4) MDRV_CPU_PROGRAM_MAP(sunaq_readmem,sunaq_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 14318000/4) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 14318000/4) MDRV_CPU_PROGRAM_MAP(sunaq_sound_readmem,sunaq_sound_writemem) - - MDRV_CPU_ADD(Z80, 24000000/4) /* Z80B */ - /* audio CPU */ + MDRV_CPU_ADD("pcm", Z80, 24000000/4) /* Z80B */ MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_readmem,bssoccer_pcm_1_writemem) MDRV_CPU_IO_MAP(bssoccer_pcm_1_readport,bssoccer_pcm_1_writeport) @@ -1043,14 +1035,14 @@ static const struct AY8910interface bestbest_ay8910_interface = static MACHINE_DRIVER_START( bestbest ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 24000000/4) + MDRV_CPU_ADD("main", M68000, 24000000/4) MDRV_CPU_PROGRAM_MAP(bestbest_map,0) MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2) - MDRV_CPU_ADD(Z80, 24000000/4) + MDRV_CPU_ADD("audio", Z80, 24000000/4) MDRV_CPU_PROGRAM_MAP(bestbest_sound_map,0) - MDRV_CPU_ADD(Z80, 24000000/4) + MDRV_CPU_ADD("pcm", Z80, 24000000/4) MDRV_CPU_PROGRAM_MAP(bestbest_pcm_1_map,0) MDRV_CPU_IO_MAP(bestbest_pcm_1_iomap,0) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index a572d070c16..d73c525dd25 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -1552,13 +1552,12 @@ static const struct Samplesinterface suna8_samples_interface = static MACHINE_DRIVER_START( hardhead ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */ + MDRV_CPU_ADD("main", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_readmem,hardhead_writemem) MDRV_CPU_IO_MAP(hardhead_readport,hardhead_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* No NMI */ - MDRV_CPU_ADD(Z80, 24000000 / 4) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_sound_readmem,hardhead_sound_writemem) MDRV_CPU_IO_MAP(hardhead_sound_readport,hardhead_sound_writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ @@ -1607,13 +1606,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rranger ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */ + MDRV_CPU_ADD("main", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(rranger_readmem,rranger_writemem) MDRV_CPU_IO_MAP(rranger_readport,rranger_writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ & NMI ! */ - MDRV_CPU_ADD(Z80, 24000000 / 4) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(rranger_sound_readmem,rranger_sound_writemem) MDRV_CPU_IO_MAP(rranger_sound_readport,rranger_sound_writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMI = retn */ @@ -1665,18 +1663,18 @@ static INTERRUPT_GEN( brickzn_interrupt ) static MACHINE_DRIVER_START( brickzn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* SUNA PROTECTION BLOCK */ + MDRV_CPU_ADD("main", Z80, 24000000 / 4) /* SUNA PROTECTION BLOCK */ MDRV_CPU_PROGRAM_MAP(brickzn_readmem,brickzn_writemem) MDRV_CPU_IO_MAP(brickzn_readport,brickzn_writeport) // MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt, 2) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // nmi breaks ramtest but is needed! - MDRV_CPU_ADD_TAG("sound", Z80, 24000000 / 4) /* Z0840006PSC */ + MDRV_CPU_ADD("sound", Z80, 24000000 / 4) /* Z0840006PSC */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(brickzn_sound_readmem,brickzn_sound_writemem) MDRV_CPU_IO_MAP(brickzn_sound_readport,brickzn_sound_writeport) - MDRV_CPU_ADD_TAG("pcm", Z80, 24000000 / 4) /* Z0840006PSC */ + MDRV_CPU_ADD("pcm", Z80, 24000000 / 4) /* Z0840006PSC */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(brickzn_pcm_readmem,brickzn_pcm_writemem) MDRV_CPU_IO_MAP(brickzn_pcm_readport,brickzn_pcm_writeport) @@ -1770,14 +1768,13 @@ static const struct AY8910interface starfigh_ay8910_interface = static MACHINE_DRIVER_START( starfigh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */ + MDRV_CPU_ADD("main", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(starfigh_readmem,starfigh_writemem) MDRV_CPU_IO_MAP(starfigh_readport,starfigh_writeport) MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt,2) /* IRQ & NMI */ /* The sound section is identical to that of hardhead */ - MDRV_CPU_ADD(Z80, 24000000 / 4) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_sound_readmem,hardhead_sound_writemem) MDRV_CPU_IO_MAP(hardhead_sound_readport,hardhead_sound_writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ @@ -1831,12 +1828,11 @@ static INTERRUPT_GEN( sparkman_interrupt ) static MACHINE_DRIVER_START( sparkman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */ + MDRV_CPU_ADD("main", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(sparkman_readmem,sparkman_writemem) MDRV_CPU_VBLANK_INT_HACK(sparkman_interrupt,2) /* IRQ & NMI */ - MDRV_CPU_ADD(Z80, 24000000 / 4) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_sound_readmem,hardhead_sound_writemem) MDRV_CPU_IO_MAP(hardhead_sound_readport,hardhead_sound_writeport) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 5fcd1b3a179..40379b2dae4 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -373,12 +373,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( supbtime ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(supbtime_readmem,supbtime_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -414,12 +413,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( chinatwn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(chinatwn_readmem,chinatwn_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 76e5d5d47de..17f1c45cdb2 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -262,7 +262,7 @@ static VIDEO_UPDATE( supdrapo ) } static MACHINE_DRIVER_START( supdrapo ) - MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* ??? */ + MDRV_CPU_ADD("main", Z80,8000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index acc90a12c25..6631486efe3 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -414,14 +414,13 @@ static NVRAM_HANDLER( superchs ) static MACHINE_DRIVER_START( superchs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(superchs_readmem,superchs_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold)/* VBL */ TAITO_F3_SOUND_SYSTEM_CPU(16000000) - - MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(superchs_cpub_readmem,superchs_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 2b4fd18e685..b2206214d24 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -332,7 +332,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( superdq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/8) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(superdq_map,0) MDRV_CPU_IO_MAP(superdq_io,0) MDRV_CPU_VBLANK_INT("main", superdq_vblank) diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index 0cbc35a5f98..2dce6aee80d 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -982,7 +982,7 @@ static INTERRUPT_GEN( bootleg_interrupt ) static MACHINE_DRIVER_START( pbillian ) - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(pbillian_port_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) @@ -1015,12 +1015,12 @@ static MACHINE_DRIVER_START( pbillian ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( hotsmash ) - MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(hotsmash_port_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M68705, 4000000) /* ???? */ + MDRV_CPU_ADD("mcu", M68705, 4000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(m68705_map,0) MDRV_MACHINE_START(pbillian) @@ -1053,12 +1053,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sqix ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 12000000/2) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80, 12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(sqix_port_map,0) MDRV_CPU_VBLANK_INT_HACK(sqix_interrupt,6) /* ??? */ - MDRV_CPU_ADD(I8751, 12000000/3) /* ??? */ + MDRV_CPU_ADD("mcu", I8751, 12000000/3) /* ??? */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_io_map,0) @@ -1096,7 +1096,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sqixbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 12000000/2) /* 6 MHz */ + MDRV_CPU_ADD("main", Z80, 12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(bootleg_port_map,0) MDRV_CPU_VBLANK_INT_HACK(bootleg_interrupt,6) /* ??? */ diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index 47778c9363a..6c8b4e13b3e 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -410,7 +410,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( supertnk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */ + MDRV_CPU_ADD("main", TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */ MDRV_CPU_PROGRAM_MAP(supertnk_map,0) MDRV_CPU_IO_MAP(supertnk_io_map,0) MDRV_CPU_VBLANK_INT("main", supertnk_interrupt) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 19dce71546c..8e97021161a 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -291,7 +291,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( suprgolf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) + MDRV_CPU_ADD("main", Z80,4000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index f5a5f2c2b2c..ef0f94a8a2d 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -168,12 +168,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( suprloco ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */ diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 64b56ec2c5d..fe0079e9e6c 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -950,7 +950,7 @@ static const struct YMZ280Binterface ymz280b_intf = }; static MACHINE_DRIVER_START(skns) - MDRV_CPU_ADD_TAG("main", SH2,28638000) + MDRV_CPU_ADD("main", SH2,28638000) MDRV_CPU_PROGRAM_MAP(skns_readmem,skns_writemem) MDRV_CPU_VBLANK_INT_HACK(skns_interrupt,2) diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c index 1e10f1b4ed6..7b67d66de87 100644 --- a/src/mame/drivers/suprridr.c +++ b/src/mame/drivers/suprridr.c @@ -356,13 +356,12 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( suprridr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_49_152MHz/16) /* 3 MHz */ + MDRV_CPU_ADD("main", Z80, XTAL_49_152MHz/16) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT("main", main_nmi_gen) - MDRV_CPU_ADD(Z80, 10000000/4) /* 2.5 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 10000000/4) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index 2f1574fc71d..fb7a238fa00 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -326,12 +326,11 @@ static const struct YM2610interface ym2610_interface = /*** MACHINE DRIVER **********************************************************/ static MACHINE_DRIVER_START( suprslam ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(suprslam_readmem,suprslam_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(suprslam_sound_readport,suprslam_sound_writeport) diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index cabdefb8b46..d628fce90b6 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -237,7 +237,7 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( surpratk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 053248 */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* 053248 */ MDRV_CPU_PROGRAM_MAP(surpratk_readmem,surpratk_writemem) MDRV_CPU_VBLANK_INT("main", surpratk_interrupt) diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index 9daf202d2c9..ca418277273 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -2482,12 +2482,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( system1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* My Hero has 2 OSCs 8 & 20 MHz (Cabbe Info) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* My Hero has 2 OSCs 8 & 20 MHz (Cabbe Info) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) + MDRV_CPU_ADD("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */ diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 29018654c71..509e269c34c 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -443,10 +443,10 @@ static WRITE16_HANDLER( sys16_coinctrl_w ) static MACHINE_DRIVER_START( system16 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_VBLANK_INT("main", sys16_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) + MDRV_CPU_ADD("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index c8e912d0d80..1b27ca4dd2e 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -1090,10 +1090,10 @@ static DRIVER_INIT( astormbl ){ static MACHINE_DRIVER_START( system18 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, 8000000) + MDRV_CPU_ADD("sound", Z80, 8000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem_18,sound_writemem_18) MDRV_CPU_IO_MAP(sound_readport_18,sound_writeport_18) diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index d6bb753c007..07a186ef93b 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -254,12 +254,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( tagteam ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ?? */ + MDRV_CPU_ADD("main", M6502, 1500000) /* 1.5 MHz ?? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", tagteam_interrupt) - MDRV_CPU_ADD(M6502, 975000) - /* audio CPU */ /* 975 kHz ?? */ + MDRV_CPU_ADD("audio", M6502, 975000) /* 975 kHz ?? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index d8ccb75bce0..4c8fedb7ce7 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -240,12 +240,11 @@ static const struct YM2608interface ym2608_interface = static MACHINE_DRIVER_START( tail2nos ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,XTAL_20MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80,XTAL_20MHz/4) /* verified on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,XTAL_20MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_port_map,0) /* IRQs are triggered by the YM2608 */ diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 3d1629f6f6c..3c62c4f46e3 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -2454,11 +2454,11 @@ static MACHINE_RESET( mb87078 ) static MACHINE_DRIVER_START( rastsag2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(rastsag2_readmem,rastsag2_writemem) MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2492,11 +2492,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ashura ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(rastsag2_readmem,rastsag2_writemem) MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2530,11 +2530,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( crimec ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(crimec_readmem,crimec_writemem) MDRV_CPU_VBLANK_INT("main", crimec_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2568,11 +2568,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tetrist ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ???*/ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ???*/ MDRV_CPU_PROGRAM_MAP(tetrist_readmem,tetrist_writemem) MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2605,11 +2605,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tetrista ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(tetrista_readmem,tetrista_writemem) MDRV_CPU_VBLANK_INT("main", masterw_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(masterw_sound_readmem,masterw_sound_writemem) MDRV_INTERLEAVE(10) @@ -2643,11 +2643,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hitice ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(hitice_readmem, hitice_writemem) MDRV_CPU_VBLANK_INT("main", hitice_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(viofight_sound_readmem, viofight_sound_writemem) MDRV_INTERLEAVE(10) @@ -2687,11 +2687,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rambo3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rambo3_readmem,rambo3_writemem) MDRV_CPU_VBLANK_INT("main", rambo3_interrupt) - MDRV_CPU_ADD(Z80, XTAL_24MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_24MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2725,11 +2725,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rambo3a ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rambo3_readmem,rambo3_writemem) MDRV_CPU_VBLANK_INT("main", rambo3_interrupt) - MDRV_CPU_ADD(Z80, XTAL_24MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_24MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2763,11 +2763,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pbobble ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(pbobble_readmem,pbobble_writemem) MDRV_CPU_VBLANK_INT("main", pbobble_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2804,11 +2804,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( spacedx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(spacedx_readmem,spacedx_writemem) MDRV_CPU_VBLANK_INT("main", pbobble_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2845,11 +2845,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( spacedxo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(spacedxo_readmem,spacedxo_writemem) MDRV_CPU_VBLANK_INT("main", selfeena_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2883,11 +2883,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( qzshowby ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz according to the readme*/ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz according to the readme*/ MDRV_CPU_PROGRAM_MAP(qzshowby_readmem,qzshowby_writemem) MDRV_CPU_VBLANK_INT("main", pbobble_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -2924,11 +2924,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( viofight ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(viofight_readmem,viofight_writemem) MDRV_CPU_VBLANK_INT("main", viofight_interrupt) - MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz verified */ + MDRV_CPU_ADD("audio", Z80, 6000000) /* 6 MHz verified */ MDRV_CPU_PROGRAM_MAP(viofight_sound_readmem, viofight_sound_writemem) MDRV_INTERLEAVE(10) @@ -2966,11 +2966,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( masterw ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(masterw_readmem,masterw_writemem) MDRV_CPU_VBLANK_INT("main", masterw_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(masterw_sound_readmem,masterw_sound_writemem) MDRV_INTERLEAVE(10) @@ -3005,11 +3005,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( silentd ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(silentd_readmem,silentd_writemem) MDRV_CPU_VBLANK_INT("main", silentd_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -3043,11 +3043,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( selfeena ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(selfeena_readmem,selfeena_writemem) MDRV_CPU_VBLANK_INT("main", selfeena_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -3090,11 +3090,11 @@ static void ryujin_patch(void) static MACHINE_DRIVER_START( ryujin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(selfeena_readmem,selfeena_writemem) MDRV_CPU_VBLANK_INT("main", selfeena_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) @@ -3135,11 +3135,11 @@ static void sbm_patch(void) static MACHINE_DRIVER_START( sbm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(sbm_readmem,sbm_writemem) MDRV_CPU_VBLANK_INT("main", sbm_interrupt) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index a1efa88bb92..1658015c659 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3736,10 +3736,10 @@ static MACHINE_RESET( qcrayon ) static MACHINE_DRIVER_START( taito_f2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 24000000/2) /* 12 MHz */ MDRV_CPU_VBLANK_INT("main", taitof2_interrupt) - MDRV_CPU_ADD_TAG("audio", Z80, 24000000/6) /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 24000000/6) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_START(f2) @@ -4188,12 +4188,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( camltrya ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cameltry_readmem,cameltry_writemem) MDRV_CPU_VBLANK_INT("main", taitof2_interrupt) - MDRV_CPU_ADD(Z80,24000000/4) /* verifed on pcb */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,24000000/4) /* verifed on pcb */ MDRV_CPU_PROGRAM_MAP(camltrya_sound_readmem,camltrya_sound_writemem) /* video hardware */ @@ -4230,12 +4229,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( driveout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(driveout_readmem,driveout_writemem) MDRV_CPU_VBLANK_INT("main", taitof2_interrupt) - MDRV_CPU_ADD(Z80,24000000/6) /* 4 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80,24000000/6) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(driveout_sound_readmem,driveout_sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 63035cf94ca..f1f68f8ed94 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -407,7 +407,7 @@ static MACHINE_START(f3) static MACHINE_DRIVER_START( f3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(f3_readmem,f3_writemem) MDRV_CPU_VBLANK_INT("main", f3_interrupt2) @@ -492,7 +492,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( bubsympb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(f3_readmem,f3_writemem) MDRV_CPU_VBLANK_INT("main", f3_interrupt2) diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 7d85a170110..d60b657cedb 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -580,11 +580,11 @@ static MACHINE_START( taitoh ) static MACHINE_DRIVER_START( syvalion ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000 / 2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(syvalion_readmem,syvalion_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_START(taitoh) @@ -619,11 +619,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( recordbr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000 / 2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(recordbr_readmem,recordbr_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_START(taitoh) @@ -658,11 +658,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dleague ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000 / 2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(dleague_readmem,dleague_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_MACHINE_START(taitoh) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index f0b14176ce1..068c915cff4 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -2170,15 +2170,15 @@ static const struct YM2203interface ym2203_interface_single = static MACHINE_DRIVER_START( fhawk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu1", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ + MDRV_CPU_ADD("cpu1", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ MDRV_CPU_PROGRAM_MAP(fhawk_readmem,fhawk_writemem) MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) - MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* verified on pcb */ + MDRV_CPU_ADD("sound", Z80, 4000000) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(fhawk_3_readmem,fhawk_3_writemem) - MDRV_CPU_ADD_TAG("cpu2", Z80, 12000000/3) /* verified on pcb */ + MDRV_CPU_ADD("cpu2", Z80, 12000000/3) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(fhawk_2_readmem,fhawk_2_writemem) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,3) /* fixes slow down problems */ @@ -2270,11 +2270,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kurikint ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ + MDRV_CPU_ADD("main", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ MDRV_CPU_PROGRAM_MAP(kurikint_readmem,kurikint_writemem) MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) - MDRV_CPU_ADD( Z80, 12000000/3) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, 12000000/3) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kurikint_2_readmem,kurikint_2_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -2321,7 +2321,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( plotting ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ + MDRV_CPU_ADD("main", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ MDRV_CPU_PROGRAM_MAP(plotting_readmem,plotting_writemem) MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) @@ -2410,11 +2410,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( evilston ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 13330560/2) /* not verfied */ + MDRV_CPU_ADD("main", Z80, 13330560/2) /* not verfied */ MDRV_CPU_PROGRAM_MAP(evilston_readmem,evilston_writemem) MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) - MDRV_CPU_ADD(Z80, 12000000/3) /* not verified */ + MDRV_CPU_ADD("audio", Z80, 12000000/3) /* not verified */ MDRV_CPU_PROGRAM_MAP(evilston_2_readmem,evilston_2_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 25e1e43b0e8..84e314738fd 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -1004,11 +1004,11 @@ static MACHINE_START( taitox ) static MACHINE_DRIVER_START( superman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(superman_readmem,superman_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -1044,11 +1044,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( daisenpu ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(daisenpu_readmem,daisenpu_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(daisenpu_sound_readmem,daisenpu_sound_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -1081,11 +1081,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gigandes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz? */ MDRV_CPU_PROGRAM_MAP(gigandes_readmem,gigandes_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(ballbros_sound_readmem,ballbros_sound_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -1120,11 +1120,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ballbros ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz? */ MDRV_CPU_PROGRAM_MAP(ballbros_readmem,ballbros_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(ballbros_sound_readmem,ballbros_sound_writemem) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index a3026d2c1b4..61bf86fef69 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -3041,15 +3041,14 @@ Contcirc road glitchiness in attract? static MACHINE_DRIVER_START( contcirc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(contcirc_readmem,contcirc_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(contcirc_cpub_readmem,contcirc_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -3098,15 +3097,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( chasehq ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(chasehq_readmem,chasehq_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(chq_cpub_readmem,chq_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3153,15 +3151,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( enforce ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(enforce_readmem,enforce_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(enforce_cpub_readmem,enforce_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -3211,11 +3208,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bshark ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(bshark_readmem,bshark_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(bshark_cpub_readmem,bshark_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3263,15 +3260,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sci ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sci_readmem,sci_writemem) MDRV_CPU_VBLANK_INT("main", sci_interrupt) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sci_cpub_readmem,sci_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3319,15 +3315,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nightstr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(nightstr_readmem,nightstr_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(nightstr_cpub_readmem,nightstr_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3376,15 +3371,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( aquajack ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(aquajack_readmem,aquajack_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(aquajack_cpub_readmem,aquajack_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3432,11 +3426,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( spacegun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(spacegun_readmem,spacegun_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(spacegun_cpub_readmem,spacegun_cpub_writemem) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -3484,15 +3478,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dblaxle ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(dblaxle_readmem,dblaxle_writemem) MDRV_CPU_VBLANK_INT("main", dblaxle_interrupt) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(dblaxle_cpub_readmem,dblaxle_cpub_writemem) MDRV_CPU_VBLANK_INT("main", dblaxle_cpub_interrupt) @@ -3540,15 +3533,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( racingb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(racingb_readmem,racingb_writemem) MDRV_CPU_VBLANK_INT("main", dblaxle_interrupt) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) - MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(racingb_cpub_readmem,racingb_cpub_writemem) MDRV_CPU_VBLANK_INT("main", dblaxle_cpub_interrupt) diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 55f51138c98..965c43ab8b4 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -594,14 +594,14 @@ static const struct YM2610interface airsys_ym2610_interface = static MACHINE_DRIVER_START( airsys ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000,24000000 / 2) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(airsys_map, 0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_ADD(TMS32025,24000000) /* 24 MHz ??? */// + MDRV_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz ??? */// MDRV_CPU_PROGRAM_MAP(DSP_map_program, 0) MDRV_CPU_DATA_MAP(DSP_map_data, 0) MDRV_CPU_IO_MAP(DSP_map_io, 0) diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index b390626f130..d315b3c33bc 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1268,18 +1268,18 @@ static INTERRUPT_GEN( taitojc_int6 ) } static MACHINE_DRIVER_START( taitojc ) - MDRV_CPU_ADD_TAG("main", M68040, 25000000) + MDRV_CPU_ADD("main", M68040, 25000000) MDRV_CPU_PROGRAM_MAP(taitojc_map, 0) MDRV_CPU_VBLANK_INT("main", taitojc_vblank) MDRV_CPU_PERIODIC_INT(taitojc_int6, 1000) TAITO_F3_SOUND_SYSTEM_CPU(16000000) - MDRV_CPU_ADD(MC68HC11, 4000000) + MDRV_CPU_ADD("sub", MC68HC11, 4000000) MDRV_CPU_PROGRAM_MAP(hc11_pgm_map, 0) MDRV_CPU_IO_MAP(hc11_io_map, 0) - MDRV_CPU_ADD(TMS32051, 50000000) + MDRV_CPU_ADD("dsp", TMS32051, 50000000) MDRV_CPU_PROGRAM_MAP(tms_program_map, 0) MDRV_CPU_DATA_MAP(tms_data_map, 0) diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index 276e7ac4d56..0fc1802b0ec 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -1820,12 +1820,12 @@ static const struct AY8910interface ay8910_interface_4 = static MACHINE_DRIVER_START( nomcu ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,8000000/2) /* 4 MHz */ + MDRV_CPU_ADD("main",Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(taitosj_main_nomcu_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* audio CPU */ /* 3 MHz */ - MDRV_CPU_ADD_TAG("audio", Z80,6000000/2) + MDRV_CPU_ADD("audio", Z80,6000000/2) MDRV_CPU_PROGRAM_MAP(taitosj_audio_map,0) /* interrupts: */ /* - no interrupts synced with vblank */ @@ -1882,7 +1882,7 @@ static MACHINE_DRIVER_START( mcu ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(taitosj_main_mcu_map,0) - MDRV_CPU_ADD(M68705,3000000) /* xtal is 3MHz, divided by 4 internally */ + MDRV_CPU_ADD("mcu", M68705,3000000) /* xtal is 3MHz, divided by 4 internally */ MDRV_CPU_PROGRAM_MAP(taitosj_mcu_map,0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 744459e2c5d..d00b743906e 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -599,7 +599,7 @@ static const struct pit8253_config taitowlf_pit8254_config = static MACHINE_DRIVER_START(taitowlf) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PENTIUM, 200000000) + MDRV_CPU_ADD("main", PENTIUM, 200000000) MDRV_CPU_PROGRAM_MAP(taitowlf_map, 0) MDRV_CPU_IO_MAP(taitowlf_io, 0) diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c index 6422e4ddeed..ee822c5da0a 100644 --- a/src/mame/drivers/tank8.c +++ b/src/mame/drivers/tank8.c @@ -329,7 +329,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( tank8 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 11055000 / 10) /* ? */ + MDRV_CPU_ADD("main", M6800, 11055000 / 10) /* ? */ MDRV_CPU_PROGRAM_MAP(tank8_cpu_map, 0) MDRV_MACHINE_RESET(tank8) diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index 60040b4311d..c37776372ab 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -275,7 +275,7 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( tankbatt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 1000000) /* 1 MHz ???? */ + MDRV_CPU_ADD("main", M6502, 1000000) /* 1 MHz ???? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", tankbatt_interrupt) diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index d7ec009e8b0..dd14d8f89f5 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -336,11 +336,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( tankbust ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* 3.072 MHz ? */ + MDRV_CPU_ADD("sub", Z80, 4000000) /* 3.072 MHz ? */ MDRV_CPU_PROGRAM_MAP(map_cpu2,0) MDRV_CPU_IO_MAP(port_map_cpu2,0) diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 467247f4c15..ae087368df0 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -331,12 +331,12 @@ static const struct YM2610interface ym2610_interface = }; static MACHINE_DRIVER_START( taotaido ) - MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) + MDRV_CPU_ADD("main", M68000, 32000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* audio CPU */ - MDRV_CPU_ADD(Z80,20000000/4) // ?? + MDRV_CPU_ADD("audio", Z80,20000000/4) // ?? MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_port_map,0) /* IRQs are triggered by the YM2610 */ diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c index e984cbd8c73..ac25f0c4d18 100644 --- a/src/mame/drivers/targeth.c +++ b/src/mame/drivers/targeth.c @@ -179,7 +179,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( targeth ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(targeth_interrupt,3) diff --git a/src/mame/drivers/tarzan.c b/src/mame/drivers/tarzan.c index 12a336e5b44..58d4269ef2a 100644 --- a/src/mame/drivers/tarzan.c +++ b/src/mame/drivers/tarzan.c @@ -90,7 +90,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( tarzan ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? */ + MDRV_CPU_ADD("main", Z80,8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(tarzan_map,0) /* video hardware */ diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index 63c2d361b63..c371cfce3e1 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -833,17 +833,17 @@ static INTERRUPT_GEN( roundup5_interrupt ) static MACHINE_DRIVER_START( apache3 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */ + MDRV_CPU_ADD("main", V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(apache3_v30_map,0) MDRV_CPU_VBLANK_INT("main", roundup5_interrupt) - MDRV_CPU_ADD(M68000,20000000 / 2) /* 68000 CPU, 20MHz / 2 */ + MDRV_CPU_ADD("sub", M68000,20000000 / 2) /* 68000 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(apache3_68000_map,0) - MDRV_CPU_ADD(V20, 8000000) //??? + MDRV_CPU_ADD("audio", V20, 8000000) //??? MDRV_CPU_PROGRAM_MAP(apache3_v20_map,0) - MDRV_CPU_ADD(Z80, 8000000) //??? + MDRV_CPU_ADD("sub2", Z80, 8000000) //??? MDRV_CPU_PROGRAM_MAP(apache3_z80_map,0) MDRV_INTERLEAVE(100) @@ -879,14 +879,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( roundup5 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */ + MDRV_CPU_ADD("main", V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(roundup5_v30_map,0) MDRV_CPU_VBLANK_INT("main", roundup5_interrupt) - MDRV_CPU_ADD(M68000,20000000 / 2) /* 68000 CPU, 20MHz / 2 */ + MDRV_CPU_ADD("sub", M68000,20000000 / 2) /* 68000 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(roundup5_68000_map,0) - MDRV_CPU_ADD(Z80, 4000000) //??? + MDRV_CPU_ADD("audio", Z80, 4000000) //??? MDRV_CPU_PROGRAM_MAP(roundup5_z80_map,0) MDRV_INTERLEAVE(100) @@ -922,15 +922,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cyclwarr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 50000000 / 4) /* Confirmed */ + MDRV_CPU_ADD("main", M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_68000a_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */ + MDRV_CPU_ADD("sub", M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_68000b_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 16000000 / 4) /* Confirmed */ + MDRV_CPU_ADD("audio", Z80, 16000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0) MDRV_INTERLEAVE(200) @@ -966,15 +966,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bigfight ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 50000000 / 4) /* Confirmed */ + MDRV_CPU_ADD("main", M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(bigfight_68000a_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */ + MDRV_CPU_ADD("sub", M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(bigfight_68000b_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, 16000000 / 4) /* Confirmed */ + MDRV_CPU_ADD("audio", Z80, 16000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0) MDRV_INTERLEAVE(200) diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 192b1d1b780..129b47a9522 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -181,7 +181,7 @@ static PALETTE_INIT( tattack ) static MACHINE_DRIVER_START( tattack ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000 / 2) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80, 8000000 / 2) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(mem, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c index a81fe960fc7..8467772ca20 100644 --- a/src/mame/drivers/taxidrvr.c +++ b/src/mame/drivers/taxidrvr.c @@ -360,15 +360,15 @@ static const struct AY8910interface ay8910_interface_2 = static MACHINE_DRIVER_START( taxidrvr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("main", Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("sub", Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ - MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpu3_map,0) MDRV_CPU_IO_MAP(cpu3_port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 259efe494b8..0f8b85fd023 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -586,18 +586,17 @@ The game is displayed on 2 monitors static MACHINE_DRIVER_START( tbowl ) /* CPU on Board '6206B' */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ + MDRV_CPU_ADD("main", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ MDRV_CPU_PROGRAM_MAP(readmem_6206B,writemem_6206B) MDRV_CPU_VBLANK_INT("left", irq0_line_hold) /* CPU on Board '6206C' */ - MDRV_CPU_ADD(Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ + MDRV_CPU_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ MDRV_CPU_PROGRAM_MAP(readmem_6206C,writemem_6206C) MDRV_CPU_VBLANK_INT("left", irq0_line_hold) /* CPU on Board '6206A' */ - MDRV_CPU_ADD(Z80, 4000000) /* Actual Z80 */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* Actual Z80 */ MDRV_CPU_PROGRAM_MAP(readmem_6206A,writemem_6206A) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index 369f047d87d..76128ca7045 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -382,23 +382,21 @@ static MACHINE_RESET( tceptor ) static MACHINE_DRIVER_START( tceptor ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 49152000/32) + MDRV_CPU_ADD("main", M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(m6809_map,0) MDRV_CPU_VBLANK_INT("2D", m6809_vb_interrupt) - MDRV_CPU_ADD(M65C02, 49152000/24) - /* audio CPU */ + MDRV_CPU_ADD("audio", M65C02, 49152000/24) MDRV_CPU_PROGRAM_MAP(m6502_a_map,0) - MDRV_CPU_ADD(M65C02, 49152000/24) - /* audio CPU */ + MDRV_CPU_ADD("audio2", M65C02, 49152000/24) MDRV_CPU_PROGRAM_MAP(m6502_b_map,0) - MDRV_CPU_ADD(M68000, 49152000/4) + MDRV_CPU_ADD("sub", M68000, 49152000/4) MDRV_CPU_PROGRAM_MAP(m68k_map,0) MDRV_CPU_VBLANK_INT("2D", m68k_vb_interrupt) - MDRV_CPU_ADD(HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ + MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_io_map,0) MDRV_CPU_VBLANK_INT("2D", mcu_vb_interrupt) diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c index 49cdbf865dc..40e41c38067 100644 --- a/src/mame/drivers/tcl.c +++ b/src/mame/drivers/tcl.c @@ -110,7 +110,7 @@ static const ppi8255_interface ppi8255_intf[2] = static MACHINE_DRIVER_START( tcl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/4) + MDRV_CPU_ADD("main", Z80,12000000/4) MDRV_CPU_PROGRAM_MAP(tcl_map,0) /* video hardware */ diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 898996ab90e..0d211ea9ce4 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -565,11 +565,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( rygar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_24MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_24MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,rygar_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("sound", Z80, XTAL_4MHz) /* verified on pcb */ + MDRV_CPU_ADD("sound", Z80, XTAL_4MHz) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(rygar_sound_readmem,rygar_sound_writemem) diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index 5f43c1eb1d1..5045913d37e 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -440,12 +440,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( fstarfrc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(fstarfrc_readmem,fstarfrc_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4MHz */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* NMIs are triggered by the main CPU */ MDRV_INTERLEAVE(10) @@ -481,12 +480,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ginkun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(ginkun_readmem,ginkun_writemem) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80,8000000/2) - /* audio CPU */ /* 4MHz */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* NMIs are triggered by the main CPU */ MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 789ddcb3790..e83222fc952 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -918,13 +918,13 @@ static const struct YMZ280Binterface ymz280b_interface = static MACHINE_DRIVER_START( deroon ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_WATCHDOG_VBLANK_INIT(400) // guess /* audio CPU */ - MDRV_CPU_ADD(Z80, 16000000/2 ) /* 8 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 16000000/2 ) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(readport,writeport) diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index 0e6b0fcf6ae..6f1941b6696 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -664,15 +664,15 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( tehkanwc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/4) /* 18.432000 / 4 */ + MDRV_CPU_ADD("main", Z80, 18432000/4) /* 18.432000 / 4 */ MDRV_CPU_PROGRAM_MAP(main_mem,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 18432000/4) + MDRV_CPU_ADD("sub", Z80, 18432000/4) MDRV_CPU_PROGRAM_MAP(sub_mem,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 18432000/4) + MDRV_CPU_ADD("audio", Z80, 18432000/4) MDRV_CPU_PROGRAM_MAP(sound_mem,0) MDRV_CPU_IO_MAP(sound_port,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index 70fcda49da4..e9a6db35457 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -581,7 +581,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( tempest ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK / 8) + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12) MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(CLOCK_3KHZ / 256)) diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c index 11d51244fb8..d78984573f3 100644 --- a/src/mame/drivers/terracre.c +++ b/src/mame/drivers/terracre.c @@ -562,12 +562,11 @@ static GFXDECODE_START( terracre ) GFXDECODE_END static MACHINE_DRIVER_START( amazon ) - MDRV_CPU_ADD_TAG("main", M68000, 8000000 ) + MDRV_CPU_ADD("main", M68000, 8000000 ) MDRV_CPU_PROGRAM_MAP(amazon_readmem,amazon_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport_3526) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */ @@ -602,12 +601,11 @@ static MACHINE_DRIVER_START( amazon ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ym3526 ) - MDRV_CPU_ADD_TAG("main", M68000, 8000000 ) + MDRV_CPU_ADD("main", M68000, 8000000 ) MDRV_CPU_PROGRAM_MAP(terracre_readmem,terracre_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport_3526) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */ @@ -640,12 +638,11 @@ static MACHINE_DRIVER_START( ym3526 ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ym2203 ) - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(terracre_readmem,terracre_writemem) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* 4 MHz???? */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport_2203) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */ diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index 4e56ebe6a32..231b20d73ca 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -1250,7 +1250,7 @@ static DRIVER_INIT( rockn3 ) static MACHINE_DRIVER_START( tetrisp2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(tetrisp2_readmem,tetrisp2_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -1283,7 +1283,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nndmseal ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) + MDRV_CPU_ADD("main", M68000, XTAL_12MHz) MDRV_CPU_PROGRAM_MAP(nndmseal_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -1315,7 +1315,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rockn ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rockn1_readmem,rockn1_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -1348,7 +1348,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rockn2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rockn2_readmem,rockn2_writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -1381,11 +1381,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rocknms ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rocknms_main_readmem,rocknms_main_writemem) MDRV_CPU_VBLANK_INT("left", irq2_line_hold) - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD("sub", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rocknms_sub_readmem,rocknms_sub_writemem) MDRV_CPU_VBLANK_INT("left", irq2_line_hold) diff --git a/src/mame/drivers/tetriunk.c b/src/mame/drivers/tetriunk.c index 46f8d3f0dc8..73c8c09890d 100644 --- a/src/mame/drivers/tetriunk.c +++ b/src/mame/drivers/tetriunk.c @@ -176,7 +176,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( tetriunk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", I8088, 8000000) + MDRV_CPU_ADD("main", I8088, 8000000) MDRV_CPU_PROGRAM_MAP(tetriunk_mem, 0) MDRV_CPU_IO_MAP(tetriunk_io, 0) diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index 36b8b98bbd6..17e9d3ce191 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -768,7 +768,7 @@ static COP400_INTERFACE( thayers_cop_intf ) static MACHINE_DRIVER_START( thayers ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_4MHz) + MDRV_CPU_ADD("main", Z80, XTAL_4MHz) MDRV_CPU_PROGRAM_MAP(thayers_map, 0) MDRV_CPU_IO_MAP(thayers_io_map, 0) MDRV_CPU_VBLANK_INT("main", vblank_callback_thayers) @@ -776,7 +776,7 @@ static MACHINE_DRIVER_START( thayers ) MDRV_MACHINE_START(thayers) MDRV_MACHINE_RESET(thayers) - MDRV_CPU_ADD(COP421, XTAL_4MHz/2) // COP421L-PCA/N + MDRV_CPU_ADD("mcu", COP421, XTAL_4MHz/2) // COP421L-PCA/N MDRV_CPU_PROGRAM_MAP(thayers_cop_map, 0) MDRV_CPU_IO_MAP(thayers_cop_io_map, 0) MDRV_CPU_CONFIG(thayers_cop_intf) diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index 54a6d2fc859..5d043c7aa82 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -369,11 +369,11 @@ static INTERRUPT_GEN( thedeep_interrupt ) static MACHINE_DRIVER_START( thedeep ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6MHz */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6MHz */ MDRV_CPU_PROGRAM_MAP(thedeep_readmem,thedeep_writemem) MDRV_CPU_VBLANK_INT_HACK(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */ - MDRV_CPU_ADD(M65C02, 2000000) /* 2MHz */ + MDRV_CPU_ADD("audio", M65C02, 2000000) /* 2MHz */ MDRV_CPU_PROGRAM_MAP(thedeep_sound_readmem,thedeep_sound_writemem) /* IRQ by YM2203, NMI by when sound latch written by main cpu */ diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index f3c4a379bdc..a5a63bf1555 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -647,11 +647,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( thepit ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(thepit_main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD_TAG("audio", Z80, SOUND_CLOCK/4) /* 2.5 MHz */ + MDRV_CPU_ADD("audio", Z80, SOUND_CLOCK/4) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_CPU_IO_MAP(audio_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c index 80014e6a987..98dd94b9b5b 100644 --- a/src/mame/drivers/thief.c +++ b/src/mame/drivers/thief.c @@ -461,7 +461,7 @@ static const struct Samplesinterface natodef_samples_interface = static MACHINE_DRIVER_START( sharkatt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(sharkatt_readmem,sharkatt_writemem) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", thief_interrupt) @@ -497,7 +497,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( thief ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(thief_readmem,thief_writemem) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", thief_interrupt) @@ -533,7 +533,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( natodef ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(thief_readmem,thief_writemem) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", thief_interrupt) diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c index 4987a06e238..9b0ad836228 100644 --- a/src/mame/drivers/thoop2.c +++ b/src/mame/drivers/thoop2.c @@ -196,7 +196,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( thoop2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(thoop2_readmem,thoop2_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 83330f3b5d6..c20a3f33a1e 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -332,10 +332,10 @@ GFXDECODE_END static MACHINE_DRIVER_START( thunderj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD_TAG("extra", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(extra_map,0) MDRV_MACHINE_RESET(thunderj) diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 9b9205d9fc2..64a79f045d7 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -697,12 +697,11 @@ static const struct K007232_interface k007232_interface = static MACHINE_DRIVER_START( scontra ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 052001 */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* 052001 */ MDRV_CPU_PROGRAM_MAP(scontra_readmem,scontra_writemem) MDRV_CPU_VBLANK_INT("main", scontra_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* ? */ MDRV_CPU_PROGRAM_MAP(scontra_readmem_sound,scontra_writemem_sound) MDRV_MACHINE_RESET(scontra) @@ -739,12 +738,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( thunderx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */ + MDRV_CPU_ADD("main", KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(thunderx_readmem,thunderx_writemem) MDRV_CPU_VBLANK_INT("main", scontra_interrupt) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* ? */ MDRV_CPU_PROGRAM_MAP(thunderx_readmem_sound,thunderx_writemem_sound) MDRV_MACHINE_RESET(thunderx) diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c index 5fe7286b843..70556b8c019 100644 --- a/src/mame/drivers/tiamc1.c +++ b/src/mame/drivers/tiamc1.c @@ -275,7 +275,7 @@ static const struct CustomSound_interface tiamc1_custom_interface = static MACHINE_DRIVER_START( tiamc1 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080,16000000/9) /* 16 MHz */ + MDRV_CPU_ADD("main", 8080,16000000/9) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(tiamc1_readmem,tiamc1_writemem) MDRV_CPU_IO_MAP(tiamc1_readport,tiamc1_writeport) diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index 5c4e1e83fef..37a74d9a303 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -425,7 +425,7 @@ static const tms34010_config tms_config = static MACHINE_DRIVER_START( tickee ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", TMS34010, XTAL_40MHz) + MDRV_CPU_ADD("main", TMS34010, XTAL_40MHz) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(tickee_map,0) diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index c6cb6b8c84c..c4aa2b4eff8 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -551,11 +551,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( tigeroad ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) /* IRQs are triggered by the YM2203 */ @@ -595,7 +595,7 @@ static MACHINE_DRIVER_START( toramich ) /* basic machine hardware */ MDRV_IMPORT_FROM(tigeroad) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) /* ? */ + MDRV_CPU_ADD("sample", Z80, 3579545) /* ? */ MDRV_CPU_PROGRAM_MAP(sample_readmem,sample_writemem) MDRV_CPU_IO_MAP(sample_readport,sample_writeport) MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000) /* ? */ diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c index 00211ffffa7..8b35b150ef5 100644 --- a/src/mame/drivers/timelimt.c +++ b/src/mame/drivers/timelimt.c @@ -263,13 +263,12 @@ static INTERRUPT_GEN( timelimt_irq ) { static MACHINE_DRIVER_START( timelimt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.000 MHz */ + MDRV_CPU_ADD("main", Z80, 5000000) /* 5.000 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,0) MDRV_CPU_VBLANK_INT("main", timelimt_irq) - MDRV_CPU_ADD(Z80,18432000/6) - /* audio CPU */ /* 3.072 MHz */ + MDRV_CPU_ADD("audio", Z80,18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_IO_MAP(readport_sound,writeport_sound) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ? */ diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index ac9a26417e4..4975069f7ae 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -359,7 +359,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( timeplt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */ + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */ MDRV_CPU_PROGRAM_MAP(timeplt_main_map,0) MDRV_CPU_VBLANK_INT("main", timeplt_interrupt) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index dd4635051d1..427cc0dc958 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -772,7 +772,7 @@ static const duart68681_config tmaster_duart68681_config = }; static MACHINE_DRIVER_START( tm3k ) - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz / 2) /* 12MHz */ + MDRV_CPU_ADD("main", M68000, XTAL_24MHz / 2) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(tmaster_map,0) MDRV_CPU_VBLANK_INT_HACK(tm3k_interrupt,2+20) // ?? @@ -834,7 +834,7 @@ static MACHINE_RESET( galgames ) } static MACHINE_DRIVER_START( galgames ) - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz / 2) + MDRV_CPU_ADD("main", M68000, XTAL_24MHz / 2) MDRV_CPU_PROGRAM_MAP(galgames_map,0) MDRV_CPU_VBLANK_INT_HACK(galgames_interrupt, 1+20) // ?? diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 726424a2ed9..56a007240d9 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -2342,7 +2342,7 @@ static const struct K053260_interface k053260_interface = static MACHINE_DRIVER_START( cuebrick ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(cuebrick_main_map,0) MDRV_CPU_VBLANK_INT_HACK(cuebrick_interrupt,10) @@ -2375,11 +2375,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mia ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/3) + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/3) MDRV_CPU_PROGRAM_MAP(mia_main_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(mia_audio_map,0) /* video hardware */ @@ -2421,11 +2421,11 @@ static MACHINE_RESET( tmnt ) static MACHINE_DRIVER_START( tmnt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/3) + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/3) MDRV_CPU_PROGRAM_MAP(tmnt_main_map,0) MDRV_CPU_VBLANK_INT("main", irq5_line_hold) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(tmnt_audio_map,0) MDRV_MACHINE_RESET(tmnt) @@ -2470,11 +2470,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( punkshot ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/2) MDRV_CPU_PROGRAM_MAP(punkshot_main_map,0) MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(punkshot_audio_map,0) /* NMIs are generated by the 053260 */ @@ -2509,11 +2509,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lgtnfght ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) + MDRV_CPU_ADD("main", M68000, XTAL_24MHz/2) MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map,0) MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(lgtnfght_audio_map,0) /* video hardware */ @@ -2548,11 +2548,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( blswhstl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(blswhstl_main_map,0) MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0) /* NMIs are generated by the 053260 */ @@ -2608,11 +2608,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( glfgreat ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(glfgreat_main_map,0) MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(glfgreat_audio_map,0) /* NMIs are generated by the 053260 */ @@ -2657,12 +2657,11 @@ static const struct K054539interface k054539_interface = static MACHINE_DRIVER_START( prmrsocr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map,0) MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt) - MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(prmrsocr_audio_map,0) /* NMIs are generated by the 054539 */ @@ -2697,12 +2696,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tmnt2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_32MHz/2) + MDRV_CPU_ADD("main", M68000, XTAL_32MHz/2) MDRV_CPU_PROGRAM_MAP(tmnt2_main_map,0) MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) - MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */ + MDRV_CPU_ADD("audio", Z80, 8000000) /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */ /* access. Access speed of ROM/RAM used on the machine is 150ns, */ /* without the wait, they cannot run on 8MHz. */ /* We are not emulating the wait state, so the ROM test ends at */ @@ -2744,12 +2742,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ssriders ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_32MHz/2) + MDRV_CPU_ADD("main", M68000, XTAL_32MHz/2) MDRV_CPU_PROGRAM_MAP(ssriders_main_map,0) MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) - MDRV_CPU_ADD(Z80, 4000000) - /* audio CPU */ /* ????? makes the ROM test sync */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ????? makes the ROM test sync */ MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0) /* NMIs are generated by the 053260 */ @@ -2787,7 +2784,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sunsetbl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) @@ -2820,11 +2817,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( thndrx2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(thndrx2_main_map,0) MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) - MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) + MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map,0) /* NMIs are generated by the 053260 */ diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index de209fa81a7..38c370d341e 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -1380,11 +1380,11 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( arknoid2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", arknoid2_interrupt) - MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1419,11 +1419,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( drtoppel ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("main", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", arknoid2_interrupt) - MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1461,15 +1461,15 @@ static const i8x41_config i8042_config = { TYPE_I8X42 }; static MACHINE_DRIVER_START( tnzs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("main", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(I8X41,12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("mcu", I8X41,12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(i8742_readmem,i8742_writemem) MDRV_CPU_IO_MAP(i8742_readport,i8742_writeport) MDRV_CPU_CONFIG( i8042_config ) @@ -1504,11 +1504,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( insectx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1542,11 +1542,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kageki ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kageki_sub_readmem,kageki_sub_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1587,15 +1587,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tnzsb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu0", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("cpu0", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu0_type2,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("cpu1", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("cpu1", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnzsb_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD_TAG("cpu2", Z80, XTAL_12MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("cpu2", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map,0) MDRV_CPU_IO_MAP(tnzsb_readport,tnzsb_writeport) @@ -1655,11 +1655,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jpopnics ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("main", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(jpopnics_main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */ + MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(jpopnics_sub_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index fcc039c4d90..df7d1f0626d 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -1237,11 +1237,11 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( rallybik ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(rallybik_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) MDRV_CPU_IO_MAP(rallybik_sound_io_map, 0) @@ -1277,11 +1277,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( truxton ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(truxton_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) MDRV_CPU_IO_MAP(truxton_sound_io_map, 0) @@ -1317,11 +1317,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hellfire ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(hellfire_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) MDRV_CPU_IO_MAP(hellfire_sound_io_map, 0) @@ -1357,11 +1357,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( zerowing ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(zerowing_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) MDRV_CPU_IO_MAP(zerowing_sound_io_map, 0) @@ -1397,15 +1397,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( demonwld ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(demonwld_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) MDRV_CPU_IO_MAP(demonwld_sound_io_map, 0) - MDRV_CPU_ADD(TMS32010,28000000/2) /* 14MHz CLKin */ + MDRV_CPU_ADD("dsp", TMS32010,28000000/2) /* 14MHz CLKin */ MDRV_CPU_PROGRAM_MAP(DSP_program_map,0) MDRV_CPU_IO_MAP(DSP_io_map,0) @@ -1441,7 +1441,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( samesame ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(samesame_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) @@ -1475,11 +1475,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( outzone ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(outzone_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) MDRV_CPU_IO_MAP(outzone_sound_io_map, 0) @@ -1515,7 +1515,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vimana ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(vimana_main_map, 0) MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index d66889d462f..730f24caee9 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3427,12 +3427,12 @@ static const struct YMZ280Binterface ymz280b_interface = static MACHINE_DRIVER_START( tekipaki ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if USE_HD64x180 - MDRV_CPU_ADD(Z180, 10000000) /* HD647180 CPU actually */ + MDRV_CPU_ADD("mcu", Z180, 10000000) /* HD647180 CPU actually */ MDRV_CPU_PROGRAM_MAP(hd647180_mem, 0) #endif @@ -3466,12 +3466,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ghox ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(ghox_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if USE_HD64x180 - MDRV_CPU_ADD(Z180, XTAL_10MHz) /* HD647180 CPU actually */ + MDRV_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */ MDRV_CPU_PROGRAM_MAP(hd647180_mem, 0) #endif @@ -3504,12 +3504,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dogyuun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_25MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_25MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if USE_V25 - MDRV_CPU_ADD(V25, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD("audio", V25, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0) //MDRV_CPU_IO_MAP(V25_port, 0) #endif @@ -3547,13 +3547,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kbash ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(kbash_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) /* ROM based v25 */ #if USE_V25 - MDRV_CPU_ADD(V25, 16000000) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD("mcu", V25, 16000000) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_mem, 0) MDRV_CPU_IO_MAP(V25_port, 0) #endif @@ -3590,7 +3590,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kbash2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(kbash2_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) @@ -3628,7 +3628,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( truxton2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2) @@ -3665,11 +3665,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pipibibs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) - MDRV_CPU_ADD(Z80,XTAL_27MHz/8) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80,XTAL_27MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0) MDRV_INTERLEAVE(10) @@ -3704,11 +3704,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( whoopee ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) - MDRV_CPU_ADD(Z80, 27000000/8) /* This should be a HD647180 */ + MDRV_CPU_ADD("audio", Z80, 27000000/8) /* This should be a HD647180 */ /* Change this to 10MHz when HD647180 gets dumped. 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0) @@ -3744,11 +3744,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pipibibi ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(pipibibi_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) - MDRV_CPU_ADD(Z80,27000000/8) /* ??? 3.37MHz */ + MDRV_CPU_ADD("audio", Z80,27000000/8) /* ??? 3.37MHz */ MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0) MDRV_INTERLEAVE(10) @@ -3783,12 +3783,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fixeight ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if USE_V25 - MDRV_CPU_ADD(V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD("audio", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0) //MDRV_CPU_IO_MAP(V25_port, 0) #endif @@ -3826,7 +3826,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fixeighb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(fixeighb_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2) @@ -3860,12 +3860,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vfive ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(vfive_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if USE_V25 - MDRV_CPU_ADD(V25, 32000000/2) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD("audio", V25, 32000000/2) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0) //MDRV_CPU_IO_MAP(V25_port, 0) #endif @@ -3916,12 +3916,12 @@ static const struct YM2151interface batsugun_ym2151_interface = static MACHINE_DRIVER_START( batsugun ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(batsugun_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if USE_V25 - MDRV_CPU_ADD(V25, 32000000/2) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD("audio", V25, 32000000/2) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0) //MDRV_CPU_IO_MAP(V25_port, 0) #endif @@ -3960,7 +3960,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( snowbro2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(snowbro2_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) @@ -3997,11 +3997,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( mahoudai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(mahoudai_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) - MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("audio", Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0) MDRV_INTERLEAVE(10) @@ -4039,11 +4039,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( shippumd ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(shippumd_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) - MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("audio", Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0) MDRV_INTERLEAVE(10) @@ -4081,11 +4081,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bgaregga ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(bgaregga_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) - MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("audio", Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem, 0) MDRV_INTERLEAVE(100) @@ -4123,11 +4123,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( batrider ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(batrider_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2) - MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ + MDRV_CPU_ADD("audio", Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(batrider_sound_z80_mem, 0) MDRV_CPU_IO_MAP(batrider_sound_z80_port, 0) @@ -4168,11 +4168,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bbakraid ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,32000000/2) + MDRV_CPU_ADD("main", M68000,32000000/2) MDRV_CPU_PROGRAM_MAP(bbakraid_68k_mem, 0) MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq1) - MDRV_CPU_ADD(Z80,32000000/4) + MDRV_CPU_ADD("audio", Z80,32000000/4) MDRV_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem, 0) MDRV_CPU_IO_MAP(bbakraid_sound_z80_port, 0) MDRV_CPU_PERIODIC_INT(bbakraid_snd_interrupt, 448) diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index 69c5e402ea0..f7838af9e17 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -435,7 +435,7 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( toki ) /* KOYO 20.000MHz near the cpu */ /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,XTAL_20MHz /2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000,XTAL_20MHz /2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(toki_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */ @@ -467,12 +467,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tokib ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */ MDRV_CPU_PROGRAM_MAP(tokib_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL (could be level1, same vector) */ - MDRV_CPU_ADD(Z80, 4000000) /* verified with PCB */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* verified with PCB */ MDRV_CPU_PROGRAM_MAP(tokib_audio_map,0) /* video hardware */ diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c index e8f30a3999c..b7295a54b65 100644 --- a/src/mame/drivers/toobin.c +++ b/src/mame/drivers/toobin.c @@ -237,7 +237,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( toobin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_32MHz/4) + MDRV_CPU_ADD("main", M68010, ATARI_CLOCK_32MHz/4) MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) MDRV_MACHINE_RESET(toobin) diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c index b51a8294b79..9d330d08073 100644 --- a/src/mame/drivers/topshoot.c +++ b/src/mame/drivers/topshoot.c @@ -237,10 +237,10 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( genesis_base ) /*basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) + MDRV_CPU_ADD("main", M68000, MASTER_CLOCK / 7) MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) - MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) + MDRV_CPU_ADD("sound", Z80, MASTER_CLOCK / 15) MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */ diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 61a53e9683b..9819d574ea4 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -695,15 +695,14 @@ static MACHINE_START( topspeed ) static MACHINE_DRIVER_START( topspeed ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(topspeed_readmem,topspeed_writemem) MDRV_CPU_VBLANK_INT("main", topspeed_interrupt) - MDRV_CPU_ADD(Z80,16000000/4) - /* audio CPU */ /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(topspeed_cpub_readmem,topspeed_cpub_writemem) MDRV_CPU_VBLANK_INT("main", topspeed_cpub_interrupt) diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index 02dcebacc09..65b3c1ba69d 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -399,7 +399,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( toratora ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800,500000) /* ?????? game speed is entirely controlled by this */ + MDRV_CPU_ADD("main", M6800,500000) /* ?????? game speed is entirely controlled by this */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_PERIODIC_INT(toratora_timer,16) /* timer counting at 16 Hz */ diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index 9fbe6b43981..96c33c25e57 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -207,7 +207,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( tourtabl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK / 3) /* actually M6507 */ + MDRV_CPU_ADD("main", M6502, MASTER_CLOCK / 3) /* actually M6507 */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_MACHINE_START(tourtabl) diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index 3a45911733e..1151962a10a 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -568,16 +568,15 @@ static const struct namco_interface namco_interface = static MACHINE_DRIVER_START( liblrabl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1536000) /* 1.536 MHz (measured on Libble Rabble board) */ + MDRV_CPU_ADD("main", M6809, 1536000) /* 1.536 MHz (measured on Libble Rabble board) */ MDRV_CPU_PROGRAM_MAP(readmem_mainCPU_liblrabl,writemem_mainCPU_liblrabl) MDRV_CPU_VBLANK_INT("main", toypop_main_interrupt) - MDRV_CPU_ADD(M6809, 1536000) - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 1536000) MDRV_CPU_PROGRAM_MAP(readmem_soundCPU,writemem_soundCPU) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) - MDRV_CPU_ADD(M68000, 6144000) /* 6.144 MHz (measured on Libble Rabble board) */ + MDRV_CPU_ADD("sub", M68000, 6144000) /* 6.144 MHz (measured on Libble Rabble board) */ MDRV_CPU_PROGRAM_MAP(readmem_68k,writemem_68k) MDRV_CPU_VBLANK_INT("main", toypop_m68000_interrupt) diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index e1d96aface4..ed6732229d7 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -418,16 +418,15 @@ GFXDECODE_END static MACHINE_DRIVER_START( tp84 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tp84_cpu1_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ + MDRV_CPU_ADD("sub", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - /* audio CPU */ - MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ + MDRV_CPU_ADD("audio", Z80,XTAL_14_31818MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index c1b286cf30f..5724363fd5f 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -800,12 +800,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( trackfld ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 1.400 MHz ??? */ + MDRV_CPU_ADD("main", M6809, 2048000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* Z80 Clock is derived from a 14.31818 MHz crystal */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_NVRAM_HANDLER(trackfld) @@ -844,12 +843,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( hyprolyb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 1.400 MHz ??? */ + MDRV_CPU_ADD("main", M6809, 2048000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ + MDRV_CPU_ADD("audio", Z80,14318180/4) /* Z80 Clock is derived from a 14.31818 MHz crystal */ MDRV_CPU_PROGRAM_MAP(hyprolyb_sound_readmem,hyprolyb_sound_writemem) MDRV_NVRAM_HANDLER(trackfld) diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 4d341e3cd9f..74df209f3f9 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -306,7 +306,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( travrusa ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index 10e8ab3158b..5ba55332b62 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -316,7 +316,7 @@ static PALETTE_INIT( triplhnt ) static MACHINE_DRIVER_START( triplhnt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6800, 800000) + MDRV_CPU_ADD("main", M6800, 800000) MDRV_CPU_PROGRAM_MAP(triplhnt_readmem, triplhnt_writemem) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index 5fd6bb7fe5b..fa420c44b4e 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -138,7 +138,7 @@ static INTERRUPT_GEN( truco_interrupt ) static MACHINE_DRIVER_START( truco ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 750000) /* ?? guess */ + MDRV_CPU_ADD("main", M6809, 750000) /* ?? guess */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", truco_interrupt) diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index b56a4144c63..d2dbf1e5e55 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -135,7 +135,7 @@ static INTERRUPT_GEN( trucocl_interrupt ) static MACHINE_DRIVER_START( trucocl ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) + MDRV_CPU_ADD("main", Z80, 18432000/6) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", trucocl_interrupt) diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 0372c39757d..7044979b74d 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -278,7 +278,7 @@ static VIDEO_UPDATE( trvmadns ) } static MACHINE_DRIVER_START( trvmadns ) - MDRV_CPU_ADD_TAG("main", Z80,10000000/2) // ? + MDRV_CPU_ADD("main", Z80,10000000/2) // ? MDRV_CPU_PROGRAM_MAP(cpu_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index 0277e7a92e6..ea3bc26e3bb 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -203,7 +203,7 @@ static MACHINE_DRIVER_START( trvquest ) MDRV_DRIVER_DATA(gameplan_state) - MDRV_CPU_ADD_TAG("main", M6809,6000000) + MDRV_CPU_ADD("main", M6809,6000000) MDRV_CPU_PROGRAM_MAP(cpu_map,0) MDRV_CPU_VBLANK_INT("main", trvquest_interrupt) diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index 03ed16c87d6..aee9a5f28db 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -189,12 +189,11 @@ static INTERRUPT_GEN( tryout_interrupt ) static MACHINE_DRIVER_START( tryout ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* ? */ + MDRV_CPU_ADD("main", M6502, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_VBLANK_INT("main", tryout_interrupt) - MDRV_CPU_ADD(M6502, 1500000) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6502, 1500000) /* ? */ MDRV_CPU_PROGRAM_MAP(sound_cpu,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* ? */ diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index 9f9e9a70f17..84db8441d62 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -751,17 +751,15 @@ GFXDECODE_END static MACHINE_DRIVER_START( tsamurai ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(z80_readport,z80_writeport) MDRV_CPU_VBLANK_INT("main", samurai_interrupt) - MDRV_CPU_ADD(Z80, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(readmem_sound1,writemem_sound1) - MDRV_CPU_ADD(Z80, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio2", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(readmem_sound2,writemem_sound2) /* video hardware */ @@ -796,21 +794,18 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( m660 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_m660,writemem_m660) MDRV_CPU_IO_MAP(z80_readport,z80_writeport_m660) MDRV_CPU_VBLANK_INT("main", samurai_interrupt) - MDRV_CPU_ADD(Z80, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(readmem_sound1_m660,writemem_sound1_m660) - MDRV_CPU_ADD(Z80, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio2", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(readmem_sound2_m660,writemem_sound2_m660) - MDRV_CPU_ADD(Z80, 2000000) - /* audio CPU */ + MDRV_CPU_ADD("audio3", Z80, 2000000) MDRV_CPU_PROGRAM_MAP(readmem_sound3_m660,writemem_sound3_m660) MDRV_CPU_IO_MAP(readport_sound3_m660,writeport_sound3_m660) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) @@ -847,11 +842,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vsgongf ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) + MDRV_CPU_ADD("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_vsgongf,writemem_vsgongf) MDRV_CPU_VBLANK_INT("main", samurai_interrupt) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_sound_vsgongf,writemem_sound_vsgongf) MDRV_CPU_IO_MAP(0,z80_writeport) MDRV_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3) diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 7127feda567..7cfb9f3e99a 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -223,7 +223,7 @@ static INTERRUPT_GEN( ttchamp_irq ) /* right? */ static MACHINE_DRIVER_START( ttchamp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30, 8000000) + MDRV_CPU_ADD("main", V30, 8000000) MDRV_CPU_PROGRAM_MAP(ttchamp_map, 0) MDRV_CPU_IO_MAP(ttchamp_io,0) MDRV_CPU_VBLANK_INT("main", ttchamp_irq) diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c index 873d7d44b59..dec20b5f6bf 100644 --- a/src/mame/drivers/tubep.c +++ b/src/mame/drivers/tubep.c @@ -902,20 +902,20 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( tubep ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,16000000 / 4) /* 4 MHz */ + MDRV_CPU_ADD("main",Z80,16000000 / 4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(tubep_main_map,0) MDRV_CPU_IO_MAP(tubep_main_portmap,0) - MDRV_CPU_ADD_TAG("slave",Z80,16000000 / 4) /* 4 MHz */ + MDRV_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(tubep_second_map,0) MDRV_CPU_IO_MAP(tubep_second_portmap,0) /* audio CPU */ - MDRV_CPU_ADD_TAG("sound",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ + MDRV_CPU_ADD("sound",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ MDRV_CPU_PROGRAM_MAP(tubep_sound_map,0) MDRV_CPU_IO_MAP(tubep_sound_portmap,0) - MDRV_CPU_ADD_TAG("nsc",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */ + MDRV_CPU_ADD("nsc",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */ MDRV_CPU_PROGRAM_MAP(nsc_map,0) MDRV_INTERLEAVE(100) @@ -958,7 +958,7 @@ static MACHINE_DRIVER_START( tubepb ) MDRV_CPU_REMOVE("nsc") - MDRV_CPU_ADD(M6802,6000000) /* ? MHz Xtal */ + MDRV_CPU_ADD("mcu", M6802,6000000) /* ? MHz Xtal */ MDRV_CPU_PROGRAM_MAP(nsc_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MACHINE_DRIVER_END @@ -967,20 +967,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( rjammer ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80,16000000 / 4) /* 4 MHz */ + MDRV_CPU_ADD("main",Z80,16000000 / 4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(rjammer_main_map,0) MDRV_CPU_IO_MAP(rjammer_main_portmap,0) - MDRV_CPU_ADD_TAG("slave",Z80,16000000 / 4) /* 4 MHz */ + MDRV_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(rjammer_second_map,0) MDRV_CPU_IO_MAP(rjammer_second_portmap,0) /* audio CPU */ - MDRV_CPU_ADD_TAG("sound",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ + MDRV_CPU_ADD("sound",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ MDRV_CPU_PROGRAM_MAP(rjammer_sound_map,0) MDRV_CPU_IO_MAP(rjammer_sound_portmap,0) - MDRV_CPU_ADD_TAG("nsc",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */ + MDRV_CPU_ADD("nsc",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */ MDRV_CPU_PROGRAM_MAP(nsc_map,0) MDRV_MACHINE_START(rjammer) diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 7b9058ff48e..e67fd8c5608 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -303,7 +303,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( tugboat ) - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz ???? */ + MDRV_CPU_ADD("main", M6502, 2000000) /* 2 MHz ???? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index cc3328fbc1a..0f98ce45f50 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -2144,7 +2144,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( tumblepb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(tumblepopb_readmem,tumblepopb_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -2174,7 +2174,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tumbleb2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(tumblepopb_readmem,tumblepopb_writemem) MDRV_CPU_VBLANK_INT("main", tumbleb2_interrupt) @@ -2203,12 +2203,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jumpkids ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(jumpkids_readmem,jumpkids_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* z80? */ - MDRV_CPU_ADD( Z80, 8000000/2) + MDRV_CPU_ADD("audio", Z80, 8000000/2) MDRV_CPU_PROGRAM_MAP(jumpkids_sound_map,0) /* video hardware */ @@ -2235,7 +2235,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fncywld ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) + MDRV_CPU_ADD("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(fncywld_readmem,fncywld_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -2293,13 +2293,11 @@ static MACHINE_RESET (htchctch) static MACHINE_DRIVER_START( htchctch ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 15000000) /* verified */ + MDRV_CPU_ADD("main", M68000, 15000000) /* verified */ MDRV_CPU_PROGRAM_MAP(htchctch_readmem,htchctch_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD( Z80, 15000000/4) /* verified on dquizgo */ - - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 15000000/4) /* verified on dquizgo */ MDRV_CPU_PROGRAM_MAP(semicom_sound_readmem,semicom_sound_writemem) MDRV_MACHINE_RESET ( htchctch ) @@ -2370,12 +2368,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jumppop ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(jumppop_readmem,jumppop_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 3500000) /* verified */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3500000) /* verified */ MDRV_CPU_PROGRAM_MAP(jumppop_sound_map, 0) MDRV_CPU_IO_MAP(jumppop_sound_io_map, 0) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1953) /* measured */ @@ -2409,12 +2406,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( suprtrio ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */ + MDRV_CPU_ADD("main", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */ MDRV_CPU_PROGRAM_MAP(suprtrio_main_cpu,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(semicom_sound_readmem,semicom_sound_writemem) /* video hardware */ @@ -2443,7 +2439,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pangpang ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(pangpang_readmem,pangpang_writemem) MDRV_CPU_VBLANK_INT("main", tumbleb2_interrupt) diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 635a3217871..d25425287ba 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -301,12 +301,12 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( tumblep ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 14000000) + MDRV_CPU_ADD("main", M68000, 14000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* audio CPU */ - MDRV_CPU_ADD(H6280, 32220000/8) /* Custom chip 45; Audio section crystal is 32.220 MHz */ + MDRV_CPU_ADD("audio", H6280, 32220000/8) /* Custom chip 45; Audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c index f6c9b2b734e..3cbbdfbd899 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -310,7 +310,7 @@ static const struct POKEYinterface pokey_interface_2 = static MACHINE_DRIVER_START( tunhunt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502,2000000) /* ??? */ + MDRV_CPU_ADD("main", M6502,2000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */ diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index 8ff50aeab38..f50be9c1672 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -1077,7 +1077,7 @@ static MACHINE_DRIVER_START( turbo ) MDRV_DRIVER_DATA(turbo_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(turbo_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1115,7 +1115,7 @@ static MACHINE_DRIVER_START( subroc3d ) MDRV_DRIVER_DATA(turbo_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(subroc3d_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) @@ -1146,11 +1146,11 @@ static MACHINE_DRIVER_START( buckrog ) MDRV_DRIVER_DATA(turbo_state) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(buckrog_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) + MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(buckrog_cpu2_map,0) MDRV_CPU_IO_MAP(buckrog_cpu2_portmap,0) diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c index 8e4beeadb7f..1dc74491d9a 100644 --- a/src/mame/drivers/turbosub.c +++ b/src/mame/drivers/turbosub.c @@ -330,14 +330,14 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( turbosub ) - MDRV_CPU_ADD_TAG("main", M6809E,4000000) + MDRV_CPU_ADD("main", M6809E,4000000) MDRV_CPU_PROGRAM_MAP(game_cpu_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* Unverified */ - MDRV_CPU_ADD(M6809E,4000000) + MDRV_CPU_ADD("frame", M6809E,4000000) MDRV_CPU_PROGRAM_MAP(frame_cpu_map,0) - MDRV_CPU_ADD(M6809E,4000000) + MDRV_CPU_ADD("audio", M6809E,4000000) MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0) /* video hardware */ diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 5eddef1a9ea..8e5331b0a14 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -229,7 +229,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( tutankhm ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz ??? */ + MDRV_CPU_ADD("main", M6809, 1500000) /* 1.5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", tutankhm_interrupt) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 52fe4fde24e..3529fd8a31a 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -913,15 +913,14 @@ static INTERRUPT_GEN( CPUB_interrupt ) static MACHINE_DRIVER_START( twin16 ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_ADD(M68000, XTAL_18_432MHz/2) + MDRV_CPU_ADD("sub", M68000, XTAL_18_432MHz/2) MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT("main", CPUB_interrupt) - MDRV_CPU_ADD(M68000, XTAL_18_432MHz/2) + MDRV_CPU_ADD("main", M68000, XTAL_18_432MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", CPUA_interrupt) @@ -971,11 +970,10 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fround ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_ADD(M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(fround_map,0) MDRV_CPU_VBLANK_INT("main", CPUA_interrupt) diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index cebde4505dc..9eed1d0dceb 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -648,15 +648,15 @@ static const struct YM3812interface ym3812_interface = static MACHINE_DRIVER_START( twincobr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,28000000/4) /* 7.0MHz - Main board Crystal is 28MHz */ + MDRV_CPU_ADD("main", M68000,28000000/4) /* 7.0MHz - Main board Crystal is 28MHz */ MDRV_CPU_PROGRAM_MAP(main_program_map, 0) MDRV_CPU_VBLANK_INT("main", twincobr_interrupt) - MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz */ + MDRV_CPU_ADD("audio", Z80,28000000/8) /* 3.5MHz */ MDRV_CPU_PROGRAM_MAP(sound_program_map, 0) MDRV_CPU_IO_MAP(sound_io_map, 0) - MDRV_CPU_ADD(TMS32010,28000000/2) /* 14MHz CLKin */ + MDRV_CPU_ADD("dsp", TMS32010,28000000/2) /* 14MHz CLKin */ MDRV_CPU_PROGRAM_MAP(DSP_program_map, 0) /* Data Map is internal to the CPU */ MDRV_CPU_IO_MAP(DSP_io_map, 0) diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index 12e0505463c..62cebdce179 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -167,7 +167,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( twins ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30, 8000000) + MDRV_CPU_ADD("main", V30, 8000000) MDRV_CPU_PROGRAM_MAP(twins_map, 0) MDRV_CPU_IO_MAP(twins_io,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) @@ -255,7 +255,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( twinsa ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", V30, XTAL_16MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", V30, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(twins_map, 0) MDRV_CPU_IO_MAP(twinsa_io,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index 545a8dbe26f..9bccf9b8ab8 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -698,14 +698,14 @@ static const struct CustomSound_interface bb_custom_interface = *************************************/ static MACHINE_DRIVER_START( tx1 ) - MDRV_CPU_ADD_TAG("main", I8086, 5000000) + MDRV_CPU_ADD("main", I8086, 5000000) MDRV_CPU_PROGRAM_MAP(tx1_main, 0) // MDRV_WATCHDOG_TIME_INIT(5) - MDRV_CPU_ADD(I8086,5000000) + MDRV_CPU_ADD("math", I8086,5000000) MDRV_CPU_PROGRAM_MAP(tx1_math, 0) - MDRV_CPU_ADD(Z80, TX1_PIXEL_CLOCK / 2) + MDRV_CPU_ADD("audio", Z80, TX1_PIXEL_CLOCK / 2) MDRV_CPU_PROGRAM_MAP(tx1_sound_prg, 0) MDRV_CPU_IO_MAP(tx1_sound_io, 0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2) @@ -756,14 +756,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( buggyboy ) - MDRV_CPU_ADD_TAG("main", I8086, 5000000) + MDRV_CPU_ADD("main", I8086/*BUGGYBOY_CPU_TYPE*/, 5000000) MDRV_CPU_PROGRAM_MAP(buggyboy_main, 0) // MDRV_WATCHDOG_TIME_INIT(5) - MDRV_CPU_ADD(BUGGYBOY_CPU_TYPE, 5000000) + MDRV_CPU_ADD("math", I8086/*BUGGYBOY_CPU_TYPE*/, 5000000) MDRV_CPU_PROGRAM_MAP(buggyboy_math, 0) - MDRV_CPU_ADD(Z80, BUGGYBOY_ZCLK / 2) + MDRV_CPU_ADD("audio", Z80, BUGGYBOY_ZCLK / 2) MDRV_CPU_PROGRAM_MAP(buggyboy_sound_prg, 0) MDRV_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048) MDRV_CPU_IO_MAP(buggyboy_sound_io, 0) @@ -814,14 +814,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( buggybjr ) - MDRV_CPU_ADD_TAG("main", I8086, 5000000) + MDRV_CPU_ADD("main", I8086/*BUGGYBOY_CPU_TYPE*/, 5000000) MDRV_CPU_PROGRAM_MAP(buggybjr_main, 0) // MDRV_WATCHDOG_TIME_INIT(5) - MDRV_CPU_ADD(BUGGYBOY_CPU_TYPE, 5000000) + MDRV_CPU_ADD("math", I8086/*BUGGYBOY_CPU_TYPE*/, 5000000) MDRV_CPU_PROGRAM_MAP(buggyboy_math, 0) - MDRV_CPU_ADD(Z80, BUGGYBOY_ZCLK / 2) + MDRV_CPU_ADD("audio", Z80, BUGGYBOY_ZCLK / 2) MDRV_CPU_PROGRAM_MAP(buggybjr_sound_prg, 0) MDRV_CPU_IO_MAP(buggyboy_sound_io, 0) MDRV_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048) diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index f04629b6adf..dd7fb7110ab 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -179,12 +179,12 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( uapce ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", H6280, PCE_MAIN_CLOCK/3) + MDRV_CPU_ADD("main", H6280, PCE_MAIN_CLOCK/3) MDRV_CPU_PROGRAM_MAP(pce_mem, 0) MDRV_CPU_IO_MAP(pce_io, 0) MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF) - MDRV_CPU_ADD(Z80, 1400000) + MDRV_CPU_ADD("sub", Z80, 1400000) MDRV_CPU_PROGRAM_MAP(z80_map, 0) MDRV_INTERLEAVE(1) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 49a113a74f6..9b3c1514001 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -246,12 +246,12 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( ultraman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz? */ + MDRV_CPU_ADD("main", M68000,24000000/2) /* 12 MHz? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* audio CPU */ /* 4 MHz? */ - MDRV_CPU_ADD(Z80,24000000/6) + MDRV_CPU_ADD("audio", Z80,24000000/6) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c index 18be3b8ecb0..e689e231dc4 100644 --- a/src/mame/drivers/ultratnk.c +++ b/src/mame/drivers/ultratnk.c @@ -290,7 +290,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( ultratnk ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, PIXEL_CLOCK / 8) + MDRV_CPU_ADD("main", M6502, PIXEL_CLOCK / 8) MDRV_CPU_PROGRAM_MAP(ultratnk_cpu_map, 0) MDRV_WATCHDOG_VBLANK_INIT(8) diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index de707f62d22..6fdcd60434f 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -239,11 +239,11 @@ static INTERRUPT_GEN( ultrsprt_vblank ) static MACHINE_DRIVER_START( ultrsprt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 25000000) /* PowerPC 403GA 25MHz */ + MDRV_CPU_ADD("main", PPC403GA, 25000000) /* PowerPC 403GA 25MHz */ MDRV_CPU_PROGRAM_MAP(ultrsprt_map, 0) MDRV_CPU_VBLANK_INT("main", ultrsprt_vblank) - MDRV_CPU_ADD(M68000, 8000000) /* Not sure about the frequency */ + MDRV_CPU_ADD("audio", M68000, 8000000) /* Not sure about the frequency */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_PERIODIC_INT(irq5_line_hold, 1) // ??? diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index 8cbb26ecf64..278194421b4 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -730,7 +730,7 @@ static INTERRUPT_GEN( undrfire_interrupt ) static MACHINE_DRIVER_START( undrfire ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(undrfire_map,0) MDRV_CPU_VBLANK_INT("main", undrfire_interrupt) @@ -761,13 +761,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( cbombers ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("main", M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(cbombers_cpua_map, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) TAITO_F3_SOUND_SYSTEM_CPU(16000000) - MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ + MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(cbombers_cpub_map, 0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index 9a94ffd88c4..7268eab184c 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -674,7 +674,7 @@ static NVRAM_HANDLER( zeropnt2 ) static MACHINE_DRIVER_START( burglarx ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem_burglarx,writemem_burglarx) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -721,7 +721,7 @@ static MACHINE_RESET( zeropt ) static MACHINE_DRIVER_START( zeropnt ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem_zeropnt,writemem_zeropnt) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) @@ -763,7 +763,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( zeropnt2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) + MDRV_CPU_ADD("main", M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(readmem_zeropnt2,writemem_zeropnt2) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index 990324ada5d..a83cd2fa961 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -289,7 +289,7 @@ static const struct CustomSound_interface amiga_custom_interface = static MACHINE_DRIVER_START( upscope ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK) + MDRV_CPU_ADD("main", M68000, AMIGA_68000_NTSC_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(amiga) diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index 3174c9f960b..aad2a70081e 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -260,7 +260,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( usg32 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ?? */ + MDRV_CPU_ADD("main", M6809, 2000000) /* ?? */ MDRV_CPU_PROGRAM_MAP(usgames_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,5) /* ?? */ diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 76d7b9750d0..a9396f3177d 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -581,7 +581,7 @@ static ADDRESS_MAP_START( qs1000_data_map, ADDRESS_SPACE_DATA, 8 ) ADDRESS_MAP_END static MACHINE_DRIVER_START( common ) - MDRV_CPU_ADD_TAG("main", E116T, 50000000) /* 50 MHz */ + MDRV_CPU_ADD("main", E116T, 50000000) /* 50 MHz */ MDRV_CPU_PROGRAM_MAP(common_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) @@ -615,7 +615,7 @@ static MACHINE_DRIVER_START( sound_ym_oki ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_qs1000 ) - MDRV_CPU_ADD_TAG("audio", I8052, 24000000/4) /* 6 MHz? */ + MDRV_CPU_ADD("audio", I8052, 24000000/4) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(qs1000_prg_map, 0) MDRV_CPU_DATA_MAP( qs1000_data_map, 0 ) diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index 0dbb8a15609..0aa3969d75d 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -245,12 +245,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( vaportra ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,12000000) /* Custom chip 59 */ + MDRV_CPU_ADD("main", M68000,12000000) /* Custom chip 59 */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index 25f578b470c..17f2cacd6e5 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -307,12 +307,12 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( vastar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz ???? */ + MDRV_CPU_ADD("main", Z80, 3072000) /* 3.072 MHz ???? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_port_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz ???? */ + MDRV_CPU_ADD("sub", Z80, 3072000) /* 3.072 MHz ???? */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(cpu2_port_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ??? */ diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index dea33cb0ed5..c305d754e54 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -400,12 +400,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( vball ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */ + MDRV_CPU_ADD("main", M6502, 2000000) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */ - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ @@ -439,12 +438,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vball2pj ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2.0 MHz */ + MDRV_CPU_ADD("main", M6502, 2000000) /* 2.0 MHz */ MDRV_CPU_PROGRAM_MAP(vball2pj_readmem,writemem) MDRV_CPU_VBLANK_INT_HACK(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */ - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ /* 3.579545 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* video hardware */ diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c index 9808142230d..8f1aebfaa30 100644 --- a/src/mame/drivers/vcombat.c +++ b/src/mame/drivers/vcombat.c @@ -94,14 +94,14 @@ static VIDEO_UPDATE( vcombat ) } static MACHINE_DRIVER_START( vcombat ) - MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) + MDRV_CPU_ADD("main", M68000, XTAL_12MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_ADD_TAG("sound", M68000, XTAL_12MHz) + MDRV_CPU_ADD("sound", M68000, XTAL_12MHz) MDRV_CPU_PROGRAM_MAP(sound_map,0) /* Virtual combat has an i860 on each of its two upper boards. - MDRV_CPU_ADD_TAG("video", i860, XTAL_20MHz) + MDRV_CPU_ADD("video", i860, XTAL_20MHz) MDRV_CPU_PROGRAM_MAP(video_map,0) */ diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index 9dd232b85d5..1c0673f12a3 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -161,7 +161,7 @@ static VIDEO_UPDATE( vega ) static MACHINE_DRIVER_START( vega ) - MDRV_CPU_ADD_TAG("cpu", GMS30C2132, 55000000) /* 55 MHz */ + MDRV_CPU_ADD("cpu", GMS30C2132, 55000000) /* 55 MHz */ MDRV_CPU_PROGRAM_MAP(vega_map,0) MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262) diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index 5c292e7a6f4..6b353522d64 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -2219,7 +2219,7 @@ static const mips3_config config = static MACHINE_DRIVER_START( vegascore ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", R5000LE, SYSTEM_CLOCK*2) + MDRV_CPU_ADD("main", R5000LE, SYSTEM_CLOCK*2) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(vegas_map_8mb,0) diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 80e0f5c870b..fdea23a52b4 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -578,12 +578,12 @@ static INTERRUPT_GEN( vendetta_irq ) static MACHINE_DRIVER_START( vendetta ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", KONAMI, 6000000) /* this is strange, seems an overclock but */ -// MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* is needed to have correct music speed */ + MDRV_CPU_ADD("main", KONAMI, 6000000) /* this is strange, seems an overclock but */ +// MDRV_CPU_ADD("main", KONAMI, 3000000) /* is needed to have correct music speed */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT("main", vendetta_irq) - MDRV_CPU_ADD_TAG("audio", Z80, 3579545) /* verified with PCB */ + MDRV_CPU_ADD("audio", Z80, 3579545) /* verified with PCB */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) /* interrupts are triggered by the main CPU */ diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c index 9f4cd6542f2..a684a66d9bf 100644 --- a/src/mame/drivers/vertigo.c +++ b/src/mame/drivers/vertigo.c @@ -105,7 +105,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( vertigo ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(vertigo_map,0) MDRV_CPU_PERIODIC_INT(vertigo_interrupt,60) @@ -116,7 +116,7 @@ static MACHINE_DRIVER_START( vertigo ) /* motor controller */ /* - MDRV_CPU_ADD(M6805, 1000000) + MDRV_CPU_ADD("motor", M6805, 1000000) MDRV_CPU_PROGRAM_MAP(vertigo_motor,0) */ MDRV_MACHINE_RESET(vertigo) diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index 0b2dac66b02..40e1cf44ca2 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -247,7 +247,7 @@ UINT8 vicdual_characterram_r(offs_t offset) static MACHINE_DRIVER_START( vicdual_root ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, VICDUAL_MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, VICDUAL_MAIN_CPU_CLOCK) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c index 047f96b9243..edb84f8243c 100644 --- a/src/mame/drivers/victory.c +++ b/src/mame/drivers/victory.c @@ -209,7 +209,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( victory ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, VICTORY_MAIN_CPU_CLOCK) + MDRV_CPU_ADD("main", Z80, VICTORY_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) MDRV_CPU_VBLANK_INT("main", victory_vblank_interrupt) diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c index 9823640f9d6..3013456a1e7 100644 --- a/src/mame/drivers/videopin.c +++ b/src/mame/drivers/videopin.c @@ -321,7 +321,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( videopin ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) + MDRV_CPU_ADD("main", M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(videopin) diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index 6c3b5bd2096..07f15d0e124 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -528,13 +528,12 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( vigilant ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3579645) /* 3.579645 MHz */ + MDRV_CPU_ADD("main", Z80, 3579645) /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(vigilant_map,0) MDRV_CPU_IO_MAP(vigilant_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3579645) - /* audio CPU */ /* 3.579645 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579645) /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ @@ -571,13 +570,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( buccanrs ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 5688800) /* 5.688800 MHz */ + MDRV_CPU_ADD("main", Z80, 5688800) /* 5.688800 MHz */ MDRV_CPU_PROGRAM_MAP(vigilant_map,0) MDRV_CPU_IO_MAP(vigilant_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 18432000/6) - /* audio CPU */ /* 3.072000 MHz */ + MDRV_CPU_ADD("audio", Z80, 18432000/6) /* 3.072000 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(buccanrs_sound_io_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ @@ -630,13 +628,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( kikcubic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 3579645) /* 3.579645 MHz */ + MDRV_CPU_ADD("main", Z80, 3579645) /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(kikcubic_map,0) MDRV_CPU_IO_MAP(kikcubic_io_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 3579645) - /* audio CPU */ /* 3.579645 MHz */ + MDRV_CPU_ADD("audio", Z80, 3579645) /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_io_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c index fe32ffa31ca..ad0b467b604 100644 --- a/src/mame/drivers/vindictr.c +++ b/src/mame/drivers/vindictr.c @@ -195,7 +195,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( vindictr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68010, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_MACHINE_RESET(vindictr) diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index 6c1d1c6f3fb..1eb1e5dfd67 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -623,7 +623,7 @@ static MACHINE_RESET(viper) static MACHINE_DRIVER_START(viper) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", MPC8240, 200000000) + MDRV_CPU_ADD("main", MPC8240, 200000000) MDRV_CPU_CONFIG(viper_ppc_cfg) MDRV_CPU_PROGRAM_MAP(viper_map, 0) MDRV_CPU_VBLANK_INT("main", viper_vblank) diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index b16ac8c1b78..f00906556a2 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -424,7 +424,7 @@ static VIDEO_UPDATE(varia) } static MACHINE_DRIVER_START( varia ) - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(varia_program_map, 0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // also level 3 diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index 3e56b8422ed..101a43b1e8d 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -239,11 +239,11 @@ static DRIVER_INIT( volfied ) static MACHINE_DRIVER_START( volfied ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8MHz */ + MDRV_CPU_ADD("main", M68000, 8000000) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, 4000000) /* sound CPU, required to run the game */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* sound CPU, required to run the game */ MDRV_CPU_PROGRAM_MAP(z80_map,0) MDRV_INTERLEAVE(20) diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 010172e4520..68a78b825ac 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -258,7 +258,7 @@ static const ppi8255_interface ppi8255_intf[2] = static MACHINE_DRIVER_START( vroulet ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", Z80, 4000000) //??? + MDRV_CPU_ADD("main", Z80, 4000000) //??? MDRV_CPU_PROGRAM_MAP(vroulet_map, 0) MDRV_CPU_IO_MAP(vroulet_io_map, 0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c index b12279ed7e1..1c6f983c3e3 100644 --- a/src/mame/drivers/vsnes.c +++ b/src/mame/drivers/vsnes.c @@ -2034,7 +2034,7 @@ static const struct NESinterface nes_interface_2 = static MACHINE_DRIVER_START( vsnes ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", N2A03,N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("main", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map,0) /* some carts also trigger IRQs */ MDRV_MACHINE_RESET(vsnes) @@ -2067,10 +2067,10 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vsdual ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", N2A03,N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("main", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map,0) /* some carts also trigger IRQs */ - MDRV_CPU_ADD(N2A03,N2A03_DEFAULTCLOCK) + MDRV_CPU_ADD("sub", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(vsnes_cpu2_map,0) /* some carts also trigger IRQs */ MDRV_MACHINE_RESET(vsdual) diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c index d9f62de38a6..789aa0cab68 100644 --- a/src/mame/drivers/vulgus.c +++ b/src/mame/drivers/vulgus.c @@ -234,12 +234,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( vulgus ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(vulgus_interrupt,2) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* 3 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 98dc4d129ec..c035f4fbfaf 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -276,7 +276,7 @@ static DRIVER_INIT( wallca ) static MACHINE_DRIVER_START( wallc ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 12288000 / 4) /* 3.072 MHz ? */ + MDRV_CPU_ADD("main", Z80, 12288000 / 4) /* 3.072 MHz ? */ MDRV_CPU_PROGRAM_MAP(wallc_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index 56dc62ee94a..dca77a40ac1 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -464,16 +464,16 @@ GFXDECODE_END static MACHINE_DRIVER_START( wardner ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,24000000/4) /* 6MHz ??? - Real board crystal is 24MHz */ + MDRV_CPU_ADD("main", Z80,24000000/4) /* 6MHz ??? - Real board crystal is 24MHz */ MDRV_CPU_PROGRAM_MAP(main_program_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) MDRV_CPU_VBLANK_INT("main", wardner_interrupt) - MDRV_CPU_ADD(Z80,24000000/7) /* 3.43MHz ??? */ + MDRV_CPU_ADD("audio", Z80,24000000/7) /* 3.43MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_program_map, 0) MDRV_CPU_IO_MAP(sound_io_map, 0) - MDRV_CPU_ADD(TMS32010,14000000) /* 14MHz Crystal CLKin */ + MDRV_CPU_ADD("dsp", TMS32010,14000000) /* 14MHz Crystal CLKin */ MDRV_CPU_PROGRAM_MAP(DSP_program_map, 0) /* Data Map is internal to the CPU */ MDRV_CPU_IO_MAP(DSP_io_map, 0) diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 070b0689bca..b290b0a068b 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -802,7 +802,7 @@ static const struct CustomSound_interface warpwarp_custom_interface = static MACHINE_DRIVER_START( geebee ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080,XTAL_18_432MHz/9) /* verified on pcb */ + MDRV_CPU_ADD("main", 8080,XTAL_18_432MHz/9) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(geebee_map,0) MDRV_CPU_IO_MAP(geebee_port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) @@ -846,7 +846,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bombbee ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080,18432000/9) /* 18.432 MHz / 9 */ + MDRV_CPU_ADD("main", 8080,18432000/9) /* 18.432 MHz / 9 */ MDRV_CPU_PROGRAM_MAP(bombbee_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_assert) diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 1d99f1a18ff..047f0249e38 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -445,12 +445,12 @@ static const struct CustomSound_interface subwoofer_interface = static MACHINE_DRIVER_START( darius2d ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */ MDRV_CPU_PROGRAM_MAP(darius2d_map,0) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) /* audio CPU */ /* 4 MHz ? */ - MDRV_CPU_ADD(Z80,16000000/4) + MDRV_CPU_ADD("audio", Z80,16000000/4) MDRV_CPU_PROGRAM_MAP(z80_sound_map,0) MDRV_MACHINE_START( warriorb ) @@ -504,12 +504,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( warriorb ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* 16 MHz ? */ MDRV_CPU_PROGRAM_MAP(warriorb_map,0) MDRV_CPU_VBLANK_INT("left", irq4_line_hold) /* audio CPU */ /* 4 MHz ? */ - MDRV_CPU_ADD(Z80,16000000/4) + MDRV_CPU_ADD("audio", Z80,16000000/4) MDRV_CPU_PROGRAM_MAP(z80_sound_map,0) MDRV_MACHINE_START( warriorb ) diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index 85110956735..99370d5a57d 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -320,16 +320,15 @@ static const struct YM2608interface ym2608_interface = static MACHINE_DRIVER_START( wc90 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6.0 MHz ??? */ + MDRV_CPU_ADD("main", Z80, 6000000) /* 6.0 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wc90_map_1,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, 6000000) /* 6.0 MHz ??? */ + MDRV_CPU_ADD("sub", Z80, 6000000) /* 6.0 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wc90_map_2,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - /* audio CPU */ /* 4 MHz ???? */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD("audio", Z80, 4000000) /* 4 MHz ???? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) /* NMIs are triggered by the main CPU */ diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 0d099b8ef61..8da5875cb1e 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -384,15 +384,15 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( wc90b ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, XTAL_14MHz/2) + MDRV_CPU_ADD("main", Z80, XTAL_14MHz/2) MDRV_CPU_PROGRAM_MAP(wc90b_map1,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_14MHz/2) + MDRV_CPU_ADD("sub", Z80, XTAL_14MHz/2) MDRV_CPU_PROGRAM_MAP(wc90b_map2,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80, XTAL_19_6608MHz/8) + MDRV_CPU_ADD("audio", Z80, XTAL_19_6608MHz/8) MDRV_CPU_PROGRAM_MAP(sound_cpu,0) /* IRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index 3bb1599516d..c1222e2e34e 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -1098,16 +1098,15 @@ static MACHINE_RESET( wecleman ) static MACHINE_DRIVER_START( wecleman ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* Schems show 10MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* Schems show 10MHz */ MDRV_CPU_PROGRAM_MAP(wecleman_map,0) MDRV_CPU_VBLANK_INT_HACK(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */ - MDRV_CPU_ADD(M68000, 10000000) /* Schems show 10MHz */ + MDRV_CPU_ADD("sub", M68000, 10000000) /* Schems show 10MHz */ MDRV_CPU_PROGRAM_MAP(wecleman_sub_map,0) /* Schems: can be reset, no nmi, soundlatch, 3.58MHz */ - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(wecleman_sound_map,0) MDRV_INTERLEAVE(100) @@ -1155,15 +1154,14 @@ static INTERRUPT_GEN( hotchase_sound_timer ) static MACHINE_DRIVER_START( hotchase ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ MDRV_CPU_PROGRAM_MAP(hotchase_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ + MDRV_CPU_ADD("sub", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ MDRV_CPU_PROGRAM_MAP(hotchase_sub_map,0) - MDRV_CPU_ADD(M6809, 3579545 / 2) - /* audio CPU */ /* 3.579/2 MHz - PCB is drawn in one set's readme */ + MDRV_CPU_ADD("audio", M6809, 3579545 / 2) /* 3.579/2 MHz - PCB is drawn in one set's readme */ MDRV_CPU_PROGRAM_MAP(hotchase_sound_map,0) MDRV_CPU_PERIODIC_INT( hotchase_sound_timer, 496 ) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 4d8702b2a70..4179c1a4da2 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -721,12 +721,12 @@ static DRIVER_INIT( quiz18k ) static MACHINE_DRIVER_START( welltris ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000,20000000/2) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* audio CPU */ - MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audio", Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_port_map,0) /* IRQs are triggered by the YM2610 */ diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 346b559d605..d067237cec5 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -950,15 +950,14 @@ static MACHINE_START( wgp ) static MACHINE_DRIVER_START( wgp ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("main", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq4_line_hold) - MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz ??? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 16000000/4) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_sound_map,0) - MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ + MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_VBLANK_INT("main", wgp_cpub_interrupt) diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 62781f0ec9e..bea14698c24 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -632,11 +632,11 @@ static INTERRUPT_GEN( wheelfir_irq ) static MACHINE_DRIVER_START( wheelfir ) - MDRV_CPU_ADD_TAG("main", M68000, 32000000) + MDRV_CPU_ADD("main", M68000, 32000000) MDRV_CPU_PROGRAM_MAP(wheelfir_main, 0) MDRV_CPU_VBLANK_INT_HACK(wheelfir_irq,256) // 1,3,5 valid - MDRV_CPU_ADD_TAG("sub", M68000, 32000000/2) + MDRV_CPU_ADD("sub", M68000, 32000000/2) MDRV_CPU_PROGRAM_MAP(wheelfir_sub, 0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // 1 valid diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index 3a70aa57253..651f4d6d707 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -1419,10 +1419,10 @@ GFXDECODE_END static MACHINE_DRIVER_START( defender ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/3/4) + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/3/4) MDRV_CPU_PROGRAM_MAP(defender_map,0) - MDRV_CPU_ADD_TAG("sound", M6808, SOUND_CLOCK) + MDRV_CPU_ADD("sound", M6808, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(defender_sound_map,0) MDRV_MACHINE_RESET(defender) @@ -1540,10 +1540,10 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( williams2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/3/4) + MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/3/4) MDRV_CPU_PROGRAM_MAP(williams2_map,0) - MDRV_CPU_ADD_TAG("sound", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */ + MDRV_CPU_ADD("sound", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */ MDRV_CPU_PROGRAM_MAP(williams2_sound_map,0) MDRV_MACHINE_RESET(williams2) diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index 95f5aae9f9e..535b370eb37 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -321,12 +321,12 @@ static MACHINE_RESET( wink ) static MACHINE_DRIVER_START( wink ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 12000000 / 4) + MDRV_CPU_ADD("main", Z80, 12000000 / 4) MDRV_CPU_PROGRAM_MAP(wink_map,0) MDRV_CPU_IO_MAP(wink_io,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 12000000 / 8) + MDRV_CPU_ADD("audio", Z80, 12000000 / 8) MDRV_CPU_PROGRAM_MAP(wink_sound_map,0) MDRV_CPU_IO_MAP(wink_sound_io,0) MDRV_CPU_PERIODIC_INT(wink_sound, 15625) diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c index 19d76fc39d3..ccb5b6d8a7b 100644 --- a/src/mame/drivers/wiping.c +++ b/src/mame/drivers/wiping.c @@ -289,12 +289,11 @@ static const struct CustomSound_interface custom_interface = static MACHINE_DRIVER_START( wiping ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("main", Z80,18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(Z80,18432000/6) - /* audio CPU */ /* 3.072 MHz */ + MDRV_CPU_ADD("audio", Z80,18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold,120) /* periodic interrupt, don't know about the frequency */ diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index d3c4445cc3a..8387e1f3118 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -777,12 +777,12 @@ static INTERRUPT_GEN( witch_sub_interrupt ) static MACHINE_DRIVER_START( witch ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */ + MDRV_CPU_ADD("main", Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(map_main, 0) MDRV_CPU_VBLANK_INT("main", witch_main_interrupt) /* 2nd z80 */ - MDRV_CPU_ADD(Z80,8000000) /* ? MHz */ + MDRV_CPU_ADD("sub", Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(map_sub, 0) MDRV_CPU_VBLANK_INT("main", witch_sub_interrupt) diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index d7c4092b026..fd2e231b5e3 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -692,12 +692,11 @@ DISCRETE_SOUND_END static MACHINE_DRIVER_START( wiz ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz ??? */ + MDRV_CPU_ADD("main", Z80, 18432000/6) /* 3.072 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(Z80, 14318000/8) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 14318000/8) /* ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? */ diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c index 84901cfe4e0..c7d7d6ae5f3 100644 --- a/src/mame/drivers/wldarrow.c +++ b/src/mame/drivers/wldarrow.c @@ -344,7 +344,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( wldarrow ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", 8080, 2000000) + MDRV_CPU_ADD("main", 8080, 2000000) MDRV_CPU_PROGRAM_MAP(wldarrow_map,0) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c index 6c9d98e6669..beee2d604c0 100644 --- a/src/mame/drivers/wolfpack.c +++ b/src/mame/drivers/wolfpack.c @@ -323,7 +323,7 @@ static MACHINE_DRIVER_START(wolfpack) MDRV_SPEAKER_STANDARD_MONO("mono") /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) + MDRV_CPU_ADD("main", M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(main_map,0) /* video hardware */ diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c index 4f38a3417aa..cab2bb2f0dc 100644 --- a/src/mame/drivers/wrally.c +++ b/src/mame/drivers/wrally.c @@ -247,11 +247,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( wrally ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000,XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("main", M68000,XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(wrally_readmem, 0) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) - MDRV_CPU_ADD(DS5002FP, XTAL_24MHz/2) /* verified on pcb */ + MDRV_CPU_ADD("mcu", DS5002FP, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_CONFIG(dallas_config) MDRV_CPU_PROGRAM_MAP(dallas_rom, 0) MDRV_CPU_DATA_MAP(dallas_ram, 0) diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index c4d6f4644b3..5ba7b56fd41 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -345,11 +345,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( wwfsstar ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) + MDRV_CPU_ADD("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(wwfsstars_interrupt,272) - MDRV_CPU_ADD(Z80, 3579545) + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index 48d499624a0..47f07377727 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -386,12 +386,11 @@ static VIDEO_EOF( wwfwfest ) static MACHINE_DRIVER_START( wwfwfest ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 24 crystal, 12 rated chip */ + MDRV_CPU_ADD("main", M68000, 24000000/2) /* 24 crystal, 12 rated chip */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(wwfwfest_interrupt,2) - MDRV_CPU_ADD(Z80, 3579545) - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_map,0) /* video hardware */ diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index b335cc29bea..d545edcfe33 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -459,18 +459,17 @@ static MACHINE_START( xsleena ) static MACHINE_DRIVER_START( xsleena ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* Confirmed 1.5MHz */ + MDRV_CPU_ADD("main", M6809, 1500000) /* Confirmed 1.5MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(xain_interrupt,256) - MDRV_CPU_ADD(M6809, 1500000) /* Confirmed 1.5MHz */ + MDRV_CPU_ADD("sub", M6809, 1500000) /* Confirmed 1.5MHz */ MDRV_CPU_PROGRAM_MAP(cpu_map_B,0) - MDRV_CPU_ADD(M6809, 1500000) /* Confirmed 1.5MHz */ - /* audio CPU */ + MDRV_CPU_ADD("audio", M6809, 1500000) /* Confirmed 1.5MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) -// MDRV_CPU_ADD(M68705, 3000000) /* Confirmed 3MHz */ +// MDRV_CPU_ADD("mcu", M68705, 3000000) /* Confirmed 3MHz */ // MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_MACHINE_START(xsleena) diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index ed94b0d3fab..fba01ef5205 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -455,15 +455,13 @@ static const struct K054539interface k054539_interface = static MACHINE_DRIVER_START( xexex ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) // 16MHz (32MHz xtal) + MDRV_CPU_ADD("main", M68000, 16000000) // 16MHz (32MHz xtal) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(xexex_interrupt,2) // 8MHz (PCB shows one 32MHz/18.432MHz xtal, reference: www.system16.com) // more likely 32MHz since 18.432MHz yields 4.608MHz(too slow) or 9.216MHz(too fast) with integer divisors - MDRV_CPU_ADD(Z80, 8000000) - - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_INTERLEAVE(32) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 4b74ec4d10b..3f9140f4117 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -474,12 +474,11 @@ static MACHINE_START( xmen ) static MACHINE_DRIVER_START( xmen ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(xmen_interrupt,2) - MDRV_CPU_ADD(Z80,8000000) /* verified with M1, guessed but accurate */ - /* audio CPU */ /* ????? */ + MDRV_CPU_ADD("audio", Z80,8000000) /* verified with M1, guessed but accurate */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_MACHINE_START(xmen) @@ -541,12 +540,11 @@ static INTERRUPT_GEN( xmen6p_interrupt ) static MACHINE_DRIVER_START( xmen6p ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* ? */ + MDRV_CPU_ADD("main", M68000, 16000000) /* ? */ MDRV_CPU_PROGRAM_MAP(6p_main_map,0) MDRV_CPU_VBLANK_INT_HACK(xmen6p_interrupt,2) - MDRV_CPU_ADD(Z80,8000000) /* verified with M1, guessed but accurate */ - /* audio CPU */ /* ????? */ + MDRV_CPU_ADD("audio", Z80,8000000) /* verified with M1, guessed but accurate */ MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index 25faf6317f5..57747fd5806 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -207,7 +207,7 @@ static INTERRUPT_GEN( xorworld_interrupt ) static MACHINE_DRIVER_START( xorworld ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M68000, 10000000) // 10 MHz + MDRV_CPU_ADD("main", M68000, 10000000) // 10 MHz MDRV_CPU_PROGRAM_MAP(xorworld_map, 0) MDRV_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6 diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c index aecc4086a2a..e652c522785 100644 --- a/src/mame/drivers/xtheball.c +++ b/src/mame/drivers/xtheball.c @@ -356,7 +356,7 @@ static const tms34010_config tms_config = static MACHINE_DRIVER_START( xtheball ) - MDRV_CPU_ADD_TAG("main", TMS34010, 40000000) + MDRV_CPU_ADD("main", TMS34010, 40000000) MDRV_CPU_CONFIG(tms_config) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_PERIODIC_INT(irq1_line_hold,15000) diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index 399b9b81883..832e5988a67 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -302,11 +302,11 @@ static const struct YM2203interface ym2203_interface_2 = static MACHINE_DRIVER_START( xxmissio ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,12000000/4) /* 3.0MHz */ + MDRV_CPU_ADD("main", Z80,12000000/4) /* 3.0MHz */ MDRV_CPU_PROGRAM_MAP(map1,0) MDRV_CPU_VBLANK_INT("main", xxmissio_interrupt_m) - MDRV_CPU_ADD(Z80,12000000/4) /* 3.0MHz */ + MDRV_CPU_ADD("sub", Z80,12000000/4) /* 3.0MHz */ MDRV_CPU_PROGRAM_MAP(map2,0) MDRV_CPU_VBLANK_INT_HACK(xxmissio_interrupt_s,2) diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index 6fd2c85a60a..2184fabc33f 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -190,7 +190,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( xybots ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) + MDRV_CPU_ADD("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index da0ad9782b3..bc994fff1c0 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -231,7 +231,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( xyonix ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,16000000 / 4) /* 4 MHz ? */ + MDRV_CPU_ADD("main", Z80,16000000 / 4) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index 4476e5f146b..e9c1b40ece8 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -254,7 +254,7 @@ static const struct VLM5030interface vlm5030_interface = static MACHINE_DRIVER_START( yiear ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M6809,18432000/16) /* ???? */ + MDRV_CPU_ADD("main", M6809,18432000/16) /* ???? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_PERIODIC_INT(yiear_nmi_interrupt,500) /* music tempo (correct frequency unknown) */ diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c index 1924e002508..a1bec9d7a3e 100644 --- a/src/mame/drivers/yumefuda.c +++ b/src/mame/drivers/yumefuda.c @@ -223,7 +223,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( yumefuda ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80 , 6000000) /*???*/ + MDRV_CPU_ADD("main", Z80 , 6000000) /*???*/ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index 5758ba76bd8..69cbbc51ef2 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -583,12 +583,11 @@ static const struct YM3812interface magicbub_ym3812_intf = static MACHINE_DRIVER_START( magicbub ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) - MDRV_CPU_ADD(Z80, 3000000) - /* audio CPU */ /* ? */ + MDRV_CPU_ADD("audio", Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_port_map,0) @@ -628,7 +627,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( shocking ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 16000000) + MDRV_CPU_ADD("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq2_line_hold) diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 54275742a88..dcc354d2253 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -506,13 +506,12 @@ static const struct MSM5205interface yunsung8_msm5205_interface = static MACHINE_DRIVER_START( yunsung8 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* Z80B */ + MDRV_CPU_ADD("main", Z80, 8000000) /* Z80B */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* No nmi routine */ - MDRV_CPU_ADD(Z80, 4000000) /* ? */ - /* audio CPU */ + MDRV_CPU_ADD("audio", Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI caused by the MSM5205? */ diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c index 3cdbbe4f5e2..c6da1f0c329 100644 --- a/src/mame/drivers/zac2650.c +++ b/src/mame/drivers/zac2650.c @@ -308,7 +308,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( tinvader ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", S2650, 3800000/4) + MDRV_CPU_ADD("main", S2650, 3800000/4) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_IO_MAP(port_map,0) diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index d692225ff01..7aaa41577d6 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -637,15 +637,15 @@ static const struct TMS5220interface tms5220_interface = static MACHINE_DRIVER_START( zaccaria ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80,XTAL_18_432MHz/6) /* verified on pcb */ + MDRV_CPU_ADD("main", Z80,XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) - MDRV_CPU_ADD(M6802,XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio", M6802,XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map_1,0) MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle,(double)3580000/4096) - MDRV_CPU_ADD(M6802,XTAL_3_579545MHz) /* verified on pcb */ + MDRV_CPU_ADD("audio2", M6802,XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map_2,0) MDRV_MACHINE_START(zaccaria) diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index ffae781174c..3a6336a9e5e 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -984,7 +984,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( root ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/16) + MDRV_CPU_ADD("main", Z80, MASTER_CLOCK/16) MDRV_CPU_PROGRAM_MAP(zaxxon_map, 0) MDRV_CPU_VBLANK_INT("main", vblank_int) @@ -1052,7 +1052,7 @@ static MACHINE_DRIVER_START( congo ) MDRV_DEVICE_MODIFY( "ppi8255", PPI8255 ) MDRV_DEVICE_CONFIG( congo_ppi_intf ) - MDRV_CPU_ADD(Z80, SOUND_CLOCK) + MDRV_CPU_ADD("audio", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(congo_sound_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/16/16/16/4) diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 45fcb6f92e8..1bbaa264145 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -176,12 +176,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( zerozone ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */ + MDRV_CPU_ADD("main", M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT("main", irq1_line_hold) - MDRV_CPU_ADD(Z80, 1000000) - /* audio CPU */ /* 1 MHz ??? */ + MDRV_CPU_ADD("audio", Z80, 1000000) /* 1 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index e34039d5bc5..ccf41261a80 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -421,7 +421,7 @@ static void zn_machine_init( running_machine *machine ) static MACHINE_DRIVER_START( zn1_1mb_vram ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG( "MAIN", PSXCPU, XTAL_67_7376MHz ) + MDRV_CPU_ADD( "MAIN", PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( zn_map, 0 ) MDRV_CPU_VBLANK_INT("main", psx_vblank) @@ -457,7 +457,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( zn2 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG( "MAIN", PSXCPU, XTAL_100MHz ) + MDRV_CPU_ADD( "MAIN", PSXCPU, XTAL_100MHz ) MDRV_CPU_PROGRAM_MAP( zn_map, 0 ) MDRV_CPU_VBLANK_INT("main", psx_vblank) @@ -679,8 +679,7 @@ static const struct QSound_interface qsound_interface = static MACHINE_DRIVER_START( coh1000c ) MDRV_IMPORT_FROM( zn1_1mb_vram ) - MDRV_CPU_ADD( Z80, 8000000 ) - /* audio CPU */ /* 8MHz ?? */ + MDRV_CPU_ADD("audio", Z80, 8000000 ) /* 8MHz ?? */ MDRV_CPU_PROGRAM_MAP( qsound_map, 0 ) MDRV_CPU_IO_MAP( qsound_portmap, 0 ) MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ @@ -697,8 +696,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( coh1002c ) MDRV_IMPORT_FROM( zn1_2mb_vram ) - MDRV_CPU_ADD( Z80, 8000000 ) - /* audio CPU */ /* 8MHz ?? */ + MDRV_CPU_ADD("audio", Z80, 8000000 ) /* 8MHz ?? */ MDRV_CPU_PROGRAM_MAP( qsound_map, 0 ) MDRV_CPU_IO_MAP( qsound_portmap, 0 ) MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ @@ -881,8 +879,7 @@ static MACHINE_RESET( coh3002c ) static MACHINE_DRIVER_START( coh3002c ) MDRV_IMPORT_FROM( zn2 ) - /* audio CPU */ /* 8MHz ?? */ - MDRV_CPU_ADD( Z80, 8000000 ) + MDRV_CPU_ADD("audio", Z80, 8000000 ) /* 8MHz ?? */ MDRV_CPU_PROGRAM_MAP( qsound_map, 0 ) MDRV_CPU_IO_MAP( qsound_portmap, 0 ) MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ @@ -1287,8 +1284,7 @@ static MACHINE_DRIVER_START( coh1000ta ) MDRV_CPU_MODIFY( "MAIN" ) MDRV_CPU_VBLANK_INT("main", coh1000t_vblank) - MDRV_CPU_ADD( Z80, 16000000 / 4 ) - /* audio CPU */ /* 4 MHz */ + MDRV_CPU_ADD("audio", Z80, 16000000 / 4 ) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP( fx1a_sound_map, 0 ) MDRV_MACHINE_RESET( coh1000ta ) MDRV_NVRAM_HANDLER( coh1000ta ) @@ -1931,7 +1927,7 @@ static MACHINE_DRIVER_START( coh1002e ) MDRV_IMPORT_FROM( zn1_2mb_vram ) /* audio CPU */ - MDRV_CPU_ADD( M68000, 12000000 ) + MDRV_CPU_ADD("audio", M68000, 12000000 ) MDRV_CPU_PROGRAM_MAP( psarc_snd_map, 0 ) MDRV_MACHINE_RESET( coh1002e ) @@ -2394,7 +2390,7 @@ static MACHINE_DRIVER_START( coh1001l ) MDRV_IMPORT_FROM( zn1_2mb_vram ) // /* audio CPU */ -// MDRV_CPU_ADD( M68000, 10000000 ) +// MDRV_CPU_ADD("audio", M68000, 10000000 ) // MDRV_CPU_PROGRAM_MAP( atlus_snd_map, 0 ) MDRV_MACHINE_RESET( coh1001l ) @@ -2711,7 +2707,7 @@ static MACHINE_DRIVER_START( coh1002msnd ) MDRV_IMPORT_FROM( zn1_2mb_vram ) /* audio CPU */ - MDRV_CPU_ADD( Z80, 32000000/8 ) + MDRV_CPU_ADD("audio", Z80, 32000000/8 ) MDRV_CPU_PROGRAM_MAP( cbaj_z80_map, 0 ) MDRV_CPU_IO_MAP( cbaj_z80_port_map, 0 ) @@ -2727,7 +2723,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( coh1002ml ) MDRV_IMPORT_FROM( zn1_2mb_vram ) - MDRV_CPU_ADD( Z80, 8000000 ) + MDRV_CPU_ADD("link", Z80, 8000000 ) MDRV_CPU_PROGRAM_MAP( link_map, 0 ) MDRV_MACHINE_RESET( coh1002m ) diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index b218801509f..f882e3e343c 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -457,11 +457,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( zodiack ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.00 MHz??? */ + MDRV_CPU_ADD("main", Z80, 4000000) /* 4.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2) - MDRV_CPU_ADD(Z80, 14318000/8) /* 1.78975 MHz??? */ + MDRV_CPU_ADD("audio", Z80, 14318000/8) /* 1.78975 MHz??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,8) /* IRQs are triggered by the main CPU */ diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index b887be98ba0..7300147d899 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -737,14 +737,14 @@ static MACHINE_RESET( zr107 ) static MACHINE_DRIVER_START( zr107 ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MDRV_CPU_ADD("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_PROGRAM_MAP(zr107_map, 0) MDRV_CPU_VBLANK_INT("main", zr107_vblank) - MDRV_CPU_ADD(M68000, 64000000/8) /* 8MHz */ + MDRV_CPU_ADD("audio", M68000, 64000000/8) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(sharc_map, 0) @@ -782,14 +782,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jetwave ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MDRV_CPU_ADD("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_PROGRAM_MAP(jetwave_map, 0) MDRV_CPU_VBLANK_INT("main", zr107_vblank) - MDRV_CPU_ADD(M68000, 64000000/8) /* 8MHz */ + MDRV_CPU_ADD("audio", M68000, 64000000/8) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) - MDRV_CPU_ADD(ADSP21062, 36000000) + MDRV_CPU_ADD("dsp", ADSP21062, 36000000) MDRV_CPU_CONFIG(sharc_cfg) MDRV_CPU_DATA_MAP(sharc_map, 0) diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c index dc6e22a0ed0..16cc127175d 100644 --- a/src/mame/machine/asic65.c +++ b/src/mame/machine/asic65.c @@ -537,7 +537,7 @@ ADDRESS_MAP_END MACHINE_DRIVER_START( asic65 ) /* ASIC65 */ - MDRV_CPU_ADD_TAG("asic65", TMS32010, 20000000) + MDRV_CPU_ADD("asic65", TMS32010, 20000000) MDRV_CPU_PROGRAM_MAP(asic65_program_map,0) MDRV_CPU_IO_MAP(asic65_io_map,0) MACHINE_DRIVER_END diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index 08cfa832722..0ac97dfa474 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -441,7 +441,7 @@ static const mc6845_interface mc6845_intf = MACHINE_DRIVER_START( qix_video ) - MDRV_CPU_ADD_TAG("video", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ + MDRV_CPU_ADD("video", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MDRV_CPU_PROGRAM_MAP(qix_video_map,0) MDRV_VIDEO_START(qix) |