summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/espial.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/espial.c')
-rw-r--r--src/mame/drivers/espial.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index c94922951ce..e99547384d5 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -75,16 +75,15 @@ WRITE8_MEMBER(espial_state::espial_sound_nmi_mask_w)
m_sound_nmi_enabled = data & 1;
}
-static TIMER_DEVICE_CALLBACK( espial_scanline )
+TIMER_DEVICE_CALLBACK_MEMBER(espial_state::espial_scanline)
{
- espial_state *state = timer.machine().driver_data<espial_state>();
int scanline = param;
- if(scanline == 240 && state->m_main_nmi_enabled) // vblank-out irq
- timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
+ if(scanline == 240 && m_main_nmi_enabled) // vblank-out irq
+ machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
if(scanline == 16) // timer irq, checks soundlatch port then updates some sound related work RAM buffers
- timer.machine().device("maincpu")->execute().set_input_line(0, HOLD_LINE);
+ machine().device("maincpu")->execute().set_input_line(0, HOLD_LINE);
}
@@ -322,7 +321,7 @@ static MACHINE_CONFIG_START( espial, espial_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(espial_map)
- MCFG_TIMER_ADD_SCANLINE("scantimer", espial_scanline, "screen", 0, 1)
+ MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", espial_state, espial_scanline, "screen", 0, 1)
MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */
MCFG_CPU_PROGRAM_MAP(espial_sound_map)