diff options
Diffstat (limited to 'src/mame/drivers/junior.cpp')
-rw-r--r-- | src/mame/drivers/junior.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp index d571bb4a543..44ba5f62e8f 100644 --- a/src/mame/drivers/junior.cpp +++ b/src/mame/drivers/junior.cpp @@ -225,26 +225,25 @@ void junior_state::machine_reset() } -void junior_state::junior(machine_config &config) -{ +MACHINE_CONFIG_START(junior_state::junior) /* basic machine hardware */ - M6502(config, m_maincpu, 1_MHz_XTAL); - m_maincpu->set_addrmap(AS_PROGRAM, &junior_state::junior_mem); - config.m_minimum_quantum = attotime::from_hz(50); + MCFG_DEVICE_ADD("maincpu",M6502, 1_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(junior_mem) + MCFG_QUANTUM_TIME(attotime::from_hz(50)) /* video hardware */ config.set_default_layout(layout_junior); /* Devices */ - MOS6532_NEW(config, m_riot, 1_MHz_XTAL); - m_riot->pa_rd_callback().set(FUNC(junior_state::junior_riot_a_r)); - m_riot->pa_wr_callback().set(FUNC(junior_state::junior_riot_a_w)); - m_riot->pb_rd_callback().set(FUNC(junior_state::junior_riot_b_r)); - m_riot->pb_wr_callback().set(FUNC(junior_state::junior_riot_b_w)); - m_riot->irq_wr_callback().set_inputline(m_maincpu, M6502_IRQ_LINE); - - TIMER(config, "led_timer").configure_periodic(FUNC(junior_state::junior_update_leds), attotime::from_hz(50)); -} + MCFG_DEVICE_ADD("riot", MOS6532_NEW, 1_MHz_XTAL) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, junior_state, junior_riot_a_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, junior_state, junior_riot_a_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, junior_state, junior_riot_b_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, junior_state, junior_riot_b_w)) + MCFG_MOS6530n_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE)) + + MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", junior_state, junior_update_leds, attotime::from_hz(50)) +MACHINE_CONFIG_END /* ROM definition */ |