From dec34486899091115acdcf518ab721e660c29c1e Mon Sep 17 00:00:00 2001 From: Robbbert Date: Tue, 31 Oct 2017 17:51:20 +1100 Subject: (nw) more drivers moved to z80sio.h --- src/mame/drivers/aussiebyte.cpp | 61 +++++++++++++-------------------- src/mame/drivers/dmax8000.cpp | 38 ++++++++++----------- src/mame/drivers/mz2500.cpp | 6 ++-- src/mame/drivers/octopus.cpp | 38 ++++++++++----------- src/mame/drivers/onyx.cpp | 21 +++++------- src/mame/drivers/pcm.cpp | 47 +++++++++++++------------ src/mame/drivers/rt1715.cpp | 6 ++-- src/mame/drivers/superslave.cpp | 76 ++++++++++++++++++++--------------------- src/mame/includes/aussiebyte.h | 9 +---- 9 files changed, 138 insertions(+), 164 deletions(-) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index 15836bae959..fdf46923f6e 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -53,7 +53,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( aussiebyte_io, AS_IO, 8, aussiebyte_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("sio1", z80sio0_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("sio1", z80sio_device, ba_cd_r, ba_cd_w) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("pio1", z80pio_device, read, write) AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_RANGE(0x0c, 0x0f) AM_NOP // winchester interface @@ -68,7 +68,7 @@ static ADDRESS_MAP_START( aussiebyte_io, AS_IO, 8, aussiebyte_state ) AM_RANGE(0x1b, 0x1b) AM_WRITE(port1b_w) // winchester control AM_RANGE(0x1c, 0x1f) AM_WRITE(port1c_w) // gpebh select AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("pio2", z80pio_device, read, write) - AM_RANGE(0x24, 0x27) AM_DEVREADWRITE("sio2", z80sio0_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x24, 0x27) AM_DEVREADWRITE("sio2", z80sio_device, ba_cd_r, ba_cd_w) AM_RANGE(0x28, 0x28) AM_READ(port28_r) AM_DEVWRITE("votrax", votrax_sc01_device, write) AM_RANGE(0x2c, 0x2c) AM_DEVWRITE("votrax", votrax_sc01_device, inflection_w) AM_RANGE(0x30, 0x30) AM_WRITE(address_w) @@ -368,29 +368,8 @@ static const z80_daisy_config daisy_chain_intf[] = ************************************************************/ // baud rate generator. All inputs are 1.2288MHz. -WRITE_LINE_MEMBER( aussiebyte_state::clock_w ) -{ - m_ctc->trg0(state); - m_ctc->trg1(state); - m_ctc->trg2(state); -} - -WRITE_LINE_MEMBER( aussiebyte_state::ctc_z0_w ) -{ - m_sio1->rxca_w(state); - m_sio1->txca_w(state); -} - -WRITE_LINE_MEMBER( aussiebyte_state::ctc_z1_w ) -{ - m_sio1->rxtxcb_w(state); - m_sio2->rxca_w(state); - m_sio2->txca_w(state); -} - WRITE_LINE_MEMBER( aussiebyte_state::ctc_z2_w ) { - m_sio2->rxtxcb_w(state); m_ctc->trg3(1); m_ctc->trg3(0); } @@ -496,13 +475,19 @@ static MACHINE_CONFIG_START( aussiebyte ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_4_9152MHz / 4) - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(aussiebyte_state, clock_w)) + MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2)) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC0_CB(WRITELINE(aussiebyte_state, ctc_z0_w)) // SIO1 Ch A - MCFG_Z80CTC_ZC1_CB(WRITELINE(aussiebyte_state, ctc_z1_w)) // SIO1 Ch B, SIO2 Ch A + MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, txca_w)) + MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, txca_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3 + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w)) MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz / 4) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -523,21 +508,21 @@ static MACHINE_CONFIG_START( aussiebyte ) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(aussiebyte_state, port20_w)) - MCFG_DEVICE_ADD("sio1", Z80SIO0, XTAL_16MHz / 4) - MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio1_rdya_w)) - MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio1_rdyb_w)) + MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_16MHz / 4) + MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio1_rdya_w)) + MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio1_rdyb_w)) - MCFG_DEVICE_ADD("sio2", Z80SIO0, XTAL_16MHz / 4) - MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio2_rdya_w)) - MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio2_rdyb_w)) - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts)) + MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_16MHz / 4) + MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio2_rdya_w)) + MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio2_rdyb_w)) + MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts)) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio0_device, rxa_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio_device, rxa_w)) MCFG_WD2797_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_intrq_w)) diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index f45e9901765..f569ed5a5fc 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -28,7 +28,7 @@ What there is of the schematic shows no sign of a daisy chain or associated inte #include "machine/wd_fdc.h" #include "cpu/z80/z80daisy.h" #include "machine/z80pio.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80ctc.h" #include "machine/mm58274c.h" #include "bus/rs232/rs232.h" @@ -104,14 +104,14 @@ static ADDRESS_MAP_START(dmax8000_io, AS_IO, 8, dmax8000_state) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("fdc", fd1793_device, read, write) - AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("dart1", z80dart_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("dart1", z80sio_device, ba_cd_r, ba_cd_w) AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("pio1", z80pio_device, read, write) // fdd controls AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("pio2", z80pio_device, read, write) // centronics & parallel ports AM_RANGE(0x14, 0x17) AM_WRITE(port14_w) // control lines for the centronics & parallel ports //AM_RANGE(0x18, 0x19) AM_MIRROR(2) AM_DEVREADWRITE("am9511", am9512_device, read, write) // optional numeric coprocessor //AM_RANGE(0x1c, 0x1d) AM_MIRROR(2) // optional hard disk controller (1C=status, 1D=data) - AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("dart2", z80dart_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("dart2", z80sio_device, ba_cd_r, ba_cd_w) AM_RANGE(0x40, 0x40) AM_WRITE(port40_w) // memory bank control //AM_RANGE(0x60, 0x67) // optional IEEE488 GPIB AM_RANGE(0x70, 0x7f) AM_DEVREADWRITE("rtc", mm58274c_device, read, write) // optional RTC @@ -156,25 +156,25 @@ static MACHINE_CONFIG_START( dmax8000 ) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2)) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80dart_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80dart_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, txca_w)) - MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart2", z80dart_device, rxtxcb_w)) - MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart1", z80dart_device, rxtxcb_w)) - - MCFG_DEVICE_ADD("dart1", Z80DART, XTAL_4MHz) // A = terminal; B = aux - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts)) + MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80sio_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80sio_device, txca_w)) + MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart2", z80sio_device, rxtxcb_w)) + MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart1", z80sio_device, rxtxcb_w)) + + MCFG_DEVICE_ADD("dart1", Z80SIO, XTAL_4MHz) // A = terminal; B = aux + MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts)) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart1", z80dart_device, rxa_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("dart1", z80dart_device, dcda_w)) - MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart1", z80dart_device, ria_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart1", z80dart_device, ctsa_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart1", z80sio_device, rxa_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE("dart1", z80sio_device, dcda_w)) + //MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart1", z80sio_device, ria_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart1", z80sio_device, ctsa_w)) - MCFG_DEVICE_ADD("dart2", Z80DART, XTAL_4MHz) // RS232 ports + MCFG_DEVICE_ADD("dart2", Z80SIO, XTAL_4MHz) // RS232 ports MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_4MHz) MCFG_Z80PIO_OUT_PA_CB(WRITE8(dmax8000_state, port0c_w)) diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index 4f87e4ad09f..f3a3c8ce3ef 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -50,7 +50,7 @@ #include "machine/pit8253.h" #include "machine/rp5c15.h" #include "machine/wd_fdc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80pio.h" #include "sound/2203intf.h" #include "sound/beep.h" @@ -1511,7 +1511,7 @@ static ADDRESS_MAP_START(mz2500_io, AS_IO, 8, mz2500_state ) // AM_RANGE(0x60, 0x63) AM_WRITE(w3100a_w) // AM_RANGE(0x63, 0x63) AM_READ(w3100a_r) // AM_RANGE(0x98, 0x99) ADPCM, unknown type, custom? - AM_RANGE(0xa0, 0xa3) AM_DEVREADWRITE("z80sio",z80sio0_device, ba_cd_r, ba_cd_w) + AM_RANGE(0xa0, 0xa3) AM_DEVREADWRITE("z80sio", z80sio_device, ba_cd_r, ba_cd_w) // AM_RANGE(0xa4, 0xa5) AM_READWRITE(sasi_r, sasi_w) AM_RANGE(0xa8, 0xa8) AM_WRITE(mz2500_rom_w) AM_RANGE(0xa9, 0xa9) AM_READ(mz2500_rom_r) @@ -2097,7 +2097,7 @@ static MACHINE_CONFIG_START( mz2500 ) MCFG_Z80PIO_OUT_PA_CB(WRITE8(mz2500_state, mz2500_pio1_porta_w)) MCFG_Z80PIO_IN_PB_CB(READ8(mz2500_state, mz2500_pio1_porta_r)) - MCFG_DEVICE_ADD("z80sio", Z80SIO0, 6000000) + MCFG_DEVICE_ADD("z80sio", Z80SIO, 6000000) MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz) MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(mz2500_state, mz2500_rtc_alarm_irq)) diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 3f2bac7797e..3d2a2d1d436 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -121,7 +121,7 @@ It's a very rare computer. It has 2 processors, Z80 and 8088, so it can run both #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "sound/spkrdev.h" #include "video/scn2674.h" @@ -245,7 +245,7 @@ private: required_device m_pit; required_device m_ppi; required_device m_speaker; - required_device m_serial; + required_device m_serial; required_device m_parallel; required_device m_z80_bankdev; required_device m_ram; @@ -300,10 +300,10 @@ static ADDRESS_MAP_START( octopus_io, AS_IO, 8, octopus_state ) AM_RANGE(0x51, 0x51) AM_DEVREADWRITE("keyboard", i8251_device, status_r, control_w) // 0x70-73: HD controller AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("pit", pit8253_device, read, write) - AM_RANGE(0xa0, 0xa0) AM_DEVREADWRITE("serial", z80sio2_device, da_r, da_w) - AM_RANGE(0xa1, 0xa1) AM_DEVREADWRITE("serial", z80sio2_device, ca_r, ca_w) - AM_RANGE(0xa2, 0xa2) AM_DEVREADWRITE("serial", z80sio2_device, db_r, db_w) - AM_RANGE(0xa3, 0xa3) AM_DEVREADWRITE("serial", z80sio2_device, cb_r, cb_w) + AM_RANGE(0xa0, 0xa0) AM_DEVREADWRITE("serial", z80sio_device, da_r, da_w) + AM_RANGE(0xa1, 0xa1) AM_DEVREADWRITE("serial", z80sio_device, ca_r, ca_w) + AM_RANGE(0xa2, 0xa2) AM_DEVREADWRITE("serial", z80sio_device, db_r, db_w) + AM_RANGE(0xa3, 0xa3) AM_DEVREADWRITE("serial", z80sio_device, cb_r, cb_w) AM_RANGE(0xb0, 0xb1) AM_DEVREADWRITE("pic_master", pic8259_device, read, write) AM_RANGE(0xb4, 0xb5) AM_DEVREADWRITE("pic_slave", pic8259_device, read, write) AM_RANGE(0xc0, 0xc7) AM_DEVREADWRITE("crtc", scn2674_device, read, write) @@ -952,7 +952,7 @@ static MACHINE_CONFIG_START( octopus ) MCFG_PIT8253_CLK0(2457500) // DART channel A MCFG_PIT8253_OUT0_HANDLER(WRITELINE(octopus_state,serial_clock_w)) // being able to write both Rx and Tx clocks at one time would be nice MCFG_PIT8253_CLK1(2457500) // DART channel B - MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("serial",z80sio2_device,rxtxcb_w)) + MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("serial",z80sio_device,rxtxcb_w)) MCFG_PIT8253_CLK2(2457500) // speaker frequency MCFG_PIT8253_OUT2_HANDLER(WRITELINE(octopus_state,spk_freq_w)) @@ -960,21 +960,21 @@ static MACHINE_CONFIG_START( octopus ) MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEVICE_ADD("serial", Z80SIO2, XTAL_16MHz / 4) // clock rate not mentioned in tech manual - MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE("pic_master",pic8259_device, ir1_w)) - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_rts)) - MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_rts)) + MCFG_DEVICE_ADD("serial", Z80SIO, XTAL_16MHz / 4) // clock rate not mentioned in tech manual + MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic_master",pic8259_device, ir1_w)) + MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_rts)) MCFG_RS232_PORT_ADD("serial_a", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio2_device, rxa_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio2_device, ctsa_w)) MCFG_DEVCB_INVERT - MCFG_RS232_RI_HANDLER(DEVWRITELINE("serial",z80sio2_device, ria_w)) MCFG_DEVCB_INVERT + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio_device, rxa_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio_device, ctsa_w)) MCFG_DEVCB_INVERT + //MCFG_RS232_RI_HANDLER(DEVWRITELINE("serial",z80sio_device, ria_w)) MCFG_DEVCB_INVERT MCFG_RS232_PORT_ADD("serial_b", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio2_device, rxb_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio2_device, ctsb_w)) MCFG_DEVCB_INVERT - MCFG_RS232_RI_HANDLER(DEVWRITELINE("serial",z80sio2_device, rib_w)) MCFG_DEVCB_INVERT + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio_device, rxb_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT + //MCFG_RS232_RI_HANDLER(DEVWRITELINE("serial",z80sio_device, rib_w)) MCFG_DEVCB_INVERT MCFG_CENTRONICS_ADD("parallel", octopus_centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(octopus_state, parallel_busy_w)) diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 6e68c7ff76c..9d55bf52af6 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -29,21 +29,18 @@ and be connected to a RS422 network. //#include "cpu/z80/z80daisy.h" //#include "machine/z80ctc.h" //#include "machine/z80pio.h" -//#include "machine/z80dart.h" +//#include "machine/z80sio.h" //#include "machine/z80dma.h" #include "machine/terminal.h" -#define TERMINAL_TAG "terminal" - class onyx_state : public driver_device { public: onyx_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_terminal(*this, TERMINAL_TAG) - { - } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_terminal(*this, "terminal") + { } DECLARE_MACHINE_RESET(c8002); void kbd_put(u8 data); @@ -91,7 +88,7 @@ ADDRESS_MAP_END //ADDRESS_MAP_END static ADDRESS_MAP_START(c8002_io, AS_IO, 8, onyx_state) - AM_RANGE(0xff00, 0xff01) AM_DEVWRITE(TERMINAL_TAG, generic_terminal_device, write) + AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("terminal", generic_terminal_device, write) AM_RANGE(0xff04, 0xff05) AM_READ(portff05_r) ADDRESS_MAP_END @@ -128,14 +125,14 @@ static MACHINE_CONFIG_START( c8002 ) /* peripheral hardware */ //MCFG_DEVICE_ADD("z80ctc_0", Z80CTC, XTAL_4MHz) //MCFG_DEVICE_ADD("z80ctc_1", Z80CTC, XTAL_4MHz) - //MCFG_DEVICE_ADD("z80sio_0", Z80SIO0, 9600) - //MCFG_DEVICE_ADD("z80sio_1", Z80SIO0, 9600) + //MCFG_DEVICE_ADD("z80sio_0", Z80SIO, 9600) + //MCFG_DEVICE_ADD("z80sio_1", Z80SIO, 9600) //MCFG_DEVICE_ADD("z80pio_0", Z80CTC, XTAL_4MHz) //MCFG_DEVICE_ADD("z80pio_1", Z80CTC, XTAL_4MHz) //MCFG_DEVICE_ADD("z80pio_2", Z80CTC, XTAL_4MHz) /* video hardware */ - MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) + MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(onyx_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 2183928883e..7b6cce016b9 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -58,7 +58,7 @@ #include "imagedev/cassette.h" #include "machine/k7659kb.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80pio.h" #include "sound/spkrdev.h" #include "sound/wave.h" @@ -72,11 +72,10 @@ public: pcm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") - , m_pio_s(*this, "z80pio_s") - , m_pio_u(*this, "z80pio_u") - , m_sio(*this, "z80sio") - , m_ctc_s(*this, "z80ctc_s") - , m_ctc_u(*this, "z80ctc_u") + , m_pio_s(*this, "pio_s") + , m_pio_u(*this, "pio_u") + , m_ctc_s(*this, "ctc_s") + , m_ctc_u(*this, "ctc_u") , m_speaker(*this, "speaker") , m_cass(*this, "cassette") , m_p_videoram(*this, "videoram") @@ -96,7 +95,6 @@ private: required_device m_maincpu; required_device m_pio_s; required_device m_pio_u; - required_device m_sio; required_device m_ctc_s; required_device m_ctc_u; required_device m_speaker; @@ -169,11 +167,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(pcm_io, AS_IO, 8, pcm_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("z80ctc_s", z80ctc_device, read, write) // system CTC - AM_RANGE(0x84, 0x87) AM_DEVREADWRITE("z80pio_s", z80pio_device, read, write) // system PIO - AM_RANGE(0x88, 0x8B) AM_DEVREADWRITE("z80sio", z80sio0_device, cd_ba_r, cd_ba_w) // SIO - AM_RANGE(0x8C, 0x8F) AM_DEVREADWRITE("z80ctc_u", z80ctc_device, read, write) // user CTC - AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("z80pio_u", z80pio_device, read, write) // user PIO + AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ctc_s", z80ctc_device, read, write) // system CTC + AM_RANGE(0x84, 0x87) AM_DEVREADWRITE("pio_s", z80pio_device, read, write) // system PIO + AM_RANGE(0x88, 0x8B) AM_DEVREADWRITE("sio", z80sio_device, cd_ba_r, cd_ba_w) // SIO + AM_RANGE(0x8C, 0x8F) AM_DEVREADWRITE("ctc_u", z80ctc_device, read, write) // user CTC + AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("pio_u", z80pio_device, read, write) // user PIO //AM_RANGE(0x94, 0x97) // bank select //AM_RANGE(0x98, 0x9B) // NMI generator //AM_RANGE(0x9C, 0x9F) // io ports available to the user @@ -223,11 +221,11 @@ uint32_t pcm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c static const z80_daisy_config pcm_daisy_chain[] = { - { "z80ctc_s" }, /* System ctc */ - { "z80pio_s" }, /* System pio */ - { "z80sio" }, /* sio */ - { "z80pio_u" }, /* User pio */ - { "z80ctc_u" }, /* User ctc */ + { "ctc_s" }, /* System ctc */ + { "pio_s" }, /* System pio */ + { "sio" }, /* sio */ + { "pio_u" }, /* User pio */ + { "ctc_u" }, /* User ctc */ { nullptr } }; @@ -280,24 +278,25 @@ static MACHINE_CONFIG_START( pcm ) MCFG_K7659_KEYBOARD_ADD() MCFG_CASSETTE_ADD("cassette") - MCFG_DEVICE_ADD("z80pio_u", Z80PIO, XTAL_10MHz/4) + MCFG_DEVICE_ADD("pio_u", Z80PIO, XTAL_10MHz/4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("z80pio_s", Z80PIO, XTAL_10MHz/4) + MCFG_DEVICE_ADD("pio_s", Z80PIO, XTAL_10MHz/4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(DEVREAD8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read)) MCFG_Z80PIO_IN_PB_CB(READ8(pcm_state, pcm_85_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(pcm_state, pcm_85_w)) - MCFG_DEVICE_ADD("z80sio", Z80SIO0, 4800) // clocks come from the system ctc + MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_10MHz /4) - MCFG_DEVICE_ADD("z80ctc_u", Z80CTC, XTAL_10MHz /4) + MCFG_DEVICE_ADD("ctc_u", Z80CTC, XTAL_10MHz /4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("z80ctc_s", Z80CTC, XTAL_10MHz /4) + MCFG_DEVICE_ADD("ctc_s", Z80CTC, XTAL_10MHz /4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - // ZC0 : SIO channel A clock - // ZC1 : SIO channel B clock + MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w)) + MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(pcm_state, pcm_82_w)) // speaker MACHINE_CONFIG_END diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index 73838113c6c..fc04e2392d1 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -18,7 +18,7 @@ #include "cpu/z80/z80.h" #include "machine/ram.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80dma.h" #include "machine/z80pio.h" #include "video/i8275.h" @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( rt1715_io, AS_IO, 8, rt1715_state ) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("a71", z80pio_device, read_alt, write_alt) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("a72", z80pio_device, read_alt, write_alt) AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("a30", z80ctc_device, read, write) - AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("a29", z80sio0_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("a29", z80sio_device, ba_cd_r, ba_cd_w) AM_RANGE(0x18, 0x19) AM_DEVREADWRITE("a26", i8275_device, read, write) AM_RANGE(0x20, 0x20) AM_WRITE(rt1715_floppy_enable) AM_RANGE(0x28, 0x28) AM_WRITE(rt1715_rom_disable) @@ -303,7 +303,7 @@ static MACHINE_CONFIG_START( rt1715 ) MCFG_DEVICE_ADD("a30", Z80CTC, XTAL_10MHz/4 /* ? */) - MCFG_DEVICE_ADD("a29", Z80SIO0, XTAL_10MHz/4 /* ? */) + MCFG_DEVICE_ADD("a29", Z80SIO, XTAL_10MHz/4 /* ? */) /* floppy */ MCFG_DEVICE_ADD("a71", Z80PIO, XTAL_10MHz/4 /* ? */) diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index 0afcdd76c42..96118f23119 100644 --- a/src/mame/drivers/superslave.cpp +++ b/src/mame/drivers/superslave.cpp @@ -27,7 +27,7 @@ Oxx,yy = Out port #include "machine/com8116.h" #include "machine/pic8259.h" #include "machine/ram.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80pio.h" #define Z80_TAG "u45" @@ -262,8 +262,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( superslave_io, AS_IO, 8, superslave_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80DART_0_TAG, z80dart_device, ba_cd_r, ba_cd_w) - AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80DART_1_TAG, z80dart_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80DART_0_TAG, z80sio_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80DART_1_TAG, z80sio_device, ba_cd_r, ba_cd_w) AM_RANGE(0x10, 0x10) AM_MIRROR(0x03) AM_WRITE(baud_w) AM_RANGE(0x14, 0x17) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt) AM_RANGE(0x18, 0x1c) AM_DEVREADWRITE(AM9519_TAG, pic8259_device, read, write) @@ -384,52 +384,52 @@ static MACHINE_CONFIG_START( superslave ) MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_8MHz/2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(Z80DART_0_TAG, Z80DART, XTAL_8MHz/2) - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) - MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) - MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD(Z80DART_0_TAG, Z80SIO, XTAL_8MHz/2) + MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxa_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, dcda_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, ctsa_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, rxa_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, dcda_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, ctsa_w)) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxb_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, dcdb_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, ctsb_w)) - - MCFG_DEVICE_ADD(Z80DART_1_TAG, Z80DART, XTAL_8MHz/2) - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts)) - MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_rts)) - MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, rxb_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, dcdb_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, ctsb_w)) + + MCFG_DEVICE_ADD(Z80DART_1_TAG, Z80SIO, XTAL_8MHz/2) + MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_RS232_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxa_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, dcda_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, ctsa_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, rxa_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, dcda_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, ctsa_w)) MCFG_RS232_PORT_ADD(RS232_D_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxb_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, dcdb_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, ctsb_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, rxb_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, dcdb_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, ctsb_w)) MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz) - MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxca_w)) - MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxtxcb_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxtxcb_w)) + MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, rxca_w)) + MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80sio_device, rxtxcb_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80sio_device, rxtxcb_w)) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index 7cb3a5268c6..af21382022a 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -20,7 +20,7 @@ #include "machine/msm5832.h" #include "machine/wd_fdc.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80dma.h" #include "machine/z80pio.h" @@ -49,8 +49,6 @@ public: , m_dma(*this, "dma") , m_pio1(*this, "pio1") , m_pio2(*this, "pio2") - , m_sio1(*this, "sio1") - , m_sio2(*this, "sio2") , m_centronics(*this, "centronics") , m_rs232(*this, "rs232") , m_fdc(*this, "fdc") @@ -92,11 +90,8 @@ public: DECLARE_WRITE_LINE_MEMBER(sio1_rdyb_w); DECLARE_WRITE_LINE_MEMBER(sio2_rdya_w); DECLARE_WRITE_LINE_MEMBER(sio2_rdyb_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); DECLARE_MACHINE_RESET(aussiebyte); DECLARE_DRIVER_INIT(aussiebyte); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); DECLARE_WRITE8_MEMBER(address_w); DECLARE_WRITE8_MEMBER(register_w); @@ -127,8 +122,6 @@ private: required_device m_dma; required_device m_pio1; required_device m_pio2; - required_device m_sio1; - required_device m_sio2; required_device m_centronics; required_device m_rs232; required_device m_fdc; -- cgit v1.2.3