diff options
author | 2016-03-12 12:31:13 +0100 | |
---|---|---|
committer | 2016-03-12 12:31:13 +0100 | |
commit | a026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch) | |
tree | e31573822f2359677de519f9f3b600d98e8764cd /src/devices/machine/z80ctc.cpp | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/machine/z80ctc.cpp')
-rw-r--r-- | src/devices/machine/z80ctc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index 276254d96f1..a6cb090e30b 100644 --- a/src/devices/machine/z80ctc.cpp +++ b/src/devices/machine/z80ctc.cpp @@ -303,7 +303,7 @@ void z80ctc_device::ctc_channel::start(z80ctc_device *device, int index) // initialize state m_device = device; m_index = index; - m_timer = m_device->machine().scheduler().timer_alloc(FUNC(static_timer_callback), this); + m_timer = m_device->machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z80ctc_device::ctc_channel::timer_callback), this)); // register for save states m_device->save_item(NAME(m_mode), m_index); @@ -478,7 +478,7 @@ void z80ctc_device::ctc_channel::trigger(UINT8 data) { // if we hit zero, do the same thing as for a timer interrupt if (--m_down == 0) - timer_callback(); + timer_callback(nullptr,0); } } } @@ -490,7 +490,7 @@ void z80ctc_device::ctc_channel::trigger(UINT8 data) // side-effects //------------------------------------------------- -void z80ctc_device::ctc_channel::timer_callback() +TIMER_CALLBACK_MEMBER(z80ctc_device::ctc_channel::timer_callback) { // down counter has reached zero - see if we should interrupt if ((m_mode & INTERRUPT) == INTERRUPT_ON) |