summaryrefslogtreecommitdiffstats
path: root/src/mame/machine/z80ne.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/z80ne.cpp')
-rw-r--r--src/mame/machine/z80ne.cpp21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index e2159af8010..5cdc78a3727 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -30,7 +30,7 @@ cassette_image_device* z80ne_state::cassette_device_image()
return m_cassette1;
}
-TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_cassette_tc)
+TIMER_CALLBACK_MEMBER(z80ne_state::cassette_tc)
{
uint8_t cass_ws = 0;
m_cass_data.input.length++;
@@ -100,7 +100,7 @@ void z80netf_state::driver_init()
}
-TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_kbd_scan)
+TIMER_CALLBACK_MEMBER(z80ne_state::kbd_scan)
{
/*
* NE555 is connected to a 74LS93 binary counter
@@ -144,16 +144,9 @@ TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_kbd_scan)
}
}
-void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param)
+TIMER_CALLBACK_MEMBER(z80ne_state::pulse_nmi)
{
- switch (id)
- {
- case 0:
- m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
- break;
- default:
- printf("Invalid timer %d encountered\n",id);
- }
+ m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
void z80net_state::reset_lx387()
@@ -342,13 +335,13 @@ INPUT_CHANGED_MEMBER(z80net_state::z80net_nmi)
void z80ne_state::machine_start()
{
- m_timer_nmi = timer_alloc(0);
+ m_timer_nmi = timer_alloc(FUNC(z80ne_state::pulse_nmi), this);
m_lx383_digits.resolve();
m_lx385_ctrl = 0x1f;
- m_cassette_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z80ne_state::z80ne_cassette_tc), this));
- m_kbd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z80ne_state::z80ne_kbd_scan), this));
+ m_cassette_timer = timer_alloc(FUNC(z80ne_state::cassette_tc), this);
+ m_kbd_timer = timer_alloc(FUNC(z80ne_state::kbd_scan), this);
m_kbd_timer->adjust(attotime::from_hz(1000), 0, attotime::from_hz(1000));
}