summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2020-03-18 17:39:05 -0400
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2020-03-18 17:39:41 -0400
commit0cc640b109f1f1e7ee95a96be7e23d4fdcaefff6 (patch) (github)
tree374b254d015c967fab145b12f4b57a7767001e13
parentc8fc4de384174058ffa57a840709e1b35a99ad27 (diff)
downloadmame-0cc640b109f1f1e7ee95a96be7e23d4fdcaefff6.tar.bz2
mame-0cc640b109f1f1e7ee95a96be7e23d4fdcaefff6.zip
input_buffer, output_latch, z80dma: Eliminate now-unnecessary bus_r and bus_w handlers (nw)
-rw-r--r--src/devices/bus/a2bus/agat7ports.cpp2
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp2
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp2
-rw-r--r--src/devices/bus/acorn/cms/4080term.cpp2
-rw-r--r--src/devices/bus/acorn/system/vib.cpp2
-rw-r--r--src/devices/bus/bbc/internal/cumana68k.cpp4
-rw-r--r--src/devices/bus/ecbbus/grip.cpp2
-rw-r--r--src/devices/bus/econet/e01.cpp4
-rw-r--r--src/devices/bus/electron/m2105.cpp2
-rw-r--r--src/devices/bus/pofo/hpc101.cpp6
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp2
-rw-r--r--src/devices/machine/buffer.h1
-rw-r--r--src/devices/machine/output_latch.h1
-rw-r--r--src/devices/machine/z80dma.h2
-rw-r--r--src/mame/drivers/a7150.cpp4
-rw-r--r--src/mame/drivers/abc1600.cpp6
-rw-r--r--src/mame/drivers/accomm.cpp2
-rw-r--r--src/mame/drivers/acrnsys.cpp2
-rw-r--r--src/mame/drivers/altos5.cpp2
-rw-r--r--src/mame/drivers/amiga.cpp2
-rw-r--r--src/mame/drivers/ampro.cpp2
-rw-r--r--src/mame/drivers/apricot.cpp4
-rw-r--r--src/mame/drivers/apricotp.cpp2
-rw-r--r--src/mame/drivers/asteroid.cpp4
-rw-r--r--src/mame/drivers/astrocde.cpp12
-rw-r--r--src/mame/drivers/atarist.cpp4
-rw-r--r--src/mame/drivers/atom.cpp4
-rw-r--r--src/mame/drivers/aussiebyte.cpp6
-rw-r--r--src/mame/drivers/bbc.cpp4
-rw-r--r--src/mame/drivers/bigbord2.cpp2
-rw-r--r--src/mame/drivers/bullet.cpp10
-rw-r--r--src/mame/drivers/bw12.cpp2
-rw-r--r--src/mame/drivers/bw2.cpp2
-rw-r--r--src/mame/drivers/cdc721.cpp2
-rw-r--r--src/mame/drivers/compis.cpp2
-rw-r--r--src/mame/drivers/crvision.cpp6
-rw-r--r--src/mame/drivers/dkong.cpp2
-rw-r--r--src/mame/drivers/einstein.cpp2
-rw-r--r--src/mame/drivers/elwro800.cpp4
-rw-r--r--src/mame/drivers/ep64.cpp2
-rw-r--r--src/mame/drivers/excali64.cpp4
-rw-r--r--src/mame/drivers/fc100.cpp4
-rw-r--r--src/mame/drivers/force68k.cpp2
-rw-r--r--src/mame/drivers/fp1100.cpp2
-rw-r--r--src/mame/drivers/hhtiger.cpp2
-rw-r--r--src/mame/drivers/isbc.cpp4
-rw-r--r--src/mame/drivers/jupace.cpp2
-rw-r--r--src/mame/drivers/kaypro.cpp4
-rw-r--r--src/mame/drivers/kdt6.cpp6
-rw-r--r--src/mame/drivers/m5.cpp4
-rw-r--r--src/mame/drivers/mario.cpp2
-rw-r--r--src/mame/drivers/mbee.cpp4
-rw-r--r--src/mame/drivers/mc1000.cpp2
-rw-r--r--src/mame/drivers/mc1502.cpp4
-rw-r--r--src/mame/drivers/msx.cpp18
-rw-r--r--src/mame/drivers/mtx.cpp2
-rw-r--r--src/mame/drivers/myb3k.cpp2
-rw-r--r--src/mame/drivers/mz700.cpp2
-rw-r--r--src/mame/drivers/nc.cpp4
-rw-r--r--src/mame/drivers/p8k.cpp2
-rw-r--r--src/mame/drivers/pencil2.cpp2
-rw-r--r--src/mame/drivers/phc25.cpp2
-rw-r--r--src/mame/drivers/pp.cpp2
-rw-r--r--src/mame/drivers/prof180x.cpp2
-rw-r--r--src/mame/drivers/px4.cpp2
-rw-r--r--src/mame/drivers/rmnimbus.cpp2
-rw-r--r--src/mame/drivers/rt1715.cpp2
-rw-r--r--src/mame/drivers/sage2.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp4
-rw-r--r--src/mame/drivers/sg1000.cpp2
-rw-r--r--src/mame/drivers/slicer.cpp8
-rw-r--r--src/mame/drivers/sorcerer.cpp4
-rw-r--r--src/mame/drivers/spc1000.cpp2
-rw-r--r--src/mame/drivers/spc1500.cpp2
-rw-r--r--src/mame/drivers/super6.cpp2
-rw-r--r--src/mame/drivers/super80.cpp10
-rw-r--r--src/mame/drivers/tandy2k.cpp2
-rw-r--r--src/mame/drivers/thomson.cpp4
-rw-r--r--src/mame/drivers/tiki100.cpp4
-rw-r--r--src/mame/drivers/trs80dt1.cpp2
-rw-r--r--src/mame/drivers/trs80m2.cpp6
-rw-r--r--src/mame/drivers/ts802.cpp2
-rw-r--r--src/mame/drivers/ts816.cpp2
-rw-r--r--src/mame/drivers/tvc.cpp2
-rw-r--r--src/mame/drivers/unixpc.cpp4
-rw-r--r--src/mame/drivers/v1050.cpp6
-rw-r--r--src/mame/drivers/x1.cpp2
-rw-r--r--src/mame/drivers/xerox820.cpp6
-rw-r--r--src/mame/drivers/xor100.cpp2
-rw-r--r--src/mame/drivers/zorba.cpp4
-rw-r--r--src/mame/machine/thomson.cpp2
91 files changed, 151 insertions, 155 deletions
diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp
index 5c24d8fac8f..d284ad2a935 100644
--- a/src/devices/bus/a2bus/agat7ports.cpp
+++ b/src/devices/bus/a2bus/agat7ports.cpp
@@ -54,7 +54,7 @@ INPUT_PORTS_END
void a2bus_agat7_ports_device::device_add_mconfig(machine_config &config)
{
I8255(config, m_d9);
- m_d9->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_d9->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_d9->out_pb_callback().set(FUNC(a2bus_agat7_ports_device::write_portb));
m_d9->in_pc_callback().set(FUNC(a2bus_agat7_ports_device::read_portc));
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 657f7ac7db3..282d97ce127 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -161,7 +161,7 @@ void luxor_55_21046_device::luxor_55_21046_io(address_map &map)
map(0x58, 0x58).mirror(0x0007).select(0xff00).r(FUNC(luxor_55_21046_device::_9a_r));
map(0x68, 0x6b).mirror(0xff00).r(m_fdc, FUNC(fd1793_device::read));
map(0x78, 0x7b).mirror(0xff00).w(m_fdc, FUNC(fd1793_device::write));
- map(0x80, 0x80).mirror(0xff77).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x80, 0x80).mirror(0xff77).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
}
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index b8c67ceb99a..c5acc016e98 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -150,7 +150,7 @@ void luxor_55_21056_device::luxor_55_21056_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xf8);
- map(0x00, 0x00).mirror(0xf0).rw(Z80DMA_TAG, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x00, 0x00).mirror(0xf0).rw(Z80DMA_TAG, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x08, 0x08).r(FUNC(luxor_55_21056_device::sasi_status_r));
map(0x18, 0x18).w(FUNC(luxor_55_21056_device::stat_w));
map(0x28, 0x28).r(FUNC(luxor_55_21056_device::out_r));
diff --git a/src/devices/bus/acorn/cms/4080term.cpp b/src/devices/bus/acorn/cms/4080term.cpp
index 104f70bb60d..27f69d3a3c1 100644
--- a/src/devices/bus/acorn/cms/4080term.cpp
+++ b/src/devices/bus/acorn/cms/4080term.cpp
@@ -87,7 +87,7 @@ void cms_4080term_device::device_add_mconfig(machine_config &config)
TIMER(config, "scantimer").configure_scanline(FUNC(cms_4080term_device::update_scanline), "screen", 0, 10);
VIA6522(config, m_via, 1_MHz_XTAL);
- m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
m_via->irq_handler().set(FUNC(cms_4080term_device::bus_irq_w));
diff --git a/src/devices/bus/acorn/system/vib.cpp b/src/devices/bus/acorn/system/vib.cpp
index e4ca10e6146..cd6cffc61d4 100644
--- a/src/devices/bus/acorn/system/vib.cpp
+++ b/src/devices/bus/acorn/system/vib.cpp
@@ -150,7 +150,7 @@ void acorn_vib_device::device_add_mconfig(machine_config &config)
INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set(FUNC(acorn_vib_device::irq_w));
VIA6522(config, m_via6522, 1'000'000); // TODO: derive clock from bus (pin 29 = ϕ2)
- m_via6522->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via6522->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via6522->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
m_via6522->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
diff --git a/src/devices/bus/bbc/internal/cumana68k.cpp b/src/devices/bus/bbc/internal/cumana68k.cpp
index 91b8517469b..c7b6e4fb405 100644
--- a/src/devices/bus/bbc/internal/cumana68k.cpp
+++ b/src/devices/bus/bbc/internal/cumana68k.cpp
@@ -89,8 +89,8 @@ void bbc_cumana68k_device::device_add_mconfig(machine_config &config)
INPUT_BUFFER(config, m_sasi_data_in);
PIA6821(config, m_pia_sasi, 0);
- m_pia_sasi->readpa_handler().set(m_sasi_data_in, FUNC(input_buffer_device::bus_r));
- m_pia_sasi->writepa_handler().set(m_sasi_data_out, FUNC(output_latch_device::bus_w));
+ m_pia_sasi->readpa_handler().set(m_sasi_data_in, FUNC(input_buffer_device::read));
+ m_pia_sasi->writepa_handler().set(m_sasi_data_out, FUNC(output_latch_device::write));
m_pia_sasi->writepb_handler().set(FUNC(bbc_cumana68k_device::pia_sasi_pb_w));
m_pia_sasi->readcb1_handler().set_constant(1); // tied to +5V
m_pia_sasi->cb2_handler().set(m_sasibus, FUNC(scsi_port_device::write_rst));
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 1fcedf58ccc..83adcc78952 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -154,7 +154,7 @@ void ecb_grip21_device::grip_io(address_map &map)
map(0x50, 0x50).w(MC6845_TAG, FUNC(mc6845_device::address_w));
map(0x52, 0x52).w(MC6845_TAG, FUNC(mc6845_device::register_w));
map(0x53, 0x53).r(MC6845_TAG, FUNC(mc6845_device::register_r));
- map(0x60, 0x60).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x60, 0x60).w("cent_data_out", FUNC(output_latch_device::write));
map(0x70, 0x73).rw(I8255A_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
// map(0x80, 0x80).w(FUNC(ecb_grip21_device::bl2out_w));
// map(0x90, 0x90).w(FUNC(ecb_grip21_device::gr2out_w));
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 493791384f1..0246af4e7d4 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -228,7 +228,7 @@ void econet_e01_device::e01_mem(address_map &map)
map(0xfc28, 0xfc28).mirror(0x00c3).rw(FUNC(econet_e01_device::network_irq_enable_r), FUNC(econet_e01_device::network_irq_enable_w));
map(0xfc2c, 0xfc2c).mirror(0x00c3).portr("FLAP");
map(0xfc30, 0xfc30).mirror(0x00c0).rw(FUNC(econet_e01_device::hdc_data_r), FUNC(econet_e01_device::hdc_data_w));
- map(0xfc31, 0xfc31).mirror(0x00c0).r("scsi_ctrl_in", FUNC(input_buffer_device::bus_r));
+ map(0xfc31, 0xfc31).mirror(0x00c0).r("scsi_ctrl_in", FUNC(input_buffer_device::read));
map(0xfc32, 0xfc32).mirror(0x00c0).w(FUNC(econet_e01_device::hdc_select_w));
map(0xfc33, 0xfc33).mirror(0x00c0).w(FUNC(econet_e01_device::hdc_irq_enable_w));
}
@@ -249,7 +249,7 @@ void econet_e01_device::device_add_mconfig(machine_config &config)
// devices
via6522_device &via(VIA6522(config, R6522_TAG, 8_MHz_XTAL / 4));
- via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
via.irq_handler().set(FUNC(econet_e01_device::via_irq_w));
MC6854(config, m_adlc, 0);
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index a5edb8e3232..e0215ae6de9 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -74,7 +74,7 @@ void electron_m2105_device::device_add_mconfig(machine_config &config)
/* user via */
VIA6522(config, m_via6522_1, DERIVED_CLOCK(1, 16));
- m_via6522_1->writepb_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via6522_1->writepb_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via6522_1->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
m_via6522_1->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp
index d62f1002f7d..692c42ae7fc 100644
--- a/src/devices/bus/pofo/hpc101.cpp
+++ b/src/devices/bus/pofo/hpc101.cpp
@@ -36,9 +36,9 @@ DEFINE_DEVICE_TYPE(POFO_HPC101, pofo_hpc101_device, "pofo_hpc101", "Atari Portfo
void pofo_hpc101_device::device_add_mconfig(machine_config &config)
{
I8255A(config, m_ppi);
- m_ppi->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
- m_ppi->out_pb_callback().set("cent_ctrl_out", FUNC(output_latch_device::bus_w));
- m_ppi->in_pc_callback().set("cent_status_in", FUNC(input_buffer_device::bus_r));
+ m_ppi->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
+ m_ppi->out_pb_callback().set("cent_ctrl_out", FUNC(output_latch_device::write));
+ m_ppi->in_pc_callback().set("cent_status_in", FUNC(input_buffer_device::read));
centronics_device &centronics(CENTRONICS(config, CENTRONICS_TAG, centronics_devices, "printer"));
centronics.ack_handler().set("cent_status_in", FUNC(input_buffer_device::write_bit5));
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index 17e9ab7f139..ddc0bdf960c 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -66,7 +66,7 @@ void vtech_printer_interface_device::device_reset()
{
io_space().install_read_handler(0x00, 0x00, read8_delegate(*this, FUNC(vtech_printer_interface_device::busy_r)));
io_space().install_write_handler(0x0d, 0x0d, write8_delegate(*this, FUNC(vtech_printer_interface_device::strobe_w)));
- io_space().install_write_handler(0x0e, 0x0e, write8_delegate(*m_latch, FUNC(output_latch_device::bus_w)));
+ io_space().install_write_handler(0x0e, 0x0e, write8smo_delegate(*m_latch, FUNC(output_latch_device::write)));
}
diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h
index ca9a88e8310..5df28af6c6b 100644
--- a/src/devices/machine/buffer.h
+++ b/src/devices/machine/buffer.h
@@ -9,7 +9,6 @@ public:
input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
uint8_t read() { return m_input_data; }
- DECLARE_READ8_MEMBER(bus_r) { return read(); }
DECLARE_WRITE_LINE_MEMBER(write_bit0) { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; }
DECLARE_WRITE_LINE_MEMBER(write_bit1) { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; }
diff --git a/src/devices/machine/output_latch.h b/src/devices/machine/output_latch.h
index 1c7010657d2..0e6a87ff6dc 100644
--- a/src/devices/machine/output_latch.h
+++ b/src/devices/machine/output_latch.h
@@ -14,7 +14,6 @@ public:
template <unsigned Bit> auto bit_handler() { return m_bit_handlers[Bit].bind(); }
void write(uint8_t data);
- DECLARE_WRITE8_MEMBER(bus_w) { write(data); }
protected:
virtual void device_resolve_objects() override;
diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h
index 37409927de3..ec49d9ea2b6 100644
--- a/src/devices/machine/z80dma.h
+++ b/src/devices/machine/z80dma.h
@@ -61,8 +61,6 @@ public:
uint8_t read();
void write(uint8_t data);
- DECLARE_READ8_MEMBER( bus_r ) { return read(); }
- DECLARE_WRITE8_MEMBER( bus_w ) { write(data); }
DECLARE_WRITE_LINE_MEMBER(rdy_w);
DECLARE_WRITE_LINE_MEMBER(wait_w);
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index c0e6a7f71bd..69a0bac9735 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -485,8 +485,8 @@ void a7150_state::a7150(machine_config &config)
// IFSP port on processor card
i8255_device &ppi(I8255(config, "ppi8255"));
-// ppi.in_pa_callback().set("cent_status_in", FUNC(input_buffer_device::bus_r));
-// ppi.out_pb_callback().set("cent_data_out", output_latch_device::bus_w));
+// ppi.in_pa_callback().set("cent_status_in", FUNC(input_buffer_device::read));
+// ppi.out_pb_callback().set("cent_data_out", output_latch_device::write));
ppi.out_pc_callback().set(FUNC(a7150_state::ppi_c_w));
PIT8253(config, m_pit8253, 0);
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index 233a5d52207..f23045601ec 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -512,9 +512,9 @@ void abc1600_state::mac_mem(address_map &map)
map(0x1ff006, 0x1ff006).mirror(0xf9).rw(m_fdc, FUNC(fd1797_device::data_r), FUNC(fd1797_device::data_w));
map(0x1ff100, 0x1ff101).mirror(0xfe).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::crtc_map));
map(0x1ff200, 0x1ff207).mirror(0xf8).rw(FUNC(abc1600_state::dart_r), FUNC(abc1600_state::dart_w));
- map(0x1ff300, 0x1ff300).mirror(0xff).rw(m_dma0, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
- map(0x1ff400, 0x1ff400).mirror(0xff).rw(m_dma1, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
- map(0x1ff500, 0x1ff500).mirror(0xff).rw(m_dma2, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1ff300, 0x1ff300).mirror(0xff).rw(m_dma0, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
+ map(0x1ff400, 0x1ff400).mirror(0xff).rw(m_dma1, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
+ map(0x1ff500, 0x1ff500).mirror(0xff).rw(m_dma2, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x1ff600, 0x1ff607).mirror(0xf8).rw(FUNC(abc1600_state::scc_r), FUNC(abc1600_state::scc_w));
map(0x1ff700, 0x1ff707).mirror(0xf8).rw(FUNC(abc1600_state::cio_r), FUNC(abc1600_state::cio_w));
map(0x1ff800, 0x1ff8ff).m(ABC1600_MOVER_TAG, FUNC(abc1600_mover_device::iowr0_map));
diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp
index 5503380d6c6..3cd4cce2375 100644
--- a/src/mame/drivers/accomm.cpp
+++ b/src/mame/drivers/accomm.cpp
@@ -847,7 +847,7 @@ void accomm_state::accomm(machine_config &config)
/* via */
VIA6522(config, m_via, 16_MHz_XTAL / 16);
- m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via->ca2_handler().set("centronics", FUNC(centronics_device::write_strobe));
/* acia */
diff --git a/src/mame/drivers/acrnsys.cpp b/src/mame/drivers/acrnsys.cpp
index 8f60643e83c..a2d009db487 100644
--- a/src/mame/drivers/acrnsys.cpp
+++ b/src/mame/drivers/acrnsys.cpp
@@ -410,7 +410,7 @@ void acrnsys_state::a6809(machine_config &config)
INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
VIA6522(config, m_via6522, 4_MHz_XTAL / 4);
- m_via6522->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via6522->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via6522->ca2_handler().set("centronics", FUNC(centronics_device::write_strobe));
//m_via6522->cb2_handler().set(FUNC(acrnsys_state::cass_w));
m_via6522->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index affbec19858..59ccd2b936d 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -102,7 +102,7 @@ void altos5_state::mem_map(address_map &map)
void altos5_state::io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x04, 0x07).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write));
map(0x08, 0x0b).rw(m_pio0, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x0c, 0x0f).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 96a34d3af46..98e8c9276d4 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -1596,7 +1596,7 @@ void amiga_state::amiga_base(machine_config &config)
m_cia_0->irq_wr_callback().set(FUNC(amiga_state::cia_0_irq));
m_cia_0->pa_rd_callback().set_ioport("cia_0_port_a");
m_cia_0->pa_wr_callback().set(FUNC(amiga_state::cia_0_port_a_write));
- m_cia_0->pb_wr_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_cia_0->pb_wr_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_cia_0->pc_wr_callback().set(m_centronics, FUNC(centronics_device::write_strobe));
m_cia_0->sp_wr_callback().set("kbd", FUNC(amiga_keyboard_bus_device::kdat_in_w)).invert();
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 97ccf1ce7d7..11af05c9dd6 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -135,7 +135,7 @@ void ampro_state::ampro_io(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
map(0x00, 0x00).w(FUNC(ampro_state::port00_w)); // system
- map(0x01, 0x01).w("pio", FUNC(output_latch_device::bus_w)); // printer data
+ map(0x01, 0x01).w("pio", FUNC(output_latch_device::write)); // printer data
map(0x02, 0x02).w(FUNC(ampro_state::set_strobe)); // printer strobe
map(0x03, 0x03).w(FUNC(ampro_state::clear_strobe)); // printer strobe
map(0x20, 0x27).rw(m_ncr, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)); // scsi chip
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index d5a5c365171..4ddfc719a62 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -402,8 +402,8 @@ void apricot_state::apricot(machine_config &config)
// devices
I8255A(config, m_ppi, 0);
- m_ppi->in_pa_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r));
- m_ppi->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_ppi->in_pa_callback().set("cent_data_in", FUNC(input_buffer_device::read));
+ m_ppi->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_ppi->out_pb_callback().set(FUNC(apricot_state::i8255_portb_w));
m_ppi->in_pc_callback().set(FUNC(apricot_state::i8255_portc_r));
m_ppi->out_pc_callback().set(FUNC(apricot_state::i8255_portc_w));
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index 64b0530ab02..03053753697 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -443,7 +443,7 @@ void fp_state::fp_io(address_map &map)
map(0x000, 0x007).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write)).umask16(0x00ff);
map(0x008, 0x00f).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write)).umask16(0x00ff);
map(0x018, 0x01f).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)).umask16(0x00ff);
- map(0x020, 0x020).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x020, 0x020).w("cent_data_out", FUNC(output_latch_device::write));
map(0x022, 0x022).w(FUNC(fp_state::pint_clr_w));
map(0x024, 0x024).r(FUNC(fp_state::prtr_snd_r));
map(0x026, 0x026).w(SN76489AN_TAG, FUNC(sn76489a_device::write));
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index 2fb03b74e0d..b0c8ce904f2 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -326,7 +326,7 @@ void asteroid_state::asteroid_map(address_map &map)
map(0x2400, 0x2407).r(FUNC(asteroid_state::asteroid_IN1_r)); /* IN1 */
map(0x2800, 0x2803).r(FUNC(asteroid_state::asteroid_DSW1_r)).nopw(); /* DSW1 */
map(0x3000, 0x3000).w(m_dvg, FUNC(dvg_device::go_w));
- map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::bus_w));
+ map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::write));
map(0x3400, 0x3400).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x3600, 0x3600).w(FUNC(asteroid_state::asteroid_explode_w));
map(0x3a00, 0x3a00).w(FUNC(asteroid_state::asteroid_thump_w));
@@ -371,7 +371,7 @@ void asteroid_state::llander_map(address_map &map)
map(0x2800, 0x2803).r(FUNC(asteroid_state::asteroid_DSW1_r)); /* DSW1 */
map(0x2c00, 0x2c00).portr("THRUST");
map(0x3000, 0x3000).w(m_dvg, FUNC(dvg_device::go_w));
- map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::bus_w));
+ map(0x3200, 0x3200).w("outlatch", FUNC(output_latch_device::write));
map(0x3400, 0x3400).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x3c00, 0x3c00).w(FUNC(asteroid_state::llander_sounds_w));
map(0x3e00, 0x3e00).w(FUNC(asteroid_state::llander_snd_reset_w));
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index ece42b777cf..e17eef39264 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -537,8 +537,8 @@ void seawolf2_state::port_map_discrete(address_map &map)
map(0x19, 0x19).w(FUNC(astrocde_state::expand_register_w));
map(0x40, 0x40).mirror(0x18).w(FUNC(seawolf2_state::sound_1_w));
map(0x41, 0x41).mirror(0x18).w(FUNC(seawolf2_state::sound_2_w));
- map(0x42, 0x42).mirror(0x18).w("lamplatch2", FUNC(output_latch_device::bus_w));
- map(0x43, 0x43).mirror(0x18).w("lamplatch1", FUNC(output_latch_device::bus_w));
+ map(0x42, 0x42).mirror(0x18).w("lamplatch2", FUNC(output_latch_device::write));
+ map(0x43, 0x43).mirror(0x18).w("lamplatch1", FUNC(output_latch_device::write));
}
@@ -1318,7 +1318,7 @@ void astrocde_state::spacezap(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &astrocde_state::port_map_mono_pattern);
m_astrocade_sound1->so_cb<0>().set("watchdog", FUNC(watchdog_timer_device::reset_w));
- m_astrocade_sound1->so_cb<3>().set("outlatch", FUNC(output_latch_device::bus_w));
+ m_astrocade_sound1->so_cb<3>().set("outlatch", FUNC(output_latch_device::write));
output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch", 0)); // MC14174B on game board at U16
outlatch.bit_handler<0>().set(FUNC(astrocde_state::coin_counter_w<0>));
@@ -1457,8 +1457,8 @@ void astrocde_state::profpac(machine_config &config)
lamplatch.bit_handler<5>().set_output("lamp4"); // right lamp B
lamplatch.bit_handler<6>().set_output("lamp5"); // right lamp C
- m_astrocade_sound1->so_cb<4>().set("outlatch", FUNC(output_latch_device::bus_w));
- m_astrocade_sound1->so_cb<5>().set("lamplatch", FUNC(output_latch_device::bus_w));
+ m_astrocade_sound1->so_cb<4>().set("outlatch", FUNC(output_latch_device::write));
+ m_astrocade_sound1->so_cb<5>().set("lamplatch", FUNC(output_latch_device::write));
}
void demndrgn_state::demndrgn(machine_config &config)
@@ -1477,7 +1477,7 @@ void demndrgn_state::demndrgn(machine_config &config)
outlatch.bit_handler<3>().set_output("led1");
outlatch.bit_handler<4>().set(FUNC(demndrgn_state::input_select_w));
- m_astrocade_sound1->so_cb<4>().set("outlatch", FUNC(output_latch_device::bus_w));
+ m_astrocade_sound1->so_cb<4>().set("outlatch", FUNC(output_latch_device::write));
m_astrocade_sound1->pot_cb<0>().set_ioport("FIREX");
m_astrocade_sound1->pot_cb<1>().set_ioport("FIREY");
}
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 812bc1190c1..7c82da2f3f0 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -1997,7 +1997,7 @@ void st_state::common(machine_config &config)
m_ymsnd->set_flags(AY8910_SINGLE_OUTPUT);
m_ymsnd->set_resistors_load(RES_K(1), 0, 0);
m_ymsnd->port_a_write_callback().set(FUNC(st_state::psg_pa_w));
- m_ymsnd->port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_ymsnd->port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::write));
// devices
WD1772(config, m_fdc, Y2/4);
@@ -2213,7 +2213,7 @@ void stbook_state::stbook(machine_config &config)
ym3439.set_flags(AY8910_SINGLE_OUTPUT);
ym3439.set_resistors_load(RES_K(1), 0, 0);
ym3439.port_a_write_callback().set(FUNC(stbook_state::psg_pa_w));
- ym3439.port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ ym3439.port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::write));
ym3439.add_route(ALL_OUTPUTS, "mono", 1.00);
MC68901(config, m_mfp, U517/8);
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index 35222ab4134..34d0327143d 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -729,7 +729,7 @@ void atom_state::atom(machine_config &config)
TIMER(config, "hz2400").configure_periodic(FUNC(atom_state::cassette_output_tick), attotime::from_hz(4806));
via6522_device &via(VIA6522(config, R6522_TAG, X2/4));
- via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
via.ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
via.irq_handler().set_inputline(SY6502_TAG, M6502_IRQ_LINE);
@@ -833,7 +833,7 @@ void atom_state::atombb(machine_config &config)
TIMER(config, "hz2400").configure_periodic(FUNC(atom_state::cassette_output_tick), attotime::from_hz(4806));
via6522_device &via(VIA6522(config, R6522_TAG, X2/4));
- via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
via.ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
via.irq_handler().set_inputline(SY6502_TAG, M6502_IRQ_LINE);
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index c8893c4438d..8f7c2318e54 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -60,7 +60,7 @@ void aussiebyte_state::aussiebyte_io(address_map &map)
map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x0c, 0x0f).noprw(); // winchester interface
map(0x10, 0x13).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write));
- map(0x14, 0x14).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x14, 0x14).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x15, 0x15).w(FUNC(aussiebyte_state::port15_w)); // boot rom disable
map(0x16, 0x16).w(FUNC(aussiebyte_state::port16_w)); // fdd select
map(0x17, 0x17).w(FUNC(aussiebyte_state::port17_w)); // DMA mux
@@ -550,8 +550,8 @@ void aussiebyte_state::aussiebyte(machine_config &config)
Z80PIO(config, m_pio1, 16_MHz_XTAL / 4);
m_pio1->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- m_pio1->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
- m_pio1->in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r));
+ m_pio1->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
+ m_pio1->in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::read));
m_pio1->out_ardy_callback().set(m_centronics, FUNC(centronics_device::write_strobe)).invert();
Z80PIO(config, m_pio2, 16_MHz_XTAL / 4);
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index 1e96311ddda..b4705146de2 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -962,7 +962,7 @@ void bbc_state::bbcb(machine_config &config)
/* user via */
VIA6522(config, m_via6522_1, 16_MHz_XTAL / 16);
- m_via6522_1->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via6522_1->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via6522_1->readpb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_r));
m_via6522_1->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
m_via6522_1->writepb_handler().append(m_internal, FUNC(bbc_internal_slot_device::latch_fe60_w));
@@ -1434,7 +1434,7 @@ void bbcm_state::bbcm(machine_config &config)
/* user via */
VIA6522(config, m_via6522_1, 16_MHz_XTAL / 16);
- m_via6522_1->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via6522_1->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via6522_1->readpb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_r));
m_via6522_1->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
m_via6522_1->ca2_handler().set("printer", FUNC(centronics_device::write_strobe));
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 80bf88d5746..c473815ddf3 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -341,7 +341,7 @@ void bigbord2_state::bigbord2_io(address_map &map)
map(0x80, 0x83).rw(m_sio, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // u16
map(0x84, 0x87).rw(m_ctc1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // u37 has issues
map(0x88, 0x8b).rw(m_ctc2, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // u21
- map(0x8c, 0x8f).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); // u62
+ map(0x8c, 0x8f).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // u62
map(0xc0, 0xc3).w("proglatch", FUNC(ls259_device::write_nibble_d3)); // u41 - eprom programming port
map(0xc4, 0xc7).r(FUNC(bigbord2_state::status_port_r)); // u11
map(0xc8, 0xcb).w(m_syslatch1, FUNC(ls259_device::write_nibble_d3)); // u14
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index c14f216c834..50e5c8eb06d 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -625,7 +625,7 @@ void bullet_state::bullet_io(address_map &map)
map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x0c, 0x0c).mirror(0x03).rw(FUNC(bullet_state::win_r), FUNC(bullet_state::wstrobe_w));
map(0x10, 0x13).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write));
- map(0x14, 0x14).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x14, 0x14).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x15, 0x15).rw(FUNC(bullet_state::brom_r), FUNC(bullet_state::brom_w));
map(0x16, 0x16).w(FUNC(bullet_state::exdsk_w));
map(0x17, 0x17).w(FUNC(bullet_state::exdma_w));
@@ -660,7 +660,7 @@ void bulletf_state::bulletf_io(address_map &map)
map(0x16, 0x16).w(FUNC(bulletf_state::xfdc_w));
map(0x17, 0x17).w(FUNC(bulletf_state::mbank_w));
map(0x19, 0x19).rw(FUNC(bulletf_state::scsi_r), FUNC(bulletf_state::scsi_w));
- map(0x1a, 0x1a).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1a, 0x1a).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x1b, 0x1b).r(FUNC(bulletf_state::hwsts_r));
}
@@ -1144,7 +1144,7 @@ void bullet_state::bullet(machine_config &config)
z80pio_device& pio(Z80PIO(config, Z80PIO_TAG, 16_MHz_XTAL / 4));
pio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- pio.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ pio.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
pio.in_pb_callback().set(FUNC(bullet_state::pio_pb_r));
MB8877(config, m_fdc, 16_MHz_XTAL / 16);
@@ -1225,9 +1225,9 @@ void bulletf_state::bulletf(machine_config &config)
z80pio_device& pio(Z80PIO(config, Z80PIO_TAG, 16_MHz_XTAL / 4));
pio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- pio.in_pa_callback().set("scsi_ctrl_in", FUNC(input_buffer_device::bus_r));
+ pio.in_pa_callback().set("scsi_ctrl_in", FUNC(input_buffer_device::read));
pio.out_pa_callback().set(FUNC(bulletf_state::pio_pa_w));
- pio.out_ardy_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ pio.out_ardy_callback().set("cent_data_out", FUNC(output_latch_device::write));
pio.out_brdy_callback().set(FUNC(bulletf_state::cstrb_w));
MB8877(config, m_fdc, 16_MHz_XTAL / 16);
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 12bdf8f5d18..7bcc6580078 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -550,7 +550,7 @@ void bw12_state::common(machine_config &config)
PIA6821(config, m_pia, 0);
m_pia->readpa_handler().set(FUNC(bw12_state::pia_pa_r));
- m_pia->writepb_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pia->writepb_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_pia->ca2_handler().set(CENTRONICS_TAG, FUNC(centronics_device::write_strobe));
m_pia->cb2_handler().set(FUNC(bw12_state::pia_cb2_w));
m_pia->irqa_handler().set_inputline(Z80_TAG, INPUT_LINE_IRQ0);
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index 43a624e86c2..c573744b49a 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -192,7 +192,7 @@ void bw2_state::bw2_io(address_map &map)
map(0x20, 0x21).m(m_lcdc, FUNC(msm6255_device::map));
map(0x30, 0x3f).rw(m_exp, FUNC(bw2_expansion_slot_device::slot_r), FUNC(bw2_expansion_slot_device::slot_w));
map(0x40, 0x41).rw(m_uart, FUNC(i8251_device::read), FUNC(i8251_device::write));
- map(0x50, 0x50).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x50, 0x50).w("cent_data_out", FUNC(output_latch_device::write));
map(0x60, 0x63).rw(m_fdc, FUNC(wd2797_device::read), FUNC(wd2797_device::write));
map(0x70, 0x7f).rw(m_exp, FUNC(bw2_expansion_slot_device::modsel_r), FUNC(bw2_expansion_slot_device::modsel_w));
}
diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp
index c6825c48a8e..2a39187231f 100644
--- a/src/mame/drivers/cdc721.cpp
+++ b/src/mame/drivers/cdc721.cpp
@@ -204,7 +204,7 @@ void cdc721_state::io_map(address_map &map)
map(0x20, 0x27).rw("kbduart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w));
map(0x30, 0x33).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x40, 0x47).rw("comuart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w));
- map(0x50, 0x50).w("ledlatch", FUNC(output_latch_device::bus_w));
+ map(0x50, 0x50).w("ledlatch", FUNC(output_latch_device::write));
map(0x70, 0x70).w(FUNC(cdc721_state::block_select_w));
map(0x80, 0x87).rw("pauart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w));
map(0x90, 0x97).rw("pbuart", FUNC(ins8250_device::ins8250_r), FUNC(ins8250_device::ins8250_w));
diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp
index 4e25c3ab1ab..8f33dda2d1b 100644
--- a/src/mame/drivers/compis.cpp
+++ b/src/mame/drivers/compis.cpp
@@ -762,7 +762,7 @@ void compis_state::compis(machine_config &config)
m_pit->out_handler<2>().set(FUNC(compis_state::tmr5_w));
I8255(config, m_ppi);
- m_ppi->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_ppi->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_ppi->in_pb_callback().set(FUNC(compis_state::ppi_pb_r));
m_ppi->out_pc_callback().set(FUNC(compis_state::ppi_pc_w));
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index 19811bb602b..09be1173d69 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -151,9 +151,9 @@ void crvision_state::crvision_map(address_map &map)
map(0x4000, 0x7fff).bankr(BANK_ROM2);
map(0x8000, 0xbfff).bankr(BANK_ROM1);
// map(0xc000, 0xe7ff).bankrw(3);
- map(0xe800, 0xe800).w(m_cent_data_out, FUNC(output_latch_device::bus_w));
- map(0xe801, 0xe801).r("cent_status_in", FUNC(input_buffer_device::bus_r));
- map(0xe801, 0xe801).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
+ map(0xe800, 0xe800).w(m_cent_data_out, FUNC(output_latch_device::write));
+ map(0xe801, 0xe801).r("cent_status_in", FUNC(input_buffer_device::read));
+ map(0xe801, 0xe801).w("cent_ctrl_out", FUNC(output_latch_device::write));
// map(0xe802, 0xf7ff).bankrw(4);
map(0xf800, 0xffff).rom().region(M6502_TAG, 0);
}
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index 09fe8852378..cb3597e05a0 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -876,7 +876,7 @@ void dkong_state::dkong3_map(address_map &map)
void dkong_state::dkong3_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); /* dma controller */
+ map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); /* dma controller */
}
/* Epos conversions */
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index 2d689fd1f63..bf46fe34183 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -834,7 +834,7 @@ void einstein_state::einstein(machine_config &config)
z80pio_device& pio(Z80PIO(config, IC_I063, XTAL_X002 / 2));
pio.out_int_callback().set(FUNC(einstein_state::int_w<0>));
- pio.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ pio.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
pio.out_ardy_callback().set(FUNC(einstein_state::ardy_w));
pio.in_pb_callback().set("user", FUNC(einstein_userport_device::read));
pio.out_pb_callback().set("user", FUNC(einstein_userport_device::write));
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index 6c3543a9c77..0939f6943bd 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -587,8 +587,8 @@ void elwro800_state::elwro800(machine_config &config)
I8255A(config, m_i8255, 0);
m_i8255->in_pa_callback().set_ioport("JOY");
- m_i8255->in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r));
- m_i8255->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_i8255->in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::read));
+ m_i8255->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_i8255->in_pc_callback().set(FUNC(elwro800_state::i8255_port_c_r));
m_i8255->out_pc_callback().set(FUNC(elwro800_state::i8255_port_c_w));
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index 3c95e577126..3baca557989 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -416,7 +416,7 @@ void ep64_state::dave_io(address_map &map)
map.global_mask(0xff);
map(0x80, 0x8f).m(m_nick, FUNC(nick_device::vio_map));
map(0xb5, 0xb5).rw(FUNC(ep64_state::rd0_r), FUNC(ep64_state::wr0_w));
- map(0xb6, 0xb6).r(FUNC(ep64_state::rd1_r)).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0xb6, 0xb6).r(FUNC(ep64_state::rd1_r)).w("cent_data_out", FUNC(output_latch_device::write));
map(0xb7, 0xb7).w(FUNC(ep64_state::wr2_w));
}
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index da63fd51b5e..a393a0d87a9 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -145,7 +145,7 @@ void excali64_state::io_map(address_map &map)
map(0x50, 0x5f).r(FUNC(excali64_state::port50_r));
map(0x60, 0x63).mirror(0x0c).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x70, 0x7f).w(FUNC(excali64_state::port70_w));
- map(0xe0, 0xe3).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0xe0, 0xe3).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0xe4, 0xe7).w(FUNC(excali64_state::porte4_w));
map(0xe8, 0xeb).r(FUNC(excali64_state::porte8_r));
map(0xec, 0xef).w(FUNC(excali64_state::portec_w));
@@ -572,7 +572,7 @@ void excali64_state::excali64(machine_config &config)
//pit.set_clk<2>(16_MHz_XTAL / 16); /* Timer 2: not used */
i8255_device &ppi(I8255A(config, "ppi"));
- ppi.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w)); // parallel port
+ ppi.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write)); // parallel port
ppi.out_pb_callback().set(FUNC(excali64_state::ppib_w));
ppi.in_pc_callback().set(FUNC(excali64_state::ppic_r));
ppi.out_pc_callback().set(FUNC(excali64_state::ppic_w));
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 3c68df4b1b0..1e1583c5de2 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -141,10 +141,10 @@ void fc100_state::fc100_io(address_map &map)
map(0x23, 0x23).w("psg", FUNC(ay8910_device::address_w));
map(0x31, 0x31).w(FUNC(fc100_state::port31_w));
map(0x33, 0x33).w(FUNC(fc100_state::port33_w));
- map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::write));
map(0x42, 0x42).nopw(); // bit 0 could be printer select
map(0x43, 0x43).w(FUNC(fc100_state::port43_w));
- map(0x44, 0x44).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0x44, 0x44).r("cent_status_in", FUNC(input_buffer_device::read));
map(0x60, 0x61).w(FUNC(fc100_state::port60_w));
map(0x70, 0x71).w(FUNC(fc100_state::port70_w));
map(0xb0, 0xb0).rw(m_uart, FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp
index 9971891ed82..886772ca8f7 100644
--- a/src/mame/drivers/force68k.cpp
+++ b/src/mame/drivers/force68k.cpp
@@ -584,7 +584,7 @@ void force68k_state::fccpu1(machine_config &config)
/* PIT Parallel Interface and Timer device, assuming strapped for on board clock */
PIT68230(config, m_pit, XTAL(16'000'000) / 2);
- m_pit->pa_out_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pit->pa_out_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pit->h2_out_callback().set(m_centronics, FUNC(centronics_device::write_strobe));
// Centronics
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index 3896aa4f06e..7d12ed2b1e3 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -654,7 +654,7 @@ void fp1100_state::fp1100(machine_config &config)
sub.set_addrmap(AS_PROGRAM, &fp1100_state::sub_map);
sub.pa_out_cb().set(FUNC(fp1100_state::porta_w));
sub.pb_in_cb().set(FUNC(fp1100_state::portb_r));
- sub.pb_out_cb().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ sub.pb_out_cb().set("cent_data_out", FUNC(output_latch_device::write));
sub.pc_in_cb().set(FUNC(fp1100_state::portc_r));
sub.pc_out_cb().set(FUNC(fp1100_state::portc_w));
sub.txd_func().set([this] (bool state) { m_cassbit = state; });
diff --git a/src/mame/drivers/hhtiger.cpp b/src/mame/drivers/hhtiger.cpp
index c3f6cdddd75..db4254d8cf2 100644
--- a/src/mame/drivers/hhtiger.cpp
+++ b/src/mame/drivers/hhtiger.cpp
@@ -315,7 +315,7 @@ void hhtiger_state::z80_mem(address_map &map)
void hhtiger_state::z80_io(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x00, 0x03).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x04, 0x07).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x10, 0x17).rw(m_tms9914, FUNC(tms9914_device::read), FUNC(tms9914_device::write)); // ??
map(0x1e, 0x1e).r(FUNC(hhtiger_state::disable_rom_r));
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index a0f92cfdfec..a8a0192b84d 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -453,8 +453,8 @@ void isbc_state::isbc286(machine_config &config)
pit.out_handler<2>().set(FUNC(isbc_state::isbc286_tmr2_w));
i8255_device &ppi(I8255A(config, "ppi"));
- ppi.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
- ppi.in_pb_callback().set(m_cent_status_in, FUNC(input_buffer_device::bus_r));
+ ppi.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
+ ppi.in_pb_callback().set(m_cent_status_in, FUNC(input_buffer_device::read));
ppi.out_pc_callback().set(FUNC(isbc_state::ppi_c_w));
CENTRONICS(config, m_centronics, centronics_devices, "printer");
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index fa43809b9a9..b6d6f08826b 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -804,7 +804,7 @@ void ace_state::ace(machine_config &config)
m_z80pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_z80pio->in_pa_callback().set(FUNC(ace_state::pio_pa_r));
m_z80pio->out_pa_callback().set(FUNC(ace_state::pio_pa_w));
- m_z80pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_z80pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
CENTRONICS(config, m_centronics, centronics_devices, "printer");
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index dfd98fdd458..d7f81ebe806 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -93,7 +93,7 @@ void kaypro_state::kaypro484_io(address_map &map)
map(0x0c, 0x0f).rw("sio_2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
map(0x10, 0x13).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
map(0x14, 0x17).rw(FUNC(kaypro_state::kaypro484_system_port_r), FUNC(kaypro_state::kaypro484_system_port_w));
- map(0x18, 0x1b).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x18, 0x1b).w("cent_data_out", FUNC(output_latch_device::write));
map(0x1c, 0x1c).rw(FUNC(kaypro_state::kaypro484_status_r), FUNC(kaypro_state::kaypro484_index_w));
map(0x1d, 0x1d).r(m_crtc, FUNC(mc6845_device::register_r)).w(FUNC(kaypro_state::kaypro484_register_w));
map(0x1f, 0x1f).rw(FUNC(kaypro_state::kaypro484_videoram_r), FUNC(kaypro_state::kaypro484_videoram_w));
@@ -250,7 +250,7 @@ void kaypro_state::kayproii(machine_config &config)
Z80PIO(config, m_pio_g, 20_MHz_XTAL / 8);
m_pio_g->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- m_pio_g->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio_g->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
Z80PIO(config, m_pio_s, 20_MHz_XTAL / 8);
m_pio_s->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp
index 6b63f7fc764..697ed56e801 100644
--- a/src/mame/drivers/kdt6.cpp
+++ b/src/mame/drivers/kdt6.cpp
@@ -176,7 +176,7 @@ void kdt6_state::psi98_mem(address_map &map)
void kdt6_state::psi98_io(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x00, 0x00).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x04, 0x07).rw(m_sio, FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w));
map(0x08, 0x0b).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x0c, 0x0f).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
@@ -696,8 +696,8 @@ void kdt6_state::psi98(machine_config &config)
z80pio_device &pio(Z80PIO(config, "pio", 16_MHz_XTAL / 4));
pio.out_int_callback().set_inputline(m_cpu, INPUT_LINE_IRQ0);
pio.out_pa_callback().set(FUNC(kdt6_state::pio_porta_w));
- pio.in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r));
- pio.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ pio.in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::read));
+ pio.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
CENTRONICS(config, m_centronics, centronics_devices, "printer");
m_centronics->set_data_input_buffer("cent_data_in");
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index bd7b14dedae..4d29790d821 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -728,7 +728,7 @@ void m5_state::m5_io(address_map &map)
map(0x35, 0x35).mirror(0x08).portr("Y5");
map(0x36, 0x36).mirror(0x08).portr("Y6");
map(0x37, 0x37).mirror(0x08).portr("JOY");
- map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::write));
map(0x50, 0x50).mirror(0x0f).rw(FUNC(m5_state::sts_r), FUNC(m5_state::com_w));
// map(0x60, 0x63) SIO
map(0x6c, 0x6c).rw(FUNC(m5_state::mem64KBI_r), FUNC(m5_state::mem64KBI_w)); //EM-64/64KBI paging
@@ -1049,7 +1049,7 @@ void brno_state::brno_io(address_map &map)
map(0x35, 0x35).portr("Y5");
map(0x36, 0x36).portr("Y6");
map(0x37, 0x37).portr("JOY");
- map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x40, 0x40).mirror(0x0f).w("cent_data_out", FUNC(output_latch_device::write));
map(0x50, 0x50).mirror(0x0f).rw(FUNC(brno_state::sts_r), FUNC(brno_state::com_w));
// map(0x60, 0x63) // SIO
map(0x64, 0x67).rw(FUNC(brno_state::mmu_r), FUNC(brno_state::mmu_w)); // MMU - page select (ramdisk memory paging)
diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp
index c937aa5e377..6349f290ec1 100644
--- a/src/mame/drivers/mario.cpp
+++ b/src/mame/drivers/mario.cpp
@@ -176,7 +176,7 @@ void mario_state::masao_map(address_map &map)
void mario_state::mario_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); /* dma controller */
+ map(0x00, 0x00).rw(m_z80dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); /* dma controller */
}
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index bac44bbf6ed..134f7f29daa 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -655,7 +655,7 @@ void mbee_state::mbee(machine_config &config)
Z80PIO(config, m_pio, 12_MHz_XTAL / 6);
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pio->out_ardy_callback().set(FUNC(mbee_state::pio_ardy));
m_pio->in_pb_callback().set(FUNC(mbee_state::pio_port_b_r));
m_pio->out_pb_callback().set(FUNC(mbee_state::pio_port_b_w));
@@ -714,7 +714,7 @@ void mbee_state::mbeeic(machine_config &config)
Z80PIO(config, m_pio, 13.5_MHz_XTAL / 4);
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pio->out_ardy_callback().set(FUNC(mbee_state::pio_ardy));
m_pio->in_pb_callback().set(FUNC(mbee_state::pio_port_b_r));
m_pio->out_pb_callback().set(FUNC(mbee_state::pio_port_b_w));
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index d676ebbe4c2..7fde774196d 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -260,7 +260,7 @@ void mc1000_state::mc1000_io(address_map &map)
{
map.global_mask(0xff);
map(0x04, 0x04).rw(FUNC(mc1000_state::printer_r), FUNC(mc1000_state::printer_w));
- map(0x05, 0x05).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x05, 0x05).w("cent_data_out", FUNC(output_latch_device::write));
// map(0x10, 0x10).w(m_crtc, FUNC(mc6845_device::address_w));
// map(0x11, 0x11).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
map(0x12, 0x12).w(FUNC(mc1000_state::mc6845_ctrl_w));
diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp
index 4c3a01bedfc..59734a3d610 100644
--- a/src/mame/drivers/mc1502.cpp
+++ b/src/mame/drivers/mc1502.cpp
@@ -256,7 +256,7 @@ void mc1502_state::mc1502(machine_config &config)
m_pic8259->out_int_callback().set_inputline(m_maincpu, 0);
I8255(config, m_ppi8255n1);
- m_ppi8255n1->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_ppi8255n1->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_ppi8255n1->out_pb_callback().set(FUNC(mc1502_state::mc1502_ppi_portb_w));
m_ppi8255n1->in_pc_callback().set(FUNC(mc1502_state::mc1502_ppi_portc_r));
m_ppi8255n1->out_pc_callback().set(FUNC(mc1502_state::mc1502_ppi_portc_w));
@@ -264,7 +264,7 @@ void mc1502_state::mc1502(machine_config &config)
I8255(config, m_ppi8255n2);
m_ppi8255n2->in_pa_callback().set(FUNC(mc1502_state::mc1502_kppi_porta_r));
m_ppi8255n2->out_pb_callback().set(FUNC(mc1502_state::mc1502_kppi_portb_w));
- m_ppi8255n2->in_pc_callback().set("cent_status_in", FUNC(input_buffer_device::bus_r));
+ m_ppi8255n2->in_pc_callback().set("cent_status_in", FUNC(input_buffer_device::read));
m_ppi8255n2->out_pc_callback().set(FUNC(mc1502_state::mc1502_kppi_portc_w));
I8251(config, m_upd8251, 0);
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index e8ec92473e8..8005a760237 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -551,9 +551,9 @@ void msx_state::msx_io_map(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
// 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system
- map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r));
- map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
- map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read));
+ map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write));
+ map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write));
map(0xa0, 0xa7).rw(m_ay8910, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w));
map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x98, 0x99).rw("tms9928a", FUNC(tms9928a_device::read), FUNC(tms9928a_device::write));
@@ -568,9 +568,9 @@ void msx2_state::msx2_io_map(address_map &map)
map.global_mask(0xff);
map(0x40, 0x4f).rw(FUNC(msx2_state::msx_switched_r), FUNC(msx2_state::msx_switched_w));
// 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system
- map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r));
- map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
- map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read));
+ map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write));
+ map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write));
map(0xa0, 0xa7).rw(m_ay8910, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w));
map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x98, 0x9b).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write));
@@ -587,9 +587,9 @@ void msx2_state::msx2p_io_map(address_map &map)
map.global_mask(0xff);
map(0x40, 0x4f).rw(FUNC(msx2_state::msx_switched_r), FUNC(msx2_state::msx_switched_w));
// 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system
- map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r));
- map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
- map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read));
+ map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write));
+ map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write));
map(0xa0, 0xa7).rw(m_ay8910, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_data_w));
map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x98, 0x9b).rw(m_v9958, FUNC(v9958_device::read), FUNC(v9958_device::write));
diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp
index 072489908d3..b456f97d649 100644
--- a/src/mame/drivers/mtx.cpp
+++ b/src/mame/drivers/mtx.cpp
@@ -53,7 +53,7 @@ void mtx_state::mtx_io(address_map &map)
map(0x01, 0x01).rw("tms9929a", FUNC(tms9929a_device::vram_read), FUNC(tms9929a_device::vram_write));
map(0x02, 0x02).rw("tms9929a", FUNC(tms9929a_device::register_read), FUNC(tms9929a_device::register_write));
map(0x03, 0x03).rw(FUNC(mtx_state::mtx_sound_strobe_r), FUNC(mtx_state::mtx_cst_w));
- map(0x04, 0x04).r(FUNC(mtx_state::mtx_prt_r)).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x04, 0x04).r(FUNC(mtx_state::mtx_prt_r)).w("cent_data_out", FUNC(output_latch_device::write));
map(0x05, 0x05).rw(FUNC(mtx_state::mtx_key_lo_r), FUNC(mtx_state::mtx_sense_w));
map(0x06, 0x06).rw(FUNC(mtx_state::mtx_key_hi_r), FUNC(mtx_state::mtx_sound_latch_w));
// map(0x07, 0x07) PIO
diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp
index 3c611cc0ec9..25cabc840f7 100644
--- a/src/mame/drivers/myb3k.cpp
+++ b/src/mame/drivers/myb3k.cpp
@@ -948,7 +948,7 @@ void myb3k_state::myb3k(machine_config &config)
/* Parallel port */
I8255A(config, m_ppi8255);
- m_ppi8255->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_ppi8255->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_ppi8255->in_pb_callback().set(FUNC(myb3k_state::ppi_portb_r));
m_ppi8255->out_pc_callback().set(FUNC(myb3k_state::ppi_portc_w));
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp
index 038828de369..82d989bf412 100644
--- a/src/mame/drivers/mz700.cpp
+++ b/src/mame/drivers/mz700.cpp
@@ -457,7 +457,7 @@ void mz_state::mz800(machine_config &config)
pio.out_int_callback().set(FUNC(mz_state::mz800_z80pio_irq));
pio.in_pa_callback().set(FUNC(mz_state::mz800_z80pio_port_a_r));
pio.out_pa_callback().set(FUNC(mz_state::mz800_z80pio_port_a_w));
- pio.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ pio.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
CENTRONICS(config, m_centronics, centronics_devices, "printer");
diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp
index eea21d91613..06ec723079d 100644
--- a/src/mame/drivers/nc.cpp
+++ b/src/mame/drivers/nc.cpp
@@ -848,7 +848,7 @@ void nc100_state::nc100_io(address_map &map)
map(0x10, 0x13).rw(FUNC(nc100_state::nc_memory_management_r), FUNC(nc100_state::nc_memory_management_w));
map(0x20, 0x20).w(FUNC(nc100_state::nc100_memory_card_wait_state_w));
map(0x30, 0x30).w(FUNC(nc100_state::nc100_uart_control_w));
- map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::write));
map(0x50, 0x53).w(FUNC(nc100_state::nc_sound_w));
map(0x60, 0x60).w(FUNC(nc100_state::nc_irq_mask_w));
map(0x70, 0x70).w(FUNC(nc100_state::nc100_poweroff_control_w));
@@ -1251,7 +1251,7 @@ void nc200_state::nc200_io(address_map &map)
map(0x10, 0x13).rw(FUNC(nc200_state::nc_memory_management_r), FUNC(nc200_state::nc_memory_management_w));
map(0x20, 0x20).w(FUNC(nc200_state::nc200_memory_card_wait_state_w));
map(0x30, 0x30).w(FUNC(nc200_state::nc200_uart_control_w));
- map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x40, 0x40).w("cent_data_out", FUNC(output_latch_device::write));
map(0x50, 0x53).w(FUNC(nc200_state::nc_sound_w));
map(0x60, 0x60).w(FUNC(nc200_state::nc_irq_mask_w));
map(0x70, 0x70).w(FUNC(nc200_state::nc200_poweroff_control_w));
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index 82b36cb9a9e..f15d00afcbb 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -161,7 +161,7 @@ void p8k_state::p8k_iomap(address_map &map)
map(0x24, 0x27).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
map(0x28, 0x2b).rw("sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
map(0x2c, 0x2f).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x3c, 0x3c).rw("dma", FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x3c, 0x3c).rw("dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write));
}
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index b736065dfb5..7afddfab616 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -144,7 +144,7 @@ void pencil2_state::io_map(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
- map(0x00, 0x0f).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x00, 0x0f).w("cent_data_out", FUNC(output_latch_device::write));
map(0x10, 0x1f).w(FUNC(pencil2_state::port10_w));
map(0x30, 0x3f).w(FUNC(pencil2_state::port30_w));
map(0x80, 0x9f).w(FUNC(pencil2_state::port80_w));
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index 9342dede5f7..4a4632b98e9 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -131,7 +131,7 @@ void phc25_state::phc25_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
- map(0x00, 0x00).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x00, 0x00).w("cent_data_out", FUNC(output_latch_device::write));
map(0x40, 0x40).rw(FUNC(phc25_state::port40_r), FUNC(phc25_state::port40_w));
map(0x80, 0x80).portr("KEY0");
map(0x81, 0x81).portr("KEY1");
diff --git a/src/mame/drivers/pp.cpp b/src/mame/drivers/pp.cpp
index 30ae4f265fd..72a4edca6bf 100644
--- a/src/mame/drivers/pp.cpp
+++ b/src/mame/drivers/pp.cpp
@@ -327,7 +327,7 @@ void pp_state::io_map(address_map &map)
map.global_mask(0xff);
map(0x00, 0x07).rw(m_pvtc, FUNC(scn2672_device::read), FUNC(scn2672_device::write));
map(0x08, 0x09).mirror(2).rw("pkdi", FUNC(i8279_device::read), FUNC(i8279_device::write));
- map(0x0d, 0x0d).mirror(2).r(m_pvtc, FUNC(scn2672_device::buffer_r)).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x0d, 0x0d).mirror(2).r(m_pvtc, FUNC(scn2672_device::buffer_r)).w("cent_data_out", FUNC(output_latch_device::write));
map(0x10, 0x13).mirror(4).rw("fdc", FUNC(fd1793_device::read), FUNC(fd1793_device::write));
map(0x18, 0x18).mirror(2).rw(FUNC(pp_state::stat_r), FUNC(pp_state::co_w));
map(0x1c, 0x1c).mirror(2).w(m_pvtc, FUNC(scn2672_device::buffer_w));
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index d5c92e99b75..26c5581756f 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -182,7 +182,7 @@ void prof180x_state::prof180x_io(address_map &map)
map(0x00d8, 0x00d8).mirror(0xff00).w("syslatch", FUNC(ls259_device::write_nibble_d0));
map(0x00d9, 0x00d9).select(0xff00).r(FUNC(prof180x_state::status_r));
map(0x00da, 0x00da).mirror(0xff00).rw(FDC9268_TAG, FUNC(upd765a_device::dma_r), FUNC(upd765a_device::dma_w));
- map(0x00db, 0x00db).mirror(0xff00).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x00db, 0x00db).mirror(0xff00).w("cent_data_out", FUNC(output_latch_device::write));
map(0x00dc, 0x00dd).mirror(0xff00).m(FDC9268_TAG, FUNC(upd765a_device::map));
}
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index ad66f2a15b3..fa89de4c6c3 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -1294,7 +1294,7 @@ void px4_state::px4_io(address_map &map)
map(0x14, 0x14).rw(FUNC(px4_state::artdir_r), FUNC(px4_state::artdor_w));
map(0x15, 0x15).rw(FUNC(px4_state::artsr_r), FUNC(px4_state::artmr_w));
map(0x16, 0x16).rw(FUNC(px4_state::iostr_r), FUNC(px4_state::artcr_w));
- map(0x17, 0x17).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x17, 0x17).w("cent_data_out", FUNC(output_latch_device::write));
map(0x18, 0x18).w(FUNC(px4_state::swr_w));
map(0x19, 0x19).w(FUNC(px4_state::ioctlr_w));
map(0x1a, 0x1f).noprw();
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index fcf5857e60b..71c8d1e1278 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -186,7 +186,7 @@ void rmnimbus_state::nimbus(machine_config &config)
EEPROM_93C06_16BIT(config, m_eeprom);
VIA6522(config, m_via, 1000000);
- m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_via->writepb_handler().set(FUNC(rmnimbus_state::nimbus_via_write_portb));
m_via->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
m_via->irq_handler().set(m_maincpu, FUNC(i80186_cpu_device::int3_w));
diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp
index fef76862797..52a1d70f53c 100644
--- a/src/mame/drivers/rt1715.cpp
+++ b/src/mame/drivers/rt1715.cpp
@@ -445,7 +445,7 @@ void rt1715_state::rt1715w_io(address_map &map)
{
rt1715_base_io(map);
- map(0x00, 0x00).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); // A2
+ map(0x00, 0x00).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // A2
map(0x04, 0x07).rw(m_ctc2, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // A4
// map(0x1a, 0x1b) // chargen write protection
map(0x1c, 0x1d).m(m_fdc, FUNC(i8272a_device::map));
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 358d7fc1d3d..a6a656a3229 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -423,7 +423,7 @@ void sage2_state::sage2(machine_config &config)
ppi0.out_pc_callback().set(FUNC(sage2_state::ppi0_pc_w));
i8255_device &ppi1(I8255A(config, I8255A_1_TAG));
- ppi1.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ ppi1.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
ppi1.in_pb_callback().set(FUNC(sage2_state::ppi1_pb_r));
ppi1.out_pc_callback().set(FUNC(sage2_state::ppi1_pc_w));
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index c3fc4bf18fc..008ea5b07b4 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -305,9 +305,9 @@ void samcoupe_state::samcoupe_io(address_map &map)
{
map(0x0080, 0x0081).select(0xff00).w(FUNC(samcoupe_state::samcoupe_ext_mem_w));
map(0x00e0, 0x00e7).select(0xff10).rw(FUNC(samcoupe_state::samcoupe_disk_r), FUNC(samcoupe_state::samcoupe_disk_w));
- map(0x00e8, 0x00e8).select(0xff00).w("lpt1_data_out", FUNC(output_latch_device::bus_w));
+ map(0x00e8, 0x00e8).select(0xff00).w("lpt1_data_out", FUNC(output_latch_device::write));
map(0x00e9, 0x00e9).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lpt1_busy_r), FUNC(samcoupe_state::samcoupe_lpt1_strobe_w));
- map(0x00ea, 0x00ea).select(0xff00).w("lpt2_data_out", FUNC(output_latch_device::bus_w));
+ map(0x00ea, 0x00ea).select(0xff00).w("lpt2_data_out", FUNC(output_latch_device::write));
map(0x00eb, 0x00eb).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lpt2_busy_r), FUNC(samcoupe_state::samcoupe_lpt2_strobe_w));
map(0x00f8, 0x00f8).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_pen_r), FUNC(samcoupe_state::samcoupe_clut_w));
map(0x00f9, 0x00f9).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_status_r), FUNC(samcoupe_state::samcoupe_line_int_w));
diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp
index c4a2c85c4d3..3d63c8fb6a9 100644
--- a/src/mame/drivers/sg1000.cpp
+++ b/src/mame/drivers/sg1000.cpp
@@ -635,7 +635,7 @@ void sf7000_state::sf7000(machine_config &config)
/* devices */
i8255_device &ppi(I8255(config, UPD9255_1_TAG));
ppi.in_pa_callback().set(FUNC(sf7000_state::ppi_pa_r));
- ppi.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ ppi.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
ppi.out_pc_callback().set(FUNC(sf7000_state::ppi_pc_w));
i8251_device &upd8251(I8251(config, UPD8251_TAG, 0));
diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp
index 41e664f4f01..127c57ef842 100644
--- a/src/mame/drivers/slicer.cpp
+++ b/src/mame/drivers/slicer.cpp
@@ -86,10 +86,10 @@ void slicer_state::slicer_io(address_map &map)
map(0x0080, 0x00ff).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)).umask16(0x00ff); //PCS1
map(0x0100, 0x010f).mirror(0x0070).w("drivelatch", FUNC(ls259_device::write_d0)).umask16(0x00ff); //PCS2
// TODO: 0x180 sets ack
- map(0x0180, 0x0180).r("sasi_data_in", FUNC(input_buffer_device::bus_r)).w("sasi_data_out", FUNC(output_latch_device::bus_w)).umask16(0x00ff); //PCS3
- map(0x0181, 0x0181).r("sasi_ctrl_in", FUNC(input_buffer_device::bus_r));
- map(0x0184, 0x0184).r("sasi_data_in", FUNC(input_buffer_device::bus_r)).w("sasi_data_out", FUNC(output_latch_device::bus_w)).umask16(0x00ff);
- map(0x0185, 0x0185).r("sasi_ctrl_in", FUNC(input_buffer_device::bus_r));
+ map(0x0180, 0x0180).r("sasi_data_in", FUNC(input_buffer_device::read)).w("sasi_data_out", FUNC(output_latch_device::write)).umask16(0x00ff); //PCS3
+ map(0x0181, 0x0181).r("sasi_ctrl_in", FUNC(input_buffer_device::read));
+ map(0x0184, 0x0184).r("sasi_data_in", FUNC(input_buffer_device::read)).w("sasi_data_out", FUNC(output_latch_device::write)).umask16(0x00ff);
+ map(0x0185, 0x0185).r("sasi_ctrl_in", FUNC(input_buffer_device::read));
}
static void slicer_floppies(device_slot_interface &device)
diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp
index d9a40e60fcc..3455e765110 100644
--- a/src/mame/drivers/sorcerer.cpp
+++ b/src/mame/drivers/sorcerer.cpp
@@ -210,7 +210,7 @@ void sorcerer_state::sorcerer_io(address_map &map)
map(0xfc, 0xfc).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit));
map(0xfd, 0xfd).rw(FUNC(sorcerer_state::port_fd_r), FUNC(sorcerer_state::port_fd_w));
map(0xfe, 0xfe).rw(FUNC(sorcerer_state::port_fe_r), FUNC(sorcerer_state::port_fe_w));
- map(0xff, 0xff).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0xff, 0xff).r("cent_status_in", FUNC(input_buffer_device::read));
map(0xff, 0xff).w(FUNC(sorcerer_state::port_ff_w));
}
@@ -230,7 +230,7 @@ void sorcerer_state::sorcererb_io(address_map &map)
sorcerer_io(map);
map(0x30, 0x33).rw(m_fdc3, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
map(0x34, 0x37).rw(FUNC(sorcerer_state::port34_r), FUNC(sorcerer_state::port34_w));
- map(0x38, 0x3b).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x38, 0x3b).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
}
void sorcerer_state::sorcererd_io(address_map &map)
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index f7bde1b2acc..e65fe0782f6 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -484,7 +484,7 @@ void spc1000_state::spc1000(machine_config &config)
SPEAKER(config, "mono").front_center();
ay8910_device &ay8910(AY8910(config, "ay8910", XTAL(4'000'000) / 1));
ay8910.port_a_read_callback().set(FUNC(spc1000_state::porta_r));
- ay8910.port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ ay8910.port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::write));
ay8910.add_route(ALL_OUTPUTS, "mono", 1.00);
SPC1000_EXP_SLOT(config, "ext1", spc1000_exp);
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index b1526bb4d51..963b729622f 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -906,7 +906,7 @@ void spc1500_state::spc1500(machine_config &config)
MCFG_VIDEO_START_OVERRIDE(spc1500_state, spc)
I8255(config, m_pio);
- m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pio->in_pb_callback().set(FUNC(spc1500_state::portb_r));
m_pio->out_pb_callback().set(FUNC(spc1500_state::portb_w));
m_pio->out_pc_callback().set(FUNC(spc1500_state::portc_w));
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp
index 89669442cd3..f34c23e9f42 100644
--- a/src/mame/drivers/super6.cpp
+++ b/src/mame/drivers/super6.cpp
@@ -277,7 +277,7 @@ void super6_state::super6_io(address_map &map)
map(0x04, 0x07).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x0c, 0x0f).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write));
- map(0x10, 0x10).mirror(0x03).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x10, 0x10).mirror(0x03).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x14, 0x14).rw(FUNC(super6_state::fdc_r), FUNC(super6_state::fdc_w));
map(0x15, 0x15).portr("J7").w(FUNC(super6_state::s100_w));
map(0x16, 0x16).w(FUNC(super6_state::bank0_w));
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index 877741406cf..c5d638bfbeb 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -275,7 +275,7 @@ void super80_state::super80_io(address_map &map)
{
map.global_mask(0xff);
map.unmap_value_high();
- map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read));
map(0xdc, 0xdc).w(FUNC(super80_state::super80_dc_w));
map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80_f0_w));
map(0xe1, 0xe1).mirror(0x14).w(FUNC(super80_state::super80_f1_w));
@@ -287,7 +287,7 @@ void super80_state::super80e_io(address_map &map)
{
map.global_mask(0xff);
map.unmap_value_high();
- map(0xbc, 0xbc).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0xbc, 0xbc).r("cent_status_in", FUNC(input_buffer_device::read));
map(0xbc, 0xbc).w(FUNC(super80_state::super80_dc_w));
map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80_f0_w));
map(0xe1, 0xe1).mirror(0x14).w(FUNC(super80_state::super80_f1_w));
@@ -302,11 +302,11 @@ void super80_state::super80r_io(address_map &map)
map(0x10, 0x10).w(FUNC(super80_state::super80v_10_w));
map(0x11, 0x11).r(m_crtc, FUNC(mc6845_device::register_r));
map(0x11, 0x11).w(FUNC(super80_state::super80v_11_w));
- map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x38, 0x3b).rw(m_fdc, FUNC(wd2793_device::read), FUNC(wd2793_device::write));
map(0x3e, 0x3e).r(FUNC(super80_state::port3e_r));
map(0x3f, 0x3f).w(FUNC(super80_state::port3f_w));
- map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read));
map(0xdc, 0xdc).w(FUNC(super80_state::super80_dc_w));
map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80r_f0_w));
map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::super80_f2_r));
@@ -320,7 +320,7 @@ void super80_state::super80v_io(address_map &map)
map(0x10, 0x10).w(FUNC(super80_state::super80v_10_w));
map(0x11, 0x11).r(m_crtc, FUNC(mc6845_device::register_r));
map(0x11, 0x11).w(FUNC(super80_state::super80v_11_w));
- map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read));
map(0xdc, 0xdc).w(FUNC(super80_state::super80_dc_w));
map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::super80_f0_w));
map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::super80_f2_r));
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index 73d47d758ba..e37a91829ae 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -1025,7 +1025,7 @@ void tandy2k_state::tandy2k(machine_config &config)
// devices
I8255A(config, m_i8255a);
- m_i8255a->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_i8255a->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_i8255a->in_pb_callback().set(FUNC(tandy2k_state::ppi_pb_r));
m_i8255a->out_pc_callback().set(FUNC(tandy2k_state::ppi_pc_w));
diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp
index 6b86d6adc5d..b4439a80989 100644
--- a/src/mame/drivers/thomson.cpp
+++ b/src/mame/drivers/thomson.cpp
@@ -2343,8 +2343,8 @@ void thomson_state::mo5nr_map(address_map &map)
map(0xa7cc, 0xa7cf).rw("pia_1", FUNC(pia6821_device::read_alt), FUNC(pia6821_device::write_alt));
map(0xa7d0, 0xa7d9).rw(FUNC(thomson_state::mo5nr_net_r), FUNC(thomson_state::mo5nr_net_w));
map(0xa7da, 0xa7dd).rw(FUNC(thomson_state::mo6_vreg_r), FUNC(thomson_state::mo6_vreg_w));
- map(0xa7e1, 0xa7e1).r("cent_data_in", FUNC(input_buffer_device::bus_r));
- map(0xa7e1, 0xa7e1).w(m_cent_data_out, FUNC(output_latch_device::bus_w));
+ map(0xa7e1, 0xa7e1).r("cent_data_in", FUNC(input_buffer_device::read));
+ map(0xa7e1, 0xa7e1).w(m_cent_data_out, FUNC(output_latch_device::write));
map(0xa7e3, 0xa7e3).rw(FUNC(thomson_state::mo5nr_prn_r), FUNC(thomson_state::mo5nr_prn_w));
map(0xa7e4, 0xa7e7).rw(FUNC(thomson_state::mo6_gatearray_r), FUNC(thomson_state::mo6_gatearray_w));
map(0xa7e8, 0xa7eb).rw("acia", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index e5adc75bd1d..d6d3c9202b9 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -736,8 +736,8 @@ void tiki100_state::tiki100(machine_config &config)
Z80PIO(config, m_pio, 8_MHz_XTAL / 4);
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- m_pio->in_pa_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r));
- m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio->in_pa_callback().set("cent_data_in", FUNC(input_buffer_device::read));
+ m_pio->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pio->in_pb_callback().set(FUNC(tiki100_state::pio_pb_r));
m_pio->out_pb_callback().set(FUNC(tiki100_state::pio_pb_w));
diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp
index 978c2881a89..721501d093f 100644
--- a/src/mame/drivers/trs80dt1.cpp
+++ b/src/mame/drivers/trs80dt1.cpp
@@ -171,7 +171,7 @@ void trs80dt1_state::io_map(address_map &map)
map(0xac00, 0xafff).r(FUNC(trs80dt1_state::key_r));
map(0xb000, 0xb3ff).portr("X9");
map(0xb400, 0xb7ff).w(FUNC(trs80dt1_state::store_w));
- map(0xb800, 0xbbff).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0xb800, 0xbbff).w("cent_data_out", FUNC(output_latch_device::write));
map(0xbc00, 0xbc01).mirror(0x3fe).rw(m_crtc, FUNC(i8276_device::read), FUNC(i8276_device::write)); // i8276
}
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index 9c9f8d74c44..826e1cb26c2 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -337,7 +337,7 @@ void trs80m2_state::z80_io(address_map &map)
map(0xef, 0xef).w(FUNC(trs80m2_state::drvslt_w));
map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0xf4, 0xf7).rw(Z80SIO_TAG, FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w));
- map(0xf8, 0xf8).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0xf8, 0xf8).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0xf9, 0xf9).w(FUNC(trs80m2_state::rom_enable_w));
map(0xfc, 0xfc).r(FUNC(trs80m2_state::keyboard_r)).w(m_crtc, FUNC(mc6845_device::address_w));
map(0xfd, 0xfd).rw(m_crtc, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
@@ -751,7 +751,7 @@ void trs80m2_state::trs80m2(machine_config &config)
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_pio->in_pa_callback().set(FUNC(trs80m2_state::pio_pa_r));
m_pio->out_pa_callback().set(FUNC(trs80m2_state::pio_pa_w));
- m_pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pio->out_brdy_callback().set(FUNC(trs80m2_state::strobe_w));
z80sio_device& sio(Z80SIO(config, Z80SIO_TAG, 8_MHz_XTAL / 2)); // SIO/0
@@ -844,7 +844,7 @@ void trs80m16_state::trs80m16(machine_config &config)
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_pio->in_pa_callback().set(FUNC(trs80m2_state::pio_pa_r));
m_pio->out_pa_callback().set(FUNC(trs80m2_state::pio_pa_w));
- m_pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
m_pio->out_brdy_callback().set(FUNC(trs80m2_state::strobe_w));
z80sio_device& sio(Z80SIO(config, Z80SIO_TAG, 8_MHz_XTAL / 2));
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index c1d5a5462fb..e8885133a74 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -94,7 +94,7 @@ void ts802_state::ts802_io(address_map &map)
map(0x0e, 0x0e).r(FUNC(ts802_state::port0e_r));
map(0x0f, 0x0f).r(FUNC(ts802_state::port0f_r));
// 10: Z80 DMA
- map(0x10, 0x13).rw("dma", FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x10, 0x13).rw("dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write));
// 14-17: WD 1793
map(0x14, 0x17).rw("fdc", FUNC(fd1793_device::read), FUNC(fd1793_device::write));
// 18: floppy misc.
diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp
index ee0dbc42ae1..4af788de994 100644
--- a/src/mame/drivers/ts816.cpp
+++ b/src/mame/drivers/ts816.cpp
@@ -95,7 +95,7 @@ void ts816_state::ts816_io(address_map &map)
map(0x68, 0x68).w(FUNC(ts816_state::port68_w)); // set 2nd bank latch
map(0x70, 0x78).w(FUNC(ts816_state::port78_w)); // reset 2nd bank latch (manual can't decide between 70 and 78, so we take both)
map(0x80, 0x83).rw("ctc1", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // CTC 1 (ch 0 baud A)
- map(0x90, 0x93).rw("dma", FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w)); // DMA
+ map(0x90, 0x93).rw("dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // DMA
map(0xA0, 0xA0); // WDC status / command
map(0xA1, 0xA1); // WDC data
map(0xB0, 0xB0).noprw(); // undocumented, written to at @0707 and @0710
diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp
index e1bee4affde..97227829e76 100644
--- a/src/mame/drivers/tvc.cpp
+++ b/src/mame/drivers/tvc.cpp
@@ -372,7 +372,7 @@ void tvc_state::tvc_io(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
map(0x00, 0x00).w(FUNC(tvc_state::border_color_w));
- map(0x01, 0x01).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0x01, 0x01).w("cent_data_out", FUNC(output_latch_device::write));
map(0x02, 0x02).w(FUNC(tvc_state::bank_w));
map(0x03, 0x03).w(FUNC(tvc_state::keyboard_w));
map(0x04, 0x06).w(FUNC(tvc_state::sound_w));
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index 027f3b61d0e..9b36f607b00 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -330,10 +330,10 @@ void unixpc_state::unixpc_mem(address_map &map)
map(0x470000, 0x470001).r(FUNC(unixpc_state::line_printer_r));
map(0x480000, 0x480001).w(FUNC(unixpc_state::rtc_w));
map(0x490000, 0x490001).select(0x7000).w(FUNC(unixpc_state::tcr_w));
- map(0x4a0000, 0x4a0000).w("mreg", FUNC(output_latch_device::bus_w));
+ map(0x4a0000, 0x4a0000).w("mreg", FUNC(output_latch_device::write));
map(0x4d0000, 0x4d7fff).w(FUNC(unixpc_state::diskdma_ptr_w));
map(0x4e0001, 0x4e0001).w(FUNC(unixpc_state::disk_control_w)).cswidth(16);
- map(0x4f0001, 0x4f0001).w("printlatch", FUNC(output_latch_device::bus_w));
+ map(0x4f0001, 0x4f0001).w("printlatch", FUNC(output_latch_device::write));
map(0xe00000, 0xe0000f).rw(m_hdc, FUNC(wd1010_device::read), FUNC(wd1010_device::write)).umask16(0x00ff);
map(0xe10000, 0xe10007).rw(m_wd2797, FUNC(wd_fdc_device_base::read), FUNC(wd_fdc_device_base::write)).umask16(0x00ff);
map(0xe30000, 0xe30001).r(FUNC(unixpc_state::rtc_r));
diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp
index 6444ef85ea0..6ec2e1c8749 100644
--- a/src/mame/drivers/v1050.cpp
+++ b/src/mame/drivers/v1050.cpp
@@ -493,8 +493,8 @@ void v1050_state::v1050_io(address_map &map)
map(0xb0, 0xb0).rw(FUNC(v1050_state::dint_clr_r), FUNC(v1050_state::dint_clr_w));
map(0xc0, 0xc0).w(FUNC(v1050_state::v1050_i8214_w));
map(0xd0, 0xd0).w(FUNC(v1050_state::bank_w));
- map(0xe0, 0xe0).w(FUNC(v1050_state::sasi_data_w)).r(m_sasi_data_in, FUNC(input_buffer_device::bus_r));
- map(0xe1, 0xe1).r(m_sasi_ctrl_in, FUNC(input_buffer_device::bus_r)).w(FUNC(v1050_state::sasi_ctrl_w));
+ map(0xe0, 0xe0).w(FUNC(v1050_state::sasi_data_w)).r(m_sasi_data_in, FUNC(input_buffer_device::read));
+ map(0xe1, 0xe1).r(m_sasi_ctrl_in, FUNC(input_buffer_device::read)).w(FUNC(v1050_state::sasi_ctrl_w));
}
void v1050_state::v1050_crt_mem(address_map &map)
@@ -1059,7 +1059,7 @@ void v1050_state::v1050(machine_config &config)
i8255_device &ppi_misc(I8255A(config, I8255A_MISC_TAG));
ppi_misc.in_pc_callback().set(FUNC(v1050_state::misc_ppi_pc_r));
ppi_misc.out_pa_callback().set(FUNC(v1050_state::misc_ppi_pa_w));
- ppi_misc.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ ppi_misc.out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
ppi_misc.out_pc_callback().set(FUNC(v1050_state::misc_ppi_pc_w));
i8255_device &ppi_rtc(I8255A(config, I8255A_RTC_TAG));
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index b55affe33ed..16aa147837a 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -1403,7 +1403,7 @@ void x1_state::x1turbo_io_banks(address_map &map)
map(0x1000, 0x12ff).w(FUNC(x1_state::x1turboz_4096_palette_w));
- map(0x1f80, 0x1f80).mirror(0x000f).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1f80, 0x1f80).mirror(0x000f).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x1f90, 0x1f93).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
map(0x1f98, 0x1f9f).rw(FUNC(x1_state::ext_sio_ctc_r), FUNC(x1_state::ext_sio_ctc_w));
map(0x1fb0, 0x1fb0).rw(FUNC(x1_state::x1turbo_pal_r), FUNC(x1_state::x1turbo_pal_w)); // Z only!
diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp
index a167ab42cd2..28a03ce75a3 100644
--- a/src/mame/drivers/xerox820.cpp
+++ b/src/mame/drivers/xerox820.cpp
@@ -730,10 +730,10 @@ void xerox820ii_state::xerox820ii(machine_config &config)
z80pio_device& pio_rd(Z80PIO(config, Z80PIO_RD_TAG, 20_MHz_XTAL / 8));
pio_rd.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- pio_rd.in_pa_callback().set("sasi_data_in", FUNC(input_buffer_device::bus_r));
- pio_rd.out_pa_callback().set("sasi_data_out", FUNC(output_latch_device::bus_w));
+ pio_rd.in_pa_callback().set("sasi_data_in", FUNC(input_buffer_device::read));
+ pio_rd.out_pa_callback().set("sasi_data_out", FUNC(output_latch_device::write));
pio_rd.out_ardy_callback().set(FUNC(xerox820ii_state::rdpio_pardy_w));
- pio_rd.in_pb_callback().set("sasi_ctrl_in", FUNC(input_buffer_device::bus_r));
+ pio_rd.in_pb_callback().set("sasi_ctrl_in", FUNC(input_buffer_device::read));
pio_rd.out_pb_callback().set(FUNC(xerox820ii_state::rdpio_pb_w));
Z80CTC(config, m_ctc, 16_MHz_XTAL / 4);
diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp
index 07503074fb0..49de558080c 100644
--- a/src/mame/drivers/xor100.cpp
+++ b/src/mame/drivers/xor100.cpp
@@ -511,7 +511,7 @@ void xor100_state::xor100(machine_config &config)
brg.ft_handler().append(m_uart_b, FUNC(i8251_device::write_rxc));
i8255_device &ppi(I8255A(config, I8255A_TAG));
- ppi.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ ppi.out_pa_callback().set("cent_data_out", FUNC(output_latch_device::write));
ppi.out_pb_callback().set(m_centronics, FUNC(centronics_device::write_strobe));
ppi.in_pc_callback().set(FUNC(xor100_state::i8255_pc_r));
diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp
index fb84b16637e..5281f2ca767 100644
--- a/src/mame/drivers/zorba.cpp
+++ b/src/mame/drivers/zorba.cpp
@@ -89,7 +89,7 @@ void zorba_state::zorba_io(address_map &map)
map(0x22, 0x23).rw(m_uart1, FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0x24, 0x25).rw(m_uart2, FUNC(i8251_device::read), FUNC(i8251_device::write));
map(0x26, 0x26).w(FUNC(zorba_state::intmask_w));
- map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x30, 0x30).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
map(0x40, 0x43).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
map(0x50, 0x53).rw(m_pia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x60, 0x63).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -188,7 +188,7 @@ void zorba_state::zorba(machine_config &config)
// port B - parallel interface
PIA6821(config, m_pia0, 0);
m_pia0->writepa_handler().set(FUNC(zorba_state::pia0_porta_w));
- m_pia0->writepb_handler().set("parprndata", FUNC(output_latch_device::bus_w));
+ m_pia0->writepb_handler().set("parprndata", FUNC(output_latch_device::write));
m_pia0->cb2_handler().set("parprn", FUNC(centronics_device::write_strobe));
// IEEE488 interface
diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp
index 059dd1714ab..3a3807567e2 100644
--- a/src/mame/machine/thomson.cpp
+++ b/src/mame/machine/thomson.cpp
@@ -525,7 +525,7 @@ void to7_io_line_device::device_add_mconfig(machine_config &config)
PIA6821(config, m_pia_io, 0);
m_pia_io->readpa_handler().set(FUNC(to7_io_line_device::porta_in));
m_pia_io->writepa_handler().set(FUNC(to7_io_line_device::porta_out));
- m_pia_io->writepb_handler().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pia_io->writepb_handler().set("cent_data_out", FUNC(output_latch_device::write));
m_pia_io->cb2_handler().set("centronics", FUNC(centronics_device::write_strobe));
m_pia_io->irqa_handler().set("^mainfirq", FUNC(input_merger_device::in_w<1>));
m_pia_io->irqb_handler().set("^mainfirq", FUNC(input_merger_device::in_w<1>));