diff options
Diffstat (limited to 'src/mame/drivers/mpf1.cpp')
-rw-r--r-- | src/mame/drivers/mpf1.cpp | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index b7de2be907e..eec49abcc2e 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -355,8 +355,8 @@ void mpf1_state::machine_reset() /* Machine Drivers */ -MACHINE_CONFIG_START(mpf1_state::mpf1) - +void mpf1_state::mpf1(machine_config &config) +{ /* basic machine hardware */ Z80(config, m_maincpu, XTAL(3'579'545)/2); m_maincpu->set_addrmap(AS_PROGRAM, &mpf1_state::mpf1_map); @@ -376,21 +376,21 @@ MACHINE_CONFIG_START(mpf1_state::mpf1) ppi.out_pb_callback().set(FUNC(mpf1_state::ppi_pb_w)); ppi.out_pc_callback().set(FUNC(mpf1_state::ppi_pc_w)); - MCFG_CASSETTE_ADD("cassette") - MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) + CASSETTE(config, m_cassette); + m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); /* video hardware */ config.set_default_layout(layout_mpf1); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.25); TIMER(config, "halt_timer").configure_periodic(FUNC(mpf1_state::check_halt_callback), attotime::from_hz(1)); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(mpf1_state::mpf1b) +void mpf1_state::mpf1b(machine_config &config) +{ /* basic machine hardware */ Z80(config, m_maincpu, XTAL(3'579'545)/2); m_maincpu->set_addrmap(AS_PROGRAM, &mpf1_state::mpf1b_map); @@ -410,24 +410,23 @@ MACHINE_CONFIG_START(mpf1_state::mpf1b) ppi.out_pb_callback().set(FUNC(mpf1_state::ppi_pb_w)); ppi.out_pc_callback().set(FUNC(mpf1_state::ppi_pc_w)); - MCFG_CASSETTE_ADD("cassette") - MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) + CASSETTE(config, m_cassette); + m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); /* video hardware */ config.set_default_layout(layout_mpf1b); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_DEVICE_ADD(TMS5220_TAG, TMS5220, 680000L) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + TMS5220(config, TMS5220_TAG, 680000L).add_route(ALL_OUTPUTS, "mono", 0.50); TIMER(config, "halt_timer").configure_periodic(FUNC(mpf1_state::check_halt_callback), attotime::from_hz(1)); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(mpf1_state::mpf1p) +void mpf1_state::mpf1p(machine_config &config) +{ /* basic machine hardware */ Z80(config, m_maincpu, 2500000); m_maincpu->set_addrmap(AS_PROGRAM, &mpf1_state::mpf1p_map); @@ -450,16 +449,15 @@ MACHINE_CONFIG_START(mpf1_state::mpf1p) ppi.out_pb_callback().set(FUNC(mpf1_state::ppi_pb_w)); ppi.out_pc_callback().set(FUNC(mpf1_state::ppi_pc_w)); - MCFG_CASSETTE_ADD("cassette") - MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) + CASSETTE(config, m_cassette); + m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.25); TIMER(config, "halt_timer").configure_periodic(FUNC(mpf1_state::check_halt_callback), attotime::from_hz(1)); -MACHINE_CONFIG_END +} /* ROMs */ |