diff options
Diffstat (limited to 'src/mame/drivers/taito_z.c')
-rw-r--r-- | src/mame/drivers/taito_z.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 3692e1e2094..17e442e2946 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1036,19 +1036,18 @@ static TIMER_CALLBACK( taitoz_cpub_interrupt5 ) /***** Routines for particular games *****/ -static INTERRUPT_GEN( sci_interrupt ) +INTERRUPT_GEN_MEMBER(taitoz_state::sci_interrupt) { /* Need 2 int4's per int6 else (-$6b63,A5) never set to 1 which causes all sprites to vanish! Spriteram has areas for 2 frames so in theory only needs updating every other frame. */ - taitoz_state *state = device->machine().driver_data<taitoz_state>(); - state->m_sci_int6 = !state->m_sci_int6; + m_sci_int6 = !m_sci_int6; - if (state->m_sci_int6) - device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(200000 - 500), FUNC(taitoz_interrupt6)); + if (m_sci_int6) + machine().scheduler().timer_set(downcast<cpu_device *>(&device)->cycles_to_attotime(200000 - 500), FUNC(taitoz_interrupt6)); - device->execute().set_input_line(4, HOLD_LINE); + device.execute().set_input_line(4, HOLD_LINE); } @@ -3076,14 +3075,14 @@ static MACHINE_CONFIG_START( contcirc, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(contcirc_map) - MCFG_CPU_VBLANK_INT("screen", irq6_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold) MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(contcirc_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq6_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3138,14 +3137,14 @@ static MACHINE_CONFIG_START( chasehq, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(chasehq_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(chq_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3200,14 +3199,14 @@ static MACHINE_CONFIG_START( enforce, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(enforce_map) - MCFG_CPU_VBLANK_INT("screen", irq6_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold) MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(enforce_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq6_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3263,11 +3262,11 @@ static MACHINE_CONFIG_START( bshark, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(bshark_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(bshark_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3331,14 +3330,14 @@ static MACHINE_CONFIG_START( sci, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sci_map) - MCFG_CPU_VBLANK_INT("screen", sci_interrupt) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt) MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sci_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3393,14 +3392,14 @@ static MACHINE_CONFIG_START( nightstr, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(nightstr_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(nightstr_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3457,14 +3456,14 @@ static MACHINE_CONFIG_START( aquajack, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(aquajack_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */ MCFG_CPU_PROGRAM_MAP(aquajack_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3520,11 +3519,11 @@ static MACHINE_CONFIG_START( spacegun, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */ MCFG_CPU_PROGRAM_MAP(spacegun_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */ MCFG_CPU_PROGRAM_MAP(spacegun_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3579,14 +3578,14 @@ static MACHINE_CONFIG_START( dblaxle, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(dblaxle_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(dblaxle_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) @@ -3641,14 +3640,14 @@ static MACHINE_CONFIG_START( racingb, taitoz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(racingb_map) - MCFG_CPU_VBLANK_INT("screen", sci_interrupt) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) MCFG_CPU_PROGRAM_MAP(z80_sound_map) MCFG_CPU_ADD("sub", M68000, XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(racingb_cpub_map) - MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold) MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) |