diff options
author | David Haywood <mamehaze@users.noreply.github.com> | 2017-01-04 18:37:58 +0000 |
---|---|---|
committer | David Haywood <mamehaze@users.noreply.github.com> | 2017-01-04 18:37:58 +0000 |
commit | 3e064256dee154be1e61047f1d3dd39898ac2dcb (patch) | |
tree | 94346293858f1dab683b1bb44f8882e4637540c1 /src | |
parent | 70b23e6f93d907781e60dff467969a19c926d63a (diff) |
use device clock (nw)
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/cpu/m6805/m6805.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index 7a49d66bc5a..40c5973773b 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -1145,13 +1145,13 @@ WRITE8_MEMBER(m68705_new_device::internal_68705_tcr_w) { /* logerror("timer enable state changed!\n"); */ if (data&0x20) m_68705_timer->adjust(attotime::never, TIMER_68705_PRESCALER_EXPIRED); - else m_68705_timer->adjust(attotime::from_hz(((XTAL_12MHz/4)/4)/(1<<(data&0x7))), TIMER_68705_PRESCALER_EXPIRED); + else m_68705_timer->adjust(attotime::from_hz(((clock())/4)/(1<<(data&0x7))), TIMER_68705_PRESCALER_EXPIRED); } // prescaler check: if timer prescaler has changed, or the PSC bit is set, adjust the timer length for the prescaler expired timer, but only if the timer would be running if ( (((m_tcr&0x07)!=(data&0x07))||(data&0x08)) && ((data&0x20)==0) ) { /* logerror("timer reset due to PSC or prescaler change!\n"); */ - m_68705_timer->adjust(attotime::from_hz(((XTAL_12MHz/4)/4)/(1<<(data&0x7))), TIMER_68705_PRESCALER_EXPIRED); + m_68705_timer->adjust(attotime::from_hz(((clock())/4)/(1<<(data&0x7))), TIMER_68705_PRESCALER_EXPIRED); } m_tcr = data; // if int state is set, and TIM is unmasked, assert an interrupt. otherwise clear it. @@ -1182,7 +1182,7 @@ TIMER_CALLBACK_MEMBER(m68705_new_device::timer_68705_increment) set_input_line(M68705_INT_TIMER, ASSERT_LINE); else set_input_line(M68705_INT_TIMER, CLEAR_LINE); - m_68705_timer->adjust(attotime::from_hz(((XTAL_12MHz/4)/4)/(1<<(m_tcr&0x7))), TIMER_68705_PRESCALER_EXPIRED); + m_68705_timer->adjust(attotime::from_hz(((clock())/4)/(1<<(m_tcr&0x7))), TIMER_68705_PRESCALER_EXPIRED); } @@ -1308,8 +1308,7 @@ void m68705_new_device::device_reset() m_tcr = 0x7F; //set_input_line(M68705_IRQ_LINE, CLEAR_LINE); - m_68705_timer->adjust(attotime::from_hz(((XTAL_12MHz/4)/4)/(1<<7))); - + m_68705_timer->adjust(attotime::from_hz(((clock())/4)/(1<<7))); } /**************************************************************************** |