summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/chqflag.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/chqflag.c')
-rw-r--r--src/mame/drivers/chqflag.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index c55a9b0ad94..f23cd08e085 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -26,15 +26,14 @@
-static TIMER_DEVICE_CALLBACK( chqflag_scanline )
+TIMER_DEVICE_CALLBACK_MEMBER(chqflag_state::chqflag_scanline)
{
- chqflag_state *state = timer.machine().driver_data<chqflag_state>();
int scanline = param;
- if(scanline == 240 && k051960_is_irq_enabled(state->m_k051960)) // vblank irq
- timer.machine().device("maincpu")->execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE);
- else if(((scanline % 32) == 0) && (k051960_is_nmi_enabled(state->m_k051960))) // timer irq
- timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
+ if(scanline == 240 && k051960_is_irq_enabled(m_k051960)) // vblank irq
+ machine().device("maincpu")->execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE);
+ else if(((scanline % 32) == 0) && (k051960_is_nmi_enabled(m_k051960))) // timer irq
+ machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w)
@@ -356,7 +355,7 @@ static MACHINE_CONFIG_START( chqflag, chqflag_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(chqflag_map)
- MCFG_TIMER_ADD_SCANLINE("scantimer", chqflag_scanline, "screen", 0, 1)
+ MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", chqflag_state, chqflag_scanline, "screen", 0, 1)
MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(chqflag_sound_map)