diff options
Diffstat (limited to 'src/devices/bus/x68k/x68k_neptunex.cpp')
-rw-r--r-- | src/devices/bus/x68k/x68k_neptunex.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp index 7a7b7c3aaab..4c77c32061c 100644 --- a/src/devices/bus/x68k/x68k_neptunex.cpp +++ b/src/devices/bus/x68k/x68k_neptunex.cpp @@ -17,13 +17,12 @@ DEFINE_DEVICE_TYPE(X68K_NEPTUNEX, x68k_neptune_device, "x68k_neptunex", "Neptune-X") // device machine config -void x68k_neptune_device::device_add_mconfig(machine_config &config) -{ - DP8390D(config, m_dp8390, 0); - m_dp8390->irq_callback().set(FUNC(x68k_neptune_device::x68k_neptune_irq_w)); - m_dp8390->mem_read_callback().set(FUNC(x68k_neptune_device::x68k_neptune_mem_read)); - m_dp8390->mem_write_callback().set(FUNC(x68k_neptune_device::x68k_neptune_mem_write)); -} +MACHINE_CONFIG_START(x68k_neptune_device::device_add_mconfig) + MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) + MCFG_DP8390D_IRQ_CB(WRITELINE(*this, x68k_neptune_device, x68k_neptune_irq_w)) + MCFG_DP8390D_MEM_READ_CB(READ8(*this, x68k_neptune_device, x68k_neptune_mem_read)) + MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, x68k_neptune_device, x68k_neptune_mem_write)) +MACHINE_CONFIG_END x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, X68K_NEPTUNEX, tag, owner, clock) @@ -39,15 +38,17 @@ x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const ch void x68k_neptune_device::device_start() { + device_t* cpu = machine().device("maincpu"); char mac[7]; uint32_t num = machine().rand(); + address_space& space = cpu->memory().space(AS_PROGRAM); m_slot = dynamic_cast<x68k_expansion_slot_device *>(owner()); memset(m_prom, 0x57, 16); sprintf(mac+2, "\x1b%c%c%c", (num >> 16) & 0xff, (num >> 8) & 0xff, num & 0xff); mac[0] = 0; mac[1] = 0; // avoid gcc warning memcpy(m_prom, mac, 6); m_dp8390->set_mac(mac); - m_slot->space().install_readwrite_handler(0xece000,0xece3ff,read16_delegate(FUNC(x68k_neptune_device::x68k_neptune_port_r),this),write16_delegate(FUNC(x68k_neptune_device::x68k_neptune_port_w),this),0xffffffff); + space.install_readwrite_handler(0xece000,0xece3ff,read16_delegate(FUNC(x68k_neptune_device::x68k_neptune_port_r),this),write16_delegate(FUNC(x68k_neptune_device::x68k_neptune_port_w),this),0xffffffff); } void x68k_neptune_device::device_reset() { |