summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/trs80m2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/trs80m2.cpp')
-rw-r--r--src/mame/drivers/trs80m2.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index 8081d8488ab..e608f00bcd9 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -709,10 +709,10 @@ void trs80m2_state::machine_reset()
MACHINE_CONFIG_START(trs80m2_state::trs80m2)
// basic machine hardware
- MCFG_DEVICE_ADD(Z80_TAG, Z80, 8_MHz_XTAL / 2)
- MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
- MCFG_DEVICE_PROGRAM_MAP(z80_mem)
- MCFG_DEVICE_IO_MAP(z80_io)
+ Z80(config, m_maincpu, 8_MHz_XTAL / 2);
+ m_maincpu->set_daisy_config(trs80m2_daisy_chain);
+ m_maincpu->set_addrmap(AS_PROGRAM, &trs80m2_state::z80_mem);
+ m_maincpu->set_addrmap(AS_IO, &trs80m2_state::z80_io);
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
@@ -734,7 +734,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
// devices
MCFG_DEVICE_ADD(FD1791_TAG, FD1791, 8_MHz_XTAL / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(m_pio, z80pio_device, pa_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(m_dmac, z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -748,13 +748,13 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(8_MHz_XTAL / 2 / 2))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 8_MHz_XTAL / 2)
- MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
- MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, trs80m2_state, read))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, trs80m2_state, write))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, trs80m2_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, trs80m2_state, io_write_byte))
+ Z80DMA(config, m_dmac, 8_MHz_XTAL / 2);
+ m_dmac->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
+ m_dmac->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_dmac->in_mreq_callback().set(FUNC(trs80m2_state::read));
+ m_dmac->out_mreq_callback().set(FUNC(trs80m2_state::write));
+ m_dmac->in_iorq_callback().set(FUNC(trs80m2_state::io_read_byte));
+ m_dmac->out_iorq_callback().set(FUNC(trs80m2_state::io_write_byte));
Z80PIO(config, m_pio, 8_MHz_XTAL / 2);
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
@@ -763,8 +763,8 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
m_pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
m_pio->out_brdy_callback().set(FUNC(trs80m2_state::strobe_w));
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2)
- MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
+ z80sio0_device& sio(Z80SIO0(config, Z80SIO_TAG, 8_MHz_XTAL / 2));
+ sio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer")
MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(m_pio, z80pio_device, strobe_b))
@@ -792,11 +792,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80m16_state::trs80m16)
// basic machine hardware
- MCFG_DEVICE_ADD(Z80_TAG, Z80, 8_MHz_XTAL / 2)
- MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
- MCFG_DEVICE_PROGRAM_MAP(z80_mem)
- MCFG_DEVICE_IO_MAP(m16_z80_io)
- MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, am9519_device, iack_cb)
+ Z80(config, m_maincpu, 8_MHz_XTAL / 2);
+ m_maincpu->set_daisy_config(trs80m2_daisy_chain);
+ m_maincpu->set_addrmap(AS_PROGRAM, &trs80m16_state::z80_mem);
+ m_maincpu->set_addrmap(AS_IO, &trs80m16_state::m16_z80_io);
+ m_maincpu->set_irq_acknowledge_callback(AM9519A_TAG, FUNC(am9519_device::iack_cb));
MCFG_DEVICE_ADD(M68000_TAG, M68000, 24_MHz_XTAL / 4)
MCFG_DEVICE_PROGRAM_MAP(m68000_mem)
@@ -822,7 +822,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
// devices
MCFG_DEVICE_ADD(FD1791_TAG, FD1791, 8_MHz_XTAL / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(m_pio, z80pio_device, pa_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(m_dmac, z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -836,13 +836,13 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(8_MHz_XTAL / 2 / 2))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 8_MHz_XTAL / 2)
- MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
- MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, trs80m2_state, read))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, trs80m2_state, write))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, trs80m2_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, trs80m2_state, io_write_byte))
+ Z80DMA(config, m_dmac, 8_MHz_XTAL / 2);
+ m_dmac->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
+ m_dmac->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_dmac->in_mreq_callback().set(FUNC(trs80m2_state::read));
+ m_dmac->out_mreq_callback().set(FUNC(trs80m2_state::write));
+ m_dmac->in_iorq_callback().set(FUNC(trs80m2_state::io_read_byte));
+ m_dmac->out_iorq_callback().set(FUNC(trs80m2_state::io_write_byte));
Z80PIO(config, m_pio, 8_MHz_XTAL / 2);
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
@@ -851,8 +851,8 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
m_pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
m_pio->out_brdy_callback().set(FUNC(trs80m2_state::strobe_w));
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2)
- MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
+ z80sio0_device& sio(Z80SIO0(config, Z80SIO_TAG, 8_MHz_XTAL / 2));
+ sio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
AM9519(config, m_uic, 0);
m_uic->out_int_callback().set_inputline(M68000_TAG, M68K_IRQ_5);