diff options
Diffstat (limited to 'src/devices/machine/edlc.cpp')
-rw-r--r-- | src/devices/machine/edlc.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/devices/machine/edlc.cpp b/src/devices/machine/edlc.cpp index 9fcc3be5fb5..26bcad50e21 100644 --- a/src/devices/machine/edlc.cpp +++ b/src/devices/machine/edlc.cpp @@ -25,7 +25,6 @@ #include "edlc.h" #include "hashing.h" -#define LOG_GENERAL (1U << 0) #define LOG_FRAMES (1U << 1) #define LOG_FILTER (1U << 2) @@ -39,7 +38,7 @@ static const u8 ETH_BROADCAST[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; seeq8003_device::seeq8003_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock) : device_t(mconfig, type, tag, owner, clock) - , device_network_interface(mconfig, *this, 10.0f) + , device_network_interface(mconfig, *this, 10) , m_out_int(*this) , m_out_rxrdy(*this) , m_out_txrdy(*this) @@ -53,10 +52,6 @@ seeq8003_device::seeq8003_device(machine_config const &mconfig, char const *tag, void seeq8003_device::device_start() { - m_out_int.resolve_safe(); - m_out_rxrdy.resolve_safe(); - m_out_txrdy.resolve_safe(); - save_item(NAME(m_int_state)); save_item(NAME(m_reset_state)); save_item(NAME(m_station_address)); @@ -67,8 +62,8 @@ void seeq8003_device::device_start() //save_item(NAME(m_rx_fifo)); //save_item(NAME(m_tx_fifo)); - m_tx_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(seeq8003_device::transmit), this)); - m_int_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(seeq8003_device::interrupt), this)); + m_tx_timer = timer_alloc(FUNC(seeq8003_device::transmit), this); + m_int_timer = timer_alloc(FUNC(seeq8003_device::interrupt), this); m_int_state = 0; m_reset_state = 1; @@ -87,7 +82,7 @@ void seeq8003_device::device_reset() // TODO: deassert RxDC and TxRET - if (m_dev) + if (has_net_device()) m_out_txrdy(1); interrupt(); @@ -258,7 +253,7 @@ void seeq8003_device::tx_command_w(u8 data) m_tx_command = data; } -void seeq8003_device::transmit(void *ptr, int param) +void seeq8003_device::transmit(s32 param) { if (m_tx_fifo.queue_length()) { @@ -333,7 +328,7 @@ int seeq8003_device::receive(u8 *buf, int length) return length; } -void seeq8003_device::interrupt(void *ptr, int param) +void seeq8003_device::interrupt(s32 param) { int const state = (!(m_tx_status & TXS_O) && (m_tx_status & m_tx_command & TXS_M)) || @@ -432,7 +427,7 @@ void seeq80c03_device::send_complete_cb(int result) else { // assume transmit failure and no device means loss of carrier - if ((m_control & CTL_TNC) && !m_dev) + if ((m_control & CTL_TNC) && !has_net_device()) m_flags |= FLAGS_TNC; } } |