diff options
Diffstat (limited to 'src/mame/drivers/trs80m2.cpp')
-rw-r--r-- | src/mame/drivers/trs80m2.cpp | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index 85e9e14fb61..9c9f8d74c44 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -336,7 +336,7 @@ void trs80m2_state::z80_io(address_map &map) map(0xe4, 0xe7).rw(FUNC(trs80m2_state::fdc_r), FUNC(trs80m2_state::fdc_w)); map(0xef, 0xef).w(FUNC(trs80m2_state::drvslt_w)); map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); - map(0xf4, 0xf7).rw(Z80SIO_TAG, FUNC(z80sio0_device::cd_ba_r), FUNC(z80sio0_device::cd_ba_w)); + map(0xf4, 0xf7).rw(Z80SIO_TAG, FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); map(0xf8, 0xf8).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); map(0xf9, 0xf9).w(FUNC(trs80m2_state::rom_enable_w)); map(0xfc, 0xfc).r(FUNC(trs80m2_state::keyboard_r)).w(m_crtc, FUNC(mc6845_device::address_w)); @@ -609,18 +609,6 @@ WRITE_LINE_MEMBER( trs80m2_state::strobe_w ) // Z80CTC //------------------------------------------------- -TIMER_DEVICE_CALLBACK_MEMBER(trs80m2_state::ctc_tick) -{ - m_ctc->trg0(1); - m_ctc->trg0(0); - - m_ctc->trg1(1); - m_ctc->trg1(0); - - m_ctc->trg2(1); - m_ctc->trg2(0); -} - static void trs80m2_floppies(device_slot_interface &device) { device.option_add("8ssdd", FLOPPY_8_SSDD); // Shugart SA-800 @@ -744,11 +732,12 @@ void trs80m2_state::trs80m2(machine_config &config) Z80CTC(config, m_ctc, 8_MHz_XTAL / 2); m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); - m_ctc->zc_callback<0>().set(Z80SIO_TAG, FUNC(z80dart_device::rxca_w)); - m_ctc->zc_callback<1>().set(Z80SIO_TAG, FUNC(z80dart_device::txca_w)); - m_ctc->zc_callback<2>().set(Z80SIO_TAG, FUNC(z80dart_device::rxtxcb_w)); - - TIMER(config, "ctc").configure_periodic(FUNC(trs80m2_state::ctc_tick), attotime::from_hz(8_MHz_XTAL / 2 / 2)); + m_ctc->set_clk<0>(8_MHz_XTAL / 2 / 2); + m_ctc->set_clk<1>(8_MHz_XTAL / 2 / 2); + m_ctc->set_clk<2>(8_MHz_XTAL / 2 / 2); + m_ctc->zc_callback<0>().set(Z80SIO_TAG, FUNC(z80sio_device::rxca_w)); + m_ctc->zc_callback<1>().set(Z80SIO_TAG, FUNC(z80sio_device::txca_w)); + m_ctc->zc_callback<2>().set(Z80SIO_TAG, FUNC(z80sio_device::rxtxcb_w)); Z80DMA(config, m_dmac, 8_MHz_XTAL / 2); m_dmac->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT); @@ -765,7 +754,7 @@ void trs80m2_state::trs80m2(machine_config &config) 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)); - z80sio0_device& sio(Z80SIO0(config, Z80SIO_TAG, 8_MHz_XTAL / 2)); + z80sio_device& sio(Z80SIO(config, Z80SIO_TAG, 8_MHz_XTAL / 2)); // SIO/0 sio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); CENTRONICS(config, m_centronics, centronics_devices, "printer"); @@ -836,11 +825,12 @@ void trs80m16_state::trs80m16(machine_config &config) Z80CTC(config, m_ctc, 8_MHz_XTAL / 2); m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); - m_ctc->zc_callback<0>().set(Z80SIO_TAG, FUNC(z80dart_device::rxca_w)); - m_ctc->zc_callback<1>().set(Z80SIO_TAG, FUNC(z80dart_device::txca_w)); - m_ctc->zc_callback<2>().set(Z80SIO_TAG, FUNC(z80dart_device::rxtxcb_w)); - - TIMER(config, "ctc").configure_periodic(FUNC(trs80m2_state::ctc_tick), attotime::from_hz(8_MHz_XTAL / 2 / 2)); + m_ctc->set_clk<0>(8_MHz_XTAL / 2 / 2); + m_ctc->set_clk<1>(8_MHz_XTAL / 2 / 2); + m_ctc->set_clk<2>(8_MHz_XTAL / 2 / 2); + m_ctc->zc_callback<0>().set(Z80SIO_TAG, FUNC(z80sio_device::rxca_w)); + m_ctc->zc_callback<1>().set(Z80SIO_TAG, FUNC(z80sio_device::txca_w)); + m_ctc->zc_callback<2>().set(Z80SIO_TAG, FUNC(z80sio_device::rxtxcb_w)); Z80DMA(config, m_dmac, 8_MHz_XTAL / 2); m_dmac->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT); @@ -857,7 +847,7 @@ void trs80m16_state::trs80m16(machine_config &config) 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)); - z80sio0_device& sio(Z80SIO0(config, Z80SIO_TAG, 8_MHz_XTAL / 2)); + z80sio_device& sio(Z80SIO(config, Z80SIO_TAG, 8_MHz_XTAL / 2)); sio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); AM9519(config, m_uic, 0); |