diff options
Diffstat (limited to 'src/devices/bus/abcbus/lux21046.cpp')
-rw-r--r-- | src/devices/bus/abcbus/lux21046.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 3b20f164cdf..984193f5e66 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -161,7 +161,7 @@ void luxor_55_21046_device::luxor_55_21046_io(address_map &map) map(0x58, 0x58).mirror(0x0007).select(0xff00).r(FUNC(luxor_55_21046_device::_9a_r)); map(0x68, 0x6b).mirror(0xff00).r(SAB1793_TAG, FUNC(fd1793_device::read)); map(0x78, 0x7b).mirror(0xff00).w(SAB1793_TAG, FUNC(fd1793_device::write)); - map(0x80, 0x80).mirror(0xff77).rw(Z80DMA_TAG, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); + map(0x80, 0x80).mirror(0xff77).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); } @@ -296,17 +296,17 @@ MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig) MCFG_DEVICE_PROGRAM_MAP(luxor_55_21046_mem) MCFG_DEVICE_IO_MAP(luxor_55_21046_io) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 16_MHz_XTAL / 4) - MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) - MCFG_Z80DMA_OUT_INT_CB(WRITELINE(*this, luxor_55_21046_device, dma_int_w)) - MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, luxor_55_21046_device, memory_read_byte)) - MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, luxor_55_21046_device, memory_write_byte)) - MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, luxor_55_21046_device, io_read_byte)) - MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, luxor_55_21046_device, io_write_byte)) + Z80DMA(config, m_dma, 16_MHz_XTAL / 4); + m_dma->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT); + m_dma->out_int_callback().set(FUNC(luxor_55_21046_device::dma_int_w)); + m_dma->in_mreq_callback().set(FUNC(luxor_55_21046_device::memory_read_byte)); + m_dma->out_mreq_callback().set(FUNC(luxor_55_21046_device::memory_write_byte)); + m_dma->in_iorq_callback().set(FUNC(luxor_55_21046_device::io_read_byte)); + m_dma->out_iorq_callback().set(FUNC(luxor_55_21046_device::io_write_byte)); MCFG_DEVICE_ADD(SAB1793_TAG, FD1793, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_21046_device, fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(m_dma, z80dma_device, rdy_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(abc830_device::device_add_mconfig) |