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/v3021.cpp | |
parent | 477d2abd43984f076b7e45f5527591fa8fd0d241 (diff) | |
parent | dcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff) |
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/machine/v3021.cpp')
-rw-r--r-- | src/devices/machine/v3021.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp index ab0057d9951..d7caf681c70 100644 --- a/src/devices/machine/v3021.cpp +++ b/src/devices/machine/v3021.cpp @@ -38,7 +38,7 @@ v3021_device::v3021_device(const machine_config &mconfig, const char *tag, devic { } -void v3021_device::timer_callback() +TIMER_CALLBACK_MEMBER(v3021_device::timer_callback) { static const UINT8 dpm[12] = { 0x31, 0x28, 0x31, 0x30, 0x31, 0x30, 0x31, 0x31, 0x30, 0x31, 0x30, 0x31 }; int dpm_count; @@ -69,11 +69,6 @@ void v3021_device::timer_callback() if((m_rtc.year & 0xf0) >= 0xa0) { m_rtc.year = 0; } //2000-2099 possible timeframe } -TIMER_CALLBACK( v3021_device::rtc_inc_callback ) -{ - reinterpret_cast<v3021_device *>(ptr)->timer_callback(); -} - //------------------------------------------------- // device_validity_check - perform validity checks // on this device @@ -90,7 +85,7 @@ void v3021_device::device_validity_check(validity_checker &valid) const void v3021_device::device_start() { /* let's call the timer callback every second */ - machine().scheduler().timer_pulse(attotime::from_hz(clock() / XTAL_32_768kHz), FUNC(rtc_inc_callback), 0, (void *)this); + machine().scheduler().timer_pulse(attotime::from_hz(clock() / XTAL_32_768kHz), timer_expired_delegate(FUNC(v3021_device::timer_callback),this)); system_time systime; machine().base_datetime(systime); |