summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-03-25 18:26:17 +0100
committer Ivan Vangelista <mesgnet@yahoo.it>2020-03-25 18:26:17 +0100
commitdc83375dcaaecddc3302cc9eddb0e39b17cb3f04 (patch)
tree82dcab9a2efc60b449f3c5a53cc0bee5437b2d46 /src/devices
parent3a15530fa5afafd6fff1e226ffce9aabb0993b3c (diff)
devices/machine: simplified more handlers (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp6
-rw-r--r--src/devices/bus/a2bus/mouse.cpp2
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp2
-rw-r--r--src/devices/bus/c64/buscard.cpp4
-rw-r--r--src/devices/bus/hp80_io/82900.cpp6
-rw-r--r--src/devices/bus/hp80_io/82937.cpp2
-rw-r--r--src/devices/bus/hp80_io/82939.cpp6
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp2
-rw-r--r--src/devices/bus/ieee488/softbox.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp10
-rw-r--r--src/devices/cpu/z80/tmpz84c011.h42
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp6
-rw-r--r--src/devices/cpu/z80/tmpz84c015.h18
-rw-r--r--src/devices/machine/1ma6.cpp4
-rw-r--r--src/devices/machine/1ma6.h4
-rw-r--r--src/devices/machine/1mb5.cpp8
-rw-r--r--src/devices/machine/1mb5.h8
-rw-r--r--src/devices/machine/28fxxx.cpp4
-rw-r--r--src/devices/machine/28fxxx.h4
-rw-r--r--src/devices/machine/40105.cpp5
-rw-r--r--src/devices/machine/40105.h1
-rw-r--r--src/devices/machine/64h156.cpp4
-rw-r--r--src/devices/machine/64h156.h4
-rw-r--r--src/devices/machine/6532riot.cpp4
-rw-r--r--src/devices/machine/6532riot.h4
-rw-r--r--src/devices/machine/68153bim.cpp4
-rw-r--r--src/devices/machine/68153bim.h4
-rw-r--r--src/devices/machine/6821pia.cpp14
-rw-r--r--src/devices/machine/6821pia.h6
-rw-r--r--src/devices/machine/68230pit.cpp4
-rw-r--r--src/devices/machine/68230pit.h4
-rw-r--r--src/devices/machine/68561mpcc.cpp4
-rw-r--r--src/devices/machine/68561mpcc.h6
-rw-r--r--src/devices/machine/74153.cpp6
-rw-r--r--src/devices/machine/74153.h6
-rw-r--r--src/devices/machine/74161.cpp2
-rw-r--r--src/devices/machine/74161.h2
-rw-r--r--src/devices/machine/8042kbdc.cpp4
-rw-r--r--src/devices/machine/8042kbdc.h4
-rw-r--r--src/devices/machine/82s129.cpp4
-rw-r--r--src/devices/machine/82s129.h4
-rw-r--r--src/devices/machine/8530scc.cpp4
-rw-r--r--src/devices/machine/8530scc.h4
-rw-r--r--src/devices/machine/aakart.cpp4
-rw-r--r--src/devices/machine/aakart.h4
-rw-r--r--src/devices/machine/aic6250.cpp4
-rw-r--r--src/devices/machine/aic6250.h4
-rw-r--r--src/devices/machine/am53cf96.cpp7
-rw-r--r--src/devices/machine/am53cf96.h4
-rw-r--r--src/devices/machine/amigafdc.cpp2
-rw-r--r--src/devices/machine/amigafdc.h2
-rw-r--r--src/devices/machine/applefdc.cpp4
-rw-r--r--src/devices/machine/applefdc.h8
-rw-r--r--src/devices/machine/at28c16.cpp4
-rw-r--r--src/devices/machine/at28c16.h4
-rw-r--r--src/devices/machine/ay31015.cpp33
-rw-r--r--src/devices/machine/ay31015.h9
-rw-r--r--src/devices/machine/busmouse.cpp6
-rw-r--r--src/devices/machine/busmouse.h6
-rw-r--r--src/devices/machine/cdp1852.cpp4
-rw-r--r--src/devices/machine/cdp1852.h4
-rw-r--r--src/devices/machine/cdp1871.cpp2
-rw-r--r--src/devices/machine/cdp1871.h2
-rw-r--r--src/devices/machine/cdp1879.cpp4
-rw-r--r--src/devices/machine/cdp1879.h4
-rw-r--r--src/devices/machine/corvushd.cpp6
-rw-r--r--src/devices/machine/corvushd.h6
-rw-r--r--src/devices/machine/cr511b.cpp4
-rw-r--r--src/devices/machine/cr511b.h4
-rw-r--r--src/devices/machine/cs8221.cpp6
-rw-r--r--src/devices/machine/cs8221.h6
-rw-r--r--src/devices/machine/ds1386.cpp4
-rw-r--r--src/devices/machine/ds1386.h4
-rw-r--r--src/devices/machine/ds2404.cpp142
-rw-r--r--src/devices/machine/ds2404.h42
-rw-r--r--src/devices/machine/ds75160a.cpp4
-rw-r--r--src/devices/machine/ds75160a.h4
-rw-r--r--src/devices/machine/e05a03.cpp4
-rw-r--r--src/devices/machine/e05a03.h4
-rw-r--r--src/devices/machine/e05a30.cpp4
-rw-r--r--src/devices/machine/e05a30.h4
-rw-r--r--src/devices/machine/f3853.cpp32
-rw-r--r--src/devices/machine/f3853.h16
-rw-r--r--src/devices/machine/fdc37c665gt.cpp4
-rw-r--r--src/devices/machine/fdc37c665gt.h4
-rw-r--r--src/devices/machine/fdc37c93x.cpp76
-rw-r--r--src/devices/machine/fdc37c93x.h24
-rw-r--r--src/devices/machine/fga002.cpp4
-rw-r--r--src/devices/machine/fga002.h4
-rw-r--r--src/devices/machine/genpc.cpp40
-rw-r--r--src/devices/machine/genpc.h42
-rw-r--r--src/devices/machine/i82439tx.cpp50
-rw-r--r--src/devices/machine/i82439tx.h50
-rw-r--r--src/devices/machine/latch8.cpp22
-rw-r--r--src/devices/machine/latch8.h22
-rw-r--r--src/devices/machine/mos6530n.cpp60
-rw-r--r--src/devices/machine/mos6530n.h38
-rw-r--r--src/devices/machine/z80sti.cpp4
-rw-r--r--src/devices/machine/z80sti.h4
99 files changed, 521 insertions, 596 deletions
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index 3b0af093659..b2e845f3d2c 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -128,10 +128,10 @@ uint8_t a2bus_corvus_device::read_c0nx(uint8_t offset)
switch (offset)
{
case 0:
- return m_corvushd->read(machine().dummy_space(), 0);
+ return m_corvushd->read();
case 1:
- return m_corvushd->status_r(machine().dummy_space(), 0);
+ return m_corvushd->status_r();
default:
logerror("Corvus: read unhandled c0n%x (%s)\n", offset, machine().describe_context());
@@ -150,7 +150,7 @@ void a2bus_corvus_device::write_c0nx(uint8_t offset, uint8_t data)
{
if (offset == 0)
{
- m_corvushd->write(machine().dummy_space(), 0, data);
+ m_corvushd->write(data);
}
}
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 817cbd1fd85..99a0f4c3bbd 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -294,7 +294,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w)
WRITE8_MEMBER(a2bus_mouse_device::mcu_port_c_w)
{
- m_pia->write_portb(data << 4);
+ m_pia->portb_w(data << 4);
}
template <unsigned AXIS, u8 DIR, u8 CLK> void a2bus_mouse_device::update_axis()
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 466cf0af036..6bab78c845e 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -225,7 +225,7 @@ WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b)
// if it's a read, poke it into the PIA
if ((data>>5) & 1)
{
- m_pia->write_porta(m_msm5832->data_r());
+ m_pia->porta_w(m_msm5832->data_r());
}
}
diff --git a/src/devices/bus/c64/buscard.cpp b/src/devices/bus/c64/buscard.cpp
index 26175466a2e..e386b6839bc 100644
--- a/src/devices/bus/c64/buscard.cpp
+++ b/src/devices/bus/c64/buscard.cpp
@@ -97,7 +97,7 @@ READ8_MEMBER( c64_buscard_device::ppi_pa_r )
if (!m_te)
{
- data = m_ieee1->read(space, 0);
+ data = m_ieee1->read();
}
if (m_dipsw)
@@ -110,7 +110,7 @@ READ8_MEMBER( c64_buscard_device::ppi_pa_r )
WRITE8_MEMBER( c64_buscard_device::ppi_pa_w )
{
- m_ieee1->write(space, 0, data);
+ m_ieee1->write(data);
m_centronics->write_data0(BIT(data, 0));
m_centronics->write_data1(BIT(data, 1));
diff --git a/src/devices/bus/hp80_io/82900.cpp b/src/devices/bus/hp80_io/82900.cpp
index 008770abb52..41bf86747e8 100644
--- a/src/devices/bus/hp80_io/82900.cpp
+++ b/src/devices/bus/hp80_io/82900.cpp
@@ -44,7 +44,7 @@ hp82900_io_card_device::~hp82900_io_card_device()
void hp82900_io_card_device::install_read_write_handlers(address_space& space , uint16_t base_addr)
{
- space.install_readwrite_handler(base_addr, base_addr + 1, read8_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_r)), write8_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_w)));
+ space.install_readwrite_handler(base_addr, base_addr + 1, read8sm_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_r)), write8sm_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_w)));
}
void hp82900_io_card_device::inten()
@@ -116,7 +116,7 @@ READ8_MEMBER(hp82900_io_card_device::cpu_io_r)
uint8_t res;
if (BIT(offset , 6) && (m_addr_latch & 0x82) == 0) {
- res = m_translator->uc_r(space , m_addr_latch & 1 , mem_mask);
+ res = m_translator->uc_r(m_addr_latch & 1);
} else {
res = ~0;
}
@@ -127,7 +127,7 @@ WRITE8_MEMBER(hp82900_io_card_device::cpu_io_w)
{
m_rom_enabled = false;
if (BIT(offset , 6) && (m_addr_latch & 0x82) == 0) {
- m_translator->uc_w(space , m_addr_latch & 1 , data , mem_mask);
+ m_translator->uc_w(m_addr_latch & 1 , data);
} else if (BIT(offset , 7)) {
m_addr_latch = data;
}
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index 6e145bb3baf..c9a699cf539 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -71,7 +71,7 @@ hp82937_io_card_device::~hp82937_io_card_device()
void hp82937_io_card_device::install_read_write_handlers(address_space& space , uint16_t base_addr)
{
- space.install_readwrite_handler(base_addr, base_addr + 1, read8_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_r)), write8_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_w)));
+ space.install_readwrite_handler(base_addr, base_addr + 1, read8sm_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_r)), write8sm_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_w)));
}
void hp82937_io_card_device::inten()
diff --git a/src/devices/bus/hp80_io/82939.cpp b/src/devices/bus/hp80_io/82939.cpp
index a65c375396c..8106f9df9ae 100644
--- a/src/devices/bus/hp80_io/82939.cpp
+++ b/src/devices/bus/hp80_io/82939.cpp
@@ -52,7 +52,7 @@ hp82939_io_card_device::~hp82939_io_card_device()
void hp82939_io_card_device::install_read_write_handlers(address_space& space , uint16_t base_addr)
{
- space.install_readwrite_handler(base_addr, base_addr + 1, read8_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_r)), write8_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_w)));
+ space.install_readwrite_handler(base_addr, base_addr + 1, read8sm_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_r)), write8sm_delegate(*m_translator, FUNC(hp_1mb5_device::cpu_w)));
}
void hp82939_io_card_device::inten()
@@ -166,7 +166,7 @@ READ8_MEMBER(hp82939_io_card_device::p2_r)
READ8_MEMBER(hp82939_io_card_device::cpu_r)
{
if ((offset & 0x82) == 0x00) {
- return m_translator->uc_r(space , offset & 1 , mem_mask);
+ return m_translator->uc_r(offset & 1);
} else if ((offset & 0x83) == 0x82) {
return m_uart->ins8250_r((offset >> 2) & 7);
} else {
@@ -177,7 +177,7 @@ READ8_MEMBER(hp82939_io_card_device::cpu_r)
WRITE8_MEMBER(hp82939_io_card_device::cpu_w)
{
if ((offset & 0x82) == 0x00) {
- m_translator->uc_w(space , offset & 1 , data , mem_mask);
+ m_translator->uc_w(offset & 1 , data);
} else if ((offset & 0x83) == 0x82) {
m_uart->ins8250_w((offset >> 2) & 7 , data);
}
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index 0b982ee772d..be648c1fa50 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -231,7 +231,7 @@ READ8_MEMBER( hardbox_device::ppi1_pc_r )
*/
- uint8_t status = m_hdc->status_r(space, 0);
+ uint8_t status = m_hdc->status_r();
uint8_t data = 0;
data |= (status & corvus_hdc_device::CONTROLLER_BUSY) ? 0 : 0x10;
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index e2041d3e4e2..8076a0d5432 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -187,7 +187,7 @@ READ8_MEMBER( softbox_device::ppi1_pc_r )
*/
- uint8_t status = m_hdc->status_r(space, 0);
+ uint8_t status = m_hdc->status_r();
uint8_t data = 0;
data |= (status & corvus_hdc_device::CONTROLLER_BUSY) ? 0 : 0x10;
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index 5dd354a1f19..c28aa2b243a 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -109,11 +109,11 @@ void tmpz84c011_device::device_reset()
z80_device::device_reset();
// initialize I/O
- tmpz84c011_dir_pa_w(*m_io, 0, 0); tmpz84c011_pa_w(*m_io, 0, 0);
- tmpz84c011_dir_pb_w(*m_io, 0, 0); tmpz84c011_pb_w(*m_io, 0, 0);
- tmpz84c011_dir_pc_w(*m_io, 0, 0); tmpz84c011_pc_w(*m_io, 0, 0);
- tmpz84c011_dir_pd_w(*m_io, 0, 0); tmpz84c011_pd_w(*m_io, 0, 0);
- tmpz84c011_dir_pe_w(*m_io, 0, 0); tmpz84c011_pe_w(*m_io, 0, 0);
+ tmpz84c011_dir_pa_w(0); tmpz84c011_pa_w(0);
+ tmpz84c011_dir_pb_w(0); tmpz84c011_pb_w(0);
+ tmpz84c011_dir_pc_w(0); tmpz84c011_pc_w(0);
+ tmpz84c011_dir_pd_w(0); tmpz84c011_pd_w(0);
+ tmpz84c011_dir_pe_w(0); tmpz84c011_pe_w(0);
}
diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h
index 013416cbd9e..89b40a9f6aa 100644
--- a/src/devices/cpu/z80/tmpz84c011.h
+++ b/src/devices/cpu/z80/tmpz84c011.h
@@ -57,27 +57,27 @@ public:
/////////////////////////////////////////////////////////
- DECLARE_READ8_MEMBER( tmpz84c011_pa_r ) { return (m_inportsa() & ~m_pio_dir[0]) | (m_pio_latch[0] & m_pio_dir[0]); }
- DECLARE_READ8_MEMBER( tmpz84c011_pb_r ) { return (m_inportsb() & ~m_pio_dir[1]) | (m_pio_latch[1] & m_pio_dir[1]); }
- DECLARE_READ8_MEMBER( tmpz84c011_pc_r ) { return (m_inportsc() & ~m_pio_dir[2]) | (m_pio_latch[2] & m_pio_dir[2]); }
- DECLARE_READ8_MEMBER( tmpz84c011_pd_r ) { return (m_inportsd() & ~m_pio_dir[3]) | (m_pio_latch[3] & m_pio_dir[3]); }
- DECLARE_READ8_MEMBER( tmpz84c011_pe_r ) { return (m_inportse() & ~m_pio_dir[4]) | (m_pio_latch[4] & m_pio_dir[4]); }
- DECLARE_WRITE8_MEMBER( tmpz84c011_pa_w ) { m_pio_latch[0] = data; m_outportsa(data & m_pio_dir[0]); }
- DECLARE_WRITE8_MEMBER( tmpz84c011_pb_w ) { m_pio_latch[1] = data; m_outportsb(data & m_pio_dir[1]); }
- DECLARE_WRITE8_MEMBER( tmpz84c011_pc_w ) { m_pio_latch[2] = data; m_outportsc(data & m_pio_dir[2]); }
- DECLARE_WRITE8_MEMBER( tmpz84c011_pd_w ) { m_pio_latch[3] = data; m_outportsd(data & m_pio_dir[3]); }
- DECLARE_WRITE8_MEMBER( tmpz84c011_pe_w ) { m_pio_latch[4] = data; m_outportse(data & m_pio_dir[4]); }
-
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pa_r ) { return m_pio_dir[0]; }
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pb_r ) { return m_pio_dir[1]; }
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pc_r ) { return m_pio_dir[2]; }
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pd_r ) { return m_pio_dir[3]; }
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pe_r ) { return m_pio_dir[4]; }
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pa_w ) { m_pio_dir[0] = data; }
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pb_w ) { m_pio_dir[1] = data; }
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pc_w ) { m_pio_dir[2] = data; }
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pd_w ) { m_pio_dir[3] = data; }
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pe_w ) { m_pio_dir[4] = data; }
+ uint8_t tmpz84c011_pa_r() { return (m_inportsa() & ~m_pio_dir[0]) | (m_pio_latch[0] & m_pio_dir[0]); }
+ uint8_t tmpz84c011_pb_r() { return (m_inportsb() & ~m_pio_dir[1]) | (m_pio_latch[1] & m_pio_dir[1]); }
+ uint8_t tmpz84c011_pc_r() { return (m_inportsc() & ~m_pio_dir[2]) | (m_pio_latch[2] & m_pio_dir[2]); }
+ uint8_t tmpz84c011_pd_r() { return (m_inportsd() & ~m_pio_dir[3]) | (m_pio_latch[3] & m_pio_dir[3]); }
+ uint8_t tmpz84c011_pe_r() { return (m_inportse() & ~m_pio_dir[4]) | (m_pio_latch[4] & m_pio_dir[4]); }
+ void tmpz84c011_pa_w(uint8_t data) { m_pio_latch[0] = data; m_outportsa(data & m_pio_dir[0]); }
+ void tmpz84c011_pb_w(uint8_t data) { m_pio_latch[1] = data; m_outportsb(data & m_pio_dir[1]); }
+ void tmpz84c011_pc_w(uint8_t data) { m_pio_latch[2] = data; m_outportsc(data & m_pio_dir[2]); }
+ void tmpz84c011_pd_w(uint8_t data) { m_pio_latch[3] = data; m_outportsd(data & m_pio_dir[3]); }
+ void tmpz84c011_pe_w(uint8_t data) { m_pio_latch[4] = data; m_outportse(data & m_pio_dir[4]); }
+
+ uint8_t tmpz84c011_dir_pa_r() { return m_pio_dir[0]; }
+ uint8_t tmpz84c011_dir_pb_r() { return m_pio_dir[1]; }
+ uint8_t tmpz84c011_dir_pc_r() { return m_pio_dir[2]; }
+ uint8_t tmpz84c011_dir_pd_r() { return m_pio_dir[3]; }
+ uint8_t tmpz84c011_dir_pe_r() { return m_pio_dir[4]; }
+ void tmpz84c011_dir_pa_w(uint8_t data) { m_pio_dir[0] = data; }
+ void tmpz84c011_dir_pb_w(uint8_t data) { m_pio_dir[1] = data; }
+ void tmpz84c011_dir_pc_w(uint8_t data) { m_pio_dir[2] = data; }
+ void tmpz84c011_dir_pd_w(uint8_t data) { m_pio_dir[3] = data; }
+ void tmpz84c011_dir_pe_w(uint8_t data) { m_pio_dir[4] = data; }
void tmpz84c011_internal_io_map(address_map &map);
protected:
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index 5c6b82a8f88..08ceb2bc1f0 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -118,7 +118,7 @@ void tmpz84c015_device::device_start()
void tmpz84c015_device::device_reset()
{
- irq_priority_w(*m_io, 0, 0);
+ irq_priority_w(0);
z80_device::device_reset();
}
@@ -132,12 +132,12 @@ void tmpz84c015_device::device_post_load()
// reinit irq priority
uint8_t prio = m_irq_priority;
m_irq_priority = -1;
- irq_priority_w(*m_io, 0, prio);
+ irq_priority_w(prio);
}
/* CPU interface */
-WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
+void tmpz84c015_device::irq_priority_w(uint8_t data)
{
data &= 7;
diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
index bb012d5cd14..a5b7027b57a 100644
--- a/src/devices/cpu/z80/tmpz84c015.h
+++ b/src/devices/cpu/z80/tmpz84c015.h
@@ -85,10 +85,10 @@ public:
DECLARE_WRITE_LINE_MEMBER( strobe_a ) { m_pio->strobe_a(state); }
DECLARE_WRITE_LINE_MEMBER( strobe_b ) { m_pio->strobe_b(state); }
- DECLARE_WRITE8_MEMBER( pa_w ) { m_pio->port_a_write(data); }
- DECLARE_READ8_MEMBER( pa_r ) { return m_pio->port_a_read(); }
- DECLARE_WRITE8_MEMBER( pb_w ) { m_pio->port_b_write(data); }
- DECLARE_READ8_MEMBER( pb_r ) { return m_pio->port_b_read(); }
+ void pa_w(uint8_t data) { m_pio->port_a_write(data); }
+ uint8_t pa_r() { return m_pio->port_a_read(); }
+ void pb_w(uint8_t data) { m_pio->port_b_write(data); }
+ uint8_t pb_r() { return m_pio->port_b_read(); }
DECLARE_WRITE_LINE_MEMBER( pa0_w ) { m_pio->pa0_w(state); }
DECLARE_WRITE_LINE_MEMBER( pa1_w ) { m_pio->pa1_w(state); }
DECLARE_WRITE_LINE_MEMBER( pa2_w ) { m_pio->pa2_w(state); }
@@ -108,7 +108,7 @@ public:
/////////////////////////////////////////////////////////
- DECLARE_WRITE8_MEMBER( irq_priority_w );
+ void irq_priority_w(uint8_t data);
void tmpz84c015_internal_io_map(address_map &map);
protected:
@@ -178,12 +178,12 @@ private:
template<unsigned N> DECLARE_WRITE_LINE_MEMBER( zc_cb_trampoline_w ) { m_zc_cb[N](state); }
- DECLARE_READ8_MEMBER( in_pa_cb_trampoline_r ) { return m_in_pa_cb(); }
- DECLARE_WRITE8_MEMBER( out_pa_cb_trampoline_w ) { m_out_pa_cb(data); }
+ uint8_t in_pa_cb_trampoline_r() { return m_in_pa_cb(); }
+ void out_pa_cb_trampoline_w(uint8_t data) { m_out_pa_cb(data); }
DECLARE_WRITE_LINE_MEMBER( out_ardy_cb_trampoline_w ) { m_out_ardy_cb(state); }
- DECLARE_READ8_MEMBER( in_pb_cb_trampoline_r ) { return m_in_pb_cb(); }
- DECLARE_WRITE8_MEMBER( out_pb_cb_trampoline_w ) { m_out_pb_cb(data); }
+ uint8_t in_pb_cb_trampoline_r() { return m_in_pb_cb(); }
+ void out_pb_cb_trampoline_w(uint8_t data) { m_out_pb_cb(data); }
DECLARE_WRITE_LINE_MEMBER( out_brdy_cb_trampoline_w ) { m_out_brdy_cb(state); }
};
diff --git a/src/devices/machine/1ma6.cpp b/src/devices/machine/1ma6.cpp
index 479c7b9d6d3..284088a9f00 100644
--- a/src/devices/machine/1ma6.cpp
+++ b/src/devices/machine/1ma6.cpp
@@ -117,7 +117,7 @@ hp_1ma6_device::hp_1ma6_device(const machine_config &mconfig, const char *tag, d
clear_state();
}
-WRITE8_MEMBER(hp_1ma6_device::reg_w)
+void hp_1ma6_device::reg_w(offs_t offset, uint8_t data)
{
LOG("WR %u=%02x\n" , offset , data);
switch(offset) {
@@ -133,7 +133,7 @@ WRITE8_MEMBER(hp_1ma6_device::reg_w)
}
}
-READ8_MEMBER(hp_1ma6_device::reg_r)
+uint8_t hp_1ma6_device::reg_r(offs_t offset)
{
uint8_t res = 0;
diff --git a/src/devices/machine/1ma6.h b/src/devices/machine/1ma6.h
index d2943857760..cb083e05c88 100644
--- a/src/devices/machine/1ma6.h
+++ b/src/devices/machine/1ma6.h
@@ -23,8 +23,8 @@ public:
hp_1ma6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// Register read/write
- DECLARE_WRITE8_MEMBER(reg_w);
- DECLARE_READ8_MEMBER(reg_r);
+ void reg_w(offs_t offset, uint8_t data);
+ uint8_t reg_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(cart_out_w);
DECLARE_WRITE_LINE_MEMBER(hole_w);
diff --git a/src/devices/machine/1mb5.cpp b/src/devices/machine/1mb5.cpp
index 8ed4384e3f5..054202b06e1 100644
--- a/src/devices/machine/1mb5.cpp
+++ b/src/devices/machine/1mb5.cpp
@@ -57,7 +57,7 @@ hp_1mb5_device::hp_1mb5_device(const machine_config &mconfig, const char *tag, d
{
}
-READ8_MEMBER(hp_1mb5_device::cpu_r)
+uint8_t hp_1mb5_device::cpu_r(offs_t offset)
{
uint8_t res = 0;
@@ -87,7 +87,7 @@ READ8_MEMBER(hp_1mb5_device::cpu_r)
return res;
}
-WRITE8_MEMBER(hp_1mb5_device::cpu_w)
+void hp_1mb5_device::cpu_w(offs_t offset, uint8_t data)
{
LOG("WR %u=%02x\n" , offset , data);
@@ -108,7 +108,7 @@ WRITE8_MEMBER(hp_1mb5_device::cpu_w)
}
}
-READ8_MEMBER(hp_1mb5_device::uc_r)
+uint8_t hp_1mb5_device::uc_r(offs_t offset)
{
uint8_t res = 0;
@@ -136,7 +136,7 @@ READ8_MEMBER(hp_1mb5_device::uc_r)
return res;
}
-WRITE8_MEMBER(hp_1mb5_device::uc_w)
+void hp_1mb5_device::uc_w(offs_t offset, uint8_t data)
{
//LOG("WRU %u=%02x SR=%02x\n" , offset , data , m_sr);
diff --git a/src/devices/machine/1mb5.h b/src/devices/machine/1mb5.h
index 351b1f25d6c..13b1296e6cc 100644
--- a/src/devices/machine/1mb5.h
+++ b/src/devices/machine/1mb5.h
@@ -26,12 +26,12 @@ public:
auto int_handler() { return m_int_handler.bind(); }
// CPU access
- DECLARE_READ8_MEMBER(cpu_r);
- DECLARE_WRITE8_MEMBER(cpu_w);
+ uint8_t cpu_r(offs_t offset);
+ void cpu_w(offs_t offset, uint8_t data);
// uC access
- DECLARE_READ8_MEMBER(uc_r);
- DECLARE_WRITE8_MEMBER(uc_w);
+ uint8_t uc_r(offs_t offset);
+ void uc_w(offs_t offset, uint8_t data);
// Signals to CPU
DECLARE_READ_LINE_MEMBER(irl_r);
diff --git a/src/devices/machine/28fxxx.cpp b/src/devices/machine/28fxxx.cpp
index 0643685589a..e434a761c46 100644
--- a/src/devices/machine/28fxxx.cpp
+++ b/src/devices/machine/28fxxx.cpp
@@ -118,7 +118,7 @@ void base_28fxxx_device::erase()
memset(m_data.get(), 0xff, m_size);
}
-READ8_MEMBER(base_28fxxx_device::read)
+u8 base_28fxxx_device::read(address_space &space, offs_t offset, u8 mem_mask)
{
switch (m_state)
{
@@ -146,7 +146,7 @@ READ8_MEMBER(base_28fxxx_device::read)
}
}
-WRITE8_MEMBER(base_28fxxx_device::write)
+void base_28fxxx_device::write(offs_t offset, u8 data)
{
// writes are ignored unless Vpp is asserted
if (!m_program_power)
diff --git a/src/devices/machine/28fxxx.h b/src/devices/machine/28fxxx.h
index dd64118cfce..153fd785960 100644
--- a/src/devices/machine/28fxxx.h
+++ b/src/devices/machine/28fxxx.h
@@ -22,8 +22,8 @@ public:
};
DECLARE_WRITE_LINE_MEMBER(vpp) { m_program_power = state; }
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ u8 read(address_space &space, offs_t offset, u8 mem_mask = ~0);
+ void write(offs_t offset, u8 data);
protected:
base_28fxxx_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 size, u8 manufacturer_code, u8 device_code);
diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp
index 0026f86a093..ffcfab73da9 100644
--- a/src/devices/machine/40105.cpp
+++ b/src/devices/machine/40105.cpp
@@ -115,11 +115,6 @@ void cmos_40105_device::write(u8 data)
m_d = data & 0x0f;
}
-WRITE8_MEMBER(cmos_40105_device::write)
-{
- write(data);
-}
-
//-------------------------------------------------
// load_input - load new data into FIFO
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h
index 7648cf3e074..5b35de12a58 100644
--- a/src/devices/machine/40105.h
+++ b/src/devices/machine/40105.h
@@ -43,7 +43,6 @@ public:
u8 read();
void write(u8 data);
- DECLARE_WRITE8_MEMBER(write);
DECLARE_WRITE_LINE_MEMBER( si_w );
DECLARE_WRITE_LINE_MEMBER( so_w );
diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp
index 4b2cd724dca..7826cfdce58 100644
--- a/src/devices/machine/64h156.cpp
+++ b/src/devices/machine/64h156.cpp
@@ -423,7 +423,7 @@ int c64h156_device::get_next_bit(attotime &tm, const attotime &limit)
// yb_r -
//-------------------------------------------------
-READ8_MEMBER( c64h156_device::yb_r )
+uint8_t c64h156_device::yb_r()
{
if (checkpoint_live.accl) {
return checkpoint_live.accl_yb;
@@ -437,7 +437,7 @@ READ8_MEMBER( c64h156_device::yb_r )
// yb_w -
//-------------------------------------------------
-WRITE8_MEMBER( c64h156_device::yb_w )
+void c64h156_device::yb_w(uint8_t data)
{
if (m_yb != data)
{
diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h
index 0db1c0a2883..c8ef50cc3ea 100644
--- a/src/devices/machine/64h156.h
+++ b/src/devices/machine/64h156.h
@@ -82,8 +82,8 @@ public:
auto sync_callback() { return m_write_sync.bind(); }
auto byte_callback() { return m_write_byte.bind(); }
- DECLARE_READ8_MEMBER( yb_r );
- DECLARE_WRITE8_MEMBER( yb_w );
+ uint8_t yb_r();
+ void yb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( test_w );
DECLARE_WRITE_LINE_MEMBER( accl_w );
diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp
index f24b8b1656c..1d4e4845e68 100644
--- a/src/devices/machine/6532riot.cpp
+++ b/src/devices/machine/6532riot.cpp
@@ -146,7 +146,7 @@ void riot6532_device::timer_end()
riot6532_w - master I/O write access
-------------------------------------------------*/
-WRITE8_MEMBER( riot6532_device::write )
+void riot6532_device::write(offs_t offset, uint8_t data)
{
reg_w(offset, data);
}
@@ -231,7 +231,7 @@ void riot6532_device::reg_w(uint8_t offset, uint8_t data)
riot6532_r - master I/O read access
-------------------------------------------------*/
-READ8_MEMBER( riot6532_device::read )
+uint8_t riot6532_device::read(offs_t offset)
{
return reg_r(offset, machine().side_effects_disabled());
}
diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h
index fc70dd82624..e551247d7fa 100644
--- a/src/devices/machine/6532riot.h
+++ b/src/devices/machine/6532riot.h
@@ -32,8 +32,8 @@ public:
auto out_pb_callback() { return m_out_pb_cb.bind(); }
auto irq_callback() { return m_irq_cb.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
uint8_t reg_r(uint8_t offset, bool debugger_access = false);
void reg_w(uint8_t offset, uint8_t data);
diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp
index 271e4d63da7..20d63ef959e 100644
--- a/src/devices/machine/68153bim.cpp
+++ b/src/devices/machine/68153bim.cpp
@@ -287,7 +287,7 @@ void bim68153_device::trigger_interrupt(int ch)
//-------------------------------------------------
// read
//-------------------------------------------------
-READ8_MEMBER( bim68153_device::read )
+uint8_t bim68153_device::read(offs_t offset)
{
int vc = offset & REG_VECTOR;
int ch = offset & CHN_MSK;
@@ -301,7 +301,7 @@ READ8_MEMBER( bim68153_device::read )
//-------------------------------------------------
// write
//-------------------------------------------------
-WRITE8_MEMBER( bim68153_device::write )
+void bim68153_device::write(offs_t offset, uint8_t data)
{
int vc = offset & REG_VECTOR;
int ch = offset & CHN_MSK;
diff --git a/src/devices/machine/68153bim.h b/src/devices/machine/68153bim.h
index 3528005c787..124870b8194 100644
--- a/src/devices/machine/68153bim.h
+++ b/src/devices/machine/68153bim.h
@@ -122,8 +122,8 @@ public:
auto out_iack2_callback() { return m_chn[CHN_2]->m_out_iack_cb.bind(); }
auto out_iack3_callback() { return m_chn[CHN_3]->m_out_iack_cb.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( iackin_w ) { m_iackin = state; }
diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp
index 1392166081b..170ca80a5dc 100644
--- a/src/devices/machine/6821pia.cpp
+++ b/src/devices/machine/6821pia.cpp
@@ -841,10 +841,10 @@ void pia6821_device::set_a_input(uint8_t data)
//-------------------------------------------------
-// write_porta
+// porta_w
//-------------------------------------------------
-void pia6821_device::write_porta(uint8_t data)
+void pia6821_device::porta_w(uint8_t data)
{
set_a_input(data);
}
@@ -959,13 +959,13 @@ bool pia6821_device::ca2_output_z()
//-------------------------------------------------
-// write_portb
+// portb_w
//-------------------------------------------------
-void pia6821_device::write_portb(uint8_t data)
+void pia6821_device::portb_w(uint8_t data)
{
if (!m_in_b_handler.isnull())
- throw emu_fatalerror("pia6821_device::write_portb() called when in_b_func implemented");
+ throw emu_fatalerror("pia6821_device::portb_w() called when in_b_func implemented");
LOG("Set PIA input port B = %02X\n", data);
@@ -983,9 +983,9 @@ void pia6821_device::write_portb_line(int line, bool state)
const uint8_t mask = 1 << line;
if (state)
- write_portb(m_in_b | mask);
+ portb_w(m_in_b | mask);
else
- write_portb(m_in_b & ~mask);
+ portb_w(m_in_b & ~mask);
}
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index ad7d28f65d6..cceff8a5a09 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -59,8 +59,7 @@ public:
uint8_t port_b_z_mask() const { return ~m_ddr_b; } // see first note in .c
- DECLARE_WRITE8_MEMBER( porta_w ) { write_porta(data); }
- void write_porta(uint8_t data);
+ void porta_w(uint8_t data);
void write_porta_line(int line, bool state);
void set_a_input(uint8_t data);
uint8_t a_output();
@@ -81,8 +80,7 @@ public:
bool ca2_output();
bool ca2_output_z();
- DECLARE_WRITE8_MEMBER( portb_w ) { write_portb(data); }
- void write_portb(uint8_t data);
+ void portb_w(uint8_t data);
void write_portb_line(int line, bool state);
uint8_t b_output();
diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp
index 44d42c1cc01..b6979d5942a 100644
--- a/src/devices/machine/68230pit.cpp
+++ b/src/devices/machine/68230pit.cpp
@@ -721,7 +721,7 @@ void pit68230_device::wr_pitreg_tsr(uint8_t data)
}
}
-WRITE8_MEMBER (pit68230_device::write)
+void pit68230_device::write(offs_t offset, uint8_t data)
{
LOG("\"%s\" %s: Register write '%02x' -> [%02x]\n", tag(), FUNCNAME, data, offset );
LOGSETUP(" * %s Reg %02x <- %02x \n", tag(), offset, data);
@@ -970,7 +970,7 @@ uint8_t pit68230_device::rr_pitreg_tsr()
return m_tsr;
}
-READ8_MEMBER (pit68230_device::read){
+uint8_t pit68230_device::read(offs_t offset){
uint8_t data;
switch (offset) {
diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h
index fbd1a4d73cb..72f6e94d373 100644
--- a/src/devices/machine/68230pit.h
+++ b/src/devices/machine/68230pit.h
@@ -87,8 +87,8 @@ public:
auto timer_irq_callback() { return m_tirq_out_cb.bind(); }
auto port_irq_callback() { return m_pirq_out_cb.bind(); }
- DECLARE_WRITE8_MEMBER (write);
- DECLARE_READ8_MEMBER (read);
+ void write(offs_t offset, uint8_t data);
+ uint8_t read(offs_t offset);
// TODO: remove these methods and replace it with a call to methods below in force68k.cpp
void h1_set(uint8_t state) { if (state) m_psr |= 1; else m_psr &= ~1; }
diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp
index 3bbd73ac990..1a3280d7975 100644
--- a/src/devices/machine/68561mpcc.cpp
+++ b/src/devices/machine/68561mpcc.cpp
@@ -812,7 +812,7 @@ void mpcc_device::update_interrupts(int source)
//-------------------------------------------------
// Read register
//-------------------------------------------------
-READ8_MEMBER( mpcc_device::read )
+uint8_t mpcc_device::read(offs_t offset)
{
uint8_t data = 0;
@@ -849,7 +849,7 @@ READ8_MEMBER( mpcc_device::read )
//-------------------------------------------------
// Write register
//-------------------------------------------------
-WRITE8_MEMBER( mpcc_device::write )
+void mpcc_device::write(offs_t offset, uint8_t data)
{
LOGSETUP(" * %s Reg %02x <- %02x \n", tag(), offset, data);
switch(offset)
diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
index d4f943607e7..9758f387976 100644
--- a/src/devices/machine/68561mpcc.h
+++ b/src/devices/machine/68561mpcc.h
@@ -62,11 +62,11 @@ public:
auto out_trxc_cb() { return m_out_trxc_cb.bind(); }
auto out_int_cb() { return m_out_int_cb.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
// interrupt acknowledge
- DECLARE_READ8_MEMBER( iack );
+ uint8_t iack(offs_t offset); // declared but not defined?
/* Callbacks to be called by others for signals driven by connected devices */
DECLARE_WRITE_LINE_MEMBER( write_rx );
diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp
index 7e27af93cc0..18352ff7e06 100644
--- a/src/devices/machine/74153.cpp
+++ b/src/devices/machine/74153.cpp
@@ -126,7 +126,7 @@ WRITE_LINE_MEMBER( ttl153_device::s1_w )
update_b();
}
-WRITE8_MEMBER( ttl153_device::s_w )
+void ttl153_device::s_w(uint8_t data)
{
m_s[0] = bool(BIT(data, 0));
m_s[1] = bool(BIT(data, 1));
@@ -158,7 +158,7 @@ WRITE_LINE_MEMBER( ttl153_device::i3a_w )
update_a();
}
-WRITE8_MEMBER( ttl153_device::ia_w )
+void ttl153_device::ia_w(uint8_t data)
{
m_ia[0] = bool(BIT(data, 0));
m_ia[1] = bool(BIT(data, 1));
@@ -191,7 +191,7 @@ WRITE_LINE_MEMBER( ttl153_device::i3b_w )
update_b();
}
-WRITE8_MEMBER( ttl153_device::ib_w )
+void ttl153_device::ib_w(uint8_t data)
{
m_ib[0] = bool(BIT(data, 0));
m_ib[1] = bool(BIT(data, 1));
diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h
index 4c48c557174..ae2f3a37353 100644
--- a/src/devices/machine/74153.h
+++ b/src/devices/machine/74153.h
@@ -40,21 +40,21 @@ public:
// select
DECLARE_WRITE_LINE_MEMBER(s0_w);
DECLARE_WRITE_LINE_MEMBER(s1_w);
- DECLARE_WRITE8_MEMBER(s_w);
+ void s_w(uint8_t data);
// input a
DECLARE_WRITE_LINE_MEMBER(i0a_w);
DECLARE_WRITE_LINE_MEMBER(i1a_w);
DECLARE_WRITE_LINE_MEMBER(i2a_w);
DECLARE_WRITE_LINE_MEMBER(i3a_w);
- DECLARE_WRITE8_MEMBER(ia_w);
+ void ia_w(uint8_t data);
// input b
DECLARE_WRITE_LINE_MEMBER(i0b_w);
DECLARE_WRITE_LINE_MEMBER(i1b_w);
DECLARE_WRITE_LINE_MEMBER(i2b_w);
DECLARE_WRITE_LINE_MEMBER(i3b_w);
- DECLARE_WRITE8_MEMBER(ib_w);
+ void ib_w(uint8_t data);
// output
DECLARE_READ_LINE_MEMBER(za_r);
diff --git a/src/devices/machine/74161.cpp b/src/devices/machine/74161.cpp
index a4c4d694ab6..015e4dba6bd 100644
--- a/src/devices/machine/74161.cpp
+++ b/src/devices/machine/74161.cpp
@@ -167,7 +167,7 @@ WRITE_LINE_MEMBER( ttl7416x_device::clock_w )
}
}
-WRITE8_MEMBER( ttl7416x_device::p_w )
+void ttl7416x_device::p_w(uint8_t data)
{
m_p = data & 0xf;
}
diff --git a/src/devices/machine/74161.h b/src/devices/machine/74161.h
index b0bc59b8afa..abc702ba398 100644
--- a/src/devices/machine/74161.h
+++ b/src/devices/machine/74161.h
@@ -73,7 +73,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( cet_w );
DECLARE_WRITE_LINE_MEMBER( cep_w );
DECLARE_WRITE_LINE_MEMBER( clock_w );
- DECLARE_WRITE8_MEMBER( p_w );
+ void p_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( p1_w );
DECLARE_WRITE_LINE_MEMBER( p2_w );
DECLARE_WRITE_LINE_MEMBER( p3_w );
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index 36cf7f776c0..2f1ca94f865 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -234,7 +234,7 @@ void kbdc8042_device::device_timer(emu_timer &timer, device_timer_id id, int par
* 0: Keyboard data in
*/
-READ8_MEMBER(kbdc8042_device::data_r)
+uint8_t kbdc8042_device::data_r(offs_t offset)
{
uint8_t data = 0;
@@ -310,7 +310,7 @@ READ8_MEMBER(kbdc8042_device::data_r)
-WRITE8_MEMBER(kbdc8042_device::data_w)
+void kbdc8042_device::data_w(offs_t offset, uint8_t data)
{
switch (offset) {
case 0:
diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
index 774f019ebe2..e70b2398b29 100644
--- a/src/devices/machine/8042kbdc.h
+++ b/src/devices/machine/8042kbdc.h
@@ -41,8 +41,8 @@ public:
auto output_buffer_empty_callback() { return m_output_buffer_empty_cb.bind(); }
auto speaker_callback() { return m_speaker_cb.bind(); }
- DECLARE_READ8_MEMBER( data_r );
- DECLARE_WRITE8_MEMBER( data_w );
+ uint8_t data_r(offs_t offset);
+ void data_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( write_out2 );
diff --git a/src/devices/machine/82s129.cpp b/src/devices/machine/82s129.cpp
index afa31ad1fda..ca147f17c2f 100644
--- a/src/devices/machine/82s129.cpp
+++ b/src/devices/machine/82s129.cpp
@@ -116,7 +116,7 @@ WRITE_LINE_MEMBER( prom82s129_base_device::ce2_w )
update();
}
-WRITE8_MEMBER( prom82s129_base_device::a_w )
+void prom82s129_base_device::a_w(uint8_t data)
{
uint8_t last_a = m_a;
m_a = data;
@@ -142,7 +142,7 @@ WRITE_LINE_MEMBER( prom82s129_base_device::a5_w ) { write_line(5, state); }
WRITE_LINE_MEMBER( prom82s129_base_device::a6_w ) { write_line(6, state); }
WRITE_LINE_MEMBER( prom82s129_base_device::a7_w ) { write_line(7, state); }
-READ8_MEMBER( prom82s129_base_device::output_r )
+uint8_t prom82s129_base_device::output_r()
{
return m_out;
}
diff --git a/src/devices/machine/82s129.h b/src/devices/machine/82s129.h
index 2c90fd6d896..96f278c85e9 100644
--- a/src/devices/machine/82s129.h
+++ b/src/devices/machine/82s129.h
@@ -58,7 +58,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( ce1_w );
DECLARE_WRITE_LINE_MEMBER( ce2_w );
- DECLARE_WRITE8_MEMBER( a_w );
+ void a_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( a0_w );
DECLARE_WRITE_LINE_MEMBER( a1_w );
DECLARE_WRITE_LINE_MEMBER( a2_w );
@@ -68,7 +68,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( a6_w );
DECLARE_WRITE_LINE_MEMBER( a7_w );
- DECLARE_READ8_MEMBER( output_r );
+ uint8_t output_r();
DECLARE_READ_LINE_MEMBER( o1_r );
DECLARE_READ_LINE_MEMBER( o2_r );
DECLARE_READ_LINE_MEMBER( o3_r );
diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp
index aafeab11ee9..c331037d0a1 100644
--- a/src/devices/machine/8530scc.cpp
+++ b/src/devices/machine/8530scc.cpp
@@ -463,7 +463,7 @@ void scc8530_legacy_device::set_reg_b(int reg, uint8_t data)
// getter
//-------------------------------------------------
-READ8_MEMBER(scc8530_legacy_device::reg_r)
+uint8_t scc8530_legacy_device::reg_r(offs_t offset)
{
return read_reg(offset & 3);
}
@@ -507,7 +507,7 @@ uint8_t scc8530_legacy_device::read_reg(int offset)
// setter
//-------------------------------------------------
-WRITE8_MEMBER( scc8530_legacy_device::reg_w )
+void scc8530_legacy_device::reg_w(offs_t offset, uint8_t data)
{
write_reg(offset & 3, data);
}
diff --git a/src/devices/machine/8530scc.h b/src/devices/machine/8530scc.h
index 4f7914f2a5d..4a706df22a0 100644
--- a/src/devices/machine/8530scc.h
+++ b/src/devices/machine/8530scc.h
@@ -37,8 +37,8 @@ public:
void set_status(int status);
- DECLARE_READ8_MEMBER(reg_r);
- DECLARE_WRITE8_MEMBER(reg_w);
+ uint8_t reg_r(offs_t offset);
+ void reg_w(offs_t offset, uint8_t data);
void write_reg(int offset, uint8_t data);
uint8_t read_reg(int offset);
diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp
index 09924675a9d..0ffb88e094e 100644
--- a/src/devices/machine/aakart.cpp
+++ b/src/devices/machine/aakart.cpp
@@ -172,14 +172,14 @@ void aakart_device::device_timer(emu_timer &timer, device_timer_id id, int param
//**************************************************************************
-READ8_MEMBER( aakart_device::read )
+uint8_t aakart_device::read()
{
m_out_tx_cb(CLEAR_LINE);
//machine().debug_break();
return m_rx;
}
-WRITE8_MEMBER( aakart_device::write )
+void aakart_device::write(uint8_t data)
{
// if(m_new_command) printf("skip cmd %02x\n",data);
diff --git a/src/devices/machine/aakart.h b/src/devices/machine/aakart.h
index 85ca75281ef..d9b367b8678 100644
--- a/src/devices/machine/aakart.h
+++ b/src/devices/machine/aakart.h
@@ -29,8 +29,8 @@ public:
auto out_rx_callback() { return m_out_rx_cb.bind(); }
// I/O operations
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( read );
+ void write(uint8_t data);
+ uint8_t read();
void send_keycode_down(uint8_t row, uint8_t col);
void send_keycode_up(uint8_t row, uint8_t col);
void send_mouse(uint8_t x, uint8_t y);
diff --git a/src/devices/machine/aic6250.cpp b/src/devices/machine/aic6250.cpp
index 9c149f51627..71859bdee05 100644
--- a/src/devices/machine/aic6250.cpp
+++ b/src/devices/machine/aic6250.cpp
@@ -89,7 +89,7 @@ void aic6250_device::map(address_map &map)
map(0xf, 0xf).rw(FUNC(aic6250_device::scsi_latch_data_r), FUNC(aic6250_device::scsi_bsy_rst_w));
}
-READ8_MEMBER(aic6250_device::read)
+u8 aic6250_device::read(address_space &space, offs_t offset)
{
u8 data = space.unmap();
@@ -123,7 +123,7 @@ READ8_MEMBER(aic6250_device::read)
return data;
}
-WRITE8_MEMBER(aic6250_device::write)
+void aic6250_device::write(offs_t offset, u8 data)
{
if (offset)
{
diff --git a/src/devices/machine/aic6250.h b/src/devices/machine/aic6250.h
index 9f6febfd8a7..048aa6de0c8 100644
--- a/src/devices/machine/aic6250.h
+++ b/src/devices/machine/aic6250.h
@@ -25,8 +25,8 @@ public:
DECLARE_WRITE_LINE_MEMBER(back_w);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ u8 read(address_space &space, offs_t offset);
+ void write(offs_t offset, u8 data);
u8 dma_r();
u16 dma16_r();
diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp
index 5e01511bb97..891f43f680b 100644
--- a/src/devices/machine/am53cf96.cpp
+++ b/src/devices/machine/am53cf96.cpp
@@ -15,9 +15,8 @@
#include "am53cf96.h"
#include "bus/scsi/scsihle.h"
-READ8_MEMBER( am53cf96_device::read )
+uint8_t am53cf96_device::read(offs_t offset)
{
- int rv;
static constexpr int states[] = { 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 0 };
if (offset == REG_STATUS)
@@ -30,7 +29,7 @@ READ8_MEMBER( am53cf96_device::read )
}
}
- rv = scsi_regs[offset];
+ int rv = scsi_regs[offset];
if (offset == REG_FIFO)
{
@@ -55,7 +54,7 @@ void am53cf96_device::device_timer(emu_timer &timer, device_timer_id tid, int pa
m_irq_handler(1);
}
-WRITE8_MEMBER( am53cf96_device::write )
+void am53cf96_device::write(offs_t offset, uint8_t data)
{
// logerror("53cf96: w %x to reg %d %s\n", data, offset, machine().describe_context());
diff --git a/src/devices/machine/am53cf96.h b/src/devices/machine/am53cf96.h
index 5ae55f76849..d9b2ce1aab4 100644
--- a/src/devices/machine/am53cf96.h
+++ b/src/devices/machine/am53cf96.h
@@ -20,8 +20,8 @@ public:
auto irq_handler() { return m_irq_handler.bind(); }
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
void dma_read_data(int bytes, uint8_t *pData);
void dma_write_data(int bytes, uint8_t *pData);
diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp
index ee854e461ad..9db640db021 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/devices/machine/amigafdc.cpp
@@ -444,7 +444,7 @@ void amiga_fdc_device::setup_leds()
}
}
-WRITE8_MEMBER( amiga_fdc_device::ciaaprb_w )
+void amiga_fdc_device::ciaaprb_w(uint8_t data)
{
floppy_image_device *old_floppy = floppy;
diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h
index 8142680bed7..b7965c49f6c 100644
--- a/src/devices/machine/amigafdc.h
+++ b/src/devices/machine/amigafdc.h
@@ -17,7 +17,7 @@ public:
auto dskblk_callback() { return m_write_dskblk.bind(); }
auto dsksyn_callback() { return m_write_dsksyn.bind(); }
- DECLARE_WRITE8_MEMBER(ciaaprb_w);
+ void ciaaprb_w(uint8_t data);
uint8_t ciaapra_r();
uint16_t dskbytr_r();
diff --git a/src/devices/machine/applefdc.cpp b/src/devices/machine/applefdc.cpp
index 681dcc525ed..b13cc62eb3a 100644
--- a/src/devices/machine/applefdc.cpp
+++ b/src/devices/machine/applefdc.cpp
@@ -442,7 +442,7 @@ void applefdc_base_device::iwm_access(int offset)
// read - reads a byte from the FDC
//-------------------------------------------------
-uint8_t applefdc_base_device::read(uint8_t offset)
+uint8_t applefdc_base_device::read(offs_t offset)
{
const applefdc_interface *intf = get_interface();
uint8_t result = 0;
@@ -505,7 +505,7 @@ uint8_t applefdc_base_device::read(uint8_t offset)
// write - writes a byte to the FDC
//-------------------------------------------------
-void applefdc_base_device::write(uint8_t offset, uint8_t data)
+void applefdc_base_device::write(offs_t offset, uint8_t data)
{
const applefdc_interface *intf = get_interface();
diff --git a/src/devices/machine/applefdc.h b/src/devices/machine/applefdc.h
index afdf13de0d8..817b2e705e0 100644
--- a/src/devices/machine/applefdc.h
+++ b/src/devices/machine/applefdc.h
@@ -62,12 +62,8 @@ public:
void set_config(const applefdc_interface *intrf) { m_interface = intrf; }
// read/write handlers
- virtual uint8_t read(uint8_t offset);
- virtual void write(uint8_t offset, uint8_t data);
-
- // read/write handlers overloads
- DECLARE_READ8_MEMBER( bus_r ) { return read(uint8_t(offset)); }
- DECLARE_WRITE8_MEMBER( bus_w ) { write(uint8_t(offset), data); }
+ virtual uint8_t read(offs_t offset);
+ virtual void write(offs_t offset, uint8_t data);
// accessor
uint8_t get_lines();
diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp
index 809f8df5256..622dfb3fc19 100644
--- a/src/devices/machine/at28c16.cpp
+++ b/src/devices/machine/at28c16.cpp
@@ -142,7 +142,7 @@ void at28c16_device::nvram_write( emu_file &file )
// READ/WRITE HANDLERS
//**************************************************************************
-WRITE8_MEMBER( at28c16_device::write )
+void at28c16_device::write(offs_t offset, uint8_t data)
{
if( m_last_write >= 0 )
{
@@ -180,7 +180,7 @@ WRITE8_MEMBER( at28c16_device::write )
}
-READ8_MEMBER( at28c16_device::read )
+uint8_t at28c16_device::read(offs_t offset)
{
if( m_last_write >= 0 )
{
diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h
index 56b75a8cfcc..54c87fccb4f 100644
--- a/src/devices/machine/at28c16.h
+++ b/src/devices/machine/at28c16.h
@@ -29,8 +29,8 @@ public:
// construction/destruction
at28c16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( read );
+ void write(offs_t offset, uint8_t data);
+ uint8_t read(offs_t offset);
protected:
// device-level overrides
diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp
index e4dc2344e28..a3cbbe456aa 100644
--- a/src/devices/machine/ay31015.cpp
+++ b/src/devices/machine/ay31015.cpp
@@ -238,7 +238,7 @@ inline void ay31015_device::update_status_pin(uint8_t reg_bit, ay31015_device::o
/*-------------------------------------------------
- ay31015_update_status_pins - Update the status pins
+ update_status_pins - Update the status pins
-------------------------------------------------*/
void ay31015_device::update_status_pins()
@@ -260,7 +260,7 @@ void ay31015_device::update_status_pins()
/*-------------------------------------------------
- ay31015_rx_process - convert serial to parallel
+ rx_process - convert serial to parallel
-------------------------------------------------*/
void ay31015_device::rx_process()
@@ -428,7 +428,7 @@ void ay31015_device::rx_process()
/*-------------------------------------------------
- ay31015_tx_process - convert parallel to serial
+ tx_process - convert parallel to serial
-------------------------------------------------*/
void ay31015_device::tx_process()
@@ -578,7 +578,7 @@ void ay31015_device::tx_process()
/*-------------------------------------------------
- ay31015_reset - reset internal state
+ internal_reset - reset internal state
-------------------------------------------------*/
void ay31015_device::internal_reset()
@@ -634,7 +634,7 @@ void ay51013_device::internal_reset()
}
/*-------------------------------------------------
- ay31015_transfer_control_pins - transfers contents of controls pins to the control register
+ transfer_control_pins - transfers contents of controls pins to the control register
-------------------------------------------------*/
void ay31015_device::transfer_control_pins()
@@ -656,7 +656,7 @@ void ay31015_device::transfer_control_pins()
/*-------------------------------------------------
- ay31015_set_input_pin - set an input pin
+ set_input_pin - set an input pin
-------------------------------------------------*/
void ay31015_device::set_input_pin( ay31015_device::input_pin pin, int data )
{
@@ -709,7 +709,7 @@ void ay31015_device::set_input_pin( ay31015_device::input_pin pin, int data )
/*-------------------------------------------------
- ay31015_get_output_pin - get the status of an output pin
+ get_output_pin - get the status of an output pin
-------------------------------------------------*/
int ay31015_device::get_output_pin( ay31015_device::output_pin pin )
@@ -719,10 +719,10 @@ int ay31015_device::get_output_pin( ay31015_device::output_pin pin )
/*-------------------------------------------------
- ay31015_get_received_data - return a byte to the computer
+ received - return a byte to the computer
-------------------------------------------------*/
-uint8_t ay31015_device::get_received_data()
+uint8_t ay31015_device::receive()
{
if (m_auto_rdav && !machine().side_effects_disabled())
{
@@ -733,16 +733,10 @@ uint8_t ay31015_device::get_received_data()
return m_rx_buffer;
}
-READ8_MEMBER(ay31015_device::receive)
-{
- return get_received_data();
-}
-
-
/*-------------------------------------------------
- ay31015_set_transmit_data - accept a byte to transmit, if able
+ transmit - accept a byte to transmit, if able
-------------------------------------------------*/
-void ay31015_device::set_transmit_data( uint8_t data )
+void ay31015_device::transmit( uint8_t data )
{
if (m_status_reg & STATUS_TBMT)
{
@@ -751,8 +745,3 @@ void ay31015_device::set_transmit_data( uint8_t data )
update_status_pins();
}
}
-
-WRITE8_MEMBER(ay31015_device::transmit)
-{
- set_transmit_data(data);
-}
diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h
index 42518cb9a85..4e27bc8e11f 100644
--- a/src/devices/machine/ay31015.h
+++ b/src/devices/machine/ay31015.h
@@ -54,16 +54,13 @@ public:
DECLARE_READ_LINE_MEMBER(eoc_r) { return get_output_pin(EOC); }
DECLARE_READ_LINE_MEMBER(so_r) { return get_output_pin(SO); }
- /* Reead the received data */
+ /* Read the received data */
/* The received data is available on RD8-RD1 (pins 5-12) */
- uint8_t get_received_data();
+ uint8_t receive();
/* Set the transmitter buffer */
/* The data to transmit is set on DB1-DB8 (pins 26-33) */
- void set_transmit_data( uint8_t data );
-
- DECLARE_READ8_MEMBER(receive);
- DECLARE_WRITE8_MEMBER(transmit);
+ void transmit( uint8_t data );
protected:
enum input_pin
diff --git a/src/devices/machine/busmouse.cpp b/src/devices/machine/busmouse.cpp
index 298c82c5124..2c06045d127 100644
--- a/src/devices/machine/busmouse.cpp
+++ b/src/devices/machine/busmouse.cpp
@@ -175,17 +175,17 @@ void bus_mouse_device::device_timer(emu_timer &timer, device_timer_id id, int pa
}
}
-READ8_MEMBER(bus_mouse_device::ppi_a_r)
+uint8_t bus_mouse_device::ppi_a_r()
{
return m_pa;
}
-READ8_MEMBER(bus_mouse_device::ppi_c_r)
+uint8_t bus_mouse_device::ppi_c_r()
{
return irq ? irq_line : 0;
}
-WRITE8_MEMBER(bus_mouse_device::ppi_c_w)
+void bus_mouse_device::ppi_c_w(uint8_t data)
{
irq_disabled = BIT(data, 4);
diff --git a/src/devices/machine/busmouse.h b/src/devices/machine/busmouse.h
index 256f8891808..787c80e399b 100644
--- a/src/devices/machine/busmouse.h
+++ b/src/devices/machine/busmouse.h
@@ -34,9 +34,9 @@ protected:
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
- DECLARE_READ8_MEMBER(ppi_a_r);
- DECLARE_READ8_MEMBER(ppi_c_r);
- DECLARE_WRITE8_MEMBER(ppi_c_w);
+ uint8_t ppi_a_r();
+ uint8_t ppi_c_r();
+ void ppi_c_w(uint8_t data);
private:
emu_timer *m_irq_timer;
diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp
index bf5b06b4e72..b98b9a34fef 100644
--- a/src/devices/machine/cdp1852.cpp
+++ b/src/devices/machine/cdp1852.cpp
@@ -183,7 +183,7 @@ TIMER_CALLBACK_MEMBER(cdp1852_device::update_sr)
// read - data read
//-------------------------------------------------
-READ8_MEMBER(cdp1852_device::read)
+uint8_t cdp1852_device::read()
{
if (!m_read_mode() && m_clock_active)
{
@@ -201,7 +201,7 @@ READ8_MEMBER(cdp1852_device::read)
// write - data write
//-------------------------------------------------
-WRITE8_MEMBER(cdp1852_device::write)
+void cdp1852_device::write(uint8_t data)
{
if (m_read_mode() && m_clock_active)
{
diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h
index fa07d196af2..4f4bec622f9 100644
--- a/src/devices/machine/cdp1852.h
+++ b/src/devices/machine/cdp1852.h
@@ -37,8 +37,8 @@ public:
auto di_cb() { return m_read_data.bind(); }
auto do_cb() { return m_write_data.bind(); }
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read();
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(clock_w);
diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp
index 600c1e6ee3c..36ce4b77892 100644
--- a/src/devices/machine/cdp1871.cpp
+++ b/src/devices/machine/cdp1871.cpp
@@ -278,7 +278,7 @@ void cdp1871_device::detect_keypress()
// read - keyboard data read
//-------------------------------------------------
-READ8_MEMBER( cdp1871_device::read )
+uint8_t cdp1871_device::read()
{
int table = 0;
diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h
index eb2eb94fbd9..50c0aaefdc9 100644
--- a/src/devices/machine/cdp1871.h
+++ b/src/devices/machine/cdp1871.h
@@ -54,7 +54,7 @@ public:
auto da_callback() { return m_write_da.bind(); }
auto rpt_callback() { return m_write_rpt.bind(); }
- DECLARE_READ8_MEMBER( read );
+ uint8_t read();
DECLARE_READ_LINE_MEMBER( da_r ) { return m_da; }
DECLARE_READ_LINE_MEMBER( rpt_r ) { return m_rpt; }
diff --git a/src/devices/machine/cdp1879.cpp b/src/devices/machine/cdp1879.cpp
index 206709f9a8d..eee9df590b5 100644
--- a/src/devices/machine/cdp1879.cpp
+++ b/src/devices/machine/cdp1879.cpp
@@ -114,7 +114,7 @@ void cdp1879_device::update_rtc()
set_clock_register(RTC_MONTH, bcd_to_integer(m_regs[R_CNT_MONTH]));
}
-READ8_MEMBER(cdp1879_device::read)
+uint8_t cdp1879_device::read(offs_t offset)
{
if (offset == R_CTL_IRQSTATUS && !machine().side_effects_disabled())
{
@@ -128,7 +128,7 @@ READ8_MEMBER(cdp1879_device::read)
return m_regs[offset];
}
-WRITE8_MEMBER(cdp1879_device::write)
+void cdp1879_device::write(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/machine/cdp1879.h b/src/devices/machine/cdp1879.h
index 3f92efec75e..2f2740df32a 100644
--- a/src/devices/machine/cdp1879.h
+++ b/src/devices/machine/cdp1879.h
@@ -20,8 +20,8 @@ public:
// construction/destruction
cdp1879_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
auto irq_callback() { return m_irq_w.bind(); }
diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp
index 491c4ce5970..07b959d9fba 100644
--- a/src/devices/machine/corvushd.cpp
+++ b/src/devices/machine/corvushd.cpp
@@ -1502,7 +1502,7 @@ void corvus_hdc_device::device_start() {
// Returns:
// Value in the controller status register
//
-READ8_MEMBER ( corvus_hdc_device::status_r ) {
+uint8_t corvus_hdc_device::status_r() {
return m_status;
}
@@ -1521,7 +1521,7 @@ READ8_MEMBER ( corvus_hdc_device::status_r ) {
// Returns:
// Value in the controller data register
//
-READ8_MEMBER ( corvus_hdc_device::read ) {
+uint8_t corvus_hdc_device::read() {
uint8_t result;
if((m_status & CONTROLLER_DIRECTION) == 0) { // Check to see if we're in Controller-to-Host mode
@@ -1569,7 +1569,7 @@ READ8_MEMBER ( corvus_hdc_device::read ) {
// Returns:
// Nothing
//
-WRITE8_MEMBER ( corvus_hdc_device::write ) {
+void corvus_hdc_device::write(uint8_t data) {
//
// Received a byte -- check to see if we should really respond
//
diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h
index 868d98678fb..fddffa0e432 100644
--- a/src/devices/machine/corvushd.h
+++ b/src/devices/machine/corvushd.h
@@ -30,9 +30,9 @@ public:
// construction/destruction
corvus_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( status_r );
+ uint8_t read();
+ void write(uint8_t data);
+ uint8_t status_r();
protected:
// device-level overrides
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index 6a4309f12c9..ea9d772fb92 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -96,12 +96,12 @@ void cr511b_device::device_timer(emu_timer &timer, device_timer_id tid, int para
// IMPLEMENTATION
//**************************************************************************
-READ8_MEMBER( cr511b_device::read )
+uint8_t cr511b_device::read()
{
return 0xff;
}
-WRITE8_MEMBER ( cr511b_device::write )
+void cr511b_device::write(uint8_t data)
{
}
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h
index 16d58151d91..b3de63c8aa6 100644
--- a/src/devices/machine/cr511b.h
+++ b/src/devices/machine/cr511b.h
@@ -52,8 +52,8 @@ public:
auto scor_handler() { return m_scor_handler.bind(); }
auto xaen_handler() { return m_xaen_handler.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER ( write );
+ uint8_t read();
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( enable_w );
DECLARE_WRITE_LINE_MEMBER( cmd_w );
diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp
index 9177a758340..e57f181e383 100644
--- a/src/devices/machine/cs8221.cpp
+++ b/src/devices/machine/cs8221.cpp
@@ -96,13 +96,13 @@ void cs8221_device::map(address_map &map)
map(0x0023, 0x0023).rw("cs8221", FUNC(cs8221_device::data_r), FUNC(cs8221_device::data_w));
}
-WRITE8_MEMBER( cs8221_device::address_w )
+void cs8221_device::address_w(uint8_t data)
{
m_address = data;
m_address_valid = ((m_address & 0x60)== 0x60) ? true : false;
}
-READ8_MEMBER( cs8221_device::data_r )
+uint8_t cs8221_device::data_r()
{
uint8_t result = 0xff;
@@ -119,7 +119,7 @@ READ8_MEMBER( cs8221_device::data_r )
return result;
}
-WRITE8_MEMBER( cs8221_device::data_w )
+void cs8221_device::data_w(uint8_t data)
{
if (m_address_valid)
{
diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h
index 39f5bfcd709..63b3102d5e9 100644
--- a/src/devices/machine/cs8221.h
+++ b/src/devices/machine/cs8221.h
@@ -64,9 +64,9 @@ private:
uint8_t m_registers[0x10];
- DECLARE_WRITE8_MEMBER( address_w );
- DECLARE_READ8_MEMBER( data_r );
- DECLARE_WRITE8_MEMBER( data_w );
+ void address_w(uint8_t data);
+ uint8_t data_r();
+ void data_w(uint8_t data);
};
DECLARE_DEVICE_TYPE(CS8221, cs8221_device)
diff --git a/src/devices/machine/ds1386.cpp b/src/devices/machine/ds1386.cpp
index 0f430413017..c5a9048f2fc 100644
--- a/src/devices/machine/ds1386.cpp
+++ b/src/devices/machine/ds1386.cpp
@@ -422,7 +422,7 @@ void ds1386_device::nvram_write(emu_file &file)
file.write(&m_ram[0], m_ram_size);
}
-WRITE8_MEMBER( ds1386_device::data_w )
+void ds1386_device::data_w(offs_t offset, uint8_t data)
{
if (offset >= m_ram_size)
return;
@@ -582,7 +582,7 @@ WRITE8_MEMBER( ds1386_device::data_w )
}
}
-READ8_MEMBER( ds1386_device::data_r )
+uint8_t ds1386_device::data_r(offs_t offset)
{
if (offset >= m_ram_size)
return 0;
diff --git a/src/devices/machine/ds1386.h b/src/devices/machine/ds1386.h
index 17e01b9f458..0e994e436c9 100644
--- a/src/devices/machine/ds1386.h
+++ b/src/devices/machine/ds1386.h
@@ -85,8 +85,8 @@ public:
auto intb() { return m_intb_cb.bind(); }
auto sqw() { return m_sqw_cb.bind(); }
- DECLARE_WRITE8_MEMBER( data_w );
- DECLARE_READ8_MEMBER( data_r );
+ void data_w(offs_t offset, uint8_t data);
+ uint8_t data_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( oe_w );
diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp
index ce24d0336ca..27b179b149d 100644
--- a/src/devices/machine/ds2404.cpp
+++ b/src/devices/machine/ds2404.cpp
@@ -66,19 +66,19 @@ void ds2404_device::device_start()
m_rtc[4] = (current_time >> 24) & 0xff;
for (auto & elem : m_state)
- elem = DS2404_STATE_IDLE;
+ elem = STATE_IDLE;
m_tick_timer = timer_alloc(0);
m_tick_timer->adjust(attotime::from_hz(256), 0, attotime::from_hz(256));
}
-void ds2404_device::ds2404_rom_cmd(uint8_t cmd)
+void ds2404_device::rom_cmd(uint8_t cmd)
{
switch(cmd)
{
case 0xcc: /* Skip ROM */
- m_state[0] = DS2404_STATE_COMMAND;
+ m_state[0] = STATE_COMMAND;
m_state_ptr = 0;
break;
@@ -87,32 +87,32 @@ void ds2404_device::ds2404_rom_cmd(uint8_t cmd)
}
}
-void ds2404_device::ds2404_cmd(uint8_t cmd)
+void ds2404_device::cmd(uint8_t cmd)
{
switch(cmd)
{
case 0x0f: /* Write scratchpad */
- m_state[0] = DS2404_STATE_ADDRESS1;
- m_state[1] = DS2404_STATE_ADDRESS2;
- m_state[2] = DS2404_STATE_INIT_COMMAND;
- m_state[3] = DS2404_STATE_WRITE_SCRATCHPAD;
+ m_state[0] = STATE_ADDRESS1;
+ m_state[1] = STATE_ADDRESS2;
+ m_state[2] = STATE_INIT_COMMAND;
+ m_state[3] = STATE_WRITE_SCRATCHPAD;
m_state_ptr = 0;
break;
case 0x55: /* Copy scratchpad */
- m_state[0] = DS2404_STATE_ADDRESS1;
- m_state[1] = DS2404_STATE_ADDRESS2;
- m_state[2] = DS2404_STATE_OFFSET;
- m_state[3] = DS2404_STATE_INIT_COMMAND;
- m_state[4] = DS2404_STATE_COPY_SCRATCHPAD;
+ m_state[0] = STATE_ADDRESS1;
+ m_state[1] = STATE_ADDRESS2;
+ m_state[2] = STATE_OFFSET;
+ m_state[3] = STATE_INIT_COMMAND;
+ m_state[4] = STATE_COPY_SCRATCHPAD;
m_state_ptr = 0;
break;
case 0xf0: /* Read memory */
- m_state[0] = DS2404_STATE_ADDRESS1;
- m_state[1] = DS2404_STATE_ADDRESS2;
- m_state[2] = DS2404_STATE_INIT_COMMAND;
- m_state[3] = DS2404_STATE_READ_MEMORY;
+ m_state[0] = STATE_ADDRESS1;
+ m_state[1] = STATE_ADDRESS2;
+ m_state[2] = STATE_INIT_COMMAND;
+ m_state[3] = STATE_READ_MEMORY;
m_state_ptr = 0;
break;
@@ -121,7 +121,7 @@ void ds2404_device::ds2404_cmd(uint8_t cmd)
}
}
-uint8_t ds2404_device::ds2404_readmem()
+uint8_t ds2404_device::readmem()
{
if( m_address < 0x200 )
{
@@ -134,7 +134,7 @@ uint8_t ds2404_device::ds2404_readmem()
return 0;
}
-void ds2404_device::ds2404_writemem(uint8_t value)
+void ds2404_device::writemem(uint8_t value)
{
if( m_address < 0x200 )
{
@@ -146,36 +146,36 @@ void ds2404_device::ds2404_writemem(uint8_t value)
}
}
-WRITE8_MEMBER( ds2404_device::ds2404_1w_reset_w )
+void ds2404_device::_1w_reset_w(uint8_t data)
{
- m_state[0] = DS2404_STATE_IDLE;
+ m_state[0] = STATE_IDLE;
m_state_ptr = 0;
}
-WRITE8_MEMBER( ds2404_device::ds2404_3w_reset_w )
+void ds2404_device::_3w_reset_w(uint8_t data)
{
- m_state[0] = DS2404_STATE_COMMAND;
+ m_state[0] = STATE_COMMAND;
m_state_ptr = 0;
}
-READ8_MEMBER( ds2404_device::ds2404_data_r )
+uint8_t ds2404_device::data_r()
{
uint8_t value = 0;
switch(m_state[m_state_ptr])
{
- case DS2404_STATE_IDLE:
- case DS2404_STATE_COMMAND:
- case DS2404_STATE_ADDRESS1:
- case DS2404_STATE_ADDRESS2:
- case DS2404_STATE_OFFSET:
- case DS2404_STATE_INIT_COMMAND:
+ case STATE_IDLE:
+ case STATE_COMMAND:
+ case STATE_ADDRESS1:
+ case STATE_ADDRESS2:
+ case STATE_OFFSET:
+ case STATE_INIT_COMMAND:
break;
- case DS2404_STATE_READ_MEMORY:
- value = ds2404_readmem();
+ case STATE_READ_MEMORY:
+ value = readmem();
break;
- case DS2404_STATE_READ_SCRATCHPAD:
+ case STATE_READ_SCRATCHPAD:
if(m_offset < 0x20)
{
value = m_ram[m_offset];
@@ -183,52 +183,52 @@ READ8_MEMBER( ds2404_device::ds2404_data_r )
}
break;
- case DS2404_STATE_WRITE_SCRATCHPAD:
+ case STATE_WRITE_SCRATCHPAD:
break;
- case DS2404_STATE_COPY_SCRATCHPAD:
+ case STATE_COPY_SCRATCHPAD:
break;
}
return value;
}
-WRITE8_MEMBER( ds2404_device::ds2404_data_w )
+void ds2404_device::data_w(uint8_t data)
{
switch( m_state[m_state_ptr] )
{
- case DS2404_STATE_IDLE:
- ds2404_rom_cmd(data & 0xff);
+ case STATE_IDLE:
+ rom_cmd(data & 0xff);
break;
- case DS2404_STATE_COMMAND:
- ds2404_cmd(data & 0xff);
+ case STATE_COMMAND:
+ cmd(data & 0xff);
break;
- case DS2404_STATE_ADDRESS1:
+ case STATE_ADDRESS1:
m_a1 = data & 0xff;
m_state_ptr++;
break;
- case DS2404_STATE_ADDRESS2:
+ case STATE_ADDRESS2:
m_a2 = data & 0xff;
m_state_ptr++;
break;
- case DS2404_STATE_OFFSET:
+ case STATE_OFFSET:
m_end_offset = data & 0xff;
m_state_ptr++;
break;
- case DS2404_STATE_INIT_COMMAND:
+ case STATE_INIT_COMMAND:
break;
- case DS2404_STATE_READ_MEMORY:
+ case STATE_READ_MEMORY:
break;
- case DS2404_STATE_READ_SCRATCHPAD:
+ case STATE_READ_SCRATCHPAD:
break;
- case DS2404_STATE_WRITE_SCRATCHPAD:
+ case STATE_WRITE_SCRATCHPAD:
if( m_offset < 0x20 )
{
m_ram[m_offset] = data & 0xff;
@@ -240,43 +240,43 @@ WRITE8_MEMBER( ds2404_device::ds2404_data_w )
}
break;
- case DS2404_STATE_COPY_SCRATCHPAD:
+ case STATE_COPY_SCRATCHPAD:
break;
}
- if( m_state[m_state_ptr] == DS2404_STATE_INIT_COMMAND )
+ if( m_state[m_state_ptr] == STATE_INIT_COMMAND )
{
switch( m_state[m_state_ptr + 1] )
{
- case DS2404_STATE_IDLE:
- case DS2404_STATE_COMMAND:
- case DS2404_STATE_ADDRESS1:
- case DS2404_STATE_ADDRESS2:
- case DS2404_STATE_OFFSET:
- case DS2404_STATE_INIT_COMMAND:
+ case STATE_IDLE:
+ case STATE_COMMAND:
+ case STATE_ADDRESS1:
+ case STATE_ADDRESS2:
+ case STATE_OFFSET:
+ case STATE_INIT_COMMAND:
break;
- case DS2404_STATE_READ_MEMORY:
+ case STATE_READ_MEMORY:
m_address = (m_a2 << 8) | m_a1;
m_address -= 1;
break;
- case DS2404_STATE_WRITE_SCRATCHPAD:
+ case STATE_WRITE_SCRATCHPAD:
m_address = (m_a2 << 8) | m_a1;
m_offset = m_address & 0x1f;
break;
- case DS2404_STATE_READ_SCRATCHPAD:
+ case STATE_READ_SCRATCHPAD:
m_address = (m_a2 << 8) | m_a1;
m_offset = m_address & 0x1f;
break;
- case DS2404_STATE_COPY_SCRATCHPAD:
+ case STATE_COPY_SCRATCHPAD:
m_address = (m_a2 << 8) | m_a1;
for(int i = 0; i <= m_end_offset; i++)
{
- ds2404_writemem(m_ram[i]);
+ writemem(m_ram[i]);
m_address++;
}
break;
@@ -285,29 +285,29 @@ WRITE8_MEMBER( ds2404_device::ds2404_data_w )
}
}
-WRITE8_MEMBER( ds2404_device::ds2404_clk_w )
+void ds2404_device::clk_w(uint8_t data)
{
switch( m_state[m_state_ptr] )
{
- case DS2404_STATE_IDLE:
- case DS2404_STATE_COMMAND:
- case DS2404_STATE_ADDRESS1:
- case DS2404_STATE_ADDRESS2:
- case DS2404_STATE_OFFSET:
- case DS2404_STATE_INIT_COMMAND:
+ case STATE_IDLE:
+ case STATE_COMMAND:
+ case STATE_ADDRESS1:
+ case STATE_ADDRESS2:
+ case STATE_OFFSET:
+ case STATE_INIT_COMMAND:
break;
- case DS2404_STATE_READ_MEMORY:
+ case STATE_READ_MEMORY:
m_address++;
break;
- case DS2404_STATE_READ_SCRATCHPAD:
+ case STATE_READ_SCRATCHPAD:
break;
- case DS2404_STATE_WRITE_SCRATCHPAD:
+ case STATE_WRITE_SCRATCHPAD:
break;
- case DS2404_STATE_COPY_SCRATCHPAD:
+ case STATE_COPY_SCRATCHPAD:
break;
}
}
diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h
index 3b7442512a4..3e31b5b14cc 100644
--- a/src/devices/machine/ds2404.h
+++ b/src/devices/machine/ds2404.h
@@ -25,14 +25,14 @@ public:
void ref_day(uint8_t day) { m_ref_day = day; }
/* 1-wire interface reset */
- DECLARE_WRITE8_MEMBER(ds2404_1w_reset_w);
+ void _1w_reset_w(uint8_t data);
/* 3-wire interface reset */
- DECLARE_WRITE8_MEMBER(ds2404_3w_reset_w);
+ void _3w_reset_w(uint8_t data);
- DECLARE_READ8_MEMBER(ds2404_data_r);
- DECLARE_WRITE8_MEMBER(ds2404_data_w);
- DECLARE_WRITE8_MEMBER(ds2404_clk_w);
+ uint8_t data_r();
+ void data_w(uint8_t data);
+ void clk_w(uint8_t data);
protected:
// device-level overrides
@@ -49,24 +49,24 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
- void ds2404_rom_cmd(uint8_t cmd);
- void ds2404_cmd(uint8_t cmd);
+ void rom_cmd(uint8_t cmd);
+ void cmd(uint8_t cmd);
- uint8_t ds2404_readmem();
- void ds2404_writemem(uint8_t value);
+ uint8_t readmem();
+ void writemem(uint8_t value);
- enum DS2404_STATE
+ enum STATE
{
- DS2404_STATE_IDLE = 1, /* waiting for ROM command, in 1-wire mode */
- DS2404_STATE_COMMAND, /* waiting for memory command */
- DS2404_STATE_ADDRESS1, /* waiting for address bits 0-7 */
- DS2404_STATE_ADDRESS2, /* waiting for address bits 8-15 */
- DS2404_STATE_OFFSET, /* waiting for ending offset */
- DS2404_STATE_INIT_COMMAND,
- DS2404_STATE_READ_MEMORY, /* Read Memory command active */
- DS2404_STATE_WRITE_SCRATCHPAD, /* Write Scratchpad command active */
- DS2404_STATE_READ_SCRATCHPAD, /* Read Scratchpad command active */
- DS2404_STATE_COPY_SCRATCHPAD /* Copy Scratchpad command active */
+ STATE_IDLE = 1, /* waiting for ROM command, in 1-wire mode */
+ STATE_COMMAND, /* waiting for memory command */
+ STATE_ADDRESS1, /* waiting for address bits 0-7 */
+ STATE_ADDRESS2, /* waiting for address bits 8-15 */
+ STATE_OFFSET, /* waiting for ending offset */
+ STATE_INIT_COMMAND,
+ STATE_READ_MEMORY, /* Read Memory command active */
+ STATE_WRITE_SCRATCHPAD, /* Write Scratchpad command active */
+ STATE_READ_SCRATCHPAD, /* Read Scratchpad command active */
+ STATE_COPY_SCRATCHPAD /* Copy Scratchpad command active */
};
emu_timer *m_tick_timer;
@@ -84,7 +84,7 @@ private:
uint8_t m_sram[512]; /* 4096 bits */
uint8_t m_ram[32]; /* scratchpad ram, 256 bits */
uint8_t m_rtc[5]; /* 40-bit RTC counter */
- DS2404_STATE m_state[8];
+ STATE m_state[8];
int m_state_ptr;
};
diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp
index d698fedca4a..d5ad8007a61 100644
--- a/src/devices/machine/ds75160a.cpp
+++ b/src/devices/machine/ds75160a.cpp
@@ -59,7 +59,7 @@ void ds75160a_device::device_start()
// read - read data bus
//-------------------------------------------------
-READ8_MEMBER( ds75160a_device::read )
+uint8_t ds75160a_device::read()
{
uint8_t data = 0;
@@ -76,7 +76,7 @@ READ8_MEMBER( ds75160a_device::read )
// write - write data bus
//-------------------------------------------------
-WRITE8_MEMBER( ds75160a_device::write )
+void ds75160a_device::write(uint8_t data)
{
m_data = data;
diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h
index bdc03e9dc99..5e2498d28ad 100644
--- a/src/devices/machine/ds75160a.h
+++ b/src/devices/machine/ds75160a.h
@@ -40,8 +40,8 @@ public:
auto read_callback() { return m_read.bind(); }
auto write_callback() { return m_write.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read();
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( te_w );
DECLARE_WRITE_LINE_MEMBER( pe_w );
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index 3b5ca84b556..2ccf97f026b 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -90,7 +90,7 @@ void e05a03_device::device_reset()
IMPLEMENTATION
***************************************************************************/
-WRITE8_MEMBER( e05a03_device::write )
+void e05a03_device::write(offs_t offset, uint8_t data)
{
logerror("%s: e05a03_w(%02x): %02x\n", machine().describe_context(), offset, data);
@@ -127,7 +127,7 @@ WRITE8_MEMBER( e05a03_device::write )
}
}
-READ8_MEMBER( e05a03_device::read )
+uint8_t e05a03_device::read(offs_t offset)
{
uint8_t result = 0;
diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h
index dc855c2cd67..10022d6814b 100644
--- a/src/devices/machine/e05a03.h
+++ b/src/devices/machine/e05a03.h
@@ -26,8 +26,8 @@ public:
auto pe_wr_callback() { return m_write_pe.bind(); }
auto data_rd_callback() { return m_read_data.bind(); }
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( read );
+ void write(offs_t offset, uint8_t data);
+ uint8_t read(offs_t offset);
WRITE_LINE_MEMBER( home_w ); /* home position signal */
WRITE_LINE_MEMBER( fire_w ); /* printhead solenoids trigger */
diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp
index 4857c75bc3d..8b6d17f21b1 100644
--- a/src/devices/machine/e05a30.cpp
+++ b/src/devices/machine/e05a30.cpp
@@ -162,7 +162,7 @@ WRITE_LINE_MEMBER( e05a30_device::centronics_input_strobe )
IMPLEMENTATION
***************************************************************************/
-WRITE8_MEMBER( e05a30_device::write )
+void e05a30_device::write(offs_t offset, uint8_t data)
{
LOG("%s: e05a30_w([0xC0%02x]): %02x\n", machine().describe_context(), offset, data);
@@ -190,7 +190,7 @@ WRITE8_MEMBER( e05a30_device::write )
}
}
-READ8_MEMBER( e05a30_device::read )
+uint8_t e05a30_device::read(offs_t offset)
{
uint8_t result = 0;
diff --git a/src/devices/machine/e05a30.h b/src/devices/machine/e05a30.h
index aaf89f63e42..9ac6cefdae5 100644
--- a/src/devices/machine/e05a30.h
+++ b/src/devices/machine/e05a30.h
@@ -25,8 +25,8 @@ public:
auto centronics_fault() { return m_write_centronics_fault.bind(); }
auto centronics_select() { return m_write_centronics_select.bind(); }
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( read );
+ void write(offs_t offset, uint8_t data);
+ uint8_t read(offs_t offset);
/* Centronics stuff */
DECLARE_WRITE_LINE_MEMBER( centronics_input_strobe );
diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp
index 8450502c22d..4f7b6ff798b 100644
--- a/src/devices/machine/f3853.cpp
+++ b/src/devices/machine/f3853.cpp
@@ -149,7 +149,7 @@ void f3853_device::device_reset()
// clear ports at power-on
for (int i = 0; i < 4; i++)
- write(machine().dummy_space(), i, 0);
+ write(i, 0);
}
@@ -224,7 +224,7 @@ WRITE_LINE_MEMBER(f3853_device::pri_in_w)
}
-READ8_MEMBER(f3853_device::read)
+uint8_t f3853_device::read(offs_t offset)
{
switch (offset & 3)
{
@@ -240,7 +240,7 @@ READ8_MEMBER(f3853_device::read)
}
}
-WRITE8_MEMBER(f3853_device::write)
+void f3853_device::write(offs_t offset, uint8_t data)
{
switch (offset & 3)
{
@@ -273,7 +273,7 @@ WRITE8_MEMBER(f3853_device::write)
// f3851_device-specific handlers
//-------------------------------------------------
-READ8_MEMBER(f3851_device::read)
+uint8_t f3851_device::read(offs_t offset)
{
switch (offset & 3)
{
@@ -287,7 +287,7 @@ READ8_MEMBER(f3851_device::read)
}
}
-WRITE8_MEMBER(f3851_device::write)
+void f3851_device::write(offs_t offset, uint8_t data)
{
switch (offset & 3)
{
@@ -298,7 +298,7 @@ WRITE8_MEMBER(f3851_device::write)
// interrupt control, timer: same as 3853
case 2: case 3:
- f3853_device::write(space, offset, data);
+ f3853_device::write(offset, data);
break;
}
}
@@ -331,7 +331,7 @@ TIMER_CALLBACK_MEMBER(f3856_device::timer_callback)
timer_start(m_timer_count);
}
-READ8_MEMBER(f3856_device::read)
+uint8_t f3856_device::read(offs_t offset)
{
switch (offset & 3)
{
@@ -341,17 +341,17 @@ READ8_MEMBER(f3856_device::read)
// other: same as 3851
default:
- return f3851_device::read(space, offset);
+ return f3851_device::read(offset);
}
}
-WRITE8_MEMBER(f3856_device::write)
+void f3856_device::write(offs_t offset, uint8_t data)
{
switch (offset & 3)
{
// I/O ports: same as 3851
case 0: case 1:
- f3851_device::write(space, offset, data);
+ f3851_device::write(offset, data);
break;
// interrupt/timer control
@@ -376,7 +376,7 @@ WRITE8_MEMBER(f3856_device::write)
// set timer
case 3:
- f3853_device::write(space, offset, data);
+ f3853_device::write(offset, data);
break;
}
}
@@ -386,7 +386,7 @@ WRITE8_MEMBER(f3856_device::write)
// f38t56_device-specific handlers
//-------------------------------------------------
-READ8_MEMBER(f38t56_device::read)
+uint8_t f38t56_device::read(offs_t offset)
{
switch (offset & 3)
{
@@ -396,17 +396,17 @@ READ8_MEMBER(f38t56_device::read)
// other: same as 3856
default:
- return f3856_device::read(space, offset);
+ return f3856_device::read(offset);
}
}
-WRITE8_MEMBER(f38t56_device::write)
+void f38t56_device::write(offs_t offset, uint8_t data)
{
switch (offset & 3)
{
// I/O ports: same as 3851
case 0: case 1:
- f3851_device::write(space, offset, data);
+ f3851_device::write(offset, data);
break;
// interrupt/timer control
@@ -434,7 +434,7 @@ WRITE8_MEMBER(f38t56_device::write)
// set timer
case 3:
m_timer_modulo = data;
- f3853_device::write(space, offset, data);
+ f3853_device::write(offset, data);
break;
}
}
diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h
index c529eaa34e6..f7d6adb3b5c 100644
--- a/src/devices/machine/f3853.h
+++ b/src/devices/machine/f3853.h
@@ -73,8 +73,8 @@ public:
auto pri_out_callback() { return m_pri_out_callback.bind(); }
template <typename... T> void set_int_daisy_chain_callback(T &&... args) { m_int_daisy_chain_callback.set(std::forward<T>(args)...); }
- virtual DECLARE_READ8_MEMBER(read);
- virtual DECLARE_WRITE8_MEMBER(write);
+ virtual uint8_t read(offs_t offset);
+ virtual void write(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(ext_int_w);
DECLARE_WRITE_LINE_MEMBER(pri_in_w);
@@ -130,8 +130,8 @@ public:
auto write_a() { return m_write_port[0].bind(); }
auto write_b() { return m_write_port[1].bind(); }
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
protected:
f3851_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -147,8 +147,8 @@ class f3856_device : public f3851_device
public:
f3856_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
virtual TIMER_CALLBACK_MEMBER(timer_callback) override;
@@ -169,8 +169,8 @@ class f38t56_device : public f3856_device
public:
f38t56_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
};
// device type definition
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 2f2adb42976..90f78c77e54 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -10,7 +10,7 @@ fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char
{
}
-READ8_MEMBER(fdc37c665gt_device::read)
+uint8_t fdc37c665gt_device::read(offs_t offset)
{
uint8_t data = 0;
@@ -29,7 +29,7 @@ READ8_MEMBER(fdc37c665gt_device::read)
return data;
}
-WRITE8_MEMBER(fdc37c665gt_device::write)
+void fdc37c665gt_device::write(offs_t offset, uint8_t data)
{
if ((offset & 0x3f8) == 0x3f8)
{
diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h
index 47fdd855503..df733078aae 100644
--- a/src/devices/machine/fdc37c665gt.h
+++ b/src/devices/machine/fdc37c665gt.h
@@ -18,8 +18,8 @@ public:
// construction/destruction
fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp
index 4616a513168..d29fe2fa89e 100644
--- a/src/devices/machine/fdc37c93x.cpp
+++ b/src/devices/machine/fdc37c93x.cpp
@@ -434,7 +434,7 @@ WRITE_LINE_MEMBER(fdc37c93x_device::kbdp20_gp20_reset_w)
m_gp20_reset_callback(state);
}
-READ8_MEMBER(fdc37c93x_device::read_fdc37c93x)
+uint8_t fdc37c93x_device::read(offs_t offset)
{
if (offset == 0)
{
@@ -455,7 +455,7 @@ READ8_MEMBER(fdc37c93x_device::read_fdc37c93x)
return 0;
}
-WRITE8_MEMBER(fdc37c93x_device::write_fdc37c93x)
+void fdc37c93x_device::write(offs_t offset, uint8_t data)
{
uint8_t byt;
@@ -500,12 +500,12 @@ WRITE8_MEMBER(fdc37c93x_device::write_fdc37c93x)
/* Map/unmap internal devices */
#if 1
-READ8_MEMBER(fdc37c93x_device::disabled_read)
+uint8_t fdc37c93x_device::disabled_read()
{
return 0xff;
}
-WRITE8_MEMBER(fdc37c93x_device::disabled_write)
+void fdc37c93x_device::disabled_write(uint8_t data)
{
}
@@ -548,17 +548,7 @@ void fdc37c93x_device::unmap_fdc_addresses()
void fdc37c93x_device::map_lpt(address_map &map)
{
- map(0x0, 0x3).rw(FUNC(fdc37c93x_device::lpt_read), FUNC(fdc37c93x_device::lpt_write));
-}
-
-READ8_MEMBER(fdc37c93x_device::lpt_read)
-{
- return pc_lpt_lptdev->read(offset);
-}
-
-WRITE8_MEMBER(fdc37c93x_device::lpt_write)
-{
- pc_lpt_lptdev->write(offset, data);
+ map(0x0, 0x3).rw(pc_lpt_lptdev, FUNC(pc_lpt_device::read), FUNC(pc_lpt_device::write));
}
void fdc37c93x_device::map_lpt_addresses()
@@ -577,17 +567,7 @@ void fdc37c93x_device::unmap_lpt_addresses()
void fdc37c93x_device::map_serial1(address_map &map)
{
- map(0x0, 0x7).rw(FUNC(fdc37c93x_device::serial1_read), FUNC(fdc37c93x_device::serial1_write));
-}
-
-READ8_MEMBER(fdc37c93x_device::serial1_read)
-{
- return pc_serial1_comdev->ins8250_r(offset);
-}
-
-WRITE8_MEMBER(fdc37c93x_device::serial1_write)
-{
- pc_serial1_comdev->ins8250_w(offset, data);
+ map(0x0, 0x7).rw(pc_serial1_comdev, FUNC(ns16450_device::ins8250_r), FUNC(ns16450_device::ins8250_w));
}
void fdc37c93x_device::map_serial1_addresses()
@@ -606,17 +586,7 @@ void fdc37c93x_device::unmap_serial1_addresses()
void fdc37c93x_device::map_serial2(address_map &map)
{
- map(0x0, 0x7).rw(FUNC(fdc37c93x_device::serial2_read), FUNC(fdc37c93x_device::serial2_write));
-}
-
-READ8_MEMBER(fdc37c93x_device::serial2_read)
-{
- return pc_serial2_comdev->ins8250_r(offset);
-}
-
-WRITE8_MEMBER(fdc37c93x_device::serial2_write)
-{
- pc_serial2_comdev->ins8250_w(offset, data);
+ map(0x0, 0x7).rw(pc_serial2_comdev, FUNC(ns16450_device::ins8250_r), FUNC(ns16450_device::ins8250_w));
}
void fdc37c93x_device::map_serial2_addresses()
@@ -635,17 +605,7 @@ void fdc37c93x_device::unmap_serial2_addresses()
void fdc37c93x_device::map_rtc(address_map &map)
{
- map(0x0, 0xf).rw(FUNC(fdc37c93x_device::rtc_read), FUNC(fdc37c93x_device::rtc_write));
-}
-
-READ8_MEMBER(fdc37c93x_device::rtc_read)
-{
- return ds12885_rtcdev->read(offset);
-}
-
-WRITE8_MEMBER(fdc37c93x_device::rtc_write)
-{
- ds12885_rtcdev->write(offset, data);
+ map(0x0, 0xf).rw(ds12885_rtcdev, FUNC(ds12885_device::read), FUNC(ds12885_device::write));
}
void fdc37c93x_device::map_rtc_addresses()
@@ -674,34 +634,34 @@ void fdc37c93x_device::unmap_keyboard(address_map &map)
map(0x4, 0x4).noprw();
}
-READ8_MEMBER(fdc37c93x_device::at_keybc_r)
+uint8_t fdc37c93x_device::at_keybc_r(offs_t offset)
{
switch (offset) //m_kbdc
{
case 0:
- return m_kbdc->data_r(space, 0);
+ return m_kbdc->data_r(0);
}
return 0xff;
}
-WRITE8_MEMBER(fdc37c93x_device::at_keybc_w)
+void fdc37c93x_device::at_keybc_w(offs_t offset, uint8_t data)
{
switch (offset)
{
case 0:
- m_kbdc->data_w(space, 0, data);
+ m_kbdc->data_w(0, data);
}
}
-READ8_MEMBER(fdc37c93x_device::keybc_status_r)
+uint8_t fdc37c93x_device::keybc_status_r()
{
- return (m_kbdc->data_r(space, 4) & 0xfb) | 0x10; // bios needs bit 2 to be 0 as powerup and bit 4 to be 1
+ return (m_kbdc->data_r(4) & 0xfb) | 0x10; // bios needs bit 2 to be 0 as powerup and bit 4 to be 1
}
-WRITE8_MEMBER(fdc37c93x_device::keybc_command_w)
+void fdc37c93x_device::keybc_command_w(uint8_t data)
{
- m_kbdc->data_w(space, 4, data);
+ m_kbdc->data_w(4, data);
}
void fdc37c93x_device::map_keyboard_addresses()
@@ -723,9 +683,9 @@ void fdc37c93x_device::remap(int space_id, offs_t start, offs_t end)
if (space_id == AS_IO)
{
if (sysopt_pin == 0)
- m_isa->install_device(0x03f0, 0x03f3, read8_delegate(*this, FUNC(fdc37c93x_device::read_fdc37c93x)), write8_delegate(*this, FUNC(fdc37c93x_device::write_fdc37c93x)));
+ m_isa->install_device(0x03f0, 0x03f3, read8sm_delegate(*this, FUNC(fdc37c93x_device::read)), write8sm_delegate(*this, FUNC(fdc37c93x_device::write)));
else
- m_isa->install_device(0x0370, 0x0373, read8_delegate(*this, FUNC(fdc37c93x_device::read_fdc37c93x)), write8_delegate(*this, FUNC(fdc37c93x_device::write_fdc37c93x)));
+ m_isa->install_device(0x0370, 0x0373, read8sm_delegate(*this, FUNC(fdc37c93x_device::read)), write8sm_delegate(*this, FUNC(fdc37c93x_device::write)));
if (enabled_logical[LogicalDevice::FDC] == true)
map_fdc_addresses();
if (enabled_logical[LogicalDevice::Parallel] == true)
diff --git a/src/devices/machine/fdc37c93x.h b/src/devices/machine/fdc37c93x.h
index c57921854aa..a4a67d2ccf3 100644
--- a/src/devices/machine/fdc37c93x.h
+++ b/src/devices/machine/fdc37c93x.h
@@ -91,22 +91,14 @@ public:
void unmap_keyboard(address_map &map);
// to access io ports
- DECLARE_READ8_MEMBER(read_fdc37c93x);
- DECLARE_WRITE8_MEMBER(write_fdc37c93x);
- DECLARE_READ8_MEMBER(disabled_read);
- DECLARE_WRITE8_MEMBER(disabled_write);
- DECLARE_READ8_MEMBER(lpt_read);
- DECLARE_WRITE8_MEMBER(lpt_write);
- DECLARE_READ8_MEMBER(serial1_read);
- DECLARE_WRITE8_MEMBER(serial1_write);
- DECLARE_READ8_MEMBER(serial2_read);
- DECLARE_WRITE8_MEMBER(serial2_write);
- DECLARE_READ8_MEMBER(rtc_read);
- DECLARE_WRITE8_MEMBER(rtc_write);
- DECLARE_READ8_MEMBER(at_keybc_r);
- DECLARE_WRITE8_MEMBER(at_keybc_w);
- DECLARE_READ8_MEMBER(keybc_status_r);
- DECLARE_WRITE8_MEMBER(keybc_command_w);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
+ uint8_t disabled_read();
+ void disabled_write(uint8_t data);
+ uint8_t at_keybc_r(offs_t offset);
+ void at_keybc_w(offs_t offset, uint8_t data);
+ uint8_t keybc_status_r();
+ void keybc_command_w(uint8_t data);
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp
index d9708fb37fc..d2ac00f8f62 100644
--- a/src/devices/machine/fga002.cpp
+++ b/src/devices/machine/fga002.cpp
@@ -608,7 +608,7 @@ WRITE_LINE_MEMBER (fga002_device::lirq5_w) { LOGINT("%s\n", FUNCNAME); lirq_w( F
WRITE_LINE_MEMBER (fga002_device::lirq6_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL6, INT_LOCAL6, FGA_ICRLOCAL6, state ); }
WRITE_LINE_MEMBER (fga002_device::lirq7_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL7, INT_LOCAL7, FGA_ICRLOCAL7, state ); }
-WRITE8_MEMBER (fga002_device::write){
+void fga002_device::write(offs_t offset, uint8_t data){
LOG("%s[%04x] <- %02x - ", FUNCNAME, offset, data);
LOGSETUP(" * %s Reg %04x <- %02x\n", tag(), offset, data);
switch(offset)
@@ -718,7 +718,7 @@ WRITE8_MEMBER (fga002_device::write){
}
}
-READ8_MEMBER (fga002_device::read){
+uint8_t fga002_device::read(offs_t offset){
uint8_t ret = 0;
LOG("%s[%04x] ", FUNCNAME, offset);
diff --git a/src/devices/machine/fga002.h b/src/devices/machine/fga002.h
index dac28d1c81c..be72206eb76 100644
--- a/src/devices/machine/fga002.h
+++ b/src/devices/machine/fga002.h
@@ -12,8 +12,8 @@ class fga002_device : public device_t
// construction/destruction
fga002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER (write);
- DECLARE_READ8_MEMBER (read);
+ void write(offs_t offset, uint8_t data);
+ uint8_t read(offs_t offset);
void lirq_w(int status, int vector, int control, int state);
DECLARE_WRITE_LINE_MEMBER( lirq0_w );
diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp
index ac818a930b5..3163fa1d9c5 100644
--- a/src/devices/machine/genpc.cpp
+++ b/src/devices/machine/genpc.cpp
@@ -38,7 +38,7 @@
*
*************************************************************************/
-WRITE8_MEMBER( ibm5160_mb_device::pc_page_w)
+void ibm5160_mb_device::pc_page_w(offs_t offset, uint8_t data)
{
switch(offset % 4)
{
@@ -64,7 +64,7 @@ WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dma_hrq_changed )
}
-READ8_MEMBER( ibm5160_mb_device::pc_dma_read_byte )
+uint8_t ibm5160_mb_device::pc_dma_read_byte(offs_t offset)
{
if(m_dma_channel == -1)
return 0xff;
@@ -74,7 +74,7 @@ READ8_MEMBER( ibm5160_mb_device::pc_dma_read_byte )
}
-WRITE8_MEMBER( ibm5160_mb_device::pc_dma_write_byte )
+void ibm5160_mb_device::pc_dma_write_byte(offs_t offset, uint8_t data)
{
if(m_dma_channel == -1)
return;
@@ -85,41 +85,41 @@ WRITE8_MEMBER( ibm5160_mb_device::pc_dma_write_byte )
}
-READ8_MEMBER( ibm5160_mb_device::pc_dma8237_1_dack_r )
+uint8_t ibm5160_mb_device::pc_dma8237_1_dack_r()
{
return m_isabus->dack_r(1);
}
-READ8_MEMBER( ibm5160_mb_device::pc_dma8237_2_dack_r )
+uint8_t ibm5160_mb_device::pc_dma8237_2_dack_r()
{
return m_isabus->dack_r(2);
}
-READ8_MEMBER( ibm5160_mb_device::pc_dma8237_3_dack_r )
+uint8_t ibm5160_mb_device::pc_dma8237_3_dack_r()
{
return m_isabus->dack_r(3);
}
-WRITE8_MEMBER( ibm5160_mb_device::pc_dma8237_1_dack_w )
+void ibm5160_mb_device::pc_dma8237_1_dack_w(uint8_t data)
{
m_isabus->dack_w(1,data);
}
-WRITE8_MEMBER( ibm5160_mb_device::pc_dma8237_2_dack_w )
+void ibm5160_mb_device::pc_dma8237_2_dack_w(uint8_t data)
{
m_isabus->dack_w(2,data);
}
-WRITE8_MEMBER( ibm5160_mb_device::pc_dma8237_3_dack_w )
+void ibm5160_mb_device::pc_dma8237_3_dack_w(uint8_t data)
{
m_isabus->dack_w(3,data);
}
-WRITE8_MEMBER( ibm5160_mb_device::pc_dma8237_0_dack_w )
+void ibm5160_mb_device::pc_dma8237_0_dack_w(uint8_t data)
{
m_u73_q2 = 0;
m_dma8237->dreq0_w( m_u73_q2 );
@@ -306,7 +306,7 @@ WRITE_LINE_MEMBER( ibm5160_mb_device::keyboard_data_w )
m_ppi_data_signal = state;
}
-READ8_MEMBER (ibm5160_mb_device::pc_ppi_porta_r)
+uint8_t ibm5160_mb_device::pc_ppi_porta_r()
{
int data = 0xFF;
/* KB port A */
@@ -332,7 +332,7 @@ READ8_MEMBER (ibm5160_mb_device::pc_ppi_porta_r)
}
-READ8_MEMBER ( ibm5160_mb_device::pc_ppi_portc_r )
+uint8_t ibm5160_mb_device::pc_ppi_portc_r()
{
int data=0xff;
@@ -362,7 +362,7 @@ READ8_MEMBER ( ibm5160_mb_device::pc_ppi_portc_r )
}
-WRITE8_MEMBER( ibm5160_mb_device::pc_ppi_portb_w )
+void ibm5160_mb_device::pc_ppi_portb_w(uint8_t data)
{
/* PPI controller port B*/
m_ppi_portb = data;
@@ -392,7 +392,7 @@ WRITE8_MEMBER( ibm5160_mb_device::pc_ppi_portb_w )
*
**********************************************************/
-WRITE8_MEMBER( ibm5160_mb_device::nmi_enable_w )
+void ibm5160_mb_device::nmi_enable_w(uint8_t data)
{
m_nmi_enabled = BIT(data,7);
if (!m_nmi_enabled)
@@ -656,7 +656,7 @@ ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, device_type
{
}
-READ8_MEMBER (ibm5150_mb_device::pc_ppi_porta_r)
+uint8_t ibm5150_mb_device::pc_ppi_porta_r()
{
int data = 0xFF;
/* KB port A */
@@ -697,7 +697,7 @@ READ8_MEMBER (ibm5150_mb_device::pc_ppi_porta_r)
}
-READ8_MEMBER ( ibm5150_mb_device::pc_ppi_portc_r )
+uint8_t ibm5150_mb_device::pc_ppi_portc_r()
{
int data=0xff;
@@ -765,7 +765,7 @@ READ8_MEMBER ( ibm5150_mb_device::pc_ppi_portc_r )
}
-WRITE8_MEMBER( ibm5150_mb_device::pc_ppi_portb_w )
+void ibm5150_mb_device::pc_ppi_portb_w(uint8_t data)
{
/* KB controller port B */
m_ppi_portb = data;
@@ -865,7 +865,7 @@ void ec1840_mb_device::device_start()
{
}
-READ8_MEMBER( ec1840_mb_device::pc_ppi_portc_r )
+uint8_t ec1840_mb_device::pc_ppi_portc_r()
{
int data = 0xff;
@@ -985,7 +985,7 @@ void ec1841_mb_device::device_start()
}
// kbd interface is 5150-like but PB2 controls access to second bank of DIP switches (SA2).
-WRITE8_MEMBER( ec1841_mb_device::pc_ppi_portb_w )
+void ec1841_mb_device::pc_ppi_portb_w(uint8_t data)
{
/* KB controller port B */
m_ppi_portb = data;
@@ -1008,7 +1008,7 @@ WRITE8_MEMBER( ec1841_mb_device::pc_ppi_portb_w )
m_pc_kbdc->clock_write_from_mb(m_ppi_clock_signal);
}
-READ8_MEMBER( ec1841_mb_device::pc_ppi_portc_r )
+uint8_t ec1841_mb_device::pc_ppi_portc_r()
{
int data=0xff;
diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h
index e302df90513..c1bce1c3072 100644
--- a/src/devices/machine/genpc.h
+++ b/src/devices/machine/genpc.h
@@ -45,8 +45,8 @@ public:
uint8_t m_pit_out2;
- DECLARE_WRITE8_MEMBER(pc_page_w);
- DECLARE_WRITE8_MEMBER(nmi_enable_w);
+ void pc_page_w(offs_t offset, uint8_t data);
+ void nmi_enable_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata );
@@ -107,21 +107,21 @@ protected:
DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w );
DECLARE_WRITE_LINE_MEMBER( keyboard_data_w );
- DECLARE_READ8_MEMBER ( pc_ppi_porta_r );
- DECLARE_READ8_MEMBER ( pc_ppi_portc_r );
- DECLARE_WRITE8_MEMBER( pc_ppi_portb_w );
+ uint8_t pc_ppi_porta_r();
+ uint8_t pc_ppi_portc_r();
+ void pc_ppi_portb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( pc_dma_hrq_changed );
DECLARE_WRITE_LINE_MEMBER( pc_dma8237_out_eop );
- DECLARE_READ8_MEMBER( pc_dma_read_byte );
- DECLARE_WRITE8_MEMBER( pc_dma_write_byte );
- DECLARE_READ8_MEMBER( pc_dma8237_1_dack_r );
- DECLARE_READ8_MEMBER( pc_dma8237_2_dack_r );
- DECLARE_READ8_MEMBER( pc_dma8237_3_dack_r );
- DECLARE_WRITE8_MEMBER( pc_dma8237_1_dack_w );
- DECLARE_WRITE8_MEMBER( pc_dma8237_2_dack_w );
- DECLARE_WRITE8_MEMBER( pc_dma8237_3_dack_w );
- DECLARE_WRITE8_MEMBER( pc_dma8237_0_dack_w );
+ uint8_t pc_dma_read_byte(offs_t offset);
+ void pc_dma_write_byte(offs_t offset, uint8_t data);
+ uint8_t pc_dma8237_1_dack_r();
+ uint8_t pc_dma8237_2_dack_r();
+ uint8_t pc_dma8237_3_dack_r();
+ void pc_dma8237_1_dack_w(uint8_t data);
+ void pc_dma8237_2_dack_w(uint8_t data);
+ void pc_dma8237_3_dack_w(uint8_t data);
+ void pc_dma8237_0_dack_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( pc_dack0_w );
DECLARE_WRITE_LINE_MEMBER( pc_dack1_w );
DECLARE_WRITE_LINE_MEMBER( pc_dack2_w );
@@ -156,9 +156,9 @@ protected:
private:
required_device<cassette_image_device> m_cassette;
- DECLARE_READ8_MEMBER ( pc_ppi_porta_r );
- DECLARE_READ8_MEMBER ( pc_ppi_portc_r );
- DECLARE_WRITE8_MEMBER( pc_ppi_portb_w );
+ uint8_t pc_ppi_porta_r();
+ uint8_t pc_ppi_portc_r();
+ void pc_ppi_portb_w(uint8_t data);
};
@@ -181,8 +181,8 @@ protected:
virtual void device_start() override;
private:
- DECLARE_READ8_MEMBER ( pc_ppi_portc_r );
- DECLARE_WRITE8_MEMBER( pc_ppi_portb_w );
+ uint8_t pc_ppi_portc_r();
+ void pc_ppi_portb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w );
};
@@ -203,8 +203,8 @@ protected:
virtual void device_start() override;
private:
- DECLARE_READ8_MEMBER ( pc_ppi_portc_r );
- DECLARE_WRITE8_MEMBER( pc_ppi_portb_w );
+ uint8_t pc_ppi_portc_r();
+ void pc_ppi_portb_w(uint8_t data);
};
DECLARE_DEVICE_TYPE(EC1840_MOTHERBOARD, ec1840_mb_device)
diff --git a/src/devices/machine/i82439tx.cpp b/src/devices/machine/i82439tx.cpp
index a3f750c58fb..f8c1c9a8bb3 100644
--- a/src/devices/machine/i82439tx.cpp
+++ b/src/devices/machine/i82439tx.cpp
@@ -149,142 +149,142 @@ void i82439tx_host_device::map_extra(uint64_t memory_window_start, uint64_t memo
}
-READ8_MEMBER (i82439tx_host_device::pcon_r)
+uint8_t i82439tx_host_device::pcon_r()
{
return pcon;
}
-WRITE8_MEMBER(i82439tx_host_device::pcon_w)
+void i82439tx_host_device::pcon_w(uint8_t data)
{
pcon = data;
logerror("pcon = %02x\n", pcon);
}
-READ8_MEMBER (i82439tx_host_device::cc_r)
+uint8_t i82439tx_host_device::cc_r()
{
return cc;
}
-WRITE8_MEMBER(i82439tx_host_device::cc_w)
+void i82439tx_host_device::cc_w(uint8_t data)
{
cc = data;
logerror("cc = %02x\n", cc);
}
-READ8_MEMBER (i82439tx_host_device::dramec_r)
+uint8_t i82439tx_host_device::dramec_r()
{
return dramec;
}
-WRITE8_MEMBER(i82439tx_host_device::dramec_w)
+void i82439tx_host_device::dramec_w(uint8_t data)
{
dramec = data;
logerror("dramec = %02x\n", dramec);
}
-READ8_MEMBER (i82439tx_host_device::dramc_r)
+uint8_t i82439tx_host_device::dramc_r()
{
return dramc;
}
-WRITE8_MEMBER(i82439tx_host_device::dramc_w)
+void i82439tx_host_device::dramc_w(uint8_t data)
{
dramc = data;
logerror("dramc = %02x\n", dramc);
remap_cb();
}
-READ8_MEMBER (i82439tx_host_device::dramt_r)
+uint8_t i82439tx_host_device::dramt_r()
{
return dramt;
}
-WRITE8_MEMBER(i82439tx_host_device::dramt_w)
+void i82439tx_host_device::dramt_w(uint8_t data)
{
dramt = data;
logerror("dramt = %02x\n", dramt);
}
-READ8_MEMBER (i82439tx_host_device::pam_r)
+uint8_t i82439tx_host_device::pam_r(offs_t offset)
{
return pam[offset - 1];
}
-WRITE8_MEMBER(i82439tx_host_device::pam_w)
+void i82439tx_host_device::pam_w(offs_t offset, uint8_t data)
{
pam[offset - 1] = data;
logerror("pam[%d] = %02x\n", offset - 1, pam[offset - 1]);
remap_cb();
}
-READ8_MEMBER (i82439tx_host_device::drb_r)
+uint8_t i82439tx_host_device::drb_r(offs_t offset)
{
return drb[offset];
}
-WRITE8_MEMBER(i82439tx_host_device::drb_w)
+void i82439tx_host_device::drb_w(offs_t offset, uint8_t data)
{
drb[offset] = data;
logerror("drb[%d] = %02x\n", offset, drb[offset]);
}
-READ8_MEMBER (i82439tx_host_device::drt_r)
+uint8_t i82439tx_host_device::drt_r()
{
return drt;
}
-WRITE8_MEMBER(i82439tx_host_device::drt_w)
+void i82439tx_host_device::drt_w(uint8_t data)
{
drt = data;
logerror("drt = %02x\n", drt);
}
-READ8_MEMBER (i82439tx_host_device::drat_r)
+uint8_t i82439tx_host_device::drat_r()
{
return drat;
}
-WRITE8_MEMBER(i82439tx_host_device::drat_w)
+void i82439tx_host_device::drat_w(uint8_t data)
{
drat = data;
logerror("drat = %02x\n", drat);
}
-READ8_MEMBER (i82439tx_host_device::smram_r)
+uint8_t i82439tx_host_device::smram_r()
{
return smram;
}
-WRITE8_MEMBER(i82439tx_host_device::smram_w)
+void i82439tx_host_device::smram_w(uint8_t data)
{
smram = data;
logerror("smram = %02x\n", smram);
remap_cb();
}
-READ8_MEMBER (i82439tx_host_device::errcmd_r)
+uint8_t i82439tx_host_device::errcmd_r()
{
return errcmd;
}
-WRITE8_MEMBER(i82439tx_host_device::errcmd_w)
+void i82439tx_host_device::errcmd_w(uint8_t data)
{
errcmd = data;
logerror("errcmd = %02x\n", errcmd);
}
-READ8_MEMBER (i82439tx_host_device::errsts_r)
+uint8_t i82439tx_host_device::errsts_r()
{
return errsts;
}
-WRITE8_MEMBER(i82439tx_host_device::errsts_w)
+void i82439tx_host_device::errsts_w(uint8_t data)
{
errsts = data;
logerror("errsts = %02x\n", errsts);
}
-READ8_MEMBER (i82439tx_host_device::errsyn_r)
+uint8_t i82439tx_host_device::errsyn_r()
{
return errsyn;
}
diff --git a/src/devices/machine/i82439tx.h b/src/devices/machine/i82439tx.h
index d14c1df0804..a2a9528b1dd 100644
--- a/src/devices/machine/i82439tx.h
+++ b/src/devices/machine/i82439tx.h
@@ -44,31 +44,31 @@ private:
uint8_t pam[7], drb[8];
uint8_t drt, drat, smram, errcmd, errsts, errsyn;
- DECLARE_READ8_MEMBER (pcon_r);
- DECLARE_WRITE8_MEMBER(pcon_w);
- DECLARE_READ8_MEMBER (cc_r);
- DECLARE_WRITE8_MEMBER(cc_w);
- DECLARE_READ8_MEMBER (dramec_r);
- DECLARE_WRITE8_MEMBER(dramec_w);
- DECLARE_READ8_MEMBER (dramc_r);
- DECLARE_WRITE8_MEMBER(dramc_w);
- DECLARE_READ8_MEMBER (dramt_r);
- DECLARE_WRITE8_MEMBER(dramt_w);
- DECLARE_READ8_MEMBER (pam_r);
- DECLARE_WRITE8_MEMBER(pam_w);
- DECLARE_READ8_MEMBER (drb_r);
- DECLARE_WRITE8_MEMBER(drb_w);
- DECLARE_READ8_MEMBER (drt_r);
- DECLARE_WRITE8_MEMBER(drt_w);
- DECLARE_READ8_MEMBER (drat_r);
- DECLARE_WRITE8_MEMBER(drat_w);
- DECLARE_READ8_MEMBER (smram_r);
- DECLARE_WRITE8_MEMBER(smram_w);
- DECLARE_READ8_MEMBER (errcmd_r);
- DECLARE_WRITE8_MEMBER(errcmd_w);
- DECLARE_READ8_MEMBER (errsts_r);
- DECLARE_WRITE8_MEMBER(errsts_w);
- DECLARE_READ8_MEMBER (errsyn_r);
+ uint8_t pcon_r();
+ void pcon_w(uint8_t data);
+ uint8_t cc_r();
+ void cc_w(uint8_t data);
+ uint8_t dramec_r();
+ void dramec_w(uint8_t data);
+ uint8_t dramc_r();
+ void dramc_w(uint8_t data);
+ uint8_t dramt_r();
+ void dramt_w(uint8_t data);
+ uint8_t pam_r(offs_t offset);
+ void pam_w(offs_t offset, uint8_t data);
+ uint8_t drb_r(offs_t offset);
+ void drb_w(offs_t offset, uint8_t data);
+ uint8_t drt_r();
+ void drt_w(uint8_t data);
+ uint8_t drat_r();
+ void drat_w(uint8_t data);
+ uint8_t smram_r();
+ void smram_w(uint8_t data);
+ uint8_t errcmd_r();
+ void errcmd_w(uint8_t data);
+ uint8_t errsts_r();
+ void errsts_w(uint8_t data);
+ uint8_t errsyn_r();
};
DECLARE_DEVICE_TYPE(I82439TX, i82439tx_host_device)
diff --git a/src/devices/machine/latch8.cpp b/src/devices/machine/latch8.cpp
index 4ca9782405a..4db3d302195 100644
--- a/src/devices/machine/latch8.cpp
+++ b/src/devices/machine/latch8.cpp
@@ -36,7 +36,7 @@ TIMER_CALLBACK_MEMBER( latch8_device::timerproc )
/* ----------------------------------------------------------------------- */
-READ8_MEMBER( latch8_device::read )
+uint8_t latch8_device::read(offs_t offset)
{
uint8_t res;
@@ -55,7 +55,7 @@ READ8_MEMBER( latch8_device::read )
}
-WRITE8_MEMBER( latch8_device::write )
+void latch8_device::write(offs_t offset, uint8_t data)
{
assert(offset == 0);
@@ -66,7 +66,7 @@ WRITE8_MEMBER( latch8_device::write )
}
-WRITE8_MEMBER( latch8_device::reset_w )
+void latch8_device::reset_w(offs_t offset, uint8_t data)
{
assert(offset == 0);
@@ -90,14 +90,14 @@ void latch8_device::bitx_w(int bit, offs_t offset, uint8_t data)
machine().scheduler().synchronize(timer_expired_delegate(FUNC(latch8_device::timerproc),this), (mask << 8) | masked_data);
}
-WRITE8_MEMBER( latch8_device::bit0_w ) { bitx_w(0, offset, data); }
-WRITE8_MEMBER( latch8_device::bit1_w ) { bitx_w(1, offset, data); }
-WRITE8_MEMBER( latch8_device::bit2_w ) { bitx_w(2, offset, data); }
-WRITE8_MEMBER( latch8_device::bit3_w ) { bitx_w(3, offset, data); }
-WRITE8_MEMBER( latch8_device::bit4_w ) { bitx_w(4, offset, data); }
-WRITE8_MEMBER( latch8_device::bit5_w ) { bitx_w(5, offset, data); }
-WRITE8_MEMBER( latch8_device::bit6_w ) { bitx_w(6, offset, data); }
-WRITE8_MEMBER( latch8_device::bit7_w ) { bitx_w(7, offset, data); }
+void latch8_device::bit0_w(offs_t offset, uint8_t data) { bitx_w(0, offset, data); }
+void latch8_device::bit1_w(offs_t offset, uint8_t data) { bitx_w(1, offset, data); }
+void latch8_device::bit2_w(offs_t offset, uint8_t data) { bitx_w(2, offset, data); }
+void latch8_device::bit3_w(offs_t offset, uint8_t data) { bitx_w(3, offset, data); }
+void latch8_device::bit4_w(offs_t offset, uint8_t data) { bitx_w(4, offset, data); }
+void latch8_device::bit5_w(offs_t offset, uint8_t data) { bitx_w(5, offset, data); }
+void latch8_device::bit6_w(offs_t offset, uint8_t data) { bitx_w(6, offset, data); }
+void latch8_device::bit7_w(offs_t offset, uint8_t data) { bitx_w(7, offset, data); }
DEFINE_DEVICE_TYPE(LATCH8, latch8_device, "latch8", "8-bit latch")
diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h
index d940c84cfa7..750a9c752b5 100644
--- a/src/devices/machine/latch8.h
+++ b/src/devices/machine/latch8.h
@@ -25,12 +25,12 @@ public:
/* write & read full byte */
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
/* reset the latch */
- DECLARE_WRITE8_MEMBER( reset_w );
+ void reset_w(offs_t offset, uint8_t data);
/* read bit x */
/* return (latch >> x) & 0x01 */
@@ -59,14 +59,14 @@ public:
/* write bit x from data into bit determined by offset */
/* latch = (latch & ~(1<<offset)) | (((data >> x) & 0x01) << offset) */
- DECLARE_WRITE8_MEMBER( bit0_w );
- DECLARE_WRITE8_MEMBER( bit1_w );
- DECLARE_WRITE8_MEMBER( bit2_w );
- DECLARE_WRITE8_MEMBER( bit3_w );
- DECLARE_WRITE8_MEMBER( bit4_w );
- DECLARE_WRITE8_MEMBER( bit5_w );
- DECLARE_WRITE8_MEMBER( bit6_w );
- DECLARE_WRITE8_MEMBER( bit7_w );
+ void bit0_w(offs_t offset, uint8_t data);
+ void bit1_w(offs_t offset, uint8_t data);
+ void bit2_w(offs_t offset, uint8_t data);
+ void bit3_w(offs_t offset, uint8_t data);
+ void bit4_w(offs_t offset, uint8_t data);
+ void bit5_w(offs_t offset, uint8_t data);
+ void bit6_w(offs_t offset, uint8_t data);
+ void bit7_w(offs_t offset, uint8_t data);
/* Bit mask specifying bits to be masked *out* */
void set_maskout(uint32_t maskout) { m_maskout = maskout; }
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp
index 88fce0bfc44..0c19a5aaed6 100644
--- a/src/devices/machine/mos6530n.cpp
+++ b/src/devices/machine/mos6530n.cpp
@@ -75,38 +75,38 @@ void mos6532_new_device::io_map(address_map &map)
map(0x04, 0x07).mirror(0x8).w(FUNC(mos6532_new_device::edge_w));
}
-READ8_MEMBER(mos6532_new_device::io_r)
+uint8_t mos6532_new_device::io_r(offs_t offset)
{
offset &= 0x1f;
uint8_t ret = 0;
- if (offset == 0x00 || offset == 0x08 || offset == 0x10 || offset == 0x18) ret = pa_data_r(space, 0);
- if (offset == 0x01 || offset == 0x09 || offset == 0x11 || offset == 0x19) ret = pa_ddr_r(space, 0);
- if (offset == 0x02 || offset == 0x0a || offset == 0x12 || offset == 0x1a) ret = pb_data_r(space, 0);
- if (offset == 0x03 || offset == 0x0b || offset == 0x13 || offset == 0x1b) ret = pb_ddr_r(space, 0);
+ if (offset == 0x00 || offset == 0x08 || offset == 0x10 || offset == 0x18) ret = pa_data_r();
+ if (offset == 0x01 || offset == 0x09 || offset == 0x11 || offset == 0x19) ret = pa_ddr_r();
+ if (offset == 0x02 || offset == 0x0a || offset == 0x12 || offset == 0x1a) ret = pb_data_r();
+ if (offset == 0x03 || offset == 0x0b || offset == 0x13 || offset == 0x1b) ret = pb_ddr_r();
- if (offset == 0x04 || offset == 0x06 || offset == 0x14 || offset == 0x16) ret = timer_off_r(space, 0);
- if (offset == 0x0c || offset == 0x0e || offset == 0x1c || offset == 0x1e) ret = timer_on_r(space, 0);
+ if (offset == 0x04 || offset == 0x06 || offset == 0x14 || offset == 0x16) ret = timer_off_r();
+ if (offset == 0x0c || offset == 0x0e || offset == 0x1c || offset == 0x1e) ret = timer_on_r();
- if (offset == 0x05 || offset == 0x07 || offset == 0x0d || offset == 0x0f) ret = irq_r(space, 0);
- if (offset == 0x15 || offset == 0x17 || offset == 0x1d || offset == 0x1f) ret = irq_r(space, 0);
+ if (offset == 0x05 || offset == 0x07 || offset == 0x0d || offset == 0x0f) ret = irq_r();
+ if (offset == 0x15 || offset == 0x17 || offset == 0x1d || offset == 0x1f) ret = irq_r();
return ret;
}
-WRITE8_MEMBER(mos6532_new_device::io_w)
+void mos6532_new_device::io_w(offs_t offset, uint8_t data)
{
offset &= 0x1f;
- if (offset == 0x00 || offset == 0x08 || offset == 0x10 || offset == 0x18) pa_data_w(space, 0, data);
- if (offset == 0x01 || offset == 0x09 || offset == 0x11 || offset == 0x19) pa_ddr_w(space, 0, data);
- if (offset == 0x02 || offset == 0x0a || offset == 0x12 || offset == 0x1a) pb_data_w(space, 0, data);
- if (offset == 0x03 || offset == 0x0b || offset == 0x13 || offset == 0x1b) pb_ddr_w(space, 0, data);
- if (offset == 0x14 || offset == 0x15 || offset == 0x16 || offset == 0x17) timer_off_w(space, offset&3, data);
- if (offset == 0x1c || offset == 0x1d || offset == 0x1e || offset == 0x1f) timer_on_w(space, offset&3, data);
+ if (offset == 0x00 || offset == 0x08 || offset == 0x10 || offset == 0x18) pa_data_w(data);
+ if (offset == 0x01 || offset == 0x09 || offset == 0x11 || offset == 0x19) pa_ddr_w(data);
+ if (offset == 0x02 || offset == 0x0a || offset == 0x12 || offset == 0x1a) pb_data_w(data);
+ if (offset == 0x03 || offset == 0x0b || offset == 0x13 || offset == 0x1b) pb_ddr_w(data);
+ if (offset == 0x14 || offset == 0x15 || offset == 0x16 || offset == 0x17) timer_off_w(offset&3, data);
+ if (offset == 0x1c || offset == 0x1d || offset == 0x1e || offset == 0x1f) timer_on_w(offset&3, data);
- if (offset == 0x04 || offset == 0x05 || offset == 0x06 || offset == 0x07) edge_w(space, offset&3, data);
- if (offset == 0x0c || offset == 0x0d || offset == 0xea || offset == 0x0f) edge_w(space, offset&3, data);
+ if (offset == 0x04 || offset == 0x05 || offset == 0x06 || offset == 0x07) edge_w(data);
+ if (offset == 0x0c || offset == 0x0d || offset == 0xea || offset == 0x0f) edge_w(data);
}
@@ -452,7 +452,7 @@ void mos6530_device_base::pb_w(int bit, int state)
// pa_data_r -
//-------------------------------------------------
-READ8_MEMBER( mos6530_device_base::pa_data_r )
+uint8_t mos6530_device_base::pa_data_r()
{
uint8_t in = 0;
@@ -487,7 +487,7 @@ READ8_MEMBER( mos6530_device_base::pa_data_r )
// pa_data_w -
//-------------------------------------------------
-WRITE8_MEMBER( mos6530_device_base::pa_data_w )
+void mos6530_device_base::pa_data_w(uint8_t data)
{
m_pa_out = data;
@@ -502,7 +502,7 @@ WRITE8_MEMBER( mos6530_device_base::pa_data_w )
// pa_ddr_w -
//-------------------------------------------------
-WRITE8_MEMBER( mos6530_device_base::pa_ddr_w )
+void mos6530_device_base::pa_ddr_w(uint8_t data)
{
m_pa_ddr = data;
@@ -517,7 +517,7 @@ WRITE8_MEMBER( mos6530_device_base::pa_ddr_w )
// pb_data_r -
//-------------------------------------------------
-READ8_MEMBER( mos6530_device_base::pb_data_r )
+uint8_t mos6530_device_base::pb_data_r()
{
uint8_t in = 0;
@@ -552,7 +552,7 @@ READ8_MEMBER( mos6530_device_base::pb_data_r )
// pb_data_w -
//-------------------------------------------------
-WRITE8_MEMBER( mos6530_device_base::pb_data_w )
+void mos6530_device_base::pb_data_w(uint8_t data)
{
m_pb_out = data;
@@ -566,7 +566,7 @@ WRITE8_MEMBER( mos6530_device_base::pb_data_w )
// pb_ddr_w -
//-------------------------------------------------
-WRITE8_MEMBER( mos6530_device_base::pb_ddr_w )
+void mos6530_device_base::pb_ddr_w(uint8_t data)
{
m_pb_ddr = data;
@@ -580,7 +580,7 @@ WRITE8_MEMBER( mos6530_device_base::pb_ddr_w )
// timer_r -
//-------------------------------------------------
-READ8_MEMBER( mos6530_device_base::timer_off_r )
+uint8_t mos6530_device_base::timer_off_r()
{
if (machine().side_effects_disabled())
return 0;
@@ -588,7 +588,7 @@ READ8_MEMBER( mos6530_device_base::timer_off_r )
return timer_r(false);
}
-READ8_MEMBER( mos6530_device_base::timer_on_r )
+uint8_t mos6530_device_base::timer_on_r()
{
if (machine().side_effects_disabled())
return 0;
@@ -623,7 +623,7 @@ uint8_t mos6530_device_base::timer_r(bool ie)
// irq_r -
//-------------------------------------------------
-READ8_MEMBER( mos6530_device_base::irq_r )
+uint8_t mos6530_device_base::irq_r()
{
uint8_t data = get_irq_flags();
@@ -642,12 +642,12 @@ READ8_MEMBER( mos6530_device_base::irq_r )
// timer_w -
//-------------------------------------------------
-WRITE8_MEMBER( mos6530_device_base::timer_off_w )
+void mos6530_device_base::timer_off_w(offs_t offset, uint8_t data)
{
timer_w(offset, data, false);
}
-WRITE8_MEMBER( mos6530_device_base::timer_on_w )
+void mos6530_device_base::timer_on_w(offs_t offset, uint8_t data)
{
timer_w(offset, data, true);
}
@@ -688,7 +688,7 @@ void mos6530_device_base::timer_w(offs_t offset, uint8_t data, bool ie)
// edge_w -
//-------------------------------------------------
-WRITE8_MEMBER( mos6530_device_base::edge_w )
+void mos6530_device_base::edge_w(uint8_t data)
{
m_pa7_dir = BIT(data, 0);
m_ie_edge = BIT(data, 1) ? false : true;
diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h
index ca0ca1f1aa7..3a6a2289944 100644
--- a/src/devices/machine/mos6530n.h
+++ b/src/devices/machine/mos6530n.h
@@ -119,23 +119,23 @@ protected:
void timer_w(offs_t offset, uint8_t data, bool ie);
uint8_t timer_r(bool ie);
- DECLARE_READ8_MEMBER( rom_r ) { return m_rom[offset]; }
- DECLARE_READ8_MEMBER( ram_r ) { return m_ram[offset]; }
- DECLARE_WRITE8_MEMBER( ram_w ) { m_ram[offset] = data; }
- DECLARE_READ8_MEMBER( pa_data_r );
- DECLARE_WRITE8_MEMBER( pa_data_w );
- DECLARE_READ8_MEMBER( pb_data_r );
- DECLARE_WRITE8_MEMBER( pb_data_w );
- DECLARE_READ8_MEMBER( pa_ddr_r ) { return m_pa_ddr; }
- DECLARE_WRITE8_MEMBER( pa_ddr_w );
- DECLARE_READ8_MEMBER( pb_ddr_r ) { return m_pb_ddr; }
- DECLARE_WRITE8_MEMBER( pb_ddr_w );
- DECLARE_READ8_MEMBER( timer_off_r );
- DECLARE_READ8_MEMBER( timer_on_r );
- DECLARE_READ8_MEMBER( irq_r );
- DECLARE_WRITE8_MEMBER( timer_off_w );
- DECLARE_WRITE8_MEMBER( timer_on_w );
- DECLARE_WRITE8_MEMBER( edge_w );
+ uint8_t rom_r(offs_t offset) { return m_rom[offset]; }
+ uint8_t ram_r(offs_t offset) { return m_ram[offset]; }
+ void ram_w(offs_t offset, uint8_t data) { m_ram[offset] = data; }
+ uint8_t pa_data_r();
+ void pa_data_w(uint8_t data);
+ uint8_t pb_data_r();
+ void pb_data_w(uint8_t data);
+ uint8_t pa_ddr_r() { return m_pa_ddr; }
+ void pa_ddr_w(uint8_t data);
+ uint8_t pb_ddr_r() { return m_pb_ddr; }
+ void pb_ddr_w(uint8_t data);
+ uint8_t timer_off_r();
+ uint8_t timer_on_r();
+ uint8_t irq_r();
+ void timer_off_w(offs_t offset, uint8_t data);
+ void timer_on_w(offs_t offset, uint8_t data);
+ void edge_w(uint8_t data);
optional_shared_ptr<uint8_t> m_ram;
optional_region_ptr<uint8_t> m_rom;
@@ -225,8 +225,8 @@ public:
virtual void io_map(address_map &map);
// is there a better way to access the memory map when not using m()?
- DECLARE_READ8_MEMBER(io_r);
- DECLARE_WRITE8_MEMBER(io_w);
+ uint8_t io_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp
index cabc6daf466..22d03323aa9 100644
--- a/src/devices/machine/z80sti.cpp
+++ b/src/devices/machine/z80sti.cpp
@@ -362,7 +362,7 @@ void z80sti_device::take_interrupt(int level)
// read - register read
//-------------------------------------------------
-READ8_MEMBER( z80sti_device::read )
+uint8_t z80sti_device::read(offs_t offset)
{
uint8_t data = 0;
@@ -407,7 +407,7 @@ READ8_MEMBER( z80sti_device::read )
// write - register write
//-------------------------------------------------
-WRITE8_MEMBER( z80sti_device::write )
+void z80sti_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x0f)
{
diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h
index 521630dbe13..24c23964f3d 100644
--- a/src/devices/machine/z80sti.h
+++ b/src/devices/machine/z80sti.h
@@ -64,8 +64,8 @@ public:
void set_rx_clock(int clock) { m_rx_clock = clock; }
void set_tx_clock(int clock) { m_tx_clock = clock; }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( i0_w );
DECLARE_WRITE_LINE_MEMBER( i1_w );