diff options
Diffstat (limited to 'src/mame/drivers/rollrace.c')
-rw-r--r-- | src/mame/drivers/rollrace.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index c1275843fbc..4b4b7bb5f29 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -208,20 +208,18 @@ static GFXDECODE_START( rollrace ) GFXDECODE_ENTRY( "gfx5", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END -static INTERRUPT_GEN( vblank_irq ) +INTERRUPT_GEN_MEMBER(rollrace_state::vblank_irq) { - rollrace_state *state = device->machine().driver_data<rollrace_state>(); - if(state->m_nmi_mask) - device->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); + if(m_nmi_mask) + device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static INTERRUPT_GEN( sound_timer_irq ) +INTERRUPT_GEN_MEMBER(rollrace_state::sound_timer_irq) { - rollrace_state *state = device->machine().driver_data<rollrace_state>(); - if(state->m_sound_nmi_mask) - device->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); + if(m_sound_nmi_mask) + device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } static MACHINE_CONFIG_START( rollrace, rollrace_state ) @@ -229,11 +227,11 @@ static MACHINE_CONFIG_START( rollrace, rollrace_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(rollrace_map) - MCFG_CPU_VBLANK_INT("screen", vblank_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", rollrace_state, vblank_irq) MCFG_CPU_ADD("audiocpu", Z80,XTAL_24MHz/16) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(rollrace_sound_map) - MCFG_CPU_PERIODIC_INT(sound_timer_irq,4*60) + MCFG_CPU_PERIODIC_INT_DRIVER(rollrace_state, sound_timer_irq, 4*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) |