Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

More CTC set_clk conversions (nw)

Browse Source
This commit is contained in:
AJR 2018-11-13 23:16:46 -05:00
parent c20e0b0fe2
commit 6d5f14ac55
7 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mame/drivers/a7150.cpp
View File

@ -31,7 +31,6 @@
#include "machine/input_merger.h"
#include "cpu/z80/z80.h"
#include "machine/clock.h"
#include "machine/z80ctc.h"
#include "machine/z80sio.h"
@ -527,14 +526,12 @@ MACHINE_CONFIG_START(a7150_state::a7150)
m_video_bankdev->set_data_width(8);
m_video_bankdev->set_stride(0x10000);
clock_device &ctc_clock(CLOCK(config, "ctc_clock", 1230750));
ctc_clock.signal_handler().set(m_ctc, FUNC(z80ctc_device::trg0));
ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg1));
ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg2));
ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg3));
Z80CTC(config, m_ctc, 16_MHz_XTAL/3);
m_ctc->intr_callback().set_inputline(m_gfxcpu, INPUT_LINE_IRQ0);
m_ctc->set_clk<0>(1230750);
m_ctc->set_clk<1>(1230750);
m_ctc->set_clk<2>(1230750);
m_ctc->set_clk<3>(1230750);
m_ctc->zc_callback<0>().set(Z80SIO_TAG, FUNC(z80sio_device::rxca_w));
m_ctc->zc_callback<0>().append(Z80SIO_TAG, FUNC(z80sio_device::txca_w));
m_ctc->zc_callback<1>().set(Z80SIO_TAG, FUNC(z80sio_device::rxtxcb_w));

8
src/mame/drivers/altos5.cpp
View File

@ -415,11 +415,6 @@ MACHINE_CONFIG_START(altos5_state::altos5)
m_maincpu->set_addrmap(AS_IO, &altos5_state::io_map);
m_maincpu->set_daisy_config(daisy_chain_intf);
clock_device &ctc_clock(CLOCK(config, "ctc_clock", 8_MHz_XTAL / 4)); // 2MHz
ctc_clock.signal_handler().set("ctc", FUNC(z80ctc_device::trg0));
ctc_clock.signal_handler().append("ctc", FUNC(z80ctc_device::trg1));
ctc_clock.signal_handler().append("ctc", FUNC(z80ctc_device::trg2));
/* devices */
Z80DMA(config, m_dma, 8_MHz_XTAL / 2);
m_dma->out_busreq_callback().set(FUNC(altos5_state::busreq_w));
@ -456,6 +451,9 @@ MACHINE_CONFIG_START(altos5_state::altos5)
z80ctc_device &ctc(Z80CTC(config, "ctc", 8_MHz_XTAL / 2));
ctc.intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
ctc.set_clk<0>(8_MHz_XTAL / 4); // 2MHz
ctc.set_clk<1>(8_MHz_XTAL / 4); // 2MHz
ctc.set_clk<2>(8_MHz_XTAL / 4); // 2MHz
ctc.zc_callback<0>().set("sio", FUNC(z80sio_device::rxtxcb_w)); // SIO Ch B
ctc.zc_callback<1>().set("dart", FUNC(z80dart_device::txca_w)); // Z80DART Ch A, SIO Ch A
ctc.zc_callback<1>().append("dart", FUNC(z80dart_device::rxca_w));

7
src/mame/drivers/ampro.cpp
View File

@ -28,7 +28,6 @@ ToDo:
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
#include "machine/clock.h"
#include "machine/timer.h"
#include "softlist.h"
@ -162,13 +161,11 @@ void ampro_state::ampro(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &ampro_state::ampro_io);
m_maincpu->set_daisy_config(daisy_chain_intf);
clock_device &ctc_clock(CLOCK(config, "ctc_clock", 16_MHz_XTAL / 8)); // 2MHz
ctc_clock.signal_handler().set(m_ctc, FUNC(z80ctc_device::trg0));
ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg1));
/* Devices */
Z80CTC(config, m_ctc, 16_MHz_XTAL / 4);
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_ctc->set_clk<0>(16_MHz_XTAL / 8); // 2MHz
m_ctc->set_clk<1>(16_MHz_XTAL / 8); // 2MHz
m_ctc->zc_callback<0>().set(m_dart, FUNC(z80dart_device::txca_w)); // Z80DART Ch A, SIO Ch A
m_ctc->zc_callback<0>().append(m_dart, FUNC(z80dart_device::rxca_w));
m_ctc->zc_callback<1>().set(m_dart, FUNC(z80dart_device::rxtxcb_w)); // SIO Ch B

