diff options
Diffstat (limited to 'src/mame/drivers/gijoe.c')
-rw-r--r-- | src/mame/drivers/gijoe.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index f142369a499..2e29503340b 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -116,25 +116,24 @@ static TIMER_CALLBACK( dmaend_callback ) state->m_maincpu->set_input_line(6, HOLD_LINE); } -static INTERRUPT_GEN( gijoe_interrupt ) +INTERRUPT_GEN_MEMBER(gijoe_state::gijoe_interrupt) { - gijoe_state *state = device->machine().driver_data<gijoe_state>(); // global interrupt masking (*this game only) - if (!k056832_is_irq_enabled(state->m_k056832, 0)) + if (!k056832_is_irq_enabled(m_k056832, 0)) return; - if (k053246_is_irq_enabled(state->m_k053246)) + if (k053246_is_irq_enabled(m_k053246)) { - gijoe_objdma(device->machine()); + gijoe_objdma(machine()); // 42.7us(clr) + 341.3us(xfer) delay at 6Mhz dotclock - state->m_dmadelay_timer->adjust(JOE_DMADELAY); + m_dmadelay_timer->adjust(JOE_DMADELAY); } // trigger V-blank interrupt - if (state->m_cur_control2 & 0x0080) - device->execute().set_input_line(5, HOLD_LINE); + if (m_cur_control2 & 0x0080) + device.execute().set_input_line(5, HOLD_LINE); } WRITE16_MEMBER(gijoe_state::sound_cmd_w) @@ -296,7 +295,7 @@ static MACHINE_CONFIG_START( gijoe, gijoe_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* Confirmed */ MCFG_CPU_PROGRAM_MAP(gijoe_map) - MCFG_CPU_VBLANK_INT("screen", gijoe_interrupt) + MCFG_CPU_VBLANK_INT_DRIVER("screen", gijoe_state, gijoe_interrupt) MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* Amuse & confirmed. z80e */ MCFG_CPU_PROGRAM_MAP(sound_map) |