summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-05-20 20:38:24 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-05-20 20:38:24 +0200
commit113badde167bda29fa012108c9a9fa9ab1602114 (patch)
treeeb2b06718809f35c124c5f02167a1121bb7f61e6 /src/devices/bus
parent972cbb40a7f5fa7042782c932893470c164c2a39 (diff)
devices/bus: a few macro removals (nw)
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/dmv/k210.cpp12
-rw-r--r--src/devices/bus/dmv/k210.h12
-rw-r--r--src/devices/bus/dmv/k220.cpp4
-rw-r--r--src/devices/bus/dmv/k220.h4
-rw-r--r--src/devices/bus/dmv/k230.cpp12
-rw-r--r--src/devices/bus/dmv/k230.h8
-rw-r--r--src/devices/bus/dmv/k806.cpp4
-rw-r--r--src/devices/bus/dmv/k806.h4
-rw-r--r--src/devices/bus/ecbbus/grip.cpp10
-rw-r--r--src/devices/bus/ecbbus/grip.h10
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp8
-rw-r--r--src/devices/bus/epson_sio/pf10.h8
-rw-r--r--src/devices/bus/hexbus/hx5102.cpp4
-rw-r--r--src/devices/bus/hexbus/hx5102.h4
-rw-r--r--src/devices/bus/hp80_io/82900.cpp2
-rw-r--r--src/devices/bus/hp80_io/82900.h2
-rw-r--r--src/devices/bus/hp80_io/82937.cpp8
-rw-r--r--src/devices/bus/hp80_io/82937.h8
-rw-r--r--src/devices/bus/hp80_io/82939.cpp6
-rw-r--r--src/devices/bus/hp80_io/82939.h6
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98035.h2
-rw-r--r--src/devices/bus/hp9845_io/98046.cpp4
-rw-r--r--src/devices/bus/hp9845_io/98046.h4
-rw-r--r--src/devices/bus/hp_dio/hp98550.cpp2
-rw-r--r--src/devices/bus/hp_dio/hp98550.h2
-rw-r--r--src/devices/bus/hp_dio/hp98643.cpp4
-rw-r--r--src/devices/bus/hp_dio/hp98643.h4
-rw-r--r--src/devices/bus/hp_dio/human_interface.cpp16
-rw-r--r--src/devices/bus/hp_dio/human_interface.h10
-rw-r--r--src/devices/bus/hp_hil/hp_hil.cpp4
-rw-r--r--src/devices/bus/hp_hil/hp_hil.h4
-rw-r--r--src/devices/bus/ieee488/c2031.cpp12
-rw-r--r--src/devices/bus/ieee488/c2031.h12
-rw-r--r--src/devices/bus/ieee488/c2040.cpp14
-rw-r--r--src/devices/bus/ieee488/c2040.h14
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp4
-rw-r--r--src/devices/bus/ieee488/c2040fdc.h4
-rw-r--r--src/devices/bus/ieee488/c8050.cpp14
-rw-r--r--src/devices/bus/ieee488/c8050.h14
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp4
-rw-r--r--src/devices/bus/ieee488/c8050fdc.h4
-rw-r--r--src/devices/bus/ieee488/c8280.cpp12
-rw-r--r--src/devices/bus/ieee488/c8280.h12
-rw-r--r--src/devices/bus/ieee488/d9060.cpp16
-rw-r--r--src/devices/bus/ieee488/d9060.h16
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp14
-rw-r--r--src/devices/bus/ieee488/hardbox.h16
-rw-r--r--src/devices/bus/ieee488/hp9122c.cpp4
-rw-r--r--src/devices/bus/ieee488/hp9122c.h4
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp6
-rw-r--r--src/devices/bus/ieee488/hp9895.h6
-rw-r--r--src/devices/bus/ieee488/softbox.cpp12
-rw-r--r--src/devices/bus/ieee488/softbox.h12
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp24
-rw-r--r--src/devices/bus/imi7000/imi5000h.h28
-rw-r--r--src/devices/bus/interpro/keyboard/lle.cpp8
-rw-r--r--src/devices/bus/interpro/keyboard/lle.h8
-rw-r--r--src/devices/bus/interpro/sr/gt.cpp2
-rw-r--r--src/devices/bus/interpro/sr/gt.h2
-rw-r--r--src/devices/bus/iq151/grafik.cpp6
-rw-r--r--src/devices/bus/iq151/grafik.h6
-rw-r--r--src/devices/bus/iq151/staper.cpp6
-rw-r--r--src/devices/bus/iq151/staper.h6
-rw-r--r--src/devices/bus/isa/3c503.cpp12
-rw-r--r--src/devices/bus/isa/3c503.h2
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp14
-rw-r--r--src/devices/bus/isa/ibm_mfc.h14
68 files changed, 278 insertions, 280 deletions
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index 23a5da77a53..3ab9209d877 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -115,27 +115,27 @@ void dmv_k210_device::io_write(int ifsel, offs_t offset, uint8_t data)
m_ppi->write(offset & 0x03, data);
}
-READ8_MEMBER( dmv_k210_device::porta_r )
+uint8_t dmv_k210_device::porta_r()
{
return m_cent_data_in->read();
}
-READ8_MEMBER( dmv_k210_device::portb_r )
+uint8_t dmv_k210_device::portb_r()
{
return m_portb;
}
-READ8_MEMBER( dmv_k210_device::portc_r )
+uint8_t dmv_k210_device::portc_r()
{
return m_portc;
}
-WRITE8_MEMBER( dmv_k210_device::porta_w )
+void dmv_k210_device::porta_w(uint8_t data)
{
m_cent_data_out->write(data);
}
-WRITE8_MEMBER( dmv_k210_device::portb_w )
+void dmv_k210_device::portb_w(uint8_t data)
{
m_centronics->write_ack(BIT(data, 2));
m_centronics->write_select(BIT(data, 4));
@@ -144,7 +144,7 @@ WRITE8_MEMBER( dmv_k210_device::portb_w )
m_centronics->write_fault(BIT(data, 7));
}
-WRITE8_MEMBER( dmv_k210_device::portc_w )
+void dmv_k210_device::portc_w(uint8_t data)
{
if (!(data & 0x80))
{
diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h
index 2200af31472..1755ee1a9f5 100644
--- a/src/devices/bus/dmv/k210.h
+++ b/src/devices/bus/dmv/k210.h
@@ -38,12 +38,12 @@ protected:
virtual void io_write(int ifsel, offs_t offset, uint8_t data) override;
private:
- DECLARE_READ8_MEMBER(porta_r);
- DECLARE_READ8_MEMBER(portb_r);
- DECLARE_READ8_MEMBER(portc_r);
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_WRITE8_MEMBER(portb_w);
- DECLARE_WRITE8_MEMBER(portc_w);
+ uint8_t porta_r();
+ uint8_t portb_r();
+ uint8_t portc_r();
+ void porta_w(uint8_t data);
+ void portb_w(uint8_t data);
+ void portc_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(cent_ack_w);
DECLARE_WRITE_LINE_MEMBER(cent_busy_w);
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index d157130ce8e..64df90c21d8 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -237,7 +237,7 @@ bool dmv_k220_device::write(offs_t offset, uint8_t data)
return false;
}
-WRITE8_MEMBER( dmv_k220_device::porta_w )
+void dmv_k220_device::porta_w(uint8_t data)
{
// 74LS247 BCD-to-Seven-Segment Decoder
static uint8_t bcd2hex[] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x58, 0x4c, 0x62, 0x69, 0x78, 0x00 };
@@ -247,7 +247,7 @@ WRITE8_MEMBER( dmv_k220_device::porta_w )
}
-WRITE8_MEMBER( dmv_k220_device::portc_w )
+void dmv_k220_device::portc_w(uint8_t data)
{
/*
xxxx ---- not connected
diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h
index 21b23a4981a..b58777df15e 100644
--- a/src/devices/bus/dmv/k220.h
+++ b/src/devices/bus/dmv/k220.h
@@ -39,8 +39,8 @@ protected:
virtual bool write(offs_t offset, uint8_t data) override;
private:
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_WRITE8_MEMBER(portc_w);
+ void porta_w(uint8_t data);
+ void portc_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(write_out0);
DECLARE_WRITE_LINE_MEMBER(write_out1);
DECLARE_WRITE_LINE_MEMBER(write_out2);
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index b661ed95abf..595cc5f970a 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -252,24 +252,24 @@ READ8_MEMBER(dmv_k230_device::rom_r)
return m_rom->base()[offset & 0x0fff];
}
-READ8_MEMBER( dmv_k230_device::io_r )
+uint8_t dmv_k230_device::io_r(offs_t offset)
{
return iospace().read_byte(offset);
}
-WRITE8_MEMBER( dmv_k230_device::io_w )
+void dmv_k230_device::io_w(offs_t offset, uint8_t data)
{
iospace().write_byte(offset, data);
}
-READ8_MEMBER( dmv_k230_device::program_r )
+uint8_t dmv_k230_device::program_r(offs_t offset)
{
- return prog_read(space, offset);
+ return prog_read(offset);
}
-WRITE8_MEMBER( dmv_k230_device::program_w )
+void dmv_k230_device::program_w(offs_t offset, uint8_t data)
{
- prog_write(space, offset, data);
+ prog_write(offset, data);
}
void dmv_k234_device::hold_w(int state)
diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h
index ebf8a868ae3..c7f8c967c44 100644
--- a/src/devices/bus/dmv/k230.h
+++ b/src/devices/bus/dmv/k230.h
@@ -55,10 +55,10 @@ protected:
int m_switch16;
int m_hold;
- DECLARE_READ8_MEMBER(io_r);
- DECLARE_READ8_MEMBER(program_r);
- DECLARE_WRITE8_MEMBER(io_w);
- DECLARE_WRITE8_MEMBER(program_w);
+ uint8_t io_r(offs_t offset);
+ uint8_t program_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
+ void program_w(offs_t offset, uint8_t data);
private:
DECLARE_READ8_MEMBER(rom_r);
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 3ee1f9dbb3c..89802ca43bd 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -154,7 +154,7 @@ void dmv_k806_device::io_write(int ifsel, offs_t offset, uint8_t data)
}
}
-READ8_MEMBER( dmv_k806_device::port1_r )
+uint8_t dmv_k806_device::port1_r()
{
// ---- ---x Left button
// ---- --x- Middle button
@@ -180,7 +180,7 @@ READ_LINE_MEMBER( dmv_k806_device::portt1_r )
return BIT(m_jumpers->read(), 7) ? 0 : 1;
}
-WRITE8_MEMBER( dmv_k806_device::port2_w )
+void dmv_k806_device::port2_w(uint8_t data)
{
out_int((data & 1) ? CLEAR_LINE : ASSERT_LINE);
}
diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h
index 3b90f7442a8..8c7c3618f69 100644
--- a/src/devices/bus/dmv/k806.h
+++ b/src/devices/bus/dmv/k806.h
@@ -41,8 +41,8 @@ protected:
private:
DECLARE_READ_LINE_MEMBER(portt1_r);
- DECLARE_READ8_MEMBER(port1_r);
- DECLARE_WRITE8_MEMBER(port2_w);
+ uint8_t port1_r();
+ void port2_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(mouse_timer);
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 83adcc78952..a51abad6c91 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -223,7 +223,7 @@ static const int16_t speaker_levels[] = { -32768, 0, 32767, 0 };
// I8255A interface
//-------------------------------------------------
-READ8_MEMBER( ecb_grip21_device::ppi_pa_r )
+uint8_t ecb_grip21_device::ppi_pa_r()
{
/*
@@ -243,7 +243,7 @@ READ8_MEMBER( ecb_grip21_device::ppi_pa_r )
return m_ppi_pa;
}
-WRITE8_MEMBER( ecb_grip21_device::ppi_pa_w )
+void ecb_grip21_device::ppi_pa_w(uint8_t data)
{
/*
@@ -263,7 +263,7 @@ WRITE8_MEMBER( ecb_grip21_device::ppi_pa_w )
m_ppi_pa = data;
}
-READ8_MEMBER( ecb_grip21_device::ppi_pb_r )
+uint8_t ecb_grip21_device::ppi_pb_r()
{
/*
@@ -283,7 +283,7 @@ READ8_MEMBER( ecb_grip21_device::ppi_pb_r )
return m_keydata;
}
-WRITE8_MEMBER( ecb_grip21_device::ppi_pc_w )
+void ecb_grip21_device::ppi_pc_w(uint8_t data)
{
/*
@@ -324,7 +324,7 @@ WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_busy)
m_centronics_busy = state;
}
-READ8_MEMBER( ecb_grip21_device::sti_gpio_r )
+uint8_t ecb_grip21_device::sti_gpio_r()
{
/*
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index d1e1456eb57..9deaa5ddfbe 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -52,11 +52,11 @@ protected:
virtual void ecbbus_io_w(offs_t offset, uint8_t data) override;
private:
- DECLARE_READ8_MEMBER( ppi_pa_r );
- DECLARE_WRITE8_MEMBER( ppi_pa_w );
- DECLARE_READ8_MEMBER( ppi_pb_r );
- DECLARE_WRITE8_MEMBER( ppi_pc_w );
- DECLARE_READ8_MEMBER( sti_gpio_r );
+ uint8_t ppi_pa_r();
+ void ppi_pa_w(uint8_t data);
+ uint8_t ppi_pb_r();
+ void ppi_pc_w(uint8_t data);
+ uint8_t sti_gpio_r();
DECLARE_WRITE_LINE_MEMBER( speaker_w );
void kb_w(uint8_t data);
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 411762657ec..2a55c2129fe 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -140,24 +140,24 @@ void epson_pf10_device::device_timer(emu_timer &timer, device_timer_id id, int p
// CPU
//**************************************************************************
-READ8_MEMBER( epson_pf10_device::port1_r )
+uint8_t epson_pf10_device::port1_r()
{
logerror("%s: port1_r(%02x)\n", tag(), m_port1);
return m_port1;
}
-WRITE8_MEMBER( epson_pf10_device::port1_w )
+void epson_pf10_device::port1_w(uint8_t data)
{
logerror("%s: port1_w(%02x)\n", tag(), data);
}
-READ8_MEMBER( epson_pf10_device::port2_r )
+uint8_t epson_pf10_device::port2_r()
{
logerror("%s: port2_r(%02x)\n", tag(), m_port2);
return m_port2;
}
-WRITE8_MEMBER( epson_pf10_device::port2_w )
+void epson_pf10_device::port2_w(uint8_t data)
{
if (m_floppy->get_device() != nullptr)
m_floppy->get_device()->mon_w(data & PORT2_MON);
diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h
index 7f305bed8c9..ced99d41715 100644
--- a/src/devices/bus/epson_sio/pf10.h
+++ b/src/devices/bus/epson_sio/pf10.h
@@ -58,10 +58,10 @@ private:
DECLARE_WRITE8_MEMBER( fdc_tc_w );
// hd6303 i/o
- DECLARE_READ8_MEMBER( port1_r );
- DECLARE_WRITE8_MEMBER( port1_w );
- DECLARE_READ8_MEMBER( port2_r );
- DECLARE_WRITE8_MEMBER( port2_w );
+ uint8_t port1_r();
+ void port1_w(uint8_t data);
+ uint8_t port2_r();
+ void port2_w(uint8_t data);
void cpu_mem(address_map &map);
diff --git a/src/devices/bus/hexbus/hx5102.cpp b/src/devices/bus/hexbus/hx5102.cpp
index 6730c5dd453..131a9db3e94 100644
--- a/src/devices/bus/hexbus/hx5102.cpp
+++ b/src/devices/bus/hexbus/hx5102.cpp
@@ -148,7 +148,7 @@ hx5102_device::hx5102_device(const machine_config &mconfig, const char *tag, dev
{
}
-WRITE8_MEMBER( hx5102_device::external_operation )
+void hx5102_device::external_operation(offs_t offset, uint8_t data)
{
static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
if (offset != IDLE_OP) LOGMASKED(LOG_WARN, "External operation %s not implemented on HX5102 board\n", extop[offset]);
@@ -430,7 +430,7 @@ WRITE8_MEMBER(hx5102_device::ibc_write)
m_hexbus_ctrl->write(space, (offset>>1)&1, data);
}
-WRITE8_MEMBER(hx5102_device::hexbus_out)
+void hx5102_device::hexbus_out(uint8_t data)
{
LOGMASKED(LOG_HEXBUS, "Write to hexbus: BAV*=%d, HSK*=%d, data=%x\n", bav_line(data)==ASSERT_LINE? 0:1, hsk_line(data)==ASSERT_LINE? 0:1, data_lines(data));
diff --git a/src/devices/bus/hexbus/hx5102.h b/src/devices/bus/hexbus/hx5102.h
index 73dea3bf2f1..48e35620c84 100644
--- a/src/devices/bus/hexbus/hx5102.h
+++ b/src/devices/bus/hexbus/hx5102.h
@@ -41,7 +41,7 @@ protected:
void crumap(address_map &map);
void memmap(address_map &map);
- DECLARE_WRITE8_MEMBER(external_operation);
+ void external_operation(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( clock_out );
DECLARE_WRITE_LINE_MEMBER( board_ready );
DECLARE_WRITE_LINE_MEMBER( board_reset );
@@ -67,7 +67,7 @@ private:
DECLARE_WRITE8_MEMBER(fdc_write);
DECLARE_READ8_MEMBER(ibc_read);
DECLARE_WRITE8_MEMBER(ibc_write);
- DECLARE_WRITE8_MEMBER(hexbus_out);
+ void hexbus_out(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(hsklatch_out);
DECLARE_READ8_MEMBER(cruread);
diff --git a/src/devices/bus/hp80_io/82900.cpp b/src/devices/bus/hp80_io/82900.cpp
index 41bf86747e8..2afc3b55946 100644
--- a/src/devices/bus/hp80_io/82900.cpp
+++ b/src/devices/bus/hp80_io/82900.cpp
@@ -146,7 +146,7 @@ void hp82900_io_card_device::cpu_io_map(address_map &map)
map(0x00 , 0xff).rw(FUNC(hp82900_io_card_device::cpu_io_r) , FUNC(hp82900_io_card_device::cpu_io_w));
}
-WRITE8_MEMBER(hp82900_io_card_device::z80_m1_w)
+void hp82900_io_card_device::z80_m1_w(uint8_t data)
{
// 1 wait state on each M1 cycle
m_cpu->adjust_icount(-1);
diff --git a/src/devices/bus/hp80_io/82900.h b/src/devices/bus/hp80_io/82900.h
index b562379c8ae..894b716d4cc 100644
--- a/src/devices/bus/hp80_io/82900.h
+++ b/src/devices/bus/hp80_io/82900.h
@@ -58,7 +58,7 @@ private:
DECLARE_WRITE8_MEMBER(cpu_io_w);
void cpu_mem_map(address_map &map);
void cpu_io_map(address_map &map);
- DECLARE_WRITE8_MEMBER(z80_m1_w);
+ void z80_m1_w(uint8_t data);
};
// device type definition
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index dbd5eaecf58..c1ab9c1d57b 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -98,7 +98,7 @@ READ_LINE_MEMBER(hp82937_io_card_device::t0_r)
return m_iatn;
}
-READ8_MEMBER(hp82937_io_card_device::p1_r)
+uint8_t hp82937_io_card_device::p1_r()
{
uint8_t res = 0;
@@ -147,13 +147,13 @@ READ8_MEMBER(hp82937_io_card_device::p1_r)
return res;
}
-WRITE8_MEMBER(hp82937_io_card_device::p1_w)
+void hp82937_io_card_device::p1_w(uint8_t data)
{
update_signals();
update_data_out();
}
-READ8_MEMBER(hp82937_io_card_device::dio_r)
+uint8_t hp82937_io_card_device::dio_r()
{
if (m_dio_out) {
return 0xff;
@@ -162,7 +162,7 @@ READ8_MEMBER(hp82937_io_card_device::dio_r)
}
}
-WRITE8_MEMBER(hp82937_io_card_device::dio_w)
+void hp82937_io_card_device::dio_w(uint8_t data)
{
update_data_out();
}
diff --git a/src/devices/bus/hp80_io/82937.h b/src/devices/bus/hp80_io/82937.h
index aa4f49b079f..d3731b5cbd6 100644
--- a/src/devices/bus/hp80_io/82937.h
+++ b/src/devices/bus/hp80_io/82937.h
@@ -53,10 +53,10 @@ private:
DECLARE_WRITE_LINE_MEMBER(reset_w);
DECLARE_READ_LINE_MEMBER(t0_r);
- DECLARE_READ8_MEMBER(p1_r);
- DECLARE_WRITE8_MEMBER(p1_w);
- DECLARE_READ8_MEMBER(dio_r);
- DECLARE_WRITE8_MEMBER(dio_w);
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ uint8_t dio_r();
+ void dio_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(ieee488_ctrl_w);
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(latch_w);
diff --git a/src/devices/bus/hp80_io/82939.cpp b/src/devices/bus/hp80_io/82939.cpp
index 8106f9df9ae..25c52760cba 100644
--- a/src/devices/bus/hp80_io/82939.cpp
+++ b/src/devices/bus/hp80_io/82939.cpp
@@ -128,7 +128,7 @@ ROM_START(hp82939)
ROM_LOAD("1820-2438.bin" , 0 , 0x800 , CRC(3a2f42a2) SHA1(0f6a70eb8981a8a87c7514ce8226ff1af3ac1668))
ROM_END
-READ8_MEMBER(hp82939_io_card_device::p1_r)
+uint8_t hp82939_io_card_device::p1_r()
{
uint8_t res = uint8_t(m_sw12->read() & 0x7f);
@@ -137,14 +137,14 @@ READ8_MEMBER(hp82939_io_card_device::p1_r)
return res;
}
-WRITE8_MEMBER(hp82939_io_card_device::p1_w)
+void hp82939_io_card_device::p1_w(uint8_t data)
{
if (BIT(data , 7)) {
m_uart->reset();
}
}
-READ8_MEMBER(hp82939_io_card_device::p2_r)
+uint8_t hp82939_io_card_device::p2_r()
{
uint8_t res = uint8_t((m_sw12->read() >> 7) & 0xf);
diff --git a/src/devices/bus/hp80_io/82939.h b/src/devices/bus/hp80_io/82939.h
index 6e66bde00fd..ab79e277deb 100644
--- a/src/devices/bus/hp80_io/82939.h
+++ b/src/devices/bus/hp80_io/82939.h
@@ -46,9 +46,9 @@ private:
required_device<ins8250_device> m_uart;
required_ioport m_sw12;
- DECLARE_READ8_MEMBER(p1_r);
- DECLARE_WRITE8_MEMBER(p1_w);
- DECLARE_READ8_MEMBER(p2_r);
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ uint8_t p2_r();
DECLARE_READ8_MEMBER(cpu_r);
DECLARE_WRITE8_MEMBER(cpu_w);
void cpu_io_map(address_map &map);
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index ca57e6a1014..9194e200b19 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -435,7 +435,7 @@ WRITE8_MEMBER(hp98035_io_card_device::clr_inten_w)
update_irq();
}
-WRITE8_MEMBER(hp98035_io_card_device::dc_w)
+void hp98035_io_card_device::dc_w(uint8_t data)
{
if (data != m_dc) {
//LOG(("DC=%02x\n" , data));
diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h
index 7cad3122a55..5051c9058aa 100644
--- a/src/devices/bus/hp9845_io/98035.h
+++ b/src/devices/bus/hp9845_io/98035.h
@@ -38,7 +38,7 @@ protected:
virtual DECLARE_WRITE16_MEMBER(reg_w) override;
private:
- DECLARE_WRITE8_MEMBER(dc_w);
+ void dc_w(uint8_t data);
DECLARE_WRITE8_MEMBER(ram_addr_w);
DECLARE_READ8_MEMBER(ram_data_r);
diff --git a/src/devices/bus/hp9845_io/98046.cpp b/src/devices/bus/hp9845_io/98046.cpp
index 16222939e8a..328bbd91e81 100644
--- a/src/devices/bus/hp9845_io/98046.cpp
+++ b/src/devices/bus/hp9845_io/98046.cpp
@@ -414,7 +414,7 @@ WRITE8_MEMBER(hp98046_io_card_device::cpu_w)
}
}
-READ8_MEMBER(hp98046_io_card_device::p1_r)
+uint8_t hp98046_io_card_device::p1_r()
{
uint8_t res = 0;
// b7: b8 of word @ txFIFO head
@@ -453,7 +453,7 @@ READ8_MEMBER(hp98046_io_card_device::p1_r)
return res;
}
-WRITE8_MEMBER(hp98046_io_card_device::p2_w)
+void hp98046_io_card_device::p2_w(uint8_t data)
{
LOG_MCU("p2=%02x\n" , data);
uint8_t diff = data ^ m_port_2;
diff --git a/src/devices/bus/hp9845_io/98046.h b/src/devices/bus/hp9845_io/98046.h
index c58b72fd857..1105865ea3b 100644
--- a/src/devices/bus/hp9845_io/98046.h
+++ b/src/devices/bus/hp9845_io/98046.h
@@ -77,8 +77,8 @@ private:
DECLARE_READ8_MEMBER(ram_r);
DECLARE_READ8_MEMBER(cpu_r);
DECLARE_WRITE8_MEMBER(cpu_w);
- DECLARE_READ8_MEMBER(p1_r);
- DECLARE_WRITE8_MEMBER(p2_w);
+ uint8_t p1_r();
+ void p2_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(sio_int_w);
DECLARE_WRITE_LINE_MEMBER(sio_txd_w);
DECLARE_WRITE_LINE_MEMBER(rs232_rxd_w);
diff --git a/src/devices/bus/hp_dio/hp98550.cpp b/src/devices/bus/hp_dio/hp98550.cpp
index ed91b99ca3f..9044b387385 100644
--- a/src/devices/bus/hp_dio/hp98550.cpp
+++ b/src/devices/bus/hp_dio/hp98550.cpp
@@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(dio32_98550_device::vblank_w)
ce->vblank_w(state);
}
-WRITE8_MEMBER(dio32_98550_device::int_w)
+void dio32_98550_device::int_w(offs_t offset, uint8_t data)
{
LOG("%s: plane%d = %s\n", __func__, offset, data ? "assert" : "deassert");
m_ints &= ~(1 << offset);
diff --git a/src/devices/bus/hp_dio/hp98550.h b/src/devices/bus/hp_dio/hp98550.h
index 47057f6da70..2b350f7a1a3 100644
--- a/src/devices/bus/hp_dio/hp98550.h
+++ b/src/devices/bus/hp_dio/hp98550.h
@@ -51,7 +51,7 @@ protected:
virtual space_config_vector memory_space_config() const override;
DECLARE_WRITE_LINE_MEMBER(vblank_w);
- DECLARE_WRITE8_MEMBER(int_w);
+ void int_w(offs_t offset, uint8_t data);
const address_space_config m_space_config;
void map(address_map &map);
diff --git a/src/devices/bus/hp_dio/hp98643.cpp b/src/devices/bus/hp_dio/hp98643.cpp
index ae468d3d490..57c02721de9 100644
--- a/src/devices/bus/hp_dio/hp98643.cpp
+++ b/src/devices/bus/hp_dio/hp98643.cpp
@@ -160,13 +160,13 @@ WRITE16_MEMBER(dio16_98643_device::novram_w)
COMBINE_DATA(&m_novram[offset & 0x3f]);
}
-WRITE16_MEMBER(dio16_98643_device::lance_dma_out)
+void dio16_98643_device::lance_dma_out(offs_t offset, uint16_t data, uint16_t mem_mask)
{
LOG("%s: offset=%04x, data=%d\n", __func__, offset, data);
COMBINE_DATA(&m_ram[(offset >> 1) & 0x1fff]);
}
-READ16_MEMBER(dio16_98643_device::lance_dma_in)
+uint16_t dio16_98643_device::lance_dma_in(offs_t offset)
{
uint16_t ret = m_ram[(offset >> 1) & 0x1fff];
diff --git a/src/devices/bus/hp_dio/hp98643.h b/src/devices/bus/hp_dio/hp98643.h
index d2b018c4b57..d06a20b147f 100644
--- a/src/devices/bus/hp_dio/hp98643.h
+++ b/src/devices/bus/hp_dio/hp98643.h
@@ -63,8 +63,8 @@ private:
WRITE16_MEMBER(novram_w);
DECLARE_WRITE_LINE_MEMBER(lance_int_w);
- DECLARE_WRITE16_MEMBER(lance_dma_out);
- DECLARE_READ16_MEMBER(lance_dma_in);
+ void lance_dma_out(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t lance_dma_in(offs_t offset);
uint16_t m_novram[32] = {
0xfff0, 0xfff0, 0xfff0, 0xfff0,
diff --git a/src/devices/bus/hp_dio/human_interface.cpp b/src/devices/bus/hp_dio/human_interface.cpp
index 10ecb19e549..e32b1ac20ad 100644
--- a/src/devices/bus/hp_dio/human_interface.cpp
+++ b/src/devices/bus/hp_dio/human_interface.cpp
@@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(human_interface_device::gpib_dreq)
update_gpib_dma();
}
-WRITE8_MEMBER(human_interface_device::ieee488_dio_w)
+void human_interface_device::ieee488_dio_w(uint8_t data)
{
if (m_ieee488->atn_r() || m_ieee488->eoi_r())
return;
@@ -217,7 +217,7 @@ WRITE8_MEMBER(human_interface_device::gpib_w)
if (m_ppoll_sc & PPOLL_IE) {
LOG("%s: start parallel poll\n", __func__);
- ieee488_dio_w(space, 0, m_ieee488->dio_r());
+ ieee488_dio_w(m_ieee488->dio_r());
}
break;
case 4:
@@ -266,7 +266,7 @@ READ8_MEMBER(human_interface_device::gpib_r)
}
-WRITE8_MEMBER(human_interface_device::iocpu_port1_w)
+void human_interface_device::iocpu_port1_w(uint8_t data)
{
m_hil_data = data;
m_rtc->d0_w(data & 0x01 ? ASSERT_LINE : CLEAR_LINE);
@@ -275,12 +275,12 @@ WRITE8_MEMBER(human_interface_device::iocpu_port1_w)
m_rtc->d3_w(data & 0x08 ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER(human_interface_device::iocpu_port2_w)
+void human_interface_device::iocpu_port2_w(uint8_t data)
{
bool latch_enable = data & LATCH_EN;
if ((data & (HIL_CS|HIL_WE)) == 0)
- m_mlc->write(space, (m_latch_data & 0xc0) >> 6, m_hil_data, 0xff);
+ m_mlc->write((m_latch_data & 0xc0) >> 6, m_hil_data);
if ((data & SN76494_EN) == 0)
m_sound->write(m_hil_data);
@@ -307,16 +307,16 @@ WRITE8_MEMBER(human_interface_device::iocpu_port2_w)
m_old_latch_enable = latch_enable;
}
-READ8_MEMBER(human_interface_device::iocpu_port1_r)
+uint8_t human_interface_device::iocpu_port1_r()
{
if (m_hil_read)
- return m_mlc->read(space, (m_latch_data & 0xc0) >> 6, 0xff);
+ return m_mlc->read((m_latch_data & 0xc0) >> 6);
if (m_latch_data & 0x20)
return m_rtc_data;
return 0xff;
}
-READ8_MEMBER(human_interface_device::iocpu_test0_r)
+uint8_t human_interface_device::iocpu_test0_r()
{
return !m_mlc->get_int();
}
diff --git a/src/devices/bus/hp_dio/human_interface.h b/src/devices/bus/hp_dio/human_interface.h
index 4a2e159d3f7..18e22413db2 100644
--- a/src/devices/bus/hp_dio/human_interface.h
+++ b/src/devices/bus/hp_dio/human_interface.h
@@ -35,15 +35,15 @@ protected:
private:
/* 8042 interface */
- DECLARE_WRITE8_MEMBER(iocpu_port1_w);
- DECLARE_WRITE8_MEMBER(iocpu_port2_w);
- DECLARE_READ8_MEMBER(iocpu_port1_r);
- DECLARE_READ8_MEMBER(iocpu_test0_r);
+ void iocpu_port1_w(uint8_t data);
+ void iocpu_port2_w(uint8_t data);
+ uint8_t iocpu_port1_r();
+ uint8_t iocpu_test0_r();
/* GPIB */
DECLARE_READ8_MEMBER(gpib_r);
DECLARE_WRITE8_MEMBER(gpib_w);
- DECLARE_WRITE8_MEMBER(ieee488_dio_w);
+ void ieee488_dio_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(gpib_irq);
DECLARE_WRITE_LINE_MEMBER(gpib_dreq);
diff --git a/src/devices/bus/hp_hil/hp_hil.cpp b/src/devices/bus/hp_hil/hp_hil.cpp
index 8d03d40c224..872101a806f 100644
--- a/src/devices/bus/hp_hil/hp_hil.cpp
+++ b/src/devices/bus/hp_hil/hp_hil.cpp
@@ -99,7 +99,7 @@ void hp_hil_mlc_device::device_reset()
}
-WRITE8_MEMBER(hp_hil_mlc_device::write)
+void hp_hil_mlc_device::write(offs_t offset, uint8_t data)
{
device_hp_hil_interface *entry = m_device_list.first();
uint16_t tmp = data | (m_w1 << 8);
@@ -154,7 +154,7 @@ WRITE8_MEMBER(hp_hil_mlc_device::write)
}
}
-READ8_MEMBER(hp_hil_mlc_device::read)
+uint8_t hp_hil_mlc_device::read(offs_t offset)
{
uint8_t data = 0;
diff --git a/src/devices/bus/hp_hil/hp_hil.h b/src/devices/bus/hp_hil/hp_hil.h
index d8d9f90e536..4b5e9a79972 100644
--- a/src/devices/bus/hp_hil/hp_hil.h
+++ b/src/devices/bus/hp_hil/hp_hil.h
@@ -125,8 +125,8 @@ public:
void add_hp_hil_device(device_hp_hil_interface *device);
bool get_int(void) { return m_r3 & 1; }
- 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(ap_w);
void hil_write(uint16_t data);
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 98c8c237af8..10b21fcff4d 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -77,7 +77,7 @@ WRITE_LINE_MEMBER( c2031_device::via0_irq_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER( c2031_device::via0_pa_r )
+uint8_t c2031_device::via0_pa_r()
{
/*
@@ -97,7 +97,7 @@ READ8_MEMBER( c2031_device::via0_pa_r )
return m_bus->dio_r();
}
-WRITE8_MEMBER( c2031_device::via0_pa_w )
+void c2031_device::via0_pa_w(uint8_t data)
{
/*
@@ -117,7 +117,7 @@ WRITE8_MEMBER( c2031_device::via0_pa_w )
m_bus->dio_w(this, data);
}
-READ8_MEMBER( c2031_device::via0_pb_r )
+uint8_t c2031_device::via0_pb_r()
{
/*
@@ -154,7 +154,7 @@ READ8_MEMBER( c2031_device::via0_pb_r )
return data;
}
-WRITE8_MEMBER( c2031_device::via0_pb_w )
+void c2031_device::via0_pb_w(uint8_t data)
{
/*
@@ -209,7 +209,7 @@ WRITE_LINE_MEMBER( c2031_device::via1_irq_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER( c2031_device::via1_pb_r )
+uint8_t c2031_device::via1_pb_r()
{
/*
@@ -237,7 +237,7 @@ READ8_MEMBER( c2031_device::via1_pb_r )
return data;
}
-WRITE8_MEMBER( c2031_device::via1_pb_w )
+void c2031_device::via1_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h
index 7c6b9d738cc..7279af034dd 100644
--- a/src/devices/bus/ieee488/c2031.h
+++ b/src/devices/bus/ieee488/c2031.h
@@ -50,13 +50,13 @@ private:
inline int get_device_number();
DECLARE_WRITE_LINE_MEMBER( via0_irq_w );
- DECLARE_READ8_MEMBER( via0_pa_r );
- DECLARE_WRITE8_MEMBER( via0_pa_w );
- DECLARE_READ8_MEMBER( via0_pb_r );
- DECLARE_WRITE8_MEMBER( via0_pb_w );
+ uint8_t via0_pa_r();
+ void via0_pa_w(uint8_t data);
+ uint8_t via0_pb_r();
+ void via0_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
- DECLARE_READ8_MEMBER( via1_pb_r );
- DECLARE_WRITE8_MEMBER( via1_pb_w );
+ uint8_t via1_pb_r();
+ void via1_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( byte_w );
void c2031_mem(address_map &map);
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 3684664325b..a42dc1a2099 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -205,7 +205,7 @@ void c2040_device::c2040_fdc_mem(address_map &map)
// riot6532 uc1
//-------------------------------------------------
-READ8_MEMBER( c2040_device::dio_r )
+uint8_t c2040_device::dio_r()
{
/*
@@ -225,7 +225,7 @@ READ8_MEMBER( c2040_device::dio_r )
return m_bus->dio_r();
}
-WRITE8_MEMBER( c2040_device::dio_w )
+void c2040_device::dio_w(uint8_t data)
{
/*
@@ -250,7 +250,7 @@ WRITE8_MEMBER( c2040_device::dio_w )
// riot6532 ue1
//-------------------------------------------------
-READ8_MEMBER( c2040_device::riot1_pa_r )
+uint8_t c2040_device::riot1_pa_r()
{
/*
@@ -281,7 +281,7 @@ READ8_MEMBER( c2040_device::riot1_pa_r )
return data;
}
-WRITE8_MEMBER( c2040_device::riot1_pa_w )
+void c2040_device::riot1_pa_w(uint8_t data)
{
/*
@@ -316,7 +316,7 @@ WRITE8_MEMBER( c2040_device::riot1_pa_w )
update_ieee_signals();
}
-READ8_MEMBER( c2040_device::riot1_pb_r )
+uint8_t c2040_device::riot1_pb_r()
{
/*
@@ -347,7 +347,7 @@ READ8_MEMBER( c2040_device::riot1_pb_r )
return data;
}
-WRITE8_MEMBER( c2040_device::riot1_pb_w )
+void c2040_device::riot1_pb_w(uint8_t data)
{
/*
@@ -375,7 +375,7 @@ WRITE8_MEMBER( c2040_device::riot1_pb_w )
}
-WRITE8_MEMBER( c2040_device::via_pb_w )
+void c2040_device::via_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h
index 1b7c1c69618..3984b93130b 100644
--- a/src/devices/bus/ieee488/c2040.h
+++ b/src/devices/bus/ieee488/c2040.h
@@ -32,13 +32,13 @@ public:
// construction/destruction
c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER( dio_r );
- DECLARE_WRITE8_MEMBER( dio_w );
- DECLARE_READ8_MEMBER( riot1_pa_r );
- DECLARE_WRITE8_MEMBER( riot1_pa_w );
- DECLARE_READ8_MEMBER( riot1_pb_r );
- DECLARE_WRITE8_MEMBER( riot1_pb_w );
- DECLARE_WRITE8_MEMBER( via_pb_w );
+ uint8_t dio_r();
+ void dio_w(uint8_t data);
+ uint8_t riot1_pa_r();
+ void riot1_pa_w(uint8_t data);
+ uint8_t riot1_pb_r();
+ void riot1_pb_w(uint8_t data);
+ void via_pb_w(uint8_t data);
void c2040_fdc_mem(address_map &map);
void c2040_main_mem(address_map &map);
diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp
index 7d99eb780cf..7ea02400fcd 100644
--- a/src/devices/bus/ieee488/c2040fdc.cpp
+++ b/src/devices/bus/ieee488/c2040fdc.cpp
@@ -443,7 +443,7 @@ int c2040_fdc_device::get_next_bit(attotime &tm, const attotime &limit)
return bit && cur_live.rw_sel;
}
-READ8_MEMBER( c2040_fdc_device::read )
+uint8_t c2040_fdc_device::read()
{
uint8_t e = checkpoint_live.e;
offs_t i = checkpoint_live.i;
@@ -455,7 +455,7 @@ READ8_MEMBER( c2040_fdc_device::read )
return data;
}
-WRITE8_MEMBER( c2040_fdc_device::write )
+void c2040_fdc_device::write(uint8_t data)
{
if (m_pi != data)
{
diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h
index 64239991222..b2b78452b84 100644
--- a/src/devices/bus/ieee488/c2040fdc.h
+++ b/src/devices/bus/ieee488/c2040fdc.h
@@ -34,8 +34,8 @@ public:
auto ready_wr_callback() { return m_write_ready.bind(); }
auto error_wr_callback() { return m_write_error.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read();
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( ds0_w );
DECLARE_WRITE_LINE_MEMBER( ds1_w );
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 81f64c271f0..367c4299857 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -257,7 +257,7 @@ void c8050_device::sfd1001_fdc_mem(address_map &map)
// riot6532 uc1
//-------------------------------------------------
-READ8_MEMBER( c8050_device::dio_r )
+uint8_t c8050_device::dio_r()
{
/*
@@ -277,7 +277,7 @@ READ8_MEMBER( c8050_device::dio_r )
return m_bus->dio_r();
}
-WRITE8_MEMBER( c8050_device::dio_w )
+void c8050_device::dio_w(uint8_t data)
{
/*
@@ -301,7 +301,7 @@ WRITE8_MEMBER( c8050_device::dio_w )
// riot6532 ue1
//-------------------------------------------------
-READ8_MEMBER( c8050_device::riot1_pa_r )
+uint8_t c8050_device::riot1_pa_r()
{
/*
@@ -332,7 +332,7 @@ READ8_MEMBER( c8050_device::riot1_pa_r )
return data;
}
-WRITE8_MEMBER( c8050_device::riot1_pa_w )
+void c8050_device::riot1_pa_w(uint8_t data)
{
/*
@@ -367,7 +367,7 @@ WRITE8_MEMBER( c8050_device::riot1_pa_w )
update_ieee_signals();
}
-READ8_MEMBER( c8050_device::riot1_pb_r )
+uint8_t c8050_device::riot1_pb_r()
{
/*
@@ -398,7 +398,7 @@ READ8_MEMBER( c8050_device::riot1_pb_r )
return data;
}
-WRITE8_MEMBER( c8050_device::riot1_pb_w )
+void c8050_device::riot1_pb_w(uint8_t data)
{
/*
@@ -425,7 +425,7 @@ WRITE8_MEMBER( c8050_device::riot1_pb_w )
m_leds[LED_ERR] = BIT(data, 5);
}
-WRITE8_MEMBER( c8050_device::via_pb_w )
+void c8050_device::via_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h
index c8f96c4605f..bc317097d9b 100644
--- a/src/devices/bus/ieee488/c8050.h
+++ b/src/devices/bus/ieee488/c8050.h
@@ -32,13 +32,13 @@ public:
// construction/destruction
c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER( dio_r );
- DECLARE_WRITE8_MEMBER( dio_w );
- DECLARE_READ8_MEMBER( riot1_pa_r );
- DECLARE_WRITE8_MEMBER( riot1_pa_w );
- DECLARE_READ8_MEMBER( riot1_pb_r );
- DECLARE_WRITE8_MEMBER( riot1_pb_w );
- DECLARE_WRITE8_MEMBER( via_pb_w );
+ uint8_t dio_r();
+ void dio_w(uint8_t data);
+ uint8_t riot1_pa_r();
+ void riot1_pa_w(uint8_t data);
+ uint8_t riot1_pb_r();
+ void riot1_pb_w(uint8_t data);
+ void via_pb_w(uint8_t data);
void c8050_fdc_mem(address_map &map);
void c8050_main_mem(address_map &map);
diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp
index 50861316839..3d365ab2304 100644
--- a/src/devices/bus/ieee488/c8050fdc.cpp
+++ b/src/devices/bus/ieee488/c8050fdc.cpp
@@ -497,7 +497,7 @@ void c8050_fdc_device::live_run(const attotime &limit)
}
}
-READ8_MEMBER( c8050_fdc_device::read )
+uint8_t c8050_fdc_device::read()
{
uint8_t e = checkpoint_live.e;
offs_t i = checkpoint_live.i;
@@ -505,7 +505,7 @@ READ8_MEMBER( c8050_fdc_device::read )
return GCR_DECODE(e, i);
}
-WRITE8_MEMBER( c8050_fdc_device::write )
+void c8050_fdc_device::write(uint8_t data)
{
if (LOG) logerror("%s %s PI %02x\n", machine().time().as_string(), machine().describe_context(), data);
diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h
index 2f75511b817..601f9c98ea6 100644
--- a/src/devices/bus/ieee488/c8050fdc.h
+++ b/src/devices/bus/ieee488/c8050fdc.h
@@ -35,8 +35,8 @@ public:
auto brdy_wr_callback() { return m_write_brdy.bind(); }
auto error_wr_callback() { return m_write_error.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read();
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( ds0_w );
DECLARE_WRITE_LINE_MEMBER( ds1_w );
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index 75e0d054874..e79e9839769 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -110,7 +110,7 @@ void c8280_device::c8280_fdc_mem(address_map &map)
// riot6532 0
//-------------------------------------------------
-READ8_MEMBER( c8280_device::dio_r )
+uint8_t c8280_device::dio_r()
{
/*
@@ -130,7 +130,7 @@ READ8_MEMBER( c8280_device::dio_r )
return m_bus->dio_r();
}
-WRITE8_MEMBER( c8280_device::dio_w )
+void c8280_device::dio_w(uint8_t data)
{
/*
@@ -155,7 +155,7 @@ WRITE8_MEMBER( c8280_device::dio_w )
// riot6532 1
//-------------------------------------------------
-READ8_MEMBER( c8280_device::riot1_pa_r )
+uint8_t c8280_device::riot1_pa_r()
{
/*
@@ -186,7 +186,7 @@ READ8_MEMBER( c8280_device::riot1_pa_r )
return data;
}
-WRITE8_MEMBER( c8280_device::riot1_pa_w )
+void c8280_device::riot1_pa_w(uint8_t data)
{
/*
@@ -221,7 +221,7 @@ WRITE8_MEMBER( c8280_device::riot1_pa_w )
update_ieee_signals();
}
-READ8_MEMBER( c8280_device::riot1_pb_r )
+uint8_t c8280_device::riot1_pb_r()
{
/*
@@ -252,7 +252,7 @@ READ8_MEMBER( c8280_device::riot1_pb_r )
return data;
}
-WRITE8_MEMBER( c8280_device::riot1_pb_w )
+void c8280_device::riot1_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h
index d5e0fc8ef1f..4695836bed0 100644
--- a/src/devices/bus/ieee488/c8280.h
+++ b/src/devices/bus/ieee488/c8280.h
@@ -49,12 +49,12 @@ protected:
private:
inline void update_ieee_signals();
- DECLARE_READ8_MEMBER( dio_r );
- DECLARE_WRITE8_MEMBER( dio_w );
- DECLARE_READ8_MEMBER( riot1_pa_r );
- DECLARE_WRITE8_MEMBER( riot1_pa_w );
- DECLARE_READ8_MEMBER( riot1_pb_r );
- DECLARE_WRITE8_MEMBER( riot1_pb_w );
+ uint8_t dio_r();
+ void dio_w(uint8_t data);
+ uint8_t riot1_pa_r();
+ void riot1_pa_w(uint8_t data);
+ uint8_t riot1_pb_r();
+ void riot1_pb_w(uint8_t data);
DECLARE_READ8_MEMBER( fk5_r );
DECLARE_WRITE8_MEMBER( fk5_w );
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 9bf524d9f64..1de4dfd9347 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -136,7 +136,7 @@ void d9060_device_base::hdc_mem(address_map &map)
// riot6532 0
//-------------------------------------------------
-READ8_MEMBER( d9060_device_base::dio_r )
+uint8_t d9060_device_base::dio_r()
{
/*
@@ -157,7 +157,7 @@ READ8_MEMBER( d9060_device_base::dio_r )
}
-WRITE8_MEMBER( d9060_device_base::dio_w )
+void d9060_device_base::dio_w(uint8_t data)
{
/*
@@ -182,7 +182,7 @@ WRITE8_MEMBER( d9060_device_base::dio_w )
// riot6532 1
//-------------------------------------------------
-READ8_MEMBER( d9060_device_base::riot1_pa_r )
+uint8_t d9060_device_base::riot1_pa_r()
{
/*
@@ -213,7 +213,7 @@ READ8_MEMBER( d9060_device_base::riot1_pa_r )
return data;
}
-WRITE8_MEMBER( d9060_device_base::riot1_pa_w )
+void d9060_device_base::riot1_pa_w(uint8_t data)
{
/*
@@ -248,7 +248,7 @@ WRITE8_MEMBER( d9060_device_base::riot1_pa_w )
update_ieee_signals();
}
-READ8_MEMBER( d9060_device_base::riot1_pb_r )
+uint8_t d9060_device_base::riot1_pb_r()
{
/*
@@ -279,7 +279,7 @@ READ8_MEMBER( d9060_device_base::riot1_pb_r )
return data;
}
-WRITE8_MEMBER( d9060_device_base::riot1_pb_w )
+void d9060_device_base::riot1_pb_w(uint8_t data)
{
/*
@@ -307,7 +307,7 @@ WRITE8_MEMBER( d9060_device_base::riot1_pb_w )
}
-WRITE8_MEMBER( d9060_device_base::via_pb_w )
+void d9060_device_base::via_pb_w(uint8_t data)
{
/*
@@ -347,7 +347,7 @@ WRITE_LINE_MEMBER( d9060_device_base::enable_w )
}
}
-WRITE8_MEMBER( d9060_device_base::scsi_data_w )
+void d9060_device_base::scsi_data_w(uint8_t data)
{
m_data = data;
diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h
index b9d720090f2..a5da444dbcf 100644
--- a/src/devices/bus/ieee488/d9060.h
+++ b/src/devices/bus/ieee488/d9060.h
@@ -54,16 +54,16 @@ protected:
private:
inline void update_ieee_signals();
- DECLARE_READ8_MEMBER( dio_r );
- DECLARE_WRITE8_MEMBER( dio_w );
- DECLARE_READ8_MEMBER( riot1_pa_r );
- DECLARE_WRITE8_MEMBER( riot1_pa_w );
- DECLARE_READ8_MEMBER( riot1_pb_r );
- DECLARE_WRITE8_MEMBER( riot1_pb_w );
- DECLARE_WRITE8_MEMBER( via_pb_w );
+ uint8_t dio_r();
+ void dio_w(uint8_t data);
+ uint8_t riot1_pa_r();
+ void riot1_pa_w(uint8_t data);
+ uint8_t riot1_pb_r();
+ void riot1_pb_w(uint8_t data);
+ void via_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( ack_w );
DECLARE_WRITE_LINE_MEMBER( enable_w );
- DECLARE_WRITE8_MEMBER( scsi_data_w );
+ void scsi_data_w(uint8_t data);
required_device<m6502_device> m_maincpu;
required_device<m6502_device> m_hdccpu;
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index ed140734e13..0ad2db1abfb 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -129,17 +129,17 @@ void hardbox_device::hardbox_io(address_map &map)
// I8255A 0 interface
//-------------------------------------------------
-READ8_MEMBER( hardbox_device::ppi0_pa_r )
+uint8_t hardbox_device::ppi0_pa_r()
{
return m_bus->dio_r() ^ 0xff;
}
-WRITE8_MEMBER( hardbox_device::ppi0_pb_w )
+void hardbox_device::ppi0_pb_w(uint8_t data)
{
m_bus->dio_w(this, data ^ 0xff);
}
-READ8_MEMBER( hardbox_device::ppi0_pc_r )
+uint8_t hardbox_device::ppi0_pc_r()
{
uint8_t data = ioport("SW1")->read();
@@ -154,7 +154,7 @@ READ8_MEMBER( hardbox_device::ppi0_pc_r )
// I8255A 1 interface
//-------------------------------------------------
-READ8_MEMBER( hardbox_device::ppi1_pa_r )
+uint8_t hardbox_device::ppi1_pa_r()
{
/*
@@ -185,7 +185,7 @@ READ8_MEMBER( hardbox_device::ppi1_pa_r )
return data;
}
-WRITE8_MEMBER( hardbox_device::ppi1_pb_w )
+void hardbox_device::ppi1_pb_w(uint8_t data)
{
/*
@@ -214,7 +214,7 @@ WRITE8_MEMBER( hardbox_device::ppi1_pb_w )
m_bus->ren_w(this, !BIT(data, 6));
}
-READ8_MEMBER( hardbox_device::ppi1_pc_r )
+uint8_t hardbox_device::ppi1_pc_r()
{
/*
@@ -240,7 +240,7 @@ READ8_MEMBER( hardbox_device::ppi1_pc_r )
return data;
}
-WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
+void hardbox_device::ppi1_pc_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h
index 65736c4e04f..4b22ab57354 100644
--- a/src/devices/bus/ieee488/hardbox.h
+++ b/src/devices/bus/ieee488/hardbox.h
@@ -47,14 +47,14 @@ protected:
virtual void ieee488_ifc(int state) override;
private:
- DECLARE_READ8_MEMBER( ppi0_pa_r );
- DECLARE_WRITE8_MEMBER( ppi0_pb_w );
- DECLARE_READ8_MEMBER( ppi0_pc_r );
-
- DECLARE_READ8_MEMBER( ppi1_pa_r );
- DECLARE_WRITE8_MEMBER( ppi1_pb_w );
- DECLARE_READ8_MEMBER( ppi1_pc_r );
- DECLARE_WRITE8_MEMBER( ppi1_pc_w );
+ uint8_t ppi0_pa_r();
+ void ppi0_pb_w(uint8_t data);
+ uint8_t ppi0_pc_r();
+
+ uint8_t ppi1_pa_r();
+ void ppi1_pb_w(uint8_t data);
+ uint8_t ppi1_pc_r();
+ void ppi1_pc_w(uint8_t data);
void hardbox_io(address_map &map);
void hardbox_mem(address_map &map);
diff --git a/src/devices/bus/ieee488/hp9122c.cpp b/src/devices/bus/ieee488/hp9122c.cpp
index bef1fdd8ecb..221c341b17a 100644
--- a/src/devices/bus/ieee488/hp9122c.cpp
+++ b/src/devices/bus/ieee488/hp9122c.cpp
@@ -255,12 +255,12 @@ void hp9122c_device::update_intsel()
m_cpufirq = firq;
}
-READ8_MEMBER(hp9122c_device::i8291a_dio_r)
+uint8_t hp9122c_device::i8291a_dio_r()
{
return m_bus->dio_r();
}
-WRITE8_MEMBER(hp9122c_device::i8291a_dio_w)
+void hp9122c_device::i8291a_dio_w(uint8_t data)
{
m_bus->dio_w(this, data);
}
diff --git a/src/devices/bus/ieee488/hp9122c.h b/src/devices/bus/ieee488/hp9122c.h
index 60e8f590db1..89c643400f5 100644
--- a/src/devices/bus/ieee488/hp9122c.h
+++ b/src/devices/bus/ieee488/hp9122c.h
@@ -100,8 +100,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(i8291a_atn_w);
DECLARE_WRITE_LINE_MEMBER(i8291a_ren_w);
- DECLARE_READ8_MEMBER(i8291a_dio_r);
- DECLARE_WRITE8_MEMBER(i8291a_dio_w);
+ uint8_t i8291a_dio_r();
+ void i8291a_dio_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(i8291a_int_w);
DECLARE_WRITE_LINE_MEMBER(i8291a_dreq_w);
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index a1546668d3f..6eb16464a63 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -471,12 +471,12 @@ WRITE_LINE_MEMBER(hp9895_device::phi_ren_w)
m_bus->ren_w(this , state);
}
-READ8_MEMBER(hp9895_device::phi_dio_r)
+uint8_t hp9895_device::phi_dio_r()
{
return m_bus->dio_r();
}
-WRITE8_MEMBER(hp9895_device::phi_dio_w)
+void hp9895_device::phi_dio_w(uint8_t data)
{
m_bus->dio_w(this , data);
}
@@ -503,7 +503,7 @@ READ8_MEMBER(hp9895_device::phi_reg_r)
return (uint8_t)reg;
}
-WRITE8_MEMBER(hp9895_device::z80_m1_w)
+void hp9895_device::z80_m1_w(uint8_t data)
{
// Every M1 cycle of Z80 clears the IRQ line
if (m_cpu_irq) {
diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h
index 60c41f63afd..ad4865d1854 100644
--- a/src/devices/bus/ieee488/hp9895.h
+++ b/src/devices/bus/ieee488/hp9895.h
@@ -58,14 +58,14 @@ private:
DECLARE_WRITE_LINE_MEMBER(phi_ren_w);
// PHI DIO r/w CBs
- DECLARE_READ8_MEMBER(phi_dio_r);
- DECLARE_WRITE8_MEMBER(phi_dio_w);
+ uint8_t phi_dio_r();
+ void phi_dio_w(uint8_t data);
// PHI IRQ/Z80 NMI
DECLARE_WRITE_LINE_MEMBER(phi_int_w);
// Z80 IRQ
- DECLARE_WRITE8_MEMBER(z80_m1_w);
+ void z80_m1_w(uint8_t data);
// Floppy interface
DECLARE_WRITE8_MEMBER(data_w);
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index ac2630c39cc..8106cae2aad 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -98,12 +98,12 @@ void softbox_device::softbox_io(address_map &map)
// I8255A 0 Interface
//-------------------------------------------------
-READ8_MEMBER( softbox_device::ppi0_pa_r )
+uint8_t softbox_device::ppi0_pa_r()
{
return m_bus->dio_r() ^ 0xff;
}
-WRITE8_MEMBER( softbox_device::ppi0_pb_w )
+void softbox_device::ppi0_pb_w(uint8_t data)
{
m_bus->dio_w(this, data ^ 0xff);
}
@@ -112,7 +112,7 @@ WRITE8_MEMBER( softbox_device::ppi0_pb_w )
// I8255A 1 Interface
//-------------------------------------------------
-READ8_MEMBER( softbox_device::ppi1_pa_r )
+uint8_t softbox_device::ppi1_pa_r()
{
/*
@@ -143,7 +143,7 @@ READ8_MEMBER( softbox_device::ppi1_pa_r )
return data;
}
-WRITE8_MEMBER( softbox_device::ppi1_pb_w )
+void softbox_device::ppi1_pb_w(uint8_t data)
{
/*
@@ -170,7 +170,7 @@ WRITE8_MEMBER( softbox_device::ppi1_pb_w )
m_bus->ifc_w(this, !BIT(data, 7));
}
-READ8_MEMBER( softbox_device::ppi1_pc_r )
+uint8_t softbox_device::ppi1_pc_r()
{
/*
@@ -196,7 +196,7 @@ READ8_MEMBER( softbox_device::ppi1_pc_r )
return data;
}
-WRITE8_MEMBER( softbox_device::ppi1_pc_w )
+void softbox_device::ppi1_pc_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h
index 0fce3e9f8d1..173d539cfbe 100644
--- a/src/devices/bus/ieee488/softbox.h
+++ b/src/devices/bus/ieee488/softbox.h
@@ -49,13 +49,13 @@ protected:
virtual void ieee488_ifc(int state) override;
private:
- DECLARE_READ8_MEMBER( ppi0_pa_r );
- DECLARE_WRITE8_MEMBER( ppi0_pb_w );
+ uint8_t ppi0_pa_r();
+ void ppi0_pb_w(uint8_t data);
- DECLARE_READ8_MEMBER( ppi1_pa_r );
- DECLARE_WRITE8_MEMBER( ppi1_pb_w );
- DECLARE_READ8_MEMBER( ppi1_pc_r );
- DECLARE_WRITE8_MEMBER( ppi1_pc_w );
+ uint8_t ppi1_pa_r();
+ void ppi1_pb_w(uint8_t data);
+ uint8_t ppi1_pc_r();
+ void ppi1_pc_w(uint8_t data);
DECLARE_WRITE8_MEMBER( dbrg_w );
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index 6ad104d7b2f..f32e7fdf2b3 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -129,7 +129,7 @@ WRITE_LINE_MEMBER( imi5000h_device::ctc_z2_w )
// Z80PIO 1
//-------------------------------------------------
-READ8_MEMBER( imi5000h_device::pio0_pa_r )
+uint8_t imi5000h_device::pio0_pa_r()
{
/*
@@ -149,7 +149,7 @@ READ8_MEMBER( imi5000h_device::pio0_pa_r )
return 0;
}
-WRITE8_MEMBER( imi5000h_device::pio0_pa_w )
+void imi5000h_device::pio0_pa_w(uint8_t data)
{
/*
@@ -167,7 +167,7 @@ WRITE8_MEMBER( imi5000h_device::pio0_pa_w )
*/
}
-READ8_MEMBER( imi5000h_device::pio0_pb_r )
+uint8_t imi5000h_device::pio0_pb_r()
{
/*
@@ -187,7 +187,7 @@ READ8_MEMBER( imi5000h_device::pio0_pb_r )
return 0;
}
-WRITE8_MEMBER( imi5000h_device::pio0_pb_w )
+void imi5000h_device::pio0_pb_w(uint8_t data)
{
/*
@@ -209,7 +209,7 @@ WRITE8_MEMBER( imi5000h_device::pio0_pb_w )
// Z80PIO 2
//-------------------------------------------------
-READ8_MEMBER( imi5000h_device::pio2_pa_r )
+uint8_t imi5000h_device::pio2_pa_r()
{
/*
@@ -229,7 +229,7 @@ READ8_MEMBER( imi5000h_device::pio2_pa_r )
return 0;
}
-WRITE8_MEMBER( imi5000h_device::pio2_pa_w )
+void imi5000h_device::pio2_pa_w(uint8_t data)
{
/*
@@ -247,13 +247,13 @@ WRITE8_MEMBER( imi5000h_device::pio2_pa_w )
*/
}
-READ8_MEMBER( imi5000h_device::pio2_pb_r )
+uint8_t imi5000h_device::pio2_pb_r()
{
// command bus
return 0;
}
-WRITE8_MEMBER( imi5000h_device::pio2_pb_w )
+void imi5000h_device::pio2_pb_w(uint8_t data)
{
// command bus
}
@@ -262,7 +262,7 @@ WRITE8_MEMBER( imi5000h_device::pio2_pb_w )
// Z80PIO 3
//-------------------------------------------------
-READ8_MEMBER( imi5000h_device::pio3_pa_r )
+uint8_t imi5000h_device::pio3_pa_r()
{
/*
@@ -282,7 +282,7 @@ READ8_MEMBER( imi5000h_device::pio3_pa_r )
return 0;
}
-WRITE8_MEMBER( imi5000h_device::pio3_pa_w )
+void imi5000h_device::pio3_pa_w(uint8_t data)
{
/*
@@ -300,7 +300,7 @@ WRITE8_MEMBER( imi5000h_device::pio3_pa_w )
*/
}
-READ8_MEMBER( imi5000h_device::pio3_pb_r )
+uint8_t imi5000h_device::pio3_pb_r()
{
/*
@@ -320,7 +320,7 @@ READ8_MEMBER( imi5000h_device::pio3_pb_r )
return 0;
}
-WRITE8_MEMBER( imi5000h_device::pio3_pb_w )
+void imi5000h_device::pio3_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h
index 935b6d7046b..77d276b154b 100644
--- a/src/devices/bus/imi7000/imi5000h.h
+++ b/src/devices/bus/imi7000/imi5000h.h
@@ -49,20 +49,20 @@ private:
DECLARE_WRITE_LINE_MEMBER( ctc_z1_w );
DECLARE_WRITE_LINE_MEMBER( ctc_z2_w );
- DECLARE_READ8_MEMBER( pio0_pa_r );
- DECLARE_WRITE8_MEMBER( pio0_pa_w );
- DECLARE_READ8_MEMBER( pio0_pb_r );
- DECLARE_WRITE8_MEMBER( pio0_pb_w );
-
- DECLARE_READ8_MEMBER( pio2_pa_r );
- DECLARE_WRITE8_MEMBER( pio2_pa_w );
- DECLARE_READ8_MEMBER( pio2_pb_r );
- DECLARE_WRITE8_MEMBER( pio2_pb_w );
-
- DECLARE_READ8_MEMBER( pio3_pa_r );
- DECLARE_WRITE8_MEMBER( pio3_pa_w );
- DECLARE_READ8_MEMBER( pio3_pb_r );
- DECLARE_WRITE8_MEMBER( pio3_pb_w );
+ uint8_t pio0_pa_r();
+ void pio0_pa_w(uint8_t data);
+ uint8_t pio0_pb_r();
+ void pio0_pb_w(uint8_t data);
+
+ uint8_t pio2_pa_r();
+ void pio2_pa_w(uint8_t data);
+ uint8_t pio2_pb_r();
+ void pio2_pb_w(uint8_t data);
+
+ uint8_t pio3_pa_r();
+ void pio3_pa_w(uint8_t data);
+ uint8_t pio3_pb_r();
+ void pio3_pb_w(uint8_t data);
void imi5000h_io(address_map &map);
void imi5000h_mem(address_map &map);
diff --git a/src/devices/bus/interpro/keyboard/lle.cpp b/src/devices/bus/interpro/keyboard/lle.cpp
index 8edfb8c1ab6..6beb3581d13 100644
--- a/src/devices/bus/interpro/keyboard/lle.cpp
+++ b/src/devices/bus/interpro/keyboard/lle.cpp
@@ -507,7 +507,7 @@ READ_LINE_MEMBER(lle_device_base::t1_r)
return BIT(m_lower[m_count >> 3]->read(), m_count & 0x7) ? ASSERT_LINE : CLEAR_LINE;
}
-WRITE8_MEMBER(lle_device_base::p1_w)
+void lle_device_base::p1_w(u8 data)
{
LOGMASKED(LOG_PORT, "p1_w 0x%02x (%s)\n", data, machine().describe_context());
@@ -534,7 +534,7 @@ WRITE8_MEMBER(lle_device_base::p1_w)
m_p1 = data;
}
-WRITE8_MEMBER(lle_device_base::p2_w)
+void lle_device_base::p2_w(u8 data)
{
LOGMASKED(LOG_PORT, "p2_w 0x%02x (%s)\n", data, machine().describe_context());
@@ -573,7 +573,7 @@ WRITE8_MEMBER(lle_device_base::p2_w)
m_p2 = data;
}
-READ8_MEMBER(lle_device_base::bus_r)
+u8 lle_device_base::bus_r()
{
if (!BIT(m_p1, 5))
{
@@ -587,7 +587,7 @@ READ8_MEMBER(lle_device_base::bus_r)
return 0xff;
}
-WRITE8_MEMBER(lle_device_base::bus_w)
+void lle_device_base::bus_w(u8 data)
{
if (data != 0xff)
LOGMASKED(LOG_PORT, "bus_w 0x%02x (%s)\n", data, machine().describe_context());
diff --git a/src/devices/bus/interpro/keyboard/lle.h b/src/devices/bus/interpro/keyboard/lle.h
index ef288bb0da6..98c565e6cfa 100644
--- a/src/devices/bus/interpro/keyboard/lle.h
+++ b/src/devices/bus/interpro/keyboard/lle.h
@@ -34,10 +34,10 @@ protected:
DECLARE_READ_LINE_MEMBER(t0_r);
DECLARE_READ_LINE_MEMBER(t1_r);
- DECLARE_WRITE8_MEMBER(p1_w);
- DECLARE_WRITE8_MEMBER(p2_w);
- DECLARE_READ8_MEMBER(bus_r);
- DECLARE_WRITE8_MEMBER(bus_w);
+ void p1_w(u8 data);
+ void p2_w(u8 data);
+ u8 bus_r();
+ void bus_w(u8 data);
private:
required_device<i8049_device> m_mcu;
diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp
index 650e1463cfe..a01017fe2ac 100644
--- a/src/devices/bus/interpro/sr/gt.cpp
+++ b/src/devices/bus/interpro/sr/gt.cpp
@@ -1400,7 +1400,7 @@ WRITE_LINE_MEMBER(gtdb_device::serial_irq)
irq0(state);
}
-WRITE32_MEMBER(gtdb_device::mouse_status_w)
+void gtdb_device::mouse_status_w(offs_t offset, u32 data, u32 mem_mask)
{
if (mem_mask & interpro_mouse_device::state_mask::MOUSE_XPOS)
{
diff --git a/src/devices/bus/interpro/sr/gt.h b/src/devices/bus/interpro/sr/gt.h
index 359cd798c9c..0fd02864c3b 100644
--- a/src/devices/bus/interpro/sr/gt.h
+++ b/src/devices/bus/interpro/sr/gt.h
@@ -262,7 +262,7 @@ protected:
virtual void map_dynamic(address_map &map);
DECLARE_WRITE_LINE_MEMBER(serial_irq);
- DECLARE_WRITE32_MEMBER(mouse_status_w);
+ void mouse_status_w(offs_t offset, u32 data, u32 mem_mask = ~0);
DECLARE_WRITE32_MEMBER(srx_mapping_w);
enum int_status_mask
diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp
index ce107cf81da..304bcf87b43 100644
--- a/src/devices/bus/iq151/grafik.cpp
+++ b/src/devices/bus/iq151/grafik.cpp
@@ -78,7 +78,7 @@ void iq151_grafik_device::device_add_mconfig(machine_config &config)
// I8255 port a
//-------------------------------------------------
-WRITE8_MEMBER(iq151_grafik_device::x_write)
+void iq151_grafik_device::x_write(uint8_t data)
{
if (LOG) logerror("Grafik: set posx 0x%02x\n", data);
@@ -89,7 +89,7 @@ WRITE8_MEMBER(iq151_grafik_device::x_write)
// I8255 port b
//-------------------------------------------------
-WRITE8_MEMBER(iq151_grafik_device::y_write)
+void iq151_grafik_device::y_write(uint8_t data)
{
if (LOG) logerror("Grafik: set posy 0x%02x\n", data);
@@ -100,7 +100,7 @@ WRITE8_MEMBER(iq151_grafik_device::y_write)
// I8255 port c
//-------------------------------------------------
-WRITE8_MEMBER(iq151_grafik_device::control_w)
+void iq151_grafik_device::control_w(uint8_t data)
{
if (LOG) logerror("Grafik: control write 0x%02x\n", data);
diff --git a/src/devices/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h
index 6b1fe79bc8c..5ac4ef42723 100644
--- a/src/devices/bus/iq151/grafik.h
+++ b/src/devices/bus/iq151/grafik.h
@@ -37,9 +37,9 @@ protected:
private:
// ppi8255 callback
- DECLARE_WRITE8_MEMBER(x_write);
- DECLARE_WRITE8_MEMBER(y_write);
- DECLARE_WRITE8_MEMBER(control_w);
+ void x_write(uint8_t data);
+ void y_write(uint8_t data);
+ void control_w(uint8_t data);
required_device<i8255_device> m_ppi8255;
diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp
index 37379f590f8..f11b431f343 100644
--- a/src/devices/bus/iq151/staper.cpp
+++ b/src/devices/bus/iq151/staper.cpp
@@ -106,13 +106,13 @@ void iq151_staper_device::io_write(offs_t offset, uint8_t data)
// I8255 interface
//**************************************************************************
-READ8_MEMBER( iq151_staper_device::ppi_porta_r )
+uint8_t iq151_staper_device::ppi_porta_r()
{
// TODO: paper tape reader input
return 0;
}
-WRITE8_MEMBER( iq151_staper_device::ppi_portb_w )
+void iq151_staper_device::ppi_portb_w(uint8_t data)
{
if (m_ppi_portc & 0x80)
{
@@ -128,7 +128,7 @@ WRITE8_MEMBER( iq151_staper_device::ppi_portb_w )
}
}
-WRITE8_MEMBER( iq151_staper_device::ppi_portc_w )
+void iq151_staper_device::ppi_portc_w(uint8_t data)
{
/*
x--- ---- printer select
diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h
index 8e0c5e2b094..d9b078061b8 100644
--- a/src/devices/bus/iq151/staper.h
+++ b/src/devices/bus/iq151/staper.h
@@ -37,9 +37,9 @@ protected:
private:
// i8255 callbacks
- DECLARE_READ8_MEMBER( ppi_porta_r );
- DECLARE_WRITE8_MEMBER( ppi_portb_w );
- DECLARE_WRITE8_MEMBER( ppi_portc_w );
+ uint8_t ppi_porta_r();
+ void ppi_portb_w(uint8_t data);
+ void ppi_portc_w(uint8_t data);
static const device_timer_id TIMER_PRINTER = 0;
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index 44955657475..a9749abc66c 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -9,8 +9,8 @@ void el2_3c503_device::device_add_mconfig(machine_config &config)
{
DP8390D(config, m_dp8390, 0);
m_dp8390->irq_callback().set(FUNC(el2_3c503_device::el2_3c503_irq_w));
- m_dp8390->mem_read_callback().set(FUNC(el2_3c503_device::el2_3c503_mem_r));
- m_dp8390->mem_write_callback().set(FUNC(el2_3c503_device::el2_3c503_mem_w));
+ m_dp8390->mem_read_callback().set(FUNC(el2_3c503_device::el2_3c503_mem_read));
+ m_dp8390->mem_write_callback().set(FUNC(el2_3c503_device::el2_3c503_mem_write));
}
DEFINE_DEVICE_TYPE(EL2_3C503, el2_3c503_device, "el2_3c503", "3C503 Network Adapter")
@@ -169,10 +169,10 @@ READ8_MEMBER(el2_3c503_device::el2_3c503_hiport_r) {
return (m_regs.vptr & 0x0f) << 4;
case 14:
if(!(m_regs.ctrl & 0x80)) return 0xff;
- return el2_3c503_mem_r(space, machine().side_effects_disabled() ? m_regs.da : m_regs.da++, mem_mask);
+ return el2_3c503_mem_read(machine().side_effects_disabled() ? m_regs.da : m_regs.da++);
case 15:
if(!(m_regs.ctrl & 0x80)) return 0xff;
- return el2_3c503_mem_r(space, machine().side_effects_disabled() ? m_regs.da : m_regs.da++, mem_mask);
+ return el2_3c503_mem_read(machine().side_effects_disabled() ? m_regs.da : m_regs.da++);
}
return 0;
}
@@ -268,11 +268,11 @@ WRITE8_MEMBER(el2_3c503_device::el2_3c503_hiport_w) {
return;
case 14:
if(!(m_regs.ctrl & 0x80)) return;
- el2_3c503_mem_w(space, m_regs.da++, data, mem_mask);
+ el2_3c503_mem_write(m_regs.da++, data);
return;
case 15:
if(!(m_regs.ctrl & 0x80)) return;
- el2_3c503_mem_w(space, m_regs.da++, data, mem_mask);
+ el2_3c503_mem_write(m_regs.da++, data);
return;
default:
logerror("3c503: invalid high register write %02x\n", offset);
diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h
index d987dc79cb2..0b0cfc69530 100644
--- a/src/devices/bus/isa/3c503.h
+++ b/src/devices/bus/isa/3c503.h
@@ -30,8 +30,6 @@ protected:
private:
void el2_3c503_irq_w(int state);
- DECLARE_READ8_MEMBER(el2_3c503_mem_r) { return el2_3c503_mem_read(offset); }
- DECLARE_WRITE8_MEMBER(el2_3c503_mem_w) { el2_3c503_mem_write(offset, data); }
required_device<dp8390d_device> m_dp8390;
uint8_t m_board_ram[8*1024];
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index 76c1dcdc1b6..b2afd57de7c 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -158,18 +158,18 @@ INPUT_PORTS_END
// D71055C PPI (PC)
//-------------------------------------------------
-READ8_MEMBER( isa8_ibm_mfc_device::ppi0_i_a )
+uint8_t isa8_ibm_mfc_device::ppi0_i_a()
{
// Read data from the Z80 PIU
return m_d71055c_1->pa_r();
}
-WRITE8_MEMBER( isa8_ibm_mfc_device::ppi0_o_b )
+void isa8_ibm_mfc_device::ppi0_o_b(uint8_t data)
{
// Write data to the Z80 PIU - no action required
}
-WRITE8_MEMBER( isa8_ibm_mfc_device::ppi0_o_c )
+void isa8_ibm_mfc_device::ppi0_o_c(uint8_t data)
{
// PC Port B /OBF (C1) -> Z80 Port B /STB (C2)
m_d71055c_1->pc2_w(BIT(data, 1));
@@ -191,7 +191,7 @@ WRITE8_MEMBER( isa8_ibm_mfc_device::ppi0_o_c )
m_pc_ppi_c = data;
}
-READ8_MEMBER( isa8_ibm_mfc_device::ppi0_i_c )
+uint8_t isa8_ibm_mfc_device::ppi0_i_c()
{
// Receive data bit 8
return BIT(m_z80_ppi_c, 5) << 7;
@@ -201,18 +201,18 @@ READ8_MEMBER( isa8_ibm_mfc_device::ppi0_i_c )
// D71055C PPI (Z80)
//-------------------------------------------------
-WRITE8_MEMBER( isa8_ibm_mfc_device::ppi1_o_a )
+void isa8_ibm_mfc_device::ppi1_o_a(uint8_t data)
{
// Write data to the PC PIU - no action required
}
-READ8_MEMBER( isa8_ibm_mfc_device::ppi1_i_b )
+uint8_t isa8_ibm_mfc_device::ppi1_i_b()
{
// Read data from the PC PIU
return m_d71055c_0->pb_r();
}
-WRITE8_MEMBER( isa8_ibm_mfc_device::ppi1_o_c )
+void isa8_ibm_mfc_device::ppi1_o_c(uint8_t data)
{
// PortA /OBF (C7) -> PortA /STB (C2)
m_d71055c_0->pc4_w(BIT(data, 7));
diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h
index febb741c3b3..ddefbfa0f68 100644
--- a/src/devices/bus/isa/ibm_mfc.h
+++ b/src/devices/bus/isa/ibm_mfc.h
@@ -42,15 +42,15 @@ protected:
virtual const tiny_rom_entry* device_rom_region() const override;
private:
- DECLARE_READ8_MEMBER( ppi0_i_a );
- DECLARE_WRITE8_MEMBER( ppi0_o_b );
- DECLARE_READ8_MEMBER( ppi0_i_c );
- DECLARE_WRITE8_MEMBER( ppi0_o_c );
+ uint8_t ppi0_i_a();
+ void ppi0_o_b(uint8_t data);
+ uint8_t ppi0_i_c();
+ void ppi0_o_c(uint8_t data);
- DECLARE_WRITE8_MEMBER( ppi1_o_a );
- DECLARE_READ8_MEMBER( ppi1_i_b );
+ void ppi1_o_a(uint8_t data);
+ uint8_t ppi1_i_b();
- DECLARE_WRITE8_MEMBER( ppi1_o_c );
+ void ppi1_o_c(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( d8253_out0 );
DECLARE_WRITE_LINE_MEMBER( d8253_out1 );