From 65c4569652eb3e0559669ba84085bf2a703c414f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 15 Jun 2018 13:17:32 +1000 Subject: acro removal, disambiguation, debugger side effects (nw) --- src/devices/bus/a2bus/a2pic.cpp | 2 +- src/devices/bus/a2bus/agat7ports.cpp | 2 +- src/devices/bus/adam/ide.cpp | 2 +- src/devices/bus/adamnet/spi.cpp | 2 +- src/devices/bus/c64/geocable.cpp | 2 +- src/devices/bus/c64/ieee488.cpp | 18 +++++----- src/devices/bus/cbmiec/c1541.cpp | 4 +-- src/devices/bus/centronics/ctronics.h | 13 ++++--- src/devices/bus/cgenie/parallel/printer.cpp | 2 +- src/devices/bus/comx35/printer.cpp | 2 +- src/devices/bus/dmv/k210.cpp | 2 +- src/devices/bus/ecbbus/grip.cpp | 2 +- src/devices/bus/econet/e01.cpp | 2 +- src/devices/bus/electron/m2105.cpp | 4 +-- src/devices/bus/electron/plus1.cpp | 8 ++--- src/devices/bus/electron/romboxp.cpp | 8 ++--- src/devices/bus/hp80_io/82937.cpp | 32 ++++++++--------- src/devices/bus/hp9845_io/98034.cpp | 24 ++++++------- src/devices/bus/ieee488/ieee488.h | 18 +++++----- src/devices/bus/isa/3c503.cpp | 20 ++++------- src/devices/bus/isa/3c503.h | 4 +-- src/devices/bus/pofo/hpc101.cpp | 2 +- src/devices/bus/ql/sandy_superdisk.cpp | 2 +- src/devices/bus/ql/sandy_superqboard.cpp | 2 +- src/devices/bus/svi3x8/slot/sv802.cpp | 2 +- src/devices/bus/vic20/vic1112.cpp | 16 ++++----- src/devices/bus/vtech/ioexp/printer.cpp | 2 +- src/devices/machine/input_merger.h | 8 ++--- src/devices/machine/pc_lpt.cpp | 2 +- src/devices/machine/x2212.cpp | 14 ++++---- src/devices/machine/x2212.h | 4 +-- src/mame/drivers/accomm.cpp | 2 +- src/mame/drivers/amiga.cpp | 2 +- src/mame/drivers/amstrad.cpp | 4 +-- src/mame/drivers/applix.cpp | 6 ++-- src/mame/drivers/apricot.cpp | 2 +- src/mame/drivers/apricotf.cpp | 2 +- src/mame/drivers/apricotp.cpp | 2 +- src/mame/drivers/atarist.cpp | 8 ++--- src/mame/drivers/atom.cpp | 8 ++--- src/mame/drivers/aussiebyte.cpp | 4 +-- src/mame/drivers/bbc.cpp | 4 +-- src/mame/drivers/bullet.cpp | 4 +-- src/mame/drivers/bw12.cpp | 2 +- src/mame/drivers/bw2.cpp | 2 +- src/mame/drivers/cat.cpp | 2 +- src/mame/drivers/cbm2.cpp | 54 ++++++++++++++--------------- src/mame/drivers/clcd.cpp | 8 ++--- src/mame/drivers/compis.cpp | 2 +- src/mame/drivers/crvision.cpp | 4 +-- src/mame/drivers/einstein.cpp | 2 +- src/mame/drivers/elwro800.cpp | 6 ++-- src/mame/drivers/ep64.cpp | 2 +- src/mame/drivers/excali64.cpp | 2 +- src/mame/drivers/fc100.cpp | 2 +- src/mame/drivers/fm7.cpp | 10 +++--- src/mame/drivers/force68k.cpp | 28 ++++++++------- src/mame/drivers/fp1100.cpp | 2 +- src/mame/drivers/gridcomp.cpp | 18 +++++----- src/mame/drivers/hp64k.cpp | 18 +++++----- src/mame/drivers/hp9k_3xx.cpp | 54 ++++++++++++++--------------- src/mame/drivers/hp_ipc.cpp | 18 +++++----- src/mame/drivers/imds2.cpp | 16 ++++----- src/mame/drivers/isbc.cpp | 2 +- src/mame/drivers/jtc.cpp | 15 ++++---- src/mame/drivers/jupace.cpp | 42 +++++++++++----------- src/mame/drivers/kaypro.cpp | 4 +-- src/mame/drivers/kdt6.cpp | 2 +- src/mame/drivers/kyocera.cpp | 8 ++--- src/mame/drivers/m5.cpp | 2 +- src/mame/drivers/mbee.cpp | 4 +-- src/mame/drivers/mc1000.cpp | 2 +- src/mame/drivers/mc1502.cpp | 2 +- src/mame/drivers/msx.cpp | 6 ++-- src/mame/drivers/mtx.cpp | 2 +- src/mame/drivers/myb3k.cpp | 2 +- src/mame/drivers/mz700.cpp | 2 +- src/mame/drivers/nc.cpp | 2 +- src/mame/drivers/octopus.cpp | 6 ++-- src/mame/drivers/oric.cpp | 2 +- src/mame/drivers/osborne1.cpp | 6 ++-- src/mame/drivers/pc1512.cpp | 4 +-- src/mame/drivers/pc8001.cpp | 4 +-- src/mame/drivers/pencil2.cpp | 2 +- src/mame/drivers/pet.cpp | 20 +++++------ src/mame/drivers/phc25.cpp | 2 +- src/mame/drivers/prof180x.cpp | 2 +- src/mame/drivers/proteus.cpp | 2 +- src/mame/drivers/px4.cpp | 2 +- src/mame/drivers/rc759.cpp | 2 +- src/mame/drivers/rmnimbus.cpp | 8 ++--- src/mame/drivers/sage2.cpp | 2 +- src/mame/drivers/samcoupe.cpp | 4 +-- src/mame/drivers/sg1000.cpp | 2 +- src/mame/drivers/softbox.cpp | 16 ++++----- src/mame/drivers/sorcerer.cpp | 2 +- src/mame/drivers/spc1000.cpp | 2 +- src/mame/drivers/spc1500.cpp | 2 +- src/mame/drivers/super80.cpp | 4 +-- src/mame/drivers/tandy2k.cpp | 2 +- src/mame/drivers/tek405x.cpp | 18 +++++----- src/mame/drivers/thomson.cpp | 10 +++--- src/mame/drivers/tiki100.cpp | 2 +- src/mame/drivers/tmc600.cpp | 2 +- src/mame/drivers/trs80.cpp | 2 +- src/mame/drivers/trs80m2.cpp | 4 +-- src/mame/drivers/tutor.cpp | 2 +- src/mame/drivers/tvc.cpp | 2 +- src/mame/drivers/v1050.cpp | 2 +- src/mame/drivers/victor9k.cpp | 21 ++++++----- src/mame/drivers/vixen.cpp | 20 +++++------ src/mame/drivers/wangpc.cpp | 2 +- src/mame/drivers/xor100.cpp | 4 +-- src/mame/drivers/zorba.cpp | 18 +++++----- src/mame/includes/gladiatr.h | 1 - src/mame/includes/vixen.h | 48 ++++++++++++------------- src/mame/includes/xor100.h | 30 ++++++++-------- src/mame/machine/osborne1.cpp | 10 +++--- src/mame/machine/thomson.cpp | 2 +- src/mame/video/gladiatr.cpp | 5 --- 120 files changed, 461 insertions(+), 466 deletions(-) diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index 799a056ccff..5c86651178e 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -72,7 +72,7 @@ ioport_constructor a2bus_pic_device::device_input_ports() const //------------------------------------------------- MACHINE_CONFIG_START(a2bus_pic_device::device_add_mconfig) - MCFG_CENTRONICS_ADD(PIC_CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_ctx, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("ctx_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, a2bus_pic_device, ack_w)) diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp index 0eddac11c7a..b74b941f600 100644 --- a/src/devices/bus/a2bus/agat7ports.cpp +++ b/src/devices/bus/a2bus/agat7ports.cpp @@ -57,7 +57,7 @@ MACHINE_CONFIG_START(a2bus_agat7_ports_device::device_add_mconfig) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, a2bus_agat7_ports_device, write_portb)) MCFG_I8255_IN_PORTC_CB(READ8(*this, a2bus_agat7_ports_device, read_portc)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, a2bus_agat7_ports_device, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index eb081677cbb..d5f403f3d10 100644 --- a/src/devices/bus/adam/ide.cpp +++ b/src/devices/bus/adam/ide.cpp @@ -64,7 +64,7 @@ const tiny_rom_entry *powermate_ide_device::device_rom_region() const MACHINE_CONFIG_START(powermate_ide_device::device_add_mconfig) MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index 62be608f09f..3d681653a70 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -85,7 +85,7 @@ MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig) MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp index ab4d5db39dc..e740ec0da69 100644 --- a/src/devices/bus/c64/geocable.cpp +++ b/src/devices/bus/c64/geocable.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(C64_GEOCABLE, c64_geocable_device, "c64_geocable", "C64 geoCa //------------------------------------------------- MACHINE_CONFIG_START(c64_geocable_device::device_add_mconfig) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, c64_geocable_device, output_b)) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp index 51769f142b3..ef33798bdfc 100644 --- a/src/devices/bus/c64/ieee488.cpp +++ b/src/devices/bus/c64/ieee488.cpp @@ -76,12 +76,12 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pa_w ) */ - m_bus->ren_w(BIT(data, 2)); - m_bus->atn_w(BIT(data, 3)); - m_bus->dav_w(BIT(data, 4)); - m_bus->eoi_w(BIT(data, 5)); - m_bus->ndac_w(BIT(data, 6)); - m_bus->nrfd_w(BIT(data, 7)); + m_bus->host_ren_w(BIT(data, 2)); + m_bus->host_atn_w(BIT(data, 3)); + m_bus->host_dav_w(BIT(data, 4)); + m_bus->host_eoi_w(BIT(data, 5)); + m_bus->host_ndac_w(BIT(data, 6)); + m_bus->host_nrfd_w(BIT(data, 7)); } READ8_MEMBER( c64_ieee488_device::tpi_pc_r ) @@ -128,8 +128,8 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pc_w ) */ - m_bus->ifc_w(BIT(data, 0)); - m_bus->srq_w(BIT(data, 1)); + m_bus->host_ifc_w(BIT(data, 0)); + m_bus->host_srq_w(BIT(data, 1)); m_exrom = !BIT(data, 3); @@ -146,7 +146,7 @@ MACHINE_CONFIG_START(c64_ieee488_device::device_add_mconfig) MCFG_TPI6525_IN_PA_CB(READ8(*this, c64_ieee488_device, tpi_pa_r)) MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, c64_ieee488_device, tpi_pa_w)) MCFG_TPI6525_IN_PB_CB(READ8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_TPI6525_OUT_PB_CB(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_TPI6525_OUT_PB_CB(WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) MCFG_TPI6525_IN_PC_CB(READ8(*this, c64_ieee488_device, tpi_pc_r)) MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, c64_ieee488_device, tpi_pc_w)) diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 5c7d1de2771..13c866eac92 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -877,9 +877,9 @@ MACHINE_CONFIG_START(c1541_prologic_dos_classic_device::device_add_mconfig) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, c1541_prologic_dos_classic_device, pia_pb_w)) MCFG_PIA_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(MC6821_TAG, pia6821_device, ca1_w)) - MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") + MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h index 4117c8d0a31..3c73690199d 100644 --- a/src/devices/bus/centronics/ctronics.h +++ b/src/devices/bus/centronics/ctronics.h @@ -14,10 +14,6 @@ #include "machine/output_latch.h" -#define MCFG_CENTRONICS_ADD(_tag, _slot_intf, _def_slot) \ - MCFG_DEVICE_ADD(_tag, CENTRONICS, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) - #define MCFG_CENTRONICS_STROBE_HANDLER(_devcb) \ devcb = &downcast(*device).set_strobe_handler(DEVCB_##_devcb); @@ -100,6 +96,15 @@ class centronics_device : public device_t, friend class device_centronics_peripheral_interface; public: + template + centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt) + : centronics_device(mconfig, tag, owner, 0) + { + option_reset(); + opts(*this); + set_default_option(dflt); + set_fixed(false); + } centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); template devcb_base &set_strobe_handler(Object &&cb) { return m_strobe_handler.set_callback(std::forward(cb)); } diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp index b31e09da419..bce52a61c97 100644 --- a/src/devices/bus/cgenie/parallel/printer.cpp +++ b/src/devices/bus/cgenie/parallel/printer.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(CGENIE_PRINTER, cgenie_printer_device, "cgenie_printer", "Pri //------------------------------------------------- MACHINE_CONFIG_START(cgenie_printer_device::device_add_mconfig) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, cgenie_printer_device, busy_w)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, cgenie_printer_device, perror_w)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, cgenie_printer_device, select_w)) diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp index 36d11482186..24a50e7ed53 100644 --- a/src/devices/bus/comx35/printer.cpp +++ b/src/devices/bus/comx35/printer.cpp @@ -56,7 +56,7 @@ const tiny_rom_entry *comx_prn_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(comx_prn_device::device_add_mconfig) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit0)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit2)) diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 6d47b8f5921..34288eb2519 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -82,7 +82,7 @@ MACHINE_CONFIG_START(dmv_k210_device::device_add_mconfig) MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, dmv_k210_device, portb_w)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, dmv_k210_device, portc_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, dmv_k210_device, cent_ack_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, dmv_k210_device, cent_busy_w)) diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 1b6e09c1ec6..1000a8a51bf 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -451,7 +451,7 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig) MCFG_Z80STI_OUT_TCO_CB(WRITELINE(Z80STI_TAG, z80sti_device, tc_w)) MCFG_Z80STI_OUT_TDO_CB(WRITELINE(Z80STI_TAG, z80sti_device, tc_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, ecb_grip21_device, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, ecb_grip21_device, write_centronics_fault)) diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 3ed758d843e..c50325bdc1b 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -267,7 +267,7 @@ MACHINE_CONFIG_START(econet_e01_device::device_add_mconfig) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", e01_floppies, "35dd", floppy_formats_afs) MCFG_SOFTWARE_LIST_ADD("flop_ls_e01", "e01_flop") - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_ca1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp index b4ed7bd0a53..77c4b196c90 100644 --- a/src/devices/bus/electron/m2105.cpp +++ b/src/devices/bus/electron/m2105.cpp @@ -74,7 +74,7 @@ MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig) //MCFG_VIA6522_READPB_HANDLER(READ8(*this, electron_m2105_device, m2105_via_user_read_portb)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, electron_m2105_device, m2105_via_user_write_portb)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<1>)) /* duart */ @@ -87,7 +87,7 @@ MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig) MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w)) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/devices/bus/electron/plus1.cpp b/src/devices/bus/electron/plus1.cpp index 344f53a3b64..2dafbd1479b 100644 --- a/src/devices/bus/electron/plus1.cpp +++ b/src/devices/bus/electron/plus1.cpp @@ -92,7 +92,7 @@ ioport_constructor electron_plus1_device::device_input_ports() const MACHINE_CONFIG_START(electron_plus1_device::device_add_mconfig) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, electron_plus1_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -130,9 +130,9 @@ const tiny_rom_entry *electron_plus1_device::device_rom_region() const // electron_plus1_device - constructor //------------------------------------------------- -electron_plus1_device::electron_plus1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, ELECTRON_PLUS1, tag, owner, clock), - device_electron_expansion_interface(mconfig, *this), +electron_plus1_device::electron_plus1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, ELECTRON_PLUS1, tag, owner, clock), + device_electron_expansion_interface(mconfig, *this), m_exp_rom(*this, "exp_rom"), m_cart_sk1(*this, "cart_sk1"), m_cart_sk2(*this, "cart_sk2"), diff --git a/src/devices/bus/electron/romboxp.cpp b/src/devices/bus/electron/romboxp.cpp index 0cc50406fee..d3ca80d43f4 100644 --- a/src/devices/bus/electron/romboxp.cpp +++ b/src/devices/bus/electron/romboxp.cpp @@ -86,7 +86,7 @@ ioport_constructor electron_romboxp_device::device_input_ports() const MACHINE_CONFIG_START(electron_romboxp_device::device_add_mconfig) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, electron_romboxp_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -126,9 +126,9 @@ const tiny_rom_entry *electron_romboxp_device::device_rom_region() const // electron_romboxp_device - constructor //------------------------------------------------- -electron_romboxp_device::electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, ELECTRON_ROMBOXP, tag, owner, clock), - device_electron_expansion_interface(mconfig, *this), +electron_romboxp_device::electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, ELECTRON_ROMBOXP, tag, owner, clock), + device_electron_expansion_interface(mconfig, *this), m_exp_rom(*this, "exp_rom"), m_rom(*this, "rom%u", 1), m_cart(*this, "cart%u", 1), diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp index 3e80cd61646..e5aff4fac43 100644 --- a/src/devices/bus/hp80_io/82937.cpp +++ b/src/devices/bus/hp80_io/82937.cpp @@ -267,40 +267,40 @@ void hp82937_io_card_device::update_signals() uint8_t p1 = m_cpu->p1_r(machine().dummy_space() , 0); m_iatn = BIT(p1 , P1_ATN_BIT); if (ctrl_active) { - m_ieee488->atn_w(m_iatn); - m_ieee488->srq_w(1); + m_ieee488->host_atn_w(m_iatn); + m_ieee488->host_srq_w(1); } else { - m_ieee488->atn_w(1); + m_ieee488->host_atn_w(1); m_iatn = m_iatn && m_ieee488->atn_r(); - m_ieee488->srq_w(BIT(p1 , P1_SRQ_BIT)); + m_ieee488->host_srq_w(BIT(p1 , P1_SRQ_BIT)); } m_talker_out = (ctrl_active && !m_iatn) || (BIT(m_latch , LATCH_TA_BIT) && m_iatn); if (m_talker_out) { - m_ieee488->nrfd_w(1); - m_ieee488->dav_w(BIT(p1 , P1_DAV_BIT)); - m_ieee488->eoi_w(BIT(p1 , P1_EOI_BIT)); - m_ieee488->ndac_w(1); + m_ieee488->host_nrfd_w(1); + m_ieee488->host_dav_w(BIT(p1 , P1_DAV_BIT)); + m_ieee488->host_eoi_w(BIT(p1 , P1_EOI_BIT)); + m_ieee488->host_ndac_w(1); } else { - m_ieee488->nrfd_w(BIT(p1 , P1_NRFD_BIT)); - m_ieee488->dav_w(1); - m_ieee488->eoi_w(1); + m_ieee488->host_nrfd_w(BIT(p1 , P1_NRFD_BIT)); + m_ieee488->host_dav_w(1); + m_ieee488->host_eoi_w(1); bool ndac = BIT(p1 , P1_NDAC_BIT); if (BIT(m_latch , LATCH_EN_NDAC_BIT) && !m_iatn) { ndac = false; } - m_ieee488->ndac_w(ndac); + m_ieee488->host_ndac_w(ndac); } bool iren = BIT(p1 , P1_REN_BIT); if (BIT(m_sw1->read() , 5)) { // System controller - m_ieee488->ren_w(iren); - m_ieee488->ifc_w(BIT(p1 , P1_IFC_BIT)); + m_ieee488->host_ren_w(iren); + m_ieee488->host_ifc_w(BIT(p1 , P1_IFC_BIT)); } else { // Not system controller - m_ieee488->ren_w(1); + m_ieee488->host_ren_w(1); iren = iren && m_ieee488->ren_r(); - m_ieee488->ifc_w(1); + m_ieee488->host_ifc_w(1); } bool not_u8_1 = m_iatn || m_ieee488->eoi_r(); m_dio_out = not_u8_1 && m_talker_out; diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index 0f615d7c967..77c8933aa15 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -309,20 +309,20 @@ void hp98034_io_card_device::update_data_out() void hp98034_io_card_device::update_ctrl_out() { if (m_clr_hpib) { - m_ieee488->dav_w(1); - m_ieee488->nrfd_w(1); - m_ieee488->eoi_w(1); - m_ieee488->ndac_w(0); + m_ieee488->host_dav_w(1); + m_ieee488->host_nrfd_w(1); + m_ieee488->host_eoi_w(1); + m_ieee488->host_ndac_w(0); } else { - m_ieee488->dav_w(BIT(m_dc , 2)); - m_ieee488->nrfd_w(BIT(m_dc , 1)); - m_ieee488->eoi_w(!BIT(m_ctrl_out , 4)); - m_ieee488->ndac_w(BIT(m_dc , 6)); + m_ieee488->host_dav_w(BIT(m_dc , 2)); + m_ieee488->host_nrfd_w(BIT(m_dc , 1)); + m_ieee488->host_eoi_w(!BIT(m_ctrl_out , 4)); + m_ieee488->host_ndac_w(BIT(m_dc , 6)); } - m_ieee488->srq_w(!BIT(m_ctrl_out , 0)); - m_ieee488->ren_w(!BIT(m_ctrl_out , 1)); - m_ieee488->atn_w(!BIT(m_ctrl_out , 2)); - m_ieee488->ifc_w(!BIT(m_ctrl_out , 3)); + m_ieee488->host_srq_w(!BIT(m_ctrl_out , 0)); + m_ieee488->host_ren_w(!BIT(m_ctrl_out , 1)); + m_ieee488->host_atn_w(!BIT(m_ctrl_out , 2)); + m_ieee488->host_ifc_w(!BIT(m_ctrl_out , 3)); } void hp98034_io_card_device::update_clr_hpib() diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index 138dd1df484..2920eaa2320 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -123,15 +123,15 @@ public: // writes for host (driver_device) void write_dio(uint8_t data) { set_data(this, data); } - DECLARE_WRITE8_MEMBER( dio_w ) { set_data(this, data); } - DECLARE_WRITE_LINE_MEMBER( eoi_w ) { set_signal(this, EOI, state); } - DECLARE_WRITE_LINE_MEMBER( dav_w ) { set_signal(this, DAV, state); } - DECLARE_WRITE_LINE_MEMBER( nrfd_w ) { set_signal(this, NRFD, state); } - DECLARE_WRITE_LINE_MEMBER( ndac_w ) { set_signal(this, NDAC, state); } - DECLARE_WRITE_LINE_MEMBER( ifc_w ) { set_signal(this, IFC, state); } - DECLARE_WRITE_LINE_MEMBER( srq_w ) { set_signal(this, SRQ, state); } - DECLARE_WRITE_LINE_MEMBER( atn_w ) { set_signal(this, ATN, state); } - DECLARE_WRITE_LINE_MEMBER( ren_w ) { set_signal(this, REN, state); } + DECLARE_WRITE8_MEMBER( host_dio_w ) { set_data(this, data); } + DECLARE_WRITE_LINE_MEMBER( host_eoi_w ) { set_signal(this, EOI, state); } + DECLARE_WRITE_LINE_MEMBER( host_dav_w ) { set_signal(this, DAV, state); } + DECLARE_WRITE_LINE_MEMBER( host_nrfd_w ) { set_signal(this, NRFD, state); } + DECLARE_WRITE_LINE_MEMBER( host_ndac_w ) { set_signal(this, NDAC, state); } + DECLARE_WRITE_LINE_MEMBER( host_ifc_w ) { set_signal(this, IFC, state); } + DECLARE_WRITE_LINE_MEMBER( host_srq_w ) { set_signal(this, SRQ, state); } + DECLARE_WRITE_LINE_MEMBER( host_atn_w ) { set_signal(this, ATN, state); } + DECLARE_WRITE_LINE_MEMBER( host_ren_w ) { set_signal(this, REN, state); } // writes for peripherals (device_t) void dio_w(device_t *device, uint8_t data) { set_data(device, data); } diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index 50922872343..424ce8bb082 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -8,8 +8,8 @@ MACHINE_CONFIG_START(el2_3c503_device::device_add_mconfig) MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(*this, el2_3c503_device, el2_3c503_irq_w)) - MCFG_DP8390D_MEM_READ_CB(READ8(*this, el2_3c503_device, el2_3c503_mem_read)) - MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, el2_3c503_device, el2_3c503_mem_write)) + MCFG_DP8390D_MEM_READ_CB(READ8(*this, el2_3c503_device, el2_3c503_mem_r)) + MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, el2_3c503_device, el2_3c503_mem_w)) MACHINE_CONFIG_END DEFINE_DEVICE_TYPE(EL2_3C503, el2_3c503_device, "el2_3c503", "3C503 Network Adapter") @@ -168,10 +168,10 @@ READ8_MEMBER(el2_3c503_device::el2_3c503_hiport_r) { return (m_regs.vptr & 0x0f) << 4; case 14: if(!(m_regs.ctrl & 0x80)) return 0xff; - return el2_3c503_mem_read(space, m_regs.da++, mem_mask); + return el2_3c503_mem_r(space, machine().side_effects_disabled() ? m_regs.da : m_regs.da++, mem_mask); case 15: if(!(m_regs.ctrl & 0x80)) return 0xff; - return el2_3c503_mem_read(space, m_regs.da++, mem_mask); + return el2_3c503_mem_r(space, machine().side_effects_disabled() ? m_regs.da : m_regs.da++, mem_mask); } return 0; } @@ -267,11 +267,11 @@ WRITE8_MEMBER(el2_3c503_device::el2_3c503_hiport_w) { return; case 14: if(!(m_regs.ctrl & 0x80)) return; - el2_3c503_mem_write(space, m_regs.da++, data, mem_mask); + el2_3c503_mem_w(space, m_regs.da++, data, mem_mask); return; case 15: if(!(m_regs.ctrl & 0x80)) return; - el2_3c503_mem_write(space, m_regs.da++, data, mem_mask); + el2_3c503_mem_w(space, m_regs.da++, data, mem_mask); return; default: logerror("3c503: invalid high register write %02x\n", offset); @@ -283,14 +283,6 @@ WRITE_LINE_MEMBER(el2_3c503_device::el2_3c503_irq_w) { if(!(m_regs.gacfr & 0x80)) set_irq(state); } -READ8_MEMBER(el2_3c503_device::el2_3c503_mem_read) { - return el2_3c503_mem_read(offset); -} - -WRITE8_MEMBER(el2_3c503_device::el2_3c503_mem_write) { - el2_3c503_mem_write(offset, data); -} - uint8_t el2_3c503_device::el2_3c503_mem_read(offs_t offset) { if((offset < 8*1024) || (offset >= 16*1024)) return 0xff; return m_board_ram[offset - (8*1024)]; diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h index 73661ab2071..d987dc79cb2 100644 --- a/src/devices/bus/isa/3c503.h +++ b/src/devices/bus/isa/3c503.h @@ -30,8 +30,8 @@ protected: private: void el2_3c503_irq_w(int state); - DECLARE_READ8_MEMBER(el2_3c503_mem_read); - DECLARE_WRITE8_MEMBER(el2_3c503_mem_write); + DECLARE_READ8_MEMBER(el2_3c503_mem_r) { return el2_3c503_mem_read(offset); } + DECLARE_WRITE8_MEMBER(el2_3c503_mem_w) { el2_3c503_mem_write(offset, data); } required_device m_dp8390; uint8_t m_board_ram[8*1024]; diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp index 0d7e58b50e3..b7d31727615 100644 --- a/src/devices/bus/pofo/hpc101.cpp +++ b/src/devices/bus/pofo/hpc101.cpp @@ -39,7 +39,7 @@ MACHINE_CONFIG_START(pofo_hpc101_device::device_add_mconfig) MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_ctrl_out", output_latch_device, bus_w)) MCFG_I8255_IN_PORTC_CB(READ8("cent_status_in", input_buffer_device, bus_r)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit3)) diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index dfbeec4d695..a2bfa83a13d 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -87,7 +87,7 @@ MACHINE_CONFIG_START(sandy_super_disk_device::device_add_mconfig) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_super_disk_floppies, "35dd", sandy_super_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, nullptr, sandy_super_disk_device::floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sandy_super_disk_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD(TTL74273_TAG, CENTRONICS_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 3dc9eb3c6f7..9942d50cb52 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -108,7 +108,7 @@ MACHINE_CONFIG_START(sandy_superqboard_device::device_add_mconfig) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sandy_superqboard_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD(TTL74273_TAG, CENTRONICS_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp index b89935ee9b5..2cc905d472c 100644 --- a/src/devices/bus/svi3x8/slot/sv802.cpp +++ b/src/devices/bus/svi3x8/slot/sv802.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV802, sv802_device, "sv802", "SV-802 Centronics Printer Inte //------------------------------------------------- MACHINE_CONFIG_START(sv802_device::device_add_mconfig) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sv802_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index 5266e430ab3..b709b6f281b 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -79,9 +79,9 @@ WRITE8_MEMBER( vic1112_device::via0_pb_w ) */ - m_bus->dav_w(BIT(data, 0)); - m_bus->nrfd_w(BIT(data, 1)); - m_bus->ndac_w(BIT(data, 2)); + m_bus->host_dav_w(BIT(data, 0)); + m_bus->host_nrfd_w(BIT(data, 1)); + m_bus->host_ndac_w(BIT(data, 2)); } @@ -105,9 +105,9 @@ MACHINE_CONFIG_START(vic1112_device::device_add_mconfig) MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, DERIVED_CLOCK(1, 1)) MCFG_VIA6522_READPB_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, vic1112_device, via1_irq_w)) MCFG_CBM_IEEE488_ADD(nullptr) @@ -153,8 +153,8 @@ void vic1112_device::device_start() void vic1112_device::device_reset() { - m_bus->ifc_w(0); - m_bus->ifc_w(1); + m_bus->host_ifc_w(0); + m_bus->host_ifc_w(1); } diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index bc900e7555a..66967668703 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(VTECH_PRINTER_INTERFACE, vtech_printer_interface_device, "vte //------------------------------------------------- MACHINE_CONFIG_START(vtech_printer_interface_device::device_add_mconfig) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, vtech_printer_interface_device, busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("latch", "centronics") MACHINE_CONFIG_END diff --git a/src/devices/machine/input_merger.h b/src/devices/machine/input_merger.h index 3f2e1c884e7..6cf9701b6df 100644 --- a/src/devices/machine/input_merger.h +++ b/src/devices/machine/input_merger.h @@ -80,28 +80,28 @@ protected: class input_merger_any_high_device : public input_merger_device { public: - input_merger_any_high_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + input_merger_any_high_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; class input_merger_all_high_device : public input_merger_device { public: - input_merger_all_high_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + input_merger_all_high_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; class input_merger_any_low_device : public input_merger_device { public: - input_merger_any_low_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + input_merger_any_low_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; class input_merger_all_low_device : public input_merger_device { public: - input_merger_all_low_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + input_merger_all_low_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp index 01b9f08ddc7..5fb71bf30ca 100644 --- a/src/devices/machine/pc_lpt.cpp +++ b/src/devices/machine/pc_lpt.cpp @@ -47,7 +47,7 @@ void pc_lpt_device::device_reset() } MACHINE_CONFIG_START(pc_lpt_device::device_add_mconfig) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit3)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4)) diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index f02b34f4cca..155208352bc 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -135,7 +135,7 @@ void x2212_device::nvram_write(emu_file &file) { // auto-save causes an implicit store prior to exiting (writing) if (m_auto_save) - store(); + do_store(); uint8_t *buffer = (uint8_t *) alloca(m_size_data); for (int byte = 0; byte < m_size_data; byte++) @@ -150,11 +150,11 @@ void x2212_device::nvram_write(emu_file &file) //************************************************************************** //------------------------------------------------- -// store - store data from live RAM into the +// do_store - store data from live RAM into the // EEPROM //------------------------------------------------- -void x2212_device::store() +void x2212_device::do_store() { for (int byte = 0; byte < m_size_data; byte++) m_e2prom->write_byte(byte, m_sram->read_byte(byte)); @@ -162,11 +162,11 @@ void x2212_device::store() //------------------------------------------------- -// recall - fetch data from the EEPROM into live +// do_recall - fetch data from the EEPROM into live // RAM //------------------------------------------------- -void x2212_device::recall() +void x2212_device::do_recall() { for (int byte = 0; byte < m_size_data; byte++) m_sram->write_byte(byte, m_e2prom->read_byte(byte)); @@ -206,7 +206,7 @@ READ8_MEMBER( x2212_device::read ) WRITE_LINE_MEMBER( x2212_device::store ) { if (state != 0 && !m_store) - store(); + do_store(); m_store = (state != 0); } @@ -219,7 +219,7 @@ WRITE_LINE_MEMBER( x2212_device::store ) WRITE_LINE_MEMBER( x2212_device::recall ) { if (state != 0 && !m_array_recall) - recall(); + do_recall(); m_array_recall = (state != 0); } diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h index b443f03c870..988d87a1a60 100644 --- a/src/devices/machine/x2212.h +++ b/src/devices/machine/x2212.h @@ -93,8 +93,8 @@ private: optional_region_ptr m_default_data; // internal helpers - void store(); - void recall(); + void do_store(); + void do_recall(); void x2212_e2prom_map(address_map &map); void x2212_sram_map(address_map &map); diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index 172680311ba..60a678dc84a 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -893,7 +893,7 @@ MACHINE_CONFIG_START(accomm_state::accomm) MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, nullptr) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 8e55a2e4d1e..c4f178a0f52 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -1430,7 +1430,7 @@ MACHINE_CONFIG_START(amiga_state::amiga_base) MCFG_RS232_CTS_HANDLER(WRITELINE(*this, amiga_state, rs232_cts_w)) // centronics - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, amiga_state, centronics_ack_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, amiga_state, centronics_busy_w)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, amiga_state, centronics_perror_w)) diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 9ecc0f47cac..84bf75be645 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -954,7 +954,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* printer */ - MCFG_CENTRONICS_ADD("centronics", amstrad_centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, amstrad_centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, amstrad_state, write_centronics_busy)) /* snapshot */ @@ -1081,7 +1081,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, amstrad_state, write_centronics_busy)) /* snapshot */ diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index 0f7ed44a649..130e7a7d406 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -60,8 +60,8 @@ class applix_state : public driver_device { public: - applix_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + applix_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_base(*this, "base"), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), @@ -897,7 +897,7 @@ MACHINE_CONFIG_START(applix_state::applix) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, applix_state, applix_pb_w)) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("via6522", via6522_device, write_pa0)) diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 503251aefa9..e2eb8edecb4 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -448,7 +448,7 @@ MACHINE_CONFIG_START(apricot_state::apricot) MCFG_APRICOT_KEYBOARD_IN_HANDLER(WRITELINE("ic15", z80sio_device, rxb_w)) // centronics printer - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("ic15", z80sio_device, ctsb_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("ic15", z80sio_device, dcdb_w)) diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index 579c2f51a26..b6cb02c1d4b 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -374,7 +374,7 @@ MACHINE_CONFIG_START(f1_state::act_f1) MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, f1_state, ctc_z1_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, f1_state, ctc_z2_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(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 1e5cb1b6ebd..1b80bfcdf7d 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(fp_state::fp) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", fp_floppies, "d32w", fp_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", fp_floppies, nullptr, fp_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fp_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, fp_state, write_centronics_select)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fp_state, write_centronics_fault)) diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index 4e19e36dfbf..b0131e09b30 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -2061,7 +2061,7 @@ MACHINE_CONFIG_START(st_state::st) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2152,7 +2152,7 @@ MACHINE_CONFIG_START(megast_state::megast) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2251,7 +2251,7 @@ MACHINE_CONFIG_START(ste_state::ste) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2365,7 +2365,7 @@ static MACHINE_CONFIG_START(stbook_state::stbook) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index 756cbf0d0f9..efd3e53feda 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -729,7 +729,7 @@ MACHINE_CONFIG_START(atom_state::atom) MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(INS8255_TAG, I8255, 0) @@ -746,7 +746,7 @@ MACHINE_CONFIG_START(atom_state::atom) MCFG_FLOPPY_DRIVE_ADD(I8271_TAG ":1", atom_floppies, "525sssd", atom_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_ca1)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_pa7)) @@ -839,7 +839,7 @@ MACHINE_CONFIG_START(atom_state::atombb) MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(INS8255_TAG, I8255, 0) @@ -848,7 +848,7 @@ MACHINE_CONFIG_START(atom_state::atombb) MCFG_I8255_IN_PORTC_CB(READ8(*this, atom_state, ppi_pc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, atom_state, ppi_pc_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_ca1)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_pa7)) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index eed5fdfdf3e..b6ba84a6b58 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -520,7 +520,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* devices */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, aussiebyte_state, write_centronics_busy)) MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0) @@ -554,7 +554,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, bus_r)) - MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT + MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_DEVCB_INVERT MCFG_DEVICE_ADD("pio2", Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 77c6c3f6c0d..a4e0c6d9b03 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -953,7 +953,7 @@ MACHINE_CONFIG_START(bbc_state::bbcb) MCFG_UPD7002_EOC_CB(bbc_state, BBC_uPD7002_EOC) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -1352,7 +1352,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm) MCFG_DEVICE_ADD("rtc", MC146818, 32.768_kHz_XTAL) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */ MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index ff4be802d9b..81ddf0897f2 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -1158,7 +1158,7 @@ MACHINE_CONFIG_START(bullet_state::bullet) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":6", bullet_8_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bullet_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, bullet_state, write_centronics_perror)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, bullet_state, write_centronics_select)) @@ -1242,7 +1242,7 @@ MACHINE_CONFIG_START(bulletf_state::bulletf) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":8", bullet_35_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":9", bullet_35_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bullet_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp index 486cf080dbf..f70f93174d3 100644 --- a/src/mame/drivers/bw12.cpp +++ b/src/mame/drivers/bw12.cpp @@ -631,7 +631,7 @@ MACHINE_CONFIG_START(bw12_state::common) MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsb_w)) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(PIA6821_TAG, pia6821_device, ca1_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bw12_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, bw12_state, write_centronics_fault)) diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index d4f71f9dca2..8e1d67918ed 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -610,7 +610,7 @@ MACHINE_CONFIG_START(bw2_state::bw2) MCFG_DEVICE_ADDRESS_MAP(0, lcdc_map) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bw2_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index 02e065508eb..b61f7bda4de 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -1080,7 +1080,7 @@ MACHINE_CONFIG_START(cat_state::cat) MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, cat_state, cat_duart_txb)) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, cat_state, cat_duart_output)) - MCFG_CENTRONICS_ADD("ctx", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_ctx, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, cat_state, prn_ack_ff)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("duartn68681", mc68681_device, ip4_w)) MCFG_DEVCB_XOR(1) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("ctx_data_out", "ctx") diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 73791f41bfa..408b9189ce9 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -2373,7 +2373,7 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w)) - MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) MCFG_DEVICE_ADD(DS75161A_TAG, DS75161A, 0) MCFG_DS75161A_IN_REN_CB(READLINE(IEEE488_TAG, ieee488_device, ren_r)) MCFG_DS75161A_IN_IFC_CB(READLINE(IEEE488_TAG, ieee488_device, ifc_r)) @@ -2383,14 +2383,14 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc) MCFG_DS75161A_IN_EOI_CB(READLINE(IEEE488_TAG, ieee488_device, eoi_r)) MCFG_DS75161A_IN_ATN_CB(READLINE(IEEE488_TAG, ieee488_device, atn_r)) MCFG_DS75161A_IN_SRQ_CB(READLINE(IEEE488_TAG, ieee488_device, srq_r)) - MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) - MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) + MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) + MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, WRITELINE(MOS6526_TAG, mos6526_device, flag_w)) @@ -2486,7 +2486,7 @@ MACHINE_CONFIG_START(p500_state::p500_pal) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w)) - MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) MCFG_DEVICE_ADD(DS75161A_TAG, DS75161A, 0) MCFG_DS75161A_IN_REN_CB(READLINE(IEEE488_TAG, ieee488_device, ren_r)) MCFG_DS75161A_IN_IFC_CB(READLINE(IEEE488_TAG, ieee488_device, ifc_r)) @@ -2496,14 +2496,14 @@ MACHINE_CONFIG_START(p500_state::p500_pal) MCFG_DS75161A_IN_EOI_CB(READLINE(IEEE488_TAG, ieee488_device, eoi_r)) MCFG_DS75161A_IN_ATN_CB(READLINE(IEEE488_TAG, ieee488_device, atn_r)) MCFG_DS75161A_IN_SRQ_CB(READLINE(IEEE488_TAG, ieee488_device, srq_r)) - MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) - MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) + MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) + MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, WRITELINE(MOS6526_TAG, mos6526_device, flag_w)) @@ -2599,7 +2599,7 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w)) - MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) MCFG_DEVICE_ADD(DS75161A_TAG, DS75161A, 0) MCFG_DS75161A_IN_REN_CB(READLINE(IEEE488_TAG, ieee488_device, ren_r)) MCFG_DS75161A_IN_IFC_CB(READLINE(IEEE488_TAG, ieee488_device, ifc_r)) @@ -2609,14 +2609,14 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc) MCFG_DS75161A_IN_EOI_CB(READLINE(IEEE488_TAG, ieee488_device, eoi_r)) MCFG_DS75161A_IN_ATN_CB(READLINE(IEEE488_TAG, ieee488_device, atn_r)) MCFG_DS75161A_IN_SRQ_CB(READLINE(IEEE488_TAG, ieee488_device, srq_r)) - MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) - MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) + MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) + MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, WRITELINE(MOS6526_TAG, mos6526_device, flag_w)) diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp index 1b2aa9f2a4f..2f2db635bc4 100644 --- a/src/mame/drivers/clcd.cpp +++ b/src/mame/drivers/clcd.cpp @@ -31,8 +31,8 @@ class clcd_state : public driver_device { public: - clcd_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + clcd_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia(*this, "acia"), m_via0(*this, "via0"), @@ -755,7 +755,7 @@ MACHINE_CONFIG_START(clcd_state::clcd) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, clcd_state, via1_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, clcd_state, via1_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, clcd_state, write_irq_via1)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_XOR(1) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_DEVCB_XOR(1) MCFG_VIA6522_CB2_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w)) MCFG_DEVICE_ADD("acia", MOS6551, 2000000) @@ -771,7 +771,7 @@ MACHINE_CONFIG_START(clcd_state::clcd) MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr)) MCFG_RS232_CTS_HANDLER(WRITELINE("via1", via6522_device, write_pb4)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, nullptr) + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, nullptr) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("via1", via6522_device, write_pb6)) MCFG_DEVCB_XOR(1) MCFG_DEVICE_ADD("bank1", ADDRESS_MAP_BANK, 0) diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp index 8d1b853bc2f..48eae46ec85 100644 --- a/src/mame/drivers/compis.cpp +++ b/src/mame/drivers/compis.cpp @@ -815,7 +815,7 @@ MACHINE_CONFIG_START(compis_state::compis) MCFG_RS232_DCD_HANDLER(WRITELINE(I8274_TAG, z80dart_device, dcdb_w)) MCFG_RS232_CTS_HANDLER(WRITELINE(I8274_TAG, z80dart_device, ctsb_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, compis_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, compis_state, write_centronics_select)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index e00bfbaa870..9fa5059cd66 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -752,7 +752,7 @@ MACHINE_CONFIG_START(crvision_state::creativision) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0) @@ -832,7 +832,7 @@ MACHINE_CONFIG_START(laser2001_state::lasr2001) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(CENTRONICS_TAG, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, laser2001_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index 6a189bbe3e3..683dba89b66 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -635,7 +635,7 @@ MACHINE_CONFIG_START(einstein_state::einstein) MCFG_ADC0844_CH4_CB(IOPORT("analogue_2_y")) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(IC_I063, z80pio_device, strobe_a)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, einstein_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, einstein_state, write_centronics_perror)) diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index c22c597b302..46046860ea4 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -37,8 +37,8 @@ class elwro800_state : public spectrum_state { public: - elwro800_state(const machine_config &mconfig, device_type type, const char *tag) - : spectrum_state(mconfig, type, tag), + elwro800_state(const machine_config &mconfig, device_type type, const char *tag) : + spectrum_state(mconfig, type, tag), m_i8251(*this, "i8251"), m_i8255(*this, "ppi8255"), m_centronics(*this, "centronics"), @@ -603,7 +603,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, elwro800_state, i8255_port_c_w)) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, elwro800_state, write_centronics_ack)) diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp index a3008a8036a..e0af1e6c5f3 100644 --- a/src/mame/drivers/ep64.cpp +++ b/src/mame/drivers/ep64.cpp @@ -589,7 +589,7 @@ MACHINE_CONFIG_START(ep64_state::ep64) MCFG_EP64_EXPANSION_BUS_SLOT_NMI_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_NMI)) MCFG_EP64_EXPANSION_BUS_SLOT_WAIT_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, ep64_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index 8d656e6ab62..ce5f1a7acd0 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -623,7 +623,7 @@ MACHINE_CONFIG_START(excali64_state::excali64) MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, excali64_state, motor_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, excali64_state, cent_busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index 1ac1ed6bd42..ef225404654 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -556,7 +556,7 @@ MACHINE_CONFIG_START(fc100_state::fc100) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "fc100_cart") - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index 39ee24f2d33..cdcc39e5187 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -2109,7 +2109,7 @@ MACHINE_CONFIG_START(fm7_state::fm7) MCFG_SOFTWARE_LIST_ADD("flop_list","fm7_disk") - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_SLOT_OPTION_ADD( "dsjoy", DEMPA_SHINBUNSHA_JOYSTICK ) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) @@ -2156,7 +2156,7 @@ MACHINE_CONFIG_START(fm7_state::fm8) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) @@ -2230,7 +2230,7 @@ MACHINE_CONFIG_START(fm7_state::fm77av) MCFG_SOFTWARE_LIST_ADD("av_flop_list", "fm77av") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_list", "fm7_disk") - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) @@ -2297,7 +2297,7 @@ MACHINE_CONFIG_START(fm7_state::fm11) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) @@ -2343,7 +2343,7 @@ MACHINE_CONFIG_START(fm7_state::fm16beta) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 80f2da7131b..d1708dbe89c 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -441,22 +441,26 @@ READ16_MEMBER (force68k_state::bootvect_r){ */ /* Dummy VME access methods until the VME bus device is ready for use */ -READ16_MEMBER (force68k_state::vme_a24_r){ - LOG("%s\n", FUNCNAME); - return (uint16_t) 0; +READ16_MEMBER (force68k_state::vme_a24_r) +{ + LOG("%s\n", FUNCNAME); + return (uint16_t) 0; } -WRITE16_MEMBER (force68k_state::vme_a24_w){ - LOG("%s\n", FUNCNAME); +WRITE16_MEMBER (force68k_state::vme_a24_w) +{ + LOG("%s\n", FUNCNAME); } -READ16_MEMBER (force68k_state::vme_a16_r){ - LOG("%s\n", FUNCNAME); - return (uint16_t) 0; +READ16_MEMBER (force68k_state::vme_a16_r) +{ + LOG("%s\n", FUNCNAME); + return (uint16_t) 0; } -WRITE16_MEMBER (force68k_state::vme_a16_w){ - LOG("%s\n", FUNCNAME); +WRITE16_MEMBER (force68k_state::vme_a16_w) +{ + LOG("%s\n", FUNCNAME); } /* @@ -588,10 +592,10 @@ MACHINE_CONFIG_START(force68k_state::fccpu1) /* PIT Parallel Interface and Timer device, assuming strapped for on board clock */ MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(16'000'000) / 2) MCFG_PIT68230_PA_OUTPUT_CB (WRITE8 ("cent_data_out", output_latch_device, bus_w)) - MCFG_PIT68230_H2_CB (WRITELINE ("centronics", centronics_device, write_strobe)) + MCFG_PIT68230_H2_CB (WRITELINE (m_centronics, centronics_device, write_strobe)) // Centronics - MCFG_CENTRONICS_ADD ("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD (m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER (WRITELINE (*this, force68k_state, centronics_ack_w)) MCFG_CENTRONICS_BUSY_HANDLER (WRITELINE (*this, force68k_state, centronics_busy_w)) MCFG_CENTRONICS_PERROR_HANDLER (WRITELINE (*this, force68k_state, centronics_perror_w)) diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index b41b2695e6d..99f71e6294e 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(fp1100_state::fp1100) MCFG_MC6845_UPDATE_ROW_CB(fp1100_state, crtc_update_row) /* Printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fp1100_state, centronics_busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index 32ba81d72de..5314bd2a4a2 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -400,15 +400,15 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101) MCFG_DEVICE_ADD("hpib", TMS9914, XTAL(4'000'000)) MCFG_TMS9914_INT_WRITE_CB(WRITELINE(I80130_TAG, i80130_device, ir5_w)) - MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) - MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) + MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) + MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) MCFG_IEEE488_BUS_ADD() MCFG_IEEE488_EOI_CALLBACK(WRITELINE("hpib", tms9914_device, eoi_w)) MCFG_IEEE488_DAV_CALLBACK(WRITELINE("hpib", tms9914_device, dav_w)) diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 27e259b92a6..7ba62429e12 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -1461,15 +1461,15 @@ MACHINE_CONFIG_START(hp64k_state::hp64k) MCFG_PHI_INT_WRITE_CB(WRITELINE(*this, hp64k_state , hp64k_phi_int_w)) MCFG_PHI_DMARQ_WRITE_CB(WRITELINE("cpu" , hp_5061_3011_cpu_device , halt_w)) MCFG_PHI_SYS_CNTRL_READ_CB(READLINE(*this, hp64k_state , hp64k_phi_sys_ctrl_r)) - MCFG_PHI_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , dio_w)) - MCFG_PHI_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , eoi_w)) - MCFG_PHI_DAV_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , dav_w)) - MCFG_PHI_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , nrfd_w)) - MCFG_PHI_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ndac_w)) - MCFG_PHI_IFC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ifc_w)) - MCFG_PHI_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , srq_w)) - MCFG_PHI_ATN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , atn_w)) - MCFG_PHI_REN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ren_w)) + MCFG_PHI_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , host_dio_w)) + MCFG_PHI_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_eoi_w)) + MCFG_PHI_DAV_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_dav_w)) + MCFG_PHI_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_nrfd_w)) + MCFG_PHI_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_ndac_w)) + MCFG_PHI_IFC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_ifc_w)) + MCFG_PHI_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_srq_w)) + MCFG_PHI_ATN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_atn_w)) + MCFG_PHI_REN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_ren_w)) MCFG_IEEE488_BUS_ADD() MCFG_IEEE488_EOI_CALLBACK(WRITELINE("phi" , phi_device , eoi_w)) MCFG_IEEE488_DAV_CALLBACK(WRITELINE("phi" , phi_device , dav_w)) diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index a794646c393..498441d2e28 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -469,15 +469,15 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k310) MCFG_DEVICE_ADD(m_tms9914, TMS9914, XTAL(5000000)) MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp9k3xx_state, gpib_irq)); - MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) - MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) + MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) + MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) MCFG_IEEE488_SLOT_ADD("ieee0", 0, hp_ieee488_devices, "hp9895") MCFG_IEEE488_SLOT_ADD("ieee_rem", 0, remote488_devices, nullptr) @@ -524,15 +524,15 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k320) MCFG_DEVICE_ADD(m_tms9914, TMS9914, XTAL(5000000)) MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp9k3xx_state, gpib_irq)); - MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) - MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) + MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) + MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) MCFG_IEEE488_SLOT_ADD("ieee0", 0, hp_ieee488_devices, "hp9895") MCFG_IEEE488_SLOT_ADD("ieee_rem", 0, remote488_devices, nullptr) @@ -585,15 +585,15 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k332) MCFG_DEVICE_ADD(m_tms9914, TMS9914, XTAL(5000000)) MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp9k3xx_state, gpib_irq)); - MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) - MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w)) - MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w)) - MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w)) - MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w)) - MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w)) + MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_eoi_w)) + MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) + MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_nrfd_w)) + MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ifc_w)) + MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_srq_w)) + MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_atn_w)) + MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, host_ren_w)) MCFG_IEEE488_SLOT_ADD("ieee0", 0, hp_ieee488_devices, "hp9895") MCFG_IEEE488_SLOT_ADD("ieee_rem", 0, remote488_devices, nullptr) diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index d477d4196c7..b2ed5189eb2 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -764,15 +764,15 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc_base) MCFG_DEVICE_ADD("hpib", TMS9914, 4_MHz_XTAL) MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp_ipc_state, irq_3)) - MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , dio_w)) - MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , eoi_w)) - MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , dav_w)) - MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , nrfd_w)) - MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ndac_w)) - MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ifc_w)) - MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , srq_w)) - MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , atn_w)) - MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ren_w)) + MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , host_dio_w)) + MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_eoi_w)) + MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_dav_w)) + MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_nrfd_w)) + MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_ndac_w)) + MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_ifc_w)) + MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_srq_w)) + MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_atn_w)) + MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , host_ren_w)) MCFG_IEEE488_BUS_ADD() MCFG_IEEE488_EOI_CALLBACK(WRITELINE("hpib" , tms9914_device , eoi_w)) MCFG_IEEE488_DAV_CALLBACK(WRITELINE("hpib" , tms9914_device , dav_w)) diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index da9a28b51ce..40076ec6ffe 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -159,16 +159,16 @@ void imds2_state::ioc_io_map(address_map &map) map(0xf0, 0xf8).rw(m_iocdma, FUNC(i8257_device::read), FUNC(i8257_device::write)); } -imds2_state::imds2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig , type , tag), +imds2_state::imds2_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig , type , tag), m_ipccpu(*this , "ipccpu"), m_ipcsyspic(*this , "ipcsyspic"), m_ipclocpic(*this , "ipclocpic"), - m_ipctimer(*this , "ipctimer"), - m_ipcusart0(*this , "ipcusart0"), - m_ipcusart1(*this , "ipcusart1"), - m_serial0(*this , "serial0"), - m_serial1(*this , "serial1"), + m_ipctimer(*this , "ipctimer"), + m_ipcusart0(*this , "ipcusart0"), + m_ipcusart1(*this , "ipcusart1"), + m_serial0(*this , "serial0"), + m_serial1(*this , "serial1"), m_ioccpu(*this , "ioccpu"), m_iocdma(*this , "iocdma"), m_ioccrtc(*this , "ioccrtc"), @@ -880,7 +880,7 @@ MACHINE_CONFIG_START(imds2_state::imds2) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, imds2_state, imds2_kb_port_t1_r)) MCFG_QUANTUM_TIME(attotime::from_hz(100)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_ack_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_busy_w)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_select_w)) diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index 48f8807154d..0a0e98f4c53 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(isbc_state::isbc286) MCFG_I8255_IN_PORTB_CB(READ8("cent_status_in", input_buffer_device, bus_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, isbc_state, ppi_c_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, isbc_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6)) diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index 18abfd29436..fb681ec4882 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -29,12 +29,13 @@ class jtc_state : public driver_device { public: jtc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, UB8830D_TAG), - m_cassette(*this, "cassette"), - m_speaker(*this, "speaker"), - m_centronics(*this, CENTRONICS_TAG), - m_video_ram(*this, "video_ram"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, UB8830D_TAG) + , m_cassette(*this, "cassette") + , m_speaker(*this, "speaker") + , m_centronics(*this, CENTRONICS_TAG) + , m_video_ram(*this, "video_ram") + { } required_device m_maincpu; required_device m_cassette; @@ -745,7 +746,7 @@ MACHINE_CONFIG_START(jtc_state::basic) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) /* printer */ - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, jtc_state, write_centronics_busy)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 37a5c3c3438..b1491881555 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -76,26 +76,26 @@ class ace_state : public driver_device { public: ace_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z80_TAG), - m_ppi(*this, I8255_TAG), - m_z80pio(*this, Z80PIO_TAG), - m_speaker(*this, "speaker"), - m_cassette(*this, "cassette"), - m_centronics(*this, CENTRONICS_TAG), - m_ram(*this, RAM_TAG), - m_sp0256(*this, SP0256AL2_TAG), - m_video_ram(*this, "video_ram"), - m_char_ram(*this, "char_ram"), - m_a8(*this, "A8"), - m_a9(*this, "A9"), - m_a10(*this, "A10"), - m_a11(*this, "A11"), - m_a12(*this, "A12"), - m_a13(*this, "A13"), - m_a14(*this, "A14"), - m_a15(*this, "A15"), - m_joy(*this, "JOY") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z80_TAG) + , m_ppi(*this, I8255_TAG) + , m_z80pio(*this, Z80PIO_TAG) + , m_speaker(*this, "speaker") + , m_cassette(*this, "cassette") + , m_centronics(*this, CENTRONICS_TAG) + , m_ram(*this, RAM_TAG) + , m_sp0256(*this, SP0256AL2_TAG) + , m_video_ram(*this, "video_ram") + , m_char_ram(*this, "char_ram") + , m_a8(*this, "A8") + , m_a9(*this, "A9") + , m_a10(*this, "A10") + , m_a11(*this, "A11") + , m_a12(*this, "A12") + , m_a13(*this, "A13") + , m_a14(*this, "A14") + , m_a15(*this, "A15") + , m_joy(*this, "JOY") { } virtual void machine_start() override; @@ -801,7 +801,7 @@ MACHINE_CONFIG_START(ace_state::ace) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, ace_state, pio_pa_w)) MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) // internal ram diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 900ed0cf116..9bf3fb191ce 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -230,7 +230,7 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_KAYPRO10KBD_RXD_CB(WRITELINE("sio", z80sio_device, rxb_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, syncb_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kaypro_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -329,7 +329,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_CLOCK_ADD("kbdtxrxc", 4800) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio_1", z80sio_device, rxtxcb_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kaypro_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index 64669c7992d..da9c4a8574b 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -695,7 +695,7 @@ MACHINE_CONFIG_START(kdt6_state::psi98) MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, bus_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("pio", z80pio_device, pa2_w)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("pio", z80pio_device, pa3_w)) diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp index c4f5c9a153c..ba39847a1b8 100644 --- a/src/mame/drivers/kyocera.cpp +++ b/src/mame/drivers/kyocera.cpp @@ -1376,7 +1376,7 @@ MACHINE_CONFIG_START(kc85_state::kc85) MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kc85_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, kc85_state, write_centronics_select)) @@ -1426,7 +1426,7 @@ MACHINE_CONFIG_START(pc8201_state::pc8201) MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kc85_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, kc85_state, write_centronics_select)) @@ -1487,7 +1487,7 @@ MACHINE_CONFIG_START(trsm100_state::trsm100) MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) @@ -1552,7 +1552,7 @@ MACHINE_CONFIG_START(tandy200_state::tandy200) MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr)) // MCFG_MC14412_ADD(MC14412_TAG, XTAL(1'000'000)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tandy200_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, tandy200_state, write_centronics_select)) diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 92ad055d7c1..0225ba345c6 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -1427,7 +1427,7 @@ MACHINE_CONFIG_START(m5_state::m5) // CK0 = EXINT, CK1 = GND, CK2 = TCK, CK3 = VDP INT // ZC2 = EXCLK - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, m5_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index ecda260b4e2..9156369fe11 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -691,7 +691,7 @@ MACHINE_CONFIG_START(mbee_state::mbee) MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 3) MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 3) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("z80pio", z80pio_device, strobe_a)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -748,7 +748,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeic) MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 2) MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 2) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("z80pio", z80pio_device, strobe_a)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp index 637b77a9554..5ca29a1a040 100644 --- a/src/mame/drivers/mc1000.cpp +++ b/src/mame/drivers/mc1000.cpp @@ -579,7 +579,7 @@ MACHINE_CONFIG_START(mc1000_state::mc1000) MCFG_SOFTWARE_LIST_ADD("cass_list", "mc1000_cass") - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, mc1000_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp index e3fa9e984fd..f03953889cf 100644 --- a/src/mame/drivers/mc1502.cpp +++ b/src/mame/drivers/mc1502.cpp @@ -293,7 +293,7 @@ MACHINE_CONFIG_START(mc1502_state::mc1502) WAVE(config, "wave", "cassette"); // FIXME: really no output routes for the cassette sound? SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.80); - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4)) diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index cf6427f2232..7231adf1e9e 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1374,7 +1374,7 @@ MACHINE_CONFIG_START(msx_state::msx) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -1526,7 +1526,7 @@ MACHINE_CONFIG_START(msx_state::msx2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -1583,7 +1583,7 @@ MACHINE_CONFIG_START(msx_state::msx2p) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index b999d55f6d5..0f8a1e35db8 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -314,7 +314,7 @@ MACHINE_CONFIG_START(mtx_state::mtx512) MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_timer", mtx_state, ctc_tick, attotime::from_hz(XTAL(4'000'000)/13)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, mtx_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, mtx_state, write_centronics_fault)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, mtx_state, write_centronics_perror)) diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index 7b2aecba634..cd02ffa2586 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -1004,7 +1004,7 @@ MACHINE_CONFIG_START(myb3k_state::myb3k) MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "isa", stepone_isa_cards, nullptr, false) /* Centronics */ - MCFG_CENTRONICS_ADD ("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD (m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER (WRITELINE (*this, myb3k_state, centronics_ack_w)) MCFG_CENTRONICS_BUSY_HANDLER (WRITELINE (*this, myb3k_state, centronics_busy_w)) MCFG_CENTRONICS_PERROR_HANDLER (WRITELINE (*this, myb3k_state, centronics_perror_w)) diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 0ddfe7e42eb..e61c24c01c2 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -471,7 +471,7 @@ MACHINE_CONFIG_START(mz_state::mz800) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mz_state, mz800_z80pio_port_a_w)) MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp index 226e425510a..e08d06574a8 100644 --- a/src/mame/drivers/nc.cpp +++ b/src/mame/drivers/nc.cpp @@ -1405,7 +1405,7 @@ MACHINE_CONFIG_START(nc_state::nc_base) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, nc_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 7db03bb6a56..369e941c99f 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -140,8 +140,8 @@ It's a very rare computer. It has 2 processors, Z80 and 8088, so it can run both class octopus_state : public driver_device { public: - octopus_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , + octopus_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), m_crtc(*this, "crtc"), @@ -991,7 +991,7 @@ MACHINE_CONFIG_START(octopus_state::octopus) MCFG_RS232_CTS_HANDLER(WRITELINE("serial",z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT //MCFG_RS232_RI_HANDLER(WRITELINE("serial",z80sio_device, rib_w)) MCFG_DEVCB_INVERT - MCFG_CENTRONICS_ADD("parallel", octopus_centronics_devices, "printer") + MCFG_DEVICE_ADD(m_parallel, CENTRONICS, octopus_centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, octopus_state, parallel_busy_w)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, octopus_state, parallel_slctout_w)) // TODO: Winchester HD controller (Xebec/SASI compatible? uses TTL logic) diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index 180d680769a..8d4cdf22379 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -800,7 +800,7 @@ MACHINE_CONFIG_START(oric_state::oric) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 30f7e7941a2..b3e93a3bed9 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -304,10 +304,10 @@ MACHINE_CONFIG_START(osborne1_state::osborne1) MCFG_DEVICE_ADD(m_pia0, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(m_ieee, ieee488_device, dio_r)) MCFG_PIA_READPB_HANDLER(READ8(*this, osborne1_state, ieee_pia_pb_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, dio_w)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, host_dio_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, osborne1_state, ieee_pia_pb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, ifc_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, ren_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, host_ifc_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, host_ren_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, osborne1_state, ieee_pia_irq_a_func)) MCFG_IEEE488_BUS_ADD() diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp index 10b033cee1d..962122f51fc 100644 --- a/src/mame/drivers/pc1512.cpp +++ b/src/mame/drivers/pc1512.cpp @@ -1223,7 +1223,7 @@ MACHINE_CONFIG_START(pc1512_state::pc1512) MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir4_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_perror)) @@ -1357,7 +1357,7 @@ MACHINE_CONFIG_START(pc1640_state::pc1640) MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir4_w)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_perror)) diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp index 8a4ffa0a570..f04f20f2ea8 100644 --- a/src/mame/drivers/pc8001.cpp +++ b/src/mame/drivers/pc8001.cpp @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(pc8001_state::pc8001) MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w)) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc8001_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pc8001_state, write_centronics_busy)) @@ -566,7 +566,7 @@ MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2) MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w)) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index bb94833eb96..a06027b08b0 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -334,7 +334,7 @@ MACHINE_CONFIG_START(pencil2_state::pencil2) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "pencil2_cart") /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pencil2_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pencil2_state, write_centronics_busy)) diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index ecc8f078b64..03c712d4499 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1230,8 +1230,8 @@ WRITE8_MEMBER( pet_state::via_pb_w ) */ // IEEE-488 - m_ieee->nrfd_w(BIT(data, 1)); - m_ieee->atn_w(BIT(data, 2)); + m_ieee->host_nrfd_w(BIT(data, 1)); + m_ieee->host_atn_w(BIT(data, 2)); // cassette m_cassette->write(BIT(data, 3)); @@ -1371,7 +1371,7 @@ READ8_MEMBER( pet2001b_state::pia1_pb_r ) WRITE_LINE_MEMBER( pet_state::pia1_ca2_w ) { - m_ieee->eoi_w(state); + m_ieee->host_eoi_w(state); m_blanktv = state; } @@ -1659,7 +1659,7 @@ MACHINE_RESET_MEMBER( pet_state, pet ) m_exp->reset(); - m_ieee->ren_w(0); + m_ieee->host_ren_w(0); } @@ -1819,9 +1819,9 @@ MACHINE_CONFIG_START(pet_state::pet) MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia2_irqa_w)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia2_irqb_w)) @@ -2283,9 +2283,9 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, host_dio_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, host_ndac_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, host_dav_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia2_irqa_w)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia2_irqb_w)) diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp index d80319ba5e4..6ff178b12c8 100644 --- a/src/mame/drivers/phc25.cpp +++ b/src/mame/drivers/phc25.cpp @@ -328,7 +328,7 @@ MACHINE_CONFIG_START(phc25_state::phc25) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("phc25_cass") - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, phc25_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp index 4888d2ca6ba..1800f077f6f 100644 --- a/src/mame/drivers/prof180x.cpp +++ b/src/mame/drivers/prof180x.cpp @@ -259,7 +259,7 @@ MACHINE_CONFIG_START(prof180x_state::prof180x) MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":3", prof180x_floppies, "35dd", floppy_image_device::default_floppy_formats) //MCFG_RTC8583_ADD(MK3835_TAG, rtc_intf) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) diff --git a/src/mame/drivers/proteus.cpp b/src/mame/drivers/proteus.cpp index 75c3c5eafff..c70ef1bd794 100644 --- a/src/mame/drivers/proteus.cpp +++ b/src/mame/drivers/proteus.cpp @@ -365,7 +365,7 @@ MACHINE_CONFIG_START(proteus_state::proteus) MCFG_PIA_IRQA_HANDLER(WRITELINE("irqs", input_merger_device, in_w<2>)) MCFG_PIA_IRQB_HANDLER(WRITELINE("irqs", input_merger_device, in_w<3>)) - MCFG_CENTRONICS_ADD("parallel", centronics_devices, "printer") + MCFG_DEVICE_ADD("parallel", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("pia", pia6821_device, ca1_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "parallel") diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index 17d5865fe6a..68766ec39b4 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -1515,7 +1515,7 @@ MACHINE_CONFIG_START(px4_state::px4) MCFG_NVRAM_ADD_NO_FILL("nvram") // centronics printer - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, px4_state, centronics_busy_w)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, px4_state, centronics_perror_w)) diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index f10dbe5e5ea..d3dfa8bb62c 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -581,7 +581,7 @@ MACHINE_CONFIG_START(rc759_state::rc759) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // internal centronics - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, rc759_state, centronics_busy_w)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, rc759_state, centronics_ack_w)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, rc759_state, centronics_fault_w)) diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp index a4f6c55aa1e..e745ae96a5c 100644 --- a/src/mame/drivers/rmnimbus.cpp +++ b/src/mame/drivers/rmnimbus.cpp @@ -107,7 +107,7 @@ void rmnimbus_state::nimbus_iocpu_io(address_map &map) MACHINE_CONFIG_START(rmnimbus_state::nimbus) /* basic machine hardware */ - MCFG_DEVICE_ADD(MAINCPU_TAG, I80186, 16000000) // the cpu is a 10Mhz part but the serial clocks are wrong unless it runs at 8Mhz + MCFG_DEVICE_ADD(m_maincpu, I80186, 16000000) // the cpu is a 10Mhz part but the serial clocks are wrong unless it runs at 8Mhz MCFG_DEVICE_PROGRAM_MAP(nimbus_mem) MCFG_DEVICE_IO_MAP(nimbus_io) MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, rmnimbus_state, cascade_callback)) @@ -185,10 +185,10 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus) MCFG_DEVICE_ADD(VIA_TAG, VIA6522, 1000000) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, bus_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, rmnimbus_state,nimbus_via_write_portb)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(MAINCPU_TAG, i80186_cpu_device, int3_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_centronics, centronics_device, write_strobe)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(m_maincpu, i80186_cpu_device, int3_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(VIA_TAG, via6522_device, write_ca1)) MCFG_DEVCB_INVERT MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp index 37940ef10cc..db2a072cc76 100644 --- a/src/mame/drivers/sage2.cpp +++ b/src/mame/drivers/sage2.cpp @@ -472,7 +472,7 @@ MACHINE_CONFIG_START(sage2_state::sage2) MCFG_UPD765A_ADD(UPD765_TAG, false, false) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, sage2_state, fdc_irq)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, sage2_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sage2_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, sage2_state, write_centronics_perror)) diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index 72536821f09..d85bf257214 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -523,12 +523,12 @@ MACHINE_CONFIG_START(samcoupe_state::samcoupe) MCFG_PALETTE_INIT_OWNER(samcoupe_state, samcoupe) /* devices */ - MCFG_CENTRONICS_ADD("lpt1", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_lpt1, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, samcoupe_state, write_lpt1_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt1_data_out", "lpt1") - MCFG_CENTRONICS_ADD("lpt2", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_lpt2, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, samcoupe_state, write_lpt2_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt2_data_out", "lpt2") diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index ac7e0ec9efc..60e14cfc1bf 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -656,7 +656,7 @@ MACHINE_CONFIG_START(sf7000_state::sf7000) MCFG_UPD765A_ADD(UPD765_TAG, false, false) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "3ssdd", sf7000_state::floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp index 4e41e30b84a..06f7a9a4def 100644 --- a/src/mame/drivers/softbox.cpp +++ b/src/mame/drivers/softbox.cpp @@ -242,14 +242,14 @@ WRITE8_MEMBER( softbox_state::ppi1_pb_w ) */ - m_ieee->atn_w(!BIT(data, 0)); - m_ieee->dav_w(!BIT(data, 1)); - m_ieee->ndac_w(!BIT(data, 2)); - m_ieee->nrfd_w(!BIT(data, 3)); - m_ieee->eoi_w(!BIT(data, 4)); - m_ieee->srq_w(!BIT(data, 5)); - m_ieee->ren_w(!BIT(data, 6)); - m_ieee->ifc_w(!BIT(data, 7)); + m_ieee->host_atn_w(!BIT(data, 0)); + m_ieee->host_dav_w(!BIT(data, 1)); + m_ieee->host_ndac_w(!BIT(data, 2)); + m_ieee->host_nrfd_w(!BIT(data, 3)); + m_ieee->host_eoi_w(!BIT(data, 4)); + m_ieee->host_srq_w(!BIT(data, 5)); + m_ieee->host_ren_w(!BIT(data, 6)); + m_ieee->host_ifc_w(!BIT(data, 7)); } READ8_MEMBER( softbox_state::ppi1_pc_r ) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 68605af3fa5..ba9b36cc6a2 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -449,7 +449,7 @@ MACHINE_CONFIG_START(sorcerer_state::sorcerer) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "covox") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "covox") /* The use of the parallel port as a general purpose port is not emulated. Currently the only use is to read the printer status in the Centronics CENDRV bios routine. */ diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp index 6c3f2c5c77c..bdc2c5e5ba1 100644 --- a/src/mame/drivers/spc1000.cpp +++ b/src/mame/drivers/spc1000.cpp @@ -491,7 +491,7 @@ MACHINE_CONFIG_START(spc1000_state::spc1000) MCFG_DEVICE_ADD("ext1", SPC1000_EXP_SLOT, 0) MCFG_DEVICE_SLOT_INTERFACE(spc1000_exp, nullptr, false) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, spc1000_state, centronics_busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0) diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index b9e09e81959..ec970416f1a 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -914,7 +914,7 @@ MACHINE_CONFIG_START(spc1500_state::spc1500) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, spc1500_state, centronics_busy_w)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0) diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index 485bcf55238..5b321852d37 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -741,7 +741,7 @@ MACHINE_CONFIG_START(super80_state::super80) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -833,7 +833,7 @@ MACHINE_CONFIG_START(super80_state::super80v) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* printer */ - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index 2599a959097..5fa0e1c0ca0 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -859,7 +859,7 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k) MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", tandy2k_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", tandy2k_state::floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_perror)) diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp index a047d58a773..6e206c4a699 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -627,13 +627,13 @@ WRITE8_MEMBER( tek4051_state::kb_pia_pb_w ) m_lamps[2] = BIT(~data, 7); // end or identify - m_gpib->eoi_w(!BIT(data, 4)); + m_gpib->host_eoi_w(!BIT(data, 4)); // speaker m_speaker->level_w(!BIT(data, 7)); // remote enable - m_gpib->ren_w(!BIT(data, 7)); + m_gpib->host_ren_w(!BIT(data, 7)); } WRITE_LINE_MEMBER( tek4051_state::kb_halt_w ) @@ -800,21 +800,21 @@ WRITE8_MEMBER( tek4051_state::gpib_pia_pb_w ) */ // end or identify - m_gpib->eoi_w(!BIT(data, 0)); + m_gpib->host_eoi_w(!BIT(data, 0)); // interface clear - m_gpib->ifc_w(!BIT(data, 1)); + m_gpib->host_ifc_w(!BIT(data, 1)); // attention - m_gpib->atn_w(BIT(data, 3)); + m_gpib->host_atn_w(BIT(data, 3)); if (m_talk) { // not ready for data - m_gpib->nrfd_w(!BIT(data, 4)); + m_gpib->host_nrfd_w(!BIT(data, 4)); // not data acknowledged - m_gpib->ndac_w(!BIT(data, 7)); + m_gpib->host_ndac_w(!BIT(data, 7)); } } @@ -825,8 +825,8 @@ WRITE_LINE_MEMBER( tek4051_state::talk_w ) if (!m_talk) { m_gpib->write_dio(0xff); - m_gpib->nrfd_w(1); - m_gpib->ndac_w(1); + m_gpib->host_nrfd_w(1); + m_gpib->host_ndac_w(1); } } diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index 0adeb85fe83..ca25a63083e 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -1502,7 +1502,7 @@ MACHINE_CONFIG_START(thomson_state::to9) MCFG_DEVICE_MODIFY("mc6846") MCFG_MC6846_OUT_PORT_CB(WRITE8(*this, thomson_state, to9_timer_port_out)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy)) /* internal ram */ @@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(thomson_state::to8) MCFG_PIA_CB2_HANDLER(NOOP) MCFG_PIA_IRQA_HANDLER(NOOP) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy)) MCFG_DEVICE_MODIFY("mc6846") @@ -1890,7 +1890,7 @@ MACHINE_CONFIG_START(thomson_state::to9p) MCFG_PIA_IRQA_HANDLER(NOOP) MCFG_PIA_IRQB_HANDLER(WRITELINE("mainfirq", input_merger_device, in_w<1>)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy)) MCFG_DEVICE_MODIFY("mc6846") @@ -2249,7 +2249,7 @@ MACHINE_CONFIG_START(thomson_state::mo6) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo6_game_porta_out)) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, mo6_game_cb2_out)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -2518,7 +2518,7 @@ MACHINE_CONFIG_START(thomson_state::mo5nr) MCFG_DEVICE_MODIFY(THOM_PIA_GAME) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo6_game_porta_out)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy)) diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index 0c899db228e..35b4c661630 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -758,7 +758,7 @@ MACHINE_CONFIG_START(tiki100_state::tiki100) MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, tiki100_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tiki100_state, write_centronics_busy)) diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp index 70f1a342ac5..6021587fe6c 100644 --- a/src/mame/drivers/tmc600.cpp +++ b/src/mame/drivers/tmc600.cpp @@ -281,7 +281,7 @@ MACHINE_CONFIG_START(tmc600_state::tmc600) MCFG_CDP1852_DO_CALLBACK(WRITE8(*this, tmc600_state, printer_w)) // printer connector - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, nullptr) + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(CDP1802_TAG, cosmac_device, ef4_w)) MCFG_DEVCB_XOR(1) // cassette diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 53fd2467eeb..434b4ab3e62 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(trs80_state::model1) // model I, level II MCFG_FLOPPY_DRIVE_ADD("fdc:2", trs80_floppies, "", trs80_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:3", trs80_floppies, "", trs80_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5)) diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index 4e85e98b262..6d995d8cdf1 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -766,7 +766,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2) MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(Z80PIO_TAG, z80pio_device, strobe_b)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_fault)) @@ -859,7 +859,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16) MCFG_DEVICE_ADD(AM9519A_TAG, AM9519, 0) MCFG_AM9519_OUT_INT_CB(INPUTLINE(M68000_TAG, M68K_IRQ_5)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(Z80PIO_TAG, z80pio_device, strobe_b)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_busy)) MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_fault)) diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index ee681e1d762..c7a202c64bd 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -762,7 +762,7 @@ MACHINE_CONFIG_START(tutor_state::tutor) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tutor_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 7f6084e5f49..7da8304d6c3 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -797,7 +797,7 @@ MACHINE_CONFIG_START(tvc_state::tvc) MCFG_TVC_SOUND_SNDINT_CALLBACK(WRITELINE(*this, tvc_state, int_ff_set)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, tvc_state, centronics_ack)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index af1ffc0cbd6..ac4654ec574 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -1130,7 +1130,7 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_SOFTWARE_LIST_ADD("hdd_list", "v1050_hdd") // printer - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, v1050_state, write_centronics_busy)) MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, v1050_state, write_centronics_perror)) diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index 4e8e9069c53..d08c4724f41 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -56,7 +56,6 @@ #define M6522_3_TAG "14l" #define DAC0808_0_TAG "5b" #define DAC0808_1_TAG "5c" -#define CENTRONICS_TAG "centronics" #define RS232_A_TAG "rs232a" #define RS232_B_TAG "rs232b" #define SCREEN_TAG "screen" @@ -81,7 +80,7 @@ public: m_ram(*this, RAM_TAG), m_kb(*this, KB_TAG), m_fdc(*this, FDC_TAG), - m_centronics(*this, CENTRONICS_TAG), + m_centronics(*this, "centronics"), m_rs232a(*this, RS232_A_TAG), m_rs232b(*this, RS232_B_TAG), m_palette(*this, "palette"), @@ -432,14 +431,14 @@ WRITE8_MEMBER( victor9k_state::via1_pb_w ) m_centronics->write_strobe(BIT(data, 0)); // IEEE-488 - m_ieee488->dav_w(BIT(data, 0)); - m_ieee488->eoi_w(BIT(data, 1)); - m_ieee488->ren_w(BIT(data, 2)); - m_ieee488->atn_w(BIT(data, 3)); - m_ieee488->ifc_w(BIT(data, 4)); - m_ieee488->srq_w(BIT(data, 5)); - m_ieee488->nrfd_w(BIT(data, 6)); - m_ieee488->ndac_w(BIT(data, 7)); + m_ieee488->host_dav_w(BIT(data, 0)); + m_ieee488->host_eoi_w(BIT(data, 1)); + m_ieee488->host_ren_w(BIT(data, 2)); + m_ieee488->host_atn_w(BIT(data, 3)); + m_ieee488->host_ifc_w(BIT(data, 4)); + m_ieee488->host_srq_w(BIT(data, 5)); + m_ieee488->host_nrfd_w(BIT(data, 6)); + m_ieee488->host_ndac_w(BIT(data, 7)); } WRITE_LINE_MEMBER( victor9k_state::codec_vol_w ) @@ -758,7 +757,7 @@ MACHINE_CONFIG_START(victor9k_state::victor9k) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor9k_state, via3_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor9k_state, via3_irq_w)) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb5)) MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb6)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb7)) diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index e5ca1dc0066..c091923a11c 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -577,28 +577,28 @@ WRITE8_MEMBER( vixen_state::io_i8155_pb_w ) */ /* data valid */ - m_ieee488->atn_w(BIT(data, 0)); + m_ieee488->host_atn_w(BIT(data, 0)); /* end or identify */ - m_ieee488->dav_w(BIT(data, 1)); + m_ieee488->host_dav_w(BIT(data, 1)); /* remote enable */ - m_ieee488->ndac_w(BIT(data, 2)); + m_ieee488->host_ndac_w(BIT(data, 2)); /* attention */ - m_ieee488->nrfd_w(BIT(data, 3)); + m_ieee488->host_nrfd_w(BIT(data, 3)); /* interface clear */ - m_ieee488->eoi_w(BIT(data, 4)); + m_ieee488->host_eoi_w(BIT(data, 4)); /* service request */ - m_ieee488->srq_w(BIT(data, 5)); + m_ieee488->host_srq_w(BIT(data, 5)); /* not ready for data */ - m_ieee488->ifc_w(BIT(data, 6)); + m_ieee488->host_ifc_w(BIT(data, 6)); /* data not accepted */ - m_ieee488->ren_w(BIT(data, 7)); + m_ieee488->host_ren_w(BIT(data, 7)); } WRITE8_MEMBER( vixen_state::io_i8155_pc_w ) @@ -743,7 +743,7 @@ void vixen_state::machine_reset() MACHINE_CONFIG_START(vixen_state::vixen) // basic machine hardware - MCFG_DEVICE_ADD(Z8400A_TAG, Z80, 23.9616_MHz_XTAL / 6) + MCFG_DEVICE_ADD(m_maincpu, Z80, 23.9616_MHz_XTAL / 6) MCFG_DEVICE_PROGRAM_MAP(vixen_mem) MCFG_DEVICE_OPCODES_MAP(bios_mem) MCFG_DEVICE_IO_MAP(vixen_io) @@ -770,7 +770,7 @@ MACHINE_CONFIG_START(vixen_state::vixen) MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, i8155_pc_w)) MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, 23.9616_MHz_XTAL / 6) - MCFG_I8155_OUT_PORTA_CB(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_I8155_OUT_PORTA_CB(WRITE8(m_ieee488, ieee488_device, host_dio_w)) MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, io_i8155_pb_w)) MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, io_i8155_pc_w)) MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, vixen_state, io_i8155_to_w)) diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp index ab5aaad10bd..5efff592a33 100644 --- a/src/mame/drivers/wangpc.cpp +++ b/src/mame/drivers/wangpc.cpp @@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(wangpc_state::wangpc) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, wangpc_state, write_centronics_ack)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, wangpc_state, write_centronics_busy)) diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp index 4860610e51f..8439c0f8831 100644 --- a/src/mame/drivers/xor100.cpp +++ b/src/mame/drivers/xor100.cpp @@ -542,7 +542,7 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, bus_w)) - MCFG_I8255_OUT_PORTB_CB(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) + MCFG_I8255_OUT_PORTB_CB(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_I8255_IN_PORTC_CB(READ8(*this, xor100_state, i8255_pc_r)) MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 8_MHz_XTAL / 2) @@ -557,7 +557,7 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":3", xor100_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") + MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(I8255A_TAG, i8255_device, pc4_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, xor100_state, write_centronics_busy)) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, xor100_state, write_centronics_select)) diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 888c3594317..bdf958b73cf 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -198,11 +198,11 @@ MACHINE_CONFIG_START(zorba_state::zorba) // IEEE488 interface MCFG_DEVICE_ADD(m_pia1, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(m_ieee, ieee488_device, dio_r)) // TODO: gated with PB1 - MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, dio_w)) // TODO: gated with PB1 + MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, host_dio_w)) // TODO: gated with PB1 MCFG_PIA_READPB_HANDLER(READ8(*this, zorba_state, pia1_portb_r)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, zorba_state, pia1_portb_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, ifc_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, ren_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, host_ifc_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, host_ren_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE("irq1", input_merger_device, in_w<0>)) MCFG_PIA_IRQB_HANDLER(WRITELINE("irq1", input_merger_device, in_w<1>)) @@ -247,7 +247,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) // J3 Parallel printer MCFG_CENTRONICS_OUTPUT_LATCH_ADD("parprndata", "parprn") - MCFG_CENTRONICS_ADD("parprn", centronics_devices, "printer") + MCFG_DEVICE_ADD("parprn", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_uart1, i8251_device, write_cts)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart1, i8251_device, write_dsr)) // TODO: shared with serial CTS MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, zorba_state, printer_fault_w)) @@ -489,11 +489,11 @@ WRITE8_MEMBER( zorba_state::pia1_portb_w ) // 6 NDAC gated with PB1 (active low) // 7 NRFD gated with PB1 (active low) - m_ieee->eoi_w(BIT(data, 3) & BIT(~data, 2)); - m_ieee->atn_w(BIT(data, 4)); - m_ieee->dav_w(BIT(data, 5) & BIT(~data, 2)); - m_ieee->ndac_w(BIT(data, 6) & BIT(~data, 1)); - m_ieee->nrfd_w(BIT(data, 7) & BIT(~data, 1)); + m_ieee->host_eoi_w(BIT(data, 3) & BIT(~data, 2)); + m_ieee->host_atn_w(BIT(data, 4)); + m_ieee->host_dav_w(BIT(data, 5) & BIT(~data, 2)); + m_ieee->host_ndac_w(BIT(data, 6) & BIT(~data, 1)); + m_ieee->host_nrfd_w(BIT(data, 7) & BIT(~data, 1)); } diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 4540e089d5c..93c8dc6e60d 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -17,7 +17,6 @@ public: DECLARE_WRITE8_MEMBER(textram_w); DECLARE_WRITE8_MEMBER(paletteram_w); DECLARE_WRITE_LINE_MEMBER(spritebuffer_w); - DECLARE_WRITE8_MEMBER(spritebuffer_w); DECLARE_WRITE8_MEMBER(adpcm_command_w); DECLARE_READ8_MEMBER(adpcm_command_r); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h index f4a3792de3e..d762d80f6af 100644 --- a/src/mame/includes/vixen.h +++ b/src/mame/includes/vixen.h @@ -29,30 +29,30 @@ class vixen_state : public driver_device { public: vixen_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z8400A_TAG), - m_fdc(*this, FDC1797_TAG), - m_io_i8155(*this, P8155H_IO_TAG), - m_usart(*this, P8251A_TAG), - m_discrete(*this, DISCRETE_TAG), - m_ieee488(*this, IEEE488_TAG), - m_palette(*this, "palette"), - m_ram(*this, RAM_TAG), - m_floppy0(*this, FDC1797_TAG":0"), - m_floppy1(*this, FDC1797_TAG":1"), - m_rs232(*this, RS232_TAG), - m_rom(*this, Z8400A_TAG), - m_sync_rom(*this, "video"), - m_char_rom(*this, "chargen"), - m_video_ram(*this, "video_ram"), - m_key(*this, "KEY.%u", 0), - m_cmd_d1(0), - m_fdint(0), - m_vsync(0), - m_srq(1), - m_atn(1), - m_rxrdy(0), - m_txrdy(0) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z8400A_TAG) + , m_fdc(*this, FDC1797_TAG) + , m_io_i8155(*this, P8155H_IO_TAG) + , m_usart(*this, P8251A_TAG) + , m_discrete(*this, DISCRETE_TAG) + , m_ieee488(*this, IEEE488_TAG) + , m_palette(*this, "palette") + , m_ram(*this, RAM_TAG) + , m_floppy0(*this, FDC1797_TAG":0") + , m_floppy1(*this, FDC1797_TAG":1") + , m_rs232(*this, RS232_TAG) + , m_rom(*this, Z8400A_TAG) + , m_sync_rom(*this, "video") + , m_char_rom(*this, "chargen") + , m_video_ram(*this, "video_ram") + , m_key(*this, "KEY.%u", 0) + , m_cmd_d1(0) + , m_fdint(0) + , m_vsync(0) + , m_srq(1) + , m_atn(1) + , m_rxrdy(0) + , m_txrdy(0) { } DECLARE_READ8_MEMBER( status_r ); diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h index 673d9289104..6e3c6ecb61f 100644 --- a/src/mame/includes/xor100.h +++ b/src/mame/includes/xor100.h @@ -32,21 +32,21 @@ class xor100_state : public driver_device { public: xor100_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z80_TAG), - m_dbrg(*this, COM5016_TAG), - m_uart_a(*this, I8251_A_TAG), - m_uart_b(*this, I8251_B_TAG), - m_fdc(*this, WD1795_TAG), - m_ctc(*this, Z80CTC_TAG), - m_ram(*this, RAM_TAG), - m_centronics(*this, CENTRONICS_TAG), - m_s100(*this, S100_TAG), - m_floppy0(*this, WD1795_TAG":0"), - m_floppy1(*this, WD1795_TAG":1"), - m_floppy2(*this, WD1795_TAG":2"), - m_floppy3(*this, WD1795_TAG":3"), - m_rom(*this, Z80_TAG) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z80_TAG) + , m_dbrg(*this, COM5016_TAG) + , m_uart_a(*this, I8251_A_TAG) + , m_uart_b(*this, I8251_B_TAG) + , m_fdc(*this, WD1795_TAG) + , m_ctc(*this, Z80CTC_TAG) + , m_ram(*this, RAM_TAG) + , m_centronics(*this, CENTRONICS_TAG) + , m_s100(*this, S100_TAG) + , m_floppy0(*this, WD1795_TAG":0") + , m_floppy1(*this, WD1795_TAG":1") + , m_floppy2(*this, WD1795_TAG":2") + , m_floppy3(*this, WD1795_TAG":3") + , m_rom(*this, Z80_TAG) { } DECLARE_WRITE8_MEMBER( mmu_w ); diff --git a/src/mame/machine/osborne1.cpp b/src/mame/machine/osborne1.cpp index 44557edc54c..6bfcde87e6d 100644 --- a/src/mame/machine/osborne1.cpp +++ b/src/mame/machine/osborne1.cpp @@ -189,11 +189,11 @@ WRITE8_MEMBER( osborne1_state::ieee_pia_pb_w ) 6 NDAC 7 NRFD */ - m_ieee->eoi_w(BIT(data, 3)); - m_ieee->atn_w(BIT(data, 4)); - m_ieee->dav_w(BIT(data, 5)); - m_ieee->ndac_w(BIT(data, 6)); - m_ieee->nrfd_w(BIT(data, 7)); + m_ieee->host_eoi_w(BIT(data, 3)); + m_ieee->host_atn_w(BIT(data, 4)); + m_ieee->host_dav_w(BIT(data, 5)); + m_ieee->host_ndac_w(BIT(data, 6)); + m_ieee->host_nrfd_w(BIT(data, 7)); } WRITE_LINE_MEMBER( osborne1_state::ieee_pia_irq_a_func ) diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 5f15821a8d5..3d0daeb81bd 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -535,7 +535,7 @@ MACHINE_CONFIG_START(to7_io_line_device::device_add_mconfig) MCFG_RS232_CTS_HANDLER(WRITELINE(*this, to7_io_line_device, write_cts)) MCFG_RS232_DSR_HANDLER(WRITELINE(*this, to7_io_line_device, write_dsr)) - MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") + MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer") MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(THOM_PIA_IO, pia6821_device, cb1_w)) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, to7_io_line_device, write_centronics_busy)) diff --git a/src/mame/video/gladiatr.cpp b/src/mame/video/gladiatr.cpp index 03702a38cb9..016b325d02b 100644 --- a/src/mame/video/gladiatr.cpp +++ b/src/mame/video/gladiatr.cpp @@ -132,11 +132,6 @@ WRITE_LINE_MEMBER(gladiatr_state_base::spritebuffer_w) m_sprite_buffer = state; } -WRITE8_MEMBER(gladiatr_state_base::spritebuffer_w) -{ - m_sprite_buffer = data & 0x01; -} - WRITE_LINE_MEMBER(gladiatr_state::spritebank_w) { m_sprite_bank = state ? 4 : 2; -- cgit v1.2.3