summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/clock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/clock.cpp')
-rw-r--r--src/devices/machine/clock.cpp130
1 files changed, 59 insertions, 71 deletions
diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp
index 4bd89fe791a..670dfba09aa 100644
--- a/src/devices/machine/clock.cpp
+++ b/src/devices/machine/clock.cpp
@@ -34,8 +34,6 @@ clock_device::clock_device(const machine_config &mconfig, const char *tag, devic
void clock_device::device_start()
{
- m_signal_handler.resolve_safe();
-
save_item(NAME(m_signal));
save_item(NAME(m_output));
save_item(NAME(m_duty));
@@ -44,8 +42,8 @@ void clock_device::device_start()
save_item(NAME(m_thigh));
save_item(NAME(m_tlow));
- m_timer_init = timer_alloc(TID_CLOCK_INIT);
- m_timer_tick = timer_alloc(TID_CLOCK_TICK);
+ m_timer_init = timer_alloc(FUNC(clock_device::clock_init), this);
+ m_timer_tick = timer_alloc(FUNC(clock_device::clock_tick), this);
reinit();
}
@@ -67,77 +65,67 @@ void clock_device::output()
}
}
-void clock_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+TIMER_CALLBACK_MEMBER(clock_device::clock_init)
{
- switch (id)
+ attotime period = (m_clock > 0) ? attotime::from_hz(m_clock) : m_period;
+ assert(!period.is_zero());
+
+ if (period.is_never())
+ {
+ m_timer_tick->adjust(attotime::never);
+ return;
+ }
+
+ if (!m_pw.is_never())
{
- case TID_CLOCK_INIT:
+ // set timing via pulse width
+ attotime pw = m_pw;
+ if (pw > period)
+ pw = period;
+
+ m_thigh = pw;
+ m_tlow = period - pw;
+ }
+ else
+ {
+ // set timing via duty cycle
+ if (m_duty == 0.5)
{
- attotime period = (m_clock > 0) ? attotime::from_hz(m_clock) : m_period;
- assert(!period.is_zero());
-
- if (period.is_never())
- {
- m_timer_tick->adjust(attotime::never);
- return;
- }
-
- if (!m_pw.is_never())
- {
- // set timing via pulse width
- attotime pw = m_pw;
- if (pw > period)
- pw = period;
-
- m_thigh = pw;
- m_tlow = period - pw;
- }
- else
- {
- // set timing via duty cycle
- if (m_duty == 0.5)
- {
- m_thigh = period / 2;
- m_tlow = m_thigh;
- }
- else if (m_duty == 0.0)
- {
- m_thigh = attotime::zero;
- m_tlow = period;
- }
- else if (m_duty == 1.0)
- {
- m_thigh = period;
- m_tlow = attotime::zero;
- }
- else
- {
- double p = period.as_double();
- m_thigh = attotime::from_double(m_duty * p);
- m_tlow = attotime::from_double((1.0 - m_duty) * p);
- }
- }
-
- attotime next = m_signal ? m_thigh : m_tlow;
- if (next < m_timer_tick->remaining())
- m_timer_tick->adjust(next);
-
- break;
+ m_thigh = period / 2;
+ m_tlow = m_thigh;
}
+ else if (m_duty == 0.0)
+ {
+ m_thigh = attotime::zero;
+ m_tlow = period;
+ }
+ else if (m_duty == 1.0)
+ {
+ m_thigh = period;
+ m_tlow = attotime::zero;
+ }
+ else
+ {
+ double p = period.as_double();
+ m_thigh = attotime::from_double(m_duty * p);
+ m_tlow = attotime::from_double((1.0 - m_duty) * p);
+ }
+ }
- case TID_CLOCK_TICK:
- if (m_thigh.is_zero())
- m_signal = 0;
- else if (m_tlow.is_zero())
- m_signal = 1;
- else
- m_signal ^= 1;
-
- m_timer_tick->adjust(m_signal ? m_thigh : m_tlow);
- output();
- break;
+ attotime next = m_signal ? m_thigh : m_tlow;
+ if (next < m_timer_tick->remaining())
+ m_timer_tick->adjust(next);
+}
- default:
- break;
- }
+TIMER_CALLBACK_MEMBER(clock_device::clock_tick)
+{
+ if (m_thigh.is_zero())
+ m_signal = 0;
+ else if (m_tlow.is_zero())
+ m_signal = 1;
+ else
+ m_signal ^= 1;
+
+ m_timer_tick->adjust(m_signal ? m_thigh : m_tlow);
+ output();
}