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/f3853.cpp | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/machine/f3853.cpp')
-rw-r--r-- | src/devices/machine/f3853.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp index a37e1b7e59b..49deb99f073 100644 --- a/src/devices/machine/f3853.cpp +++ b/src/devices/machine/f3853.cpp @@ -77,7 +77,7 @@ void f3853_device::device_start() m_interrupt_req_cb.bind_relative_to(*owner()); - m_timer = machine().scheduler().timer_alloc(FUNC(f3853_timer_callback), (void *)this ); + m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(f3853_device::timer_callback),this)); save_item(NAME(m_high) ); save_item(NAME(m_low) ); @@ -128,13 +128,7 @@ void f3853_device::timer_start(UINT8 value) m_timer->adjust(period); } - -TIMER_CALLBACK( f3853_device::f3853_timer_callback ) -{ - reinterpret_cast<f3853_device*>(ptr)->timer(); -} - -void f3853_device::timer() +TIMER_CALLBACK_MEMBER(f3853_device::timer_callback) { if(m_timer_enable) { |