diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/isa/ne1000.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/isa/ne1000.cpp')
-rw-r--r-- | src/devices/bus/isa/ne1000.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index 1eaef942105..7723ad75a88 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -6,13 +6,12 @@ DEFINE_DEVICE_TYPE(NE1000, ne1000_device, "ne1000", "NE1000 Network Adapter") -void ne1000_device::device_add_mconfig(machine_config &config) -{ - DP8390D(config, m_dp8390, 0); - m_dp8390->irq_callback().set(FUNC(ne1000_device::ne1000_irq_w)); - m_dp8390->mem_read_callback().set(FUNC(ne1000_device::ne1000_mem_read)); - m_dp8390->mem_write_callback().set(FUNC(ne1000_device::ne1000_mem_write)); -} +MACHINE_CONFIG_START(ne1000_device::device_add_mconfig) + MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) + MCFG_DP8390D_IRQ_CB(WRITELINE(*this, ne1000_device, ne1000_irq_w)) + MCFG_DP8390D_MEM_READ_CB(READ8(*this, ne1000_device, ne1000_mem_read)) + MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, ne1000_device, ne1000_mem_write)) +MACHINE_CONFIG_END ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, NE1000, tag, owner, clock), |