From c23969d91fd3784694511beb373d24b1afac1a0f Mon Sep 17 00:00:00 2001 From: Robbbert Date: Tue, 31 Oct 2017 19:14:39 +1100 Subject: [PATCH] (nw) more drivers moved to z80sio.h --- src/mame/drivers/apricotf.cpp | 12 ++++++------ src/mame/drivers/apricotp.cpp | 10 +++++----- src/mame/drivers/attache.cpp | 8 ++++---- src/mame/drivers/dlair.cpp | 8 ++++---- src/mame/drivers/mtx.cpp | 8 ++++---- src/mame/drivers/osbexec.cpp | 36 +++++++++++++++++------------------ src/mame/drivers/proconn.cpp | 6 +++--- src/mame/includes/mtx.h | 4 ++-- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index 28aa129fed1..ce541dd27a8 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -35,7 +35,7 @@ #include "machine/input_merger.h" #include "machine/wd_fdc.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "screen.h" @@ -82,7 +82,7 @@ public: required_device m_maincpu; required_device m_ctc; - required_device m_sio; + required_device m_sio; required_device m_fdc; required_device m_floppy0; required_device m_floppy1; @@ -266,7 +266,7 @@ static ADDRESS_MAP_START( act_f1_io, AS_IO, 16, f1_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x000f) AM_WRITE8(system_w, 0xffff) AM_RANGE(0x0010, 0x0017) AM_DEVREADWRITE8(Z80CTC_TAG, z80ctc_device, read, write, 0x00ff) - AM_RANGE(0x0020, 0x0027) AM_DEVREADWRITE8(Z80SIO2_TAG, z80sio2_device, ba_cd_r, ba_cd_w, 0x00ff) + AM_RANGE(0x0020, 0x0027) AM_DEVREADWRITE8(Z80SIO2_TAG, z80sio_device, ba_cd_r, ba_cd_w, 0x00ff) // AM_RANGE(0x0030, 0x0031) AM_WRITE8(ctc_ack_w, 0x00ff) AM_RANGE(0x0040, 0x0047) AM_DEVREADWRITE8(WD2797_TAG, wd2797_device, read, write, 0x00ff) // AM_RANGE(0x01e0, 0x01ff) winchester @@ -353,8 +353,8 @@ static MACHINE_CONFIG_START( act_f1 ) /* Devices */ MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0) - MCFG_DEVICE_ADD(Z80SIO2_TAG, Z80SIO2, 2500000) - MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE("irqs", input_merger_device, in_w<0>)) + MCFG_DEVICE_ADD(Z80SIO2_TAG, Z80SIO, 2500000) + MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("irqs", input_merger_device, in_w<0>)) MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 2500000) MCFG_Z80CTC_INTR_CB(DEVWRITELINE("irqs", input_merger_device, in_w<1>)) @@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( act_f1 ) MCFG_Z80CTC_ZC2_CB(WRITELINE(f1_state, ctc_z2_w)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(Z80SIO2_TAG, z80dart_device, ctsa_w)) + MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(Z80SIO2_TAG, z80sio_device, ctsa_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index 324e77c5dda..e75c8a19a35 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -35,7 +35,7 @@ #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "sound/sn76496.h" #include "video/mc6845.h" #include "screen.h" @@ -111,7 +111,7 @@ public: required_device m_dmac; required_device m_pic; required_device m_pit; - required_device m_sio; + required_device m_sio; required_device m_fdc; required_device m_crtc; required_device m_ram; @@ -435,7 +435,7 @@ static ADDRESS_MAP_START( fp_io, AS_IO, 16, fp_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000, 0x007) AM_DEVREADWRITE8(WD2797_TAG, wd2797_device, read, write, 0x00ff) AM_RANGE(0x008, 0x00f) AM_DEVREADWRITE8(I8253A5_TAG, pit8253_device, read, write, 0x00ff) - AM_RANGE(0x018, 0x01f) AM_DEVREADWRITE8(Z80SIO0_TAG, z80sio0_device, ba_cd_r, ba_cd_w, 0x00ff) + AM_RANGE(0x018, 0x01f) AM_DEVREADWRITE8(Z80SIO0_TAG, z80sio_device, ba_cd_r, ba_cd_w, 0x00ff) AM_RANGE(0x020, 0x021) AM_DEVWRITE8("cent_data_out", output_latch_device, write, 0x00ff) AM_RANGE(0x022, 0x023) AM_WRITE8(pint_clr_w, 0x00ff) AM_RANGE(0x024, 0x025) AM_READ8(prtr_snd_r, 0x00ff) @@ -634,8 +634,8 @@ static MACHINE_CONFIG_START( fp ) MCFG_PIT8253_CLK1(2000000) MCFG_PIT8253_CLK2(2000000) - MCFG_DEVICE_ADD(Z80SIO0_TAG, Z80SIO0, 2500000) - MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w)) + MCFG_DEVICE_ADD(Z80SIO0_TAG, Z80SIO, 2500000) + MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w)) MCFG_WD2797_ADD(WD2797_TAG, 2000000) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir1_w)) diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 09128f14682..7d5d6dd7218 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -61,7 +61,7 @@ #include "machine/ram.h" #include "machine/upd765.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80pio.h" #include "sound/ay8910.h" #include "video/tms9927.h" @@ -172,7 +172,7 @@ private: required_device m_rtc; required_device m_psg; required_device m_fdc; - required_device m_sio; + required_device m_sio; required_device m_pio; required_device m_ctc; required_device m_crtc; @@ -758,7 +758,7 @@ static ADDRESS_MAP_START( attache_io , AS_IO, 8, attache_state) AM_RANGE(0xe0, 0xed) AM_DEVREADWRITE("dma",am9517a_device,read,write) AM_MIRROR(0xff00) AM_RANGE(0xee, 0xee) AM_WRITE(display_command_w) AM_MIRROR(0xff00) AM_RANGE(0xef, 0xef) AM_READWRITE(dma_mask_r, dma_mask_w) AM_MIRROR(0xff00) - AM_RANGE(0xe6, 0xe7) AM_DEVREADWRITE("sio",z80sio0_device,ba_cd_r, ba_cd_w) AM_MIRROR(0xff00) + AM_RANGE(0xe6, 0xe7) AM_DEVREADWRITE("sio",z80sio_device,ba_cd_r, ba_cd_w) AM_MIRROR(0xff00) AM_RANGE(0xf4, 0xf7) AM_DEVREADWRITE("ctc",z80ctc_device,read,write) AM_MIRROR(0xff00) AM_RANGE(0xf8, 0xfb) AM_DEVREADWRITE("pio",z80pio_device,read_alt,write_alt) AM_MIRROR(0xff00) AM_RANGE(0xfc, 0xfd) AM_DEVICE("fdc",upd765a_device,map) AM_MIRROR(0xff00) @@ -942,7 +942,7 @@ static MACHINE_CONFIG_START( attache ) MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w)) - MCFG_DEVICE_ADD("sio", Z80SIO0, XTAL_8MHz / 26) + MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 26) MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index 81f78b66a21..ad4efd600c3 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -42,7 +42,7 @@ #include "machine/ldstub.h" #include "machine/watchdog.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "sound/ay8910.h" #include "sound/spkrdev.h" #include "render.h" @@ -408,7 +408,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dleuro_io_map, AS_IO, 8, dlair_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x03) AM_MIRROR(0x7c) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) - AM_RANGE(0x80, 0x83) AM_MIRROR(0x7c) AM_DEVREADWRITE("sio", z80dart_device, ba_cd_r, ba_cd_w) + AM_RANGE(0x80, 0x83) AM_MIRROR(0x7c) AM_DEVREADWRITE("sio", z80sio_device, ba_cd_r, ba_cd_w) ADDRESS_MAP_END @@ -755,8 +755,8 @@ static MACHINE_CONFIG_START( dleuro ) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(dlair_state, write_speaker)) - MCFG_DEVICE_ADD("sio", Z80SIO0, MASTER_CLOCK_EURO/4 /* same as "maincpu" */) - MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD("sio", Z80SIO, MASTER_CLOCK_EURO/4 /* same as "maincpu" */) + MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // TODO: hook up tx and rx callbacks MCFG_WATCHDOG_ADD("watchdog") diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 9b2c1870a63..00bfbb4c8e1 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/z80dart.h" +#include "machine/z80sio.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, z80dart_device, cd_ba_r, cd_ba_w) + AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(Z80DART_TAG, z80sio_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, Z80DART, XTAL_4MHz) - MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) + MCFG_DEVICE_ADD(Z80DART_TAG, Z80SIO, XTAL_4MHz) + MCFG_Z80SIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index e3e775dd0e3..d48da4ba9a9 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -16,7 +16,7 @@ #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 "screen.h" @@ -51,7 +51,7 @@ public: required_device m_messram; required_device m_pia_0; required_device m_pia_1; - required_device m_sio; + required_device m_sio; required_device m_speaker; required_device m_floppy0; required_device m_floppy1; @@ -221,7 +221,7 @@ static ADDRESS_MAP_START( osbexec_io, AS_IO, 8, osbexec_state ) AM_RANGE( 0x00, 0x03 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE( "pia_0", pia6821_device, read, write) /* 6821 PIA @ UD12 */ AM_RANGE( 0x04, 0x07 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("ctc", pit8253_device, read, write) /* 8253 @UD1 */ AM_RANGE( 0x08, 0x0B ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("mb8877", wd_fdc_device_base, read, write ) /* MB8877 @ UB17 input clock = 1MHz */ - AM_RANGE( 0x0C, 0x0F ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("sio", z80sio2_device, ba_cd_r, ba_cd_w ) /* SIO @ UD4 */ + AM_RANGE( 0x0C, 0x0F ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("sio", z80sio_device, ba_cd_r, ba_cd_w ) /* SIO @ UD4 */ AM_RANGE( 0x10, 0x13 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE( "pia_1", pia6821_device, read, write) /* 6821 PIA @ UD8 */ AM_RANGE( 0x14, 0x17 ) AM_SELECT( 0xff00 ) AM_READ(osbexec_kbd_r ) /* KBD */ AM_RANGE( 0x18, 0x1b ) AM_MIRROR( 0xff00 ) AM_READ(osbexec_rtc_r ) /* "RTC" @ UE13/UF13 */ @@ -590,34 +590,34 @@ static MACHINE_CONFIG_START( osbexec ) MCFG_INPUT_MERGER_ANY_HIGH("mainirq") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", 0)) - MCFG_DEVICE_ADD("sio", Z80SIO2, MAIN_CLOCK/6) - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT - MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT - MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT - MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT - MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT - MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE("mainirq", input_merger_device, in_w<4>)) + MCFG_DEVICE_ADD("sio", Z80SIO, MAIN_CLOCK/6) + MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT + MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT + MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT + MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT + MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT + MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT + MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("mainirq", input_merger_device, in_w<4>)) MCFG_DEVICE_ADD("ctc", PIT8253, 0) MCFG_PIT8253_CLK0(MAIN_CLOCK / 13) // divided by 74S161 @ UC25 MCFG_PIT8253_CLK1(MAIN_CLOCK / 13) // divided by 74S161 @ UC25 MCFG_PIT8253_CLK2(MAIN_CLOCK / 12) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(osbexec_state, comm_clk_a_w)) - MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("sio", z80sio2_device, rxtxcb_w)) + MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) //MCFG_PIT8253_OUT2_HANDLER(WRITELINE(osbexec_state, spindle_clk_w)) MCFG_RS232_PORT_ADD(MODEM_PORT_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio2_device, rxa_w)) MCFG_DEVCB_INVERT - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio2_device, dcda_w)) MCFG_DEVCB_INVERT + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w)) MCFG_DEVCB_INVERT + MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcda_w)) MCFG_DEVCB_INVERT MCFG_RS232_DSR_HANDLER(WRITELINE(osbexec_state, modem_dsr_w)) MCFG_RS232_RI_HANDLER(WRITELINE(osbexec_state, modem_ri_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio2_device, ctsa_w)) MCFG_DEVCB_INVERT + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w)) MCFG_DEVCB_INVERT MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio2_device, rxb_w)) MCFG_DEVCB_INVERT - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio2_device, dcdb_w)) MCFG_DEVCB_INVERT - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio2_device, ctsb_w)) MCFG_DEVCB_INVERT + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w)) MCFG_DEVCB_INVERT + MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w)) MCFG_DEVCB_INVERT + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT MCFG_DEVICE_ADD("mb8877", MB8877, MAIN_CLOCK/24) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pia_1", pia6821_device, cb1_w)) diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index b8d37ebb0e3..dc5131cbed5 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -30,7 +30,7 @@ #include "machine/meters.h" #include "machine/roc10937.h" #include "machine/z80ctc.h" -#include "machine/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80pio.h" #include "sound/ay8910.h" #include "video/awpvid.h" @@ -190,7 +190,7 @@ protected: required_device m_z80pio_4; required_device m_z80pio_5; required_device m_z80ctc; - required_device m_z80sio; + required_device m_z80sio; required_device m_ay; required_device m_meters; @@ -373,7 +373,7 @@ static MACHINE_CONFIG_START( proconn ) MCFG_DEVICE_ADD("z80ctc", Z80CTC, 4000000) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("z80sio", Z80SIO0, 4000000) /* ?? Mhz */ + MCFG_DEVICE_ADD("z80sio", Z80SIO, 4000000) /* ?? Mhz */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h index f52d468e3cd..1a9cdd95aa2 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/z80dart.h" +#include "machine/z80sio.h" #include "machine/z80ctc.h" #include "sound/sn76496.h" #include "machine/ram.h" @@ -45,7 +45,7 @@ public: 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;