diff options
author | 2011-02-03 07:52:45 +0000 | |
---|---|---|
committer | 2011-02-03 07:52:45 +0000 | |
commit | 1e88333178b63ee0d5b914e181b19b3b161f807b (patch) | |
tree | ff1d59069ab151d3ea122c8a26931305157f9d17 /src/emu/machine/6850acia.c | |
parent | 78005b8ffeaf34d10565466d794debf7f5d2ff73 (diff) |
Converted attotime to a class, with proper operators. Removed old
global functions which are now superceded by the operators and
methods on the class. [Aaron Giles]
Required mappings are:
attotime_make(a,b) => attotime(a,b)
attotime_to_double(t) => t.as_double()
double_to_attotime(d) => attotime::from_double(d)
attotime_to_attoseconds(t) => t.as_attoseconds()
attotime_to_ticks(t,f) => t.as_ticks(f)
ticks_to_attotime(t,f) => attotime::from_ticks(t,f)
attotime_add(a,b) => a + b
attotime_add_attoseconds(a,b) => a + attotime(0, b)
attotime_sub(a,b) => a - b
attotime_sub_attoseconds(a,b) => a - attotime(0, b)
attotime_compare(a,b) == 0 => a == b
attotime_compare(a,b) != 0 => a != b
attotime_compare(a,b) < 0 => a < b
attotime_compare(a,b) <= 0 => a <= b
attotime_compare(a,b) > 0 => a > b
attotime_compare(a,b) >= 0 => a >= b
attotime_mul(a,f) => a * f
attotime_div(a,f) => a / f
attotime_min(a,b) => min(a,b)
attotime_max(a,b) => max(a,b)
attotime_is_never(t) => t.is_never()
attotime_string(t,p) => t.as_string(p)
In addition, some existing #defines still exist but will go away:
attotime_zero => attotime::zero
attotime_never => attotime::never
ATTOTIME_IN_SEC(s) => attotime::from_seconds(s)
ATTOTIME_IN_MSEC(m) => attotime::from_msec(m)
ATTOTIME_IN_USEC(u) => attotime::from_usec(u)
ATTOTIME_IN_NSEC(n) => attotime::from_nsec(n)
ATTOTIME_IN_HZ(h) => attotime::from_hz(h)
Diffstat (limited to 'src/emu/machine/6850acia.c')
-rw-r--r-- | src/emu/machine/6850acia.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c index 9ae997f8725..110787a720b 100644 --- a/src/emu/machine/6850acia.c +++ b/src/emu/machine/6850acia.c @@ -291,13 +291,13 @@ WRITE8_DEVICE_HANDLER_TRAMPOLINE(acia6850, acia6850_ctrl_w ) { if (m_rx_clock) { - attotime rx_period = attotime_mul(ATTOTIME_IN_HZ(m_rx_clock), m_divide); + attotime rx_period = attotime::from_hz(m_rx_clock) * m_divide; timer_adjust_periodic(m_rx_timer, rx_period, 0, rx_period); } if (m_tx_clock) { - attotime tx_period = attotime_mul(ATTOTIME_IN_HZ(m_tx_clock), m_divide); + attotime tx_period = attotime::from_hz(m_tx_clock) * m_divide; timer_adjust_periodic(m_tx_timer, tx_period, 0, tx_period); } } @@ -745,7 +745,7 @@ void acia6850_device::set_rx_clock(int clock) if (m_rx_clock) { - attotime rx_period = attotime_mul(ATTOTIME_IN_HZ(m_rx_clock), m_divide); + attotime rx_period = attotime::from_hz(m_rx_clock) * m_divide; timer_adjust_periodic(m_rx_timer, rx_period, 0, rx_period); } } @@ -772,7 +772,7 @@ void acia6850_device::set_tx_clock(int clock) if (m_tx_clock) { - attotime tx_period = attotime_mul(ATTOTIME_IN_HZ(m_tx_clock), m_divide); + attotime tx_period = attotime::from_hz(m_tx_clock) * m_divide; timer_adjust_periodic(m_tx_timer, tx_period, 0, tx_period); } } |