summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Ivan Vangelista <mesgnet@yahoo.it>2020-06-11 18:07:37 +0200
committerGravatarGravatar Ivan Vangelista <mesgnet@yahoo.it>2020-06-11 18:07:37 +0200
commit148c8649c7b66deba30050bfcb8e0597ad4cb8e4 (patch)
treee804a4fb2ed094d17055fd339a5323ae63066a24
parent8b69ca54e27136efa1d8ac8db85e1f3d69d6c9ef (diff)
downloadmame-148c8649c7b66deba30050bfcb8e0597ad4cb8e4.tar.xz
mame-148c8649c7b66deba30050bfcb8e0597ad4cb8e4.zip
drivers starting with j, k, l and part of m: read* and write* macro removal (nw)
-rw-r--r--src/mame/audio/dcs.cpp4
-rw-r--r--src/mame/audio/dcs.h4
-rw-r--r--src/mame/audio/jaguar.cpp10
-rw-r--r--src/mame/audio/laserbat.cpp14
-rw-r--r--src/mame/drivers/applix.cpp4
-rw-r--r--src/mame/drivers/jack.cpp2
-rw-r--r--src/mame/drivers/jackal.cpp18
-rw-r--r--src/mame/drivers/jaguar.cpp144
-rw-r--r--src/mame/drivers/jailbrek.cpp8
-rw-r--r--src/mame/drivers/jedi.cpp4
-rw-r--r--src/mame/drivers/jpmimpct.cpp36
-rw-r--r--src/mame/drivers/jpmsys5.cpp26
-rw-r--r--src/mame/drivers/kangaroo.cpp8
-rw-r--r--src/mame/drivers/karnov.cpp6
-rw-r--r--src/mame/drivers/kaypro.cpp2
-rw-r--r--src/mame/drivers/kchamp.cpp4
-rw-r--r--src/mame/drivers/kickgoal.cpp16
-rw-r--r--src/mame/drivers/kikikai.cpp4
-rw-r--r--src/mame/drivers/konamigx.cpp34
-rw-r--r--src/mame/drivers/kron.cpp2
-rw-r--r--src/mame/drivers/ksayakyu.cpp10
-rw-r--r--src/mame/drivers/labyrunr.cpp2
-rw-r--r--src/mame/drivers/ladybug.cpp4
-rw-r--r--src/mame/drivers/ladyfrog.cpp14
-rw-r--r--src/mame/drivers/laser3k.cpp20
-rw-r--r--src/mame/drivers/laserbat.cpp4
-rw-r--r--src/mame/drivers/lasso.cpp6
-rw-r--r--src/mame/drivers/lastduel.cpp6
-rw-r--r--src/mame/drivers/lazercmd.cpp16
-rw-r--r--src/mame/drivers/lemmings.cpp8
-rw-r--r--src/mame/drivers/lethal.cpp12
-rw-r--r--src/mame/drivers/lethalj.cpp12
-rw-r--r--src/mame/drivers/liberate.cpp28
-rw-r--r--src/mame/drivers/liberatr.cpp10
-rw-r--r--src/mame/drivers/lkage.cpp16
-rw-r--r--src/mame/drivers/lockon.cpp22
-rw-r--r--src/mame/drivers/lordgun.cpp22
-rw-r--r--src/mame/drivers/lsasquad.cpp2
-rw-r--r--src/mame/drivers/lucky74.cpp12
-rw-r--r--src/mame/drivers/lvcards.cpp6
-rw-r--r--src/mame/drivers/lwings.cpp18
-rw-r--r--src/mame/drivers/m107.cpp4
-rw-r--r--src/mame/drivers/m72.cpp34
-rw-r--r--src/mame/drivers/m90.cpp6
-rw-r--r--src/mame/drivers/m92.cpp10
-rw-r--r--src/mame/drivers/mac.cpp14
-rw-r--r--src/mame/drivers/macpci.cpp4
-rw-r--r--src/mame/drivers/macrossp.cpp16
-rw-r--r--src/mame/drivers/magmax.cpp4
-rw-r--r--src/mame/drivers/mcr68.cpp46
-rw-r--r--src/mame/drivers/megadriv_acbl.cpp42
-rw-r--r--src/mame/drivers/megadriv_rad.cpp4
-rw-r--r--src/mame/drivers/megasys1.cpp55
-rw-r--r--src/mame/drivers/metalmx.cpp32
-rw-r--r--src/mame/drivers/metro.cpp10
-rw-r--r--src/mame/drivers/midvunit.cpp80
-rw-r--r--src/mame/drivers/midyunit.cpp2
-rw-r--r--src/mame/drivers/midzeus.cpp49
-rw-r--r--src/mame/drivers/model1.cpp4
-rw-r--r--src/mame/drivers/model2.cpp232
-rw-r--r--src/mame/drivers/model3.cpp137
-rw-r--r--src/mame/drivers/moo.cpp14
-rw-r--r--src/mame/drivers/mpu5.cpp38
-rw-r--r--src/mame/drivers/ms32.cpp44
-rw-r--r--src/mame/drivers/mugsmash.cpp4
-rw-r--r--src/mame/drivers/mystwarr.cpp26
-rw-r--r--src/mame/drivers/puckpkmn.cpp4
-rw-r--r--src/mame/etc/jrcrypt.cpp4
-rw-r--r--src/mame/includes/jack.h12
-rw-r--r--src/mame/includes/jackal.h18
-rw-r--r--src/mame/includes/jaguar.h144
-rw-r--r--src/mame/includes/jailbrek.h12
-rw-r--r--src/mame/includes/jedi.h4
-rw-r--r--src/mame/includes/jpmimpct.h40
-rw-r--r--src/mame/includes/jpmsys5.h28
-rw-r--r--src/mame/includes/kangaroo.h12
-rw-r--r--src/mame/includes/karnov.h10
-rw-r--r--src/mame/includes/kaypro.h20
-rw-r--r--src/mame/includes/kc.h40
-rw-r--r--src/mame/includes/kchamp.h9
-rw-r--r--src/mame/includes/kickgoal.h22
-rw-r--r--src/mame/includes/kikikai.h44
-rw-r--r--src/mame/includes/kncljoe.h6
-rw-r--r--src/mame/includes/konamigx.h42
-rw-r--r--src/mame/includes/kopunch.h4
-rw-r--r--src/mame/includes/ksayakyu.h14
-rw-r--r--src/mame/includes/labyrunr.h6
-rw-r--r--src/mame/includes/ladybug.h6
-rw-r--r--src/mame/includes/ladyfrog.h34
-rw-r--r--src/mame/includes/laserbat.h28
-rw-r--r--src/mame/includes/lasso.h18
-rw-r--r--src/mame/includes/lastduel.h12
-rw-r--r--src/mame/includes/lazercmd.h16
-rw-r--r--src/mame/includes/lemmings.h14
-rw-r--r--src/mame/includes/lethal.h14
-rw-r--r--src/mame/includes/lethalj.h10
-rw-r--r--src/mame/includes/liberate.h32
-rw-r--r--src/mame/includes/liberatr.h16
-rw-r--r--src/mame/includes/lisa.h12
-rw-r--r--src/mame/includes/lkage.h18
-rw-r--r--src/mame/includes/llc.h4
-rw-r--r--src/mame/includes/lockon.h44
-rw-r--r--src/mame/includes/lordgun.h22
-rw-r--r--src/mame/includes/lsasquad.h14
-rw-r--r--src/mame/includes/lucky74.h20
-rw-r--r--src/mame/includes/lvcards.h10
-rw-r--r--src/mame/includes/lwings.h30
-rw-r--r--src/mame/includes/lynx.h14
-rw-r--r--src/mame/includes/m107.h10
-rw-r--r--src/mame/includes/m72.h18
-rw-r--r--src/mame/includes/m90.h8
-rw-r--r--src/mame/includes/m92.h22
-rw-r--r--src/mame/includes/mac.h64
-rw-r--r--src/mame/includes/macpci.h16
-rw-r--r--src/mame/includes/macrossp.h18
-rw-r--r--src/mame/includes/magmax.h4
-rw-r--r--src/mame/includes/mcr68.h28
-rw-r--r--src/mame/includes/megadriv_acbl.h24
-rw-r--r--src/mame/includes/megadriv_rad.h4
-rw-r--r--src/mame/includes/megasys1.h46
-rw-r--r--src/mame/includes/metalmx.h32
-rw-r--r--src/mame/includes/metro.h12
-rw-r--r--src/mame/includes/micro3d.h36
-rw-r--r--src/mame/includes/midtunit.h34
-rw-r--r--src/mame/includes/midvunit.h78
-rw-r--r--src/mame/includes/midwunit.h24
-rw-r--r--src/mame/includes/midxunit.h26
-rw-r--r--src/mame/includes/midyunit.h46
-rw-r--r--src/mame/includes/midzeus.h44
-rw-r--r--src/mame/includes/model1.h57
-rw-r--r--src/mame/includes/model2.h386
-rw-r--r--src/mame/includes/model3.h72
-rw-r--r--src/mame/includes/moo.h10
-rw-r--r--src/mame/includes/mpu5.h16
-rw-r--r--src/mame/includes/ms32.h48
-rw-r--r--src/mame/includes/mugsmash.h8
-rw-r--r--src/mame/includes/mystwarr.h40
-rw-r--r--src/mame/machine/k573dio.cpp80
-rw-r--r--src/mame/machine/k573dio.h80
-rw-r--r--src/mame/machine/kaneko_calc3.cpp8
-rw-r--r--src/mame/machine/kaneko_calc3.h8
-rw-r--r--src/mame/machine/kaneko_hit.cpp28
-rw-r--r--src/mame/machine/kaneko_hit.h16
-rw-r--r--src/mame/machine/kaneko_toybox.cpp10
-rw-r--r--src/mame/machine/kaneko_toybox.h10
-rw-r--r--src/mame/machine/kaypro.cpp4
-rw-r--r--src/mame/machine/kc.cpp66
-rw-r--r--src/mame/machine/kikikai.cpp38
-rw-r--r--src/mame/machine/konamigx.cpp10
-rw-r--r--src/mame/machine/konppc.cpp58
-rw-r--r--src/mame/machine/konppc.h54
-rw-r--r--src/mame/machine/lisa.cpp16
-rw-r--r--src/mame/machine/llc.cpp4
-rw-r--r--src/mame/machine/lsasquad.cpp12
-rw-r--r--src/mame/machine/lynx.cpp18
-rw-r--r--src/mame/machine/m20_8086.cpp6
-rw-r--r--src/mame/machine/m20_8086.h6
-rw-r--r--src/mame/machine/m24_z8000.cpp12
-rw-r--r--src/mame/machine/m24_z8000.h12
-rw-r--r--src/mame/machine/m3comm.cpp30
-rw-r--r--src/mame/machine/m3comm.h24
-rw-r--r--src/mame/machine/mac.cpp40
-rw-r--r--src/mame/machine/mace.cpp48
-rw-r--r--src/mame/machine/mace.h48
-rw-r--r--src/mame/machine/macpci.cpp12
-rw-r--r--src/mame/machine/maple-dc.cpp22
-rw-r--r--src/mame/machine/maple-dc.h22
-rw-r--r--src/mame/machine/micro3d.cpp30
-rw-r--r--src/mame/machine/midtunit.cpp64
-rw-r--r--src/mame/machine/midwayic.cpp24
-rw-r--r--src/mame/machine/midwayic.h10
-rw-r--r--src/mame/machine/midwunit.cpp28
-rw-r--r--src/mame/machine/midxunit.cpp34
-rw-r--r--src/mame/machine/midyunit.cpp46
-rw-r--r--src/mame/machine/mips_rambo.cpp16
-rw-r--r--src/mame/machine/mips_rambo.h30
-rw-r--r--src/mame/machine/model1.cpp40
-rw-r--r--src/mame/machine/model2.cpp4
-rw-r--r--src/mame/machine/model3.cpp4
-rw-r--r--src/mame/video/jack.cpp12
-rw-r--r--src/mame/video/jag_blitter.cpp14
-rw-r--r--src/mame/video/jag_blitter.h14
-rw-r--r--src/mame/video/jaguar.cpp10
-rw-r--r--src/mame/video/jailbrek.cpp4
-rw-r--r--src/mame/video/jpmimpct.cpp4
-rw-r--r--src/mame/video/k001005.cpp4
-rw-r--r--src/mame/video/k001005.h4
-rw-r--r--src/mame/video/k001006.cpp4
-rw-r--r--src/mame/video/k001006.h4
-rw-r--r--src/mame/video/k053250.cpp10
-rw-r--r--src/mame/video/k053250.h10
-rw-r--r--src/mame/video/k053250_ps.cpp10
-rw-r--r--src/mame/video/k053250_ps.h10
-rw-r--r--src/mame/video/k053936.cpp8
-rw-r--r--src/mame/video/k053936.h8
-rw-r--r--src/mame/video/k055555.cpp4
-rw-r--r--src/mame/video/k055555.h4
-rw-r--r--src/mame/video/k057714.cpp6
-rw-r--r--src/mame/video/k057714.h6
-rw-r--r--src/mame/video/kaneko_grap2.cpp8
-rw-r--r--src/mame/video/kaneko_grap2.h40
-rw-r--r--src/mame/video/kangaroo.cpp4
-rw-r--r--src/mame/video/karnov.cpp2
-rw-r--r--src/mame/video/kaypro.cpp14
-rw-r--r--src/mame/video/kchamp.cpp6
-rw-r--r--src/mame/video/kickgoal.cpp6
-rw-r--r--src/mame/video/kikikai.cpp2
-rw-r--r--src/mame/video/kncljoe.cpp6
-rw-r--r--src/mame/video/konamigx.cpp12
-rw-r--r--src/mame/video/kopunch.cpp4
-rw-r--r--src/mame/video/ksayakyu.cpp4
-rw-r--r--src/mame/video/labyrunr.cpp4
-rw-r--r--src/mame/video/ladybug.cpp2
-rw-r--r--src/mame/video/ladyfrog.cpp24
-rw-r--r--src/mame/video/laserbat.cpp10
-rw-r--r--src/mame/video/lasso.cpp18
-rw-r--r--src/mame/video/lastduel.cpp6
-rw-r--r--src/mame/video/lemmings.cpp6
-rw-r--r--src/mame/video/lethal.cpp2
-rw-r--r--src/mame/video/lethalj.cpp4
-rw-r--r--src/mame/video/liberate.cpp12
-rw-r--r--src/mame/video/liberatr.cpp6
-rw-r--r--src/mame/video/light.cpp4
-rw-r--r--src/mame/video/light.h4
-rw-r--r--src/mame/video/lkage.cpp2
-rw-r--r--src/mame/video/lockon.cpp22
-rw-r--r--src/mame/video/lucky74.cpp8
-rw-r--r--src/mame/video/lvcards.cpp4
-rw-r--r--src/mame/video/lwings.cpp12
-rw-r--r--src/mame/video/m107.cpp10
-rw-r--r--src/mame/video/m90.cpp4
-rw-r--r--src/mame/video/m92.cpp16
-rw-r--r--src/mame/video/mac.cpp12
-rw-r--r--src/mame/video/macrossp.cpp8
-rw-r--r--src/mame/video/mb60553.cpp12
-rw-r--r--src/mame/video/mb60553.h12
-rw-r--r--src/mame/video/mcd212.cpp4
-rw-r--r--src/mame/video/mcd212.h4
-rw-r--r--src/mame/video/mcr68.cpp5
-rw-r--r--src/mame/video/megasys1.cpp24
-rw-r--r--src/mame/video/metro.cpp2
-rw-r--r--src/mame/video/micro3d.cpp10
-rw-r--r--src/mame/video/midtunit.cpp30
-rw-r--r--src/mame/video/midtunit.h30
-rw-r--r--src/mame/video/midvunit.cpp24
-rw-r--r--src/mame/video/midyunit.cpp14
-rw-r--r--src/mame/video/midzeus.cpp4
-rw-r--r--src/mame/video/model1.cpp4
-rw-r--r--src/mame/video/model2.cpp178
-rw-r--r--src/mame/video/model2rd.hxx56
-rw-r--r--src/mame/video/model3.cpp22
-rw-r--r--src/mame/video/ms1_tmap.cpp6
-rw-r--r--src/mame/video/ms1_tmap.h6
-rw-r--r--src/mame/video/ms32.cpp4
-rw-r--r--src/mame/video/mugsmash.cpp6
-rw-r--r--src/mame/video/mystwarr.cpp14
256 files changed, 2840 insertions, 2846 deletions
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index baa0ccebb22..3932d430f68 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -1461,7 +1461,7 @@ void dcs_audio_device::set_io_callbacks(write_line_delegate output_full_cb, writ
}
-void dcs_audio_device::set_fifo_callbacks(read16smo_delegate fifo_data_r, read16_delegate fifo_status_r, write_line_delegate fifo_reset_w)
+void dcs_audio_device::set_fifo_callbacks(read16smo_delegate fifo_data_r, read16mo_delegate fifo_status_r, write_line_delegate fifo_reset_w)
{
m_fifo_data_r = fifo_data_r;
m_fifo_status_r = fifo_status_r;
@@ -1506,7 +1506,7 @@ uint16_t dcs_audio_device::latch_status_r(address_space &space)
if (IS_OUTPUT_EMPTY())
result |= 0x40;
if (!m_fifo_status_r.isnull() && (!m_transfer.hle_enabled || m_transfer.state == 0))
- result |= m_fifo_status_r(space, 0, 0xffff) & 0x38;
+ result |= m_fifo_status_r(space) & 0x38;
if (m_transfer.hle_enabled && m_transfer.state != 0)
result |= 0x08;
return result;
diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h
index 5aa65eea98b..719e9d87a8b 100644
--- a/src/mame/audio/dcs.h
+++ b/src/mame/audio/dcs.h
@@ -26,7 +26,7 @@ public:
void set_auto_ack(int state);
- void set_fifo_callbacks(read16smo_delegate fifo_data_r, read16_delegate fifo_status_r, write_line_delegate fifo_reset_w);
+ void set_fifo_callbacks(read16smo_delegate fifo_data_r, read16mo_delegate fifo_status_r, write_line_delegate fifo_reset_w);
void set_io_callbacks(write_line_delegate output_full_cb, write_line_delegate input_empty_cb);
uint16_t data_r();
@@ -218,7 +218,7 @@ protected:
write_line_delegate m_input_empty_cb;
read16smo_delegate m_fifo_data_r;
- read16_delegate m_fifo_status_r;
+ read16mo_delegate m_fifo_status_r;
write_line_delegate m_fifo_reset_w;
/* timers */
diff --git a/src/mame/audio/jaguar.cpp b/src/mame/audio/jaguar.cpp
index a7cabde84fe..560f1ed2eb2 100644
--- a/src/mame/audio/jaguar.cpp
+++ b/src/mame/audio/jaguar.cpp
@@ -215,7 +215,7 @@ void jaguar_state::sound_start()
*
*************************************/
-READ16_MEMBER( jaguar_state::jerry_regs_r )
+uint16_t jaguar_state::jerry_regs_r(offs_t offset)
{
if (offset != JINTCTRL && offset != JINTCTRL+2)
logerror("%s:jerry read register @ F10%03X\n", machine().describe_context(), offset * 2);
@@ -232,7 +232,7 @@ READ16_MEMBER( jaguar_state::jerry_regs_r )
}
-WRITE16_MEMBER( jaguar_state::jerry_regs_w )
+void jaguar_state::jerry_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_dsp_regs[offset]);
@@ -258,7 +258,7 @@ WRITE16_MEMBER( jaguar_state::jerry_regs_w )
#if ENABLE_SPEEDUP_HACKS
-WRITE32_MEMBER( jaguar_state::dsp_flags_w )
+void jaguar_state::dsp_flags_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask)
{
/* write the data through */
m_dsp->iobus_w(offset, data, mem_mask);
@@ -321,14 +321,14 @@ void jaguar_state::serial_update()
*
*************************************/
-READ32_MEMBER( jaguar_state::serial_r )
+uint32_t jaguar_state::serial_r(offs_t offset)
{
logerror("%s:jaguar_serial_r(%X)\n", machine().describe_context(), offset);
return 0;
}
-WRITE32_MEMBER( jaguar_state::serial_w )
+void jaguar_state::serial_w(offs_t offset, uint32_t data)
{
switch (offset)
{
diff --git a/src/mame/audio/laserbat.cpp b/src/mame/audio/laserbat.cpp
index 202c4bccc49..864b0c11c1f 100644
--- a/src/mame/audio/laserbat.cpp
+++ b/src/mame/audio/laserbat.cpp
@@ -11,22 +11,22 @@
#include "includes/laserbat.h"
-READ8_MEMBER(laserbat_state_base::rhsc_r)
+uint8_t laserbat_state_base::rhsc_r()
{
return m_rhsc;
}
-WRITE8_MEMBER(laserbat_state_base::whsc_w)
+void laserbat_state_base::whsc_w(uint8_t data)
{
m_whsc = data;
}
-WRITE8_MEMBER(laserbat_state_base::csound1_w)
+void laserbat_state_base::csound1_w(uint8_t data)
{
m_csound1 = data;
}
-WRITE8_MEMBER(laserbat_state_base::csound2_w)
+void laserbat_state_base::csound2_w(uint8_t data)
{
m_csound2 = data;
}
@@ -127,7 +127,7 @@ WRITE8_MEMBER(laserbat_state_base::csound2_w)
*/
-WRITE8_MEMBER(laserbat_state::csound2_w)
+void laserbat_state::csound2_w(uint8_t data)
{
// there are a bunch of edge-triggered things, so grab changes
unsigned const diff = data ^ m_csound2;
@@ -307,14 +307,14 @@ WRITE8_MEMBER(laserbat_state::csound2_w)
it isn't routed anywhere.
*/
-WRITE8_MEMBER(catnmous_state::csound1_w)
+void catnmous_state::csound1_w(uint8_t data)
{
m_audiopcb->sound_w(data);
m_csound1 = data;
}
-WRITE8_MEMBER(catnmous_state::csound2_w)
+void catnmous_state::csound2_w(uint8_t data)
{
// the bottom bit is used for sprite banking, of all things
m_gfx2 = memregion("gfx2")->base() + ((data & 0x01) ? 0x0800 : 0x0000);
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index 0c9dee9418a..7520f80e825 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -110,7 +110,7 @@ public:
private:
virtual void machine_reset() override;
virtual void machine_start() override;
- u8 applix_inputs_r();
+ u16 applix_inputs_r();
void palette_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void analog_latch_w(u16 data);
void dac_latch_w(u16 data);
@@ -272,7 +272,7 @@ d1 = cassette in
d2,3 = joystick in
d4-7 = SW2 dipswitch block
*/
-u8 applix_state::applix_inputs_r()
+u16 applix_state::applix_inputs_r()
{
return m_io_dsw->read() | m_cass_data[2];
}
diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp
index 51846a21063..6487e920993 100644
--- a/src/mame/drivers/jack.cpp
+++ b/src/mame/drivers/jack.cpp
@@ -112,7 +112,7 @@ IRQ_CALLBACK_MEMBER(jack_state::jack_sh_irq_ack)
/***************************************************************/
-READ8_MEMBER(jack_state::striv_question_r)
+uint8_t jack_state::striv_question_r(offs_t offset)
{
// Set-up the remap table for every 16 bytes
if ((offset & 0xc00) == 0x800)
diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp
index 2c11e8fa7c4..0d4d3147536 100644
--- a/src/mame/drivers/jackal.cpp
+++ b/src/mame/drivers/jackal.cpp
@@ -86,36 +86,36 @@ Address Dir Data Description
*
*************************************/
-READ8_MEMBER(jackal_state::jackalr_rotary_r)
+uint8_t jackal_state::jackalr_rotary_r(offs_t offset)
{
return (1 << m_dials[offset].read_safe(0x00)) ^ 0xff;
}
-WRITE8_MEMBER(jackal_state::jackal_flipscreen_w)
+void jackal_state::jackal_flipscreen_w(uint8_t data)
{
m_irq_enable = data & 0x02;
flip_screen_set(data & 0x08);
}
-READ8_MEMBER(jackal_state::jackal_zram_r)
+uint8_t jackal_state::jackal_zram_r(offs_t offset)
{
return m_rambank[0x0020 + offset];
}
-READ8_MEMBER(jackal_state::jackal_voram_r)
+uint8_t jackal_state::jackal_voram_r(offs_t offset)
{
return m_rambank[0x2000 + offset];
}
-READ8_MEMBER(jackal_state::jackal_spriteram_r)
+uint8_t jackal_state::jackal_spriteram_r(offs_t offset)
{
return m_spritebank[0x3000 + offset];
}
-WRITE8_MEMBER(jackal_state::jackal_rambank_w)
+void jackal_state::jackal_rambank_w(uint8_t data)
{
uint8_t *rgn = memregion("master")->base();
@@ -136,13 +136,13 @@ WRITE8_MEMBER(jackal_state::jackal_rambank_w)
}
-WRITE8_MEMBER(jackal_state::jackal_zram_w)
+void jackal_state::jackal_zram_w(offs_t offset, uint8_t data)
{
m_rambank[0x0020 + offset] = data;
}
-WRITE8_MEMBER(jackal_state::jackal_voram_w)
+void jackal_state::jackal_voram_w(offs_t offset, uint8_t data)
{
if ((offset & 0xf800) == 0)
jackal_mark_tile_dirty(offset & 0x3ff);
@@ -151,7 +151,7 @@ WRITE8_MEMBER(jackal_state::jackal_voram_w)
}
-WRITE8_MEMBER(jackal_state::jackal_spriteram_w)
+void jackal_state::jackal_spriteram_w(offs_t offset, uint8_t data)
{
m_spritebank[0x3000 + offset] = data;
}
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index 447c2b5fafb..38a880b3c56 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -565,7 +565,7 @@ static NVRAM_HANDLER( jaguar )
}
}
*/
-WRITE32_MEMBER(jaguar_state::eeprom_w)
+void jaguar_state::eeprom_w(uint32_t data)
{
m_eeprom_bit_count++;
if (m_eeprom_bit_count != 9) /* kill extra bit at end of address */
@@ -576,7 +576,7 @@ WRITE32_MEMBER(jaguar_state::eeprom_w)
}
}
-READ32_MEMBER(jaguar_state::eeprom_clk)
+uint32_t jaguar_state::eeprom_clk()
{
if (!machine().side_effects_disabled())
{
@@ -586,7 +586,7 @@ READ32_MEMBER(jaguar_state::eeprom_clk)
return 0;
}
-READ32_MEMBER(jaguar_state::eeprom_cs)
+uint32_t jaguar_state::eeprom_cs()
{
if (!machine().side_effects_disabled())
{
@@ -608,7 +608,7 @@ READ32_MEMBER(jaguar_state::eeprom_cs)
*
*************************************/
-READ32_MEMBER(jaguar_state::misc_control_r)
+uint32_t jaguar_state::misc_control_r()
{
/* D7 = board reset (low)
D6 = audio must & reset (high)
@@ -621,7 +621,7 @@ READ32_MEMBER(jaguar_state::misc_control_r)
}
-WRITE32_MEMBER(jaguar_state::misc_control_w)
+void jaguar_state::misc_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
logerror("%s:misc_control_w(%02X)\n", machine().describe_context(), data);
@@ -661,12 +661,12 @@ WRITE32_MEMBER(jaguar_state::misc_control_w)
*
*************************************/
-READ32_MEMBER(jaguar_state::gpuctrl_r)
+uint32_t jaguar_state::gpuctrl_r(offs_t offset, uint32_t mem_mask)
{
return m_gpu->iobus_r(offset, mem_mask);
}
-WRITE32_MEMBER(jaguar_state::gpuctrl_w)
+void jaguar_state::gpuctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
m_gpu->iobus_w(offset, data, mem_mask);
}
@@ -677,12 +677,12 @@ WRITE32_MEMBER(jaguar_state::gpuctrl_w)
*
*************************************/
-READ32_MEMBER(jaguar_state::dspctrl_r)
+uint32_t jaguar_state::dspctrl_r(offs_t offset, uint32_t mem_mask)
{
return m_dsp->iobus_r(offset, mem_mask);
}
-WRITE32_MEMBER(jaguar_state::dspctrl_w)
+void jaguar_state::dspctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
m_dsp->iobus_w(offset, data, mem_mask);
}
@@ -696,7 +696,7 @@ WRITE32_MEMBER(jaguar_state::dspctrl_w)
*
*************************************/
-READ32_MEMBER(jaguar_state::joystick_r)
+uint32_t jaguar_state::joystick_r()
{
uint16_t joystick_result = 0xfffe;
uint16_t joybuts_result = 0xffef;
@@ -730,7 +730,7 @@ READ32_MEMBER(jaguar_state::joystick_r)
return (joystick_result << 16) | joybuts_result;
}
-WRITE32_MEMBER(jaguar_state::joystick_w)
+void jaguar_state::joystick_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/*
* 16 12 8 4 0
@@ -788,7 +788,7 @@ WRITE32_MEMBER(jaguar_state::joystick_w)
*
*************************************/
-WRITE32_MEMBER(jaguar_state::latch_w)
+void jaguar_state::latch_w(uint32_t data)
{
logerror("%08X:latch_w(%X)\n", m_maincpu->pcbase(), data);
@@ -811,7 +811,7 @@ WRITE32_MEMBER(jaguar_state::latch_w)
*
*************************************/
-READ32_MEMBER(jaguar_state::eeprom_data_r)
+uint32_t jaguar_state::eeprom_data_r(offs_t offset)
{
if (m_is_r3000)
return m_nvram[offset] | 0xffffff00;
@@ -820,13 +820,13 @@ READ32_MEMBER(jaguar_state::eeprom_data_r)
}
-WRITE32_MEMBER(jaguar_state::eeprom_enable_w)
+void jaguar_state::eeprom_enable_w(uint32_t data)
{
m_eeprom_enable = true;
}
-WRITE32_MEMBER(jaguar_state::eeprom_data_w)
+void jaguar_state::eeprom_data_w(offs_t offset, uint32_t data)
{
// if (m_eeprom_enable)
{
@@ -870,7 +870,7 @@ WRITE32_MEMBER(jaguar_state::eeprom_data_w)
*/
-WRITE32_MEMBER(jaguar_state::gpu_jump_w)
+void jaguar_state::gpu_jump_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/* update the data in memory */
COMBINE_DATA(m_gpu_jump_address);
@@ -885,7 +885,7 @@ WRITE32_MEMBER(jaguar_state::gpu_jump_w)
}
-READ32_MEMBER(jaguar_state::gpu_jump_r)
+uint32_t jaguar_state::gpu_jump_r()
{
/* if the current GPU command is just pointing back to the spin loop, and */
/* we're reading it from the spin loop, we can optimize */
@@ -926,7 +926,7 @@ READ32_MEMBER(jaguar_state::gpu_jump_r)
#if ENABLE_SPEEDUP_HACKS
-READ32_MEMBER(jaguar_state::cojagr3k_main_speedup_r)
+uint32_t jaguar_state::cojagr3k_main_speedup_r()
{
uint64_t curcycles = m_maincpu->total_cycles();
@@ -974,7 +974,7 @@ READ32_MEMBER(jaguar_state::cojagr3k_main_speedup_r)
#if ENABLE_SPEEDUP_HACKS
-READ32_MEMBER(jaguar_state::main_gpu_wait_r)
+uint32_t jaguar_state::main_gpu_wait_r()
{
if (m_gpu_command_pending)
m_maincpu->spin_until_interrupt();
@@ -1000,7 +1000,7 @@ READ32_MEMBER(jaguar_state::main_gpu_wait_r)
#if ENABLE_SPEEDUP_HACKS
-WRITE32_MEMBER(jaguar_state::area51_main_speedup_w)
+void jaguar_state::area51_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint64_t curcycles = m_maincpu->total_cycles();
@@ -1034,7 +1034,7 @@ WRITE32_MEMBER(jaguar_state::area51_main_speedup_w)
against 0 must handle that explicitly.
*/
-WRITE32_MEMBER(jaguar_state::area51mx_main_speedup_w)
+void jaguar_state::area51mx_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint64_t curcycles = m_maincpu->total_cycles();
@@ -1072,41 +1072,41 @@ WRITE32_MEMBER(jaguar_state::area51mx_main_speedup_w)
// surely these should be 16-bit natively if the standard Jaguar is driven by a plain 68k?
// all these trampolines are not good for performance ;-)
-READ16_MEMBER(jaguar_state::gpuctrl_r16){ if (!(offset&1)) { return gpuctrl_r(space, offset>>1, mem_mask<<16) >> 16; } else { return gpuctrl_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::gpuctrl_w16){ if (!(offset&1)) { gpuctrl_w(space, offset>>1, data << 16, mem_mask << 16); } else { gpuctrl_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::blitter_r16){ if (!(offset&1)) { return blitter_r(space, offset>>1, mem_mask<<16) >> 16; } else { return blitter_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::blitter_w16){ if (!(offset&1)) { blitter_w(space, offset>>1, data << 16, mem_mask << 16); } else { blitter_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::serial_r16){ if (!(offset&1)) { return serial_r(space, offset>>1, mem_mask<<16) >> 16; } else { return serial_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::serial_w16){ if (!(offset&1)) { serial_w(space, offset>>1, data << 16, mem_mask << 16); } else { serial_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::dspctrl_r16){ if (!(offset&1)) { return dspctrl_r(space, offset>>1, mem_mask<<16) >> 16; } else { return dspctrl_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::dspctrl_w16){ if (!(offset&1)) { dspctrl_w(space, offset>>1, data << 16, mem_mask << 16); } else { dspctrl_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::eeprom_cs16){ if (!(offset&1)) { return eeprom_cs(space, offset>>1, mem_mask<<16) >> 16; } else { return eeprom_cs(space, offset>>1, mem_mask); } }
-READ16_MEMBER(jaguar_state::eeprom_clk16){ if (!(offset&1)) { return eeprom_clk(space, offset>>1, mem_mask<<16) >> 16; } else { return eeprom_clk(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::eeprom_w16){ if (!(offset&1)) { eeprom_w(space, offset>>1, data << 16, mem_mask << 16); } else { eeprom_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::joystick_r16){ if (!(offset&1)) { return joystick_r(space, offset>>1, mem_mask<<16) >> 16; } else { return joystick_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::joystick_w16){ if (!(offset&1)) { joystick_w(space, offset>>1, data << 16, mem_mask << 16); } else { joystick_w(space, offset>>1, data, mem_mask); } }
-
-READ32_MEMBER(jaguar_state::shared_ram_r){ return m_shared_ram[offset]; }
-WRITE32_MEMBER(jaguar_state::shared_ram_w){ COMBINE_DATA(&m_shared_ram[offset]); }
-READ32_MEMBER(jaguar_state::rom_base_r){ return m_rom_base[offset*2+1] << 16 | m_rom_base[offset*2]; }
-READ32_MEMBER(jaguar_state::wave_rom_r){ return m_wave_rom[offset*2+1] << 16 | m_wave_rom[offset*2]; }
-READ32_MEMBER(jaguarcd_state::cd_bios_r){ return m_cd_bios[offset*2+1] << 16 | m_cd_bios[offset*2]; }
-READ32_MEMBER(jaguar_state::dsp_ram_r){ return m_dsp_ram[offset]; }
-WRITE32_MEMBER(jaguar_state::dsp_ram_w){ COMBINE_DATA(&m_dsp_ram[offset]); }
-READ32_MEMBER(jaguar_state::gpu_clut_r){ return m_gpu_clut[offset]; }
-WRITE32_MEMBER(jaguar_state::gpu_clut_w){ COMBINE_DATA(&m_gpu_clut[offset]); }
-READ32_MEMBER(jaguar_state::gpu_ram_r){ return m_gpu_ram[offset]; }
-WRITE32_MEMBER(jaguar_state::gpu_ram_w){ COMBINE_DATA(&m_gpu_ram[offset]); }
-
-READ16_MEMBER(jaguar_state::shared_ram_r16){ if (!(offset&1)) { return shared_ram_r(space, offset>>1, mem_mask<<16) >> 16; } else { return shared_ram_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::shared_ram_w16){ if (!(offset&1)) { shared_ram_w(space, offset>>1, data << 16, mem_mask << 16); } else { shared_ram_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::cart_base_r16){ if (!(offset&1)) { return m_cart_base[offset>>1] >> 16; } else { return m_cart_base[offset>>1] & 0xffff; } }
-READ16_MEMBER(jaguar_state::dsp_ram_r16){ if (!(offset&1)) { return dsp_ram_r(space, offset>>1, mem_mask<<16) >> 16; } else { return dsp_ram_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::dsp_ram_w16){ if (!(offset&1)) { dsp_ram_w(space, offset>>1, data << 16, mem_mask << 16); } else { dsp_ram_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::gpu_clut_r16){ if (!(offset&1)) { return gpu_clut_r(space, offset>>1, mem_mask<<16) >> 16; } else { return gpu_clut_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::gpu_clut_w16){ if (!(offset&1)) { gpu_clut_w(space, offset>>1, data << 16, mem_mask << 16); } else { gpu_clut_w(space, offset>>1, data, mem_mask); } }
-READ16_MEMBER(jaguar_state::gpu_ram_r16){ if (!(offset&1)) { return gpu_ram_r(space, offset>>1, mem_mask<<16) >> 16; } else { return gpu_ram_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguar_state::gpu_ram_w16){ if (!(offset&1)) { gpu_ram_w(space, offset>>1, data << 16, mem_mask << 16); } else { gpu_ram_w(space, offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::gpuctrl_r16(offs_t offset, uint16_t mem_mask){ if (!(offset&1)) { return gpuctrl_r(offset>>1, mem_mask<<16) >> 16; } else { return gpuctrl_r(offset>>1, mem_mask); } }
+void jaguar_state::gpuctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { gpuctrl_w(offset>>1, data << 16, mem_mask << 16); } else { gpuctrl_w(offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::blitter_r16(offs_t offset, uint16_t mem_mask){ if (!(offset&1)) { return blitter_r(offset>>1, mem_mask<<16) >> 16; } else { return blitter_r(offset>>1, mem_mask); } }
+void jaguar_state::blitter_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { blitter_w(offset>>1, data << 16, mem_mask << 16); } else { blitter_w(offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::serial_r16(offs_t offset){ if (!(offset&1)) { return serial_r(offset>>1) >> 16; } else { return serial_r(offset>>1); } }
+void jaguar_state::serial_w16(offs_t offset, uint16_t data){ if (!(offset&1)) { serial_w(offset>>1, data << 16); } else { serial_w(offset>>1, data); } }
+uint16_t jaguar_state::dspctrl_r16(offs_t offset, uint16_t mem_mask){ if (!(offset&1)) { return dspctrl_r(offset>>1, mem_mask<<16) >> 16; } else { return dspctrl_r(offset>>1, mem_mask); } }
+void jaguar_state::dspctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { dspctrl_w(offset>>1, data << 16, mem_mask << 16); } else { dspctrl_w(offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::eeprom_cs16(offs_t offset){ if (!(offset&1)) { return eeprom_cs() >> 16; } else { return eeprom_cs(); } }
+uint16_t jaguar_state::eeprom_clk16(offs_t offset){ if (!(offset&1)) { return eeprom_clk() >> 16; } else { return eeprom_clk(); } }
+void jaguar_state::eeprom_w16(offs_t offset, uint16_t data){ if (!(offset&1)) { eeprom_w(data << 16); } else { eeprom_w(data); } }
+uint16_t jaguar_state::joystick_r16(offs_t offset){ if (!(offset&1)) { return joystick_r() >> 16; } else { return joystick_r(); } }
+void jaguar_state::joystick_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { joystick_w(offset>>1, data << 16, mem_mask << 16); } else { joystick_w(offset>>1, data, mem_mask); } }
+
+uint32_t jaguar_state::shared_ram_r(offs_t offset){ return m_shared_ram[offset]; }
+void jaguar_state::shared_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_shared_ram[offset]); }
+uint32_t jaguar_state::rom_base_r(offs_t offset){ return m_rom_base[offset*2+1] << 16 | m_rom_base[offset*2]; }
+uint32_t jaguar_state::wave_rom_r(offs_t offset){ return m_wave_rom[offset*2+1] << 16 | m_wave_rom[offset*2]; }
+uint32_t jaguarcd_state::cd_bios_r(offs_t offset){ return m_cd_bios[offset*2+1] << 16 | m_cd_bios[offset*2]; }
+uint32_t jaguar_state::dsp_ram_r(offs_t offset){ return m_dsp_ram[offset]; }
+void jaguar_state::dsp_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_dsp_ram[offset]); }
+uint32_t jaguar_state::gpu_clut_r(offs_t offset){ return m_gpu_clut[offset]; }
+void jaguar_state::gpu_clut_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_gpu_clut[offset]); }
+uint32_t jaguar_state::gpu_ram_r(offs_t offset){ return m_gpu_ram[offset]; }
+void jaguar_state::gpu_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_gpu_ram[offset]); }
+
+uint16_t jaguar_state::shared_ram_r16(offs_t offset){ if (!(offset&1)) { return shared_ram_r(offset>>1) >> 16; } else { return shared_ram_r(offset>>1); } }
+void jaguar_state::shared_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { shared_ram_w(offset>>1, data << 16, mem_mask << 16); } else { shared_ram_w(offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::cart_base_r16(offs_t offset){ if (!(offset&1)) { return m_cart_base[offset>>1] >> 16; } else { return m_cart_base[offset>>1] & 0xffff; } }
+uint16_t jaguar_state::dsp_ram_r16(offs_t offset){ if (!(offset&1)) { return dsp_ram_r(offset>>1) >> 16; } else { return dsp_ram_r(offset>>1); } }
+void jaguar_state::dsp_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { dsp_ram_w(offset>>1, data << 16, mem_mask << 16); } else { dsp_ram_w(offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::gpu_clut_r16(offs_t offset){ if (!(offset&1)) { return gpu_clut_r(offset>>1) >> 16; } else { return gpu_clut_r(offset>>1); } }
+void jaguar_state::gpu_clut_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { gpu_clut_w(offset>>1, data << 16, mem_mask << 16); } else { gpu_clut_w(offset>>1, data, mem_mask); } }
+uint16_t jaguar_state::gpu_ram_r16(offs_t offset){ if (!(offset&1)) { return gpu_ram_r(offset>>1) >> 16; } else { return gpu_ram_r(offset>>1); } }
+void jaguar_state::gpu_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { gpu_ram_w(offset>>1, data << 16, mem_mask << 16); } else { gpu_ram_w(offset>>1, data, mem_mask); } }
void jaguar_state::console_base_map(address_map &map)
{
@@ -1207,10 +1207,10 @@ TODO: this needs to be device-ized, of course ...
*/
-READ16_MEMBER(jaguarcd_state::butch_regs_r16){ if (!(offset&1)) { return butch_regs_r(space, offset>>1, mem_mask<<16) >> 16; } else { return butch_regs_r(space, offset>>1, mem_mask); } }
-WRITE16_MEMBER(jaguarcd_state::butch_regs_w16){ if (!(offset&1)) { butch_regs_w(space, offset>>1, data << 16, mem_mask << 16); } else { butch_regs_w(space, offset>>1, data, mem_mask); } }
+uint16_t jaguarcd_state::butch_regs_r16(offs_t offset){ if (!(offset&1)) { return butch_regs_r(offset>>1) >> 16; } else { return butch_regs_r(offset>>1); } }
+void jaguarcd_state::butch_regs_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { butch_regs_w(offset>>1, data << 16, mem_mask << 16); } else { butch_regs_w(offset>>1, data, mem_mask); } }
-READ32_MEMBER(jaguarcd_state::butch_regs_r)
+uint32_t jaguarcd_state::butch_regs_r(offs_t offset)
{
switch(offset*4)
{
@@ -1222,7 +1222,7 @@ READ32_MEMBER(jaguarcd_state::butch_regs_r)
return m_butch_regs[offset];
}
-WRITE32_MEMBER(jaguarcd_state::butch_regs_w)
+void jaguarcd_state::butch_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_butch_regs[offset]);
@@ -2491,10 +2491,10 @@ void jaguar_state::cojag_common_init(uint16_t gpu_jump_offs, uint16_t spin_pc)
/* install synchronization hooks for GPU */
if (m_is_r3000)
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, write32_delegate(*this, FUNC(jaguar_state::gpu_jump_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, write32s_delegate(*this, FUNC(jaguar_state::gpu_jump_w)));
else
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, write32_delegate(*this, FUNC(jaguar_state::gpu_jump_w)));
- m_gpu->space(AS_PROGRAM).install_read_handler(0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, read32_delegate(*this, FUNC(jaguar_state::gpu_jump_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, write32s_delegate(*this, FUNC(jaguar_state::gpu_jump_w)));
+ m_gpu->space(AS_PROGRAM).install_read_handler(0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, read32smo_delegate(*this, FUNC(jaguar_state::gpu_jump_r)));
m_gpu_jump_address = &m_gpu_ram[gpu_jump_offs/4];
m_gpu_spin_pc = 0xf03000 + spin_pc;
}
@@ -2507,7 +2507,7 @@ void jaguar_state::init_area51a()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xa02030, 0xa02033, write32_delegate(*this, FUNC(jaguar_state::area51_main_speedup_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xa02030, 0xa02033, write32s_delegate(*this, FUNC(jaguar_state::area51_main_speedup_w)));
m_main_speedup = m_mainram + 0x2030/4;
#endif
}
@@ -2520,7 +2520,7 @@ void jaguar_state::init_area51()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 120;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x100062e8, 0x100062eb, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x100062e8, 0x100062eb, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
m_main_speedup = m_mainram + 0x62e8/4;
#endif
}
@@ -2536,7 +2536,7 @@ void jaguar_state::init_maxforce()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 120;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000865c, 0x1000865f, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000865c, 0x1000865f, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
m_main_speedup = m_mainram + 0x865c/4;
#endif
}
@@ -2552,7 +2552,7 @@ void jaguar_state::init_area51mx()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xa19550, 0xa19557, write32_delegate(*this, FUNC(jaguar_state::area51mx_main_speedup_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xa19550, 0xa19557, write32s_delegate(*this, FUNC(jaguar_state::area51mx_main_speedup_w)));
m_main_speedup = m_mainram + 0x19550/4;
#endif
}
@@ -2569,7 +2569,7 @@ void jaguar_state::init_a51mxr3k()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 120;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x10006f0c, 0x10006f0f, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x10006f0c, 0x10006f0f, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
m_main_speedup = m_mainram + 0x6f0c/4;
#endif
}
@@ -2583,7 +2583,7 @@ void jaguar_state::init_fishfren()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 200;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x10021b60, 0x10021b63, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x10021b60, 0x10021b63, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
m_main_speedup = m_mainram + 0x21b60/4;
#endif
}
@@ -2597,10 +2597,10 @@ void jaguar_state::init_freeze_common(offs_t main_speedup_addr)
/* install speedup for main CPU */
m_main_speedup_max_cycles = 200;
if (main_speedup_addr != 0) {
- m_maincpu->space(AS_PROGRAM).install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
m_main_speedup = m_mainram + (main_speedup_addr - 0x10000000)/4;
}
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x0400d900, 0x0400d900 + 3, read32_delegate(*this, FUNC(jaguar_state::main_gpu_wait_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x0400d900, 0x0400d900 + 3, read32smo_delegate(*this, FUNC(jaguar_state::main_gpu_wait_r)));
m_main_gpu_wait = m_shared_ram + 0xd900/4;
#endif
}
@@ -2620,7 +2620,7 @@ void jaguar_state::init_vcircle()
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 50;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x12005b34, 0x12005b37, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x12005b34, 0x12005b37, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r)));
m_main_speedup = m_mainram + 0x5b34/4;
m_main_speedup = m_mainram2 + 0x5b34/4;
#endif
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index 9f99ca04ff3..40c998ad11c 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -98,14 +98,14 @@ Notes:
#include "speaker.h"
-WRITE8_MEMBER(jailbrek_state::ctrl_w)
+void jailbrek_state::ctrl_w(uint8_t data)
{
m_nmi_enable = data & 0x01;
m_irq_enable = data & 0x02;
flip_screen_set(data & 0x08);
}
-WRITE8_MEMBER(jailbrek_state::coin_w)
+void jailbrek_state::coin_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
@@ -124,12 +124,12 @@ INTERRUPT_GEN_MEMBER(jailbrek_state::interrupt_nmi)
}
-READ8_MEMBER(jailbrek_state::speech_r)
+uint8_t jailbrek_state::speech_r()
{
return (m_vlm->bsy() ? 1 : 0);
}
-WRITE8_MEMBER(jailbrek_state::speech_w)
+void jailbrek_state::speech_w(uint8_t data)
{
/* bit 0 could be latch direction like in yiear */
m_vlm->st((data >> 1) & 1);
diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp
index 59cc14454c8..a6c35a061d5 100644
--- a/src/mame/drivers/jedi.cpp
+++ b/src/mame/drivers/jedi.cpp
@@ -217,13 +217,13 @@ WRITE_LINE_MEMBER(jedi_state::coin_counter_right_w)
*
*************************************/
-READ8_MEMBER(jedi_state::novram_data_r)
+u8 jedi_state::novram_data_r(address_space &space, offs_t offset)
{
return (m_novram[0]->read(space, offset) & 0x0f) | (m_novram[1]->read(space, offset) << 4);
}
-WRITE8_MEMBER(jedi_state::novram_data_w)
+void jedi_state::novram_data_w(offs_t offset, u8 data)
{
m_novram[0]->write(offset, data & 0x0f);
m_novram[1]->write(offset, data >> 4);
diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index f2db979c868..2375f9ef79b 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -210,7 +210,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jpmimpct_state::duart_1_timer_event)
update_irqs();
}
-READ16_MEMBER(jpmimpct_state::duart_1_r)
+uint16_t jpmimpct_state::duart_1_r(offs_t offset)
{
struct duart_t &duart_1 = m_duart_1;
uint16_t val = 0xffff;
@@ -274,7 +274,7 @@ READ16_MEMBER(jpmimpct_state::duart_1_r)
return val;
}
-WRITE16_MEMBER(jpmimpct_state::duart_1_w)
+void jpmimpct_state::duart_1_w(offs_t offset, uint16_t data)
{
struct duart_t &duart_1 = m_duart_1;
//int old_val;
@@ -360,7 +360,7 @@ WRITE16_MEMBER(jpmimpct_state::duart_1_w)
Communication with a touchscreen interface PCB
is handled via UART B.
*/
-READ16_MEMBER(jpmimpct_state::duart_2_r)
+uint16_t jpmimpct_state::duart_2_r(offs_t offset)
{
switch (offset)
{
@@ -401,7 +401,7 @@ READ16_MEMBER(jpmimpct_state::duart_2_r)
/*
Nothing important here?
*/
-WRITE16_MEMBER(jpmimpct_state::duart_2_w)
+void jpmimpct_state::duart_2_w(uint16_t data)
{
}
@@ -428,7 +428,7 @@ WRITE16_MEMBER(jpmimpct_state::duart_2_w)
* 9: Coin mechanism
*/
-READ16_MEMBER(jpmimpct_state::inputs1_r)
+uint16_t jpmimpct_state::inputs1_r(offs_t offset)
{
uint16_t val = 0x00ff;
@@ -465,7 +465,7 @@ READ16_MEMBER(jpmimpct_state::inputs1_r)
* Sound control
*
*************************************/
-WRITE16_MEMBER(jpmimpct_state::volume_w)
+void jpmimpct_state::volume_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -474,7 +474,7 @@ WRITE16_MEMBER(jpmimpct_state::volume_w)
}
}
-WRITE16_MEMBER(jpmimpct_state::upd7759_w)
+void jpmimpct_state::upd7759_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -484,7 +484,7 @@ WRITE16_MEMBER(jpmimpct_state::upd7759_w)
}
}
-READ16_MEMBER(jpmimpct_state::upd7759_r)
+uint16_t jpmimpct_state::upd7759_r(offs_t offset, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -500,12 +500,12 @@ READ16_MEMBER(jpmimpct_state::upd7759_r)
*
*************************************/
-READ16_MEMBER(jpmimpct_state::unk_r)
+uint16_t jpmimpct_state::unk_r()
{
return 0xffff;
}
-WRITE16_MEMBER(jpmimpct_state::unk_w)
+void jpmimpct_state::unk_w(uint16_t data)
{
}
@@ -520,12 +520,12 @@ void jpmimpct_state::jpm_draw_lamps(int data, int lamp_strobe)
}
}
-READ16_MEMBER(jpmimpct_state::jpmio_r)
+uint16_t jpmimpct_state::jpmio_r()
{
return 0xffff;
}
-WRITE16_MEMBER(jpmimpct_state::jpmio_w)
+void jpmimpct_state::jpmio_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -1003,7 +1003,7 @@ MACHINE_RESET_MEMBER(jpmimpct_state,impctawp)
* 8: Payslides
* 9: Coin mechanism
*/
-READ16_MEMBER(jpmimpct_state::inputs1awp_r)
+uint16_t jpmimpct_state::inputs1awp_r(offs_t offset)
{
uint16_t val = 0x00;
@@ -1060,22 +1060,22 @@ READ16_MEMBER(jpmimpct_state::inputs1awp_r)
}
}
-READ16_MEMBER(jpmimpct_state::optos_r)
+uint16_t jpmimpct_state::optos_r()
{
return m_optic_pattern;
}
-READ16_MEMBER(jpmimpct_state::prot_1_r)
+uint16_t jpmimpct_state::prot_1_r()
{
return 0x01;
}
-READ16_MEMBER(jpmimpct_state::prot_0_r)
+uint16_t jpmimpct_state::prot_0_r()
{
return 0x00;
}
-WRITE16_MEMBER(jpmimpct_state::jpmioawp_w)
+void jpmimpct_state::jpmioawp_w(offs_t offset, uint16_t data)
{
int i,metno;
switch (offset)
@@ -1176,7 +1176,7 @@ WRITE16_MEMBER(jpmimpct_state::jpmioawp_w)
}
}
-READ16_MEMBER(jpmimpct_state::ump_r)
+uint16_t jpmimpct_state::ump_r()
{
return 0xff;//0xffff;
}
diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp
index cd7b51be214..76c07ddec22 100644
--- a/src/mame/drivers/jpmsys5.cpp
+++ b/src/mame/drivers/jpmsys5.cpp
@@ -74,7 +74,7 @@ WRITE_LINE_MEMBER(jpmsys5v_state::generate_tms34061_interrupt)
m_maincpu->set_input_line(INT_TMS34061, state);
}
-WRITE16_MEMBER(jpmsys5v_state::sys5_tms34061_w)
+void jpmsys5v_state::sys5_tms34061_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int func = (offset >> 19) & 3;
int row = (offset >> 7) & 0x1ff;
@@ -97,7 +97,7 @@ WRITE16_MEMBER(jpmsys5v_state::sys5_tms34061_w)
m_tms34061->write(col | 1, row, func, data & 0xff);
}
-READ16_MEMBER(jpmsys5v_state::sys5_tms34061_r)
+uint16_t jpmsys5v_state::sys5_tms34061_r(offs_t offset, uint16_t mem_mask)
{
uint16_t data = 0;
int func = (offset >> 19) & 3;
@@ -123,7 +123,7 @@ READ16_MEMBER(jpmsys5v_state::sys5_tms34061_r)
return data;
}
-WRITE16_MEMBER(jpmsys5v_state::ramdac_w)
+void jpmsys5v_state::ramdac_w(offs_t offset, uint16_t data)
{
if (offset == 0)
{
@@ -194,12 +194,12 @@ void jpmsys5_state::sys5_draw_lamps()
*
****************************************/
-WRITE16_MEMBER(jpmsys5v_state::rombank_w)
+void jpmsys5v_state::rombank_w(uint16_t data)
{
m_rombank->set_entry(data & 0x1f);
}
-READ16_MEMBER(jpmsys5_state::coins_r)
+uint16_t jpmsys5_state::coins_r(offs_t offset)
{
if (offset == 2)
return ioport("COINS")->read() << 8;
@@ -207,22 +207,22 @@ READ16_MEMBER(jpmsys5_state::coins_r)
return 0xffff;
}
-WRITE16_MEMBER(jpmsys5_state::coins_w)
+void jpmsys5_state::coins_w(uint16_t data)
{
/* TODO */
}
-READ16_MEMBER(jpmsys5_state::unk_r)
+uint16_t jpmsys5_state::unk_r()
{
return 0xffff;
}
-WRITE16_MEMBER(jpmsys5_state::mux_w)
+void jpmsys5_state::mux_w(offs_t offset, uint16_t data)
{
m_muxram[offset]=data;
}
-READ16_MEMBER(jpmsys5_state::mux_r)
+uint16_t jpmsys5_state::mux_r(offs_t offset)
{
if (offset == 0x81/2)
return ioport("DSW")->read();
@@ -230,7 +230,7 @@ READ16_MEMBER(jpmsys5_state::mux_r)
return 0xffff;
}
-WRITE16_MEMBER(jpmsys5_state::jpm_upd7759_w)
+void jpmsys5_state::jpm_upd7759_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -263,7 +263,7 @@ WRITE16_MEMBER(jpmsys5_state::jpm_upd7759_w)
}
}
-READ16_MEMBER(jpmsys5_state::jpm_upd7759_r)
+uint16_t jpmsys5_state::jpm_upd7759_r()
{
return 0x14 | m_upd7759->busy_r();
}
@@ -647,7 +647,7 @@ void jpmsys5v_state::jpmsys5v(machine_config &config)
ptm.irq_callback().set(FUNC(jpmsys5v_state::ptm_irq));
}
-READ16_MEMBER(jpmsys5_state::mux_awp_r)
+uint16_t jpmsys5_state::mux_awp_r(offs_t offset)
{
static const char *const portnames[] = { "DSW", "DSW2", "ROTARY", "STROBE0", "STROBE1", "STROBE2", "STROBE3", "STROBE4" };
@@ -661,7 +661,7 @@ READ16_MEMBER(jpmsys5_state::mux_awp_r)
}
}
-READ16_MEMBER(jpmsys5_state::coins_awp_r)
+uint16_t jpmsys5_state::coins_awp_r(offs_t offset)
{
switch (offset)
{
diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp
index a3c549c8764..1e7d8e2870d 100644
--- a/src/mame/drivers/kangaroo.cpp
+++ b/src/mame/drivers/kangaroo.cpp
@@ -185,7 +185,7 @@ void kangaroo_state::machine_start()
MACHINE_START_MEMBER(kangaroo_state,kangaroo_mcu)
{
kangaroo_state::machine_start();
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xef00, 0xefff, read8_delegate(*this, FUNC(kangaroo_state::mcu_sim_r)), write8_delegate(*this, FUNC(kangaroo_state::mcu_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xef00, 0xefff, read8smo_delegate(*this, FUNC(kangaroo_state::mcu_sim_r)), write8smo_delegate(*this, FUNC(kangaroo_state::mcu_sim_w)));
save_item(NAME(m_mcu_clock));
}
@@ -220,12 +220,12 @@ void kangaroo_state::machine_reset()
this just seems to do the trick -V-
*/
-READ8_MEMBER(kangaroo_state::mcu_sim_r)
+uint8_t kangaroo_state::mcu_sim_r()
{
return ++m_mcu_clock & 0x0f;
}
-WRITE8_MEMBER(kangaroo_state::mcu_sim_w)
+void kangaroo_state::mcu_sim_w(uint8_t data)
{
}
@@ -237,7 +237,7 @@ WRITE8_MEMBER(kangaroo_state::mcu_sim_w)
*
*************************************/
-WRITE8_MEMBER(kangaroo_state::kangaroo_coin_counter_w)
+void kangaroo_state::kangaroo_coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp
index 36a1384aeca..17cca757257 100644
--- a/src/mame/drivers/karnov.cpp
+++ b/src/mame/drivers/karnov.cpp
@@ -305,7 +305,7 @@ void karnov_state::wndrplnt_i8751_w( int data )
*
*************************************/
-WRITE16_MEMBER(karnov_state::mcusim_ack_w)
+void karnov_state::mcusim_ack_w(u16 data)
{
m_maincpu->set_input_line(6, CLEAR_LINE);
@@ -345,7 +345,7 @@ void karnov_state::mcusim_w(u16 data)
wndrplnt_i8751_w(data);
}
-WRITE16_MEMBER(karnov_state::mcusim_reset_w)
+void karnov_state::mcusim_reset_w(u16 data)
{
logerror("Reset i8751\n");
m_i8751_needs_ack = 0;
@@ -354,7 +354,7 @@ WRITE16_MEMBER(karnov_state::mcusim_reset_w)
m_i8751_return = 0;
}
-WRITE16_MEMBER(karnov_state::vint_ack_w)
+void karnov_state::vint_ack_w(u16 data)
{
m_maincpu->set_input_line(7, CLEAR_LINE);
}
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index d7f81ebe806..99487ebf146 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -56,7 +56,7 @@
#include "speaker.h"
-READ8_MEMBER( kaypro_state::kaypro484_87_r ) { return 0x7f; } /* to bypass unemulated HD controller */
+uint8_t kaypro_state::kaypro484_87_r() { return 0x7f; } /* to bypass unemulated HD controller */
/***********************************************************
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index ee3eaf6e28e..ae9969334e7 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -150,14 +150,14 @@ void kchamp_state::kchampvs_sound_io_map(address_map &map)
/********************
* 1 Player Version *
********************/
-READ8_MEMBER(kchamp_state::sound_reset_r)
+uint8_t kchamp_state::sound_reset_r()
{
if (!machine().side_effects_disabled())
m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
return 0;
}
-WRITE8_MEMBER(kchamp_state::kc_sound_control_w)
+void kchamp_state::kc_sound_control_w(offs_t offset, uint8_t data)
{
if (offset == 0)
{
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index 09583aeb2cc..ebab4c76fad 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -83,7 +83,7 @@ Action Hollywood
*/
-WRITE16_MEMBER(kickgoal_state::actionhw_snd_w)
+void kickgoal_state::actionhw_snd_w(offs_t offset, u16 data, u16 mem_mask)
{
logerror("%s: Writing %04x to Sound CPU - mask %04x\n",machine().describe_context(),data,mem_mask);
@@ -351,7 +351,7 @@ void kickgoal_state::oki_map(address_map &map)
}
-void kickgoal_state::soundio_port_a_w(uint8_t data)
+void kickgoal_state::soundio_port_a_w(u8 data)
{
// only time this ever gets a different value is the high score name entry, these banks are correct based on sample positions
switch (data)
@@ -362,23 +362,23 @@ void kickgoal_state::soundio_port_a_w(uint8_t data)
}
}
-uint8_t kickgoal_state::soundio_port_b_r()
+u8 kickgoal_state::soundio_port_b_r()
{
return m_pic_portb;
}
-void kickgoal_state::soundio_port_b_w(uint8_t data)
+void kickgoal_state::soundio_port_b_w(u8 data)
{
m_pic_portb = data;
}
-uint8_t kickgoal_state::soundio_port_c_r()
+u8 kickgoal_state::soundio_port_c_r()
{
// 0x20 = sound command ready?
return (m_pic_portc & ~0x20) | m_sound_command_sent;
}
-void kickgoal_state::soundio_port_c_w(uint8_t data)
+void kickgoal_state::soundio_port_c_w(u8 data)
{
if ((data & 0x10) != (m_pic_portc & 0x10))
{
@@ -409,7 +409,7 @@ void kickgoal_state::soundio_port_c_w(uint8_t data)
}
-WRITE16_MEMBER(kickgoal_state::to_pic_w)
+void kickgoal_state::to_pic_w(u16 data)
{
m_soundlatch->write(data);
m_sound_command_sent = 0x20;
@@ -578,7 +578,7 @@ void kickgoal_state::init_kickgoal()
void kickgoal_state::init_actionhw()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x800004, 0x800005, write16_delegate(*this, FUNC(kickgoal_state::actionhw_snd_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x800004, 0x800005, write16s_delegate(*this, FUNC(kickgoal_state::actionhw_snd_w)));
}
GAME( 1995, kickgoal, 0, kickgoal, kickgoal, kickgoal_state, init_kickgoal, ROT0, "TCH", "Kick Goal (set 1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kikikai.cpp b/src/mame/drivers/kikikai.cpp
index f8fd906e102..1aa7c53ccee 100644
--- a/src/mame/drivers/kikikai.cpp
+++ b/src/mame/drivers/kikikai.cpp
@@ -69,7 +69,7 @@ PS4 J8635 PS4 J8541 PS4 J8648
*
*************************************/
-READ8_MEMBER(kikikai_state::kiki_ym2203_r)
+uint8_t kikikai_state::kiki_ym2203_r(offs_t offset)
{
u8 result = m_ymsnd->read(offset);
@@ -108,7 +108,7 @@ void kikikai_state::sound_map(address_map &map)
map(0xc000, 0xc001).r(FUNC(kikikai_state::kiki_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write));
}
-WRITE8_MEMBER(kikikai_state::kicknrun_sub_output_w)
+void kikikai_state::kicknrun_sub_output_w(uint8_t data)
{
/*--x- ---- coin lockout 2*/
/*---x ---- coin lockout 1*/
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index cdcefccf662..615109c0a0c 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -363,7 +363,7 @@ void konamigx_state::daiskiss_esc(address_space &space, uint32_t p1, uint32_t p2
generate_sprites(space, 0xc00000, 0xd20000, 0x100);
}
-WRITE32_MEMBER(konamigx_state::esc_w)
+void konamigx_state::esc_w(address_space &space, uint32_t data)
{
uint32_t opcode;
uint32_t params;
@@ -453,7 +453,7 @@ CUSTOM_INPUT_MEMBER(konamigx_state::gx_rdport1_3_r)
return (m_gx_rdport1_3 >> 1);
}
-WRITE32_MEMBER(konamigx_state::eeprom_w)
+void konamigx_state::eeprom_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t odata;
@@ -501,7 +501,7 @@ WRITE32_MEMBER(konamigx_state::eeprom_w)
}
}
-WRITE32_MEMBER(konamigx_state::control_w)
+void konamigx_state::control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// TODO: derive from reported PCB XTALs
const uint32_t pixclock[4] = { 6'000'000, 8'000'000, 12'000'000, 16'000'000 };
@@ -735,7 +735,7 @@ double konamigx_state::adc0834_callback(uint8_t input)
}
-READ32_MEMBER(konamigx_state::le2_gun_H_r)
+uint32_t konamigx_state::le2_gun_H_r()
{
int p1x = m_light0_x->read()*290/0xff+20;
int p2x = m_light1_x->read()*290/0xff+20;
@@ -743,7 +743,7 @@ READ32_MEMBER(konamigx_state::le2_gun_H_r)
return (p1x<<16)|p2x;
}
-READ32_MEMBER(konamigx_state::le2_gun_V_r)
+uint32_t konamigx_state::le2_gun_V_r()
{
int p1y = m_light0_y->read()*224/0xff;
int p2y = m_light1_y->read()*224/0xff;
@@ -758,14 +758,14 @@ READ32_MEMBER(konamigx_state::le2_gun_V_r)
/**********************************************************************************/
/* system or game dependent handlers */
-READ32_MEMBER(konamigx_state::type1_roz_r1)
+uint32_t konamigx_state::type1_roz_r1(offs_t offset)
{
uint32_t *ROM = (uint32_t *)memregion("gfx3")->base();
return ROM[offset];
}
-READ32_MEMBER(konamigx_state::type1_roz_r2)
+uint32_t konamigx_state::type1_roz_r2(offs_t offset)
{
uint32_t *ROM = (uint32_t *)memregion("gfx3")->base();
@@ -774,7 +774,7 @@ READ32_MEMBER(konamigx_state::type1_roz_r2)
return ROM[offset];
}
-READ32_MEMBER(konamigx_state::type3_sync_r)
+uint32_t konamigx_state::type3_sync_r()
{
if(m_konamigx_current_frame==0)
return -1; // return 0xfffffffe | 1;
@@ -859,7 +859,7 @@ READ32_MEMBER(konamigx_state::type3_sync_r)
move.l #$C10400,($C102EC).l move.l #$C10400,($C102EC).l
*/
-WRITE32_MEMBER(konamigx_state::type4_prot_w)
+void konamigx_state::type4_prot_w(address_space &space, offs_t offset, uint32_t data)
{
int clk;
int i;
@@ -1012,7 +1012,7 @@ WRITE32_MEMBER(konamigx_state::type4_prot_w)
}
// cabinet lamps for type 1 games
-WRITE32_MEMBER(konamigx_state::type1_cablamps_w)
+void konamigx_state::type1_cablamps_w(uint32_t data)
{
m_lamp = BIT(data, 24);
}
@@ -1118,14 +1118,14 @@ void konamigx_state::gx_type4_map(address_map &map)
/**********************************************************************************/
/* Sound handling */
-READ16_MEMBER(konamigx_state::tms57002_status_word_r)
+uint16_t konamigx_state::tms57002_status_word_r()
{
return (m_dasp->dready_r() ? 4 : 0) |
(m_dasp->pc0_r() ? 2 : 0) |
(m_dasp->empty_r() ? 1 : 0);
}
-WRITE16_MEMBER(konamigx_state::tms57002_control_word_w)
+void konamigx_state::tms57002_control_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -3879,7 +3879,7 @@ static const GXGameInfoT gameDefs[] =
{ "", 0xff,0xff,0xff },
};
-READ32_MEMBER( konamigx_state::k_6bpp_rom_long_r )
+uint32_t konamigx_state::k_6bpp_rom_long_r(offs_t offset, uint32_t mem_mask)
{
return m_k056832->k_6bpp_rom_long_r(offset, mem_mask);
}
@@ -3908,8 +3908,8 @@ void konamigx_state::init_konamigx()
switch (gameDefs[i].special)
{
case 1: // LE2 guns
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xd44000, 0xd44003, read32_delegate(*this, FUNC(konamigx_state::le2_gun_H_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xd44004, 0xd44007, read32_delegate(*this, FUNC(konamigx_state::le2_gun_V_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xd44000, 0xd44003, read32smo_delegate(*this, FUNC(konamigx_state::le2_gun_H_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xd44004, 0xd44007, read32smo_delegate(*this, FUNC(konamigx_state::le2_gun_V_r)));
break;
case 2: // tkmmpzdm hack
{
@@ -3944,7 +3944,7 @@ void konamigx_state::init_konamigx()
break;
case 7: // install type 4 Xilinx protection for non-type 3/4 games
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xcc0000, 0xcc0007, write32_delegate(*this, FUNC(konamigx_state::type4_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xcc0000, 0xcc0007, write32m_delegate(*this, FUNC(konamigx_state::type4_prot_w)));
break;
case 8: // tbyahhoo
@@ -3961,7 +3961,7 @@ void konamigx_state::init_konamigx()
}
if (readback == BPP66)
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xd00000, 0xd01fff, read32_delegate(*this, FUNC(konamigx_state::k_6bpp_rom_long_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xd00000, 0xd01fff, read32s_delegate(*this, FUNC(konamigx_state::k_6bpp_rom_long_r)));
#undef BPP5
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index bd15aa365d5..34f2804fdf7 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -261,7 +261,7 @@ uint32_t kron180_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
/* Interrupt Handling */
#if 0
-WRITE8_MEMBER(kron180_state::irq0_ack_w)
+void kron180_state::irq0_ack_w(uint8_t data)
{
m_irq0_ack = data;
if ((data & 1) == 1)
diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp
index 7295d172376..8829ee9fdfb 100644
--- a/src/mame/drivers/ksayakyu.cpp
+++ b/src/mame/drivers/ksayakyu.cpp
@@ -78,7 +78,7 @@ SRAM:
#define MAIN_CLOCK XTAL(18'432'000)
-WRITE8_MEMBER(ksayakyu_state::bank_select_w)
+void ksayakyu_state::bank_select_w(uint8_t data)
{
/*
bits:
@@ -90,24 +90,24 @@ WRITE8_MEMBER(ksayakyu_state::bank_select_w)
membank("bank1")->set_entry(data & 0x01);
}
-WRITE8_MEMBER(ksayakyu_state::latch_w)
+void ksayakyu_state::latch_w(uint8_t data)
{
m_sound_status &= ~0x80;
m_soundlatch->write(data | 0x80);
}
-READ8_MEMBER(ksayakyu_state::sound_status_r)
+uint8_t ksayakyu_state::sound_status_r()
{
return m_sound_status | 4;
}
-WRITE8_MEMBER(ksayakyu_state::tomaincpu_w)
+void ksayakyu_state::tomaincpu_w(uint8_t data)
{
m_sound_status |= 0x80;
m_soundlatch->write(data);
}
-READ8_MEMBER(ksayakyu_state::int_ack_r)
+uint8_t ksayakyu_state::int_ack_r()
{
m_maincpu->set_input_line(0, CLEAR_LINE);
return 0xff; // value not used
diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp
index 5309b55a80f..061f6b42247 100644
--- a/src/mame/drivers/labyrunr.cpp
+++ b/src/mame/drivers/labyrunr.cpp
@@ -34,7 +34,7 @@ INTERRUPT_GEN_MEMBER(labyrunr_state::labyrunr_timer_interrupt)
}
-WRITE8_MEMBER(labyrunr_state::labyrunr_bankswitch_w)
+void labyrunr_state::labyrunr_bankswitch_w(uint8_t data)
{
if (data & 0xe0) popmessage("bankswitch %02x", data);
diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp
index 150a1327936..04c86ee82d0 100644
--- a/src/mame/drivers/ladybug.cpp
+++ b/src/mame/drivers/ladybug.cpp
@@ -73,7 +73,7 @@ TODO:
// Protection?
-READ8_MEMBER(sraider_state::sraider_8005_r)
+uint8_t sraider_state::sraider_8005_r()
{
// This must return X011111X or cpu #1 will hang
// see code at rst $10
@@ -81,7 +81,7 @@ READ8_MEMBER(sraider_state::sraider_8005_r)
}
// Unknown IO
-WRITE8_MEMBER(sraider_state::sraider_misc_w)
+void sraider_state::sraider_misc_w(offs_t offset, uint8_t data)
{
switch(offset)
{
diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp
index 3ffb12f56e5..4f510ee8cb3 100644
--- a/src/mame/drivers/ladyfrog.cpp
+++ b/src/mame/drivers/ladyfrog.cpp
@@ -62,19 +62,19 @@ Notes:
#include "speaker.h"
-READ8_MEMBER(ladyfrog_state::from_snd_r)
+uint8_t ladyfrog_state::from_snd_r()
{
m_snd_flag = 0;
return m_snd_data;
}
-WRITE8_MEMBER(ladyfrog_state::to_main_w)
+void ladyfrog_state::to_main_w(uint8_t data)
{
m_snd_data = data;
m_snd_flag = 2;
}
-WRITE8_MEMBER(ladyfrog_state::sound_cpu_reset_w)
+void ladyfrog_state::sound_cpu_reset_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 1 ) ? ASSERT_LINE : CLEAR_LINE);
}
@@ -87,18 +87,18 @@ TIMER_CALLBACK_MEMBER(ladyfrog_state::nmi_callback)
m_pending_nmi = 1;
}
-WRITE8_MEMBER(ladyfrog_state::sound_command_w)
+void ladyfrog_state::sound_command_w(uint8_t data)
{
m_soundlatch->write(data);
machine().scheduler().synchronize(timer_expired_delegate(FUNC(ladyfrog_state::nmi_callback),this), data);
}
-WRITE8_MEMBER(ladyfrog_state::nmi_disable_w)
+void ladyfrog_state::nmi_disable_w(uint8_t data)
{
m_sound_nmi_enable = 0;
}
-WRITE8_MEMBER(ladyfrog_state::nmi_enable_w)
+void ladyfrog_state::nmi_enable_w(uint8_t data)
{
m_sound_nmi_enable = 1;
if (m_pending_nmi)
@@ -112,7 +112,7 @@ void ladyfrog_state::unk_w(uint8_t data)
{
}
-READ8_MEMBER(ladyfrog_state::snd_flag_r)
+uint8_t ladyfrog_state::snd_flag_r()
{
return m_snd_flag | 0xfd;
}
diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp
index df772f96d27..9c3e20e49cf 100644
--- a/src/mame/drivers/laser3k.cpp
+++ b/src/mame/drivers/laser3k.cpp
@@ -91,11 +91,11 @@ protected:
virtual void machine_reset() override;
private:
- READ8_MEMBER( ram_r );
- WRITE8_MEMBER( ram_w );
- READ8_MEMBER( io_r );
- WRITE8_MEMBER( io_w );
- READ8_MEMBER( io2_r );
+ uint8_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint8_t data);
+ uint8_t io_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
+ uint8_t io2_r(offs_t offset);
void laser3k_palette(palette_device &palette) const;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -249,12 +249,12 @@ void laser3k_state::machine_reset()
rom[0x4607] = 0;
}
-READ8_MEMBER( laser3k_state::ram_r )
+uint8_t laser3k_state::ram_r(offs_t offset)
{
return m_ram->read(offset);
}
-WRITE8_MEMBER( laser3k_state::ram_w )
+void laser3k_state::ram_w(offs_t offset, uint8_t data)
{
m_ram->write(offset, data);
}
@@ -397,7 +397,7 @@ void laser3k_state::do_io(int offset)
}
}
-READ8_MEMBER( laser3k_state::io_r )
+uint8_t laser3k_state::io_r(offs_t offset)
{
switch (offset)
{
@@ -431,7 +431,7 @@ READ8_MEMBER( laser3k_state::io_r )
return 0xff;
}
-WRITE8_MEMBER( laser3k_state::io_w )
+void laser3k_state::io_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -472,7 +472,7 @@ WRITE8_MEMBER( laser3k_state::io_w )
}
}
-READ8_MEMBER( laser3k_state::io2_r )
+uint8_t laser3k_state::io2_r(offs_t offset)
{
switch (offset)
{
diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp
index 477cb85fdd0..3f06c515102 100644
--- a/src/mame/drivers/laserbat.cpp
+++ b/src/mame/drivers/laserbat.cpp
@@ -86,7 +86,7 @@
#include "speaker.h"
-WRITE8_MEMBER(laserbat_state_base::ct_io_w)
+void laserbat_state_base::ct_io_w(uint8_t data)
{
/*
Uses a hex buffer, so bits 6 and 7 are not physically present.
@@ -134,7 +134,7 @@ WRITE8_MEMBER(laserbat_state_base::ct_io_w)
// popmessage("ct io: %02X", data);
}
-READ8_MEMBER(laserbat_state_base::rrowx_r)
+uint8_t laserbat_state_base::rrowx_r()
{
return (m_mpx_p_1_2 ? m_row2 : m_mux_ports[m_input_mux])->read();
}
diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp
index 5e8da97b532..01345292238 100644
--- a/src/mame/drivers/lasso.cpp
+++ b/src/mame/drivers/lasso.cpp
@@ -50,19 +50,19 @@ INPUT_CHANGED_MEMBER(lasso_state::coin_inserted)
/* Write to the sound latch and generate an IRQ on the sound CPU */
-WRITE8_MEMBER(lasso_state::sound_command_w)
+void lasso_state::sound_command_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->set_input_line(0, HOLD_LINE);
}
-READ8_MEMBER(lasso_state::sound_status_r)
+uint8_t lasso_state::sound_status_r()
{
/* 0x01: chip#0 ready; 0x02: chip#1 ready */
return 0x03;
}
-WRITE8_MEMBER(lasso_state::sound_select_w)
+void lasso_state::sound_select_w(uint8_t data)
{
uint8_t to_write = bitswap<8>(*m_chip_data, 0, 1, 2, 3, 4, 5, 6, 7);
diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp
index 1a261cf2dab..b4a71a1b280 100644
--- a/src/mame/drivers/lastduel.cpp
+++ b/src/mame/drivers/lastduel.cpp
@@ -134,14 +134,14 @@ Notes:
/******************************************************************************/
template<int Layer>
-WRITE16_MEMBER(lastduel_state::lastduel_vram_w)
+void lastduel_state::lastduel_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram[Layer][offset]);
m_tilemap[Layer]->mark_tile_dirty(offset / 2);
}
template<int Layer>
-WRITE16_MEMBER(lastduel_state::madgear_vram_w)
+void lastduel_state::madgear_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram[Layer][offset]);
m_tilemap[Layer]->mark_tile_dirty(offset & 0x7ff);
@@ -197,7 +197,7 @@ void lastduel_state::sound_map(address_map &map)
map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read));
}
-WRITE8_MEMBER(lastduel_state::mg_bankswitch_w)
+void lastduel_state::mg_bankswitch_w(uint8_t data)
{
m_audiobank->set_entry(data & 0x01);
}
diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp
index f5282ebecee..c3247ab40d5 100644
--- a/src/mame/drivers/lazercmd.cpp
+++ b/src/mame/drivers/lazercmd.cpp
@@ -284,30 +284,30 @@ TIMER_DEVICE_CALLBACK_MEMBER(lazercmd_state::bbonk_timer)
*************************************************************/
/* triggered by WRTC,r opcode */
-WRITE8_MEMBER(lazercmd_state::lazercmd_ctrl_port_w)
+void lazercmd_state::lazercmd_ctrl_port_w(uint8_t data)
{
}
/* triggered by REDC,r opcode */
-READ8_MEMBER(lazercmd_state::lazercmd_ctrl_port_r)
+uint8_t lazercmd_state::lazercmd_ctrl_port_r()
{
uint8_t data = 0;
return data;
}
/* triggered by WRTD,r opcode */
-WRITE8_MEMBER(lazercmd_state::lazercmd_data_port_w)
+void lazercmd_state::lazercmd_data_port_w(uint8_t data)
{
}
/* triggered by REDD,r opcode */
-READ8_MEMBER(lazercmd_state::lazercmd_data_port_r)
+uint8_t lazercmd_state::lazercmd_data_port_r()
{
uint8_t data = ioport("DSW")->read() & 0x0f;
return data;
}
-WRITE8_MEMBER(lazercmd_state::lazercmd_hardware_w)
+void lazercmd_state::lazercmd_hardware_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -329,7 +329,7 @@ WRITE8_MEMBER(lazercmd_state::lazercmd_hardware_w)
}
}
-WRITE8_MEMBER(lazercmd_state::medlanes_hardware_w)
+void lazercmd_state::medlanes_hardware_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -352,7 +352,7 @@ WRITE8_MEMBER(lazercmd_state::medlanes_hardware_w)
}
}
-WRITE8_MEMBER(lazercmd_state::bbonk_hardware_w)
+void lazercmd_state::bbonk_hardware_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -369,7 +369,7 @@ WRITE8_MEMBER(lazercmd_state::bbonk_hardware_w)
}
}
-READ8_MEMBER(lazercmd_state::lazercmd_hardware_r)
+uint8_t lazercmd_state::lazercmd_hardware_r(offs_t offset)
{
uint8_t data = 0;
diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp
index 40ae0d3fcae..b58fc7bd549 100644
--- a/src/mame/drivers/lemmings.cpp
+++ b/src/mame/drivers/lemmings.cpp
@@ -28,7 +28,7 @@
#include "speaker.h"
-WRITE16_MEMBER(lemmings_state::lemmings_control_w)
+void lemmings_state::lemmings_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* Offset==0 Pixel layer X scroll */
if (offset == 4)
@@ -36,14 +36,14 @@ WRITE16_MEMBER(lemmings_state::lemmings_control_w)
COMBINE_DATA(&m_control_data[offset]);
}
-READ16_MEMBER(lemmings_state::lemmings_trackball_r)
+uint16_t lemmings_state::lemmings_trackball_r(offs_t offset)
{
if ((offset & 2) == 0)
return m_trackball_io[(offset & 1) | ((offset & 4) >> 1)]->read();
return 0;
}
-READ16_MEMBER( lemmings_state::lem_protection_region_0_146_r )
+uint16_t lemmings_state::lem_protection_region_0_146_r(offs_t offset)
{
int real_address = 0 + (offset *2);
int deco146_addr = bitswap<32>(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
@@ -52,7 +52,7 @@ READ16_MEMBER( lemmings_state::lem_protection_region_0_146_r )
return data;
}
-WRITE16_MEMBER( lemmings_state::lem_protection_region_0_146_w )
+void lemmings_state::lem_protection_region_0_146_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int real_address = 0 + (offset *2);
int deco146_addr = bitswap<32>(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index bf1d46f7c86..ae22d82e4ee 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -268,7 +268,7 @@ static const char *const gunnames[] = { "LIGHT0_X", "LIGHT0_Y", "LIGHT1_X", "LIG
#define GUNX( a ) (( ( ioport(gunnames[2 * (a - 1)])->read() * 287 ) / 0xff ) + 16)
#define GUNY( a ) (( ( ioport(gunnames[2 * (a - 1) + 1])->read() * 223 ) / 0xff ) + 10)
-WRITE8_MEMBER(lethal_state::control2_w)
+void lethal_state::control2_w(uint8_t data)
{
/* bit 0 is data */
/* bit 1 is cs (active low) */
@@ -291,23 +291,23 @@ INTERRUPT_GEN_MEMBER(lethal_state::lethalen_interrupt)
device.execute().set_input_line(HD6309_IRQ_LINE, HOLD_LINE);
}
-READ8_MEMBER(lethal_state::sound_irq_r)
+uint8_t lethal_state::sound_irq_r()
{
m_soundcpu->set_input_line(0, HOLD_LINE);
return 0x00;
}
-WRITE8_MEMBER(lethal_state::sound_irq_w)
+void lethal_state::sound_irq_w(uint8_t data)
{
m_soundcpu->set_input_line(0, HOLD_LINE);
}
-WRITE8_MEMBER(lethal_state::le_bankswitch_w)
+void lethal_state::le_bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data);
}
-READ8_MEMBER(lethal_state::guns_r)
+uint8_t lethal_state::guns_r(offs_t offset)
{
switch (offset)
{
@@ -330,7 +330,7 @@ READ8_MEMBER(lethal_state::guns_r)
return 0;
}
-READ8_MEMBER(lethal_state::gunsaux_r)
+uint8_t lethal_state::gunsaux_r()
{
int res = 0;
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 6108bb609e4..88859eb290f 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -213,7 +213,7 @@ CUSTOM_INPUT_MEMBER(lethalj_state::cclownz_paddle)
*
*************************************/
-WRITE16_MEMBER(lethalj_state::ripribit_control_w)
+void lethalj_state::ripribit_control_w(uint16_t data)
{
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_ticket->motor_w(BIT(data, 1));
@@ -221,7 +221,7 @@ WRITE16_MEMBER(lethalj_state::ripribit_control_w)
}
-WRITE16_MEMBER(lethalj_state::cfarm_control_w)
+void lethalj_state::cfarm_control_w(uint16_t data)
{
m_ticket->motor_w(BIT(data, 0));
m_lamps[0] = BIT(data, 2);
@@ -231,7 +231,7 @@ WRITE16_MEMBER(lethalj_state::cfarm_control_w)
}
-WRITE16_MEMBER(lethalj_state::cclownz_control_w)
+void lethalj_state::cclownz_control_w(uint16_t data)
{
m_ticket->motor_w(BIT(data, 0));
m_lamps[0] = BIT(data, 2);
@@ -1204,19 +1204,19 @@ ROM_END
void lethalj_state::init_ripribit()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16_delegate(*this, FUNC(lethalj_state::ripribit_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16smo_delegate(*this, FUNC(lethalj_state::ripribit_control_w)));
}
void lethalj_state::init_cfarm()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16_delegate(*this, FUNC(lethalj_state::cfarm_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16smo_delegate(*this, FUNC(lethalj_state::cfarm_control_w)));
}
void lethalj_state::init_cclownz()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16_delegate(*this, FUNC(lethalj_state::cclownz_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16smo_delegate(*this, FUNC(lethalj_state::cclownz_control_w)));
}
diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp
index 0dc6b06c023..7cd62ad4243 100644
--- a/src/mame/drivers/liberate.cpp
+++ b/src/mame/drivers/liberate.cpp
@@ -33,7 +33,7 @@
*
*************************************/
-READ8_MEMBER(liberate_state::deco16_bank_r)
+uint8_t liberate_state::deco16_bank_r(offs_t offset)
{
const uint8_t *ROM = memregion("user1")->base();
@@ -60,7 +60,7 @@ READ8_MEMBER(liberate_state::deco16_bank_r)
return 0;
}
-READ8_MEMBER(liberate_state::deco16_io_r)
+uint8_t liberate_state::deco16_io_r(offs_t offset)
{
if (offset == 0) return ioport("IN1")->read(); /* Player 1 controls */
if (offset == 1) return ioport("IN2")->read(); /* Player 2 controls */
@@ -72,17 +72,17 @@ READ8_MEMBER(liberate_state::deco16_io_r)
return 0xff;
}
-WRITE8_MEMBER(liberate_state::deco16_bank_w)
+void liberate_state::deco16_bank_w(uint8_t data)
{
m_bank = data;
if (m_bank)
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8_delegate(*this, FUNC(liberate_state::deco16_io_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8sm_delegate(*this, FUNC(liberate_state::deco16_io_r)));
else
m_maincpu->space(AS_PROGRAM).install_read_bank(0x8000, 0x800f, "bank1");
}
-READ8_MEMBER(liberate_state::prosoccr_bank_r)
+uint8_t liberate_state::prosoccr_bank_r(offs_t offset)
{
const uint8_t *ROM = memregion("user1")->base();
@@ -111,7 +111,7 @@ READ8_MEMBER(liberate_state::prosoccr_bank_r)
return 0;
}
-READ8_MEMBER(liberate_state::prosoccr_charram_r)
+uint8_t liberate_state::prosoccr_charram_r(offs_t offset)
{
uint8_t *SRC_GFX = memregion("shared_gfx")->base();
@@ -132,11 +132,11 @@ READ8_MEMBER(liberate_state::prosoccr_charram_r)
return m_charram[offset + m_gfx_rom_readback * 0x1800];
}
-WRITE8_MEMBER(liberate_state::prosoccr_charram_w)
+void liberate_state::prosoccr_charram_w(offs_t offset, uint8_t data)
{
if (m_bank)
{
- prosoccr_io_w(space, offset & 0x0f, data);
+ prosoccr_io_w(offset & 0x0f, data);
}
else
{
@@ -167,7 +167,7 @@ WRITE8_MEMBER(liberate_state::prosoccr_charram_w)
// m_gfxdecode->gfx(0)->mark_dirty((offset | 0x1800) >> 3);
}
-WRITE8_MEMBER(liberate_state::prosoccr_char_bank_w)
+void liberate_state::prosoccr_char_bank_w(uint8_t data)
{
m_gfx_rom_readback = data & 1; //enable GFX rom read-back
@@ -175,18 +175,18 @@ WRITE8_MEMBER(liberate_state::prosoccr_char_bank_w)
printf("%02x\n", data);
}
-WRITE8_MEMBER(liberate_state::prosoccr_io_bank_w)
+void liberate_state::prosoccr_io_bank_w(uint8_t data)
{
m_bank = data & 1;
if (m_bank)
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8_delegate(*this, FUNC(liberate_state::deco16_io_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8sm_delegate(*this, FUNC(liberate_state::deco16_io_r)));
else
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8_delegate(*this, FUNC(liberate_state::prosoccr_charram_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8sm_delegate(*this, FUNC(liberate_state::prosoccr_charram_r)));
}
-READ8_MEMBER(liberate_state::prosport_charram_r)
+uint8_t liberate_state::prosport_charram_r(offs_t offset)
{
uint8_t *FG_GFX = memregion("progolf_fg_gfx")->base();
@@ -206,7 +206,7 @@ READ8_MEMBER(liberate_state::prosport_charram_r)
return 0;
}
-WRITE8_MEMBER(liberate_state::prosport_charram_w)
+void liberate_state::prosport_charram_w(offs_t offset, uint8_t data)
{
uint8_t *FG_GFX = memregion("progolf_fg_gfx")->base();
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index f659567caa9..0876baf87b3 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -170,7 +170,7 @@ void liberatr_state::machine_reset()
*
*************************************/
-WRITE8_MEMBER(liberatr_state::output_latch_w)
+void liberatr_state::output_latch_w(offs_t offset, uint8_t data)
{
m_outlatch->write_bit(offset, BIT(data, 4));
}
@@ -209,7 +209,7 @@ WRITE_LINE_MEMBER(liberatr_state::trackball_reset_w)
}
-READ8_MEMBER( liberatr_state::port0_r )
+uint8_t liberatr_state::port0_r()
{
/* if ctrld is high, the /ld signal on the LS191 is NOT set, meaning that the trackball is counting */
if (m_ctrld)
@@ -231,14 +231,14 @@ READ8_MEMBER( liberatr_state::port0_r )
*
*************************************/
-READ8_MEMBER( liberatr_state::earom_r )
+uint8_t liberatr_state::earom_r()
{
// return data latched from previous clock
return m_earom->data();
}
-WRITE8_MEMBER( liberatr_state::earom_w )
+void liberatr_state::earom_w(offs_t offset, uint8_t data)
{
// remember the value written
m_earom_data = data;
@@ -252,7 +252,7 @@ WRITE8_MEMBER( liberatr_state::earom_w )
}
-WRITE8_MEMBER( liberatr_state::earom_control_w )
+void liberatr_state::earom_control_w(uint8_t data)
{
// remember the control state
m_earom_control = data;
diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp
index 923e61eb107..f31e3a104a1 100644
--- a/src/mame/drivers/lkage.cpp
+++ b/src/mame/drivers/lkage.cpp
@@ -102,17 +102,17 @@ TODO:
#define MCU_CLOCK (XTAL(12'000'000)/4)
-WRITE8_MEMBER(lkage_state::lkage_sh_nmi_disable_w)
+void lkage_state::lkage_sh_nmi_disable_w(uint8_t data)
{
m_soundnmi->in_w<1>(0);
}
-WRITE8_MEMBER(lkage_state::lkage_sh_nmi_enable_w)
+void lkage_state::lkage_sh_nmi_enable_w(uint8_t data)
{
m_soundnmi->in_w<1>(1);
}
-READ8_MEMBER(lkage_state::sound_status_r)
+uint8_t lkage_state::sound_status_r()
{
return 0xff;
}
@@ -155,7 +155,7 @@ void lkage_state::lkage_map_boot(address_map &map)
}
-READ8_MEMBER(lkage_state::port_fetch_r)
+uint8_t lkage_state::port_fetch_r(offs_t offset)
{
return memregion("user1")->base()[offset];
}
@@ -846,7 +846,7 @@ ROM_START( bygone )
ROM_END
-READ8_MEMBER(lkage_state::mcu_status_r)
+uint8_t lkage_state::mcu_status_r()
{
// bit 0 = when 1, MCU is ready to receive data from main CPU
// bit 1 = when 1, MCU has sent data to the main CPU
@@ -857,7 +857,7 @@ READ8_MEMBER(lkage_state::mcu_status_r)
// Note: This probably uses another MCU program, which is undumped.
-READ8_MEMBER(lkage_state::fake_mcu_r)
+uint8_t lkage_state::fake_mcu_r()
{
int result = 0;
@@ -892,12 +892,12 @@ READ8_MEMBER(lkage_state::fake_mcu_r)
return result;
}
-WRITE8_MEMBER(lkage_state::fake_mcu_w)
+void lkage_state::fake_mcu_w(uint8_t data)
{
m_mcu_val = data;
}
-READ8_MEMBER(lkage_state::fake_status_r)
+uint8_t lkage_state::fake_status_r()
{
return m_mcu_ready;
}
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index e175c6fb7c0..e362452dab0 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -49,7 +49,7 @@
*************************************/
-WRITE16_MEMBER(lockon_state::adrst_w)
+void lockon_state::adrst_w(uint16_t data)
{
m_ctrl_reg = data & 0xff;
@@ -59,13 +59,13 @@ WRITE16_MEMBER(lockon_state::adrst_w)
m_audiocpu->set_input_line(INPUT_LINE_HALT, data & 0x40 ? CLEAR_LINE : ASSERT_LINE);
}
-READ16_MEMBER(lockon_state::main_gnd_r)
+uint16_t lockon_state::main_gnd_r(offs_t offset)
{
address_space &gndspace = m_ground->space(AS_PROGRAM);
return gndspace.read_word(V30_GND_ADDR | offset * 2);
}
-WRITE16_MEMBER(lockon_state::main_gnd_w)
+void lockon_state::main_gnd_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
address_space &gndspace = m_ground->space(AS_PROGRAM);
@@ -75,13 +75,13 @@ WRITE16_MEMBER(lockon_state::main_gnd_w)
gndspace.write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
}
-READ16_MEMBER(lockon_state::main_obj_r)
+uint16_t lockon_state::main_obj_r(offs_t offset)
{
address_space &objspace = m_object->space(AS_PROGRAM);
return objspace.read_word(V30_OBJ_ADDR | offset * 2);
}
-WRITE16_MEMBER(lockon_state::main_obj_w)
+void lockon_state::main_obj_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
address_space &objspace =m_object->space(AS_PROGRAM);
@@ -91,7 +91,7 @@ WRITE16_MEMBER(lockon_state::main_obj_w)
objspace.write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
}
-WRITE16_MEMBER(lockon_state::tst_w)
+void lockon_state::tst_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset < 0x800)
{
@@ -110,24 +110,24 @@ WRITE16_MEMBER(lockon_state::tst_w)
}
}
-READ16_MEMBER(lockon_state::main_z80_r)
+uint16_t lockon_state::main_z80_r(offs_t offset)
{
address_space &sndspace = m_audiocpu->space(AS_PROGRAM);
return 0xff00 | sndspace.read_byte(offset);
}
-WRITE16_MEMBER(lockon_state::main_z80_w)
+void lockon_state::main_z80_w(offs_t offset, uint16_t data)
{
address_space &sndspace = m_audiocpu->space(AS_PROGRAM);
sndspace.write_byte(offset, data);
}
-WRITE16_MEMBER(lockon_state::inten_w)
+void lockon_state::inten_w(uint16_t data)
{
m_main_inten = 1;
}
-WRITE16_MEMBER(lockon_state::emres_w)
+void lockon_state::emres_w(uint16_t data)
{
m_watchdog->watchdog_reset();
m_main_inten = 0;
@@ -352,7 +352,7 @@ GFXDECODE_END
*
*************************************/
-WRITE8_MEMBER(lockon_state::sound_vol)
+void lockon_state::sound_vol(uint8_t data)
{
#define LO_SHUNT 250.0
#define LO_R0 5600.0
diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp
index 31a1f945f87..111d4cce87f 100644
--- a/src/mame/drivers/lordgun.cpp
+++ b/src/mame/drivers/lordgun.cpp
@@ -56,7 +56,7 @@ Notes:
***************************************************************************/
-WRITE16_MEMBER(lordgun_state::lordgun_protection_w)
+void lordgun_state::lordgun_protection_w(offs_t offset, uint16_t data)
{
switch (offset & 0x60)
{
@@ -77,7 +77,7 @@ WRITE16_MEMBER(lordgun_state::lordgun_protection_w)
}
}
-READ16_MEMBER(lordgun_state::lordgun_protection_r)
+uint16_t lordgun_state::lordgun_protection_r(offs_t offset)
{
switch (offset & 0x60)
{
@@ -107,7 +107,7 @@ READ16_MEMBER(lordgun_state::lordgun_protection_r)
return 0;
}
-WRITE16_MEMBER(lordgun_state::aliencha_protection_w)
+void lordgun_state::aliencha_protection_w(offs_t offset, uint16_t data)
{
switch (offset & 0x60)
{
@@ -120,7 +120,7 @@ WRITE16_MEMBER(lordgun_state::aliencha_protection_w)
}
}
-READ16_MEMBER(lordgun_state::aliencha_protection_r)
+uint16_t lordgun_state::aliencha_protection_r(offs_t offset)
{
switch (offset & 0x60)
{
@@ -244,33 +244,33 @@ void lordgun_state::aliencha_dip_w(uint8_t data)
}
// Unknown, always equal to 7 in lordgun, aliencha.
-WRITE16_MEMBER(lordgun_state::priority_w)
+void lordgun_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_priority);
}
-READ16_MEMBER(lordgun_state::lordgun_gun_0_x_r)
+uint16_t lordgun_state::lordgun_gun_0_x_r()
{
return m_gun[0].hw_x;
}
-READ16_MEMBER(lordgun_state::lordgun_gun_0_y_r)
+uint16_t lordgun_state::lordgun_gun_0_y_r()
{
return m_gun[0].hw_y;
}
-READ16_MEMBER(lordgun_state::lordgun_gun_1_x_r)
+uint16_t lordgun_state::lordgun_gun_1_x_r()
{
return m_gun[1].hw_x;
}
-READ16_MEMBER(lordgun_state::lordgun_gun_1_y_r)
+uint16_t lordgun_state::lordgun_gun_1_y_r()
{
return m_gun[1].hw_y;
}
-WRITE16_MEMBER(lordgun_state::soundlatch_w)
+void lordgun_state::soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7) m_soundlatch->write((data >> 0) & 0xff);
if (ACCESSING_BITS_8_15) m_soundlatch2->write((data >> 8) & 0xff);
@@ -279,7 +279,7 @@ WRITE16_MEMBER(lordgun_state::soundlatch_w)
}
template<int Layer>
-WRITE16_MEMBER(lordgun_state::vram_w)
+void lordgun_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram[Layer][offset]);
m_tilemap[Layer]->mark_tile_dirty(offset/2);
diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp
index f5e525be613..50071777976 100644
--- a/src/mame/drivers/lsasquad.cpp
+++ b/src/mame/drivers/lsasquad.cpp
@@ -157,7 +157,7 @@ Notes:
#define MASTER_CLOCK XTAL(24'000'000)
-WRITE8_MEMBER(lsasquad_state::lsasquad_bankswitch_w)
+void lsasquad_state::lsasquad_bankswitch_w(uint8_t data)
{
/* bits 0-2 select ROM bank */
membank("bank1")->set_entry(data & 0x07);
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index 32cfb3c27ac..5f1c79e0b33 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -807,7 +807,7 @@ void lucky74_state::machine_reset()
* Read/Write Handlers *
*****************************/
-READ8_MEMBER(lucky74_state::custom_09R81P_port_r)
+uint8_t lucky74_state::custom_09R81P_port_r(offs_t offset)
{
if (offset != 0x00)
{
@@ -819,7 +819,7 @@ READ8_MEMBER(lucky74_state::custom_09R81P_port_r)
}
}
-WRITE8_MEMBER(lucky74_state::custom_09R81P_port_w)
+void lucky74_state::custom_09R81P_port_w(offs_t offset, uint8_t data)
{
m_adpcm_reg[offset] = data;
}
@@ -836,28 +836,28 @@ void lucky74_state::ym2149_portb_w(uint8_t data)
flip_screen_set(data & 0x01);
}
-READ8_MEMBER(lucky74_state::usart_8251_r)
+uint8_t lucky74_state::usart_8251_r()
{
/* reads to USART 8251 port */
logerror("read from USART port.\n");
return 0xff;
}
-WRITE8_MEMBER(lucky74_state::usart_8251_w)
+void lucky74_state::usart_8251_w(uint8_t data)
{
/* writes to USART 8251 port */
m_usart_8251 = data;
logerror("write to USART port: %02x \n", m_usart_8251);
}
-READ8_MEMBER(lucky74_state::copro_sm7831_r)
+uint8_t lucky74_state::copro_sm7831_r()
{
/* read from SM7831 co-processor */
logerror("read from co-processor.\n");
return 0xff;
}
-WRITE8_MEMBER(lucky74_state::copro_sm7831_w)
+void lucky74_state::copro_sm7831_w(uint8_t data)
{
/* write to SM7831 co-processor */
m_copro_sm7831 = data;
diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp
index 84f2a583d03..0c903b6c682 100644
--- a/src/mame/drivers/lvcards.cpp
+++ b/src/mame/drivers/lvcards.cpp
@@ -101,7 +101,7 @@ void lvpoker_state::machine_reset()
m_result = 0;
}
-WRITE8_MEMBER(lvpoker_state::control_port_2_w)
+void lvpoker_state::control_port_2_w(uint8_t data)
{
switch (data)
{
@@ -117,7 +117,7 @@ WRITE8_MEMBER(lvpoker_state::control_port_2_w)
}
}
-WRITE8_MEMBER(lvpoker_state::control_port_2a_w)
+void lvpoker_state::control_port_2a_w(uint8_t data)
{
switch (data)
{
@@ -133,7 +133,7 @@ WRITE8_MEMBER(lvpoker_state::control_port_2a_w)
}
}
-READ8_MEMBER(lvpoker_state::payout_r)
+uint8_t lvpoker_state::payout_r()
{
m_result = ioport("IN2")->read();
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index b36e02fca54..6c537d31d55 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -73,17 +73,17 @@ Notes:
* a code reflecting the direction (8 angles) from one point to the other.
*/
-WRITE8_MEMBER(lwings_state::avengers_adpcm_w)
+void lwings_state::avengers_adpcm_w(uint8_t data)
{
m_adpcm = data;
}
-READ8_MEMBER(lwings_state::avengers_adpcm_r)
+uint8_t lwings_state::avengers_adpcm_r()
{
return m_adpcm;
}
-WRITE8_MEMBER(lwings_state::lwings_bankswitch_w)
+void lwings_state::lwings_bankswitch_w(uint8_t data)
{
// if (data & 0xe0) printf("bankswitch_w %02x\n", data);
// Fireball writes 0x20 on startup, maybe reset soundcpu?
@@ -116,7 +116,7 @@ WRITE_LINE_MEMBER(lwings_state::avengers_interrupt)
}
-WRITE8_MEMBER(lwings_state::avengers_protection_w)
+void lwings_state::avengers_protection_w(uint8_t data)
{
int pc = m_maincpu->pc();
@@ -143,7 +143,7 @@ WRITE8_MEMBER(lwings_state::avengers_protection_w)
}
}
-WRITE8_MEMBER(lwings_state::avengers_prot_bank_w)
+void lwings_state::avengers_prot_bank_w(uint8_t data)
{
m_palette_pen = data * 64;
}
@@ -239,7 +239,7 @@ int lwings_state::avengers_fetch_paldata( )
return result;
}
-READ8_MEMBER(lwings_state::avengers_protection_r)
+uint8_t lwings_state::avengers_protection_r()
{
static const int xpos[8] = { 10, 7, 0, -7, -10, -7, 0, 7 };
static const int ypos[8] = { 0, 7, 10, 7, 0, -7, -10, -7 };
@@ -275,14 +275,14 @@ READ8_MEMBER(lwings_state::avengers_protection_r)
return best_dir << 5;
}
-READ8_MEMBER(lwings_state::avengers_soundlatch2_r)
+uint8_t lwings_state::avengers_soundlatch2_r()
{
uint8_t data = *m_soundlatch2 | m_soundstate;
m_soundstate = 0;
return(data);
}
-WRITE8_MEMBER(lwings_state::msm5205_w)
+void lwings_state::msm5205_w(uint8_t data)
{
m_msm->reset_w(BIT(data, 7));
m_msm->data_w(data);
@@ -402,7 +402,7 @@ void lwings_state::fball_map(address_map &map)
-WRITE8_MEMBER(lwings_state::fball_oki_bank_w)
+void lwings_state::fball_oki_bank_w(uint8_t data)
{
//printf("fball_oki_bank_w %02x\n", data);
membank("samplebank")->set_entry((data >> 1) & 0x7);
diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp
index 1a6996820fc..d47cc465285 100644
--- a/src/mame/drivers/m107.cpp
+++ b/src/mame/drivers/m107.cpp
@@ -87,7 +87,7 @@ WRITE8_MEMBER(m107_state::bankswitch_w)
logerror("%05x: bankswitch %04x\n", m_maincpu->pc(), data);
}
-WRITE16_MEMBER(m107_state::sound_reset_w)
+void m107_state::sound_reset_w(uint16_t data)
{
m_soundcpu->set_input_line(INPUT_LINE_RESET, (data) ? CLEAR_LINE : ASSERT_LINE);
}
@@ -143,7 +143,7 @@ void m107_state::dsoccr94_io_map(address_map &map)
}
/* same as M107 but with an extra i/o board */
-WRITE16_MEMBER(m107_state::wpksoc_output_w)
+void m107_state::wpksoc_output_w(uint16_t data)
{
/*
x--- ---- ?
diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp
index 45fcda4c67b..6c342932619 100644
--- a/src/mame/drivers/m72.cpp
+++ b/src/mame/drivers/m72.cpp
@@ -442,25 +442,25 @@ INTERRUPT_GEN_MEMBER(m72_state::fake_nmi)
}
-WRITE16_MEMBER(m72_state::bchopper_sample_trigger_w)
+void m72_state::bchopper_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[6] = { 0x0000, 0x0010, 0x2510, 0x6510, 0x8510, 0x9310 };
if (ACCESSING_BITS_0_7 && (data & 0xff) < 6) m_audio->set_sample_start(a[data & 0xff]);
}
-WRITE16_MEMBER(m72_state::nspirit_sample_trigger_w)
+void m72_state::nspirit_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[9] = { 0x0000, 0x0020, 0x2020, 0, 0x5720, 0, 0x7b60, 0x9b60, 0xc360 };
if (ACCESSING_BITS_0_7 && (data & 0xff) < 9) m_audio->set_sample_start(a[data & 0xff]);
}
-WRITE16_MEMBER(m72_state::imgfight_sample_trigger_w)
+void m72_state::imgfight_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[7] = { 0x0000, 0x0020, 0x44e0, 0x98a0, 0xc820, 0xf7a0, 0x108c0 };
if (ACCESSING_BITS_0_7 && (data & 0xff) < 7) m_audio->set_sample_start(a[data & 0xff]);
}
-WRITE16_MEMBER(m72_state::loht_sample_trigger_w)
+void m72_state::loht_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[7] = { 0x0000, 0x0020, 0, 0x2c40, 0x4320, 0x7120, 0xb200 };
if (ACCESSING_BITS_0_7 && (data & 0xff) < 7) m_audio->set_sample_start(a[data & 0xff]);
@@ -468,13 +468,13 @@ WRITE16_MEMBER(m72_state::loht_sample_trigger_w)
-WRITE16_MEMBER(m72_state::dbreedm72_sample_trigger_w)
+void m72_state::dbreedm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[9] = { 0x00000, 0x00020, 0x02c40, 0x08160, 0x0c8c0, 0x0ffe0, 0x13000, 0x15820, 0x15f40 };
if (ACCESSING_BITS_0_7 && (data & 0xff) < 9) m_audio->set_sample_start(a[data & 0xff]);
}
-WRITE16_MEMBER(m72_state::dkgenm72_sample_trigger_w)
+void m72_state::dkgenm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[28] = {
0x00000, 0x00020, 0x01800, 0x02da0, 0x03be0, 0x05ae0, 0x06100, 0x06de0,
@@ -485,7 +485,7 @@ WRITE16_MEMBER(m72_state::dkgenm72_sample_trigger_w)
if (ACCESSING_BITS_0_7 && (data & 0xff) < 28) m_audio->set_sample_start(a[data & 0xff]);
}
-WRITE16_MEMBER(m72_state::gallop_sample_trigger_w)
+void m72_state::gallop_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
{
static const int a[31] = {
0x00000, 0x00020, 0x00040, 0x01360, 0x02580, 0x04f20, 0x06240, 0x076e0,
@@ -632,14 +632,14 @@ void m72_state::copy_le(u16 *dest, const u8 *src, u8 bytes)
dest[i/2] = src[i+0] | (src[i+1] << 8);
}
-READ16_MEMBER(m72_state::protection_r)
+u16 m72_state::protection_r(offs_t offset, u16 mem_mask)
{
if (ACCESSING_BITS_8_15)
copy_le(m_protection_ram.get(),m_protection_code,CODE_LEN);
return m_protection_ram[0xffa/2+offset];
}
-WRITE16_MEMBER(m72_state::protection_w)
+void m72_state::protection_w(offs_t offset, u16 data, u16 mem_mask)
{
data ^= 0xffff;
COMBINE_DATA(&m_protection_ram[offset]);
@@ -655,8 +655,8 @@ void m72_state::install_protection_handler(const u8 *code,const u8 *crc)
m_protection_code = code;
m_protection_crc = crc;
m_maincpu->space(AS_PROGRAM).install_read_bank(0xb0000, 0xb0fff, "bank1");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xb0ffa, 0xb0ffb, read16_delegate(*this, FUNC(m72_state::protection_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xb0000, 0xb0fff, write16_delegate(*this, FUNC(m72_state::protection_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xb0ffa, 0xb0ffb, read16s_delegate(*this, FUNC(m72_state::protection_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xb0000, 0xb0fff, write16s_delegate(*this, FUNC(m72_state::protection_w)));
membank("bank1")->configure_entry(0, m_protection_ram.get());
save_pointer(NAME(m_protection_ram), 0x1000/2);
@@ -665,36 +665,36 @@ void m72_state::install_protection_handler(const u8 *code,const u8 *crc)
void m72_state::init_bchopper()
{
install_protection_handler(bchopper_code,bchopper_crc);
- m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(*this, FUNC(m72_state::bchopper_sample_trigger_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::bchopper_sample_trigger_w)));
}
void m72_state::init_nspirit()
{
install_protection_handler(nspirit_code,nspirit_crc);
- m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(*this, FUNC(m72_state::nspirit_sample_trigger_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::nspirit_sample_trigger_w)));
}
void m72_state::init_imgfight()
{
install_protection_handler(imgfight_code,imgfightj_crc);
- m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(*this, FUNC(m72_state::imgfight_sample_trigger_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::imgfight_sample_trigger_w)));
}
void m72_state::init_dbreedm72()
{
install_protection_handler(dbreedm72_code,dbreedm72_crc);
- m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(*this, FUNC(m72_state::dbreedm72_sample_trigger_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::dbreedm72_sample_trigger_w)));
}
void m72_state::init_dkgenm72()
{
install_protection_handler(dkgenm72_code,dkgenm72_crc);
- m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(*this, FUNC(m72_state::dkgenm72_sample_trigger_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::dkgenm72_sample_trigger_w)));
}
void m72_state::init_gallop()
{
- m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(*this, FUNC(m72_state::gallop_sample_trigger_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::gallop_sample_trigger_w)));
}
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp
index f2b459b0c17..4f30e4dcf03 100644
--- a/src/mame/drivers/m90.cpp
+++ b/src/mame/drivers/m90.cpp
@@ -39,7 +39,7 @@ void m90_state::machine_start()
/***************************************************************************/
-WRITE16_MEMBER(m90_state::coincounter_w)
+void m90_state::coincounter_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -50,14 +50,14 @@ WRITE16_MEMBER(m90_state::coincounter_w)
}
}
-WRITE16_MEMBER(m90_state::quizf1_bankswitch_w)
+void m90_state::quizf1_bankswitch_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_mainbank->set_entry(data & 0xf);
}
#ifdef UNUSED_FUNCTION
-WRITE16_MEMBER(m90_state::unknown_w)
+void m90_state::unknown_w(uint16_t data)
{
printf("%04x ",data);
}
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index 614a352e1dd..476b32bf1ff 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -254,13 +254,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(m92_state::scanline_interrupt)
/*****************************************************************************/
-READ16_MEMBER(m92_state::eeprom_r)
+uint16_t m92_state::eeprom_r(offs_t offset)
{
// logerror("%05x: EEPROM RE %04x\n",m_maincpu->pc(),offset);
return m_eeprom[offset] | 0xff00;
}
-WRITE16_MEMBER(m92_state::eeprom_w)
+void m92_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// logerror("%05x: EEPROM WR %04x\n",m_maincpu->pc(),offset);
if (ACCESSING_BITS_0_7)
@@ -289,7 +289,7 @@ READ_LINE_MEMBER(m92_state::sprite_busy_r)
}
template<int Layer>
-WRITE16_MEMBER(m92_state::pf_control_w)
+void m92_state::pf_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
//Fix for nbbm stage start screen
//m_screen->update_partial(m_screen->vpos());
@@ -298,7 +298,7 @@ WRITE16_MEMBER(m92_state::pf_control_w)
/*****************************************************************************/
-WRITE16_MEMBER(m92_state::sound_reset_w)
+void m92_state::sound_reset_w(uint16_t data)
{
if (m_soundcpu)
m_soundcpu->set_input_line(INPUT_LINE_RESET, (data) ? CLEAR_LINE : ASSERT_LINE);
@@ -371,7 +371,7 @@ void m92_state::m92_banked_portmap(address_map &map)
map(0x20, 0x20).w(FUNC(m92_state::bankswitch_w));
}
-WRITE16_MEMBER(m92_state::oki_bank_w)
+void m92_state::oki_bank_w(uint16_t data)
{
m_oki->set_rom_bank((data+1) & 0x3); // +1?
}
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index dcfae4a09be..2c419174cad 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -117,12 +117,12 @@ WRITE_LINE_MEMBER(mac_state::mac_rbv_vbl)
}
}
-READ32_MEMBER( mac_state::rbv_ramdac_r )
+uint32_t mac_state::rbv_ramdac_r()
{
return 0;
}
-WRITE32_MEMBER( mac_state::rbv_ramdac_w )
+void mac_state::rbv_ramdac_w(offs_t offset, uint32_t data)
{
if (!offset)
{
@@ -158,7 +158,7 @@ WRITE32_MEMBER( mac_state::rbv_ramdac_w )
}
}
-WRITE32_MEMBER( mac_state::ariel_ramdac_w ) // this is for the "Ariel" style RAMDAC
+void mac_state::ariel_ramdac_w(offs_t offset, uint32_t data, uint32_t mem_mask) // this is for the "Ariel" style RAMDAC
{
if (mem_mask == 0xff000000)
{
@@ -422,19 +422,19 @@ VIDEO_START_MEMBER(mac_state,macprtb)
{
}
-READ16_MEMBER(mac_state::mac_config_r)
+uint16_t mac_state::mac_config_r()
{
return 0xffff; // returns nonzero if no PDS RAM expansion, 0 if present
}
// IIfx
-READ32_MEMBER(mac_state::biu_r)
+uint32_t mac_state::biu_r(offs_t offset, uint32_t mem_mask)
{
// printf("biu_r @ %x, mask %08x\n", offset, mem_mask);
return 0;
}
-WRITE32_MEMBER(mac_state::biu_w)
+void mac_state::biu_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// printf("biu_w %x @ %x, mask %08x\n", data, offset, mem_mask);
}
@@ -456,7 +456,7 @@ WRITE8_MEMBER(mac_state::oss_w)
m_oss_regs[offset] = data;
}
-READ32_MEMBER(mac_state::buserror_r)
+uint32_t mac_state::buserror_r()
{
m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE);
m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE);
diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp
index 970f4249a7d..4b1dd06c512 100644
--- a/src/mame/drivers/macpci.cpp
+++ b/src/mame/drivers/macpci.cpp
@@ -47,14 +47,14 @@
#include "softlist.h"
#include "speaker.h"
-READ64_MEMBER( macpci_state::unk1_r )
+uint64_t macpci_state::unk1_r()
{
m_unk1_test ^= 0x0400; //PC=ff808760
return m_unk1_test << 16;
}
-READ64_MEMBER( macpci_state::unk2_r )
+uint64_t macpci_state::unk2_r(offs_t offset, uint64_t mem_mask)
{
if (ACCESSING_BITS_32_47)
return (uint64_t)0xe1 << 32; //PC=fff04810
diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp
index 2de8e3334bc..77046f3fc83 100644
--- a/src/mame/drivers/macrossp.cpp
+++ b/src/mame/drivers/macrossp.cpp
@@ -293,7 +293,7 @@ Notes:
/*** VARIOUS READ / WRITE HANDLERS *******************************************/
-READ32_MEMBER(macrossp_state::macrossp_soundstatus_r)
+uint32_t macrossp_state::macrossp_soundstatus_r()
{
// logerror("%08x read soundstatus\n", m_maincpu->pc());
@@ -305,7 +305,7 @@ READ32_MEMBER(macrossp_state::macrossp_soundstatus_r)
return (m_sndpending << 1) | m_snd_toggle;
}
-WRITE32_MEMBER(macrossp_state::macrossp_soundcmd_w)
+void macrossp_state::macrossp_soundcmd_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -318,14 +318,14 @@ WRITE32_MEMBER(macrossp_state::macrossp_soundcmd_w)
}
}
-READ16_MEMBER(macrossp_state::macrossp_soundcmd_r)
+uint16_t macrossp_state::macrossp_soundcmd_r()
{
// logerror("%06x read soundcmd\n",m_audiocpu->pc());
m_sndpending = 0;
return m_soundlatch->read();
}
-WRITE16_MEMBER(macrossp_state::palette_fade_w)
+void macrossp_state::palette_fade_w(uint16_t data)
{
// 0xff is written a few times on startup
if (data >> 8 != 0xff)
@@ -690,7 +690,7 @@ ROM_END
-WRITE32_MEMBER(macrossp_state::macrossp_speedup_w)
+void macrossp_state::macrossp_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/*
PC :00018104 018104: addq.w #1, $f1015a.l
@@ -703,7 +703,7 @@ PC :00018110 018110: beq 18104
}
#ifdef UNUSED_FUNCTION
-WRITE32_MEMBER(macrossp_state::quizmoon_speedup_w)
+void macrossp_state::quizmoon_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_mainram[0x00020 / 4]);
if (m_maincpu->pc() == 0x1cc) m_maincpu->spin_until_interrupt();
@@ -712,13 +712,13 @@ WRITE32_MEMBER(macrossp_state::quizmoon_speedup_w)
void macrossp_state::init_macrossp()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xf10158, 0xf1015b, write32_delegate(*this, FUNC(macrossp_state::macrossp_speedup_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xf10158, 0xf1015b, write32s_delegate(*this, FUNC(macrossp_state::macrossp_speedup_w)));
}
void macrossp_state::init_quizmoon()
{
#ifdef UNUSED_FUNCTION
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xf00020, 0xf00023, write32_delegate(*this, FUNC(macrossp_state::quizmoon_speedup_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xf00020, 0xf00023, write32s_delegate(*this, FUNC(macrossp_state::quizmoon_speedup_w)));
#endif
}
diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp
index 43ac513d888..5714000c9b6 100644
--- a/src/mame/drivers/magmax.cpp
+++ b/src/mame/drivers/magmax.cpp
@@ -33,7 +33,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
#include "speaker.h"
-WRITE16_MEMBER(magmax_state::cpu_irq_ack_w)
+void magmax_state::cpu_irq_ack_w(uint16_t data)
{
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
}
@@ -169,7 +169,7 @@ bit3 - SOUND Chan#8 name=AY-3-8910 #2 Ch C
m_ay[2]->set_output_gain(2, percent);
}
-WRITE16_MEMBER(magmax_state::vreg_w)
+void magmax_state::vreg_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* VRAM CONTROL REGISTER */
/* bit0 - coin counter 1 */
diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp
index 0a1b72f3ff6..70c9cae035c 100644
--- a/src/mame/drivers/mcr68.cpp
+++ b/src/mame/drivers/mcr68.cpp
@@ -74,7 +74,7 @@
*
*************************************/
-WRITE16_MEMBER(mcr68_state::xenophobe_control_w)
+void mcr68_state::xenophobe_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_control_word);
/* m_sounds_good->reset_write(~m_control_word & 0x0020);*/
@@ -89,7 +89,7 @@ WRITE16_MEMBER(mcr68_state::xenophobe_control_w)
*
*************************************/
-WRITE16_MEMBER(mcr68_state::blasted_control_w)
+void mcr68_state::blasted_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_control_word);
/* m_sounds_good->reset_write(~m_control_word & 0x0020);*/
@@ -104,7 +104,7 @@ WRITE16_MEMBER(mcr68_state::blasted_control_w)
*
*************************************/
-READ16_MEMBER(mcr68_state::spyhunt2_port_0_r)
+uint16_t mcr68_state::spyhunt2_port_0_r()
{
int result = ioport("IN0")->read();
int analog = m_adc->read();
@@ -113,14 +113,14 @@ READ16_MEMBER(mcr68_state::spyhunt2_port_0_r)
}
-READ16_MEMBER(mcr68_state::spyhunt2_port_1_r)
+uint16_t mcr68_state::spyhunt2_port_1_r()
{
int result = ioport("IN1")->read();
return result | ((m_turbo_cheap_squeak->read() & 1) << 7);
}
-WRITE16_MEMBER(mcr68_state::spyhunt2_control_w)
+void mcr68_state::spyhunt2_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_control_word);
@@ -168,7 +168,7 @@ WRITE16_MEMBER(mcr68_state::spyhunt2_control_w)
static const uint8_t translate49[7] = { 0x7, 0x3, 0x1, 0x0, 0xc, 0xe, 0xf };
-READ16_MEMBER(mcr68_state::archrivl_port_1_r)
+uint16_t mcr68_state::archrivl_port_1_r()
{
return (translate49[ioport("49WAYY2")->read() >> 4] << 12) |
(translate49[ioport("49WAYX2")->read() >> 4] << 8) |
@@ -177,7 +177,7 @@ READ16_MEMBER(mcr68_state::archrivl_port_1_r)
}
-WRITE16_MEMBER(mcr68_state::archrivl_control_w)
+void mcr68_state::archrivl_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_control_word);
m_cvsd_sound->reset_write(~m_control_word & 0x0400);
@@ -192,7 +192,7 @@ WRITE16_MEMBER(mcr68_state::archrivl_control_w)
*
*************************************/
-WRITE16_MEMBER(mcr68_state::pigskin_protection_w)
+void mcr68_state::pigskin_protection_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* ignore upper-byte only */
if (ACCESSING_BITS_0_7)
@@ -209,7 +209,7 @@ WRITE16_MEMBER(mcr68_state::pigskin_protection_w)
}
-READ16_MEMBER(mcr68_state::pigskin_protection_r)
+uint16_t mcr68_state::pigskin_protection_r()
{
/* based on the last 5 bytes return a value */
if (m_protection_data[4] == 0xe3 && m_protection_data[3] == 0x94)
@@ -229,7 +229,7 @@ READ16_MEMBER(mcr68_state::pigskin_protection_r)
}
-READ16_MEMBER(mcr68_state::pigskin_port_1_r)
+uint16_t mcr68_state::pigskin_port_1_r()
{
/* see archrivl_port_1_r for 49-way joystick description */
return ioport("IN1")->read() |
@@ -238,7 +238,7 @@ READ16_MEMBER(mcr68_state::pigskin_port_1_r)
}
-READ16_MEMBER(mcr68_state::pigskin_port_2_r)
+uint16_t mcr68_state::pigskin_port_2_r()
{
/* see archrivl_port_1_r for 49-way joystick description */
return ioport("DSW")->read() |
@@ -254,7 +254,7 @@ READ16_MEMBER(mcr68_state::pigskin_port_2_r)
*
*************************************/
-READ16_MEMBER(mcr68_state::trisport_port_1_r)
+uint16_t mcr68_state::trisport_port_1_r()
{
int xaxis = (int8_t)ioport("AN1")->read();
int yaxis = (int8_t)ioport("AN2")->read();
@@ -1488,7 +1488,7 @@ void mcr68_state::init_xenophob()
m_timing_factor = attotime::from_hz(m_maincpu->unscaled_clock() / 10) * (256 + 16);
/* install control port handler */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(*this, FUNC(mcr68_state::xenophobe_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16s_delegate(*this, FUNC(mcr68_state::xenophobe_control_w)));
}
@@ -1500,9 +1500,9 @@ void mcr68_state::init_spyhunt2()
m_timing_factor = attotime::from_hz(m_maincpu->unscaled_clock() / 10) * (256 + 16);
/* analog port handling is a bit tricky */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(*this, FUNC(mcr68_state::spyhunt2_control_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x0d0000, 0x0dffff, read16_delegate(*this, FUNC(mcr68_state::spyhunt2_port_0_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16_delegate(*this, FUNC(mcr68_state::spyhunt2_port_1_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16s_delegate(*this, FUNC(mcr68_state::spyhunt2_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x0d0000, 0x0dffff, read16smo_delegate(*this, FUNC(mcr68_state::spyhunt2_port_0_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16smo_delegate(*this, FUNC(mcr68_state::spyhunt2_port_1_r)));
}
@@ -1516,7 +1516,7 @@ void mcr68_state::init_blasted()
m_timing_factor = attotime::from_hz(m_maincpu->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(*this, FUNC(mcr68_state::blasted_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16s_delegate(*this, FUNC(mcr68_state::blasted_control_w)));
}
void mcr68_state::init_intlaser()
@@ -1527,7 +1527,7 @@ void mcr68_state::init_intlaser()
m_timing_factor = attotime::from_hz(m_maincpu->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(*this, FUNC(mcr68_state::blasted_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16s_delegate(*this, FUNC(mcr68_state::blasted_control_w)));
}
@@ -1541,13 +1541,13 @@ void mcr68_state::init_archrivl()
m_timing_factor = attotime::from_hz(m_maincpu->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(*this, FUNC(mcr68_state::archrivl_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16s_delegate(*this, FUNC(mcr68_state::archrivl_control_w)));
/* 49-way joystick handling is a bit tricky */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16_delegate(*this, FUNC(mcr68_state::archrivl_port_1_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16smo_delegate(*this, FUNC(mcr68_state::archrivl_port_1_r)));
}
-READ16_MEMBER(mcr68_state::archrivlb_port_1_r)
+uint16_t mcr68_state::archrivlb_port_1_r()
{
return ioport("IN1")->read();
}
@@ -1560,10 +1560,10 @@ void mcr68_state::init_archrivlb()
m_timing_factor = attotime::from_hz(m_maincpu->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(*this, FUNC(mcr68_state::archrivl_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16s_delegate(*this, FUNC(mcr68_state::archrivl_control_w)));
/* 49-way joystick replaced by standard 8way stick */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16_delegate(*this, FUNC(mcr68_state::archrivlb_port_1_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16smo_delegate(*this, FUNC(mcr68_state::archrivlb_port_1_r)));
}
diff --git a/src/mame/drivers/megadriv_acbl.cpp b/src/mame/drivers/megadriv_acbl.cpp
index 4112941d99a..8bc27d110d4 100644
--- a/src/mame/drivers/megadriv_acbl.cpp
+++ b/src/mame/drivers/megadriv_acbl.cpp
@@ -301,7 +301,7 @@ void md_boot_state::md_bootleg(machine_config &config)
*
*************************************/
-WRITE16_MEMBER(md_boot_state::aladmdb_w )
+void md_boot_state::aladmdb_w(uint16_t data)
{
/*
Values returned from the log file :
@@ -313,7 +313,7 @@ WRITE16_MEMBER(md_boot_state::aladmdb_w )
logerror("aladmdb_w : %06x - data = %04x\n",m_maincpu->pc(),data);
}
-READ16_MEMBER(md_boot_state::aladmdb_r )
+uint16_t md_boot_state::aladmdb_r()
{
if (m_maincpu->pc()==0x1b2a56)
{
@@ -332,7 +332,7 @@ READ16_MEMBER(md_boot_state::aladmdb_r )
return 0x0000;
}
-READ16_MEMBER(md_boot_state::twinktmb_r )
+uint16_t md_boot_state::twinktmb_r()
{
if (m_maincpu->pc()==0x02f81e)
return ioport("COIN")->read(); // TODO: coins don't respond well
@@ -344,7 +344,7 @@ READ16_MEMBER(md_boot_state::twinktmb_r )
return 0x0000;
}
-READ16_MEMBER(md_boot_state::jparkmb_r )
+uint16_t md_boot_state::jparkmb_r()
{
if (m_maincpu->pc()==0x1e327a)
return ioport("COIN")->read(); // TODO: coins don't respond well
@@ -356,31 +356,31 @@ READ16_MEMBER(md_boot_state::jparkmb_r )
return 0x0000;
}
-READ16_MEMBER(md_boot_state::mk3mdb_dsw_r )
+uint16_t md_boot_state::mk3mdb_dsw_r(offs_t offset)
{
static const char *const dswname[3] = { "DSWA", "DSWB", "DSWC" };
return ioport(dswname[offset])->read();
}
-READ16_MEMBER(md_boot_state::ssf2mdb_dsw_r )
+uint16_t md_boot_state::ssf2mdb_dsw_r(offs_t offset)
{
static const char *const dswname[3] = { "DSWA", "DSWB", "DSWC" };
return ioport(dswname[offset])->read();
}
-READ16_MEMBER(md_boot_state::srmdb_dsw_r )
+uint16_t md_boot_state::srmdb_dsw_r(offs_t offset)
{
static const char *const dswname[3] = { "DSWA", "DSWB", "DSWC" };
return ioport(dswname[offset])->read();
}
-READ16_MEMBER(md_boot_state::topshoot_200051_r )
+uint16_t md_boot_state::topshoot_200051_r()
{
return -0x5b;
}
// jzth protection
-WRITE16_MEMBER(md_boot_state::bl_710000_w)
+void md_boot_state::bl_710000_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int pc = m_maincpu->pc();
@@ -435,7 +435,7 @@ WRITE16_MEMBER(md_boot_state::bl_710000_w)
}
-READ16_MEMBER(md_boot_state::bl_710000_r)
+uint16_t md_boot_state::bl_710000_r()
{
uint16_t ret;
int pc = m_maincpu->pc();
@@ -956,8 +956,8 @@ void md_boot_state::init_aladmdb()
#endif
// 220000 = writes to mcu? 330000 = reads?
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x220000, 0x220001, write16_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x330000, 0x330001, read16_delegate(*this, FUNC(md_boot_state::aladmdb_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x220000, 0x220001, write16smo_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x330000, 0x330001, read16smo_delegate(*this, FUNC(md_boot_state::aladmdb_r)));
init_megadrij();
}
@@ -1005,7 +1005,7 @@ void md_boot_state::init_mk3mdb()
rom[0x07] = 0x02;
rom[0x06] = 0x10;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x770070, 0x770075, read16_delegate(*this, FUNC(md_boot_state::mk3mdb_dsw_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x770070, 0x770075, read16sm_delegate(*this, FUNC(md_boot_state::mk3mdb_dsw_r)));
init_megadriv();
// 6 button game, so overwrite 3 button io handlers
@@ -1021,7 +1021,7 @@ void md_boot_state::init_ssf2mdb()
membank("bank5")->set_base(memregion( "maincpu" )->base() + 0x400000 );
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x770070, 0x770075, read16_delegate(*this, FUNC(md_boot_state::ssf2mdb_dsw_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x770070, 0x770075, read16sm_delegate(*this, FUNC(md_boot_state::ssf2mdb_dsw_r)));
init_megadrij();
// 6 button game, so overwrite 3 button io handlers
@@ -1052,14 +1052,14 @@ void md_boot_state::init_srmdb()
rom[0x06] = 0xd2;
rom[0x07] = 0x00;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x770070, 0x770075, read16_delegate(*this, FUNC(md_boot_state::srmdb_dsw_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x770070, 0x770075, read16sm_delegate(*this, FUNC(md_boot_state::srmdb_dsw_r)));
init_megadriv();
}
void md_boot_state::init_topshoot()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x200050, 0x200051, read16_delegate(*this, FUNC(md_boot_state::topshoot_200051_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x200050, 0x200051, read16smo_delegate(*this, FUNC(md_boot_state::topshoot_200051_r)));
m_maincpu->space(AS_PROGRAM).install_read_port(0x200042, 0x200043, "IN0");
m_maincpu->space(AS_PROGRAM).install_read_port(0x200044, 0x200045, "IN1");
m_maincpu->space(AS_PROGRAM).install_read_port(0x200046, 0x200047, "IN2");
@@ -1086,7 +1086,7 @@ void md_boot_state::init_barek3()
void md_boot_state::init_sonic2mb()
{
// 100000 = writes to unpopulated MCU?
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16smo_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
m_maincpu->space(AS_PROGRAM).install_read_port(0x300000, 0x300001, "DSW");
init_megadrij();
@@ -1103,15 +1103,15 @@ void md_boot_state::init_twinktmb()
rom[0x06] = 0xcc;
init_megadrij();
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16_delegate(*this, FUNC(md_boot_state::twinktmb_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16smo_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16smo_delegate(*this, FUNC(md_boot_state::twinktmb_r)));
}
void md_boot_state::init_jparkmb()
{
init_megadrij();
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16_delegate(*this, FUNC(md_boot_state::jparkmb_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16smo_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16smo_delegate(*this, FUNC(md_boot_state::jparkmb_r)));
}
/*************************************
diff --git a/src/mame/drivers/megadriv_rad.cpp b/src/mame/drivers/megadriv_rad.cpp
index a5b5dd14036..e0abb5b2f6c 100644
--- a/src/mame/drivers/megadriv_rad.cpp
+++ b/src/mame/drivers/megadriv_rad.cpp
@@ -39,12 +39,12 @@ void megadriv_radica_state::megadriv_radica_map(address_map &map)
map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000).share("megadrive_ram");
}
-READ16_MEMBER(megadriv_radica_state::read)
+uint16_t megadriv_radica_state::read(offs_t offset)
{
return m_rom[(((m_bank * 0x10000) + (offset << 1)) & (0x400000 - 1))/2];
}
-READ16_MEMBER(megadriv_radica_state::read_a13)
+uint16_t megadriv_radica_state::read_a13(offs_t offset)
{
if (offset < 0x80)
m_bank = offset & 0x3f;
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 16d13878d9c..163c0395f5b 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -264,14 +264,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(megasys1_state::megasys1B_scanline)
in that order. */
-READ16_MEMBER(megasys1_state::ip_select_r) // FROM MCU
+u16 megasys1_state::ip_select_r() // FROM MCU
{
return m_ip_latched;
}
-WRITE16_MEMBER(megasys1_state::ip_select_w) // TO MCU
+void megasys1_state::ip_select_w(u16 data) // TO MCU
{
int i;
@@ -362,7 +362,7 @@ void megasys1_state::megasys1B_monkelf_map(address_map &map)
#define INTERRUPT_NUM_C INTERRUPT_NUM_B
#define interrupt_C interrupt_B
-WRITE16_MEMBER(megasys1_state::ram_w)
+void megasys1_state::ram_w(offs_t offset, u16 data)
{
// DON'T use COMBINE_DATA
// byte writes end up mirroring in both bytes of the word like nmk16.cpp
@@ -1639,7 +1639,7 @@ INPUT_PORTS_END
/* Read the input ports, through a protection device */
-READ16_MEMBER(megasys1_state::protection_peekaboo_r)
+u16 megasys1_state::protection_peekaboo_r()
{
switch (m_protection_val)
{
@@ -1650,7 +1650,7 @@ READ16_MEMBER(megasys1_state::protection_peekaboo_r)
}
}
-WRITE16_MEMBER(megasys1_state::protection_peekaboo_w)
+void megasys1_state::protection_peekaboo_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_protection_val);
@@ -4644,7 +4644,7 @@ void megasys1_state::init_64street()
save_item(NAME(m_sprite_bank));
}
-READ16_MEMBER(megasys1_state::megasys1A_mcu_hs_r)
+u16 megasys1_state::megasys1A_mcu_hs_r(offs_t offset, u16 mem_mask)
{
if(m_mcu_hs && ((m_mcu_hs_ram[8/2] << 6) & 0x3ffc0) == ((offset*2) & 0x3ffc0))
{
@@ -4657,7 +4657,7 @@ READ16_MEMBER(megasys1_state::megasys1A_mcu_hs_r)
return m_rom_maincpu[offset];
}
-WRITE16_MEMBER(megasys1_state::megasys1A_mcu_hs_w)
+void megasys1_state::megasys1A_mcu_hs_w(offs_t offset, u16 data, u16 mem_mask)
{
// following is hachoo, other games differs slightly
// R 0x5f0, if bit 0 == 0 then skips hs seq (debug?)
@@ -4683,8 +4683,8 @@ WRITE16_MEMBER(megasys1_state::megasys1A_mcu_hs_w)
void megasys1_state::init_astyanax()
{
astyanax_rom_decode(machine(), "maincpu");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x20000, 0x20009, write16_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16s_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x20000, 0x20009, write16s_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_w)));
m_mcu_hs = 0;
memset(m_mcu_hs_ram, 0, sizeof(m_mcu_hs_ram));
@@ -4791,7 +4791,7 @@ void megasys1_state::init_hayaosi1()
save_item(NAME(m_ip_latched));
}
-READ16_MEMBER(megasys1_state::iganinju_mcu_hs_r)
+u16 megasys1_state::iganinju_mcu_hs_r(offs_t offset, u16 mem_mask)
{
if(m_mcu_hs && ((m_mcu_hs_ram[8/2] << 6) & 0x3ffc0) == ((offset*2) & 0x3ffc0))
{
@@ -4804,7 +4804,7 @@ READ16_MEMBER(megasys1_state::iganinju_mcu_hs_r)
return m_rom_maincpu[offset];
}
-WRITE16_MEMBER(megasys1_state::iganinju_mcu_hs_w)
+void megasys1_state::iganinju_mcu_hs_w(offs_t offset, u16 data, u16 mem_mask)
{
// [0/2]: 0x0000
// [2/2]: 0x0055
@@ -4828,8 +4828,8 @@ void megasys1_state::init_iganinju()
{
phantasm_rom_decode(machine(), "maincpu");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(*this, FUNC(megasys1_state::iganinju_mcu_hs_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x2f000, 0x2f009, write16_delegate(*this, FUNC(megasys1_state::iganinju_mcu_hs_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16s_delegate(*this, FUNC(megasys1_state::iganinju_mcu_hs_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x2f000, 0x2f009, write16s_delegate(*this, FUNC(megasys1_state::iganinju_mcu_hs_w)));
//m_rom_maincpu[0x00006e/2] = 0x0420; // the only game that does
// not like lev 3 interrupts
@@ -4847,8 +4847,8 @@ void megasys1_state::init_jitsupro()
jitsupro_gfx_unmangle("scroll0"); // Gfx
jitsupro_gfx_unmangle("sprites");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x20000, 0x20009, write16_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16s_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x20000, 0x20009, write16s_delegate(*this, FUNC(megasys1_state::megasys1A_mcu_hs_w)));
m_mcu_hs = 0;
memset(m_mcu_hs_ram, 0, sizeof(m_mcu_hs_ram));
@@ -4864,7 +4864,8 @@ void megasys1_state::init_peekaboo()
m_okibank->configure_entry(7, &ROM[0x20000]);
m_okibank->configure_entries(0, 7, &ROM[0x20000], 0x20000);
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x100000, 0x100001, read16_delegate(*this, FUNC(megasys1_state::protection_peekaboo_r)), write16_delegate(*this, FUNC(megasys1_state::protection_peekaboo_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x100001, read16smo_delegate(*this, FUNC(megasys1_state::protection_peekaboo_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16s_delegate(*this, FUNC(megasys1_state::protection_peekaboo_w)));
save_item(NAME(m_protection_val));
}
@@ -4901,12 +4902,12 @@ void megasys1_state::init_rittam()
astyanax_rom_decode(machine(), "maincpu");
}
-READ16_MEMBER(megasys1_state::soldamj_spriteram16_r)
+u16 megasys1_state::soldamj_spriteram16_r(offs_t offset)
{
return m_spriteram[offset];
}
-WRITE16_MEMBER(megasys1_state::soldamj_spriteram16_w)
+void megasys1_state::soldamj_spriteram16_w(offs_t offset, u16 data, u16 mem_mask)
{
if (offset < 0x800/2) COMBINE_DATA(&m_spriteram[offset]);
}
@@ -4915,18 +4916,20 @@ void megasys1_state::init_soldamj()
{
astyanax_rom_decode(machine(), "maincpu");
/* Sprite RAM is mirrored */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8c000, 0x8cfff, read16_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_r)), write16_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8c000, 0x8cfff, read16sm_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x8c000, 0x8cfff, write16s_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_w)));
}
void megasys1_state::init_soldam()
{
phantasm_rom_decode(machine(), "maincpu");
/* Sprite RAM is mirrored */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8c000, 0x8cfff, read16_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_r)), write16_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8c000, 0x8cfff, read16sm_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x8c000, 0x8cfff, write16s_delegate(*this, FUNC(megasys1_state::soldamj_spriteram16_w)));
}
-READ16_MEMBER(megasys1_state::stdragon_mcu_hs_r)
+u16 megasys1_state::stdragon_mcu_hs_r(offs_t offset, u16 mem_mask)
{
if(m_mcu_hs && ((m_mcu_hs_ram[8/2] << 6) & 0x3ffc0) == ((offset*2) & 0x3ffc0))
{
@@ -4939,7 +4942,7 @@ READ16_MEMBER(megasys1_state::stdragon_mcu_hs_r)
return m_rom_maincpu[offset];
}
-WRITE16_MEMBER(megasys1_state::stdragon_mcu_hs_w)
+void megasys1_state::stdragon_mcu_hs_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_mcu_hs_ram[offset]);
@@ -4956,8 +4959,8 @@ WRITE16_MEMBER(megasys1_state::stdragon_mcu_hs_w)
void megasys1_state::init_stdragon()
{
phantasm_rom_decode(machine(), "maincpu");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x23ff0, 0x23ff9, write16_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16s_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x23ff0, 0x23ff9, write16s_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_w)));
m_mcu_hs = 0;
memset(m_mcu_hs_ram, 0, sizeof(m_mcu_hs_ram));
@@ -4973,8 +4976,8 @@ void megasys1_state::init_stdragona()
stdragona_gfx_unmangle("scroll0");
stdragona_gfx_unmangle("sprites");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x23ff0, 0x23ff9, write16_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16s_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x23ff0, 0x23ff9, write16s_delegate(*this, FUNC(megasys1_state::stdragon_mcu_hs_w)));
m_mcu_hs = 0;
memset(m_mcu_hs_ram, 0, sizeof(m_mcu_hs_ram));
diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp
index cbd88a338eb..74b75ad0587 100644
--- a/src/mame/drivers/metalmx.cpp
+++ b/src/mame/drivers/metalmx.cpp
@@ -301,25 +301,25 @@ uint32_t metalmx_state::screen_update_metalmx(screen_device &screen, bitmap_ind1
*
*************************************/
-READ32_MEMBER(metalmx_state::unk_r)
+uint32_t metalmx_state::unk_r()
{
return 0;//machine().rand();
}
-READ32_MEMBER(metalmx_state::watchdog_r)
+uint32_t metalmx_state::watchdog_r()
{
return 0xffffffff;
}
-WRITE32_MEMBER(metalmx_state::shifter_w)
+void metalmx_state::shifter_w(uint32_t data)
{
}
-WRITE32_MEMBER(metalmx_state::motor_w)
+void metalmx_state::motor_w(uint32_t data)
{
}
-WRITE32_MEMBER(metalmx_state::reset_w)
+void metalmx_state::reset_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -336,7 +336,7 @@ WRITE32_MEMBER(metalmx_state::reset_w)
*
*************************************/
-READ32_MEMBER(metalmx_state::sound_data_r)
+uint32_t metalmx_state::sound_data_r(offs_t offset, uint32_t mem_mask)
{
uint32_t result = 0;
@@ -347,7 +347,7 @@ READ32_MEMBER(metalmx_state::sound_data_r)
return result;
}
-WRITE32_MEMBER(metalmx_state::sound_data_w)
+void metalmx_state::sound_data_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_0_15)
m_cage->control_w(data);
@@ -367,7 +367,7 @@ void metalmx_state::cage_irq_callback(uint8_t data)
*************************************/
template<int Chip>
-WRITE32_MEMBER(metalmx_state::dsp32c_w)
+void metalmx_state::dsp32c_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
offset <<= 1;
@@ -380,7 +380,7 @@ WRITE32_MEMBER(metalmx_state::dsp32c_w)
}
template<int Chip>
-READ32_MEMBER(metalmx_state::dsp32c_r)
+uint32_t metalmx_state::dsp32c_r(offs_t offset, uint32_t mem_mask)
{
uint32_t data;
@@ -404,7 +404,7 @@ READ32_MEMBER(metalmx_state::dsp32c_r)
*
*************************************/
-WRITE32_MEMBER(metalmx_state::host_gsp_w)
+void metalmx_state::host_gsp_w(offs_t offset, uint32_t data)
{
address_space &gsp_space = m_gsp->space(AS_PROGRAM);
@@ -412,7 +412,7 @@ WRITE32_MEMBER(metalmx_state::host_gsp_w)
gsp_space.write_word((0xc0000000 + (offset << 5))/ 8 , data >> 16);
}
-READ32_MEMBER(metalmx_state::host_gsp_r)
+uint32_t metalmx_state::host_gsp_r(offs_t offset)
{
address_space &gsp_space = m_gsp->space(AS_PROGRAM);
uint32_t val;
@@ -423,12 +423,12 @@ READ32_MEMBER(metalmx_state::host_gsp_r)
}
-READ32_MEMBER(metalmx_state::host_dram_r)
+uint32_t metalmx_state::host_dram_r(offs_t offset)
{
return (m_gsp_dram[offset * 2] << 16) | m_gsp_dram[offset * 2 + 1];
}
-WRITE32_MEMBER(metalmx_state::host_dram_w)
+void metalmx_state::host_dram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(m_gsp_dram + offset * 2 + 1);
data >>= 16;
@@ -436,12 +436,12 @@ WRITE32_MEMBER(metalmx_state::host_dram_w)
COMBINE_DATA(m_gsp_dram + offset * 2);
}
-READ32_MEMBER(metalmx_state::host_vram_r)
+uint32_t metalmx_state::host_vram_r(offs_t offset)
{
return (m_gsp_vram[offset * 2] << 16) | m_gsp_vram[offset * 2 + 1];
}
-WRITE32_MEMBER(metalmx_state::host_vram_w)
+void metalmx_state::host_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(m_gsp_vram + offset * 2 + 1);
data >>= 16;
@@ -450,7 +450,7 @@ WRITE32_MEMBER(metalmx_state::host_vram_w)
}
-WRITE32_MEMBER(metalmx_state::timer_w)
+void metalmx_state::timer_w(offs_t offset, uint32_t data)
{
// Offsets
// 9000 with 1 changes to external clock source
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index 6cc911b804b..d825f683a02 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -270,7 +270,7 @@ WRITE_LINE_MEMBER(metro_state::karatour_vblank_irq)
}
}
-WRITE16_MEMBER(metro_state::mouja_irq_timer_ctrl_w)
+void metro_state::mouja_irq_timer_ctrl_w(uint16_t data)
{
double freq = 58.0 + (0xff - (data & 0xff)) / 2.2; /* 0xff=58Hz, 0x80=116Hz? */
@@ -478,7 +478,7 @@ WRITE8_MEMBER(metro_state::coin_lockout_1word_w)
// value written doesn't matter, also each counted coin gets reported after one full second.
// TODO: maybe the counter also controls lockout?
-WRITE16_MEMBER(metro_state::coin_lockout_4words_w)
+void metro_state::coin_lockout_4words_w(offs_t offset, uint16_t data)
{
machine().bookkeeping().coin_counter_w((offset >> 1) & 1, offset & 1);
// machine().bookkeeping().coin_lockout_w((offset >> 1) & 1, offset & 1);
@@ -528,7 +528,7 @@ void metro_state::ymf278_map(address_map &map)
***************************************************************************/
/* Really weird way of mapping 3 DSWs */
-READ16_MEMBER(metro_state::balcube_dsw_r)
+uint16_t metro_state::balcube_dsw_r(offs_t offset)
{
uint16_t dsw1 = ioport("DSW0")->read() >> 0;
uint16_t dsw2 = ioport("DSW0")->read() >> 8;
@@ -813,7 +813,7 @@ WRITE8_MEMBER(metro_state::gakusai_oki_bank_lo_w)
}
-READ16_MEMBER(metro_state::gakusai_input_r)
+uint16_t metro_state::gakusai_input_r()
{
uint16_t input_sel = (*m_input_sel) ^ 0x3e;
// Bit 0 ??
@@ -1238,7 +1238,7 @@ WRITE_LINE_MEMBER(puzzlet_io_device::clk_w)
}
-WRITE16_MEMBER(metro_state::puzzlet_irq_enable_w)
+void metro_state::puzzlet_irq_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
*m_irq_enable = data ^ 0xffff;
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index 7e35cfce04d..c7c868723af 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -90,7 +90,7 @@ MACHINE_RESET_MEMBER(midvunit_state,midvplus)
*
*************************************/
-READ32_MEMBER(midvunit_state::port0_r)
+uint32_t midvunit_state::port0_r()
{
uint16_t val = ioport("IN0")->read();
uint16_t diff = val ^ m_last_port0;
@@ -118,7 +118,7 @@ READ32_MEMBER(midvunit_state::port0_r)
*
*************************************/
-READ32_MEMBER( midvunit_state::adc_r )
+uint32_t midvunit_state::adc_r()
{
if (!(m_control_data & 0x40))
return m_adc->read() << m_adc_shift;
@@ -128,7 +128,7 @@ READ32_MEMBER( midvunit_state::adc_r )
return 0xffffffff;
}
-WRITE32_MEMBER( midvunit_state::adc_w )
+void midvunit_state::adc_w(uint32_t data)
{
if (!(m_control_data & 0x20))
m_adc->write(data >> m_adc_shift);
@@ -144,20 +144,20 @@ WRITE32_MEMBER( midvunit_state::adc_w )
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_cmos_protect_w)
+void midvunit_state::midvunit_cmos_protect_w(uint32_t data)
{
m_cmos_protected = ((data & 0xc00) != 0xc00);
}
-WRITE32_MEMBER(midvunit_state::midvunit_cmos_w)
+void midvunit_state::midvunit_cmos_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (!m_cmos_protected)
COMBINE_DATA(m_nvram + offset);
}
-READ32_MEMBER(midvunit_state::midvunit_cmos_r)
+uint32_t midvunit_state::midvunit_cmos_r(offs_t offset)
{
return m_nvram[offset];
}
@@ -170,7 +170,7 @@ READ32_MEMBER(midvunit_state::midvunit_cmos_r)
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_control_w)
+void midvunit_state::midvunit_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint16_t olddata = m_control_data;
COMBINE_DATA(&m_control_data);
@@ -190,7 +190,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_control_w)
}
-WRITE32_MEMBER(midvunit_state::crusnwld_control_w)
+void midvunit_state::crusnwld_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint16_t olddata = m_control_data;
COMBINE_DATA(&m_control_data);
@@ -210,7 +210,7 @@ WRITE32_MEMBER(midvunit_state::crusnwld_control_w)
}
-WRITE32_MEMBER(midvunit_state::midvunit_sound_w)
+void midvunit_state::midvunit_sound_w(uint32_t data)
{
logerror("Sound W = %02X\n", data);
m_dcs->data_w(data & 0xff);
@@ -224,7 +224,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_sound_w)
*
*************************************/
-READ32_MEMBER(midvunit_state::tms32031_control_r)
+uint32_t midvunit_state::tms32031_control_r(offs_t offset)
{
/* watch for accesses to the timers */
if (offset == 0x24 || offset == 0x34)
@@ -244,7 +244,7 @@ READ32_MEMBER(midvunit_state::tms32031_control_r)
}
-WRITE32_MEMBER(midvunit_state::tms32031_control_w)
+void midvunit_state::tms32031_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_tms32031_control[offset]);
@@ -278,20 +278,20 @@ WRITE32_MEMBER(midvunit_state::tms32031_control_w)
*
*************************************/
-READ32_MEMBER(midvunit_state::crusnwld_serial_status_r)
+uint32_t midvunit_state::crusnwld_serial_status_r()
{
uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic->status_r() << 15);
return in1 | in1 << 16;
}
-READ32_MEMBER(midvunit_state::crusnwld_serial_data_r)
+uint32_t midvunit_state::crusnwld_serial_data_r()
{
return m_midway_serial_pic->read() << 16;
}
-WRITE32_MEMBER(midvunit_state::crusnwld_serial_data_w)
+void midvunit_state::crusnwld_serial_data_w(uint32_t data)
{
if ((data & 0xf0000) == 0x10000)
{
@@ -319,7 +319,7 @@ static const uint32_t bit_data[0x10] =
};
-READ32_MEMBER(midvunit_state::bit_data_r)
+uint32_t midvunit_state::bit_data_r(offs_t offset)
{
int bit = (bit_data[m_bit_index / 32] >> (31 - (m_bit_index % 32))) & 1;
m_bit_index = (m_bit_index + 1) % 512;
@@ -327,7 +327,7 @@ READ32_MEMBER(midvunit_state::bit_data_r)
}
-WRITE32_MEMBER(midvunit_state::bit_reset_w)
+void midvunit_state::bit_reset_w(uint32_t data)
{
m_bit_index = 0;
}
@@ -340,25 +340,25 @@ WRITE32_MEMBER(midvunit_state::bit_reset_w)
*
*************************************/
-READ32_MEMBER(midvunit_state::offroadc_serial_status_r)
+uint32_t midvunit_state::offroadc_serial_status_r()
{
uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic2->status_r() << 15);
return in1 | in1 << 16;
}
-READ32_MEMBER(midvunit_state::offroadc_serial_data_r)
+uint32_t midvunit_state::offroadc_serial_data_r()
{
return m_midway_serial_pic2->read() << 16;
}
-WRITE32_MEMBER(midvunit_state::offroadc_serial_data_w)
+void midvunit_state::offroadc_serial_data_w(uint32_t data)
{
m_midway_serial_pic2->write(data >> 16);
}
-READ32_MEMBER(midvunit_state::midvunit_wheel_board_r)
+uint32_t midvunit_state::midvunit_wheel_board_r()
{
//logerror("midvunit_wheel_board_r: %08X\n", m_wheel_board_output);
return m_wheel_board_output << 8;
@@ -371,7 +371,7 @@ void midvunit_state::set_input(const char *s)
m_galil_input_length = strlen(s);
}
-WRITE32_MEMBER(midvunit_state::midvunit_wheel_board_w)
+void midvunit_state::midvunit_wheel_board_w(uint32_t data)
{
//logerror("midvunit_wheel_board_w: %08X\n", data);
@@ -500,7 +500,7 @@ DECLARE_CUSTOM_INPUT_MEMBER(midvunit_state::motion_r)
}
-READ32_MEMBER(midvunit_state::midvunit_intcs_r)
+uint32_t midvunit_state::midvunit_intcs_r()
{
return 4;
}
@@ -523,7 +523,7 @@ uint16_t midvunit_state::comm_bus_in()
return comm_bus_out();
}
-READ32_MEMBER(midvunit_state::midvunit_comcs_r)
+uint32_t midvunit_state::midvunit_comcs_r(offs_t offset)
{
if (offset != 0)
{
@@ -541,7 +541,7 @@ READ32_MEMBER(midvunit_state::midvunit_comcs_r)
}
}
-WRITE32_MEMBER(midvunit_state::midvunit_comcs_w)
+void midvunit_state::midvunit_comcs_w(offs_t offset, uint32_t data)
{
switch (offset)
{
@@ -558,7 +558,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_comcs_w)
*
*************************************/
-READ32_MEMBER(midvunit_state::midvplus_misc_r)
+uint32_t midvunit_state::midvplus_misc_r(offs_t offset)
{
uint32_t result = m_midvplus_misc[offset];
@@ -583,7 +583,7 @@ READ32_MEMBER(midvunit_state::midvplus_misc_r)
}
-WRITE32_MEMBER(midvunit_state::midvplus_misc_w)
+void midvunit_state::midvplus_misc_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t olddata = m_midvplus_misc[offset];
bool logit = true;
@@ -1854,7 +1854,7 @@ ROM_END
*
*************************************/
-READ32_MEMBER(midvunit_state::generic_speedup_r)
+uint32_t midvunit_state::generic_speedup_r(offs_t offset)
{
m_maincpu->eat_cycles(100);
return m_generic_speedup[offset];
@@ -1866,7 +1866,7 @@ void midvunit_state::init_crusnusa_common(offs_t speedup)
m_adc_shift = 24;
/* speedups */
- m_maincpu->space(AS_PROGRAM).install_read_handler(speedup, speedup + 1, read32_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(speedup, speedup + 1, read32sm_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
m_generic_speedup = m_ram_base + speedup;
}
void midvunit_state::init_crusnusa() { init_crusnusa_common(0xc93e); }
@@ -1879,19 +1879,19 @@ void midvunit_state::init_crusnwld_common(offs_t speedup)
m_adc_shift = 16;
/* control register is different */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32_delegate(*this, FUNC(midvunit_state::crusnwld_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32s_delegate(*this, FUNC(midvunit_state::crusnwld_control_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32_delegate(*this, FUNC(midvunit_state::crusnwld_serial_status_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x996000, 0x996000, read32_delegate(*this, FUNC(midvunit_state::crusnwld_serial_data_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x996000, 0x996000, write32_delegate(*this, FUNC(midvunit_state::crusnwld_serial_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32smo_delegate(*this, FUNC(midvunit_state::crusnwld_serial_status_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x996000, 0x996000, read32smo_delegate(*this, FUNC(midvunit_state::crusnwld_serial_data_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x996000, 0x996000, write32smo_delegate(*this, FUNC(midvunit_state::crusnwld_serial_data_w)));
/* install strange protection device */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x9d0000, 0x9d1fff, read32_delegate(*this, FUNC(midvunit_state::bit_data_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x9d0000, 0x9d0000, write32_delegate(*this, FUNC(midvunit_state::bit_reset_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x9d0000, 0x9d1fff, read32sm_delegate(*this, FUNC(midvunit_state::bit_data_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x9d0000, 0x9d0000, write32smo_delegate(*this, FUNC(midvunit_state::bit_reset_w)));
/* speedups */
if (speedup) {
- m_maincpu->space(AS_PROGRAM).install_read_handler(speedup, speedup + 1, read32_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(speedup, speedup + 1, read32sm_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
m_generic_speedup = m_ram_base + speedup;
}
}
@@ -1906,13 +1906,13 @@ void midvunit_state::init_offroadc()
m_adc_shift = 16;
/* control register is different */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32_delegate(*this, FUNC(midvunit_state::crusnwld_control_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32s_delegate(*this, FUNC(midvunit_state::crusnwld_control_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32_delegate(*this, FUNC(midvunit_state::offroadc_serial_status_r)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x996000, 0x996000, read32_delegate(*this, FUNC(midvunit_state::offroadc_serial_data_r)), write32_delegate(*this, FUNC(midvunit_state::offroadc_serial_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32smo_delegate(*this, FUNC(midvunit_state::offroadc_serial_status_r)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x996000, 0x996000, read32smo_delegate(*this, FUNC(midvunit_state::offroadc_serial_data_r)), write32smo_delegate(*this, FUNC(midvunit_state::offroadc_serial_data_w)));
/* speedups */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x195aa, 0x195aa, read32_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x195aa, 0x195aa, read32sm_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
m_generic_speedup = m_ram_base + 0x195aa;
}
@@ -1933,7 +1933,7 @@ void midvunit_state::init_wargods()
m_midway_ioasic->set_default_nvram(default_nvram);
/* speedups */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x2f4c, 0x2f4c, read32_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x2f4c, 0x2f4c, read32sm_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
m_generic_speedup = m_ram_base + 0x2f4c;
}
diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp
index 7c0d543b23e..8b4dc76205c 100644
--- a/src/mame/drivers/midyunit.cpp
+++ b/src/mame/drivers/midyunit.cpp
@@ -139,7 +139,7 @@ Notes:
*
*************************************/
-WRITE8_MEMBER(midyunit_state::yawdim_oki_bank_w)
+void midyunit_state::yawdim_oki_bank_w(uint8_t data)
{
if (data & 4)
m_oki->set_rom_bank(data & 3);
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index a6a0d843322..bf53f5cbd33 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -155,7 +155,7 @@ WRITE_LINE_MEMBER(midzeus2_state::zeus_irq)
*
*************************************/
-WRITE32_MEMBER(midzeus_state::cmos_w)
+void midzeus_state::cmos_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (disk_asic_jr[2] && !cmos_protected)
COMBINE_DATA(&m_nvram[offset]);
@@ -165,13 +165,13 @@ WRITE32_MEMBER(midzeus_state::cmos_w)
}
-READ32_MEMBER(midzeus_state::cmos_r)
+uint32_t midzeus_state::cmos_r(offs_t offset)
{
return m_nvram[offset] | 0xffffff00;
}
-WRITE32_MEMBER(midzeus_state::cmos_protect_w)
+void midzeus_state::cmos_protect_w(uint32_t data)
{
cmos_protected = false;
}
@@ -200,13 +200,13 @@ void midzeus2_state::zeus2_timekeeper_w(offs_t offset, uint32_t data)
}
-READ32_MEMBER(midzeus_state::zpram_r)
+uint32_t midzeus_state::zpram_r(offs_t offset)
{
return m_nvram[offset] | 0xffffff00;
}
-WRITE32_MEMBER(midzeus_state::zpram_w)
+void midzeus_state::zpram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (disk_asic_jr[2])
COMBINE_DATA(&m_nvram[offset]);
@@ -221,7 +221,7 @@ WRITE32_MEMBER(midzeus_state::zpram_w)
* Disk ASIC registers
*
*************************************/
-READ32_MEMBER(midzeus_state::disk_asic_r)
+uint32_t midzeus_state::disk_asic_r(offs_t offset)
{
uint32_t retVal = disk_asic[offset];
switch (offset)
@@ -260,7 +260,7 @@ READ32_MEMBER(midzeus_state::disk_asic_r)
}
-WRITE32_MEMBER(midzeus_state::disk_asic_w)
+void midzeus_state::disk_asic_w(offs_t offset, uint32_t data)
{
disk_asic[offset] = data;
@@ -300,7 +300,7 @@ WRITE32_MEMBER(midzeus_state::disk_asic_w)
* Disk ASIC JR registers
*
*************************************/
-READ32_MEMBER(midzeus_state::disk_asic_jr_r)
+uint32_t midzeus_state::disk_asic_jr_r(offs_t offset)
{
uint32_t retVal = disk_asic_jr[offset];
switch (offset)
@@ -341,7 +341,7 @@ READ32_MEMBER(midzeus_state::disk_asic_jr_r)
}
-WRITE32_MEMBER(midzeus_state::disk_asic_jr_w)
+void midzeus_state::disk_asic_jr_w(offs_t offset, uint32_t data)
{
//uint32_t oldval = disk_asic_jr[offset];
disk_asic_jr[offset] = data;
@@ -462,7 +462,7 @@ void midzeus2_state::crusnexo_leds_w(offs_t offset, uint32_t data)
*
*************************************/
-READ32_MEMBER(midzeus_state::firewire_r)
+uint32_t midzeus_state::firewire_r(offs_t offset)
{
uint32_t retVal = 0;
if (offset < 0x40)
@@ -498,7 +498,7 @@ READ32_MEMBER(midzeus_state::firewire_r)
return retVal;
}
-WRITE32_MEMBER(midzeus_state::firewire_w)
+void midzeus_state::firewire_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// 0x08 // Control
// Bit 0: Flush bad packets from Rx FIFO
@@ -538,7 +538,7 @@ WRITE32_MEMBER(midzeus_state::firewire_w)
*
*************************************/
-READ32_MEMBER(midzeus_state::tms32031_control_r)
+uint32_t midzeus_state::tms32031_control_r(offs_t offset)
{
/* watch for accesses to the timers */
if (offset == 0x24 || offset == 0x34)
@@ -557,7 +557,7 @@ READ32_MEMBER(midzeus_state::tms32031_control_r)
}
-WRITE32_MEMBER(midzeus_state::tms32031_control_w)
+void midzeus_state::tms32031_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_tms32031_control[offset]);
@@ -591,7 +591,7 @@ CUSTOM_INPUT_MEMBER(midzeus_state::custom_49way_r)
}
-WRITE32_MEMBER(midzeus_state::keypad_select_w)
+void midzeus_state::keypad_select_w(offs_t offset, uint32_t data)
{
if (offset == 1)
keypad_select = data;
@@ -610,13 +610,13 @@ CUSTOM_INPUT_MEMBER(midzeus_state::keypad_r)
return bits;
}
-READ32_MEMBER(midzeus_state::grid_keypad_r)
+uint32_t midzeus_state::grid_keypad_r(offs_t offset)
{
uint32_t bits = (m_io_keypad->read() >> ((offset >> 1) << 2)) & 0xf;
return bits;
}
-READ32_MEMBER(midzeus_state::trackball_r)
+uint32_t midzeus_state::trackball_r(offs_t offset)
{
if (offset==0)
return m_io_tracky->read();
@@ -632,7 +632,7 @@ READ32_MEMBER(midzeus_state::trackball_r)
*
*************************************/
-READ32_MEMBER(midzeus_state::analog_r)
+uint32_t midzeus_state::analog_r(offs_t offset)
{
if (offset < 8 || offset > 11)
logerror("%06X:analog_r(%X)\n", m_maincpu->pc(), offset);
@@ -640,7 +640,7 @@ READ32_MEMBER(midzeus_state::analog_r)
}
-WRITE32_MEMBER(midzeus_state::analog_w)
+void midzeus_state::analog_w(uint32_t data)
{
/* 16 writes to the location before a read */
}
@@ -679,7 +679,7 @@ TIMER_CALLBACK_MEMBER(midzeus_state::invasn_gun_callback)
}
-WRITE32_MEMBER(midzeus_state::invasn_gun_w)
+void midzeus_state::invasn_gun_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t old_control = gun_control;
int player;
@@ -705,7 +705,7 @@ WRITE32_MEMBER(midzeus_state::invasn_gun_w)
}
-READ32_MEMBER(midzeus_state::invasn_gun_r)
+uint32_t midzeus_state::invasn_gun_r()
{
int beamx = m_screen->hpos();
int beamy = m_screen->vpos();
@@ -1678,7 +1678,8 @@ void midzeus_state::init_mk4()
void midzeus_state::init_invasn()
{
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x9c0000, 0x9c0000, read32_delegate(*this, FUNC(midzeus_state::invasn_gun_r)), write32_delegate(*this, FUNC(midzeus_state::invasn_gun_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x9c0000, 0x9c0000, read32smo_delegate(*this, FUNC(midzeus_state::invasn_gun_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x9c0000, 0x9c0000, write32s_delegate(*this, FUNC(midzeus_state::invasn_gun_w)));
}
@@ -1686,15 +1687,15 @@ void midzeus2_state::init_crusnexo()
{
membank("bank1")->configure_entries(0, 3, memregion("user2")->base(), 0x400000*4);
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x9b0004, 0x9b0007, read32sm_delegate(*this, FUNC(midzeus2_state::crusnexo_leds_r)), write32sm_delegate(*this, FUNC(midzeus2_state::crusnexo_leds_w)));
- m_maincpu->space(AS_PROGRAM).install_write_handler (0x8d0009, 0x8d000a, write32_delegate(*this, FUNC(midzeus_state::keypad_select_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler (0x8d0009, 0x8d000a, write32sm_delegate(*this, FUNC(midzeus_state::keypad_select_w)));
}
void midzeus2_state::init_thegrid()
{
membank("bank1")->configure_entries(0, 3, memregion("user2")->base(), 0x400000*4);
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x8c0000, 0x8c0001, read32_delegate(*this, FUNC(midzeus_state::trackball_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x9b0000, 0x9b0004, read32_delegate(*this, FUNC(midzeus_state::grid_keypad_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8c0000, 0x8c0001, read32sm_delegate(*this, FUNC(midzeus_state::trackball_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x9b0000, 0x9b0004, read32sm_delegate(*this, FUNC(midzeus_state::grid_keypad_r)));
}
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index c4834a7a31e..35131d00c06 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -765,12 +765,12 @@ void model1_state::r360_w(uint8_t data)
}
}
-READ16_MEMBER(model1_state::fifoin_status_r)
+u16 model1_state::fifoin_status_r()
{
return 0xffff;
}
-WRITE16_MEMBER(model1_state::bank_w)
+void model1_state::bank_w(offs_t offset, u16 data, u16 mem_mask)
{
if(ACCESSING_BITS_0_7) {
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index b01f2d1d234..bcb23c84f00 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -109,7 +109,7 @@
#include "segabill.lh"
/* Timers - these count down at 25 MHz and pull IRQ2 when they hit 0 */
-READ32_MEMBER(model2_state::timers_r)
+u32 model2_state::timers_r(offs_t offset)
{
m_maincpu->i960_noburst();
@@ -117,7 +117,7 @@ READ32_MEMBER(model2_state::timers_r)
if (m_timerrun[offset])
{
// get elapsed time, convert to units of 25 MHz
- uint32_t cur = (m_timers[offset]->time_elapsed() * 25000000).as_double();
+ u32 cur = (m_timers[offset]->time_elapsed() * 25000000).as_double();
// subtract units from starting value
m_timervals[offset] = m_timerorig[offset] - cur;
@@ -126,7 +126,7 @@ READ32_MEMBER(model2_state::timers_r)
return m_timervals[offset];
}
-WRITE32_MEMBER(model2_state::timers_w)
+void model2_state::timers_w(offs_t offset, u32 data, u32 mem_mask)
{
attotime period;
@@ -328,37 +328,37 @@ void model2c_state::machine_reset()
m_copro_tgpx4->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
-WRITE16_MEMBER(model2_state::palette_w)
+void model2_state::palette_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_palram[offset]);
u16 color = m_palram[offset];
m_palette->set_pen_color(offset, pal5bit(color >> 0), pal5bit(color >> 5), pal5bit(color >> 10));
}
-READ16_MEMBER(model2_state::palette_r)
+u16 model2_state::palette_r(offs_t offset)
{
return m_palram[offset];
}
-WRITE16_MEMBER(model2_state::colorxlat_w)
+void model2_state::colorxlat_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_colorxlat[offset]);
}
-READ16_MEMBER(model2_state::colorxlat_r)
+u16 model2_state::colorxlat_r(offs_t offset)
{
return m_colorxlat[offset];
}
// Apparently original Model 2 doesn't have fifo control?
-READ32_MEMBER(model2o_state::fifo_control_2o_r)
+u32 model2o_state::fifo_control_2o_r()
{
return 0xffffffff;
}
-READ32_MEMBER(model2_state::fifo_control_2a_r)
+u32 model2_state::fifo_control_2a_r()
{
- uint32_t r = 0;
+ u32 r = 0;
if (m_copro_fifo_out->is_empty())
{
@@ -371,9 +371,9 @@ READ32_MEMBER(model2_state::fifo_control_2a_r)
// return r | 0x04;
}
-READ32_MEMBER(model2_state::videoctl_r)
+u32 model2_state::videoctl_r()
{
- uint8_t framenum;
+ u8 framenum;
if(m_render_mode == false)
framenum = (m_screen->frame_number() & 2) << 1;
@@ -383,23 +383,23 @@ READ32_MEMBER(model2_state::videoctl_r)
return (framenum) | (m_videocontrol & 3);
}
-WRITE32_MEMBER(model2_state::videoctl_w)
+void model2_state::videoctl_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_videocontrol);
}
// Coprocessor - Common
-READ32_MEMBER(model2_state::copro_prg_r)
+u32 model2_state::copro_prg_r()
{
return 0xffffffff;
}
-READ32_MEMBER(model2_state::copro_ctl1_r)
+u32 model2_state::copro_ctl1_r()
{
return m_coproctl;
}
-WRITE32_MEMBER(model2_state::copro_ctl1_w)
+void model2_state::copro_ctl1_w(offs_t offset, u32 data, u32 mem_mask)
{
// did hi bit change?
if ((data ^ m_coproctl) == 0x80000000)
@@ -457,7 +457,7 @@ void model2_tgp_state::copro_tgp_rf_map(address_map &map)
map(0x3, 0x3).w(FUNC(model2_tgp_state::copro_tgp_bank_w));
}
-READ32_MEMBER(model2_tgp_state::copro_tgp_memory_r)
+u32 model2_tgp_state::copro_tgp_memory_r(offs_t offset)
{
offs_t adr = (m_copro_tgp_bank_reg & 0xff0000) | offset;
@@ -474,7 +474,7 @@ READ32_MEMBER(model2_tgp_state::copro_tgp_memory_r)
return 0;
}
-WRITE32_MEMBER(model2_tgp_state::copro_tgp_memory_w)
+void model2_tgp_state::copro_tgp_memory_w(offs_t offset, u32 data, u32 mem_mask)
{
offs_t adr = (m_copro_tgp_bank_reg & 0xff0000) | offset;
if(adr & 0x400000) {
@@ -483,18 +483,18 @@ WRITE32_MEMBER(model2_tgp_state::copro_tgp_memory_w)
}
}
-WRITE32_MEMBER(model2_tgp_state::copro_tgp_bank_w)
+void model2_tgp_state::copro_tgp_bank_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_tgp_bank_reg);
m_copro_tgp_bank->set_bank(m_copro_tgp_bank_reg & 0xc00000 ? 1 : 0);
}
-WRITE32_MEMBER(model2_tgp_state::copro_sincos_w)
+void model2_tgp_state::copro_sincos_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_sincos_base);
}
-READ32_MEMBER(model2_tgp_state::copro_sincos_r)
+u32 model2_tgp_state::copro_sincos_r(offs_t offset)
{
offs_t ang = m_copro_sincos_base + offset * 0x4000;
offs_t index = ang & 0x3fff;
@@ -506,12 +506,12 @@ READ32_MEMBER(model2_tgp_state::copro_sincos_r)
return result;
}
-WRITE32_MEMBER(model2_tgp_state::copro_inv_w)
+void model2_tgp_state::copro_inv_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_inv_base);
}
-READ32_MEMBER(model2_tgp_state::copro_inv_r)
+u32 model2_tgp_state::copro_inv_r(offs_t offset)
{
offs_t index = ((m_copro_inv_base >> 9) & 0x3ffe) | (offset & 1);
u32 result = m_copro_tgp_tables[index | 0x8000];
@@ -523,12 +523,12 @@ READ32_MEMBER(model2_tgp_state::copro_inv_r)
return result;
}
-WRITE32_MEMBER(model2_tgp_state::copro_isqrt_w)
+void model2_tgp_state::copro_isqrt_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_isqrt_base);
}
-READ32_MEMBER(model2_tgp_state::copro_isqrt_r)
+u32 model2_tgp_state::copro_isqrt_r(offs_t offset)
{
offs_t index = 0x2000 ^ (((m_copro_isqrt_base>> 10) & 0x3ffe) | (offset & 1));
u32 result = m_copro_tgp_tables[index | 0xc000];
@@ -540,13 +540,13 @@ READ32_MEMBER(model2_tgp_state::copro_isqrt_r)
return result;
}
-WRITE32_MEMBER(model2_tgp_state::copro_atan_w)
+void model2_tgp_state::copro_atan_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_atan_base[offset]);
m_copro_tgp->gpio0_w((m_copro_atan_base[0] & 0x7fffffff) <= (m_copro_atan_base[1] & 0x7fffffff));
}
-READ32_MEMBER(model2_tgp_state::copro_atan_r)
+u32 model2_tgp_state::copro_atan_r()
{
u8 ie = 0x88 - (m_copro_atan_base[3] >> 23);
@@ -571,10 +571,10 @@ READ32_MEMBER(model2_tgp_state::copro_atan_r)
return result & 0xffff;
}
-WRITE32_MEMBER(model2_tgp_state::copro_function_port_w)
+void model2_tgp_state::copro_function_port_w(offs_t offset, u32 data)
{
- uint32_t d = data & 0x800fffff;
- uint32_t a = (offset >> 2) & 0xff;
+ u32 d = data & 0x800fffff;
+ u32 a = (offset >> 2) & 0xff;
d |= a << 23;
m_copro_fifo_in->push(u32(d));
@@ -591,13 +591,13 @@ void model2_tgp_state::copro_boot()
m_copro_tgp->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
}
-READ32_MEMBER(model2_tgp_state::copro_fifo_r)
+u32 model2_tgp_state::copro_fifo_r()
{
m_maincpu->i960_noburst();
return m_copro_fifo_out->pop();
}
-WRITE32_MEMBER(model2_tgp_state::copro_fifo_w)
+void model2_tgp_state::copro_fifo_w(u32 data)
{
m_maincpu->i960_noburst();
if (m_coproctl & 0x80000000)
@@ -613,12 +613,12 @@ WRITE32_MEMBER(model2_tgp_state::copro_fifo_w)
// Coprocessor - SHARC
-READ32_MEMBER(model2b_state::copro_sharc_buffer_r)
+u32 model2b_state::copro_sharc_buffer_r(offs_t offset)
{
return m_bufferram[offset & 0x7fff];
}
-WRITE32_MEMBER(model2b_state::copro_sharc_buffer_w)
+void model2b_state::copro_sharc_buffer_w(offs_t offset, u32 data)
{
m_bufferram[offset & 0x7fff] = data;
}
@@ -640,13 +640,13 @@ void model2b_state::copro_boot()
m_copro_adsp->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
}
-READ32_MEMBER(model2b_state::copro_fifo_r)
+u32 model2b_state::copro_fifo_r()
{
m_maincpu->i960_noburst();
return m_copro_fifo_out->pop();
}
-WRITE32_MEMBER(model2b_state::copro_fifo_w)
+void model2b_state::copro_fifo_w(u32 data)
{
m_maincpu->i960_noburst();
if (m_coproctl & 0x80000000)
@@ -660,7 +660,7 @@ WRITE32_MEMBER(model2b_state::copro_fifo_w)
}
}
-WRITE32_MEMBER(model2b_state::copro_sharc_iop_w)
+void model2b_state::copro_sharc_iop_w(offs_t offset, u32 data)
{
/* FIXME: clean this mess */
if ((strcmp(machine().system().name, "schamp" ) == 0) ||
@@ -698,10 +698,10 @@ WRITE32_MEMBER(model2b_state::copro_sharc_iop_w)
}
}
-WRITE32_MEMBER(model2b_state::copro_function_port_w)
+void model2b_state::copro_function_port_w(offs_t offset, u32 data)
{
- uint32_t d = data & 0x800fffff;
- uint32_t a = (offset >> 2) & 0xff;
+ u32 d = data & 0x800fffff;
+ u32 a = (offset >> 2) & 0xff;
d |= a << 23;
m_copro_fifo_in->push(u32(d));
@@ -719,13 +719,13 @@ void model2c_state::copro_boot()
m_copro_tgpx4->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
}
-READ32_MEMBER(model2c_state::copro_fifo_r)
+u32 model2c_state::copro_fifo_r()
{
m_maincpu->i960_noburst();
return m_copro_fifo_out->pop();
}
-WRITE32_MEMBER(model2c_state::copro_fifo_w)
+void model2c_state::copro_fifo_w(u32 data)
{
m_maincpu->i960_noburst();
if (m_coproctl & 0x80000000)
@@ -749,10 +749,10 @@ WRITE32_MEMBER(model2c_state::copro_fifo_w)
}
}
-WRITE32_MEMBER(model2c_state::copro_function_port_w)
+void model2c_state::copro_function_port_w(offs_t offset, u32 data)
{
- uint32_t d = data & 0x800fffff;
- uint32_t a = (offset >> 2) & 0xff;
+ u32 d = data & 0x800fffff;
+ u32 a = (offset >> 2) & 0xff;
d |= a << 23;
m_copro_fifo_in->push(u32(d));
@@ -775,7 +775,7 @@ void model2c_state::copro_tgpx4_data_map(address_map &map)
/* GEO */
-WRITE32_MEMBER(model2_state::geo_ctl1_w)
+void model2_state::geo_ctl1_w(u32 data)
{
// did hi bit change?
if ((data ^ m_geoctl) == 0x80000000)
@@ -794,20 +794,20 @@ WRITE32_MEMBER(model2_state::geo_ctl1_w)
m_geoctl = data;
}
-void model2_state::push_geo_data(uint32_t data)
+void model2_state::push_geo_data(u32 data)
{
//osd_printf_debug("push_geo_data: %08X: %08X\n", 0x900000+m_geo_write_start_address, data);
m_bufferram[m_geo_write_start_address/4] = data;
m_geo_write_start_address += 4;
}
-READ32_MEMBER(model2_state::geo_prg_r)
+u32 model2_state::geo_prg_r(offs_t offset)
{
popmessage("Read from Geometry FIFO at %08x, contact MAMEdev",offset*4);
return 0xffffffff;
}
-WRITE32_MEMBER(model2_state::geo_prg_w)
+void model2_state::geo_prg_w(u32 data)
{
if (m_geoctl & 0x80000000)
{
@@ -821,7 +821,7 @@ WRITE32_MEMBER(model2_state::geo_prg_w)
}
}
-READ32_MEMBER(model2_state::geo_r)
+u32 model2_state::geo_r(offs_t offset)
{
int address = offset * 4;
if (address == 0x2008)
@@ -839,7 +839,7 @@ READ32_MEMBER(model2_state::geo_r)
return 0;
}
-WRITE32_MEMBER(model2_state::geo_w)
+void model2_state::geo_w(offs_t offset, u32 data)
{
int address = offset * 4;
@@ -848,7 +848,7 @@ WRITE32_MEMBER(model2_state::geo_w)
/*if (data & 0x80000000)
{
int i;
- uint32_t a;
+ u32 a;
osd_printf_debug("GEO: jump to %08X\n", (data & 0xfffff));
a = (data & 0xfffff) / 4;
for (i=0; i < 4; i++)
@@ -875,7 +875,7 @@ WRITE32_MEMBER(model2_state::geo_w)
if (data & 0x80000000)
{
- uint32_t r = 0;
+ u32 r = 0;
r |= data & 0x800fffff;
r |= ((address >> 4) & 0x3f) << 23;
push_geo_data(r);
@@ -884,12 +884,12 @@ WRITE32_MEMBER(model2_state::geo_w)
{
if ((address & 0xf) == 0)
{
- uint32_t r = 0;
+ u32 r = 0;
r |= data & 0x000fffff;
r |= ((address >> 4) & 0x3f) << 23;
if((address >> 4) & 0xc0)
{
- uint8_t function = (address >> 4) & 0x3f;
+ u8 function = (address >> 4) & 0x3f;
if(function == 1)
{
r |= ((address>>10)&3)<<29; // Eye Mode, used by Sega Rally on car select
@@ -918,21 +918,21 @@ WRITE32_MEMBER(model2_state::geo_w)
/*****************************************************************************/
-READ32_MEMBER(model2_state::irq_request_r)
+u32 model2_state::irq_request_r()
{
m_maincpu->i960_noburst();
return m_intreq;
}
-READ32_MEMBER(model2_state::irq_enable_r)
+u32 model2_state::irq_enable_r()
{
m_maincpu->i960_noburst();
return m_intena;
}
-WRITE32_MEMBER(model2_state::irq_ack_w)
+void model2_state::irq_ack_w(u32 data)
{
m_maincpu->i960_noburst();
@@ -941,7 +941,7 @@ WRITE32_MEMBER(model2_state::irq_ack_w)
model2_check_irqack_state(data ^ 0xffffffff);
}
-WRITE32_MEMBER(model2_state::irq_enable_w)
+void model2_state::irq_enable_w(offs_t offset, u32 data, u32 mem_mask)
{
m_maincpu->i960_noburst();
@@ -966,7 +966,7 @@ void model2_state::model2_check_irq_state()
}
}
-void model2_state::model2_check_irqack_state(uint32_t data)
+void model2_state::model2_check_irqack_state(u32 data)
{
const int irq_type[12]= {I960_IRQ0,I960_IRQ1,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ3,I960_IRQ3};
@@ -978,7 +978,7 @@ void model2_state::model2_check_irqack_state(uint32_t data)
}
/* TODO: rewrite this part. It's a 8251-compatible chip */
-READ32_MEMBER(model2_state::model2_serial_r)
+u32 model2_state::model2_serial_r(offs_t offset, u32 mem_mask)
{
if (offset == 0)
{
@@ -994,7 +994,7 @@ READ32_MEMBER(model2_state::model2_serial_r)
}
-WRITE32_MEMBER(model2_state::model2_serial_w)
+void model2_state::model2_serial_w(offs_t offset, u32 data, u32 mem_mask)
{
if (ACCESSING_BITS_0_7 && (offset == 0))
{
@@ -1017,7 +1017,7 @@ WRITE32_MEMBER(model2_state::model2_serial_w)
#ifdef UNUSED_FUNCTION
-WRITE32_MEMBER(model2_state::copro_w)
+void model2_state::copro_w(offs_t offset, u32 data)
{
int address = offset * 4;
@@ -1036,12 +1036,12 @@ WRITE32_MEMBER(model2_state::copro_w)
}
#endif
-READ32_MEMBER(model2_state::render_mode_r)
+u32 model2_state::render_mode_r()
{
return (m_render_unk << 14) | (m_render_mode << 2) | (m_render_test_mode << 0);
}
-WRITE32_MEMBER(model2_state::render_mode_w)
+void model2_state::render_mode_w(u32 data)
{
// ---- -x-- (1) 60 Hz mode
// (0) 30 Hz mode - skytargt, desert, vstriker, vcop
@@ -1056,7 +1056,7 @@ WRITE32_MEMBER(model2_state::render_mode_w)
// osd_printf_debug("Mode = %08X\n", data);
}
-WRITE32_MEMBER(model2_tgp_state::tex0_w)
+void model2_tgp_state::tex0_w(offs_t offset, u32 data)
{
if ( (offset & 1) == 0 )
{
@@ -1070,7 +1070,7 @@ WRITE32_MEMBER(model2_tgp_state::tex0_w)
}
}
-WRITE32_MEMBER(model2_tgp_state::tex1_w)
+void model2_tgp_state::tex1_w(offs_t offset, u32 data)
{
if ( (offset & 1) == 0 )
{
@@ -1084,12 +1084,12 @@ WRITE32_MEMBER(model2_tgp_state::tex1_w)
}
}
-READ16_MEMBER(model2_state::lumaram_r)
+u16 model2_state::lumaram_r(offs_t offset)
{
return m_lumaram[offset];
}
-WRITE16_MEMBER(model2_state::lumaram_w)
+void model2_state::lumaram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_lumaram[offset]);
}
@@ -1102,10 +1102,10 @@ READ8_MEMBER(model2_state::tgpid_r)
return ID[offset];
}
-READ16_MEMBER(model2_state::fbvram_bankA_r) { return m_fbvramA[offset]; }
-READ16_MEMBER(model2_state::fbvram_bankB_r) { return m_fbvramB[offset]; }
-WRITE16_MEMBER(model2_state::fbvram_bankA_w) { COMBINE_DATA(&m_fbvramA[offset]); }
-WRITE16_MEMBER(model2_state::fbvram_bankB_w) { COMBINE_DATA(&m_fbvramB[offset]); }
+u16 model2_state::fbvram_bankA_r(offs_t offset) { return m_fbvramA[offset]; }
+u16 model2_state::fbvram_bankB_r(offs_t offset) { return m_fbvramB[offset]; }
+void model2_state::fbvram_bankA_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_fbvramA[offset]); }
+void model2_state::fbvram_bankB_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_fbvramB[offset]); }
/* common map for all Model 2 versions */
void model2_state::model2_base_mem(address_map &map)
@@ -1182,13 +1182,13 @@ void model2_state::model2_5881_mem(address_map &map)
// Interface board ID: 837-12079
// ALTERA FLEX + Sega 315-5338A
-uint8_t model2_state::lightgun_data_r(offs_t offset)
+u8 model2_state::lightgun_data_r(offs_t offset)
{
- uint16_t data = m_lightgun_ports[offset >> 1].read_safe(0);
+ u16 data = m_lightgun_ports[offset >> 1].read_safe(0);
return BIT(offset, 0) ? (data >> 8) : data;
}
-uint8_t model2_state::lightgun_mux_r()
+u8 model2_state::lightgun_mux_r()
{
if (m_lightgun_mux < 8)
return lightgun_data_r(m_lightgun_mux);
@@ -1196,13 +1196,13 @@ uint8_t model2_state::lightgun_mux_r()
return lightgun_offscreen_r(0);
}
-void model2_state::lightgun_mux_w(uint8_t data)
+void model2_state::lightgun_mux_w(u8 data)
{
m_lightgun_mux = data;
}
// handles offscreen gun trigger detection here
-uint8_t model2_state::lightgun_offscreen_r(offs_t offset)
+u8 model2_state::lightgun_offscreen_r(offs_t offset)
{
// 5 percent border size
const float BORDER_SIZE = 0.05f;
@@ -1213,12 +1213,12 @@ uint8_t model2_state::lightgun_offscreen_r(offs_t offset)
const int BORDER_P2X = (m_lightgun_ports[3]->field(0x3ff)->maxval() - m_lightgun_ports[3]->field(0x3ff)->minval()) * BORDER_SIZE;
const int BORDER_P2Y = (m_lightgun_ports[2]->field(0x3ff)->maxval() - m_lightgun_ports[2]->field(0x3ff)->minval()) * BORDER_SIZE;
- uint16_t data = 0xfffc;
+ u16 data = 0xfffc;
- const uint16_t P1X = m_lightgun_ports[1].read_safe(0);
- const uint16_t P1Y = m_lightgun_ports[0].read_safe(0);
- const uint16_t P2X = m_lightgun_ports[3].read_safe(0);
- const uint16_t P2Y = m_lightgun_ports[2].read_safe(0);
+ const u16 P1X = m_lightgun_ports[1].read_safe(0);
+ const u16 P1Y = m_lightgun_ports[0].read_safe(0);
+ const u16 P2X = m_lightgun_ports[3].read_safe(0);
+ const u16 P2Y = m_lightgun_ports[2].read_safe(0);
// border hit test for player 1 and 2
if (P1X <= (m_lightgun_ports[1]->field(0x3ff)->minval() + BORDER_P1X)) data |= 1;
@@ -1238,7 +1238,7 @@ uint8_t model2_state::lightgun_offscreen_r(offs_t offset)
// OUTPUTS
//**************************************************************************
-void model2o_state::daytona_output_w(uint8_t data)
+void model2o_state::daytona_output_w(u8 data)
{
// 7------- leader led
// -6------ vr4 led
@@ -1253,7 +1253,7 @@ void model2o_state::daytona_output_w(uint8_t data)
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
}
-void model2o_state::desert_output_w(uint8_t data)
+void model2o_state::desert_output_w(u8 data)
{
// 7------- cannon motor
// -6------ machine gun motor
@@ -1268,7 +1268,7 @@ void model2o_state::desert_output_w(uint8_t data)
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
}
-void model2o_state::vcop_output_w(uint8_t data)
+void model2o_state::vcop_output_w(u8 data)
{
// 7654---- unknown (not used?)
// ----32-- start leds (always set together)
@@ -1318,9 +1318,9 @@ void model2o_state::model2o_mem(address_map &map)
}
/* Daytona "To The MAXX" PIC protection simulation */
-READ32_MEMBER(model2o_maxx_state::maxx_r)
+u32 model2o_maxx_state::maxx_r(offs_t offset, u32 mem_mask)
{
- uint32_t *ROM = (uint32_t *)memregion("maincpu")->base();
+ u32 *ROM = (u32 *)memregion("maincpu")->base();
if (offset <= 0x1f/4)
{
@@ -1367,7 +1367,7 @@ void model2o_maxx_state::model2o_maxx_mem(address_map &map)
READ8_MEMBER(model2o_gtx_state::gtx_r)
{
- uint8_t *ROM = memregion("prot_data")->base();
+ u8 *ROM = memregion("prot_data")->base();
if(offset == 0xffffc) // disable protection ROM overlay (fallbacks to data rom?)
m_gtx_state = 2;
@@ -1386,7 +1386,7 @@ void model2o_gtx_state::model2o_gtx_mem(address_map &map)
}
/* TODO: read by Sonic the Fighters (bit 1), unknown purpose */
-READ32_MEMBER(model2_state::copro_status_r)
+u32 model2_state::copro_status_r()
{
if(m_coprocnt == 0)
return -1;
@@ -1569,9 +1569,9 @@ void model2c_state::model2c_5881_mem(address_map &map)
*/
// simulate this so that it passes the initial checks
-uint8_t model2_state::rchase2_drive_board_r()
+u8 model2_state::rchase2_drive_board_r()
{
- uint8_t data = 0xff;
+ u8 data = 0xff;
if(m_cmd_data == 0xe0 || m_cmd_data == 0x0e)
data &= ~1;
@@ -1585,12 +1585,12 @@ uint8_t model2_state::rchase2_drive_board_r()
return data;
}
-void model2_state::rchase2_drive_board_w(uint8_t data)
+void model2_state::rchase2_drive_board_w(u8 data)
{
m_cmd_data = data;
}
-void model2_state::drive_board_w(uint8_t data)
+void model2_state::drive_board_w(u8 data)
{
m_driveio_comm_data = data;
m_drivecpu->set_input_line(0, HOLD_LINE);
@@ -1601,7 +1601,7 @@ void model2_state::drive_board_w(uint8_t data)
// INPUT HANDLING
//**************************************************************************
-void model2_state::eeprom_w(uint8_t data)
+void model2_state::eeprom_w(u8 data)
{
m_ctrlmode = BIT(data, 0);
@@ -1610,9 +1610,9 @@ void model2_state::eeprom_w(uint8_t data)
m_eeprom->cs_write(BIT(data, 6) ? ASSERT_LINE : CLEAR_LINE);
}
-uint8_t model2_state::in0_r()
+u8 model2_state::in0_r()
{
- uint8_t data = m_in0->read();
+ u8 data = m_in0->read();
if (m_ctrlmode)
return (0xc0) | (m_eeprom->do_read() << 5) | (0x10) | (data & 0x0f);
@@ -1633,9 +1633,9 @@ uint8_t model2_state::in0_r()
// Used by Sega Rally and Daytona USA, others might be different
CUSTOM_INPUT_MEMBER(model2_state::daytona_gearbox_r)
{
- uint8_t res = m_gears.read_safe(0);
+ u8 res = m_gears.read_safe(0);
int i;
- const uint8_t gearvalue[5] = { 0, 2, 1, 6, 5 };
+ const u8 gearvalue[5] = { 0, 2, 1, 6, 5 };
for(i=0;i<5;i++)
{
@@ -2419,12 +2419,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2c_state::model2c_interrupt)
/* Model 2 sound board emulation */
-WRITE16_MEMBER(model2_state::model2snd_ctrl)
+void model2_state::model2snd_ctrl(u16 data)
{
// handle sample banking
if (memregion("samples")->bytes() > 0x800000)
{
- uint8_t *snd = memregion("samples")->base();
+ u8 *snd = memregion("samples")->base();
if (data & 0x20)
{
membank("bank4")->set_base(snd + 0x200000);
@@ -2454,7 +2454,7 @@ void model2_state::scsp_map(address_map &map)
map(0x000000, 0x07ffff).ram().share("soundram");
}
-void model2_state::scsp_irq(offs_t offset, uint8_t data)
+void model2_state::scsp_irq(offs_t offset, u8 data)
{
m_audiocpu->set_input_line(offset, data);
}
@@ -2571,17 +2571,17 @@ void model2o_state::model2o(machine_config &config)
M2COMM(config, "m2comm", 0);
}
-uint8_t model2_state::driveio_portg_r()
+u8 model2_state::driveio_portg_r()
{
return m_driveio_comm_data;
}
-uint8_t model2_state::driveio_porth_r()
+u8 model2_state::driveio_porth_r()
{
return m_driveio_comm_data;
}
-void model2_state::driveio_port_w(uint8_t data)
+void model2_state::driveio_port_w(u8 data)
{
// TODO: hook up to the main CPU
// popmessage("%02x",data);
@@ -2710,7 +2710,7 @@ void model2a_state::model2a(machine_config &config)
io.in_pc_callback().set_ioport("IN1");
io.in_pd_callback().set_ioport("IN2");
io.in_pg_callback().set_ioport("SW");
- io.out_pe_callback().set([this] (uint8_t data) { m_billboard->write(data); });
+ io.out_pe_callback().set([this] (u8 data) { m_billboard->write(data); });
model2_timers(config);
model2_screen(config);
@@ -2774,9 +2774,9 @@ void model2a_state::skytargt(machine_config &config)
io.an_port_callback<2>().set_ioport("STICKX");
}
-uint16_t model2_state::crypt_read_callback(uint32_t addr)
+u16 model2_state::crypt_read_callback(u32 addr)
{
- uint16_t dat= m_maincpu->space().read_word((0x1d80000+2*addr));
+ u16 dat= m_maincpu->space().read_word((0x1d80000+2*addr));
return ((dat&0xff00)>>8)|((dat&0x00ff)<<8);
}
@@ -2835,7 +2835,7 @@ void model2b_state::model2b(machine_config &config)
io.in_pc_callback().set_ioport("IN1");
io.in_pd_callback().set_ioport("IN2");
io.in_pg_callback().set_ioport("SW");
- io.out_pe_callback().set([this] (uint8_t data) { m_billboard->write(data); });
+ io.out_pe_callback().set([this] (u8 data) { m_billboard->write(data); });
model2_timers(config);
model2_screen(config);
@@ -6967,20 +6967,20 @@ ROM_END
void model2_state::init_pltkids()
{
// fix bug in program: it destroys the interrupt table and never fixes it
- uint32_t *ROM = (uint32_t *)memregion("maincpu")->base();
+ u32 *ROM = (u32 *)memregion("maincpu")->base();
ROM[0x730/4] = 0x08000004;
}
void model2_state::init_zerogun()
{
// fix bug in program: it destroys the interrupt table and never fixes it
- uint32_t *ROM = (uint32_t *)memregion("maincpu")->base();
+ u32 *ROM = (u32 *)memregion("maincpu")->base();
ROM[0x700/4] = 0x08000004;
}
void model2_state::init_sgt24h()
{
- uint32_t *ROM = (uint32_t *)memregion("maincpu")->base();
+ u32 *ROM = (u32 *)memregion("maincpu")->base();
ROM[0x56578/4] = 0x08000004;
//ROM[0x5b3e8/4] = 0x08000004;
}
@@ -6993,7 +6993,7 @@ void model2_state::init_powsledm ()
ROM[0x1585D] = 0xFD; // inverted node ID
}
-READ32_MEMBER(model2_state::doa_prot_r)
+u32 model2_state::doa_prot_r(offs_t offset, u32 mem_mask)
{
// doa only reads 16-bits at a time, while STV reads 32-bits
uint32 ret = 0;
@@ -7004,9 +7004,9 @@ READ32_MEMBER(model2_state::doa_prot_r)
return ret;
}
-READ32_MEMBER(model2_state::doa_unk_r)
+u32 model2_state::doa_unk_r()
{
- uint32_t retval = 0;
+ u32 retval = 0;
// this actually looks a busy status flag
m_prot_a = !m_prot_a;
@@ -7039,7 +7039,7 @@ void model2_state::model2_0229_mem(address_map &map)
void model2_state::init_doa()
{
- uint32_t *ROM = (uint32_t *)memregion("maincpu")->base();
+ u32 *ROM = (u32 *)memregion("maincpu")->base();
ROM[0x630 / 4] = 0x08000004;
ROM[0x808 / 4] = 0x08000004;
diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp
index 6f7de140e41..2aec64eff35 100644
--- a/src/mame/drivers/model3.cpp
+++ b/src/mame/drivers/model3.cpp
@@ -899,7 +899,7 @@ void model3_state::pci_device_set_reg(uint32_t value)
}
}
-READ64_MEMBER(model3_state::mpc105_addr_r)
+uint64_t model3_state::mpc105_addr_r(offs_t offset, uint64_t mem_mask)
{
if (ACCESSING_BITS_32_63)
{
@@ -908,7 +908,7 @@ READ64_MEMBER(model3_state::mpc105_addr_r)
return 0;
}
-WRITE64_MEMBER(model3_state::mpc105_addr_w)
+void model3_state::mpc105_addr_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if (ACCESSING_BITS_32_63)
{
@@ -922,7 +922,7 @@ WRITE64_MEMBER(model3_state::mpc105_addr_w)
}
}
-READ64_MEMBER(model3_state::mpc105_data_r)
+uint64_t model3_state::mpc105_data_r()
{
if(m_pci_device == 0) {
return ((uint64_t)(swapendian_int32(m_mpc105_regs[(m_pci_reg/2)+1])) << 32) |
@@ -931,7 +931,7 @@ READ64_MEMBER(model3_state::mpc105_data_r)
return swapendian_int32(pci_device_get_reg());
}
-WRITE64_MEMBER(model3_state::mpc105_data_w)
+void model3_state::mpc105_data_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if(m_pci_device == 0) {
m_mpc105_regs[(m_pci_reg/2)+1] = swapendian_int32((uint32_t)(data >> 32));
@@ -944,13 +944,13 @@ WRITE64_MEMBER(model3_state::mpc105_data_w)
}
}
-READ64_MEMBER(model3_state::mpc105_reg_r)
+uint64_t model3_state::mpc105_reg_r(offs_t offset)
{
return ((uint64_t)(m_mpc105_regs[(offset*2)+0]) << 32) |
(uint64_t)(m_mpc105_regs[(offset*2)+1]);
}
-WRITE64_MEMBER(model3_state::mpc105_reg_w)
+void model3_state::mpc105_reg_w(offs_t offset, uint64_t data)
{
m_mpc105_regs[(offset*2)+0] = (uint32_t)(data >> 32);
m_mpc105_regs[(offset*2)+1] = (uint32_t)data;
@@ -975,7 +975,7 @@ void model3_state::mpc105_init()
/* Motorola MPC106 PCI Bridge/Memory Controller */
-READ64_MEMBER(model3_state::mpc106_addr_r)
+uint64_t model3_state::mpc106_addr_r(offs_t offset, uint64_t mem_mask)
{
if (ACCESSING_BITS_32_63)
{
@@ -984,7 +984,7 @@ READ64_MEMBER(model3_state::mpc106_addr_r)
return 0;
}
-WRITE64_MEMBER(model3_state::mpc106_addr_w)
+void model3_state::mpc106_addr_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if (ACCESSING_BITS_32_63)
{
@@ -1006,7 +1006,7 @@ WRITE64_MEMBER(model3_state::mpc106_addr_w)
}
}
-READ64_MEMBER(model3_state::mpc106_data_r)
+uint64_t model3_state::mpc106_data_r(offs_t offset, uint64_t mem_mask)
{
if(m_pci_device == 0) {
return ((uint64_t)(swapendian_int32(m_mpc106_regs[(m_pci_reg/2)+1])) << 32) |
@@ -1022,7 +1022,7 @@ READ64_MEMBER(model3_state::mpc106_data_r)
}
}
-WRITE64_MEMBER(model3_state::mpc106_data_w)
+void model3_state::mpc106_data_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if(m_pci_device == 0) {
m_mpc106_regs[(m_pci_reg/2)+1] = swapendian_int32((uint32_t)(data >> 32));
@@ -1035,13 +1035,13 @@ WRITE64_MEMBER(model3_state::mpc106_data_w)
}
}
-READ64_MEMBER(model3_state::mpc106_reg_r)
+uint64_t model3_state::mpc106_reg_r(offs_t offset)
{
return ((uint64_t)(m_mpc106_regs[(offset*2)+0]) << 32) |
(uint64_t)(m_mpc106_regs[(offset*2)+1]);
}
-WRITE64_MEMBER(model3_state::mpc106_reg_w)
+void model3_state::mpc106_reg_w(offs_t offset, uint64_t data)
{
m_mpc106_regs[(offset*2)+0] = (uint32_t)(data >> 32);
m_mpc106_regs[(offset*2)+1] = (uint32_t)data;
@@ -1069,7 +1069,7 @@ void model3_state::mpc106_init()
/*****************************************************************************/
-READ64_MEMBER(model3_state::scsi_r)
+uint64_t model3_state::scsi_r(offs_t offset, uint64_t mem_mask)
{
int reg = offset*8;
uint64_t r = 0;
@@ -1101,7 +1101,7 @@ READ64_MEMBER(model3_state::scsi_r)
return r;
}
-WRITE64_MEMBER(model3_state::scsi_w)
+void model3_state::scsi_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
int reg = offset*8;
if (ACCESSING_BITS_56_63) {
@@ -1146,7 +1146,7 @@ void model3_state::scsi_irq_callback(int state)
/* Real3D DMA */
-READ64_MEMBER(model3_state::real3d_dma_r)
+uint64_t model3_state::real3d_dma_r(offs_t offset, uint64_t mem_mask)
{
switch(offset)
{
@@ -1162,7 +1162,7 @@ READ64_MEMBER(model3_state::real3d_dma_r)
return 0;
}
-WRITE64_MEMBER(model3_state::real3d_dma_w)
+void model3_state::real3d_dma_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch(offset)
{
@@ -1475,7 +1475,7 @@ void model3_state::lostwsga_ser2_w(uint8_t data)
m_serial_fifo2 = data;
}
-READ64_MEMBER(model3_state::model3_sys_r)
+uint64_t model3_state::model3_sys_r(offs_t offset, uint64_t mem_mask)
{
// printf("%s model3_sys_r: mask %llx @ %x\n", machine().describe_context().c_str(), mem_mask, offset);
@@ -1510,7 +1510,7 @@ READ64_MEMBER(model3_state::model3_sys_r)
return 0;
}
-WRITE64_MEMBER(model3_state::model3_sys_w)
+void model3_state::model3_sys_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
// printf("model3_sys_w: %llx to %x mask %llx\n", data, offset, mem_mask);
@@ -1580,29 +1580,29 @@ WRITE64_MEMBER(model3_state::model3_sys_w)
}
}
-READ64_MEMBER(model3_state::model3_rtc_r)
+uint64_t model3_state::model3_rtc_r(offs_t offset, uint64_t mem_mask)
{
uint64_t r = 0;
if(ACCESSING_BITS_56_63) {
- r |= (uint64_t)rtc72421_r(space, (offset*2)+0, (uint32_t)(mem_mask >> 32)) << 32;
+ r |= (uint64_t)rtc72421_r((offset*2)+0) << 32;
}
if(ACCESSING_BITS_24_31) {
- r |= (uint64_t)rtc72421_r(space, (offset*2)+1, (uint32_t)(mem_mask));
+ r |= (uint64_t)rtc72421_r((offset*2)+1);
}
return r;
}
-WRITE64_MEMBER(model3_state::model3_rtc_w)
+void model3_state::model3_rtc_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if(ACCESSING_BITS_56_63) {
- rtc72421_w(space, (offset*2)+0, (uint32_t)(data >> 32), (uint32_t)(mem_mask >> 32));
+ rtc72421_w((offset*2)+0, (uint32_t)(data >> 32));
}
if(ACCESSING_BITS_24_31) {
- rtc72421_w(space, (offset*2)+1, (uint32_t)(data), (uint32_t)(mem_mask));
+ rtc72421_w((offset*2)+1, (uint32_t)(data));
}
}
-READ64_MEMBER(model3_state::real3d_status_r)
+uint64_t model3_state::real3d_status_r(offs_t offset)
{
m_real3d_status ^= 0xffffffffffffffffU;
if (offset == 0)
@@ -1682,7 +1682,7 @@ WRITE8_MEMBER(model3_state::model3_sound_w)
}
}
-WRITE64_MEMBER(model3_state::daytona2_rombank_w)
+void model3_state::daytona2_rombank_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if (ACCESSING_BITS_56_63)
{
@@ -5840,7 +5840,7 @@ ROM_END
/* Model 3 sound board emulation */
-WRITE16_MEMBER(model3_state::model3snd_ctrl)
+void model3_state::model3snd_ctrl(uint16_t data)
{
// handle sample banking
if (memregion("samples")->bytes() > 0x800000)
@@ -6115,13 +6115,14 @@ void model3_state::init_model3_10()
{
interleave_vroms();
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc0000000, 0xc00000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc0000000, 0xc00000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(*this, FUNC(model3_state::mpc105_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc105_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(*this, FUNC(model3_state::mpc105_data_r)), write64_delegate(*this, FUNC(model3_state::mpc105_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc105_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc105_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64s_delegate(*this, FUNC(model3_state::mpc105_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc105_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xf0c00cf8, 0xf0c00cff, read64smo_delegate(*this, FUNC(model3_state::mpc105_data_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0c00cf8, 0xf0c00cff, write64s_delegate(*this, FUNC(model3_state::mpc105_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc105_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc105_reg_w)));
}
void model3_state::init_model3_15()
@@ -6129,9 +6130,10 @@ void model3_state::init_model3_15()
interleave_vroms();
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1");
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(*this, FUNC(model3_state::mpc105_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc105_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(*this, FUNC(model3_state::mpc105_data_r)), write64_delegate(*this, FUNC(model3_state::mpc105_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc105_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc105_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64s_delegate(*this, FUNC(model3_state::mpc105_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc105_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xf0c00cf8, 0xf0c00cff, read64smo_delegate(*this, FUNC(model3_state::mpc105_data_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0c00cf8, 0xf0c00cff, write64s_delegate(*this, FUNC(model3_state::mpc105_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc105_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc105_reg_w)));
}
void model3_state::init_model3_20()
@@ -6139,11 +6141,11 @@ void model3_state::init_model3_20()
interleave_vroms();
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc2000000, 0xc20000ff, read64_delegate(*this, FUNC(model3_state::real3d_dma_r)), write64_delegate(*this, FUNC(model3_state::real3d_dma_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc2000000, 0xc20000ff, read64s_delegate(*this, FUNC(model3_state::real3d_dma_r)), write64s_delegate(*this, FUNC(model3_state::real3d_dma_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
}
void model3_state::init_lostwsga()
@@ -6151,7 +6153,7 @@ void model3_state::init_lostwsga()
uint32_t *rom = (uint32_t*)memregion("user1")->base();
init_model3_15();
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
rom[0x7374f0/4] = 0x38840004; /* This seems to be an actual bug in the original code */
}
@@ -6160,7 +6162,7 @@ void model3_state::init_scud()
{
init_model3_15();
/* TODO: network device at 0xC0000000 - FF */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
// uint32_t *rom = (uint32_t*)memregion("user1")->base();
// rom[(0x799de8^4)/4] = 0x00050208; // secret debug menu
@@ -6169,20 +6171,20 @@ void model3_state::init_scud()
void model3_state::init_scudplus()
{
init_model3_15();
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
}
void model3_state::init_scudplusa()
{
init_model3_15();
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
}
void model3_state::init_lemans24()
{
init_model3_15();
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
// rom[(0x73fe38^4)/4] = 0x38840004; /* This seems to be an actual bug in the original code */
}
@@ -6208,13 +6210,13 @@ void model3_state::init_vs215()
interleave_vroms();
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
}
void model3_state::init_vs29815()
@@ -6229,13 +6231,13 @@ void model3_state::init_vs29815()
interleave_vroms();
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
}
void model3_state::init_bass()
@@ -6245,13 +6247,13 @@ void model3_state::init_bass()
interleave_vroms();
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64_delegate(*this, FUNC(model3_state::mpc106_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64s_delegate(*this, FUNC(model3_state::mpc106_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64s_delegate(*this, FUNC(model3_state::mpc106_data_r)), write64s_delegate(*this, FUNC(model3_state::mpc106_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc106_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc106_reg_w)));
}
void model3_state::init_getbass()
@@ -6259,11 +6261,12 @@ void model3_state::init_getbass()
interleave_vroms();
m_maincpu->space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(*this, FUNC(model3_state::scsi_r)), write64_delegate(*this, FUNC(model3_state::scsi_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64s_delegate(*this, FUNC(model3_state::scsi_r)), write64s_delegate(*this, FUNC(model3_state::scsi_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(*this, FUNC(model3_state::mpc105_addr_r)), write64_delegate(*this, FUNC(model3_state::mpc105_addr_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(*this, FUNC(model3_state::mpc105_data_r)), write64_delegate(*this, FUNC(model3_state::mpc105_data_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(*this, FUNC(model3_state::mpc105_reg_r)), write64_delegate(*this, FUNC(model3_state::mpc105_reg_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64s_delegate(*this, FUNC(model3_state::mpc105_addr_r)), write64s_delegate(*this, FUNC(model3_state::mpc105_addr_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xf0c00cf8, 0xf0c00cff, read64smo_delegate(*this, FUNC(model3_state::mpc105_data_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0c00cf8, 0xf0c00cff, write64s_delegate(*this, FUNC(model3_state::mpc105_data_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64sm_delegate(*this, FUNC(model3_state::mpc105_reg_r)), write64sm_delegate(*this, FUNC(model3_state::mpc105_reg_w)));
}
void model3_state::init_vs2()
@@ -6354,7 +6357,7 @@ void model3_state::init_daytona2()
// uint32_t *rom = (uint32_t*)memregion("user1")->base();
init_model3_20();
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xc3800000, 0xc3800007, write64_delegate(*this, FUNC(model3_state::daytona2_rombank_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xc3800000, 0xc3800007, write64s_delegate(*this, FUNC(model3_state::daytona2_rombank_w)));
m_maincpu->space(AS_PROGRAM).install_read_bank(0xc3000000, 0xc37fffff, "bank2");
//rom[(0x68468c^4)/4] = 0x60000000;
@@ -6368,7 +6371,7 @@ void model3_state::init_dayto2pe()
// uint32_t *rom = (uint32_t*)memregion("user1")->base();
init_model3_20();
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xc3800000, 0xc3800007, write64_delegate(*this, FUNC(model3_state::daytona2_rombank_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xc3800000, 0xc3800007, write64s_delegate(*this, FUNC(model3_state::daytona2_rombank_w)));
m_maincpu->space(AS_PROGRAM).install_read_bank(0xc3000000, 0xc37fffff, "bank2");
// rom[(0x606784^4)/4] = 0x60000000;
diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp
index 92b7e399270..48be07987a2 100644
--- a/src/mame/drivers/moo.cpp
+++ b/src/mame/drivers/moo.cpp
@@ -130,12 +130,12 @@ Bucky:
#define MOO_DMADELAY (100)
-READ16_MEMBER(moo_state::control2_r)
+uint16_t moo_state::control2_r()
{
return m_cur_control2;
}
-WRITE16_MEMBER(moo_state::control2_w)
+void moo_state::control2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* bit 0 is data */
/* bit 1 is cs (active low) */
@@ -221,7 +221,7 @@ INTERRUPT_GEN_MEMBER(moo_state::moobl_interrupt)
device.execute().set_input_line(5, HOLD_LINE);
}
-WRITE16_MEMBER(moo_state::sound_irq_w)
+void moo_state::sound_irq_w(uint16_t data)
{
m_soundcpu->set_input_line(0, HOLD_LINE);
}
@@ -236,7 +236,7 @@ WRITE8_MEMBER(moo_state::sound_bankswitch_w)
/* the interface with the 053247 is weird. The chip can address only 0x1000 bytes */
/* of RAM, but they put 0x10000 there. The CPU can access them all. */
-READ16_MEMBER(moo_state::k053247_scattered_word_r)
+uint16_t moo_state::k053247_scattered_word_r(offs_t offset, uint16_t mem_mask)
{
if (offset & 0x0078)
return m_spriteram[offset];
@@ -247,7 +247,7 @@ READ16_MEMBER(moo_state::k053247_scattered_word_r)
}
}
-WRITE16_MEMBER(moo_state::k053247_scattered_word_w)
+void moo_state::k053247_scattered_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset & 0x0078)
COMBINE_DATA(m_spriteram + offset);
@@ -262,7 +262,7 @@ WRITE16_MEMBER(moo_state::k053247_scattered_word_w)
#endif
-WRITE16_MEMBER(moo_state::moo_prot_w)
+void moo_state::moo_prot_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint32_t src1, src2, dst, length, a, b, res;
@@ -292,7 +292,7 @@ WRITE16_MEMBER(moo_state::moo_prot_w)
}
-WRITE16_MEMBER(moo_state::moobl_oki_bank_w)
+void moo_state::moobl_oki_bank_w(uint16_t data)
{
logerror("%x to OKI bank\n", data);
diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp
index 6b109190886..78610b87ad9 100644
--- a/src/mame/drivers/mpu5.cpp
+++ b/src/mame/drivers/mpu5.cpp
@@ -144,7 +144,7 @@ Switches Aux-RS232 Aux Port Alpha Vend-Bus
#include "mpu5.lh"
-READ8_MEMBER(mpu5_state::asic_r8)
+uint8_t mpu5_state::asic_r8(offs_t offset)
{
switch (offset)
{
@@ -173,17 +173,17 @@ READ8_MEMBER(mpu5_state::asic_r8)
}
-READ32_MEMBER(mpu5_state::asic_r32)
+uint32_t mpu5_state::asic_r32(offs_t offset, uint32_t mem_mask)
{
uint32_t retdata = 0;
- if (ACCESSING_BITS_24_31) retdata |= asic_r8(space,(offset*4)+0) <<24;
- if (ACCESSING_BITS_16_23) retdata |= asic_r8(space,(offset*4)+1) <<16;
- if (ACCESSING_BITS_8_15) retdata |= asic_r8(space,(offset*4)+2) <<8;
- if (ACCESSING_BITS_0_7) retdata |= asic_r8(space,(offset*4)+3) <<0;
+ if (ACCESSING_BITS_24_31) retdata |= asic_r8((offset*4)+0) <<24;
+ if (ACCESSING_BITS_16_23) retdata |= asic_r8((offset*4)+1) <<16;
+ if (ACCESSING_BITS_8_15) retdata |= asic_r8((offset*4)+2) <<8;
+ if (ACCESSING_BITS_0_7) retdata |= asic_r8((offset*4)+3) <<0;
return retdata;
}
-READ32_MEMBER(mpu5_state::mpu5_mem_r)
+uint32_t mpu5_state::mpu5_mem_r(offs_t offset, uint32_t mem_mask)
{
int pc = m_maincpu->pc();
int addr = offset *4;
@@ -208,7 +208,7 @@ READ32_MEMBER(mpu5_state::mpu5_mem_r)
case 0xf0:
{
- return asic_r32(space, offset&3,mem_mask);
+ return asic_r32(offset&3,mem_mask);
}
default:
@@ -236,7 +236,7 @@ READ32_MEMBER(mpu5_state::mpu5_mem_r)
}
// Each board is fitted with an ASIC that does most of the heavy lifting, including sound playback.
-WRITE8_MEMBER(mpu5_state::asic_w8)
+void mpu5_state::asic_w8(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -308,23 +308,23 @@ WRITE8_MEMBER(mpu5_state::asic_w8)
}
-WRITE32_MEMBER(mpu5_state::asic_w32)
+void mpu5_state::asic_w32(offs_t offset, uint32_t data, uint32_t mem_mask)
{
- if (ACCESSING_BITS_24_31) asic_w8(space,(offset*4)+0, (data>>24)&0xff);
- if (ACCESSING_BITS_16_23) asic_w8(space,(offset*4)+1, (data>>16)&0xff);
- if (ACCESSING_BITS_8_15) asic_w8(space,(offset*4)+2, (data>>8) &0xff);
- if (ACCESSING_BITS_0_7) asic_w8(space,(offset*4)+3, (data>>0) &0xff);
+ if (ACCESSING_BITS_24_31) asic_w8((offset*4)+0, (data>>24)&0xff);
+ if (ACCESSING_BITS_16_23) asic_w8((offset*4)+1, (data>>16)&0xff);
+ if (ACCESSING_BITS_8_15) asic_w8((offset*4)+2, (data>>8) &0xff);
+ if (ACCESSING_BITS_0_7) asic_w8((offset*4)+3, (data>>0) &0xff);
}
-READ32_MEMBER(mpu5_state::pic_r)
+uint32_t mpu5_state::pic_r(offs_t offset)
{
int pc = m_maincpu->pc();
logerror("%08x maincpu read from PIC - offset %01x\n", pc, offset);
return m_pic_output_bit;
}
-WRITE32_MEMBER(mpu5_state::pic_w)
+void mpu5_state::pic_w(offs_t offset, uint32_t data)
{
switch (offset)
{
@@ -379,7 +379,7 @@ WRITE32_MEMBER(mpu5_state::pic_w)
}
-WRITE32_MEMBER(mpu5_state::mpu5_mem_w)
+void mpu5_state::mpu5_mem_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
int pc = m_maincpu->pc();
int addr = offset *4;
@@ -393,7 +393,7 @@ WRITE32_MEMBER(mpu5_state::mpu5_mem_w)
{
case 0xd0:
{
- pic_w(space, (addr& 0x0f),data,mem_mask);
+ pic_w((addr& 0x0f),data);
break;
}
case 0xe0:
@@ -404,7 +404,7 @@ WRITE32_MEMBER(mpu5_state::mpu5_mem_w)
case 0xf0:
{
- asic_w32(space, offset&3,data,mem_mask);
+ asic_w32(offset&3,data,mem_mask);
break;
}
diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp
index 3931554b1f9..7eb5182205c 100644
--- a/src/mame/drivers/ms32.cpp
+++ b/src/mame/drivers/ms32.cpp
@@ -510,7 +510,7 @@ CUSTOM_INPUT_MEMBER(ms32_state::mahjong_ctrl_r)
}
-READ32_MEMBER(ms32_state::ms32_read_inputs3)
+u32 ms32_state::ms32_read_inputs3()
{
int a,b,c,d;
a = ioport("AN2?")->read(); // unused?
@@ -521,7 +521,7 @@ READ32_MEMBER(ms32_state::ms32_read_inputs3)
}
-WRITE32_MEMBER(ms32_state::ms32_sound_w)
+void ms32_state::ms32_sound_w(u32 data)
{
m_soundlatch->write(data & 0xff);
@@ -529,12 +529,12 @@ WRITE32_MEMBER(ms32_state::ms32_sound_w)
m_maincpu->spin_until_time(attotime::from_usec(40));
}
-READ32_MEMBER(ms32_state::ms32_sound_r)
+u32 ms32_state::ms32_sound_r()
{
return m_to_main^0xff;
}
-WRITE32_MEMBER(ms32_state::reset_sub_w)
+void ms32_state::reset_sub_w(u32 data)
{
if(data) m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); // 0 too ?
}
@@ -565,71 +565,71 @@ WRITE8_MEMBER(ms32_state::ms32_priram_w8)
m_priram[offset] = data;
}
-READ16_MEMBER(ms32_state::ms32_palram_r16)
+u16 ms32_state::ms32_palram_r16(offs_t offset)
{
return m_palram[offset];
}
-WRITE16_MEMBER(ms32_state::ms32_palram_w16)
+void ms32_state::ms32_palram_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_palram[offset]);
}
-READ16_MEMBER(ms32_state::ms32_rozram_r16)
+u16 ms32_state::ms32_rozram_r16(offs_t offset)
{
return m_rozram[offset];
}
-WRITE16_MEMBER(ms32_state::ms32_rozram_w16)
+void ms32_state::ms32_rozram_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_rozram[offset]);
m_roz_tilemap->mark_tile_dirty(offset/2);
}
-READ16_MEMBER(ms32_state::ms32_lineram_r16)
+u16 ms32_state::ms32_lineram_r16(offs_t offset)
{
return m_lineram[offset];
}
-WRITE16_MEMBER(ms32_state::ms32_lineram_w16)
+void ms32_state::ms32_lineram_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_lineram[offset]);
}
-READ16_MEMBER(ms32_state::ms32_sprram_r16)
+u16 ms32_state::ms32_sprram_r16(offs_t offset)
{
return m_sprram[offset];
}
-WRITE16_MEMBER(ms32_state::ms32_sprram_w16)
+void ms32_state::ms32_sprram_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_sprram[offset]);
}
-READ16_MEMBER(ms32_state::ms32_txram_r16)
+u16 ms32_state::ms32_txram_r16(offs_t offset)
{
return m_txram[offset];
}
-WRITE16_MEMBER(ms32_state::ms32_txram_w16)
+void ms32_state::ms32_txram_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_txram[offset]);
m_tx_tilemap->mark_tile_dirty(offset/2);
}
-READ16_MEMBER(ms32_state::ms32_bgram_r16)
+u16 ms32_state::ms32_bgram_r16(offs_t offset)
{
return m_bgram[offset];
}
-WRITE16_MEMBER(ms32_state::ms32_bgram_w16)
+void ms32_state::ms32_bgram_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_bgram[offset]);
m_bg_tilemap->mark_tile_dirty(offset/2);
m_bg_tilemap_alt->mark_tile_dirty(offset/2);
}
-WRITE32_MEMBER(ms32_state::pip_w)
+void ms32_state::pip_w(u32 data)
{
m_tilemaplayoutcontrol = data;
@@ -637,7 +637,7 @@ WRITE32_MEMBER(ms32_state::pip_w)
popmessage("fce00a7c = %02x",data);
}
-WRITE32_MEMBER(ms32_state::coin_counter_w)
+void ms32_state::coin_counter_w(u32 data)
{
// desertwr/p47aces sets 4 here
// f1superb sets 2
@@ -690,23 +690,23 @@ void ms32_state::ms32_map(address_map &map)
/* F1 Super Battle has an extra linemap for the road, and am unknown maths chip (mcu?) handling perspective calculations for the road / corners etc. */
/* it should use its own memory map */
-WRITE16_MEMBER(ms32_state::ms32_extra_w16)
+void ms32_state::ms32_extra_w16(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_f1superb_extraram[offset]);
m_extra_tilemap->mark_tile_dirty(offset/2);
}
-READ16_MEMBER(ms32_state::ms32_extra_r16)
+u16 ms32_state::ms32_extra_r16(offs_t offset)
{
return m_f1superb_extraram[offset];
}
-WRITE32_MEMBER(ms32_state::ms32_irq2_guess_w)
+void ms32_state::ms32_irq2_guess_w(u32 data)
{
irq_raise(2);
}
-WRITE32_MEMBER(ms32_state::ms32_irq5_guess_w)
+void ms32_state::ms32_irq5_guess_w(u32 data)
{
irq_raise(5);
}
diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp
index 8e4b03d8ea0..ea55eb7a8dc 100644
--- a/src/mame/drivers/mugsmash.cpp
+++ b/src/mame/drivers/mugsmash.cpp
@@ -52,7 +52,7 @@ behavior we use .
#include "speaker.h"
-WRITE16_MEMBER(mugsmash_state::mugsmash_reg2_w)
+void mugsmash_state::mugsmash_reg2_w(offs_t offset, uint16_t data)
{
m_regs2[offset] = data;
//popmessage ("Regs2 %04x, %04x, %04x, %04x", m_regs2[0], m_regs2[1], m_regs2[2], m_regs2[3]);
@@ -151,7 +151,7 @@ WRITE16_MEMBER(mugsmash_state::mugsmash_reg2_w)
#define USE_FAKE_INPUT_PORTS 0
#if USE_FAKE_INPUT_PORTS
-READ16_MEMBER(mugsmash_state::mugsmash_input_ports_r)
+uint16_t mugsmash_state::mugsmash_input_ports_r(offs_t offset)
{
uint16_t data = 0xffff;
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index 5bed1b52102..8e2f2a44f45 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -146,7 +146,7 @@ we have no way of knowing which is the later/corrected version.
-READ16_MEMBER(mystwarr_state::eeprom_r)
+uint16_t mystwarr_state::eeprom_r(offs_t offset, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -158,7 +158,7 @@ READ16_MEMBER(mystwarr_state::eeprom_r)
return 0;
}
-WRITE16_MEMBER(mystwarr_state::mweeprom_w)
+void mystwarr_state::mweeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -169,7 +169,7 @@ WRITE16_MEMBER(mystwarr_state::mweeprom_w)
}
-READ16_MEMBER(mystwarr_state::dddeeprom_r)
+uint16_t mystwarr_state::dddeeprom_r(offs_t offset, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -179,7 +179,7 @@ READ16_MEMBER(mystwarr_state::dddeeprom_r)
return ioport("P2")->read();
}
-WRITE16_MEMBER(mystwarr_state::mmeeprom_w)
+void mystwarr_state::mmeeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -244,12 +244,12 @@ INTERRUPT_GEN_MEMBER(mystwarr_state::ddd_interrupt)
/**********************************************************************************/
-WRITE16_MEMBER(mystwarr_state::sound_irq_w)
+void mystwarr_state::sound_irq_w(uint16_t data)
{
m_soundcpu->set_input_line(0, HOLD_LINE);
}
-WRITE16_MEMBER(mystwarr_state::irq_ack_w)
+void mystwarr_state::irq_ack_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_k056832->b_word_w(offset, data, mem_mask);
@@ -264,7 +264,7 @@ WRITE16_MEMBER(mystwarr_state::irq_ack_w)
/* the interface with the 053247 is weird. The chip can address only 0x1000 bytes */
/* of RAM, but they put 0x10000 there. The CPU can access them all. */
-READ16_MEMBER(mystwarr_state::k053247_scattered_word_r)
+uint16_t mystwarr_state::k053247_scattered_word_r(offs_t offset)
{
if (offset & 0x0078)
return m_spriteram[offset];
@@ -275,7 +275,7 @@ READ16_MEMBER(mystwarr_state::k053247_scattered_word_r)
}
}
-WRITE16_MEMBER(mystwarr_state::k053247_scattered_word_w)
+void mystwarr_state::k053247_scattered_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset & 0x0078)
{
@@ -385,7 +385,7 @@ void mystwarr_state::viostorm_map(address_map &map)
}
// Martial Champion specific interfaces
-READ16_MEMBER(mystwarr_state::k053247_martchmp_word_r)
+uint16_t mystwarr_state::k053247_martchmp_word_r(offs_t offset)
{
if (offset & 0x0018)
return m_spriteram[offset];
@@ -396,7 +396,7 @@ READ16_MEMBER(mystwarr_state::k053247_martchmp_word_r)
}
}
-WRITE16_MEMBER(mystwarr_state::k053247_martchmp_word_w)
+void mystwarr_state::k053247_martchmp_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset & 0x0018)
{
@@ -410,13 +410,13 @@ WRITE16_MEMBER(mystwarr_state::k053247_martchmp_word_w)
}
}
-READ16_MEMBER(mystwarr_state::mccontrol_r)
+uint16_t mystwarr_state::mccontrol_r()
{
// unknown, buggy watchdog reset code ?
return 0;
}
-WRITE16_MEMBER(mystwarr_state::mccontrol_w)
+void mystwarr_state::mccontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -429,7 +429,7 @@ WRITE16_MEMBER(mystwarr_state::mccontrol_w)
// else logerror("write %x to LSB of mccontrol\n", data);
}
-WRITE16_MEMBER(mystwarr_state::mceeprom_w)
+void mystwarr_state::mceeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp
index 3305d45640c..ee255c84cc4 100644
--- a/src/mame/drivers/puckpkmn.cpp
+++ b/src/mame/drivers/puckpkmn.cpp
@@ -259,12 +259,12 @@ void md_boot_state::jzth_map(address_map &map)
map(0x710000, 0x710001).rw(FUNC(md_boot_state::bl_710000_r), FUNC(md_boot_state::bl_710000_w)); // protection, will erase the VDP address causing writes to 0 unless this returns 0xe
}
-READ16_MEMBER(md_boot_state::puckpkmna_70001c_r)
+uint16_t md_boot_state::puckpkmna_70001c_r()
{
return 0x0e;
}
-READ16_MEMBER(md_boot_state::puckpkmna_4b2476_r)
+uint16_t md_boot_state::puckpkmna_4b2476_r()
{
if (!strcmp(machine().system().name, "puckpkmnb")) return 0x3100;
diff --git a/src/mame/etc/jrcrypt.cpp b/src/mame/etc/jrcrypt.cpp
index 0a40a84e6fc..0ca833ea0a7 100644
--- a/src/mame/etc/jrcrypt.cpp
+++ b/src/mame/etc/jrcrypt.cpp
@@ -2,7 +2,7 @@
// copyright-holders:David Caldwell
/***************************************************************************
- jrcrypt.c
+ jrcrypt.cpp
This file is not part of MAME. It is here to provide detailed
documentation of the encryption used by Jr. Pac Man ROMs.
@@ -400,7 +400,7 @@ void write_rom_section(char *prefix,char *suffix,int start,int end)
}
#endif
-WRITE8_HANDLER( jrpacman_interrupt_mask_w )
+void jrpacman_interrupt_mask_w(uint8_t data)
{
irq_mask = data;
}
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index 9e1d4e897b3..c0a1f5230af 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -70,12 +70,12 @@ private:
IRQ_CALLBACK_MEMBER(jack_sh_irq_ack);
void joinem_control_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(joinem_scroll_w);
- DECLARE_READ8_MEMBER(striv_question_r);
- DECLARE_WRITE8_MEMBER(jack_videoram_w);
- DECLARE_WRITE8_MEMBER(jack_colorram_w);
- DECLARE_READ8_MEMBER(jack_flipscreen_r);
- DECLARE_WRITE8_MEMBER(jack_flipscreen_w);
+ void joinem_scroll_w(offs_t offset, uint8_t data);
+ uint8_t striv_question_r(offs_t offset);
+ void jack_videoram_w(offs_t offset, uint8_t data);
+ void jack_colorram_w(offs_t offset, uint8_t data);
+ uint8_t jack_flipscreen_r(offs_t offset);
+ void jack_flipscreen_w(offs_t offset, uint8_t data);
uint8_t timer_r();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h
index ea420998744..56818414488 100644
--- a/src/mame/includes/jackal.h
+++ b/src/mame/includes/jackal.h
@@ -49,15 +49,15 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- DECLARE_READ8_MEMBER(jackalr_rotary_r);
- DECLARE_WRITE8_MEMBER(jackal_flipscreen_w);
- DECLARE_READ8_MEMBER(jackal_zram_r);
- DECLARE_READ8_MEMBER(jackal_voram_r);
- DECLARE_READ8_MEMBER(jackal_spriteram_r);
- DECLARE_WRITE8_MEMBER(jackal_rambank_w);
- DECLARE_WRITE8_MEMBER(jackal_zram_w);
- DECLARE_WRITE8_MEMBER(jackal_voram_w);
- DECLARE_WRITE8_MEMBER(jackal_spriteram_w);
+ uint8_t jackalr_rotary_r(offs_t offset);
+ void jackal_flipscreen_w(uint8_t data);
+ uint8_t jackal_zram_r(offs_t offset);
+ uint8_t jackal_voram_r(offs_t offset);
+ uint8_t jackal_spriteram_r(offs_t offset);
+ void jackal_rambank_w(uint8_t data);
+ void jackal_zram_w(offs_t offset, uint8_t data);
+ void jackal_voram_w(offs_t offset, uint8_t data);
+ void jackal_spriteram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 87a77371ddb..bb9738dcb5c 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -192,73 +192,73 @@ private:
static void (jaguar_state::*const bitmap16[8])(uint16_t *, int32_t, int32_t, uint32_t *, int32_t);
static void (jaguar_state::*const bitmap32[8])(uint16_t *, int32_t, int32_t, uint32_t *, int32_t);
- DECLARE_WRITE32_MEMBER(eeprom_w);
- DECLARE_READ32_MEMBER(eeprom_clk);
- DECLARE_READ32_MEMBER(eeprom_cs);
- DECLARE_READ32_MEMBER(misc_control_r);
- DECLARE_WRITE32_MEMBER(misc_control_w);
- DECLARE_READ32_MEMBER(gpuctrl_r);
- DECLARE_WRITE32_MEMBER(gpuctrl_w);
- DECLARE_READ32_MEMBER(dspctrl_r);
- DECLARE_WRITE32_MEMBER(dspctrl_w);
- DECLARE_READ32_MEMBER(joystick_r);
- DECLARE_WRITE32_MEMBER(joystick_w);
- DECLARE_WRITE32_MEMBER(latch_w);
- DECLARE_READ32_MEMBER(eeprom_data_r);
- DECLARE_WRITE32_MEMBER(eeprom_enable_w);
- DECLARE_WRITE32_MEMBER(eeprom_data_w);
- DECLARE_WRITE32_MEMBER(gpu_jump_w);
- DECLARE_READ32_MEMBER(gpu_jump_r);
- DECLARE_READ32_MEMBER(cojagr3k_main_speedup_r);
- DECLARE_READ32_MEMBER(main_gpu_wait_r);
- DECLARE_WRITE32_MEMBER(area51_main_speedup_w);
- DECLARE_WRITE32_MEMBER(area51mx_main_speedup_w);
- DECLARE_READ16_MEMBER(gpuctrl_r16);
- DECLARE_WRITE16_MEMBER(gpuctrl_w16);
- DECLARE_READ16_MEMBER(blitter_r16);
- DECLARE_WRITE16_MEMBER(blitter_w16);
- DECLARE_READ16_MEMBER(serial_r16);
- DECLARE_WRITE16_MEMBER(serial_w16);
- DECLARE_READ16_MEMBER(dspctrl_r16);
- DECLARE_WRITE16_MEMBER(dspctrl_w16);
- DECLARE_READ16_MEMBER(eeprom_cs16);
- DECLARE_READ16_MEMBER(eeprom_clk16);
- DECLARE_WRITE16_MEMBER(eeprom_w16);
- DECLARE_READ16_MEMBER(joystick_r16);
- DECLARE_WRITE16_MEMBER(joystick_w16);
- DECLARE_READ32_MEMBER(shared_ram_r);
- DECLARE_WRITE32_MEMBER(shared_ram_w);
- DECLARE_READ32_MEMBER(rom_base_r);
- DECLARE_READ32_MEMBER(wave_rom_r);
- DECLARE_READ32_MEMBER(dsp_ram_r);
- DECLARE_WRITE32_MEMBER(dsp_ram_w);
- DECLARE_READ32_MEMBER(gpu_clut_r);
- DECLARE_WRITE32_MEMBER(gpu_clut_w);
- DECLARE_READ32_MEMBER(gpu_ram_r);
- DECLARE_WRITE32_MEMBER(gpu_ram_w);
- DECLARE_READ16_MEMBER(shared_ram_r16);
- DECLARE_WRITE16_MEMBER(shared_ram_w16);
- DECLARE_READ16_MEMBER(cart_base_r16);
- DECLARE_READ16_MEMBER(dsp_ram_r16);
- DECLARE_WRITE16_MEMBER(dsp_ram_w16);
- DECLARE_READ16_MEMBER(gpu_clut_r16);
- DECLARE_WRITE16_MEMBER(gpu_clut_w16);
- DECLARE_READ16_MEMBER(gpu_ram_r16);
- DECLARE_WRITE16_MEMBER(gpu_ram_w16);
+ void eeprom_w(uint32_t data);
+ uint32_t eeprom_clk();
+ uint32_t eeprom_cs();
+ uint32_t misc_control_r();
+ void misc_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpuctrl_r(offs_t offset, uint32_t mem_mask = ~0);
+ void gpuctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t dspctrl_r(offs_t offset, uint32_t mem_mask = ~0);
+ void dspctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t joystick_r();
+ void joystick_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void latch_w(uint32_t data);
+ uint32_t eeprom_data_r(offs_t offset);
+ void eeprom_enable_w(uint32_t data);
+ void eeprom_data_w(offs_t offset, uint32_t data);
+ void gpu_jump_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpu_jump_r();
+ uint32_t cojagr3k_main_speedup_r();
+ uint32_t main_gpu_wait_r();
+ void area51_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void area51mx_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t gpuctrl_r16(offs_t offset, uint16_t mem_mask = ~0);
+ void gpuctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t blitter_r16(offs_t offset, uint16_t mem_mask = ~0);
+ void blitter_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t serial_r16(offs_t offset);
+ void serial_w16(offs_t offset, uint16_t data);
+ uint16_t dspctrl_r16(offs_t offset, uint16_t mem_mask = ~0);
+ void dspctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t eeprom_cs16(offs_t offset);
+ uint16_t eeprom_clk16(offs_t offset);
+ void eeprom_w16(offs_t offset, uint16_t data);
+ uint16_t joystick_r16(offs_t offset);
+ void joystick_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t shared_ram_r(offs_t offset);
+ void shared_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t rom_base_r(offs_t offset);
+ uint32_t wave_rom_r(offs_t offset);
+ uint32_t dsp_ram_r(offs_t offset);
+ void dsp_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpu_clut_r(offs_t offset);
+ void gpu_clut_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpu_ram_r(offs_t offset);
+ void gpu_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t shared_ram_r16(offs_t offset);
+ void shared_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cart_base_r16(offs_t offset);
+ uint16_t dsp_ram_r16(offs_t offset);
+ void dsp_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t gpu_clut_r16(offs_t offset);
+ void gpu_clut_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t gpu_ram_r16(offs_t offset);
+ void gpu_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
// from audio/jaguar.cpp
- DECLARE_READ16_MEMBER( jerry_regs_r );
- DECLARE_WRITE16_MEMBER( jerry_regs_w );
- DECLARE_READ32_MEMBER( serial_r );
- DECLARE_WRITE32_MEMBER( serial_w );
+ uint16_t jerry_regs_r(offs_t offset);
+ void jerry_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t serial_r(offs_t offset);
+ void serial_w(offs_t offset, uint32_t data);
void serial_update();
// from video/jaguar.cpp
- DECLARE_READ32_MEMBER( blitter_r );
- DECLARE_WRITE32_MEMBER( blitter_w );
- DECLARE_READ16_MEMBER( tom_regs_r );
- DECLARE_WRITE16_MEMBER( tom_regs_w );
- DECLARE_READ32_MEMBER( cojag_gun_input_r );
+ uint32_t blitter_r(offs_t offset, uint32_t mem_mask = ~0);
+ void blitter_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t tom_regs_r(offs_t offset);
+ void tom_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t cojag_gun_input_r(offs_t offset);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void jagpal_ycc(palette_device &palette) const;
@@ -298,11 +298,11 @@ private:
void cojag_common_init(uint16_t gpu_jump_offs, uint16_t spin_pc);
void init_freeze_common(offs_t main_speedup_addr);
- // from audio/jaguar.c
+ // from audio/jaguar.cpp
void update_gpu_irq();
- DECLARE_WRITE32_MEMBER( dsp_flags_w );
+ void dsp_flags_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- // from video/jaguar.c
+ // from video/jaguar.cpp
void get_crosshair_xy(int player, int &x, int &y);
int effective_hvalue(int value);
bool adjust_object_timer(int vc);
@@ -313,7 +313,7 @@ private:
void scanline_update(int param);
void set_palette(uint16_t vmode);
- /* from jagobj.c */
+ /* from jagobj.cpp */
void jagobj_init();
uint32_t *process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit);
uint32_t *process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit);
@@ -356,7 +356,7 @@ private:
void bitmap_32_6(uint16_t *scanline, int32_t firstpix, int32_t iwidth, uint32_t *src, int32_t xpos);
void bitmap_32_7(uint16_t *scanline, int32_t firstpix, int32_t iwidth, uint32_t *src, int32_t xpos);
- /* from jagblit.c */
+ /* from jagblit.cpp */
void generic_blitter(uint32_t command, uint32_t a1flags, uint32_t a2flags);
void blitter_09800001_010020_010020(uint32_t command, uint32_t a1flags, uint32_t a2flags);
void blitter_09800009_000020_000020(uint32_t command, uint32_t a1flags, uint32_t a2flags);
@@ -391,12 +391,12 @@ protected:
virtual void machine_reset() override;
private:
- DECLARE_READ16_MEMBER(butch_regs_r16);
- DECLARE_WRITE16_MEMBER(butch_regs_w16);
- DECLARE_READ32_MEMBER(butch_regs_r);
- DECLARE_WRITE32_MEMBER(butch_regs_w);
+ uint16_t butch_regs_r16(offs_t offset);
+ void butch_regs_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t butch_regs_r(offs_t offset);
+ void butch_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_READ32_MEMBER(cd_bios_r);
+ uint32_t cd_bios_r(offs_t offset);
void jaguarcd_map(address_map &map);
void jagcd_gpu_dsp_map(address_map &map);
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 1ed00e95e2b..b7a3aff3226 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -55,12 +55,12 @@ private:
/* misc */
uint8_t m_irq_enable;
uint8_t m_nmi_enable;
- DECLARE_WRITE8_MEMBER(ctrl_w);
- DECLARE_WRITE8_MEMBER(coin_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(colorram_w);
- DECLARE_READ8_MEMBER(speech_r);
- DECLARE_WRITE8_MEMBER(speech_w);
+ void ctrl_w(uint8_t data);
+ void coin_w(uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
+ void colorram_w(offs_t offset, uint8_t data);
+ uint8_t speech_r();
+ void speech_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h
index 269918dda19..a632d829b35 100644
--- a/src/mame/includes/jedi.h
+++ b/src/mame/includes/jedi.h
@@ -67,8 +67,8 @@ private:
void rom_banksel_w(u8 data);
DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w);
- DECLARE_READ8_MEMBER(novram_data_r);
- DECLARE_WRITE8_MEMBER(novram_data_w);
+ u8 novram_data_r(address_space &space, offs_t offset);
+ void novram_data_w(offs_t offset, u8 data);
void novram_recall_w(offs_t offset, u8 data);
void novram_store_w(u8 data);
void vscroll_w(offs_t offset, u8 data);
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 5f37d58f48b..c11aaab8c24 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -81,26 +81,26 @@ public:
private:
template <unsigned N> DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); }
- DECLARE_READ16_MEMBER(duart_1_r);
- DECLARE_WRITE16_MEMBER(duart_1_w);
- DECLARE_READ16_MEMBER(duart_2_r);
- DECLARE_WRITE16_MEMBER(duart_2_w);
- DECLARE_READ16_MEMBER(inputs1_r);
- DECLARE_READ16_MEMBER(unk_r);
- DECLARE_WRITE16_MEMBER(unk_w);
- DECLARE_READ16_MEMBER(jpmio_r);
- DECLARE_WRITE16_MEMBER(jpmio_w);
- DECLARE_READ16_MEMBER(inputs1awp_r);
- DECLARE_READ16_MEMBER(optos_r);
- DECLARE_READ16_MEMBER(prot_1_r);
- DECLARE_READ16_MEMBER(prot_0_r);
- DECLARE_WRITE16_MEMBER(jpmioawp_w);
- DECLARE_READ16_MEMBER(ump_r);
- DECLARE_WRITE16_MEMBER(jpmimpct_bt477_w);
- DECLARE_READ16_MEMBER(jpmimpct_bt477_r);
- DECLARE_WRITE16_MEMBER(volume_w);
- DECLARE_WRITE16_MEMBER(upd7759_w);
- DECLARE_READ16_MEMBER(upd7759_r);
+ uint16_t duart_1_r(offs_t offset);
+ void duart_1_w(offs_t offset, uint16_t data);
+ uint16_t duart_2_r(offs_t offset);
+ void duart_2_w(uint16_t data);
+ uint16_t inputs1_r(offs_t offset);
+ uint16_t unk_r();
+ void unk_w(uint16_t data);
+ uint16_t jpmio_r();
+ void jpmio_w(offs_t offset, uint16_t data);
+ uint16_t inputs1awp_r(offs_t offset);
+ uint16_t optos_r();
+ uint16_t prot_1_r();
+ uint16_t prot_0_r();
+ void jpmioawp_w(offs_t offset, uint16_t data);
+ uint16_t ump_r();
+ void jpmimpct_bt477_w(offs_t offset, uint16_t data);
+ uint16_t jpmimpct_bt477_r(offs_t offset);
+ void volume_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void upd7759_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t upd7759_r(offs_t offset, uint16_t mem_mask = ~0);
uint8_t hopper_b_r();
uint8_t hopper_c_r();
void payen_a_w(uint8_t data);
diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h
index 39cde833a19..468ca9c9a8f 100644
--- a/src/mame/includes/jpmsys5.h
+++ b/src/mame/includes/jpmsys5.h
@@ -53,8 +53,8 @@ protected:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_WRITE16_MEMBER(jpm_upd7759_w);
- DECLARE_READ16_MEMBER(jpm_upd7759_r);
+ void jpm_upd7759_w(offs_t offset, uint16_t data);
+ uint16_t jpm_upd7759_r();
required_device<cpu_device> m_maincpu;
required_device_array<acia6850_device, 3> m_acia6850;
@@ -64,14 +64,14 @@ protected:
void jpm_sys5_common_map(address_map &map);
private:
- DECLARE_READ16_MEMBER(coins_r);
- DECLARE_WRITE16_MEMBER(coins_w);
- DECLARE_READ16_MEMBER(unk_r);
- DECLARE_WRITE16_MEMBER(mux_w);
- DECLARE_READ16_MEMBER(mux_r);
-
- DECLARE_READ16_MEMBER(mux_awp_r);
- DECLARE_READ16_MEMBER(coins_awp_r);
+ uint16_t coins_r(offs_t offset);
+ void coins_w(uint16_t data);
+ uint16_t unk_r();
+ void mux_w(offs_t offset, uint16_t data);
+ uint16_t mux_r(offs_t offset);
+
+ uint16_t mux_awp_r(offs_t offset);
+ uint16_t coins_awp_r(offs_t offset);
void sys5_draw_lamps();
void m68000_awp_map(address_map &map);
@@ -113,10 +113,10 @@ private:
virtual void machine_reset() override;
DECLARE_WRITE_LINE_MEMBER(generate_tms34061_interrupt);
- DECLARE_WRITE16_MEMBER(sys5_tms34061_w);
- DECLARE_READ16_MEMBER(sys5_tms34061_r);
- DECLARE_WRITE16_MEMBER(ramdac_w);
- DECLARE_WRITE16_MEMBER(rombank_w);
+ void sys5_tms34061_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t sys5_tms34061_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ramdac_w(offs_t offset, uint16_t data);
+ void rombank_w(uint16_t data);
uint32_t screen_update_jpmsys5v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(touch_cb);
diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h
index a12cba2bae7..5b69ec18baf 100644
--- a/src/mame/includes/kangaroo.h
+++ b/src/mame/includes/kangaroo.h
@@ -26,12 +26,12 @@ public:
std::unique_ptr<uint32_t[]> m_videoram;
/* misc */
- uint8_t m_mcu_clock;
- DECLARE_READ8_MEMBER(mcu_sim_r);
- DECLARE_WRITE8_MEMBER(mcu_sim_w);
- DECLARE_WRITE8_MEMBER(kangaroo_coin_counter_w);
- DECLARE_WRITE8_MEMBER(kangaroo_videoram_w);
- DECLARE_WRITE8_MEMBER(kangaroo_video_control_w);
+ uint8_t m_mcu_clock;
+ uint8_t mcu_sim_r();
+ void mcu_sim_w(uint8_t data);
+ void kangaroo_coin_counter_w(uint8_t data);
+ void kangaroo_videoram_w(offs_t offset, uint8_t data);
+ void kangaroo_video_control_w(offs_t offset, uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index de097954c3e..f2d14ba5f63 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -64,11 +64,11 @@ public:
u16 mcusim_r();
void mcusim_w(u16 data);
- DECLARE_WRITE16_MEMBER(mcusim_ack_w);
- DECLARE_WRITE16_MEMBER(mcusim_reset_w);
- DECLARE_WRITE16_MEMBER(vint_ack_w);
- DECLARE_WRITE16_MEMBER(videoram_w);
- void playfield_w(offs_t offset, u16 data, u16 mem_mask);
+ void mcusim_ack_w(u16 data);
+ void mcusim_reset_w(u16 data);
+ void vint_ack_w(u16 data);
+ void videoram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void playfield_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void init_wndrplnt();
void init_karnov();
void init_karnovj();
diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h
index 28ef1759183..8b6ce15c308 100644
--- a/src/mame/includes/kaypro.h
+++ b/src/mame/includes/kaypro.h
@@ -42,21 +42,21 @@ public:
{}
DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
- DECLARE_READ8_MEMBER(kaypro484_87_r);
- DECLARE_READ8_MEMBER(kaypro484_system_port_r);
- DECLARE_READ8_MEMBER(kaypro484_status_r);
- DECLARE_READ8_MEMBER(kaypro484_videoram_r);
- DECLARE_WRITE8_MEMBER(kaypro484_system_port_w);
- DECLARE_WRITE8_MEMBER(kaypro484_index_w);
- DECLARE_WRITE8_MEMBER(kaypro484_register_w);
- DECLARE_WRITE8_MEMBER(kaypro484_videoram_w);
+ uint8_t kaypro484_87_r();
+ uint8_t kaypro484_system_port_r();
+ uint8_t kaypro484_status_r();
+ uint8_t kaypro484_videoram_r();
+ void kaypro484_system_port_w(uint8_t data);
+ void kaypro484_index_w(uint8_t data);
+ void kaypro484_register_w(uint8_t data);
+ void kaypro484_videoram_w(uint8_t data);
uint8_t pio_system_r();
void kayproii_pio_system_w(uint8_t data);
void kayproiv_pio_system_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
- DECLARE_READ8_MEMBER(kaypro_videoram_r);
- DECLARE_WRITE8_MEMBER(kaypro_videoram_w);
+ uint8_t kaypro_videoram_r(offs_t offset);
+ void kaypro_videoram_w(offs_t offset, uint8_t data);
DECLARE_MACHINE_START(kayproii);
DECLARE_MACHINE_RESET(kaypro);
DECLARE_VIDEO_START(kaypro);
diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h
index ae515f41a05..00be5ef8e80 100644
--- a/src/mame/includes/kc.h
+++ b/src/mame/includes/kc.h
@@ -79,23 +79,23 @@ public:
required_device<screen_device> m_screen;
required_device_array<kcexp_slot_device, 3> m_expansions;
- // defined in machine/kc.c
+ // defined in machine/kc.cpp
virtual void machine_start() override;
virtual void machine_reset() override;
// modules read/write
- DECLARE_READ8_MEMBER ( expansion_read );
- DECLARE_WRITE8_MEMBER( expansion_write );
- DECLARE_READ8_MEMBER ( expansion_4000_r );
- DECLARE_WRITE8_MEMBER( expansion_4000_w );
- DECLARE_READ8_MEMBER ( expansion_8000_r );
- DECLARE_WRITE8_MEMBER( expansion_8000_w );
- DECLARE_READ8_MEMBER ( expansion_c000_r );
- DECLARE_WRITE8_MEMBER( expansion_c000_w );
- DECLARE_READ8_MEMBER ( expansion_e000_r );
- DECLARE_WRITE8_MEMBER( expansion_e000_w );
- DECLARE_READ8_MEMBER ( expansion_io_read );
- DECLARE_WRITE8_MEMBER( expansion_io_write );
+ uint8_t expansion_read(offs_t offset);
+ void expansion_write(offs_t offset, uint8_t data);
+ uint8_t expansion_4000_r(offs_t offset);
+ void expansion_4000_w(offs_t offset, uint8_t data);
+ uint8_t expansion_8000_r(offs_t offset);
+ void expansion_8000_w(offs_t offset, uint8_t data);
+ uint8_t expansion_c000_r(offs_t offset);
+ void expansion_c000_w(offs_t offset, uint8_t data);
+ uint8_t expansion_e000_r(offs_t offset);
+ void expansion_e000_w(offs_t offset, uint8_t data);
+ uint8_t expansion_io_read(offs_t offset);
+ void expansion_io_write(offs_t offset, uint8_t data);
// bankswitch
virtual void update_0x00000();
@@ -126,7 +126,7 @@ public:
// speaker
void speaker_update();
- // defined in video/kc.c
+ // defined in video/kc.cpp
virtual void video_start() override;
virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER( video_toggle_blink_state );
@@ -171,19 +171,19 @@ public:
: kc_state(mconfig, type, tag)
{ }
- // defined in machine/kc.c
+ // defined in machine/kc.cpp
virtual void machine_reset() override;
virtual void update_0x04000() override;
virtual void update_0x08000() override;
virtual void update_0x0c000() override;
- DECLARE_READ8_MEMBER( kc85_4_86_r );
- DECLARE_READ8_MEMBER( kc85_4_84_r );
- DECLARE_WRITE8_MEMBER( kc85_4_86_w );
- DECLARE_WRITE8_MEMBER( kc85_4_84_w );
+ uint8_t kc85_4_86_r();
+ uint8_t kc85_4_84_r();
+ void kc85_4_86_w(uint8_t data);
+ void kc85_4_84_w(uint8_t data);
- // defined in video/kc.c
+ // defined in video/kc.cpp
virtual void video_start() override;
virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) override;
void video_control_w(int data);
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index d8d7982ef65..77ba4fd4418 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -73,11 +73,10 @@ private:
DECLARE_WRITE_LINE_MEMBER(nmi_enable_w);
DECLARE_WRITE_LINE_MEMBER(sound_reset_w);
- DECLARE_WRITE8_MEMBER(sound_msm_w);
- DECLARE_READ8_MEMBER(sound_reset_r);
- DECLARE_WRITE8_MEMBER(kc_sound_control_w);
- DECLARE_WRITE8_MEMBER(kchamp_videoram_w);
- DECLARE_WRITE8_MEMBER(kchamp_colorram_w);
+ uint8_t sound_reset_r();
+ void kc_sound_control_w(offs_t offset, uint8_t data);
+ void kchamp_videoram_w(offs_t offset, uint8_t data);
+ void kchamp_colorram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
void sound_control_w(u8 data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index b5b3cb6373a..3a2985d8698 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -48,17 +48,17 @@ protected:
virtual void machine_reset() override;
private:
- DECLARE_WRITE16_MEMBER(fgram_w);
- DECLARE_WRITE16_MEMBER(bgram_w);
- DECLARE_WRITE16_MEMBER(bg2ram_w);
- DECLARE_WRITE16_MEMBER(actionhw_snd_w);
-
- void soundio_port_a_w(uint8_t data);
- uint8_t soundio_port_b_r();
- void soundio_port_b_w(uint8_t data);
- uint8_t soundio_port_c_r();
- void soundio_port_c_w(uint8_t data);
- DECLARE_WRITE16_MEMBER(to_pic_w);
+ void fgram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void bgram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void bg2ram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void actionhw_snd_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+
+ void soundio_port_a_w(u8 data);
+ u8 soundio_port_b_r();
+ void soundio_port_b_w(u8 data);
+ u8 soundio_port_c_r();
+ void soundio_port_c_w(u8 data);
+ void to_pic_w(u16 data);
TILE_GET_INFO_MEMBER(get_kickgoal_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/kikikai.h b/src/mame/includes/kikikai.h
index 8f3e1deab06..cdbabb19dc7 100644
--- a/src/mame/includes/kikikai.h
+++ b/src/mame/includes/kikikai.h
@@ -59,11 +59,11 @@ private:
//u8 m_queue[64];
//int m_qfront;
//int m_qstate;
- DECLARE_WRITE8_MEMBER(kicknrun_sub_output_w);
- virtual DECLARE_WRITE8_MEMBER(main_f008_w);
+ void kicknrun_sub_output_w(uint8_t data);
+ virtual void main_f008_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(main_bankswitch_w);
- DECLARE_READ8_MEMBER(kiki_ym2203_r);
+ void main_bankswitch_w(uint8_t data);
+ uint8_t kiki_ym2203_r(offs_t offset);
virtual INTERRUPT_GEN_MEMBER(kikikai_interrupt);
@@ -86,22 +86,22 @@ private:
uint8_t m_port3_out;
uint8_t m_port4_out;
- DECLARE_READ8_MEMBER(kikikai_mcu_ddr1_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_ddr1_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_ddr2_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_ddr2_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_ddr3_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_ddr3_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_ddr4_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_ddr4_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_port1_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_port1_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_port2_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_port2_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_port3_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_port3_w);
- DECLARE_READ8_MEMBER(kikikai_mcu_port4_r);
- DECLARE_WRITE8_MEMBER(kikikai_mcu_port4_w);
+ uint8_t kikikai_mcu_ddr1_r();
+ void kikikai_mcu_ddr1_w(uint8_t data);
+ uint8_t kikikai_mcu_ddr2_r();
+ void kikikai_mcu_ddr2_w(uint8_t data);
+ uint8_t kikikai_mcu_ddr3_r();
+ void kikikai_mcu_ddr3_w(uint8_t data);
+ uint8_t kikikai_mcu_ddr4_r();
+ void kikikai_mcu_ddr4_w(uint8_t data);
+ uint8_t kikikai_mcu_port1_r();
+ void kikikai_mcu_port1_w(uint8_t data);
+ uint8_t kikikai_mcu_port2_r();
+ void kikikai_mcu_port2_w(uint8_t data);
+ uint8_t kikikai_mcu_port3_r();
+ void kikikai_mcu_port3_w(uint8_t data);
+ uint8_t kikikai_mcu_port4_r();
+ void kikikai_mcu_port4_w(uint8_t data);
};
class mexico86_state : public kikikai_state
@@ -121,7 +121,7 @@ protected:
virtual void machine_reset() override;
private:
- virtual DECLARE_WRITE8_MEMBER(main_f008_w) override;
+ virtual void main_f008_w(uint8_t data) override;
INTERRUPT_GEN_MEMBER(mexico86_m68705_interrupt);
void mexico86_68705_port_a_w(u8 data);
@@ -153,7 +153,7 @@ protected:
virtual void machine_reset() override;
private:
- virtual DECLARE_WRITE8_MEMBER(main_f008_w) override;
+ virtual void main_f008_w(uint8_t data) override;
virtual INTERRUPT_GEN_MEMBER(kikikai_interrupt) override;
diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h
index 57d0f0b7391..331d95499c1 100644
--- a/src/mame/includes/kncljoe.h
+++ b/src/mame/includes/kncljoe.h
@@ -62,9 +62,9 @@ private:
void sound_cmd_w(uint8_t data);
void sound_irq_ack_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(kncljoe_videoram_w);
- DECLARE_WRITE8_MEMBER(kncljoe_control_w);
- DECLARE_WRITE8_MEMBER(kncljoe_scroll_w);
+ void kncljoe_videoram_w(offs_t offset, uint8_t data);
+ void kncljoe_control_w(uint8_t data);
+ void kncljoe_scroll_w(offs_t offset, uint8_t data);
void m6803_port1_w(uint8_t data);
void m6803_port2_w(uint8_t data);
uint8_t m6803_port1_r();
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index b7f2501c635..57db6e9b4e5 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -61,26 +61,26 @@ public:
, m_lamp(*this, "lamp0")
{ }
- DECLARE_WRITE32_MEMBER(esc_w);
- DECLARE_WRITE32_MEMBER(eeprom_w);
- DECLARE_WRITE32_MEMBER(control_w);
- DECLARE_READ32_MEMBER(le2_gun_H_r);
- DECLARE_READ32_MEMBER(le2_gun_V_r);
- DECLARE_READ32_MEMBER(type1_roz_r1);
- DECLARE_READ32_MEMBER(type1_roz_r2);
- DECLARE_READ32_MEMBER(type3_sync_r);
- DECLARE_WRITE32_MEMBER(type4_prot_w);
- DECLARE_WRITE32_MEMBER(type1_cablamps_w);
- DECLARE_READ16_MEMBER(tms57002_status_word_r);
- DECLARE_WRITE16_MEMBER(tms57002_control_word_w);
- DECLARE_READ16_MEMBER(K055550_word_r);
- DECLARE_WRITE16_MEMBER(K055550_word_w);
- DECLARE_WRITE16_MEMBER(K053990_martchmp_word_w);
- DECLARE_WRITE32_MEMBER(fantjour_dma_w);
- DECLARE_WRITE8_MEMBER(type3_bank_w);
- DECLARE_WRITE32_MEMBER(konamigx_tilebank_w);
- DECLARE_WRITE32_MEMBER(konamigx_t1_psacmap_w);
- DECLARE_WRITE32_MEMBER(konamigx_t4_psacmap_w);
+ void esc_w(address_space &space, uint32_t data);
+ void eeprom_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t le2_gun_H_r();
+ uint32_t le2_gun_V_r();
+ uint32_t type1_roz_r1(offs_t offset);
+ uint32_t type1_roz_r2(offs_t offset);
+ uint32_t type3_sync_r();
+ void type4_prot_w(address_space &space, offs_t offset, uint32_t data);
+ void type1_cablamps_w(uint32_t data);
+ uint16_t tms57002_status_word_r();
+ void tms57002_control_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t K055550_word_r(offs_t offset);
+ void K055550_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void K053990_martchmp_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void fantjour_dma_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void type3_bank_w(offs_t offset, uint8_t data);
+ void konamigx_tilebank_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void konamigx_t1_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void konamigx_t4_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(vblank_irq_ack_w);
DECLARE_WRITE_LINE_MEMBER(hblank_irq_ack_w);
DECLARE_CUSTOM_INPUT_MEMBER(gx_rdport1_3_r);
@@ -120,7 +120,7 @@ public:
K055673_CB_MEMBER(le2_sprite_callback);
void common_init();
- DECLARE_READ32_MEMBER( k_6bpp_rom_long_r );
+ uint32_t k_6bpp_rom_long_r(offs_t offset, uint32_t mem_mask = ~0);
void konamigx_mixer (screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect,tilemap_t *sub1, int sub1flags,tilemap_t *sub2, int sub2flags,int mixerflags, bitmap_ind16 *extra_bitmap, int rushingheroes_hack);
void konamigx_mixer_draw(screen_device &Screen, bitmap_rgb32 &bitmap, const rectangle &cliprect,
tilemap_t *sub1, int sub1flags,
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index 1510154ec55..5e28da6a82b 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -35,8 +35,8 @@ private:
uint8_t sensors2_r();
void lamp_w(uint8_t data);
void coin_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(vram_fg_w);
- DECLARE_WRITE8_MEMBER(vram_bg_w);
+ void vram_fg_w(offs_t offset, uint8_t data);
+ void vram_bg_w(offs_t offset, uint8_t data);
void scroll_x_w(uint8_t data);
void scroll_y_w(uint8_t data);
void gfxbank_w(uint8_t data);
diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h
index 028c653d993..8d8e001e455 100644
--- a/src/mame/includes/ksayakyu.h
+++ b/src/mame/includes/ksayakyu.h
@@ -48,13 +48,13 @@ private:
/* misc */
int m_sound_status;
- DECLARE_WRITE8_MEMBER(bank_select_w);
- DECLARE_WRITE8_MEMBER(latch_w);
- DECLARE_READ8_MEMBER(sound_status_r);
- DECLARE_WRITE8_MEMBER(tomaincpu_w);
- DECLARE_READ8_MEMBER(int_ack_r);
- DECLARE_WRITE8_MEMBER(ksayakyu_videoram_w);
- DECLARE_WRITE8_MEMBER(ksayakyu_videoctrl_w);
+ void bank_select_w(uint8_t data);
+ void latch_w(uint8_t data);
+ uint8_t sound_status_r();
+ void tomaincpu_w(uint8_t data);
+ uint8_t int_ack_r();
+ void ksayakyu_videoram_w(offs_t offset, uint8_t data);
+ void ksayakyu_videoctrl_w(uint8_t data);
void dummy1_w(uint8_t data);
void dummy2_w(uint8_t data);
void dummy3_w(uint8_t data);
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index 2e83afbe09b..51c01b4faf2 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -55,9 +55,9 @@ private:
rectangle m_clip0;
rectangle m_clip1;
- DECLARE_WRITE8_MEMBER(labyrunr_bankswitch_w);
- DECLARE_WRITE8_MEMBER(labyrunr_vram1_w);
- DECLARE_WRITE8_MEMBER(labyrunr_vram2_w);
+ void labyrunr_bankswitch_w(uint8_t data);
+ void labyrunr_vram1_w(offs_t offset, uint8_t data);
+ void labyrunr_vram2_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info0);
TILE_GET_INFO_MEMBER(get_tile_info1);
virtual void machine_start() override;
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index 78f89b580f5..7b9177a134f 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -101,9 +101,9 @@ public:
void sraider(machine_config &config);
protected:
- DECLARE_READ8_MEMBER(sraider_8005_r);
- DECLARE_WRITE8_MEMBER(sraider_misc_w);
- DECLARE_WRITE8_MEMBER(sraider_io_w);
+ uint8_t sraider_8005_r();
+ void sraider_misc_w(offs_t offset, uint8_t data);
+ void sraider_io_w(uint8_t data);
void sraider_palette(palette_device &palette) const;
DECLARE_WRITE_LINE_MEMBER(screen_vblank_sraider);
TILE_GET_INFO_MEMBER(get_grid_tile_info);
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index 16d4a0bfa75..b9dd982fc2e 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -66,23 +66,23 @@ private:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- DECLARE_READ8_MEMBER(from_snd_r);
- DECLARE_WRITE8_MEMBER(to_main_w);
- DECLARE_WRITE8_MEMBER(sound_cpu_reset_w);
- DECLARE_WRITE8_MEMBER(sound_command_w);
- DECLARE_WRITE8_MEMBER(nmi_disable_w);
- DECLARE_WRITE8_MEMBER(nmi_enable_w);
- DECLARE_READ8_MEMBER(snd_flag_r);
- DECLARE_WRITE8_MEMBER(ladyfrog_spriteram_w);
- DECLARE_READ8_MEMBER(ladyfrog_spriteram_r);
- DECLARE_WRITE8_MEMBER(ladyfrog_videoram_w);
- DECLARE_READ8_MEMBER(ladyfrog_videoram_r);
- DECLARE_WRITE8_MEMBER(ladyfrog_palette_w);
- DECLARE_READ8_MEMBER(ladyfrog_palette_r);
- DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl_w);
- DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl2_w);
- DECLARE_READ8_MEMBER(ladyfrog_scrlram_r);
- DECLARE_WRITE8_MEMBER(ladyfrog_scrlram_w);
+ uint8_t from_snd_r();
+ void to_main_w(uint8_t data);
+ void sound_cpu_reset_w(uint8_t data);
+ void sound_command_w(uint8_t data);
+ void nmi_disable_w(uint8_t data);
+ void nmi_enable_w(uint8_t data);
+ uint8_t snd_flag_r();
+ void ladyfrog_spriteram_w(offs_t offset, uint8_t data);
+ uint8_t ladyfrog_spriteram_r(offs_t offset);
+ void ladyfrog_videoram_w(offs_t offset, uint8_t data);
+ uint8_t ladyfrog_videoram_r(offs_t offset);
+ void ladyfrog_palette_w(offs_t offset, uint8_t data);
+ uint8_t ladyfrog_palette_r(offs_t offset);
+ void ladyfrog_gfxctrl_w(uint8_t data);
+ void ladyfrog_gfxctrl2_w(uint8_t data);
+ uint8_t ladyfrog_scrlram_r(offs_t offset);
+ void ladyfrog_scrlram_w(offs_t offset, uint8_t data);
void unk_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
DECLARE_VIDEO_START(toucheme);
diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h
index ee7dac539f2..621c10838d3 100644
--- a/src/mame/includes/laserbat.h
+++ b/src/mame/includes/laserbat.h
@@ -74,23 +74,23 @@ protected:
enum { TIMER_SCANLINE };
// control ports
- DECLARE_WRITE8_MEMBER(ct_io_w);
- DECLARE_READ8_MEMBER(rrowx_r);
+ void ct_io_w(uint8_t data);
+ uint8_t rrowx_r();
INTERRUPT_GEN_MEMBER(laserbat_interrupt);
// video memory and control ports
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(wcoh_w);
- DECLARE_WRITE8_MEMBER(wcov_w);
- DECLARE_WRITE8_MEMBER(cnt_eff_w);
- DECLARE_WRITE8_MEMBER(cnt_nav_w);
+ void videoram_w(offs_t offset, uint8_t data);
+ void wcoh_w(uint8_t data);
+ void wcov_w(uint8_t data);
+ void cnt_eff_w(uint8_t data);
+ void cnt_nav_w(uint8_t data);
// sound control ports
- virtual DECLARE_READ8_MEMBER(rhsc_r);
- virtual DECLARE_WRITE8_MEMBER(whsc_w);
- virtual DECLARE_WRITE8_MEMBER(csound1_w);
- virtual DECLARE_WRITE8_MEMBER(csound2_w);
+ virtual uint8_t rhsc_r();
+ virtual void whsc_w(uint8_t data);
+ virtual void csound1_w(uint8_t data);
+ virtual void csound2_w(uint8_t data);
// running the video
virtual void video_start() override;
@@ -176,7 +176,7 @@ protected:
void laserbat_palette(palette_device &palette) const;
// sound control ports
- virtual DECLARE_WRITE8_MEMBER(csound2_w) override;
+ virtual void csound2_w(uint8_t data) override;
// sound board devices
required_device<sn76477_device> m_csg;
@@ -205,8 +205,8 @@ protected:
void catnmous_palette(palette_device &palette) const;
// sound control ports
- virtual DECLARE_WRITE8_MEMBER(csound1_w) override;
- virtual DECLARE_WRITE8_MEMBER(csound2_w) override;
+ virtual void csound1_w(uint8_t data) override;
+ virtual void csound2_w(uint8_t data) override;
required_device<zac1b11107_audio_device> m_audiopcb;
};
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index 01406e21540..e9c8fc84f8d 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -76,15 +76,15 @@ private:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- DECLARE_WRITE8_MEMBER(sound_command_w);
- DECLARE_READ8_MEMBER(sound_status_r);
- DECLARE_WRITE8_MEMBER(sound_select_w);
- DECLARE_WRITE8_MEMBER(lasso_videoram_w);
- DECLARE_WRITE8_MEMBER(lasso_colorram_w);
- DECLARE_WRITE8_MEMBER(lasso_flip_screen_w);
- DECLARE_WRITE8_MEMBER(lasso_video_control_w);
- DECLARE_WRITE8_MEMBER(wwjgtin_video_control_w);
- DECLARE_WRITE8_MEMBER(pinbo_video_control_w);
+ void sound_command_w(uint8_t data);
+ uint8_t sound_status_r();
+ void sound_select_w(uint8_t data);
+ void lasso_videoram_w(offs_t offset, uint8_t data);
+ void lasso_colorram_w(offs_t offset, uint8_t data);
+ void lasso_flip_screen_w(uint8_t data);
+ void lasso_video_control_w(uint8_t data);
+ void wwjgtin_video_control_w(uint8_t data);
+ void pinbo_video_control_w(uint8_t data);
TILE_GET_INFO_MEMBER(lasso_get_bg_tile_info);
TILE_GET_INFO_MEMBER(wwjgtin_get_track_tile_info);
TILE_GET_INFO_MEMBER(pinbo_get_bg_tile_info);
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index 2d1494df9db..54b0fe403f1 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -58,12 +58,12 @@ private:
int m_sprite_pri_mask;
int m_tilemap_priority;
- DECLARE_WRITE8_MEMBER(mg_bankswitch_w);
- DECLARE_WRITE8_MEMBER(flip_w);
- DECLARE_WRITE16_MEMBER(vctrl_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(lastduel_vram_w);
- DECLARE_WRITE16_MEMBER(txram_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(madgear_vram_w);
+ void mg_bankswitch_w(uint8_t data);
+ void flip_w(uint8_t data);
+ void vctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void lastduel_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void txram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void madgear_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
static rgb_t lastduel_RRRRGGGGBBBBIIII(uint32_t raw);
TILE_GET_INFO_MEMBER(ld_get_bg_tile_info);
TILE_GET_INFO_MEMBER(ld_get_fg_tile_info);
diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h
index fdb7d2c91cc..d2a9f9b24cc 100644
--- a/src/mame/includes/lazercmd.h
+++ b/src/mame/includes/lazercmd.h
@@ -72,14 +72,14 @@ private:
uint8_t m_sense_state;
uint8_t m_attract;
- DECLARE_WRITE8_MEMBER(lazercmd_ctrl_port_w);
- DECLARE_READ8_MEMBER(lazercmd_ctrl_port_r);
- DECLARE_WRITE8_MEMBER(lazercmd_data_port_w);
- DECLARE_READ8_MEMBER(lazercmd_data_port_r);
- DECLARE_WRITE8_MEMBER(lazercmd_hardware_w);
- DECLARE_WRITE8_MEMBER(medlanes_hardware_w);
- DECLARE_WRITE8_MEMBER(bbonk_hardware_w);
- DECLARE_READ8_MEMBER(lazercmd_hardware_r);
+ void lazercmd_ctrl_port_w(uint8_t data);
+ uint8_t lazercmd_ctrl_port_r();
+ void lazercmd_data_port_w(uint8_t data);
+ uint8_t lazercmd_data_port_r();
+ void lazercmd_hardware_w(offs_t offset, uint8_t data);
+ void medlanes_hardware_w(offs_t offset, uint8_t data);
+ void bbonk_hardware_w(offs_t offset, uint8_t data);
+ uint8_t lazercmd_hardware_r(offs_t offset);
virtual void machine_start() override;
virtual void machine_reset() override;
void lazercmd_palette(palette_device &palette) const;
diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h
index e5c909fa06d..05a1d5aa0b1 100644
--- a/src/mame/includes/lemmings.h
+++ b/src/mame/includes/lemmings.h
@@ -54,11 +54,11 @@ private:
required_ioport_array<4> m_trackball_io;
- DECLARE_WRITE16_MEMBER(lemmings_control_w);
- DECLARE_READ16_MEMBER(lemmings_trackball_r);
- DECLARE_WRITE16_MEMBER(lemmings_pixel_0_w);
- DECLARE_WRITE16_MEMBER(lemmings_pixel_1_w);
- DECLARE_WRITE16_MEMBER(lemmings_vram_w);
+ void lemmings_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t lemmings_trackball_r(offs_t offset);
+ void lemmings_pixel_0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void lemmings_pixel_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void lemmings_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
virtual void video_start() override;
@@ -66,8 +66,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(screen_vblank_lemmings);
void lemmings_copy_bitmap(bitmap_rgb32& bitmap, int* xscroll, int* yscroll, const rectangle& cliprect);
- DECLARE_READ16_MEMBER( lem_protection_region_0_146_r );
- DECLARE_WRITE16_MEMBER( lem_protection_region_0_146_w );
+ uint16_t lem_protection_region_0_146_r(offs_t offset);
+ void lem_protection_region_0_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void lemmings_map(address_map &map);
void sound_map(address_map &map);
};
diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h
index b518681ae8a..95ad1e56837 100644
--- a/src/mame/includes/lethal.h
+++ b/src/mame/includes/lethal.h
@@ -54,13 +54,13 @@ private:
required_device<k054321_device> m_k054321;
required_device<palette_device> m_palette;
- DECLARE_WRITE8_MEMBER(control2_w);
- DECLARE_READ8_MEMBER(sound_irq_r);
- DECLARE_WRITE8_MEMBER(sound_irq_w);
- DECLARE_WRITE8_MEMBER(le_bankswitch_w);
- DECLARE_READ8_MEMBER(guns_r);
- DECLARE_READ8_MEMBER(gunsaux_r);
- DECLARE_WRITE8_MEMBER(lethalen_palette_control);
+ void control2_w(uint8_t data);
+ uint8_t sound_irq_r();
+ void sound_irq_w(uint8_t data);
+ void le_bankswitch_w(uint8_t data);
+ uint8_t guns_r(offs_t offset);
+ uint8_t gunsaux_r();
+ void lethalen_palette_control(offs_t offset, uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h
index 0dbff276f71..f0c6b267fb7 100644
--- a/src/mame/includes/lethalj.h
+++ b/src/mame/includes/lethalj.h
@@ -47,11 +47,11 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(cclownz_paddle);
private:
- DECLARE_WRITE16_MEMBER(ripribit_control_w);
- DECLARE_WRITE16_MEMBER(cfarm_control_w);
- DECLARE_WRITE16_MEMBER(cclownz_control_w);
- DECLARE_READ16_MEMBER(lethalj_gun_r);
- DECLARE_WRITE16_MEMBER(blitter_w);
+ void ripribit_control_w(uint16_t data);
+ void cfarm_control_w(uint16_t data);
+ void cclownz_control_w(uint16_t data);
+ uint16_t lethalj_gun_r(offs_t offset);
+ void blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void do_blit();
inline void get_crosshair_xy(int player, int *x, int *y);
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update);
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index e3fe540e7e7..2fee4d64a21 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -65,22 +65,22 @@ private:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- DECLARE_READ8_MEMBER(deco16_bank_r);
- DECLARE_READ8_MEMBER(deco16_io_r);
- DECLARE_WRITE8_MEMBER(deco16_bank_w);
- DECLARE_READ8_MEMBER(prosoccr_bank_r);
- DECLARE_READ8_MEMBER(prosoccr_charram_r);
- DECLARE_WRITE8_MEMBER(prosoccr_charram_w);
- DECLARE_WRITE8_MEMBER(prosoccr_char_bank_w);
- DECLARE_WRITE8_MEMBER(prosoccr_io_bank_w);
- DECLARE_READ8_MEMBER(prosport_charram_r);
- DECLARE_WRITE8_MEMBER(prosport_charram_w);
- DECLARE_WRITE8_MEMBER(deco16_io_w);
- DECLARE_WRITE8_MEMBER(prosoccr_io_w);
- DECLARE_WRITE8_MEMBER(prosport_io_w);
- DECLARE_WRITE8_MEMBER(liberate_videoram_w);
- DECLARE_WRITE8_MEMBER(liberate_colorram_w);
- DECLARE_WRITE8_MEMBER(prosport_bg_vram_w);
+ uint8_t deco16_bank_r(offs_t offset);
+ uint8_t deco16_io_r(offs_t offset);
+ void deco16_bank_w(uint8_t data);
+ uint8_t prosoccr_bank_r(offs_t offset);
+ uint8_t prosoccr_charram_r(offs_t offset);
+ void prosoccr_charram_w(offs_t offset, uint8_t data);
+ void prosoccr_char_bank_w(uint8_t data);
+ void prosoccr_io_bank_w(uint8_t data);
+ uint8_t prosport_charram_r(offs_t offset);
+ void prosport_charram_w(offs_t offset, uint8_t data);
+ void deco16_io_w(offs_t offset, uint8_t data);
+ void prosoccr_io_w(offs_t offset, uint8_t data);
+ void prosport_io_w(offs_t offset, uint8_t data);
+ void liberate_videoram_w(offs_t offset, uint8_t data);
+ void liberate_colorram_w(offs_t offset, uint8_t data);
+ void prosport_bg_vram_w(offs_t offset, uint8_t data);
TILEMAP_MAPPER_MEMBER(back_scan);
TILEMAP_MAPPER_MEMBER(fix_scan);
TILE_GET_INFO_MEMBER(get_back_tile_info);
diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h
index 43139771e2d..ab8ad36efbb 100644
--- a/src/mame/includes/liberatr.h
+++ b/src/mame/includes/liberatr.h
@@ -43,23 +43,23 @@ private:
virtual void machine_reset() override;
virtual void video_start() override;
- DECLARE_WRITE8_MEMBER(output_latch_w);
+ void output_latch_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w);
DECLARE_WRITE_LINE_MEMBER(trackball_reset_w);
- DECLARE_READ8_MEMBER(port0_r);
+ uint8_t port0_r();
- DECLARE_WRITE8_MEMBER( bitmap_w );
- DECLARE_READ8_MEMBER( bitmap_xy_r );
- DECLARE_WRITE8_MEMBER( bitmap_xy_w );
+ void bitmap_w(offs_t offset, uint8_t data);
+ uint8_t bitmap_xy_r();
+ void bitmap_xy_w(uint8_t data);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// early raster EAROM interface
- DECLARE_READ8_MEMBER( earom_r );
- DECLARE_WRITE8_MEMBER( earom_w );
- DECLARE_WRITE8_MEMBER( earom_control_w );
+ uint8_t earom_r();
+ void earom_w(offs_t offset, uint8_t data);
+ void earom_control_w(uint8_t data);
void liberat2_map(address_map &map);
void liberatr_map(address_map &map);
diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h
index 7d6a3d87842..d91a9ee35a0 100644
--- a/src/mame/includes/lisa.h
+++ b/src/mame/includes/lisa.h
@@ -206,12 +206,12 @@ private:
int m_last_my;
int m_frame_count;
int m_videoROM_address;
- DECLARE_READ8_MEMBER(lisa_fdc_io_r);
- DECLARE_WRITE8_MEMBER(lisa_fdc_io_w);
- DECLARE_READ16_MEMBER(lisa_r);
- DECLARE_WRITE16_MEMBER(lisa_w);
- DECLARE_READ16_MEMBER(lisa_IO_r);
- DECLARE_WRITE16_MEMBER(lisa_IO_w);
+ uint8_t lisa_fdc_io_r(offs_t offset);
+ void lisa_fdc_io_w(offs_t offset, uint8_t data);
+ uint16_t lisa_r(offs_t offset, uint16_t mem_mask = ~0);
+ void lisa_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t lisa_IO_r(offs_t offset, uint16_t mem_mask = ~0);
+ void lisa_IO_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(diag1_w);
DECLARE_WRITE_LINE_MEMBER(diag2_w);
DECLARE_WRITE_LINE_MEMBER(seg1_w);
diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h
index dd1eade2765..620667ba8ec 100644
--- a/src/mame/includes/lkage.h
+++ b/src/mame/includes/lkage.h
@@ -69,16 +69,16 @@ private:
required_device<generic_latch_8_device> m_soundlatch;
required_device<input_merger_device> m_soundnmi;
- DECLARE_WRITE8_MEMBER(lkage_sh_nmi_disable_w);
- DECLARE_WRITE8_MEMBER(lkage_sh_nmi_enable_w);
- DECLARE_READ8_MEMBER(sound_status_r);
- DECLARE_READ8_MEMBER(port_fetch_r);
- DECLARE_READ8_MEMBER(mcu_status_r);
- DECLARE_READ8_MEMBER(fake_mcu_r);
- DECLARE_WRITE8_MEMBER(fake_mcu_w);
- DECLARE_READ8_MEMBER(fake_status_r);
+ void lkage_sh_nmi_disable_w(uint8_t data);
+ void lkage_sh_nmi_enable_w(uint8_t data);
+ uint8_t sound_status_r();
+ uint8_t port_fetch_r(offs_t offset);
+ uint8_t mcu_status_r();
+ uint8_t fake_mcu_r();
+ void fake_mcu_w(uint8_t data);
+ uint8_t fake_status_r();
- DECLARE_WRITE8_MEMBER(lkage_videoram_w);
+ void lkage_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h
index 259c1b1adf1..721437ce104 100644
--- a/src/mame/includes/llc.h
+++ b/src/mame/includes/llc.h
@@ -40,8 +40,8 @@ public:
void init_llc1();
private:
- DECLARE_WRITE8_MEMBER(llc2_rom_disable_w);
- DECLARE_WRITE8_MEMBER(llc2_basic_enable_w);
+ void llc2_rom_disable_w(uint8_t data);
+ void llc2_basic_enable_w(uint8_t data);
void kbd_put(u8 data);
uint8_t llc1_port1_a_r();
uint8_t llc1_port2_a_r();
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index d50352fb7d9..8465c19b424 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -116,28 +116,28 @@ private:
required_device<palette_device> m_palette;
output_finder<> m_lamp;
- DECLARE_READ16_MEMBER(lockon_crtc_r);
- DECLARE_WRITE16_MEMBER(lockon_crtc_w);
- DECLARE_WRITE16_MEMBER(lockon_char_w);
- DECLARE_WRITE16_MEMBER(lockon_scene_h_scr_w);
- DECLARE_WRITE16_MEMBER(lockon_scene_v_scr_w);
- DECLARE_WRITE16_MEMBER(lockon_ground_ctrl_w);
- DECLARE_WRITE16_MEMBER(lockon_tza112_w);
- DECLARE_READ16_MEMBER(lockon_obj_4000_r);
- DECLARE_WRITE16_MEMBER(lockon_obj_4000_w);
- DECLARE_WRITE16_MEMBER(lockon_fb_clut_w);
- DECLARE_WRITE16_MEMBER(lockon_rotate_w);
- DECLARE_WRITE16_MEMBER(adrst_w);
- DECLARE_READ16_MEMBER(main_gnd_r);
- DECLARE_WRITE16_MEMBER(main_gnd_w);
- DECLARE_READ16_MEMBER(main_obj_r);
- DECLARE_WRITE16_MEMBER(main_obj_w);
- DECLARE_WRITE16_MEMBER(tst_w);
- DECLARE_READ16_MEMBER(main_z80_r);
- DECLARE_WRITE16_MEMBER(main_z80_w);
- DECLARE_WRITE16_MEMBER(inten_w);
- DECLARE_WRITE16_MEMBER(emres_w);
- DECLARE_WRITE8_MEMBER(sound_vol);
+ uint16_t lockon_crtc_r();
+ void lockon_crtc_w(offs_t offset, uint16_t data);
+ void lockon_char_w(offs_t offset, uint16_t data);
+ void lockon_scene_h_scr_w(uint16_t data);
+ void lockon_scene_v_scr_w(uint16_t data);
+ void lockon_ground_ctrl_w(uint16_t data);
+ void lockon_tza112_w(offs_t offset, uint16_t data);
+ uint16_t lockon_obj_4000_r();
+ void lockon_obj_4000_w(uint16_t data);
+ void lockon_fb_clut_w(offs_t offset, uint16_t data);
+ void lockon_rotate_w(offs_t offset, uint16_t data);
+ void adrst_w(uint16_t data);
+ uint16_t main_gnd_r(offs_t offset);
+ void main_gnd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t main_obj_r(offs_t offset);
+ void main_obj_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void tst_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t main_z80_r(offs_t offset);
+ void main_z80_w(offs_t offset, uint16_t data);
+ void inten_w(uint16_t data);
+ void emres_w(uint16_t data);
+ void sound_vol(uint8_t data);
void ym2203_out_b(uint8_t data);
TILE_GET_INFO_MEMBER(get_lockon_tile_info);
void lockon_palette(palette_device &palette) const;
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index 633d6935325..b7567c2f4f9 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -72,18 +72,18 @@ private:
std::unique_ptr<bitmap_ind16> m_bitmaps[5];
uint16_t m_protection_data;
- DECLARE_WRITE16_MEMBER(lordgun_protection_w);
- DECLARE_READ16_MEMBER(lordgun_protection_r);
- DECLARE_WRITE16_MEMBER(aliencha_protection_w);
- DECLARE_READ16_MEMBER(aliencha_protection_r);
+ void lordgun_protection_w(offs_t offset, uint16_t data);
+ uint16_t lordgun_protection_r(offs_t offset);
+ void aliencha_protection_w(offs_t offset, uint16_t data);
+ uint16_t aliencha_protection_r(offs_t offset);
- DECLARE_WRITE16_MEMBER(priority_w);
- DECLARE_READ16_MEMBER(lordgun_gun_0_x_r);
- DECLARE_READ16_MEMBER(lordgun_gun_0_y_r);
- DECLARE_READ16_MEMBER(lordgun_gun_1_x_r);
- DECLARE_READ16_MEMBER(lordgun_gun_1_y_r);
- DECLARE_WRITE16_MEMBER(soundlatch_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(vram_w);
+ void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t lordgun_gun_0_x_r();
+ uint16_t lordgun_gun_0_y_r();
+ uint16_t lordgun_gun_1_x_r();
+ uint16_t lordgun_gun_1_y_r();
+ void soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void fake_w(uint8_t data);
void fake2_w(uint8_t data);
void lordgun_eeprom_w(uint8_t data);
diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h
index a6d24d7535c..c6f38e111f5 100644
--- a/src/mame/includes/lsasquad.h
+++ b/src/mame/includes/lsasquad.h
@@ -45,14 +45,14 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- DECLARE_WRITE8_MEMBER(lsasquad_bankswitch_w);
- DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_disable_w);
- DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_enable_w);
- DECLARE_READ8_MEMBER(lsasquad_sound_status_r);
- DECLARE_READ8_MEMBER(daikaiju_sound_status_r);
+ void lsasquad_bankswitch_w(uint8_t data);
+ void lsasquad_sh_nmi_disable_w(uint8_t data);
+ void lsasquad_sh_nmi_enable_w(uint8_t data);
+ uint8_t lsasquad_sound_status_r();
+ uint8_t daikaiju_sound_status_r();
- DECLARE_READ8_MEMBER(lsasquad_mcu_status_r);
- DECLARE_READ8_MEMBER(daikaiju_mcu_status_r);
+ uint8_t lsasquad_mcu_status_r();
+ uint8_t daikaiju_mcu_status_r();
void unk(uint8_t data);
DECLARE_MACHINE_START(lsasquad);
DECLARE_MACHINE_RESET(lsasquad);
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index d09ee1cb4c6..f7444814e5c 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -33,16 +33,16 @@ protected:
virtual void sound_start() override;
private:
- DECLARE_READ8_MEMBER(custom_09R81P_port_r);
- DECLARE_WRITE8_MEMBER(custom_09R81P_port_w);
- DECLARE_READ8_MEMBER(usart_8251_r);
- DECLARE_WRITE8_MEMBER(usart_8251_w);
- DECLARE_READ8_MEMBER(copro_sm7831_r);
- DECLARE_WRITE8_MEMBER(copro_sm7831_w);
- DECLARE_WRITE8_MEMBER(lucky74_fg_videoram_w);
- DECLARE_WRITE8_MEMBER(lucky74_fg_colorram_w);
- DECLARE_WRITE8_MEMBER(lucky74_bg_videoram_w);
- DECLARE_WRITE8_MEMBER(lucky74_bg_colorram_w);
+ uint8_t custom_09R81P_port_r(offs_t offset);
+ void custom_09R81P_port_w(offs_t offset, uint8_t data);
+ uint8_t usart_8251_r();
+ void usart_8251_w(uint8_t data);
+ uint8_t copro_sm7831_r();
+ void copro_sm7831_w(uint8_t data);
+ void lucky74_fg_videoram_w(offs_t offset, uint8_t data);
+ void lucky74_fg_colorram_w(offs_t offset, uint8_t data);
+ void lucky74_bg_videoram_w(offs_t offset, uint8_t data);
+ void lucky74_bg_colorram_w(offs_t offset, uint8_t data);
void ym2149_portb_w(uint8_t data);
void lamps_a_w(uint8_t data);
void lamps_b_w(uint8_t data);
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index 1f5e15f91f9..945a32bee6a 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -28,8 +28,8 @@ public:
protected:
virtual void video_start() override;
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(colorram_w);
+ void videoram_w(offs_t offset, uint8_t data);
+ void colorram_w(offs_t offset, uint8_t data);
required_device<cpu_device> m_maincpu;
@@ -61,9 +61,9 @@ protected:
virtual void machine_reset() override;
private:
- DECLARE_WRITE8_MEMBER(control_port_2_w);
- DECLARE_WRITE8_MEMBER(control_port_2a_w);
- DECLARE_READ8_MEMBER(payout_r);
+ void control_port_2_w(uint8_t data);
+ void control_port_2a_w(uint8_t data);
+ uint8_t payout_r();
void lvpoker_map(address_map &map);
void ponttehk_map(address_map &map);
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index 99d27831877..c0bf63983aa 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -63,21 +63,21 @@ private:
uint8_t m_nmi_mask;
int m_sprbank;
- DECLARE_WRITE8_MEMBER(avengers_adpcm_w);
- DECLARE_READ8_MEMBER(avengers_adpcm_r);
- DECLARE_WRITE8_MEMBER(lwings_bankswitch_w);
- DECLARE_WRITE8_MEMBER(avengers_protection_w);
- DECLARE_WRITE8_MEMBER(avengers_prot_bank_w);
- DECLARE_READ8_MEMBER(avengers_protection_r);
- DECLARE_READ8_MEMBER(avengers_soundlatch2_r);
- DECLARE_WRITE8_MEMBER(lwings_fgvideoram_w);
- DECLARE_WRITE8_MEMBER(lwings_bg1videoram_w);
- DECLARE_WRITE8_MEMBER(lwings_bg1_scrollx_w);
- DECLARE_WRITE8_MEMBER(lwings_bg1_scrolly_w);
- DECLARE_WRITE8_MEMBER(trojan_bg2_scrollx_w);
- DECLARE_WRITE8_MEMBER(trojan_bg2_image_w);
- DECLARE_WRITE8_MEMBER(msm5205_w);
- DECLARE_WRITE8_MEMBER(fball_oki_bank_w);
+ void avengers_adpcm_w(uint8_t data);
+ uint8_t avengers_adpcm_r();
+ void lwings_bankswitch_w(uint8_t data);
+ void avengers_protection_w(uint8_t data);
+ void avengers_prot_bank_w(uint8_t data);
+ uint8_t avengers_protection_r();
+ uint8_t avengers_soundlatch2_r();
+ void lwings_fgvideoram_w(offs_t offset, uint8_t data);
+ void lwings_bg1videoram_w(offs_t offset, uint8_t data);
+ void lwings_bg1_scrollx_w(offs_t offset, uint8_t data);
+ void lwings_bg1_scrolly_w(offs_t offset, uint8_t data);
+ void trojan_bg2_scrollx_w(uint8_t data);
+ void trojan_bg2_image_w(uint8_t data);
+ void msm5205_w(uint8_t data);
+ void fball_oki_bank_w(uint8_t data);
TILEMAP_MAPPER_MEMBER(get_bg2_memory_offset);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/lynx.h b/src/mame/includes/lynx.h
index 01d10bb5a1d..8d14e0d9dfa 100644
--- a/src/mame/includes/lynx.h
+++ b/src/mame/includes/lynx.h
@@ -171,13 +171,13 @@ private:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_READ8_MEMBER(suzy_read);
- DECLARE_WRITE8_MEMBER(suzy_write);
- DECLARE_WRITE8_MEMBER(lynx_uart_w);
- DECLARE_READ8_MEMBER(lynx_uart_r);
- DECLARE_READ8_MEMBER(mikey_read);
- DECLARE_WRITE8_MEMBER(mikey_write);
- DECLARE_READ8_MEMBER(lynx_memory_config_r);
+ uint8_t suzy_read(offs_t offset);
+ void suzy_write(offs_t offset, uint8_t data);
+ void lynx_uart_w(offs_t offset, uint8_t data);
+ uint8_t lynx_uart_r(offs_t offset);
+ uint8_t mikey_read(offs_t offset);
+ void mikey_write(offs_t offset, uint8_t data);
+ uint8_t lynx_memory_config_r();
void lynx_memory_config_w(uint8_t data);
void lynx_divide();
void lynx_multiply();
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index 97ab0fae6e5..18f4b221e7d 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -75,11 +75,11 @@ private:
DECLARE_WRITE8_MEMBER(coincounter_w);
DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_WRITE16_MEMBER(sound_reset_w);
- DECLARE_WRITE16_MEMBER(wpksoc_output_w);
- DECLARE_WRITE16_MEMBER(vram_w);
- DECLARE_WRITE16_MEMBER(control_w);
- DECLARE_WRITE16_MEMBER(spritebuffer_w);
+ void sound_reset_w(uint16_t data);
+ void wpksoc_output_w(uint16_t data);
+ void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void spritebuffer_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_pf_tile_info);
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index 350f37cdbd1..550b72e2fc5 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -166,17 +166,17 @@ private:
void mcu_low_w(u8 data);
void mcu_high_w(u8 data);
- DECLARE_READ16_MEMBER(protection_r);
- DECLARE_WRITE16_MEMBER(protection_w);
+ u16 protection_r(offs_t offset, u16 mem_mask = ~0);
+ void protection_w(offs_t offset, u16 data, u16 mem_mask = ~0);
// game specific
- DECLARE_WRITE16_MEMBER(bchopper_sample_trigger_w);
- DECLARE_WRITE16_MEMBER(nspirit_sample_trigger_w);
- DECLARE_WRITE16_MEMBER(imgfight_sample_trigger_w);
- DECLARE_WRITE16_MEMBER(loht_sample_trigger_w);
- DECLARE_WRITE16_MEMBER(dbreedm72_sample_trigger_w);
- DECLARE_WRITE16_MEMBER(dkgenm72_sample_trigger_w);
- DECLARE_WRITE16_MEMBER(gallop_sample_trigger_w);
+ void bchopper_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void nspirit_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void imgfight_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void loht_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void dbreedm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void dkgenm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void gallop_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void rtype2_port02_w(u8 data);
void poundfor_port02_w(u8 data);
void m82_gfx_ctrl_w(offs_t offset, u16 data, u16 mem_mask);
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index bf902d73521..5f207e62d40 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -58,10 +58,10 @@ private:
tilemap_t *m_pf_layer[2][2];
uint8_t m_last_pf[2];
- DECLARE_WRITE16_MEMBER(coincounter_w);
- DECLARE_WRITE16_MEMBER(quizf1_bankswitch_w);
- DECLARE_WRITE16_MEMBER(m90_video_w);
- DECLARE_WRITE16_MEMBER(bootleg_video_w);
+ void coincounter_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void quizf1_bankswitch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void m90_video_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void bootleg_video_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
virtual void video_start() override;
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index 70cfe455663..f6c42e03bc4 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -99,19 +99,19 @@ private:
uint8_t m_palette_bank;
std::vector<uint16_t> m_paletteram;
- DECLARE_READ16_MEMBER(eeprom_r);
- DECLARE_WRITE16_MEMBER(eeprom_w);
+ uint16_t eeprom_r(offs_t offset);
+ void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE8_MEMBER(coincounter_w);
DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_WRITE16_MEMBER(sound_reset_w);
- DECLARE_WRITE16_MEMBER(spritecontrol_w);
- DECLARE_WRITE16_MEMBER(videocontrol_w);
- DECLARE_READ16_MEMBER(paletteram_r);
- DECLARE_WRITE16_MEMBER(paletteram_w);
- DECLARE_WRITE16_MEMBER(vram_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(pf_control_w);
- DECLARE_WRITE16_MEMBER(master_control_w);
- DECLARE_WRITE16_MEMBER(oki_bank_w);
+ void sound_reset_w(uint16_t data);
+ void spritecontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void videocontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t paletteram_r(offs_t offset);
+ void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void pf_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void master_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void oki_bank_w(uint16_t data);
TILE_GET_INFO_MEMBER(get_pf_tile_info);
DECLARE_MACHINE_RESET(m92);
DECLARE_VIDEO_START(m92);
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 0e8ace44344..e5b979fb42c 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -303,7 +303,7 @@ private:
emu_timer *m_overlay_timeout;
TIMER_CALLBACK_MEMBER(overlay_timeout_func);
- DECLARE_READ32_MEMBER(rom_switch_r);
+ uint32_t rom_switch_r(offs_t offset);
bool m_snd_enable;
bool m_main_buffer;
@@ -399,40 +399,40 @@ private:
void set_adb_line(int linestate);
void update_volume();
- DECLARE_READ16_MEMBER ( mac_via_r );
- DECLARE_WRITE16_MEMBER ( mac_via_w );
- DECLARE_READ16_MEMBER ( mac_via2_r );
- DECLARE_WRITE16_MEMBER ( mac_via2_w );
- DECLARE_READ16_MEMBER ( mac_autovector_r );
- DECLARE_WRITE16_MEMBER ( mac_autovector_w );
- DECLARE_READ16_MEMBER ( mac_iwm_r );
- DECLARE_WRITE16_MEMBER ( mac_iwm_w );
- DECLARE_READ16_MEMBER ( mac_scc_r );
- DECLARE_WRITE16_MEMBER ( mac_scc_w );
- DECLARE_WRITE16_MEMBER ( mac_scc_2_w );
- DECLARE_READ16_MEMBER ( macplus_scsi_r );
- DECLARE_WRITE16_MEMBER ( macplus_scsi_w );
- DECLARE_WRITE16_MEMBER ( macii_scsi_w );
- DECLARE_READ32_MEMBER (macii_scsi_drq_r);
- DECLARE_WRITE32_MEMBER (macii_scsi_drq_w);
-
- DECLARE_READ32_MEMBER( rbv_ramdac_r );
- DECLARE_WRITE32_MEMBER( rbv_ramdac_w );
- DECLARE_WRITE32_MEMBER( ariel_ramdac_w );
+ uint16_t mac_via_r(offs_t offset);
+ void mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mac_via2_r(offs_t offset);
+ void mac_via2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mac_autovector_r(offs_t offset);
+ void mac_autovector_w(offs_t offset, uint16_t data);
+ uint16_t mac_iwm_r(offs_t offset, uint16_t mem_mask = ~0);
+ void mac_iwm_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mac_scc_r(offs_t offset);
+ void mac_scc_w(offs_t offset, uint16_t data);
+ void mac_scc_2_w(offs_t offset, uint16_t data);
+ uint16_t macplus_scsi_r(offs_t offset, uint16_t mem_mask = ~0);
+ void macplus_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void macii_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t macii_scsi_drq_r(offs_t offset, uint32_t mem_mask = ~0);
+ void macii_scsi_drq_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+ uint32_t rbv_ramdac_r();
+ void rbv_ramdac_w(offs_t offset, uint32_t data);
+ void ariel_ramdac_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
DECLARE_READ8_MEMBER( mac_sonora_vctl_r );
DECLARE_WRITE8_MEMBER( mac_sonora_vctl_w );
DECLARE_READ8_MEMBER ( mac_rbv_r );
DECLARE_WRITE8_MEMBER ( mac_rbv_w );
- DECLARE_READ32_MEMBER(mac_read_id);
+ uint32_t mac_read_id();
- DECLARE_READ16_MEMBER(mac_config_r);
+ uint16_t mac_config_r();
- DECLARE_READ32_MEMBER(biu_r);
- DECLARE_WRITE32_MEMBER(biu_w);
+ uint32_t biu_r(offs_t offset, uint32_t mem_mask = ~0);
+ void biu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
DECLARE_READ8_MEMBER(oss_r);
DECLARE_WRITE8_MEMBER(oss_w);
- DECLARE_READ32_MEMBER(buserror_r);
+ uint32_t buserror_r();
DECLARE_READ8_MEMBER(swimiop_r);
DECLARE_WRITE8_MEMBER(swimiop_w);
DECLARE_READ8_MEMBER(scciop_r);
@@ -450,13 +450,13 @@ private:
DECLARE_READ8_MEMBER(mac_5396_r);
DECLARE_WRITE8_MEMBER(mac_5396_w);
- DECLARE_READ32_MEMBER(dafb_r);
- DECLARE_WRITE32_MEMBER(dafb_w);
- DECLARE_READ32_MEMBER(dafb_dac_r);
- DECLARE_WRITE32_MEMBER(dafb_dac_w);
+ uint32_t dafb_r(offs_t offset, uint32_t mem_mask = ~0);
+ void dafb_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t dafb_dac_r(offs_t offset, uint32_t mem_mask = ~0);
+ void dafb_dac_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_READ32_MEMBER(macwd_r);
- DECLARE_WRITE32_MEMBER(macwd_w);
+ uint32_t macwd_r(offs_t offset, uint32_t mem_mask = ~0);
+ void macwd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(nubus_irq_9_w);
DECLARE_WRITE_LINE_MEMBER(nubus_irq_a_w);
diff --git a/src/mame/includes/macpci.h b/src/mame/includes/macpci.h
index 505fd224b04..58f916f0c3b 100644
--- a/src/mame/includes/macpci.h
+++ b/src/mame/includes/macpci.h
@@ -122,13 +122,13 @@ private:
// this is shared among all video setups with vram
uint32_t *m_vram;
- DECLARE_READ16_MEMBER ( mac_via_r );
- DECLARE_WRITE16_MEMBER ( mac_via_w );
- DECLARE_READ16_MEMBER ( mac_scc_r );
- DECLARE_WRITE16_MEMBER ( mac_scc_w );
- DECLARE_WRITE16_MEMBER ( mac_scc_2_w );
+ uint16_t mac_via_r(offs_t offset);
+ void mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mac_scc_r(offs_t offset);
+ void mac_scc_w(offs_t offset, uint16_t data);
+ void mac_scc_2_w(offs_t offset, uint16_t data);
- DECLARE_READ32_MEMBER(mac_read_id);
+ uint32_t mac_read_id();
DECLARE_READ8_MEMBER(mac_5396_r);
DECLARE_WRITE8_MEMBER(mac_5396_w);
@@ -140,8 +140,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(cuda_adb_linechange_w);
// hack functions
- DECLARE_READ64_MEMBER ( unk1_r );
- DECLARE_READ64_MEMBER ( unk2_r );
+ uint64_t unk1_r();
+ uint64_t unk2_r(offs_t offset, uint64_t mem_mask = ~0);
void init_pippin();
void pippin_mem(address_map &map);
diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h
index 51458fd6d8d..37bf6cc6576 100644
--- a/src/mame/includes/macrossp.h
+++ b/src/mame/includes/macrossp.h
@@ -91,15 +91,15 @@ private:
required_device<palette_device> m_palette;
required_device<generic_latch_16_device> m_soundlatch;
- DECLARE_READ32_MEMBER(macrossp_soundstatus_r);
- DECLARE_WRITE32_MEMBER(macrossp_soundcmd_w);
- DECLARE_READ16_MEMBER(macrossp_soundcmd_r);
- DECLARE_WRITE16_MEMBER(palette_fade_w);
- DECLARE_WRITE32_MEMBER(macrossp_speedup_w);
- DECLARE_WRITE32_MEMBER(macrossp_scra_videoram_w);
- DECLARE_WRITE32_MEMBER(macrossp_scrb_videoram_w);
- DECLARE_WRITE32_MEMBER(macrossp_scrc_videoram_w);
- DECLARE_WRITE32_MEMBER(macrossp_text_videoram_w);
+ uint32_t macrossp_soundstatus_r();
+ void macrossp_soundcmd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t macrossp_soundcmd_r();
+ void palette_fade_w(uint16_t data);
+ void macrossp_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void macrossp_scra_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void macrossp_scrb_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void macrossp_scrc_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void macrossp_text_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_macrossp_scra_tile_info);
TILE_GET_INFO_MEMBER(get_macrossp_scrb_tile_info);
TILE_GET_INFO_MEMBER(get_macrossp_scrc_tile_info);
diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h
index 3f5cfe627b8..95b517d2dd9 100644
--- a/src/mame/includes/magmax.h
+++ b/src/mame/includes/magmax.h
@@ -61,9 +61,9 @@ private:
std::unique_ptr<uint32_t[]> m_prom_tab;
bitmap_ind16 m_bitmap;
- DECLARE_WRITE16_MEMBER(cpu_irq_ack_w);
+ void cpu_irq_ack_w(uint16_t data);
DECLARE_READ8_MEMBER(sound_r);
- DECLARE_WRITE16_MEMBER(vreg_w);
+ void vreg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void ay8910_portB_0_w(uint8_t data);
void ay8910_portA_0_w(uint8_t data);
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index 00eafc5ea01..8dd11a3bc04 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -69,21 +69,21 @@ private:
timer_expired_delegate m_v493_callback;
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
- DECLARE_WRITE16_MEMBER(xenophobe_control_w);
- DECLARE_WRITE16_MEMBER(blasted_control_w);
- DECLARE_READ16_MEMBER(spyhunt2_port_0_r);
- DECLARE_READ16_MEMBER(spyhunt2_port_1_r);
- DECLARE_WRITE16_MEMBER(spyhunt2_control_w);
- DECLARE_READ16_MEMBER(archrivl_port_1_r);
- DECLARE_WRITE16_MEMBER(archrivl_control_w);
- DECLARE_WRITE16_MEMBER(pigskin_protection_w);
- DECLARE_READ16_MEMBER(pigskin_protection_r);
- DECLARE_READ16_MEMBER(pigskin_port_1_r);
- DECLARE_READ16_MEMBER(pigskin_port_2_r);
- DECLARE_READ16_MEMBER(trisport_port_1_r);
- DECLARE_WRITE16_MEMBER(mcr68_videoram_w);
+ void xenophobe_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void blasted_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t spyhunt2_port_0_r();
+ uint16_t spyhunt2_port_1_r();
+ void spyhunt2_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t archrivl_port_1_r();
+ void archrivl_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void pigskin_protection_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t pigskin_protection_r();
+ uint16_t pigskin_port_1_r();
+ uint16_t pigskin_port_2_r();
+ uint16_t trisport_port_1_r();
+ void mcr68_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(archrivlb_port_1_r);
+ uint16_t archrivlb_port_1_r();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
DECLARE_MACHINE_START(mcr68);
DECLARE_MACHINE_RESET(mcr68);
diff --git a/src/mame/includes/megadriv_acbl.h b/src/mame/includes/megadriv_acbl.h
index 0692714fe18..12e7a95dc7e 100644
--- a/src/mame/includes/megadriv_acbl.h
+++ b/src/mame/includes/megadriv_acbl.h
@@ -30,18 +30,18 @@ public:
void init_jparkmb();
private:
- DECLARE_WRITE16_MEMBER(bl_710000_w);
- DECLARE_READ16_MEMBER(bl_710000_r);
- DECLARE_WRITE16_MEMBER(aladmdb_w);
- DECLARE_READ16_MEMBER(aladmdb_r);
- DECLARE_READ16_MEMBER(jparkmb_r);
- DECLARE_READ16_MEMBER(twinktmb_r);
- DECLARE_READ16_MEMBER(mk3mdb_dsw_r);
- DECLARE_READ16_MEMBER(ssf2mdb_dsw_r);
- DECLARE_READ16_MEMBER(srmdb_dsw_r);
- DECLARE_READ16_MEMBER(topshoot_200051_r);
- DECLARE_READ16_MEMBER(puckpkmna_70001c_r);
- DECLARE_READ16_MEMBER(puckpkmna_4b2476_r);
+ void bl_710000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t bl_710000_r();
+ void aladmdb_w(uint16_t data);
+ uint16_t aladmdb_r();
+ uint16_t jparkmb_r();
+ uint16_t twinktmb_r();
+ uint16_t mk3mdb_dsw_r(offs_t offset);
+ uint16_t ssf2mdb_dsw_r(offs_t offset);
+ uint16_t srmdb_dsw_r(offs_t offset);
+ uint16_t topshoot_200051_r();
+ uint16_t puckpkmna_70001c_r();
+ uint16_t puckpkmna_4b2476_r();
DECLARE_MACHINE_START(md_bootleg) { MACHINE_START_CALL_MEMBER(megadriv); m_vdp->stop_timers(); }
DECLARE_MACHINE_START(md_6button);
diff --git a/src/mame/includes/megadriv_rad.h b/src/mame/includes/megadriv_rad.h
index 499ccbd9039..9dd0e0860f7 100644
--- a/src/mame/includes/megadriv_rad.h
+++ b/src/mame/includes/megadriv_rad.h
@@ -20,8 +20,8 @@ public:
DECLARE_MACHINE_START(megadriv_radica_3button);
DECLARE_MACHINE_RESET(megadriv_radica);
- DECLARE_READ16_MEMBER(read);
- DECLARE_READ16_MEMBER(read_a13);
+ uint16_t read(offs_t offset);
+ uint16_t read_a13(offs_t offset);
void megadriv_radica_6button_ntsc(machine_config &config);
void megadriv_radica_6button_pal(machine_config &config);
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index fd68d179b3b..d8d0a85a6ba 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -146,31 +146,31 @@ private:
u16 *m_spriteram;
DECLARE_WRITE_LINE_MEMBER(sound_irq);
- DECLARE_READ16_MEMBER(ip_select_r);
- DECLARE_WRITE16_MEMBER(ip_select_w);
- DECLARE_READ16_MEMBER(protection_peekaboo_r);
- DECLARE_WRITE16_MEMBER(protection_peekaboo_w);
- DECLARE_READ16_MEMBER(megasys1A_mcu_hs_r);
- DECLARE_WRITE16_MEMBER(megasys1A_mcu_hs_w);
- DECLARE_READ16_MEMBER(iganinju_mcu_hs_r);
- DECLARE_WRITE16_MEMBER(iganinju_mcu_hs_w);
- DECLARE_READ16_MEMBER(soldamj_spriteram16_r);
- DECLARE_WRITE16_MEMBER(soldamj_spriteram16_w);
- DECLARE_READ16_MEMBER(stdragon_mcu_hs_r);
- DECLARE_WRITE16_MEMBER(stdragon_mcu_hs_w);
- DECLARE_WRITE16_MEMBER(active_layers_w);
- DECLARE_WRITE16_MEMBER(sprite_bank_w);
- DECLARE_READ16_MEMBER(sprite_flag_r);
- DECLARE_WRITE16_MEMBER(sprite_flag_w);
- DECLARE_WRITE16_MEMBER(screen_flag_w);
- DECLARE_WRITE16_MEMBER(soundlatch_w);
- DECLARE_WRITE16_MEMBER(soundlatch_z_w);
- DECLARE_WRITE16_MEMBER(soundlatch_c_w);
- DECLARE_WRITE16_MEMBER(monkelf_scroll0_w);
- DECLARE_WRITE16_MEMBER(monkelf_scroll1_w);
+ u16 ip_select_r();
+ void ip_select_w(u16 data);
+ u16 protection_peekaboo_r();
+ void protection_peekaboo_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 megasys1A_mcu_hs_r(offs_t offset, u16 mem_mask = ~0);
+ void megasys1A_mcu_hs_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 iganinju_mcu_hs_r(offs_t offset, u16 mem_mask = ~0);
+ void iganinju_mcu_hs_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 soldamj_spriteram16_r(offs_t offset);
+ void soldamj_spriteram16_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 stdragon_mcu_hs_r(offs_t offset, u16 mem_mask = ~0);
+ void stdragon_mcu_hs_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void active_layers_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void sprite_bank_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 sprite_flag_r();
+ void sprite_flag_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void screen_flag_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void soundlatch_w(u16 data);
+ void soundlatch_z_w(u16 data);
+ void soundlatch_c_w(u16 data);
+ void monkelf_scroll0_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void monkelf_scroll1_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void megasys1_set_vreg_flag(int which, int data);
template<int Chip> DECLARE_READ8_MEMBER(oki_status_r);
- DECLARE_WRITE16_MEMBER(ram_w);
+ void ram_w(offs_t offset, u16 data);
void p47b_adpcm_w(offs_t offset, u8 data);
DECLARE_MACHINE_RESET(megasys1);
diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h
index 56a0b6d47a9..044de368830 100644
--- a/src/mame/includes/metalmx.h
+++ b/src/mame/includes/metalmx.h
@@ -31,22 +31,22 @@ public:
void metalmx(machine_config &config);
private:
- DECLARE_READ32_MEMBER(unk_r);
- DECLARE_READ32_MEMBER(watchdog_r);
- DECLARE_WRITE32_MEMBER(shifter_w);
- DECLARE_WRITE32_MEMBER(motor_w);
- DECLARE_WRITE32_MEMBER(reset_w);
- DECLARE_READ32_MEMBER(sound_data_r);
- DECLARE_WRITE32_MEMBER(sound_data_w);
- template<int Chip> DECLARE_WRITE32_MEMBER(dsp32c_w);
- template<int Chip> DECLARE_READ32_MEMBER(dsp32c_r);
- DECLARE_WRITE32_MEMBER(host_gsp_w);
- DECLARE_READ32_MEMBER(host_gsp_r);
- DECLARE_READ32_MEMBER(host_dram_r);
- DECLARE_WRITE32_MEMBER(host_dram_w);
- DECLARE_READ32_MEMBER(host_vram_r);
- DECLARE_WRITE32_MEMBER(host_vram_w);
- DECLARE_WRITE32_MEMBER(timer_w);
+ uint32_t unk_r();
+ uint32_t watchdog_r();
+ void shifter_w(uint32_t data);
+ void motor_w(uint32_t data);
+ void reset_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sound_data_r(offs_t offset, uint32_t mem_mask = ~0);
+ void sound_data_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ template<int Chip> void dsp32c_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ template<int Chip> uint32_t dsp32c_r(offs_t offset, uint32_t mem_mask = ~0);
+ void host_gsp_w(offs_t offset, uint32_t data);
+ uint32_t host_gsp_r(offs_t offset);
+ uint32_t host_dram_r(offs_t offset);
+ void host_dram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t host_vram_r(offs_t offset);
+ void host_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void timer_w(offs_t offset, uint32_t data);
void cage_irq_callback(uint8_t data);
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index 076b385259a..719ca620a93 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -109,7 +109,7 @@ private:
u8 irq_cause_r(offs_t offset);
void irq_cause_w(offs_t offset, u8 data);
uint8_t irq_vector_r(offs_t offset);
- DECLARE_WRITE16_MEMBER(mouja_irq_timer_ctrl_w);
+ void mouja_irq_timer_ctrl_w(uint16_t data);
DECLARE_WRITE8_MEMBER(sound_data_w);
TIMER_CALLBACK_MEMBER(sound_data_sync);
DECLARE_READ8_MEMBER(soundstatus_r);
@@ -120,13 +120,13 @@ private:
void upd7810_portb_w(uint8_t data);
void daitorid_portb_w(uint8_t data);
DECLARE_WRITE8_MEMBER(coin_lockout_1word_w);
- DECLARE_WRITE16_MEMBER(coin_lockout_4words_w);
- DECLARE_READ16_MEMBER(balcube_dsw_r);
- DECLARE_READ16_MEMBER(gakusai_input_r);
+ void coin_lockout_4words_w(offs_t offset, uint16_t data);
+ uint16_t balcube_dsw_r(offs_t offset);
+ uint16_t gakusai_input_r();
DECLARE_WRITE8_MEMBER(blzntrnd_sh_bankswitch_w);
- DECLARE_WRITE16_MEMBER(puzzlet_irq_enable_w);
+ void puzzlet_irq_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void puzzlet_portb_w(uint16_t data);
- DECLARE_WRITE16_MEMBER(k053936_w);
+ void k053936_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE8_MEMBER(gakusai_oki_bank_hi_w);
DECLARE_WRITE8_MEMBER(gakusai_oki_bank_lo_w);
DECLARE_READ8_MEMBER(gakusai_eeprom_r);
diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h
index c7049a61a58..07456d4d574 100644
--- a/src/mame/includes/micro3d.h
+++ b/src/mame/includes/micro3d.h
@@ -154,25 +154,25 @@ private:
DECLARE_WRITE8_MEMBER(vgb_uart_w);
DECLARE_READ8_MEMBER(vgb_uart_r);
- DECLARE_WRITE32_MEMBER(micro3d_mac1_w);
- DECLARE_READ32_MEMBER(micro3d_mac2_r);
- DECLARE_WRITE32_MEMBER(micro3d_mac2_w);
- DECLARE_READ16_MEMBER(micro3d_encoder_h_r);
- DECLARE_READ16_MEMBER(micro3d_encoder_l_r);
+ void micro3d_mac1_w(uint32_t data);
+ uint32_t micro3d_mac2_r();
+ void micro3d_mac2_w(uint32_t data);
+ uint16_t micro3d_encoder_h_r();
+ uint16_t micro3d_encoder_l_r();
uint8_t adc_volume_r();
- DECLARE_READ16_MEMBER(botss_140000_r);
- DECLARE_READ16_MEMBER(botss_180000_r);
- DECLARE_WRITE16_MEMBER(micro3d_reset_w);
- DECLARE_WRITE16_MEMBER(host_drmath_int_w);
- DECLARE_WRITE32_MEMBER(micro3d_shared_w);
- DECLARE_READ32_MEMBER(micro3d_shared_r);
- DECLARE_WRITE32_MEMBER(drmath_int_w);
- DECLARE_WRITE32_MEMBER(drmath_intr2_ack);
- DECLARE_WRITE16_MEMBER(micro3d_creg_w);
- DECLARE_WRITE16_MEMBER(micro3d_xfer3dk_w);
- DECLARE_WRITE32_MEMBER(micro3d_fifo_w);
- DECLARE_WRITE32_MEMBER(micro3d_alt_fifo_w);
- DECLARE_READ32_MEMBER(micro3d_pipe_r);
+ uint16_t botss_140000_r();
+ uint16_t botss_180000_r();
+ void micro3d_reset_w(uint16_t data);
+ void host_drmath_int_w(uint16_t data);
+ void micro3d_shared_w(offs_t offset, uint32_t data);
+ uint32_t micro3d_shared_r(offs_t offset);
+ void drmath_int_w(uint32_t data);
+ void drmath_intr2_ack(uint32_t data);
+ void micro3d_creg_w(uint16_t data);
+ void micro3d_xfer3dk_w(uint16_t data);
+ void micro3d_fifo_w(uint32_t data);
+ void micro3d_alt_fifo_w(uint32_t data);
+ uint32_t micro3d_pipe_r();
DECLARE_WRITE8_MEMBER(micro3d_snd_dac_a);
DECLARE_WRITE8_MEMBER(micro3d_snd_dac_b);
void micro3d_sound_p1_w(uint8_t data);
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index 005681d6609..167df8a83ff 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -60,23 +60,23 @@ private:
required_shared_ptr<uint16_t> m_nvram;
- DECLARE_WRITE16_MEMBER(midtunit_cmos_enable_w);
- DECLARE_WRITE16_MEMBER(midtunit_cmos_w);
- DECLARE_READ16_MEMBER(midtunit_cmos_r);
- DECLARE_READ16_MEMBER(midtunit_sound_state_r);
- DECLARE_READ16_MEMBER(midtunit_sound_r);
- DECLARE_WRITE16_MEMBER(midtunit_sound_w);
- DECLARE_READ16_MEMBER(mk_prot_r);
- DECLARE_WRITE16_MEMBER(mk_prot_w);
- DECLARE_READ16_MEMBER(mkturbo_prot_r);
- DECLARE_READ16_MEMBER(mk2_prot_const_r);
- DECLARE_READ16_MEMBER(mk2_prot_r);
- DECLARE_READ16_MEMBER(mk2_prot_shift_r);
- DECLARE_WRITE16_MEMBER(mk2_prot_w);
- DECLARE_READ16_MEMBER(nbajam_prot_r);
- DECLARE_WRITE16_MEMBER(nbajam_prot_w);
- DECLARE_WRITE16_MEMBER(jdredd_prot_w);
- DECLARE_READ16_MEMBER(jdredd_prot_r);
+ void midtunit_cmos_enable_w(uint16_t data);
+ void midtunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midtunit_cmos_r(offs_t offset);
+ uint16_t midtunit_sound_state_r();
+ uint16_t midtunit_sound_r();
+ void midtunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mk_prot_r(offs_t offset);
+ void mk_prot_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mkturbo_prot_r();
+ uint16_t mk2_prot_const_r();
+ uint16_t mk2_prot_r();
+ uint16_t mk2_prot_shift_r();
+ void mk2_prot_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t nbajam_prot_r();
+ void nbajam_prot_w(offs_t offset, uint16_t data);
+ void jdredd_prot_w(offs_t offset, uint16_t data);
+ uint16_t jdredd_prot_r(offs_t offset);
void register_state_saving();
void init_tunit_generic(int sound);
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index e3d6d1718fe..c5c71c8793c 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -131,46 +131,46 @@ private:
uint32_t m_wheel_board_u8_latch;
uint8_t m_comm_flags;
uint16_t m_comm_data;
- DECLARE_WRITE32_MEMBER(midvunit_dma_queue_w);
- DECLARE_READ32_MEMBER(midvunit_dma_queue_entries_r);
- DECLARE_READ32_MEMBER(midvunit_dma_trigger_r);
- DECLARE_WRITE32_MEMBER(midvunit_page_control_w);
- DECLARE_READ32_MEMBER(midvunit_page_control_r);
- DECLARE_WRITE32_MEMBER(midvunit_video_control_w);
- DECLARE_READ32_MEMBER(midvunit_scanline_r);
- DECLARE_WRITE32_MEMBER(midvunit_videoram_w);
- DECLARE_READ32_MEMBER(midvunit_videoram_r);
- DECLARE_WRITE32_MEMBER(midvunit_paletteram_w);
- DECLARE_WRITE32_MEMBER(midvunit_textureram_w);
- DECLARE_READ32_MEMBER(midvunit_textureram_r);
- DECLARE_READ32_MEMBER(port0_r);
- DECLARE_READ32_MEMBER(adc_r);
- DECLARE_WRITE32_MEMBER(adc_w);
- DECLARE_WRITE32_MEMBER(midvunit_cmos_protect_w);
- DECLARE_WRITE32_MEMBER(midvunit_cmos_w);
- DECLARE_READ32_MEMBER(midvunit_cmos_r);
- DECLARE_WRITE32_MEMBER(midvunit_control_w);
- DECLARE_WRITE32_MEMBER(crusnwld_control_w);
- DECLARE_WRITE32_MEMBER(midvunit_sound_w);
- DECLARE_READ32_MEMBER(tms32031_control_r);
- DECLARE_WRITE32_MEMBER(tms32031_control_w);
- DECLARE_READ32_MEMBER(crusnwld_serial_status_r);
- DECLARE_READ32_MEMBER(crusnwld_serial_data_r);
- DECLARE_WRITE32_MEMBER(crusnwld_serial_data_w);
- DECLARE_READ32_MEMBER(bit_data_r);
- DECLARE_WRITE32_MEMBER(bit_reset_w);
- DECLARE_READ32_MEMBER(offroadc_serial_status_r);
- DECLARE_READ32_MEMBER(offroadc_serial_data_r);
- DECLARE_WRITE32_MEMBER(offroadc_serial_data_w);
- DECLARE_READ32_MEMBER(midvplus_misc_r);
- DECLARE_WRITE32_MEMBER(midvplus_misc_w);
+ void midvunit_dma_queue_w(uint32_t data);
+ uint32_t midvunit_dma_queue_entries_r();
+ uint32_t midvunit_dma_trigger_r(offs_t offset);
+ void midvunit_page_control_w(uint32_t data);
+ uint32_t midvunit_page_control_r();
+ void midvunit_video_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t midvunit_scanline_r();
+ void midvunit_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t midvunit_videoram_r(offs_t offset);
+ void midvunit_paletteram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void midvunit_textureram_w(offs_t offset, uint32_t data);
+ uint32_t midvunit_textureram_r(offs_t offset);
+ uint32_t port0_r();
+ uint32_t adc_r();
+ void adc_w(uint32_t data);
+ void midvunit_cmos_protect_w(uint32_t data);
+ void midvunit_cmos_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t midvunit_cmos_r(offs_t offset);
+ void midvunit_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void crusnwld_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void midvunit_sound_w(uint32_t data);
+ uint32_t tms32031_control_r(offs_t offset);
+ void tms32031_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t crusnwld_serial_status_r();
+ uint32_t crusnwld_serial_data_r();
+ void crusnwld_serial_data_w(uint32_t data);
+ uint32_t bit_data_r(offs_t offset);
+ void bit_reset_w(uint32_t data);
+ uint32_t offroadc_serial_status_r();
+ uint32_t offroadc_serial_data_r();
+ void offroadc_serial_data_w(uint32_t data);
+ uint32_t midvplus_misc_r(offs_t offset);
+ void midvplus_misc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
void midvplus_xf1_w(uint8_t data);
- DECLARE_READ32_MEMBER(generic_speedup_r);
- DECLARE_READ32_MEMBER(midvunit_wheel_board_r);
- DECLARE_WRITE32_MEMBER(midvunit_wheel_board_w);
- DECLARE_READ32_MEMBER(midvunit_intcs_r);
- DECLARE_READ32_MEMBER(midvunit_comcs_r);
- DECLARE_WRITE32_MEMBER(midvunit_comcs_w);
+ uint32_t generic_speedup_r(offs_t offset);
+ uint32_t midvunit_wheel_board_r();
+ void midvunit_wheel_board_w(uint32_t data);
+ uint32_t midvunit_intcs_r();
+ uint32_t midvunit_comcs_r(offs_t offset);
+ void midvunit_comcs_w(offs_t offset, uint32_t data);
void set_input(const char *s);
void init_crusnwld_common(offs_t speedup);
void init_crusnusa_common(offs_t speedup);
diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h
index 8545708a63c..65a30559968 100644
--- a/src/mame/includes/midwunit.h
+++ b/src/mame/includes/midwunit.h
@@ -43,18 +43,18 @@ protected:
virtual void machine_reset() override;
private:
- DECLARE_WRITE16_MEMBER(midwunit_cmos_enable_w);
- DECLARE_WRITE16_MEMBER(midwunit_cmos_w);
- DECLARE_READ16_MEMBER(midwunit_cmos_r);
- DECLARE_WRITE16_MEMBER(midwunit_io_w);
- DECLARE_READ16_MEMBER(midwunit_io_r);
- DECLARE_READ16_MEMBER(midwunit_security_r);
- DECLARE_WRITE16_MEMBER(midwunit_security_w);
- DECLARE_READ16_MEMBER(midwunit_sound_r);
- DECLARE_READ16_MEMBER(midwunit_sound_state_r);
- DECLARE_WRITE16_MEMBER(midwunit_sound_w);
- DECLARE_WRITE16_MEMBER(umk3_palette_hack_w);
- DECLARE_WRITE16_MEMBER(wwfmania_io_0_w);
+ void midwunit_cmos_enable_w(uint16_t data);
+ void midwunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midwunit_cmos_r(offs_t offset);
+ void midwunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midwunit_io_r(offs_t offset);
+ uint16_t midwunit_security_r();
+ void midwunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midwunit_sound_r();
+ uint16_t midwunit_sound_state_r();
+ void midwunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void umk3_palette_hack_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wwfmania_io_0_w(uint16_t data);
void init_mk3_common();
void main_map(address_map &map);
diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h
index 9baf2f40484..8a9565aae35 100644
--- a/src/mame/includes/midxunit.h
+++ b/src/mame/includes/midxunit.h
@@ -32,20 +32,20 @@ protected:
virtual void machine_reset() override;
private:
- DECLARE_READ16_MEMBER(midxunit_cmos_r);
- DECLARE_WRITE16_MEMBER(midxunit_cmos_w);
- DECLARE_WRITE16_MEMBER(midxunit_io_w);
- DECLARE_WRITE16_MEMBER(midxunit_unknown_w);
+ uint16_t midxunit_cmos_r(offs_t offset);
+ void midxunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midxunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midxunit_unknown_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(adc_int_w);
- DECLARE_READ16_MEMBER(midxunit_status_r);
- DECLARE_READ16_MEMBER(midxunit_uart_r);
- DECLARE_WRITE16_MEMBER(midxunit_uart_w);
- DECLARE_READ16_MEMBER(midxunit_security_r);
- DECLARE_WRITE16_MEMBER(midxunit_security_w);
- DECLARE_WRITE16_MEMBER(midxunit_security_clock_w);
- DECLARE_READ16_MEMBER(midxunit_sound_r);
- DECLARE_READ16_MEMBER(midxunit_sound_state_r);
- DECLARE_WRITE16_MEMBER(midxunit_sound_w);
+ uint16_t midxunit_status_r();
+ uint16_t midxunit_uart_r(offs_t offset);
+ void midxunit_uart_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midxunit_security_r();
+ void midxunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midxunit_security_clock_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midxunit_sound_r();
+ uint16_t midxunit_sound_state_r();
+ void midxunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(midxunit_dcs_output_full);
void main_map(address_map &map);
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index 7e6b531bd1d..322348345ff 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -134,28 +134,28 @@ private:
dma_state_t m_dma_state;
emu_timer *m_dma_timer;
emu_timer *m_autoerase_line_timer;
- DECLARE_WRITE16_MEMBER(midyunit_cmos_w);
- DECLARE_READ16_MEMBER(midyunit_cmos_r);
- DECLARE_WRITE16_MEMBER(midyunit_cmos_enable_w);
- DECLARE_READ16_MEMBER(midyunit_protection_r);
- DECLARE_READ16_MEMBER(midyunit_input_r);
- DECLARE_WRITE16_MEMBER(midyunit_sound_w);
- DECLARE_READ16_MEMBER(term2_input_r);
- DECLARE_WRITE16_MEMBER(term2_sound_w);
- DECLARE_WRITE16_MEMBER(term2_hack_w);
- DECLARE_WRITE16_MEMBER(term2la3_hack_w);
- DECLARE_WRITE16_MEMBER(term2la2_hack_w);
- DECLARE_WRITE16_MEMBER(term2la1_hack_w);
- DECLARE_WRITE8_MEMBER(cvsd_protection_w);
- DECLARE_READ16_MEMBER(mkturbo_prot_r);
- DECLARE_READ16_MEMBER(midyunit_gfxrom_r);
- DECLARE_WRITE16_MEMBER(midyunit_vram_w);
- DECLARE_READ16_MEMBER(midyunit_vram_r);
- DECLARE_WRITE16_MEMBER(midyunit_control_w);
- DECLARE_WRITE16_MEMBER(midyunit_paletteram_w);
- DECLARE_READ16_MEMBER(midyunit_dma_r);
- DECLARE_WRITE16_MEMBER(midyunit_dma_w);
- DECLARE_WRITE8_MEMBER(yawdim_oki_bank_w);
+ void midyunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midyunit_cmos_r(offs_t offset);
+ void midyunit_cmos_enable_w(address_space &space, uint16_t data);
+ uint16_t midyunit_protection_r();
+ uint16_t midyunit_input_r(offs_t offset);
+ void midyunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t term2_input_r(offs_t offset);
+ void term2_sound_w(offs_t offset, uint16_t data);
+ void term2_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void term2la3_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void term2la2_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void term2la1_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cvsd_protection_w(offs_t offset, uint8_t data);
+ uint16_t mkturbo_prot_r();
+ uint16_t midyunit_gfxrom_r(offs_t offset);
+ void midyunit_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midyunit_vram_r(offs_t offset);
+ void midyunit_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midyunit_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midyunit_dma_r(offs_t offset);
+ void midyunit_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void yawdim_oki_bank_w(uint8_t data);
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update);
@@ -174,7 +174,7 @@ private:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
void dma_draw(uint16_t command);
void init_generic(int bpp, int sound, int prot_start, int prot_end);
- void term2_init_common(write16_delegate hack_w);
+ void term2_init_common(write16s_delegate hack_w);
};
#endif // MAME_INCLUDES_MIDYUNIT_H
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index b33f7481b45..b275fbca7bf 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -99,30 +99,30 @@ public:
required_shared_ptr<uint32_t> m_tms32031_control;
optional_shared_ptr<uint32_t> m_zeusbase;
- DECLARE_WRITE32_MEMBER(cmos_w);
- DECLARE_READ32_MEMBER(cmos_r);
- DECLARE_WRITE32_MEMBER(cmos_protect_w);
- DECLARE_READ32_MEMBER(zpram_r);
- DECLARE_WRITE32_MEMBER(zpram_w);
- DECLARE_READ32_MEMBER(disk_asic_r);
- DECLARE_WRITE32_MEMBER(disk_asic_w);
- DECLARE_READ32_MEMBER(disk_asic_jr_r);
- DECLARE_WRITE32_MEMBER(disk_asic_jr_w);
- DECLARE_READ32_MEMBER(firewire_r);
- DECLARE_WRITE32_MEMBER(firewire_w);
- DECLARE_READ32_MEMBER(tms32031_control_r);
- DECLARE_WRITE32_MEMBER(tms32031_control_w);
- DECLARE_WRITE32_MEMBER(keypad_select_w);
- DECLARE_READ32_MEMBER(analog_r);
- DECLARE_WRITE32_MEMBER(analog_w);
- DECLARE_WRITE32_MEMBER(invasn_gun_w);
- DECLARE_READ32_MEMBER(invasn_gun_r);
- DECLARE_READ32_MEMBER(zeus_r);
- DECLARE_WRITE32_MEMBER(zeus_w);
+ void cmos_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cmos_r(offs_t offset);
+ void cmos_protect_w(uint32_t data);
+ uint32_t zpram_r(offs_t offset);
+ void zpram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t disk_asic_r(offs_t offset);
+ void disk_asic_w(offs_t offset, uint32_t data);
+ uint32_t disk_asic_jr_r(offs_t offset);
+ void disk_asic_jr_w(offs_t offset, uint32_t data);
+ uint32_t firewire_r(offs_t offset);
+ void firewire_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t tms32031_control_r(offs_t offset);
+ void tms32031_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void keypad_select_w(offs_t offset, uint32_t data);
+ uint32_t analog_r(offs_t offset);
+ void analog_w(uint32_t data);
+ void invasn_gun_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t invasn_gun_r();
+ uint32_t zeus_r(offs_t offset);
+ void zeus_w(offs_t offset, uint32_t data);
DECLARE_CUSTOM_INPUT_MEMBER(custom_49way_r);
DECLARE_CUSTOM_INPUT_MEMBER(keypad_r);
- DECLARE_READ32_MEMBER(grid_keypad_r);
- DECLARE_READ32_MEMBER(trackball_r);
+ uint32_t grid_keypad_r(offs_t offset);
+ uint32_t trackball_r(offs_t offset);
void init_invasn();
void init_mk4();
DECLARE_MACHINE_START(midzeus);
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index e7109b98c90..ed5dc6e5182 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -100,40 +100,35 @@ private:
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
- DECLARE_WRITE16_MEMBER(bank_w);
+ void bank_w(offs_t offset, u16 data, u16 mem_mask = ~0);
TIMER_DEVICE_CALLBACK_MEMBER(model1_interrupt);
IRQ_CALLBACK_MEMBER(irq_callback);
// TGP
- DECLARE_READ16_MEMBER(fifoin_status_r);
-
- DECLARE_READ16_MEMBER(v60_copro_fifo_r);
- DECLARE_WRITE16_MEMBER(v60_copro_fifo_w);
- DECLARE_READ16_MEMBER(v60_copro_ram_adr_r);
- DECLARE_WRITE16_MEMBER(v60_copro_ram_adr_w);
- DECLARE_READ16_MEMBER(v60_copro_ram_r);
- DECLARE_WRITE16_MEMBER(v60_copro_ram_w);
-
- DECLARE_READ32_MEMBER(copro_ram_r);
- DECLARE_WRITE32_MEMBER(copro_ram_w);
- DECLARE_READ32_MEMBER(copro_fifoin_pop);
- DECLARE_WRITE32_MEMBER(copro_fifoout_push);
-
- DECLARE_WRITE32_MEMBER(copro_sincos_w);
- DECLARE_READ32_MEMBER(copro_sincos_r);
- DECLARE_WRITE32_MEMBER(copro_inv_w);
- DECLARE_READ32_MEMBER(copro_inv_r);
- DECLARE_WRITE32_MEMBER(copro_isqrt_w);
- DECLARE_READ32_MEMBER(copro_isqrt_r);
- DECLARE_WRITE32_MEMBER(copro_atan_w);
- DECLARE_READ32_MEMBER(copro_atan_r);
- DECLARE_WRITE32_MEMBER(copro_data_w);
- DECLARE_READ32_MEMBER(copro_data_r);
- DECLARE_WRITE32_MEMBER(copro_ramadr_w);
- DECLARE_READ32_MEMBER(copro_ramadr_r);
- DECLARE_WRITE32_MEMBER(copro_ramdata_w);
- DECLARE_READ32_MEMBER(copro_ramdata_r);
+ u16 fifoin_status_r();
+
+ u16 v60_copro_fifo_r(offs_t offset);
+ void v60_copro_fifo_w(offs_t offset, u16 data);
+ u16 v60_copro_ram_adr_r();
+ void v60_copro_ram_adr_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 v60_copro_ram_r(offs_t offset);
+ void v60_copro_ram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+
+ void copro_sincos_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_sincos_r(offs_t offset);
+ void copro_inv_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_inv_r(offs_t offset);
+ void copro_isqrt_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_isqrt_r(offs_t offset);
+ void copro_atan_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_atan_r();
+ void copro_data_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_data_r(offs_t offset);
+ void copro_ramadr_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_ramadr_r(offs_t offset);
+ void copro_ramdata_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_ramdata_r(offs_t offset);
void copro_reset();
@@ -150,8 +145,8 @@ private:
// Rendering
virtual void video_start() override;
- DECLARE_READ16_MEMBER(model1_listctl_r);
- DECLARE_WRITE16_MEMBER(model1_listctl_w);
+ u16 model1_listctl_r(offs_t offset);
+ void model1_listctl_w(offs_t offset, u16 data, u16 mem_mask = ~0);
uint32_t screen_update_model1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_model1);
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 34ff8d6e633..761803cf07e 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -65,12 +65,12 @@ public:
{ }
/* Public for access by the rendering functions */
- required_shared_ptr<uint32_t> m_textureram0;
- required_shared_ptr<uint32_t> m_textureram1;
- std::unique_ptr<uint16_t[]> m_palram;
- std::unique_ptr<uint16_t[]> m_colorxlat;
- std::unique_ptr<uint16_t[]> m_lumaram;
- uint8_t m_gamma_table[256];
+ required_shared_ptr<u32> m_textureram0;
+ required_shared_ptr<u32> m_textureram1;
+ std::unique_ptr<u16[]> m_palram;
+ std::unique_ptr<u16[]> m_colorxlat;
+ std::unique_ptr<u16[]> m_lumaram;
+ u8 m_gamma_table[256];
std::unique_ptr<model2_renderer> m_poly;
/* Public for access by the ioports */
@@ -78,7 +78,7 @@ public:
/* Public for access by MCFG */
TIMER_DEVICE_CALLBACK_MEMBER(model2_interrupt);
- uint16_t crypt_read_callback(uint32_t addr);
+ u16 crypt_read_callback(u32 addr);
DECLARE_MACHINE_START(model2);
@@ -97,11 +97,11 @@ protected:
virtual void machine_start() override;
virtual void machine_reset() override;
- required_shared_ptr<uint32_t> m_workram;
- required_shared_ptr<uint32_t> m_bufferram;
- std::unique_ptr<uint16_t[]> m_fbvramA;
- std::unique_ptr<uint16_t[]> m_fbvramB;
- optional_shared_ptr<uint16_t> m_soundram;
+ required_shared_ptr<u32> m_workram;
+ required_shared_ptr<u32> m_bufferram;
+ std::unique_ptr<u16[]> m_fbvramA;
+ std::unique_ptr<u16[]> m_fbvramB;
+ optional_shared_ptr<u16> m_soundram;
required_device<i960_cpu_device> m_maincpu;
optional_device<dsbz80_device> m_dsbz80; // Z80-based MPEG Digital Sound Board
@@ -126,101 +126,99 @@ protected:
optional_ioport m_gears;
optional_ioport_array<4> m_lightgun_ports;
- uint32_t m_timervals[4];
- uint32_t m_timerorig[4];
+ u32 m_timervals[4];
+ u32 m_timerorig[4];
int m_timerrun[4];
int m_ctrlmode;
- uint16_t m_cmd_data;
- uint8_t m_driveio_comm_data;
+ u16 m_cmd_data;
+ u8 m_driveio_comm_data;
int m_iop_write_num;
- uint32_t m_iop_data;
+ u32 m_iop_data;
int m_geo_iop_write_num;
- uint32_t m_geo_iop_data;
+ u32 m_geo_iop_data;
- uint32_t m_geo_read_start_address;
- uint32_t m_geo_write_start_address;
+ u32 m_geo_read_start_address;
+ u32 m_geo_write_start_address;
std::unique_ptr<raster_state> m_raster;
std::unique_ptr<geo_state> m_geo;
bitmap_rgb32 m_sys24_bitmap;
-// uint32_t m_soundack;
+// u32 m_soundack;
void model2_check_irq_state();
- void model2_check_irqack_state(uint32_t data);
- uint8_t m_gearsel;
- uint8_t m_lightgun_mux;
+ void model2_check_irqack_state(u32 data);
+ u8 m_gearsel;
+ u8 m_lightgun_mux;
// Coprocessor communications
- DECLARE_READ32_MEMBER(copro_prg_r);
- DECLARE_WRITE32_MEMBER(copro_prg_w);
- DECLARE_READ32_MEMBER(copro_ctl1_r);
- DECLARE_WRITE32_MEMBER(copro_ctl1_w);
- DECLARE_READ32_MEMBER(copro_status_r);
+ u32 copro_prg_r();
+ u32 copro_ctl1_r();
+ void copro_ctl1_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_status_r();
// Geometrizer communications
- DECLARE_WRITE32_MEMBER(geo_ctl1_w);
- DECLARE_READ32_MEMBER(geo_prg_r);
- DECLARE_WRITE32_MEMBER(geo_prg_w);
- DECLARE_READ32_MEMBER(geo_r);
- DECLARE_WRITE32_MEMBER(geo_w);
+ void geo_ctl1_w(u32 data);
+ u32 geo_prg_r(offs_t offset);
+ void geo_prg_w(u32 data);
+ u32 geo_r(offs_t offset);
+ void geo_w(offs_t offset, u32 data);
// Everything else
- DECLARE_READ32_MEMBER(timers_r);
- DECLARE_WRITE32_MEMBER(timers_w);
- DECLARE_READ16_MEMBER(palette_r);
- DECLARE_WRITE16_MEMBER(palette_w);
- DECLARE_READ16_MEMBER(colorxlat_r);
- DECLARE_WRITE16_MEMBER(colorxlat_w);
- void eeprom_w(uint8_t data);
- uint8_t in0_r();
- DECLARE_READ32_MEMBER(fifo_control_2a_r);
- DECLARE_READ32_MEMBER(videoctl_r);
- DECLARE_WRITE32_MEMBER(videoctl_w);
- uint8_t rchase2_drive_board_r();
- void rchase2_drive_board_w(uint8_t data);
- void drive_board_w(uint8_t data);
- uint8_t lightgun_data_r(offs_t offset);
- uint8_t lightgun_mux_r();
- void lightgun_mux_w(uint8_t data);
- uint8_t lightgun_offscreen_r(offs_t offset);
- DECLARE_READ32_MEMBER(irq_request_r);
- DECLARE_WRITE32_MEMBER(irq_ack_w);
- DECLARE_READ32_MEMBER(irq_enable_r);
- DECLARE_WRITE32_MEMBER(irq_enable_w);
- DECLARE_READ32_MEMBER(model2_serial_r);
- DECLARE_WRITE32_MEMBER(model2o_serial_w);
- DECLARE_WRITE32_MEMBER(model2_serial_w);
- void horizontal_sync_w(uint16_t data);
- void vertical_sync_w(uint16_t data);
- DECLARE_READ32_MEMBER(doa_prot_r);
- DECLARE_READ32_MEMBER(doa_unk_r);
+ u32 timers_r(offs_t offset);
+ void timers_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u16 palette_r(offs_t offset);
+ void palette_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 colorxlat_r(offs_t offset);
+ void colorxlat_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void eeprom_w(u8 data);
+ u8 in0_r();
+ u32 fifo_control_2a_r();
+ u32 videoctl_r();
+ void videoctl_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u8 rchase2_drive_board_r();
+ void rchase2_drive_board_w(u8 data);
+ void drive_board_w(u8 data);
+ u8 lightgun_data_r(offs_t offset);
+ u8 lightgun_mux_r();
+ void lightgun_mux_w(u8 data);
+ u8 lightgun_offscreen_r(offs_t offset);
+ u32 irq_request_r();
+ void irq_ack_w(u32 data);
+ u32 irq_enable_r();
+ void irq_enable_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 model2_serial_r(offs_t offset, u32 mem_mask = ~0);
+ void model2_serial_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void horizontal_sync_w(u16 data);
+ void vertical_sync_w(u16 data);
+ u32 doa_prot_r(offs_t offset, u32 mem_mask = ~0);
+ u32 doa_unk_r();
void sega_0229_map(address_map &map);
int m_prot_a;
void raster_init(memory_region *texture_rom);
void geo_init(memory_region *polygon_rom);
- DECLARE_READ32_MEMBER(render_mode_r);
- DECLARE_WRITE32_MEMBER(render_mode_w);
- DECLARE_READ16_MEMBER(lumaram_r);
- DECLARE_WRITE16_MEMBER(lumaram_w);
- DECLARE_READ16_MEMBER(fbvram_bankA_r);
- DECLARE_WRITE16_MEMBER(fbvram_bankA_w);
- DECLARE_READ16_MEMBER(fbvram_bankB_r);
- DECLARE_WRITE16_MEMBER(fbvram_bankB_w);
- DECLARE_WRITE32_MEMBER(model2_3d_zclip_w);
- DECLARE_WRITE16_MEMBER(model2snd_ctrl);
+ u32 render_mode_r();
+ void render_mode_w(u32 data);
+ u16 lumaram_r(offs_t offset);
+ void lumaram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 fbvram_bankA_r(offs_t offset);
+ void fbvram_bankA_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 fbvram_bankB_r(offs_t offset);
+ void fbvram_bankB_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void model2_3d_zclip_w(u32 data);
+ void model2snd_ctrl(u16 data);
DECLARE_READ8_MEMBER(tgpid_r);
- DECLARE_READ32_MEMBER(polygon_count_r);
+ u32 polygon_count_r();
- uint8_t driveio_portg_r();
- uint8_t driveio_porth_r();
- void driveio_port_w(uint8_t data);
- void push_geo_data(uint32_t data);
+ u8 driveio_portg_r();
+ u8 driveio_porth_r();
+ void driveio_port_w(u8 data);
+ void push_geo_data(u32 data);
DECLARE_VIDEO_START(model2);
void reset_model2_scsp();
- uint32_t screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ u32 screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// DECLARE_WRITE_LINE_MEMBER(screen_vblank_model2);
// DECLARE_WRITE_LINE_MEMBER(sound_ready_w);
TIMER_DEVICE_CALLBACK_MEMBER(model2_timer_cb);
- void scsp_irq(offs_t offset, uint8_t data);
+ void scsp_irq(offs_t offset, u8 data);
void model2_3d_frame_start( void );
void geo_parse( void );
@@ -250,10 +248,10 @@ protected:
virtual void video_start() override;
- uint32_t m_intreq;
- uint32_t m_intena;
- uint32_t m_coproctl;
- uint32_t m_coprocnt;
+ u32 m_intreq;
+ u32 m_intena;
+ u32 m_coproctl;
+ u32 m_coprocnt;
virtual void copro_halt() = 0;
virtual void copro_boot() = 0;
@@ -261,55 +259,55 @@ protected:
private:
void tri_list_dump(FILE *dst);
- uint32_t m_geoctl;
- uint32_t m_geocnt;
- uint32_t m_videocontrol;
+ u32 m_geoctl;
+ u32 m_geocnt;
+ u32 m_videocontrol;
bool m_render_unk;
bool m_render_mode;
bool m_render_test_mode;
int16 m_crtc_xoffset, m_crtc_yoffset;
- uint32_t *geo_process_command( geo_state *geo, uint32_t opcode, uint32_t *input, bool *end_code );
+ u32 *geo_process_command( geo_state *geo, u32 opcode, u32 *input, bool *end_code );
// geo commands
- uint32_t *geo_nop( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_object_data( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_direct_data( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_window_data( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_texture_data( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_polygon_data( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_texture_parameters( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_mode( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_zsort_mode( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_focal_distance( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_light_source( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_matrix_write( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_translate_write( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_data_mem_push( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_test( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_end( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_dummy( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_log_data( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_lod( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_code_upload( geo_state *geo, uint32_t opcode, uint32_t *input );
- uint32_t *geo_code_jump( geo_state *geo, uint32_t opcode, uint32_t *input );
+ u32 *geo_nop( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_object_data( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_direct_data( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_window_data( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_texture_data( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_polygon_data( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_texture_parameters( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_mode( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_zsort_mode( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_focal_distance( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_light_source( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_matrix_write( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_translate_write( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_data_mem_push( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_test( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_end( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_dummy( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_log_data( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_lod( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_code_upload( geo_state *geo, u32 opcode, u32 *input );
+ u32 *geo_code_jump( geo_state *geo, u32 opcode, u32 *input );
// geo code drawing paths
- void geo_parse_np_ns( geo_state *geo, uint32_t *input, uint32_t count );
- void geo_parse_np_s( geo_state *geo, uint32_t *input, uint32_t count );
- void geo_parse_nn_ns( geo_state *geo, uint32_t *input, uint32_t count );
- void geo_parse_nn_s( geo_state *geo, uint32_t *input, uint32_t count );
+ void geo_parse_np_ns( geo_state *geo, u32 *input, u32 count );
+ void geo_parse_np_s( geo_state *geo, u32 *input, u32 count );
+ void geo_parse_nn_ns( geo_state *geo, u32 *input, u32 count );
+ void geo_parse_nn_s( geo_state *geo, u32 *input, u32 count );
// raster functions
// main data input port
- void model2_3d_push( raster_state *raster, uint32_t input );
+ void model2_3d_push( raster_state *raster, u32 input );
// quad & triangle push paths
- void model2_3d_process_quad( raster_state *raster, uint32_t attr );
- void model2_3d_process_triangle( raster_state *raster, uint32_t attr );
+ void model2_3d_process_quad( raster_state *raster, u32 attr );
+ void model2_3d_process_triangle( raster_state *raster, u32 attr );
// inliners
inline void model2_3d_project( triangle *tri );
- inline uint16_t float_to_zval( float floatval );
- inline bool check_culling( raster_state *raster, uint32_t attr, float min_z, float max_z );
+ inline u16 float_to_zval( float floatval );
+ inline bool check_culling( raster_state *raster, u32 attr, float min_z, float max_z );
};
/*****************************
@@ -334,8 +332,8 @@ protected:
virtual void machine_reset() override;
required_device<mb86234_device> m_copro_tgp;
- required_shared_ptr<uint32_t> m_copro_tgp_program;
- required_region_ptr<uint32_t> m_copro_tgp_tables;
+ required_shared_ptr<u32> m_copro_tgp_program;
+ required_region_ptr<u32> m_copro_tgp_tables;
required_device<address_map_bank_device> m_copro_tgp_bank;
u32 m_copro_tgp_bank_reg;
@@ -344,28 +342,24 @@ protected:
u32 m_copro_isqrt_base;
u32 m_copro_atan_base[4];
- DECLARE_READ32_MEMBER(copro_tgp_buffer_r);
- DECLARE_WRITE32_MEMBER(copro_tgp_buffer_w);
- DECLARE_WRITE32_MEMBER(copro_function_port_w);
- DECLARE_READ32_MEMBER(copro_fifo_r);
- DECLARE_WRITE32_MEMBER(copro_fifo_w);
- DECLARE_WRITE32_MEMBER(tex0_w);
- DECLARE_WRITE32_MEMBER(tex1_w);
-
- DECLARE_READ32_MEMBER(copro_tgp_fifoin_pop);
- DECLARE_WRITE32_MEMBER(copro_tgp_fifoout_push);
- DECLARE_WRITE32_MEMBER(copro_tgp_bank_w);
- DECLARE_READ32_MEMBER(copro_tgp_memory_r);
- DECLARE_WRITE32_MEMBER(copro_tgp_memory_w);
-
- DECLARE_WRITE32_MEMBER(copro_sincos_w);
- DECLARE_READ32_MEMBER(copro_sincos_r);
- DECLARE_WRITE32_MEMBER(copro_inv_w);
- DECLARE_READ32_MEMBER(copro_inv_r);
- DECLARE_WRITE32_MEMBER(copro_isqrt_w);
- DECLARE_READ32_MEMBER(copro_isqrt_r);
- DECLARE_WRITE32_MEMBER(copro_atan_w);
- DECLARE_READ32_MEMBER(copro_atan_r);
+ void copro_function_port_w(offs_t offset, u32 data);
+ u32 copro_fifo_r();
+ void copro_fifo_w(u32 data);
+ void tex0_w(offs_t offset, u32 data);
+ void tex1_w(offs_t offset, u32 data);
+
+ void copro_tgp_bank_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_tgp_memory_r(offs_t offset);
+ void copro_tgp_memory_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+
+ void copro_sincos_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_sincos_r(offs_t offset);
+ void copro_inv_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_inv_r(offs_t offset);
+ void copro_isqrt_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_isqrt_r(offs_t offset);
+ void copro_atan_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 copro_atan_r();
void model2_tgp_mem(address_map &map);
@@ -398,10 +392,10 @@ public:
void vcop(machine_config &config);
protected:
- DECLARE_READ32_MEMBER(fifo_control_2o_r);
- void daytona_output_w(uint8_t data);
- void desert_output_w(uint8_t data);
- void vcop_output_w(uint8_t data);
+ u32 fifo_control_2o_r();
+ void daytona_output_w(u8 data);
+ void desert_output_w(u8 data);
+ void vcop_output_w(u8 data);
void model2o_mem(address_map &map);
};
@@ -419,7 +413,7 @@ public:
: model2o_state(mconfig, type, tag)
{}
- DECLARE_READ32_MEMBER(maxx_r);
+ u32 maxx_r(offs_t offset, u32 mem_mask = ~0);
void daytona_maxx(machine_config &config);
void model2o_maxx_mem(address_map &map);
@@ -515,12 +509,12 @@ protected:
required_device<adsp21062_device> m_copro_adsp;
- DECLARE_WRITE32_MEMBER(copro_function_port_w);
- DECLARE_READ32_MEMBER(copro_fifo_r);
- DECLARE_WRITE32_MEMBER(copro_fifo_w);
- DECLARE_WRITE32_MEMBER(copro_sharc_iop_w);
- DECLARE_READ32_MEMBER(copro_sharc_buffer_r);
- DECLARE_WRITE32_MEMBER(copro_sharc_buffer_w);
+ void copro_function_port_w(offs_t offset, u32 data);
+ u32 copro_fifo_r();
+ void copro_fifo_w(u32 data);
+ void copro_sharc_iop_w(offs_t offset, u32 data);
+ u32 copro_sharc_buffer_r(offs_t offset);
+ void copro_sharc_buffer_w(offs_t offset, u32 data);
void model2b_crx_mem(address_map &map);
void model2b_5881_mem(address_map &map);
@@ -569,11 +563,11 @@ protected:
virtual void machine_reset() override;
required_device<mb86235_device> m_copro_tgpx4;
- required_shared_ptr<uint64_t> m_copro_tgpx4_program;
+ required_shared_ptr<u64> m_copro_tgpx4_program;
- DECLARE_WRITE32_MEMBER(copro_function_port_w);
- DECLARE_READ32_MEMBER(copro_fifo_r);
- DECLARE_WRITE32_MEMBER(copro_fifo_w);
+ void copro_function_port_w(offs_t offset, u32 data);
+ u32 copro_fifo_r();
+ void copro_fifo_w(u32 data);
TIMER_DEVICE_CALLBACK_MEMBER(model2c_interrupt);
@@ -595,23 +589,23 @@ protected:
struct m2_poly_extra_data
{
model2_state * state;
- uint32_t lumabase;
- uint32_t colorbase;
- uint32_t * texsheet;
- uint32_t texwidth;
- uint32_t texheight;
- uint32_t texx, texy;
- uint8_t texmirrorx;
- uint8_t texmirrory;
+ u32 lumabase;
+ u32 colorbase;
+ u32 * texsheet;
+ u32 texwidth;
+ u32 texheight;
+ u32 texx, texy;
+ u8 texmirrorx;
+ u8 texmirrory;
};
-static inline uint16_t get_texel( uint32_t base_x, uint32_t base_y, int x, int y, uint32_t *sheet )
+static inline u16 get_texel( u32 base_x, u32 base_y, int x, int y, u32 *sheet )
{
- uint32_t baseoffs = ((base_y/2)*512)+(base_x/2);
- uint32_t texeloffs = ((y/2)*512)+(x/2);
- uint32_t offset = baseoffs + texeloffs;
- uint32_t texel = sheet[offset>>1];
+ u32 baseoffs = ((base_y/2)*512)+(base_x/2);
+ u32 texeloffs = ((y/2)*512)+(x/2);
+ u32 offset = baseoffs + texeloffs;
+ u32 texel = sheet[offset>>1];
if ( offset & 1 )
texel >>= 16;
@@ -738,7 +732,7 @@ struct texture_parameter
{
float diffuse;
float ambient;
- uint32_t specular_control;
+ u32 specular_control;
float specular_scale;
};
@@ -746,9 +740,9 @@ struct triangle
{
void * next;
poly_vertex v[3];
- uint16_t z;
- uint16_t texheader[4];
- uint8_t luma;
+ u16 z;
+ u16 texheader[4];
+ u8 luma;
int16_t viewport[4];
int16_t center[2];
};
@@ -756,9 +750,9 @@ struct triangle
struct quad_m2
{
poly_vertex v[4];
- uint16_t z;
- uint16_t texheader[4];
- uint8_t luma;
+ u16 z;
+ u16 texheader[4];
+ u8 luma;
};
/*******************************************
@@ -771,26 +765,26 @@ struct quad_m2
struct raster_state
{
-// uint32_t mode; /* bit 0 = Test Mode, bit 2 = Switch 60Hz(1)/30Hz(0) operation */
- uint16_t *texture_rom; /* Texture ROM pointer */
- uint32_t texture_rom_mask; /* Texture ROM mask */
+// u32 mode; /* bit 0 = Test Mode, bit 2 = Switch 60Hz(1)/30Hz(0) operation */
+ u16 *texture_rom; /* Texture ROM pointer */
+ u32 texture_rom_mask; /* Texture ROM mask */
int16_t viewport[4]; /* View port (startx,starty,endx,endy) */
int16_t center[4][2]; /* Centers (eye 0[x,y],1[x,y],2[x,y],3[x,y]) */
- uint16_t center_sel; /* Selected center */
- uint32_t reverse; /* Left/Right Reverse */
+ u16 center_sel; /* Selected center */
+ u32 reverse; /* Left/Right Reverse */
float z_adjust; /* ZSort Mode */
float triangle_z; /* Current Triangle z value */
- uint8_t master_z_clip; /* Master Z-Clip value */
- uint32_t cur_command; /* Current command */
- uint32_t command_buffer[32]; /* Command buffer */
- uint32_t command_index; /* Command buffer index */
+ u8 master_z_clip; /* Master Z-Clip value */
+ u32 cur_command; /* Current command */
+ u32 command_buffer[32]; /* Command buffer */
+ u32 command_index; /* Command buffer index */
triangle tri_list[MAX_TRIANGLES]; /* Triangle list */
- uint32_t tri_list_index; /* Triangle list index */
+ u32 tri_list_index; /* Triangle list index */
triangle *tri_sorted_list[0x10000]; /* Sorted Triangle list */
- uint16_t min_z; /* Minimum sortable Z value */
- uint16_t max_z; /* Maximum sortable Z value */
- uint16_t texture_ram[0x10000]; /* Texture RAM pointer */
- uint8_t log_ram[0x40000]; /* Log RAM pointer */
+ u16 min_z; /* Minimum sortable Z value */
+ u16 max_z; /* Maximum sortable Z value */
+ u16 texture_ram[0x10000]; /* Texture RAM pointer */
+ u8 log_ram[0x40000]; /* Log RAM pointer */
};
/*******************************************
@@ -802,17 +796,17 @@ struct raster_state
struct geo_state
{
raster_state * raster;
- uint32_t mode; /* bit 0 = Enable Specular, bit 1 = Calculate Normals */
- uint32_t * polygon_rom; /* Polygon ROM pointer */
- uint32_t polygon_rom_mask; /* Polygon ROM mask */
+ u32 mode; /* bit 0 = Enable Specular, bit 1 = Calculate Normals */
+ u32 * polygon_rom; /* Polygon ROM pointer */
+ u32 polygon_rom_mask; /* Polygon ROM mask */
float matrix[12]; /* Current Transformation Matrix */
poly_vertex focus; /* Focus (x,y) */
poly_vertex light; /* Light Vector */
float lod; /* LOD */
float coef_table[32]; /* Distane Coefficient table */
texture_parameter texture_parameters[32]; /* Texture parameters */
- uint32_t polygon_ram0[0x8000]; /* Fast Polygon RAM pointer */
- uint32_t polygon_ram1[0x8000]; /* Slow Polygon RAM pointer */
+ u32 polygon_ram0[0x8000]; /* Fast Polygon RAM pointer */
+ u32 polygon_ram1[0x8000]; /* Slow Polygon RAM pointer */
model2_state *state;
};
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index 40469919aa3..b1121701487 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -253,37 +253,37 @@ private:
int m_viewport_tri_index[4];
int m_viewport_tri_alpha_index[4];
- DECLARE_READ32_MEMBER(rtc72421_r);
- DECLARE_WRITE32_MEMBER(rtc72421_w);
- DECLARE_READ64_MEMBER(model3_char_r);
- DECLARE_WRITE64_MEMBER(model3_char_w);
- DECLARE_READ64_MEMBER(model3_tile_r);
- DECLARE_WRITE64_MEMBER(model3_tile_w);
- DECLARE_READ64_MEMBER(model3_vid_reg_r);
- DECLARE_WRITE64_MEMBER(model3_vid_reg_w);
- DECLARE_WRITE64_MEMBER(model3_palette_w);
- DECLARE_READ64_MEMBER(model3_palette_r);
- DECLARE_WRITE64_MEMBER(real3d_display_list_w);
- DECLARE_WRITE64_MEMBER(real3d_polygon_ram_w);
- DECLARE_WRITE64_MEMBER(real3d_cmd_w);
- DECLARE_READ64_MEMBER(mpc105_addr_r);
- DECLARE_WRITE64_MEMBER(mpc105_addr_w);
- DECLARE_READ64_MEMBER(mpc105_data_r);
- DECLARE_WRITE64_MEMBER(mpc105_data_w);
- DECLARE_READ64_MEMBER(mpc105_reg_r);
- DECLARE_WRITE64_MEMBER(mpc105_reg_w);
+ uint32_t rtc72421_r(offs_t offset);
+ void rtc72421_w(offs_t offset, uint32_t data);
+ uint64_t model3_char_r(offs_t offset);
+ void model3_char_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t model3_tile_r(offs_t offset);
+ void model3_tile_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t model3_vid_reg_r(offs_t offset);
+ void model3_vid_reg_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void model3_palette_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t model3_palette_r(offs_t offset);
+ void real3d_display_list_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void real3d_polygon_ram_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void real3d_cmd_w(uint64_t data);
+ uint64_t mpc105_addr_r(offs_t offset, uint64_t mem_mask = ~0);
+ void mpc105_addr_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t mpc105_data_r();
+ void mpc105_data_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t mpc105_reg_r(offs_t offset);
+ void mpc105_reg_w(offs_t offset, uint64_t data);
void mpc105_init();
- DECLARE_READ64_MEMBER(mpc106_addr_r);
- DECLARE_WRITE64_MEMBER(mpc106_addr_w);
- DECLARE_READ64_MEMBER(mpc106_data_r);
- DECLARE_WRITE64_MEMBER(mpc106_data_w);
- DECLARE_READ64_MEMBER(mpc106_reg_r);
- DECLARE_WRITE64_MEMBER(mpc106_reg_w);
+ uint64_t mpc106_addr_r(offs_t offset, uint64_t mem_mask = ~0);
+ void mpc106_addr_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t mpc106_data_r(offs_t offset, uint64_t mem_mask = ~0);
+ void mpc106_data_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t mpc106_reg_r(offs_t offset);
+ void mpc106_reg_w(offs_t offset, uint64_t data);
void mpc106_init();
- DECLARE_READ64_MEMBER(scsi_r);
- DECLARE_WRITE64_MEMBER(scsi_w);
- DECLARE_READ64_MEMBER(real3d_dma_r);
- DECLARE_WRITE64_MEMBER(real3d_dma_w);
+ uint64_t scsi_r(offs_t offset, uint64_t mem_mask = ~0);
+ void scsi_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t real3d_dma_r(offs_t offset, uint64_t mem_mask = ~0);
+ void real3d_dma_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
void eeprom_w(uint8_t data);
uint8_t input_r();
@@ -291,16 +291,16 @@ private:
uint8_t lostwsga_ser2_r();
void lostwsga_ser2_w(uint8_t data);
- DECLARE_READ64_MEMBER(model3_sys_r);
- DECLARE_WRITE64_MEMBER(model3_sys_w);
- DECLARE_READ64_MEMBER(model3_rtc_r);
- DECLARE_WRITE64_MEMBER(model3_rtc_w);
- DECLARE_READ64_MEMBER(real3d_status_r);
+ uint64_t model3_sys_r(offs_t offset, uint64_t mem_mask = ~0);
+ void model3_sys_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t model3_rtc_r(offs_t offset, uint64_t mem_mask = ~0);
+ void model3_rtc_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t real3d_status_r(offs_t offset);
DECLARE_READ8_MEMBER(model3_sound_r);
DECLARE_WRITE8_MEMBER(model3_sound_w);
- DECLARE_WRITE64_MEMBER(daytona2_rombank_w);
- DECLARE_WRITE16_MEMBER(model3snd_ctrl);
+ void daytona2_rombank_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void model3snd_ctrl(uint16_t data);
uint32_t pci_device_get_reg();
void pci_device_set_reg(uint32_t value);
void configure_fast_ram();
diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h
index dc2fe807dd6..71cdd913536 100644
--- a/src/mame/includes/moo.h
+++ b/src/mame/includes/moo.h
@@ -79,12 +79,12 @@ private:
optional_device<k054321_device> m_k054321;
emu_timer *m_dmaend_timer;
- DECLARE_READ16_MEMBER(control2_r);
- DECLARE_WRITE16_MEMBER(control2_w);
- DECLARE_WRITE16_MEMBER(sound_irq_w);
+ uint16_t control2_r();
+ void control2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void sound_irq_w(uint16_t data);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
- DECLARE_WRITE16_MEMBER(moo_prot_w);
- DECLARE_WRITE16_MEMBER(moobl_oki_bank_w);
+ void moo_prot_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void moobl_oki_bank_w(uint16_t data);
DECLARE_MACHINE_START(moo);
DECLARE_MACHINE_RESET(moo);
DECLARE_VIDEO_START(moo);
diff --git a/src/mame/includes/mpu5.h b/src/mame/includes/mpu5.h
index 5bcddd816a7..93c83745707 100644
--- a/src/mame/includes/mpu5.h
+++ b/src/mame/includes/mpu5.h
@@ -21,16 +21,16 @@ public:
void mpu5(machine_config &config);
private:
- DECLARE_READ32_MEMBER(mpu5_mem_r);
- DECLARE_WRITE32_MEMBER(mpu5_mem_w);
+ uint32_t mpu5_mem_r(offs_t offset, uint32_t mem_mask = ~0);
+ void mpu5_mem_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_READ32_MEMBER(asic_r32);
- DECLARE_READ8_MEMBER(asic_r8);
- DECLARE_WRITE32_MEMBER(asic_w32);
- DECLARE_WRITE8_MEMBER(asic_w8);
+ uint32_t asic_r32(offs_t offset, uint32_t mem_mask = ~0);
+ uint8_t asic_r8(offs_t offset);
+ void asic_w32(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void asic_w8(offs_t offset, uint8_t data);
- DECLARE_READ32_MEMBER(pic_r);
- DECLARE_WRITE32_MEMBER(pic_w);
+ uint32_t pic_r(offs_t offset);
+ void pic_w(offs_t offset, uint32_t data);
virtual void machine_start() override;
void mpu5_map(address_map &map);
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 3ba318b575c..3787ed2b477 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -64,9 +64,9 @@ protected:
DECLARE_READ8_MEMBER(latch_r);
DECLARE_WRITE8_MEMBER(to_main_w);
- DECLARE_READ32_MEMBER(ms32_sound_r);
- DECLARE_WRITE32_MEMBER(ms32_sound_w);
- DECLARE_WRITE32_MEMBER(reset_sub_w);
+ u32 ms32_sound_r();
+ void ms32_sound_w(u32 data);
+ void reset_sub_w(u32 data);
required_device<palette_device> m_palette;
required_device<gfxdecode_device> m_gfxdecode;
@@ -113,31 +113,31 @@ private:
int m_brt_r;
int m_brt_g;
int m_brt_b;
- DECLARE_READ32_MEMBER(ms32_read_inputs3);
+ u32 ms32_read_inputs3();
DECLARE_READ8_MEMBER(ms32_nvram_r8);
DECLARE_WRITE8_MEMBER(ms32_nvram_w8);
DECLARE_READ8_MEMBER(ms32_priram_r8);
DECLARE_WRITE8_MEMBER(ms32_priram_w8);
- DECLARE_READ16_MEMBER(ms32_palram_r16);
- DECLARE_WRITE16_MEMBER(ms32_palram_w16);
- DECLARE_READ16_MEMBER(ms32_rozram_r16);
- DECLARE_WRITE16_MEMBER(ms32_rozram_w16);
- DECLARE_READ16_MEMBER(ms32_lineram_r16);
- DECLARE_WRITE16_MEMBER(ms32_lineram_w16);
- DECLARE_READ16_MEMBER(ms32_sprram_r16);
- DECLARE_WRITE16_MEMBER(ms32_sprram_w16);
- DECLARE_READ16_MEMBER(ms32_txram_r16);
- DECLARE_WRITE16_MEMBER(ms32_txram_w16);
- DECLARE_READ16_MEMBER(ms32_bgram_r16);
- DECLARE_WRITE16_MEMBER(ms32_bgram_w16);
- DECLARE_WRITE32_MEMBER(pip_w);
- DECLARE_WRITE16_MEMBER(ms32_extra_w16);
- DECLARE_READ16_MEMBER(ms32_extra_r16);
- DECLARE_WRITE32_MEMBER(ms32_irq2_guess_w);
- DECLARE_WRITE32_MEMBER(ms32_irq5_guess_w);
- DECLARE_WRITE32_MEMBER(ms32_brightness_w);
- DECLARE_WRITE32_MEMBER(ms32_gfxctrl_w);
- DECLARE_WRITE32_MEMBER(coin_counter_w);
+ u16 ms32_palram_r16(offs_t offset);
+ void ms32_palram_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 ms32_rozram_r16(offs_t offset);
+ void ms32_rozram_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 ms32_lineram_r16(offs_t offset);
+ void ms32_lineram_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 ms32_sprram_r16(offs_t offset);
+ void ms32_sprram_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 ms32_txram_r16(offs_t offset);
+ void ms32_txram_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 ms32_bgram_r16(offs_t offset);
+ void ms32_bgram_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void pip_w(u32 data);
+ void ms32_extra_w16(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 ms32_extra_r16(offs_t offset);
+ void ms32_irq2_guess_w(u32 data);
+ void ms32_irq5_guess_w(u32 data);
+ void ms32_brightness_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void ms32_gfxctrl_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void coin_counter_w(u32 data);
void init_ms32_common();
TILE_GET_INFO_MEMBER(get_ms32_tx_tile_info);
diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h
index 6622876f9a9..d14daabe1db 100644
--- a/src/mame/includes/mugsmash.h
+++ b/src/mame/includes/mugsmash.h
@@ -39,10 +39,10 @@ private:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- DECLARE_WRITE16_MEMBER(mugsmash_reg2_w);
- DECLARE_WRITE16_MEMBER(mugsmash_videoram1_w);
- DECLARE_WRITE16_MEMBER(mugsmash_videoram2_w);
- DECLARE_WRITE16_MEMBER(mugsmash_reg_w);
+ void mugsmash_reg2_w(offs_t offset, uint16_t data);
+ void mugsmash_videoram1_w(offs_t offset, uint16_t data);
+ void mugsmash_videoram2_w(offs_t offset, uint16_t data);
+ void mugsmash_reg_w(offs_t offset, uint16_t data);
TILE_GET_INFO_MEMBER(get_mugsmash_tile_info1);
TILE_GET_INFO_MEMBER(get_mugsmash_tile_info2);
virtual void machine_start() override;
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index e114635a339..022ae40a059 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -52,28 +52,28 @@ private:
uint8_t m_sound_ctrl;
uint8_t m_sound_nmi_clk;
- DECLARE_READ16_MEMBER(eeprom_r);
- DECLARE_WRITE16_MEMBER(mweeprom_w);
- DECLARE_READ16_MEMBER(dddeeprom_r);
- DECLARE_WRITE16_MEMBER(mmeeprom_w);
- DECLARE_WRITE16_MEMBER(sound_irq_w);
- DECLARE_WRITE16_MEMBER(irq_ack_w);
- DECLARE_READ16_MEMBER(k053247_scattered_word_r);
- DECLARE_WRITE16_MEMBER(k053247_scattered_word_w);
- DECLARE_READ16_MEMBER(k053247_martchmp_word_r);
- DECLARE_WRITE16_MEMBER(k053247_martchmp_word_w);
- DECLARE_WRITE16_MEMBER(mceeprom_w);
- DECLARE_READ16_MEMBER(mccontrol_r);
- DECLARE_WRITE16_MEMBER(mccontrol_w);
+ uint16_t eeprom_r(offs_t offset, uint16_t mem_mask = ~0);
+ void mweeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dddeeprom_r(offs_t offset, uint16_t mem_mask = ~0);
+ void mmeeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void sound_irq_w(uint16_t data);
+ void irq_ack_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t k053247_scattered_word_r(offs_t offset);
+ void k053247_scattered_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t k053247_martchmp_word_r(offs_t offset);
+ void k053247_martchmp_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mceeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mccontrol_r();
+ void mccontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE8_MEMBER(sound_ctrl_w);
- DECLARE_WRITE16_MEMBER(ddd_053936_enable_w);
- DECLARE_WRITE16_MEMBER(ddd_053936_clip_w);
- DECLARE_READ16_MEMBER(gai_053936_tilerom_0_r);
- DECLARE_READ16_MEMBER(ddd_053936_tilerom_0_r);
- DECLARE_READ16_MEMBER(ddd_053936_tilerom_1_r);
- DECLARE_READ16_MEMBER(gai_053936_tilerom_2_r);
- DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r);
+ void ddd_053936_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void ddd_053936_clip_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t gai_053936_tilerom_0_r(offs_t offset);
+ uint16_t ddd_053936_tilerom_0_r(offs_t offset);
+ uint16_t ddd_053936_tilerom_1_r(offs_t offset);
+ uint16_t gai_053936_tilerom_2_r(offs_t offset);
+ uint16_t ddd_053936_tilerom_2_r(offs_t offset);
TILE_GET_INFO_MEMBER(get_gai_936_tile_info);
TILE_GET_INFO_MEMBER(get_ult_936_tile_info);
DECLARE_MACHINE_START(mystwarr);
diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp
index 205ff7ec682..4b8eeddfb99 100644
--- a/src/mame/machine/k573dio.cpp
+++ b/src/mame/machine/k573dio.cpp
@@ -159,60 +159,60 @@ void k573dio_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
}
-READ16_MEMBER(k573dio_device::a00_r)
+uint16_t k573dio_device::a00_r()
{
logerror("%s: a00_r (%s)\n", tag(), machine().describe_context());
return 0x0000;
}
-READ16_MEMBER(k573dio_device::a02_r)
+uint16_t k573dio_device::a02_r()
{
logerror("%s: a02_r (%s)\n", tag(), machine().describe_context());
return 0x0001;
}
-READ16_MEMBER(k573dio_device::a04_r)
+uint16_t k573dio_device::a04_r()
{
logerror("%s: a04_r (%s)\n", tag(), machine().describe_context());
return 0x0000;
}
-READ16_MEMBER(k573dio_device::a06_r)
+uint16_t k573dio_device::a06_r()
{
logerror("%s: a06_r (%s)\n", tag(), machine().describe_context());
return 0x0000;
}
-READ16_MEMBER(k573dio_device::a0a_r)
+uint16_t k573dio_device::a0a_r()
{
logerror("%s: a0a_r (%s)\n", tag(), machine().describe_context());
return 0x0000;
}
-WRITE16_MEMBER(k573dio_device::a10_w)
+void k573dio_device::a10_w(uint16_t data)
{
logerror("%s: a10_w (%s)\n", tag(), machine().describe_context());
}
-READ16_MEMBER(k573dio_device::ac4_r)
+uint16_t k573dio_device::ac4_r()
{
// What is this?
return 0;
}
-READ16_MEMBER(k573dio_device::a80_r)
+uint16_t k573dio_device::a80_r()
{
logerror("%s: a80_r (%s)\n", tag(), machine().describe_context());
return 0x1234;
}
-WRITE16_MEMBER(k573dio_device::mpeg_start_adr_high_w)
+void k573dio_device::mpeg_start_adr_high_w(uint16_t data)
{
logerror("FPGA MPEG start address high %04x\n", data);
k573fpga->set_mp3_cur_adr((k573fpga->get_mp3_cur_adr() & 0x0000ffff) | (data << 16)); // high
}
-WRITE16_MEMBER(k573dio_device::mpeg_start_adr_low_w)
+void k573dio_device::mpeg_start_adr_low_w(uint16_t data)
{
logerror("FPGA MPEG start address low %04x\n", data);
k573fpga->set_mp3_cur_adr((k573fpga->get_mp3_cur_adr() & 0xffff0000) | data); // low
@@ -221,32 +221,32 @@ WRITE16_MEMBER(k573dio_device::mpeg_start_adr_low_w)
k573fpga->set_crypto_key3(0);
}
-WRITE16_MEMBER(k573dio_device::mpeg_end_adr_high_w)
+void k573dio_device::mpeg_end_adr_high_w(uint16_t data)
{
logerror("FPGA MPEG end address high %04x\n", data);
k573fpga->set_mp3_end_adr((k573fpga->get_mp3_end_adr() & 0x0000ffff) | (data << 16)); // high
}
-WRITE16_MEMBER(k573dio_device::mpeg_end_adr_low_w)
+void k573dio_device::mpeg_end_adr_low_w(uint16_t data)
{
logerror("FPGA MPEG end address low %04x\n", data);
k573fpga->set_mp3_end_adr((k573fpga->get_mp3_end_adr() & 0xffff0000) | data); // low
}
-READ16_MEMBER(k573dio_device::mpeg_key_1_r)
+uint16_t k573dio_device::mpeg_key_1_r()
{
// Dance Dance Revolution Solo Bass Mix reads this key before starting songs
return crypto_key1;
}
-WRITE16_MEMBER(k573dio_device::mpeg_key_1_w)
+void k573dio_device::mpeg_key_1_w(uint16_t data)
{
logerror("FPGA MPEG key 1/3 %04x\n", data);
crypto_key1 = data;
k573fpga->set_crypto_key1(data);
}
-READ16_MEMBER(k573dio_device::mas_i2c_r)
+uint16_t k573dio_device::mas_i2c_r()
{
int scl = mas3507d->i2c_scl_r() << 13;
int sda = mas3507d->i2c_sda_r() << 12;
@@ -254,13 +254,13 @@ READ16_MEMBER(k573dio_device::mas_i2c_r)
return scl | sda;
}
-WRITE16_MEMBER(k573dio_device::mas_i2c_w)
+void k573dio_device::mas_i2c_w(uint16_t data)
{
mas3507d->i2c_scl_w(data & 0x2000);
mas3507d->i2c_sda_w(data & 0x1000);
}
-READ16_MEMBER(k573dio_device::mpeg_ctrl_r)
+uint16_t k573dio_device::mpeg_ctrl_r()
{
if (k573fpga->get_mpeg_ctrl() == 0x1000 && !k573fpga->is_playing()) {
// Set the FPGA to stop mode so that data won't be sent anymore
@@ -270,101 +270,101 @@ READ16_MEMBER(k573dio_device::mpeg_ctrl_r)
return k573fpga->get_mpeg_ctrl();
}
-WRITE16_MEMBER(k573dio_device::mpeg_ctrl_w)
+void k573dio_device::mpeg_ctrl_w(uint16_t data)
{
k573fpga->set_mpeg_ctrl(data);
}
-WRITE16_MEMBER(k573dio_device::ram_write_adr_high_w)
+void k573dio_device::ram_write_adr_high_w(uint16_t data)
{
// read and write address are shared
ram_adr = ((ram_adr & 0x0000ffff) | (data << 16)) & 0x1ffffff;
}
-WRITE16_MEMBER(k573dio_device::ram_write_adr_low_w)
+void k573dio_device::ram_write_adr_low_w(uint16_t data)
{
// read and write address are shared
ram_adr = ((ram_adr & 0xffff0000) | data) & 0x1ffffff;
}
-READ16_MEMBER(k573dio_device::ram_r)
+uint16_t k573dio_device::ram_r()
{
uint16_t res = ram[(ram_read_adr & 0x1ffffff) >> 1];
ram_read_adr += 2;
return res;
}
-WRITE16_MEMBER(k573dio_device::ram_w)
+void k573dio_device::ram_w(uint16_t data)
{
ram[(ram_adr & 0x1ffffff) >> 1] = data;
ram_adr += 2;
}
-WRITE16_MEMBER(k573dio_device::ram_read_adr_high_w)
+void k573dio_device::ram_read_adr_high_w(uint16_t data)
{
// read and write address are shared
ram_read_adr = ((ram_read_adr & 0x0000ffff) | (data << 16)) & 0x1ffffff;
}
-WRITE16_MEMBER(k573dio_device::ram_read_adr_low_w)
+void k573dio_device::ram_read_adr_low_w(uint16_t data)
{
// read and write address are shared
ram_read_adr = ((ram_read_adr & 0xffff0000) | data) & 0x1ffffff;
}
-READ16_MEMBER(k573dio_device::mp3_frame_count_high_r)
+uint16_t k573dio_device::mp3_frame_count_high_r()
{
return (mas3507d->get_frame_count() & 0xffff0000) >> 16;
}
-READ16_MEMBER(k573dio_device::mp3_frame_count_low_r)
+uint16_t k573dio_device::mp3_frame_count_low_r()
{
return mas3507d->get_frame_count() & 0x0000ffff;
}
-WRITE16_MEMBER(k573dio_device::output_1_w)
+void k573dio_device::output_1_w(uint16_t data)
{
output(1, data);
}
-WRITE16_MEMBER(k573dio_device::output_0_w)
+void k573dio_device::output_0_w(uint16_t data)
{
output(0, data);
}
-WRITE16_MEMBER(k573dio_device::output_3_w)
+void k573dio_device::output_3_w(uint16_t data)
{
output(3, data);
}
-WRITE16_MEMBER(k573dio_device::output_7_w)
+void k573dio_device::output_7_w(uint16_t data)
{
output(7, data);
}
-WRITE16_MEMBER(k573dio_device::mpeg_key_2_w)
+void k573dio_device::mpeg_key_2_w(uint16_t data)
{
logerror("FPGA MPEG key 2/3 %04x\n", data);
k573fpga->set_crypto_key2(data);
}
-WRITE16_MEMBER(k573dio_device::mpeg_key_3_w)
+void k573dio_device::mpeg_key_3_w(uint16_t data)
{
logerror("FPGA MPEG key 3/3 %04x\n", data);
k573fpga->set_crypto_key3(data);
}
-READ16_MEMBER(k573dio_device::digital_id_r)
+uint16_t k573dio_device::digital_id_r()
{
return digital_id->read() << 12;
}
-WRITE16_MEMBER(k573dio_device::digital_id_w)
+void k573dio_device::digital_id_w(uint16_t data)
{
digital_id->write( !( ( data >> 12 ) & 1 ) );
}
-READ16_MEMBER(k573dio_device::fpga_status_r)
+uint16_t k573dio_device::fpga_status_r()
{
//logerror("%s: fpga_status_r (%s)\n", tag(), machine().describe_context());
@@ -380,27 +380,27 @@ READ16_MEMBER(k573dio_device::fpga_status_r)
return 0x8000 | 0x2000 | 0x1000;
}
-WRITE16_MEMBER(k573dio_device::fpga_firmware_w)
+void k573dio_device::fpga_firmware_w(uint16_t data)
{
// Firmware bits in bit 15, always the same firmware
}
-WRITE16_MEMBER(k573dio_device::output_4_w)
+void k573dio_device::output_4_w(uint16_t data)
{
output(4, data);
}
-WRITE16_MEMBER(k573dio_device::output_5_w)
+void k573dio_device::output_5_w(uint16_t data)
{
output(5, data);
}
-WRITE16_MEMBER(k573dio_device::output_2_w)
+void k573dio_device::output_2_w(uint16_t data)
{
output(2, data);
}
-READ16_MEMBER(k573dio_device::mp3_unk_r)
+uint16_t k573dio_device::mp3_unk_r()
{
return 0;
}
diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h
index 2d2e44bac70..25fb3565b8e 100644
--- a/src/mame/machine/k573dio.h
+++ b/src/mame/machine/k573dio.h
@@ -18,47 +18,47 @@ public:
void amap(address_map &map);
void set_ddrsbm_fpga(bool flag) { is_ddrsbm_fpga = flag; }
- DECLARE_READ16_MEMBER(a00_r);
- DECLARE_READ16_MEMBER(a02_r);
- DECLARE_READ16_MEMBER(a04_r);
- DECLARE_READ16_MEMBER(a06_r);
- DECLARE_READ16_MEMBER(a0a_r);
- DECLARE_WRITE16_MEMBER(a10_w);
- DECLARE_READ16_MEMBER(a80_r);
- DECLARE_READ16_MEMBER(ac4_r);
+ uint16_t a00_r();
+ uint16_t a02_r();
+ uint16_t a04_r();
+ uint16_t a06_r();
+ uint16_t a0a_r();
+ void a10_w(uint16_t data);
+ uint16_t a80_r();
+ uint16_t ac4_r();
- DECLARE_WRITE16_MEMBER(mpeg_start_adr_high_w);
- DECLARE_WRITE16_MEMBER(mpeg_start_adr_low_w);
- DECLARE_WRITE16_MEMBER(mpeg_end_adr_high_w);
- DECLARE_WRITE16_MEMBER(mpeg_end_adr_low_w);
- DECLARE_READ16_MEMBER(mpeg_key_1_r);
- DECLARE_WRITE16_MEMBER(mpeg_key_1_w);
- DECLARE_READ16_MEMBER(mas_i2c_r);
- DECLARE_WRITE16_MEMBER(mas_i2c_w);
- DECLARE_READ16_MEMBER(mpeg_ctrl_r);
- DECLARE_WRITE16_MEMBER(mpeg_ctrl_w);
- DECLARE_WRITE16_MEMBER(ram_write_adr_high_w);
- DECLARE_WRITE16_MEMBER(ram_write_adr_low_w);
- DECLARE_READ16_MEMBER(ram_r);
- DECLARE_WRITE16_MEMBER(ram_w);
- DECLARE_WRITE16_MEMBER(ram_read_adr_high_w);
- DECLARE_WRITE16_MEMBER(ram_read_adr_low_w);
- DECLARE_READ16_MEMBER(mp3_frame_count_high_r);
- DECLARE_READ16_MEMBER(mp3_frame_count_low_r);
- DECLARE_WRITE16_MEMBER(output_0_w);
- DECLARE_WRITE16_MEMBER(output_1_w);
- DECLARE_WRITE16_MEMBER(output_7_w);
- DECLARE_WRITE16_MEMBER(output_3_w);
- DECLARE_WRITE16_MEMBER(mpeg_key_2_w);
- DECLARE_WRITE16_MEMBER(mpeg_key_3_w);
- DECLARE_READ16_MEMBER(digital_id_r);
- DECLARE_WRITE16_MEMBER(digital_id_w);
- DECLARE_READ16_MEMBER(fpga_status_r);
- DECLARE_WRITE16_MEMBER(fpga_firmware_w);
- DECLARE_WRITE16_MEMBER(output_4_w);
- DECLARE_WRITE16_MEMBER(output_2_w);
- DECLARE_WRITE16_MEMBER(output_5_w);
- DECLARE_READ16_MEMBER(mp3_unk_r);
+ void mpeg_start_adr_high_w(uint16_t data);
+ void mpeg_start_adr_low_w(uint16_t data);
+ void mpeg_end_adr_high_w(uint16_t data);
+ void mpeg_end_adr_low_w(uint16_t data);
+ uint16_t mpeg_key_1_r();
+ void mpeg_key_1_w(uint16_t data);
+ uint16_t mas_i2c_r();
+ void mas_i2c_w(uint16_t data);
+ uint16_t mpeg_ctrl_r();
+ void mpeg_ctrl_w(uint16_t data);
+ void ram_write_adr_high_w(uint16_t data);
+ void ram_write_adr_low_w(uint16_t data);
+ uint16_t ram_r();
+ void ram_w(uint16_t data);
+ void ram_read_adr_high_w(uint16_t data);
+ void ram_read_adr_low_w(uint16_t data);
+ uint16_t mp3_frame_count_high_r();
+ uint16_t mp3_frame_count_low_r();
+ void output_0_w(uint16_t data);
+ void output_1_w(uint16_t data);
+ void output_7_w(uint16_t data);
+ void output_3_w(uint16_t data);
+ void mpeg_key_2_w(uint16_t data);
+ void mpeg_key_3_w(uint16_t data);
+ uint16_t digital_id_r();
+ void digital_id_w(uint16_t data);
+ uint16_t fpga_status_r();
+ void fpga_firmware_w(uint16_t data);
+ void output_4_w(uint16_t data);
+ void output_2_w(uint16_t data);
+ void output_5_w(uint16_t data);
+ uint16_t mp3_unk_r();
protected:
virtual void device_start() override;
diff --git a/src/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp
index 54078f5d297..c3f79df2d11 100644
--- a/src/mame/machine/kaneko_calc3.cpp
+++ b/src/mame/machine/kaneko_calc3.cpp
@@ -140,10 +140,10 @@ void kaneko_calc3_device::mcu_com_w(offs_t offset, uint16_t data, uint16_t mem_m
m_mcu_status |= (1 << _n_);
}
-WRITE16_MEMBER(kaneko_calc3_device::mcu_com0_w){ mcu_com_w(offset, data, mem_mask, 0); }
-WRITE16_MEMBER(kaneko_calc3_device::mcu_com1_w){ mcu_com_w(offset, data, mem_mask, 1); }
-WRITE16_MEMBER(kaneko_calc3_device::mcu_com2_w){ mcu_com_w(offset, data, mem_mask, 2); }
-WRITE16_MEMBER(kaneko_calc3_device::mcu_com3_w){ mcu_com_w(offset, data, mem_mask, 3); }
+void kaneko_calc3_device::mcu_com0_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 0); }
+void kaneko_calc3_device::mcu_com1_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 1); }
+void kaneko_calc3_device::mcu_com2_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 2); }
+void kaneko_calc3_device::mcu_com3_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 3); }
diff --git a/src/mame/machine/kaneko_calc3.h b/src/mame/machine/kaneko_calc3.h
index f1cdc9717cb..3ae8b0b78a7 100644
--- a/src/mame/machine/kaneko_calc3.h
+++ b/src/mame/machine/kaneko_calc3.h
@@ -22,10 +22,10 @@ public:
kaneko_calc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE16_MEMBER(mcu_com0_w);
- DECLARE_WRITE16_MEMBER(mcu_com1_w);
- DECLARE_WRITE16_MEMBER(mcu_com2_w);
- DECLARE_WRITE16_MEMBER(mcu_com3_w);
+ void mcu_com0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mcu_com1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mcu_com2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mcu_com3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void reset_run_timer();
void mcu_run();
diff --git a/src/mame/machine/kaneko_hit.cpp b/src/mame/machine/kaneko_hit.cpp
index b3112eec53f..1c6ef992326 100644
--- a/src/mame/machine/kaneko_hit.cpp
+++ b/src/mame/machine/kaneko_hit.cpp
@@ -106,26 +106,26 @@ void kaneko_hit_device::device_reset()
}
-READ16_MEMBER(kaneko_hit_device::kaneko_hit_r)
+uint16_t kaneko_hit_device::kaneko_hit_r(offs_t offset)
{
switch (m_hittype)
{
- case 0: return kaneko_hit_type0_r(space,offset,mem_mask);
- case 1: return kaneko_hit_type1_r(space,offset,mem_mask);
- case 2: return kaneko_hit_type2_r(space,offset,mem_mask);
+ case 0: return kaneko_hit_type0_r(offset);
+ case 1: return kaneko_hit_type1_r(offset);
+ case 2: return kaneko_hit_type2_r(offset);
default:
fatalerror("kaneko_hit_r called, but m_hittype not set\n");
}
}
-WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_w)
+void kaneko_hit_device::kaneko_hit_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch (m_hittype)
{
- case 0: kaneko_hit_type0_w(space,offset,data, mem_mask); break;
- case 1: kaneko_hit_type1_w(space,offset,data, mem_mask); break;
- case 2: kaneko_hit_type2_w(space,offset,data, mem_mask); break;
+ case 0: kaneko_hit_type0_w(offset,data, mem_mask); break;
+ case 1: kaneko_hit_type1_w(offset,data, mem_mask); break;
+ case 2: kaneko_hit_type2_w(offset,data, mem_mask); break;
default:
fatalerror("kaneko_hit_r called, but m_hittype not set\n");
@@ -139,7 +139,7 @@ WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_w)
bonkadv
*********************************************************************/
-READ16_MEMBER(kaneko_hit_device::kaneko_hit_type0_r)
+uint16_t kaneko_hit_device::kaneko_hit_type0_r(offs_t offset)
{
calc1_hit_t &hit = m_hit;
uint16_t data = 0;
@@ -193,7 +193,7 @@ READ16_MEMBER(kaneko_hit_device::kaneko_hit_type0_r)
return 0;
}
-WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_type0_w)
+void kaneko_hit_device::kaneko_hit_type0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
calc1_hit_t &hit = m_hit;
data &= mem_mask;
@@ -224,7 +224,7 @@ WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_type0_w)
bloorwar
*********************************************************************/
-READ16_MEMBER(kaneko_hit_device::kaneko_hit_type1_r)
+uint16_t kaneko_hit_device::kaneko_hit_type1_r(offs_t offset)
{
calc1_hit_t &hit = m_hit;
uint16_t data = 0;
@@ -286,7 +286,7 @@ READ16_MEMBER(kaneko_hit_device::kaneko_hit_type1_r)
return 0;
}
-WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_type1_w)
+void kaneko_hit_device::kaneko_hit_type1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
calc1_hit_t &hit = m_hit;
data &= mem_mask;
@@ -358,7 +358,7 @@ int16_t kaneko_hit_device::calc_compute_y(calc1_hit_t &hit)
*********************************************************************/
-WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_type2_w)
+void kaneko_hit_device::kaneko_hit_type2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
calc3_hit_t &hit3 = m_hit3;
data &= mem_mask;
@@ -426,7 +426,7 @@ WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_type2_w)
}
-READ16_MEMBER(kaneko_hit_device::kaneko_hit_type2_r)
+uint16_t kaneko_hit_device::kaneko_hit_type2_r(offs_t offset)
{
calc3_hit_t &hit3 = m_hit3;
int idx=offset*4;
diff --git a/src/mame/machine/kaneko_hit.h b/src/mame/machine/kaneko_hit.h
index 11e50332cb9..492521a9f31 100644
--- a/src/mame/machine/kaneko_hit.h
+++ b/src/mame/machine/kaneko_hit.h
@@ -21,8 +21,8 @@ public:
void set_type(int hittype) { m_hittype = hittype; }
- DECLARE_READ16_MEMBER(kaneko_hit_r);
- DECLARE_WRITE16_MEMBER(kaneko_hit_w);
+ uint16_t kaneko_hit_r(offs_t offset);
+ void kaneko_hit_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
protected:
virtual void device_start() override;
@@ -66,16 +66,16 @@ private:
calc1_hit_t m_hit;
calc3_hit_t m_hit3;
- DECLARE_READ16_MEMBER(kaneko_hit_type0_r);
- DECLARE_WRITE16_MEMBER(kaneko_hit_type0_w);
+ uint16_t kaneko_hit_type0_r(offs_t offset);
+ void kaneko_hit_type0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(kaneko_hit_type1_r);
- DECLARE_WRITE16_MEMBER(kaneko_hit_type1_w);
+ uint16_t kaneko_hit_type1_r(offs_t offset);
+ void kaneko_hit_type1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
int16_t calc_compute_x(calc1_hit_t &hit);
int16_t calc_compute_y(calc1_hit_t &hit);
- DECLARE_WRITE16_MEMBER(kaneko_hit_type2_w);
- DECLARE_READ16_MEMBER(kaneko_hit_type2_r);
+ void kaneko_hit_type2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t kaneko_hit_type2_r(offs_t offset);
int type2_calc_compute(int x1, int w1, int x2, int w2);
void type2_calc_org(int mode, int x0, int s0, int* x1, int* s1);
void type2_recalc_collisions(calc3_hit_t &hit3);
diff --git a/src/mame/machine/kaneko_toybox.cpp b/src/mame/machine/kaneko_toybox.cpp
index cd8f110c4c2..ecc89d04bb3 100644
--- a/src/mame/machine/kaneko_toybox.cpp
+++ b/src/mame/machine/kaneko_toybox.cpp
@@ -453,15 +453,15 @@ void kaneko_toybox_device::mcu_com_w(offs_t offset, uint16_t data, uint16_t mem_
mcu_run();
}
-WRITE16_MEMBER(kaneko_toybox_device::mcu_com0_w){ mcu_com_w(offset, data, mem_mask, 0); }
-WRITE16_MEMBER(kaneko_toybox_device::mcu_com1_w){ mcu_com_w(offset, data, mem_mask, 1); }
-WRITE16_MEMBER(kaneko_toybox_device::mcu_com2_w){ mcu_com_w(offset, data, mem_mask, 2); }
-WRITE16_MEMBER(kaneko_toybox_device::mcu_com3_w){ mcu_com_w(offset, data, mem_mask, 3); }
+void kaneko_toybox_device::mcu_com0_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 0); }
+void kaneko_toybox_device::mcu_com1_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 1); }
+void kaneko_toybox_device::mcu_com2_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 2); }
+void kaneko_toybox_device::mcu_com3_w(offs_t offset, uint16_t data, uint16_t mem_mask){ mcu_com_w(offset, data, mem_mask, 3); }
/*
bonkadv and bloodwar test bit 0
*/
-READ16_MEMBER(kaneko_toybox_device::mcu_status_r)
+uint16_t kaneko_toybox_device::mcu_status_r()
{
logerror("%s : read MCU status\n", machine().describe_context());
return 0; // most games test bit 0 for failure
diff --git a/src/mame/machine/kaneko_toybox.h b/src/mame/machine/kaneko_toybox.h
index f8b1b504b22..64e864d14ac 100644
--- a/src/mame/machine/kaneko_toybox.h
+++ b/src/mame/machine/kaneko_toybox.h
@@ -32,11 +32,11 @@ public:
void set_table(int tabletype) { m_tabletype = tabletype; }
void set_game_type(int gametype) { m_gametype = gametype; }
- DECLARE_WRITE16_MEMBER(mcu_com0_w);
- DECLARE_WRITE16_MEMBER(mcu_com1_w);
- DECLARE_WRITE16_MEMBER(mcu_com2_w);
- DECLARE_WRITE16_MEMBER(mcu_com3_w);
- DECLARE_READ16_MEMBER(mcu_status_r);
+ void mcu_com0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mcu_com1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mcu_com2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mcu_com3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mcu_status_r();
protected:
virtual void device_start() override;
diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp
index 446d852792e..c1dbb8b60cb 100644
--- a/src/mame/machine/kaypro.cpp
+++ b/src/mame/machine/kaypro.cpp
@@ -88,13 +88,13 @@ void kaypro_state::kayproiv_pio_system_w(uint8_t data)
************************************************************/
-READ8_MEMBER( kaypro_state::kaypro484_system_port_r )
+uint8_t kaypro_state::kaypro484_system_port_r()
{
uint8_t data = m_centronics_busy << 6;
return (m_system_port & 0xbf) | data;
}
-WRITE8_MEMBER( kaypro_state::kaypro484_system_port_w )
+void kaypro_state::kaypro484_system_port_w(uint8_t data)
{
/* d7 bank select
d6 alternate character set (write only)
diff --git a/src/mame/machine/kc.cpp b/src/mame/machine/kc.cpp
index ec622162754..1a0487e224d 100644
--- a/src/mame/machine/kc.cpp
+++ b/src/mame/machine/kc.cpp
@@ -77,7 +77,7 @@ QUICKLOAD_LOAD_MEMBER(kc_state::quickload_cb)
// The KC85/4 and KC85/3 are "modular systems". These computers can be expanded with modules.
-READ8_MEMBER( kc_state::expansion_read )
+uint8_t kc_state::expansion_read(offs_t offset)
{
uint8_t result = 0xff;
@@ -90,7 +90,7 @@ READ8_MEMBER( kc_state::expansion_read )
return result;
}
-WRITE8_MEMBER( kc_state::expansion_write )
+void kc_state::expansion_write(offs_t offset, uint8_t data)
{
// assert MEI line of first slot
m_expansions[0]->mei_w(ASSERT_LINE);
@@ -104,14 +104,14 @@ WRITE8_MEMBER( kc_state::expansion_write )
- xx is module id.
- Only addressess divisible by 4 are checked.
+ Only addresses divisible by 4 are checked.
If module does not exist, 0x0ff is returned.
When xx80 is read, if a module exists a id will be returned.
Id's for known modules are listed above.
*/
-READ8_MEMBER( kc_state::expansion_io_read )
+uint8_t kc_state::expansion_io_read(offs_t offset)
{
uint8_t result = 0xff;
@@ -136,7 +136,7 @@ READ8_MEMBER( kc_state::expansion_io_read )
return result;
}
-WRITE8_MEMBER( kc_state::expansion_io_write )
+void kc_state::expansion_io_write(offs_t offset, uint8_t data)
{
// assert MEI line of first slot
m_expansions[0]->mei_w(ASSERT_LINE);
@@ -158,14 +158,14 @@ WRITE8_MEMBER( kc_state::expansion_io_write )
}
// module read/write handlers
-READ8_MEMBER ( kc_state::expansion_4000_r ){ return expansion_read(space, offset + 0x4000); }
-WRITE8_MEMBER( kc_state::expansion_4000_w ){ expansion_write(space, offset + 0x4000, data); }
-READ8_MEMBER ( kc_state::expansion_8000_r ){ return expansion_read(space, offset + 0x8000); }
-WRITE8_MEMBER( kc_state::expansion_8000_w ){ expansion_write(space, offset + 0x8000, data); }
-READ8_MEMBER ( kc_state::expansion_c000_r ){ return expansion_read(space, offset + 0xc000); }
-WRITE8_MEMBER( kc_state::expansion_c000_w ){ expansion_write(space, offset + 0xc000, data); }
-READ8_MEMBER ( kc_state::expansion_e000_r ){ return expansion_read(space, offset + 0xe000); }
-WRITE8_MEMBER( kc_state::expansion_e000_w ){ expansion_write(space, offset + 0xe000, data); }
+uint8_t kc_state::expansion_4000_r(offs_t offset){ return expansion_read(offset + 0x4000); }
+void kc_state::expansion_4000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0x4000, data); }
+uint8_t kc_state::expansion_8000_r(offs_t offset){ return expansion_read(offset + 0x8000); }
+void kc_state::expansion_8000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0x8000, data); }
+uint8_t kc_state::expansion_c000_r(offs_t offset){ return expansion_read(offset + 0xc000); }
+void kc_state::expansion_c000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0xc000, data); }
+uint8_t kc_state::expansion_e000_r(offs_t offset){ return expansion_read(offset + 0xe000); }
+void kc_state::expansion_e000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0xe000, data); }
//**************************************************************************
@@ -309,8 +309,8 @@ void kc_state::update_0x00000()
{
LOG(("Module at 0x0000\n"));
- space.install_read_handler (0x0000, 0x3fff, read8_delegate(*this, FUNC(kc_state::expansion_read)), 0);
- space.install_write_handler(0x0000, 0x3fff, write8_delegate(*this, FUNC(kc_state::expansion_write)), 0);
+ space.install_read_handler (0x0000, 0x3fff, read8sm_delegate(*this, FUNC(kc_state::expansion_read)), 0);
+ space.install_write_handler(0x0000, 0x3fff, write8sm_delegate(*this, FUNC(kc_state::expansion_write)), 0);
}
}
@@ -321,8 +321,8 @@ void kc_state::update_0x04000()
LOG(("Module at 0x4000\n"));
- space.install_read_handler (0x4000, 0x7fff, read8_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0);
- space.install_write_handler(0x4000, 0x7fff, write8_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0);
+ space.install_read_handler (0x4000, 0x7fff, read8sm_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0);
+ space.install_write_handler(0x4000, 0x7fff, write8sm_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0);
}
@@ -345,8 +345,8 @@ void kc_state::update_0x0c000()
{
LOG(("Module at 0x0c000\n"));
- space.install_read_handler (0xc000, 0xdfff, read8_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0);
- space.install_write_handler(0xc000, 0xdfff, write8_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0);
+ space.install_read_handler (0xc000, 0xdfff, read8sm_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0);
+ space.install_write_handler(0xc000, 0xdfff, write8sm_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0);
}
}
@@ -368,8 +368,8 @@ void kc_state::update_0x0e000()
{
LOG(("Module at 0x0e000\n"));
- space.install_read_handler (0xe000, 0xffff, read8_delegate(*this, FUNC(kc_state::expansion_e000_r)), 0);
- space.install_write_handler(0xe000, 0xffff, write8_delegate(*this, FUNC(kc_state::expansion_e000_w)), 0);
+ space.install_read_handler (0xe000, 0xffff, read8sm_delegate(*this, FUNC(kc_state::expansion_e000_r)), 0);
+ space.install_write_handler(0xe000, 0xffff, write8sm_delegate(*this, FUNC(kc_state::expansion_e000_w)), 0);
}
}
@@ -391,8 +391,8 @@ void kc_state::update_0x08000()
{
LOG(("Module at 0x8000!\n"));
- space.install_read_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0);
- space.install_write_handler(0x8000, 0xbfff, write8_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0);
+ space.install_read_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0);
+ space.install_write_handler(0x8000, 0xbfff, write8sm_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0);
}
}
@@ -433,8 +433,8 @@ void kc85_4_state::update_0x04000()
{
LOG(("Module at 0x4000\n"));
- space.install_read_handler (0x4000, 0x7fff, read8_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0);
- space.install_write_handler(0x4000, 0x7fff, write8_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0);
+ space.install_read_handler (0x4000, 0x7fff, read8sm_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0);
+ space.install_write_handler(0x4000, 0x7fff, write8sm_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0);
}
}
@@ -470,8 +470,8 @@ void kc85_4_state::update_0x0c000()
{
LOG(("Module at 0x0c000\n"));
- space.install_read_handler (0xc000, 0xdfff, read8_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0);
- space.install_write_handler(0xc000, 0xdfff, write8_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0);
+ space.install_read_handler (0xc000, 0xdfff, read8sm_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0);
+ space.install_write_handler(0xc000, 0xdfff, write8sm_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0);
}
}
}
@@ -542,8 +542,8 @@ void kc85_4_state::update_0x08000()
{
LOG(("Module at 0x8000\n"));
- space.install_read_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0);
- space.install_write_handler(0x8000, 0xbfff, write8_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0);
+ space.install_read_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0);
+ space.install_write_handler(0x8000, 0xbfff, write8sm_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0);
}
}
@@ -624,7 +624,7 @@ bit 1: BLA0 .pixel/color
bit 0: BILD .display screen 0 or 1
*/
-WRITE8_MEMBER( kc85_4_state::kc85_4_84_w )
+void kc85_4_state::kc85_4_84_w(uint8_t data)
{
LOG(("0x84 W: %02x\n", data));
@@ -635,7 +635,7 @@ WRITE8_MEMBER( kc85_4_state::kc85_4_84_w )
update_0x08000();
}
-READ8_MEMBER( kc85_4_state::kc85_4_84_r )
+uint8_t kc85_4_state::kc85_4_84_r()
{
return m_port_84_data;
}
@@ -651,7 +651,7 @@ bit 1: WRITE PROTECT RAM 4
bit 0: ACCESS RAM 4
*/
-WRITE8_MEMBER( kc85_4_state::kc85_4_86_w )
+void kc85_4_state::kc85_4_86_w(uint8_t data)
{
LOG(("0x86 W: %02x\n", data));
@@ -661,7 +661,7 @@ WRITE8_MEMBER( kc85_4_state::kc85_4_86_w )
update_0x04000();
}
-READ8_MEMBER( kc85_4_state::kc85_4_86_r )
+uint8_t kc85_4_state::kc85_4_86_r()
{
return m_port_86_data;
}
diff --git a/src/mame/machine/kikikai.cpp b/src/mame/machine/kikikai.cpp
index 5e372353c28..08331daa9f9 100644
--- a/src/mame/machine/kikikai.cpp
+++ b/src/mame/machine/kikikai.cpp
@@ -14,14 +14,14 @@ bit 2 = sound cpu reset line
bit 1 = microcontroller reset line
bit 0 = ? (unused?)
*/
-WRITE8_MEMBER(kikikai_state::main_f008_w)
+void kikikai_state::main_f008_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE);
m_mcu->set_input_line(INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
}
-WRITE8_MEMBER(mexico86_state::main_f008_w)
+void mexico86_state::main_f008_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE);
@@ -29,7 +29,7 @@ WRITE8_MEMBER(mexico86_state::main_f008_w)
m_68705mcu->set_input_line(INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
}
-WRITE8_MEMBER(kikikai_simulation_state::main_f008_w)
+void kikikai_simulation_state::main_f008_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE);
@@ -344,54 +344,54 @@ Kiki KaiKai / Kick 'n Run MCU
***************************************************************************/
-READ8_MEMBER(kikikai_state::kikikai_mcu_ddr1_r)
+uint8_t kikikai_state::kikikai_mcu_ddr1_r()
{
return m_ddr1;
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_ddr1_w)
+void kikikai_state::kikikai_mcu_ddr1_w(uint8_t data)
{
m_ddr1 = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_ddr2_r)
+uint8_t kikikai_state::kikikai_mcu_ddr2_r()
{
return m_ddr2;
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_ddr2_w)
+void kikikai_state::kikikai_mcu_ddr2_w(uint8_t data)
{
m_ddr2 = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_ddr3_r)
+uint8_t kikikai_state::kikikai_mcu_ddr3_r()
{
return m_ddr3;
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_ddr3_w)
+void kikikai_state::kikikai_mcu_ddr3_w(uint8_t data)
{
m_ddr3 = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_ddr4_r)
+uint8_t kikikai_state::kikikai_mcu_ddr4_r()
{
return m_ddr4;
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_ddr4_w)
+void kikikai_state::kikikai_mcu_ddr4_w(uint8_t data)
{
m_ddr4 = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_port1_r)
+uint8_t kikikai_state::kikikai_mcu_port1_r()
{
//logerror("%04x: 6801U4 port 1 read\n", m_mcu->pc());
m_port1_in = ioport("IN0")->read();
return (m_port1_out & m_ddr1) | (m_port1_in & ~m_ddr1);
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_port1_w)
+void kikikai_state::kikikai_mcu_port1_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 1 write %02x\n", m_mcu->pc(), data);
@@ -413,13 +413,13 @@ WRITE8_MEMBER(kikikai_state::kikikai_mcu_port1_w)
m_port1_out = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_port2_r)
+uint8_t kikikai_state::kikikai_mcu_port2_r()
{
//logerror("%04x: 6801U4 port 2 read\n", m_mcu->pc());
return (m_port2_out & m_ddr2) | (m_port2_in & ~m_ddr2);
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_port2_w)
+void kikikai_state::kikikai_mcu_port2_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 2 write %02x\n", m_mcu->pc(), data);
static const char *const portnames[] = { "IN1", "IN2" };
@@ -452,25 +452,25 @@ WRITE8_MEMBER(kikikai_state::kikikai_mcu_port2_w)
m_port2_out = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_port3_r)
+uint8_t kikikai_state::kikikai_mcu_port3_r()
{
//logerror("%04x: 6801U4 port 3 read\n", m_mcu->pc());
return (m_port3_out & m_ddr3) | (m_port3_in & ~m_ddr3);
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_port3_w)
+void kikikai_state::kikikai_mcu_port3_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 3 write %02x\n", m_mcu->pc(), data);
m_port3_out = data;
}
-READ8_MEMBER(kikikai_state::kikikai_mcu_port4_r)
+uint8_t kikikai_state::kikikai_mcu_port4_r()
{
//logerror("%04x: 6801U4 port 4 read\n", m_mcu->pc());
return (m_port4_out & m_ddr4) | (m_port4_in & ~m_ddr4);
}
-WRITE8_MEMBER(kikikai_state::kikikai_mcu_port4_w)
+void kikikai_state::kikikai_mcu_port4_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 4 write %02x\n", m_mcu->pc(), data);
diff --git a/src/mame/machine/konamigx.cpp b/src/mame/machine/konamigx.cpp
index d82eb498426..53ad766b79f 100644
--- a/src/mame/machine/konamigx.cpp
+++ b/src/mame/machine/konamigx.cpp
@@ -45,12 +45,12 @@ Has word-wide registers as follows:
// K055550/K053990 protection chips, perform simple memset() and other game logic operations
-READ16_MEMBER(konamigx_state::K055550_word_r)
+uint16_t konamigx_state::K055550_word_r(offs_t offset)
{
return(m_prot_data[offset]);
}
-WRITE16_MEMBER(konamigx_state::K055550_word_w)
+void konamigx_state::K055550_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
auto &mspace = m_maincpu->space(AS_PROGRAM);
uint32_t adr, bsize, count, i, lim;
@@ -176,7 +176,7 @@ WRITE16_MEMBER(konamigx_state::K055550_word_w)
}
}
-WRITE16_MEMBER(konamigx_state::K053990_martchmp_word_w)
+void konamigx_state::K053990_martchmp_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
auto &mspace = m_maincpu->space(AS_PROGRAM);
int src_addr, src_count, src_skip;
@@ -471,11 +471,11 @@ void konamigx_state::fantjour_dma_install()
{
save_item(NAME(m_fantjour_dma));
save_item(NAME(m_prot_data));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xdb0000, 0xdb001f, write32_delegate(*this, FUNC(konamigx_state::fantjour_dma_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xdb0000, 0xdb001f, write32s_delegate(*this, FUNC(konamigx_state::fantjour_dma_w)));
memset(m_fantjour_dma, 0, sizeof(m_fantjour_dma));
}
-WRITE32_MEMBER(konamigx_state::fantjour_dma_w)
+void konamigx_state::fantjour_dma_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
auto &mspace = m_maincpu->space(AS_PROGRAM);
COMBINE_DATA(m_fantjour_dma + offset);
diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp
index 2ed065fdedd..49454224c98 100644
--- a/src/mame/machine/konppc.cpp
+++ b/src/mame/machine/konppc.cpp
@@ -110,7 +110,7 @@ void konppc_device::set_cgboard_texture_bank(int board, const char *bank, uint8_
/* CG Board DSP interface for PowerPC */
-READ32_MEMBER( konppc_device::cgboard_dsp_comm_r_ppc )
+uint32_t konppc_device::cgboard_dsp_comm_r_ppc(offs_t offset, uint32_t mem_mask)
{
if (cgboard_id < MAX_CG_BOARDS)
{
@@ -123,7 +123,7 @@ READ32_MEMBER( konppc_device::cgboard_dsp_comm_r_ppc )
}
}
-WRITE32_MEMBER( konppc_device::cgboard_dsp_comm_w_ppc )
+void konppc_device::cgboard_dsp_comm_w_ppc(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// osd_printf_debug("%s dsp_cmd_w: (board %d) %08X, %08X, %08X\n", machine().describe_context(), cgboard_id, data, offset, mem_mask);
@@ -165,7 +165,7 @@ WRITE32_MEMBER( konppc_device::cgboard_dsp_comm_w_ppc )
-READ32_MEMBER( konppc_device::cgboard_dsp_shared_r_ppc )
+uint32_t konppc_device::cgboard_dsp_shared_r_ppc(offs_t offset)
{
if (cgboard_id < MAX_CG_BOARDS)
{
@@ -177,7 +177,7 @@ READ32_MEMBER( konppc_device::cgboard_dsp_shared_r_ppc )
}
}
-WRITE32_MEMBER( konppc_device::cgboard_dsp_shared_w_ppc )
+void konppc_device::cgboard_dsp_shared_w_ppc(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (cgboard_id < MAX_CG_BOARDS)
{
@@ -195,7 +195,7 @@ uint32_t konppc_device::dsp_comm_sharc_r(int board, int offset)
return dsp_comm_ppc[board][offset];
}
-void konppc_device::dsp_comm_sharc_w(address_space &space, int board, int offset, uint32_t data)
+void konppc_device::dsp_comm_sharc_w(int board, int offset, uint32_t data)
{
if (offset >= 2)
{
@@ -288,49 +288,49 @@ void konppc_device::dsp_shared_ram_w_sharc(int board, int offset, uint32_t data)
}
}
-READ32_MEMBER( konppc_device::cgboard_0_comm_sharc_r )
+uint32_t konppc_device::cgboard_0_comm_sharc_r(offs_t offset)
{
return dsp_comm_sharc_r(0, offset);
}
-WRITE32_MEMBER( konppc_device::cgboard_0_comm_sharc_w )
+void konppc_device::cgboard_0_comm_sharc_w(offs_t offset, uint32_t data)
{
- dsp_comm_sharc_w(space, 0, offset, data);
+ dsp_comm_sharc_w(0, offset, data);
}
-READ32_MEMBER( konppc_device::cgboard_0_shared_sharc_r )
+uint32_t konppc_device::cgboard_0_shared_sharc_r(offs_t offset)
{
return dsp_shared_ram_r_sharc(0, offset);
}
-WRITE32_MEMBER( konppc_device::cgboard_0_shared_sharc_w )
+void konppc_device::cgboard_0_shared_sharc_w(offs_t offset, uint32_t data)
{
dsp_shared_ram_w_sharc(0, offset, data);
}
-READ32_MEMBER( konppc_device::cgboard_1_comm_sharc_r )
+uint32_t konppc_device::cgboard_1_comm_sharc_r(offs_t offset)
{
return dsp_comm_sharc_r(1, offset);
}
-WRITE32_MEMBER( konppc_device::cgboard_1_comm_sharc_w )
+void konppc_device::cgboard_1_comm_sharc_w(offs_t offset, uint32_t data)
{
- dsp_comm_sharc_w(space, 1, offset, data);
+ dsp_comm_sharc_w(1, offset, data);
}
-READ32_MEMBER( konppc_device::cgboard_1_shared_sharc_r )
+uint32_t konppc_device::cgboard_1_shared_sharc_r(offs_t offset)
{
return dsp_shared_ram_r_sharc(1, offset);
}
-WRITE32_MEMBER( konppc_device::cgboard_1_shared_sharc_w )
+void konppc_device::cgboard_1_shared_sharc_w(offs_t offset, uint32_t data)
{
dsp_shared_ram_w_sharc(1, offset, data);
}
/*****************************************************************************/
-uint32_t konppc_device::nwk_fifo_r(address_space &space, int board)
+uint32_t konppc_device::nwk_fifo_r(int board)
{
if (nwk_fifo_read_ptr[board] < nwk_fifo_half_full_r)
{
@@ -377,37 +377,37 @@ void konppc_device::nwk_fifo_w(int board, uint32_t data)
/*****************************************************************************/
-/* Konami K033906 PCI bridge (most emulation is now in src/emu/machine/k033906.c ) */
+/* Konami K033906 PCI bridge (most emulation is now in src/devices/machine/k033906.cpp ) */
-READ32_MEMBER( konppc_device::K033906_0_r )
+uint32_t konppc_device::K033906_0_r(offs_t offset)
{
if (nwk_device_sel[0] & 0x01)
- return nwk_fifo_r(space, 0);
+ return nwk_fifo_r(0);
else
return m_k033906[0]->read(offset);
}
-WRITE32_MEMBER( konppc_device::K033906_0_w )
+void konppc_device::K033906_0_w(offs_t offset, uint32_t data)
{
m_k033906[0]->write(offset, data);
}
-READ32_MEMBER( konppc_device::K033906_1_r )
+uint32_t konppc_device::K033906_1_r(offs_t offset)
{
if (nwk_device_sel[1] & 0x01)
- return nwk_fifo_r(space, 1);
+ return nwk_fifo_r(1);
else
return m_k033906[1]->read(offset);
}
-WRITE32_MEMBER( konppc_device::K033906_1_w)
+void konppc_device::K033906_1_w(offs_t offset, uint32_t data)
{
m_k033906[1]->write(offset, data);
}
/*****************************************************************************/
-WRITE32_MEMBER( konppc_device::nwk_fifo_0_w)
+void konppc_device::nwk_fifo_0_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (nwk_device_sel[0] & 0x01)
{
@@ -424,7 +424,7 @@ WRITE32_MEMBER( konppc_device::nwk_fifo_0_w)
}
}
-WRITE32_MEMBER( konppc_device::nwk_fifo_1_w)
+void konppc_device::nwk_fifo_1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (nwk_device_sel[1] & 0x01)
{
@@ -441,7 +441,7 @@ WRITE32_MEMBER( konppc_device::nwk_fifo_1_w)
}
}
-READ32_MEMBER( konppc_device::nwk_voodoo_0_r)
+uint32_t konppc_device::nwk_voodoo_0_r(offs_t offset)
{
if ((nwk_device_sel[0] == 0x4) && offset >= 0x100000 && offset < 0x200000)
{
@@ -453,7 +453,7 @@ READ32_MEMBER( konppc_device::nwk_voodoo_0_r)
}
}
-READ32_MEMBER( konppc_device::nwk_voodoo_1_r)
+uint32_t konppc_device::nwk_voodoo_1_r(offs_t offset)
{
if ((nwk_device_sel[1] == 0x4) && offset >= 0x100000 && offset < 0x200000)
{
@@ -465,7 +465,7 @@ READ32_MEMBER( konppc_device::nwk_voodoo_1_r)
}
}
-WRITE32_MEMBER( konppc_device::nwk_voodoo_0_w)
+void konppc_device::nwk_voodoo_0_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (nwk_device_sel[0] & 0x01)
{
@@ -482,7 +482,7 @@ WRITE32_MEMBER( konppc_device::nwk_voodoo_0_w)
}
}
-WRITE32_MEMBER( konppc_device::nwk_voodoo_1_w)
+void konppc_device::nwk_voodoo_1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (nwk_device_sel[1] & 0x01)
{
diff --git a/src/mame/machine/konppc.h b/src/mame/machine/konppc.h
index e3862b23b9a..f905057c503 100644
--- a/src/mame/machine/konppc.h
+++ b/src/mame/machine/konppc.h
@@ -32,41 +32,41 @@ public:
// read/write
- DECLARE_READ32_MEMBER( cgboard_dsp_comm_r_ppc );
- DECLARE_WRITE32_MEMBER( cgboard_dsp_comm_w_ppc );
- DECLARE_READ32_MEMBER( cgboard_dsp_shared_r_ppc );
- DECLARE_WRITE32_MEMBER( cgboard_dsp_shared_w_ppc );
-
- DECLARE_READ32_MEMBER( cgboard_0_comm_sharc_r );
- DECLARE_WRITE32_MEMBER( cgboard_0_comm_sharc_w );
- DECLARE_READ32_MEMBER( cgboard_0_shared_sharc_r );
- DECLARE_WRITE32_MEMBER( cgboard_0_shared_sharc_w );
- DECLARE_READ32_MEMBER( cgboard_1_comm_sharc_r );
- DECLARE_WRITE32_MEMBER( cgboard_1_comm_sharc_w );
- DECLARE_READ32_MEMBER( cgboard_1_shared_sharc_r );
- DECLARE_WRITE32_MEMBER( cgboard_1_shared_sharc_w );
-
- DECLARE_READ32_MEMBER(K033906_0_r);
- DECLARE_WRITE32_MEMBER(K033906_0_w);
- DECLARE_READ32_MEMBER(K033906_1_r);
- DECLARE_WRITE32_MEMBER(K033906_1_w);
-
- DECLARE_WRITE32_MEMBER(nwk_fifo_0_w);
- DECLARE_WRITE32_MEMBER(nwk_fifo_1_w);
- DECLARE_READ32_MEMBER(nwk_voodoo_0_r);
- DECLARE_READ32_MEMBER(nwk_voodoo_1_r);
- DECLARE_WRITE32_MEMBER(nwk_voodoo_0_w);
- DECLARE_WRITE32_MEMBER(nwk_voodoo_1_w);
+ uint32_t cgboard_dsp_comm_r_ppc(offs_t offset, uint32_t mem_mask = ~0);
+ void cgboard_dsp_comm_w_ppc(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cgboard_dsp_shared_r_ppc(offs_t offset);
+ void cgboard_dsp_shared_w_ppc(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+ uint32_t cgboard_0_comm_sharc_r(offs_t offset);
+ void cgboard_0_comm_sharc_w(offs_t offset, uint32_t data);
+ uint32_t cgboard_0_shared_sharc_r(offs_t offset);
+ void cgboard_0_shared_sharc_w(offs_t offset, uint32_t data);
+ uint32_t cgboard_1_comm_sharc_r(offs_t offset);
+ void cgboard_1_comm_sharc_w(offs_t offset, uint32_t data);
+ uint32_t cgboard_1_shared_sharc_r(offs_t offset);
+ void cgboard_1_shared_sharc_w(offs_t offset, uint32_t data);
+
+ uint32_t K033906_0_r(offs_t offset);
+ void K033906_0_w(offs_t offset, uint32_t data);
+ uint32_t K033906_1_r(offs_t offset);
+ void K033906_1_w(offs_t offset, uint32_t data);
+
+ void nwk_fifo_0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void nwk_fifo_1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t nwk_voodoo_0_r(offs_t offset);
+ uint32_t nwk_voodoo_1_r(offs_t offset);
+ void nwk_voodoo_0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void nwk_voodoo_1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
protected:
// device-level overrides
virtual void device_start() override;
uint32_t dsp_comm_sharc_r(int board, int offset);
- void dsp_comm_sharc_w(address_space &space, int board, int offset, uint32_t data);
+ void dsp_comm_sharc_w(int board, int offset, uint32_t data);
uint32_t dsp_shared_ram_r_sharc(int board, int offset);
void dsp_shared_ram_w_sharc(int board, int offset, uint32_t data);
- uint32_t nwk_fifo_r(address_space &space, int board);
+ uint32_t nwk_fifo_r(int board);
void nwk_fifo_w(int board, uint32_t data);
private:
// device finders
diff --git a/src/mame/machine/lisa.cpp b/src/mame/machine/lisa.cpp
index 5fc4807d645..32f5f77cb9b 100644
--- a/src/mame/machine/lisa.cpp
+++ b/src/mame/machine/lisa.cpp
@@ -1158,7 +1158,7 @@ void lisa_state::lisa_fdc_ttl_glue_access(offs_t offset)
}
}
-READ8_MEMBER(lisa_state::lisa_fdc_io_r)
+uint8_t lisa_state::lisa_fdc_io_r(offs_t offset)
{
int answer=0;
@@ -1185,7 +1185,7 @@ READ8_MEMBER(lisa_state::lisa_fdc_io_r)
return answer;
}
-WRITE8_MEMBER(lisa_state::lisa_fdc_io_w)
+void lisa_state::lisa_fdc_io_w(offs_t offset, uint8_t data)
{
switch ((offset & 0x0030) >> 4)
{
@@ -1213,7 +1213,7 @@ WRITE8_MEMBER(lisa_state::lisa_fdc_io_w)
}
}
-READ16_MEMBER(lisa_state::lisa_r)
+uint16_t lisa_state::lisa_r(offs_t offset, uint16_t mem_mask)
{
int answer=0;
@@ -1310,7 +1310,7 @@ READ16_MEMBER(lisa_state::lisa_r)
break;
case IO:
- answer = lisa_IO_r(space, (address & 0x00ffff) >> 1, mem_mask);
+ answer = lisa_IO_r((address & 0x00ffff) >> 1, mem_mask);
break;
@@ -1386,7 +1386,7 @@ READ16_MEMBER(lisa_state::lisa_r)
return answer;
}
-WRITE16_MEMBER(lisa_state::lisa_w)
+void lisa_state::lisa_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* segment register set */
int the_seg = m_seg;
@@ -1555,7 +1555,7 @@ WRITE16_MEMBER(lisa_state::lisa_w)
break;
case IO:
- lisa_IO_w(space, (address & 0x00ffff) >> 1, data, mem_mask);
+ lisa_IO_w((address & 0x00ffff) >> 1, data, mem_mask);
break;
case RAM_stack_r: /* read-only */
@@ -1659,7 +1659,7 @@ WRITE_LINE_MEMBER(lisa_state::hdmsk_w)
set_parity_error_pending(0);
}
-READ16_MEMBER(lisa_state::lisa_IO_r)
+uint16_t lisa_state::lisa_IO_r(offs_t offset, uint16_t mem_mask)
{
int answer=0;
@@ -1784,7 +1784,7 @@ READ16_MEMBER(lisa_state::lisa_IO_r)
return answer;
}
-WRITE16_MEMBER(lisa_state::lisa_IO_w)
+void lisa_state::lisa_IO_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch ((offset & 0x7000) >> 12)
{
diff --git a/src/mame/machine/llc.cpp b/src/mame/machine/llc.cpp
index caeb0838fd9..6b3a61a29e6 100644
--- a/src/mame/machine/llc.cpp
+++ b/src/mame/machine/llc.cpp
@@ -133,7 +133,7 @@ MACHINE_RESET_MEMBER(llc_state,llc2)
}
-WRITE8_MEMBER(llc_state::llc2_rom_disable_w)
+void llc_state::llc2_rom_disable_w(uint8_t data)
{
address_space &mem_space = m_maincpu->space(AS_PROGRAM);
uint8_t *ram = m_ram->pointer();
@@ -152,7 +152,7 @@ WRITE8_MEMBER(llc_state::llc2_rom_disable_w)
}
-WRITE8_MEMBER(llc_state::llc2_basic_enable_w)
+void llc_state::llc2_basic_enable_w(uint8_t data)
{
address_space &mem_space = m_maincpu->space(AS_PROGRAM);
if (data & 0x02)
diff --git a/src/mame/machine/lsasquad.cpp b/src/mame/machine/lsasquad.cpp
index 7735325b583..75f39df6782 100644
--- a/src/mame/machine/lsasquad.cpp
+++ b/src/mame/machine/lsasquad.cpp
@@ -10,17 +10,17 @@
***************************************************************************/
-WRITE8_MEMBER(lsasquad_state::lsasquad_sh_nmi_disable_w)
+void lsasquad_state::lsasquad_sh_nmi_disable_w(uint8_t data)
{
m_soundnmi->in_w<1>(0);
}
-WRITE8_MEMBER(lsasquad_state::lsasquad_sh_nmi_enable_w)
+void lsasquad_state::lsasquad_sh_nmi_enable_w(uint8_t data)
{
m_soundnmi->in_w<1>(1);
}
-READ8_MEMBER(lsasquad_state::lsasquad_sound_status_r)
+uint8_t lsasquad_state::lsasquad_sound_status_r()
{
/* bit 0: message pending for sound cpu */
/* bit 1: message pending for main cpu */
@@ -28,14 +28,14 @@ READ8_MEMBER(lsasquad_state::lsasquad_sound_status_r)
}
-READ8_MEMBER(lsasquad_state::daikaiju_sound_status_r)
+uint8_t lsasquad_state::daikaiju_sound_status_r()
{
/* bit 0: message pending for sound cpu */
/* bit 1: message pending for main cpu */
return (m_soundlatch->pending_r() ? 2 : 1);
}
-READ8_MEMBER(lsasquad_state::lsasquad_mcu_status_r)
+uint8_t lsasquad_state::lsasquad_mcu_status_r()
{
int res = ioport("MCU")->read();
@@ -53,7 +53,7 @@ READ8_MEMBER(lsasquad_state::lsasquad_mcu_status_r)
return res;
}
-READ8_MEMBER(lsasquad_state::daikaiju_mcu_status_r)
+uint8_t lsasquad_state::daikaiju_mcu_status_r()
{
int res = ioport("MCU")->read();
diff --git a/src/mame/machine/lynx.cpp b/src/mame/machine/lynx.cpp
index c18a0b6ebc3..0ea49c13a12 100644
--- a/src/mame/machine/lynx.cpp
+++ b/src/mame/machine/lynx.cpp
@@ -892,7 +892,7 @@ void lynx_state::lynx_multiply()
}
}
-READ8_MEMBER(lynx_state::suzy_read)
+uint8_t lynx_state::suzy_read(offs_t offset)
{
uint8_t value = 0, input;
@@ -1042,7 +1042,7 @@ READ8_MEMBER(lynx_state::suzy_read)
return value;
}
-WRITE8_MEMBER(lynx_state::suzy_write)
+void lynx_state::suzy_write(offs_t offset, uint8_t data)
{
m_suzy.data[offset] = data;
//logerror("suzy write %.2x %.2x\n",offset,data);
@@ -1632,7 +1632,7 @@ TIMER_CALLBACK_MEMBER(lynx_state::lynx_uart_timer)
}
}
-READ8_MEMBER(lynx_state::lynx_uart_r)
+uint8_t lynx_state::lynx_uart_r(offs_t offset)
{
uint8_t value = 0x00;
switch (offset)
@@ -1654,7 +1654,7 @@ READ8_MEMBER(lynx_state::lynx_uart_r)
return value;
}
-WRITE8_MEMBER(lynx_state::lynx_uart_w)
+void lynx_state::lynx_uart_w(offs_t offset, uint8_t data)
{
logerror("uart write %.2x %.2x\n", offset, data);
switch (offset)
@@ -1688,7 +1688,7 @@ WRITE8_MEMBER(lynx_state::lynx_uart_w)
****************************************/
-READ8_MEMBER(lynx_state::mikey_read)
+uint8_t lynx_state::mikey_read(offs_t offset)
{
uint8_t direction, value = 0x00;
@@ -1747,7 +1747,7 @@ READ8_MEMBER(lynx_state::mikey_read)
case 0x8c:
case 0x8d:
- value = lynx_uart_r(space, offset, mem_mask);
+ value = lynx_uart_r(offset);
break;
default:
@@ -1757,7 +1757,7 @@ READ8_MEMBER(lynx_state::mikey_read)
return value;
}
-WRITE8_MEMBER(lynx_state::mikey_write)
+void lynx_state::mikey_write(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -1819,7 +1819,7 @@ WRITE8_MEMBER(lynx_state::mikey_write)
break;
case 0x8c: case 0x8d:
- lynx_uart_w(space, offset, data);
+ lynx_uart_w(offset, data);
break;
case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7:
@@ -1872,7 +1872,7 @@ WRITE8_MEMBER(lynx_state::mikey_write)
****************************************/
-READ8_MEMBER(lynx_state::lynx_memory_config_r)
+uint8_t lynx_state::lynx_memory_config_r()
{
return m_memory_config;
}
diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp
index d961cef1014..1a907b4ecfc 100644
--- a/src/mame/machine/m20_8086.cpp
+++ b/src/mame/machine/m20_8086.cpp
@@ -65,12 +65,12 @@ void m20_8086_device::device_add_mconfig(machine_config &config)
m_8086->set_irq_acknowledge_callback(FUNC(m20_8086_device::int_cb));
}
-READ16_MEMBER(m20_8086_device::z8000_io_r)
+uint16_t m20_8086_device::z8000_io_r(offs_t offset, uint16_t mem_mask)
{
return m_maincpu->space(AS_IO).read_word(offset << 1, mem_mask);
}
-WRITE16_MEMBER(m20_8086_device::z8000_io_w)
+void m20_8086_device::z8000_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_maincpu->space(AS_IO).write_word(offset << 1, data, mem_mask);
}
@@ -99,7 +99,7 @@ WRITE_LINE_MEMBER(m20_8086_device::vi_w)
m_8086->set_input_line(INPUT_LINE_IRQ0, (state || m_nvi) ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE16_MEMBER(m20_8086_device::handshake_w)
+void m20_8086_device::handshake_w(offs_t offset, uint16_t data)
{
if(!offset)
{
diff --git a/src/mame/machine/m20_8086.h b/src/mame/machine/m20_8086.h
index c0ec8c7588a..ae083e47d62 100644
--- a/src/mame/machine/m20_8086.h
+++ b/src/mame/machine/m20_8086.h
@@ -21,11 +21,11 @@ public:
m20_8086_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ16_MEMBER(z8000_io_r);
- DECLARE_WRITE16_MEMBER(z8000_io_w);
+ uint16_t z8000_io_r(offs_t offset, uint16_t mem_mask = ~0);
+ void z8000_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(vi_w);
DECLARE_WRITE_LINE_MEMBER(nvi_w);
- DECLARE_WRITE16_MEMBER(handshake_w);
+ void handshake_w(offs_t offset, uint16_t data);
void halt() { m_8086->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }
bool halted() const { return m_8086_halt; }
diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp
index 34d05b9e891..aee7ac9f6c6 100644
--- a/src/mame/machine/m24_z8000.cpp
+++ b/src/mame/machine/m24_z8000.cpp
@@ -97,7 +97,7 @@ const uint8_t m24_z8000_device::pmem_table[16][4] =
{1, 2, 8, 9}, {5, 6, 10, 11}, {1, 2, 8, 9}, {12, 13, 14, 15},
{16, 17, 18, 19}, {20, 21, 22, 23}, {24, 25, 26, 27}, {28, 29, 30, 31}};
-READ16_MEMBER(m24_z8000_device::pmem_r)
+uint16_t m24_z8000_device::pmem_r(offs_t offset, uint16_t mem_mask)
{
uint16_t ret;
uint8_t hostseg;
@@ -115,7 +115,7 @@ READ16_MEMBER(m24_z8000_device::pmem_r)
return (ret << 8) | (ret >> 8);
}
-WRITE16_MEMBER(m24_z8000_device::pmem_w)
+void m24_z8000_device::pmem_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t hostseg;
data = (data << 8) | (data >> 8);
@@ -135,7 +135,7 @@ const uint8_t m24_z8000_device::dmem_table[16][4] =
{5, 6, 10, 11}, {5, 6, 10, 11}, {1, 2, 8, 9}, {12, 13, 14, 15},
{16, 17, 18, 19}, {20, 21, 22, 23}, {24, 25, 26, 27}, {28, 29, 30, 31}};
-READ16_MEMBER(m24_z8000_device::dmem_r)
+uint16_t m24_z8000_device::dmem_r(offs_t offset, uint16_t mem_mask)
{
uint16_t ret;
uint8_t hostseg;
@@ -150,7 +150,7 @@ READ16_MEMBER(m24_z8000_device::dmem_r)
return (ret << 8) | (ret >> 8);
}
-WRITE16_MEMBER(m24_z8000_device::dmem_w)
+void m24_z8000_device::dmem_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t hostseg;
data = (data << 8) | (data >> 8);
@@ -164,13 +164,13 @@ WRITE16_MEMBER(m24_z8000_device::dmem_w)
m_maincpu->space(AS_PROGRAM).write_word(offset, data, (mem_mask << 8) | (mem_mask >> 8));
}
-READ16_MEMBER(m24_z8000_device::i86_io_r)
+uint16_t m24_z8000_device::i86_io_r(offs_t offset, uint16_t mem_mask)
{
uint16_t ret = m_maincpu->space(AS_IO).read_word(offset << 1, (mem_mask << 8) | (mem_mask >> 8));
return (ret << 8) | (ret >> 8);
}
-WRITE16_MEMBER(m24_z8000_device::i86_io_w)
+void m24_z8000_device::i86_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = (data << 8) | (data >> 8);
m_maincpu->space(AS_IO).write_word(offset << 1, data, (mem_mask << 8) | (mem_mask >> 8));
diff --git a/src/mame/machine/m24_z8000.h b/src/mame/machine/m24_z8000.h
index 61d96783589..a7dea290eb1 100644
--- a/src/mame/machine/m24_z8000.h
+++ b/src/mame/machine/m24_z8000.h
@@ -18,12 +18,12 @@ public:
auto halt_callback() { return m_halt_out.bind(); }
- DECLARE_READ16_MEMBER(pmem_r);
- DECLARE_WRITE16_MEMBER(pmem_w);
- DECLARE_READ16_MEMBER(dmem_r);
- DECLARE_WRITE16_MEMBER(dmem_w);
- DECLARE_READ16_MEMBER(i86_io_r);
- DECLARE_WRITE16_MEMBER(i86_io_w);
+ uint16_t pmem_r(offs_t offset, uint16_t mem_mask = ~0);
+ void pmem_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dmem_r(offs_t offset, uint16_t mem_mask = ~0);
+ void dmem_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t i86_io_r(offs_t offset, uint16_t mem_mask = ~0);
+ void i86_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE8_MEMBER(irqctl_w);
DECLARE_WRITE8_MEMBER(serctl_w);
DECLARE_READ8_MEMBER(handshake_r);
diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp
index a4c72c7801b..e1d74fc0ae3 100644
--- a/src/mame/machine/m3comm.cpp
+++ b/src/mame/machine/m3comm.cpp
@@ -205,7 +205,7 @@ void m3comm_device::device_timer(emu_timer &timer, device_timer_id id, int param
///////////// Internal MMIO
-READ16_MEMBER(m3comm_device::ctrl_r)
+uint16_t m3comm_device::ctrl_r(offs_t offset, uint16_t mem_mask)
{
switch (offset) {
case 0x00 / 2:
@@ -215,7 +215,7 @@ READ16_MEMBER(m3comm_device::ctrl_r)
return 0;
}
}
-WRITE16_MEMBER(m3comm_device::ctrl_w)
+void m3comm_device::ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch (offset) {
case 0x00 / 2: // Communication RAM bank switch (flipped in IRQ2 and IRQ5 handlers)
@@ -237,7 +237,7 @@ WRITE16_MEMBER(m3comm_device::ctrl_w)
}
}
-READ16_MEMBER(m3comm_device::ioregs_r)
+uint16_t m3comm_device::ioregs_r(offs_t offset, uint16_t mem_mask)
{
switch (offset) {
case 0x00 / 2: // UNK, Model3 host wait it to be NZ then write 0
@@ -258,7 +258,7 @@ READ16_MEMBER(m3comm_device::ioregs_r)
return 0;
}
}
-WRITE16_MEMBER(m3comm_device::ioregs_w)
+void m3comm_device::ioregs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch (offset) {
case 0x14 / 2: // written 80 at data receive enable, 0 then 1 at IRQ6 handler
@@ -332,43 +332,43 @@ WRITE16_MEMBER(m3comm_device::ioregs_w)
////////////// Model3 interface
-READ16_MEMBER(m3comm_device::m3_m68k_ram_r)
+uint16_t m3comm_device::m3_m68k_ram_r(offs_t offset)
{
uint16_t value = m68k_ram[offset]; // FIXME endian
return swapb16(value);
}
-WRITE16_MEMBER(m3comm_device::m3_m68k_ram_w)
+void m3comm_device::m3_m68k_ram_w(offs_t offset, uint16_t data)
{
m68k_ram[offset] = swapb16(data); // FIXME endian
}
-READ8_MEMBER(m3comm_device::m3_comm_ram_r)
+uint8_t m3comm_device::m3_comm_ram_r(offs_t offset)
{
uint8_t *commram = (uint8_t*)membank("comm_ram")->base();
return commram[offset ^ 3];
}
-WRITE8_MEMBER(m3comm_device::m3_comm_ram_w)
+void m3comm_device::m3_comm_ram_w(offs_t offset, uint8_t data)
{
uint8_t *commram = (uint8_t*)membank("comm_ram")->base();
commram[offset ^ 3] = data;
}
-READ16_MEMBER(m3comm_device::m3_ioregs_r)
+uint16_t m3comm_device::m3_ioregs_r(offs_t offset, uint16_t mem_mask)
{
- uint16_t value = ioregs_r(space, offset, swapb16(mem_mask));
+ uint16_t value = ioregs_r(offset, swapb16(mem_mask));
return swapb16(value);
}
-WRITE16_MEMBER(m3comm_device::m3_ioregs_w)
+void m3comm_device::m3_ioregs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t value = swapb16(data);
- ioregs_w(space, offset, value, swapb16(mem_mask));
+ ioregs_w(offset, value, swapb16(mem_mask));
// guess, can be asserted at any reg write
if (offset == (0x88 / 2))
m_commcpu->set_input_line(M68K_IRQ_2, ASSERT_LINE);
}
-////////////// NAOMI inerface
+////////////// NAOMI interface
-READ16_MEMBER(m3comm_device::naomi_r)
+uint16_t m3comm_device::naomi_r(offs_t offset)
{
switch (offset)
{
@@ -398,7 +398,7 @@ READ16_MEMBER(m3comm_device::naomi_r)
return 0;
}
}
-WRITE16_MEMBER(m3comm_device::naomi_w)
+void m3comm_device::naomi_w(offs_t offset, uint16_t data)
{
switch (offset)
{
diff --git a/src/mame/machine/m3comm.h b/src/mame/machine/m3comm.h
index 6e80c24eeff..f4fd23c1578 100644
--- a/src/mame/machine/m3comm.h
+++ b/src/mame/machine/m3comm.h
@@ -21,21 +21,21 @@ public:
void m3_map(address_map &map);
- DECLARE_READ16_MEMBER(ctrl_r);
- DECLARE_WRITE16_MEMBER(ctrl_w);
+ uint16_t ctrl_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(ioregs_r);
- DECLARE_WRITE16_MEMBER(ioregs_w);
+ uint16_t ioregs_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ioregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(m3_m68k_ram_r);
- DECLARE_WRITE16_MEMBER(m3_m68k_ram_w);
- DECLARE_READ8_MEMBER(m3_comm_ram_r);
- DECLARE_WRITE8_MEMBER(m3_comm_ram_w);
- DECLARE_READ16_MEMBER(m3_ioregs_r);
- DECLARE_WRITE16_MEMBER(m3_ioregs_w);
+ uint16_t m3_m68k_ram_r(offs_t offset);
+ void m3_m68k_ram_w(offs_t offset, uint16_t data);
+ uint8_t m3_comm_ram_r(offs_t offset);
+ void m3_comm_ram_w(offs_t offset, uint8_t data);
+ uint16_t m3_ioregs_r(offs_t offset, uint16_t mem_mask = ~0);
+ void m3_ioregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(naomi_r);
- DECLARE_WRITE16_MEMBER(naomi_w);
+ uint16_t naomi_r(offs_t offset);
+ void naomi_w(offs_t offset, uint16_t data);
void m3comm_mem(address_map &map);
protected:
diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp
index b19c3e9cff9..f2c7d45acc4 100644
--- a/src/mame/machine/mac.cpp
+++ b/src/mame/machine/mac.cpp
@@ -284,7 +284,7 @@ WRITE_LINE_MEMBER(mac_state::mac_asc_irq)
}
}
-WRITE16_MEMBER ( mac_state::mac_autovector_w )
+void mac_state::mac_autovector_w(offs_t offset, uint16_t data)
{
if (LOG_GENERAL)
logerror("mac_autovector_w: offset=0x%08x data=0x%04x\n", offset, data);
@@ -294,7 +294,7 @@ WRITE16_MEMBER ( mac_state::mac_autovector_w )
/* Not yet implemented */
}
-READ16_MEMBER ( mac_state::mac_autovector_r )
+uint16_t mac_state::mac_autovector_r(offs_t offset)
{
if (LOG_GENERAL)
logerror("mac_autovector_r: offset=0x%08x\n", offset);
@@ -344,7 +344,7 @@ void mac_state::v8_resize()
mac_install_memory(0x00000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
// install catcher in place of ROM that will detect the first access to ROM in its real location
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa00000, 0xafffff, read32_delegate(*this, FUNC(mac_state::rom_switch_r)), 0xffffffff);
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa00000, 0xafffff, read32sm_delegate(*this, FUNC(mac_state::rom_switch_r)), 0xffffffff);
}
else
{
@@ -464,7 +464,7 @@ void mac_state::set_memory_overlay(int overlay)
if (is_rom)
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x40000000, 0x4fffffff, read32_delegate(*this, FUNC(mac_state::rom_switch_r)), 0xffffffff);
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x40000000, 0x4fffffff, read32sm_delegate(*this, FUNC(mac_state::rom_switch_r)), 0xffffffff);
}
else
{
@@ -489,7 +489,7 @@ void mac_state::set_memory_overlay(int overlay)
}
}
-READ32_MEMBER(mac_state::rom_switch_r)
+uint32_t mac_state::rom_switch_r(offs_t offset)
{
offs_t ROM_size = memregion("bootrom")->bytes();
uint32_t *ROM_data = (uint32_t *)memregion("bootrom")->base();
@@ -945,7 +945,7 @@ Note: Asserting the DACK signal applies only to write operations to
scsiRd+sRESET $580070 Reset Parity/Interrupt
*/
-READ16_MEMBER ( mac_state::macplus_scsi_r )
+uint16_t mac_state::macplus_scsi_r(offs_t offset, uint16_t mem_mask)
{
int reg = (offset>>3) & 0xf;
@@ -959,7 +959,7 @@ READ16_MEMBER ( mac_state::macplus_scsi_r )
return m_ncr5380->ncr5380_read_reg(reg)<<8;
}
-READ32_MEMBER (mac_state::macii_scsi_drq_r)
+uint32_t mac_state::macii_scsi_drq_r(offs_t offset, uint32_t mem_mask)
{
switch (mem_mask)
{
@@ -979,7 +979,7 @@ READ32_MEMBER (mac_state::macii_scsi_drq_r)
return 0;
}
-WRITE32_MEMBER (mac_state::macii_scsi_drq_w)
+void mac_state::macii_scsi_drq_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
switch (mem_mask)
{
@@ -1005,7 +1005,7 @@ WRITE32_MEMBER (mac_state::macii_scsi_drq_w)
}
}
-WRITE16_MEMBER ( mac_state::macplus_scsi_w )
+void mac_state::macplus_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int reg = (offset>>3) & 0xf;
@@ -1019,7 +1019,7 @@ WRITE16_MEMBER ( mac_state::macplus_scsi_w )
m_ncr5380->ncr5380_write_reg(reg, data);
}
-WRITE16_MEMBER ( mac_state::macii_scsi_w )
+void mac_state::macii_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int reg = (offset>>3) & 0xf;
@@ -1165,7 +1165,7 @@ void mac_state::scc_mouse_irq(int x, int y)
-READ16_MEMBER ( mac_state::mac_scc_r )
+uint16_t mac_state::mac_scc_r(offs_t offset)
{
uint16_t result;
@@ -1175,12 +1175,12 @@ READ16_MEMBER ( mac_state::mac_scc_r )
-WRITE16_MEMBER ( mac_state::mac_scc_w )
+void mac_state::mac_scc_w(offs_t offset, uint16_t data)
{
m_scc->reg_w(offset, data);
}
-WRITE16_MEMBER ( mac_state::mac_scc_2_w )
+void mac_state::mac_scc_2_w(offs_t offset, uint16_t data)
{
m_scc->reg_w(offset, data >> 8);
}
@@ -1189,7 +1189,7 @@ WRITE16_MEMBER ( mac_state::mac_scc_2_w )
* IWM Code specific to the Mac Plus *
* ********************************** */
-READ16_MEMBER ( mac_state::mac_iwm_r )
+uint16_t mac_state::mac_iwm_r(offs_t offset, uint16_t mem_mask)
{
/* The first time this is called is in a floppy test, which goes from
* $400104 to $400126. After that, all access to the floppy goes through
@@ -1207,7 +1207,7 @@ READ16_MEMBER ( mac_state::mac_iwm_r )
return (result << 8) | result;
}
-WRITE16_MEMBER ( mac_state::mac_iwm_w )
+void mac_state::mac_iwm_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (LOG_MAC_IWM)
printf("mac_iwm_w: offset=0x%08x data=0x%04x mask %04x (PC=%x)\n", offset, data, mem_mask, m_maincpu->pc());
@@ -1652,7 +1652,7 @@ WRITE_LINE_MEMBER(mac_state::mac_via_irq)
set_via_interrupt(state);
}
-READ16_MEMBER ( mac_state::mac_via_r )
+uint16_t mac_state::mac_via_r(offs_t offset)
{
uint16_t data;
@@ -1668,7 +1668,7 @@ READ16_MEMBER ( mac_state::mac_via_r )
return (data & 0xff) | (data << 8);
}
-WRITE16_MEMBER ( mac_state::mac_via_w )
+void mac_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset >>= 8;
offset &= 0x0f;
@@ -1693,7 +1693,7 @@ WRITE_LINE_MEMBER(mac_state::mac_via2_irq)
set_via2_interrupt(state);
}
-READ16_MEMBER ( mac_state::mac_via2_r )
+uint16_t mac_state::mac_via2_r(offs_t offset)
{
int data;
@@ -1708,7 +1708,7 @@ READ16_MEMBER ( mac_state::mac_via2_r )
return (data & 0xff) | (data << 8);
}
-WRITE16_MEMBER ( mac_state::mac_via2_w )
+void mac_state::mac_via2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset >>= 8;
offset &= 0x0f;
@@ -2088,7 +2088,7 @@ TIMER_CALLBACK_MEMBER(mac_state::overlay_timeout_func)
m_overlay_timeout->adjust(attotime::never);
}
-READ32_MEMBER(mac_state::mac_read_id)
+uint32_t mac_state::mac_read_id()
{
// printf("Mac read ID reg @ PC=%x\n", m_maincpu->pc());
diff --git a/src/mame/machine/mace.cpp b/src/mame/machine/mace.cpp
index 4dad0828eb0..75f7fdef799 100644
--- a/src/mame/machine/mace.cpp
+++ b/src/mame/machine/mace.cpp
@@ -129,7 +129,7 @@ void mace_device::map(address_map &map)
// REGISTER ACCESS
//**************************************************************************
-READ64_MEMBER(mace_device::pci_r)
+uint64_t mace_device::pci_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -142,7 +142,7 @@ READ64_MEMBER(mace_device::pci_r)
return ret;
}
-WRITE64_MEMBER(mace_device::pci_w)
+void mace_device::pci_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -153,7 +153,7 @@ WRITE64_MEMBER(mace_device::pci_w)
}
}
-READ64_MEMBER(mace_device::vin1_r)
+uint64_t mace_device::vin1_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -166,7 +166,7 @@ READ64_MEMBER(mace_device::vin1_r)
return ret;
}
-WRITE64_MEMBER(mace_device::vin1_w)
+void mace_device::vin1_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -177,7 +177,7 @@ WRITE64_MEMBER(mace_device::vin1_w)
}
}
-READ64_MEMBER(mace_device::vin2_r)
+uint64_t mace_device::vin2_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -190,7 +190,7 @@ READ64_MEMBER(mace_device::vin2_r)
return ret;
}
-WRITE64_MEMBER(mace_device::vin2_w)
+void mace_device::vin2_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -201,7 +201,7 @@ WRITE64_MEMBER(mace_device::vin2_w)
}
}
-READ64_MEMBER(mace_device::vout_r)
+uint64_t mace_device::vout_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -214,7 +214,7 @@ READ64_MEMBER(mace_device::vout_r)
return ret;
}
-WRITE64_MEMBER(mace_device::vout_w)
+void mace_device::vout_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -225,7 +225,7 @@ WRITE64_MEMBER(mace_device::vout_w)
}
}
-READ64_MEMBER(mace_device::enet_r)
+uint64_t mace_device::enet_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -238,7 +238,7 @@ READ64_MEMBER(mace_device::enet_r)
return ret;
}
-WRITE64_MEMBER(mace_device::enet_w)
+void mace_device::enet_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -249,7 +249,7 @@ WRITE64_MEMBER(mace_device::enet_w)
}
}
-READ64_MEMBER(mace_device::audio_r)
+uint64_t mace_device::audio_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -262,7 +262,7 @@ READ64_MEMBER(mace_device::audio_r)
return ret;
}
-WRITE64_MEMBER(mace_device::audio_w)
+void mace_device::audio_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -273,7 +273,7 @@ WRITE64_MEMBER(mace_device::audio_w)
}
}
-READ64_MEMBER(mace_device::isa_r)
+uint64_t mace_device::isa_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -306,7 +306,7 @@ READ64_MEMBER(mace_device::isa_r)
return ret;
}
-WRITE64_MEMBER(mace_device::isa_w)
+void mace_device::isa_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -342,7 +342,7 @@ WRITE64_MEMBER(mace_device::isa_w)
}
}
-READ64_MEMBER(mace_device::kbdms_r)
+uint64_t mace_device::kbdms_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -355,7 +355,7 @@ READ64_MEMBER(mace_device::kbdms_r)
return ret;
}
-WRITE64_MEMBER(mace_device::kbdms_w)
+void mace_device::kbdms_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -366,7 +366,7 @@ WRITE64_MEMBER(mace_device::kbdms_w)
}
}
-READ64_MEMBER(mace_device::i2c_r)
+uint64_t mace_device::i2c_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -379,7 +379,7 @@ READ64_MEMBER(mace_device::i2c_r)
return ret;
}
-WRITE64_MEMBER(mace_device::i2c_w)
+void mace_device::i2c_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -390,7 +390,7 @@ WRITE64_MEMBER(mace_device::i2c_w)
}
}
-READ64_MEMBER(mace_device::isa_ext_r)
+uint64_t mace_device::isa_ext_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -403,7 +403,7 @@ READ64_MEMBER(mace_device::isa_ext_r)
return ret;
}
-WRITE64_MEMBER(mace_device::isa_ext_w)
+void mace_device::isa_ext_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
@@ -418,7 +418,7 @@ WRITE64_MEMBER(mace_device::isa_ext_w)
// RTC
//**************************************************************************
-READ64_MEMBER(mace_device::rtc_r)
+uint64_t mace_device::rtc_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = m_rtc_read_callback(offset >> 5);
@@ -428,7 +428,7 @@ READ64_MEMBER(mace_device::rtc_r)
return ret;
}
-WRITE64_MEMBER(mace_device::rtc_w)
+void mace_device::rtc_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
LOGMASKED(LOG_WRITE_RTC, "%s: MACE: RTC Write: %08x (register %02x) = %08x%08x & %08x%08x\n", machine().describe_context(), 0x1f3a0000 + offset*8
, offset >> 5, (uint32_t)(data >> 32), (uint32_t)data, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask);
@@ -467,7 +467,7 @@ void mace_device::check_ust_msc_compare()
m_isa.m_int_status |= ISA_INT_COMPARE3;
}
-READ64_MEMBER(mace_device::ust_msc_r)
+uint64_t mace_device::ust_msc_r(offs_t offset, uint64_t mem_mask)
{
uint64_t ret = 0ULL;
switch (offset)
@@ -530,7 +530,7 @@ READ64_MEMBER(mace_device::ust_msc_r)
return ret;
}
-WRITE64_MEMBER(mace_device::ust_msc_w)
+void mace_device::ust_msc_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
switch (offset)
{
diff --git a/src/mame/machine/mace.h b/src/mame/machine/mace.h
index 548134e5c31..bac2e2cb8ca 100644
--- a/src/mame/machine/mace.h
+++ b/src/mame/machine/mace.h
@@ -44,30 +44,30 @@ protected:
void check_ust_msc_compare();
// Read/Write Handlers
- DECLARE_READ64_MEMBER(pci_r);
- DECLARE_WRITE64_MEMBER(pci_w);
- DECLARE_READ64_MEMBER(vin1_r);
- DECLARE_WRITE64_MEMBER(vin1_w);
- DECLARE_READ64_MEMBER(vin2_r);
- DECLARE_WRITE64_MEMBER(vin2_w);
- DECLARE_READ64_MEMBER(vout_r);
- DECLARE_WRITE64_MEMBER(vout_w);
- DECLARE_READ64_MEMBER(enet_r);
- DECLARE_WRITE64_MEMBER(enet_w);
- DECLARE_READ64_MEMBER(audio_r);
- DECLARE_WRITE64_MEMBER(audio_w);
- DECLARE_READ64_MEMBER(isa_r);
- DECLARE_WRITE64_MEMBER(isa_w);
- DECLARE_READ64_MEMBER(kbdms_r);
- DECLARE_WRITE64_MEMBER(kbdms_w);
- DECLARE_READ64_MEMBER(i2c_r);
- DECLARE_WRITE64_MEMBER(i2c_w);
- DECLARE_READ64_MEMBER(ust_msc_r);
- DECLARE_WRITE64_MEMBER(ust_msc_w);
- DECLARE_READ64_MEMBER(isa_ext_r);
- DECLARE_WRITE64_MEMBER(isa_ext_w);
- DECLARE_READ64_MEMBER(rtc_r);
- DECLARE_WRITE64_MEMBER(rtc_w);
+ uint64_t pci_r(offs_t offset, uint64_t mem_mask = ~0);
+ void pci_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t vin1_r(offs_t offset, uint64_t mem_mask = ~0);
+ void vin1_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t vin2_r(offs_t offset, uint64_t mem_mask = ~0);
+ void vin2_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t vout_r(offs_t offset, uint64_t mem_mask = ~0);
+ void vout_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t enet_r(offs_t offset, uint64_t mem_mask = ~0);
+ void enet_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t audio_r(offs_t offset, uint64_t mem_mask = ~0);
+ void audio_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t isa_r(offs_t offset, uint64_t mem_mask = ~0);
+ void isa_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t kbdms_r(offs_t offset, uint64_t mem_mask = ~0);
+ void kbdms_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t i2c_r(offs_t offset, uint64_t mem_mask = ~0);
+ void i2c_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t ust_msc_r(offs_t offset, uint64_t mem_mask = ~0);
+ void ust_msc_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t isa_ext_r(offs_t offset, uint64_t mem_mask = ~0);
+ void isa_ext_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t rtc_r(offs_t offset, uint64_t mem_mask = ~0);
+ void rtc_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
required_device<mips3_device> m_maincpu;
diff --git a/src/mame/machine/macpci.cpp b/src/mame/machine/macpci.cpp
index 518d632e047..7b116c6be65 100644
--- a/src/mame/machine/macpci.cpp
+++ b/src/mame/machine/macpci.cpp
@@ -63,7 +63,7 @@ void macpci_state::mac_via_out_b(uint8_t data)
m_cuda->set_tip((data&0x20) ? 1 : 0);
}
-READ16_MEMBER ( macpci_state::mac_via_r )
+uint16_t macpci_state::mac_via_r(offs_t offset)
{
uint16_t data;
@@ -79,7 +79,7 @@ READ16_MEMBER ( macpci_state::mac_via_r )
return data | (data<<8);
}
-WRITE16_MEMBER ( macpci_state::mac_via_w )
+void macpci_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset >>= 8;
offset &= 0x0f;
@@ -150,7 +150,7 @@ void macpci_state::init_##label() \
MAC_DRIVER_INIT(pippin, PCIMODEL_MAC_PIPPIN)
-READ32_MEMBER(macpci_state::mac_read_id)
+uint32_t macpci_state::mac_read_id()
{
printf("Mac read ID reg @ PC=%x\n", m_maincpu->pc());
@@ -166,18 +166,18 @@ READ32_MEMBER(macpci_state::mac_read_id)
/* 8530 SCC interface */
-READ16_MEMBER ( macpci_state::mac_scc_r )
+uint16_t macpci_state::mac_scc_r(offs_t offset)
{
uint16_t result = m_scc->reg_r(offset);
return (result << 8) | result;
}
-WRITE16_MEMBER ( macpci_state::mac_scc_w )
+void macpci_state::mac_scc_w(offs_t offset, uint16_t data)
{
m_scc->reg_w(offset, data);
}
-WRITE16_MEMBER ( macpci_state::mac_scc_2_w )
+void macpci_state::mac_scc_2_w(offs_t offset, uint16_t data)
{
m_scc->reg_w(offset, data >> 8);
}
diff --git a/src/mame/machine/maple-dc.cpp b/src/mame/machine/maple-dc.cpp
index 77705c6556b..f2db34fd867 100644
--- a/src/mame/machine/maple-dc.cpp
+++ b/src/mame/machine/maple-dc.cpp
@@ -242,42 +242,42 @@ void maple_dc_device::maple_hw_trigger()
}
}
-READ32_MEMBER(maple_dc_device::sb_mdstar_r)
+uint32_t maple_dc_device::sb_mdstar_r()
{
return mdstar;
}
-WRITE32_MEMBER(maple_dc_device::sb_mdstar_w)
+void maple_dc_device::sb_mdstar_w(uint32_t data)
{
mdstar = data & ~31;
}
-READ32_MEMBER(maple_dc_device::sb_mden_r)
+uint32_t maple_dc_device::sb_mden_r()
{
return mden;
}
-WRITE32_MEMBER(maple_dc_device::sb_mden_w)
+void maple_dc_device::sb_mden_w(uint32_t data)
{
mden = data & 1;
}
-READ32_MEMBER(maple_dc_device::sb_mdtsel_r)
+uint32_t maple_dc_device::sb_mdtsel_r()
{
return mdtsel;
}
-WRITE32_MEMBER(maple_dc_device::sb_mdtsel_w)
+void maple_dc_device::sb_mdtsel_w(uint32_t data)
{
mdtsel = data & 1;
}
-READ32_MEMBER(maple_dc_device::sb_mdst_r)
+uint32_t maple_dc_device::sb_mdst_r()
{
return dma_state != DMA_IDLE ? 1 : 0;
}
-WRITE32_MEMBER(maple_dc_device::sb_mdst_w)
+void maple_dc_device::sb_mdst_w(uint32_t data)
{
uint32_t old = mdst;
mdst = data & 1;
@@ -289,16 +289,16 @@ WRITE32_MEMBER(maple_dc_device::sb_mdst_w)
}
}
-READ32_MEMBER(maple_dc_device::sb_msys_r)
+uint32_t maple_dc_device::sb_msys_r()
{
return msys;
}
-WRITE32_MEMBER(maple_dc_device::sb_msys_w)
+void maple_dc_device::sb_msys_w(uint32_t data)
{
msys = data;
}
-WRITE32_MEMBER(maple_dc_device::sb_mdapro_w)
+void maple_dc_device::sb_mdapro_w(uint32_t data)
{
}
diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h
index d0219f674fa..19d0a3c7718 100644
--- a/src/mame/machine/maple-dc.h
+++ b/src/mame/machine/maple-dc.h
@@ -27,17 +27,17 @@ public:
template <typename T> void set_maincpu_tag(T &&cpu_tag) { cpu.set_tag(std::forward<T>(cpu_tag)); }
auto irq_callback() { return irq_cb.bind(); }
- DECLARE_READ32_MEMBER(sb_mdstar_r); // 5f6c04
- DECLARE_WRITE32_MEMBER(sb_mdstar_w);
- DECLARE_READ32_MEMBER(sb_mdtsel_r); // 5f6c10
- DECLARE_WRITE32_MEMBER(sb_mdtsel_w);
- DECLARE_READ32_MEMBER(sb_mden_r); // 5f6c14
- DECLARE_WRITE32_MEMBER(sb_mden_w);
- DECLARE_READ32_MEMBER(sb_mdst_r); // 5f6c18
- DECLARE_WRITE32_MEMBER(sb_mdst_w);
- DECLARE_READ32_MEMBER(sb_msys_r); // 5f6c80
- DECLARE_WRITE32_MEMBER(sb_msys_w);
- DECLARE_WRITE32_MEMBER(sb_mdapro_w); // 5f6c8c
+ uint32_t sb_mdstar_r(); // 5f6c04
+ void sb_mdstar_w(uint32_t data);
+ uint32_t sb_mdtsel_r(); // 5f6c10
+ void sb_mdtsel_w(uint32_t data);
+ uint32_t sb_mden_r(); // 5f6c14
+ void sb_mden_w(uint32_t data);
+ uint32_t sb_mdst_r(); // 5f6c18
+ void sb_mdst_w(uint32_t data);
+ uint32_t sb_msys_r(); // 5f6c80
+ void sb_msys_w(uint32_t data);
+ void sb_mdapro_w(uint32_t data); // 5f6c8c
void amap(address_map &map);
diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp
index 3c5fb44d733..0353281c0ea 100644
--- a/src/mame/machine/micro3d.cpp
+++ b/src/mame/machine/micro3d.cpp
@@ -143,18 +143,18 @@ TIMER_CALLBACK_MEMBER(micro3d_state::mac_done_callback)
m_mac_stat = 0;
}
-WRITE32_MEMBER(micro3d_state::micro3d_mac1_w)
+void micro3d_state::micro3d_mac1_w(uint32_t data)
{
m_vtx_addr = (data & 0x3ffff);
m_sram_w_addr = (data >> 18) & 0xfff;
}
-READ32_MEMBER(micro3d_state::micro3d_mac2_r)
+uint32_t micro3d_state::micro3d_mac2_r()
{
return (m_mac_inst << 1) | m_mac_stat;
}
-WRITE32_MEMBER(micro3d_state::micro3d_mac2_w)
+void micro3d_state::micro3d_mac2_w(uint32_t data)
{
uint32_t cnt = data & 0xff;
uint32_t inst = (data >> 8) & 0x1f;
@@ -349,7 +349,7 @@ WRITE32_MEMBER(micro3d_state::micro3d_mac2_w)
*
*************************************/
-READ16_MEMBER(micro3d_state::micro3d_encoder_h_r)
+uint16_t micro3d_state::micro3d_encoder_h_r()
{
uint16_t x_encoder = m_joystick_x.read_safe(0);
uint16_t y_encoder = m_joystick_y.read_safe(0);
@@ -357,7 +357,7 @@ READ16_MEMBER(micro3d_state::micro3d_encoder_h_r)
return (y_encoder & 0xf00) | ((x_encoder & 0xf00) >> 8);
}
-READ16_MEMBER(micro3d_state::micro3d_encoder_l_r)
+uint16_t micro3d_state::micro3d_encoder_l_r()
{
uint16_t x_encoder = m_joystick_x.read_safe(0);
uint16_t y_encoder = m_joystick_y.read_safe(0);
@@ -375,13 +375,13 @@ READ_LINE_MEMBER(micro3d_state::botss_hwchk_r)
return m_botss_latch;
}
-READ16_MEMBER(micro3d_state::botss_140000_r)
+uint16_t micro3d_state::botss_140000_r()
{
m_botss_latch = 0;
return 0xffff;
}
-READ16_MEMBER(micro3d_state::botss_180000_r)
+uint16_t micro3d_state::botss_180000_r()
{
m_botss_latch = 1;
return 0xffff;
@@ -393,7 +393,7 @@ READ16_MEMBER(micro3d_state::botss_180000_r)
*
*************************************/
-WRITE16_MEMBER(micro3d_state::micro3d_reset_w)
+void micro3d_state::micro3d_reset_w(uint16_t data)
{
data >>= 8;
m_drmath->set_input_line(INPUT_LINE_RESET, data & 1 ? CLEAR_LINE : ASSERT_LINE);
@@ -401,7 +401,7 @@ WRITE16_MEMBER(micro3d_state::micro3d_reset_w)
/* TODO: Joystick reset? */
}
-WRITE16_MEMBER(micro3d_state::host_drmath_int_w)
+void micro3d_state::host_drmath_int_w(uint16_t data)
{
m_drmath->set_input_line(AM29000_INTR2, ASSERT_LINE);
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
@@ -414,23 +414,23 @@ WRITE16_MEMBER(micro3d_state::host_drmath_int_w)
*
*************************************/
-WRITE32_MEMBER(micro3d_state::micro3d_shared_w)
+void micro3d_state::micro3d_shared_w(offs_t offset, uint32_t data)
{
m_shared_ram[offset * 2 + 1] = data & 0xffff;
m_shared_ram[offset * 2 + 0] = data >> 16;
}
-READ32_MEMBER(micro3d_state::micro3d_shared_r)
+uint32_t micro3d_state::micro3d_shared_r(offs_t offset)
{
return (m_shared_ram[offset * 2] << 16) | m_shared_ram[offset * 2 + 1];
}
-WRITE32_MEMBER(micro3d_state::drmath_int_w)
+void micro3d_state::drmath_int_w(uint32_t data)
{
m_maincpu->set_input_line(5, HOLD_LINE);
}
-WRITE32_MEMBER(micro3d_state::drmath_intr2_ack)
+void micro3d_state::drmath_intr2_ack(uint32_t data)
{
m_drmath->set_input_line(AM29000_INTR2, CLEAR_LINE);
}
@@ -524,8 +524,8 @@ void micro3d_state::init_botss()
address_space &space = m_maincpu->space(AS_PROGRAM);
/* Required to pass the hardware version check */
- space.install_read_handler(0x140000, 0x140001, read16_delegate(*this, FUNC(micro3d_state::botss_140000_r)));
- space.install_read_handler(0x180000, 0x180001, read16_delegate(*this, FUNC(micro3d_state::botss_180000_r)));
+ space.install_read_handler(0x140000, 0x140001, read16smo_delegate(*this, FUNC(micro3d_state::botss_140000_r)));
+ space.install_read_handler(0x180000, 0x180001, read16smo_delegate(*this, FUNC(micro3d_state::botss_180000_r)));
init_micro3d();
}
diff --git a/src/mame/machine/midtunit.cpp b/src/mame/machine/midtunit.cpp
index 98cb5d91079..4530ae163ce 100644
--- a/src/mame/machine/midtunit.cpp
+++ b/src/mame/machine/midtunit.cpp
@@ -45,13 +45,13 @@ void midtunit_state::register_state_saving()
*
*************************************/
-WRITE16_MEMBER(midtunit_state::midtunit_cmos_enable_w)
+void midtunit_state::midtunit_cmos_enable_w(uint16_t data)
{
m_cmos_write_enable = 1;
}
-WRITE16_MEMBER(midtunit_state::midtunit_cmos_w)
+void midtunit_state::midtunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (1)/*m_cmos_write_enable*/
{
@@ -66,7 +66,7 @@ WRITE16_MEMBER(midtunit_state::midtunit_cmos_w)
}
-READ16_MEMBER(midtunit_state::midtunit_cmos_r)
+uint16_t midtunit_state::midtunit_cmos_r(offs_t offset)
{
return m_nvram[offset];
}
@@ -90,7 +90,7 @@ static const uint8_t mk_prot_values[] =
0xff
};
-READ16_MEMBER(midtunit_state::mk_prot_r)
+uint16_t midtunit_state::mk_prot_r(offs_t offset)
{
logerror("%s:Protection R @ %05X = %04X\n", machine().describe_context(), offset, mk_prot_values[m_mk_prot_index] << 9);
@@ -104,7 +104,7 @@ READ16_MEMBER(midtunit_state::mk_prot_r)
return mk_prot_values[m_mk_prot_index++] << 9;
}
-WRITE16_MEMBER(midtunit_state::mk_prot_w)
+void midtunit_state::mk_prot_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -138,7 +138,7 @@ WRITE16_MEMBER(midtunit_state::mk_prot_w)
*
*************************************/
-READ16_MEMBER(midtunit_state::mkturbo_prot_r)
+uint16_t midtunit_state::mkturbo_prot_r()
{
/* the security GAL overlays a counter of some sort at 0xfffff400 in ROM &space.
* A startup protection check expects to read back two different values in succession */
@@ -153,22 +153,22 @@ READ16_MEMBER(midtunit_state::mkturbo_prot_r)
*
*************************************/
-READ16_MEMBER(midtunit_state::mk2_prot_const_r)
+uint16_t midtunit_state::mk2_prot_const_r()
{
return 2;
}
-READ16_MEMBER(midtunit_state::mk2_prot_r)
+uint16_t midtunit_state::mk2_prot_r()
{
return m_mk2_prot_data;
}
-READ16_MEMBER(midtunit_state::mk2_prot_shift_r)
+uint16_t midtunit_state::mk2_prot_shift_r()
{
return m_mk2_prot_data >> 1;
}
-WRITE16_MEMBER(midtunit_state::mk2_prot_w)
+void midtunit_state::mk2_prot_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_mk2_prot_data);
}
@@ -221,7 +221,7 @@ static const uint32_t nbajamte_prot_values[128] =
0x381c2e17, 0x393c3e3f, 0x3a3d1e0f, 0x3b1d0e27, 0x3c3e1f2f, 0x3d1e0f07, 0x3e1f2f37, 0x3f3f3f1f
};
-READ16_MEMBER(midtunit_state::nbajam_prot_r)
+uint16_t midtunit_state::nbajam_prot_r()
{
int result = m_nbajam_prot_queue[m_nbajam_prot_index];
if (m_nbajam_prot_index < 4)
@@ -229,7 +229,7 @@ READ16_MEMBER(midtunit_state::nbajam_prot_r)
return result;
}
-WRITE16_MEMBER(midtunit_state::nbajam_prot_w)
+void midtunit_state::nbajam_prot_w(offs_t offset, uint16_t data)
{
int table_index = (offset >> 6) & 0x7f;
uint32_t protval = m_nbajam_prot_table[table_index];
@@ -292,7 +292,7 @@ static const uint8_t jdredd_prot_values_80020[] =
0x39,0x33,0x00,0x00,0x00,0x00,0x00,0x00
};
-WRITE16_MEMBER(midtunit_state::jdredd_prot_w)
+void midtunit_state::jdredd_prot_w(offs_t offset, uint16_t data)
{
logerror("%s:jdredd_prot_w(%04X,%04X)\n", machine().describe_context(), offset*16, data);
@@ -335,7 +335,7 @@ WRITE16_MEMBER(midtunit_state::jdredd_prot_w)
}
}
-READ16_MEMBER(midtunit_state::jdredd_prot_r)
+uint16_t midtunit_state::jdredd_prot_r(offs_t offset)
{
uint16_t result = 0xffff;
@@ -379,7 +379,8 @@ void midtunit_state::init_mktunit()
init_tunit_generic(SOUND_ADPCM);
/* protection */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1b00000, 0x1b6ffff, read16_delegate(*this, FUNC(midtunit_state::mk_prot_r)), write16_delegate(*this, FUNC(midtunit_state::mk_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1b00000, 0x1b6ffff, read16sm_delegate(*this, FUNC(midtunit_state::mk_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x1b00000, 0x1b6ffff, write16s_delegate(*this, FUNC(midtunit_state::mk_prot_w)));
/* sound chip protection (hidden RAM) */
m_adpcm_sound->get_cpu()->space(AS_PROGRAM).install_ram(0xfb9c, 0xfbc6);
@@ -388,7 +389,7 @@ void midtunit_state::init_mktunit()
void midtunit_state::init_mkturbo()
{
/* protection */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(*this, FUNC(midtunit_state::mkturbo_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xfffff400, 0xfffff40f, read16smo_delegate(*this, FUNC(midtunit_state::mkturbo_prot_r)));
init_mktunit();
}
@@ -402,13 +403,16 @@ void midtunit_state::init_nbajam_common(int te_protection)
if (!te_protection)
{
m_nbajam_prot_table = nbajam_prot_values;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1b14020, 0x1b2503f, read16_delegate(*this, FUNC(midtunit_state::nbajam_prot_r)), write16_delegate(*this, FUNC(midtunit_state::nbajam_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1b14020, 0x1b2503f, read16smo_delegate(*this, FUNC(midtunit_state::nbajam_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x1b14020, 0x1b2503f, write16sm_delegate(*this, FUNC(midtunit_state::nbajam_prot_w)));
}
else
{
m_nbajam_prot_table = nbajamte_prot_values;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1b15f40, 0x1b37f5f, read16_delegate(*this, FUNC(midtunit_state::nbajam_prot_r)), write16_delegate(*this, FUNC(midtunit_state::nbajam_prot_w)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1b95f40, 0x1bb7f5f, read16_delegate(*this, FUNC(midtunit_state::nbajam_prot_r)), write16_delegate(*this, FUNC(midtunit_state::nbajam_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1b15f40, 0x1b37f5f, read16smo_delegate(*this, FUNC(midtunit_state::nbajam_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x1b15f40, 0x1b37f5f, write16sm_delegate(*this, FUNC(midtunit_state::nbajam_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1b95f40, 0x1bb7f5f, read16smo_delegate(*this, FUNC(midtunit_state::nbajam_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x1b95f40, 0x1bb7f5f, write16sm_delegate(*this, FUNC(midtunit_state::nbajam_prot_w)));
}
/* sound chip protection (hidden RAM) */
@@ -437,7 +441,7 @@ void midtunit_state::init_jdreddp()
m_maincpu->space(AS_PROGRAM).nop_write(0x01d81060, 0x01d8107f);
/* protection */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1b00000, 0x1bfffff, read16_delegate(*this, FUNC(midtunit_state::jdredd_prot_r)), write16_delegate(*this, FUNC(midtunit_state::jdredd_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1b00000, 0x1bfffff, read16sm_delegate(*this, FUNC(midtunit_state::jdredd_prot_r)), write16sm_delegate(*this, FUNC(midtunit_state::jdredd_prot_w)));
/* sound chip protection (hidden RAM) */
m_adpcm_sound->get_cpu()->space(AS_PROGRAM).install_read_bank(0xfbcf, 0xfbf9, "bank7");
@@ -462,13 +466,13 @@ void midtunit_state::init_mk2()
m_video->set_gfx_rom_large(true);
/* protection */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x00f20c60, 0x00f20c7f, write16_delegate(*this, FUNC(midtunit_state::mk2_prot_w)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x00f42820, 0x00f4283f, write16_delegate(*this, FUNC(midtunit_state::mk2_prot_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01a190e0, 0x01a190ff, read16_delegate(*this, FUNC(midtunit_state::mk2_prot_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01a191c0, 0x01a191df, read16_delegate(*this, FUNC(midtunit_state::mk2_prot_shift_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01a3d0c0, 0x01a3d0ff, read16_delegate(*this, FUNC(midtunit_state::mk2_prot_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01d9d1e0, 0x01d9d1ff, read16_delegate(*this, FUNC(midtunit_state::mk2_prot_const_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01def920, 0x01def93f, read16_delegate(*this, FUNC(midtunit_state::mk2_prot_const_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x00f20c60, 0x00f20c7f, write16s_delegate(*this, FUNC(midtunit_state::mk2_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x00f42820, 0x00f4283f, write16s_delegate(*this, FUNC(midtunit_state::mk2_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01a190e0, 0x01a190ff, read16smo_delegate(*this, FUNC(midtunit_state::mk2_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01a191c0, 0x01a191df, read16smo_delegate(*this, FUNC(midtunit_state::mk2_prot_shift_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01a3d0c0, 0x01a3d0ff, read16smo_delegate(*this, FUNC(midtunit_state::mk2_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01d9d1e0, 0x01d9d1ff, read16smo_delegate(*this, FUNC(midtunit_state::mk2_prot_const_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01def920, 0x01def93f, read16smo_delegate(*this, FUNC(midtunit_state::mk2_prot_const_r)));
}
@@ -505,7 +509,7 @@ void midtunit_state::machine_reset()
*
*************************************/
-READ16_MEMBER(midtunit_state::midtunit_sound_state_r)
+uint16_t midtunit_state::midtunit_sound_state_r()
{
/* logerror("%s:Sound status read\n", machine().describe_context());*/
@@ -520,7 +524,7 @@ READ16_MEMBER(midtunit_state::midtunit_sound_state_r)
return ~0;
}
-READ16_MEMBER(midtunit_state::midtunit_sound_r)
+uint16_t midtunit_state::midtunit_sound_r()
{
logerror("%08X:Sound data read\n", m_maincpu->pc());
@@ -530,7 +534,7 @@ READ16_MEMBER(midtunit_state::midtunit_sound_r)
return ~0;
}
-WRITE16_MEMBER(midtunit_state::midtunit_sound_w)
+void midtunit_state::midtunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* check for out-of-bounds accesses */
if (!offset)
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index c7aedfa33c2..44d252131c0 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -758,7 +758,7 @@ void midway_ioasic_device::device_start()
{
m_dcs->set_fifo_callbacks(
read16smo_delegate(*this, FUNC(midway_ioasic_device::fifo_r)),
- read16_delegate(*this, FUNC(midway_ioasic_device::fifo_status_r)),
+ read16mo_delegate(*this, FUNC(midway_ioasic_device::fifo_status_r)),
write_line_delegate(*this, FUNC(midway_ioasic_device::fifo_reset_w)));
m_dcs->set_io_callbacks(
write_line_delegate(*this, FUNC(midway_ioasic_device::ioasic_output_full)),
@@ -788,7 +788,7 @@ void midway_ioasic_device::ioasic_reset()
void midway_ioasic_device::update_ioasic_irq()
{
- uint16_t fifo_state = fifo_status_r(machine().dummy_space(), 0);
+ uint16_t fifo_state = fifo_status_r(machine().dummy_space());
uint16_t irqbits = 0x2000;
uint8_t new_state;
@@ -889,7 +889,7 @@ uint16_t midway_ioasic_device::fifo_r()
}
-READ16_MEMBER(midway_ioasic_device::fifo_status_r)
+uint16_t midway_ioasic_device::fifo_status_r(address_space &space)
{
uint16_t result = 0;
@@ -972,18 +972,18 @@ void midway_ioasic_device::fifo_full_w(uint16_t data)
*
*************************************/
-READ32_MEMBER( midway_ioasic_device::packed_r )
+uint32_t midway_ioasic_device::packed_r(address_space &space, offs_t offset, uint32_t mem_mask)
{
uint32_t result = 0;
if (ACCESSING_BITS_0_15)
- result |= read(space, offset*2, 0x0000ffff) & 0xffff;
+ result |= read(space, offset*2) & 0xffff;
if (ACCESSING_BITS_16_31)
- result |= (read(space, offset*2+1, 0x0000ffff) & 0xffff) << 16;
+ result |= (read(space, offset*2+1) & 0xffff) << 16;
return result;
}
-READ32_MEMBER( midway_ioasic_device::read )
+uint32_t midway_ioasic_device::read(address_space &space, offs_t offset)
{
uint32_t result;
@@ -1033,7 +1033,7 @@ READ32_MEMBER( midway_ioasic_device::read )
if (m_has_dcs)
{
result |= ((m_dcs->control_r() >> 4) ^ 0x40) & 0x00c0;
- result |= fifo_status_r(space,0) & 0x0038;
+ result |= fifo_status_r(space) & 0x0038;
result |= m_dcs->data2_r() & 0xff00;
}
else if (m_has_cage)
@@ -1076,12 +1076,12 @@ READ32_MEMBER( midway_ioasic_device::read )
}
-WRITE32_MEMBER( midway_ioasic_device::packed_w )
+void midway_ioasic_device::packed_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_0_15)
- write(space, offset*2, data & 0xffff, 0x0000ffff);
+ write(offset*2, data & 0xffff, 0x0000ffff);
if (ACCESSING_BITS_16_31)
- write(space, offset*2+1, data >> 16, 0x0000ffff);
+ write(offset*2+1, data >> 16, 0x0000ffff);
}
void midway_ioasic_device::serial_rx_w(u8 data)
@@ -1101,7 +1101,7 @@ void midway_ioasic_device::serial_rx_w(u8 data)
}
-WRITE32_MEMBER( midway_ioasic_device::write )
+void midway_ioasic_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t oldreg, newreg;
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h
index 90bd1415bbc..98148a85cd4 100644
--- a/src/mame/machine/midwayic.h
+++ b/src/mame/machine/midwayic.h
@@ -165,15 +165,15 @@ public:
DECLARE_WRITE_LINE_MEMBER(fifo_reset_w);
uint16_t fifo_r();
- DECLARE_READ16_MEMBER(fifo_status_r);
+ uint16_t fifo_status_r(address_space &space);
DECLARE_WRITE_LINE_MEMBER(ioasic_input_empty);
DECLARE_WRITE_LINE_MEMBER(ioasic_output_full);
- DECLARE_READ32_MEMBER( read );
- DECLARE_WRITE32_MEMBER( write );
- DECLARE_READ32_MEMBER( packed_r );
- DECLARE_WRITE32_MEMBER( packed_w );
+ uint32_t read(address_space &space, offs_t offset);
+ void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t packed_r(address_space &space, offs_t offset, uint32_t mem_mask = ~0);
+ void packed_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
void cage_irq_handler(uint8_t data);
diff --git a/src/mame/machine/midwunit.cpp b/src/mame/machine/midwunit.cpp
index 885e0b0b4ee..fa9b083a6a8 100644
--- a/src/mame/machine/midwunit.cpp
+++ b/src/mame/machine/midwunit.cpp
@@ -27,13 +27,13 @@
*
*************************************/
-WRITE16_MEMBER(midwunit_state::midwunit_cmos_enable_w)
+void midwunit_state::midwunit_cmos_enable_w(uint16_t data)
{
m_cmos_write_enable = 1;
}
-WRITE16_MEMBER(midwunit_state::midwunit_cmos_w)
+void midwunit_state::midwunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (m_cmos_write_enable)
{
@@ -49,7 +49,7 @@ WRITE16_MEMBER(midwunit_state::midwunit_cmos_w)
-READ16_MEMBER(midwunit_state::midwunit_cmos_r)
+uint16_t midwunit_state::midwunit_cmos_r(offs_t offset)
{
return m_nvram[offset];
}
@@ -62,7 +62,7 @@ READ16_MEMBER(midwunit_state::midwunit_cmos_r)
*
*************************************/
-WRITE16_MEMBER(midwunit_state::midwunit_io_w)
+void midwunit_state::midwunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset %= 8;
int oldword = m_iodata[offset];
@@ -102,7 +102,7 @@ WRITE16_MEMBER(midwunit_state::midwunit_io_w)
*
*************************************/
-READ16_MEMBER(midwunit_state::midwunit_io_r)
+uint16_t midwunit_state::midwunit_io_r(offs_t offset)
{
/* apply I/O shuffling */
offset = m_ioshuffle[offset % 16];
@@ -120,7 +120,7 @@ READ16_MEMBER(midwunit_state::midwunit_io_r)
int picret = 0;
if (m_midway_serial_pic) picret = m_midway_serial_pic->status_r();
- return (picret << 12) | midwunit_sound_state_r(space, 0, 0xffff);
+ return (picret << 12) | midwunit_sound_state_r();
}
default:
LOGMASKED(LOG_IO | LOG_UNKNOWN, "%s: Unknown I/O read from %d\n", machine().describe_context(), offset);
@@ -160,7 +160,7 @@ void midwunit_state::machine_start()
/********************** Mortal Kombat 3 **********************/
-WRITE16_MEMBER(midwunit_state::umk3_palette_hack_w)
+void midwunit_state::umk3_palette_hack_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask)
{
/*
UMK3 uses a circular buffer to hold pending palette changes; the buffer holds 17 entries
@@ -241,7 +241,7 @@ void midwunit_state::init_nbahangt()
/********************** WWF Wrestlemania **********************/
-WRITE16_MEMBER(midwunit_state::wwfmania_io_0_w)
+void midwunit_state::wwfmania_io_0_w(uint16_t data)
{
/* start with the originals */
for (int i = 0; i < 16; i++)
@@ -291,7 +291,7 @@ WRITE16_MEMBER(midwunit_state::wwfmania_io_0_w)
void midwunit_state::init_wwfmania()
{
/* enable I/O shuffling */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x01800000, 0x0180000f, write16_delegate(*this, FUNC(midwunit_state::wwfmania_io_0_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x01800000, 0x0180000f, write16smo_delegate(*this, FUNC(midwunit_state::wwfmania_io_0_w)));
/* serial prefixes 430, 528 */
//midway_serial_pic_init(machine(), 528);
@@ -332,7 +332,7 @@ void midwunit_state::machine_reset()
*
*************************************/
-READ16_MEMBER(midwunit_state::midwunit_security_r)
+uint16_t midwunit_state::midwunit_security_r()
{
uint16_t picret = 0;
if (m_midway_serial_pic) picret = m_midway_serial_pic->read();
@@ -340,7 +340,7 @@ READ16_MEMBER(midwunit_state::midwunit_security_r)
}
-WRITE16_MEMBER(midwunit_state::midwunit_security_w)
+void midwunit_state::midwunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 0 && ACCESSING_BITS_0_7)
{
@@ -356,7 +356,7 @@ WRITE16_MEMBER(midwunit_state::midwunit_security_w)
*
*************************************/
-READ16_MEMBER(midwunit_state::midwunit_sound_r)
+uint16_t midwunit_state::midwunit_sound_r()
{
LOGMASKED(LOG_SOUND, "%s: Sound read\n", machine().describe_context());
@@ -364,13 +364,13 @@ READ16_MEMBER(midwunit_state::midwunit_sound_r)
}
-READ16_MEMBER(midwunit_state::midwunit_sound_state_r)
+uint16_t midwunit_state::midwunit_sound_state_r()
{
return m_dcs->control_r();
}
-WRITE16_MEMBER(midwunit_state::midwunit_sound_w)
+void midwunit_state::midwunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* check for out-of-bounds accesses */
if (offset)
diff --git a/src/mame/machine/midxunit.cpp b/src/mame/machine/midxunit.cpp
index 9e2ab1df0ff..762a092b331 100644
--- a/src/mame/machine/midxunit.cpp
+++ b/src/mame/machine/midxunit.cpp
@@ -29,12 +29,12 @@
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_cmos_r)
+uint16_t midxunit_state::midxunit_cmos_r(offs_t offset)
{
return m_nvram[offset];
}
-WRITE16_MEMBER(midxunit_state::midxunit_cmos_w)
+void midxunit_state::midxunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_nvram+offset);
}
@@ -46,7 +46,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_cmos_w)
*
*************************************/
-WRITE16_MEMBER(midxunit_state::midxunit_io_w)
+void midxunit_state::midxunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int oldword, newword;
@@ -80,7 +80,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_io_w)
}
-WRITE16_MEMBER(midxunit_state::midxunit_unknown_w)
+void midxunit_state::midxunit_unknown_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int offs = offset / 0x40000;
@@ -105,7 +105,7 @@ WRITE_LINE_MEMBER(midxunit_state::adc_int_w)
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_status_r)
+uint16_t midxunit_state::midxunit_status_r()
{
/* low bit indicates whether the ADC is done reading the current input */
return (m_midway_serial_pic->status_r() << 1) | (m_adc_int ? 1 : 0);
@@ -127,7 +127,7 @@ WRITE_LINE_MEMBER(midxunit_state::midxunit_dcs_output_full)
}
-READ16_MEMBER(midxunit_state::midxunit_uart_r)
+uint16_t midxunit_state::midxunit_uart_r(offs_t offset)
{
int result = 0;
@@ -152,7 +152,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
else
{
- int temp = midxunit_sound_state_r(space, 0, 0xffff);
+ int temp = midxunit_sound_state_r();
result |= (temp & 0x800) >> 9;
result |= (~temp & 0x400) >> 10;
machine().scheduler().synchronize();
@@ -167,7 +167,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
/* non-loopback case: read from the DCS system */
else
- result = midxunit_sound_r(space, 0, 0xffff);
+ result = midxunit_sound_r();
break;
case 5: /* register 5 seems to be like 3, but with in/out swapped */
@@ -179,7 +179,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
else
{
- int temp = midxunit_sound_state_r(space, 0, 0xffff);
+ int temp = midxunit_sound_state_r();
result |= (temp & 0x800) >> 11;
result |= (~temp & 0x400) >> 8;
machine().scheduler().synchronize();
@@ -196,7 +196,7 @@ READ16_MEMBER(midxunit_state::midxunit_uart_r)
}
-WRITE16_MEMBER(midxunit_state::midxunit_uart_w)
+void midxunit_state::midxunit_uart_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* convert to a byte offset, ignoring MSB writes */
if ((offset & 1) || !ACCESSING_BITS_0_7)
@@ -215,7 +215,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_uart_w)
/* non-loopback case: send to the DCS system */
else
- midxunit_sound_w(space, 0, data, mem_mask);
+ midxunit_sound_w(0, data, mem_mask);
break;
case 5: /* register 5 write seems to reset things */
@@ -282,19 +282,19 @@ void midxunit_state::machine_reset()
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_security_r)
+uint16_t midxunit_state::midxunit_security_r()
{
return m_midway_serial_pic->read();
}
-WRITE16_MEMBER(midxunit_state::midxunit_security_w)
+void midxunit_state::midxunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_security_bits = data & 0x0f;
}
-WRITE16_MEMBER(midxunit_state::midxunit_security_clock_w)
+void midxunit_state::midxunit_security_clock_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 0 && ACCESSING_BITS_0_7)
m_midway_serial_pic->write(((~data & 2) << 3) | m_security_bits);
@@ -308,7 +308,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_security_clock_w)
*
*************************************/
-READ16_MEMBER(midxunit_state::midxunit_sound_r)
+uint16_t midxunit_state::midxunit_sound_r()
{
LOGMASKED(LOG_SOUND, "%08X:Sound read\n", m_maincpu->pc());
@@ -316,13 +316,13 @@ READ16_MEMBER(midxunit_state::midxunit_sound_r)
}
-READ16_MEMBER(midxunit_state::midxunit_sound_state_r)
+uint16_t midxunit_state::midxunit_sound_state_r()
{
return m_dcs->control_r();
}
-WRITE16_MEMBER(midxunit_state::midxunit_sound_w)
+void midxunit_state::midxunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* check for out-of-bounds accesses */
if (offset)
diff --git a/src/mame/machine/midyunit.cpp b/src/mame/machine/midyunit.cpp
index 68c199100df..12a707bbd51 100644
--- a/src/mame/machine/midyunit.cpp
+++ b/src/mame/machine/midyunit.cpp
@@ -27,14 +27,14 @@
*
*************************************/
-WRITE16_MEMBER(midyunit_state::midyunit_cmos_w)
+void midyunit_state::midyunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
logerror("%08x:CMOS Write @ %05X\n", m_maincpu->pc(), offset);
COMBINE_DATA(&m_cmos_ram[offset + m_cmos_page]);
}
-READ16_MEMBER(midyunit_state::midyunit_cmos_r)
+uint16_t midyunit_state::midyunit_cmos_r(offs_t offset)
{
return m_cmos_ram[offset + m_cmos_page];
}
@@ -47,7 +47,7 @@ READ16_MEMBER(midyunit_state::midyunit_cmos_r)
*
*************************************/
-WRITE16_MEMBER(midyunit_state::midyunit_cmos_enable_w)
+void midyunit_state::midyunit_cmos_enable_w(address_space &space, uint16_t data)
{
m_cmos_w_enable = (~data >> 9) & 1;
@@ -97,7 +97,7 @@ WRITE16_MEMBER(midyunit_state::midyunit_cmos_enable_w)
}
-READ16_MEMBER(midyunit_state::midyunit_protection_r)
+uint16_t midyunit_state::midyunit_protection_r()
{
/* return the most recently clocked value */
logerror("%08X:Protection read = %04X\n", m_maincpu->pc(), m_prot_result);
@@ -112,7 +112,7 @@ READ16_MEMBER(midyunit_state::midyunit_protection_r)
*
*************************************/
-READ16_MEMBER(midyunit_state::midyunit_input_r)
+uint16_t midyunit_state::midyunit_input_r(offs_t offset)
{
return m_ports[offset]->read();
}
@@ -125,7 +125,7 @@ READ16_MEMBER(midyunit_state::midyunit_input_r)
*
*************************************/
-READ16_MEMBER(midyunit_state::term2_input_r)
+uint16_t midyunit_state::term2_input_r(offs_t offset)
{
if (offset != 2)
return m_ports[offset]->read();
@@ -133,7 +133,7 @@ READ16_MEMBER(midyunit_state::term2_input_r)
return m_term2_adc->read() | 0xff00;
}
-WRITE16_MEMBER(midyunit_state::term2_sound_w)
+void midyunit_state::term2_sound_w(offs_t offset, uint16_t data)
{
/* Flash Lamp Output Data */
if ( ((data & 0x800) != 0x800) && ((data & 0x400) == 0x400 ) )
@@ -174,7 +174,7 @@ WRITE16_MEMBER(midyunit_state::term2_sound_w)
*
*************************************/
-WRITE16_MEMBER(midyunit_state::term2_hack_w)
+void midyunit_state::term2_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 1 && m_maincpu->pc() == 0xffce6520)
{
@@ -184,7 +184,7 @@ WRITE16_MEMBER(midyunit_state::term2_hack_w)
COMBINE_DATA(&m_t2_hack_mem[offset]);
}
-WRITE16_MEMBER(midyunit_state::term2la3_hack_w)
+void midyunit_state::term2la3_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 0 && m_maincpu->pc() == 0xffce5230)
{
@@ -194,7 +194,7 @@ WRITE16_MEMBER(midyunit_state::term2la3_hack_w)
COMBINE_DATA(&m_t2_hack_mem[offset]);
}
-WRITE16_MEMBER(midyunit_state::term2la2_hack_w)
+void midyunit_state::term2la2_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 0 && m_maincpu->pc() == 0xffce4b80)
{
@@ -204,7 +204,7 @@ WRITE16_MEMBER(midyunit_state::term2la2_hack_w)
COMBINE_DATA(&m_t2_hack_mem[offset]);
}
-WRITE16_MEMBER(midyunit_state::term2la1_hack_w)
+void midyunit_state::term2la1_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset == 0 && m_maincpu->pc() == 0xffce33f0)
{
@@ -222,7 +222,7 @@ WRITE16_MEMBER(midyunit_state::term2la1_hack_w)
*
*************************************/
-WRITE8_MEMBER(midyunit_state::cvsd_protection_w)
+void midyunit_state::cvsd_protection_w(offs_t offset, uint8_t data)
{
/* because the entire CVSD ROM is banked, we have to make sure that writes */
/* go to the proper location (i.e., bank 0); currently bank 0 always lives */
@@ -286,7 +286,7 @@ void midyunit_state::init_generic(int bpp, int sound, int prot_start, int prot_e
switch (sound)
{
case SOUND_CVSD_SMALL:
- m_cvsd_sound->get_cpu()->space(AS_PROGRAM).install_write_handler(prot_start, prot_end, write8_delegate(*this, FUNC(midyunit_state::cvsd_protection_w)));
+ m_cvsd_sound->get_cpu()->space(AS_PROGRAM).install_write_handler(prot_start, prot_end, write8sm_delegate(*this, FUNC(midyunit_state::cvsd_protection_w)));
m_cvsd_protection_base = memregion("cvsd:cpu")->base() + 0x10000 + (prot_start - 0x8000);
break;
@@ -457,7 +457,7 @@ void midyunit_state::init_mkyawdim()
*
*************************************/
-READ16_MEMBER(midyunit_state::mkturbo_prot_r)
+uint16_t midyunit_state::mkturbo_prot_r()
{
/* the security GAL overlays a counter of some sort at 0xfffff400 in ROM space.
* A startup protection check expects to read back two different values in succession */
@@ -467,14 +467,14 @@ READ16_MEMBER(midyunit_state::mkturbo_prot_r)
void midyunit_state::init_mkyturbo()
{
/* protection */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(*this, FUNC(midyunit_state::mkturbo_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xfffff400, 0xfffff40f, read16smo_delegate(*this, FUNC(midyunit_state::mkturbo_prot_r)));
init_mkyunit();
}
/********************** Terminator 2 **********************/
-void midyunit_state::term2_init_common(write16_delegate hack_w)
+void midyunit_state::term2_init_common(write16s_delegate hack_w)
{
// protection
static constexpr struct protection_data term2_protection_data =
@@ -488,8 +488,8 @@ void midyunit_state::term2_init_common(write16_delegate hack_w)
init_generic(6, SOUND_ADPCM, 0xfa8d, 0xfa9c);
// special inputs */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01c00000, 0x01c0005f, read16_delegate(*this, FUNC(midyunit_state::term2_input_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x01e00000, 0x01e0001f, write16_delegate(*this, FUNC(midyunit_state::term2_sound_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01c00000, 0x01c0005f, read16sm_delegate(*this, FUNC(midyunit_state::term2_input_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x01e00000, 0x01e0001f, write16sm_delegate(*this, FUNC(midyunit_state::term2_sound_w)));
// HACK: this prevents the freeze on the movies
// until we figure what's causing it, this is better than nothing
@@ -497,10 +497,10 @@ void midyunit_state::term2_init_common(write16_delegate hack_w)
m_t2_hack_mem = m_mainram + (0xaa0e0>>4);
}
-void midyunit_state::init_term2() { term2_init_common(write16_delegate(*this, FUNC(midyunit_state::term2_hack_w))); }
-void midyunit_state::init_term2la3() { term2_init_common(write16_delegate(*this, FUNC(midyunit_state::term2la3_hack_w))); }
-void midyunit_state::init_term2la2() { term2_init_common(write16_delegate(*this, FUNC(midyunit_state::term2la2_hack_w))); }
-void midyunit_state::init_term2la1() { term2_init_common(write16_delegate(*this, FUNC(midyunit_state::term2la1_hack_w))); }
+void midyunit_state::init_term2() { term2_init_common(write16s_delegate(*this, FUNC(midyunit_state::term2_hack_w))); }
+void midyunit_state::init_term2la3() { term2_init_common(write16s_delegate(*this, FUNC(midyunit_state::term2la3_hack_w))); }
+void midyunit_state::init_term2la2() { term2_init_common(write16s_delegate(*this, FUNC(midyunit_state::term2la2_hack_w))); }
+void midyunit_state::init_term2la1() { term2_init_common(write16s_delegate(*this, FUNC(midyunit_state::term2la1_hack_w))); }
@@ -563,7 +563,7 @@ MACHINE_RESET_MEMBER(midyunit_state,midyunit)
*
*************************************/
-WRITE16_MEMBER(midyunit_state::midyunit_sound_w)
+void midyunit_state::midyunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* check for out-of-bounds accesses */
if (offset)
diff --git a/src/mame/machine/mips_rambo.cpp b/src/mame/machine/mips_rambo.cpp
index 53023cce5a7..017d24fef77 100644
--- a/src/mame/machine/mips_rambo.cpp
+++ b/src/mame/machine/mips_rambo.cpp
@@ -111,7 +111,7 @@ template <unsigned Channel> u16 mips_rambo_device::fifo_r()
return m_fifo[Channel].dequeue();
}
-template <unsigned Channel> READ32_MEMBER(mips_rambo_device::mode_r)
+template <unsigned Channel> u32 mips_rambo_device::mode_r()
{
u32 data = m_channel[Channel].mode | m_fifo[Channel].queue_length();
@@ -123,21 +123,21 @@ template <unsigned Channel> READ32_MEMBER(mips_rambo_device::mode_r)
return data;
}
-READ32_MEMBER(mips_rambo_device::tcount_r)
+u32 mips_rambo_device::tcount_r()
{
u32 const data = attotime_to_clocks(machine().time() - m_tcount);
return data;
}
-WRITE32_MEMBER(mips_rambo_device::tcount_w)
+void mips_rambo_device::tcount_w(u32 data)
{
LOGMASKED(LOG_REG, "tcount_w 0x%08x (%s)\n", data, machine().describe_context());
m_tcount = machine().time();
}
-WRITE32_MEMBER(mips_rambo_device::tbreak_w)
+void mips_rambo_device::tbreak_w(offs_t offset, u32 data, u32 mem_mask)
{
LOGMASKED(LOG_REG, "tbreak_w 0x%08x (%s)\n", data, machine().describe_context());
@@ -146,7 +146,7 @@ WRITE32_MEMBER(mips_rambo_device::tbreak_w)
m_timer->adjust(clocks_to_attotime(m_tbreak) - (machine().time() - m_tcount));
}
-WRITE32_MEMBER(mips_rambo_device::control_w)
+void mips_rambo_device::control_w(u32 data)
{
LOGMASKED(LOG_REG, "control_w 0x%08x (%s)\n", data, machine().describe_context());
@@ -164,7 +164,7 @@ WRITE32_MEMBER(mips_rambo_device::control_w)
}
}
-template <unsigned Channel> WRITE32_MEMBER(mips_rambo_device::load_address_w)
+template <unsigned Channel> void mips_rambo_device::load_address_w(offs_t offset, u32 data, u32 mem_mask)
{
LOGMASKED(LOG_REG, "load_address_w<%d> 0x%08x (%s)\n", Channel, data, machine().describe_context());
@@ -181,7 +181,7 @@ template <unsigned Channel> void mips_rambo_device::fifo_w(u16 data)
m_dma->adjust(attotime::zero, Channel);
}
-template <unsigned Channel> WRITE32_MEMBER(mips_rambo_device::mode_w)
+template <unsigned Channel> void mips_rambo_device::mode_w(offs_t offset, u32 data, u32 mem_mask)
{
LOGMASKED(LOG_REG, "mode_w<%d> 0x%08x (%s)\n", Channel, data, machine().describe_context());
@@ -201,7 +201,7 @@ template <unsigned Channel> WRITE32_MEMBER(mips_rambo_device::mode_w)
m_dma->adjust(attotime::zero, Channel);
}
-template <unsigned Channel> WRITE16_MEMBER(mips_rambo_device::block_count_w)
+template <unsigned Channel> void mips_rambo_device::block_count_w(offs_t offset, u16 data, u16 mem_mask)
{
LOGMASKED(LOG_REG, "block_count_w<%d> 0x%04x (%s)\n", Channel, data, machine().describe_context());
diff --git a/src/mame/machine/mips_rambo.h b/src/mame/machine/mips_rambo.h
index fb57b6fff0a..540b5d80391 100644
--- a/src/mame/machine/mips_rambo.h
+++ b/src/mame/machine/mips_rambo.h
@@ -35,11 +35,11 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- template <unsigned Channel> DECLARE_READ32_MEMBER(load_address_r) { return m_channel[Channel].load_address; }
- template <unsigned Channel> DECLARE_READ32_MEMBER(diag_r) { return 0; }
+ template <unsigned Channel> u32 load_address_r() { return m_channel[Channel].load_address; }
+ template <unsigned Channel> u32 diag_r() { return 0; }
template <unsigned Channel> u16 fifo_r();
- template <unsigned Channel> DECLARE_READ32_MEMBER(mode_r);
- template <unsigned Channel> DECLARE_READ16_MEMBER(block_count_r)
+ template <unsigned Channel> u32 mode_r();
+ template <unsigned Channel> u16 block_count_r()
{
if ((Channel == 0) || !(m_channel[Channel].mode & MODE_CHANNEL_EN))
return m_channel[Channel].block_count;
@@ -56,21 +56,21 @@ protected:
return m_channel[Channel].block_count - (block_cycles % (m_channel[Channel].block_count + 1));
}
- template <unsigned Channel> DECLARE_READ32_MEMBER(current_address_r) { return m_channel[Channel].current_address; }
+ template <unsigned Channel> u32 current_address_r() { return m_channel[Channel].current_address; }
- DECLARE_READ32_MEMBER(tcount_r);
- DECLARE_READ32_MEMBER(tbreak_r) { return m_tbreak; }
- DECLARE_READ32_MEMBER(error_r) { return 0; }
- DECLARE_READ32_MEMBER(control_r) { return 0; }
+ u32 tcount_r();
+ u32 tbreak_r() { return m_tbreak; }
+ u32 error_r() { return 0; }
+ u32 control_r() { return 0; }
- template <unsigned Channel> DECLARE_WRITE32_MEMBER(load_address_w);
+ template <unsigned Channel> void load_address_w(offs_t offset, u32 data, u32 mem_mask = ~0);
template <unsigned Channel> void fifo_w(u16 data);
- template <unsigned Channel> DECLARE_WRITE32_MEMBER(mode_w);
- template <unsigned Channel> DECLARE_WRITE16_MEMBER(block_count_w);
+ template <unsigned Channel> void mode_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ template <unsigned Channel> void block_count_w(offs_t offset, u16 data, u16 mem_mask = ~0);
- DECLARE_WRITE32_MEMBER(tcount_w);
- DECLARE_WRITE32_MEMBER(tbreak_w);
- DECLARE_WRITE32_MEMBER(control_w);
+ void tcount_w(u32 data);
+ void tbreak_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void control_w(u32 data);
TIMER_CALLBACK_MEMBER(timer);
TIMER_CALLBACK_MEMBER(dma);
diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp
index 5cf0749eb53..f0fb5ca2c12 100644
--- a/src/mame/machine/model1.cpp
+++ b/src/mame/machine/model1.cpp
@@ -54,17 +54,17 @@ void model1_state::copro_reset()
memset(m_copro_ram_data.get(), 0, 0x2000*4);
}
-READ16_MEMBER(model1_state::v60_copro_ram_adr_r)
+u16 model1_state::v60_copro_ram_adr_r()
{
return m_v60_copro_ram_adr;
}
-WRITE16_MEMBER(model1_state::v60_copro_ram_adr_w)
+void model1_state::v60_copro_ram_adr_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_v60_copro_ram_adr);
}
-READ16_MEMBER(model1_state::v60_copro_ram_r)
+u16 model1_state::v60_copro_ram_r(offs_t offset)
{
u16 r;
if (!offset)
@@ -80,7 +80,7 @@ READ16_MEMBER(model1_state::v60_copro_ram_r)
return r;
}
-WRITE16_MEMBER(model1_state::v60_copro_ram_w)
+void model1_state::v60_copro_ram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(m_v60_copro_ram_latch + offset);
@@ -92,7 +92,7 @@ WRITE16_MEMBER(model1_state::v60_copro_ram_w)
}
}
-READ16_MEMBER(model1_state::v60_copro_fifo_r)
+u16 model1_state::v60_copro_fifo_r(offs_t offset)
{
if (!offset) {
m_v60_copro_fifo_r = m_copro_fifo_out->pop();
@@ -102,7 +102,7 @@ READ16_MEMBER(model1_state::v60_copro_fifo_r)
return m_v60_copro_fifo_r >> 16;
}
-WRITE16_MEMBER(model1_state::v60_copro_fifo_w)
+void model1_state::v60_copro_fifo_w(offs_t offset, u16 data)
{
if(offset) {
m_v60_copro_fifo_w = (m_v60_copro_fifo_w & 0x0000ffff) | (data << 16);
@@ -144,17 +144,17 @@ void model1_state::copro_rf_map(address_map &map)
map(0x0, 0x0).nopw(); // leds
}
-WRITE32_MEMBER(model1_state::copro_ramadr_w)
+void model1_state::copro_ramadr_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_ram_adr[offset >> 3]);
}
-READ32_MEMBER(model1_state::copro_ramadr_r)
+u32 model1_state::copro_ramadr_r(offs_t offset)
{
return m_copro_ram_adr[offset >> 3];
}
-WRITE32_MEMBER(model1_state::copro_ramdata_w)
+void model1_state::copro_ramdata_w(offs_t offset, u32 data, u32 mem_mask)
{
if(m_copro_ram_adr[offset >> 3] & 0x40000) {
COMBINE_DATA(&m_copro_ram_data[0x1000 | (m_copro_ram_adr[offset >> 3] & 0x1fff)]);
@@ -164,7 +164,7 @@ WRITE32_MEMBER(model1_state::copro_ramdata_w)
m_copro_ram_adr[offset >> 3] ++;
}
-READ32_MEMBER(model1_state::copro_ramdata_r)
+u32 model1_state::copro_ramdata_r(offs_t offset)
{
u32 val = (m_copro_ram_adr[offset >> 3] & 0x40000) ? m_copro_ram_data[0x1000 | (m_copro_ram_adr[offset >> 3] & 0x1fff)] : m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff];
if(!machine().side_effects_disabled())
@@ -174,12 +174,12 @@ READ32_MEMBER(model1_state::copro_ramdata_r)
-WRITE32_MEMBER(model1_state::copro_sincos_w)
+void model1_state::copro_sincos_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_sincos_base);
}
-READ32_MEMBER(model1_state::copro_sincos_r)
+u32 model1_state::copro_sincos_r(offs_t offset)
{
offs_t ang = m_copro_sincos_base + offset * 0x4000;
offs_t index = ang & 0x3fff;
@@ -191,12 +191,12 @@ READ32_MEMBER(model1_state::copro_sincos_r)
return result;
}
-WRITE32_MEMBER(model1_state::copro_inv_w)
+void model1_state::copro_inv_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_inv_base);
}
-READ32_MEMBER(model1_state::copro_inv_r)
+u32 model1_state::copro_inv_r(offs_t offset)
{
offs_t index = ((m_copro_inv_base >> 9) & 0x3ffe) | (offset & 1);
u32 result = m_copro_tables[index | 0x8000];
@@ -208,12 +208,12 @@ READ32_MEMBER(model1_state::copro_inv_r)
return result;
}
-WRITE32_MEMBER(model1_state::copro_isqrt_w)
+void model1_state::copro_isqrt_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_isqrt_base);
}
-READ32_MEMBER(model1_state::copro_isqrt_r)
+u32 model1_state::copro_isqrt_r(offs_t offset)
{
offs_t index = 0x2000 ^ (((m_copro_isqrt_base>> 10) & 0x3ffe) | (offset & 1));
u32 result = m_copro_tables[index | 0xc000];
@@ -225,12 +225,12 @@ READ32_MEMBER(model1_state::copro_isqrt_r)
return result;
}
-WRITE32_MEMBER(model1_state::copro_atan_w)
+void model1_state::copro_atan_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_atan_base[offset]);
}
-READ32_MEMBER(model1_state::copro_atan_r)
+u32 model1_state::copro_atan_r()
{
u32 idx = m_copro_atan_base[3] & 0xffff;
if(idx & 0xc000)
@@ -274,12 +274,12 @@ READ32_MEMBER(model1_state::copro_atan_r)
return result & 0xffff;
}
-WRITE32_MEMBER(model1_state::copro_data_w)
+void model1_state::copro_data_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_copro_data_base);
}
-READ32_MEMBER(model1_state::copro_data_r)
+u32 model1_state::copro_data_r(offs_t offset)
{
offs_t index = (m_copro_data_base & ~0x7fff) | offset;
index &= (m_copro_data->bytes() >> 2) - 1;
diff --git a/src/mame/machine/model2.cpp b/src/mame/machine/model2.cpp
index 600619d92b8..72ee81a81df 100644
--- a/src/mame/machine/model2.cpp
+++ b/src/mame/machine/model2.cpp
@@ -88,8 +88,8 @@ void model2_state::debug_geo_dasm_command(int ref, const std::vector<std::string
while (!end_code && ptr < 0x20000/4)
{
- uint32_t opcode;
- uint32_t attr;
+ u32 opcode;
+ u32 attr;
util::stream_format(f, "%08x: \t",ptr*4+0x900000);
opcode = m_bufferram[ptr++];
diff --git a/src/mame/machine/model3.cpp b/src/mame/machine/model3.cpp
index c2b3f3ec63a..7463ec4a602 100644
--- a/src/mame/machine/model3.cpp
+++ b/src/mame/machine/model3.cpp
@@ -290,7 +290,7 @@ void model3_state::tap_reset()
/*****************************************************************************/
/* Epson RTC-72421 */
-READ32_MEMBER(model3_state::rtc72421_r)
+uint32_t model3_state::rtc72421_r(offs_t offset)
{
int reg = offset;
uint32_t data;
@@ -299,7 +299,7 @@ READ32_MEMBER(model3_state::rtc72421_r)
return data;
}
-WRITE32_MEMBER(model3_state::rtc72421_w)
+void model3_state::rtc72421_w(offs_t offset, uint32_t data)
{
m_rtc->write(offset, data >> 24);
}
diff --git a/src/mame/video/jack.cpp b/src/mame/video/jack.cpp
index f90276c2513..70a08c05fee 100644
--- a/src/mame/video/jack.cpp
+++ b/src/mame/video/jack.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Brad Oliver
/***************************************************************************
- video/jack.c
+ video/jack.cpp
Functions to emulate the video hardware of the machine.
@@ -13,25 +13,25 @@
-WRITE8_MEMBER(jack_state::jack_videoram_w)
+void jack_state::jack_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(jack_state::jack_colorram_w)
+void jack_state::jack_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_MEMBER(jack_state::jack_flipscreen_r)
+uint8_t jack_state::jack_flipscreen_r(offs_t offset)
{
flip_screen_set(offset);
return 0;
}
-WRITE8_MEMBER(jack_state::jack_flipscreen_w)
+void jack_state::jack_flipscreen_w(offs_t offset, uint8_t data)
{
flip_screen_set(offset);
}
@@ -120,7 +120,7 @@ uint32_t jack_state::screen_update_striv(screen_device &screen, bitmap_ind16 &bi
***************************************************************************/
-WRITE8_MEMBER(jack_state::joinem_scroll_w)
+void jack_state::joinem_scroll_w(offs_t offset, uint8_t data)
{
switch (offset & 3)
{
diff --git a/src/mame/video/jag_blitter.cpp b/src/mame/video/jag_blitter.cpp
index d2f33aacfeb..46f5809a8f5 100644
--- a/src/mame/video/jag_blitter.cpp
+++ b/src/mame/video/jag_blitter.cpp
@@ -173,31 +173,31 @@ void jag_blitter_device::regs_map(address_map &map)
map(0x3c, 0x3f).w(FUNC(jag_blitter_device::count_inner_w)).umask32(0x0000ffff);
}
-WRITE32_MEMBER(jag_blitter_device::a1_base_w)
+void jag_blitter_device::a1_base_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_a1.base);
// align to phrase
m_a1.base &= ~7;
}
-WRITE16_MEMBER(jag_blitter_device::a1_xstep_w)
+void jag_blitter_device::a1_xstep_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_a1.xstep);
}
-WRITE16_MEMBER(jag_blitter_device::a1_ystep_w)
+void jag_blitter_device::a1_ystep_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_a1.ystep);
}
-READ32_MEMBER(jag_blitter_device::status_r)
+u32 jag_blitter_device::status_r()
{
// TODO: stopped bit
// TODO: diag bits 2-31
return m_status_idle;
}
-WRITE32_MEMBER(jag_blitter_device::command_w)
+void jag_blitter_device::command_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_command_latch);
// TODO: is it possible from 68k to write on this in byte units?
@@ -207,7 +207,7 @@ WRITE32_MEMBER(jag_blitter_device::command_w)
command_start();
}
-WRITE16_MEMBER(jag_blitter_device::count_outer_w)
+void jag_blitter_device::count_outer_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_count_lines);
if (m_count_lines == 0)
@@ -218,7 +218,7 @@ WRITE16_MEMBER(jag_blitter_device::count_outer_w)
}
}
-WRITE16_MEMBER(jag_blitter_device::count_inner_w)
+void jag_blitter_device::count_inner_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_count_pixels);
if (m_count_pixels == 0)
diff --git a/src/mame/video/jag_blitter.h b/src/mame/video/jag_blitter.h
index 6812871d647..313f98f2d22 100644
--- a/src/mame/video/jag_blitter.h
+++ b/src/mame/video/jag_blitter.h
@@ -51,13 +51,13 @@ protected:
private:
void regs_map(address_map &map);
- DECLARE_WRITE32_MEMBER(a1_base_w);
- DECLARE_WRITE16_MEMBER(a1_xstep_w);
- DECLARE_WRITE16_MEMBER(a1_ystep_w);
- DECLARE_READ32_MEMBER(status_r);
- DECLARE_WRITE32_MEMBER(command_w);
- DECLARE_WRITE16_MEMBER(count_outer_w);
- DECLARE_WRITE16_MEMBER(count_inner_w);
+ void a1_base_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void a1_xstep_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void a1_ystep_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u32 status_r();
+ void command_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void count_outer_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void count_inner_w(offs_t offset, u16 data, u16 mem_mask = ~0);
// timer setups
emu_timer *m_command_timer;
diff --git a/src/mame/video/jaguar.cpp b/src/mame/video/jaguar.cpp
index 06e0995577b..c402ecb31ef 100644
--- a/src/mame/video/jaguar.cpp
+++ b/src/mame/video/jaguar.cpp
@@ -542,7 +542,7 @@ if (++reps % 100 == 99)
g_profiler.stop();
}
-READ32_MEMBER( jaguar_state::blitter_r )
+uint32_t jaguar_state::blitter_r(offs_t offset, uint32_t mem_mask)
{
#if USE_LEGACY_BLITTER
switch (offset)
@@ -560,7 +560,7 @@ READ32_MEMBER( jaguar_state::blitter_r )
}
-WRITE32_MEMBER( jaguar_state::blitter_w )
+void jaguar_state::blitter_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
#if USE_LEGACY_BLITTER
COMBINE_DATA(&m_blitter_regs[offset]);
@@ -588,7 +588,7 @@ WRITE32_MEMBER( jaguar_state::blitter_w )
*
*************************************/
-READ16_MEMBER( jaguar_state::tom_regs_r )
+uint16_t jaguar_state::tom_regs_r(offs_t offset)
{
if (offset != INT1 && offset != INT2 && offset != HC && offset != VC)
logerror("%s:TOM read register @ F00%03X\n", machine().describe_context(), offset * 2);
@@ -619,7 +619,7 @@ READ16_MEMBER( jaguar_state::tom_regs_r )
return m_gpu_regs[offset];
}
-WRITE16_MEMBER( jaguar_state::tom_regs_w )
+void jaguar_state::tom_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint32_t reg_store = m_gpu_regs[offset];
attotime sample_period;
@@ -704,7 +704,7 @@ WRITE16_MEMBER( jaguar_state::tom_regs_w )
*
*************************************/
-READ32_MEMBER( jaguar_state::cojag_gun_input_r )
+uint32_t jaguar_state::cojag_gun_input_r(offs_t offset)
{
int beamx, beamy;
diff --git a/src/mame/video/jailbrek.cpp b/src/mame/video/jailbrek.cpp
index 8964f1a91c1..c1519e6c0d0 100644
--- a/src/mame/video/jailbrek.cpp
+++ b/src/mame/video/jailbrek.cpp
@@ -33,13 +33,13 @@ void jailbrek_state::jailbrek_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(jailbrek_state::videoram_w)
+void jailbrek_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(jailbrek_state::colorram_w)
+void jailbrek_state::colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/jpmimpct.cpp b/src/mame/video/jpmimpct.cpp
index 8d68a44bd49..2edc65cbd58 100644
--- a/src/mame/video/jpmimpct.cpp
+++ b/src/mame/video/jpmimpct.cpp
@@ -29,7 +29,7 @@
* 1 1 0 Command register
*/
-WRITE16_MEMBER(jpmimpct_state::jpmimpct_bt477_w)
+void jpmimpct_state::jpmimpct_bt477_w(offs_t offset, uint16_t data)
{
uint8_t val = data & 0xff;
@@ -75,7 +75,7 @@ WRITE16_MEMBER(jpmimpct_state::jpmimpct_bt477_w)
}
}
-READ16_MEMBER(jpmimpct_state::jpmimpct_bt477_r)
+uint16_t jpmimpct_state::jpmimpct_bt477_r(offs_t offset)
{
popmessage("Bt477: Unhandled read access (offset:%x)", offset);
return 0;
diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp
index 7a851c4a4f7..55ae7629a90 100644
--- a/src/mame/video/k001005.cpp
+++ b/src/mame/video/k001005.cpp
@@ -1252,7 +1252,7 @@ void k001005_device::swap_buffers( )
m_renderer->swap_buffers();
}
-READ32_MEMBER( k001005_device::read )
+uint32_t k001005_device::read(address_space &space, offs_t offset, uint32_t mem_mask)
{
adsp21062_device *dsp = downcast<adsp21062_device*>(&space.device());
@@ -1314,7 +1314,7 @@ READ32_MEMBER( k001005_device::read )
return 0;
}
-WRITE32_MEMBER( k001005_device::write )
+void k001005_device::write(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask)
{
adsp21062_device *dsp = downcast<adsp21062_device*>(&space.device());
diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h
index 586de02d410..12bed551c95 100644
--- a/src/mame/video/k001005.h
+++ b/src/mame/video/k001005.h
@@ -117,8 +117,8 @@ public:
void draw(bitmap_rgb32 &bitmap, const rectangle &cliprect);
void swap_buffers();
- DECLARE_READ32_MEMBER( read );
- DECLARE_WRITE32_MEMBER( write );
+ uint32_t read(address_space &space, offs_t offset, uint32_t mem_mask = ~0);
+ void write(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
protected:
// device-level overrides
diff --git a/src/mame/video/k001006.cpp b/src/mame/video/k001006.cpp
index a15f8b20589..c3cbfeca586 100644
--- a/src/mame/video/k001006.cpp
+++ b/src/mame/video/k001006.cpp
@@ -61,7 +61,7 @@ void k001006_device::device_reset()
DEVICE HANDLERS
*****************************************************************************/
-READ32_MEMBER( k001006_device::read )
+uint32_t k001006_device::read(offs_t offset)
{
if (offset == 1)
{
@@ -92,7 +92,7 @@ READ32_MEMBER( k001006_device::read )
return 0;
}
-WRITE32_MEMBER( k001006_device::write )
+void k001006_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (offset == 0)
{
diff --git a/src/mame/video/k001006.h b/src/mame/video/k001006.h
index 649b287f4a1..5bdff319e75 100644
--- a/src/mame/video/k001006.h
+++ b/src/mame/video/k001006.h
@@ -20,8 +20,8 @@ public:
uint32_t fetch_texel(int page, int pal_index, int u, int v);
void preprocess_texture_data(uint8_t *dst, uint8_t *src, int length, int gticlub);
- DECLARE_READ32_MEMBER( read );
- DECLARE_WRITE32_MEMBER( write );
+ uint32_t read(offs_t offset);
+ void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
protected:
// device-level overrides
diff --git a/src/mame/video/k053250.cpp b/src/mame/video/k053250.cpp
index b47518911a5..6363569a761 100644
--- a/src/mame/video/k053250.cpp
+++ b/src/mame/video/k053250.cpp
@@ -423,12 +423,12 @@ void k053250_device::dma(int limiter)
m_page ^= 1;
}
-READ16_MEMBER(k053250_device::reg_r)
+uint16_t k053250_device::reg_r(offs_t offset)
{
return m_regs[offset];
}
-WRITE16_MEMBER(k053250_device::reg_w)
+void k053250_device::reg_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -440,17 +440,17 @@ WRITE16_MEMBER(k053250_device::reg_w)
}
}
-READ16_MEMBER(k053250_device::ram_r)
+uint16_t k053250_device::ram_r(offs_t offset)
{
return m_ram[offset];
}
-WRITE16_MEMBER(k053250_device::ram_w)
+void k053250_device::ram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_ram[offset]);
}
-READ16_MEMBER(k053250_device::rom_r)
+uint16_t k053250_device::rom_r(offs_t offset)
{
return m_rom[0x80000 * m_regs[6] + 0x800 * m_regs[7] + offset/2];
}
diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h
index a56cf7ab948..5b9afa0542e 100644
--- a/src/mame/video/k053250.h
+++ b/src/mame/video/k053250.h
@@ -31,11 +31,11 @@ public:
m_offy = offy;
}
- DECLARE_READ16_MEMBER(reg_r);
- DECLARE_WRITE16_MEMBER(reg_w);
- DECLARE_READ16_MEMBER(ram_r);
- DECLARE_WRITE16_MEMBER(ram_w);
- DECLARE_READ16_MEMBER(rom_r);
+ uint16_t reg_r(offs_t offset);
+ void reg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t rom_r(offs_t offset);
void draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colorbase, int flags, bitmap_ind8 &priority_bitmap, int priority );
diff --git a/src/mame/video/k053250_ps.cpp b/src/mame/video/k053250_ps.cpp
index 871a0e14522..9f62bd0b0fb 100644
--- a/src/mame/video/k053250_ps.cpp
+++ b/src/mame/video/k053250_ps.cpp
@@ -492,7 +492,7 @@ void k053250ps_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, in
}
}
-READ16_MEMBER(k053250ps_device::reg_r)
+uint16_t k053250ps_device::reg_r(offs_t offset)
{
return m_regs[offset];
}
@@ -553,7 +553,7 @@ READ_LINE_MEMBER(k053250ps_device::dmairq_r)
}
-WRITE16_MEMBER(k053250ps_device::reg_w)
+void k053250ps_device::reg_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
#if 0
static char const *const regnames[] =
@@ -574,17 +574,17 @@ WRITE16_MEMBER(k053250ps_device::reg_w)
m_regs[offset] = data;
}
-READ16_MEMBER(k053250ps_device::ram_r)
+uint16_t k053250ps_device::ram_r(offs_t offset)
{
return m_ram[offset];
}
-WRITE16_MEMBER(k053250ps_device::ram_w)
+void k053250ps_device::ram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_ram[offset]);
}
-READ16_MEMBER(k053250ps_device::rom_r)
+uint16_t k053250ps_device::rom_r(offs_t offset)
{
return m_rom[0x80000 * m_regs[6] + 0x800 * m_regs[7] + offset/2];
}
diff --git a/src/mame/video/k053250_ps.h b/src/mame/video/k053250_ps.h
index 24d1ebc7484..1e3451970a3 100644
--- a/src/mame/video/k053250_ps.h
+++ b/src/mame/video/k053250_ps.h
@@ -33,11 +33,11 @@ public:
}
auto dmairq_cb() { return m_dmairq_cb.bind(); }
- DECLARE_READ16_MEMBER(reg_r);
- DECLARE_WRITE16_MEMBER(reg_w);
- DECLARE_READ16_MEMBER(ram_r);
- DECLARE_WRITE16_MEMBER(ram_w);
- DECLARE_READ16_MEMBER(rom_r);
+ uint16_t reg_r(offs_t offset);
+ void reg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t rom_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(vblank_w);
DECLARE_READ_LINE_MEMBER(dmairq_r);
diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp
index 03844481ef5..3be4ff7a48e 100644
--- a/src/mame/video/k053936.cpp
+++ b/src/mame/video/k053936.cpp
@@ -266,22 +266,22 @@ void k053936_device::device_reset()
DEVICE HANDLERS
*****************************************************************************/
-WRITE16_MEMBER( k053936_device::ctrl_w )
+void k053936_device::ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_ctrl[offset]);
}
-READ16_MEMBER( k053936_device::ctrl_r )
+uint16_t k053936_device::ctrl_r(offs_t offset)
{
return m_ctrl[offset];
}
-WRITE16_MEMBER( k053936_device::linectrl_w )
+void k053936_device::linectrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_linectrl[offset]);
}
-READ16_MEMBER( k053936_device::linectrl_r )
+uint16_t k053936_device::linectrl_r(offs_t offset)
{
return m_linectrl[offset];
}
diff --git a/src/mame/video/k053936.h b/src/mame/video/k053936.h
index 8f9b85077ba..8d0d62f3e25 100644
--- a/src/mame/video/k053936.h
+++ b/src/mame/video/k053936.h
@@ -34,10 +34,10 @@ public:
m_yoff = y_offset;
}
- DECLARE_WRITE16_MEMBER( ctrl_w );
- DECLARE_READ16_MEMBER( ctrl_r );
- DECLARE_WRITE16_MEMBER( linectrl_w );
- DECLARE_READ16_MEMBER( linectrl_r );
+ void ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t ctrl_r(offs_t offset);
+ void linectrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t linectrl_r(offs_t offset);
void zoom_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t *tmap, int flags, uint32_t priority, int glfgreat_hack);
void zoom_draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, tilemap_t *tmap, int flags, uint32_t priority, int glfgreat_hack);
// void wraparound_enable(int status); unused? // shall we merge this into the configuration intf?
diff --git a/src/mame/video/k055555.cpp b/src/mame/video/k055555.cpp
index 68abbbdfb09..64c2dcfd33a 100644
--- a/src/mame/video/k055555.cpp
+++ b/src/mame/video/k055555.cpp
@@ -90,7 +90,7 @@ void k055555_device::K055555_write_reg(uint8_t regnum, uint8_t regdat)
m_regs[regnum] = regdat;
}
-WRITE32_MEMBER( k055555_device::K055555_long_w )
+void k055555_device::K055555_long_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint8_t regnum, regdat;
@@ -111,7 +111,7 @@ WRITE32_MEMBER( k055555_device::K055555_long_w )
}
-WRITE16_MEMBER( k055555_device::K055555_word_w )
+void k055555_device::K055555_word_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (mem_mask == 0x00ff)
{
diff --git a/src/mame/video/k055555.h b/src/mame/video/k055555.h
index 775c2965bc7..0b94decc061 100644
--- a/src/mame/video/k055555.h
+++ b/src/mame/video/k055555.h
@@ -81,8 +81,8 @@ public:
void K055555_write_reg(uint8_t regnum, uint8_t regdat);
- DECLARE_WRITE16_MEMBER( K055555_word_w );
- DECLARE_WRITE32_MEMBER( K055555_long_w );
+ void K055555_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void K055555_long_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
int K055555_read_register(int regnum);
int K055555_get_palette_index(int idx);
diff --git a/src/mame/video/k057714.cpp b/src/mame/video/k057714.cpp
index 084ed639473..4771c5898cf 100644
--- a/src/mame/video/k057714.cpp
+++ b/src/mame/video/k057714.cpp
@@ -70,7 +70,7 @@ void k057714_device::device_stop()
}
-READ32_MEMBER(k057714_device::read)
+uint32_t k057714_device::read(offs_t offset)
{
int reg = offset * 4;
@@ -93,7 +93,7 @@ READ32_MEMBER(k057714_device::read)
return 0xffffffff;
}
-WRITE32_MEMBER(k057714_device::write)
+void k057714_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
int reg = offset * 4;
@@ -317,7 +317,7 @@ WRITE32_MEMBER(k057714_device::write)
}
}
-WRITE32_MEMBER(k057714_device::fifo_w)
+void k057714_device::fifo_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
diff --git a/src/mame/video/k057714.h b/src/mame/video/k057714.h
index 190a8dd92c7..fc9354e6b2e 100644
--- a/src/mame/video/k057714.h
+++ b/src/mame/video/k057714.h
@@ -14,9 +14,9 @@ public:
int draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_READ32_MEMBER(read);
- DECLARE_WRITE32_MEMBER(write);
- DECLARE_WRITE32_MEMBER(fifo_w);
+ uint32_t read(offs_t offset);
+ void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void fifo_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
struct framebuffer
{
diff --git a/src/mame/video/kaneko_grap2.cpp b/src/mame/video/kaneko_grap2.cpp
index 4c299a2579e..8769e454b18 100644
--- a/src/mame/video/kaneko_grap2.cpp
+++ b/src/mame/video/kaneko_grap2.cpp
@@ -78,7 +78,7 @@ void kaneko_grap2_device::rom_bank_updated()
{
}
-READ16_MEMBER(kaneko_grap2_device::regs1_r)
+uint16_t kaneko_grap2_device::regs1_r(offs_t offset, uint16_t mem_mask)
{
switch (offset)
{
@@ -154,7 +154,7 @@ void kaneko_grap2_device::do_rle(uint32_t address)
}
-WRITE16_MEMBER(kaneko_grap2_device::regs1_go_w)
+void kaneko_grap2_device::regs1_go_w(uint16_t data)
{
uint32_t address = m_regs1_address_regs[1]| (m_regs1_address_regs[0]<<16);
@@ -168,14 +168,14 @@ void kaneko_grap2_device::set_color_555(pen_t color, int rshift, int gshift, int
set_pen_color(color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift));
}
-WRITE16_MEMBER(kaneko_grap2_device::framebuffer1_palette_w)
+void kaneko_grap2_device::framebuffer1_palette_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_framebuffer_palette[offset]);
set_color_555(offset, 5, 10, 0, m_framebuffer_palette[offset]);
}
/* definitely looks like a cycling bg colour used for the girls */
-WRITE16_MEMBER(kaneko_grap2_device::framebuffer1_bgcol_w)
+void kaneko_grap2_device::framebuffer1_bgcol_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_framebuffer_palette[0x100]);
set_color_555(0x100, 5, 10, 0, m_framebuffer_palette[0x100]);
diff --git a/src/mame/video/kaneko_grap2.h b/src/mame/video/kaneko_grap2.h
index 0c566d22b7e..a3c6fc16e38 100644
--- a/src/mame/video/kaneko_grap2.h
+++ b/src/mame/video/kaneko_grap2.h
@@ -16,8 +16,8 @@ public:
kaneko_grap2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ16_MEMBER(regs1_r);
- DECLARE_WRITE16_MEMBER(regs1_go_w);
+ uint16_t regs1_r(offs_t offset, uint16_t mem_mask = ~0);
+ void regs1_go_w(uint16_t data);
void grap2_map(address_map &map);
@@ -35,32 +35,32 @@ public:
uint16_t m_regs1_address_regs[0x2];
uint16_t m_regs2;
- DECLARE_WRITE16_MEMBER(framebuffer1_enable_w) { m_framebuffer_enable = data; }
+ void framebuffer1_enable_w(uint16_t data) { m_framebuffer_enable = data; }
- DECLARE_WRITE16_MEMBER(framebuffer1_scrolly_w) { m_framebuffer_scrolly = data; }
- DECLARE_WRITE16_MEMBER(framebuffer1_scrollx_w) { m_framebuffer_scrollx = data; }
+ void framebuffer1_scrolly_w(uint16_t data) { m_framebuffer_scrolly = data; }
+ void framebuffer1_scrollx_w(uint16_t data) { m_framebuffer_scrollx = data; }
- DECLARE_READ16_MEMBER(framebuffer1_fbbright1_r) { return m_framebuffer_bright1; }
- DECLARE_READ16_MEMBER(framebuffer1_fbbright2_r) { return m_framebuffer_bright2; }
+ uint16_t framebuffer1_fbbright1_r() { return m_framebuffer_bright1; }
+ uint16_t framebuffer1_fbbright2_r() { return m_framebuffer_bright2; }
- DECLARE_WRITE16_MEMBER(framebuffer1_fbbright1_w) { COMBINE_DATA(&m_framebuffer_bright1); }
- DECLARE_WRITE16_MEMBER(framebuffer1_fbbright2_w) { COMBINE_DATA(&m_framebuffer_bright2); }
+ void framebuffer1_fbbright1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_framebuffer_bright1); }
+ void framebuffer1_fbbright2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_framebuffer_bright2); }
- DECLARE_WRITE16_MEMBER(framebuffer1_bgcol_w);
+ void framebuffer1_bgcol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_WRITE16_MEMBER(regs1_address_w) { COMBINE_DATA(&m_regs1_address_regs[offset]); }
- DECLARE_WRITE16_MEMBER(regs2_w) { COMBINE_DATA(&m_regs2); }
+ void regs1_address_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_regs1_address_regs[offset]); }
+ void regs2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_regs2); }
- DECLARE_READ16_MEMBER( framebuffer_r ) { return m_framebuffer[offset]; }
- DECLARE_WRITE16_MEMBER( framebuffer_w ) { COMBINE_DATA(&m_framebuffer[offset]); }
- DECLARE_READ16_MEMBER( pal_r ) { return m_framebuffer_palette[offset]; }
- DECLARE_WRITE16_MEMBER(framebuffer1_palette_w);
- DECLARE_READ16_MEMBER( unk1_r ) { return m_framebuffer_unk1[offset]; }
- DECLARE_WRITE16_MEMBER( unk1_w ) { COMBINE_DATA(&m_framebuffer_unk1[offset]); }
- DECLARE_READ16_MEMBER( unk2_r ) { return m_framebuffer_unk2[offset]; }
- DECLARE_WRITE16_MEMBER( unk2_w ) { COMBINE_DATA(&m_framebuffer_unk2[offset]); }
+ uint16_t framebuffer_r(offs_t offset) { return m_framebuffer[offset]; }
+ void framebuffer_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_framebuffer[offset]); }
+ uint16_t pal_r(offs_t offset) { return m_framebuffer_palette[offset]; }
+ void framebuffer1_palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t unk1_r(offs_t offset) { return m_framebuffer_unk1[offset]; }
+ void unk1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_framebuffer_unk1[offset]); }
+ uint16_t unk2_r(offs_t offset) { return m_framebuffer_unk2[offset]; }
+ void unk2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_framebuffer_unk2[offset]); }
std::unique_ptr<uint16_t[]> m_framebuffer;
std::unique_ptr<uint16_t[]> m_framebuffer_palette;
diff --git a/src/mame/video/kangaroo.cpp b/src/mame/video/kangaroo.cpp
index f8ce9c49314..89425997add 100644
--- a/src/mame/video/kangaroo.cpp
+++ b/src/mame/video/kangaroo.cpp
@@ -57,7 +57,7 @@ void kangaroo_state::videoram_write( uint16_t offset, uint8_t data, uint8_t mask
}
-WRITE8_MEMBER(kangaroo_state::kangaroo_videoram_w)
+void kangaroo_state::kangaroo_videoram_w(offs_t offset, uint8_t data)
{
videoram_write(offset, data, m_video_control[8]);
}
@@ -70,7 +70,7 @@ WRITE8_MEMBER(kangaroo_state::kangaroo_videoram_w)
*
*************************************/
-WRITE8_MEMBER(kangaroo_state::kangaroo_video_control_w)
+void kangaroo_state::kangaroo_video_control_w(offs_t offset, uint8_t data)
{
m_video_control[offset] = data;
diff --git a/src/mame/video/karnov.cpp b/src/mame/video/karnov.cpp
index ce267b1bfbb..0b6bdcd5a94 100644
--- a/src/mame/video/karnov.cpp
+++ b/src/mame/video/karnov.cpp
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(karnov_state::get_bg_tile_info)
0);
}
-WRITE16_MEMBER(karnov_state::videoram_w)
+void karnov_state::videoram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_videoram[offset]);
m_fix_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/kaypro.cpp b/src/mame/video/kaypro.cpp
index 418fe519f17..2af3874ffdd 100644
--- a/src/mame/video/kaypro.cpp
+++ b/src/mame/video/kaypro.cpp
@@ -214,20 +214,20 @@ void kaypro_state::mc6845_screen_configure()
/**************************** I/O PORTS *****************************************************************/
-READ8_MEMBER( kaypro_state::kaypro484_status_r )
+uint8_t kaypro_state::kaypro484_status_r()
{
/* Need bit 7 high or computer hangs */
return 0x80 | m_crtc->register_r();
}
-WRITE8_MEMBER( kaypro_state::kaypro484_index_w )
+void kaypro_state::kaypro484_index_w(uint8_t data)
{
m_mc6845_ind = data & 0x1f;
m_crtc->address_w(data);
}
-WRITE8_MEMBER( kaypro_state::kaypro484_register_w )
+void kaypro_state::kaypro484_register_w(uint8_t data)
{
static const uint8_t mcmask[32]={0xff,0xff,0xff,0x0f,0x7f,0x1f,0x7f,0x7f,3,0x1f,0x7f,0x1f,0x3f,0xff,0x3f,0xff,0,0};
@@ -245,22 +245,22 @@ WRITE8_MEMBER( kaypro_state::kaypro484_register_w )
m_mc6845_video_address = m_mc6845_reg[19] | ((m_mc6845_reg[18] & 0x3f) << 8); /* internal ULA address */
}
-READ8_MEMBER( kaypro_state::kaypro_videoram_r )
+uint8_t kaypro_state::kaypro_videoram_r(offs_t offset)
{
return m_p_videoram[offset];
}
-WRITE8_MEMBER( kaypro_state::kaypro_videoram_w )
+void kaypro_state::kaypro_videoram_w(offs_t offset, uint8_t data)
{
m_p_videoram[offset] = data;
}
-READ8_MEMBER( kaypro_state::kaypro484_videoram_r )
+uint8_t kaypro_state::kaypro484_videoram_r()
{
return m_p_videoram[m_mc6845_video_address];
}
-WRITE8_MEMBER( kaypro_state::kaypro484_videoram_w )
+void kaypro_state::kaypro484_videoram_w(uint8_t data)
{
m_p_videoram[m_mc6845_video_address] = data;
}
diff --git a/src/mame/video/kchamp.cpp b/src/mame/video/kchamp.cpp
index 11b39e43de2..b213ef78741 100644
--- a/src/mame/video/kchamp.cpp
+++ b/src/mame/video/kchamp.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Ernesto Corvi
/***************************************************************************
- video.c
+ kchamp.cpp
Functions to emulate the video hardware of the machine.
@@ -25,13 +25,13 @@ void kchamp_state::kchamp_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(kchamp_state::kchamp_videoram_w)
+void kchamp_state::kchamp_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(kchamp_state::kchamp_colorram_w)
+void kchamp_state::kchamp_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/kickgoal.cpp b/src/mame/video/kickgoal.cpp
index 5b09a0da2e1..4ab7273e150 100644
--- a/src/mame/video/kickgoal.cpp
+++ b/src/mame/video/kickgoal.cpp
@@ -6,19 +6,19 @@
#include "includes/kickgoal.h"
-WRITE16_MEMBER(kickgoal_state::fgram_w)
+void kickgoal_state::fgram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_fgram[offset]);
m_fgtm->mark_tile_dirty(offset / 2);
}
-WRITE16_MEMBER(kickgoal_state::bgram_w)
+void kickgoal_state::bgram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_bgram[offset]);
m_bgtm->mark_tile_dirty(offset / 2);
}
-WRITE16_MEMBER(kickgoal_state::bg2ram_w)
+void kickgoal_state::bg2ram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_bg2ram[offset]);
m_bg2tm->mark_tile_dirty(offset / 2);
diff --git a/src/mame/video/kikikai.cpp b/src/mame/video/kikikai.cpp
index 3ed05c6a315..9105d1f23b8 100644
--- a/src/mame/video/kikikai.cpp
+++ b/src/mame/video/kikikai.cpp
@@ -4,7 +4,7 @@
#include "includes/kikikai.h"
-WRITE8_MEMBER(kikikai_state::main_bankswitch_w)
+void kikikai_state::main_bankswitch_w(uint8_t data)
{
if ((data & 7) > 5)
popmessage("Switching to invalid bank!");
diff --git a/src/mame/video/kncljoe.cpp b/src/mame/video/kncljoe.cpp
index b600f77f024..ccbcc5ab44f 100644
--- a/src/mame/video/kncljoe.cpp
+++ b/src/mame/video/kncljoe.cpp
@@ -112,13 +112,13 @@ void kncljoe_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(kncljoe_state::kncljoe_videoram_w)
+void kncljoe_state::kncljoe_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(kncljoe_state::kncljoe_control_w)
+void kncljoe_state::kncljoe_control_w(uint8_t data)
{
int i;
/*
@@ -152,7 +152,7 @@ WRITE8_MEMBER(kncljoe_state::kncljoe_control_w)
}
}
-WRITE8_MEMBER(kncljoe_state::kncljoe_scroll_w)
+void kncljoe_state::kncljoe_scroll_w(offs_t offset, uint8_t data)
{
int scrollx;
diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp
index a13d936f735..3f3cef92899 100644
--- a/src/mame/video/konamigx.cpp
+++ b/src/mame/video/konamigx.cpp
@@ -924,7 +924,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac_tile_info)
}
-WRITE8_MEMBER(konamigx_state::type3_bank_w)
+void konamigx_state::type3_bank_w(offs_t offset, uint8_t data)
{
// other bits are used for something...
@@ -1589,7 +1589,7 @@ static inline void set_color_555(palette_device &palette, pen_t color, int rshif
#ifdef UNUSED_FUNCTION
// main monitor for type 3
-WRITE32_MEMBER(konamigx_state::konamigx_555_palette_w)
+void konamigx_state::konamigx_555_palette_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t coldat;
COMBINE_DATA(&m_generic_paletteram_32[offset]);
@@ -1601,7 +1601,7 @@ WRITE32_MEMBER(konamigx_state::konamigx_555_palette_w)
}
// sub monitor for type 3
-WRITE32_MEMBER(konamigx_state::konamigx_555_palette2_w)
+void konamigx_state::konamigx_555_palette2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t coldat;
COMBINE_DATA(&m_subpaletteram32[offset]);
@@ -1614,7 +1614,7 @@ WRITE32_MEMBER(konamigx_state::konamigx_555_palette2_w)
}
#endif
-WRITE32_MEMBER(konamigx_state::konamigx_tilebank_w)
+void konamigx_state::konamigx_tilebank_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_24_31)
m_gx_tilebanks[offset*4] = (data>>24)&0xff;
@@ -1627,7 +1627,7 @@ WRITE32_MEMBER(konamigx_state::konamigx_tilebank_w)
}
// type 1 RAM-based PSAC tilemap
-WRITE32_MEMBER(konamigx_state::konamigx_t1_psacmap_w)
+void konamigx_state::konamigx_t1_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_psacram[offset]);
m_gx_psac_tilemap->mark_tile_dirty(offset/2);
@@ -1635,7 +1635,7 @@ WRITE32_MEMBER(konamigx_state::konamigx_t1_psacmap_w)
}
// type 4 RAM-based PSAC tilemap
-WRITE32_MEMBER(konamigx_state::konamigx_t4_psacmap_w)
+void konamigx_state::konamigx_t4_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_psacram[offset]);
diff --git a/src/mame/video/kopunch.cpp b/src/mame/video/kopunch.cpp
index 8715532a860..7160c48dbad 100644
--- a/src/mame/video/kopunch.cpp
+++ b/src/mame/video/kopunch.cpp
@@ -43,13 +43,13 @@ void kopunch_state::kopunch_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(kopunch_state::vram_fg_w)
+void kopunch_state::vram_fg_w(offs_t offset, uint8_t data)
{
m_vram_fg[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(kopunch_state::vram_bg_w)
+void kopunch_state::vram_bg_w(offs_t offset, uint8_t data)
{
m_vram_bg[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/ksayakyu.cpp b/src/mame/video/ksayakyu.cpp
index 0c95f1e69f1..8a28791ef20 100644
--- a/src/mame/video/ksayakyu.cpp
+++ b/src/mame/video/ksayakyu.cpp
@@ -4,13 +4,13 @@
#include "includes/ksayakyu.h"
-WRITE8_MEMBER(ksayakyu_state::ksayakyu_videoram_w)
+void ksayakyu_state::ksayakyu_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset]=data;
m_textmap->mark_tile_dirty(offset >> 1);
}
-WRITE8_MEMBER(ksayakyu_state::ksayakyu_videoctrl_w)
+void ksayakyu_state::ksayakyu_videoctrl_w(uint8_t data)
{
/*
bits:
diff --git a/src/mame/video/labyrunr.cpp b/src/mame/video/labyrunr.cpp
index 8dfd6b2ca34..24f4cfba8a7 100644
--- a/src/mame/video/labyrunr.cpp
+++ b/src/mame/video/labyrunr.cpp
@@ -127,13 +127,13 @@ void labyrunr_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(labyrunr_state::labyrunr_vram1_w)
+void labyrunr_state::labyrunr_vram1_w(offs_t offset, uint8_t data)
{
m_videoram1[offset] = data;
m_layer0->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_MEMBER(labyrunr_state::labyrunr_vram2_w)
+void labyrunr_state::labyrunr_vram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_layer1->mark_tile_dirty(offset & 0x3ff);
diff --git a/src/mame/video/ladybug.cpp b/src/mame/video/ladybug.cpp
index 08c0d12b09b..13171816a7f 100644
--- a/src/mame/video/ladybug.cpp
+++ b/src/mame/video/ladybug.cpp
@@ -403,7 +403,7 @@ TILE_GET_INFO_MEMBER(sraider_state::get_grid_tile_info)
}
}
-WRITE8_MEMBER(sraider_state::sraider_io_w)
+void sraider_state::sraider_io_w(uint8_t data)
{
// bit7 = flip
// bit6 = grid red
diff --git a/src/mame/video/ladyfrog.cpp b/src/mame/video/ladyfrog.cpp
index cf34b9bbb97..4ff916aaffd 100644
--- a/src/mame/video/ladyfrog.cpp
+++ b/src/mame/video/ladyfrog.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Tomasz Slanina
/***************************************************************************
- video.c
+ ladyfrog.cpp
Functions to emulate the video hardware of the machine.
@@ -11,12 +11,12 @@
#include "includes/ladyfrog.h"
-WRITE8_MEMBER(ladyfrog_state::ladyfrog_spriteram_w)
+void ladyfrog_state::ladyfrog_spriteram_w(offs_t offset, uint8_t data)
{
m_spriteram[offset] = data;
}
-READ8_MEMBER(ladyfrog_state::ladyfrog_spriteram_r)
+uint8_t ladyfrog_state::ladyfrog_spriteram_r(offs_t offset)
{
return m_spriteram[offset];
}
@@ -31,18 +31,18 @@ TILE_GET_INFO_MEMBER(ladyfrog_state::get_tile_info)
);
}
-WRITE8_MEMBER(ladyfrog_state::ladyfrog_videoram_w)
+void ladyfrog_state::ladyfrog_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-READ8_MEMBER(ladyfrog_state::ladyfrog_videoram_r)
+uint8_t ladyfrog_state::ladyfrog_videoram_r(offs_t offset)
{
return m_videoram[offset];
}
-WRITE8_MEMBER(ladyfrog_state::ladyfrog_palette_w)
+void ladyfrog_state::ladyfrog_palette_w(offs_t offset, uint8_t data)
{
if (offset & 0x100)
m_palette->write8_ext((offset & 0xff) + (m_palette_bank << 8), data);
@@ -50,7 +50,7 @@ WRITE8_MEMBER(ladyfrog_state::ladyfrog_palette_w)
m_palette->write8((offset & 0xff) + (m_palette_bank << 8), data);
}
-READ8_MEMBER(ladyfrog_state::ladyfrog_palette_r)
+uint8_t ladyfrog_state::ladyfrog_palette_r(offs_t offset)
{
if (offset & 0x100)
return m_paletteram_ext[(offset & 0xff) + (m_palette_bank << 8)];
@@ -58,12 +58,12 @@ READ8_MEMBER(ladyfrog_state::ladyfrog_palette_r)
return m_paletteram[(offset & 0xff) + (m_palette_bank << 8)];
}
-WRITE8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl_w)
+void ladyfrog_state::ladyfrog_gfxctrl_w(uint8_t data)
{
m_palette_bank = (data & 0x20) >> 5;
}
-WRITE8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl2_w)
+void ladyfrog_state::ladyfrog_gfxctrl2_w(uint8_t data)
{
m_tilebank = ((data & 0x18) >> 3) ^ 3;
m_bg_tilemap->mark_all_dirty();
@@ -73,18 +73,18 @@ WRITE8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl2_w)
#ifdef UNUSED_FUNCTION
int gfxctrl;
-READ8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl_r)
+uint8_t ladyfrog_state::ladyfrog_gfxctrl_r()
{
return gfxctrl;
}
#endif
-READ8_MEMBER(ladyfrog_state::ladyfrog_scrlram_r)
+uint8_t ladyfrog_state::ladyfrog_scrlram_r(offs_t offset)
{
return m_scrlram[offset];
}
-WRITE8_MEMBER(ladyfrog_state::ladyfrog_scrlram_w)
+void ladyfrog_state::ladyfrog_scrlram_w(offs_t offset, uint8_t data)
{
m_scrlram[offset] = data;
m_bg_tilemap->set_scrolly(offset, data);
diff --git a/src/mame/video/laserbat.cpp b/src/mame/video/laserbat.cpp
index c13e900cdd6..0dae5a95f7d 100644
--- a/src/mame/video/laserbat.cpp
+++ b/src/mame/video/laserbat.cpp
@@ -83,7 +83,7 @@
#include "includes/laserbat.h"
-WRITE8_MEMBER(laserbat_state_base::videoram_w)
+void laserbat_state_base::videoram_w(offs_t offset, uint8_t data)
{
if (!m_mpx_bkeff)
m_bg_ram[offset] = data;
@@ -91,19 +91,19 @@ WRITE8_MEMBER(laserbat_state_base::videoram_w)
m_eff_ram[offset & 0x1ff] = data; // A9 is not connected, only half the chip is used
}
-WRITE8_MEMBER(laserbat_state_base::wcoh_w)
+void laserbat_state_base::wcoh_w(uint8_t data)
{
// sprite horizontal offset
m_wcoh = data;
}
-WRITE8_MEMBER(laserbat_state_base::wcov_w)
+void laserbat_state_base::wcov_w(uint8_t data)
{
// sprite vertical offset
m_wcov = data;
}
-WRITE8_MEMBER(laserbat_state_base::cnt_eff_w)
+void laserbat_state_base::cnt_eff_w(uint8_t data)
{
/*
+-----+-------------+-----------------------------------------------+
@@ -131,7 +131,7 @@ WRITE8_MEMBER(laserbat_state_base::cnt_eff_w)
// popmessage("effect: 0x%02X", data);
}
-WRITE8_MEMBER(laserbat_state_base::cnt_nav_w)
+void laserbat_state_base::cnt_nav_w(uint8_t data)
{
/*
+-----+-----------+--------------------------------------+
diff --git a/src/mame/video/lasso.cpp b/src/mame/video/lasso.cpp
index 6ba87f447e6..edc07e73df0 100644
--- a/src/mame/video/lasso.cpp
+++ b/src/mame/video/lasso.cpp
@@ -183,20 +183,20 @@ VIDEO_START_MEMBER(lasso_state,pinbo)
*
*************************************/
-WRITE8_MEMBER(lasso_state::lasso_videoram_w)
+void lasso_state::lasso_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(lasso_state::lasso_colorram_w)
+void lasso_state::lasso_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(lasso_state::lasso_flip_screen_w)
+void lasso_state::lasso_flip_screen_w(uint8_t data)
{
/* don't know which is which, but they are always set together */
flip_screen_x_set(data & 0x01);
@@ -206,7 +206,7 @@ WRITE8_MEMBER(lasso_state::lasso_flip_screen_w)
}
-WRITE8_MEMBER(lasso_state::lasso_video_control_w)
+void lasso_state::lasso_video_control_w(uint8_t data)
{
int bank = (data & 0x04) >> 2;
@@ -216,10 +216,10 @@ WRITE8_MEMBER(lasso_state::lasso_video_control_w)
machine().tilemap().mark_all_dirty();
}
- lasso_flip_screen_w(space, offset, data);
+ lasso_flip_screen_w(data);
}
-WRITE8_MEMBER(lasso_state::wwjgtin_video_control_w)
+void lasso_state::wwjgtin_video_control_w(uint8_t data)
{
int bank = ((data & 0x04) ? 0 : 1) + ((data & 0x10) ? 2 : 0);
m_track_enable = data & 0x08;
@@ -230,15 +230,15 @@ WRITE8_MEMBER(lasso_state::wwjgtin_video_control_w)
machine().tilemap().mark_all_dirty();
}
- lasso_flip_screen_w(space, offset, data);
+ lasso_flip_screen_w(data);
}
-WRITE8_MEMBER(lasso_state::pinbo_video_control_w)
+void lasso_state::pinbo_video_control_w(uint8_t data)
{
/* no need to dirty the tilemap -- only the sprites use the global bank */
m_gfxbank = (data & 0x0c) >> 2;
- lasso_flip_screen_w(space, offset, data);
+ lasso_flip_screen_w(data);
}
diff --git a/src/mame/video/lastduel.cpp b/src/mame/video/lastduel.cpp
index c6915755688..908a216a3fc 100644
--- a/src/mame/video/lastduel.cpp
+++ b/src/mame/video/lastduel.cpp
@@ -114,7 +114,7 @@ VIDEO_START_MEMBER(lastduel_state,madgear)
***************************************************************************/
-WRITE8_MEMBER(lastduel_state::flip_w)
+void lastduel_state::flip_w(uint8_t data)
{
flip_screen_set(data & 0x01);
@@ -124,7 +124,7 @@ WRITE8_MEMBER(lastduel_state::flip_w)
machine().bookkeeping().coin_counter_w(1, data & 0x80);
}
-WRITE16_MEMBER(lastduel_state::vctrl_w)
+void lastduel_state::vctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_vctrl[offset]);
switch (offset)
@@ -140,7 +140,7 @@ WRITE16_MEMBER(lastduel_state::vctrl_w)
}
}
-WRITE16_MEMBER(lastduel_state::txram_w)
+void lastduel_state::txram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_txram[offset]);
m_tx_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/lemmings.cpp b/src/mame/video/lemmings.cpp
index 4b4924bc1e6..5851be91a0a 100644
--- a/src/mame/video/lemmings.cpp
+++ b/src/mame/video/lemmings.cpp
@@ -66,7 +66,7 @@ WRITE_LINE_MEMBER(lemmings_state::screen_vblank_lemmings)
/******************************************************************************/
// RAM based
-WRITE16_MEMBER(lemmings_state::lemmings_pixel_0_w)
+void lemmings_state::lemmings_pixel_0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int sx, sy, src, old;
@@ -87,7 +87,7 @@ WRITE16_MEMBER(lemmings_state::lemmings_pixel_0_w)
}
// RAM based tiles for the FG tilemap
-WRITE16_MEMBER(lemmings_state::lemmings_pixel_1_w)
+void lemmings_state::lemmings_pixel_1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int sx, sy, src, tile;
@@ -106,7 +106,7 @@ WRITE16_MEMBER(lemmings_state::lemmings_pixel_1_w)
m_vram_buffer[(tile * 64) + ((sx & 7)) + ((sy & 7) * 8)] = (src >> 0) & 0xf;
}
-WRITE16_MEMBER(lemmings_state::lemmings_vram_w)
+void lemmings_state::lemmings_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram_data[offset]);
m_vram_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/lethal.cpp b/src/mame/video/lethal.cpp
index f04361d4e4c..0e8fe8c4b1e 100644
--- a/src/mame/video/lethal.cpp
+++ b/src/mame/video/lethal.cpp
@@ -71,7 +71,7 @@ void lethal_state::video_start()
}
}
-WRITE8_MEMBER(lethal_state::lethalen_palette_control)
+void lethal_state::lethalen_palette_control(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/mame/video/lethalj.cpp b/src/mame/video/lethalj.cpp
index 73e9dad414c..d813632965b 100644
--- a/src/mame/video/lethalj.cpp
+++ b/src/mame/video/lethalj.cpp
@@ -47,7 +47,7 @@ inline void lethalj_state::get_crosshair_xy(int player, int *x, int *y)
*
*************************************/
-READ16_MEMBER(lethalj_state::lethalj_gun_r)
+uint16_t lethalj_state::lethalj_gun_r(offs_t offset)
{
uint16_t result = 0;
int beamx, beamy;
@@ -156,7 +156,7 @@ void lethalj_state::do_blit()
}
-WRITE16_MEMBER(lethalj_state::blitter_w)
+void lethalj_state::blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* combine the data */
COMBINE_DATA(&m_blitter_data[offset]);
diff --git a/src/mame/video/liberate.cpp b/src/mame/video/liberate.cpp
index 36749a569a9..313b5cb7a8b 100644
--- a/src/mame/video/liberate.cpp
+++ b/src/mame/video/liberate.cpp
@@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(liberate_state::prosport_get_back_tile_info)
/***************************************************************************/
-WRITE8_MEMBER(liberate_state::deco16_io_w)
+void liberate_state::deco16_io_w(offs_t offset, uint8_t data)
{
m_io_ram[offset] = data;
if (offset > 1 && offset < 6)
@@ -132,7 +132,7 @@ WRITE8_MEMBER(liberate_state::deco16_io_w)
}
}
-WRITE8_MEMBER(liberate_state::prosoccr_io_w)
+void liberate_state::prosoccr_io_w(offs_t offset, uint8_t data)
{
m_io_ram[offset] = data;
if (offset > 1 && offset < 6)
@@ -161,7 +161,7 @@ WRITE8_MEMBER(liberate_state::prosoccr_io_w)
}
/* completely different i/o...*/
-WRITE8_MEMBER(liberate_state::prosport_io_w)
+void liberate_state::prosport_io_w(offs_t offset, uint8_t data)
{
m_io_ram[offset] = data;
@@ -182,19 +182,19 @@ WRITE8_MEMBER(liberate_state::prosport_io_w)
}
}
-WRITE8_MEMBER(liberate_state::liberate_videoram_w)
+void liberate_state::liberate_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(liberate_state::liberate_colorram_w)
+void liberate_state::liberate_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(liberate_state::prosport_bg_vram_w)
+void liberate_state::prosport_bg_vram_w(offs_t offset, uint8_t data)
{
m_bg_vram[offset] = data;
m_back_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/liberatr.cpp b/src/mame/video/liberatr.cpp
index eb24737053d..82c5cbcdc25 100644
--- a/src/mame/video/liberatr.cpp
+++ b/src/mame/video/liberatr.cpp
@@ -24,19 +24,19 @@
-WRITE8_MEMBER( liberatr_state::bitmap_xy_w )
+void liberatr_state::bitmap_xy_w(uint8_t data)
{
m_videoram[(*m_ycoord << 8) | *m_xcoord] = data & 0xe0;
}
-READ8_MEMBER( liberatr_state::bitmap_xy_r )
+uint8_t liberatr_state::bitmap_xy_r()
{
return m_videoram[(*m_ycoord << 8) | *m_xcoord];
}
-WRITE8_MEMBER( liberatr_state::bitmap_w )
+void liberatr_state::bitmap_w(offs_t offset, uint8_t data)
{
uint8_t x, y;
diff --git a/src/mame/video/light.cpp b/src/mame/video/light.cpp
index ad23db675be..5847135f462 100644
--- a/src/mame/video/light.cpp
+++ b/src/mame/video/light.cpp
@@ -143,7 +143,7 @@ uint32_t light_video_device::screen_update(screen_device &device, bitmap_rgb32 &
return 0;
}
-READ32_MEMBER(light_video_device::entry_r)
+uint32_t light_video_device::entry_r(offs_t offset, uint32_t mem_mask)
{
uint32_t ret = 0;
switch (offset)
@@ -163,7 +163,7 @@ READ32_MEMBER(light_video_device::entry_r)
return ret;
}
-WRITE32_MEMBER(light_video_device::entry_w)
+void light_video_device::entry_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
bool go = (offset >= REX15_PAGE1_GO/4) || (offset >= REX15_PAGE0_GO/4 && offset < REX15_PAGE1_SET/4);
diff --git a/src/mame/video/light.h b/src/mame/video/light.h
index 82799fc906b..5996affbd1b 100644
--- a/src/mame/video/light.h
+++ b/src/mame/video/light.h
@@ -24,8 +24,8 @@ public:
uint32_t screen_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_READ32_MEMBER(entry_r);
- DECLARE_WRITE32_MEMBER(entry_w);
+ uint32_t entry_r(offs_t offset, uint32_t mem_mask = ~0);
+ void entry_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
static constexpr uint32_t x_res = 1024;
static constexpr uint32_t y_res = 768;
diff --git a/src/mame/video/lkage.cpp b/src/mame/video/lkage.cpp
index 26a198caecc..1dbddf18823 100644
--- a/src/mame/video/lkage.cpp
+++ b/src/mame/video/lkage.cpp
@@ -44,7 +44,7 @@
#include "screen.h"
-WRITE8_MEMBER(lkage_state::lkage_videoram_w)
+void lkage_state::lkage_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
diff --git a/src/mame/video/lockon.cpp b/src/mame/video/lockon.cpp
index bad09c07801..09051177dc3 100644
--- a/src/mame/video/lockon.cpp
+++ b/src/mame/video/lockon.cpp
@@ -23,12 +23,12 @@
*
*************************************/
-READ16_MEMBER(lockon_state::lockon_crtc_r)
+uint16_t lockon_state::lockon_crtc_r()
{
return 0xffff;
}
-WRITE16_MEMBER(lockon_state::lockon_crtc_w)
+void lockon_state::lockon_crtc_w(offs_t offset, uint16_t data)
{
#if 0
data &= 0xff;
@@ -132,7 +132,7 @@ void lockon_state::lockon_palette(palette_device &palette) const
*
*************************************/
-WRITE16_MEMBER(lockon_state::lockon_char_w)
+void lockon_state::lockon_char_w(offs_t offset, uint16_t data)
{
m_char_ram[offset] = data;
m_tilemap->mark_tile_dirty(offset);
@@ -154,12 +154,12 @@ TILE_GET_INFO_MEMBER(lockon_state::get_lockon_tile_info)
*******************************************************************************************/
-WRITE16_MEMBER(lockon_state::lockon_scene_h_scr_w)
+void lockon_state::lockon_scene_h_scr_w(uint16_t data)
{
m_scroll_h = data & 0x1ff;
}
-WRITE16_MEMBER(lockon_state::lockon_scene_v_scr_w)
+void lockon_state::lockon_scene_v_scr_w(uint16_t data)
{
m_scroll_v = data & 0x81ff;
}
@@ -274,7 +274,7 @@ void lockon_state::scene_draw( )
*******************************************************************************************/
-WRITE16_MEMBER(lockon_state::lockon_ground_ctrl_w)
+void lockon_state::lockon_ground_ctrl_w(uint16_t data)
{
m_ground_ctrl = data & 0xff;
}
@@ -598,7 +598,7 @@ void lockon_state::objects_draw( )
}
/* The mechanism used by the object CPU to update the object ASICs palette RAM */
-WRITE16_MEMBER(lockon_state::lockon_tza112_w)
+void lockon_state::lockon_tza112_w(offs_t offset, uint16_t data)
{
if (m_iden)
{
@@ -608,13 +608,13 @@ WRITE16_MEMBER(lockon_state::lockon_tza112_w)
}
}
-READ16_MEMBER(lockon_state::lockon_obj_4000_r)
+uint16_t lockon_state::lockon_obj_4000_r()
{
m_object->set_input_line(NEC_INPUT_LINE_POLL, CLEAR_LINE);
return 0xffff;
}
-WRITE16_MEMBER(lockon_state::lockon_obj_4000_w)
+void lockon_state::lockon_obj_4000_w(uint16_t data)
{
m_iden = data & 1;
}
@@ -642,7 +642,7 @@ WRITE16_MEMBER(lockon_state::lockon_obj_4000_w)
*******************************************************************************************/
-WRITE16_MEMBER(lockon_state::lockon_fb_clut_w)
+void lockon_state::lockon_fb_clut_w(offs_t offset, uint16_t data)
{
rgb_t color;
@@ -651,7 +651,7 @@ WRITE16_MEMBER(lockon_state::lockon_fb_clut_w)
}
/* Rotation control register */
-WRITE16_MEMBER(lockon_state::lockon_rotate_w)
+void lockon_state::lockon_rotate_w(offs_t offset, uint16_t data)
{
switch (offset & 7)
{
diff --git a/src/mame/video/lucky74.cpp b/src/mame/video/lucky74.cpp
index 0472bcbf171..e8cfa329fc0 100644
--- a/src/mame/video/lucky74.cpp
+++ b/src/mame/video/lucky74.cpp
@@ -100,25 +100,25 @@
#include "includes/lucky74.h"
-WRITE8_MEMBER(lucky74_state::lucky74_fg_videoram_w)
+void lucky74_state::lucky74_fg_videoram_w(offs_t offset, uint8_t data)
{
m_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(lucky74_state::lucky74_fg_colorram_w)
+void lucky74_state::lucky74_fg_colorram_w(offs_t offset, uint8_t data)
{
m_fg_colorram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(lucky74_state::lucky74_bg_videoram_w)
+void lucky74_state::lucky74_bg_videoram_w(offs_t offset, uint8_t data)
{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(lucky74_state::lucky74_bg_colorram_w)
+void lucky74_state::lucky74_bg_colorram_w(offs_t offset, uint8_t data)
{
m_bg_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/lvcards.cpp b/src/mame/video/lvcards.cpp
index 3c3819990d7..fc3b4dd0e32 100644
--- a/src/mame/video/lvcards.cpp
+++ b/src/mame/video/lvcards.cpp
@@ -47,13 +47,13 @@ void lvcards_state::lvcards_palette(palette_device &palette) const//Ever so slig
}
}
-WRITE8_MEMBER(lvcards_state::videoram_w)
+void lvcards_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(lvcards_state::colorram_w)
+void lvcards_state::colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/lwings.cpp b/src/mame/video/lwings.cpp
index 3d030a5f7c0..0c5842987c3 100644
--- a/src/mame/video/lwings.cpp
+++ b/src/mame/video/lwings.cpp
@@ -119,37 +119,37 @@ VIDEO_START_MEMBER(lwings_state,avengersb)
***************************************************************************/
-WRITE8_MEMBER(lwings_state::lwings_fgvideoram_w)
+void lwings_state::lwings_fgvideoram_w(offs_t offset, uint8_t data)
{
m_fgvideoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_MEMBER(lwings_state::lwings_bg1videoram_w)
+void lwings_state::lwings_bg1videoram_w(offs_t offset, uint8_t data)
{
m_bg1videoram[offset] = data;
m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_MEMBER(lwings_state::lwings_bg1_scrollx_w)
+void lwings_state::lwings_bg1_scrollx_w(offs_t offset, uint8_t data)
{
m_scroll_x[offset] = data;
m_bg1_tilemap->set_scrollx(0, m_scroll_x[0] | (m_scroll_x[1] << 8));
}
-WRITE8_MEMBER(lwings_state::lwings_bg1_scrolly_w)
+void lwings_state::lwings_bg1_scrolly_w(offs_t offset, uint8_t data)
{
m_scroll_y[offset] = data;
m_bg1_tilemap->set_scrolly(0, m_scroll_y[0] | (m_scroll_y[1] << 8));
}
-WRITE8_MEMBER(lwings_state::trojan_bg2_scrollx_w)
+void lwings_state::trojan_bg2_scrollx_w(uint8_t data)
{
m_bg2_tilemap->set_scrollx(0, data);
}
-WRITE8_MEMBER(lwings_state::trojan_bg2_image_w)
+void lwings_state::trojan_bg2_image_w(uint8_t data)
{
if (m_bg2_image != data)
{
diff --git a/src/mame/video/m107.cpp b/src/mame/video/m107.cpp
index 7b74a5b157c..860af7e4621 100644
--- a/src/mame/video/m107.cpp
+++ b/src/mame/video/m107.cpp
@@ -64,19 +64,17 @@ TILE_GET_INFO_MEMBER(m107_state::get_pf_tile_info)
/*****************************************************************************/
-WRITE16_MEMBER(m107_state::vram_w)
+void m107_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
- int laynum;
-
COMBINE_DATA(&m_vram_data[offset]);
- for (laynum = 0; laynum < 4; laynum++)
+ for (int laynum = 0; laynum < 4; laynum++)
if ((offset & 0x6000) == m_pf_layer[laynum].vram_base)
m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2);
}
/*****************************************************************************/
-WRITE16_MEMBER(m107_state::control_w)
+void m107_state::control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t old = m_control[offset];
pf_layer_info *layer;
@@ -371,7 +369,7 @@ void m107_state::screenrefresh(screen_device &screen, bitmap_ind16 &bitmap, cons
/*****************************************************************************/
-WRITE16_MEMBER(m107_state::spritebuffer_w)
+void m107_state::spritebuffer_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7) {
/*
diff --git a/src/mame/video/m90.cpp b/src/mame/video/m90.cpp
index 7e8b65e486b..c0d3fa21dcb 100644
--- a/src/mame/video/m90.cpp
+++ b/src/mame/video/m90.cpp
@@ -219,7 +219,7 @@ void m90_state::dynablsb_draw_sprites(screen_device &screen, bitmap_ind16 &bitma
}
}
-WRITE16_MEMBER(m90_state::m90_video_w)
+void m90_state::m90_video_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_video_data[offset]);
@@ -235,7 +235,7 @@ WRITE16_MEMBER(m90_state::m90_video_w)
}
}
-WRITE16_MEMBER(m90_state::bootleg_video_w)
+void m90_state::bootleg_video_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_video_data[offset]);
diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp
index ddc8ecae1ad..d04543a4103 100644
--- a/src/mame/video/m92.cpp
+++ b/src/mame/video/m92.cpp
@@ -60,7 +60,7 @@ void m92_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
}
-WRITE16_MEMBER(m92_state::spritecontrol_w)
+void m92_state::spritecontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_spritecontrol[offset]);
// offset0: sprite list size (negative)
@@ -96,7 +96,7 @@ WRITE16_MEMBER(m92_state::spritecontrol_w)
// logerror("%s: spritecontrol_w %08x %08x\n",m_maincpu->pc(),offset,data);
}
-WRITE16_MEMBER(m92_state::videocontrol_w)
+void m92_state::videocontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videocontrol);
/*
@@ -133,12 +133,12 @@ WRITE16_MEMBER(m92_state::videocontrol_w)
// logerror("%s: videocontrol_w %d = %02x\n",m_maincpu->pc(),offset,data);
}
-READ16_MEMBER(m92_state::paletteram_r)
+uint16_t m92_state::paletteram_r(offs_t offset)
{
return m_paletteram[offset | (m_palette_bank << 10)];
}
-WRITE16_MEMBER(m92_state::paletteram_w)
+void m92_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_palette->write16(offset | (m_palette_bank << 10), data, mem_mask);
}
@@ -165,13 +165,11 @@ TILE_GET_INFO_MEMBER(m92_state::get_pf_tile_info)
/*****************************************************************************/
-WRITE16_MEMBER(m92_state::vram_w)
+void m92_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
- int laynum;
-
COMBINE_DATA(&m_vram_data[offset]);
- for (laynum = 0; laynum < 3; laynum++)
+ for (int laynum = 0; laynum < 3; laynum++)
{
if ((offset & 0x6000) == m_pf_layer[laynum].vram_base)
{
@@ -185,7 +183,7 @@ WRITE16_MEMBER(m92_state::vram_w)
/*****************************************************************************/
-WRITE16_MEMBER(m92_state::master_control_w)
+void m92_state::master_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t old = m_pf_master_control[offset];
M92_pf_layer_info *layer;
diff --git a/src/mame/video/mac.cpp b/src/mame/video/mac.cpp
index ea9dbc1f132..12ad7e3af40 100644
--- a/src/mame/video/mac.cpp
+++ b/src/mame/video/mac.cpp
@@ -892,7 +892,7 @@ VIDEO_RESET_MEMBER(mac_state,macdafb)
memset(m_rbv_palette, 0, sizeof(m_rbv_palette));
}
-READ32_MEMBER(mac_state::dafb_r)
+uint32_t mac_state::dafb_r(offs_t offset, uint32_t mem_mask)
{
// if (offset != 0x108/4) printf("DAFB: Read @ %x (mask %x PC=%x)\n", offset*4, mem_mask, m_maincpu->pc());
@@ -923,7 +923,7 @@ READ32_MEMBER(mac_state::dafb_r)
return 0;
}
-WRITE32_MEMBER(mac_state::dafb_w)
+void mac_state::dafb_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// if (offset != 0x10c/4) printf("DAFB: Write %08x @ %x (mask %x PC=%x)\n", data, offset*4, mem_mask, m_maincpu->pc());
@@ -987,14 +987,14 @@ WRITE32_MEMBER(mac_state::dafb_w)
}
}
-READ32_MEMBER(mac_state::dafb_dac_r)
+uint32_t mac_state::dafb_dac_r(offs_t offset, uint32_t mem_mask)
{
// printf("DAFB: Read DAC @ %x (mask %x PC=%x)\n", offset*4, mem_mask, m_maincpu->pc());
return 0;
}
-WRITE32_MEMBER(mac_state::dafb_dac_w)
+void mac_state::dafb_dac_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// if ((offset > 0) && (offset != 0x10/4)) printf("DAFB: Write %08x to DAC @ %x (mask %x PC=%x)\n", data, offset*4, mem_mask, m_maincpu->pc());
@@ -1180,7 +1180,7 @@ uint32_t mac_state::screen_update_macpbwd(screen_device &screen, bitmap_rgb32 &b
return 0;
}
-READ32_MEMBER(mac_state::macwd_r)
+uint32_t mac_state::macwd_r(offs_t offset, uint32_t mem_mask)
{
switch (offset)
{
@@ -1201,7 +1201,7 @@ READ32_MEMBER(mac_state::macwd_r)
return 0;
}
-WRITE32_MEMBER(mac_state::macwd_w)
+void mac_state::macwd_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
switch (offset)
{
diff --git a/src/mame/video/macrossp.cpp b/src/mame/video/macrossp.cpp
index 40fc8880978..d2d13850959 100644
--- a/src/mame/video/macrossp.cpp
+++ b/src/mame/video/macrossp.cpp
@@ -36,7 +36,7 @@ Interesting test cases (macrossp, quizmoon doesn't use tilemap zoom):
/*** SCR A LAYER ***/
-WRITE32_MEMBER(macrossp_state::macrossp_scra_videoram_w)
+void macrossp_state::macrossp_scra_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_scra_videoram[offset]);
@@ -71,7 +71,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scra_tile_info)
/*** SCR B LAYER ***/
-WRITE32_MEMBER(macrossp_state::macrossp_scrb_videoram_w)
+void macrossp_state::macrossp_scrb_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_scrb_videoram[offset]);
@@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrb_tile_info)
/*** SCR C LAYER ***/
-WRITE32_MEMBER(macrossp_state::macrossp_scrc_videoram_w)
+void macrossp_state::macrossp_scrc_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_scrc_videoram[offset]);
@@ -141,7 +141,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrc_tile_info)
/*** TEXT LAYER ***/
-WRITE32_MEMBER(macrossp_state::macrossp_text_videoram_w)
+void macrossp_state::macrossp_text_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_text_videoram[offset]);
diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp
index 98875062526..2438cf24cc9 100644
--- a/src/mame/video/mb60553.cpp
+++ b/src/mame/video/mb60553.cpp
@@ -289,7 +289,7 @@ void mb60553_zooming_tilemap_device::draw( screen_device &screen, bitmap_ind16&
}
}
-WRITE16_MEMBER(mb60553_zooming_tilemap_device::regs_w)
+void mb60553_zooming_tilemap_device::regs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t oldreg = m_regs[offset];
@@ -299,30 +299,30 @@ WRITE16_MEMBER(mb60553_zooming_tilemap_device::regs_w)
reg_written(offset);
}
-WRITE16_MEMBER(mb60553_zooming_tilemap_device::vram_w)
+void mb60553_zooming_tilemap_device::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram[offset]);
m_tmap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(mb60553_zooming_tilemap_device::line_w)
+void mb60553_zooming_tilemap_device::line_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_lineram[offset]);
}
-READ16_MEMBER(mb60553_zooming_tilemap_device::regs_r)
+uint16_t mb60553_zooming_tilemap_device::regs_r(offs_t offset)
{
return m_regs[offset];
}
-READ16_MEMBER(mb60553_zooming_tilemap_device::vram_r)
+uint16_t mb60553_zooming_tilemap_device::vram_r(offs_t offset)
{
return m_vram[offset];
}
-READ16_MEMBER(mb60553_zooming_tilemap_device::line_r)
+uint16_t mb60553_zooming_tilemap_device::line_r(offs_t offset)
{
return m_lineram[offset];
}
diff --git a/src/mame/video/mb60553.h b/src/mame/video/mb60553.h
index 5783b9b4729..80b3758289d 100644
--- a/src/mame/video/mb60553.h
+++ b/src/mame/video/mb60553.h
@@ -24,13 +24,13 @@ public:
TILEMAP_MAPPER_MEMBER(twc94_scan);
- DECLARE_WRITE16_MEMBER(regs_w);
- DECLARE_WRITE16_MEMBER(vram_w);
- DECLARE_WRITE16_MEMBER(line_w);
+ void regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void line_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(regs_r);
- DECLARE_READ16_MEMBER(vram_r);
- DECLARE_READ16_MEMBER(line_r);
+ uint16_t regs_r(offs_t offset);
+ uint16_t vram_r(offs_t offset);
+ uint16_t line_r(offs_t offset);
protected:
virtual void device_start() override;
diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp
index a6c394a40cb..294bc7cabf8 100644
--- a/src/mame/video/mcd212.cpp
+++ b/src/mame/video/mcd212.cpp
@@ -1231,7 +1231,7 @@ void mcd212_device::draw_scanline(int y)
draw_cursor(scanline, y);
}
-READ16_MEMBER( mcd212_device::regs_r )
+uint16_t mcd212_device::regs_r(offs_t offset, uint16_t mem_mask)
{
uint8_t channel = 1 - (offset / 8);
@@ -1284,7 +1284,7 @@ READ16_MEMBER( mcd212_device::regs_r )
return 0;
}
-WRITE16_MEMBER( mcd212_device::regs_w )
+void mcd212_device::regs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch(offset)
{
diff --git a/src/mame/video/mcd212.h b/src/mame/video/mcd212.h
index bc5ed25a163..1701c36cd94 100644
--- a/src/mame/video/mcd212.h
+++ b/src/mame/video/mcd212.h
@@ -129,8 +129,8 @@ public:
template <typename... T> void set_scanline_callback(T &&... args) { m_scanline_callback.set(std::forward<T>(args)...); }
// device members
- DECLARE_READ16_MEMBER( regs_r );
- DECLARE_WRITE16_MEMBER( regs_w );
+ uint16_t regs_r(offs_t offset, uint16_t mem_mask = ~0);
+ void regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TIMER_CALLBACK_MEMBER( perform_scan );
bitmap_rgb32& get_bitmap() { return m_bitmap; }
diff --git a/src/mame/video/mcr68.cpp b/src/mame/video/mcr68.cpp
index de5d85fbd73..19af9f2d6e3 100644
--- a/src/mame/video/mcr68.cpp
+++ b/src/mame/video/mcr68.cpp
@@ -53,10 +53,9 @@ VIDEO_START_MEMBER(mcr68_state,mcr68)
*
*************************************/
-WRITE16_MEMBER(mcr68_state::mcr68_videoram_w)
+void mcr68_state::mcr68_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
- uint16_t *videoram = m_videoram;
- COMBINE_DATA(&videoram[offset]);
+ COMBINE_DATA(&m_videoram[offset]);
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp
index 18868e4a545..8a6f6a30d3d 100644
--- a/src/mame/video/megasys1.cpp
+++ b/src/mame/video/megasys1.cpp
@@ -235,28 +235,28 @@ VIDEO_START_MEMBER(megasys1_state,megasys1_z)
***************************************************************************/
-WRITE16_MEMBER(megasys1_state::active_layers_w)
+void megasys1_state::active_layers_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_active_layers);
m_screen->update_partial(m_screen->vpos());
}
-WRITE16_MEMBER(megasys1_state::sprite_bank_w)
+void megasys1_state::sprite_bank_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_sprite_bank);
}
-READ16_MEMBER(megasys1_state::sprite_flag_r)
+u16 megasys1_state::sprite_flag_r()
{
return m_sprite_flag;
}
-WRITE16_MEMBER(megasys1_state::sprite_flag_w)
+void megasys1_state::sprite_flag_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_sprite_flag);
}
-WRITE16_MEMBER(megasys1_state::screen_flag_w)
+void megasys1_state::screen_flag_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_screen_flag);
@@ -269,39 +269,39 @@ WRITE16_MEMBER(megasys1_state::screen_flag_w)
}
}
-WRITE16_MEMBER(megasys1_state::soundlatch_w)
+void megasys1_state::soundlatch_w(u16 data)
{
m_soundlatch[0]->write(data);
m_audiocpu->set_input_line(4, HOLD_LINE);
}
-WRITE16_MEMBER(megasys1_state::soundlatch_z_w)
+void megasys1_state::soundlatch_z_w(u16 data)
{
m_soundlatch[0]->write(data & 0xff);
m_audiocpu->set_input_line(5, HOLD_LINE);
}
-WRITE16_MEMBER(megasys1_state::soundlatch_c_w)
+void megasys1_state::soundlatch_c_w(u16 data)
{
// Cybattler reads sound latch on irq 2
m_soundlatch[0]->write(data);
m_audiocpu->set_input_line(2, HOLD_LINE);
}
-WRITE16_MEMBER(megasys1_state::monkelf_scroll0_w)
+void megasys1_state::monkelf_scroll0_w(offs_t offset, u16 data, u16 mem_mask)
{
// code in routine $280 does this. protection?
if (offset == 0)
data = data - (((data & 0x0f) > 0x0d) ? 0x10 : 0);
- m_tmap[0]->scroll_w(space, offset, data, mem_mask);
+ m_tmap[0]->scroll_w(offset, data, mem_mask);
}
-WRITE16_MEMBER(megasys1_state::monkelf_scroll1_w)
+void megasys1_state::monkelf_scroll1_w(offs_t offset, u16 data, u16 mem_mask)
{
// code in routine $280 does this. protection?
if (offset == 0)
data = data - (((data & 0x0f) > 0x0b) ? 0x10 : 0);
- m_tmap[1]->scroll_w(space, offset, data, mem_mask);
+ m_tmap[1]->scroll_w(offset, data, mem_mask);
}
diff --git a/src/mame/video/metro.cpp b/src/mame/video/metro.cpp
index 7847b40ddad..03c918b4b05 100644
--- a/src/mame/video/metro.cpp
+++ b/src/mame/video/metro.cpp
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(metro_state::k053936_gstrik2_get_tile_info)
0);
}
-WRITE16_MEMBER(metro_state::k053936_w)
+void metro_state::k053936_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_k053936_ram[offset]);
m_k053936_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/micro3d.cpp b/src/mame/video/micro3d.cpp
index 7efaae37aca..79e9422b9e2 100644
--- a/src/mame/video/micro3d.cpp
+++ b/src/mame/video/micro3d.cpp
@@ -105,7 +105,7 @@ TMS340X0_SCANLINE_IND16_CB_MEMBER(micro3d_state::scanline_update)
}
}
-WRITE16_MEMBER(micro3d_state::micro3d_creg_w)
+void micro3d_state::micro3d_creg_w(uint16_t data)
{
if (~data & 0x80)
m_vgb->set_input_line(0, CLEAR_LINE);
@@ -113,7 +113,7 @@ WRITE16_MEMBER(micro3d_state::micro3d_creg_w)
m_creg = data;
}
-WRITE16_MEMBER(micro3d_state::micro3d_xfer3dk_w)
+void micro3d_state::micro3d_xfer3dk_w(uint16_t data)
{
m_xfer3dk = data;
}
@@ -620,7 +620,7 @@ bc000000-1fc DPRAM address for read access
******************************************************************************/
-WRITE32_MEMBER(micro3d_state::micro3d_fifo_w)
+void micro3d_state::micro3d_fifo_w(uint32_t data)
{
uint32_t opcode = data >> 24;
@@ -720,12 +720,12 @@ WRITE32_MEMBER(micro3d_state::micro3d_fifo_w)
}
}
-WRITE32_MEMBER(micro3d_state::micro3d_alt_fifo_w)
+void micro3d_state::micro3d_alt_fifo_w(uint32_t data)
{
m_vtx_fifo[m_fifo_idx++] = VTX_SEX(data);
}
-READ32_MEMBER(micro3d_state::micro3d_pipe_r)
+uint32_t micro3d_state::micro3d_pipe_r()
{
m_drmath->set_input_line(AM29000_INTR1, CLEAR_LINE);
return m_pipe_data;
diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp
index 92b41097f8a..afea37e9f7c 100644
--- a/src/mame/video/midtunit.cpp
+++ b/src/mame/video/midtunit.cpp
@@ -227,7 +227,7 @@ void midxunit_video_device::device_start()
*
*************************************/
-READ16_MEMBER(midtunit_video_device::midtunit_gfxrom_r)
+uint16_t midtunit_video_device::midtunit_gfxrom_r(offs_t offset)
{
uint8_t *base = m_gfxrom->base() + m_gfxbank_offset[(offset >> 21) & 1];
offset = (offset & 0x01fffff) * 2;
@@ -235,7 +235,7 @@ READ16_MEMBER(midtunit_video_device::midtunit_gfxrom_r)
}
-READ16_MEMBER(midwunit_video_device::midwunit_gfxrom_r)
+uint16_t midwunit_video_device::midwunit_gfxrom_r(offs_t offset)
{
uint8_t *base = m_gfxrom->base() + m_gfxbank_offset[0];
offset *= 2;
@@ -250,7 +250,7 @@ READ16_MEMBER(midwunit_video_device::midwunit_gfxrom_r)
*
*************************************/
-WRITE16_MEMBER(midtunit_video_device::midtunit_vram_w)
+void midtunit_video_device::midtunit_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset *= 2;
if (m_videobank_select)
@@ -270,7 +270,7 @@ WRITE16_MEMBER(midtunit_video_device::midtunit_vram_w)
}
-WRITE16_MEMBER(midtunit_video_device::midtunit_vram_data_w)
+void midtunit_video_device::midtunit_vram_data_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset *= 2;
if (ACCESSING_BITS_0_7)
@@ -280,7 +280,7 @@ WRITE16_MEMBER(midtunit_video_device::midtunit_vram_data_w)
}
-WRITE16_MEMBER(midtunit_video_device::midtunit_vram_color_w)
+void midtunit_video_device::midtunit_vram_color_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset *= 2;
if (ACCESSING_BITS_0_7)
@@ -290,7 +290,7 @@ WRITE16_MEMBER(midtunit_video_device::midtunit_vram_color_w)
}
-READ16_MEMBER(midtunit_video_device::midtunit_vram_r)
+uint16_t midtunit_video_device::midtunit_vram_r(offs_t offset)
{
offset *= 2;
if (m_videobank_select)
@@ -300,14 +300,14 @@ READ16_MEMBER(midtunit_video_device::midtunit_vram_r)
}
-READ16_MEMBER(midtunit_video_device::midtunit_vram_data_r)
+uint16_t midtunit_video_device::midtunit_vram_data_r(offs_t offset)
{
offset *= 2;
return (m_local_videoram[offset] & 0x00ff) | (m_local_videoram[offset + 1] << 8);
}
-READ16_MEMBER(midtunit_video_device::midtunit_vram_color_r)
+uint16_t midtunit_video_device::midtunit_vram_color_r(offs_t offset)
{
offset *= 2;
return (m_local_videoram[offset] >> 8) | (m_local_videoram[offset + 1] & 0xff00);
@@ -340,7 +340,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(midtunit_video_device::from_shiftreg)
*
*************************************/
-WRITE16_MEMBER(midtunit_video_device::midtunit_control_w)
+void midtunit_video_device::midtunit_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/*
other important bits:
@@ -361,7 +361,7 @@ WRITE16_MEMBER(midtunit_video_device::midtunit_control_w)
}
-WRITE16_MEMBER(midwunit_video_device::midwunit_control_w)
+void midwunit_video_device::midwunit_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/*
other important bits:
@@ -379,7 +379,7 @@ WRITE16_MEMBER(midwunit_video_device::midwunit_control_w)
}
-READ16_MEMBER(midwunit_video_device::midwunit_control_r)
+uint16_t midwunit_video_device::midwunit_control_r()
{
return m_midtunit_control;
}
@@ -392,14 +392,14 @@ READ16_MEMBER(midwunit_video_device::midwunit_control_r)
*
*************************************/
-WRITE16_MEMBER(midxunit_video_device::midxunit_paletteram_w)
+void midxunit_video_device::midxunit_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (!(offset & 1))
m_palette->write16(offset / 2, data, mem_mask);
}
-READ16_MEMBER(midxunit_video_device::midxunit_paletteram_r)
+uint16_t midxunit_video_device::midxunit_paletteram_r(offs_t offset)
{
return m_palette->read16(offset / 2);
}
@@ -637,7 +637,7 @@ void midtunit_video_device::device_timer(emu_timer &timer, device_timer_id id, i
*
*************************************/
-READ16_MEMBER(midtunit_video_device::midtunit_dma_r)
+uint16_t midtunit_video_device::midtunit_dma_r(offs_t offset)
{
/* rmpgwt sometimes reads register 0, expecting it to return the */
/* current DMA status; thus we map register 0 to register 1 */
@@ -694,7 +694,7 @@ READ16_MEMBER(midtunit_video_device::midtunit_dma_r)
* | ----------2----- | select top/bottom or left/right for reg 12/13
*/
-WRITE16_MEMBER(midtunit_video_device::midtunit_dma_w)
+void midtunit_video_device::midtunit_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
static const uint8_t register_map[2][16] =
{
diff --git a/src/mame/video/midtunit.h b/src/mame/video/midtunit.h
index 5282e91aa7d..0072e580f3f 100644
--- a/src/mame/video/midtunit.h
+++ b/src/mame/video/midtunit.h
@@ -37,18 +37,18 @@ public:
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update);
- DECLARE_READ16_MEMBER(midtunit_vram_r);
- DECLARE_WRITE16_MEMBER(midtunit_vram_w);
- DECLARE_READ16_MEMBER(midtunit_gfxrom_r);
- DECLARE_WRITE16_MEMBER(midtunit_vram_data_w);
- DECLARE_WRITE16_MEMBER(midtunit_vram_color_w);
- DECLARE_READ16_MEMBER(midtunit_vram_data_r);
- DECLARE_READ16_MEMBER(midtunit_vram_color_r);
+ uint16_t midtunit_vram_r(offs_t offset);
+ void midtunit_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midtunit_gfxrom_r(offs_t offset);
+ void midtunit_vram_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midtunit_vram_color_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midtunit_vram_data_r(offs_t offset);
+ uint16_t midtunit_vram_color_r(offs_t offset);
- DECLARE_READ16_MEMBER(midtunit_dma_r);
- DECLARE_WRITE16_MEMBER(midtunit_dma_w);
+ uint16_t midtunit_dma_r(offs_t offset);
+ void midtunit_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_WRITE16_MEMBER(midtunit_control_w);
+ void midtunit_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void set_gfx_rom_large(bool gfx_rom_large) { m_gfx_rom_large = gfx_rom_large; }
@@ -193,10 +193,10 @@ public:
}
midwunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
- DECLARE_READ16_MEMBER(midwunit_gfxrom_r);
+ uint16_t midwunit_gfxrom_r(offs_t offset);
- DECLARE_WRITE16_MEMBER(midwunit_control_w);
- DECLARE_READ16_MEMBER(midwunit_control_r);
+ void midwunit_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midwunit_control_r();
protected:
midwunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0);
@@ -222,8 +222,8 @@ public:
midxunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
- DECLARE_WRITE16_MEMBER(midxunit_paletteram_w);
- DECLARE_READ16_MEMBER(midxunit_paletteram_r);
+ void midxunit_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t midxunit_paletteram_r(offs_t offset);
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update);
diff --git a/src/mame/video/midvunit.cpp b/src/mame/video/midvunit.cpp
index 2cc60de8c5e..53c51aa6e31 100644
--- a/src/mame/video/midvunit.cpp
+++ b/src/mame/video/midvunit.cpp
@@ -376,7 +376,7 @@ void midvunit_renderer::process_dma_queue()
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_dma_queue_w)
+void midvunit_state::midvunit_dma_queue_w(uint32_t data)
{
if (LOG_DMA && machine().input().code_pressed(KEYCODE_L))
logerror("%06X:queue(%X) = %08X\n", m_maincpu->pc(), m_dma_data_index, data);
@@ -385,14 +385,14 @@ WRITE32_MEMBER(midvunit_state::midvunit_dma_queue_w)
}
-READ32_MEMBER(midvunit_state::midvunit_dma_queue_entries_r)
+uint32_t midvunit_state::midvunit_dma_queue_entries_r()
{
/* always return 0 entries */
return 0;
}
-READ32_MEMBER(midvunit_state::midvunit_dma_trigger_r)
+uint32_t midvunit_state::midvunit_dma_trigger_r(offs_t offset)
{
if (offset)
{
@@ -412,7 +412,7 @@ READ32_MEMBER(midvunit_state::midvunit_dma_trigger_r)
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_page_control_w)
+void midvunit_state::midvunit_page_control_w(uint32_t data)
{
/* watch for the display page to change */
if ((m_page_control ^ data) & 1)
@@ -426,7 +426,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_page_control_w)
}
-READ32_MEMBER(midvunit_state::midvunit_page_control_r)
+uint32_t midvunit_state::midvunit_page_control_r()
{
return m_page_control;
}
@@ -439,7 +439,7 @@ READ32_MEMBER(midvunit_state::midvunit_page_control_r)
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_video_control_w)
+void midvunit_state::midvunit_video_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint16_t old = m_video_regs[offset];
@@ -465,7 +465,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_video_control_w)
}
-READ32_MEMBER(midvunit_state::midvunit_scanline_r)
+uint32_t midvunit_state::midvunit_scanline_r()
{
return m_screen->vpos();
}
@@ -478,7 +478,7 @@ READ32_MEMBER(midvunit_state::midvunit_scanline_r)
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_videoram_w)
+void midvunit_state::midvunit_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
m_poly->wait("Video RAM write");
if (!m_video_changed)
@@ -491,7 +491,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_videoram_w)
}
-READ32_MEMBER(midvunit_state::midvunit_videoram_r)
+uint32_t midvunit_state::midvunit_videoram_r(offs_t offset)
{
m_poly->wait("Video RAM read");
return m_videoram[offset];
@@ -505,7 +505,7 @@ READ32_MEMBER(midvunit_state::midvunit_videoram_r)
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_paletteram_w)
+void midvunit_state::midvunit_paletteram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
int newword;
@@ -522,7 +522,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_paletteram_w)
*
*************************************/
-WRITE32_MEMBER(midvunit_state::midvunit_textureram_w)
+void midvunit_state::midvunit_textureram_w(offs_t offset, uint32_t data)
{
uint8_t *base = (uint8_t *)m_textureram.target();
m_poly->wait("Texture RAM write");
@@ -531,7 +531,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_textureram_w)
}
-READ32_MEMBER(midvunit_state::midvunit_textureram_r)
+uint32_t midvunit_state::midvunit_textureram_r(offs_t offset)
{
uint8_t *base = (uint8_t *)m_textureram.target();
return (base[offset * 2 + 1] << 8) | base[offset * 2];
diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp
index 123fef5ca2b..fe3233e827f 100644
--- a/src/mame/video/midyunit.cpp
+++ b/src/mame/video/midyunit.cpp
@@ -122,7 +122,7 @@ VIDEO_START_MEMBER(midyunit_state,midzunit)
*
*************************************/
-READ16_MEMBER(midyunit_state::midyunit_gfxrom_r)
+uint16_t midyunit_state::midyunit_gfxrom_r(offs_t offset)
{
offset *= 2;
if (m_palette_mask == 0x00ff)
@@ -140,7 +140,7 @@ READ16_MEMBER(midyunit_state::midyunit_gfxrom_r)
*
*************************************/
-WRITE16_MEMBER(midyunit_state::midyunit_vram_w)
+void midyunit_state::midyunit_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset *= 2;
if (m_videobank_select)
@@ -160,7 +160,7 @@ WRITE16_MEMBER(midyunit_state::midyunit_vram_w)
}
-READ16_MEMBER(midyunit_state::midyunit_vram_r)
+uint16_t midyunit_state::midyunit_vram_r(offs_t offset)
{
offset *= 2;
if (m_videobank_select)
@@ -196,7 +196,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(midyunit_state::from_shiftreg)
*
*************************************/
-WRITE16_MEMBER(midyunit_state::midyunit_control_w)
+void midyunit_state::midyunit_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/*
* Narc system register
@@ -233,7 +233,7 @@ WRITE16_MEMBER(midyunit_state::midyunit_control_w)
*
*************************************/
-WRITE16_MEMBER(midyunit_state::midyunit_paletteram_w)
+void midyunit_state::midyunit_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int newword;
@@ -390,7 +390,7 @@ TIMER_CALLBACK_MEMBER(midyunit_state::dma_callback)
*
*************************************/
-READ16_MEMBER(midyunit_state::midyunit_dma_r)
+uint16_t midyunit_state::midyunit_dma_r(offs_t offset)
{
return m_dma_register[offset];
}
@@ -428,7 +428,7 @@ READ16_MEMBER(midyunit_state::midyunit_dma_r)
* 9 | xxxxxxxxxxxxxxxx | color
*/
-WRITE16_MEMBER(midyunit_state::midyunit_dma_w)
+void midyunit_state::midyunit_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
struct dma_state_t &dma_state = m_dma_state;
uint32_t gfxoffset;
diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp
index 5e069383921..093a3172fc8 100644
--- a/src/mame/video/midzeus.cpp
+++ b/src/mame/video/midzeus.cpp
@@ -327,7 +327,7 @@ uint32_t midzeus_state::screen_update_midzeus(screen_device &screen, bitmap_ind1
*
*************************************/
-READ32_MEMBER(midzeus_state::zeus_r)
+uint32_t midzeus_state::zeus_r(offs_t offset)
{
bool logit = (offset < 0xb0 || offset > 0xb7);
uint32_t result = m_zeusbase[offset & ~1];
@@ -397,7 +397,7 @@ READ32_MEMBER(midzeus_state::zeus_r)
*
*************************************/
-WRITE32_MEMBER(midzeus_state::zeus_w)
+void midzeus_state::zeus_w(offs_t offset, uint32_t data)
{
bool logit = m_zeus_enable_logging || ((offset < 0xb0 || offset > 0xb7) && (offset < 0xe0 || offset > 0xe1));
diff --git a/src/mame/video/model1.cpp b/src/mame/video/model1.cpp
index 1e88b22ec4f..9d4c8d428da 100644
--- a/src/mame/video/model1.cpp
+++ b/src/mame/video/model1.cpp
@@ -1231,7 +1231,7 @@ void model1_state::end_frame()
m_listctl[0] ^= 0x40;
}
-READ16_MEMBER(model1_state::model1_listctl_r)
+u16 model1_state::model1_listctl_r(offs_t offset)
{
if(!offset)
return m_listctl[0] | 0x30;
@@ -1239,7 +1239,7 @@ READ16_MEMBER(model1_state::model1_listctl_r)
return m_listctl[1];
}
-WRITE16_MEMBER(model1_state::model1_listctl_w)
+void model1_state::model1_listctl_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(m_listctl + offset);
LOG_TGP(("VIDEO: control=%08x\n", (m_listctl[1] << 16) | m_listctl[0]));
diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp
index c25785d28fc..427db401050 100644
--- a/src/mame/video/model2.cpp
+++ b/src/mame/video/model2.cpp
@@ -164,11 +164,11 @@ static inline void apply_focus( geo_state *geo, poly_vertex *p0)
}
/* 1.8.23 float to 4.12 float converter, courtesy of Aaron Giles */
-inline uint16_t model2_state::float_to_zval( float floatval )
+inline u16 model2_state::float_to_zval( float floatval )
{
int32_t fpint = f2u(floatval);
int32_t exponent = ((fpint >> 23) & 0xff) - 127;
- uint32_t mantissa = fpint & 0x7fffff;
+ u32 mantissa = fpint & 0x7fffff;
/* round the low bits and reduce to 12 */
mantissa += 0x400;
@@ -237,8 +237,8 @@ static int32_t clip_polygon(poly_vertex *v, int32_t num_vertices, poly_vertex *v
out[outcount].x = cur->x + ((v[nextvert].x - cur->x) * scale);
out[outcount].y = cur->y + ((v[nextvert].y - cur->y) * scale);
out[outcount].pz = cur->pz + ((v[nextvert].pz - cur->pz) * scale);
- out[outcount].pu = (uint16_t)((float)cur->pu + (((float)v[nextvert].pu - (float)cur->pu) * scale));
- out[outcount].pv = (uint16_t)((float)cur->pv + (((float)v[nextvert].pv - (float)cur->pv) * scale));
+ out[outcount].pu = (u16)((float)cur->pu + (((float)v[nextvert].pu - (float)cur->pu) * scale));
+ out[outcount].pv = (u16)((float)cur->pv + (((float)v[nextvert].pv - (float)cur->pv) * scale));
outcount++;
}