summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/wiping.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/wiping.c')
-rw-r--r--src/mame/drivers/wiping.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 81bb0c14fc1..e2fc9aaef83 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -262,20 +262,18 @@ static GFXDECODE_START( wiping )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 64*4, 64 )
GFXDECODE_END
-static INTERRUPT_GEN( vblank_irq )
+INTERRUPT_GEN_MEMBER(wiping_state::vblank_irq)
{
- wiping_state *state = device->machine().driver_data<wiping_state>();
- if(state->m_main_irq_mask)
- device->execute().set_input_line(0, HOLD_LINE);
+ if(m_main_irq_mask)
+ device.execute().set_input_line(0, HOLD_LINE);
}
-static INTERRUPT_GEN( sound_timer_irq )
+INTERRUPT_GEN_MEMBER(wiping_state::sound_timer_irq)
{
- wiping_state *state = device->machine().driver_data<wiping_state>();
- if(state->m_sound_irq_mask)
- device->execute().set_input_line(0, HOLD_LINE);
+ if(m_sound_irq_mask)
+ device.execute().set_input_line(0, HOLD_LINE);
}
@@ -285,11 +283,11 @@ static MACHINE_CONFIG_START( wiping, wiping_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", wiping_state, vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT(sound_timer_irq,120) /* periodic interrupt, don't know about the frequency */
+ MCFG_CPU_PERIODIC_INT_DRIVER(wiping_state, sound_timer_irq, 120) /* periodic interrupt, don't know about the frequency */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)