summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/devices/bus/dmv/k012.cpp4
-rw-r--r--src/devices/bus/isa/bblue2.cpp4
-rw-r--r--src/devices/bus/isa/lpt.cpp4
-rw-r--r--src/devices/bus/isa/mda.cpp8
-rw-r--r--src/devices/bus/isa/mpu401.cpp2
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_midi.cpp4
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.cpp4
-rw-r--r--src/devices/machine/8042kbdc.cpp4
-rw-r--r--src/devices/machine/fdc37c93x.cpp4
-rw-r--r--src/devices/machine/hd64610.cpp6
-rw-r--r--src/devices/machine/hd64610.h6
-rw-r--r--src/devices/machine/i7220.cpp4
-rw-r--r--src/devices/machine/i7220.h4
-rw-r--r--src/devices/machine/i8214.cpp8
-rw-r--r--src/devices/machine/i8214.h8
-rw-r--r--src/devices/machine/i8257.cpp16
-rw-r--r--src/devices/machine/i8257.h16
-rw-r--r--src/devices/machine/i8291a.cpp48
-rw-r--r--src/devices/machine/i8291a.h56
-rw-r--r--src/devices/machine/icm7170.cpp4
-rw-r--r--src/devices/machine/icm7170.h4
-rw-r--r--src/devices/machine/im6402.cpp28
-rw-r--r--src/devices/machine/im6402.h46
-rw-r--r--src/devices/machine/iopcdvd.cpp4
-rw-r--r--src/devices/machine/iopcdvd.h4
-rw-r--r--src/devices/machine/k053252.cpp4
-rw-r--r--src/devices/machine/k053252.h4
-rw-r--r--src/devices/machine/k054321.cpp10
-rw-r--r--src/devices/machine/k054321.h10
-rw-r--r--src/devices/machine/kr2376.cpp2
-rw-r--r--src/devices/machine/kr2376.h2
-rw-r--r--src/devices/machine/ldp1000.cpp4
-rw-r--r--src/devices/machine/ldp1000.h4
-rw-r--r--src/devices/machine/ldpr8210.cpp22
-rw-r--r--src/devices/machine/ldpr8210.h22
-rw-r--r--src/devices/machine/ldv1000.cpp24
-rw-r--r--src/devices/machine/ldv1000.h24
-rw-r--r--src/devices/machine/ldvp931.cpp28
-rw-r--r--src/devices/machine/ldvp931.h28
-rw-r--r--src/devices/machine/lh5810.cpp4
-rw-r--r--src/devices/machine/lh5810.h4
-rw-r--r--src/devices/machine/lpc-pit.cpp6
-rw-r--r--src/devices/machine/lpc-pit.h6
-rw-r--r--src/devices/machine/lpc-rtc.cpp20
-rw-r--r--src/devices/machine/lpc-rtc.h16
-rw-r--r--src/devices/machine/mb87030.cpp60
-rw-r--r--src/devices/machine/mb87030.h64
-rw-r--r--src/devices/machine/mb8795.cpp32
-rw-r--r--src/devices/machine/mb8795.h32
-rw-r--r--src/devices/machine/mb89352.cpp4
-rw-r--r--src/devices/machine/mb89352.h4
-rw-r--r--src/devices/machine/mb89363b.cpp32
-rw-r--r--src/devices/machine/mb89363b.h28
-rw-r--r--src/devices/machine/mb89374.cpp18
-rw-r--r--src/devices/machine/mb89374.h18
-rw-r--r--src/devices/machine/mc14411.cpp8
-rw-r--r--src/devices/machine/mc14411.h8
-rw-r--r--src/devices/machine/mc6846.cpp4
-rw-r--r--src/devices/machine/mc6846.h4
-rw-r--r--src/devices/machine/mos6529.cpp4
-rw-r--r--src/devices/machine/mos6529.h22
-rw-r--r--src/devices/machine/mos6530.cpp4
-rw-r--r--src/devices/machine/mos6530.h4
-rw-r--r--src/devices/machine/mos8706.cpp4
-rw-r--r--src/devices/machine/mos8706.h4
-rw-r--r--src/devices/machine/mpu401.cpp18
-rw-r--r--src/devices/machine/mpu401.h20
-rw-r--r--src/devices/machine/msm6253.cpp8
-rw-r--r--src/devices/machine/msm6253.h8
-rw-r--r--src/devices/machine/nscsi_cb.h39
-rw-r--r--src/devices/machine/pc_fdc.cpp16
-rw-r--r--src/devices/machine/pc_fdc.h14
-rw-r--r--src/devices/machine/pc_lpt.cpp28
-rw-r--r--src/devices/machine/pc_lpt.h18
-rw-r--r--src/devices/machine/pckeybrd.cpp12
-rw-r--r--src/devices/machine/pckeybrd.h6
-rw-r--r--src/devices/machine/pdc.cpp36
-rw-r--r--src/devices/machine/pdc.h36
-rw-r--r--src/devices/machine/r10696.cpp4
-rw-r--r--src/devices/machine/r10696.h4
-rw-r--r--src/devices/machine/r10788.cpp4
-rw-r--r--src/devices/machine/r10788.h4
-rw-r--r--src/devices/machine/ra17xx.cpp4
-rw-r--r--src/devices/machine/ra17xx.h4
-rw-r--r--src/devices/machine/rp5c01.cpp4
-rw-r--r--src/devices/machine/rp5c01.h8
-rw-r--r--src/devices/machine/rp5c15.cpp4
-rw-r--r--src/devices/machine/rp5c15.h4
-rw-r--r--src/devices/machine/s2636.cpp6
-rw-r--r--src/devices/machine/s2636.h6
-rw-r--r--src/devices/machine/scc2698b.cpp36
-rw-r--r--src/devices/machine/scc2698b.h27
-rw-r--r--src/devices/machine/scnxx562.cpp20
-rw-r--r--src/devices/machine/scnxx562.h50
-rw-r--r--src/devices/machine/serflash.cpp18
-rw-r--r--src/devices/machine/serflash.h18
-rw-r--r--src/devices/machine/smioc.cpp20
-rw-r--r--src/devices/machine/smioc.h16
-rw-r--r--src/devices/machine/smpc.cpp32
-rw-r--r--src/devices/machine/smpc.h32
-rw-r--r--src/devices/machine/swtpc8212.cpp30
-rw-r--r--src/devices/machine/swtpc8212.h30
-rw-r--r--src/devices/machine/tms1024.cpp10
-rw-r--r--src/devices/machine/tms1024.h10
-rw-r--r--src/devices/machine/tms5501.cpp26
-rw-r--r--src/devices/machine/tms5501.h26
-rw-r--r--src/devices/machine/tms6100.cpp16
-rw-r--r--src/devices/machine/tms6100.h18
-rw-r--r--src/devices/machine/tms9901.cpp8
-rw-r--r--src/devices/machine/tms9901.h8
-rw-r--r--src/devices/machine/upd7004.cpp4
-rw-r--r--src/devices/machine/upd7004.h4
-rw-r--r--src/devices/machine/upd71071.cpp4
-rw-r--r--src/devices/machine/upd71071.h8
-rw-r--r--src/devices/machine/v3021.cpp4
-rw-r--r--src/devices/machine/v3021.h4
-rw-r--r--src/devices/machine/vt82c496.cpp4
-rw-r--r--src/devices/machine/vt82c496.h5
-rw-r--r--src/devices/machine/wd1000.cpp4
-rw-r--r--src/devices/machine/wd1000.h9
-rw-r--r--src/devices/machine/wd1010.cpp8
-rw-r--r--src/devices/machine/wd1010.h8
-rw-r--r--src/devices/machine/wd11c00_17.cpp24
-rw-r--r--src/devices/machine/wd11c00_17.h24
-rw-r--r--src/devices/machine/wozfdc.cpp2
-rw-r--r--src/devices/machine/wozfdc.h2
-rw-r--r--src/devices/machine/x2212.cpp8
-rw-r--r--src/devices/machine/x2212.h8
-rw-r--r--src/devices/machine/ym3802.cpp4
-rw-r--r--src/devices/machine/ym3802.h4
-rw-r--r--src/devices/machine/z80scc.cpp16
-rw-r--r--src/devices/machine/z80scc.h42
-rw-r--r--src/mame/audio/gottlieb.cpp2
-rw-r--r--src/mame/drivers/amstr_pc.cpp8
-rw-r--r--src/mame/drivers/argo.cpp4
-rw-r--r--src/mame/drivers/asst128.cpp6
-rw-r--r--src/mame/drivers/ccastles.cpp6
-rw-r--r--src/mame/drivers/compc.cpp4
-rw-r--r--src/mame/drivers/cv1k.cpp12
-rw-r--r--src/mame/drivers/cvs.cpp12
-rw-r--r--src/mame/drivers/docastle.cpp8
-rw-r--r--src/mame/drivers/eispc.cpp8
-rw-r--r--src/mame/drivers/europc.cpp2
-rw-r--r--src/mame/drivers/firefox.cpp4
-rw-r--r--src/mame/drivers/fmtowns.cpp4
-rw-r--r--src/mame/drivers/gumbo.cpp2
-rw-r--r--src/mame/drivers/hh_tms1k.cpp8
-rw-r--r--src/mame/drivers/ibmpcjr.cpp2
-rw-r--r--src/mame/drivers/indy_indigo2.cpp2
-rw-r--r--src/mame/drivers/jedi.cpp4
-rw-r--r--src/mame/drivers/k28.cpp2
-rw-r--r--src/mame/drivers/kron.cpp2
-rw-r--r--src/mame/drivers/kyocera.cpp2
-rw-r--r--src/mame/drivers/malzak.cpp2
-rw-r--r--src/mame/drivers/mcb216.cpp2
-rw-r--r--src/mame/drivers/mz2500.cpp4
-rw-r--r--src/mame/drivers/nforcepc.cpp4
-rw-r--r--src/mame/drivers/pcw16.cpp4
-rw-r--r--src/mame/drivers/plus4.cpp12
-rw-r--r--src/mame/drivers/punchout.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp2
-rw-r--r--src/mame/drivers/tandy2k.cpp2
-rw-r--r--src/mame/drivers/wangpc.cpp4
-rw-r--r--src/mame/drivers/wicat.cpp6
-rw-r--r--src/mame/machine/balsente.cpp4
-rw-r--r--src/mame/machine/msx.cpp4
-rw-r--r--src/mame/machine/z80ne.cpp2
-rw-r--r--src/mame/video/docastle.cpp6
-rw-r--r--src/mame/video/zac2650.cpp2
170 files changed, 1013 insertions, 1025 deletions
diff --git a/src/devices/bus/dmv/k012.cpp b/src/devices/bus/dmv/k012.cpp
index 71c4f4aa402..21f5f4e5e8d 100644
--- a/src/devices/bus/dmv/k012.cpp
+++ b/src/devices/bus/dmv/k012.cpp
@@ -106,11 +106,11 @@ void dmv_k012_device::device_add_mconfig(machine_config &config)
void dmv_k012_device::io_read(int ifsel, offs_t offset, uint8_t &data)
{
if ((1 << ifsel) == m_jumpers->read() && !(offset & 0x08))
- data = m_hdc->read(machine().dummy_space(), offset);
+ data = m_hdc->read(offset);
}
void dmv_k012_device::io_write(int ifsel, offs_t offset, uint8_t data)
{
if ((1 << ifsel) == m_jumpers->read() && !(offset & 0x08))
- m_hdc->write(machine().dummy_space(), offset, data);
+ m_hdc->write(offset, data);
}
diff --git a/src/devices/bus/isa/bblue2.cpp b/src/devices/bus/isa/bblue2.cpp
index 121ec92e390..a85bd17ab0d 100644
--- a/src/devices/bus/isa/bblue2.cpp
+++ b/src/devices/bus/isa/bblue2.cpp
@@ -215,10 +215,10 @@ void isa8_babyblue2_device::device_reset()
if(!m_devices_installed) // will need a hard reset to put DIP switch and jumper changes into effect
{
// map Z80 LPT port based on jumper setting
- m_z80->space(AS_IO).install_readwrite_handler(z80lptloc, z80lptloc+7, read8_delegate(m_parallel, FUNC(pc_lpt_device::read)), write8_delegate(m_parallel, FUNC(pc_lpt_device::write)));
+ m_z80->space(AS_IO).install_readwrite_handler(z80lptloc, z80lptloc+7, read8sm_delegate(m_parallel, FUNC(pc_lpt_device::read)), write8sm_delegate(m_parallel, FUNC(pc_lpt_device::write)));
m_isa->install_device(ioloc, ioloc+1, read8_delegate(*this, FUNC(isa8_babyblue2_device::z80_control_r)), write8_delegate(*this, FUNC(isa8_babyblue2_device::z80_control_w)));
- m_isa->install_device(lptloc, lptloc+7, read8_delegate(m_parallel, FUNC(pc_lpt_device::read)), write8_delegate(m_parallel, FUNC(pc_lpt_device::write)));
+ m_isa->install_device(lptloc, lptloc+7, read8sm_delegate(m_parallel, FUNC(pc_lpt_device::read)), write8sm_delegate(m_parallel, FUNC(pc_lpt_device::write)));
m_isa->install_device(0x3f8, 0x03ff, read8sm_delegate(m_serial1, FUNC(ins8250_device::ins8250_r)), write8sm_delegate(m_serial1, FUNC(ins8250_device::ins8250_w)));
m_isa->install_device(0x2f8, 0x02ff, read8sm_delegate(m_serial2, FUNC(ins8250_device::ins8250_r)), write8sm_delegate(m_serial2, FUNC(ins8250_device::ins8250_w)));
// TODO: RTC
diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp
index 5c4baf5aaeb..268ff2c9caf 100644
--- a/src/devices/bus/isa/lpt.cpp
+++ b/src/devices/bus/isa/lpt.cpp
@@ -47,9 +47,9 @@ void isa8_lpt_device::device_reset()
m_is_primary = (ioport("DSW")->read() & 1) ? false : true;
pc_lpt_device &lpt(*subdevice<pc_lpt_device>("lpt"));
if (m_is_primary)
- m_isa->install_device(0x0378, 0x037b, read8_delegate(lpt, FUNC(pc_lpt_device::read)), write8_delegate(lpt, FUNC(pc_lpt_device::write)));
+ m_isa->install_device(0x0378, 0x037b, read8sm_delegate(lpt, FUNC(pc_lpt_device::read)), write8sm_delegate(lpt, FUNC(pc_lpt_device::write)));
else
- m_isa->install_device(0x0278, 0x027b, read8_delegate(lpt, FUNC(pc_lpt_device::read)), write8_delegate(lpt, FUNC(pc_lpt_device::write)));
+ m_isa->install_device(0x0278, 0x027b, read8sm_delegate(lpt, FUNC(pc_lpt_device::read)), write8sm_delegate(lpt, FUNC(pc_lpt_device::write)));
}
WRITE_LINE_MEMBER(isa8_lpt_device::pc_cpu_line)
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index 4e0122d83fd..0408d52becf 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -482,7 +482,7 @@ WRITE8_MEMBER( isa8_mda_device::io_write )
mode_control_w(space, offset, data);
break;
case 0x0c: case 0x0d: case 0x0e:
- m_lpt->write(space, offset - 0x0c, data);
+ m_lpt->write(offset - 0x0c, data);
break;
}
}
@@ -503,7 +503,7 @@ READ8_MEMBER( isa8_mda_device::io_read )
break;
/* LPT ports */
case 0x0c: case 0x0d: case 0x0e:
- data = m_lpt->read(space, offset - 0x0c);
+ data = m_lpt->read(offset - 0x0c);
break;
}
return data;
@@ -701,7 +701,7 @@ WRITE8_MEMBER( isa8_hercules_device::io_write )
mode_control_w(space, offset, data);
break;
case 0x0c: case 0x0d: case 0x0e:
- m_lpt->write(space, offset - 12, data);
+ m_lpt->write(offset - 12, data);
break;
case 0x0f:
m_configuration_switch = data;
@@ -746,7 +746,7 @@ READ8_MEMBER( isa8_hercules_device::io_read )
break;
/* LPT ports */
case 0xc: case 0xd: case 0xe:
- data = m_lpt->read(space, offset - 0x0c);
+ data = m_lpt->read(offset - 0x0c);
break;
}
return data;
diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp
index b7a49506094..7f6a28b87b4 100644
--- a/src/devices/bus/isa/mpu401.cpp
+++ b/src/devices/bus/isa/mpu401.cpp
@@ -77,7 +77,7 @@ void isa8_mpu401_device::device_start()
{
set_isa_device();
- m_isa->install_device(0x330, 0x0331, read8_delegate(*m_mpu401, FUNC(mpu401_device::mpu_r)), write8_delegate(*m_mpu401, FUNC(mpu401_device::mpu_w)));
+ m_isa->install_device(0x330, 0x0331, read8sm_delegate(*m_mpu401, FUNC(mpu401_device::mpu_r)), write8sm_delegate(*m_mpu401, FUNC(mpu401_device::mpu_w)));
}
//-------------------------------------------------
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index 8670610ea40..3448589b9a5 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -200,7 +200,7 @@ void wdxt_gen_device::device_start()
{
set_isa_device();
m_isa->install_rom(this, 0xc8000, 0xc9fff, "hdc", "hdc");
- m_isa->install_device(0x0320, 0x0323, read8_delegate(*m_host, FUNC(wd11c00_17_device::io_r)), write8_delegate(*m_host, FUNC(wd11c00_17_device::io_w)));
+ m_isa->install_device(0x0320, 0x0323, read8sm_delegate(*m_host, FUNC(wd11c00_17_device::io_r)), write8sm_delegate(*m_host, FUNC(wd11c00_17_device::io_w)));
m_isa->set_dma_channel(3, this, false);
}
diff --git a/src/devices/bus/x68k/x68k_midi.cpp b/src/devices/bus/x68k/x68k_midi.cpp
index e4e639fff04..34243f758a2 100644
--- a/src/devices/bus/x68k/x68k_midi.cpp
+++ b/src/devices/bus/x68k/x68k_midi.cpp
@@ -49,12 +49,12 @@ void x68k_midi_device::device_reset()
READ8_MEMBER(x68k_midi_device::x68k_midi_reg_r)
{
- return m_midi->read(space, offset);
+ return m_midi->read(offset);
}
WRITE8_MEMBER(x68k_midi_device::x68k_midi_reg_w)
{
- m_midi->write(space, offset, data);
+ m_midi->write(offset, data);
}
void x68k_midi_device::irq_w(int state)
diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp
index 67dffd2e33e..22a35a17297 100644
--- a/src/devices/bus/x68k/x68k_scsiext.cpp
+++ b/src/devices/bus/x68k/x68k_scsiext.cpp
@@ -96,10 +96,10 @@ void x68k_scsiext_device::drq_w(int state)
READ8_MEMBER(x68k_scsiext_device::register_r)
{
- return m_spc->mb89352_r(space,offset);
+ return m_spc->mb89352_r(offset);
}
WRITE8_MEMBER(x68k_scsiext_device::register_w)
{
- m_spc->mb89352_w(space,offset,data);
+ m_spc->mb89352_w(offset,data);
}
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index 7984b1d0294..36cf7f776c0 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -134,7 +134,7 @@ void kbdc8042_device::at_8042_check_keyboard()
{
if (!m_keyboard.received && !m_mouse.received)
{
- int data = m_keyboard_dev->read(machine().dummy_space(), 0);
+ int data = m_keyboard_dev->read();
if (data)
at_8042_receive(data);
}
@@ -320,7 +320,7 @@ WRITE8_MEMBER(kbdc8042_device::data_w)
case 0:
m_data = data;
m_sending=1;
- m_keyboard_dev->write(space, 0, data);
+ m_keyboard_dev->write(data);
break;
case 1:
diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp
index 002f9458d8e..4616a513168 100644
--- a/src/devices/machine/fdc37c93x.cpp
+++ b/src/devices/machine/fdc37c93x.cpp
@@ -553,12 +553,12 @@ void fdc37c93x_device::map_lpt(address_map &map)
READ8_MEMBER(fdc37c93x_device::lpt_read)
{
- return pc_lpt_lptdev->read(space, offset, mem_mask);
+ return pc_lpt_lptdev->read(offset);
}
WRITE8_MEMBER(fdc37c93x_device::lpt_write)
{
- pc_lpt_lptdev->write(space, offset, data, mem_mask);
+ pc_lpt_lptdev->write(offset, data);
}
void fdc37c93x_device::map_lpt_addresses()
diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp
index 0da686e7bf0..3b8393b9a11 100644
--- a/src/devices/machine/hd64610.cpp
+++ b/src/devices/machine/hd64610.cpp
@@ -276,7 +276,7 @@ void hd64610_device::nvram_write(emu_file &file)
// hardware start/stop
//-------------------------------------------------
-WRITE_LINE_MEMBER( hd64610_device::h_w )
+void hd64610_device::h_w(int state)
{
m_hline_state = state;
}
@@ -286,7 +286,7 @@ WRITE_LINE_MEMBER( hd64610_device::h_w )
// read -
//-------------------------------------------------
-READ8_MEMBER( hd64610_device::read )
+uint8_t hd64610_device::read(offs_t offset)
{
uint8_t data = m_regs[offset & 0x0f];
@@ -300,7 +300,7 @@ READ8_MEMBER( hd64610_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( hd64610_device::write )
+void hd64610_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x0f)
{
diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h
index 9e5e0ae18d8..517ff11284f 100644
--- a/src/devices/machine/hd64610.h
+++ b/src/devices/machine/hd64610.h
@@ -39,11 +39,11 @@ public:
auto irq() { return m_out_irq_cb.bind(); }
auto clkout() { return m_out_1hz_cb.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
// hardware start/stop line
- DECLARE_WRITE_LINE_MEMBER( h_w );
+ void h_w(int state);
protected:
// device-level overrides
diff --git a/src/devices/machine/i7220.cpp b/src/devices/machine/i7220.cpp
index 0e86dc081bb..4050cd5aff8 100644
--- a/src/devices/machine/i7220.cpp
+++ b/src/devices/machine/i7220.cpp
@@ -575,7 +575,7 @@ void i7220_device::write_data_continue(bubble_info &bi)
// read -
//-------------------------------------------------
-READ8_MEMBER(i7220_device::read)
+uint8_t i7220_device::read(offs_t offset)
{
uint8_t data = 0;
@@ -643,7 +643,7 @@ READ8_MEMBER(i7220_device::read)
// write -
//-------------------------------------------------
-WRITE8_MEMBER( i7220_device::write )
+void i7220_device::write(offs_t offset, uint8_t data)
{
static const char *commands[] = {
"Write Bootloop Register Masked",
diff --git a/src/devices/machine/i7220.h b/src/devices/machine/i7220.h
index d4d24a3e049..a65eecbf119 100644
--- a/src/devices/machine/i7220.h
+++ b/src/devices/machine/i7220.h
@@ -61,8 +61,8 @@ public:
virtual bool is_reset_on_load() const noexcept override { return false; }
virtual const char *file_extensions() const noexcept override { return "bubble"; }
- 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/i8214.cpp b/src/devices/machine/i8214.cpp
index eccf8d496bc..4eb767d9396 100644
--- a/src/devices/machine/i8214.cpp
+++ b/src/devices/machine/i8214.cpp
@@ -159,7 +159,7 @@ uint8_t i8214_device::a_r()
// 8080-compatible interrupt vector
//-------------------------------------------------
-READ8_MEMBER(i8214_device::vector_r)
+uint8_t i8214_device::vector_r()
{
return 0xc7 | (m_a << 3);
}
@@ -234,7 +234,7 @@ void i8214_device::r_all_w(uint8_t state)
// sgs_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8214_device::sgs_w )
+void i8214_device::sgs_w(int state)
{
LOG("%s: sgs_w: %d\n", machine().describe_context(), state);
@@ -248,7 +248,7 @@ WRITE_LINE_MEMBER( i8214_device::sgs_w )
// etlg_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8214_device::etlg_w )
+void i8214_device::etlg_w(int state)
{
LOG("%s: etlg_w: %d\n", machine().describe_context(), state);
@@ -262,7 +262,7 @@ WRITE_LINE_MEMBER( i8214_device::etlg_w )
// inte_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8214_device::inte_w )
+void i8214_device::inte_w(int state)
{
LOG("%s: inte_w: %d\n", machine().describe_context(), state);
diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h
index b1246d0bec9..9b567660990 100644
--- a/src/devices/machine/i8214.h
+++ b/src/devices/machine/i8214.h
@@ -35,12 +35,12 @@ public:
auto int_wr_callback() { return m_write_int.bind(); }
auto enlg_wr_callback() { return m_write_enlg.bind(); }
- DECLARE_WRITE_LINE_MEMBER( sgs_w );
- DECLARE_WRITE_LINE_MEMBER( etlg_w );
- DECLARE_WRITE_LINE_MEMBER( inte_w );
+ void sgs_w(int state);
+ void etlg_w(int state);
+ void inte_w(int state);
uint8_t a_r();
- DECLARE_READ8_MEMBER(vector_r);
+ uint8_t vector_r();
void b_w(uint8_t data);
void b_sgs_w(uint8_t data);
void r_w(int line, int state);
diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp
index 1b32ad40c6a..663c5851abf 100644
--- a/src/devices/machine/i8257.cpp
+++ b/src/devices/machine/i8257.cpp
@@ -471,7 +471,7 @@ void i8257_device::execute_run()
// read -
//-------------------------------------------------
-READ8_MEMBER( i8257_device::read )
+uint8_t i8257_device::read(offs_t offset)
{
LOG("%s\n", FUNCNAME);
uint8_t data = 0;
@@ -529,7 +529,7 @@ READ8_MEMBER( i8257_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( i8257_device::write )
+void i8257_device::write(offs_t offset, uint8_t data)
{
LOG("%s \n", FUNCNAME);
if (!BIT(offset, 3))
@@ -600,7 +600,7 @@ WRITE8_MEMBER( i8257_device::write )
// hlda_w - hold acknowledge
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8257_device::hlda_w )
+void i8257_device::hlda_w(int state)
{
LOG("I8257 Hold Acknowledge: %u\n", state);
@@ -613,7 +613,7 @@ WRITE_LINE_MEMBER( i8257_device::hlda_w )
// ready_w - ready
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8257_device::ready_w )
+void i8257_device::ready_w(int state)
{
LOG("I8257 Ready: %u\n", state);
@@ -625,7 +625,7 @@ WRITE_LINE_MEMBER( i8257_device::ready_w )
// dreq0_w - DMA request for channel 0
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8257_device::dreq0_w )
+void i8257_device::dreq0_w(int state)
{
LOG("%s\n", FUNCNAME);
dma_request(0, state);
@@ -636,7 +636,7 @@ WRITE_LINE_MEMBER( i8257_device::dreq0_w )
// dreq0_w - DMA request for channel 1
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8257_device::dreq1_w )
+void i8257_device::dreq1_w(int state)
{
LOG("%s\n", FUNCNAME);
dma_request(1, state);
@@ -647,7 +647,7 @@ WRITE_LINE_MEMBER( i8257_device::dreq1_w )
// dreq1_w - DMA request for channel 2
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8257_device::dreq2_w )
+void i8257_device::dreq2_w(int state)
{
LOG("%s\n", FUNCNAME);
dma_request(2, state);
@@ -658,7 +658,7 @@ WRITE_LINE_MEMBER( i8257_device::dreq2_w )
// dreq3_w - DMA request for channel 3
//-------------------------------------------------
-WRITE_LINE_MEMBER( i8257_device::dreq3_w )
+void i8257_device::dreq3_w(int state)
{
LOG("%s\n", FUNCNAME);
dma_request(3, state);
diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h
index 964f1058f44..df1f74a4858 100644
--- a/src/devices/machine/i8257.h
+++ b/src/devices/machine/i8257.h
@@ -40,16 +40,16 @@ public:
// construction/destruction
i8257_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);
- DECLARE_WRITE_LINE_MEMBER( hlda_w );
- DECLARE_WRITE_LINE_MEMBER( ready_w );
+ void hlda_w(int state);
+ void ready_w(int state);
- DECLARE_WRITE_LINE_MEMBER( dreq0_w );
- DECLARE_WRITE_LINE_MEMBER( dreq1_w );
- DECLARE_WRITE_LINE_MEMBER( dreq2_w );
- DECLARE_WRITE_LINE_MEMBER( dreq3_w );
+ void dreq0_w(int state);
+ void dreq1_w(int state);
+ void dreq2_w(int state);
+ void dreq3_w(int state);
auto out_hrq_cb() { return m_out_hrq_cb.bind(); }
auto out_tc_cb() { return m_out_tc_cb.bind(); }
diff --git a/src/devices/machine/i8291a.cpp b/src/devices/machine/i8291a.cpp
index f676617e581..7c9c0296a05 100644
--- a/src/devices/machine/i8291a.cpp
+++ b/src/devices/machine/i8291a.cpp
@@ -155,7 +155,7 @@ void i8291a_device::device_start()
save_item(NAME(m_dt_state));
}
-READ8_MEMBER(i8291a_device::din_r)
+uint8_t i8291a_device::din_r()
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, m_din);
if (!machine().side_effects_disabled()) {
@@ -201,7 +201,7 @@ void i8291a_device::update_int()
}
}
-READ8_MEMBER(i8291a_device::ints1_r)
+uint8_t i8291a_device::ints1_r()
{
uint8_t ret = m_ints1;
@@ -213,7 +213,7 @@ READ8_MEMBER(i8291a_device::ints1_r)
return ret;
}
-READ8_MEMBER(i8291a_device::ints2_r)
+uint8_t i8291a_device::ints2_r()
{
uint8_t ret = m_ints2;
@@ -225,13 +225,13 @@ READ8_MEMBER(i8291a_device::ints2_r)
return ret;
}
-READ8_MEMBER(i8291a_device::spoll_stat_r)
+uint8_t i8291a_device::spoll_stat_r()
{
LOGMASKED(LOG_REG, "%s\n", __FUNCTION__);
return 0;
}
-READ8_MEMBER(i8291a_device::addr_stat_r)
+uint8_t i8291a_device::addr_stat_r()
{
if (!(m_address_status & 0xfe))
m_address_status = 0;
@@ -240,25 +240,25 @@ READ8_MEMBER(i8291a_device::addr_stat_r)
return m_address_status;
}
-READ8_MEMBER(i8291a_device::cpt_r)
+uint8_t i8291a_device::cpt_r()
{
LOGMASKED(LOG_REG, "%s\n", __FUNCTION__);
return m_cpt;
}
-READ8_MEMBER(i8291a_device::addr0_r)
+uint8_t i8291a_device::addr0_r()
{
//LOGMASKED(LOG_REG, "%s = %02X\n", __FUNCTION__, m_address0);
return m_address0;
}
-READ8_MEMBER(i8291a_device::addr1_r)
+uint8_t i8291a_device::addr1_r()
{
LOGMASKED(LOG_REG, "%s = %02X\n", __FUNCTION__, m_address1);
return m_address1;
}
-WRITE8_MEMBER(i8291a_device::dout_w)
+void i8291a_device::dout_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
if (m_nba)
@@ -268,35 +268,35 @@ WRITE8_MEMBER(i8291a_device::dout_w)
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::ie1_w)
+void i8291a_device::ie1_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
m_ie1 = data;
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::ie2_w)
+void i8291a_device::ie2_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
m_ie2 = data;
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::spoll_mode_w)
+void i8291a_device::spoll_mode_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
m_spoll_mode = data;
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::addr_mode_w)
+void i8291a_device::addr_mode_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
m_address_mode = data & 3;
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::aux_mode_w)
+void i8291a_device::aux_mode_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
switch (data >> 5) {
@@ -401,7 +401,7 @@ WRITE8_MEMBER(i8291a_device::aux_mode_w)
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::addr01_w)
+void i8291a_device::addr01_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
if (data & REG_ADDRESS01_ARS)
@@ -411,56 +411,56 @@ WRITE8_MEMBER(i8291a_device::addr01_w)
run_fsm();
}
-WRITE8_MEMBER(i8291a_device::eos_w)
+void i8291a_device::eos_w(uint8_t data)
{
LOGMASKED(LOG_REG, "%s: %02X\n", __FUNCTION__, data);
m_eos = data;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::nrfd_w)
+void i8291a_device::nrfd_w(int state)
{
m_nrfd = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::ndac_w)
+void i8291a_device::ndac_w(int state)
{
m_ndac = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::dav_w)
+void i8291a_device::dav_w(int state)
{
m_dav = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::eoi_w)
+void i8291a_device::eoi_w(int state)
{
m_eoi = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::srq_w)
+void i8291a_device::srq_w(int state)
{
m_srq = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::ifc_w)
+void i8291a_device::ifc_w(int state)
{
m_ifc = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::atn_w)
+void i8291a_device::atn_w(int state)
{
m_atn = !state;
run_fsm();
}
-WRITE_LINE_MEMBER(i8291a_device::ren_w)
+void i8291a_device::ren_w(int state)
{
m_ren = !state;
run_fsm();
diff --git a/src/devices/machine/i8291a.h b/src/devices/machine/i8291a.h
index 566ae4779b7..2d048d806aa 100644
--- a/src/devices/machine/i8291a.h
+++ b/src/devices/machine/i8291a.h
@@ -31,39 +31,39 @@ public:
auto dio_read() { return m_dio_read_func.bind(); }
// Signal inputs
- DECLARE_WRITE_LINE_MEMBER(reset_w);
- DECLARE_WRITE_LINE_MEMBER(dack_w);
+ void reset_w(int state);
+ void dack_w(int state);
// GPIB port
- DECLARE_WRITE_LINE_MEMBER(eoi_w);
- DECLARE_WRITE_LINE_MEMBER(dav_w);
- DECLARE_WRITE_LINE_MEMBER(nrfd_w);
- DECLARE_WRITE_LINE_MEMBER(ndac_w);
- DECLARE_WRITE_LINE_MEMBER(ifc_w);
- DECLARE_WRITE_LINE_MEMBER(srq_w);
- DECLARE_WRITE_LINE_MEMBER(atn_w);
- DECLARE_WRITE_LINE_MEMBER(ren_w);
- DECLARE_WRITE8_MEMBER(dio_w);
+ void eoi_w(int state);
+ void dav_w(int state);
+ void nrfd_w(int state);
+ void ndac_w(int state);
+ void ifc_w(int state);
+ void srq_w(int state);
+ void atn_w(int state);
+ void ren_w(int state);
+ void dio_w(uint8_t data); // declared but not defined?
// register r/w functions
- DECLARE_WRITE8_MEMBER(dout_w);
- DECLARE_WRITE8_MEMBER(ie1_w);
- DECLARE_WRITE8_MEMBER(ie2_w);
- DECLARE_WRITE8_MEMBER(spoll_mode_w);
- DECLARE_WRITE8_MEMBER(addr_mode_w);
- DECLARE_WRITE8_MEMBER(aux_mode_w);
- DECLARE_WRITE8_MEMBER(addr01_w);
- DECLARE_WRITE8_MEMBER(eos_w);
-
- DECLARE_READ8_MEMBER(din_r);
- DECLARE_READ8_MEMBER(ints1_r);
- DECLARE_READ8_MEMBER(ints2_r);
- DECLARE_READ8_MEMBER(spoll_stat_r);
- DECLARE_READ8_MEMBER(addr_stat_r);
- DECLARE_READ8_MEMBER(cpt_r);
- DECLARE_READ8_MEMBER(addr0_r);
- DECLARE_READ8_MEMBER(addr1_r);
+ void dout_w(uint8_t data);
+ void ie1_w(uint8_t data);
+ void ie2_w(uint8_t data);
+ void spoll_mode_w(uint8_t data);
+ void addr_mode_w(uint8_t data);
+ void aux_mode_w(uint8_t data);
+ void addr01_w(uint8_t data);
+ void eos_w(uint8_t data);
+
+ uint8_t din_r();
+ uint8_t ints1_r();
+ uint8_t ints2_r();
+ uint8_t spoll_stat_r();
+ uint8_t addr_stat_r();
+ uint8_t cpt_r();
+ uint8_t addr0_r();
+ uint8_t addr1_r();
void map(address_map &map);
private:
diff --git a/src/devices/machine/icm7170.cpp b/src/devices/machine/icm7170.cpp
index 5b57d380c2f..07057df3482 100644
--- a/src/devices/machine/icm7170.cpp
+++ b/src/devices/machine/icm7170.cpp
@@ -123,7 +123,7 @@ void icm7170_device::nvram_write(emu_file &file)
}
// non-inherited device functions
-READ8_MEMBER( icm7170_device::read )
+uint8_t icm7170_device::read(offs_t offset)
{
uint8_t data = m_regs[offset & 0x1f];
@@ -132,7 +132,7 @@ READ8_MEMBER( icm7170_device::read )
return data;
}
-WRITE8_MEMBER( icm7170_device::write )
+void icm7170_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x1f)
{
diff --git a/src/devices/machine/icm7170.h b/src/devices/machine/icm7170.h
index c7c6f77d12b..027e38c676b 100644
--- a/src/devices/machine/icm7170.h
+++ b/src/devices/machine/icm7170.h
@@ -54,8 +54,8 @@ public:
auto irq() { return m_out_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);
protected:
// device-level overrides
diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp
index a464560870c..6a52867bdbd 100644
--- a/src/devices/machine/im6402.cpp
+++ b/src/devices/machine/im6402.cpp
@@ -212,7 +212,7 @@ void im6402_device::rcv_complete()
// write - transmitter buffer register write
//-------------------------------------------------
-WRITE8_MEMBER( im6402_device::write )
+void im6402_device::write(uint8_t data)
{
LOG("IM6402 Transmit Buffer Register %02x\n", data);
@@ -238,7 +238,7 @@ WRITE8_MEMBER( im6402_device::write )
// rrc_w - receiver register clock
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::rrc_w )
+void im6402_device::rrc_w(int state)
{
if (state)
{
@@ -252,7 +252,7 @@ WRITE_LINE_MEMBER( im6402_device::rrc_w )
// trc_w - transmitter register clock
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::trc_w )
+void im6402_device::trc_w(int state)
{
if (state)
{
@@ -266,7 +266,7 @@ WRITE_LINE_MEMBER( im6402_device::trc_w )
// rrd_w - receiver register disable
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::rrd_w )
+void im6402_device::rrd_w(int state)
{
}
@@ -275,7 +275,7 @@ WRITE_LINE_MEMBER( im6402_device::rrd_w )
// sfd_w - status flags disable
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::sfd_w )
+void im6402_device::sfd_w(int state)
{
}
@@ -284,7 +284,7 @@ WRITE_LINE_MEMBER( im6402_device::sfd_w )
// drr_w - data received reset
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::drr_w )
+void im6402_device::drr_w(int state)
{
if (state)
{
@@ -297,7 +297,7 @@ WRITE_LINE_MEMBER( im6402_device::drr_w )
// mr_w - master reset
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::mr_w )
+void im6402_device::mr_w(int state)
{
if (state)
{
@@ -310,7 +310,7 @@ WRITE_LINE_MEMBER( im6402_device::mr_w )
// crl_w - control register load
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::crl_w )
+void im6402_device::crl_w(int state)
{
if (state)
{
@@ -336,7 +336,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
// pi_w - parity inhibit
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::pi_w )
+void im6402_device::pi_w(int state)
{
LOG("IM6402 Parity Inhibit %u\n", state);
@@ -348,7 +348,7 @@ WRITE_LINE_MEMBER( im6402_device::pi_w )
// sbs_w - stop bit select
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::sbs_w )
+void im6402_device::sbs_w(int state)
{
LOG("IM6402 Stop Bit Select %u\n", state);
@@ -360,7 +360,7 @@ WRITE_LINE_MEMBER( im6402_device::sbs_w )
// cls1_w - character length select 1
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::cls1_w )
+void im6402_device::cls1_w(int state)
{
LOG("IM6402 Character Length Select 1 %u\n", state);
@@ -372,7 +372,7 @@ WRITE_LINE_MEMBER( im6402_device::cls1_w )
// cls2_w - character length select 2
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::cls2_w )
+void im6402_device::cls2_w(int state)
{
LOG("IM6402 Character Length Select 2 %u\n", state);
@@ -384,14 +384,14 @@ WRITE_LINE_MEMBER( im6402_device::cls2_w )
// epe_w - even parity enable
//-------------------------------------------------
-WRITE_LINE_MEMBER( im6402_device::epe_w )
+void im6402_device::epe_w(int state)
{
LOG("IM6402 Even Parity Enable %u\n", state);
m_epe = state;
}
-WRITE_LINE_MEMBER(im6402_device::write_rri)
+void im6402_device::write_rri(int state)
{
// HACK derive clock from data line as wangpckb sends bytes instantly to make up for mcs51 serial implementation
receive_register_update_bit(state);
diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h
index 6729b4da984..d36853353c2 100644
--- a/src/devices/machine/im6402.h
+++ b/src/devices/machine/im6402.h
@@ -64,29 +64,29 @@ public:
auto tbre_callback() { return m_write_tbre.bind(); }
auto tre_callback() { return m_write_tre.bind(); }
- DECLARE_READ8_MEMBER( read ) { return m_rbr; }
- DECLARE_WRITE8_MEMBER( write );
-
- DECLARE_READ_LINE_MEMBER( dr_r ) { return m_dr; }
- DECLARE_READ_LINE_MEMBER( tbre_r ) { return m_tbre; }
- DECLARE_READ_LINE_MEMBER( tre_r ) { return m_tre; }
- DECLARE_READ_LINE_MEMBER( pe_r ) { return m_pe; }
- DECLARE_READ_LINE_MEMBER( fe_r ) { return m_fe; }
- DECLARE_READ_LINE_MEMBER( oe_r ) { return m_oe; }
-
- DECLARE_WRITE_LINE_MEMBER( write_rri ); // receiver register input
- DECLARE_WRITE_LINE_MEMBER( rrc_w );
- DECLARE_WRITE_LINE_MEMBER( trc_w );
- DECLARE_WRITE_LINE_MEMBER( rrd_w );
- DECLARE_WRITE_LINE_MEMBER( sfd_w );
- DECLARE_WRITE_LINE_MEMBER( drr_w );
- DECLARE_WRITE_LINE_MEMBER( mr_w );
- DECLARE_WRITE_LINE_MEMBER( crl_w );
- DECLARE_WRITE_LINE_MEMBER( pi_w );
- DECLARE_WRITE_LINE_MEMBER( sbs_w );
- DECLARE_WRITE_LINE_MEMBER( cls1_w );
- DECLARE_WRITE_LINE_MEMBER( cls2_w );
- DECLARE_WRITE_LINE_MEMBER( epe_w );
+ uint8_t read() { return m_rbr; }
+ void write(uint8_t data);
+
+ int dr_r() { return m_dr; }
+ int tbre_r() { return m_tbre; }
+ int tre_r() { return m_tre; }
+ int pe_r() { return m_pe; }
+ int fe_r() { return m_fe; }
+ int oe_r() { return m_oe; }
+
+ void write_rri(int state); // receiver register input
+ void rrc_w(int state);
+ void trc_w(int state);
+ void rrd_w(int state);
+ void sfd_w(int state);
+ void drr_w(int state);
+ void mr_w(int state);
+ void crl_w(int state);
+ void pi_w(int state);
+ void sbs_w(int state);
+ void cls1_w(int state);
+ void cls2_w(int state);
+ void epe_w(int state);
protected:
// device-level overrides
diff --git a/src/devices/machine/iopcdvd.cpp b/src/devices/machine/iopcdvd.cpp
index a1e32e48a1c..a2938c4be35 100644
--- a/src/devices/machine/iopcdvd.cpp
+++ b/src/devices/machine/iopcdvd.cpp
@@ -55,7 +55,7 @@ void iop_cdvd_device::device_reset()
m_channel[1].m_status |= CDVD_STATUS_IDLE;
}
-READ8_MEMBER(iop_cdvd_device::read)
+uint8_t iop_cdvd_device::read(offs_t offset)
{
uint8_t ret = 0;
switch (offset)
@@ -117,7 +117,7 @@ uint8_t iop_cdvd_device::data_fifo_pop()
return ret;
}
-WRITE8_MEMBER(iop_cdvd_device::write)
+void iop_cdvd_device::write(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/machine/iopcdvd.h b/src/devices/machine/iopcdvd.h
index e5d95f0322f..194933eb3d9 100644
--- a/src/devices/machine/iopcdvd.h
+++ b/src/devices/machine/iopcdvd.h
@@ -29,8 +29,8 @@ public:
iop_cdvd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~iop_cdvd_device() override;
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp
index 050a7faea90..6972d0f5c96 100644
--- a/src/devices/machine/k053252.cpp
+++ b/src/devices/machine/k053252.cpp
@@ -135,7 +135,7 @@ void k053252_device::reset_internal_state()
DEVICE HANDLERS
*****************************************************************************/
-READ8_MEMBER( k053252_device::read )
+uint8_t k053252_device::read(offs_t offset)
{
//TODO: debugger_access()
switch(offset)
@@ -188,7 +188,7 @@ void k053252_device::res_change()
}
}
-WRITE8_MEMBER( k053252_device::write )
+void k053252_device::write(offs_t offset, uint8_t data)
{
m_regs[offset] = data;
diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h
index b7e41ca06f4..fec683df1da 100644
--- a/src/devices/machine/k053252.h
+++ b/src/devices/machine/k053252.h
@@ -21,8 +21,8 @@ public:
auto int_time() { return m_int_time_cb.bind(); }
void set_offsets(int offsx, int offsy) { m_offsx = offsx; m_offsy = offsy; }
- DECLARE_READ8_MEMBER( read ); // CCU registers
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset); // CCU registers
+ void write(offs_t offset, uint8_t data);
void res_change();
diff --git a/src/devices/machine/k054321.cpp b/src/devices/machine/k054321.cpp
index 2c56cd7827d..e5621f4f789 100644
--- a/src/devices/machine/k054321.cpp
+++ b/src/devices/machine/k054321.cpp
@@ -91,13 +91,13 @@ void k054321_device::device_add_mconfig(machine_config &config)
GENERIC_LATCH_8(config, m_soundlatch[i]);
}
-WRITE8_MEMBER(k054321_device::volume_reset_w)
+void k054321_device::volume_reset_w(u8 data)
{
m_volume = 0;
propagate_volume();
}
-WRITE8_MEMBER(k054321_device::volume_up_w)
+void k054321_device::volume_up_w(u8 data)
{
// assume that max volume is 64
if (data && m_volume < 64)
@@ -107,18 +107,18 @@ WRITE8_MEMBER(k054321_device::volume_up_w)
}
}
-READ8_MEMBER(k054321_device::busy_r)
+u8 k054321_device::busy_r()
{
return 0; // bit0 = 1 means busy
}
-WRITE8_MEMBER(k054321_device::active_w)
+void k054321_device::active_w(u8 data)
{
m_active = data;
propagate_volume();
}
-WRITE8_MEMBER(k054321_device::dummy_w)
+void k054321_device::dummy_w(u8 data)
{
if(data != 0x4a)
logerror("unexpected dummy_w %02x\n", data);
diff --git a/src/devices/machine/k054321.h b/src/devices/machine/k054321.h
index 92d0874dc54..f5d9b65ea25 100644
--- a/src/devices/machine/k054321.h
+++ b/src/devices/machine/k054321.h
@@ -41,12 +41,12 @@ private:
void propagate_volume();
- DECLARE_WRITE8_MEMBER(volume_reset_w);
- DECLARE_WRITE8_MEMBER(volume_up_w);
- DECLARE_WRITE8_MEMBER(active_w);
+ void volume_reset_w(u8 data);
+ void volume_up_w(u8 data);
+ void active_w(u8 data);
- DECLARE_READ8_MEMBER(busy_r);
- DECLARE_WRITE8_MEMBER(dummy_w);
+ u8 busy_r();
+ void dummy_w(u8 data);
};
DECLARE_DEVICE_TYPE(K054321, k054321_device)
diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp
index f3551a50043..7d59c4ea317 100644
--- a/src/devices/machine/kr2376.cpp
+++ b/src/devices/machine/kr2376.cpp
@@ -277,7 +277,7 @@ void kr2376_device::device_timer(emu_timer &timer, device_timer_id id, int param
/* Keyboard Data */
-READ8_MEMBER( kr2376_device::data_r )
+uint8_t kr2376_device::data_r()
{
if (m_pins[KR2376_DSII])
return m_data ^ 0xff;
diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h
index b685887c3e4..ab5a4c3f82c 100644
--- a/src/devices/machine/kr2376.h
+++ b/src/devices/machine/kr2376.h
@@ -60,7 +60,7 @@ public:
auto strobe() { return m_write_strobe.bind(); }
/* keyboard data */
- DECLARE_READ8_MEMBER( data_r );
+ uint8_t data_r();
/* Set an input pin */
void set_input_pin( input_pin_t pin, int data );
diff --git a/src/devices/machine/ldp1000.cpp b/src/devices/machine/ldp1000.cpp
index ace30f6fc9a..42f8cb796fe 100644
--- a/src/devices/machine/ldp1000.cpp
+++ b/src/devices/machine/ldp1000.cpp
@@ -116,7 +116,7 @@ int32_t sony_ldp1000_device::player_update(const vbi_metadata &vbi, int fieldnum
// READ/WRITE HANDLERS
//**************************************************************************
-READ8_MEMBER( sony_ldp1000_device::status_r )
+uint8_t sony_ldp1000_device::status_r()
{
uint8_t res = m_status;
m_status = stat_undef;
@@ -169,7 +169,7 @@ void sony_ldp1000_device::exec_enter_cmd()
// TODO: de-instantize this
-WRITE8_MEMBER( sony_ldp1000_device::command_w )
+void sony_ldp1000_device::command_w(uint8_t data)
{
printf("CMD %02x\n",data);
// 0x30 to 0x69 range causes an ACK, anything else is invalid
diff --git a/src/devices/machine/ldp1000.h b/src/devices/machine/ldp1000.h
index b3f420afb6e..2fd79a6a6fc 100644
--- a/src/devices/machine/ldp1000.h
+++ b/src/devices/machine/ldp1000.h
@@ -30,8 +30,8 @@ public:
sony_ldp1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// I/O operations TODO: both actually protected
- DECLARE_WRITE8_MEMBER( command_w );
- DECLARE_READ8_MEMBER( status_r );
+ void command_w(uint8_t data);
+ uint8_t status_r();
protected:
// device-level overrides
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 283ffdc0916..fc94159ff6a 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -484,7 +484,7 @@ void pioneer_pr8210_device::player_overlay(bitmap_yuy16 &bitmap)
// Pioneer PIA
//-------------------------------------------------
-READ8_MEMBER( pioneer_pr8210_device::i8049_pia_r )
+uint8_t pioneer_pr8210_device::i8049_pia_r(offs_t offset)
{
uint8_t result = 0xff;
switch (offset)
@@ -532,7 +532,7 @@ READ8_MEMBER( pioneer_pr8210_device::i8049_pia_r )
// Pioneer PIA
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_pr8210_device::i8049_pia_w )
+void pioneer_pr8210_device::i8049_pia_w(offs_t offset, uint8_t data)
{
uint8_t value;
switch (offset)
@@ -603,7 +603,7 @@ WRITE8_MEMBER( pioneer_pr8210_device::i8049_pia_w )
// input, which is enabled via the PIA above
//-------------------------------------------------
-READ8_MEMBER( pioneer_pr8210_device::i8049_bus_r )
+uint8_t pioneer_pr8210_device::i8049_bus_r()
{
/*
$80 = n/c
@@ -647,7 +647,7 @@ READ8_MEMBER( pioneer_pr8210_device::i8049_bus_r )
// port #1
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_pr8210_device::i8049_port1_w )
+void pioneer_pr8210_device::i8049_port1_w(uint8_t data)
{
/*
$80 = (out) SCAN C (F/R)
@@ -704,7 +704,7 @@ WRITE8_MEMBER( pioneer_pr8210_device::i8049_port1_w )
// port #2
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_pr8210_device::i8049_port2_w )
+void pioneer_pr8210_device::i8049_port2_w(uint8_t data)
{
/*
$80 = (out) /CS on PIA
@@ -738,7 +738,7 @@ WRITE8_MEMBER( pioneer_pr8210_device::i8049_port2_w )
// T0 input (connected to VSYNC)
//-------------------------------------------------
-READ_LINE_MEMBER( pioneer_pr8210_device::i8049_t0_r )
+int pioneer_pr8210_device::i8049_t0_r()
{
// returns VSYNC state
return !m_vsync;
@@ -750,7 +750,7 @@ READ_LINE_MEMBER( pioneer_pr8210_device::i8049_t0_r )
// T1 input (pulled high)
//-------------------------------------------------
-READ_LINE_MEMBER( pioneer_pr8210_device::i8049_t1_r )
+int pioneer_pr8210_device::i8049_t1_r()
{
return 1;
}
@@ -1041,7 +1041,7 @@ void simutrek_special_device::device_add_mconfig(machine_config &config)
// port #2
//-------------------------------------------------
-READ8_MEMBER( simutrek_special_device::i8748_port2_r )
+uint8_t simutrek_special_device::i8748_port2_r()
{
// bit $80 is the pr8210 video squelch
return (m_i8049_port1 & 0x20) ? 0x00 : 0x80;
@@ -1053,7 +1053,7 @@ READ8_MEMBER( simutrek_special_device::i8748_port2_r )
// port #2
//-------------------------------------------------
-WRITE8_MEMBER( simutrek_special_device::i8748_port2_w )
+void simutrek_special_device::i8748_port2_w(uint8_t data)
{
// update stat
uint8_t prev = m_i8748_port2;
@@ -1088,7 +1088,7 @@ WRITE8_MEMBER( simutrek_special_device::i8748_port2_w )
// i8748_data_r - handle external 8748 data reads
//-------------------------------------------------
-READ8_MEMBER( simutrek_special_device::i8748_data_r )
+uint8_t simutrek_special_device::i8748_data_r()
{
// acknowledge the read and clear the data ready flag
m_data_ready = false;
@@ -1101,7 +1101,7 @@ READ8_MEMBER( simutrek_special_device::i8748_data_r )
// T0 input
//-------------------------------------------------
-READ_LINE_MEMBER( simutrek_special_device::i8748_t0_r )
+int simutrek_special_device::i8748_t0_r()
{
// return 1 if data is waiting from main CPU
return m_data_ready;
diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h
index 02df0516361..217159e0cd1 100644
--- a/src/devices/machine/ldpr8210.h
+++ b/src/devices/machine/ldpr8210.h
@@ -75,13 +75,13 @@ protected:
virtual void update_audio_squelch() { set_audio_squelch((m_i8049_port1 & 0x40) || !(m_pia.portb & 0x01), (m_i8049_port1 & 0x40) || !(m_pia.portb & 0x02)); }
// internal read/write handlers
- DECLARE_READ8_MEMBER( i8049_pia_r );
- DECLARE_WRITE8_MEMBER( i8049_pia_w );
- DECLARE_READ8_MEMBER( i8049_bus_r );
- DECLARE_WRITE8_MEMBER( i8049_port1_w );
- DECLARE_WRITE8_MEMBER( i8049_port2_w );
- DECLARE_READ_LINE_MEMBER( i8049_t0_r );
- DECLARE_READ_LINE_MEMBER( i8049_t1_r );
+ uint8_t i8049_pia_r(offs_t offset);
+ void i8049_pia_w(offs_t offset, uint8_t data);
+ uint8_t i8049_bus_r();
+ void i8049_port1_w(uint8_t data);
+ void i8049_port2_w(uint8_t data);
+ int i8049_t0_r();
+ int i8049_t1_r();
// pioneer PIA subclass
class pioneer_pia
@@ -176,10 +176,10 @@ protected:
private:
// internal read/write handlers
- DECLARE_READ8_MEMBER( i8748_data_r );
- DECLARE_READ8_MEMBER( i8748_port2_r );
- DECLARE_WRITE8_MEMBER( i8748_port2_w );
- DECLARE_READ_LINE_MEMBER( i8748_t0_r );
+ uint8_t i8748_data_r();
+ uint8_t i8748_port2_r();
+ void i8748_port2_w(uint8_t data);
+ int i8748_t0_r();
void simutrek_portmap(address_map &map);
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index 4f7a0196e40..8d94650e9db 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -340,7 +340,7 @@ int32_t pioneer_ldv1000_device::player_update(const vbi_metadata &vbi, int field
// an interrupt in the daisy chain
//-------------------------------------------------
-WRITE_LINE_MEMBER( pioneer_ldv1000_device::ctc_interrupt )
+void pioneer_ldv1000_device::ctc_interrupt(int state)
{
m_z80_cpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
@@ -351,7 +351,7 @@ WRITE_LINE_MEMBER( pioneer_ldv1000_device::ctc_interrupt )
// the decoder/display chips
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_ldv1000_device::z80_decoder_display_port_w )
+void pioneer_ldv1000_device::z80_decoder_display_port_w(offs_t offset, uint8_t data)
{
/*
TX/RX = /A0 (A0=0 -> TX, A0=1 -> RX)
@@ -382,7 +382,7 @@ WRITE8_MEMBER( pioneer_ldv1000_device::z80_decoder_display_port_w )
// decoder/display chips
//-------------------------------------------------
-READ8_MEMBER( pioneer_ldv1000_device::z80_decoder_display_port_r )
+uint8_t pioneer_ldv1000_device::z80_decoder_display_port_r(offs_t offset)
{
// reads from offset 3 constitute actual reads from the display and decoder chips
uint8_t result = 0;
@@ -404,7 +404,7 @@ READ8_MEMBER( pioneer_ldv1000_device::z80_decoder_display_port_r )
// the controlling system
//-------------------------------------------------
-READ8_MEMBER( pioneer_ldv1000_device::z80_controller_r )
+uint8_t pioneer_ldv1000_device::z80_controller_r()
{
// note that this is a cheesy implementation; the real thing relies on exquisite timing
uint8_t result = m_command ^ 0xff;
@@ -417,7 +417,7 @@ READ8_MEMBER( pioneer_ldv1000_device::z80_controller_r )
// z80_controller_w - handle status latch writes
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_ldv1000_device::z80_controller_w )
+void pioneer_ldv1000_device::z80_controller_w(uint8_t data)
{
if (LOG_STATUS_CHANGES && data != m_status)
logerror("%s:CONTROLLER.W=%02X\n", machine().describe_context(), data);
@@ -430,7 +430,7 @@ WRITE8_MEMBER( pioneer_ldv1000_device::z80_controller_w )
// PPI #0
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_ldv1000_device::ppi0_porta_w )
+void pioneer_ldv1000_device::ppi0_porta_w(uint8_t data)
{
m_counter_start = data;
if (LOG_PORT_IO)
@@ -443,7 +443,7 @@ WRITE8_MEMBER( pioneer_ldv1000_device::ppi0_porta_w )
// PPI #0
//-------------------------------------------------
-READ8_MEMBER( pioneer_ldv1000_device::ppi0_portb_r )
+uint8_t pioneer_ldv1000_device::ppi0_portb_r()
{
return m_counter;
}
@@ -454,7 +454,7 @@ READ8_MEMBER( pioneer_ldv1000_device::ppi0_portb_r )
// PPI #0
//-------------------------------------------------
-READ8_MEMBER( pioneer_ldv1000_device::ppi0_portc_r )
+uint8_t pioneer_ldv1000_device::ppi0_portc_r()
{
/*
$10 = /VSYNC
@@ -477,7 +477,7 @@ READ8_MEMBER( pioneer_ldv1000_device::ppi0_portc_r )
// PPI #0
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_ldv1000_device::ppi0_portc_w )
+void pioneer_ldv1000_device::ppi0_portc_w(uint8_t data)
{
/*
$01 = preload on up/down counters
@@ -512,7 +512,7 @@ WRITE8_MEMBER( pioneer_ldv1000_device::ppi0_portc_w )
// PPI #1
//-------------------------------------------------
-READ8_MEMBER( pioneer_ldv1000_device::ppi1_porta_r )
+uint8_t pioneer_ldv1000_device::ppi1_porta_r()
{
/*
$01 = /FOCS LOCK
@@ -562,7 +562,7 @@ READ8_MEMBER( pioneer_ldv1000_device::ppi1_porta_r )
// PPI #1
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_ldv1000_device::ppi1_portb_w )
+void pioneer_ldv1000_device::ppi1_portb_w(uint8_t data)
{
/*
$01 = /FOCS ON
@@ -615,7 +615,7 @@ WRITE8_MEMBER( pioneer_ldv1000_device::ppi1_portb_w )
// PPI #1
//-------------------------------------------------
-WRITE8_MEMBER( pioneer_ldv1000_device::ppi1_portc_w )
+void pioneer_ldv1000_device::ppi1_portc_w(uint8_t data)
{
/*
$01 = AUD 1
diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h
index 883bca49a71..2d19b81c4e3 100644
--- a/src/devices/machine/ldv1000.h
+++ b/src/devices/machine/ldv1000.h
@@ -78,20 +78,20 @@ private:
bool laser_on() const { return (m_portb1 & 0x40); }
// internal read/write handlers
- DECLARE_WRITE8_MEMBER( z80_decoder_display_port_w );
- DECLARE_READ8_MEMBER( z80_decoder_display_port_r );
- DECLARE_READ8_MEMBER( z80_controller_r );
- DECLARE_WRITE8_MEMBER( z80_controller_w );
+ void z80_decoder_display_port_w(offs_t offset, uint8_t data);
+ uint8_t z80_decoder_display_port_r(offs_t offset);
+ uint8_t z80_controller_r();
+ void z80_controller_w(uint8_t data);
// internal read/write handlers
- DECLARE_WRITE_LINE_MEMBER( ctc_interrupt );
- DECLARE_WRITE8_MEMBER( ppi0_porta_w );
- DECLARE_READ8_MEMBER( ppi0_portb_r );
- DECLARE_READ8_MEMBER( ppi0_portc_r );
- DECLARE_WRITE8_MEMBER( ppi0_portc_w );
- DECLARE_READ8_MEMBER( ppi1_porta_r );
- DECLARE_WRITE8_MEMBER( ppi1_portb_w );
- DECLARE_WRITE8_MEMBER( ppi1_portc_w );
+ void ctc_interrupt(int state);
+ void ppi0_porta_w(uint8_t data);
+ uint8_t ppi0_portb_r();
+ uint8_t ppi0_portc_r();
+ void ppi0_portc_w(uint8_t data);
+ uint8_t ppi1_porta_r();
+ void ppi1_portb_w(uint8_t data);
+ void ppi1_portc_w(uint8_t data);
void ldv1000_map(address_map &map);
void ldv1000_portmap(address_map &map);
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index 4bcb74e1b6a..094447391cf 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -335,7 +335,7 @@ int32_t philips_22vp931_device::player_update(const vbi_metadata &vbi, int field
// and other bits
//-------------------------------------------------
-WRITE8_MEMBER( philips_22vp931_device::i8049_output0_w )
+void philips_22vp931_device::i8049_output0_w(uint8_t data)
{
/*
$80 = n/c
@@ -374,7 +374,7 @@ WRITE8_MEMBER( philips_22vp931_device::i8049_output0_w )
// i8049_output1_w - controls scanning behaviors
//-------------------------------------------------
-WRITE8_MEMBER( philips_22vp931_device::i8049_output1_w )
+void philips_22vp931_device::i8049_output1_w(uint8_t data)
{
/*
$80 = n/c
@@ -418,7 +418,7 @@ WRITE8_MEMBER( philips_22vp931_device::i8049_output1_w )
// i8049_lcd_w - vestigial LCD frame display
//-------------------------------------------------
-WRITE8_MEMBER( philips_22vp931_device::i8049_lcd_w )
+void philips_22vp931_device::i8049_lcd_w(uint8_t data)
{
/*
Frame number is written as 5 digits here; however, it is not actually
@@ -431,7 +431,7 @@ WRITE8_MEMBER( philips_22vp931_device::i8049_lcd_w )
// i8049_unknown_r - unknown input port
//-------------------------------------------------
-READ8_MEMBER( philips_22vp931_device::i8049_unknown_r )
+uint8_t philips_22vp931_device::i8049_unknown_r()
{
// only bit $80 is checked and its effects are minor
return 0x00;
@@ -443,7 +443,7 @@ READ8_MEMBER( philips_22vp931_device::i8049_unknown_r )
// controls
//-------------------------------------------------
-READ8_MEMBER( philips_22vp931_device::i8049_keypad_r )
+uint8_t philips_22vp931_device::i8049_keypad_r()
{
/*
From the code, this is apparently a vestigial keypad with basic controls:
@@ -465,7 +465,7 @@ READ8_MEMBER( philips_22vp931_device::i8049_keypad_r )
// DATIC circuit
//-------------------------------------------------
-READ8_MEMBER( philips_22vp931_device::i8049_datic_r )
+uint8_t philips_22vp931_device::i8049_datic_r()
{
return m_daticval;
}
@@ -476,7 +476,7 @@ READ8_MEMBER( philips_22vp931_device::i8049_datic_r )
// external controller wrote
//-------------------------------------------------
-READ8_MEMBER( philips_22vp931_device::i8049_from_controller_r )
+uint8_t philips_22vp931_device::i8049_from_controller_r()
{
// clear the pending flag and return the data
m_fromcontroller_pending = false;
@@ -489,7 +489,7 @@ READ8_MEMBER( philips_22vp931_device::i8049_from_controller_r )
// the external controller
//-------------------------------------------------
-WRITE8_MEMBER( philips_22vp931_device::i8049_to_controller_w )
+void philips_22vp931_device::i8049_to_controller_w(uint8_t data)
{
// set the pending flag and stash the data
m_tocontroller_pending = true;
@@ -508,7 +508,7 @@ WRITE8_MEMBER( philips_22vp931_device::i8049_to_controller_w )
// i8049_port1_r - read the 8048 I/O port 1
//-------------------------------------------------
-READ8_MEMBER( philips_22vp931_device::i8049_port1_r )
+uint8_t philips_22vp931_device::i8049_port1_r()
{
/*
$80 = P17 = (in) unsure
@@ -527,7 +527,7 @@ READ8_MEMBER( philips_22vp931_device::i8049_port1_r )
// i8049_port1_w - write the 8048 I/O port 1
//-------------------------------------------------
-WRITE8_MEMBER( philips_22vp931_device::i8049_port1_w )
+void philips_22vp931_device::i8049_port1_w(uint8_t data)
{
/*
$10 = P14 = (out) D104 -> /SPEED
@@ -598,7 +598,7 @@ WRITE8_MEMBER( philips_22vp931_device::i8049_port1_w )
// i8049_port2_r - read from the 8048 I/O port 2
//-------------------------------------------------
-READ8_MEMBER( philips_22vp931_device::i8049_port2_r )
+uint8_t philips_22vp931_device::i8049_port2_r()
{
/*
$80 = P27 = (in) set/reset latch; set by FOC LS, reset by IGR
@@ -619,7 +619,7 @@ READ8_MEMBER( philips_22vp931_device::i8049_port2_r )
// i8049_port2_w - write the 8048 I/O port 2
//-------------------------------------------------
-WRITE8_MEMBER( philips_22vp931_device::i8049_port2_w )
+void philips_22vp931_device::i8049_port2_w(uint8_t data)
{
/*
$40 = P26 = (out) cleared while data is sent back & forth; set afterwards
@@ -633,7 +633,7 @@ WRITE8_MEMBER( philips_22vp931_device::i8049_port2_w )
// connected to the DATIC's data strobe line
//-------------------------------------------------
-READ_LINE_MEMBER( philips_22vp931_device::i8049_t0_r )
+int philips_22vp931_device::i8049_t0_r()
{
return m_datastrobe;
}
@@ -645,7 +645,7 @@ READ_LINE_MEMBER( philips_22vp931_device::i8049_t0_r )
// to count the number of tracks advanced
//-------------------------------------------------
-READ_LINE_MEMBER( philips_22vp931_device::i8049_t1_r )
+int philips_22vp931_device::i8049_t1_r()
{
return m_trackstate;
}
diff --git a/src/devices/machine/ldvp931.h b/src/devices/machine/ldvp931.h
index fd69f52429e..c492f0cb699 100644
--- a/src/devices/machine/ldvp931.h
+++ b/src/devices/machine/ldvp931.h
@@ -78,20 +78,20 @@ protected:
private:
// internal read/write handlers
- DECLARE_WRITE8_MEMBER( i8049_output0_w );
- DECLARE_WRITE8_MEMBER( i8049_output1_w );
- DECLARE_WRITE8_MEMBER( i8049_lcd_w );
- DECLARE_READ8_MEMBER( i8049_unknown_r );
- DECLARE_READ8_MEMBER( i8049_keypad_r );
- DECLARE_READ8_MEMBER( i8049_datic_r );
- DECLARE_READ8_MEMBER( i8049_from_controller_r );
- DECLARE_WRITE8_MEMBER( i8049_to_controller_w );
- DECLARE_READ8_MEMBER( i8049_port1_r );
- DECLARE_WRITE8_MEMBER( i8049_port1_w );
- DECLARE_READ8_MEMBER( i8049_port2_r );
- DECLARE_WRITE8_MEMBER( i8049_port2_w );
- DECLARE_READ_LINE_MEMBER( i8049_t0_r );
- DECLARE_READ_LINE_MEMBER( i8049_t1_r );
+ void i8049_output0_w(uint8_t data);
+ void i8049_output1_w(uint8_t data);
+ void i8049_lcd_w(uint8_t data);
+ uint8_t i8049_unknown_r();
+ uint8_t i8049_keypad_r();
+ uint8_t i8049_datic_r();
+ uint8_t i8049_from_controller_r();
+ void i8049_to_controller_w(uint8_t data);
+ uint8_t i8049_port1_r();
+ void i8049_port1_w(uint8_t data);
+ uint8_t i8049_port2_r();
+ void i8049_port2_w(uint8_t data);
+ int i8049_t0_r();
+ int i8049_t1_r();
void vp931_portmap(address_map &map);
diff --git a/src/devices/machine/lh5810.cpp b/src/devices/machine/lh5810.cpp
index 8e427ab3bcf..054a532dff0 100644
--- a/src/devices/machine/lh5810.cpp
+++ b/src/devices/machine/lh5810.cpp
@@ -96,7 +96,7 @@ void lh5810_device::device_reset()
// data_r - data read
//-------------------------------------------------
-READ8_MEMBER( lh5810_device::data_r )
+uint8_t lh5810_device::data_r(offs_t offset)
{
switch (offset)
{
@@ -139,7 +139,7 @@ READ8_MEMBER( lh5810_device::data_r )
// data_w - data write
//-------------------------------------------------
-WRITE8_MEMBER( lh5810_device::data_w )
+void lh5810_device::data_w(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/machine/lh5810.h b/src/devices/machine/lh5810.h
index 75716274c38..a383d0047eb 100644
--- a/src/devices/machine/lh5810.h
+++ b/src/devices/machine/lh5810.h
@@ -24,8 +24,8 @@ public:
auto portc_w() { return m_portc_w_cb.bind(); }
auto out_int() { return m_out_int_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);
protected:
// device-level overrides
diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp
index 8c558c69b0d..e15f1893045 100644
--- a/src/devices/machine/lpc-pit.cpp
+++ b/src/devices/machine/lpc-pit.cpp
@@ -32,18 +32,18 @@ void lpc_pit_device::device_reset()
{
}
-READ8_MEMBER( lpc_pit_device::status_r)
+uint8_t lpc_pit_device::status_r(offs_t offset)
{
logerror("%s: status_r %d\n", tag(), offset);
return 0xff;
}
-WRITE8_MEMBER(lpc_pit_device::access_w)
+void lpc_pit_device::access_w(offs_t offset, uint8_t data)
{
logerror("%s: access_w %d, %02x\n", tag(), offset, data);
}
-WRITE8_MEMBER(lpc_pit_device::control_w)
+void lpc_pit_device::control_w(uint8_t data)
{
logerror("%s: control_w %02x\n", tag(), data);
}
diff --git a/src/devices/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h
index 467a6d2bd14..aa83b6af5ce 100644
--- a/src/devices/machine/lpc-pit.h
+++ b/src/devices/machine/lpc-pit.h
@@ -21,9 +21,9 @@ protected:
private:
void map(address_map &map);
- DECLARE_READ8_MEMBER( status_r);
- DECLARE_WRITE8_MEMBER(access_w);
- DECLARE_WRITE8_MEMBER(control_w);
+ uint8_t status_r(offs_t offset);
+ void access_w(offs_t offset, uint8_t data);
+ void control_w(uint8_t data);
};
DECLARE_DEVICE_TYPE(LPC_PIT, lpc_pit_device)
diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp
index 43e722810b0..e584d96cd6c 100644
--- a/src/devices/machine/lpc-rtc.cpp
+++ b/src/devices/machine/lpc-rtc.cpp
@@ -37,49 +37,53 @@ void lpc_rtc_device::map_extdevice(uint64_t memory_window_start, uint64_t memory
void lpc_rtc_device::device_start()
{
memset(ram, 0, 256);
+
+ save_item(NAME(cur_index));
+ save_item(NAME(cur_extindex));
+ save_item(NAME(ram));
}
void lpc_rtc_device::device_reset()
{
}
-READ8_MEMBER( lpc_rtc_device::index_r)
+uint8_t lpc_rtc_device::index_r()
{
return cur_index;
}
-WRITE8_MEMBER( lpc_rtc_device::index_w)
+void lpc_rtc_device::index_w(uint8_t data)
{
cur_index = data & 0x7f;
}
-READ8_MEMBER( lpc_rtc_device::target_r)
+uint8_t lpc_rtc_device::target_r()
{
return ram[cur_index];
}
-WRITE8_MEMBER( lpc_rtc_device::target_w)
+void lpc_rtc_device::target_w(uint8_t data)
{
ram[cur_index] = data;
logerror("%s: ram[%02x] = %02x\n", tag(), cur_index, data);
}
-READ8_MEMBER( lpc_rtc_device::extindex_r)
+uint8_t lpc_rtc_device::extindex_r()
{
return cur_extindex;
}
-WRITE8_MEMBER( lpc_rtc_device::extindex_w)
+void lpc_rtc_device::extindex_w(uint8_t data)
{
cur_extindex = data & 0x7f;
}
-READ8_MEMBER( lpc_rtc_device::exttarget_r)
+uint8_t lpc_rtc_device::exttarget_r()
{
return ram[cur_extindex|128];
}
-WRITE8_MEMBER( lpc_rtc_device::exttarget_w)
+void lpc_rtc_device::exttarget_w(uint8_t data)
{
ram[cur_extindex|128] = data;
logerror("%s: ram[%02x] = %02x\n", tag(), cur_extindex|128, data);
diff --git a/src/devices/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h
index 7fee7cf7cb3..5243bcf7f8a 100644
--- a/src/devices/machine/lpc-rtc.h
+++ b/src/devices/machine/lpc-rtc.h
@@ -28,14 +28,14 @@ private:
uint8_t cur_index, cur_extindex;
uint8_t ram[256];
- DECLARE_READ8_MEMBER( index_r);
- DECLARE_WRITE8_MEMBER( index_w);
- DECLARE_READ8_MEMBER( target_r);
- DECLARE_WRITE8_MEMBER( target_w);
- DECLARE_READ8_MEMBER( extindex_r);
- DECLARE_WRITE8_MEMBER( extindex_w);
- DECLARE_READ8_MEMBER( exttarget_r);
- DECLARE_WRITE8_MEMBER( exttarget_w);
+ uint8_t index_r();
+ void index_w(uint8_t data);
+ uint8_t target_r();
+ void target_w(uint8_t data);
+ uint8_t extindex_r();
+ void extindex_w(uint8_t data);
+ uint8_t exttarget_r();
+ void exttarget_w(uint8_t data);
};
DECLARE_DEVICE_TYPE(LPC_RTC, lpc_rtc_device)
diff --git a/src/devices/machine/mb87030.cpp b/src/devices/machine/mb87030.cpp
index 25420dfad54..a9c87cfc11b 100644
--- a/src/devices/machine/mb87030.cpp
+++ b/src/devices/machine/mb87030.cpp
@@ -471,7 +471,7 @@ void mb87030_device::scsi_ctrl_changed()
step(false);
}
-WRITE_LINE_MEMBER(mb87030_device::reset_w)
+void mb87030_device::reset_w(int state)
{
LOG("%s: %s\n", __FUNCTION__, state);
if (state)
@@ -502,38 +502,38 @@ void mb87030_device::update_ints()
m_irq_handler(m_ints && (m_sctl & 1));// || (m_ints & INTS_DISCONNECTED));
}
-READ8_MEMBER(mb87030_device::bdid_r)
+uint8_t mb87030_device::bdid_r()
{
LOG("%s %02X\n", __FUNCTION__, (1 << m_bdid));
return 1 << m_bdid;
}
-WRITE8_MEMBER(mb87030_device::bdid_w)
+void mb87030_device::bdid_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_bdid = data & 0x7;
}
-READ8_MEMBER(mb87030_device::sctl_r)
+uint8_t mb87030_device::sctl_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_sctl);
return m_sctl;
}
-WRITE8_MEMBER(mb87030_device::sctl_w)
+void mb87030_device::sctl_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_sctl = data;
update_ints();
}
-READ8_MEMBER(mb87030_device::scmd_r)
+uint8_t mb87030_device::scmd_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_scmd);
return m_scmd;
}
-WRITE8_MEMBER(mb87030_device::scmd_w)
+void mb87030_device::scmd_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_scmd = data;
@@ -609,32 +609,32 @@ WRITE8_MEMBER(mb87030_device::scmd_w)
}
}
-READ8_MEMBER(mb87030_device::tmod_r)
+uint8_t mb87030_device::tmod_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_tmod);
return m_tmod;
}
-WRITE8_MEMBER(mb87030_device::tmod_w)
+void mb87030_device::tmod_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_tmod = data;
}
-READ8_MEMBER(mb87030_device::ints_r)
+uint8_t mb87030_device::ints_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_ints);
return m_ints;
}
-WRITE8_MEMBER(mb87030_device::ints_w)
+void mb87030_device::ints_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_ints &= ~(data);
update_ints();
}
-READ8_MEMBER(mb87030_device::psns_r)
+uint8_t mb87030_device::psns_r()
{
uint32_t ctrl = scsi_get_ctrl();
uint8_t ret = (!!(ctrl & S_REQ) << 7) |
@@ -649,33 +649,33 @@ READ8_MEMBER(mb87030_device::psns_r)
return ret;
}
-WRITE8_MEMBER(mb87030_device::sdgc_w)
+void mb87030_device::sdgc_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_sdgc = data;
scsi_ctrl_changed();
}
-READ8_MEMBER(mb87030_device::ssts_r)
+uint8_t mb87030_device::ssts_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_ssts);
update_ssts();
return m_ssts;
}
-READ8_MEMBER(mb87030_device::serr_r)
+uint8_t mb87030_device::serr_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_serr);
return m_serr;
}
-READ8_MEMBER(mb87030_device::pctl_r)
+uint8_t mb87030_device::pctl_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_pctl);
return m_pctl;
}
-WRITE8_MEMBER(mb87030_device::pctl_w)
+void mb87030_device::pctl_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_pctl = data;
@@ -684,13 +684,13 @@ WRITE8_MEMBER(mb87030_device::pctl_w)
step(false);
}
-READ8_MEMBER(mb87030_device::mbc_r)
+uint8_t mb87030_device::mbc_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_mbc);
return m_mbc;
}
-READ8_MEMBER(mb87030_device::dreg_r)
+uint8_t mb87030_device::dreg_r()
{
step(false);
if (!m_fifo.empty())
@@ -699,7 +699,7 @@ READ8_MEMBER(mb87030_device::dreg_r)
return m_dreg;
}
-WRITE8_MEMBER(mb87030_device::dreg_w)
+void mb87030_device::dreg_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_dreg = data;
@@ -708,35 +708,35 @@ WRITE8_MEMBER(mb87030_device::dreg_w)
step(false);
}
-READ8_MEMBER(mb87030_device::temp_r)
+uint8_t mb87030_device::temp_r()
{
step(false);
LOG("%s: %02X\n", __FUNCTION__, m_temp);
return m_temp;
}
-WRITE8_MEMBER(mb87030_device::temp_w)
+void mb87030_device::temp_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_temp = data;
step(false);
}
-READ8_MEMBER(mb87030_device::tch_r)
+uint8_t mb87030_device::tch_r()
{
uint8_t ret = (m_tc >> 16) & 0xff;
LOG("%s: %02X\n", __FUNCTION__, ret);
return ret;
}
-READ8_MEMBER(mb87030_device::tcm_r)
+uint8_t mb87030_device::tcm_r()
{
uint8_t ret = (m_tc >> 8) & 0xff;
LOG("%s: %02X\n", __FUNCTION__, ret);
return ret;
}
-READ8_MEMBER(mb87030_device::tcl_r)
+uint8_t mb87030_device::tcl_r()
{
uint8_t ret = m_tc & 0xff;
LOG("%s: %02X\n", __FUNCTION__, ret);
@@ -744,7 +744,7 @@ READ8_MEMBER(mb87030_device::tcl_r)
}
-WRITE8_MEMBER(mb87030_device::tch_w)
+void mb87030_device::tch_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_tc &= 0x00ffff;
@@ -752,7 +752,7 @@ WRITE8_MEMBER(mb87030_device::tch_w)
update_ssts();
}
-WRITE8_MEMBER(mb87030_device::tcm_w)
+void mb87030_device::tcm_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_tc &= 0xff00ff;
@@ -760,7 +760,7 @@ WRITE8_MEMBER(mb87030_device::tcm_w)
update_ssts();
}
-WRITE8_MEMBER(mb87030_device::tcl_w)
+void mb87030_device::tcl_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_tc &= 0xffff00;
@@ -768,13 +768,13 @@ WRITE8_MEMBER(mb87030_device::tcl_w)
update_ssts();
}
-READ8_MEMBER(mb87030_device::exbf_r)
+uint8_t mb87030_device::exbf_r()
{
LOG("%s: %02X\n", __FUNCTION__, m_exbf);
return m_exbf;
}
-WRITE8_MEMBER(mb87030_device::exbf_w)
+void mb87030_device::exbf_w(uint8_t data)
{
LOG("%s: %02X\n", __FUNCTION__, data);
m_exbf = data;
diff --git a/src/devices/machine/mb87030.h b/src/devices/machine/mb87030.h
index dc07f0edb9b..c4d113107cd 100644
--- a/src/devices/machine/mb87030.h
+++ b/src/devices/machine/mb87030.h
@@ -18,38 +18,38 @@ public:
auto out_irq_callback() { return m_irq_handler.bind(); }
auto out_dreq_callback() { return m_dreq_handler.bind(); }
- DECLARE_READ8_MEMBER(bdid_r);
- DECLARE_READ8_MEMBER(sctl_r);
- DECLARE_READ8_MEMBER(scmd_r);
- DECLARE_READ8_MEMBER(tmod_r);
- DECLARE_READ8_MEMBER(ints_r);
- DECLARE_READ8_MEMBER(psns_r);
- DECLARE_READ8_MEMBER(ssts_r);
- DECLARE_READ8_MEMBER(serr_r);
- DECLARE_READ8_MEMBER(pctl_r);
- DECLARE_READ8_MEMBER(mbc_r);
- DECLARE_READ8_MEMBER(dreg_r);
- DECLARE_READ8_MEMBER(temp_r);
- DECLARE_READ8_MEMBER(tch_r);
- DECLARE_READ8_MEMBER(tcm_r);
- DECLARE_READ8_MEMBER(tcl_r);
- DECLARE_READ8_MEMBER(exbf_r);
-
- DECLARE_WRITE8_MEMBER(bdid_w);
- DECLARE_WRITE8_MEMBER(sctl_w);
- DECLARE_WRITE8_MEMBER(scmd_w);
- DECLARE_WRITE8_MEMBER(tmod_w);
- DECLARE_WRITE8_MEMBER(ints_w);
- DECLARE_WRITE8_MEMBER(sdgc_w);
- DECLARE_WRITE8_MEMBER(pctl_w);
- DECLARE_WRITE8_MEMBER(dreg_w);
- DECLARE_WRITE8_MEMBER(temp_w);
- DECLARE_WRITE8_MEMBER(tch_w);
- DECLARE_WRITE8_MEMBER(tcm_w);
- DECLARE_WRITE8_MEMBER(tcl_w);
- DECLARE_WRITE8_MEMBER(exbf_w);
-
- DECLARE_WRITE_LINE_MEMBER(reset_w);
+ uint8_t bdid_r();
+ uint8_t sctl_r();
+ uint8_t scmd_r();
+ uint8_t tmod_r();
+ uint8_t ints_r();
+ uint8_t psns_r();
+ uint8_t ssts_r();
+ uint8_t serr_r();
+ uint8_t pctl_r();
+ uint8_t mbc_r();
+ uint8_t dreg_r();
+ uint8_t temp_r();
+ uint8_t tch_r();
+ uint8_t tcm_r();
+ uint8_t tcl_r();
+ uint8_t exbf_r();
+
+ void bdid_w(uint8_t data);
+ void sctl_w(uint8_t data);
+ void scmd_w(uint8_t data);
+ void tmod_w(uint8_t data);
+ void ints_w(uint8_t data);
+ void sdgc_w(uint8_t data);
+ void pctl_w(uint8_t data);
+ void dreg_w(uint8_t data);
+ void temp_w(uint8_t data);
+ void tch_w(uint8_t data);
+ void tcm_w(uint8_t data);
+ void tcl_w(uint8_t data);
+ void exbf_w(uint8_t data);
+
+ void reset_w(int state);
virtual void scsi_ctrl_changed() override;
uint8_t dma_r();
diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp
index 0ec30d1f84b..4f6d08d9aca 100644
--- a/src/devices/machine/mb8795.cpp
+++ b/src/devices/machine/mb8795.cpp
@@ -82,95 +82,95 @@ void mb8795_device::recv_cb(uint8_t *buf, int len)
receive();
}
-READ8_MEMBER(mb8795_device::txstat_r)
+uint8_t mb8795_device::txstat_r()
{
// logerror("txstat_r %02x %s\n", txstat, machine().describe_context());
return txstat;
}
-WRITE8_MEMBER(mb8795_device::txstat_w)
+void mb8795_device::txstat_w(uint8_t data)
{
txstat = txstat & (0xf0 | ~data);
check_irq();
logerror("txstat_w %02x %s\n", txstat, machine().describe_context());
}
-READ8_MEMBER(mb8795_device::txmask_r)
+uint8_t mb8795_device::txmask_r()
{
logerror("txmask_r %02x %s\n", txmask, machine().describe_context());
return txmask;
}
-WRITE8_MEMBER(mb8795_device::txmask_w)
+void mb8795_device::txmask_w(uint8_t data)
{
txmask = data & 0xaf;
check_irq();
logerror("txmask_w %02x %s\n", txmask, machine().describe_context());
}
-READ8_MEMBER(mb8795_device::rxstat_r)
+uint8_t mb8795_device::rxstat_r()
{
logerror("rxstat_r %02x %s\n", rxstat, machine().describe_context());
return rxstat;
}
-WRITE8_MEMBER(mb8795_device::rxstat_w)
+void mb8795_device::rxstat_w(uint8_t data)
{
rxstat = rxstat & (0x70 | ~data);
check_irq();
logerror("rxstat_w %02x %s\n", rxstat, machine().describe_context());
}
-READ8_MEMBER(mb8795_device::rxmask_r)
+uint8_t mb8795_device::rxmask_r()
{
logerror("rxmask_r %02x %s\n", rxmask, machine().describe_context());
return rxmask;
}
-WRITE8_MEMBER(mb8795_device::rxmask_w)
+void mb8795_device::rxmask_w(uint8_t data)
{
rxmask = data & 0x9f;
check_irq();
logerror("rxmask_w %02x %s\n", rxmask, machine().describe_context());
}
-READ8_MEMBER(mb8795_device::txmode_r)
+uint8_t mb8795_device::txmode_r()
{
logerror("txmode_r %02x %s\n", txmode, machine().describe_context());
return txmode;
}
-WRITE8_MEMBER(mb8795_device::txmode_w)
+void mb8795_device::txmode_w(uint8_t data)
{
txmode = data;
logerror("txmode_w %02x %s\n", txmode, machine().describe_context());
}
-READ8_MEMBER(mb8795_device::rxmode_r)
+uint8_t mb8795_device::rxmode_r()
{
logerror("rxmode_r %02x %s\n", rxmode, machine().describe_context());
return rxmode;
}
-WRITE8_MEMBER(mb8795_device::rxmode_w)
+void mb8795_device::rxmode_w(uint8_t data)
{
rxmode = data;
logerror("rxmode_w %02x %s\n", rxmode, machine().describe_context());
}
-WRITE8_MEMBER(mb8795_device::reset_w)
+void mb8795_device::reset_w(uint8_t data)
{
if(data & EN_RST_RESET)
device_reset();
}
-READ8_MEMBER(mb8795_device::tdc_lsb_r)
+uint8_t mb8795_device::tdc_lsb_r()
{
logerror("tdc_lsb_r %02x %s\n", txcount & 0xff, machine().describe_context());
return txcount;
}
-READ8_MEMBER(mb8795_device::mac_r)
+uint8_t mb8795_device::mac_r(offs_t offset)
{
if(offset < 6)
return mac[offset];
@@ -181,7 +181,7 @@ READ8_MEMBER(mb8795_device::mac_r)
return 0;
}
-WRITE8_MEMBER(mb8795_device::mac_w)
+void mb8795_device::mac_w(offs_t offset, uint8_t data)
{
if(offset < 6) {
mac[offset] = data;
diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h
index 6662cd96ebc..1298a6295cc 100644
--- a/src/devices/machine/mb8795.h
+++ b/src/devices/machine/mb8795.h
@@ -84,22 +84,22 @@ private:
bool recv_is_multicast();
bool recv_is_local_multicast();
- DECLARE_READ8_MEMBER(txstat_r);
- DECLARE_WRITE8_MEMBER(txstat_w);
- DECLARE_READ8_MEMBER(txmask_r);
- DECLARE_WRITE8_MEMBER(txmask_w);
- DECLARE_READ8_MEMBER(rxstat_r);
- DECLARE_WRITE8_MEMBER(rxstat_w);
- DECLARE_READ8_MEMBER(rxmask_r);
- DECLARE_WRITE8_MEMBER(rxmask_w);
- DECLARE_READ8_MEMBER(txmode_r);
- DECLARE_WRITE8_MEMBER(txmode_w);
- DECLARE_READ8_MEMBER(rxmode_r);
- DECLARE_WRITE8_MEMBER(rxmode_w);
- DECLARE_WRITE8_MEMBER(reset_w);
- DECLARE_READ8_MEMBER(tdc_lsb_r);
- DECLARE_READ8_MEMBER(mac_r);
- DECLARE_WRITE8_MEMBER(mac_w);
+ uint8_t txstat_r();
+ void txstat_w(uint8_t data);
+ uint8_t txmask_r();
+ void txmask_w(uint8_t data);
+ uint8_t rxstat_r();
+ void rxstat_w(uint8_t data);
+ uint8_t rxmask_r();
+ void rxmask_w(uint8_t data);
+ uint8_t txmode_r();
+ void txmode_w(uint8_t data);
+ uint8_t rxmode_r();
+ void rxmode_w(uint8_t data);
+ void reset_w(uint8_t data);
+ uint8_t tdc_lsb_r();
+ uint8_t mac_r(offs_t offset);
+ void mac_w(offs_t offset, uint8_t data);
};
DECLARE_DEVICE_TYPE(MB8795, mb8795_device)
diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp
index 0cde218e996..62b9adb78bb 100644
--- a/src/devices/machine/mb89352.cpp
+++ b/src/devices/machine/mb89352.cpp
@@ -285,7 +285,7 @@ void mb89352_device::set_phase(int phase)
logerror("MB89352: phase set to %i\n",m_phase);
}
-READ8_MEMBER( mb89352_device::mb89352_r )
+uint8_t mb89352_device::mb89352_r(offs_t offset)
{
uint8_t ret;
switch(offset & 0x0f)
@@ -363,7 +363,7 @@ READ8_MEMBER( mb89352_device::mb89352_r )
return 0xff;
}
-WRITE8_MEMBER( mb89352_device::mb89352_w )
+void mb89352_device::mb89352_w(offs_t offset, uint8_t data)
{
switch(offset & 0x0f)
{
diff --git a/src/devices/machine/mb89352.h b/src/devices/machine/mb89352.h
index b9723b314d6..7454e63a352 100644
--- a/src/devices/machine/mb89352.h
+++ b/src/devices/machine/mb89352.h
@@ -21,8 +21,8 @@ public:
auto drq_cb() { return m_drq_cb.bind(); }
// any publically accessible interfaces needed for runtime
- DECLARE_READ8_MEMBER( mb89352_r );
- DECLARE_WRITE8_MEMBER( mb89352_w );
+ uint8_t mb89352_r(offs_t offset);
+ void mb89352_w(offs_t offset, uint8_t data);
void set_phase(int phase);
diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp
index 0c03a66e421..dae0d4a3372 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -103,21 +103,21 @@ mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *tag,
}
-READ8_MEMBER(mb89363b_device::i8255_a_port_a_r) { return m_in_a_pa_cb(space, offset); }
-READ8_MEMBER(mb89363b_device::i8255_a_port_b_r) { return m_in_a_pb_cb(space, offset); }
-READ8_MEMBER(mb89363b_device::i8255_a_port_c_r) { return m_in_a_pc_cb(space, offset); }
-WRITE8_MEMBER(mb89363b_device::i8255_a_port_a_w) { m_out_a_pa_cb(space, offset, data); }
-WRITE8_MEMBER(mb89363b_device::i8255_a_port_b_w) { m_out_a_pb_cb(space, offset, data); }
-WRITE8_MEMBER(mb89363b_device::i8255_a_port_c_w) { m_out_a_pc_cb(space, offset, data); }
-READ8_MEMBER(mb89363b_device::i8255_b_port_a_r) { return m_in_b_pa_cb(space, offset); }
-READ8_MEMBER(mb89363b_device::i8255_b_port_b_r) { return m_in_b_pb_cb(space, offset); }
-READ8_MEMBER(mb89363b_device::i8255_b_port_c_r) { return m_in_b_pc_cb(space, offset); }
-WRITE8_MEMBER(mb89363b_device::i8255_b_port_a_w) { m_out_b_pa_cb(space, offset, data); }
-WRITE8_MEMBER(mb89363b_device::i8255_b_port_b_w) { m_out_b_pb_cb(space, offset, data); }
-WRITE8_MEMBER(mb89363b_device::i8255_b_port_c_w) { m_out_b_pc_cb(space, offset, data); }
-
-
-READ8_MEMBER( mb89363b_device::read )
+uint8_t mb89363b_device::i8255_a_port_a_r(offs_t offset) { return m_in_a_pa_cb(offset); }
+uint8_t mb89363b_device::i8255_a_port_b_r(offs_t offset) { return m_in_a_pb_cb(offset); }
+uint8_t mb89363b_device::i8255_a_port_c_r(offs_t offset) { return m_in_a_pc_cb(offset); }
+void mb89363b_device::i8255_a_port_a_w(offs_t offset, uint8_t data) { m_out_a_pa_cb(offset, data); }
+void mb89363b_device::i8255_a_port_b_w(offs_t offset, uint8_t data) { m_out_a_pb_cb(offset, data); }
+void mb89363b_device::i8255_a_port_c_w(offs_t offset, uint8_t data) { m_out_a_pc_cb(offset, data); }
+uint8_t mb89363b_device::i8255_b_port_a_r(offs_t offset) { return m_in_b_pa_cb(offset); }
+uint8_t mb89363b_device::i8255_b_port_b_r(offs_t offset) { return m_in_b_pb_cb(offset); }
+uint8_t mb89363b_device::i8255_b_port_c_r(offs_t offset) { return m_in_b_pc_cb(offset); }
+void mb89363b_device::i8255_b_port_a_w(offs_t offset, uint8_t data) { m_out_b_pa_cb(offset, data); }
+void mb89363b_device::i8255_b_port_b_w(offs_t offset, uint8_t data) { m_out_b_pb_cb(offset, data); }
+void mb89363b_device::i8255_b_port_c_w(offs_t offset, uint8_t data) { m_out_b_pc_cb(offset, data); }
+
+
+uint8_t mb89363b_device::read(offs_t offset)
{
if (offset & 4)
return m_i8255_b->read(offset & 3);
@@ -125,7 +125,7 @@ READ8_MEMBER( mb89363b_device::read )
return m_i8255_a->read(offset & 3);
}
-WRITE8_MEMBER( mb89363b_device::write )
+void mb89363b_device::write(offs_t offset, uint8_t data)
{
if (offset & 4)
m_i8255_b->write(offset & 3, data);
diff --git a/src/devices/machine/mb89363b.h b/src/devices/machine/mb89363b.h
index da8198288c0..273642f96f5 100644
--- a/src/devices/machine/mb89363b.h
+++ b/src/devices/machine/mb89363b.h
@@ -23,8 +23,8 @@ public:
// construction/destruction
mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
auto in_pa() { return m_in_a_pa_cb.bind(); }
auto in_pb() { return m_in_a_pb_cb.bind(); }
@@ -46,18 +46,18 @@ protected:
virtual void device_reset() override;
private:
- DECLARE_READ8_MEMBER(i8255_a_port_a_r);
- DECLARE_READ8_MEMBER(i8255_a_port_b_r);
- DECLARE_READ8_MEMBER(i8255_a_port_c_r);
- DECLARE_WRITE8_MEMBER(i8255_a_port_a_w);
- DECLARE_WRITE8_MEMBER(i8255_a_port_b_w);
- DECLARE_WRITE8_MEMBER(i8255_a_port_c_w);
- DECLARE_READ8_MEMBER(i8255_b_port_a_r);
- DECLARE_READ8_MEMBER(i8255_b_port_b_r);
- DECLARE_READ8_MEMBER(i8255_b_port_c_r);
- DECLARE_WRITE8_MEMBER(i8255_b_port_a_w);
- DECLARE_WRITE8_MEMBER(i8255_b_port_b_w);
- DECLARE_WRITE8_MEMBER(i8255_b_port_c_w);
+ uint8_t i8255_a_port_a_r(offs_t offset);
+ uint8_t i8255_a_port_b_r(offs_t offset);
+ uint8_t i8255_a_port_c_r(offs_t offset);
+ void i8255_a_port_a_w(offs_t offset, uint8_t data);
+ void i8255_a_port_b_w(offs_t offset, uint8_t data);
+ void i8255_a_port_c_w(offs_t offset, uint8_t data);
+ uint8_t i8255_b_port_a_r(offs_t offset);
+ uint8_t i8255_b_port_b_r(offs_t offset);
+ uint8_t i8255_b_port_c_r(offs_t offset);
+ void i8255_b_port_a_w(offs_t offset, uint8_t data);
+ void i8255_b_port_b_w(offs_t offset, uint8_t data);
+ void i8255_b_port_c_w(offs_t offset, uint8_t data);
required_device<i8255_device> m_i8255_a;
required_device<i8255_device> m_i8255_b;
diff --git a/src/devices/machine/mb89374.cpp b/src/devices/machine/mb89374.cpp
index ad77d30b8af..3e888d820ec 100644
--- a/src/devices/machine/mb89374.cpp
+++ b/src/devices/machine/mb89374.cpp
@@ -269,7 +269,7 @@ void mb89374_device::execute_run()
// read - handler for register reading
//-------------------------------------------------
-READ8_MEMBER(mb89374_device::read)
+uint8_t mb89374_device::read(offs_t offset)
{
uint8_t data = 0xff;
switch (offset & 0x1f)
@@ -306,7 +306,7 @@ READ8_MEMBER(mb89374_device::read)
// write - handler for register writing
//-------------------------------------------------
-WRITE8_MEMBER(mb89374_device::write)
+void mb89374_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x1f)
{
@@ -365,7 +365,7 @@ WRITE8_MEMBER(mb89374_device::write)
// pi0_w - handler for RxCI#/PI0
//-------------------------------------------------
-WRITE_LINE_MEMBER(mb89374_device::pi0_w)
+void mb89374_device::pi0_w(int state)
{
m_pi[0] = state;
}
@@ -375,7 +375,7 @@ WRITE_LINE_MEMBER(mb89374_device::pi0_w)
// pi1_w - handler for TxCI#/PI1
//-------------------------------------------------
-WRITE_LINE_MEMBER(mb89374_device::pi1_w)
+void mb89374_device::pi1_w(int state)
{
m_pi[1] = state;
}
@@ -385,7 +385,7 @@ WRITE_LINE_MEMBER(mb89374_device::pi1_w)
// pi2_w - handler for TxDACK#/PI2
//-------------------------------------------------
-WRITE_LINE_MEMBER(mb89374_device::pi2_w)
+void mb89374_device::pi2_w(int state)
{
m_pi[2] = state;
}
@@ -395,7 +395,7 @@ WRITE_LINE_MEMBER(mb89374_device::pi2_w)
// pi3_w - handler for RxDACK#/PI3
//-------------------------------------------------
-WRITE_LINE_MEMBER(mb89374_device::pi3_w)
+void mb89374_device::pi3_w(int state)
{
m_pi[3] = state;
}
@@ -405,7 +405,7 @@ WRITE_LINE_MEMBER(mb89374_device::pi3_w)
// ci_w - handler for TxLAST#/CI#
//-------------------------------------------------
-WRITE_LINE_MEMBER(mb89374_device::ci_w)
+void mb89374_device::ci_w(int state)
{
m_ci = state;
if (m_ci == 1 && m_pi[2] == 0)
@@ -420,7 +420,7 @@ WRITE_LINE_MEMBER(mb89374_device::ci_w)
// read - handler for dma reading (rx buffer)
//-------------------------------------------------
-READ8_MEMBER(mb89374_device::dma_r)
+uint8_t mb89374_device::dma_r()
{
uint8_t data = rxRead();
if (m_rx_offset == m_rx_length)
@@ -433,7 +433,7 @@ READ8_MEMBER(mb89374_device::dma_r)
// write - handler for dma writing (tx buffer)
//-------------------------------------------------
-WRITE8_MEMBER(mb89374_device::dma_w)
+void mb89374_device::dma_w(uint8_t data)
{
txWrite(data);
}
diff --git a/src/devices/machine/mb89374.h b/src/devices/machine/mb89374.h
index f6163bb4e16..c70781b49aa 100644
--- a/src/devices/machine/mb89374.h
+++ b/src/devices/machine/mb89374.h
@@ -49,18 +49,18 @@ public:
template <unsigned N> auto out_po_callback() { return m_out_po_cb[N].bind(); }
// read/write handlers
- 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( pi0_w );
- DECLARE_WRITE_LINE_MEMBER( pi1_w );
- DECLARE_WRITE_LINE_MEMBER( pi2_w );
- DECLARE_WRITE_LINE_MEMBER( pi3_w );
+ void pi0_w(int state);
+ void pi1_w(int state);
+ void pi2_w(int state);
+ void pi3_w(int state);
- DECLARE_WRITE_LINE_MEMBER( ci_w );
+ void ci_w(int state);
- DECLARE_READ8_MEMBER( dma_r );
- DECLARE_WRITE8_MEMBER( dma_w );
+ uint8_t dma_r();
+ void dma_w(uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/machine/mc14411.cpp b/src/devices/machine/mc14411.cpp
index cab994ca89c..64bf476e2c4 100644
--- a/src/devices/machine/mc14411.cpp
+++ b/src/devices/machine/mc14411.cpp
@@ -244,7 +244,7 @@ void mc14411_device::device_timer(emu_timer &timer, device_timer_id id, int32_t
// divider at run time affects wave forms
//--------------------------------------------------------
-WRITE8_MEMBER(mc14411_device::rate_select_w)
+void mc14411_device::rate_select_w(uint8_t data)
{
LOGSETUP("%s %02x\n", FUNCNAME, data);
@@ -260,7 +260,7 @@ WRITE8_MEMBER(mc14411_device::rate_select_w)
// rsa_w - set RSA input line
//------------------------------------------------
-WRITE_LINE_MEMBER(mc14411_device::rsa_w)
+void mc14411_device::rsa_w(int state)
{
LOGSETUP("%s %02x\n", FUNCNAME, state);
@@ -276,7 +276,7 @@ WRITE_LINE_MEMBER(mc14411_device::rsa_w)
// rsb_w - set RSB input line
//------------------------------------------------
-WRITE_LINE_MEMBER(mc14411_device::rsb_w)
+void mc14411_device::rsb_w(int state)
{
LOGSETUP("%s %02x\n", FUNCNAME, state);
@@ -292,7 +292,7 @@ WRITE_LINE_MEMBER(mc14411_device::rsb_w)
// reset_w - software controlled reset
//------------------------------------------------
-WRITE_LINE_MEMBER(mc14411_device::reset_w)
+void mc14411_device::reset_w(int state)
{
LOGSETUP("%s %02x\n", FUNCNAME, state);
diff --git a/src/devices/machine/mc14411.h b/src/devices/machine/mc14411.h
index 6755df220e2..99cc8309c96 100644
--- a/src/devices/machine/mc14411.h
+++ b/src/devices/machine/mc14411.h
@@ -63,10 +63,10 @@ public:
template <std::size_t Line> auto out_f() { return m_out_fx_cbs[Line-1].bind(); }
- DECLARE_WRITE_LINE_MEMBER(reset_w);
- DECLARE_WRITE8_MEMBER(rate_select_w);
- DECLARE_WRITE_LINE_MEMBER(rsa_w);
- DECLARE_WRITE_LINE_MEMBER(rsb_w);
+ void reset_w(int state);
+ void rate_select_w(uint8_t data);
+ void rsa_w(int state);
+ void rsb_w(int state);
void timer_enable(timer_id i, bool enable);
void timer_disable_all();
diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp
index ecae29b48c3..72b3f1added 100644
--- a/src/devices/machine/mc6846.cpp
+++ b/src/devices/machine/mc6846.cpp
@@ -283,7 +283,7 @@ TIMER_CALLBACK_MEMBER( mc6846_device::timer_one_shot )
/************************** CPU interface ****************************/
-READ8_MEMBER(mc6846_device::read)
+uint8_t mc6846_device::read(offs_t offset)
{
switch ( offset )
{
@@ -352,7 +352,7 @@ READ8_MEMBER(mc6846_device::read)
-WRITE8_MEMBER(mc6846_device::write)
+void mc6846_device::write(offs_t offset, uint8_t data)
{
switch ( offset )
diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h
index 81633923adc..3569e78bb98 100644
--- a/src/devices/machine/mc6846.h
+++ b/src/devices/machine/mc6846.h
@@ -26,8 +26,8 @@ public:
auto irq() { return m_irq_cb.bind(); }
/* interface to CPU via address/data bus*/
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
/* asynchronous write from outside world into interrupt-generating pins */
void set_input_cp1(int data);
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index beacf44640b..46bbf3bc0b8 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -54,7 +54,7 @@ void mos6529_device::device_start()
// read -
//-------------------------------------------------
-READ8_MEMBER( mos6529_device::read )
+uint8_t mos6529_device::read()
{
return m_input;
}
@@ -64,7 +64,7 @@ READ8_MEMBER( mos6529_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( mos6529_device::write )
+void mos6529_device::write(uint8_t data)
{
for (int bit = 0; bit < 8; bit++)
m_p_handler[bit](BIT(data, bit));
diff --git a/src/devices/machine/mos6529.h b/src/devices/machine/mos6529.h
index 63607f67223..67806441d57 100644
--- a/src/devices/machine/mos6529.h
+++ b/src/devices/machine/mos6529.h
@@ -41,17 +41,17 @@ public:
template <std::size_t Bit> auto p_handler() { return m_p_handler[Bit].bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
-
- DECLARE_WRITE_LINE_MEMBER( write_p0 ) { if (state) m_input |= 1; else m_input &= ~1; }
- DECLARE_WRITE_LINE_MEMBER( write_p1 ) { if (state) m_input |= 2; else m_input &= ~2; }
- DECLARE_WRITE_LINE_MEMBER( write_p2 ) { if (state) m_input |= 4; else m_input &= ~4; }
- DECLARE_WRITE_LINE_MEMBER( write_p3 ) { if (state) m_input |= 8; else m_input &= ~8; }
- DECLARE_WRITE_LINE_MEMBER( write_p4 ) { if (state) m_input |= 16; else m_input &= ~16; }
- DECLARE_WRITE_LINE_MEMBER( write_p5 ) { if (state) m_input |= 32; else m_input &= ~32; }
- DECLARE_WRITE_LINE_MEMBER( write_p6 ) { if (state) m_input |= 64; else m_input &= ~64; }
- DECLARE_WRITE_LINE_MEMBER( write_p7 ) { if (state) m_input |= 128; else m_input &= ~128; }
+ uint8_t read();
+ void write(uint8_t data);
+
+ void write_p0(int state) { if (state) m_input |= 1; else m_input &= ~1; }
+ void write_p1(int state) { if (state) m_input |= 2; else m_input &= ~2; }
+ void write_p2(int state) { if (state) m_input |= 4; else m_input &= ~4; }
+ void write_p3(int state) { if (state) m_input |= 8; else m_input &= ~8; }
+ void write_p4(int state) { if (state) m_input |= 16; else m_input &= ~16; }
+ void write_p5(int state) { if (state) m_input |= 32; else m_input &= ~32; }
+ void write_p6(int state) { if (state) m_input |= 64; else m_input &= ~64; }
+ void write_p7(int state) { if (state) m_input |= 128; else m_input &= ~128; }
protected:
// device-level overrides
diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp
index c149240f5ef..8cc7198b3e5 100644
--- a/src/devices/machine/mos6530.cpp
+++ b/src/devices/machine/mos6530.cpp
@@ -194,7 +194,7 @@ void mos6530_device::device_timer(emu_timer &timer, device_timer_id id, int para
mos6530_w - master I/O write access
-------------------------------------------------*/
-WRITE8_MEMBER( mos6530_device::write )
+void mos6530_device::write(offs_t offset, uint8_t data)
{
/* if A2 == 1, we are writing to the timer */
if (offset & 0x04)
@@ -258,7 +258,7 @@ WRITE8_MEMBER( mos6530_device::write )
mos6530_r - master I/O read access
-------------------------------------------------*/
-READ8_MEMBER( mos6530_device::read )
+uint8_t mos6530_device::read(offs_t offset)
{
uint8_t val;
diff --git a/src/devices/machine/mos6530.h b/src/devices/machine/mos6530.h
index 6bbeb8db9de..0639544d8e0 100644
--- a/src/devices/machine/mos6530.h
+++ b/src/devices/machine/mos6530.h
@@ -53,8 +53,8 @@ public:
auto in_pb_callback() { return m_in_pb_cb.bind(); }
auto out_pb_callback() { return m_out_pb_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 porta_in_get();
uint8_t portb_in_get();
diff --git a/src/devices/machine/mos8706.cpp b/src/devices/machine/mos8706.cpp
index d3f8f42fa10..3ac0a976310 100644
--- a/src/devices/machine/mos8706.cpp
+++ b/src/devices/machine/mos8706.cpp
@@ -59,7 +59,7 @@ void mos8706_device::device_reset()
// read -
//-------------------------------------------------
-READ8_MEMBER( mos8706_device::read )
+uint8_t mos8706_device::read(offs_t offset)
{
return 0;
}
@@ -69,6 +69,6 @@ READ8_MEMBER( mos8706_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( mos8706_device::write )
+void mos8706_device::write(offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/machine/mos8706.h b/src/devices/machine/mos8706.h
index a3a6247bf5a..a1d1a225e0e 100644
--- a/src/devices/machine/mos8706.h
+++ b/src/devices/machine/mos8706.h
@@ -40,8 +40,8 @@ class mos8706_device : public device_t
public:
mos8706_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/mpu401.cpp b/src/devices/machine/mpu401.cpp
index a07587be87e..0103e51ceca 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -153,28 +153,28 @@ void mpu401_device::device_timer(emu_timer &timer, device_timer_id tid, int para
m_ourcpu->m6801_clock_serial();
}
-READ8_MEMBER(mpu401_device::port1_r)
+uint8_t mpu401_device::port1_r()
{
return 0xff;
}
-WRITE8_MEMBER(mpu401_device::port1_w)
+void mpu401_device::port1_w(uint8_t data)
{
// printf("port1_w: %02x met %x syncout %x DSRD %d DRRD %d\n", data, data & 3, (data>>3) & 3, (data>>6) & 1, (data>>7) & 1);
}
-READ8_MEMBER(mpu401_device::port2_r)
+uint8_t mpu401_device::port2_r()
{
// printf("%s Read P2\n", machine().describe_context().c_str());
return m_port2;
}
-WRITE8_MEMBER(mpu401_device::port2_w)
+void mpu401_device::port2_w(uint8_t data)
{
// printf("port2_w: %02x SYCOUT %d SYCIN %d SRCK %d MIDI OUT %d\n", data, (data & 1), (data>>1) & 1, (data>>2) & 1, (data>>4) & 1);
}
-READ8_MEMBER(mpu401_device::mpu_r)
+uint8_t mpu401_device::mpu_r(offs_t offset)
{
// printf("mpu_r @ %d\n", offset);
@@ -190,7 +190,7 @@ READ8_MEMBER(mpu401_device::mpu_r)
}
}
-WRITE8_MEMBER(mpu401_device::mpu_w)
+void mpu401_device::mpu_w(offs_t offset, uint8_t data)
{
// printf("%02x to MPU-401 @ %d\n", data, offset);
m_command = data;
@@ -206,7 +206,7 @@ WRITE8_MEMBER(mpu401_device::mpu_w)
}
}
-READ8_MEMBER(mpu401_device::asic_r)
+uint8_t mpu401_device::asic_r(offs_t offset)
{
if (offset == 0)
{
@@ -221,7 +221,7 @@ READ8_MEMBER(mpu401_device::asic_r)
return 0xff;
}
-WRITE8_MEMBER(mpu401_device::asic_w)
+void mpu401_device::asic_w(offs_t offset, uint8_t data)
{
// printf("MPU401: %02x to gate array @ %d\n", data, offset);
@@ -234,7 +234,7 @@ WRITE8_MEMBER(mpu401_device::asic_w)
}
// MIDI receive
-WRITE_LINE_MEMBER( mpu401_device::midi_rx_w )
+void mpu401_device::midi_rx_w(int state)
{
if (state == ASSERT_LINE)
{
diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h
index 1cd4583b454..6a51a8f3e91 100644
--- a/src/devices/machine/mpu401.h
+++ b/src/devices/machine/mpu401.h
@@ -20,8 +20,8 @@ public:
auto irq_cb() { return write_irq.bind(); }
// public API - call for reads/writes at I/O 330/331 on PC, C0n0/C0n1 on Apple II, etc.
- DECLARE_READ8_MEMBER(mpu_r);
- DECLARE_WRITE8_MEMBER(mpu_w);
+ uint8_t mpu_r(offs_t offset);
+ void mpu_w(offs_t offset, uint8_t data);
protected:
// device-level overrides
@@ -32,14 +32,14 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
private:
- DECLARE_WRITE_LINE_MEMBER(midi_rx_w);
-
- DECLARE_READ8_MEMBER(asic_r);
- DECLARE_WRITE8_MEMBER(asic_w);
- DECLARE_READ8_MEMBER(port1_r);
- DECLARE_WRITE8_MEMBER(port1_w);
- DECLARE_READ8_MEMBER(port2_r);
- DECLARE_WRITE8_MEMBER(port2_w);
+ void midi_rx_w(int state);
+
+ uint8_t asic_r(offs_t offset);
+ void asic_w(offs_t offset, uint8_t data);
+ uint8_t port1_r();
+ void port1_w(uint8_t data);
+ uint8_t port2_r();
+ void port2_w(uint8_t data);
void mpu401_map(address_map &map);
diff --git a/src/devices/machine/msm6253.cpp b/src/devices/machine/msm6253.cpp
index 6653156c826..53a47b2152e 100644
--- a/src/devices/machine/msm6253.cpp
+++ b/src/devices/machine/msm6253.cpp
@@ -78,7 +78,7 @@ ioport_value msm6253_device::port_read()
// one of four internal latches
//-------------------------------------------------
-WRITE8_MEMBER(msm6253_device::address_w)
+void msm6253_device::address_w(offs_t offset, u8 data)
{
// fill the shift register from the internal A/D latch
m_shift_register = m_analog_input_cb[offset & 3]();
@@ -88,7 +88,7 @@ WRITE8_MEMBER(msm6253_device::address_w)
// select_w - write D0/D1 to address latch
//-------------------------------------------------
-WRITE8_MEMBER(msm6253_device::select_w)
+void msm6253_device::select_w(offs_t offset, u8 data)
{
// fill the shift register from the internal A/D latch
m_shift_register = m_analog_input_cb[data & 3]();
@@ -115,7 +115,7 @@ bool msm6253_device::shift_out()
// d0_r - shift data bit out to D0
//-------------------------------------------------
-READ8_MEMBER(msm6253_device::d0_r)
+u8 msm6253_device::d0_r(address_space &space)
{
// offset is ignored
return shift_out() | (space.unmap() & 0xfe);
@@ -125,7 +125,7 @@ READ8_MEMBER(msm6253_device::d0_r)
// d7_r - shift data bit out to D7
//-------------------------------------------------
-READ8_MEMBER(msm6253_device::d7_r)
+u8 msm6253_device::d7_r(address_space &space)
{
// offset is ignored
return (shift_out() << 7) | (space.unmap() & 0x7f);
diff --git a/src/devices/machine/msm6253.h b/src/devices/machine/msm6253.h
index 8830c7dc969..b784bb9aec3 100644
--- a/src/devices/machine/msm6253.h
+++ b/src/devices/machine/msm6253.h
@@ -42,13 +42,13 @@ public:
template <unsigned P, typename... T> void set_input_cb(T &&... args) { m_analog_input_cb[P].set(std::forward<T>(args)...); }
// write handlers
- WRITE8_MEMBER(address_w);
- WRITE8_MEMBER(select_w);
+ void address_w(offs_t offset, u8 data);
+ void select_w(offs_t offset, u8 data);
// read handlers
bool shift_out();
- READ8_MEMBER(d0_r);
- READ8_MEMBER(d7_r);
+ u8 d0_r(address_space &space);
+ u8 d7_r(address_space &space);
protected:
// device-level overrides
diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h
index 8a97b76c29f..5cc96b83862 100644
--- a/src/devices/machine/nscsi_cb.h
+++ b/src/devices/machine/nscsi_cb.h
@@ -26,29 +26,28 @@ public:
virtual void scsi_ctrl_changed() override;
uint8_t read() { return scsi_bus->data_r(); }
- DECLARE_READ8_MEMBER( read ) { return read(); }
+
void write(uint8_t data) { scsi_bus->data_w(scsi_refid, data); }
- DECLARE_WRITE8_MEMBER( write ) { write(data); }
- DECLARE_READ_LINE_MEMBER( rst_r ) { return (m_ctrl & S_RST) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( atn_r ) { return (m_ctrl & S_ATN) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( ack_r ) { return (m_ctrl & S_ACK) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( req_r ) { return (m_ctrl & S_REQ) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( msg_r ) { return (m_ctrl & S_MSG) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( io_r ) { return (m_ctrl & S_INP) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( cd_r ) { return (m_ctrl & S_CTL) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( sel_r ) { return (m_ctrl & S_SEL) ? 1 : 0; }
- DECLARE_READ_LINE_MEMBER( bsy_r ) { return (m_ctrl & S_BSY) ? 1 : 0; }
+ int rst_r() { return (m_ctrl & S_RST) ? 1 : 0; }
+ int atn_r() { return (m_ctrl & S_ATN) ? 1 : 0; }
+ int ack_r() { return (m_ctrl & S_ACK) ? 1 : 0; }
+ int req_r() { return (m_ctrl & S_REQ) ? 1 : 0; }
+ int msg_r() { return (m_ctrl & S_MSG) ? 1 : 0; }
+ int io_r() { return (m_ctrl & S_INP) ? 1 : 0; }
+ int cd_r() { return (m_ctrl & S_CTL) ? 1 : 0; }
+ int sel_r() { return (m_ctrl & S_SEL) ? 1 : 0; }
+ int bsy_r() { return (m_ctrl & S_BSY) ? 1 : 0; }
- DECLARE_WRITE_LINE_MEMBER( rst_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_RST : 0, S_RST); }
- DECLARE_WRITE_LINE_MEMBER( atn_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_ATN : 0, S_ATN); }
- DECLARE_WRITE_LINE_MEMBER( ack_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_ACK : 0, S_ACK); }
- DECLARE_WRITE_LINE_MEMBER( req_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_REQ : 0, S_REQ); }
- DECLARE_WRITE_LINE_MEMBER( msg_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_MSG : 0, S_MSG); }
- DECLARE_WRITE_LINE_MEMBER( io_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_INP : 0, S_INP); }
- DECLARE_WRITE_LINE_MEMBER( cd_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_CTL : 0, S_CTL); }
- DECLARE_WRITE_LINE_MEMBER( sel_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_SEL : 0, S_SEL); }
- DECLARE_WRITE_LINE_MEMBER( bsy_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_BSY : 0, S_BSY); }
+ void rst_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_RST : 0, S_RST); }
+ void atn_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_ATN : 0, S_ATN); }
+ void ack_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_ACK : 0, S_ACK); }
+ void req_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_REQ : 0, S_REQ); }
+ void msg_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_MSG : 0, S_MSG); }
+ void io_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_INP : 0, S_INP); }
+ void cd_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_CTL : 0, S_CTL); }
+ void sel_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_SEL : 0, S_SEL); }
+ void bsy_w(int state) { scsi_bus->ctrl_w(scsi_refid, state ? S_BSY : 0, S_BSY); }
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index 8f48da0f505..69048e4e32d 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -109,7 +109,7 @@ void pc_fdc_family_device::device_reset()
// Bit 4-7 control the drive motors
-WRITE8_MEMBER( pc_fdc_family_device::dor_w )
+void pc_fdc_family_device::dor_w(uint8_t data)
{
LOG("dor = %02x\n", data);
uint8_t pdor = dor;
@@ -131,17 +131,17 @@ WRITE8_MEMBER( pc_fdc_family_device::dor_w )
fdc->reset();
}
-READ8_MEMBER( pc_fdc_family_device::dor_r )
+uint8_t pc_fdc_family_device::dor_r()
{
return dor;
}
-READ8_MEMBER( pc_fdc_family_device::dir_r )
+uint8_t pc_fdc_family_device::dir_r()
{
return do_dir_r();
}
-WRITE8_MEMBER( pc_fdc_family_device::ccr_w )
+void pc_fdc_family_device::ccr_w(uint8_t data)
{
static const int rates[4] = { 500000, 300000, 250000, 1000000 };
LOG("ccr = %02x\n", data);
@@ -155,19 +155,19 @@ uint8_t pc_fdc_family_device::do_dir_r()
return 0x00;
}
-WRITE8_MEMBER( pc_fdc_xt_device::dor_fifo_w)
+void pc_fdc_xt_device::dor_fifo_w(uint8_t data)
{
fdc->fifo_w(data);
- dor_w(space, 0, data, mem_mask);
+ dor_w(data);
}
-WRITE_LINE_MEMBER( pc_fdc_family_device::irq_w )
+void pc_fdc_family_device::irq_w(int state)
{
fdc_irq = state;
check_irq();
}
-WRITE_LINE_MEMBER( pc_fdc_family_device::drq_w )
+void pc_fdc_family_device::drq_w(int state)
{
fdc_drq = state;
check_drq();
diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h
index 351542ed881..56438d01499 100644
--- a/src/devices/machine/pc_fdc.h
+++ b/src/devices/machine/pc_fdc.h
@@ -26,10 +26,10 @@ public:
virtual void dma_w(uint8_t data) override;
virtual uint8_t do_dir_r() override;
- READ8_MEMBER(dor_r);
- WRITE8_MEMBER(dor_w);
- READ8_MEMBER(dir_r);
- WRITE8_MEMBER(ccr_w);
+ uint8_t dor_r();
+ void dor_w(uint8_t data);
+ uint8_t dir_r();
+ void ccr_w(uint8_t data);
required_device<upd765a_device> fdc;
@@ -41,8 +41,8 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
private:
- DECLARE_WRITE_LINE_MEMBER( irq_w );
- DECLARE_WRITE_LINE_MEMBER( drq_w );
+ void irq_w(int state);
+ void drq_w(int state);
bool irq, drq, fdc_drq, fdc_irq;
devcb_write_line intrq_cb, drq_cb;
@@ -59,7 +59,7 @@ public:
pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void map(address_map &map) override;
- WRITE8_MEMBER(dor_fifo_w);
+ void dor_fifo_w(uint8_t data);
};
class pc_fdc_at_device : public pc_fdc_family_device {
diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp
index 0d43fbc6eeb..26d2357a72b 100644
--- a/src/devices/machine/pc_lpt.cpp
+++ b/src/devices/machine/pc_lpt.cpp
@@ -77,29 +77,29 @@ void pc_lpt_device::device_add_mconfig(machine_config &config)
}
-READ8_MEMBER( pc_lpt_device::data_r )
+uint8_t pc_lpt_device::data_r()
{
// pull up mechanism for input lines, zeros are provided by peripheral
return m_data & m_cent_data_in->read();
}
-WRITE8_MEMBER( pc_lpt_device::data_w )
+void pc_lpt_device::data_w(uint8_t data)
{
m_data = data;
m_cent_data_out->write(m_data);
}
-READ8_MEMBER( pc_lpt_device::status_r )
+uint8_t pc_lpt_device::status_r()
{
return m_cent_status_in->read() ^ STATUS_BUSY;
}
-READ8_MEMBER( pc_lpt_device::control_r )
+uint8_t pc_lpt_device::control_r()
{
return ~((m_control & m_cent_ctrl_in->read() & 0x3f) ^ CONTROL_INIT);
}
-WRITE8_MEMBER( pc_lpt_device::control_w )
+void pc_lpt_device::control_w(uint8_t data)
{
// logerror("pc_lpt_control_w: 0x%02x\n", data);
@@ -107,13 +107,13 @@ WRITE8_MEMBER( pc_lpt_device::control_w )
m_cent_ctrl_out->write(m_control);
}
-READ8_MEMBER( pc_lpt_device::read )
+uint8_t pc_lpt_device::read(offs_t offset)
{
switch (offset)
{
- case 0: return data_r(space, 0);
- case 1: return status_r(space, 0);
- case 2: return control_r(space, 0);
+ case 0: return data_r();
+ case 1: return status_r();
+ case 2: return control_r();
}
/* if we reach this its an error */
@@ -122,13 +122,13 @@ READ8_MEMBER( pc_lpt_device::read )
return 0xff;
}
-WRITE8_MEMBER( pc_lpt_device::write )
+void pc_lpt_device::write(offs_t offset, uint8_t data)
{
switch (offset)
{
- case 0: data_w(space, 0, data); break;
+ case 0: data_w(data); break;
case 1: break;
- case 2: control_w(space, 0, data); break;
+ case 2: control_w(data); break;
}
}
@@ -147,13 +147,13 @@ void pc_lpt_device::update_irq()
}
}
-WRITE_LINE_MEMBER( pc_lpt_device::write_irq_enabled )
+void pc_lpt_device::write_irq_enabled(int state)
{
m_irq_enabled = state;
update_irq();
}
-WRITE_LINE_MEMBER( pc_lpt_device::write_centronics_ack )
+void pc_lpt_device::write_centronics_ack(int state)
{
m_centronics_ack = state;
m_cent_status_in->write_bit6(state);
diff --git a/src/devices/machine/pc_lpt.h b/src/devices/machine/pc_lpt.h
index 72677832926..911c657baa4 100644
--- a/src/devices/machine/pc_lpt.h
+++ b/src/devices/machine/pc_lpt.h
@@ -26,14 +26,14 @@ public:
// configuration helpers
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);
- DECLARE_READ8_MEMBER( data_r );
- DECLARE_WRITE8_MEMBER( data_w );
- DECLARE_READ8_MEMBER( status_r );
- DECLARE_READ8_MEMBER( control_r );
- DECLARE_WRITE8_MEMBER( control_w );
+ uint8_t data_r();
+ void data_w(uint8_t data);
+ uint8_t status_r();
+ uint8_t control_r( );
+ void control_w(uint8_t data);
protected:
// device-level overrides
@@ -43,8 +43,8 @@ protected:
private:
void update_irq();
- DECLARE_WRITE_LINE_MEMBER( write_irq_enabled );
- DECLARE_WRITE_LINE_MEMBER( write_centronics_ack );
+ void write_irq_enabled(int state);
+ void write_centronics_ack(int state);
enum
{
diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp
index 29559c3cde9..61bc1c5ce0e 100644
--- a/src/devices/machine/pckeybrd.cpp
+++ b/src/devices/machine/pckeybrd.cpp
@@ -360,7 +360,7 @@ void at_keyboard_device::device_reset()
m_leds[1] = 0;
}
-WRITE_LINE_MEMBER(pc_keyboard_device::enable)
+void pc_keyboard_device::enable(int state)
{
if(state && !m_on)
{
@@ -614,7 +614,7 @@ void pc_keyboard_device::polling(void)
}
}
-READ8_MEMBER(pc_keyboard_device::read)
+uint8_t pc_keyboard_device::read()
{
int data;
if (m_tail == m_head)
@@ -688,7 +688,7 @@ Note: each command is acknowledged by FAh (ACK), if not mentioned otherwise.
SeeAlso: #P046
*/
-WRITE8_MEMBER(at_keyboard_device::write)
+void at_keyboard_device::write(uint8_t data)
{
if (LOG_KEYBOARD)
logerror("keyboard write %.2x\n",data);
@@ -775,7 +775,7 @@ WRITE8_MEMBER(at_keyboard_device::write)
if (data & 0x080)
{
/* command received instead of code - execute command */
- write(space, offset, data);
+ write(data);
}
else
{
@@ -799,7 +799,7 @@ WRITE8_MEMBER(at_keyboard_device::write)
if (data & 0x080)
{
/* command received instead of code - execute command */
- write(space, offset, data);
+ write(data);
}
else
{
@@ -830,7 +830,7 @@ WRITE8_MEMBER(at_keyboard_device::write)
if (data & 0x080)
{
/* command received instead of code - execute command */
- write(space, offset, data);
+ write(data);
}
else
{
diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h
index 42a443226f5..ce3d5610ce6 100644
--- a/src/devices/machine/pckeybrd.h
+++ b/src/devices/machine/pckeybrd.h
@@ -22,8 +22,8 @@ class pc_keyboard_device : public device_t
public:
pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE_LINE_MEMBER(enable);
+ uint8_t read();
+ void enable(int state);
auto keypress() { return m_out_keypress_func.bind(); }
@@ -84,7 +84,7 @@ public:
at_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
- DECLARE_WRITE8_MEMBER( write );
+ void write(uint8_t data);
void set_type(KEYBOARD_TYPE type, int default_set) { m_scan_code_set = default_set; m_type = type; }
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 20b0c627dc5..848d70f3344 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -366,43 +366,43 @@ void pdc_device::device_reset()
// I8237 DMA
//-------------------------------------------------
-WRITE_LINE_MEMBER(pdc_device::i8237_hreq_w)
+void pdc_device::i8237_hreq_w(int state)
{
m_pdccpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
m_dma8237->hack_w(state);
}
-WRITE_LINE_MEMBER(pdc_device::i8237_eop_w)
+void pdc_device::i8237_eop_w(int state)
{
m_fdc->tc_w(state);
reg_p38 |= 4; /* ready for 68k ram DMA */
if(state) m_dma8237->dreq1_w(0);
}
-READ8_MEMBER(pdc_device::i8237_dma_mem_r)
+uint8_t pdc_device::i8237_dma_mem_r(offs_t offset)
{
return m_pdccpu->space(AS_PROGRAM).read_byte(offset);
}
-WRITE8_MEMBER(pdc_device::i8237_dma_mem_w)
+void pdc_device::i8237_dma_mem_w(offs_t offset, uint8_t data)
{
m_pdccpu->space(AS_PROGRAM).write_byte(offset,data);
}
-READ8_MEMBER(pdc_device::i8237_fdc_dma_r)
+uint8_t pdc_device::i8237_fdc_dma_r(offs_t offset)
{
uint8_t ret = m_fdc->dma_r();
if(TRACE_PDC_DMA) logerror("PDC: 8237 DMA CHANNEL 0 READ ADDRESS: %08X, DATA: %02X\n", offset, ret );
return ret;
}
-WRITE8_MEMBER(pdc_device::i8237_fdc_dma_w)
+void pdc_device::i8237_fdc_dma_w(offs_t offset, uint8_t data)
{
if(TRACE_PDC_DMA) logerror("PDC: 8237 DMA CHANNEL 0 WRITE ADDRESS: %08X, DATA: %02X\n", offset, data );
m_fdc->dma_w(data);
}
-READ8_MEMBER(pdc_device::m68k_dma_r)
+uint8_t pdc_device::m68k_dma_r()
{
uint32_t address;
uint8_t data;
@@ -413,23 +413,23 @@ READ8_MEMBER(pdc_device::m68k_dma_r)
return data;
}
-WRITE8_MEMBER(pdc_device::m68k_dma_w)
+void pdc_device::m68k_dma_w(uint8_t data)
{
if(TRACE_PDC_DMA) logerror("PDC: 8237 DMA CHANNEL 1 WRITE ADDRESS: %08X, DATA: %02X\n", fdd_68k_dma_address, data );
m_m68k_w_cb(data);
fdd_68k_dma_address++;
}
-WRITE_LINE_MEMBER(pdc_device::hdd_irq)
+void pdc_device::hdd_irq(int state)
{
m_pdccpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE);
}
-WRITE_LINE_MEMBER(pdc_device::fdc_irq)
+void pdc_device::fdc_irq(int state)
{
b_fdc_irq = state != 0;
}
-READ8_MEMBER(pdc_device::p0_7_r)
+uint8_t pdc_device::p0_7_r(offs_t offset)
{
switch(offset)
{
@@ -457,7 +457,7 @@ READ8_MEMBER(pdc_device::p0_7_r)
}
}
-WRITE8_MEMBER(pdc_device::p0_7_w)
+void pdc_device::p0_7_w(offs_t offset, uint8_t data)
{
switch(offset)
{
@@ -477,7 +477,7 @@ WRITE8_MEMBER(pdc_device::p0_7_w)
}
}
-READ8_MEMBER(pdc_device::fdd_68k_r)
+uint8_t pdc_device::fdd_68k_r(offs_t offset)
{
uint8_t address = offset + 0x21;
switch(address)
@@ -487,7 +487,7 @@ READ8_MEMBER(pdc_device::fdd_68k_r)
return 0;
}
}
-WRITE8_MEMBER(pdc_device::fdd_68k_w)
+void pdc_device::fdd_68k_w(offs_t offset, uint8_t data)
{
uint8_t address = offset + 0x21;
switch(address)
@@ -533,21 +533,21 @@ WRITE8_MEMBER(pdc_device::fdd_68k_w)
}
}
-WRITE8_MEMBER(pdc_device::p38_w)
+void pdc_device::p38_w(uint8_t data)
{
if(TRACE_PDC_CMD) logerror("PDC: Port 0x38 WRITE: %i\n", data);
//reg_p38 |= data;
reg_p38 = data;
}
-READ8_MEMBER(pdc_device::p38_r)
+uint8_t pdc_device::p38_r()
{
reg_p38 ^= 0x20; /* Invert bit 5 (32) */
if(TRACE_PDC_CMD) logerror("PDC: Port 0x38 READ: %02X %s\n", reg_p38, machine().describe_context());
return reg_p38;
}
-READ8_MEMBER(pdc_device::p39_r)
+uint8_t pdc_device::p39_r()
{
uint8_t data = 1;
if(b_fdc_irq) data |= 8; // Set bit 3
@@ -555,7 +555,7 @@ READ8_MEMBER(pdc_device::p39_r)
return data;
}
-WRITE8_MEMBER(pdc_device::p50_5f_w)
+void pdc_device::p50_5f_w(offs_t offset, uint8_t data)
{
uint8_t address = 0x50 + offset;
switch(address)
diff --git a/src/devices/machine/pdc.h b/src/devices/machine/pdc.h
index df205ae0b29..a80b97c5fa8 100644
--- a/src/devices/machine/pdc.h
+++ b/src/devices/machine/pdc.h
@@ -41,7 +41,7 @@ public:
auto m68k_w_callback() { return m_m68k_w_cb.bind(); }
/* Read and Write members */
- DECLARE_WRITE_LINE_MEMBER(hdd_irq);
+ void hdd_irq(int state);
/* Main CPU accessible registers */
uint8_t reg_p0;
@@ -66,27 +66,27 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
private:
- DECLARE_WRITE_LINE_MEMBER(i8237_hreq_w);
- DECLARE_WRITE_LINE_MEMBER(i8237_eop_w);
- DECLARE_READ8_MEMBER(i8237_dma_mem_r);
- DECLARE_WRITE8_MEMBER(i8237_dma_mem_w);
- DECLARE_READ8_MEMBER(i8237_fdc_dma_r);
- DECLARE_WRITE8_MEMBER(i8237_fdc_dma_w);
+ void i8237_hreq_w(int state);
+ void i8237_eop_w(int state);
+ uint8_t i8237_dma_mem_r(offs_t offset);
+ void i8237_dma_mem_w(offs_t offset, uint8_t data);
+ uint8_t i8237_fdc_dma_r(offs_t offset);
+ void i8237_fdc_dma_w(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER(m68k_dma_r);
- DECLARE_WRITE8_MEMBER(m68k_dma_w);
+ uint8_t m68k_dma_r();
+ void m68k_dma_w(uint8_t data);
- DECLARE_WRITE_LINE_MEMBER(fdc_irq);
+ void fdc_irq(int state);
DECLARE_FLOPPY_FORMATS( floppy_formats );
- DECLARE_READ8_MEMBER(p0_7_r);
- DECLARE_WRITE8_MEMBER(p0_7_w);
- DECLARE_READ8_MEMBER(fdd_68k_r);
- DECLARE_WRITE8_MEMBER(fdd_68k_w);
- DECLARE_WRITE8_MEMBER(p38_w);
- DECLARE_READ8_MEMBER(p38_r);
- DECLARE_READ8_MEMBER(p39_r);
- DECLARE_WRITE8_MEMBER(p50_5f_w);
+ uint8_t p0_7_r(offs_t offset);
+ void p0_7_w(offs_t offset, uint8_t data);
+ uint8_t fdd_68k_r(offs_t offset);
+ void fdd_68k_w(offs_t offset, uint8_t data);
+ void p38_w(uint8_t data);
+ uint8_t p38_r();
+ uint8_t p39_r();
+ void p50_5f_w(offs_t offset, uint8_t data);
void pdc_io(address_map &map);
void pdc_mem(address_map &map);
diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp
index 1f6dd022aab..ce9140ef7d5 100644
--- a/src/devices/machine/r10696.cpp
+++ b/src/devices/machine/r10696.cpp
@@ -80,7 +80,7 @@ void r10696_device::device_reset()
*
*************************************/
-WRITE8_MEMBER( r10696_device::io_w )
+void r10696_device::io_w(offs_t offset, uint8_t data)
{
assert(offset < 16);
const uint8_t io_a = m_io_a;
@@ -128,7 +128,7 @@ WRITE8_MEMBER( r10696_device::io_w )
}
-READ8_MEMBER( r10696_device::io_r )
+uint8_t r10696_device::io_r(offs_t offset)
{
assert(offset < 16);
uint8_t io_a, io_b, io_c;
diff --git a/src/devices/machine/r10696.h b/src/devices/machine/r10696.h
index 17e0c4e1c84..4b5b7c91d87 100644
--- a/src/devices/machine/r10696.h
+++ b/src/devices/machine/r10696.h
@@ -26,8 +26,8 @@ class r10696_device : public device_t
public:
r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- 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);
/* Set the read and write group (4-bit; nibble) delegates */
auto iord_cb() { return m_iord.bind(); }
diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp
index 95b23c9ec9b..c273c70a4ee 100644
--- a/src/devices/machine/r10788.cpp
+++ b/src/devices/machine/r10788.cpp
@@ -135,7 +135,7 @@ void r10788_device::device_timer(emu_timer &timer, device_timer_id id, int param
*
*************************************/
-WRITE8_MEMBER( r10788_device::io_w )
+void r10788_device::io_w(offs_t offset, uint8_t data)
{
assert(offset < 16);
switch (offset)
@@ -180,7 +180,7 @@ WRITE8_MEMBER( r10788_device::io_w )
}
-READ8_MEMBER( r10788_device::io_r )
+uint8_t r10788_device::io_r(offs_t offset)
{
assert(offset < 16);
uint8_t data = 0xf;
diff --git a/src/devices/machine/r10788.h b/src/devices/machine/r10788.h
index ef783cb5a2d..6b1214328d2 100644
--- a/src/devices/machine/r10788.h
+++ b/src/devices/machine/r10788.h
@@ -36,8 +36,8 @@ public:
KER = 0x6 //!< Reset Keyboard Error
};
- 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);
auto update_cb() { return m_display.bind(); } /* Set the writer used to update a display digit */
diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp
index d45dec77e91..66fc3163da5 100644
--- a/src/devices/machine/ra17xx.cpp
+++ b/src/devices/machine/ra17xx.cpp
@@ -93,7 +93,7 @@ void ra17xx_device::device_reset()
*
*************************************/
-WRITE8_MEMBER( ra17xx_device::io_w )
+void ra17xx_device::io_w(address_space &space, offs_t offset, uint8_t data)
{
assert(offset < 16);
@@ -138,7 +138,7 @@ WRITE8_MEMBER( ra17xx_device::io_w )
}
-READ8_MEMBER( ra17xx_device::io_r )
+uint8_t ra17xx_device::io_r(offs_t offset)
{
assert(offset < 16);
return (m_bl >= 16 || (m_iord(m_bl) & 1)) ? 0x0f : 0x07;
diff --git a/src/devices/machine/ra17xx.h b/src/devices/machine/ra17xx.h
index 1523c8d0b15..11020778f8e 100644
--- a/src/devices/machine/ra17xx.h
+++ b/src/devices/machine/ra17xx.h
@@ -25,8 +25,8 @@ class ra17xx_device : public device_t
public:
ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER ( io_r );
- DECLARE_WRITE8_MEMBER( io_w );
+ uint8_t io_r(offs_t offset);
+ void io_w(address_space &space, offs_t offset, uint8_t data);
auto iord_cb() { return m_iord.bind(); }
auto iowr_cb() { return m_iowr.bind(); }
diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp
index 6bbc68be94e..67850396213 100644
--- a/src/devices/machine/rp5c01.cpp
+++ b/src/devices/machine/rp5c01.cpp
@@ -310,7 +310,7 @@ void rp5c01_device::nvram_write(emu_file &file)
// read -
//-------------------------------------------------
-READ8_MEMBER( rp5c01_device::read )
+uint8_t rp5c01_device::read(offs_t offset)
{
uint8_t data = 0;
offset &= 0x0f;
@@ -355,7 +355,7 @@ READ8_MEMBER( rp5c01_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( rp5c01_device::write )
+void rp5c01_device::write(offs_t offset, uint8_t data)
{
data &= 0x0f;
offset &= 0x0f;
diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h
index 19f2711c67a..a638d5df145 100644
--- a/src/devices/machine/rp5c01.h
+++ b/src/devices/machine/rp5c01.h
@@ -43,10 +43,10 @@ public:
auto out_alarm_callback() { return m_out_alarm_cb.bind(); }
void remove_battery() { m_battery_backed = false; }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ_LINE_MEMBER( alarm_r ) { return m_alarm; }
- DECLARE_WRITE_LINE_MEMBER( adj_w ) { if (state) adjust_seconds(); }
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
+ int alarm_r() { return m_alarm; }
+ void adj_w(int state) { if (state) adjust_seconds(); }
protected:
// construction/destruction
diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp
index 7d9b3b9b320..78d71d42000 100644
--- a/src/devices/machine/rp5c15.cpp
+++ b/src/devices/machine/rp5c15.cpp
@@ -293,7 +293,7 @@ void rp5c15_device::rtc_clock_updated(int year, int month, int day, int day_of_w
// read -
//-------------------------------------------------
-READ8_MEMBER( rp5c15_device::read )
+uint8_t rp5c15_device::read(offs_t offset)
{
uint8_t data = 0;
offset &= 0x0f;
@@ -324,7 +324,7 @@ READ8_MEMBER( rp5c15_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( rp5c15_device::write )
+void rp5c15_device::write(offs_t offset, uint8_t data)
{
data &= 0x0f;
offset &= 0x0f;
diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h
index 156393fc4da..6d4e161ac3e 100644
--- a/src/devices/machine/rp5c15.h
+++ b/src/devices/machine/rp5c15.h
@@ -35,8 +35,8 @@ public:
auto alarm() { return m_out_alarm_cb.bind(); }
auto clkout() { return m_out_clkout_cb.bind(); }
- 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/s2636.cpp b/src/devices/machine/s2636.cpp
index 3d29e76b099..ddc46adf81c 100644
--- a/src/devices/machine/s2636.cpp
+++ b/src/devices/machine/s2636.cpp
@@ -405,7 +405,7 @@ void s2636_device::render_next_line()
// bus access handlers
//-------------------------------------------------
-READ8_MEMBER( s2636_device::read_data )
+uint8_t s2636_device::read_data(offs_t offset)
{
mask_offset(offset);
uint8_t data = m_registers[offset];
@@ -424,7 +424,7 @@ READ8_MEMBER( s2636_device::read_data )
return data;
}
-WRITE8_MEMBER( s2636_device::write_data )
+void s2636_device::write_data(offs_t offset, uint8_t data)
{
mask_offset(offset);
@@ -434,7 +434,7 @@ WRITE8_MEMBER( s2636_device::write_data )
m_registers[offset] = data;
}
-WRITE_LINE_MEMBER( s2636_device::write_intack )
+void s2636_device::write_intack(int state)
{
assert((ASSERT_LINE == state) || (HOLD_LINE == state) || (CLEAR_LINE == state));
diff --git a/src/devices/machine/s2636.h b/src/devices/machine/s2636.h
index befa3cd9e56..bc82ed68903 100644
--- a/src/devices/machine/s2636.h
+++ b/src/devices/machine/s2636.h
@@ -48,10 +48,10 @@ public:
void render_first_line();
void render_next_line();
- DECLARE_READ8_MEMBER( read_data );
- DECLARE_WRITE8_MEMBER( write_data );
+ uint8_t read_data(offs_t offset);
+ void write_data(offs_t offset, uint8_t data);
- DECLARE_WRITE_LINE_MEMBER( write_intack );
+ void write_intack(int state);
protected:
// device-level overrides
diff --git a/src/devices/machine/scc2698b.cpp b/src/devices/machine/scc2698b.cpp
index 5be0dc9b08c..9dcc280fb20 100644
--- a/src/devices/machine/scc2698b.cpp
+++ b/src/devices/machine/scc2698b.cpp
@@ -342,11 +342,11 @@ void scc2698b_channel::recompute_pin_output(bool force)
-WRITE_LINE_MEMBER( scc2698b_channel::mpi0_w )
+void scc2698b_channel::mpi0_w(int state)
{
}
-WRITE_LINE_MEMBER( scc2698b_channel::mpi1_w )
+void scc2698b_channel::mpi1_w(int state)
{
}
@@ -434,19 +434,7 @@ void scc2698b_device::write_line_mpo(int port, int value)
logerror("Unsupported port %d in write_line_mpo\n", port);
}
-
-READ8_MEMBER(scc2698b_device::read)
-{
- return read_reg(offset);
-}
-
-WRITE8_MEMBER(scc2698b_device::write)
-{
- write_reg(offset, data);
-}
-
-
-uint8_t scc2698b_device::read_reg(int offset)
+uint8_t scc2698b_device::read(offs_t offset)
{
int device = (offset >> 4) & 3;
int reg = (offset & 15);
@@ -496,7 +484,7 @@ uint8_t scc2698b_device::read_reg(int offset)
return data;
}
-void scc2698b_device::write_reg(int offset, uint8_t data)
+void scc2698b_device::write(offs_t offset, u8 data)
{
int device = (offset >> 4) & 3;
int reg = (offset & 15);
@@ -576,14 +564,14 @@ void scc2698b_device::write_reg(int offset, uint8_t data)
}
}
-WRITE_LINE_MEMBER(scc2698b_device::port_a_rx_w) { m_channel[0]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_b_rx_w) { m_channel[1]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_c_rx_w) { m_channel[2]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_d_rx_w) { m_channel[3]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_e_rx_w) { m_channel[4]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_f_rx_w) { m_channel[5]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_g_rx_w) { m_channel[6]->rx_w(state); }
-WRITE_LINE_MEMBER(scc2698b_device::port_h_rx_w) { m_channel[7]->rx_w(state); }
+void scc2698b_device::port_a_rx_w(int state) { m_channel[0]->rx_w(state); }
+void scc2698b_device::port_b_rx_w(int state) { m_channel[1]->rx_w(state); }
+void scc2698b_device::port_c_rx_w(int state) { m_channel[2]->rx_w(state); }
+void scc2698b_device::port_d_rx_w(int state) { m_channel[3]->rx_w(state); }
+void scc2698b_device::port_e_rx_w(int state) { m_channel[4]->rx_w(state); }
+void scc2698b_device::port_f_rx_w(int state) { m_channel[5]->rx_w(state); }
+void scc2698b_device::port_g_rx_w(int state) { m_channel[6]->rx_w(state); }
+void scc2698b_device::port_h_rx_w(int state) { m_channel[7]->rx_w(state); }
scc2698b_channel* scc2698b_device::get_channel(int port)
diff --git a/src/devices/machine/scc2698b.h b/src/devices/machine/scc2698b.h
index f693c6df50a..84da53998c5 100644
--- a/src/devices/machine/scc2698b.h
+++ b/src/devices/machine/scc2698b.h
@@ -17,8 +17,8 @@ class scc2698b_channel : public device_t, public device_serial_interface
public:
scc2698b_channel(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE_LINE_MEMBER(mpi0_w);
- DECLARE_WRITE_LINE_MEMBER(mpi1_w);
+ void mpi0_w(int state);
+ void mpi1_w(int state);
virtual void rcv_complete() override; // Rx completed receiving byte
virtual void tra_complete() override; // Tx completed sending byte
@@ -80,11 +80,8 @@ public:
virtual void map(address_map &map);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
-
- void write_reg(int offset, uint8_t data);
- uint8_t read_reg(int offset);
+ void write(offs_t offset, u8 data);
+ uint8_t read(offs_t offset);
auto intr_A() { return write_intr_A.bind(); }
auto intr_B() { return write_intr_B.bind(); }
@@ -93,14 +90,14 @@ public:
required_device_array<scc2698b_channel, 8> m_channel;
- DECLARE_WRITE_LINE_MEMBER(port_a_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_b_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_c_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_d_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_e_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_f_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_g_rx_w);
- DECLARE_WRITE_LINE_MEMBER(port_h_rx_w);
+ void port_a_rx_w(int state);
+ void port_b_rx_w(int state);
+ void port_c_rx_w(int state);
+ void port_d_rx_w(int state);
+ void port_e_rx_w(int state);
+ void port_f_rx_w(int state);
+ void port_g_rx_w(int state);
+ void port_h_rx_w(int state);
void write_line_tx(int port, int value);
diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp
index 4e82cfa1aa8..df6754c8f24 100644
--- a/src/devices/machine/scnxx562.cpp
+++ b/src/devices/machine/scnxx562.cpp
@@ -376,7 +376,7 @@ void duscc_device::z80daisy_irq_reti()
}
}
-READ8_MEMBER( duscc_device::iack )
+uint8_t duscc_device::iack()
{
LOGINT("%s %s - returning vector:%02x\n",tag(), FUNCNAME, m_ivrm);
int vec = z80daisy_irq_ack();
@@ -513,7 +513,7 @@ void duscc_device::trigger_interrupt(int index, int state)
check_interrupts();
}
-READ8_MEMBER( duscc_device::read )
+uint8_t duscc_device::read(offs_t offset)
{
if ( offset & 0x20 )
return m_chanB->read(offset);
@@ -521,7 +521,7 @@ READ8_MEMBER( duscc_device::read )
return m_chanA->read(offset);
}
-WRITE8_MEMBER( duscc_device::write )
+void duscc_device::write(offs_t offset, uint8_t data)
{
if ( offset & 0x20 )
m_chanB->write(data, offset);
@@ -2395,7 +2395,7 @@ void duscc_channel::receive_data(uint8_t data)
// cts_w - clear to send handler
//-------------------------------------------------
-WRITE_LINE_MEMBER( duscc_channel::cts_w )
+void duscc_channel::cts_w(int state)
{
LOG("\"%s\" %s: %c : CTS %u\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
@@ -2425,7 +2425,7 @@ WRITE_LINE_MEMBER( duscc_channel::cts_w )
//-------------------------------------------------
// dcd_w - data carrier detected handler
//-------------------------------------------------
-WRITE_LINE_MEMBER( duscc_channel::dcd_w )
+void duscc_channel::dcd_w(int state)
{
LOG("\"%s\" %s: %c : DCD %u - not implemented\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
#if 0
@@ -2449,7 +2449,7 @@ WRITE_LINE_MEMBER( duscc_channel::dcd_w )
// ri_w - ring indicator handler
//-------------------------------------------------
-WRITE_LINE_MEMBER( duscc_channel::ri_w )
+void duscc_channel::ri_w(int state)
{
LOG("\"%s\" %s: %c : RI %u - not implemented\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
#if 0
@@ -2464,7 +2464,7 @@ WRITE_LINE_MEMBER( duscc_channel::ri_w )
//-------------------------------------------------
// sync_w - sync handler
//-------------------------------------------------
-WRITE_LINE_MEMBER( duscc_channel::sync_w )
+void duscc_channel::sync_w(int state)
{
LOG("\"%s\" %s: %c : SYNC %u - not implemented\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
}
@@ -2472,7 +2472,7 @@ WRITE_LINE_MEMBER( duscc_channel::sync_w )
//-------------------------------------------------
// rxc_w - receive clock
//-------------------------------------------------
-WRITE_LINE_MEMBER( duscc_channel::rxc_w )
+void duscc_channel::rxc_w(int state)
{
LOG("\"%s\" %s: %c : RXC %u - not implemented\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
}
@@ -2480,7 +2480,7 @@ WRITE_LINE_MEMBER( duscc_channel::rxc_w )
//-------------------------------------------------
// txc_w - transmit clock
//-------------------------------------------------
-WRITE_LINE_MEMBER( duscc_channel::txc_w )
+void duscc_channel::txc_w(int state)
{
LOG("\"%s\" %s: %c : TXC %u - not implemented\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
}
@@ -2558,7 +2558,7 @@ void duscc_channel::set_dtr(int state)
// write_rx - called by terminal through rs232/diserial
// when character is sent to board
//-------------------------------------------------
-WRITE_LINE_MEMBER(duscc_channel::write_rx)
+void duscc_channel::write_rx(int state)
{
m_rxd = state;
//only use rx_w when self-clocked
diff --git a/src/devices/machine/scnxx562.h b/src/devices/machine/scnxx562.h
index eb95b8c2370..72f3322a2e5 100644
--- a/src/devices/machine/scnxx562.h
+++ b/src/devices/machine/scnxx562.h
@@ -140,13 +140,13 @@ public:
void m_rx_fifo_rp_step();
uint8_t m_rx_fifo_rp_data();
- DECLARE_WRITE_LINE_MEMBER( write_rx );
- DECLARE_WRITE_LINE_MEMBER( cts_w );
- DECLARE_WRITE_LINE_MEMBER( dcd_w );
- DECLARE_WRITE_LINE_MEMBER( ri_w );
- DECLARE_WRITE_LINE_MEMBER( rxc_w );
- DECLARE_WRITE_LINE_MEMBER( txc_w );
- DECLARE_WRITE_LINE_MEMBER( sync_w );
+ void write_rx(int state);
+ void cts_w(int state);
+ void dcd_w(int state);
+ void ri_w(int state);
+ void rxc_w(int state);
+ void txc_w(int state);
+ void sync_w(int state);
protected:
// device-level overrides
@@ -561,34 +561,34 @@ public:
#endif
}
- 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();
// device_z80daisy_interface overrides
virtual int z80daisy_irq_state() override;
virtual int z80daisy_irq_ack() override;
virtual void z80daisy_irq_reti() override;
- DECLARE_WRITE_LINE_MEMBER( rxa_w ) { m_chanA->write_rx(state); }
- DECLARE_WRITE_LINE_MEMBER( rxb_w ) { m_chanB->write_rx(state); }
- DECLARE_WRITE_LINE_MEMBER( ctsa_w ) { m_chanA->cts_w(state); }
- DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_chanB->cts_w(state); }
- DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_chanA->dcd_w(state); }
- DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_chanB->dcd_w(state); }
- DECLARE_WRITE_LINE_MEMBER( ria_w ) { m_chanA->ri_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rib_w ) { m_chanB->ri_w(state); }
+ void rxa_w(int state) { m_chanA->write_rx(state); }
+ void rxb_w(int state) { m_chanB->write_rx(state); }
+ void ctsa_w(int state) { m_chanA->cts_w(state); }
+ void ctsb_w(int state) { m_chanB->cts_w(state); }
+ void dcda_w(int state) { m_chanA->dcd_w(state); }
+ void dcdb_w(int state) { m_chanB->dcd_w(state); }
+ void ria_w(int state) { m_chanA->ri_w(state); }
+ void rib_w(int state) { m_chanB->ri_w(state); }
#if 0
- DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_chanA->rxc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_chanB->rxc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_chanA->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( txcb_w ) { m_chanB->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxtxcb_w ) { m_chanB->rxc_w(state); m_chanB->txc_w(state); }
+ void rxca_w(int state) { m_chanA->rxc_w(state); }
+ void rxcb_w(int state) { m_chanB->rxc_w(state); }
+ void txca_w(int state) { m_chanA->txc_w(state); }
+ void txcb_w(int state) { m_chanB->txc_w(state); }
+ void rxtxcb_w(int state) { m_chanB->rxc_w(state); m_chanB->txc_w(state); }
#endif
- DECLARE_WRITE_LINE_MEMBER( synca_w ) { m_chanA->sync_w(state); }
- DECLARE_WRITE_LINE_MEMBER( syncb_w ) { m_chanB->sync_w(state); }
+ void synca_w(int state) { m_chanA->sync_w(state); }
+ void syncb_w(int state) { m_chanB->sync_w(state); }
protected:
duscc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant);
diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp
index 32f2524d5eb..c616b4d34a7 100644
--- a/src/devices/machine/serflash.cpp
+++ b/src/devices/machine/serflash.cpp
@@ -162,7 +162,7 @@ void serflash_device::flash_hard_reset()
m_flash_page_index = 0;
}
-WRITE8_MEMBER( serflash_device::flash_enab_w )
+void serflash_device::flash_enab_w(uint8_t data)
{
//logerror("%08x FLASH: enab = %02X\n", m_maincpu->pc(), data);
m_flash_enab = data;
@@ -181,7 +181,7 @@ void serflash_device::flash_change_state(flash_state_t state)
//logerror("flash_change_state - FLASH: state = %s\n", m_flash_state_name[state]);
}
-WRITE8_MEMBER( serflash_device::flash_cmd_w )
+void serflash_device::flash_cmd_w(uint8_t data)
{
if (!m_flash_enab)
return;
@@ -287,7 +287,7 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w )
}
}
-WRITE8_MEMBER( serflash_device::flash_data_w )
+void serflash_device::flash_data_w(uint8_t data)
{
if (!m_flash_enab)
return;
@@ -300,7 +300,7 @@ WRITE8_MEMBER( serflash_device::flash_data_w )
m_flash_page_addr++;
}
-WRITE8_MEMBER( serflash_device::flash_addr_w )
+void serflash_device::flash_addr_w(uint8_t data)
{
if (!m_flash_enab)
return;
@@ -336,7 +336,7 @@ WRITE8_MEMBER( serflash_device::flash_addr_w )
}
}
-READ8_MEMBER( serflash_device::flash_io_r )
+uint8_t serflash_device::flash_io_r()
{
uint8_t data = 0x00;
// uint32_t old;
@@ -395,14 +395,14 @@ READ8_MEMBER( serflash_device::flash_io_r )
return data;
}
-READ8_MEMBER( serflash_device::flash_ready_r )
+uint8_t serflash_device::flash_ready_r()
{
return 1;
}
-READ8_MEMBER(serflash_device::n3d_flash_r)
+uint8_t serflash_device::n3d_flash_r(offs_t offset)
{
if (m_last_flash_cmd==0x70) return 0xe0;
@@ -423,7 +423,7 @@ READ8_MEMBER(serflash_device::n3d_flash_r)
}
-WRITE8_MEMBER(serflash_device::n3d_flash_cmd_w)
+void serflash_device::n3d_flash_cmd_w(offs_t offset, uint8_t data)
{
logerror("n3d_flash_cmd_w %02x %02x\n", offset, data);
m_last_flash_cmd = data;
@@ -437,7 +437,7 @@ WRITE8_MEMBER(serflash_device::n3d_flash_cmd_w)
}
}
-WRITE8_MEMBER(serflash_device::n3d_flash_addr_w)
+void serflash_device::n3d_flash_addr_w(offs_t offset, uint8_t data)
{
// logerror("n3d_flash_addr_w %02x %02x\n", offset, data);
diff --git a/src/devices/machine/serflash.h b/src/devices/machine/serflash.h
index 20077b00263..03181dec73a 100644
--- a/src/devices/machine/serflash.h
+++ b/src/devices/machine/serflash.h
@@ -26,17 +26,17 @@ public:
// configuration
void set_flash_page_size(uint16_t size) { m_flash_page_size = size; }
- DECLARE_READ8_MEMBER( flash_ready_r );
- DECLARE_READ8_MEMBER( flash_io_r );
- DECLARE_WRITE8_MEMBER( flash_addr_w );
- DECLARE_WRITE8_MEMBER( flash_data_w );
- DECLARE_WRITE8_MEMBER( flash_cmd_w );
- DECLARE_WRITE8_MEMBER( flash_enab_w );
+ uint8_t flash_ready_r();
+ uint8_t flash_io_r();
+ void flash_addr_w(uint8_t data);
+ void flash_data_w(uint8_t data);
+ void flash_cmd_w(uint8_t data);
+ void flash_enab_w(uint8_t data);
void flash_hard_reset();
- DECLARE_READ8_MEMBER(n3d_flash_r);
- DECLARE_WRITE8_MEMBER(n3d_flash_cmd_w);
- DECLARE_WRITE8_MEMBER(n3d_flash_addr_w);
+ uint8_t n3d_flash_r(offs_t offset);
+ void n3d_flash_cmd_w(offs_t offset, uint8_t data);
+ void n3d_flash_addr_w(offs_t offset, uint8_t data);
protected:
enum class flash_state_t : u8 { IDLE = 0, READ, READ_ID, READ_STATUS, BLOCK_ERASE, PAGE_PROGRAM };
diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp
index 65616c82a0a..7f7f2046fb5 100644
--- a/src/devices/machine/smioc.cpp
+++ b/src/devices/machine/smioc.cpp
@@ -439,7 +439,7 @@ void smioc_device::update_and_log(u16& reg, u16 newValue, const char* register_n
reg = newValue;
}
-READ8_MEMBER(smioc_device::ram2_mmio_r)
+u8 smioc_device::ram2_mmio_r(offs_t offset)
{
const char *description = "";
u8 data = m_logic_ram[offset & 0xFFF];
@@ -497,7 +497,7 @@ READ8_MEMBER(smioc_device::ram2_mmio_r)
return data;
}
-WRITE8_MEMBER(smioc_device::ram2_mmio_w)
+void smioc_device::ram2_mmio_w(offs_t offset, u8 data)
{
const char *description = "";
@@ -557,7 +557,7 @@ WRITE8_MEMBER(smioc_device::ram2_mmio_w)
LOG_PARAMETER_RAM("ram2[%04X] <= %02X %s\n", offset, data, description);
}
-READ8_MEMBER(smioc_device::dma68k_r)
+u8 smioc_device::dma68k_r(offs_t offset)
{
u8 data = 0;
@@ -575,7 +575,7 @@ READ8_MEMBER(smioc_device::dma68k_r)
return data;
}
-WRITE8_MEMBER(smioc_device::dma68k_w)
+void smioc_device::dma68k_w(offs_t offset, u8 data)
{
m_dma_timer->adjust(attotime::from_usec(10));
@@ -585,7 +585,7 @@ WRITE8_MEMBER(smioc_device::dma68k_w)
LOG_REGISTER_ACCESS("%s dma68k[%04X] <= %02X\n", machine().time().as_string(), offset, data);
}
-READ8_MEMBER(smioc_device::boardlogic_mmio_r)
+u8 smioc_device::boardlogic_mmio_r(offs_t offset)
{
u8 data = 0xFF;
switch (offset)
@@ -619,7 +619,7 @@ READ8_MEMBER(smioc_device::boardlogic_mmio_r)
return data;
}
-WRITE8_MEMBER(smioc_device::boardlogic_mmio_w)
+void smioc_device::boardlogic_mmio_w(offs_t offset, u8 data)
{
switch (offset)
{
@@ -695,16 +695,16 @@ void smioc_device::AdvanceStatus2()
}
-READ8_MEMBER(smioc_device::dma8237_2_dmaread)
+u8 smioc_device::dma8237_2_dmaread(offs_t offset)
{
int data = m_smioccpu->space(AS_PROGRAM).read_byte(offset);
LOG_REGISTER_ACCESS("dma2read [0x%x] => 0x%x\n", offset, data);
- m_scc2698b->write_reg(0x03, data);
+ m_scc2698b->write(0x03, data);
return data;
}
-WRITE8_MEMBER(smioc_device::dma8237_2_dmawrite)
+void smioc_device::dma8237_2_dmawrite(offs_t offset, u8 data)
{
- data = m_scc2698b->read_reg(0x03);
+ data = m_scc2698b->read(0x03);
LOG_REGISTER_ACCESS("dma2write [0x%x] <= 0x%x\n", offset, data);
m_smioccpu->space(AS_PROGRAM).write_byte(offset, data);
}
diff --git a/src/devices/machine/smioc.h b/src/devices/machine/smioc.h
index 61cfbe88f62..a75a5b33ed3 100644
--- a/src/devices/machine/smioc.h
+++ b/src/devices/machine/smioc.h
@@ -44,17 +44,17 @@ public:
auto m68k_w_callback() { return m_m68k_w_cb.bind(); }
- DECLARE_READ8_MEMBER(ram2_mmio_r);
- DECLARE_WRITE8_MEMBER(ram2_mmio_w);
+ u8 ram2_mmio_r(offs_t offset);
+ void ram2_mmio_w(offs_t offset, u8 data);
- DECLARE_READ8_MEMBER(dma68k_r);
- DECLARE_WRITE8_MEMBER(dma68k_w);
+ u8 dma68k_r(offs_t offset);
+ void dma68k_w(offs_t offset, u8 data);
- DECLARE_READ8_MEMBER(dma8237_2_dmaread);
- DECLARE_WRITE8_MEMBER(dma8237_2_dmawrite);
+ u8 dma8237_2_dmaread(offs_t offset);
+ void dma8237_2_dmawrite(offs_t offset, u8 data);
- DECLARE_READ8_MEMBER(boardlogic_mmio_r);
- DECLARE_WRITE8_MEMBER(boardlogic_mmio_w);
+ u8 boardlogic_mmio_r(offs_t offset);
+ void boardlogic_mmio_w(offs_t offset, u8 data);
int m_activePortIndex;
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index 440f8e06f78..17623c54da4 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -340,7 +340,7 @@ device_memory_interface::space_config_vector smpc_hle_device::memory_space_confi
// READ/WRITE HANDLERS
//**************************************************************************
-WRITE8_MEMBER( smpc_hle_device::ireg_w )
+void smpc_hle_device::ireg_w(offs_t offset, uint8_t data)
{
if (!(offset & 1)) // avoid writing to even bytes
return;
@@ -371,7 +371,7 @@ WRITE8_MEMBER( smpc_hle_device::ireg_w )
}
}
-READ8_MEMBER( smpc_hle_device::oreg_r )
+uint8_t smpc_hle_device::oreg_r(offs_t offset)
{
if (!(offset & 1)) // avoid reading to even bytes (TODO: is it 0s or 1s?)
return 0x00;
@@ -379,38 +379,38 @@ READ8_MEMBER( smpc_hle_device::oreg_r )
return m_oreg[offset >> 1];
}
-READ8_MEMBER( smpc_hle_device::status_register_r )
+uint8_t smpc_hle_device::status_register_r()
{
return m_sr;
}
-READ8_MEMBER( smpc_hle_device::status_flag_r )
+uint8_t smpc_hle_device::status_flag_r()
{
// bit 3: CD enable related?
return (m_sf<<0) | (m_cd_sf<<3);
}
-WRITE8_MEMBER( smpc_hle_device::status_flag_w )
+void smpc_hle_device::status_flag_w(uint8_t data)
{
m_sf = BIT(data,0);
m_cd_sf = false;
}
-READ8_MEMBER( smpc_hle_device::pdr1_r )
+uint8_t smpc_hle_device::pdr1_r()
{
uint8_t res = (m_pdr1_read() & ~m_ddr1) | m_pdr1_readback;
return res;
}
-READ8_MEMBER( smpc_hle_device::pdr2_r )
+uint8_t smpc_hle_device::pdr2_r()
{
uint8_t res = (m_pdr2_read() & ~m_ddr2) | m_pdr2_readback;
return res;
}
-WRITE8_MEMBER( smpc_hle_device::pdr1_w )
+void smpc_hle_device::pdr1_w(uint8_t data)
{
// pins defined as output returns in input
m_pdr1_readback = (data & m_ddr1);
@@ -420,7 +420,7 @@ WRITE8_MEMBER( smpc_hle_device::pdr1_w )
m_pdr1_readback |= data & 0x80;
}
-WRITE8_MEMBER( smpc_hle_device::pdr2_w )
+void smpc_hle_device::pdr2_w(uint8_t data)
{
// pins defined as output returns in input
m_pdr2_readback = (data & m_ddr2);
@@ -430,23 +430,23 @@ WRITE8_MEMBER( smpc_hle_device::pdr2_w )
m_pdr2_readback |= data & 0x80;
}
-WRITE8_MEMBER( smpc_hle_device::ddr1_w )
+void smpc_hle_device::ddr1_w(uint8_t data)
{
m_ddr1 = data & 0x7f;
}
-WRITE8_MEMBER( smpc_hle_device::ddr2_w )
+void smpc_hle_device::ddr2_w(uint8_t data)
{
m_ddr2 = data & 0x7f;
}
-WRITE8_MEMBER( smpc_hle_device::iosel_w )
+void smpc_hle_device::iosel_w(uint8_t data)
{
m_iosel1 = BIT(data,0);
m_iosel2 = BIT(data,1);
}
-WRITE8_MEMBER( smpc_hle_device::exle_w )
+void smpc_hle_device::exle_w(uint8_t data)
{
m_exle1 = BIT(data,0);
m_exle2 = BIT(data,1);
@@ -499,12 +499,12 @@ inline void smpc_hle_device::irq_request()
// TODO: trampolines that needs to go away
-READ8_MEMBER( smpc_hle_device::read )
+uint8_t smpc_hle_device::read(offs_t offset)
{
return this->space().read_byte(offset);
}
-WRITE8_MEMBER( smpc_hle_device::write )
+void smpc_hle_device::write(offs_t offset, uint8_t data)
{
this->space().write_byte(offset,data);
}
@@ -513,7 +513,7 @@ WRITE8_MEMBER( smpc_hle_device::write )
// Command simulation
//**************************************************************************
-WRITE8_MEMBER( smpc_hle_device::command_register_w )
+void smpc_hle_device::command_register_w(uint8_t data)
{
// don't send a command if previous one is still in progress
// ST-V tries to send a sysres command if OREG31 doesn't return the ack command
diff --git a/src/devices/machine/smpc.h b/src/devices/machine/smpc.h
index e832cdd2558..f727b4852e4 100644
--- a/src/devices/machine/smpc.h
+++ b/src/devices/machine/smpc.h
@@ -31,8 +31,8 @@ public:
// I/O operations
// void io_map(address_map &map);
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
DECLARE_INPUT_CHANGED_MEMBER( trigger_nmi_r );
@@ -177,20 +177,20 @@ private:
void smpc_regs(address_map &map);
- DECLARE_WRITE8_MEMBER( ireg_w );
- DECLARE_WRITE8_MEMBER( command_register_w );
- DECLARE_READ8_MEMBER( oreg_r );
- DECLARE_READ8_MEMBER( status_register_r );
- DECLARE_WRITE8_MEMBER( status_flag_w );
- DECLARE_READ8_MEMBER( status_flag_r );
- DECLARE_READ8_MEMBER( pdr1_r );
- DECLARE_READ8_MEMBER( pdr2_r );
- DECLARE_WRITE8_MEMBER( pdr1_w );
- DECLARE_WRITE8_MEMBER( pdr2_w );
- DECLARE_WRITE8_MEMBER( ddr1_w );
- DECLARE_WRITE8_MEMBER( ddr2_w );
- DECLARE_WRITE8_MEMBER( iosel_w );
- DECLARE_WRITE8_MEMBER( exle_w );
+ void ireg_w(offs_t offset, uint8_t data);
+ void command_register_w(uint8_t data);
+ uint8_t oreg_r(offs_t offset);
+ uint8_t status_register_r();
+ void status_flag_w(uint8_t data);
+ uint8_t status_flag_r();
+ uint8_t pdr1_r();
+ uint8_t pdr2_r();
+ void pdr1_w(uint8_t data);
+ void pdr2_w(uint8_t data);
+ void ddr1_w(uint8_t data);
+ void ddr2_w(uint8_t data);
+ void iosel_w(uint8_t data);
+ void exle_w(uint8_t data);
};
diff --git a/src/devices/machine/swtpc8212.cpp b/src/devices/machine/swtpc8212.cpp
index bd7b33e23e9..68af9d42e07 100644
--- a/src/devices/machine/swtpc8212.cpp
+++ b/src/devices/machine/swtpc8212.cpp
@@ -168,7 +168,7 @@ swtpc8212_device::swtpc8212_device(const machine_config &mconfig, const char *ta
{
}
-WRITE8_MEMBER(swtpc8212_device::latch_w)
+void swtpc8212_device::latch_w(uint8_t data)
{
// Bits 0 to 3 control outputs that are intended to control and tape
// 'read' and 'punch' operations. These are strobes, about 10usec, and
@@ -206,7 +206,7 @@ WRITE8_MEMBER(swtpc8212_device::latch_w)
}
-READ8_MEMBER(swtpc8212_device::pia0_pa_r)
+uint8_t swtpc8212_device::pia0_pa_r()
{
// PA0 controls the 'duplex' mode, the echoing back of characters, and
// appears to connect to a switch on the outer casing.
@@ -221,7 +221,7 @@ READ8_MEMBER(swtpc8212_device::pia0_pa_r)
return (m_keypad_data << 4) | config;
}
-READ8_MEMBER(swtpc8212_device::pia0_pb_r)
+uint8_t swtpc8212_device::pia0_pb_r()
{
return m_keyboard_data;
}
@@ -256,7 +256,7 @@ INPUT_CHANGED_MEMBER(swtpc8212_device::keypad_changed)
}
}
-WRITE_LINE_MEMBER(swtpc8212_device::pia0_ca2_w)
+void swtpc8212_device::pia0_ca2_w(int state)
{
if (state == 0)
{
@@ -265,19 +265,19 @@ WRITE_LINE_MEMBER(swtpc8212_device::pia0_ca2_w)
}
}
-WRITE8_MEMBER(swtpc8212_device::pia1_pa_w)
+void swtpc8212_device::pia1_pa_w(uint8_t data)
{
// External parallel printer data output.
m_printer_data = data;
}
-READ_LINE_MEMBER(swtpc8212_device::pia1_ca1_r)
+int swtpc8212_device::pia1_ca1_r()
{
// External parallel printer busy input.
return 0;
}
-WRITE_LINE_MEMBER(swtpc8212_device::pia1_ca2_w)
+void swtpc8212_device::pia1_ca2_w(int state)
{
// External parallel printer data ready.
@@ -339,42 +339,42 @@ void swtpc8212_device::device_timer(emu_timer &timer, device_timer_id id, int pa
}
}
-WRITE_LINE_MEMBER(swtpc8212_device::rs232_conn_dcd_w)
+void swtpc8212_device::rs232_conn_dcd_w(int state)
{
m_uart->dcd_w(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::rs232_conn_dsr_w)
+void swtpc8212_device::rs232_conn_dsr_w(int state)
{
m_uart->dsr_w(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::rs232_conn_ri_w)
+void swtpc8212_device::rs232_conn_ri_w(int state)
{
m_uart->ri_w(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::rs232_conn_cts_w)
+void swtpc8212_device::rs232_conn_cts_w(int state)
{
m_uart->cts_w(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::rs232_conn_rxd_w)
+void swtpc8212_device::rs232_conn_rxd_w(int state)
{
m_uart->rx_w(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::write_txd)
+void swtpc8212_device::write_txd(int state)
{
m_rs232_conn_txd_handler(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::write_dtr)
+void swtpc8212_device::write_dtr(int state)
{
m_rs232_conn_dtr_handler(state);
}
-WRITE_LINE_MEMBER(swtpc8212_device::write_rts)
+void swtpc8212_device::write_rts(int state)
{
m_rs232_conn_rts_handler(state);
}
diff --git a/src/devices/machine/swtpc8212.h b/src/devices/machine/swtpc8212.h
index 7f2ed05ad68..343d182de4b 100644
--- a/src/devices/machine/swtpc8212.h
+++ b/src/devices/machine/swtpc8212.h
@@ -27,11 +27,11 @@ public:
auto rs232_conn_txd_handler() { return m_rs232_conn_txd_handler.bind(); }
auto rs232_conn_dtr_handler() { return m_rs232_conn_dtr_handler.bind(); }
auto rs232_conn_rts_handler() { return m_rs232_conn_rts_handler.bind(); }
- DECLARE_WRITE_LINE_MEMBER(rs232_conn_dcd_w);
- DECLARE_WRITE_LINE_MEMBER(rs232_conn_dsr_w);
- DECLARE_WRITE_LINE_MEMBER(rs232_conn_ri_w);
- DECLARE_WRITE_LINE_MEMBER(rs232_conn_cts_w);
- DECLARE_WRITE_LINE_MEMBER(rs232_conn_rxd_w);
+ void rs232_conn_dcd_w(int state);
+ void rs232_conn_dsr_w(int state);
+ void rs232_conn_ri_w(int state);
+ void rs232_conn_cts_w(int state);
+ void rs232_conn_rxd_w(int state);
protected:
swtpc8212_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -74,16 +74,16 @@ private:
MC6845_UPDATE_ROW(update_row);
- DECLARE_WRITE8_MEMBER(latch_w);
+ void latch_w(uint8_t data);
uint8_t m_latch_data;
- DECLARE_READ8_MEMBER(pia0_pa_r);
- DECLARE_READ8_MEMBER(pia0_pb_r);
- DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w);
+ uint8_t pia0_pa_r();
+ uint8_t pia0_pb_r();
+ void pia0_ca2_w(int state);
- DECLARE_WRITE8_MEMBER(pia1_pa_w);
- DECLARE_READ_LINE_MEMBER(pia1_ca1_r);
- DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w);
+ void pia1_pa_w(uint8_t data);
+ int pia1_ca1_r();
+ void pia1_ca2_w(int state);
uint8_t m_keyboard_data;
uint8_t m_keypad_data;
@@ -92,9 +92,9 @@ private:
void keyboard_put(uint8_t data);
- DECLARE_WRITE_LINE_MEMBER(write_txd);
- DECLARE_WRITE_LINE_MEMBER(write_dtr);
- DECLARE_WRITE_LINE_MEMBER(write_rts);
+ void write_txd(int state);
+ void write_dtr(int state);
+ void write_rts(int state);
};
DECLARE_DEVICE_TYPE(SWTPC8212, swtpc8212_device)
diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp
index fcceee4ed7a..7c509b03c3d 100644
--- a/src/devices/machine/tms1024.cpp
+++ b/src/devices/machine/tms1024.cpp
@@ -67,13 +67,13 @@ void tms1024_device::device_start()
// handlers
//-------------------------------------------------
-WRITE8_MEMBER(tms1024_device::write_h)
+void tms1024_device::write_h(u8 data)
{
// H1,2,3,4: data for outputs A,B,C,D
m_h = data & 0xf;
}
-READ8_MEMBER(tms1024_device::read_h)
+u8 tms1024_device::read_h()
{
if (!m_ms)
{
@@ -87,13 +87,13 @@ READ8_MEMBER(tms1024_device::read_h)
return m_h;
}
-WRITE8_MEMBER(tms1024_device::write_s)
+void tms1024_device::write_s(uint8_t data)
{
// S0,1,2: select port
m_s = data & 7;
}
-WRITE_LINE_MEMBER(tms1024_device::write_std)
+void tms1024_device::write_std(int state)
{
state = (state) ? 1 : 0;
@@ -114,7 +114,7 @@ WRITE_LINE_MEMBER(tms1024_device::write_std)
m_std = state;
}
-WRITE_LINE_MEMBER(tms1024_device::write_ms)
+void tms1024_device::write_ms(int state)
{
// 0: multiplexer(read) mode, 1: latch(write) mode
m_ms = (state) ? 1 : 0;
diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h
index 3477147d59f..127909d27f2 100644
--- a/src/devices/machine/tms1024.h
+++ b/src/devices/machine/tms1024.h
@@ -69,11 +69,11 @@ public:
auto write_port6_callback() { return m_write_port[5].bind(); }
auto write_port7_callback() { return m_write_port[6].bind(); }
- DECLARE_WRITE8_MEMBER(write_h);
- DECLARE_READ8_MEMBER(read_h);
- DECLARE_WRITE8_MEMBER(write_s);
- DECLARE_WRITE_LINE_MEMBER(write_std);
- DECLARE_WRITE_LINE_MEMBER(write_ms);
+ void write_h(u8 data);
+ u8 read_h();
+ void write_s(u8 data);
+ void write_std(int state);
+ void write_ms(int state);
protected:
tms1024_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp
index d067497567a..6f115084d70 100644
--- a/src/devices/machine/tms5501.cpp
+++ b/src/devices/machine/tms5501.cpp
@@ -219,7 +219,7 @@ void tms5501_device::rcv_complete()
// rb_r - read receiver buffer
//-------------------------------------------------
-READ8_MEMBER( tms5501_device::rb_r )
+uint8_t tms5501_device::rb_r()
{
m_sta &= ~STA_RBL;
m_irq &= ~IRQ_RB;
@@ -234,7 +234,7 @@ READ8_MEMBER( tms5501_device::rb_r )
// xi_r - read external inputs
//-------------------------------------------------
-READ8_MEMBER( tms5501_device::xi_r )
+uint8_t tms5501_device::xi_r()
{
uint8_t data = m_read_xi(0);
@@ -251,7 +251,7 @@ READ8_MEMBER( tms5501_device::xi_r )
// rst_r - read interrupt address
//-------------------------------------------------
-READ8_MEMBER( tms5501_device::rst_r )
+uint8_t tms5501_device::rst_r()
{
return get_vector();
}
@@ -261,7 +261,7 @@ READ8_MEMBER( tms5501_device::rst_r )
// sta_r - read TMS5510 status
//-------------------------------------------------
-READ8_MEMBER( tms5501_device::sta_r )
+uint8_t tms5501_device::sta_r()
{
if(is_transmit_register_empty())
m_sta |= STA_XBE;
@@ -278,7 +278,7 @@ READ8_MEMBER( tms5501_device::sta_r )
// cmd_w - issue discrete commands
//-------------------------------------------------
-WRITE8_MEMBER( tms5501_device::cmd_w )
+void tms5501_device::cmd_w(uint8_t data)
{
if (LOG) logerror("TMS5501 '%s' Command %02x\n", tag(), data);
@@ -317,7 +317,7 @@ WRITE8_MEMBER( tms5501_device::cmd_w )
// rr_w - load rate register
//-------------------------------------------------
-WRITE8_MEMBER( tms5501_device::rr_w )
+void tms5501_device::rr_w(uint8_t data)
{
if (LOG) logerror("TMS5501 '%s' Rate Register %02x\n", tag(), data);
@@ -351,7 +351,7 @@ WRITE8_MEMBER( tms5501_device::rr_w )
// tb_w - load transmitter buffer
//-------------------------------------------------
-WRITE8_MEMBER( tms5501_device::tb_w )
+void tms5501_device::tb_w(uint8_t data)
{
if (LOG) logerror("TMS5501 '%s' Transmitter Buffer %02x\n", tag(), data);
@@ -376,7 +376,7 @@ WRITE8_MEMBER( tms5501_device::tb_w )
// xo_w - load output port
//-------------------------------------------------
-WRITE8_MEMBER( tms5501_device::xo_w )
+void tms5501_device::xo_w(uint8_t data)
{
if (LOG) logerror("TMS5501 '%s' Output %02x\n", tag(), data);
@@ -388,7 +388,7 @@ WRITE8_MEMBER( tms5501_device::xo_w )
// mr_w - load mask register
//-------------------------------------------------
-WRITE8_MEMBER( tms5501_device::mr_w )
+void tms5501_device::mr_w(uint8_t data)
{
if (LOG) logerror("TMS5501 '%s' Mask Register %02x\n", tag(), data);
@@ -402,7 +402,7 @@ WRITE8_MEMBER( tms5501_device::mr_w )
// tmr_w - load interval timer
//-------------------------------------------------
-WRITE8_MEMBER( tms5501_device::tmr_w )
+void tms5501_device::tmr_w(offs_t offset, uint8_t data)
{
if (LOG) logerror("TMS5501 '%s' Timer %u %02x\n", tag(), offset, data);
@@ -414,7 +414,7 @@ WRITE8_MEMBER( tms5501_device::tmr_w )
// rcv_w - receive data write
//-------------------------------------------------
-WRITE_LINE_MEMBER( tms5501_device::rcv_w )
+void tms5501_device::rcv_w(int state)
{
device_serial_interface::rx_w(state);
@@ -435,7 +435,7 @@ WRITE_LINE_MEMBER( tms5501_device::rcv_w )
// xi7_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( tms5501_device::xi7_w )
+void tms5501_device::xi7_w(int state)
{
if (m_cmd & CMD_XI7)
{
@@ -453,7 +453,7 @@ WRITE_LINE_MEMBER( tms5501_device::xi7_w )
// sens_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( tms5501_device::sens_w )
+void tms5501_device::sens_w(int state)
{
if (!m_sens && state)
{
diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h
index 17a1cd19b87..74fae77b586 100644
--- a/src/devices/machine/tms5501.h
+++ b/src/devices/machine/tms5501.h
@@ -56,25 +56,25 @@ public:
auto xi_callback() { return m_read_xi.bind(); }
auto xo_callback() { return m_write_xo.bind(); }
- DECLARE_WRITE_LINE_MEMBER( rcv_w );
+ void rcv_w(int state);
- DECLARE_WRITE_LINE_MEMBER( sens_w );
- DECLARE_WRITE_LINE_MEMBER( xi7_w );
+ void sens_w(int state);
+ void xi7_w(int state);
uint8_t get_vector();
virtual void io_map(address_map &map);
- DECLARE_READ8_MEMBER( rb_r );
- DECLARE_READ8_MEMBER( xi_r );
- DECLARE_READ8_MEMBER( rst_r );
- DECLARE_READ8_MEMBER( sta_r );
- DECLARE_WRITE8_MEMBER( cmd_w );
- DECLARE_WRITE8_MEMBER( rr_w );
- DECLARE_WRITE8_MEMBER( tb_w );
- DECLARE_WRITE8_MEMBER( xo_w );
- DECLARE_WRITE8_MEMBER( mr_w );
- DECLARE_WRITE8_MEMBER( tmr_w );
+ uint8_t rb_r();
+ uint8_t xi_r();
+ uint8_t rst_r();
+ uint8_t sta_r();
+ void cmd_w(uint8_t data);
+ void rr_w(uint8_t data);
+ void tb_w(uint8_t data);
+ void xo_w(uint8_t data);
+ void mr_w(uint8_t data);
+ void tmr_w(offs_t offset, uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp
index 0728a511e8d..62bfc994b1f 100644
--- a/src/devices/machine/tms6100.cpp
+++ b/src/devices/machine/tms6100.cpp
@@ -97,45 +97,45 @@ void m58819_device::device_start()
// external i/o
-WRITE_LINE_MEMBER(tms6100_device::m0_w)
+void tms6100_device::m0_w(int state)
{
m_m0 = (state) ? 1 : 0;
}
-WRITE_LINE_MEMBER(tms6100_device::m1_w)
+void tms6100_device::m1_w(int state)
{
m_m1 = (state) ? 1 : 0;
}
-WRITE_LINE_MEMBER(tms6100_device::cs_w)
+void tms6100_device::cs_w(int state)
{
// chip select pin
m_cs = (state) ? 1 : 0;
}
-WRITE_LINE_MEMBER(tms6100_device::rck_w)
+void tms6100_device::rck_w(int state)
{
// gate/mask for clk
m_rck = (state) ? 1 : 0;
}
-WRITE8_MEMBER(tms6100_device::add_w)
+void tms6100_device::add_w(u8 data)
{
m_add = data & 0xf;
}
-READ8_MEMBER(tms6100_device::data_r)
+u8 tms6100_device::data_r()
{
return m_data & 0xf;
}
-READ_LINE_MEMBER(tms6100_device::data_line_r)
+int tms6100_device::data_line_r()
{
// DATA/ADD8
return (m_data & 8) ? 1 : 0;
}
-WRITE_LINE_MEMBER(tms6100_device::clk_w)
+void tms6100_device::clk_w(int state)
{
// process on falling edge
if (m_clk && !m_rck && !state)
diff --git a/src/devices/machine/tms6100.h b/src/devices/machine/tms6100.h
index ec9c8c55918..b7bfd7b3b45 100644
--- a/src/devices/machine/tms6100.h
+++ b/src/devices/machine/tms6100.h
@@ -88,15 +88,15 @@ public:
// note: in 4-bit mode, use data_r, otherwise use data_line_r
void enable_4bit_mode(bool mode) { m_4bit_mode = mode; }
- DECLARE_WRITE_LINE_MEMBER(m0_w);
- DECLARE_WRITE_LINE_MEMBER(m1_w);
- DECLARE_WRITE_LINE_MEMBER(rck_w);
- DECLARE_WRITE_LINE_MEMBER(cs_w);
- DECLARE_WRITE_LINE_MEMBER(clk_w);
-
- DECLARE_WRITE8_MEMBER(add_w);
- DECLARE_READ8_MEMBER(data_r); // 4bit
- DECLARE_READ_LINE_MEMBER(data_line_r);
+ void m0_w(int state);
+ void m1_w(int state);
+ void rck_w(int state);
+ void cs_w(int state);
+ void clk_w(int state);
+
+ void add_w(u8 data);
+ u8 data_r(); // 4bit
+ int data_line_r();
protected:
tms6100_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp
index 79a29fd539c..64250f7079a 100644
--- a/src/devices/machine/tms9901.cpp
+++ b/src/devices/machine/tms9901.cpp
@@ -314,7 +314,7 @@ void tms9901_device::set_int_line(int n, int state)
(in this order). When configured as outputs, reading returns the latched
values.
*/
-READ8_MEMBER( tms9901_device::read )
+uint8_t tms9901_device::read(offs_t offset)
{
return read_bit(offset)? 0x01 : 0x00;
}
@@ -372,7 +372,7 @@ bool tms9901_device::read_bit(int bit)
15 Clock mode: /RST2; Interrupt mode: Set Mask 15
16..31 Set P(n-16) as output, latch value, and output it
*/
-WRITE8_MEMBER( tms9901_device::write )
+void tms9901_device::write(offs_t offset, uint8_t data)
{
write_bit(offset, data!=0);
}
@@ -486,7 +486,7 @@ void tms9901_device::timer_clock_in(line_state clk)
a CLK line controlled by the CPU, like the TMS99xx systems.
In that case, clock is set to 0.
*/
-WRITE_LINE_MEMBER( tms9901_device::phi_line )
+void tms9901_device::phi_line(int state)
{
if (state==ASSERT_LINE)
{
@@ -573,7 +573,7 @@ void tms9901_device::device_reset()
/*
RST1 input line (active low; using ASSERT/CLEAR).
*/
-WRITE_LINE_MEMBER( tms9901_device::rst1_line )
+void tms9901_device::rst1_line(int state)
{
if (state==ASSERT_LINE) do_reset();
}
diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h
index 510cd4cd18a..7947845601a 100644
--- a/src/devices/machine/tms9901.h
+++ b/src/devices/machine/tms9901.h
@@ -60,13 +60,13 @@ public:
void set_int_line(int pin_number, int state);
- DECLARE_WRITE_LINE_MEMBER( rst1_line );
+ void rst1_line(int state);
// Synchronous clock input
- DECLARE_WRITE_LINE_MEMBER( phi_line );
+ void phi_line(int state);
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
bool read_bit(int bit);
void write_bit(int bit, bool set);
diff --git a/src/devices/machine/upd7004.cpp b/src/devices/machine/upd7004.cpp
index f1bd2482619..e3cfb911864 100644
--- a/src/devices/machine/upd7004.cpp
+++ b/src/devices/machine/upd7004.cpp
@@ -112,7 +112,7 @@ void upd7004_device::device_timer(emu_timer &timer, device_timer_id id, int para
// INTERFACE
//**************************************************************************
-READ8_MEMBER(upd7004_device::read)
+uint8_t upd7004_device::read(offs_t offset)
{
uint8_t data = 0xff;
@@ -135,7 +135,7 @@ READ8_MEMBER(upd7004_device::read)
return data;
}
-WRITE8_MEMBER(upd7004_device::write)
+void upd7004_device::write(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/machine/upd7004.h b/src/devices/machine/upd7004.h
index 05165756d35..11b311b60f2 100644
--- a/src/devices/machine/upd7004.h
+++ b/src/devices/machine/upd7004.h
@@ -44,8 +44,8 @@ public:
auto eoc_ff_callback() { return m_eoc_ff_cb.bind(); }
template <int N> auto in_callback() { return m_in_cb[N].bind(); }
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp
index 9074429ecaf..de46ffe53c5 100644
--- a/src/devices/machine/upd71071.cpp
+++ b/src/devices/machine/upd71071.cpp
@@ -308,7 +308,7 @@ int upd71071_device::dmarq(int state, int channel)
return 0;
}
-READ8_MEMBER(upd71071_device::read)
+uint8_t upd71071_device::read(offs_t offset)
{
uint8_t ret = 0;
@@ -385,7 +385,7 @@ READ8_MEMBER(upd71071_device::read)
return ret;
}
-WRITE8_MEMBER(upd71071_device::write)
+void upd71071_device::write(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h
index 6926dc1b51f..0ccf146f931 100644
--- a/src/devices/machine/upd71071.h
+++ b/src/devices/machine/upd71071.h
@@ -21,10 +21,10 @@ public:
template <unsigned N> auto dma_write_callback() { return m_dma_write_cb[N].bind(); }
template <unsigned N> auto out_dack_callback() { return m_out_dack_cb[N].bind(); }
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
- DECLARE_WRITE_LINE_MEMBER(set_hreq);
- DECLARE_WRITE_LINE_MEMBER(set_eop);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
+ void set_hreq(int state);
+ void set_eop(int state);
int dmarq(int state, int channel);
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp
index 3e48d4e8ebb..a1e118b5412 100644
--- a/src/devices/machine/v3021.cpp
+++ b/src/devices/machine/v3021.cpp
@@ -115,7 +115,7 @@ void v3021_device::device_reset()
// READ/WRITE HANDLERS
//**************************************************************************
-READ8_MEMBER( v3021_device::read )
+uint8_t v3021_device::read()
{
uint8_t calr = (m_cal_val & m_cal_mask) ? 1 : 0;
@@ -123,7 +123,7 @@ READ8_MEMBER( v3021_device::read )
return calr;
}
-WRITE8_MEMBER( v3021_device::write )
+void v3021_device::write(uint8_t data)
{
m_cal_com <<= 1;
m_cal_com |= data & 1;
diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h
index 4f3b4635ea4..cbbe8e3f0e6 100644
--- a/src/devices/machine/v3021.h
+++ b/src/devices/machine/v3021.h
@@ -29,8 +29,8 @@ public:
v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 32'768);
// I/O operations
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( read );
+ void write(uint8_t data);
+ uint8_t read();
TIMER_CALLBACK_MEMBER(timer_callback);
protected:
diff --git a/src/devices/machine/vt82c496.cpp b/src/devices/machine/vt82c496.cpp
index c06dec96565..16d309adb91 100644
--- a/src/devices/machine/vt82c496.cpp
+++ b/src/devices/machine/vt82c496.cpp
@@ -57,14 +57,14 @@ void vt82c496_device::device_reset()
machine().root_device().membank("bios_f0_r")->set_base(&m_rom[0x30000/4]);
}
-READ8_MEMBER(vt82c496_device::read)
+uint8_t vt82c496_device::read(offs_t offset)
{
if(offset == 1)
return m_reg[m_reg_select];
return 0x00;
}
-WRITE8_MEMBER(vt82c496_device::write)
+void vt82c496_device::write(offs_t offset, uint8_t data)
{
if(offset == 0)
m_reg_select = data;
diff --git a/src/devices/machine/vt82c496.h b/src/devices/machine/vt82c496.h
index e00d1186d55..48028579ed2 100644
--- a/src/devices/machine/vt82c496.h
+++ b/src/devices/machine/vt82c496.h
@@ -24,8 +24,9 @@ public:
template <typename T> void set_ramtag(T &&tag) { m_ram.set_tag(std::forward<T>(tag)); }
template <typename T> void set_isatag(T &&tag) { m_rom.set_tag(std::forward<T>(tag)); }
- 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
virtual void device_start() override;
diff --git a/src/devices/machine/wd1000.cpp b/src/devices/machine/wd1000.cpp
index b0dbb182590..f8c879ef20e 100644
--- a/src/devices/machine/wd1000.cpp
+++ b/src/devices/machine/wd1000.cpp
@@ -320,7 +320,7 @@ uint8_t wd1000_device::data_r()
return data;
}
-READ8_MEMBER( wd1000_device::read )
+uint8_t wd1000_device::read(offs_t offset)
{
if ((m_status & S_BSY) && offset != 7)
{
@@ -441,7 +441,7 @@ void wd1000_device::data_w(uint8_t data)
}
}
-WRITE8_MEMBER( wd1000_device::write )
+void wd1000_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x07)
{
diff --git a/src/devices/machine/wd1000.h b/src/devices/machine/wd1000.h
index e7386ee543b..ac2219e8425 100644
--- a/src/devices/machine/wd1000.h
+++ b/src/devices/machine/wd1000.h
@@ -33,11 +33,12 @@ public:
void data_w(uint8_t val);
void set_sector_base(uint32_t base);
- DECLARE_READ8_MEMBER(read);
- DECLARE_WRITE8_MEMBER(write);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
- DECLARE_READ_LINE_MEMBER(intrq_r);
- DECLARE_READ_LINE_MEMBER(drq_r);
+ // declared but not defined?
+ int intrq_r();
+ int drq_r();
protected:
diff --git a/src/devices/machine/wd1010.cpp b/src/devices/machine/wd1010.cpp
index c093c11319b..c845c52fc11 100644
--- a/src/devices/machine/wd1010.cpp
+++ b/src/devices/machine/wd1010.cpp
@@ -292,7 +292,7 @@ int wd1010_device::get_lbasector()
// INTERFACE
//**************************************************************************
-WRITE_LINE_MEMBER( wd1010_device::drdy_w )
+void wd1010_device::drdy_w(int state)
{
if (state)
m_status |= STATUS_RDY;
@@ -300,12 +300,12 @@ WRITE_LINE_MEMBER( wd1010_device::drdy_w )
m_status &= ~STATUS_RDY;
}
-WRITE_LINE_MEMBER( wd1010_device::brdy_w )
+void wd1010_device::brdy_w(int state)
{
m_brdy = state;
}
-READ8_MEMBER( wd1010_device::read )
+uint8_t wd1010_device::read(offs_t offset)
{
// if the controller is busy all reads return the status register
if (m_status & STATUS_BSY)
@@ -358,7 +358,7 @@ READ8_MEMBER( wd1010_device::read )
return 0xff;
}
-WRITE8_MEMBER( wd1010_device::write )
+void wd1010_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x07)
{
diff --git a/src/devices/machine/wd1010.h b/src/devices/machine/wd1010.h
index b5db9975693..3d734af1563 100644
--- a/src/devices/machine/wd1010.h
+++ b/src/devices/machine/wd1010.h
@@ -31,11 +31,11 @@ public:
auto in_data_callback() { return m_in_data_cb.bind(); }
auto out_data_callback() { return m_out_data_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(drdy_w);
- DECLARE_WRITE_LINE_MEMBER(brdy_w);
+ void drdy_w(int state);
+ void brdy_w(int state);
protected:
// device-level overrides
diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp
index b0d58034f6d..981672a70d9 100644
--- a/src/devices/machine/wd11c00_17.cpp
+++ b/src/devices/machine/wd11c00_17.cpp
@@ -238,7 +238,7 @@ void wd11c00_17_device::device_reset()
// io_r -
//-------------------------------------------------
-READ8_MEMBER( wd11c00_17_device::io_r )
+uint8_t wd11c00_17_device::io_r(offs_t offset)
{
uint8_t data = 0xff;
@@ -271,7 +271,7 @@ READ8_MEMBER( wd11c00_17_device::io_r )
// io_w -
//-------------------------------------------------
-WRITE8_MEMBER( wd11c00_17_device::io_w )
+void wd11c00_17_device::io_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -304,7 +304,7 @@ WRITE8_MEMBER( wd11c00_17_device::io_w )
// dack3_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER(wd11c00_17_device::dack3_w)
+void wd11c00_17_device::dack3_w(int state)
{
}
@@ -333,7 +333,7 @@ void wd11c00_17_device::dack_w(uint8_t data)
// read -
//-------------------------------------------------
-READ8_MEMBER( wd11c00_17_device::read )
+uint8_t wd11c00_17_device::read(offs_t offset)
{
uint8_t data = 0;
@@ -358,7 +358,7 @@ READ8_MEMBER( wd11c00_17_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( wd11c00_17_device::write )
+void wd11c00_17_device::write(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -385,7 +385,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
// ireq_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( wd11c00_17_device::ireq_w )
+void wd11c00_17_device::ireq_w(int state)
{
LOG("%s WD11C00-17 IREQ %u\n", machine().describe_context(), state);
@@ -414,7 +414,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::ireq_w )
// io_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( wd11c00_17_device::io_w )
+void wd11c00_17_device::io_w(int state)
{
LOG("%s WD11C00-17 I/O %u\n", machine().describe_context(), state);
@@ -426,7 +426,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::io_w )
// cd_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( wd11c00_17_device::cd_w )
+void wd11c00_17_device::cd_w(int state)
{
LOG("%s WD11C00-17 C/D %u\n", machine().describe_context(), state);
@@ -438,7 +438,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::cd_w )
// clct_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( wd11c00_17_device::clct_w )
+void wd11c00_17_device::clct_w(int state)
{
LOG("%s WD11C00-17 CLCT %u\n", machine().describe_context(), state);
@@ -454,7 +454,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::clct_w )
// mode_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( wd11c00_17_device::mode_w )
+void wd11c00_17_device::mode_w(int state)
{
LOG("%s WD11C00-17 MODE %u\n", machine().describe_context(), state);
@@ -467,7 +467,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::mode_w )
// busy_r -
//-------------------------------------------------
-READ_LINE_MEMBER( wd11c00_17_device::busy_r )
+int wd11c00_17_device::busy_r()
{
return (m_status & STATUS_BUSY) ? 0 : 1;
}
@@ -477,7 +477,7 @@ READ_LINE_MEMBER( wd11c00_17_device::busy_r )
// ecc_not_0_r -
//-------------------------------------------------
-READ_LINE_MEMBER( wd11c00_17_device::ecc_not_0_r )
+int wd11c00_17_device::ecc_not_0_r()
{
return m_ecc_not_0;
}
diff --git a/src/devices/machine/wd11c00_17.h b/src/devices/machine/wd11c00_17.h
index 0b375f61e67..91175d2472d 100644
--- a/src/devices/machine/wd11c00_17.h
+++ b/src/devices/machine/wd11c00_17.h
@@ -36,24 +36,24 @@ public:
auto in_cs1010_callback() { return m_in_cs1010_cb.bind(); }
auto out_cs1010_callback() { return m_out_cs1010_cb.bind(); }
- 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);
- DECLARE_WRITE_LINE_MEMBER( dack3_w );
+ void dack3_w(int state);
uint8_t dack_r();
void dack_w(uint8_t data);
- 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( ireq_w );
- DECLARE_WRITE_LINE_MEMBER( io_w );
- DECLARE_WRITE_LINE_MEMBER( cd_w );
- DECLARE_WRITE_LINE_MEMBER( clct_w );
- DECLARE_WRITE_LINE_MEMBER( mode_w );
+ void ireq_w(int state);
+ void io_w(int state);
+ void cd_w(int state);
+ void clct_w(int state);
+ void mode_w(int state);
- DECLARE_READ_LINE_MEMBER( busy_r );
- DECLARE_READ_LINE_MEMBER( ecc_not_0_r );
+ int busy_r();
+ int ecc_not_0_r();
protected:
// device-level overrides
diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp
index 61f1150bee0..0c316a4c108 100644
--- a/src/devices/machine/wozfdc.cpp
+++ b/src/devices/machine/wozfdc.cpp
@@ -217,7 +217,7 @@ void wozfdc_device::write(offs_t offset, uint8_t data)
last_6502_write = data;
}
-WRITE8_MEMBER(wozfdc_device::set_phase)
+void wozfdc_device::set_phase(uint8_t data)
{
if (floppy && active)
floppy->seek_phase_w(data);
diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h
index 3fae86420b0..6c7a438be17 100644
--- a/src/devices/machine/wozfdc.h
+++ b/src/devices/machine/wozfdc.h
@@ -42,7 +42,7 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
void control(int offset);
- DECLARE_WRITE8_MEMBER(set_phase);
+ void set_phase(uint8_t data);
uint64_t time_to_cycles(const attotime &tm);
attotime cycles_to_time(uint64_t cycles);
void a3_update_drive_sel();
diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp
index 1871d03c4da..84a4e0b565b 100644
--- a/src/devices/machine/x2212.cpp
+++ b/src/devices/machine/x2212.cpp
@@ -136,7 +136,7 @@ void x2212_device::do_recall()
// write - store to the live RAM
//-------------------------------------------------
-WRITE8_MEMBER( x2212_device::write )
+void x2212_device::write(offs_t offset, uint8_t data)
{
assert(offset < m_size_data);
m_sram[offset] = data & 0x0f;
@@ -147,7 +147,7 @@ WRITE8_MEMBER( x2212_device::write )
// read - read from the live RAM
//-------------------------------------------------
-READ8_MEMBER( x2212_device::read )
+u8 x2212_device::read(address_space &space, offs_t offset)
{
assert(offset < m_size_data);
return (m_sram[offset] & 0x0f) | (space.unmap() & 0xf0);
@@ -159,7 +159,7 @@ READ8_MEMBER( x2212_device::read )
// (FIXME: actually active low, not active high)
//-------------------------------------------------
-WRITE_LINE_MEMBER( x2212_device::store )
+void x2212_device::store(int state)
{
if (state != 0 && !m_store)
do_store();
@@ -172,7 +172,7 @@ WRITE_LINE_MEMBER( x2212_device::store )
// (FIXME: actually active low, not active high)
//-------------------------------------------------
-WRITE_LINE_MEMBER( x2212_device::recall )
+void x2212_device::recall(int state)
{
if (state != 0 && !m_array_recall)
do_recall();
diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h
index 4a2fb8ddb56..5fbcb23f532 100644
--- a/src/devices/machine/x2212.h
+++ b/src/devices/machine/x2212.h
@@ -45,11 +45,11 @@ public:
void set_auto_save(bool auto_save) { m_auto_save = auto_save; }
// I/O operations
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ u8 read(address_space &space, offs_t offset);
+ void write(offs_t offset, uint8_t data);
- DECLARE_WRITE_LINE_MEMBER( store );
- DECLARE_WRITE_LINE_MEMBER( recall );
+ void store(int state);
+ void recall(int state);
protected:
x2212_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int size_data);
diff --git a/src/devices/machine/ym3802.cpp b/src/devices/machine/ym3802.cpp
index 603a9d82f53..3f0e8080ba7 100644
--- a/src/devices/machine/ym3802.cpp
+++ b/src/devices/machine/ym3802.cpp
@@ -188,7 +188,7 @@ void ym3802_device::set_comms_mode()
logerror("MIDI comms set to 1 start bit, %i data bits, %s, parity = %i\n",data_bits, (stop_bits == STOP_BITS_2) ? "2 stop bits" : "1 stop bit", parity);
}
-READ8_MEMBER(ym3802_device::read)
+uint8_t ym3802_device::read(offs_t offset)
{
if(offset < 4)
{
@@ -225,7 +225,7 @@ READ8_MEMBER(ym3802_device::read)
}
}
-WRITE8_MEMBER(ym3802_device::write)
+void ym3802_device::write(offs_t offset, uint8_t data)
{
m_wdr = data;
if(offset == 1)
diff --git a/src/devices/machine/ym3802.h b/src/devices/machine/ym3802.h
index 31301fab4f1..68cdf4d535d 100644
--- a/src/devices/machine/ym3802.h
+++ b/src/devices/machine/ym3802.h
@@ -33,8 +33,8 @@ public:
auto irq_handler() { return m_irq_handler.bind(); }
auto txd_handler() { return m_txd_handler.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 vector() { return m_vector; }
diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp
index 31807925847..c47165ef99b 100644
--- a/src/devices/machine/z80scc.cpp
+++ b/src/devices/machine/z80scc.cpp
@@ -852,7 +852,7 @@ int z80scc_device::m1_r()
//-------------------------------------------------
// zbus_r - Z-Bus read
//-------------------------------------------------
-READ8_MEMBER( z80scc_device::zbus_r )
+uint8_t z80scc_device::zbus_r(offs_t offset)
{
offset &= 31;
bool ba = BIT(offset, 4);
@@ -883,7 +883,7 @@ READ8_MEMBER( z80scc_device::zbus_r )
//-------------------------------------------------
// zbus_w - Z-Bus write
//-------------------------------------------------
-WRITE8_MEMBER( z80scc_device::zbus_w )
+void z80scc_device::zbus_w(offs_t offset, uint8_t data)
{
offset &= 31;
bool ba = BIT(offset, 4);
@@ -2664,7 +2664,7 @@ void z80scc_channel::receive_data(uint8_t data)
//-------------------------------------------------
// cts_w - clear to send handler
//-------------------------------------------------
-WRITE_LINE_MEMBER( z80scc_channel::cts_w )
+void z80scc_channel::cts_w(int state)
{
LOG("\"%s\"%s: %c : CTS %u\n", owner()->tag(), FUNCNAME, 'A' + m_index, state);
@@ -2701,7 +2701,7 @@ WRITE_LINE_MEMBER( z80scc_channel::cts_w )
//-------------------------------------------------
// dcd_w - data carrier detected handler
//-------------------------------------------------
-WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
+void z80scc_channel::dcd_w(int state)
{
LOGDCD("\"%s\": %c : DCD %u\n", owner()->tag(), 'A' + m_index, state);
@@ -2740,7 +2740,7 @@ WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
//-------------------------------------------------
// sync_w - sync handler for external sync mode
//-------------------------------------------------
-WRITE_LINE_MEMBER( z80scc_channel::sync_w )
+void z80scc_channel::sync_w(int state)
{
LOGSYNC("\"%s\": %c : SYNC %u\n", owner()->tag(), 'A' + m_index, state);
@@ -2778,7 +2778,7 @@ WRITE_LINE_MEMBER( z80scc_channel::sync_w )
//-------------------------------------------------
// rxc_w - receive clock
//-------------------------------------------------
-WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
+void z80scc_channel::rxc_w(int state)
{
/* Support for external clock as source for BRG yet to be finished */
#if 0
@@ -2830,7 +2830,7 @@ WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
//-------------------------------------------------
// txc_w - transmit clock
//-------------------------------------------------
-WRITE_LINE_MEMBER( z80scc_channel::txc_w )
+void z80scc_channel::txc_w(int state)
{
//LOG("\"%s\": %c : Transmitter Clock Pulse\n", owner()->tag(), m_index + 'A');
if (m_wr5 & WR5_TX_ENABLE)
@@ -2981,7 +2981,7 @@ void z80scc_channel::set_dtr(int state)
// write_rx - called by terminal through rs232/diserial
// when character is sent to board
//-------------------------------------------------
-WRITE_LINE_MEMBER(z80scc_channel::write_rx)
+void z80scc_channel::write_rx(int state)
{
#if START_BIT_HUNT
// Check for start bit if not receiving
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index 4a44c3c9c2c..18d6ffffc55 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -122,12 +122,12 @@ public:
void m_rx_fifo_rp_step();
uint8_t m_rx_fifo_rp_data();
- DECLARE_WRITE_LINE_MEMBER( write_rx );
- DECLARE_WRITE_LINE_MEMBER( cts_w );
- DECLARE_WRITE_LINE_MEMBER( dcd_w );
- DECLARE_WRITE_LINE_MEMBER( rxc_w );
- DECLARE_WRITE_LINE_MEMBER( txc_w );
- DECLARE_WRITE_LINE_MEMBER( sync_w );
+ void write_rx(int state);
+ void cts_w(int state);
+ void dcd_w(int state);
+ void rxc_w(int state);
+ void txc_w(int state);
+ void sync_w(int state);
int m_rxc;
int m_txc;
@@ -369,8 +369,8 @@ public:
uint8_t cb_r(offs_t offset) { return m_chanB->control_read(); }
void cb_w(offs_t offset, uint8_t data) { m_chanB->control_write(data); }
- DECLARE_READ8_MEMBER( zbus_r );
- DECLARE_WRITE8_MEMBER( zbus_w );
+ uint8_t zbus_r(offs_t offset);
+ void zbus_w(offs_t offset, uint8_t data);
// interrupt acknowledge
int m1_r();
@@ -378,19 +378,19 @@ public:
// Single registers instances accessed from both channels
uint8_t m_wr9; // REG_WR9_MASTER_INT_CTRL
- DECLARE_WRITE_LINE_MEMBER( rxa_w ) { m_chanA->write_rx(state); }
- DECLARE_WRITE_LINE_MEMBER( rxb_w ) { m_chanB->write_rx(state); }
- DECLARE_WRITE_LINE_MEMBER( ctsa_w ) { m_chanA->cts_w(state); }
- DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_chanB->cts_w(state); }
- DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_chanA->dcd_w(state); }
- DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_chanB->dcd_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_chanA->rxc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_chanB->rxc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_chanA->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( txcb_w ) { m_chanB->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxtxcb_w ) { m_chanB->rxc_w(state); m_chanB->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( synca_w ) { m_chanA->sync_w(state); }
- DECLARE_WRITE_LINE_MEMBER( syncb_w ) { m_chanB->sync_w(state); }
+ void rxa_w(int state) { m_chanA->write_rx(state); }
+ void rxb_w(int state) { m_chanB->write_rx(state); }
+ void ctsa_w(int state) { m_chanA->cts_w(state); }
+ void ctsb_w(int state) { m_chanB->cts_w(state); }
+ void dcda_w(int state) { m_chanA->dcd_w(state); }
+ void dcdb_w(int state) { m_chanB->dcd_w(state); }
+ void rxca_w(int state) { m_chanA->rxc_w(state); }
+ void rxcb_w(int state) { m_chanB->rxc_w(state); }
+ void txca_w(int state) { m_chanA->txc_w(state); }
+ void txcb_w(int state) { m_chanB->txc_w(state); }
+ void rxtxcb_w(int state) { m_chanB->rxc_w(state); m_chanB->txc_w(state); }
+ void synca_w(int state) { m_chanA->sync_w(state); }
+ void syncb_w(int state) { m_chanB->sync_w(state); }
int update_extint(int i);
int get_extint_priority(int type);
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index a9227fd9f54..3bf157011b7 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -75,7 +75,7 @@ WRITE8_MEMBER( gottlieb_sound_r0_device::write )
uint8_t pb0_3 = data ^ 15;
uint8_t pb4_7 = ioport("SB0")->read() & 0x90;
m_sndcmd = pb0_3 | pb4_7;
- m_r6530->write(space, offset, m_sndcmd);
+ m_r6530->write(offset, m_sndcmd);
}
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index 3cff81a4ba7..48a414880da 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -298,7 +298,7 @@ READ8_MEMBER( amstrad_pc_state::pc1640_port60_r )
if (m_port61&0x80)
data=m_port60;
else
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
@@ -316,7 +316,7 @@ READ8_MEMBER( amstrad_pc_state::pc1640_port60_r )
READ8_MEMBER( amstrad_pc_state::pc200_port378_r )
{
- uint8_t data = m_lpt1->read(space, offset);
+ uint8_t data = m_lpt1->read(offset);
if (offset == 1)
data = (data & ~7) | (ioport("DSW0")->read() & 7);
@@ -328,7 +328,7 @@ READ8_MEMBER( amstrad_pc_state::pc200_port378_r )
READ8_MEMBER( amstrad_pc_state::pc200_port278_r )
{
- uint8_t data = m_lpt2->read(space, offset);
+ uint8_t data = m_lpt2->read(offset);
if (offset == 1)
data = (data & ~7) | (ioport("DSW0")->read() & 7);
@@ -341,7 +341,7 @@ READ8_MEMBER( amstrad_pc_state::pc200_port278_r )
READ8_MEMBER( amstrad_pc_state::pc1640_port378_r )
{
- uint8_t data = m_lpt1->read(space, offset);
+ uint8_t data = m_lpt1->read(offset);
if (offset == 1)
data=(data & ~7) | (ioport("DSW0")->read() & 7);
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index fba33d67549..64da55393f1 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -136,7 +136,7 @@ READ8_MEMBER(argo_state::argo_io_r)
case 0xE8: // wants bit 4 low then high
{
- u8 data = m_dma->read(space, 8);
+ u8 data = m_dma->read(8);
data |= (m_framecnt << 4); // hack because dma update_flag is not emulated
return data;
}
@@ -184,7 +184,7 @@ WRITE8_MEMBER(argo_state::argo_io_w)
memmove(m_p_videoram, m_p_videoram+80, 24*80);
m_scroll_ctrl = 0;
}
- m_dma->write(space, 8, data);
+ m_dma->write(8, data);
break;
default:
diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp
index 00aa18f5a76..0b5f71ce1ba 100644
--- a/src/mame/drivers/asst128.cpp
+++ b/src/mame/drivers/asst128.cpp
@@ -54,7 +54,7 @@ private:
required_device<pc_fdc_xt_device> m_fdc;
DECLARE_FLOPPY_FORMATS(asst128_formats);
- DECLARE_WRITE8_MEMBER(asst128_fdc_dor_w);
+ void asst128_fdc_dor_w(uint8_t data);
void machine_start() override;
void asst128_io(address_map &map);
@@ -68,10 +68,10 @@ void asst128_state::machine_start()
memcpy(font->base() + 0x0400, memregion("bios")->base() + 0x4000, 0x0400);
}
-WRITE8_MEMBER(asst128_state::asst128_fdc_dor_w)
+void asst128_state::asst128_fdc_dor_w(uint8_t data)
{
m_fdc->tc_w((data & 0x80) == 0x80);
- m_fdc->dor_w(space, offset, data, mem_mask);
+ m_fdc->dor_w(data);
}
void asst128_state::asst128_map(address_map &map)
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index d054eba255d..0650a3f9463 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -282,14 +282,14 @@ WRITE_LINE_MEMBER(ccastles_state::nvram_store_w)
READ8_MEMBER(ccastles_state::nvram_r)
{
- return (m_nvram_4b->read(space, offset) & 0x0f) | (m_nvram_4a->read(space, offset) << 4);
+ return (m_nvram_4b->read(space, offset) & 0x0f) | (m_nvram_4a->read(space,offset) << 4);
}
WRITE8_MEMBER(ccastles_state::nvram_w)
{
- m_nvram_4b->write(space, offset, data);
- m_nvram_4a->write(space, offset, data >> 4);
+ m_nvram_4b->write(offset, data);
+ m_nvram_4a->write(offset, data >> 4);
}
diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp
index 77563b5fb26..b5bfce05faa 100644
--- a/src/mame/drivers/compc.cpp
+++ b/src/mame/drivers/compc.cpp
@@ -98,7 +98,7 @@ READ8_MEMBER(compc_state::pio_r)
switch (offset)
{
case 0:
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
data = m_portb;
@@ -146,7 +146,7 @@ READ8_MEMBER(compc_state::pioiii_r)
switch (offset)
{
case 0:
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
data = m_portb;
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 528a4b946d2..404d08354bd 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -260,7 +260,7 @@ uint32_t cv1k_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
READ64_MEMBER( cv1k_state::flash_port_e_r )
{
- return ((m_serflash->flash_ready_r(space, offset) ? 0x20 : 0x00)) | 0xdf;
+ return ((m_serflash->flash_ready_r() ? 0x20 : 0x00)) | 0xdf;
}
@@ -281,7 +281,7 @@ READ8_MEMBER( cv1k_state::flash_io_r )
return 0xff;
case 0x00:
- return m_serflash->flash_io_r(space,offset);
+ return m_serflash->flash_io_r();
}
}
@@ -295,15 +295,15 @@ WRITE8_MEMBER( cv1k_state::flash_io_w )
break;
case 0x00:
- m_serflash->flash_data_w(space, offset, data);
+ m_serflash->flash_data_w( data);
break;
case 0x01:
- m_serflash->flash_cmd_w(space, offset, data);
+ m_serflash->flash_cmd_w(data);
break;
case 0x2:
- m_serflash->flash_addr_w(space, offset, data);
+ m_serflash->flash_addr_w(data);
break;
}
}
@@ -332,7 +332,7 @@ WRITE8_MEMBER( cv1k_state::serial_rtc_eeprom_w )
m_eepromout->write(data, 0xff);
break;
case 0x03:
- m_serflash->flash_enab_w(space,offset,data);
+ m_serflash->flash_enab_w(data);
break;
default:
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index 1b9a274067c..60f78e8710d 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -159,7 +159,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_r)
if (m_s2650_flag)
return m_character_ram[(0 * 0x800) | 0x400 | m_character_ram_page_start | offset];
else
- return m_s2636[0]->read_data(space, offset);
+ return m_s2636[0]->read_data(offset);
}
WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w)
@@ -171,7 +171,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w)
m_gfxdecode->gfx(1)->mark_dirty((offset / 8) % 256);
}
else
- m_s2636[0]->write_data(space, offset, data);
+ m_s2636[0]->write_data(offset, data);
}
@@ -180,7 +180,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_r)
if (m_s2650_flag)
return m_character_ram[(1 * 0x800) | 0x400 | m_character_ram_page_start | offset];
else
- return m_s2636[1]->read_data(space, offset);
+ return m_s2636[1]->read_data(offset);
}
WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w)
@@ -192,7 +192,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w)
m_gfxdecode->gfx(1)->mark_dirty((offset / 8) % 256);
}
else
- m_s2636[1]->write_data(space, offset, data);
+ m_s2636[1]->write_data(offset, data);
}
@@ -201,7 +201,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_r)
if (m_s2650_flag)
return m_character_ram[(2 * 0x800) | 0x400 | m_character_ram_page_start | offset];
else
- return m_s2636[2]->read_data(space, offset);
+ return m_s2636[2]->read_data(offset);
}
WRITE8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_w)
@@ -213,7 +213,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_w)
m_gfxdecode->gfx(1)->mark_dirty((offset / 8) % 256);
}
else
- m_s2636[2]->write_data(space, offset, data);
+ m_s2636[2]->write_data(offset, data);
}
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index d67cadd8e60..cd55e532254 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -547,9 +547,7 @@ GFXDECODE_END
void docastle_state::machine_reset()
{
- int i;
-
- for (i = 0; i < 9; i++)
+ for (int i = 0; i < 9; i++)
{
m_buffer0[i] = 0;
m_buffer1[i] = 0;
@@ -560,11 +558,11 @@ void docastle_state::machine_reset()
m_adpcm_data = -1;
m_adpcm_status = 0;
- for (i = 0; i < 2; i++)
+ for (int i = 0; i < 2; i++)
{
m_inp[i]->write_ms(0); // pin 5 tied low
//m_inp[i]->write_ce(1); // pin 4 tied high
- m_inp[i]->write_s(machine().dummy_space(), 0, 0); // cleared with LS273
+ m_inp[i]->write_s(0); // cleared with LS273
}
flip_screen_set(0); // cleared with LS273
}
diff --git a/src/mame/drivers/eispc.cpp b/src/mame/drivers/eispc.cpp
index 34a164ad1a3..2168bae6b31 100644
--- a/src/mame/drivers/eispc.cpp
+++ b/src/mame/drivers/eispc.cpp
@@ -445,17 +445,17 @@ void epc_state::epc_io(address_map &map)
map(0x03f4, 0x03f5).m(m_fdc, FUNC(i8272a_device::map));
map(0x03bc, 0x03be).lrw8(
- [this](address_space &space, offs_t offset, uint8_t mem_mask) -> uint8_t
+ [this](offs_t offset, uint8_t mem_mask) -> uint8_t
{
- uint8_t data = m_lpt->read(space, offset);
+ uint8_t data = m_lpt->read(offset);
LOGLPT("LPT read offset %02x: %02x\n", offset, data);
return data;
},
"lpt_r",
- [this](address_space &space, offs_t offset, uint8_t data)
+ [this](offs_t offset, uint8_t data)
{
LOGLPT("LPT write offset %02x: %02x\n", offset, data);
- m_lpt->write(space, offset, data);
+ m_lpt->write(offset, data);
},
"lpt_w"
);
diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp
index 61ff9718be5..7116d472661 100644
--- a/src/mame/drivers/europc.cpp
+++ b/src/mame/drivers/europc.cpp
@@ -417,7 +417,7 @@ READ8_MEMBER( europc_pc_state::europc_pio_r )
switch (offset)
{
case 0:
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
data = m_port61;
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 10332c3008a..8e94da7359d 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -377,8 +377,8 @@ WRITE8_MEMBER(firefox_state::riot_porta_w)
WRITE8_MEMBER(firefox_state::nvram_w)
{
- m_nvram_1c->write(space, offset, data >> 4);
- m_nvram_1d->write(space, offset, data & 0xf);
+ m_nvram_1c->write(offset, data >> 4);
+ m_nvram_1d->write(offset, data & 0xf);
}
READ8_MEMBER(firefox_state::nvram_r)
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index c74e40492b5..bea9210ef2f 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -498,14 +498,14 @@ template<int Chip>
READ8_MEMBER(towns_state::towns_dma_r)
{
logerror("DMA#%01x: read register %i\n",Chip,offset);
- return m_dma[Chip]->read(space, offset);
+ return m_dma[Chip]->read(offset);
}
template<int Chip>
WRITE8_MEMBER(towns_state::towns_dma_w)
{
logerror("DMA#%01x: wrote 0x%02x to register %i\n",Chip,data,offset);
- m_dma[Chip]->write(space, offset, data);
+ m_dma[Chip]->write(offset, data);
}
/*
diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp
index af7d7307055..a81397336cb 100644
--- a/src/mame/drivers/gumbo.cpp
+++ b/src/mame/drivers/gumbo.cpp
@@ -356,7 +356,7 @@ ROM_START( mspuzzlea ) /* sticker on PCB stated: MISS PUZZLE V ..8 */
ROM_LOAD( "u210.bin", 0x00000, 0x40000, CRC(0a223a38) SHA1(e5aefbdbb09c18cc230bc852df3ea1defb1a21a8) )
ROM_REGION( 0x200000, "gfx1", 0 )
- ROM_LOAD( "u421.u421", 0x000000, 0x80000, CRC(52b67ee5) SHA1(209fdf845c5ef2e65fbc0de8aeb26562b6d033ab) ) /* several more explicit pictures have been relaced compared to the set below */
+ ROM_LOAD( "u421.u421", 0x000000, 0x80000, CRC(52b67ee5) SHA1(209fdf845c5ef2e65fbc0de8aeb26562b6d033ab) ) /* several more explicit pictures have been replaced compared to the set below */
ROM_LOAD( "u420.u420", 0x100000, 0x80000, CRC(3565696e) SHA1(5234dc25f73e6245b199071fa3a9c0d2367cae9f) ) /* Starting with 204 & 205, as well as many in 300 range */
ROM_LOAD( "u425.u425", 0x080000, 0x80000, CRC(933544e3) SHA1(d77b1050c4b56d0fd3be703bec961863d5188484) )
ROM_LOAD( "u426.u426", 0x180000, 0x80000, CRC(e458eb9d) SHA1(bead05ec57d97c86ed727b2c4b95f8ffdbd7ef4c) )
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 8af983a1c31..5f8fe1a09d7 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -5287,7 +5287,7 @@ WRITE16_MEMBER(ginv2000_state::write_r)
// R11,R12: TMS1024 S1,S0 (S2 forced high)
// R13: TMS1024 STD
- m_expander->write_s(space, 0, (data >> 12 & 1) | (data >> 10 & 2) | 4);
+ m_expander->write_s((data >> 12 & 1) | (data >> 10 & 2) | 4);
m_expander->write_std(data >> 13 & 1);
// R1-R10: VFD grid
@@ -5298,7 +5298,7 @@ WRITE16_MEMBER(ginv2000_state::write_r)
WRITE16_MEMBER(ginv2000_state::write_o)
{
// O4-O7: TMS1024 H1-H4
- m_expander->write_h(space, 0, data >> 4 & 0xf);
+ m_expander->write_h(data >> 4 & 0xf);
}
READ8_MEMBER(ginv2000_state::read_k)
@@ -11732,7 +11732,7 @@ WRITE16_MEMBER(tbreakup_state::write_r)
// R3-R5: TMS1025 port S
// R2: TMS1025 STD pin
- m_expander->write_s(space, 0, data >> 3 & 7);
+ m_expander->write_s(data >> 3 & 7);
m_expander->write_std(data >> 2 & 1);
// R0,R1: select digit
@@ -11743,7 +11743,7 @@ WRITE16_MEMBER(tbreakup_state::write_r)
WRITE16_MEMBER(tbreakup_state::write_o)
{
// O0-O3: TMS1025 port H
- m_expander->write_h(space, 0, data & 0xf);
+ m_expander->write_h(data & 0xf);
// O0-O7: led state
m_o = data;
diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp
index 2f296a5e45c..ca25960204c 100644
--- a/src/mame/drivers/ibmpcjr.cpp
+++ b/src/mame/drivers/ibmpcjr.cpp
@@ -271,7 +271,7 @@ WRITE_LINE_MEMBER(pcjr_state::keyb_interrupt)
{
int data;
- if(state && (data = m_keyboard->read(machine().dummy_space(), 0)))
+ if(state && (data = m_keyboard->read()))
{
uint8_t parity = 0;
int i;
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index fe9ba3d88c3..929cf810a8b 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -500,7 +500,7 @@ void ip22_state::indigo2_4415(machine_config &config)
* 0d <- 00 High Const BRG = (CLK / (2 x Desired Rate x BR Clock period)) - 2
* 0e <- 01 Mics: BRG enable
* 03 <- c1 Receiver: as above + Receiver enable
- * 05 <- ea Transmitter: as above + Transmitetr enable
+ * 05 <- ea Transmitter: as above + Transmitter enable
* 00 <- 10 Reset External/status IE
*/
diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp
index 9d0cf14ef59..59cc14454c8 100644
--- a/src/mame/drivers/jedi.cpp
+++ b/src/mame/drivers/jedi.cpp
@@ -225,8 +225,8 @@ READ8_MEMBER(jedi_state::novram_data_r)
WRITE8_MEMBER(jedi_state::novram_data_w)
{
- m_novram[0]->write(space, offset, data & 0x0f);
- m_novram[1]->write(space, offset, data >> 4);
+ m_novram[0]->write(offset, data & 0x0f);
+ m_novram[1]->write(offset, data >> 4);
}
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index 509eb45d9ce..a5bf02afa5c 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -203,7 +203,7 @@ WRITE8_MEMBER(k28_state::mcu_p2_w)
m_vfd->data_w(data & 1);
// d0-d3: VSM data, input mux and SC-01 phoneme lower nibble
- m_tms6100->add_w(space, 0, data);
+ m_tms6100->add_w(data);
m_inp_mux = (m_inp_mux & ~0xf) | (~data & 0xf);
m_phoneme = (m_phoneme & ~0xf) | (data & 0xf);
}
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index 15bd855a8f6..d0e8753386b 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -279,7 +279,7 @@ INTERRUPT_GEN_MEMBER(kron180_state::interrupt)
WRITE_LINE_MEMBER(kron180_state::keyb_interrupt)
{
- if(state && (m_kbd_data = m_keyboard->read(machine().dummy_space(), 0)))
+ if(state && (m_kbd_data = m_keyboard->read()))
{
LOGKBD("%s(%02x)\n", FUNCNAME, m_kbd_data);
m_maincpu->set_input_line(2, ASSERT_LINE);
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index a1ea225a14d..fbf525ccf1e 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -202,7 +202,7 @@ uint8_t kc85_state::uart_r()
m_uart->drr_w(1);
}
- return m_uart->read(machine().dummy_space(), 0);
+ return m_uart->read();
}
void kc85_state::uart_ctrl_w(uint8_t data)
diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp
index 58541cb3cc3..13262d362cb 100644
--- a/src/mame/drivers/malzak.cpp
+++ b/src/mame/drivers/malzak.cpp
@@ -76,7 +76,7 @@
READ8_MEMBER(malzak_state::fake_VRLE_r)
{
- return (m_s2636[0]->read_data(space, 0xcb) & 0x3f) + (m_screen->vblank() ? 0x40 : 0x00);
+ return (m_s2636[0]->read_data(0xcb) & 0x3f) + (m_screen->vblank() ? 0x40 : 0x00);
}
READ8_MEMBER(malzak_state::s2636_portA_r)
diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp
index 43e0e5022aa..5807868b2be 100644
--- a/src/mame/drivers/mcb216.cpp
+++ b/src/mame/drivers/mcb216.cpp
@@ -69,7 +69,7 @@ READ8_MEMBER(mcb216_state::tms5501_status_r)
{
// D7 D6 D5 D4 D3 D2 D1 D0
// TBE RDA IPG TBE RDA SRV ORE FME
- return bitswap<8>(m_tms5501->sta_r(space, 0), 4, 3, 5, 4, 3, 2, 1, 0);
+ return bitswap<8>(m_tms5501->sta_r(), 4, 3, 5, 4, 3, 2, 1, 0);
}
void mcb216_state::mcb216_mem(address_map &map)
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index e04a521dd53..967b4cfc2bf 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -1183,14 +1183,14 @@ READ8_MEMBER(mz2500_state::rp5c15_8_r)
{
uint8_t rtc_index = (m_maincpu->state_int(Z80_B));
- return m_rtc->read(space, rtc_index);
+ return m_rtc->read(rtc_index);
}
WRITE8_MEMBER(mz2500_state::rp5c15_8_w)
{
uint8_t rtc_index = (m_maincpu->state_int(Z80_B));
- m_rtc->write(space, rtc_index, data);
+ m_rtc->write(rtc_index, data);
}
diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp
index 2d4c21dcede..6ce0f49df21 100644
--- a/src/mame/drivers/nforcepc.cpp
+++ b/src/mame/drivers/nforcepc.cpp
@@ -907,12 +907,12 @@ void it8703f_device::map_lpt(address_map& map)
READ8_MEMBER(it8703f_device::lpt_read)
{
- return pc_lpt_lptdev->read(space, offset, mem_mask);
+ return pc_lpt_lptdev->read(offset);
}
WRITE8_MEMBER(it8703f_device::lpt_write)
{
- pc_lpt_lptdev->write(space, offset, data, mem_mask);
+ pc_lpt_lptdev->write(offset, data);
}
void it8703f_device::map_lpt_addresses()
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index f1772001a3b..32e3b4154f1 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -497,7 +497,7 @@ WRITE8_MEMBER(pcw16_state::pcw16_keyboard_control_w)
/* busy */
m_keyboard_state |= PCW16_KEYBOARD_BUSY_STATUS;
/* keyboard takes data */
- m_keyboard->write(space, 0, m_keyboard_data_shift);
+ m_keyboard->write(m_keyboard_data_shift);
/* set clock low - no furthur transmissions */
pcw16_keyboard_set_clock_state(0);
/* set int */
@@ -532,7 +532,7 @@ WRITE_LINE_MEMBER(pcw16_state::pcw16_keyboard_callback)
{
int data;
- data = m_keyboard->read(machine().dummy_space(), 0);
+ data = m_keyboard->read();
if (data)
{
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index adbae9c81a7..138418eeca5 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -280,13 +280,13 @@ uint8_t plus4_state::read_memory(address_space &space, offs_t offset, int ba, in
if (!scs && m_vslsi)
{
- data = m_vslsi->read(space, offset & 0x03);
+ data = m_vslsi->read(offset & 0x03);
}
else if (!user)
{
if (m_spi_user)
{
- data = m_spi_user->read(space, 0);
+ data = m_spi_user->read();
}
data &= ~0x04;
@@ -298,7 +298,7 @@ uint8_t plus4_state::read_memory(address_space &space, offs_t offset, int ba, in
}
else if (!keyport)
{
- data = m_spi_kb->read(space, 0);
+ data = m_spi_kb->read();
}
else if (!cs0)
{
@@ -407,11 +407,11 @@ WRITE8_MEMBER( plus4_state::write )
if (!scs && m_vslsi)
{
- m_vslsi->write(space, offset & 0x03, data);
+ m_vslsi->write(offset & 0x03, data);
}
else if (!user && m_spi_user)
{
- m_spi_user->write(space, 0, data);
+ m_spi_user->write(data);
}
else if (!_6551 && m_acia)
{
@@ -423,7 +423,7 @@ WRITE8_MEMBER( plus4_state::write )
}
else if (!keyport)
{
- m_spi_kb->write(space, 0, data);
+ m_spi_kb->write(data);
}
else if (offset < 0xfd00 || offset >= 0xff20)
{
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index 2b64436a90c..503d74a0a3a 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -209,7 +209,7 @@ READ8_MEMBER(punchout_state::spunchout_exp_r)
// d5: _ALARM from RP5C01
// d6: COUNTER OUT from RP5H01
// d7: DATA OUT from RP5H01 - always 0?
- uint8_t ret = m_rtc->read(space, offset >> 4 & 0xf) & 0xf;
+ uint8_t ret = m_rtc->read(offset >> 4 & 0xf) & 0xf;
ret |= 0x10;
ret |= m_rtc->alarm_r() ? 0x00 : 0x20;
ret |= m_rp5h01->counter_r() ? 0x00 : 0x40;
@@ -221,7 +221,7 @@ READ8_MEMBER(punchout_state::spunchout_exp_r)
WRITE8_MEMBER(punchout_state::spunchout_exp_w)
{
// d0-d3: D0-D3 to RP5C01
- m_rtc->write(space, offset >> 4 & 0xf, data & 0xf);
+ m_rtc->write(offset >> 4 & 0xf, data & 0xf);
}
WRITE8_MEMBER(punchout_state::spunchout_rp5h01_reset_w)
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 448f6d48ee7..4d09e517ca4 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -339,7 +339,7 @@ READ8_MEMBER(tandy1000_state::tandy1000_pio_r)
case 0:
if (m_tandy_ppi_ack)
{
- m_tandy_ppi_porta = m_keyboard->read(space, 0);
+ m_tandy_ppi_porta = m_keyboard->read();
m_tandy_ppi_ack = 0;
}
data = m_tandy_ppi_porta;
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index e37a91829ae..bf2ec76d79b 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -213,7 +213,7 @@ READ8_MEMBER( tandy2k_state::kbint_clr_r )
m_kb->busy_w(1);
m_pic1->ir0_w(CLEAR_LINE);
- return m_pc_keyboard->read(space, 0);
+ return m_pc_keyboard->read();
}
return 0xff;
diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp
index 2e9e322123b..da7f603ba2e 100644
--- a/src/mame/drivers/wangpc.cpp
+++ b/src/mame/drivers/wangpc.cpp
@@ -569,7 +569,7 @@ READ8_MEMBER( wangpc_state::uart_r )
check_level2_interrupts();
- uint8_t data = m_uart->read(space, 0);
+ uint8_t data = m_uart->read();
if (LOG) logerror("%s: UART read %02x\n", machine().describe_context(), data);
@@ -608,7 +608,7 @@ WRITE8_MEMBER( wangpc_state::uart_w )
m_uart_tbre = 0;
check_level2_interrupts();
- m_uart->write(space, 0, data);
+ m_uart->write(data);
}
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index 03965f3fc51..d4380542985 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -630,7 +630,7 @@ READ8_MEMBER(wicat_state::videosram_r)
WRITE8_MEMBER(wicat_state::videosram_w)
{
if(!(offset & 0x01))
- m_videosram->write(space,offset/2,data);
+ m_videosram->write(offset/2,data);
}
WRITE8_MEMBER(wicat_state::videosram_store_w)
@@ -666,7 +666,7 @@ READ8_MEMBER(wicat_state::video_timer_r)
m_videouart->drr_w(1);
m_videouart->drr_w(0);
}
- return m_videouart->read(space,0);
+ return m_videouart->read();
}
return ret;
}
@@ -675,7 +675,7 @@ WRITE8_MEMBER(wicat_state::video_timer_w)
{
logerror("I/O port 0x%04x write %02x\n",offset,data);
if(offset == 0x02)
- m_videouart->write(space,0,data);
+ m_videouart->write(data);
}
READ8_MEMBER(wicat_state::video_status_r)
diff --git a/src/mame/machine/balsente.cpp b/src/mame/machine/balsente.cpp
index b8c9939079b..af750998a90 100644
--- a/src/mame/machine/balsente.cpp
+++ b/src/mame/machine/balsente.cpp
@@ -248,8 +248,8 @@ READ8_MEMBER(balsente_state::novram_8bit_r)
WRITE8_MEMBER(balsente_state::novram_8bit_w)
{
- m_novram[0]->write(space, offset, data & 0x0f);
- m_novram[1]->write(space, offset, data >> 4);
+ m_novram[0]->write(offset, data & 0x0f);
+ m_novram[1]->write(offset, data >> 4);
}
diff --git a/src/mame/machine/msx.cpp b/src/mame/machine/msx.cpp
index 25cc0ce4aa2..2fd51da858b 100644
--- a/src/mame/machine/msx.cpp
+++ b/src/mame/machine/msx.cpp
@@ -294,12 +294,12 @@ WRITE8_MEMBER( msx2_state::msx_rtc_latch_w )
WRITE8_MEMBER( msx2_state::msx_rtc_reg_w )
{
- m_rtc->write(space, m_rtc_latch, data);
+ m_rtc->write(m_rtc_latch, data);
}
READ8_MEMBER( msx2_state::msx_rtc_reg_r )
{
- return m_rtc->read(space, m_rtc_latch);
+ return m_rtc->read(m_rtc_latch);
}
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index aefb0b7dc44..916c009bb97 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -555,7 +555,7 @@ READ8_MEMBER(z80net_state::lx388_mc6847_videoram_r)
READ8_MEMBER(z80net_state::lx387_data_r)
{
- uint8_t data = m_lx387_kr2376->data_r(space, 0) & 0x7f;
+ uint8_t data = m_lx387_kr2376->data_r() & 0x7f;
data |= m_lx387_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7;
return data;
}
diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp
index a1a46497e8a..4b2f63cacee 100644
--- a/src/mame/video/docastle.cpp
+++ b/src/mame/video/docastle.cpp
@@ -79,12 +79,12 @@ WRITE8_MEMBER(docastle_state::docastle_colorram_w)
READ8_MEMBER(docastle_state::inputs_flipscreen_r)
{
// inputs pass through LS244 non-inverting buffer
- uint8_t buf = (m_inp[1]->read_h(space, 0) << 4) | m_inp[0]->read_h(space, 0);
+ uint8_t buf = (m_inp[1]->read_h() << 4) | m_inp[0]->read_h();
// LS273 latches address bits on rising edge of address decode
flip_screen_set(BIT(offset, 7));
- m_inp[0]->write_s(space, 0, offset & 7);
- m_inp[1]->write_s(space, 0, offset & 7);
+ m_inp[0]->write_s(offset & 7);
+ m_inp[1]->write_s(offset & 7);
return buf;
}
diff --git a/src/mame/video/zac2650.cpp b/src/mame/video/zac2650.cpp
index 81cd781083f..c0ed41cd4cf 100644
--- a/src/mame/video/zac2650.cpp
+++ b/src/mame/video/zac2650.cpp
@@ -35,7 +35,7 @@ WRITE8_MEMBER(zac2650_state::zac_s2636_w)
m_gfxdecode->gfx(2)->mark_dirty(offset/8);
if (offset == 0xc7)
{
- m_s2636->write_data(space, offset, data);
+ m_s2636->write_data(offset, data);
}
}