From e7d2693098d04f5e1e12f8549f514f949a3b38b0 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Wed, 1 Nov 2017 00:57:41 +1100 Subject: (nw) partial revert of z80sio stuff --- src/mame/drivers/altos5.cpp | 14 ++++---- src/mame/drivers/czk80.cpp | 14 ++++---- src/mame/drivers/dmax8000.cpp | 38 ++++++++++----------- src/mame/drivers/mtx.cpp | 8 ++--- src/mame/drivers/pulsar.cpp | 26 +++++++------- src/mame/drivers/rc702.cpp | 14 ++++---- src/mame/drivers/superslave.cpp | 76 ++++++++++++++++++++--------------------- src/mame/drivers/ts802.cpp | 14 ++++---- src/mame/drivers/ts803.cpp | 18 +++++----- src/mame/drivers/univac.cpp | 18 +++++----- src/mame/includes/mtx.h | 20 +++++------ 11 files changed, 130 insertions(+), 130 deletions(-) diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index 5ef66ee8d13..e3ecc13fb91 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -16,6 +16,7 @@ #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/z80dma.h" #include "machine/wd_fdc.h" #include "machine/clock.h" @@ -93,7 +94,7 @@ static ADDRESS_MAP_START(altos5_io, AS_IO, 8, altos5_state) AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("pio1", z80pio_device, read, write) AM_RANGE(0x14, 0x17) AM_WRITE(port14_w) - AM_RANGE(0x1c, 0x1f) AM_DEVREADWRITE("dart", z80sio_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x1c, 0x1f) AM_DEVREADWRITE("dart", z80dart_device, ba_cd_r, ba_cd_w) //AM_RANGE(0x20, 0x23) // Hard drive AM_RANGE(0x2c, 0x2f) AM_DEVREADWRITE("sio", z80sio_device, ba_cd_r, ba_cd_w) ADDRESS_MAP_END @@ -375,10 +376,10 @@ static MACHINE_CONFIG_START( altos5 ) MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_8MHz / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart", Z80SIO, XTAL_8MHz / 2) + MCFG_DEVICE_ADD("dart", Z80DART, XTAL_8MHz / 2) // Channel A - console #3 // Channel B - printer - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2) // Channel A - console #2 @@ -392,16 +393,15 @@ static MACHINE_CONFIG_START( altos5 ) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) // SIO Ch B - MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80sio_device, txca_w)) // Z80DART Ch A, SIO Ch A - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart" ,z80sio_device, rxca_w)) + MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart" ,z80dart_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio" ,z80sio_device, txca_w)) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio" ,z80sio_device, rxca_w)) - MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart", z80sio_device, rxtxcb_w)) // Z80DART Ch B + MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) // Z80DART Ch B MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w)) - //MCFG_RS232_RI_HANDLER(DEVWRITELINE("sio", z80sio_device, rib_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w)) MCFG_FD1797_ADD("fdc", XTAL_8MHz / 8) diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index b0dc831d6e1..1f91ac23027 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -45,7 +45,7 @@ I/O ports: These ranges are what is guessed #include "machine/upd765.h" #include "cpu/z80/z80daisy.h" #include "machine/z80pio.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/z80ctc.h" #include "machine/terminal.h" @@ -112,7 +112,7 @@ static ADDRESS_MAP_START(czk80_io, AS_IO, 8, czk80_state) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x40, 0x40) AM_WRITE(port40_w) AM_RANGE(0x4c, 0x4f) AM_DEVREADWRITE("pio", z80pio_device, read, write) - AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("dart", z80sio_device, cd_ba_r, cd_ba_w) + AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("dart", z80dart_device, cd_ba_r, cd_ba_w) AM_RANGE(0x54, 0x57) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_RANGE(0x80, 0x80) AM_READ(port80_r) AM_DEVWRITE("terminal", generic_terminal_device, write) AM_RANGE(0x81, 0x81) AM_READ(port81_r) @@ -206,11 +206,11 @@ static MACHINE_CONFIG_START( czk80 ) MCFG_Z80CTC_ZC1_CB(WRITELINE(czk80_state, ctc_z1_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(czk80_state, ctc_z2_w)) - MCFG_DEVICE_ADD("dart", Z80SIO, XTAL_16MHz / 4) - //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_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("dart", Z80DART, XTAL_16MHz / 4) + //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_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_16MHz/4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index f569ed5a5fc..f45e9901765 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/z80sio.h" +#include "machine/z80dart.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", z80sio_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("dart1", z80dart_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", z80sio_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("dart2", z80dart_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", 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_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_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") - 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_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_DEVICE_ADD("dart2", Z80SIO, XTAL_4MHz) // RS232 ports + MCFG_DEVICE_ADD("dart2", Z80DART, 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/mtx.cpp b/src/mame/drivers/mtx.cpp index 00bfbb4c8e1..9b2c1870a63 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -31,7 +31,7 @@ #include "imagedev/snapquik.h" #include "machine/ram.h" #include "machine/z80ctc.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "sound/sn76496.h" #include "video/tms9928a.h" @@ -88,7 +88,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rs128_io, AS_IO, 8, mtx_state ) AM_IMPORT_FROM(mtx_io) - AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80DART_TAG, z80sio_device, cd_ba_r, cd_ba_w) + AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, cd_ba_r, cd_ba_w) ADDRESS_MAP_END /*************************************************************************** @@ -363,8 +363,8 @@ static MACHINE_CONFIG_DERIVED( rs128, mtx512 ) MCFG_Z80_DAISY_CHAIN(rs128_daisy_chain) /* devices */ - MCFG_DEVICE_ADD(Z80DART_TAG, Z80SIO, XTAL_4MHz) - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL_4MHz) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index e139cc6b03c..c65bc3b09fb 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -39,7 +39,7 @@ X - Test off-board memory banks #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/msm5832.h" #include "machine/i8255.h" #include "machine/com8116.h" @@ -88,7 +88,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(pulsar_io, AS_IO, 8, pulsar_state) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x0c) AM_DEVREADWRITE("dart", z80sio_device, ba_cd_r, ba_cd_w) + AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x0c) AM_DEVREADWRITE("dart", z80dart_device, ba_cd_r, ba_cd_w) AM_RANGE(0xd0, 0xd3) AM_MIRROR(0x0c) AM_DEVREADWRITE("fdc", fd1797_device, read, write) AM_RANGE(0xe0, 0xe3) AM_MIRROR(0x0c) AM_DEVREADWRITE("ppi", i8255_device, read, write) AM_RANGE(0xf0, 0xff) AM_WRITE(baud_w) @@ -222,23 +222,23 @@ static MACHINE_CONFIG_START( pulsar ) MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz) - MCFG_DEVICE_ADD("dart", Z80SIO, XTAL_4MHz) - 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_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("dart", Z80DART, XTAL_4MHz) + 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_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80sio_device, rxa_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart", z80sio_device, ctsa_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart", z80dart_device, ctsa_w)) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz) // Schematic has the labels for FT and FR the wrong way around, but the pin numbers are correct. - MCFG_COM8116_FR_HANDLER(DEVWRITELINE("dart", z80sio_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80sio_device, rxca_w)) - MCFG_COM8116_FT_HANDLER(DEVWRITELINE("dart", z80sio_device, txcb_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80sio_device, rxcb_w)) + MCFG_COM8116_FR_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w)) + MCFG_COM8116_FT_HANDLER(DEVWRITELINE("dart", z80dart_device, txcb_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxcb_w)) MCFG_FD1797_ADD("fdc", XTAL_4MHz / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", pulsar_floppies, "525hd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index acf3fccc6d2..30739929caf 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -29,7 +29,7 @@ Issues: #include "machine/keyboard.h" #include "machine/upd765.h" #include "machine/z80ctc.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/z80pio.h" #include "sound/beep.h" #include "video/i8275.h" @@ -104,7 +104,7 @@ static ADDRESS_MAP_START(rc702_io, AS_IO, 8, rc702_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("crtc", i8275_device, read, write) AM_RANGE(0x04, 0x05) AM_DEVICE("fdc", upd765a_device, map) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("sio1", z80sio_device, cd_ba_r, cd_ba_w) // boot sequence doesn't program this + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("sio1", z80dart_device, cd_ba_r, cd_ba_w) // boot sequence doesn't program this AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("ctc1", z80ctc_device, read, write) AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("pio", z80pio_device, read, write) AM_RANGE(0x14, 0x17) AM_READ_PORT("DSW") AM_WRITE(port14_w) // motors @@ -334,13 +334,13 @@ static MACHINE_CONFIG_START( rc702 ) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(rc702_state, clock_w)) MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_8MHz / 2) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, rxca_w)) - MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w)) + MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80dart_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80dart_device, rxca_w)) + MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80dart_device, rxtxcb_w)) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_8MHz / 2) - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("sio1", Z80DART, XTAL_8MHz / 2) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_8MHz / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index 96118f23119..0afcdd76c42 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/z80sio.h" +#include "machine/z80dart.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, 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(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(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, 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_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_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") - 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_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_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, 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_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_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr) - 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_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_PORT_ADD(RS232_D_TAG, default_rs232_devices, nullptr) - 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_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_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz) - 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)) + 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)) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index 921e26ffc8d..84319cea6e7 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -27,7 +27,7 @@ #include "machine/terminal.h" #include "machine/z80dma.h" #include "machine/z80ctc.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/wd_fdc.h" class ts802_state : public driver_device @@ -77,7 +77,7 @@ static ADDRESS_MAP_START(ts802_io, AS_IO, 8, ts802_state) // 08-0B: Z80 CTC AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) // 0C-0F: Z80 SIO #1 - //AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("dart1", z80sio_device, ba_cd_r, ba_cd_w) + //AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("dart1", z80dart_device, ba_cd_r, ba_cd_w) AM_RANGE(0x0c, 0x0c) AM_READ(port0c_r) AM_RANGE(0x0d, 0x0d) AM_READ(port0d_r) AM_DEVWRITE("terminal", generic_terminal_device, write) AM_RANGE(0x0e, 0x0e) AM_READ(port0e_r) @@ -89,7 +89,7 @@ static ADDRESS_MAP_START(ts802_io, AS_IO, 8, ts802_state) // 18: floppy misc. AM_RANGE(0x18, 0x1c) AM_WRITE(port18_w) // 20-23: Z80 SIO #2 - AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("dart2", z80sio_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("dart2", z80dart_device, ba_cd_r, ba_cd_w) // 48-4F: WD1000 harddisk controller // 80: LEDs AM_RANGE(0x80, 0x80) AM_WRITE(port80_w) @@ -199,11 +199,11 @@ static MACHINE_CONFIG_START( ts802 ) MCFG_Z80DMA_IN_IORQ_CB(READ8(ts802_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ts802_state, io_write_byte)) - MCFG_DEVICE_ADD("dart1", Z80SIO, XTAL_16MHz / 4) - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("dart1", Z80DART, XTAL_16MHz / 4) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart2", Z80SIO, XTAL_16MHz / 4) - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("dart2", Z80DART, XTAL_16MHz / 4) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 51180c6c02b..25a2cb8b41d 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -51,7 +51,7 @@ PAGE SEL bit in PORT0 set to 1: #include "cpu/z80/z80daisy.h" #include "machine/keyboard.h" #include "machine/timer.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/wd_fdc.h" #include "machine/z80sti.h" #include "video/mc6845.h" @@ -134,7 +134,7 @@ static ADDRESS_MAP_START(ts803_io, AS_IO, 8, ts803_state) AM_RANGE(0x00, 0x0f) AM_READ_PORT("DSW") AM_RANGE(0x10, 0x1f) AM_READWRITE(port10_r, port10_w) AM_RANGE(0x20, 0x2f) AM_DEVREADWRITE("sti", z80sti_device, read, write) - AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("dart", z80sio_device, cd_ba_r, cd_ba_w) + AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("dart", z80dart_device, cd_ba_r, cd_ba_w) AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("fdc", fd1793_device, read, write) AM_RANGE(0x90, 0x9f) AM_READWRITE(disk_0_control_r,disk_0_control_w) AM_RANGE(0xa0, 0xbf) AM_READWRITE(porta0_r, porta0_w) @@ -437,19 +437,19 @@ static MACHINE_CONFIG_START( ts803 ) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sti", z80sti_device, rc_w)) MCFG_DEVICE_ADD("dart_clock", CLOCK, (XTAL_16MHz / 13) / 8) - MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("dart", z80sio_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80sio_device, rxca_w)) + MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w)) MCFG_DEVICE_ADD("sti", Z80STI, XTAL_16MHz/4) - MCFG_Z80STI_OUT_TBO_CB(DEVWRITELINE("dart", z80sio_device, rxtxcb_w)) + MCFG_Z80STI_OUT_TBO_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) MCFG_Z80STI_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart", Z80SIO, XTAL_16MHz / 4) - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_DEVICE_ADD("dart", Z80DART, XTAL_16MHz / 4) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80sio_device, rxa_w)) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w)) /* floppy disk */ MCFG_FD1793_ADD("fdc", XTAL_1MHz) diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index 7b08d970bbc..6386475511d 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -26,7 +26,7 @@ #include "cpu/z80/z80daisy.h" #include "machine/nvram.h" #include "machine/z80ctc.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/clock.h" #include "screen.h" @@ -58,7 +58,7 @@ private: required_shared_ptr m_p_videoram; required_device m_nvram; required_device m_ctc; - required_device m_dart; + required_device m_dart; required_region_ptr m_p_chargen; }; @@ -92,7 +92,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( uts20_io, AS_IO, 8, univac_state) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("dart", z80sio_device, cd_ba_r, cd_ba_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("dart", z80dart_device, cd_ba_r, cd_ba_w) AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_RANGE(0x43, 0x43) AM_WRITE(port43_w) AM_RANGE(0x80, 0xbf) AM_RAM AM_SHARE("nvram") @@ -187,15 +187,15 @@ static MACHINE_CONFIG_START( uts20 ) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600) - MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("dart", z80sio_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80sio_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80sio_device, txcb_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80sio_device, rxcb_w)) + MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, txcb_w)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxcb_w)) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart", Z80SIO, XTAL_4MHz) - MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("dart", Z80DART, XTAL_4MHz) + MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MACHINE_CONFIG_END diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h index 1a9cdd95aa2..a3805f76cba 100644 --- a/src/mame/includes/mtx.h +++ b/src/mame/includes/mtx.h @@ -12,7 +12,7 @@ #include "imagedev/snapquik.h" #include "imagedev/cassette.h" #include "bus/centronics/ctronics.h" -#include "machine/z80sio.h" +#include "machine/z80dart.h" #include "machine/z80ctc.h" #include "sound/sn76496.h" #include "machine/ram.h" @@ -32,20 +32,20 @@ class mtx_state : public driver_device { public: mtx_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z80_TAG), - m_sn(*this, SN76489A_TAG), - m_z80ctc(*this, Z80CTC_TAG), - m_z80dart(*this, Z80DART_TAG), - m_cassette(*this, "cassette"), - m_centronics(*this, CENTRONICS_TAG), - m_ram(*this, RAM_TAG) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z80_TAG) + , m_sn(*this, SN76489A_TAG) + , m_z80ctc(*this, Z80CTC_TAG) + , m_z80dart(*this, Z80DART_TAG) + , m_cassette(*this, "cassette") + , m_centronics(*this, CENTRONICS_TAG) + , m_ram(*this, RAM_TAG) { } required_device m_maincpu; required_device m_sn; required_device m_z80ctc; - optional_device m_z80dart; + optional_device m_z80dart; required_device m_cassette; required_device m_centronics; required_device m_ram; -- cgit v1.2.3