9
src/mame/drivers/einstein.cpp
View File

@ -19,7 +19,6 @@
#include "bus/einstein/userport/userport.h"
#include "bus/rs232/rs232.h"
#include "machine/adc0844.h"
#include "machine/clock.h"
#include "machine/i8251.h"
#include "machine/ram.h"
#include "machine/rescap.h"
@ -597,15 +596,13 @@ MACHINE_CONFIG_START(einstein_state::einstein)
z80ctc_device& ctc(Z80CTC(config, IC_I058, XTAL_X002 / 2));
ctc.intr_callback().set(FUNC(einstein_state::int_w<1>));
ctc.set_clk<0>(XTAL_X002 / 4);
ctc.set_clk<1>(XTAL_X002 / 4);
ctc.set_clk<2>(XTAL_X002 / 4);
ctc.zc_callback<0>().set(IC_I060, FUNC(i8251_device::write_txc));
ctc.zc_callback<1>().set(IC_I060, FUNC(i8251_device::write_rxc));
ctc.zc_callback<2>().set(IC_I058, FUNC(z80ctc_device::trg3));
clock_device &ctc_trigger(CLOCK(config, "ctc_trigger", XTAL_X002 / 4));
ctc_trigger.signal_handler().set(IC_I058, FUNC(z80ctc_device::trg0));
ctc_trigger.signal_handler().append(IC_I058, FUNC(z80ctc_device::trg1));
ctc_trigger.signal_handler().append(IC_I058, FUNC(z80ctc_device::trg2));
/* Einstein daisy chain support for non-Z80 devices */
Z80DAISY_GENERIC(config, m_keyboard_daisy, 0xf7);
m_keyboard_daisy->int_handler().set(FUNC(einstein_state::int_w<2>));

5
src/mame/drivers/mc8020.cpp
View File

@ -18,7 +18,6 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "machine/clock.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "emupal.h"
@ -321,11 +320,9 @@ MACHINE_CONFIG_START(mc8020_state::mc8020)
pio.in_pb_callback().set(FUNC(mc8020_state::port_b_r));
pio.out_pb_callback().set(FUNC(mc8020_state::port_b_w));
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(2'457'600) / 64) // guess
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg2))
z80ctc_device &ctc(Z80CTC(config, "ctc", XTAL(2'457'600)));
ctc.intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
ctc.set_clk<2>(XTAL(2'457'600) / 64); // guess
ctc.zc_callback<2>().set("ctc", FUNC(z80ctc_device::trg1));
ctc.zc_callback<2>().append("ctc", FUNC(z80ctc_device::trg0));
MACHINE_CONFIG_END

4
src/mame/drivers/super6.cpp
View File

@ -453,12 +453,10 @@ void super6_state::super6(machine_config &config)
// devices
Z80CTC(config, m_ctc, 24_MHz_XTAL / 4);
m_ctc->set_clk<0>(24_MHz_XTAL / 16); // J6 pin 1-14 (1.5MHz)
m_ctc->zc_callback<0>().set(m_ctc, FUNC(z80ctc_device::trg1)); // J6 pin 2-3
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
clock_device &ctc_tick(CLOCK(config, "ctc_tick", 24_MHz_XTAL / 16));
ctc_tick.signal_handler().set(m_ctc, FUNC(z80ctc_device::trg0)); // J6 pin 1-14 (1.5MHz)
Z80DMA(config, m_dma, 24_MHz_XTAL / 6);
m_dma->out_busreq_callback().set(m_dma, FUNC(z80dma_device::bai_w));
m_dma->out_int_callback().set(m_ctc, FUNC(z80ctc_device::trg2));

1
src/mame/includes/super6.h
View File

@ -9,7 +9,6 @@
#include "machine/z80daisy.h"
#include "machine/com8116.h"
#include "machine/ram.h"
#include "machine/clock.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"