diff options
Diffstat (limited to 'src/mame/drivers/bottom9.c')
-rw-r--r-- | src/mame/drivers/bottom9.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 84940e06bcd..dca0a865aae 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -20,12 +20,11 @@ #include "includes/konamipt.h" #include "includes/bottom9.h" -static INTERRUPT_GEN( bottom9_interrupt ) +INTERRUPT_GEN_MEMBER(bottom9_state::bottom9_interrupt) { - bottom9_state *state = device->machine().driver_data<bottom9_state>(); - if (k052109_is_irq_enabled(state->m_k052109)) - device->execute().set_input_line(0, HOLD_LINE); + if (k052109_is_irq_enabled(m_k052109)) + device.execute().set_input_line(0, HOLD_LINE); } READ8_MEMBER(bottom9_state::k052109_051960_r) @@ -138,11 +137,10 @@ WRITE8_MEMBER(bottom9_state::bottom9_sh_irqtrigger_w) m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } -static INTERRUPT_GEN( bottom9_sound_interrupt ) +INTERRUPT_GEN_MEMBER(bottom9_state::bottom9_sound_interrupt) { - bottom9_state *state = device->machine().driver_data<bottom9_state>(); - if (state->m_nmienable) - device->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); + if (m_nmienable) + device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } WRITE8_MEMBER(bottom9_state::nmi_enable_w) @@ -353,11 +351,11 @@ static MACHINE_CONFIG_START( bottom9, bottom9_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */ MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_VBLANK_INT("screen", bottom9_interrupt) + MCFG_CPU_VBLANK_INT_DRIVER("screen", bottom9_state, bottom9_interrupt) MCFG_CPU_ADD("audiocpu", Z80, 3579545) MCFG_CPU_PROGRAM_MAP(audio_map) - MCFG_CPU_PERIODIC_INT(bottom9_sound_interrupt,8*60) /* irq is triggered by the main CPU */ + MCFG_CPU_PERIODIC_INT_DRIVER(bottom9_state, bottom9_sound_interrupt, 8*60) /* irq is triggered by the main CPU */ /* video hardware */ |