diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/cpu/alto2/a2ether.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/cpu/alto2/a2ether.cpp')
-rw-r--r-- | src/devices/cpu/alto2/a2ether.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/cpu/alto2/a2ether.cpp b/src/devices/cpu/alto2/a2ether.cpp index 7af15ffbad0..2c1a3d56a89 100644 --- a/src/devices/cpu/alto2/a2ether.cpp +++ b/src/devices/cpu/alto2/a2ether.cpp @@ -522,7 +522,7 @@ void alto2_cpu_device::rx_breath_of_life(void* ptr, int32_t arg) m_eth.rx_timer->adjust(attotime::from_seconds(m_eth.breath_of_life), 0); } else { // receive at a rate of 5.44us per word - m_eth.rx_timer->adjust(attotime::from_usec(5.44), arg); + m_eth.rx_timer->adjust(attotime::from_nsec(5440), arg); } eth_wakeup(); } @@ -557,10 +557,10 @@ void alto2_cpu_device::tx_packet(void* ptr, int32_t arg) // the FIFO is empty now: clear the OBUSY and WLF flip flops PUT_ETH_OBUSY(m_eth.status, 0); PUT_ETH_WLF(m_eth.status, 0); - m_eth.tx_timer->adjust(attotime::from_usec(5.44), -1); + m_eth.tx_timer->adjust(attotime::from_nsec(5440), -1); } else { // transmit the next word after 5.44us - m_eth.tx_timer->adjust(attotime::from_usec(5.44), arg + 1); + m_eth.tx_timer->adjust(attotime::from_nsec(5440), arg + 1); } eth_wakeup(); } @@ -722,7 +722,7 @@ void alto2_cpu_device::f2_late_eodfct() uint8_t a49 = m_ether_a49[16 * m_eth.fifo_wr + m_eth.fifo_rd]; if (0 == BF(a49)) { m_task_wakeup &= ~(1 << task_ether); - m_eth.tx_timer->adjust(attotime::from_usec(5.44), 0); + m_eth.tx_timer->adjust(attotime::from_nsec(5440), 0); } } @@ -774,7 +774,7 @@ void alto2_cpu_device::f2_late_eefct() PUT_ETH_OBUSY(m_eth.status, 1); PUT_ETH_OEOT(m_eth.status, 1); // end transmitting the packet - m_eth.tx_timer->adjust(attotime::from_usec(5.44), -1); + m_eth.tx_timer->adjust(attotime::from_nsec(5440), -1); eth_wakeup(); } |