diff options
Diffstat (limited to 'src/mame/drivers/cclimber.c')
-rw-r--r-- | src/mame/drivers/cclimber.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index 9e089fc2c6e..75ce44ece48 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -973,12 +973,11 @@ static GFXDECODE_START( toprollr ) GFXDECODE_ENTRY( "gfx3", 0x0000, cclimber_charlayout, 24*4, 16 ) GFXDECODE_END -static INTERRUPT_GEN( vblank_irq ) +INTERRUPT_GEN_MEMBER(cclimber_state::vblank_irq) { - cclimber_state *state = device->machine().driver_data<cclimber_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 MACHINE_CONFIG_START( root, cclimber_state ) @@ -987,7 +986,7 @@ static MACHINE_CONFIG_START( root, cclimber_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(cclimber_map) MCFG_CPU_IO_MAP(cclimber_portmap) - MCFG_CPU_VBLANK_INT("screen", vblank_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) MCFG_MACHINE_RESET_OVERRIDE(cclimber_state,cclimber) @@ -1082,12 +1081,12 @@ static MACHINE_CONFIG_START( swimmer, cclimber_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(swimmer_map) - MCFG_CPU_VBLANK_INT("screen", vblank_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) MCFG_CPU_ADD("audiocpu", Z80,XTAL_4MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(swimmer_audio_map) MCFG_CPU_IO_MAP(swimmer_audio_portmap) - MCFG_CPU_PERIODIC_INT(nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */ + MCFG_CPU_PERIODIC_INT_DRIVER(cclimber_state, nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) |