diff options
Diffstat (limited to 'src/mame/drivers/mk2.cpp')
-rw-r--r-- | src/mame/drivers/mk2.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp index 7196be18f16..a126253a09b 100644 --- a/src/mame/drivers/mk2.cpp +++ b/src/mame/drivers/mk2.cpp @@ -200,28 +200,28 @@ WRITE8_MEMBER( mk2_state::mk2_write_b ) } -void mk2_state::mk2(machine_config &config) -{ +MACHINE_CONFIG_START(mk2_state::mk2) /* basic machine hardware */ - M6504(config, m_maincpu, 1000000); - m_maincpu->set_addrmap(AS_PROGRAM, &mk2_state::mk2_mem); - config.m_minimum_quantum = attotime::from_hz(60); + MCFG_DEVICE_ADD("maincpu", M6504, 1000000) + MCFG_DEVICE_PROGRAM_MAP(mk2_mem) + MCFG_QUANTUM_TIME(attotime::from_hz(60)) /* video hardware */ config.set_default_layout(layout_mk2); - MOS6530(config, m_miot, 1000000); - m_miot->in_pa_callback().set(FUNC(mk2_state::mk2_read_a)); - m_miot->out_pa_callback().set(FUNC(mk2_state::mk2_write_a)); - m_miot->in_pb_callback().set(FUNC(mk2_state::mk2_read_b)); - m_miot->out_pb_callback().set(FUNC(mk2_state::mk2_write_b)); + MCFG_DEVICE_ADD("miot", MOS6530, 1000000) + MCFG_MOS6530_IN_PA_CB(READ8(*this, mk2_state, mk2_read_a)) + MCFG_MOS6530_OUT_PA_CB(WRITE8(*this, mk2_state, mk2_write_a)) + MCFG_MOS6530_IN_PB_CB(READ8(*this, mk2_state, mk2_read_b)) + MCFG_MOS6530_OUT_PB_CB(WRITE8(*this, mk2_state, mk2_write_b)) /* sound hardware */ SPEAKER(config, "mono").front_center(); - SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - TIMER(config, "led_timer").configure_periodic(FUNC(mk2_state::update_leds), attotime::from_hz(60)); -} + MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", mk2_state, update_leds, attotime::from_hz(60)) +MACHINE_CONFIG_END ROM_START(ccmk2) |