diff options
Diffstat (limited to 'src/mame/drivers/gberet.c')
-rw-r--r-- | src/mame/drivers/gberet.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 4639539a344..fb7c6b76d44 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -82,23 +82,22 @@ * *************************************/ -static TIMER_DEVICE_CALLBACK( gberet_interrupt_tick ) +TIMER_DEVICE_CALLBACK_MEMBER(gberet_state::gberet_interrupt_tick) { - gberet_state *state = timer.machine().driver_data<gberet_state>(); - UINT8 ticks_mask = ~state->m_interrupt_ticks & (state->m_interrupt_ticks + 1); // 0->1 - state->m_interrupt_ticks++; + UINT8 ticks_mask = ~m_interrupt_ticks & (m_interrupt_ticks + 1); // 0->1 + m_interrupt_ticks++; // NMI on d0 - if (ticks_mask & state->m_interrupt_mask & 1) - timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); + if (ticks_mask & m_interrupt_mask & 1) + machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); // IRQ on d3 (used by mrgoemon) - if (ticks_mask & state->m_interrupt_mask<<2 & 8) - timer.machine().device("maincpu")->execute().set_input_line(0, ASSERT_LINE); + if (ticks_mask & m_interrupt_mask<<2 & 8) + machine().device("maincpu")->execute().set_input_line(0, ASSERT_LINE); // IRQ on d4 (used by gberet) - if (ticks_mask & state->m_interrupt_mask<<2 & 16) - timer.machine().device("maincpu")->execute().set_input_line(0, ASSERT_LINE); + if (ticks_mask & m_interrupt_mask<<2 & 16) + machine().device("maincpu")->execute().set_input_line(0, ASSERT_LINE); } @@ -423,7 +422,7 @@ static MACHINE_CONFIG_START( gberet, gberet_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) // X1S (generated by a custom IC) MCFG_CPU_PROGRAM_MAP(gberet_map) - MCFG_TIMER_ADD_SCANLINE("scantimer", gberet_interrupt_tick, "screen", 0, 16) // ? + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gberet_state, gberet_interrupt_tick, "screen", 0, 16) MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet) MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet) |