summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/slapfght.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/slapfght.c')
-rw-r--r--src/mame/drivers/slapfght.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 93ac56a61fa..f11ca1b9d83 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -734,12 +734,11 @@ static const ay8910_interface ay8910_interface_2 =
DEVCB_NULL
};
-static INTERRUPT_GEN( vblank_irq )
+INTERRUPT_GEN_MEMBER(slapfght_state::vblank_irq)
{
- slapfght_state *state = device->machine().driver_data<slapfght_state>();
- if(state->m_irq_mask)
- device->execute().set_input_line(0, HOLD_LINE);
+ if(m_irq_mask)
+ device.execute().set_input_line(0, HOLD_LINE);
}
@@ -749,11 +748,11 @@ static MACHINE_CONFIG_START( perfrman, slapfght_state )
MCFG_CPU_ADD("maincpu", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(perfrman_map)
MCFG_CPU_IO_MAP(slapfght_io_map)
- MCFG_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(perfrman_sound_map)
- MCFG_CPU_PERIODIC_INT(getstar_interrupt,4*60) /* music speed, verified */
+ MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, getstar_interrupt, 4*60) /* music speed, verified */
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -795,11 +794,11 @@ static MACHINE_CONFIG_START( tigerhb, slapfght_state )
MCFG_CPU_ADD("maincpu", Z80, 6000000)
MCFG_CPU_PROGRAM_MAP(tigerh_map)
MCFG_CPU_IO_MAP(tigerhb_io_map)
- MCFG_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80, 6000000)
MCFG_CPU_PROGRAM_MAP(slapfght_sound_map)
- MCFG_CPU_PERIODIC_INT(nmi_line_pulse,6*60) /* ??? */
+ MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, nmi_line_pulse, 6*60) /* ??? */
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -840,11 +839,11 @@ static MACHINE_CONFIG_START( tigerh, slapfght_state )
MCFG_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tigerh_map)
MCFG_CPU_IO_MAP(tigerh_io_map)
- MCFG_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slapfght_sound_map)
- MCFG_CPU_PERIODIC_INT(nmi_line_pulse,6*60) /* ??? */
+ MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, nmi_line_pulse, 6*60) /* ??? */
MCFG_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tigerh_m68705_map)
@@ -889,11 +888,11 @@ static MACHINE_CONFIG_START( slapfigh, slapfght_state )
MCFG_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slapfght_map)
MCFG_CPU_IO_MAP(slapfght_io_map)
- MCFG_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slapfght_sound_map)
- MCFG_CPU_PERIODIC_INT(getstar_interrupt, 3*60)
+ MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, getstar_interrupt, 3*60)
MCFG_CPU_ADD("mcu", M68705, XTAL_36MHz/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slapfight_m68705_map)