diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-24 15:01:45 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-24 15:01:45 +0000 |
commit | e624f84f348ad700b12230a7513288c3ff97f5bf (patch) | |
tree | 576984d6a73376e195baccd6bf401825eca23486 /src/mame/drivers/aces1.c | |
parent | 3679f744c291a75d83085fe049f91ddc94b1419a (diff) |
modernization or timer callbacks part 3 - final (no whatsnew)
Diffstat (limited to 'src/mame/drivers/aces1.c')
-rw-r--r-- | src/mame/drivers/aces1.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/aces1.c b/src/mame/drivers/aces1.c index 93f3441196c..1178fee2a66 100644 --- a/src/mame/drivers/aces1.c +++ b/src/mame/drivers/aces1.c @@ -146,34 +146,34 @@ public: DECLARE_DRIVER_INIT(aces1); virtual void machine_start(); virtual void machine_reset(); + TIMER_CALLBACK_MEMBER(m_aces1_irq_timer_callback); + TIMER_CALLBACK_MEMBER(m_aces1_nmi_timer_callback); }; -static TIMER_CALLBACK( m_aces1_irq_timer_callback ) +TIMER_CALLBACK_MEMBER(aces1_state::m_aces1_irq_timer_callback) { - aces1_state *state = machine.driver_data<aces1_state>(); // printf("irq\n"); - state->m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); - state->aces1_reset_irq_timer(); + m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); + aces1_reset_irq_timer(); } -static TIMER_CALLBACK( m_aces1_nmi_timer_callback ) +TIMER_CALLBACK_MEMBER(aces1_state::m_aces1_nmi_timer_callback) { - aces1_state *state = machine.driver_data<aces1_state>(); // printf("nmi\n"); - state->m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); - state->aces1_reset_nmi_timer(); + m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); + aces1_reset_nmi_timer(); } static void aces1_create_timers(running_machine &machine) { aces1_state *state = machine.driver_data<aces1_state>(); - state->m_aces1_irq_timer = machine.scheduler().timer_alloc(FUNC(m_aces1_irq_timer_callback), 0); - state->m_aces1_nmi_timer = machine.scheduler().timer_alloc(FUNC(m_aces1_nmi_timer_callback), 0); + state->m_aces1_irq_timer = machine.scheduler().timer_alloc(timer_expired_delegate(FUNC(aces1_state::m_aces1_irq_timer_callback),state), 0); + state->m_aces1_nmi_timer = machine.scheduler().timer_alloc(timer_expired_delegate(FUNC(aces1_state::m_aces1_nmi_timer_callback),state), 0); } void aces1_state::machine_start() |