summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-06-08 17:17:27 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-06-08 17:17:27 +0200
commit65d282d19ed5985d8e9925cdf5cb168e5f4aa09d (patch)
treecb0f2d561c22d547fe398839cbcfb36341512ad4 /src
parentddc7ec4db26d6cc88330a96006643878dc42ce8c (diff)
drivers starting with c and d: completed read* and write* macros removal (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/powerpc/ppc.h8
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp8
-rw-r--r--src/mame/audio/canyon.cpp6
-rw-r--r--src/mame/audio/carnival.cpp4
-rw-r--r--src/mame/audio/cchasm.cpp12
-rw-r--r--src/mame/audio/cinemat.cpp2
-rw-r--r--src/mame/audio/crbaloon.cpp6
-rw-r--r--src/mame/audio/dcs.cpp73
-rw-r--r--src/mame/audio/dcs.h54
-rw-r--r--src/mame/audio/depthch.cpp2
-rw-r--r--src/mame/audio/dkong.cpp2
-rw-r--r--src/mame/drivers/cabal.cpp14
-rw-r--r--src/mame/drivers/canyon.cpp6
-rw-r--r--src/mame/drivers/capbowl.cpp10
-rw-r--r--src/mame/drivers/cbasebal.cpp16
-rw-r--r--src/mame/drivers/ccastles.cpp10
-rw-r--r--src/mame/drivers/cdi.cpp4
-rw-r--r--src/mame/drivers/centiped.cpp32
-rw-r--r--src/mame/drivers/cgc7900.cpp20
-rw-r--r--src/mame/drivers/chaknpop.cpp4
-rw-r--r--src/mame/drivers/champbas.cpp2
-rw-r--r--src/mame/drivers/changela.cpp18
-rw-r--r--src/mame/drivers/channelf.cpp16
-rw-r--r--src/mame/drivers/chqflag.cpp14
-rw-r--r--src/mame/drivers/cinemat.cpp26
-rw-r--r--src/mame/drivers/circusc.cpp10
-rw-r--r--src/mame/drivers/cischeat.cpp40
-rw-r--r--src/mame/drivers/citycon.cpp4
-rw-r--r--src/mame/drivers/clcd.cpp44
-rw-r--r--src/mame/drivers/cloak.cpp8
-rw-r--r--src/mame/drivers/cloud9.cpp8
-rw-r--r--src/mame/drivers/clshroad.cpp2
-rw-r--r--src/mame/drivers/cninja.cpp26
-rw-r--r--src/mame/drivers/coinmvga.cpp4
-rw-r--r--src/mame/drivers/coleco.cpp20
-rw-r--r--src/mame/drivers/combatsc.cpp51
-rw-r--r--src/mame/drivers/comquest.cpp4
-rw-r--r--src/mame/drivers/comx35.cpp10
-rw-r--r--src/mame/drivers/contra.cpp8
-rw-r--r--src/mame/drivers/coolpool.cpp22
-rw-r--r--src/mame/drivers/cop01.cpp8
-rw-r--r--src/mame/drivers/copsnrob.cpp4
-rw-r--r--src/mame/drivers/cosmic.cpp30
-rw-r--r--src/mame/drivers/cosmicos.cpp25
-rw-r--r--src/mame/drivers/cps1.cpp78
-rw-r--r--src/mame/drivers/cps2.cpp20
-rw-r--r--src/mame/drivers/cps3.cpp48
-rw-r--r--src/mame/drivers/crbaloon.cpp16
-rw-r--r--src/mame/drivers/crgolf.cpp22
-rw-r--r--src/mame/drivers/crimfght.cpp8
-rw-r--r--src/mame/drivers/crshrace.cpp2
-rw-r--r--src/mame/drivers/cvs.cpp50
-rw-r--r--src/mame/drivers/cxhumax.cpp112
-rw-r--r--src/mame/drivers/cyberbal.cpp4
-rw-r--r--src/mame/drivers/cybiko.cpp18
-rw-r--r--src/mame/drivers/cybstorm.cpp4
-rw-r--r--src/mame/drivers/darkmist.cpp2
-rw-r--r--src/mame/drivers/darkseal.cpp2
-rw-r--r--src/mame/drivers/dassault.cpp12
-rw-r--r--src/mame/drivers/dbz.cpp8
-rw-r--r--src/mame/drivers/dccons.cpp16
-rw-r--r--src/mame/drivers/dcheese.cpp10
-rw-r--r--src/mame/drivers/ddragon.cpp26
-rw-r--r--src/mame/drivers/ddragon3.cpp20
-rw-r--r--src/mame/drivers/ddribble.cpp12
-rw-r--r--src/mame/drivers/deadang.cpp8
-rw-r--r--src/mame/drivers/dec0.cpp30
-rw-r--r--src/mame/drivers/dec8.cpp45
-rw-r--r--src/mame/drivers/deco_mlc.cpp32
-rw-r--r--src/mame/drivers/decocass.cpp26
-rw-r--r--src/mame/drivers/dietgo.cpp4
-rw-r--r--src/mame/drivers/divebomb.cpp10
-rw-r--r--src/mame/drivers/djboy.cpp12
-rw-r--r--src/mame/drivers/djmain.cpp34
-rw-r--r--src/mame/drivers/dkong.cpp48
-rw-r--r--src/mame/drivers/dm7000.cpp32
-rw-r--r--src/mame/drivers/docastle.cpp4
-rw-r--r--src/mame/drivers/dogfgt.cpp8
-rw-r--r--src/mame/drivers/dragrace.cpp6
-rw-r--r--src/mame/drivers/drgnmst.cpp6
-rw-r--r--src/mame/drivers/drmicro.cpp4
-rw-r--r--src/mame/drivers/dynax.cpp82
-rw-r--r--src/mame/drivers/fcrash.cpp6
-rw-r--r--src/mame/drivers/galaga.cpp4
-rw-r--r--src/mame/drivers/galaxia.cpp2
-rw-r--r--src/mame/drivers/vicdual.cpp6
-rw-r--r--src/mame/includes/cabal.h20
-rw-r--r--src/mame/includes/calomega.h4
-rw-r--r--src/mame/includes/canyon.h12
-rw-r--r--src/mame/includes/capbowl.h18
-rw-r--r--src/mame/includes/carpolo.h28
-rw-r--r--src/mame/includes/cbasebal.h22
-rw-r--r--src/mame/includes/ccastles.h26
-rw-r--r--src/mame/includes/cchasm.h16
-rw-r--r--src/mame/includes/cdi.h4
-rw-r--r--src/mame/includes/centiped.h44
-rw-r--r--src/mame/includes/cgc7900.h58
-rw-r--r--src/mame/includes/chaknpop.h12
-rw-r--r--src/mame/includes/champbas.h4
-rw-r--r--src/mame/includes/changela.h28
-rw-r--r--src/mame/includes/channelf.h16
-rw-r--r--src/mame/includes/cheekyms.h4
-rw-r--r--src/mame/includes/chqflag.h14
-rw-r--r--src/mame/includes/cinemat.h20
-rw-r--r--src/mame/includes/circusc.h10
-rw-r--r--src/mame/includes/cischeat.h76
-rw-r--r--src/mame/includes/citycon.h10
-rw-r--r--src/mame/includes/cloak.h18
-rw-r--r--src/mame/includes/cloud9.h18
-rw-r--r--src/mame/includes/clshroad.h6
-rw-r--r--src/mame/includes/cninja.h24
-rw-r--r--src/mame/includes/coleco.h23
-rw-r--r--src/mame/includes/combatsc.h46
-rw-r--r--src/mame/includes/commando.h14
-rw-r--r--src/mame/includes/comx35.h10
-rw-r--r--src/mame/includes/concept.h4
-rw-r--r--src/mame/includes/contra.h24
-rw-r--r--src/mame/includes/coolpool.h18
-rw-r--r--src/mame/includes/cop01.h18
-rw-r--r--src/mame/includes/copsnrob.h4
-rw-r--r--src/mame/includes/cosmic.h26
-rw-r--r--src/mame/includes/cosmicos.h22
-rw-r--r--src/mame/includes/cps1.h86
-rw-r--r--src/mame/includes/cps3.h48
-rw-r--r--src/mame/includes/crbaloon.h16
-rw-r--r--src/mame/includes/crgolf.h20
-rw-r--r--src/mame/includes/crimfght.h8
-rw-r--r--src/mame/includes/crshrace.h10
-rw-r--r--src/mame/includes/cvs.h52
-rw-r--r--src/mame/includes/cxhumax.h142
-rw-r--r--src/mame/includes/cyberbal.h4
-rw-r--r--src/mame/includes/cybiko.h32
-rw-r--r--src/mame/includes/cybstorm.h4
-rw-r--r--src/mame/includes/dai.h14
-rw-r--r--src/mame/includes/darkmist.h4
-rw-r--r--src/mame/includes/darkseal.h6
-rw-r--r--src/mame/includes/dassault.h12
-rw-r--r--src/mame/includes/dbz.h10
-rw-r--r--src/mame/includes/dc.h28
-rw-r--r--src/mame/includes/dccons.h18
-rw-r--r--src/mame/includes/dcheese.h20
-rw-r--r--src/mame/includes/dcon.h10
-rw-r--r--src/mame/includes/dday.h16
-rw-r--r--src/mame/includes/ddragon.h30
-rw-r--r--src/mame/includes/ddragon3.h30
-rw-r--r--src/mame/includes/ddribble.h20
-rw-r--r--src/mame/includes/deadang.h12
-rw-r--r--src/mame/includes/dec0.h48
-rw-r--r--src/mame/includes/dec8.h64
-rw-r--r--src/mame/includes/deco32.h2
-rw-r--r--src/mame/includes/deco_mlc.h34
-rw-r--r--src/mame/includes/decocass.h124
-rw-r--r--src/mame/includes/dgn_beta.h44
-rw-r--r--src/mame/includes/dietgo.h4
-rw-r--r--src/mame/includes/digdug.h6
-rw-r--r--src/mame/includes/divebomb.h14
-rw-r--r--src/mame/includes/djboy.h20
-rw-r--r--src/mame/includes/djmain.h34
-rw-r--r--src/mame/includes/dkong.h50
-rw-r--r--src/mame/includes/dm7000.h28
-rw-r--r--src/mame/includes/docastle.h22
-rw-r--r--src/mame/includes/dogfgt.h22
-rw-r--r--src/mame/includes/dragrace.h6
-rw-r--r--src/mame/includes/drgnmst.h12
-rw-r--r--src/mame/includes/drmicro.h6
-rw-r--r--src/mame/includes/dynax.h120
-rw-r--r--src/mame/includes/dynduke.h10
-rw-r--r--src/mame/includes/vicdual.h6
-rw-r--r--src/mame/machine/cammu.h136
-rw-r--r--src/mame/machine/carpolo.cpp28
-rw-r--r--src/mame/machine/cchasm.cpp2
-rw-r--r--src/mame/machine/cdicdic.cpp8
-rw-r--r--src/mame/machine/cdicdic.h8
-rw-r--r--src/mame/machine/cdislavehle.cpp4
-rw-r--r--src/mame/machine/cdislavehle.h4
-rw-r--r--src/mame/machine/concept.cpp4
-rw-r--r--src/mame/machine/cybiko.cpp26
-rw-r--r--src/mame/machine/dai.cpp14
-rw-r--r--src/mame/machine/dc.cpp28
-rw-r--r--src/mame/machine/dccons.cpp4
-rw-r--r--src/mame/machine/dec0.cpp18
-rw-r--r--src/mame/machine/decioga.cpp20
-rw-r--r--src/mame/machine/decioga.h18
-rw-r--r--src/mame/machine/decocass.cpp98
-rw-r--r--src/mame/machine/dgn_beta.cpp46
-rw-r--r--src/mame/machine/docastle.cpp10
-rw-r--r--src/mame/machine/docg3.cpp12
-rw-r--r--src/mame/machine/docg3.h12
-rw-r--r--src/mame/video/cabal.cpp6
-rw-r--r--src/mame/video/calomega.cpp4
-rw-r--r--src/mame/video/canyon.cpp2
-rw-r--r--src/mame/video/capbowl.cpp8
-rw-r--r--src/mame/video/cbasebal.cpp14
-rw-r--r--src/mame/video/ccastles.cpp16
-rw-r--r--src/mame/video/cchasm.cpp2
-rw-r--r--src/mame/video/centiped.cpp18
-rw-r--r--src/mame/video/cgc7900.cpp26
-rw-r--r--src/mame/video/chaknpop.cpp8
-rw-r--r--src/mame/video/champbas.cpp2
-rw-r--r--src/mame/video/changela.cpp16
-rw-r--r--src/mame/video/cheekyms.cpp4
-rw-r--r--src/mame/video/circusc.cpp4
-rw-r--r--src/mame/video/cischeat.cpp40
-rw-r--r--src/mame/video/citycon.cpp6
-rw-r--r--src/mame/video/cloak.cpp14
-rw-r--r--src/mame/video/cloud9.cpp10
-rw-r--r--src/mame/video/clshroad.cpp4
-rw-r--r--src/mame/video/combatsc.cpp10
-rw-r--r--src/mame/video/commando.cpp16
-rw-r--r--src/mame/video/comx35.cpp2
-rw-r--r--src/mame/video/contra.cpp16
-rw-r--r--src/mame/video/cop01.cpp6
-rw-r--r--src/mame/video/cosmic.cpp6
-rw-r--r--src/mame/video/cps1.cpp18
-rw-r--r--src/mame/video/crbaloon.cpp4
-rw-r--r--src/mame/video/crshrace.cpp8
-rw-r--r--src/mame/video/cvs.cpp8
-rw-r--r--src/mame/video/darkmist.cpp2
-rw-r--r--src/mame/video/darkseal.cpp4
-rw-r--r--src/mame/video/dbz.cpp4
-rw-r--r--src/mame/video/dcheese.cpp12
-rw-r--r--src/mame/video/dcon.cpp10
-rw-r--r--src/mame/video/dday.cpp20
-rw-r--r--src/mame/video/ddragon.cpp4
-rw-r--r--src/mame/video/ddragon3.cpp10
-rw-r--r--src/mame/video/ddribble.cpp8
-rw-r--r--src/mame/video/deadang.cpp8
-rw-r--r--src/mame/video/dec0.cpp2
-rw-r--r--src/mame/video/dec8.cpp22
-rw-r--r--src/mame/video/decocass.cpp38
-rw-r--r--src/mame/video/dgn_beta.cpp2
-rw-r--r--src/mame/video/digdug.cpp2
-rw-r--r--src/mame/video/divebomb.cpp4
-rw-r--r--src/mame/video/djboy.cpp10
-rw-r--r--src/mame/video/dkong.cpp16
-rw-r--r--src/mame/video/docastle.cpp8
-rw-r--r--src/mame/video/dogfgt.cpp20
-rw-r--r--src/mame/video/drgnmst.cpp6
-rw-r--r--src/mame/video/drmicro.cpp2
-rw-r--r--src/mame/video/dynax.cpp42
-rw-r--r--src/mame/video/dynduke.cpp10
241 files changed, 2344 insertions, 2365 deletions
diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h
index 80407ed60f7..d37bf06498c 100644
--- a/src/devices/cpu/powerpc/ppc.h
+++ b/src/devices/cpu/powerpc/ppc.h
@@ -501,8 +501,8 @@ protected:
uint64_t m_dec_zero_cycles;
emu_timer * m_decrementer_int_timer;
- read32_delegate m_dcr_read_func;
- write32_delegate m_dcr_write_func;
+ read32sm_delegate m_dcr_read_func;
+ write32sm_delegate m_dcr_write_func;
write32sm_delegate m_dcstore_cb;
@@ -756,8 +756,8 @@ public:
void ppc4xx_set_dma_read_handler(int channel, read32_delegate callback, int rate);
void ppc4xx_set_dma_write_handler(int channel, write32sm_delegate callback, int rate);
- void ppc4xx_set_dcr_read_handler(read32_delegate dcr_read_func);
- void ppc4xx_set_dcr_write_handler(write32_delegate dcr_write_func);
+ void ppc4xx_set_dcr_read_handler(read32sm_delegate dcr_read_func);
+ void ppc4xx_set_dcr_write_handler(write32sm_delegate dcr_write_func);
uint8_t ppc4xx_spu_r(offs_t offset);
void ppc4xx_spu_w(offs_t offset, uint8_t data);
diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp
index 4cb57917035..566be7c820a 100644
--- a/src/devices/cpu/powerpc/ppccom.cpp
+++ b/src/devices/cpu/powerpc/ppccom.cpp
@@ -1924,7 +1924,7 @@ void ppc_device::ppccom_execute_mfdcr()
else
m_core->param1 = 0;
} else {
- m_core->param1 = m_dcr_read_func(*m_program,m_core->param0,0xffffffff);
+ m_core->param1 = m_dcr_read_func(m_core->param0);
}
}
@@ -2014,7 +2014,7 @@ void ppc_device::ppccom_execute_mtdcr()
if (m_core->param0 < ARRAY_LENGTH(m_dcr))
m_dcr[m_core->param0] = m_core->param1;
} else {
- m_dcr_write_func(*m_program,m_core->param0,m_core->param1,0xffffffff);
+ m_dcr_write_func(m_core->param0,m_core->param1);
}
}
@@ -2903,7 +2903,7 @@ void ppc4xx_device::ppc4xx_set_dma_write_handler(int channel, write32sm_delegate
ppc4xx_set_dcr_read_handler
-------------------------------------------------*/
-void ppc4xx_device::ppc4xx_set_dcr_read_handler(read32_delegate dcr_read_func)
+void ppc4xx_device::ppc4xx_set_dcr_read_handler(read32sm_delegate dcr_read_func)
{
m_dcr_read_func = dcr_read_func;
@@ -2913,7 +2913,7 @@ void ppc4xx_device::ppc4xx_set_dcr_read_handler(read32_delegate dcr_read_func)
ppc4xx_set_dcr_write_handler
-------------------------------------------------*/
-void ppc4xx_device::ppc4xx_set_dcr_write_handler(write32_delegate dcr_write_func)
+void ppc4xx_device::ppc4xx_set_dcr_write_handler(write32sm_delegate dcr_write_func)
{
m_dcr_write_func = dcr_write_func;
}
diff --git a/src/mame/audio/canyon.cpp b/src/mame/audio/canyon.cpp
index f928c997e69..bac731ea036 100644
--- a/src/mame/audio/canyon.cpp
+++ b/src/mame/audio/canyon.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Mike Balfour
/*************************************************************************
- audio\canyon.c
+ audio\canyon.cpp
*************************************************************************/
#include "emu.h"
@@ -16,13 +16,13 @@
*
*************************************/
-WRITE8_MEMBER(canyon_state::canyon_motor_w)
+void canyon_state::canyon_motor_w(offs_t offset, uint8_t data)
{
m_discrete->write(NODE_RELATIVE(CANYON_MOTOR1_DATA, (offset & 0x01)), data & 0x0f);
}
-WRITE8_MEMBER(canyon_state::canyon_explode_w)
+void canyon_state::canyon_explode_w(uint8_t data)
{
m_discrete->write(CANYON_EXPLODE_DATA, data >> 4);
}
diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp
index 68ff34874c9..88c1b90195f 100644
--- a/src/mame/audio/carnival.cpp
+++ b/src/mame/audio/carnival.cpp
@@ -61,7 +61,7 @@ enum
};
-WRITE8_MEMBER( carnival_state::carnival_audio_1_w )
+void carnival_state::carnival_audio_1_w(uint8_t data)
{
int bitsChanged;
int bitsGoneHigh;
@@ -126,7 +126,7 @@ WRITE8_MEMBER( carnival_state::carnival_audio_1_w )
}
}
-WRITE8_MEMBER( carnival_state::carnival_audio_2_w )
+void carnival_state::carnival_audio_2_w(uint8_t data)
{
int bitsChanged;
//int bitsGoneHigh;
diff --git a/src/mame/audio/cchasm.cpp b/src/mame/audio/cchasm.cpp
index 6ca1bbf1240..a4549d2092b 100644
--- a/src/mame/audio/cchasm.cpp
+++ b/src/mame/audio/cchasm.cpp
@@ -13,7 +13,7 @@
#include "sound/ay8910.h"
-WRITE8_MEMBER(cchasm_state::reset_coin_flag_w)
+void cchasm_state::reset_coin_flag_w(uint8_t data)
{
if (m_coin_flag)
{
@@ -31,27 +31,27 @@ INPUT_CHANGED_MEMBER(cchasm_state::set_coin_flag )
}
}
-READ8_MEMBER(cchasm_state::coin_sound_r)
+uint8_t cchasm_state::coin_sound_r()
{
uint8_t coin = (ioport("IN3")->read() >> 4) & 0x7;
return m_sound_flags | (m_coin_flag << 3) | coin;
}
-READ8_MEMBER(cchasm_state::soundlatch2_r)
+uint8_t cchasm_state::soundlatch2_r()
{
m_sound_flags &= ~0x80;
m_ctc->trg2(0);
return m_soundlatch2->read();
}
-WRITE8_MEMBER(cchasm_state::soundlatch4_w)
+void cchasm_state::soundlatch4_w(uint8_t data)
{
m_sound_flags |= 0x40;
m_soundlatch4->write(data);
m_maincpu->set_input_line(1, HOLD_LINE);
}
-WRITE16_MEMBER(cchasm_state::io_w)
+void cchasm_state::io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
//static int led;
@@ -76,7 +76,7 @@ WRITE16_MEMBER(cchasm_state::io_w)
}
}
-READ16_MEMBER(cchasm_state::io_r)
+uint16_t cchasm_state::io_r(offs_t offset)
{
switch (offset & 0xf)
{
diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp
index 421bb09ca30..093ca45499a 100644
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@@ -1442,7 +1442,7 @@ void demon_state::demon_sound(machine_config &config)
*
*************************************/
-WRITE8_MEMBER(qb3_state::qb3_sound_fifo_w)
+void qb3_state::qb3_sound_fifo_w(uint8_t data)
{
uint16_t rega = m_maincpu->state_int(ccpu_cpu_device::CCPU_A);
machine().scheduler().synchronize(timer_expired_delegate(FUNC(qb3_state::synced_sound_w), this), rega & 0x0f);
diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp
index 1414ae546e9..aa6765362d5 100644
--- a/src/mame/audio/crbaloon.cpp
+++ b/src/mame/audio/crbaloon.cpp
@@ -31,13 +31,13 @@
-WRITE8_MEMBER(crbaloon_state::crbaloon_audio_set_music_freq)
+void crbaloon_state::crbaloon_audio_set_music_freq(uint8_t data)
{
m_discrete->write(CRBALOON_MUSIC_DATA, data);
}
-WRITE8_MEMBER(crbaloon_state::crbaloon_audio_set_music_enable)
+void crbaloon_state::crbaloon_audio_set_music_enable(uint8_t data)
{
m_discrete->write(CRBALOON_MUSIC_EN, data);
}
@@ -65,7 +65,7 @@ void crbaloon_state::crbaloon_audio_set_appear_enable(int enabled)
}
-WRITE8_MEMBER(crbaloon_state::crbaloon_audio_set_laugh_enable)
+void crbaloon_state::crbaloon_audio_set_laugh_enable(uint8_t data)
{
m_discrete->write(CRBALOON_LAUGH_EN, data);
}
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index af6197c87a8..baa0ccebb22 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -910,13 +910,16 @@ void dcs_audio_device::install_speedup(void)
{
if (m_polling_offset) {
if (m_rev < REV_DSIO) {
- m_cpu->space(AS_DATA).install_readwrite_handler(m_polling_offset, m_polling_offset, read16_delegate(*this, FUNC(dcs_audio_device::dcs_polling_r)), write16_delegate(*this, FUNC(dcs_audio_device::dcs_polling_w)));
+ m_cpu->space(AS_DATA).install_read_handler(m_polling_offset, m_polling_offset, read16mo_delegate(*this, FUNC(dcs_audio_device::dcs_polling_r)));
+ m_cpu->space(AS_DATA).install_write_handler(m_polling_offset, m_polling_offset, write16s_delegate(*this, FUNC(dcs_audio_device::dcs_polling_w)));
}
else {
// ADSP 2181 (DSIO and DENVER) use program memory
- m_cpu->space(AS_PROGRAM).install_readwrite_handler(m_polling_offset, m_polling_offset, read32_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_r)), write32_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_w)));
+ m_cpu->space(AS_PROGRAM).install_read_handler(m_polling_offset, m_polling_offset, read32mo_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_r)));
+ m_cpu->space(AS_PROGRAM).install_write_handler(m_polling_offset, m_polling_offset, write32s_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_w)));
// DSIO and DENVER poll in two spots. This offset covers all three machines (mwskins, sf2049, roadburn).
- m_cpu->space(AS_PROGRAM).install_readwrite_handler(m_polling_offset + 9, m_polling_offset + 9, read32_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_r)), write32_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_w)));
+ m_cpu->space(AS_PROGRAM).install_read_handler(m_polling_offset + 9, m_polling_offset + 9, read32mo_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_r)));
+ m_cpu->space(AS_PROGRAM).install_write_handler(m_polling_offset + 9, m_polling_offset + 9, write32s_delegate(*this, FUNC(dcs_audio_device::dcs_polling32_w)));
}
}
}
@@ -934,14 +937,14 @@ void dcs_audio_device::set_auto_ack(int state)
*
*************************************/
-READ16_MEMBER( dcs_audio_device::dcs_dataram_r )
+uint16_t dcs_audio_device::dcs_dataram_r(offs_t offset)
{
assert(m_external_program_ram != nullptr);
return m_external_program_ram[offset] >> 8;
}
-WRITE16_MEMBER( dcs_audio_device::dcs_dataram_w )
+void dcs_audio_device::dcs_dataram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
assert(m_external_program_ram != nullptr);
uint16_t val = m_external_program_ram[offset] >> 8;
@@ -950,7 +953,7 @@ WRITE16_MEMBER( dcs_audio_device::dcs_dataram_w )
}
-WRITE16_MEMBER( dcs_audio_device::dcs_data_bank_select_w )
+void dcs_audio_device::dcs_data_bank_select_w(uint16_t data)
{
if (m_rev != REV_DCS1P5)
m_sounddata_bank = data & 0x7ff;
@@ -966,7 +969,7 @@ WRITE16_MEMBER( dcs_audio_device::dcs_data_bank_select_w )
#endif
}
-WRITE16_MEMBER( dcs_audio_device::dcs_data_bank_select2_w )
+void dcs_audio_device::dcs_data_bank_select2_w(uint16_t data)
{
m_sounddata_bank = (m_sounddata_bank & 0x00ff) | ((data & 0x01) << 8) | ((data & 0xfc) << 7);
@@ -1082,7 +1085,7 @@ void dcs_audio_device::sdrc_reset()
*
*************************************/
-READ16_MEMBER( dcs_audio_device::sdrc_r )
+uint16_t dcs_audio_device::sdrc_r(offs_t offset)
{
sdrc_state &sdrc = m_sdrc;
uint16_t result = sdrc.reg[offset];
@@ -1131,7 +1134,7 @@ READ16_MEMBER( dcs_audio_device::sdrc_r )
}
-WRITE16_MEMBER( dcs_audio_device::sdrc_w )
+void dcs_audio_device::sdrc_w(offs_t offset, uint16_t data)
{
sdrc_state &sdrc = m_sdrc;
uint16_t diff = sdrc.reg[offset] ^ data;
@@ -1214,7 +1217,7 @@ void dcs_audio_device::dsio_reset()
}
-READ16_MEMBER( dcs_audio_device::dsio_r )
+uint16_t dcs_audio_device::dsio_r(offs_t offset)
{
dsio_state &dsio = m_dsio;
uint16_t result = dsio.reg[offset];
@@ -1230,7 +1233,7 @@ READ16_MEMBER( dcs_audio_device::dsio_r )
}
-WRITE16_MEMBER( dcs_audio_device::dsio_w )
+void dcs_audio_device::dsio_w(offs_t offset, uint16_t data)
{
dsio_state &dsio = m_dsio;
@@ -1291,7 +1294,7 @@ void dcs_audio_device::denver_alloc_dmadac()
// recompute_sample_rate();
}
-READ16_MEMBER( dcs_audio_device::denver_r )
+uint16_t dcs_audio_device::denver_r(offs_t offset)
{
uint16_t result = m_dsio.reg[offset];
@@ -1307,7 +1310,7 @@ READ16_MEMBER( dcs_audio_device::denver_r )
}
-WRITE16_MEMBER( dcs_audio_device::denver_w )
+void dcs_audio_device::denver_w(offs_t offset, uint16_t data)
{
dsio_state &dsio = m_dsio;
int channels;
@@ -1365,7 +1368,7 @@ WRITE16_MEMBER( dcs_audio_device::denver_w )
*
*************************************/
-WRITE32_MEMBER( dcs_audio_device::dsio_idma_addr_w )
+void dcs_audio_device::dsio_idma_addr_w(uint32_t data)
{
if (LOG_DCS_TRANSFERS)
logerror("%s IDMA_addr = %04X\n", machine().describe_context(), data);
@@ -1375,7 +1378,7 @@ WRITE32_MEMBER( dcs_audio_device::dsio_idma_addr_w )
}
-WRITE32_MEMBER( dcs_audio_device::dsio_idma_data_w )
+void dcs_audio_device::dsio_idma_data_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
dsio_state &dsio = m_dsio;
// IDMA is to internal memory only
@@ -1405,7 +1408,7 @@ WRITE32_MEMBER( dcs_audio_device::dsio_idma_data_w )
}
-READ32_MEMBER( dcs_audio_device::dsio_idma_data_r )
+uint32_t dcs_audio_device::dsio_idma_data_r()
{
uint32_t result;
// IDMA is to internal memory only
@@ -1495,7 +1498,7 @@ void dcs_audio_device::reset_w(int state)
}
-READ16_MEMBER( dcs_audio_device::latch_status_r )
+uint16_t dcs_audio_device::latch_status_r(address_space &space)
{
int result = 0;
if (IS_INPUT_FULL())
@@ -1510,7 +1513,7 @@ READ16_MEMBER( dcs_audio_device::latch_status_r )
}
-READ16_MEMBER( dcs_audio_device::fifo_input_r )
+uint16_t dcs_audio_device::fifo_input_r()
{
if (!m_fifo_data_r.isnull())
return m_fifo_data_r();
@@ -1566,7 +1569,7 @@ void dcs_audio_device::data_w(uint16_t data)
}
-WRITE16_MEMBER( dcs_audio_device::input_latch_ack_w )
+void dcs_audio_device::input_latch_ack_w(uint16_t data)
{
if (!m_last_input_empty && !m_input_empty_cb.isnull())
m_input_empty_cb(m_last_input_empty = 1);
@@ -1578,20 +1581,20 @@ WRITE16_MEMBER( dcs_audio_device::input_latch_ack_w )
}
-READ16_MEMBER( dcs_audio_device::input_latch_r )
+uint16_t dcs_audio_device::input_latch_r()
{
if (m_auto_ack)
- input_latch_ack_w(space,0,0,0xffff);
+ input_latch_ack_w(0);
if (LOG_DCS_IO)
logerror("%s input_latch_r(%04X)\n", machine().describe_context(), m_input_data);
return m_input_data;
}
-READ32_MEMBER( dcs_audio_device::input_latch32_r )
+uint32_t dcs_audio_device::input_latch32_r()
{
if (m_auto_ack)
- input_latch_ack_w(space,0,0,0xffff);
+ input_latch_ack_w(0);
if (LOG_DCS_IO)
logerror("%s input_latch32_r(%04X)\n", machine().describe_context(), m_input_data);
return m_input_data << 8;
@@ -1619,7 +1622,7 @@ void dcs_audio_device::output_latch_w(uint16_t data)
machine().scheduler().synchronize(timer_expired_delegate(FUNC(dcs_audio_device::latch_delayed_w),this), data>>8);
}
-WRITE32_MEMBER( dcs_audio_device::output_latch32_w )
+void dcs_audio_device::output_latch32_w(uint32_t data)
{
m_pre_output_data = data >> 8;
if (LOG_DCS_IO)
@@ -1681,7 +1684,7 @@ TIMER_CALLBACK_MEMBER( dcs_audio_device::output_control_delayed_w )
}
-WRITE16_MEMBER( dcs_audio_device::output_control_w )
+void dcs_audio_device::output_control_w(uint16_t data)
{
if (LOG_DCS_IO)
logerror("%s output_control_w = %04X\n", machine().describe_context(), data);
@@ -1689,7 +1692,7 @@ WRITE16_MEMBER( dcs_audio_device::output_control_w )
}
-READ16_MEMBER( dcs_audio_device::output_control_r )
+uint16_t dcs_audio_device::output_control_r()
{
if (LOG_DCS_IO)
logerror("%s output_control_r = %04X\n", machine().describe_context(), m_output_control);
@@ -1857,7 +1860,7 @@ WRITE_LINE_MEMBER(dcs_audio_device::timer_enable_callback)
0x3c00-0x3fff = Memory Mapped control registers & reserved.
*/
-READ16_MEMBER( dcs_audio_device::adsp_control_r )
+uint16_t dcs_audio_device::adsp_control_r(offs_t offset)
{
uint16_t result = 0xffff;
@@ -1891,7 +1894,7 @@ READ16_MEMBER( dcs_audio_device::adsp_control_r )
}
-WRITE16_MEMBER(dcs_audio_device:: adsp_control_w )
+void dcs_audio_device:: adsp_control_w(offs_t offset, uint16_t data)
{
m_control_regs[offset] = data;
@@ -1972,7 +1975,7 @@ WRITE16_MEMBER(dcs_audio_device:: adsp_control_w )
case IDMA_CONTROL_REG:
if (m_rev == REV_DSIO || m_rev == REV_DENV)
- dsio_idma_addr_w(space, offset, data);
+ dsio_idma_addr_w(data);
break;
}
if (LOG_DCS_IO)
@@ -2136,7 +2139,7 @@ void dcs_audio_device::sound_tx_callback(offs_t offset, uint32_t data)
VERY BASIC & SAFE OPTIMIZATIONS
****************************************************************************/
-READ16_MEMBER( dcs_audio_device::dcs_polling_r )
+uint16_t dcs_audio_device::dcs_polling_r(address_space &space)
{
if (m_polling_count++ > 5)
space.device().execute().eat_cycles(2000);
@@ -2144,19 +2147,19 @@ READ16_MEMBER( dcs_audio_device::dcs_polling_r )
}
-WRITE16_MEMBER( dcs_audio_device::dcs_polling_w )
+void dcs_audio_device::dcs_polling_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_polling_count = 0;
COMBINE_DATA(&m_polling_value);
}
-READ32_MEMBER(dcs_audio_device::dcs_polling32_r)
+uint32_t dcs_audio_device::dcs_polling32_r(address_space &space)
{
space.device().execute().eat_cycles(1000);
return m_polling32_value;
}
-WRITE32_MEMBER(dcs_audio_device::dcs_polling32_w)
+void dcs_audio_device::dcs_polling32_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
m_polling_count = 0;
COMBINE_DATA(&m_polling32_value);
@@ -2356,8 +2359,6 @@ int dcs_audio_device::preprocess_stage_1(uint16_t data)
TIMER_CALLBACK_MEMBER( dcs_audio_device::s2_ack_callback )
{
- address_space &space = m_cpu->space(AS_PROGRAM);
-
/* if the output is full, stall for a usec */
if (IS_OUTPUT_FULL())
{
@@ -2365,7 +2366,7 @@ TIMER_CALLBACK_MEMBER( dcs_audio_device::s2_ack_callback )
return;
}
output_latch_w(param);
- output_control_w(space, 0, (m_output_control & ~0xff00) | 0x0300, 0xffff);
+ output_control_w((m_output_control & ~0xff00) | 0x0300);
}
diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h
index 55ae29d1b69..5aa65eea98b 100644
--- a/src/mame/audio/dcs.h
+++ b/src/mame/audio/dcs.h
@@ -39,9 +39,9 @@ public:
void fifo_notify(int count, int max);
- DECLARE_WRITE32_MEMBER( dsio_idma_addr_w );
- DECLARE_WRITE32_MEMBER( dsio_idma_data_w );
- DECLARE_READ32_MEMBER( dsio_idma_data_r );
+ void dsio_idma_addr_w(uint32_t data);
+ void dsio_idma_data_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t dsio_idma_data_r();
void dmovlay_remap_memory();
void dmovlay_callback(uint32_t data);
void denver_postload(void);
@@ -51,51 +51,51 @@ public:
void dcs_boot();
TIMER_CALLBACK_MEMBER( dcs_reset );
void dcs_register_state();
- DECLARE_READ16_MEMBER( dcs_dataram_r );
- DECLARE_WRITE16_MEMBER( dcs_dataram_w );
- DECLARE_WRITE16_MEMBER( dcs_data_bank_select_w );
- DECLARE_WRITE16_MEMBER( dcs_data_bank_select2_w );
+ uint16_t dcs_dataram_r(offs_t offset);
+ void dcs_dataram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void dcs_data_bank_select_w(uint16_t data);
+ void dcs_data_bank_select2_w(uint16_t data);
inline void sdrc_update_bank_pointers();
void sdrc_remap_memory();
void sdrc_reset();
- DECLARE_READ16_MEMBER( sdrc_r );
- DECLARE_WRITE16_MEMBER( sdrc_w );
+ uint16_t sdrc_r(offs_t offset);
+ void sdrc_w(offs_t offset, uint16_t data);
void dsio_reset();
- DECLARE_READ16_MEMBER( dsio_r );
- DECLARE_WRITE16_MEMBER( dsio_w );
+ uint16_t dsio_r(offs_t offset);
+ void dsio_w(offs_t offset, uint16_t data);
void denver_alloc_dmadac(void);
void denver_reset();
- DECLARE_READ16_MEMBER( denver_r );
- DECLARE_WRITE16_MEMBER( denver_w );
- DECLARE_READ16_MEMBER( latch_status_r );
- DECLARE_READ16_MEMBER( fifo_input_r );
+ uint16_t denver_r(offs_t offset);
+ void denver_w(offs_t offset, uint16_t data);
+ uint16_t latch_status_r(address_space &space);
+ uint16_t fifo_input_r();
void dcs_delayed_data_w(uint16_t data);
TIMER_CALLBACK_MEMBER( dcs_delayed_data_w_callback );
- DECLARE_WRITE16_MEMBER( input_latch_ack_w );
- DECLARE_READ16_MEMBER( input_latch_r );
- DECLARE_READ32_MEMBER( input_latch32_r );
+ void input_latch_ack_w(uint16_t data);
+ uint16_t input_latch_r();
+ uint32_t input_latch32_r();
TIMER_CALLBACK_MEMBER( latch_delayed_w );
void output_latch_w(uint16_t data);
- DECLARE_WRITE32_MEMBER( output_latch32_w );
+ void output_latch32_w(uint32_t data);
void delayed_ack_w();
TIMER_CALLBACK_MEMBER( delayed_ack_w_callback );
TIMER_CALLBACK_MEMBER( output_control_delayed_w );
- DECLARE_WRITE16_MEMBER( output_control_w );
- DECLARE_READ16_MEMBER( output_control_r );
+ void output_control_w(uint16_t data);
+ uint16_t output_control_r();
void update_timer_count();
TIMER_DEVICE_CALLBACK_MEMBER( internal_timer_callback );
void reset_timer();
DECLARE_WRITE_LINE_MEMBER(timer_enable_callback);
- DECLARE_READ16_MEMBER( adsp_control_r );
- DECLARE_WRITE16_MEMBER( adsp_control_w );
+ uint16_t adsp_control_r(offs_t offset);
+ void adsp_control_w(offs_t offset, uint16_t data);
TIMER_DEVICE_CALLBACK_MEMBER( dcs_irq );
TIMER_DEVICE_CALLBACK_MEMBER( sport0_irq );
void recompute_sample_rate();
void sound_tx_callback(offs_t offset, uint32_t data);
- DECLARE_READ16_MEMBER( dcs_polling_r );
- DECLARE_WRITE16_MEMBER( dcs_polling_w );
- DECLARE_READ32_MEMBER(dcs_polling32_r);
- DECLARE_WRITE32_MEMBER(dcs_polling32_w);
+ uint16_t dcs_polling_r(address_space &space);
+ void dcs_polling_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t dcs_polling32_r(address_space &space);
+ void dcs_polling32_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
TIMER_DEVICE_CALLBACK_MEMBER( transfer_watchdog_callback );
TIMER_CALLBACK_MEMBER( s1_ack_callback2 );
TIMER_CALLBACK_MEMBER( s1_ack_callback1 );
diff --git a/src/mame/audio/depthch.cpp b/src/mame/audio/depthch.cpp
index fa91754e077..299192c6112 100644
--- a/src/mame/audio/depthch.cpp
+++ b/src/mame/audio/depthch.cpp
@@ -42,7 +42,7 @@ enum
};
-WRITE8_MEMBER( vicdual_state::depthch_audio_w )
+void vicdual_state::depthch_audio_w(uint8_t data)
{
int bitsChanged;
int bitsGoneHigh;
diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp
index 4765c205c5e..e623ef5530a 100644
--- a/src/mame/audio/dkong.cpp
+++ b/src/mame/audio/dkong.cpp
@@ -1254,7 +1254,7 @@ void dkong_state::dkong_p1_w(uint8_t data)
*
****************************************************************/
-WRITE8_MEMBER(dkong_state::dkong_audio_irq_w)
+void dkong_state::dkong_audio_irq_w(uint8_t data)
{
if (data)
m_soundcpu->set_input_line(0, ASSERT_LINE);
diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp
index bf1c95b8594..a7d67f0a3dd 100644
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@@ -70,7 +70,7 @@ MACHINE_RESET_MEMBER(cabal_state,cabalbl)
/******************************************************************************************/
-WRITE16_MEMBER(cabal_state::cabalbl_sndcmd_w)
+void cabal_state::cabalbl_sndcmd_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -95,7 +95,7 @@ void cabal_state::sound_irq_trigger_word_w(offs_t, u16 data, u16 mem_mask)
m_maincpu->spin_until_time(attotime::from_usec(50));
}
-WRITE16_MEMBER(cabal_state::cabalbl_sound_irq_trigger_word_w)
+void cabal_state::cabalbl_sound_irq_trigger_word_w(uint16_t data)
{
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
@@ -157,17 +157,17 @@ void cabal_state::cabalbl_main_map(address_map &map)
/*********************************************************************/
-READ8_MEMBER(cabal_state::cabalbl_snd2_r)
+uint8_t cabal_state::cabalbl_snd2_r()
{
return bitswap<8>(m_sound_command2, 7,2,4,5,3,6,1,0);
}
-READ8_MEMBER(cabal_state::cabalbl_snd1_r)
+uint8_t cabal_state::cabalbl_snd1_r()
{
return bitswap<8>(m_sound_command1, 7,2,4,5,3,6,1,0);
}
-WRITE8_MEMBER(cabal_state::cabalbl_coin_w)
+void cabal_state::cabalbl_coin_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
@@ -245,7 +245,7 @@ void cabal_state::cabalbl2_predecrypted_opcodes_map(address_map &map)
/* the bootleg has 2x z80 sample players */
-WRITE8_MEMBER(cabal_state::cabalbl_1_adpcm_w)
+void cabal_state::cabalbl_1_adpcm_w(uint8_t data)
{
m_msm1->reset_w(BIT(data, 7));
/* ?? bit 6?? */
@@ -253,7 +253,7 @@ WRITE8_MEMBER(cabal_state::cabalbl_1_adpcm_w)
m_msm1->vclk_w(1);
m_msm1->vclk_w(0);
}
-WRITE8_MEMBER(cabal_state::cabalbl_2_adpcm_w)
+void cabal_state::cabalbl_2_adpcm_w(uint8_t data)
{
m_msm2->reset_w(BIT(data, 7));
/* ?? bit 6?? */
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 22e5d3b0822..db10f7c0a0c 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -68,7 +68,7 @@ void canyon_state::canyon_palette(palette_device &palette) const
*
*************************************/
-READ8_MEMBER(canyon_state::canyon_switches_r)
+uint8_t canyon_state::canyon_switches_r(offs_t offset)
{
uint8_t val = 0;
@@ -82,7 +82,7 @@ READ8_MEMBER(canyon_state::canyon_switches_r)
}
-READ8_MEMBER(canyon_state::canyon_options_r)
+uint8_t canyon_state::canyon_options_r(offs_t offset)
{
return (ioport("DSW")->read() >> (2 * (~offset & 3))) & 3;
}
@@ -96,7 +96,7 @@ READ8_MEMBER(canyon_state::canyon_options_r)
*
*************************************/
-WRITE8_MEMBER(canyon_state::output_latch_w)
+void canyon_state::output_latch_w(offs_t offset, uint8_t data)
{
// ADR1 = D, ADR8 = A2, ADR7 = A1, ADR0 = A0
m_outlatch->write_bit((offset & 0x180) >> 6 | BIT(offset, 0), BIT(offset, 1));
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index c98bc2a67f5..955073fa1a5 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -153,7 +153,7 @@ TIMER_CALLBACK_MEMBER(capbowl_state::update)
*
*************************************/
-WRITE8_MEMBER(capbowl_state::capbowl_rom_select_w)
+void capbowl_state::capbowl_rom_select_w(uint8_t data)
{
// 2009-11 FP: shall we add a check to be sure that bank < 6?
membank("bank1")->set_entry(((data & 0x0c) >> 1) + (data & 0x01));
@@ -167,19 +167,19 @@ WRITE8_MEMBER(capbowl_state::capbowl_rom_select_w)
*
*************************************/
-READ8_MEMBER(capbowl_state::track_0_r)
+uint8_t capbowl_state::track_0_r()
{
return (ioport("IN0")->read() & 0xf0) | ((ioport("TRACKY")->read() - m_last_trackball_val[0]) & 0x0f);
}
-READ8_MEMBER(capbowl_state::track_1_r)
+uint8_t capbowl_state::track_1_r()
{
return (ioport("IN1")->read() & 0xf0) | ((ioport("TRACKX")->read() - m_last_trackball_val[1]) & 0x0f);
}
-WRITE8_MEMBER(capbowl_state::track_reset_w)
+void capbowl_state::track_reset_w(uint8_t data)
{
/* reset the trackball counters */
m_last_trackball_val[0] = ioport("TRACKY")->read();
@@ -196,7 +196,7 @@ WRITE8_MEMBER(capbowl_state::track_reset_w)
*
*************************************/
-WRITE8_MEMBER(capbowl_state::sndcmd_w)
+void capbowl_state::sndcmd_w(uint8_t data)
{
m_audiocpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE);
m_soundlatch->write(data);
diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp
index 304bcd0f7ca..be6dbed1db0 100644
--- a/src/mame/drivers/cbasebal.cpp
+++ b/src/mame/drivers/cbasebal.cpp
@@ -32,7 +32,7 @@
*
*************************************/
-WRITE8_MEMBER(cbasebal_state::cbasebal_bankswitch_w)
+void cbasebal_state::cbasebal_bankswitch_w(uint8_t data)
{
/* bits 0-4 select ROM bank */
//logerror("%04x: bankswitch %02x\n", m_maincpu->pc(), data);
@@ -46,40 +46,40 @@ WRITE8_MEMBER(cbasebal_state::cbasebal_bankswitch_w)
}
-READ8_MEMBER(cbasebal_state::bankedram_r)
+uint8_t cbasebal_state::bankedram_r(offs_t offset)
{
switch (m_rambank)
{
case 2:
- return cbasebal_textram_r(space, offset); /* VRAM */
+ return cbasebal_textram_r(offset); /* VRAM */
case 1:
if (offset < 0x800)
return m_palette->basemem().read8(offset);
else
return 0;
default:
- return cbasebal_scrollram_r(space, offset); /* SCROLL */
+ return cbasebal_scrollram_r(offset); /* SCROLL */
}
}
-WRITE8_MEMBER(cbasebal_state::bankedram_w)
+void cbasebal_state::bankedram_w(offs_t offset, uint8_t data)
{
switch (m_rambank)
{
case 2:
- cbasebal_textram_w(space, offset, data);
+ cbasebal_textram_w(offset, data);
break;
case 1:
if (offset < 0x800)
m_palette->write8(offset, data);
break;
default:
- cbasebal_scrollram_w(space, offset, data);
+ cbasebal_scrollram_w(offset, data);
break;
}
}
-WRITE8_MEMBER(cbasebal_state::cbasebal_coinctrl_w)
+void cbasebal_state::cbasebal_coinctrl_w(uint8_t data)
{
machine().bookkeeping().coin_lockout_w(0, ~data & 0x04);
machine().bookkeeping().coin_lockout_w(1, ~data & 0x08);
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index 72f873ce8b3..b6c2b02f545 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -238,7 +238,7 @@ void ccastles_state::machine_reset()
*
*************************************/
-WRITE8_MEMBER(ccastles_state::irq_ack_w)
+void ccastles_state::irq_ack_w(uint8_t data)
{
if (m_irq_state)
{
@@ -248,7 +248,7 @@ WRITE8_MEMBER(ccastles_state::irq_ack_w)
}
-READ8_MEMBER(ccastles_state::leta_r)
+uint8_t ccastles_state::leta_r(offs_t offset)
{
static const char *const letanames[] = { "LETA0", "LETA1", "LETA2", "LETA3" };
@@ -263,7 +263,7 @@ READ8_MEMBER(ccastles_state::leta_r)
*
*************************************/
-WRITE8_MEMBER(ccastles_state::nvram_recall_w)
+void ccastles_state::nvram_recall_w(uint8_t data)
{
m_nvram_4b->recall(0);
m_nvram_4b->recall(1);
@@ -281,13 +281,13 @@ WRITE_LINE_MEMBER(ccastles_state::nvram_store_w)
}
-READ8_MEMBER(ccastles_state::nvram_r)
+uint8_t ccastles_state::nvram_r(address_space &space, offs_t offset)
{
return (m_nvram_4b->read(space, offset) & 0x0f) | (m_nvram_4a->read(space,offset) << 4);
}
-WRITE8_MEMBER(ccastles_state::nvram_w)
+void ccastles_state::nvram_w(offs_t offset, uint8_t data)
{
m_nvram_4b->write(offset, data);
m_nvram_4a->write(offset, data >> 4);
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 2ceeb1ebee6..51ebc83ee20 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -356,13 +356,13 @@ uint8_t quizard_state::mcu_rx()
* DVC cartridge *
*************************/
-READ16_MEMBER( cdi_state::dvc_r )
+uint16_t cdi_state::dvc_r(offs_t offset, uint16_t mem_mask)
{
LOGMASKED(LOG_DVC, "%s: dvc_r: %08x = 0000 & %04x\n", machine().describe_context(), 0xe80000 + (offset << 1), mem_mask);
return 0;
}
-WRITE16_MEMBER( cdi_state::dvc_w )
+void cdi_state::dvc_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
LOGMASKED(LOG_DVC, "%s: dvc_w: %08x = %04x & %04x\n", machine().describe_context(), 0xe80000 + (offset << 1), data, mem_mask);
}
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index ebfbd314f7f..e9ecc70075e 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -471,7 +471,7 @@ MACHINE_RESET_MEMBER(centiped_state,magworm)
}
-WRITE8_MEMBER(centiped_state::irq_ack_w)
+void centiped_state::irq_ack_w(uint8_t data)
{
m_maincpu->set_input_line(0, CLEAR_LINE);
}
@@ -529,24 +529,24 @@ inline int centiped_state::read_trackball(int idx, int switch_port)
}
-READ8_MEMBER(centiped_state::centiped_IN0_r)
+uint8_t centiped_state::centiped_IN0_r()
{
return read_trackball(0, 0);
}
-READ8_MEMBER(centiped_state::centiped_IN2_r)
+uint8_t centiped_state::centiped_IN2_r()
{
return read_trackball(1, 2);
}
-READ8_MEMBER(centiped_state::milliped_IN1_r)
+uint8_t centiped_state::milliped_IN1_r()
{
return read_trackball(1, 1);
}
-READ8_MEMBER(centiped_state::milliped_IN2_r)
+uint8_t centiped_state::milliped_IN2_r()
{
uint8_t data = ioport("IN2")->read();
@@ -580,7 +580,7 @@ WRITE_LINE_MEMBER(centiped_state::control_select_w)
}
-READ8_MEMBER(centiped_state::mazeinv_input_r)
+uint8_t centiped_state::mazeinv_input_r()
{
static const char *const sticknames[] = { "STICK0", "STICK1", "STICK2", "STICK3" };
@@ -588,12 +588,12 @@ READ8_MEMBER(centiped_state::mazeinv_input_r)
}
-WRITE8_MEMBER(centiped_state::mazeinv_input_select_w)
+void centiped_state::mazeinv_input_select_w(offs_t offset, uint8_t data)
{
m_control_select = offset & 3;
}
-READ8_MEMBER(centiped_state::bullsdrt_data_port_r)
+uint8_t centiped_state::bullsdrt_data_port_r()
{
switch (m_maincpu->pc())
{
@@ -653,12 +653,12 @@ WRITE_LINE_MEMBER(centiped_state::bullsdrt_coin_count_w)
*
*************************************/
-READ8_MEMBER(centiped_state::earom_read)
+uint8_t centiped_state::earom_read()
{
return m_earom->data();
}
-WRITE8_MEMBER(centiped_state::earom_write)
+void centiped_state::earom_write(offs_t offset, uint8_t data)
{
m_earom->set_address(offset & 0x3f);
m_earom->set_data(data);
@@ -760,13 +760,13 @@ void centiped_state::caterplr_map(address_map &map)
map(0x1000, 0x100f).rw(FUNC(centiped_state::caterplr_AY8910_r), FUNC(centiped_state::caterplr_AY8910_w));
}
-WRITE8_MEMBER(centiped_state::caterplr_AY8910_w)
+void centiped_state::caterplr_AY8910_w(offs_t offset, uint8_t data)
{
m_aysnd->address_w(offset);
m_aysnd->data_w(data);
}
-READ8_MEMBER(centiped_state::caterplr_AY8910_r)
+uint8_t centiped_state::caterplr_AY8910_r(offs_t offset)
{
m_aysnd->address_w(offset);
return m_aysnd->data_r();
@@ -852,12 +852,12 @@ void centiped_state::multiped_map(address_map &map)
map(0xdc00, 0xdc00).mirror(0x03ff).w(FUNC(centiped_state::multiped_gfxbank_w));
}
-READ8_MEMBER(centiped_state::multiped_eeprom_r)
+uint8_t centiped_state::multiped_eeprom_r()
{
return m_eeprom->do_read() ? 0x80 : 0;
}
-WRITE8_MEMBER(centiped_state::multiped_eeprom_w)
+void centiped_state::multiped_eeprom_w(offs_t offset, uint8_t data)
{
// a0: always high
// a3-a7: always low
@@ -877,7 +877,7 @@ WRITE8_MEMBER(centiped_state::multiped_eeprom_w)
m_eeprom->cs_write((data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER(centiped_state::multiped_prgbank_w)
+void centiped_state::multiped_prgbank_w(uint8_t data)
{
// d0-d6: N/C?
// d7: prg (and gfx) rom bank
@@ -885,7 +885,7 @@ WRITE8_MEMBER(centiped_state::multiped_prgbank_w)
if (bank != m_prg_bank)
{
m_prg_bank = bank;
- multiped_gfxbank_w(space, 0, m_gfx_bank << 6);
+ multiped_gfxbank_w(m_gfx_bank << 6);
// TODO: prg bankswitch and alt memory map layout for centiped
}
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index d1379fda0a1..8ffaeca2ddf 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -96,7 +96,7 @@ void cgc7900_state::kbd_put(u8 data)
keyboard_r - keyboard data read
-------------------------------------------------*/
-READ16_MEMBER( cgc7900_state::keyboard_r )
+u16 cgc7900_state::keyboard_r()
{
u16 data;
@@ -146,7 +146,7 @@ READ16_MEMBER( cgc7900_state::keyboard_r )
keyboard_w - keyboard data write
-------------------------------------------------*/
-WRITE16_MEMBER( cgc7900_state::keyboard_w )
+void cgc7900_state::keyboard_w(u16 data)
{
/*
@@ -183,7 +183,7 @@ static const int int_vectors[16] = {
0x4b, 0x44, 0x4c, 0x43, 0x42, 0x4d, 0x45, 0x4a, 0x49, 0x46, 0x4e, 0x41, 0x40, 0x4f, 0x47, 0x48
};
-WRITE16_MEMBER( cgc7900_state::interrupt_mask_w )
+void cgc7900_state::interrupt_mask_w(u16 data)
{
/*
@@ -255,7 +255,7 @@ void cgc7900_state::irq_encoder(int pin, int state)
disk_data_r - disk data read
-------------------------------------------------*/
-READ16_MEMBER( cgc7900_state::disk_data_r )
+u16 cgc7900_state::disk_data_r()
{
return 0;
}
@@ -264,7 +264,7 @@ READ16_MEMBER( cgc7900_state::disk_data_r )
disk_data_w - disk data write
-------------------------------------------------*/
-WRITE16_MEMBER( cgc7900_state::disk_data_w )
+void cgc7900_state::disk_data_w(u16 data)
{
}
@@ -272,7 +272,7 @@ WRITE16_MEMBER( cgc7900_state::disk_data_w )
disk_status_r - disk status read
-------------------------------------------------*/
-READ16_MEMBER( cgc7900_state::disk_status_r )
+u16 cgc7900_state::disk_status_r()
{
/*
@@ -304,11 +304,11 @@ READ16_MEMBER( cgc7900_state::disk_status_r )
disk_command_w - disk command write
-------------------------------------------------*/
-WRITE16_MEMBER( cgc7900_state::disk_command_w )
+void cgc7900_state::disk_command_w(u16 data)
{
}
-READ16_MEMBER(cgc7900_state::unmapped_r)
+u16 cgc7900_state::unmapped_r()
{
return rand();
}
@@ -440,9 +440,9 @@ void cgc7900_state::machine_start()
void cgc7900_state::machine_reset()
{
- uint8_t *user1 = memregion(M68000_TAG)->base();
+ u8 *user1 = memregion(M68000_TAG)->base();
- memcpy((uint8_t *)m_chrom_ram.target(), user1, 8); // not really what happens but...
+ memcpy((u8 *)m_chrom_ram.target(), user1, 8); // not really what happens but...
kbd_mods = 0x300; // forces cold boot -- initializes SRAM contents
kbd_data = 0;
diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp
index 4dff0f6c168..72fc704d560 100644
--- a/src/mame/drivers/chaknpop.cpp
+++ b/src/mame/drivers/chaknpop.cpp
@@ -125,7 +125,7 @@ Notes:
***************************************************************************/
-READ8_MEMBER(chaknpop_state::mcu_status_r)
+uint8_t chaknpop_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
@@ -149,7 +149,7 @@ void chaknpop_state::unknown_port_3_w(uint8_t data)
//logerror("%s: write to unknown port 3: 0x%02x\n", machine().describe_context(), data);
}
-WRITE8_MEMBER(chaknpop_state::coinlock_w)
+void chaknpop_state::coinlock_w(uint8_t data)
{
logerror("%04x: coin lock %sable\n", m_maincpu->pc(), data ? "dis" : "en");
}
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index e3bbcc325aa..c1733cf3f96 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -125,7 +125,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(exctsccr_state::exctsccr_sound_irq)
*************************************/
/* champbja another protection */
-READ8_MEMBER(champbas_state::champbja_protection_r)
+uint8_t champbas_state::champbja_protection_r(offs_t offset)
{
uint8_t data = 0;
/*
diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp
index 4767b185994..cb8e2ec6848 100644
--- a/src/mame/drivers/changela.cpp
+++ b/src/mame/drivers/changela.cpp
@@ -22,14 +22,14 @@ Tomasz Slanina
#include "changela.lh"
-READ8_MEMBER(changela_state::mcu_r)
+uint8_t changela_state::mcu_r()
{
//osd_printf_debug("Z80 MCU R = %x\n", m_mcu_out);
return m_mcu_out;
}
/* latch LS374 at U39 */
-WRITE8_MEMBER(changela_state::mcu_w)
+void changela_state::mcu_w(uint8_t data)
{
m_mcu_in = data;
if (!BIT(m_port_c_out, 2))
@@ -62,23 +62,23 @@ void changela_state::changela_68705_port_c_w(uint8_t data)
/* U30 */
-READ8_MEMBER(changela_state::changela_24_r)
+uint8_t changela_state::changela_24_r()
{
return (BIT(m_port_c_out, 1) << 3) | 0x07; /* bits 2,1,0-N/C inputs */
}
-READ8_MEMBER(changela_state::changela_25_r)
+uint8_t changela_state::changela_25_r()
{
//collisions on bits 3,2, bits 1,0-N/C inputs
return (m_tree1_col << 3) | (m_tree0_col << 2) | 0x03;
}
-READ8_MEMBER(changela_state::changela_30_r)
+uint8_t changela_state::changela_30_r()
{
return ioport("WHEEL")->read() & 0x0f; //wheel control (clocked input) signal on bits 3,2,1,0
}
-READ8_MEMBER(changela_state::changela_31_r)
+uint8_t changela_state::changela_31_r()
{
/* If the new value is less than the old value, and it did not wrap around,
or if the new value is greater than the old value, and it did wrap around,
@@ -98,7 +98,7 @@ READ8_MEMBER(changela_state::changela_31_r)
return (m_dir_31 << 3) | (m_left_bank_col << 2) | (m_right_bank_col << 1) | m_boat_shore_col;
}
-READ8_MEMBER(changela_state::changela_2c_r)
+uint8_t changela_state::changela_2c_r()
{
int val = ioport("IN0")->read();
@@ -107,9 +107,9 @@ READ8_MEMBER(changela_state::changela_2c_r)
return val;
}
-READ8_MEMBER(changela_state::changela_2d_r)
+uint8_t changela_state::changela_2d_r()
{
- /* the schems are unreadable - i'm not sure it is V8 (page 74, SOUND I/O BOARD SCHEMATIC 1 OF 2, FIGURE 24 - in the middle on the right side) */
+ /* the schems are unreadable - I'm not sure it is V8 (page 74, SOUND I/O BOARD SCHEMATIC 1 OF 2, FIGURE 24 - in the middle on the right side) */
int v8 = 0;
int gas;
diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp
index 361f07323b8..1d11bd349d3 100644
--- a/src/mame/drivers/channelf.cpp
+++ b/src/mame/drivers/channelf.cpp
@@ -49,12 +49,12 @@ uint8_t channelf_state::port_read_with_latch(uint8_t ext, uint8_t latch_state)
return (~ext | latch_state);
}
-READ8_MEMBER( channelf_state::port_0_r )
+uint8_t channelf_state::port_0_r()
{
return port_read_with_latch(ioport("PANEL")->read(), m_latch[0]);
}
-READ8_MEMBER( channelf_state::port_1_r )
+uint8_t channelf_state::port_1_r()
{
uint8_t ext_value;
@@ -66,7 +66,7 @@ READ8_MEMBER( channelf_state::port_1_r )
return port_read_with_latch(ext_value,m_latch[1]);
}
-READ8_MEMBER( channelf_state::port_4_r )
+uint8_t channelf_state::port_4_r()
{
uint8_t ext_value;
@@ -78,12 +78,12 @@ READ8_MEMBER( channelf_state::port_4_r )
return port_read_with_latch(ext_value,m_latch[2]);
}
-READ8_MEMBER( channelf_state::port_5_r )
+uint8_t channelf_state::port_5_r()
{
return port_read_with_latch(0xff, m_latch[3]);
}
-WRITE8_MEMBER( channelf_state::port_0_w )
+void channelf_state::port_0_w(uint8_t data)
{
int offs;
@@ -96,19 +96,19 @@ WRITE8_MEMBER( channelf_state::port_0_w )
}
}
-WRITE8_MEMBER( channelf_state::port_1_w )
+void channelf_state::port_1_w(uint8_t data)
{
m_latch[1] = data;
m_val_reg = ((data ^ 0xff) >> 6) & 0x03;
}
-WRITE8_MEMBER( channelf_state::port_4_w )
+void channelf_state::port_4_w(uint8_t data)
{
m_latch[2] = data;
m_col_reg = (data | 0x80) ^ 0xff;
}
-WRITE8_MEMBER( channelf_state::port_5_w )
+void channelf_state::port_5_w(uint8_t data)
{
m_latch[3] = data;
m_custom->sound_w((data>>6)&3);
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index 239192f4e47..f4683ef97db 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -35,7 +35,7 @@
/* these trampolines are less confusing than nested address_map_bank_devices */
template<int Chip>
-READ8_MEMBER(chqflag_state::k051316_ramrom_r)
+uint8_t chqflag_state::k051316_ramrom_r(offs_t offset)
{
if (m_k051316_readroms)
return m_k051316[Chip]->rom_r(offset);
@@ -43,7 +43,7 @@ READ8_MEMBER(chqflag_state::k051316_ramrom_r)
return m_k051316[Chip]->read(offset);
}
-WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w)
+void chqflag_state::chqflag_bankswitch_w(uint8_t data)
{
/* bits 0-4 = ROM bank # (0x00-0x11) */
int bankaddress = data & 0x1f;
@@ -56,7 +56,7 @@ WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w)
/* other bits unknown/unused */
}
-WRITE8_MEMBER(chqflag_state::chqflag_vreg_w)
+void chqflag_state::chqflag_vreg_w(uint8_t data)
{
/* bits 0 & 1 = coin counters */
machine().bookkeeping().coin_counter_w(1, data & 0x01);
@@ -105,12 +105,12 @@ WRITE8_MEMBER(chqflag_state::chqflag_vreg_w)
/* other bits unknown. bit 5 is used. */
}
-WRITE8_MEMBER(chqflag_state::select_analog_ctrl_w)
+void chqflag_state::select_analog_ctrl_w(uint8_t data)
{
m_analog_ctrl = data;
}
-READ8_MEMBER(chqflag_state::analog_read_r)
+uint8_t chqflag_state::analog_read_r()
{
switch (m_analog_ctrl & 0x03)
{
@@ -160,7 +160,7 @@ void chqflag_state::bank1000_map(address_map &map)
}
-WRITE8_MEMBER(chqflag_state::k007232_bankswitch_w)
+void chqflag_state::k007232_bankswitch_w(uint8_t data)
{
int bank_A, bank_B;
@@ -262,7 +262,7 @@ void chqflag_state::volume_callback0(uint8_t data)
m_k007232[0]->set_volume(0, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2);
}
-WRITE8_MEMBER(chqflag_state::k007232_extvolume_w)
+void chqflag_state::k007232_extvolume_w(uint8_t data)
{
// volume/pan for one of the channels on this chip
// which channel and which bits are left/right is a guess
diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp
index 21f2c49bfe2..64a69e92436 100644
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@@ -84,13 +84,13 @@ void cinemat_state::machine_reset()
*
*************************************/
-READ8_MEMBER(cinemat_state::inputs_r)
+uint8_t cinemat_state::inputs_r(offs_t offset)
{
return (m_inputs->read() >> offset) & 1;
}
-READ8_MEMBER(cinemat_state::switches_r)
+uint8_t cinemat_state::switches_r(offs_t offset)
{
static const uint8_t switch_shuffle[8] = { 2,5,4,3,0,1,6,7 };
return (m_switches->read() >> switch_shuffle[offset]) & 1;
@@ -112,7 +112,7 @@ INPUT_CHANGED_MEMBER(cinemat_state::coin_inserted)
}
-READ8_MEMBER(cinemat_state::coin_input_r)
+uint8_t cinemat_state::coin_input_r()
{
return !m_coin_detected;
}
@@ -165,7 +165,7 @@ uint8_t cinemat_state::joystick_read()
*
*************************************/
-READ8_MEMBER(cinemat_state::speedfrk_wheel_r)
+uint8_t cinemat_state::speedfrk_wheel_r(offs_t offset)
{
static const uint8_t speedfrk_steer[] = {0xe, 0x6, 0x2, 0x0, 0x3, 0x7, 0xf};
int delta_wheel;
@@ -181,7 +181,7 @@ READ8_MEMBER(cinemat_state::speedfrk_wheel_r)
}
-READ8_MEMBER(cinemat_state::speedfrk_gear_r)
+uint8_t cinemat_state::speedfrk_gear_r(offs_t offset)
{
int gearval = m_gear_input->read();
@@ -232,7 +232,7 @@ static const struct
};
-READ8_MEMBER(cinemat_16level_state::sundance_inputs_r)
+uint8_t cinemat_16level_state::sundance_inputs_r(offs_t offset)
{
/* handle special keys first */
if (sundance_port_map[offset].portname)
@@ -249,7 +249,7 @@ READ8_MEMBER(cinemat_16level_state::sundance_inputs_r)
*
*************************************/
-READ8_MEMBER(cinemat_color_state::boxingb_dial_r)
+uint8_t cinemat_color_state::boxingb_dial_r(offs_t offset)
{
int value = ioport("DIAL")->read();
if (!m_mux_select) offset += 4;
@@ -264,7 +264,7 @@ READ8_MEMBER(cinemat_color_state::boxingb_dial_r)
*
*************************************/
-READ8_MEMBER(qb3_state::qb3_frame_r)
+uint8_t qb3_state::qb3_frame_r()
{
attotime next_update = m_screen->time_until_update();
attotime frame_period = m_screen->frame_period();
@@ -275,7 +275,7 @@ READ8_MEMBER(qb3_state::qb3_frame_r)
}
-WRITE8_MEMBER(qb3_state::qb3_ram_bank_w)
+void qb3_state::qb3_ram_bank_w(uint8_t data)
{
membank("bank1")->set_entry(m_maincpu->state_int(ccpu_cpu_device::CCPU_P) & 3);
}
@@ -1499,21 +1499,21 @@ ROM_END
void cinemat_state::init_speedfrk()
{
m_gear = 0xe;
- m_maincpu->space(AS_IO).install_read_handler(0x00, 0x03, read8_delegate(*this, FUNC(cinemat_state::speedfrk_wheel_r)));
- m_maincpu->space(AS_IO).install_read_handler(0x04, 0x06, read8_delegate(*this, FUNC(cinemat_state::speedfrk_gear_r)));
+ m_maincpu->space(AS_IO).install_read_handler(0x00, 0x03, read8sm_delegate(*this, FUNC(cinemat_state::speedfrk_wheel_r)));
+ m_maincpu->space(AS_IO).install_read_handler(0x04, 0x06, read8sm_delegate(*this, FUNC(cinemat_state::speedfrk_gear_r)));
save_item(NAME(m_gear));
}
void cinemat_16level_state::init_sundance()
{
- m_maincpu->space(AS_IO).install_read_handler(0x00, 0x0f, read8_delegate(*this, FUNC(cinemat_16level_state::sundance_inputs_r)));
+ m_maincpu->space(AS_IO).install_read_handler(0x00, 0x0f, read8sm_delegate(*this, FUNC(cinemat_16level_state::sundance_inputs_r)));
}
void cinemat_color_state::init_boxingb()
{
- m_maincpu->space(AS_IO).install_read_handler(0x0c, 0x0f, read8_delegate(*this, FUNC(cinemat_color_state::boxingb_dial_r)));
+ m_maincpu->space(AS_IO).install_read_handler(0x0c, 0x0f, read8sm_delegate(*this, FUNC(cinemat_color_state::boxingb_dial_r)));
}
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index dd83abcbc8f..fb3ff5dc849 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -78,7 +78,7 @@ void circusc_state::machine_reset()
m_sn_latch = 0;
}
-READ8_MEMBER(circusc_state::circusc_sh_timer_r)
+uint8_t circusc_state::circusc_sh_timer_r()
{
/* This port reads the output of a counter clocked from the CPU clock.
* The CPU XTAL is 14.31818MHz divided by 4. It then goes through 10
@@ -91,14 +91,12 @@ READ8_MEMBER(circusc_state::circusc_sh_timer_r)
* Can be shortened to:
*/
- int clock;
-
- clock = m_audiocpu->total_cycles() >> 9;
+ int clock = m_audiocpu->total_cycles() >> 9;
return clock & 0x1e;
}
-WRITE8_MEMBER(circusc_state::circusc_sh_irqtrigger_w)
+void circusc_state::circusc_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
@@ -113,7 +111,7 @@ WRITE_LINE_MEMBER(circusc_state::coin_counter_2_w)
machine().bookkeeping().coin_counter_w(1, state);
}
-WRITE8_MEMBER(circusc_state::circusc_sound_w)
+void circusc_state::circusc_sound_w(offs_t offset, uint8_t data)
{
switch (offset & 7)
{
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 7cee49460a8..637290dd756 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -209,7 +209,7 @@ Cisco Heat.
Big Run
**************************************************************************/
-WRITE16_MEMBER(cischeat_state::leds_out_w)
+void cischeat_state::leds_out_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// leds
if (ACCESSING_BITS_0_7)
@@ -382,7 +382,7 @@ void cischeat_state::f1gpstar_map(address_map &map)
**************************************************************************/
// ad stick read select
-READ16_MEMBER(cischeat_state::wildplt_xy_r)
+uint16_t cischeat_state::wildplt_xy_r()
{
switch(m_ip_select)
{
@@ -394,7 +394,7 @@ READ16_MEMBER(cischeat_state::wildplt_xy_r)
}
// buttons & sensors are muxed. bit 0 routes to coin chute (single according to test mode)
-READ16_MEMBER(cischeat_state::wildplt_mux_r)
+uint16_t cischeat_state::wildplt_mux_r()
{
uint16_t split_in = 0xffff;
switch(m_wildplt_output & 0xc)
@@ -407,7 +407,7 @@ READ16_MEMBER(cischeat_state::wildplt_mux_r)
return split_in & ioport("IN1_COMMON")->read();
}
-WRITE16_MEMBER(cischeat_state::wildplt_mux_w)
+void cischeat_state::wildplt_mux_w(uint16_t data)
{
m_wildplt_output = data & 0xc;
}
@@ -513,13 +513,13 @@ void cischeat_state::f1gpstr2_map(address_map &map)
---- ---- ---- --1- Up Limit
---- ---- ---- ---0 Down Limit */
-READ16_MEMBER(cischeat_state::scudhamm_motor_status_r)
+uint16_t cischeat_state::scudhamm_motor_status_r()
{
return m_scudhamm_motor_command; // Motor Status
}
-READ16_MEMBER(cischeat_state::scudhamm_motor_pos_r)
+uint16_t cischeat_state::scudhamm_motor_pos_r()
{
return 0x00 << 8;
}
@@ -533,7 +533,7 @@ READ16_MEMBER(cischeat_state::scudhamm_motor_pos_r)
Within $20 vblanks the motor must reach the target. */
-WRITE16_MEMBER(cischeat_state::scudhamm_motor_command_w)
+void cischeat_state::scudhamm_motor_command_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA( &m_scudhamm_motor_command );
}
@@ -565,7 +565,7 @@ uint8_t cischeat_state::scudhamm_analog_r()
port (coins, tilt, buttons, select etc.) triggers the corresponding bit
in this word. I mapped the 3 buttons to the first 3 led.
*/
-WRITE16_MEMBER(cischeat_state::scudhamm_leds_w)
+void cischeat_state::scudhamm_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -587,12 +587,12 @@ WRITE16_MEMBER(cischeat_state::scudhamm_leds_w)
$FFFC during self test, $FFFF onwards.
It could be audio(L/R) or layers(0/2) enable.
*/
-WRITE16_MEMBER(cischeat_state::scudhamm_enable_w)
+void cischeat_state::scudhamm_enable_w(uint16_t data)
{
}
-WRITE16_MEMBER(cischeat_state::scudhamm_oki_bank_w)
+void cischeat_state::scudhamm_oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -628,12 +628,12 @@ void cischeat_state::scudhamm_map(address_map &map)
Arm Champs II
**************************************************************************/
-READ16_MEMBER(armchamp2_state::motor_status_r)
+uint16_t armchamp2_state::motor_status_r()
{
return 0x11;
}
-WRITE16_MEMBER(armchamp2_state::motor_command_w)
+void armchamp2_state::motor_command_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// 0x00xx -> disable motor (test mode)
// 0x10ff -> automated test (test limits?)
@@ -659,7 +659,7 @@ uint8_t armchamp2_state::analog_r()
---- ---- 76-- ---- Coin counters
---- ---- --54 3210
*/
-WRITE16_MEMBER(armchamp2_state::output_w)
+void armchamp2_state::output_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -705,7 +705,7 @@ void armchamp2_state::armchmp2_map(address_map &map)
#define RIGHT 0
#define LEFT 1
-WRITE16_MEMBER(captflag_state::leds_w)
+void captflag_state::leds_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA( &m_captflag_leds );
if (ACCESSING_BITS_8_15)
@@ -722,7 +722,7 @@ WRITE16_MEMBER(captflag_state::leds_w)
}
}
-WRITE16_MEMBER(captflag_state::oki_bank_w)
+void captflag_state::oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -733,7 +733,7 @@ WRITE16_MEMBER(captflag_state::oki_bank_w)
// Motors
-WRITE16_MEMBER(captflag_state::motor_command_right_w)
+void captflag_state::motor_command_right_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// Output check:
// e09a up
@@ -743,7 +743,7 @@ WRITE16_MEMBER(captflag_state::motor_command_right_w)
data = COMBINE_DATA( &m_motor_command[RIGHT] );
motor_move(RIGHT, data);
}
-WRITE16_MEMBER(captflag_state::motor_command_left_w)
+void captflag_state::motor_command_left_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// Output check:
// e0ba up
@@ -953,7 +953,7 @@ void cischeat_state::f1gpstar_map3(address_map &map)
Big Run
**************************************************************************/
-WRITE16_MEMBER(cischeat_state::bigrun_soundbank_w)
+void cischeat_state::bigrun_soundbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -978,12 +978,12 @@ void cischeat_state::bigrun_sound_map(address_map &map)
Cisco Heat
**************************************************************************/
-WRITE16_MEMBER(cischeat_state::cischeat_soundbank_1_w)
+void cischeat_state::cischeat_soundbank_1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7) m_oki1->set_rom_bank(data & 1);
}
-WRITE16_MEMBER(cischeat_state::cischeat_soundbank_2_w)
+void cischeat_state::cischeat_soundbank_2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7) m_oki2->set_rom_bank(data & 1);
}
diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp
index 47ea952a56e..5cdb97962a6 100644
--- a/src/mame/drivers/citycon.cpp
+++ b/src/mame/drivers/citycon.cpp
@@ -31,12 +31,12 @@ Dip locations added from dip listing at crazykong.com
#define VBEND (16)
#define VBSTART (240)
-READ8_MEMBER(citycon_state::citycon_in_r)
+uint8_t citycon_state::citycon_in_r()
{
return ioport(flip_screen() ? "P2" : "P1")->read();
}
-READ8_MEMBER(citycon_state::citycon_irq_ack_r)
+uint8_t citycon_state::citycon_irq_ack_r()
{
m_maincpu->set_input_line(0, CLEAR_LINE);
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index f1179caf4f3..7f014bca587 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -149,7 +149,7 @@ public:
return 0;
}
- READ8_MEMBER(ram_r)
+ uint8_t ram_r(offs_t offset)
{
if (offset < m_ram->size())
{
@@ -159,7 +159,7 @@ public:
return 0xff;
}
- WRITE8_MEMBER(ram_w)
+ void ram_w(offs_t offset, uint8_t data)
{
if (offset < m_ram->size())
{
@@ -265,37 +265,37 @@ public:
}
}
- WRITE8_MEMBER(mmu_mode_kern_w)
+ void mmu_mode_kern_w(uint8_t data)
{
update_mmu_mode(MMU_MODE_KERN);
}
- WRITE8_MEMBER(mmu_mode_appl_w)
+ void mmu_mode_appl_w(uint8_t data)
{
update_mmu_mode(MMU_MODE_APPL);
}
- WRITE8_MEMBER(mmu_mode_ram_w)
+ void mmu_mode_ram_w(uint8_t data)
{
update_mmu_mode(MMU_MODE_RAM);
}
- WRITE8_MEMBER(mmu_mode_recall_w)
+ void mmu_mode_recall_w(uint8_t data)
{
update_mmu_mode(m_mmu_saved_mode);
}
- WRITE8_MEMBER(mmu_mode_save_w)
+ void mmu_mode_save_w(uint8_t data)
{
m_mmu_saved_mode = m_mmu_mode;
}
- WRITE8_MEMBER(mmu_mode_test_w)
+ void mmu_mode_test_w(uint8_t data)
{
update_mmu_mode(MMU_MODE_TEST);
}
- WRITE8_MEMBER(mmu_offset1_w)
+ void mmu_offset1_w(uint8_t data)
{
if (m_mmu_offset1 != data)
{
@@ -304,7 +304,7 @@ public:
}
}
- WRITE8_MEMBER(mmu_offset2_w)
+ void mmu_offset2_w(uint8_t data)
{
if (m_mmu_offset2 != data)
{
@@ -313,7 +313,7 @@ public:
}
}
- WRITE8_MEMBER(mmu_offset3_w)
+ void mmu_offset3_w(uint8_t data)
{
if (m_mmu_offset3 != data)
{
@@ -322,7 +322,7 @@ public:
}
}
- WRITE8_MEMBER(mmu_offset4_w)
+ void mmu_offset4_w(uint8_t data)
{
if (m_mmu_offset4 != data)
{
@@ -331,7 +331,7 @@ public:
}
}
- WRITE8_MEMBER(mmu_offset5_w)
+ void mmu_offset5_w(uint8_t data)
{
if (m_mmu_offset5 != data)
{
@@ -340,47 +340,47 @@ public:
}
}
- READ8_MEMBER(mmu_offset1_r)
+ uint8_t mmu_offset1_r()
{
return m_mmu_offset1;
}
- READ8_MEMBER(mmu_offset2_r)
+ uint8_t mmu_offset2_r()
{
return m_mmu_offset2;
}
- READ8_MEMBER(mmu_offset3_r)
+ uint8_t mmu_offset3_r()
{
return m_mmu_offset3;
}
- READ8_MEMBER(mmu_offset4_r)
+ uint8_t mmu_offset4_r()
{
return m_mmu_offset4;
}
- READ8_MEMBER(mmu_offset5_r)
+ uint8_t mmu_offset5_r()
{
return m_mmu_offset5;
}
- WRITE8_MEMBER(lcd_scrollx_w)
+ void lcd_scrollx_w(uint8_t data)
{
m_lcd_scrollx = data;
}
- WRITE8_MEMBER(lcd_scrolly_w)
+ void lcd_scrolly_w(uint8_t data)
{
m_lcd_scrolly = data;
}
- WRITE8_MEMBER(lcd_mode_w)
+ void lcd_mode_w(uint8_t data)
{
m_lcd_mode = data;
}
- WRITE8_MEMBER(lcd_size_w)
+ void lcd_size_w(uint8_t data)
{
m_lcd_size = data;
}
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 31d1a1a36a8..5dacb21df5c 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -144,21 +144,21 @@ WRITE_LINE_MEMBER(cloak_state::coin_counter_r_w)
machine().bookkeeping().coin_counter_w(1, state);
}
-WRITE8_MEMBER(cloak_state::cloak_custom_w)
+void cloak_state::cloak_custom_w(uint8_t data)
{
}
-WRITE8_MEMBER(cloak_state::cloak_irq_reset_0_w)
+void cloak_state::cloak_irq_reset_0_w(uint8_t data)
{
m_maincpu->set_input_line(0, CLEAR_LINE);
}
-WRITE8_MEMBER(cloak_state::cloak_irq_reset_1_w)
+void cloak_state::cloak_irq_reset_1_w(uint8_t data)
{
m_slave->set_input_line(0, CLEAR_LINE);
}
-WRITE8_MEMBER(cloak_state::cloak_nvram_enable_w)
+void cloak_state::cloak_nvram_enable_w(uint8_t data)
{
m_nvram_enabled = data & 0x01;
}
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index 8b616e002e9..fb28a5eca59 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -206,7 +206,7 @@ void cloud9_state::machine_reset()
*
*************************************/
-WRITE8_MEMBER(cloud9_state::irq_ack_w)
+void cloud9_state::irq_ack_w(uint8_t data)
{
if (m_irq_state)
{
@@ -216,7 +216,7 @@ WRITE8_MEMBER(cloud9_state::irq_ack_w)
}
-READ8_MEMBER(cloud9_state::leta_r)
+uint8_t cloud9_state::leta_r(offs_t offset)
{
return ioport(offset ? "TRACKX" : "TRACKY")->read();
}
@@ -229,7 +229,7 @@ READ8_MEMBER(cloud9_state::leta_r)
*
*************************************/
-WRITE8_MEMBER(cloud9_state::nvram_recall_w)
+void cloud9_state::nvram_recall_w(uint8_t data)
{
m_nvram->recall(0);
m_nvram->recall(1);
@@ -237,7 +237,7 @@ WRITE8_MEMBER(cloud9_state::nvram_recall_w)
}
-WRITE8_MEMBER(cloud9_state::nvram_store_w)
+void cloud9_state::nvram_store_w(uint8_t data)
{
m_nvram->store(0);
m_nvram->store(1);
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index 78dff2a5ff2..e453e7e9044 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -55,7 +55,7 @@ void clshroad_state::machine_reset()
}
-READ8_MEMBER(clshroad_state::input_r)
+uint8_t clshroad_state::input_r(offs_t offset)
{
return ((~ioport("P1")->read() & (1 << offset)) ? 1 : 0) |
((~ioport("P2")->read() & (1 << offset)) ? 2 : 0) |
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index 6e0fecf13ef..b066e74301d 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -56,14 +56,14 @@ Note about version levels using Mutant Fighter as the example:
/**********************************************************************************/
template<int Chip>
-WRITE16_MEMBER(cninja_state::cninja_pf_control_w)
+void cninja_state::cninja_pf_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_screen->update_partial(m_screen->vpos());
m_deco_tilegen[Chip]->pf_control_w(offset, data, mem_mask);
}
-READ16_MEMBER( cninja_state::cninja_protection_region_0_104_r )
+uint16_t cninja_state::cninja_protection_region_0_104_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;
@@ -72,7 +72,7 @@ READ16_MEMBER( cninja_state::cninja_protection_region_0_104_r )
return data;
}
-WRITE16_MEMBER( cninja_state::cninja_protection_region_0_104_w )
+void cninja_state::cninja_protection_region_0_104_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;
@@ -80,7 +80,7 @@ WRITE16_MEMBER( cninja_state::cninja_protection_region_0_104_w )
m_ioprot->write_data( deco146_addr, data, mem_mask, cs );
}
-READ16_MEMBER(cninja_state::cninjabl2_sprite_dma_r)
+uint16_t cninja_state::cninjabl2_sprite_dma_r()
{
m_spriteram[0]->copy();
return 0;
@@ -145,7 +145,7 @@ void cninja_state::cninjabl_map(address_map &map)
map(0x1b4000, 0x1b4001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */
}
-READ16_MEMBER( cninja_state::edrandy_protection_region_8_146_r )
+uint16_t cninja_state::edrandy_protection_region_8_146_r(offs_t offset)
{
int real_address = 0x1a0000 + (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;
@@ -154,7 +154,7 @@ READ16_MEMBER( cninja_state::edrandy_protection_region_8_146_r )
return data;
}
-WRITE16_MEMBER( cninja_state::edrandy_protection_region_8_146_w )
+void cninja_state::edrandy_protection_region_8_146_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int real_address = 0x1a0000 + (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;
@@ -162,7 +162,7 @@ WRITE16_MEMBER( cninja_state::edrandy_protection_region_8_146_w )
m_ioprot->write_data( deco146_addr, data, mem_mask, cs );
}
-READ16_MEMBER( cninja_state::edrandy_protection_region_6_146_r )
+uint16_t cninja_state::edrandy_protection_region_6_146_r(offs_t offset)
{
// uint16_t realdat = deco16_60_prot_r(space,offset&0x3ff,mem_mask);
@@ -178,7 +178,7 @@ READ16_MEMBER( cninja_state::edrandy_protection_region_6_146_r )
return data;
}
-WRITE16_MEMBER( cninja_state::edrandy_protection_region_6_146_w )
+void cninja_state::edrandy_protection_region_6_146_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// deco16_60_prot_w(space,offset&0x3ff,data,mem_mask);
@@ -218,7 +218,7 @@ void cninja_state::edrandy_map(address_map &map)
map(0x1bc800, 0x1bcfff).nopw(); /* Another bug in game code? Sprite list can overrun. Doesn't seem to mirror */
}
-WRITE16_MEMBER(cninja_state::robocop2_priority_w)
+void cninja_state::robocop2_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_priority);
}
@@ -254,7 +254,7 @@ void cninja_state::robocop2_map(address_map &map)
}
-READ16_MEMBER( cninja_state::mutantf_protection_region_0_146_r )
+uint16_t cninja_state::mutantf_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;
@@ -263,7 +263,7 @@ READ16_MEMBER( cninja_state::mutantf_protection_region_0_146_r )
return data;
}
-WRITE16_MEMBER( cninja_state::mutantf_protection_region_0_146_w )
+void cninja_state::mutantf_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;
@@ -271,7 +271,7 @@ WRITE16_MEMBER( cninja_state::mutantf_protection_region_0_146_w )
m_ioprot->write_data( deco146_addr, data, mem_mask, cs );
}
-READ16_MEMBER( cninja_state::mutantf_71_r )
+uint16_t cninja_state::mutantf_71_r()
{
return 0xffff; // todo
}
@@ -2170,7 +2170,7 @@ ROM_END
void cninja_state::init_cninjabl2()
{
m_maincpu->space(AS_PROGRAM).install_ram(0x180000, 0x18ffff);
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x1b4000, 0x1b4001, read16_delegate(*this, FUNC(cninja_state::cninjabl2_sprite_dma_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x1b4000, 0x1b4001, read16smo_delegate(*this, FUNC(cninja_state::cninjabl2_sprite_dma_r)));
m_okibank->configure_entries(0, 8, memregion("oki2")->base(), 0x10000);
}
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index 3b0bac5b32f..d30e64d7e43 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -301,13 +301,13 @@ uint32_t coinmvga_state::screen_update_coinmvga(screen_device &screen, bitmap_in
* Read / Write Handlers *
**************************/
-//WRITE8_MEMBER(coinmvga_state::debug_w)
+//void coinmvga_state::debug_w(uint8_t data)
//{
// popmessage("written : %02X", data);
//}
/*
-READ16_MEMBER(coinmvga_state::test_r)
+uint16_t coinmvga_state::test_r()
{
return machine().rand();
}*/
diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp
index 04046b45c24..015899fbd5a 100644
--- a/src/mame/drivers/coleco.cpp
+++ b/src/mame/drivers/coleco.cpp
@@ -77,27 +77,27 @@
/* Read/Write Handlers */
-READ8_MEMBER( coleco_state::paddle_1_r )
+uint8_t coleco_state::paddle_1_r()
{
return m_joy_d7_state[0] | coleco_paddle_read(0, m_joy_mode, m_joy_analog_state[0]);
}
-READ8_MEMBER( coleco_state::paddle_2_r )
+uint8_t coleco_state::paddle_2_r()
{
return m_joy_d7_state[1] | coleco_paddle_read(1, m_joy_mode, m_joy_analog_state[1]);
}
-WRITE8_MEMBER( coleco_state::paddle_off_w )
+void coleco_state::paddle_off_w(uint8_t data)
{
m_joy_mode = 0;
}
-WRITE8_MEMBER( coleco_state::paddle_on_w )
+void coleco_state::paddle_on_w(uint8_t data)
{
m_joy_mode = 1;
}
-READ8_MEMBER( bit90_state::bankswitch_u4_r )
+uint8_t bit90_state::bankswitch_u4_r(address_space &space)
{
if (!machine().side_effects_disabled()) {
LOG("Bankswitch to u4\n");
@@ -106,7 +106,7 @@ READ8_MEMBER( bit90_state::bankswitch_u4_r )
return space.unmap();
}
-READ8_MEMBER( bit90_state::bankswitch_u3_r )
+uint8_t bit90_state::bankswitch_u3_r(address_space &space)
{
if (!machine().side_effects_disabled()) {
LOG("Bankswitch to u3\n");
@@ -115,7 +115,7 @@ READ8_MEMBER( bit90_state::bankswitch_u3_r )
return space.unmap();
}
-READ8_MEMBER( bit90_state::keyboard_r )
+uint8_t bit90_state::keyboard_r(address_space &space)
{
if (m_keyselect < 8) {
return m_io_keyboard[m_keyselect]->read();
@@ -123,7 +123,7 @@ READ8_MEMBER( bit90_state::keyboard_r )
return space.unmap();
}
-WRITE8_MEMBER( bit90_state::u32_w )
+void bit90_state::u32_w(uint8_t data)
{
// Write to a 74LS174 at u32
// Bits 4-7 are connected for keyboard scanning (actually only 4-6 are used)
@@ -392,7 +392,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(coleco_state::paddle_update_callback)
}
}
-READ8_MEMBER( coleco_state::cart_r )
+uint8_t coleco_state::cart_r(offs_t offset)
{
return m_cart->bd_r(offset & 0x7fff, 0, 0, 0, 0, 0);
}
@@ -505,7 +505,7 @@ void coleco_state::machine_start()
}
if (m_cart->exists())
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xffff, read8_delegate(*this, FUNC(coleco_state::cart_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xffff, read8sm_delegate(*this, FUNC(coleco_state::cart_r)));
save_item(NAME(m_joy_mode));
save_item(NAME(m_last_nmi_state));
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 82a119c776d..b0c537a6bc7 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -136,7 +136,7 @@ Dip location and recommended settings verified with the US manual
*
*************************************/
-WRITE8_MEMBER(combatsc_state::combatsc_vreg_w)
+void combatsc_state::combatsc_vreg_w(uint8_t data)
{
if (data != m_vreg)
{
@@ -149,14 +149,14 @@ WRITE8_MEMBER(combatsc_state::combatsc_vreg_w)
}
}
-READ8_MEMBER(combatsc_state::combatscb_io_r)
+uint8_t combatsc_state::combatscb_io_r(offs_t offset)
{
static const char *const portnames[] = { "IN0", "IN1", "DSW1", "DSW2" };
return ioport(portnames[offset])->read();
}
-WRITE8_MEMBER(combatsc_state::combatscb_priority_w)
+void combatsc_state::combatscb_priority_w(uint8_t data)
{
if (data & 0x40)
{
@@ -174,7 +174,7 @@ WRITE8_MEMBER(combatsc_state::combatscb_priority_w)
m_priority = data & 0x20;
}
-WRITE8_MEMBER(combatsc_state::combatsc_bankselect_w)
+void combatsc_state::combatsc_bankselect_w(uint8_t data)
{
m_priority = data & 0x20;
@@ -197,18 +197,18 @@ WRITE8_MEMBER(combatsc_state::combatsc_bankselect_w)
membank("bank1")->set_entry(8 + (data & 1));
}
-WRITE8_MEMBER(combatsc_state::combatscb_io_w)
+void combatsc_state::combatscb_io_w(offs_t offset, uint8_t data)
{
switch (offset)
{
- case 0x400: combatscb_priority_w(space, 0, data); break;
+ case 0x400: combatscb_priority_w(data); break;
case 0x800: m_soundlatch->write(data); break;
- case 0xc00: combatsc_vreg_w(space, 0, data); break;
+ case 0xc00: combatsc_vreg_w(data); break;
default: m_io_ram[offset] = data; break;
}
}
-WRITE8_MEMBER(combatsc_state::combatscb_bankselect_w)
+void combatsc_state::combatscb_bankselect_w(address_space &space, uint8_t data)
{
if (data & 0x40)
{
@@ -235,8 +235,8 @@ WRITE8_MEMBER(combatsc_state::combatscb_bankselect_w)
if (data == 0x1f)
{
membank("bank1")->set_entry(8 + (data & 1));
- space.install_write_handler(0x4000, 0x7fff, write8_delegate(*this, FUNC(combatsc_state::combatscb_io_w)));
- space.install_read_handler(0x4400, 0x4403, read8_delegate(*this, FUNC(combatsc_state::combatscb_io_r))); // IO RAM & Video Registers
+ space.install_write_handler(0x4000, 0x7fff, write8sm_delegate(*this, FUNC(combatsc_state::combatscb_io_w)));
+ space.install_read_handler(0x4400, 0x4403, read8sm_delegate(*this, FUNC(combatsc_state::combatscb_io_r))); // IO RAM & Video Registers
}
else
{
@@ -248,7 +248,7 @@ WRITE8_MEMBER(combatsc_state::combatscb_bankselect_w)
/****************************************************************************/
-WRITE8_MEMBER(combatsc_state::combatsc_coin_counter_w)
+void combatsc_state::combatsc_coin_counter_w(uint8_t data)
{
/* b7-b3: unused? */
/* b1: coin counter 2 */
@@ -258,7 +258,7 @@ WRITE8_MEMBER(combatsc_state::combatsc_coin_counter_w)
machine().bookkeeping().coin_counter_w(1, data & 0x02);
}
-READ8_MEMBER(combatsc_state::trackball_r)
+uint8_t combatsc_state::trackball_r(offs_t offset)
{
if (offset == 0)
{
@@ -293,15 +293,15 @@ READ8_MEMBER(combatsc_state::trackball_r)
/* the protection is a simple multiply */
-WRITE8_MEMBER(combatsc_state::protection_w)
+void combatsc_state::protection_w(offs_t offset, uint8_t data)
{
m_prot[offset] = data;
}
-READ8_MEMBER(combatsc_state::protection_r)
+uint8_t combatsc_state::protection_r(offs_t offset)
{
return ((m_prot[0] * m_prot[1]) >> (offset * 8)) & 0xff;
}
-WRITE8_MEMBER(combatsc_state::protection_clock_w)
+void combatsc_state::protection_clock_w(uint8_t data)
{
/* 0x3f is written here every time before accessing the other registers */
}
@@ -309,22 +309,22 @@ WRITE8_MEMBER(combatsc_state::protection_clock_w)
/****************************************************************************/
-WRITE8_MEMBER(combatsc_state::combatsc_sh_irqtrigger_w)
+void combatsc_state::combatsc_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
-READ8_MEMBER(combatsc_state::combatsc_busy_r)
+uint8_t combatsc_state::combatsc_busy_r()
{
return m_upd7759->busy_r() ? 1 : 0;
}
-WRITE8_MEMBER(combatsc_state::combatsc_play_w)
+void combatsc_state::combatsc_play_w(uint8_t data)
{
m_upd7759->start_w(data & 2);
}
-WRITE8_MEMBER(combatsc_state::combatsc_voice_reset_w)
+void combatsc_state::combatsc_voice_reset_w(uint8_t data)
{
m_upd7759->reset_w(data & 1);
}
@@ -335,7 +335,7 @@ void combatsc_state::combatsc_portA_w(uint8_t data)
}
// causes scores to disappear during fire ranges, either sprite busy flag or screen frame number related
-READ8_MEMBER(combatsc_state::unk_r)
+uint8_t combatsc_state::unk_r()
{
return 0; //m_screen->frame_number() & 1;
}
@@ -400,7 +400,7 @@ void combatsc_state::combatsc_sound_map(address_map &map)
map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); /* YM 2203 intercepted */
}
-WRITE8_MEMBER(combatsc_state::combatscb_msm_w)
+void combatsc_state::combatscb_msm_w(uint8_t data)
{
membank("bl_abank")->set_entry(BIT(data, 7));
@@ -408,7 +408,7 @@ WRITE8_MEMBER(combatsc_state::combatscb_msm_w)
m_msm->data_w(data & 0x0f);
}
-WRITE8_MEMBER(combatsc_state::combatscb_sound_irq_ack)
+void combatsc_state::combatscb_sound_irq_ack(uint8_t data)
{
m_audiocpu->set_input_line(0, CLEAR_LINE);
}
@@ -677,9 +677,6 @@ MACHINE_START_MEMBER(combatsc_state,combatscb)
void combatsc_state::machine_reset()
{
- address_space &space = m_maincpu->space(AS_PROGRAM);
- int i;
-
memset(m_io_ram, 0x00, 0x4000);
memset(m_page[0], 0x00, 0x2000);
memset(m_page[1], 0x00, 0x2000);
@@ -690,13 +687,13 @@ void combatsc_state::machine_reset()
m_prot[0] = 0;
m_prot[1] = 0;
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
{
m_pos[i] = 0;
m_sign[i] = 0;
}
- combatsc_bankselect_w(space, 0, 0);
+ combatsc_bankselect_w(0);
}
/* combat school (original) */
diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp
index 78ee3a4f452..2418c7c4fd6 100644
--- a/src/mame/drivers/comquest.cpp
+++ b/src/mame/drivers/comquest.cpp
@@ -50,14 +50,14 @@ icq3250a-d
#ifdef UNUSED_FUNCTION
-READ8_MEMBER(comquest_state::comquest_read)
+uint8_t comquest_state::comquest_read(offs_t offset)
{
uint8_t data=0;
logerror("comquest read %.4x %.2x\n",offset,data);
return data;
}
-WRITE8_MEMBER(comquest_state::comquest_write)
+void comquest_state::comquest_write(offs_t offset, uint8_t data)
{
logerror("comquest read %.4x %.2x\n",offset,data);
}
diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp
index 688cf20f5a4..ae63ceabe3e 100644
--- a/src/mame/drivers/comx35.cpp
+++ b/src/mame/drivers/comx35.cpp
@@ -210,7 +210,7 @@ QUICKLOAD_LOAD_MEMBER(comx35_state::quickload_cb)
// mem_r - memory read
//-------------------------------------------------
-READ8_MEMBER( comx35_state::mem_r )
+uint8_t comx35_state::mem_r(offs_t offset)
{
int extrom = 1;
@@ -237,7 +237,7 @@ READ8_MEMBER( comx35_state::mem_r )
// mem_w - memory write
//-------------------------------------------------
-WRITE8_MEMBER( comx35_state::mem_w )
+void comx35_state::mem_w(offs_t offset, uint8_t data)
{
m_exp->mwr_w(offset, data);
@@ -260,7 +260,7 @@ WRITE8_MEMBER( comx35_state::mem_w )
// io_r - I/O read
//-------------------------------------------------
-READ8_MEMBER( comx35_state::io_r )
+uint8_t comx35_state::io_r(offs_t offset)
{
uint8_t data = m_exp->io_r(offset);
@@ -277,13 +277,13 @@ READ8_MEMBER( comx35_state::io_r )
// io_w - I/O write
//-------------------------------------------------
-WRITE8_MEMBER( comx35_state::io_w )
+void comx35_state::io_w(offs_t offset, uint8_t data)
{
m_exp->io_w(offset, data);
if (offset >= 3)
{
- cdp1869_w(space, offset, data);
+ cdp1869_w(offset, data);
}
}
diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp
index 085acf4903b..79379fc66ab 100644
--- a/src/mame/drivers/contra.cpp
+++ b/src/mame/drivers/contra.cpp
@@ -35,22 +35,22 @@ INTERRUPT_GEN_MEMBER(contra_state::contra_interrupt)
device.execute().set_input_line(HD6309_IRQ_LINE, HOLD_LINE);
}
-WRITE8_MEMBER(contra_state::contra_bankswitch_w)
+void contra_state::contra_bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x0f);
}
-WRITE8_MEMBER(contra_state::contra_sh_irqtrigger_w)
+void contra_state::contra_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
}
-WRITE8_MEMBER(contra_state::sirq_clear_w)
+void contra_state::sirq_clear_w(uint8_t data)
{
m_audiocpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
}
-WRITE8_MEMBER(contra_state::contra_coin_counter_w)
+void contra_state::contra_coin_counter_w(uint8_t data)
{
if (data & 0x01)
machine().bookkeeping().coin_counter_w(0, data & 0x01);
diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp
index 29f83f1d25b..8028dcc7a7e 100644
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@@ -156,7 +156,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(coolpool_state::nvram_write_timeout)
}
-WRITE16_MEMBER(coolpool_state::nvram_thrash_w)
+void coolpool_state::nvram_thrash_w(offs_t offset, uint16_t data)
{
/* keep track of the last few writes */
memmove(&m_nvram_write_seq[0], &m_nvram_write_seq[1], (NVRAM_UNLOCK_SEQ_LEN - 1) * sizeof(m_nvram_write_seq[0]));
@@ -171,7 +171,7 @@ WRITE16_MEMBER(coolpool_state::nvram_thrash_w)
}
-WRITE16_MEMBER(coolpool_state::nvram_data_w)
+void coolpool_state::nvram_data_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* only the low 8 bits matter */
if (ACCESSING_BITS_0_7)
@@ -184,10 +184,10 @@ WRITE16_MEMBER(coolpool_state::nvram_data_w)
}
-WRITE16_MEMBER(coolpool_state::nvram_thrash_data_w)
+void coolpool_state::nvram_thrash_data_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
- nvram_data_w(space, offset, data, mem_mask);
- nvram_thrash_w(space, offset, data, mem_mask);
+ nvram_data_w(offset, data, mem_mask);
+ nvram_thrash_w(offset, data);
}
@@ -205,7 +205,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(coolpool_state::amerdart_audio_int_gen)
}
-WRITE16_MEMBER(coolpool_state::amerdart_misc_w)
+void coolpool_state::amerdart_misc_w(uint16_t data)
{
logerror("%08x:IOP_system_w %04x\n",m_maincpu->pc(),data);
@@ -317,7 +317,7 @@ int coolpool_state::amerdart_trackball_direction(int num, int data)
}
-READ16_MEMBER(coolpool_state::amerdart_trackball_r)
+uint16_t coolpool_state::amerdart_trackball_r(offs_t offset)
{
/*
Trackballs seem to be handled as though they're rotated 45 degrees anti-clockwise.
@@ -389,7 +389,7 @@ READ16_MEMBER(coolpool_state::amerdart_trackball_r)
*
*************************************/
-WRITE16_MEMBER(coolpool_state::coolpool_misc_w)
+void coolpool_state::coolpool_misc_w(uint16_t data)
{
logerror("%08x:IOP_system_w %04x\n",m_maincpu->pc(),data);
@@ -426,13 +426,13 @@ uint16_t coolpool_state::dsp_hold_line_r()
*
*************************************/
-READ16_MEMBER(coolpool_state::dsp_rom_r)
+uint16_t coolpool_state::dsp_rom_r()
{
return m_dsp_rom[m_iop_romaddr & (m_dsp_rom.mask())];
}
-WRITE16_MEMBER(coolpool_state::dsp_romaddr_w)
+void coolpool_state::dsp_romaddr_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -454,7 +454,7 @@ WRITE16_MEMBER(coolpool_state::dsp_romaddr_w)
*
*************************************/
-READ16_MEMBER(coolpool_state::coolpool_input_r)
+uint16_t coolpool_state::coolpool_input_r(offs_t offset)
{
m_result = (ioport("IN1")->read() & 0x00ff) | (m_lastresult & 0xff00);
m_newx[1] = ioport("XAXIS")->read();
diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp
index e8f6677f85a..4647c04bd75 100644
--- a/src/mame/drivers/cop01.cpp
+++ b/src/mame/drivers/cop01.cpp
@@ -78,13 +78,13 @@ Mighty Guy board layout:
*
*************************************/
-WRITE8_MEMBER(cop01_state::cop01_sound_command_w)
+void cop01_state::cop01_sound_command_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->set_input_line(0, ASSERT_LINE);
}
-READ8_MEMBER(cop01_state::cop01_sound_command_r)
+uint8_t cop01_state::cop01_sound_command_r()
{
int res = (m_soundlatch->read() & 0x7f) << 1;
@@ -109,12 +109,12 @@ READ_LINE_MEMBER(cop01_state::mightguy_area_r)
return (ioport("FAKE")->read() & Mask) ? 1 : 0;
}
-WRITE8_MEMBER(cop01_state::cop01_irq_ack_w)
+void cop01_state::cop01_irq_ack_w(uint8_t data)
{
m_maincpu->set_input_line(0, CLEAR_LINE );
}
-READ8_MEMBER(cop01_state::cop01_sound_irq_ack_w)
+uint8_t cop01_state::cop01_sound_irq_ack_w()
{
m_audiocpu->set_input_line(0, CLEAR_LINE );
return 0;
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index 061158521e4..87ea3b49834 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -70,12 +70,12 @@ Added Dip locations according to manual.
*
*************************************/
-READ8_MEMBER(copsnrob_state::copsnrob_misc_r)
+uint8_t copsnrob_state::copsnrob_misc_r()
{
return m_screen->vblank() ? 0x00 : 0x80;
}
-WRITE8_MEMBER(copsnrob_state::copsnrob_misc2_w)
+void copsnrob_state::copsnrob_misc2_w(uint8_t data)
{
m_misc = data & 0x7f;
/* Multi Player Start */
diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp
index 9bfb1f3a8cd..c5d5b976777 100644
--- a/src/mame/drivers/cosmic.cpp
+++ b/src/mame/drivers/cosmic.cpp
@@ -46,7 +46,7 @@ cosmicg - board can operate in b&w mode if there is no PROM, in this case
/* Schematics show 12 triggers for discrete sound circuits */
-WRITE8_MEMBER(cosmic_state::panic_sound_output_w)
+void cosmic_state::panic_sound_output_w(offs_t offset, uint8_t data)
{
/* Sound Enable / Disable */
if (offset == 11)
@@ -112,7 +112,7 @@ WRITE8_MEMBER(cosmic_state::panic_sound_output_w)
#endif
}
-WRITE8_MEMBER(cosmic_state::panic_sound_output2_w)
+void cosmic_state::panic_sound_output2_w(offs_t offset, uint8_t data)
{
if (m_sound_enabled)
{
@@ -128,7 +128,7 @@ WRITE8_MEMBER(cosmic_state::panic_sound_output2_w)
#endif
}
-WRITE8_MEMBER(cosmic_state::cosmicg_output_w)
+void cosmic_state::cosmicg_output_w(offs_t offset, uint8_t data)
{
/* Sound Enable / Disable */
if (offset == 12)
@@ -190,7 +190,7 @@ WRITE8_MEMBER(cosmic_state::cosmicg_output_w)
}
-WRITE8_MEMBER(cosmic_state::cosmica_sound_output_w)
+void cosmic_state::cosmica_sound_output_w(offs_t offset, uint8_t data)
{
/* Sound Enable / Disable */
if (offset == 11)
@@ -327,17 +327,17 @@ WRITE8_MEMBER(cosmic_state::cosmica_sound_output_w)
#endif
}
-WRITE8_MEMBER(cosmic_state::dac_w)
+void cosmic_state::dac_w(uint8_t data)
{
m_dac->write(BIT(data, 7));
}
-READ8_MEMBER(cosmic_state::cosmica_pixel_clock_r)
+uint8_t cosmic_state::cosmica_pixel_clock_r()
{
return (m_screen->vpos() >> 2) & 0x3f;
}
-READ8_MEMBER(cosmic_state::cosmicg_port_0_r)
+uint8_t cosmic_state::cosmicg_port_0_r(offs_t offset)
{
/* The top four address lines from the CRTC are bits 0-3 */
if (offset >= 4)
@@ -346,12 +346,12 @@ READ8_MEMBER(cosmic_state::cosmicg_port_0_r)
return BIT(m_screen->vpos(), offset + 4);
}
-READ8_MEMBER(cosmic_state::cosmicg_port_1_r)
+uint8_t cosmic_state::cosmicg_port_1_r(offs_t offset)
{
return BIT(m_in_ports[1]->read(), offset);
}
-READ8_MEMBER(cosmic_state::magspot_coinage_dip_r)
+uint8_t cosmic_state::magspot_coinage_dip_r(offs_t offset)
{
return (m_dsw.read_safe(0) & (1 << (7 - offset))) ? 0 : 1;
}
@@ -359,7 +359,7 @@ READ8_MEMBER(cosmic_state::magspot_coinage_dip_r)
/* Has 8 way joystick, remap combinations to missing directions */
-READ8_MEMBER(cosmic_state::nomnlnd_port_0_1_r)
+uint8_t cosmic_state::nomnlnd_port_0_1_r(offs_t offset)
{
int control = m_in_ports[offset]->read();
int fire = m_in_ports[3]->read();
@@ -378,7 +378,7 @@ READ8_MEMBER(cosmic_state::nomnlnd_port_0_1_r)
-WRITE8_MEMBER(cosmic_state::flip_screen_w)
+void cosmic_state::flip_screen_w(uint8_t data)
{
flip_screen_set(data & 0x80);
}
@@ -1597,16 +1597,16 @@ void cosmic_state::init_cosmica()
void cosmic_state::init_devzone()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x4807, 0x4807, write8_delegate(*this, FUNC(cosmic_state::cosmic_background_enable_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x4807, 0x4807, write8smo_delegate(*this, FUNC(cosmic_state::cosmic_background_enable_w)));
}
void cosmic_state::init_nomnlnd()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x5000, 0x5001, read8_delegate(*this, FUNC(cosmic_state::nomnlnd_port_0_1_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x5000, 0x5001, read8sm_delegate(*this, FUNC(cosmic_state::nomnlnd_port_0_1_r)));
m_maincpu->space(AS_PROGRAM).nop_write(0x4800, 0x4800);
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x4807, 0x4807, write8_delegate(*this, FUNC(cosmic_state::cosmic_background_enable_w)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x480a, 0x480a, write8_delegate(*this, FUNC(cosmic_state::dac_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x4807, 0x4807, write8smo_delegate(*this, FUNC(cosmic_state::cosmic_background_enable_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x480a, 0x480a, write8smo_delegate(*this, FUNC(cosmic_state::dac_w)));
}
void cosmic_state::init_panic()
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index b858c8d7ea0..01fc9b772d5 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -56,7 +56,7 @@ enum
/* Read/Write Handlers */
-READ8_MEMBER( cosmicos_state::read )
+uint8_t cosmicos_state::read(offs_t offset)
{
if (m_boot) offset |= 0xc000;
@@ -78,7 +78,7 @@ READ8_MEMBER( cosmicos_state::read )
return data;
}
-WRITE8_MEMBER( cosmicos_state::write )
+void cosmicos_state::write(offs_t offset, uint8_t data)
{
if (m_boot) offset |= 0xc000;
@@ -92,7 +92,7 @@ WRITE8_MEMBER( cosmicos_state::write )
}
}
-READ8_MEMBER( cosmicos_state::video_off_r )
+uint8_t cosmicos_state::video_off_r()
{
uint8_t data = 0;
@@ -104,7 +104,7 @@ READ8_MEMBER( cosmicos_state::video_off_r )
return data;
}
-READ8_MEMBER( cosmicos_state::video_on_r )
+uint8_t cosmicos_state::video_on_r()
{
uint8_t data = 0;
@@ -116,7 +116,7 @@ READ8_MEMBER( cosmicos_state::video_on_r )
return data;
}
-WRITE8_MEMBER( cosmicos_state::audio_latch_w )
+void cosmicos_state::audio_latch_w(uint8_t data)
{
if (m_q)
{
@@ -124,12 +124,11 @@ WRITE8_MEMBER( cosmicos_state::audio_latch_w )
}
}
-READ8_MEMBER( cosmicos_state::hex_keyboard_r )
+uint8_t cosmicos_state::hex_keyboard_r()
{
uint8_t data = 0;
- int i;
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
{
if (BIT(m_keylatch, i))
{
@@ -145,19 +144,19 @@ READ8_MEMBER( cosmicos_state::hex_keyboard_r )
return data;
}
-WRITE8_MEMBER( cosmicos_state::hex_keylatch_w )
+void cosmicos_state::hex_keylatch_w(uint8_t data)
{
m_keylatch = data & 0x0f;
}
-READ8_MEMBER( cosmicos_state::reset_counter_r )
+uint8_t cosmicos_state::reset_counter_r()
{
m_counter = 0;
return 0;
}
-WRITE8_MEMBER( cosmicos_state::segment_w )
+void cosmicos_state::segment_w(uint8_t data)
{
m_counter++;
@@ -172,12 +171,12 @@ WRITE8_MEMBER( cosmicos_state::segment_w )
}
}
-READ8_MEMBER( cosmicos_state::data_r )
+uint8_t cosmicos_state::data_r()
{
return m_data;
}
-WRITE8_MEMBER( cosmicos_state::display_w )
+void cosmicos_state::display_w(uint8_t data)
{
m_segment = data;
}
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 859d0d752a1..0c0df44b4a4 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -255,50 +255,50 @@ Stephh's log (2006.09.20) :
-READ16_MEMBER(cps_state::cps1_dsw_r)
+uint16_t cps_state::cps1_dsw_r(offs_t offset)
{
static const char *const dswname[] = { "IN0", "DSWA", "DSWB", "DSWC" };
int in = ioport(dswname[offset])->read();
return (in << 8) | 0xff;
}
-READ16_MEMBER(cps_state::cps1_hack_dsw_r)
+uint16_t cps_state::cps1_hack_dsw_r(offs_t offset)
{
static const char *const dswname[] = { "IN0", "DSWA", "DSWB", "DSWC" };
int in = ioport(dswname[offset])->read();
return (in << 8) | in;
}
-READ16_MEMBER(cps_state::cps1_in1_r)
+uint16_t cps_state::cps1_in1_r()
{
int in = ioport("IN1")->read();
return (in << 8) | in;
}
-READ16_MEMBER(cps_state::cps1_in2_r)
+uint16_t cps_state::cps1_in2_r()
{
int in = ioport("IN2")->read();
return (in << 8) | in;
}
-READ16_MEMBER(cps_state::cps1_in3_r)
+uint16_t cps_state::cps1_in3_r()
{
int in = ioport("IN3")->read();
return (in << 8) | in;
}
-WRITE8_MEMBER(cps_state::cps1_snd_bankswitch_w)
+void cps_state::cps1_snd_bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x01);
}
-WRITE8_MEMBER(cps_state::cps1_oki_pin7_w)
+void cps_state::cps1_oki_pin7_w(uint8_t data)
{
m_oki->set_pin7(data & 1);
}
-WRITE16_MEMBER(cps_state::cps1_soundlatch_w)
+void cps_state::cps1_soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_soundlatch->write(data & 0xff);
@@ -306,13 +306,13 @@ WRITE16_MEMBER(cps_state::cps1_soundlatch_w)
m_soundlatch->write(data >> 8);
}
-WRITE16_MEMBER(cps_state::cps1_soundlatch2_w)
+void cps_state::cps1_soundlatch2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_soundlatch2->write(data & 0xff);
}
-WRITE16_MEMBER(cps_state::cps1_coinctrl_w)
+void cps_state::cps1_coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -325,7 +325,7 @@ WRITE16_MEMBER(cps_state::cps1_coinctrl_w)
}
}
-WRITE16_MEMBER(cps_state::cpsq_coinctrl2_w)
+void cps_state::cpsq_coinctrl2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -382,7 +382,7 @@ void cps_state::cpu_space_map(address_map &map)
*
********************************************************************/
-READ16_MEMBER(cps_state::qsound_rom_r)
+uint16_t cps_state::qsound_rom_r(offs_t offset)
{
if (memregion("user1") != nullptr)
{
@@ -396,29 +396,29 @@ READ16_MEMBER(cps_state::qsound_rom_r)
}
}
-READ16_MEMBER(cps_state::qsound_sharedram1_r)
+uint16_t cps_state::qsound_sharedram1_r(offs_t offset)
{
return m_qsound_sharedram1[offset] | 0xff00;
}
-WRITE16_MEMBER(cps_state::qsound_sharedram1_w)
+void cps_state::qsound_sharedram1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_qsound_sharedram1[offset] = data;
}
-READ16_MEMBER(cps_state::qsound_sharedram2_r)
+uint16_t cps_state::qsound_sharedram2_r(offs_t offset)
{
return m_qsound_sharedram2[offset] | 0xff00;
}
-WRITE16_MEMBER(cps_state::qsound_sharedram2_w)
+void cps_state::qsound_sharedram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_qsound_sharedram2[offset] = data;
}
-WRITE8_MEMBER(cps_state::qsound_banksw_w)
+void cps_state::qsound_banksw_w(uint8_t data)
{
/* Z80 bank register for music note data. It's odd that it isn't encrypted though. */
int bank = data & 0x0f;
@@ -13503,7 +13503,7 @@ ROM_START( sfzbch )
ROM_END
-READ16_MEMBER(cps_state::sf2rb_prot_r)
+uint16_t cps_state::sf2rb_prot_r(offs_t offset)
{
switch (offset)
{
@@ -13519,12 +13519,12 @@ READ16_MEMBER(cps_state::sf2rb_prot_r)
void cps_state::init_sf2rb()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x2fffff, read16_delegate(*this, FUNC(cps_state::sf2rb_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x2fffff, read16sm_delegate(*this, FUNC(cps_state::sf2rb_prot_r)));
init_cps1();
}
-READ16_MEMBER(cps_state::sf2rb2_prot_r)
+uint16_t cps_state::sf2rb2_prot_r(offs_t offset)
{
switch (offset)
{
@@ -13540,7 +13540,7 @@ READ16_MEMBER(cps_state::sf2rb2_prot_r)
void cps_state::init_sf2rb2()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x2fffff, read16_delegate(*this, FUNC(cps_state::sf2rb2_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x2fffff, read16sm_delegate(*this, FUNC(cps_state::sf2rb2_prot_r)));
init_cps1();
}
@@ -13550,7 +13550,8 @@ void cps_state::init_sf2ee()
/* This specific revision of SF2 has the CPS-B custom mapped at a different address. */
/* The mapping is handled by the PAL IOB2 on the B-board */
m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x800140, 0x80017f);
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(*this, FUNC(cps_state::cps1_cps_b_r)), write16_delegate(*this, FUNC(cps_state::cps1_cps_b_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8001c0, 0x8001ff, read16sm_delegate(*this, FUNC(cps_state::cps1_cps_b_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x8001c0, 0x8001ff, write16s_delegate(*this, FUNC(cps_state::cps1_cps_b_w)));
init_cps1();
}
@@ -13558,7 +13559,8 @@ void cps_state::init_sf2ee()
void cps_state::init_sf2thndr()
{
/* This particular hack uses a modified B-board PAL which mirrors the CPS-B registers at an alternate address */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(*this, FUNC(cps_state::cps1_cps_b_r)), write16_delegate(*this, FUNC(cps_state::cps1_cps_b_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8001c0, 0x8001ff, read16sm_delegate(*this, FUNC(cps_state::cps1_cps_b_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x8001c0, 0x8001ff, write16s_delegate(*this, FUNC(cps_state::cps1_cps_b_w)));
init_cps1();
}
@@ -13566,7 +13568,7 @@ void cps_state::init_sf2thndr()
void cps_state::init_sf2hack()
{
/* some SF2 hacks have some inputs wired to the LSB instead of MSB */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x800018, 0x80001f, read16_delegate(*this, FUNC(cps_state::cps1_hack_dsw_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x800018, 0x80001f, read16sm_delegate(*this, FUNC(cps_state::cps1_hack_dsw_r)));
init_cps1();
}
@@ -13593,7 +13595,7 @@ void cps_state::init_sf2rk()
}
}
-READ16_MEMBER(cps_state::sf2dongb_prot_r)
+uint16_t cps_state::sf2dongb_prot_r(offs_t offset)
{
switch (offset)
{
@@ -13608,12 +13610,12 @@ READ16_MEMBER(cps_state::sf2dongb_prot_r)
void cps_state::init_sf2dongb()
{
// There is a hacked up Altera EP910PC-30 DIP in the 5f socket instead of a 4th EPROM
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x180000, 0x1fffff, read16_delegate(*this, FUNC(cps_state::sf2dongb_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x180000, 0x1fffff, read16sm_delegate(*this, FUNC(cps_state::sf2dongb_prot_r)));
init_cps1();
}
-READ16_MEMBER(cps_state::sf2ceblp_prot_r)
+uint16_t cps_state::sf2ceblp_prot_r()
{
if (sf2ceblp_prot == 0x0)
return 0x1992;
@@ -13622,7 +13624,7 @@ READ16_MEMBER(cps_state::sf2ceblp_prot_r)
return 0xffff;
}
-WRITE16_MEMBER(cps_state::sf2ceblp_prot_w)
+void cps_state::sf2ceblp_prot_w(uint16_t data)
{
sf2ceblp_prot = data;
}
@@ -13630,8 +13632,8 @@ WRITE16_MEMBER(cps_state::sf2ceblp_prot_w)
void cps_state::init_sf2ceblp()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x5762b0, 0x5762b1, write16_delegate(*this, FUNC(cps_state::sf2ceblp_prot_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x57A2b0, 0x57A2b1, read16_delegate(*this, FUNC(cps_state::sf2ceblp_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x5762b0, 0x5762b1, write16smo_delegate(*this, FUNC(cps_state::sf2ceblp_prot_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x57A2b0, 0x57A2b1, read16smo_delegate(*this, FUNC(cps_state::sf2ceblp_prot_r)));
init_cps1();
}
@@ -13730,7 +13732,7 @@ void cps_state::init_pang3()
init_pang3b();
}
-READ16_MEMBER(cps_state::ganbare_ram_r)
+uint16_t cps_state::ganbare_ram_r(offs_t offset, uint16_t mem_mask)
{
uint16_t result = 0xffff;
@@ -13742,7 +13744,7 @@ READ16_MEMBER(cps_state::ganbare_ram_r)
return result;
}
-WRITE16_MEMBER(cps_state::ganbare_ram_w)
+void cps_state::ganbare_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_mainram[offset]);
@@ -13755,10 +13757,10 @@ void cps_state::init_ganbare()
init_cps1();
/* ram is shared between the CPS work ram and the timekeeper ram */
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff0000, 0xffffff, read16_delegate(*this, FUNC(cps_state::ganbare_ram_r)), write16_delegate(*this, FUNC(cps_state::ganbare_ram_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff0000, 0xffffff, read16s_delegate(*this, FUNC(cps_state::ganbare_ram_r)), write16s_delegate(*this, FUNC(cps_state::ganbare_ram_w)));
}
-READ16_MEMBER(cps_state::dinohunt_sound_r)
+uint16_t cps_state::dinohunt_sound_r()
{
/*TODO: understand what's really going on here. According to MT05805;
"I think that the values written are only qsound leftovers (after a lot of 0xFF values,
@@ -13769,19 +13771,19 @@ READ16_MEMBER(cps_state::dinohunt_sound_r)
void cps_state::init_dinohunt()
{
// is this shared with the new sound hw?
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xf18000, 0xf19fff, read16_delegate(*this, FUNC(cps_state::dinohunt_sound_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xf18000, 0xf19fff, read16smo_delegate(*this, FUNC(cps_state::dinohunt_sound_r)));
m_maincpu->space(AS_PROGRAM).install_read_port(0xfc0000, 0xfc0001, "IN2"); ;
// the ym2151 doesn't seem to be used. Is it actually on the PCB?
init_cps1();
}
-WRITE16_MEMBER( cps_state::sf2m3_layer_w )
+void cps_state::sf2m3_layer_w(offs_t offset, uint16_t data)
{
- cps1_cps_b_w(space,0x0a,data);
+ cps1_cps_b_w(0x0a,data);
}
-WRITE16_MEMBER(cps_state::varthb2_cps_a_w)
+void cps_state::varthb2_cps_a_w(offs_t offset, uint16_t data)
{
// cps-a regs are updated as normal by original code,
// but bootleg code ignores them and uses these regions instead:
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index 3404ddf2680..837f07ef636 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -706,7 +706,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cps2_state::cps2_interrupt)
*
*************************************/
-WRITE16_MEMBER( cps2_state::cps2_eeprom_port_w )
+void cps2_state::cps2_eeprom_port_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -797,7 +797,7 @@ TIMER_CALLBACK_MEMBER(cps2_state::cps2_update_digital_volume)
m_qsound->set_output_gain(1, m_cps2digitalvolumelevel / 39.0);
}
-READ16_MEMBER(cps2_state::cps2_qsound_volume_r)
+uint16_t cps2_state::cps2_qsound_volume_r()
{
static const uint16_t cps2_vol_states[40] =
{
@@ -831,12 +831,12 @@ READ16_MEMBER(cps2_state::cps2_qsound_volume_r)
*
*************************************/
-READ16_MEMBER(cps2_state::kludge_r)
+uint16_t cps2_state::kludge_r()
{
return 0xffff;
}
-READ16_MEMBER(cps2_state::joy_or_paddle_r)
+uint16_t cps2_state::joy_or_paddle_r()
{
if (m_readpaddle != 0)
{
@@ -848,7 +848,7 @@ READ16_MEMBER(cps2_state::joy_or_paddle_r)
}
}
-READ16_MEMBER(cps2_state::joy_or_paddle_ecofghtr_r)
+uint16_t cps2_state::joy_or_paddle_ecofghtr_r()
{
if (m_readpaddle == 0 || (m_io_in1->read() & 0x10) == 0x10) // ignore bit if spinner not enabled
{
@@ -10011,7 +10011,7 @@ void cps2_state::init_pzloop2()
save_item(NAME(m_readpaddle));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x804000, 0x804001, read16_delegate(*this, FUNC(cps2_state::joy_or_paddle_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x804000, 0x804001, read16smo_delegate(*this, FUNC(cps2_state::joy_or_paddle_r)));
}
void cps2_state::init_singbrd()
@@ -10023,12 +10023,12 @@ void cps2_state::init_singbrd()
m_digital_volume_timer->adjust(attotime::never, 0, attotime::never);
}
-READ16_MEMBER( cps2_state::gigaman2_dummyqsound_r )
+uint16_t cps2_state::gigaman2_dummyqsound_r(offs_t offset)
{
return m_gigaman2_dummyqsound_ram[offset];
}
-WRITE16_MEMBER( cps2_state::gigaman2_dummyqsound_w )
+void cps2_state::gigaman2_dummyqsound_w(offs_t offset, uint16_t data)
{
m_gigaman2_dummyqsound_ram[offset] = data;
}
@@ -10059,7 +10059,7 @@ void cps2_state::init_gigaman2()
m_gigaman2_dummyqsound_ram = std::make_unique<uint16_t[]>(0x20000 / 2);
save_pointer(NAME(m_gigaman2_dummyqsound_ram), 0x20000 / 2);
- space.install_readwrite_handler(0x618000, 0x619fff, read16_delegate(*this, FUNC(cps2_state::gigaman2_dummyqsound_r)), write16_delegate(*this, FUNC(cps2_state::gigaman2_dummyqsound_w))); // no qsound..
+ space.install_readwrite_handler(0x618000, 0x619fff, read16sm_delegate(*this, FUNC(cps2_state::gigaman2_dummyqsound_r)), write16sm_delegate(*this, FUNC(cps2_state::gigaman2_dummyqsound_w))); // no qsound..
memcpy(m_decrypted_opcodes, memregion("maincpu")->base()+0x200000, 0x200000);
@@ -10076,7 +10076,7 @@ void cps2_state::init_ecofghtr()
save_item(NAME(m_readpaddle));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x804000, 0x804001, read16_delegate(*this, FUNC(cps2_state::joy_or_paddle_ecofghtr_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x804000, 0x804001, read16smo_delegate(*this, FUNC(cps2_state::joy_or_paddle_ecofghtr_r)));
}
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index ba7ff425182..c13f757e69d 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -1326,12 +1326,12 @@ u32 cps3_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const
0x8000 - 0xffff tile character definitions
*/
-READ8_MEMBER(cps3_state::ssram_r)
+u8 cps3_state::ssram_r(offs_t offset)
{
return m_ss_ram[offset];
}
-WRITE8_MEMBER(cps3_state::ssram_w)
+void cps3_state::ssram_w(offs_t offset, u8 data)
{
if (offset >= 0x4000)
m_gfxdecode->gfx(0)->mark_dirty((offset - 0x4000)/32);
@@ -1339,14 +1339,14 @@ WRITE8_MEMBER(cps3_state::ssram_w)
m_ss_ram[offset] = data;
}
-WRITE32_MEMBER(cps3_state::sh2cache_ram_w)
+void cps3_state::sh2cache_ram_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA( &m_sh2cache_ram[offset] );
// store a decrypted copy
m_sh2cache_ram_decrypted[offset] = m_sh2cache_ram[offset]^cps3_mask(offset*4+0xc0000000, m_key1, m_key2);
}
-WRITE32_MEMBER(cps3_state::cram_bank_w)
+void cps3_state::cram_bank_w(offs_t offset, u32 data, u32 mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -1375,14 +1375,14 @@ WRITE32_MEMBER(cps3_state::cram_bank_w)
}
}
-READ32_MEMBER(cps3_state::cram_data_r)
+u32 cps3_state::cram_data_r(offs_t offset)
{
u32 fulloffset = (((m_cram_bank & 0x7)*0x100000)/4) + offset;
return little_endianize_int32(m_char_ram[fulloffset]);
}
-WRITE32_MEMBER(cps3_state::cram_data_w)
+void cps3_state::cram_data_w(offs_t offset, u32 data, u32 mem_mask)
{
u32 fulloffset = (((m_cram_bank & 0x7)*0x100000)/4) + offset;
mem_mask = little_endianize_int32(mem_mask);
@@ -1391,7 +1391,7 @@ WRITE32_MEMBER(cps3_state::cram_data_w)
m_gfxdecode->gfx(1)->mark_dirty(fulloffset/0x40);
}
-WRITE16_MEMBER(cps3_state::spritedma_w)
+void cps3_state::spritedma_w(offs_t offset, u16 data, u16 mem_mask)
{
u16 prev = m_spritelist_dma;
COMBINE_DATA(&m_spritelist_dma);
@@ -1418,7 +1418,7 @@ WRITE16_MEMBER(cps3_state::spritedma_w)
/* FLASH ROM ACCESS */
-READ32_MEMBER(cps3_state::gfxflash_r)
+u32 cps3_state::gfxflash_r(offs_t offset, u32 mem_mask)
{
u32 result = 0;
if (m_cram_gfxflash_bank&1) offset += 0x200000/4;
@@ -1456,7 +1456,7 @@ READ32_MEMBER(cps3_state::gfxflash_r)
return result;
}
-WRITE32_MEMBER(cps3_state::gfxflash_w)
+void cps3_state::gfxflash_w(offs_t offset, u32 data, u32 mem_mask)
{
int command;
if (m_cram_gfxflash_bank&1) offset += 0x200000/4;
@@ -1547,7 +1547,7 @@ u32 cps3_state::flashmain_r(int which, u32 offset, u32 mem_mask)
-READ32_MEMBER(cps3_state::flash1_r)
+u32 cps3_state::flash1_r(offs_t offset, u32 mem_mask)
{
u32 retvalue = flashmain_r(0, offset, mem_mask);
@@ -1557,7 +1557,7 @@ READ32_MEMBER(cps3_state::flash1_r)
return retvalue;
}
-READ32_MEMBER(cps3_state::flash2_r)
+u32 cps3_state::flash2_r(offs_t offset, u32 mem_mask)
{
u32 retvalue = flashmain_r(1, offset, mem_mask);
@@ -1625,17 +1625,17 @@ void cps3_state::flashmain_w(int which, u32 offset, u32 data, u32 mem_mask)
}
}
-WRITE32_MEMBER(cps3_state::flash1_w)
+void cps3_state::flash1_w(offs_t offset, u32 data, u32 mem_mask)
{
flashmain_w(0,offset,data,mem_mask);
}
-WRITE32_MEMBER(cps3_state::flash2_w)
+void cps3_state::flash2_w(offs_t offset, u32 data, u32 mem_mask)
{
flashmain_w(1,offset,data,mem_mask);
}
-WRITE32_MEMBER(cps3_state::cram_gfxflash_bank_w)
+void cps3_state::cram_gfxflash_bank_w(offs_t offset, u32 data, u32 mem_mask)
{
if (ACCESSING_BITS_24_31)
{
@@ -1691,12 +1691,12 @@ WRITE32_MEMBER(cps3_state::cram_gfxflash_bank_w)
}
}
-READ16_MEMBER(cps3_state::dma_status_r)
+u16 cps3_state::dma_status_r()
{
return m_dma_status;
}
-READ16_MEMBER(cps3_state::dev_dipsw_r)
+u16 cps3_state::dev_dipsw_r()
{
// presumably these data came from serial interface populated on early boards
// inverted words from 5000a00-5000a0f area ANDed with inverted words from 5000a10-5000a1f. perhaps one return DIPSW in 8 high bits, while other in 8 low bits.
@@ -1707,7 +1707,7 @@ READ16_MEMBER(cps3_state::dev_dipsw_r)
/* EEPROM access is a little odd, I think it accesses eeprom through some kind of
additional interface, as these writes aren't normal for the type of eeprom we have */
-READ32_MEMBER(cps3_state::eeprom_r)
+u32 cps3_state::eeprom_r(offs_t offset, u32 mem_mask)
{
int addr = offset*4;
@@ -1735,7 +1735,7 @@ READ32_MEMBER(cps3_state::eeprom_r)
}
}
-WRITE32_MEMBER(cps3_state::eeprom_w)
+void cps3_state::eeprom_w(offs_t offset, u32 data, u32 mem_mask)
{
int addr = offset*4;
@@ -1757,7 +1757,7 @@ WRITE32_MEMBER(cps3_state::eeprom_w)
}
-WRITE16_MEMBER(cps3_state::outport_w)
+void cps3_state::outport_w(offs_t offset, u16 data, u16 mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -1769,7 +1769,7 @@ WRITE16_MEMBER(cps3_state::outport_w)
// bits 14 and 15 some LEDs ?
}
-WRITE8_MEMBER(cps3_state::ssregs_w)
+void cps3_state::ssregs_w(offs_t offset, u8 data)
{
switch (offset)
{
@@ -1800,7 +1800,7 @@ WRITE8_MEMBER(cps3_state::ssregs_w)
//<ElSemi> (a word each)
-WRITE32_MEMBER(cps3_state::palettedma_w)
+void cps3_state::palettedma_w(offs_t offset, u32 data, u32 mem_mask)
{
if (offset==0)
{
@@ -2071,7 +2071,7 @@ void cps3_state::process_character_dma(u32 address)
m_dma_timer->adjust(attotime::from_usec(100)); // delay time is a hack, what is actual DMA speed?
}
-WRITE32_MEMBER(cps3_state::characterdma_w)
+void cps3_state::characterdma_w(offs_t offset, u32 data, u32 mem_mask)
{
if (DEBUG_PRINTF) logerror("chardma_w %08x %08x %08x\n", offset, data, mem_mask);
@@ -2116,12 +2116,12 @@ WRITE32_MEMBER(cps3_state::characterdma_w)
}
}
-READ16_MEMBER(cps3_state::colourram_r)
+u16 cps3_state::colourram_r(offs_t offset)
{
return m_colourram[offset];
}
-WRITE16_MEMBER(cps3_state::colourram_w)
+void cps3_state::colourram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_colourram[offset]);
diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp
index b0e0f99fd6f..a5cbfa64982 100644
--- a/src/mame/drivers/crbaloon.cpp
+++ b/src/mame/drivers/crbaloon.cpp
@@ -58,7 +58,7 @@ void crbaloon_state::pc3092_update()
}
-WRITE8_MEMBER(crbaloon_state::pc3092_w)
+void crbaloon_state::pc3092_w(offs_t offset, uint8_t data)
{
m_pc3092_data[offset] = data & 0x0f;
@@ -114,7 +114,7 @@ void crbaloon_state::pc3259_update(void)
}
-READ8_MEMBER(crbaloon_state::pc3259_r)
+uint8_t crbaloon_state::pc3259_r(offs_t offset)
{
uint8_t ret = 0;
uint8_t reg = offset >> 2;
@@ -155,7 +155,7 @@ READ8_MEMBER(crbaloon_state::pc3259_r)
*
*************************************/
-WRITE8_MEMBER(crbaloon_state::port_sound_w)
+void crbaloon_state::port_sound_w(uint8_t data)
{
/* D0 - interrupt enable - also goes to PC3259 as /HTCTRL */
m_irq_mask = data & 0x01;
@@ -165,7 +165,7 @@ WRITE8_MEMBER(crbaloon_state::port_sound_w)
machine().sound().system_enable((data & 0x02) ? true : false);
/* D2 - unlabeled - music enable */
- crbaloon_audio_set_music_enable(space, 0, (data & 0x04) ? true : false);
+ crbaloon_audio_set_music_enable((data & 0x04) ? true : false);
/* D3 - EXPLOSION */
crbaloon_audio_set_explosion_enable((data & 0x08) ? true : false);
@@ -177,7 +177,7 @@ WRITE8_MEMBER(crbaloon_state::port_sound_w)
crbaloon_audio_set_appear_enable((data & 0x20) ? true : false);
/* D6 - unlabeled - laugh enable */
- crbaloon_audio_set_laugh_enable(space, 0, (data & 0x40) ? true : false);
+ crbaloon_audio_set_laugh_enable((data & 0x40) ? true : false);
/* D7 - unlabeled - goes to PC3259 pin 16 */
@@ -339,11 +339,9 @@ GFXDECODE_END
void crbaloon_state::machine_reset()
{
- address_space &space = m_maincpu->space(AS_IO);
-
pc3092_reset();
- port_sound_w(space, 0, 0);
- crbaloon_audio_set_music_freq(space, 0, 0);
+ port_sound_w(0);
+ crbaloon_audio_set_music_freq(0);
}
diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp
index 15f2a8730ec..2f9c163f68a 100644
--- a/src/mame/drivers/crgolf.cpp
+++ b/src/mame/drivers/crgolf.cpp
@@ -107,7 +107,7 @@ protected or a snippet should do the aforementioned string copy.
*
*************************************/
-WRITE8_MEMBER(crgolf_state::rom_bank_select_w)
+void crgolf_state::rom_bank_select_w(uint8_t data)
{
membank("bank1")->set_entry(data & 15);
}
@@ -149,7 +149,7 @@ void crgolf_state::machine_reset()
*
*************************************/
-READ8_MEMBER(crgolf_state::switch_input_r)
+uint8_t crgolf_state::switch_input_r()
{
static const char *const portnames[] = { "IN0", "IN1", "P1", "P2", "DSW", "UNUSED0", "UNUSED1" };
@@ -157,13 +157,13 @@ READ8_MEMBER(crgolf_state::switch_input_r)
}
-READ8_MEMBER(crgolf_state::analog_input_r)
+uint8_t crgolf_state::analog_input_r()
{
return ((ioport("STICK0")->read() >> 4) | (ioport("STICK1")->read() & 0xf0)) ^ 0x88;
}
-WRITE8_MEMBER(crgolf_state::switch_input_select_w)
+void crgolf_state::switch_input_select_w(uint8_t data)
{
if (!(data & 0x40)) m_port_select = 6;
if (!(data & 0x20)) m_port_select = 5;
@@ -175,7 +175,7 @@ WRITE8_MEMBER(crgolf_state::switch_input_select_w)
}
-WRITE8_MEMBER(crgolf_state::unknown_w)
+void crgolf_state::unknown_w(uint8_t data)
{
logerror("%04X:unknown_w = %02X\n", m_audiocpu->pc(), data);
}
@@ -212,7 +212,7 @@ WRITE_LINE_MEMBER(crgolf_state::vck_callback)
}
-WRITE8_MEMBER(crgolf_state::crgolfhi_sample_w)
+void crgolf_state::crgolfhi_sample_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -348,22 +348,22 @@ void crgolf_state::mastrglf_submap(address_map &map)
}
-READ8_MEMBER(crgolf_state::unk_sub_02_r)
+uint8_t crgolf_state::unk_sub_02_r()
{
return 0x00;
}
-READ8_MEMBER(crgolf_state::unk_sub_05_r)
+uint8_t crgolf_state::unk_sub_05_r()
{
return 0x00;
}
-READ8_MEMBER(crgolf_state::unk_sub_07_r)
+uint8_t crgolf_state::unk_sub_07_r()
{
return 0x00;
}
-WRITE8_MEMBER(crgolf_state::unk_sub_0c_w)
+void crgolf_state::unk_sub_0c_w(uint8_t data)
{
}
@@ -778,7 +778,7 @@ ROM_END
void crgolf_state::init_crgolfhi()
{
- m_audiocpu->space(AS_PROGRAM).install_write_handler(0xa000, 0xa003, write8_delegate(*this, FUNC(crgolf_state::crgolfhi_sample_w)));
+ m_audiocpu->space(AS_PROGRAM).install_write_handler(0xa000, 0xa003, write8sm_delegate(*this, FUNC(crgolf_state::crgolfhi_sample_w)));
}
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index 4a382ffd5c7..a9aca2d5354 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -23,13 +23,13 @@
#include "speaker.h"
-WRITE8_MEMBER(crimfght_state::crimfght_coin_w)
+void crimfght_state::crimfght_coin_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
}
-READ8_MEMBER(crimfght_state::k052109_051960_r)
+uint8_t crimfght_state::k052109_051960_r(offs_t offset)
{
if (m_k052109->get_rmrd_line() == CLEAR_LINE)
{
@@ -44,7 +44,7 @@ READ8_MEMBER(crimfght_state::k052109_051960_r)
return m_k052109->read(offset);
}
-WRITE8_MEMBER(crimfght_state::k052109_051960_w)
+void crimfght_state::k052109_051960_w(offs_t offset, uint8_t data)
{
if (offset >= 0x3800 && offset < 0x3808)
m_k051960->k051937_w(offset - 0x3800, data);
@@ -54,7 +54,7 @@ WRITE8_MEMBER(crimfght_state::k052109_051960_w)
m_k051960->k051960_w(offset - 0x3c00, data);
}
-WRITE8_MEMBER(crimfght_state::sound_w)
+void crimfght_state::sound_w(uint8_t data)
{
// writing the latch asserts the irq line
m_soundlatch->write(data);
diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp
index 0f243576a88..2281f0749fc 100644
--- a/src/mame/drivers/crshrace.cpp
+++ b/src/mame/drivers/crshrace.cpp
@@ -140,7 +140,7 @@ Dip locations verified with Service Mode.
#define CRSHRACE_3P_HACK 0
-WRITE8_MEMBER(crshrace_state::crshrace_sh_bankswitch_w)
+void crshrace_state::crshrace_sh_bankswitch_w(uint8_t data)
{
m_z80bank->set_entry(data & 0x03);
}
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index 10f86635b53..a3ebda42db6 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -120,7 +120,7 @@ WRITE_LINE_MEMBER(cvs_state::write_s2650_flag)
m_s2650_flag = state;
}
-READ8_MEMBER(cvs_state::cvs_video_or_color_ram_r)
+uint8_t cvs_state::cvs_video_or_color_ram_r(offs_t offset)
{
if (m_s2650_flag)
return m_video_ram[offset];
@@ -128,7 +128,7 @@ READ8_MEMBER(cvs_state::cvs_video_or_color_ram_r)
return m_color_ram[offset];
}
-WRITE8_MEMBER(cvs_state::cvs_video_or_color_ram_w)
+void cvs_state::cvs_video_or_color_ram_w(offs_t offset, uint8_t data)
{
if (m_s2650_flag)
m_video_ram[offset] = data;
@@ -137,7 +137,7 @@ WRITE8_MEMBER(cvs_state::cvs_video_or_color_ram_w)
}
-READ8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_r)
+uint8_t cvs_state::cvs_bullet_ram_or_palette_r(offs_t offset)
{
if (m_s2650_flag)
return m_palette_ram[offset & 0x0f];
@@ -145,7 +145,7 @@ READ8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_r)
return m_bullet_ram[offset];
}
-WRITE8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_w)
+void cvs_state::cvs_bullet_ram_or_palette_w(offs_t offset, uint8_t data)
{
if (m_s2650_flag)
m_palette_ram[offset & 0x0f] = data;
@@ -154,7 +154,7 @@ WRITE8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_w)
}
-READ8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_r)
+uint8_t cvs_state::cvs_s2636_0_or_character_ram_r(offs_t offset)
{
if (m_s2650_flag)
return m_character_ram[(0 * 0x800) | 0x400 | m_character_ram_page_start | offset];
@@ -162,7 +162,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_r)
return m_s2636[0]->read_data(offset);
}
-WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w)
+void cvs_state::cvs_s2636_0_or_character_ram_w(offs_t offset, uint8_t data)
{
if (m_s2650_flag)
{
@@ -175,7 +175,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w)
}
-READ8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_r)
+uint8_t cvs_state::cvs_s2636_1_or_character_ram_r(offs_t offset)
{
if (m_s2650_flag)
return m_character_ram[(1 * 0x800) | 0x400 | m_character_ram_page_start | offset];
@@ -183,7 +183,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_r)
return m_s2636[1]->read_data(offset);
}
-WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w)
+void cvs_state::cvs_s2636_1_or_character_ram_w(offs_t offset, uint8_t data)
{
if (m_s2650_flag)
{
@@ -196,7 +196,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w)
}
-READ8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_r)
+uint8_t cvs_state::cvs_s2636_2_or_character_ram_r(offs_t offset)
{
if (m_s2650_flag)
return m_character_ram[(2 * 0x800) | 0x400 | m_character_ram_page_start | offset];
@@ -204,7 +204,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_r)
return m_s2636[2]->read_data(offset);
}
-WRITE8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_w)
+void cvs_state::cvs_s2636_2_or_character_ram_w(offs_t offset, uint8_t data)
{
if (m_s2650_flag)
{
@@ -245,7 +245,7 @@ WRITE_LINE_MEMBER(cvs_state::cvs_slave_cpu_interrupt)
*
*************************************/
-READ8_MEMBER(cvs_state::cvs_input_r)
+uint8_t cvs_state::cvs_input_r(offs_t offset)
{
uint8_t ret = 0;
@@ -309,7 +309,7 @@ void cvs_state::start_393hz_timer()
*
*************************************/
-WRITE8_MEMBER(cvs_state::cvs_4_bit_dac_data_w)
+void cvs_state::cvs_4_bit_dac_data_w(offs_t offset, uint8_t data)
{
uint8_t dac_value;
static int old_data[4] = {0,0,0,0};
@@ -331,7 +331,7 @@ WRITE8_MEMBER(cvs_state::cvs_4_bit_dac_data_w)
m_dac2->write(dac_value);
}
-WRITE8_MEMBER(cvs_state::cvs_unknown_w)
+void cvs_state::cvs_unknown_w(offs_t offset, uint8_t data)
{
/* offset 2 is used in 8ball
* offset 0 is used in spacefrt
@@ -356,21 +356,21 @@ WRITE8_MEMBER(cvs_state::cvs_unknown_w)
*************************************/
-WRITE8_MEMBER(cvs_state::cvs_speech_rom_address_lo_w)
+void cvs_state::cvs_speech_rom_address_lo_w(uint8_t data)
{
/* assuming that d0-d2 are cleared here */
m_speech_rom_bit_address = (m_speech_rom_bit_address & 0xf800) | (data << 3);
LOG(("%04x : CVS: Speech Lo %02x Address = %04x\n", m_speechcpu->pc(), data, m_speech_rom_bit_address >> 3));
}
-WRITE8_MEMBER(cvs_state::cvs_speech_rom_address_hi_w)
+void cvs_state::cvs_speech_rom_address_hi_w(uint8_t data)
{
m_speech_rom_bit_address = (m_speech_rom_bit_address & 0x07ff) | (data << 11);
LOG(("%04x : CVS: Speech Hi %02x Address = %04x\n", m_speechcpu->pc(), data, m_speech_rom_bit_address >> 3));
}
-READ8_MEMBER(cvs_state::cvs_speech_command_r)
+uint8_t cvs_state::cvs_speech_command_r()
{
/* FIXME: this was by observation on board ???
* -bit 7 is TMS status (active LO) */
@@ -378,7 +378,7 @@ READ8_MEMBER(cvs_state::cvs_speech_command_r)
}
-WRITE8_MEMBER(cvs_state::cvs_tms5110_ctl_w)
+void cvs_state::cvs_tms5110_ctl_w(offs_t offset, uint8_t data)
{
uint8_t ctl;
/*
@@ -396,7 +396,7 @@ WRITE8_MEMBER(cvs_state::cvs_tms5110_ctl_w)
}
-WRITE8_MEMBER(cvs_state::cvs_tms5110_pdc_w)
+void cvs_state::cvs_tms5110_pdc_w(offs_t offset, uint8_t data)
{
uint8_t out = ((~data) >> 7) & 1;
LOG(("CVS: Speech PDC = %02x %02x\n", offset, out));
@@ -426,7 +426,7 @@ READ_LINE_MEMBER(cvs_state::speech_rom_read_bit)
*
*************************************/
-WRITE8_MEMBER(cvs_state::audio_command_w)
+void cvs_state::audio_command_w(uint8_t data)
{
LOG(("data %02x\n", data));
/* cause interrupt on audio CPU if bit 7 set */
@@ -1547,7 +1547,7 @@ ROM_END
*
*************************************/
-READ8_MEMBER(cvs_state::huncholy_prot_r)
+uint8_t cvs_state::huncholy_prot_r(offs_t offset)
{
if (offset == 1)
{
@@ -1561,7 +1561,7 @@ READ8_MEMBER(cvs_state::huncholy_prot_r)
void cvs_state::init_huncholy()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x6ff1, 0x6ff2, read8_delegate(*this, FUNC(cvs_state::huncholy_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x6ff1, 0x6ff2, read8sm_delegate(*this, FUNC(cvs_state::huncholy_prot_r)));
save_item(NAME(m_protection_counter));
}
@@ -1576,7 +1576,7 @@ void cvs_state::init_hunchbaka()
}
-READ8_MEMBER(cvs_state::superbik_prot_r)
+uint8_t cvs_state::superbik_prot_r()
{
m_protection_counter++;
if ((m_protection_counter & 0x0f) == 0x02) return 0;
@@ -1586,13 +1586,13 @@ READ8_MEMBER(cvs_state::superbik_prot_r)
void cvs_state::init_superbik()
{
m_protection_counter = 0;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x73f1, 0x73f2, read8_delegate(*this, FUNC(cvs_state::superbik_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x73f1, 0x73f2, read8smo_delegate(*this, FUNC(cvs_state::superbik_prot_r)));
save_item(NAME(m_protection_counter));
}
-READ8_MEMBER(cvs_state::hero_prot_r)
+uint8_t cvs_state::hero_prot_r(offs_t offset)
{
u8 *ROM = memregion("maincpu")->base() + 0x73f0;
@@ -1619,7 +1619,7 @@ READ8_MEMBER(cvs_state::hero_prot_r)
void cvs_state::init_hero()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x73f0, 0x73ff, read8_delegate(*this, FUNC(cvs_state::hero_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x73f0, 0x73ff, read8sm_delegate(*this, FUNC(cvs_state::hero_prot_r)));
}
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index 15fdc62b66a..612e69281e3 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -34,7 +34,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
}
}
-READ32_MEMBER ( cxhumax_state::cx_gxa_r )
+uint32_t cxhumax_state::cx_gxa_r(offs_t offset)
{
uint32_t res = m_gxa_cmd_regs[offset];
verboselog(*this, 9, "(GXA) %08X -> %08X\n", 0xE0600000 + (offset << 2), res);
@@ -58,7 +58,7 @@ READ32_MEMBER ( cxhumax_state::cx_gxa_r )
return res;
}
-WRITE32_MEMBER( cxhumax_state::cx_gxa_w )
+void cxhumax_state::cx_gxa_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(GXA) %08X <- %08X\n", 0xE0600000 + (offset << 2), data);
uint8_t gxa_command_number = (offset >> 9) & 0x7F;
@@ -116,7 +116,7 @@ WRITE32_MEMBER( cxhumax_state::cx_gxa_w )
}
}
-WRITE32_MEMBER ( cxhumax_state::flash_w )
+void cxhumax_state::flash_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
offset *= 2;
if(ACCESSING_BITS_0_15)
@@ -126,7 +126,7 @@ WRITE32_MEMBER ( cxhumax_state::flash_w )
verboselog(*this, 9, "(FLASH) %08X <- %08X\n", 0xF0000000 + (offset << 2), data);
}
-READ32_MEMBER ( cxhumax_state::flash_r )
+uint32_t cxhumax_state::flash_r(offs_t offset, uint32_t mem_mask)
{
uint32_t res = 0;
offset *= 2;
@@ -138,12 +138,12 @@ READ32_MEMBER ( cxhumax_state::flash_r )
return res;
}
-READ32_MEMBER ( cxhumax_state::dummy_flash_r )
+uint32_t cxhumax_state::dummy_flash_r()
{
return 0xFFFFFFFF;
}
-WRITE32_MEMBER ( cxhumax_state::cx_remap_w )
+void cxhumax_state::cx_remap_w(offs_t offset, uint32_t data)
{
if(!(data&1)) {
verboselog(*this, 9, "(REMAP) %08X -> %08X\n", 0xE0400014 + (offset << 2), data);
@@ -151,7 +151,7 @@ WRITE32_MEMBER ( cxhumax_state::cx_remap_w )
}
}
-READ32_MEMBER( cxhumax_state::cx_scratch_r )
+uint32_t cxhumax_state::cx_scratch_r(offs_t offset)
{
uint32_t data = m_scratch_reg;
verboselog(*this, 9, "(SCRATCH) %08X -> %08X\n", 0xE0400024 + (offset << 2), data);
@@ -175,102 +175,102 @@ READ32_MEMBER( cxhumax_state::cx_scratch_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_scratch_w )
+void cxhumax_state::cx_scratch_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(SCRATCH) %08X <- %08X\n", 0xE0400024 + (offset << 2), data);
COMBINE_DATA(&m_scratch_reg);
}
-READ32_MEMBER( cxhumax_state::cx_hsx_r )
+uint32_t cxhumax_state::cx_hsx_r(offs_t offset)
{
uint32_t data = 0; // dummy
verboselog(*this, 9, "(HSX) %08X -> %08X\n", 0xE0000000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_hsx_w )
+void cxhumax_state::cx_hsx_w(offs_t offset, uint32_t data)
{
verboselog(*this, 9, "(HSX) %08X <- %08X\n", 0xE0000000 + (offset << 2), data);
}
-READ32_MEMBER( cxhumax_state::cx_romdescr_r )
+uint32_t cxhumax_state::cx_romdescr_r(offs_t offset)
{
uint32_t data = m_romdescr_reg;
verboselog(*this, 9, "(ROMDESC0) %08X -> %08X\n", 0xE0010000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_romdescr_w )
+void cxhumax_state::cx_romdescr_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(ROMDESC0) %08X <- %08X\n", 0xE0010000 + (offset << 2), data);
COMBINE_DATA(&m_romdescr_reg);
}
-READ32_MEMBER( cxhumax_state::cx_isaromdescr_r )
+uint32_t cxhumax_state::cx_isaromdescr_r(offs_t offset)
{
uint32_t data = m_isaromdescr_regs[offset];
verboselog(*this, 9, "(ISAROMDESC%d) %08X -> %08X\n", offset+1, 0xE0010004 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_isaromdescr_w )
+void cxhumax_state::cx_isaromdescr_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(ISAROMDESC%d) %08X <- %08X\n", offset+1, 0xE0010004 + (offset << 2), data);
COMBINE_DATA(&m_isaromdescr_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_isadescr_r )
+uint32_t cxhumax_state::cx_isadescr_r(offs_t offset)
{
uint32_t data = m_isaromdescr_regs[offset];
verboselog(*this, 9, "(ISA_DESC%d) %08X -> %08X\n", offset+4, 0xE0010010 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_isadescr_w )
+void cxhumax_state::cx_isadescr_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(ISA_DESC%d) %08X <- %08X\n", offset+4, 0xE0010010 + (offset << 2), data);
COMBINE_DATA(&m_isaromdescr_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_rommap_r )
+uint32_t cxhumax_state::cx_rommap_r(offs_t offset)
{
uint32_t data = 0;
verboselog(*this, 9, "(ROM%d_MAP) %08X -> %08X\n", offset, 0xE0010020 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_rommap_w )
+void cxhumax_state::cx_rommap_w(offs_t offset, uint32_t data)
{
verboselog(*this, 9, "(ROM%d_MAP) %08X <- %08X\n", offset, 0xE0010020 + (offset << 2), data);
}
-READ32_MEMBER( cxhumax_state::cx_rommode_r )
+uint32_t cxhumax_state::cx_rommode_r(offs_t offset)
{
uint32_t data = m_rommode_reg;
verboselog(*this, 9, "(ROMMODE) %08X -> %08X\n", 0xE0010034 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_rommode_w )
+void cxhumax_state::cx_rommode_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(ROMMODE) %08X <- %08X\n", 0xE0010034 + (offset << 2), data);
COMBINE_DATA(&m_rommode_reg);
}
-READ32_MEMBER( cxhumax_state::cx_xoemask_r )
+uint32_t cxhumax_state::cx_xoemask_r(offs_t offset)
{
uint32_t data = m_xoemask_reg;
verboselog(*this, 9, "(XOEMASK) %08X -> %08X\n", 0xE0010034 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_xoemask_w )
+void cxhumax_state::cx_xoemask_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(XOEMASK) %08X <- %08X\n", 0xE0010034 + (offset << 2), data);
COMBINE_DATA(&m_xoemask_reg);
}
-READ32_MEMBER( cxhumax_state::cx_pci_r )
+uint32_t cxhumax_state::cx_pci_r(offs_t offset)
{
uint32_t data = 0;
switch (offset) {
@@ -288,20 +288,20 @@ READ32_MEMBER( cxhumax_state::cx_pci_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_pci_w )
+void cxhumax_state::cx_pci_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(PCI) %08X <- %08X\n", 0xE0010040 + (offset << 2), data);
COMBINE_DATA(&m_pci_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_extdesc_r )
+uint32_t cxhumax_state::cx_extdesc_r(offs_t offset)
{
uint32_t data = m_extdesc_regs[offset];
verboselog(*this, 9, "(EXTDESC) %08X -> %08X\n", 0xE0010080 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_extdesc_w )
+void cxhumax_state::cx_extdesc_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(EXTDESC) %08X <- %08X\n", 0xE0010080 + (offset << 2), data);
COMBINE_DATA(&m_extdesc_regs[offset]);
@@ -334,7 +334,7 @@ TIMER_CALLBACK_MEMBER(cxhumax_state::timer_tick)
m_timer_regs.timer[param].timer->adjust(period,param);
}
-READ32_MEMBER( cxhumax_state::cx_timers_r )
+uint32_t cxhumax_state::cx_timers_r(offs_t offset)
{
uint32_t data = 0;
uint8_t index = offset>>2;
@@ -359,7 +359,7 @@ READ32_MEMBER( cxhumax_state::cx_timers_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_timers_w )
+void cxhumax_state::cx_timers_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint8_t index = offset>>2;
if(index==16) {
@@ -391,7 +391,7 @@ WRITE32_MEMBER( cxhumax_state::cx_timers_w )
}
}
-READ32_MEMBER( cxhumax_state::cx_uart2_r )
+uint32_t cxhumax_state::cx_uart2_r(offs_t offset)
{
uint32_t data;
switch (offset) {
@@ -405,7 +405,7 @@ READ32_MEMBER( cxhumax_state::cx_uart2_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_uart2_w )
+void cxhumax_state::cx_uart2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(UART2) %08X <- %08X\n", 0xE0411000 + (offset << 2), data);
switch (offset) {
@@ -432,66 +432,66 @@ WRITE32_MEMBER( cxhumax_state::cx_uart2_w )
}
}
-READ32_MEMBER( cxhumax_state::cx_pll_r )
+uint32_t cxhumax_state::cx_pll_r(offs_t offset)
{
uint32_t data = m_pll_regs[offset];
verboselog(*this, 9, "(PLL) %08X -> %08X\n", 0xE0440000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_pll_w )
+void cxhumax_state::cx_pll_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(PLL) %08X <- %08X\n", 0xE0440000 + (offset << 2), data);
COMBINE_DATA(&m_pll_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_pllprescale_r )
+uint32_t cxhumax_state::cx_pllprescale_r(offs_t offset)
{
uint32_t data = m_pllprescale_reg;
verboselog(*this, 9, "(PLLPRESCALE) %08X -> %08X\n", 0xE0440094 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_pllprescale_w )
+void cxhumax_state::cx_pllprescale_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(PLLPRESCALE) %08X <- %08X\n", 0xE0440094 + (offset << 2), data);
COMBINE_DATA(&m_pllprescale_reg);
}
-READ32_MEMBER( cxhumax_state::cx_clkdiv_r )
+uint32_t cxhumax_state::cx_clkdiv_r(offs_t offset)
{
uint32_t data = m_clkdiv_regs[offset];
verboselog(*this, 9, "(CLKDIV) %08X -> %08X\n", 0xE0440020 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_clkdiv_w )
+void cxhumax_state::cx_clkdiv_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(CLKDIV) %08X <- %08X\n", 0xE0440020 + (offset << 2), data);
COMBINE_DATA(&m_clkdiv_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_chipcontrol_r )
+uint32_t cxhumax_state::cx_chipcontrol_r(offs_t offset)
{
uint32_t data = m_chipcontrol_regs[offset];
verboselog(*this, 9, "(CHIPCONTROL) %08X -> %08X\n", 0xE0440100 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_chipcontrol_w )
+void cxhumax_state::cx_chipcontrol_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(CHIPCONTROL) %08X <- %08X\n", 0xE0440100 + (offset << 2), data);
COMBINE_DATA(&m_chipcontrol_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_intctrl_r )
+uint32_t cxhumax_state::cx_intctrl_r(offs_t offset)
{
uint32_t data = m_intctrl_regs[offset];
verboselog(*this, 9, "(INTCTRL) %08X -> %08X\n", 0xE0450000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_intctrl_w )
+void cxhumax_state::cx_intctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(INTCTRL) %08X <- %08X\n", 0xE0450000 + (offset << 2), data);
switch (offset >> 3) { // Decode the group
@@ -559,7 +559,7 @@ WRITE32_MEMBER( cxhumax_state::cx_intctrl_w )
}
-READ32_MEMBER( cxhumax_state::cx_ss_r )
+uint32_t cxhumax_state::cx_ss_r(offs_t offset)
{
uint32_t data = 0;
switch(offset) {
@@ -574,7 +574,7 @@ READ32_MEMBER( cxhumax_state::cx_ss_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_ss_w )
+void cxhumax_state::cx_ss_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(SS) %08X <- %08X\n", 0xE0490000 + (offset << 2), data);
switch(offset) {
@@ -617,14 +617,14 @@ WRITE32_MEMBER( cxhumax_state::cx_ss_w )
};
}
-READ32_MEMBER( cxhumax_state::cx_i2c0_r )
+uint32_t cxhumax_state::cx_i2c0_r(offs_t offset)
{
uint32_t data = m_i2c0_regs[offset];
verboselog(*this, 9, "(I2C0) %08X -> %08X\n", 0xE04E0000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_i2c0_w )
+void cxhumax_state::cx_i2c0_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(I2C0) %08X <- %08X\n", 0xE04E0000 + (offset << 2), data);
COMBINE_DATA(&m_i2c0_regs[offset]);
@@ -678,7 +678,7 @@ void cxhumax_state::i2cmem_stop()
m_i2cmem->write_scl(0);
}
-READ32_MEMBER( cxhumax_state::cx_i2c1_r )
+uint32_t cxhumax_state::cx_i2c1_r(offs_t offset)
{
uint32_t data=0;
switch(offset) {
@@ -692,7 +692,7 @@ READ32_MEMBER( cxhumax_state::cx_i2c1_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_i2c1_w )
+void cxhumax_state::cx_i2c1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(I2C1) %08X <- %08X\n", 0xE04E1000 + (offset << 2), data);
switch(offset) {
@@ -751,33 +751,33 @@ WRITE32_MEMBER( cxhumax_state::cx_i2c1_w )
}
}
-READ32_MEMBER( cxhumax_state::cx_i2c2_r )
+uint32_t cxhumax_state::cx_i2c2_r(offs_t offset)
{
uint32_t data = m_i2c2_regs[offset];
verboselog(*this, 9, "(I2C2) %08X -> %08X\n", 0xE04E2000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_i2c2_w )
+void cxhumax_state::cx_i2c2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(I2C2) %08X <- %08X\n", 0xE04E2000 + (offset << 2), data);
COMBINE_DATA(&m_i2c2_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_mc_cfg_r )
+uint32_t cxhumax_state::cx_mc_cfg_r(offs_t offset)
{
uint32_t data = m_mccfg_regs[offset];
verboselog(*this, 9, "(MC_CFG) %08X -> %08X\n", 0xE0500300 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_mc_cfg_w )
+void cxhumax_state::cx_mc_cfg_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(MC_CFG) %08X <- %08X\n", 0xE0500300 + (offset << 2), data);
COMBINE_DATA(&m_mccfg_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_drm0_r )
+uint32_t cxhumax_state::cx_drm0_r(offs_t offset)
{
uint32_t data = m_drm0_regs[offset];
verboselog(*this, 9, "(DRM0) %08X -> %08X\n", 0xE0560000 + (offset << 2), data);
@@ -789,33 +789,33 @@ READ32_MEMBER( cxhumax_state::cx_drm0_r )
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_drm0_w )
+void cxhumax_state::cx_drm0_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(DRM0) %08X <- %08X\n", 0xE0560000 + (offset << 2), data);
COMBINE_DATA(&m_drm0_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_drm1_r )
+uint32_t cxhumax_state::cx_drm1_r(offs_t offset)
{
uint32_t data = m_drm1_regs[offset];
verboselog(*this, 9, "(DRM1) %08X -> %08X\n", 0xE0570000 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_drm1_w )
+void cxhumax_state::cx_drm1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(DRM1) %08X <- %08X\n", 0xE0570000 + (offset << 2), data);
COMBINE_DATA(&m_drm1_regs[offset]);
}
-READ32_MEMBER( cxhumax_state::cx_hdmi_r )
+uint32_t cxhumax_state::cx_hdmi_r(offs_t offset)
{
uint32_t data = m_hdmi_regs[offset];
verboselog(*this, 9, "(HDMI) %08X -> %08X\n", 0xE05D0800 + (offset << 2), data);
return data;
}
-WRITE32_MEMBER( cxhumax_state::cx_hdmi_w )
+void cxhumax_state::cx_hdmi_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
verboselog(*this, 9, "(HDMI) %08X <- %08X\n", 0xE05D0800 + (offset << 2), data);
switch(offset) {
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 48fd9ac1a2e..60784857c68 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -90,7 +90,7 @@ void cyberbal2p_state::machine_reset()
*
*************************************/
-READ16_MEMBER(cyberbal2p_state::sound_state_r)
+uint16_t cyberbal2p_state::sound_state_r()
{
int temp = 0xffff;
if (m_jsa->main_to_sound_ready()) temp ^= 0xffff;
@@ -105,7 +105,7 @@ READ16_MEMBER(cyberbal2p_state::sound_state_r)
*
*************************************/
-WRITE16_MEMBER(cyberbal_state::p2_reset_w)
+void cyberbal_state::p2_reset_w(uint16_t data)
{
m_extracpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
}
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index fc69472fcf4..495d1e033ad 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -118,12 +118,12 @@ void cybiko_state::cybikoxt_mem(address_map &map)
map(0xe00000, 0xefffff).r(FUNC(cybiko_state::cybikoxt_key_r));
}
-WRITE16_MEMBER(cybiko_state::serflash_w)
+void cybiko_state::serflash_w(uint16_t data)
{
m_flash1->cs_w ((data & 0x10) ? 0 : 1);
}
-READ16_MEMBER(cybiko_state::clock_r)
+uint16_t cybiko_state::clock_r()
{
if (m_rtc->sda_r())
{
@@ -133,13 +133,13 @@ READ16_MEMBER(cybiko_state::clock_r)
return 0x04;
}
-WRITE16_MEMBER(cybiko_state::clock_w)
+void cybiko_state::clock_w(uint16_t data)
{
m_rtc->scl_w((data & 0x02) ? 1 : 0);
m_rtc->sda_w((data & 0x01) ? 0 : 1);
}
-READ16_MEMBER(cybiko_state::xtclock_r)
+uint16_t cybiko_state::xtclock_r()
{
if (m_rtc->sda_r())
{
@@ -149,30 +149,30 @@ READ16_MEMBER(cybiko_state::xtclock_r)
return 0;
}
-WRITE16_MEMBER(cybiko_state::xtclock_w)
+void cybiko_state::xtclock_w(uint16_t data)
{
m_rtc->scl_w((data & 0x02) ? 1 : 0);
m_rtc->sda_w((data & 0x40) ? 0 : 1);
}
-READ16_MEMBER(cybiko_state::xtpower_r)
+uint16_t cybiko_state::xtpower_r()
{
// bit 7 = on/off button
// bit 6 = battery charged if "1"
return 0xc0;
}
-READ16_MEMBER(cybiko_state::adc1_r)
+uint16_t cybiko_state::adc1_r()
{
return 0x01;
}
-READ16_MEMBER(cybiko_state::adc2_r)
+uint16_t cybiko_state::adc2_r()
{
return 0x00;
}
-READ16_MEMBER(cybiko_state::port0_r)
+uint16_t cybiko_state::port0_r()
{
// bit 3 = on/off button
return 0x08;
diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp
index e8359cffba7..ecbf9a22c63 100644
--- a/src/mame/drivers/cybstorm.cpp
+++ b/src/mame/drivers/cybstorm.cpp
@@ -44,13 +44,13 @@ void cybstorm_state::machine_start()
*
*************************************/
-READ32_MEMBER(cybstorm_state::special_port1_r)
+uint32_t cybstorm_state::special_port1_r()
{
return ioport("9F0010")->read();
}
-WRITE32_MEMBER(cybstorm_state::latch_w)
+void cybstorm_state::latch_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t oldword = m_latch_data;
COMBINE_DATA(&m_latch_data);
diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp
index 3e2e1c75864..2990d6fbe50 100644
--- a/src/mame/drivers/darkmist.cpp
+++ b/src/mame/drivers/darkmist.cpp
@@ -38,7 +38,7 @@ void darkmist_state::machine_start()
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000);
}
-WRITE8_MEMBER(darkmist_state::hw_w)
+void darkmist_state::hw_w(uint8_t data)
{
m_hw=data;
membank("bank1")->set_entry((data&0x80)?1:0);
diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp
index cf4bbb84db2..2d19c1aa270 100644
--- a/src/mame/drivers/darkseal.cpp
+++ b/src/mame/drivers/darkseal.cpp
@@ -31,7 +31,7 @@
/******************************************************************************/
-WRITE16_MEMBER(darkseal_state::irq_ack_w)
+void darkseal_state::irq_ack_w(uint16_t data)
{
m_maincpu->set_input_line(M68K_IRQ_6, CLEAR_LINE);
}
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index c7327511c1b..5ca5eedb1e8 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -222,22 +222,22 @@ TODO:
/**********************************************************************************/
-WRITE16_MEMBER(dassault_state::priority_w)
+void dassault_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_priority);
}
-WRITE16_MEMBER(dassault_state::main_irq_ack_w)
+void dassault_state::main_irq_ack_w(uint16_t data)
{
m_maincpu->set_input_line(M68K_IRQ_4, CLEAR_LINE);
}
-WRITE16_MEMBER(dassault_state::sub_irq_ack_w)
+void dassault_state::sub_irq_ack_w(uint16_t data)
{
m_subcpu->set_input_line(M68K_IRQ_5, CLEAR_LINE);
}
-READ16_MEMBER(dassault_state::dassault_control_r)
+uint16_t dassault_state::dassault_control_r(offs_t offset)
{
switch (offset << 1)
{
@@ -260,14 +260,14 @@ READ16_MEMBER(dassault_state::dassault_control_r)
return 0xffff;
}
-WRITE16_MEMBER(dassault_state::dassault_control_w)
+void dassault_state::dassault_control_w(uint16_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
if (data & 0xfffe)
logerror("Coin cointrol %04x\n", data);
}
-READ16_MEMBER(dassault_state::dassault_sub_control_r)
+uint16_t dassault_state::dassault_sub_control_r()
{
return ioport("VBLANK1")->read();
}
diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp
index 2f587e406b6..6da40ba4290 100644
--- a/src/mame/drivers/dbz.cpp
+++ b/src/mame/drivers/dbz.cpp
@@ -74,13 +74,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(dbz_state::dbz_scanline)
}
#if 0
-READ16_MEMBER(dbz_state::dbzcontrol_r)
+uint16_t dbz_state::dbzcontrol_r()
{
return m_control;
}
#endif
-WRITE16_MEMBER(dbz_state::dbzcontrol_w)
+void dbz_state::dbzcontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* bit 10 = enable '246 readback */
@@ -95,12 +95,12 @@ WRITE16_MEMBER(dbz_state::dbzcontrol_w)
machine().bookkeeping().coin_counter_w(1, data & 2);
}
-WRITE16_MEMBER(dbz_state::dbz_sound_command_w)
+void dbz_state::dbz_sound_command_w(uint16_t data)
{
m_soundlatch->write(data >> 8);
}
-WRITE16_MEMBER(dbz_state::dbz_sound_cause_nmi)
+void dbz_state::dbz_sound_cause_nmi(uint16_t data)
{
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index 7e8e1c24601..d89964525ae 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -278,7 +278,7 @@
#define CPU_CLOCK (200000000)
-READ64_MEMBER(dc_cons_state::dcus_idle_skip_r )
+uint64_t dc_cons_state::dcus_idle_skip_r()
{
//if (m_maincpu->pc()==0xc0ba52a)
// m_maincpu->spin_until_time(attotime::from_usec(2500));
@@ -287,7 +287,7 @@ READ64_MEMBER(dc_cons_state::dcus_idle_skip_r )
return dc_ram[0x2303b0/8];
}
-READ64_MEMBER(dc_cons_state::dcjp_idle_skip_r )
+uint64_t dc_cons_state::dcjp_idle_skip_r()
{
//if (m_maincpu->pc()==0xc0bac62)
// m_maincpu->spin_until_time(attotime::from_usec(2500));
@@ -306,14 +306,14 @@ void dc_cons_state::init_dc()
void dc_cons_state::init_dcus()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xc2303b0, 0xc2303b7, read64_delegate(*this, FUNC(dc_cons_state::dcus_idle_skip_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xc2303b0, 0xc2303b7, read64smo_delegate(*this, FUNC(dc_cons_state::dcus_idle_skip_r)));
init_dc();
}
void dc_cons_state::init_dcjp()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xc2302f8, 0xc2302ff, read64_delegate(*this, FUNC(dc_cons_state::dcjp_idle_skip_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xc2302f8, 0xc2302ff, read64smo_delegate(*this, FUNC(dc_cons_state::dcjp_idle_skip_r)));
init_dc();
}
@@ -330,7 +330,7 @@ void dc_cons_state::init_tream()
init_dcus();
}
-READ64_MEMBER(dc_cons_state::dc_pdtra_r )
+uint64_t dc_cons_state::dc_pdtra_r()
{
uint64_t out = PCTRA<<32;
@@ -360,18 +360,18 @@ READ64_MEMBER(dc_cons_state::dc_pdtra_r )
return out;
}
-WRITE64_MEMBER(dc_cons_state::dc_pdtra_w )
+void dc_cons_state::dc_pdtra_w(uint64_t data)
{
PCTRA = (data>>16) & 0xffff;
PDTRA = (data & 0xffff);
}
-READ8_MEMBER(dc_cons_state::dc_flash_r)
+uint8_t dc_cons_state::dc_flash_r(offs_t offset)
{
return m_dcflash->read(offset+0x20000);
}
-WRITE8_MEMBER(dc_cons_state::dc_flash_w)
+void dc_cons_state::dc_flash_w(offs_t offset, uint8_t data)
{
m_dcflash->write(offset+0x20000,data);
}
diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp
index fb829e52071..403b1ecc2f3 100644
--- a/src/mame/drivers/dcheese.cpp
+++ b/src/mame/drivers/dcheese.cpp
@@ -58,7 +58,7 @@ void dcheese_state::update_irq_state()
}
-uint8_t dcheese_state::iack_r(offs_t offset)
+u8 dcheese_state::iack_r(offs_t offset)
{
if (!machine().side_effects_disabled())
{
@@ -111,7 +111,7 @@ void dcheese_state::machine_start()
*
*************************************/
-WRITE16_MEMBER(dcheese_state::eeprom_control_w)
+void dcheese_state::eeprom_control_w(offs_t offset, u16 data, u16 mem_mask)
{
/* toggles bit $0100 very frequently while waiting for things */
/* bits $0080-$0010 are probably lamps */
@@ -129,14 +129,14 @@ WRITE16_MEMBER(dcheese_state::eeprom_control_w)
*
*************************************/
-READ8_MEMBER(dcheese_state::sound_status_r)
+u8 dcheese_state::sound_status_r()
{
/* seems to be ready signal on BSMT or latching hardware */
return m_bsmt->read_status() << 7;
}
-WRITE8_MEMBER(dcheese_state::sound_control_w)
+void dcheese_state::sound_control_w(u8 data)
{
u8 const diff = data ^ m_sound_control;
m_sound_control = data;
@@ -150,7 +150,7 @@ WRITE8_MEMBER(dcheese_state::sound_control_w)
}
-WRITE8_MEMBER(dcheese_state::bsmt_data_w)
+void dcheese_state::bsmt_data_w(offs_t offset, u8 data)
{
/* writes come in pairs; even bytes latch, odd bytes write */
if ((offset & 1) == 0)
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index cbf7de007bd..149a3f7efb5 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -165,7 +165,7 @@ MACHINE_RESET_MEMBER(ddragon_state,ddragon)
*
*************************************/
-WRITE8_MEMBER(ddragon_state::ddragon_bankswitch_w)
+void ddragon_state::ddragon_bankswitch_w(uint8_t data)
{
/*
76543210
@@ -186,7 +186,7 @@ WRITE8_MEMBER(ddragon_state::ddragon_bankswitch_w)
}
-WRITE8_MEMBER(toffy_state::toffy_bankswitch_w)
+void toffy_state::toffy_bankswitch_w(uint8_t data)
{
m_scrollx_hi = data & 0x01;
m_scrolly_hi = (data & 0x02) >> 1;
@@ -198,7 +198,7 @@ WRITE8_MEMBER(toffy_state::toffy_bankswitch_w)
}
-READ8_MEMBER(darktowr_state::darktowr_mcu_bank_r)
+uint8_t darktowr_state::darktowr_mcu_bank_r(offs_t offset)
{
// logerror("BankRead %05x %08x\n",m_maincpu->pc(),offset);
@@ -226,7 +226,7 @@ READ8_MEMBER(darktowr_state::darktowr_mcu_bank_r)
}
-WRITE8_MEMBER(darktowr_state::darktowr_mcu_bank_w)
+void darktowr_state::darktowr_mcu_bank_w(offs_t offset, uint8_t data)
{
logerror("BankWrite %05x %08x %08x\n", m_maincpu->pc(), offset, data);
@@ -239,7 +239,7 @@ WRITE8_MEMBER(darktowr_state::darktowr_mcu_bank_w)
}
-WRITE8_MEMBER(darktowr_state::darktowr_bankswitch_w)
+void darktowr_state::darktowr_bankswitch_w(uint8_t data)
{
m_scrollx_hi = (data & 0x01);
m_scrolly_hi = ((data & 0x02) >> 1);
@@ -288,26 +288,26 @@ void ddragon_state::ddragon_interrupt_ack(offs_t offset, uint8_t data)
}
-READ8_MEMBER(ddragon_state::ddragon_interrupt_r)
+uint8_t ddragon_state::ddragon_interrupt_r(offs_t offset)
{
ddragon_interrupt_ack(offset, 0xff);
return 0xff;
}
-WRITE8_MEMBER(ddragon_state::ddragon_interrupt_w)
+void ddragon_state::ddragon_interrupt_w(offs_t offset, uint8_t data)
{
ddragon_interrupt_ack(offset, data);
}
-WRITE8_MEMBER(ddragon_state::ddragon2_sub_irq_ack_w)
+void ddragon_state::ddragon2_sub_irq_ack_w(uint8_t data)
{
m_subcpu->set_input_line(m_sprite_irq, CLEAR_LINE);
}
-WRITE8_MEMBER(ddragon_state::ddragon2_sub_irq_w)
+void ddragon_state::ddragon2_sub_irq_w(uint8_t data)
{
m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
}
@@ -369,7 +369,7 @@ void ddragon_state::sub_port6_w(uint8_t data)
*
*************************************/
-READ8_MEMBER(ddragon_state::ddragon_comram_r)
+uint8_t ddragon_state::ddragon_comram_r(offs_t offset)
{
// Access to shared RAM is prevented when the sub CPU is active
if (!m_subcpu->suspended(SUSPEND_REASON_RESET | SUSPEND_REASON_HALT))
@@ -379,7 +379,7 @@ READ8_MEMBER(ddragon_state::ddragon_comram_r)
}
-WRITE8_MEMBER(ddragon_state::ddragon_comram_w)
+void ddragon_state::ddragon_comram_w(offs_t offset, uint8_t data)
{
if (!m_subcpu->suspended(SUSPEND_REASON_RESET | SUSPEND_REASON_HALT))
return;
@@ -395,7 +395,7 @@ WRITE8_MEMBER(ddragon_state::ddragon_comram_w)
*
*************************************/
-WRITE8_MEMBER(ddragon_state::dd_adpcm_w)
+void ddragon_state::dd_adpcm_w(offs_t offset, uint8_t data)
{
int chip = offset & 1;
@@ -451,7 +451,7 @@ WRITE_LINE_MEMBER(ddragon_state::dd_adpcm_int_2)
}
-READ8_MEMBER(ddragon_state::dd_adpcm_status_r)
+uint8_t ddragon_state::dd_adpcm_status_r()
{
return (m_adpcm_idle[0] ? 1 : 0) | (m_adpcm_idle[1] ? 2 : 0);
}
diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp
index d0128d7c991..d02d937bad6 100644
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@@ -198,39 +198,39 @@ ROMs (All ROMs are 27C010 EPROM. - means not populated)
*
*************************************/
-WRITE8_MEMBER(ddragon3_state::oki_bankswitch_w)
+void ddragon3_state::oki_bankswitch_w(uint8_t data)
{
m_oki->set_rom_bank(data & 1);
}
-WRITE16_MEMBER(wwfwfest_state::wwfwfest_soundwrite)
+void wwfwfest_state::wwfwfest_soundwrite(uint16_t data)
{
// upper byte is always set to 0x31 for some reason
m_soundlatch->write(data & 0xff);
}
-WRITE16_MEMBER(ddragon3_state::ddragon3_vreg_w)
+void ddragon3_state::ddragon3_vreg_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vreg);
}
-WRITE16_MEMBER(ddragon3_state::irq6_ack_w)
+void ddragon3_state::irq6_ack_w(uint16_t data)
{
// this gets written to on startup and at the end of IRQ6
m_maincpu->set_input_line(6, CLEAR_LINE);
}
-WRITE16_MEMBER(ddragon3_state::irq5_ack_w)
+void ddragon3_state::irq5_ack_w(uint16_t data)
{
// this gets written to on startup and at the end of IRQ5 (input port read)
m_maincpu->set_input_line(5, CLEAR_LINE);
}
-WRITE16_MEMBER(wwfwfest_state::wwfwfest_irq_ack_w)
+void wwfwfest_state::wwfwfest_irq_ack_w(offs_t offset, uint16_t data)
{
if (offset == 0)
m_maincpu->set_input_line(3, CLEAR_LINE);
@@ -239,20 +239,20 @@ WRITE16_MEMBER(wwfwfest_state::wwfwfest_irq_ack_w)
m_maincpu->set_input_line(2, CLEAR_LINE);
}
-WRITE16_MEMBER(wwfwfest_state::wwfwfest_flipscreen_w)
+void wwfwfest_state::wwfwfest_flipscreen_w(uint16_t data)
{
flip_screen_set(data&1);
}
/*- Palette Reads/Writes - A5 and A6 are not connected */
-READ16_MEMBER(wwfwfest_state::wwfwfest_paletteram_r)
+uint16_t wwfwfest_state::wwfwfest_paletteram_r(offs_t offset)
{
offset = (offset & 0x000f) | (offset & 0x7fc0) >> 2;
return m_paletteram[offset];
}
-WRITE16_MEMBER(wwfwfest_state::wwfwfest_paletteram_w)
+void wwfwfest_state::wwfwfest_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset = (offset & 0x000f) | (offset & 0x7fc0) >> 2;
m_palette->write16(offset, data, mem_mask);
@@ -261,7 +261,7 @@ WRITE16_MEMBER(wwfwfest_state::wwfwfest_paletteram_w)
/*- Priority Control -*/
-WRITE8_MEMBER(wwfwfest_state::wwfwfest_priority_w)
+void wwfwfest_state::wwfwfest_priority_w(uint8_t data)
{
m_pri = data;
}
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index 20270a163fd..892530c09e4 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -32,33 +32,33 @@ WRITE_LINE_MEMBER(ddribble_state::vblank_irq)
}
-WRITE8_MEMBER(ddribble_state::ddribble_bankswitch_w)
+void ddribble_state::ddribble_bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x07);
}
-READ8_MEMBER(ddribble_state::ddribble_sharedram_r)
+uint8_t ddribble_state::ddribble_sharedram_r(offs_t offset)
{
return m_sharedram[offset];
}
-WRITE8_MEMBER(ddribble_state::ddribble_sharedram_w)
+void ddribble_state::ddribble_sharedram_w(offs_t offset, uint8_t data)
{
m_sharedram[offset] = data;
}
-READ8_MEMBER(ddribble_state::ddribble_snd_sharedram_r)
+uint8_t ddribble_state::ddribble_snd_sharedram_r(offs_t offset)
{
return m_snd_sharedram[offset];
}
-WRITE8_MEMBER(ddribble_state::ddribble_snd_sharedram_w)
+void ddribble_state::ddribble_snd_sharedram_w(offs_t offset, uint8_t data)
{
m_snd_sharedram[offset] = data;
}
-WRITE8_MEMBER(ddribble_state::ddribble_coin_counter_w)
+void ddribble_state::ddribble_coin_counter_w(uint8_t data)
{
/* b4-b7: unused */
/* b2-b3: unknown */
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index 5698f9d0958..edef6c2e8a2 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -56,11 +56,11 @@ Dip locations and factory settings verified with US manual
/* Read/Write Handlers */
-READ16_MEMBER(deadang_state::ghunter_trackball_low_r)
+uint16_t deadang_state::ghunter_trackball_low_r()
{
return (ioport("TRACKX")->read() & 0xff) | ((ioport("TRACKY")->read() & 0xff) << 8);
}
-READ16_MEMBER(deadang_state::ghunter_trackball_high_r)
+uint16_t deadang_state::ghunter_trackball_high_r()
{
return ((ioport("TRACKX")->read() & 0x0f00) >> 4) | (ioport("TRACKY")->read() & 0x0f00);
}
@@ -733,8 +733,8 @@ void deadang_state::init_ghunter()
m_adpcm1->decrypt();
m_adpcm2->decrypt();
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x80000, 0x80001, read16_delegate(*this, FUNC(deadang_state::ghunter_trackball_low_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xb0000, 0xb0001, read16_delegate(*this, FUNC(deadang_state::ghunter_trackball_high_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x80000, 0x80001, read16smo_delegate(*this, FUNC(deadang_state::ghunter_trackball_low_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xb0000, 0xb0001, read16smo_delegate(*this, FUNC(deadang_state::ghunter_trackball_high_r)));
}
/* Game Drivers */
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index 33843810851..5dc70924960 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -337,12 +337,12 @@ Notes:
/******************************************************************************/
-WRITE16_MEMBER(dec0_state::dec0_control_w)
+void dec0_state::dec0_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch (offset << 1)
{
case 0: /* Playfield & Sprite priority */
- priority_w(space, 0, data, mem_mask);
+ priority_w(0, data, mem_mask);
break;
case 2: /* DMA flag */
@@ -380,7 +380,7 @@ WRITE16_MEMBER(dec0_state::dec0_control_w)
}
}
-WRITE16_MEMBER(dec0_automat_state::automat_control_w)
+void dec0_automat_state::automat_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch (offset << 1)
{
@@ -410,7 +410,7 @@ WRITE16_MEMBER(dec0_automat_state::automat_control_w)
}
}
-WRITE16_MEMBER(dec0_state::midres_sound_w)
+void dec0_state::midres_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_soundlatch->write(data & 0xff);
@@ -499,7 +499,7 @@ void dec0_state::hippodrm_sub_map(address_map &map)
}
-READ16_MEMBER(dec0_state::slyspy_controls_r)
+uint16_t dec0_state::slyspy_controls_r(offs_t offset)
{
switch (offset<<1)
{
@@ -518,7 +518,7 @@ READ16_MEMBER(dec0_state::slyspy_controls_r)
}
// TODO: this can be a timer access, maybe video counter returns (and used as RNG in both games)
-READ16_MEMBER(dec0_state::slyspy_protection_r)
+uint16_t dec0_state::slyspy_protection_r(offs_t offset)
{
switch (offset<<1)
{
@@ -571,13 +571,13 @@ READ16_MEMBER(dec0_state::slyspy_protection_r)
*/
-WRITE16_MEMBER(dec0_state::slyspy_state_w)
+void dec0_state::slyspy_state_w(uint16_t data)
{
m_slyspy_state = 0;
m_pfprotect->set_bank(m_slyspy_state);
}
-READ16_MEMBER(dec0_state::slyspy_state_r)
+uint16_t dec0_state::slyspy_state_r()
{
m_slyspy_state = (m_slyspy_state + 1) % 4;
m_pfprotect->set_bank(m_slyspy_state);
@@ -703,7 +703,7 @@ void dec0_state::slyspy_s_map(address_map &map)
// Sly Spy sound state protection machine emulation
// similar to the video state machine
// current bank is at 0x1f0045, incremented by 1 then here is read
-READ8_MEMBER(dec0_state::slyspy_sound_state_r)
+uint8_t dec0_state::slyspy_sound_state_r()
{
m_slyspy_sound_state ++;
m_slyspy_sound_state &= 3;
@@ -713,7 +713,7 @@ READ8_MEMBER(dec0_state::slyspy_sound_state_r)
return 0xff;
}
-READ8_MEMBER(dec0_state::slyspy_sound_state_reset_r)
+uint8_t dec0_state::slyspy_sound_state_reset_r()
{
m_slyspy_sound_state = 0;
m_sndprotect->set_bank(m_slyspy_sound_state);
@@ -774,13 +774,13 @@ void dec0_automat_state::machine_start()
/* swizzle the palette writes around so we can use the same gfx plane ordering as the originals */
-READ16_MEMBER( dec0_automat_state::automat_palette_r )
+uint16_t dec0_automat_state::automat_palette_r(offs_t offset)
{
offset ^=0xf;
return m_paletteram[offset];
}
-WRITE16_MEMBER( dec0_automat_state::automat_palette_w )
+void dec0_automat_state::automat_palette_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset ^=0xf;
m_palette->write16(offset, data, mem_mask);
@@ -1821,7 +1821,7 @@ void dec0_state::dec1(machine_config &config)
}
-WRITE8_MEMBER(dec0_automat_state::sound_bankswitch_w)
+void dec0_automat_state::sound_bankswitch_w(uint8_t data)
{
m_msm[0]->reset_w(BIT(data, 3));
m_msm[1]->reset_w(BIT(data, 4));
@@ -4068,7 +4068,7 @@ void dec0_state::init_midresb()
// m_maincpu->space(AS_PROGRAM).install_write_handler(0x00180014, 0x00180015, write16_delegate(*this, FUNC(dec0_state::midres_sound_w)));
}
-READ16_MEMBER(dec0_state::ffantasybl_242024_r)
+uint16_t dec0_state::ffantasybl_242024_r()
{
/*
000152: 41F9 0024 2020 lea $242020.l, A0
@@ -4085,7 +4085,7 @@ void dec0_state::init_ffantasybl()
{
m_maincpu->space(AS_PROGRAM).install_ram(0x24c880, 0x24cbff); // what is this? layer 3-related??
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x00242024, 0x00242025, read16_delegate(*this, FUNC(dec0_state::ffantasybl_242024_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x00242024, 0x00242025, read16smo_delegate(*this, FUNC(dec0_state::ffantasybl_242024_r)));
m_maincpu->space(AS_PROGRAM).install_read_port(0x00ff87ee, 0x00ff87ef, "VBLANK");
}
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index 16214d3c35a..40059359833 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -59,7 +59,7 @@ To do:
/******************************************************************************/
-WRITE8_MEMBER(dec8_state::dec8_mxc06_karn_buffer_spriteram_w)
+void dec8_state::dec8_mxc06_karn_buffer_spriteram_w(uint8_t data)
{
uint8_t* spriteram = m_spriteram->live();
// copy to a 16-bit region for the sprite chip
@@ -75,22 +75,21 @@ WRITE_LINE_MEMBER(dec8_state::screen_vblank_dec8)
// rising edge
if (state)
{
- address_space &space = m_maincpu->space(AS_PROGRAM);
- dec8_mxc06_karn_buffer_spriteram_w(space, 0, 0);
+ dec8_mxc06_karn_buffer_spriteram_w(0);
}
}
-READ8_MEMBER(dec8_state::i8751_h_r)
+uint8_t dec8_state::i8751_h_r()
{
return m_i8751_return >> 8; /* MSB */
}
-READ8_MEMBER(dec8_state::i8751_l_r)
+uint8_t dec8_state::i8751_l_r()
{
return m_i8751_return & 0xff; /* LSB */
}
-WRITE8_MEMBER(dec8_state::i8751_reset_w)
+void dec8_state::i8751_reset_w(uint8_t data)
{
// ? reset the actual MCU?
//m_i8751_return = 0;
@@ -98,7 +97,7 @@ WRITE8_MEMBER(dec8_state::i8751_reset_w)
/******************************************************************************/
-READ8_MEMBER(dec8_state::gondo_player_1_r)
+uint8_t dec8_state::gondo_player_1_r(offs_t offset)
{
int val = 1 << ioport("AN0")->read();
@@ -112,7 +111,7 @@ READ8_MEMBER(dec8_state::gondo_player_1_r)
return 0xff;
}
-READ8_MEMBER(dec8_state::gondo_player_2_r)
+uint8_t dec8_state::gondo_player_2_r(offs_t offset)
{
int val = 1 << ioport("AN1")->read();
@@ -153,7 +152,7 @@ void dec8_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
}
}
-WRITE8_MEMBER(dec8_state::dec8_i8751_w)
+void dec8_state::dec8_i8751_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -170,7 +169,7 @@ WRITE8_MEMBER(dec8_state::dec8_i8751_w)
/******************************************************************************/
-WRITE8_MEMBER(dec8_state::dec8_bank_w)
+void dec8_state::dec8_bank_w(uint8_t data)
{
m_mainbank->set_entry(data & 0x0f);
}
@@ -204,7 +203,7 @@ void dec8_state::ghostb_bank_w(uint8_t data)
flip_screen_set(BIT(data, 3));
}
-WRITE8_MEMBER(dec8_state::csilver_control_w)
+void dec8_state::csilver_control_w(uint8_t data)
{
/*
Bit 0x0f - ROM bank switch.
@@ -216,7 +215,7 @@ WRITE8_MEMBER(dec8_state::csilver_control_w)
m_mainbank->set_entry(data & 0x0f);
}
-WRITE8_MEMBER(dec8_state::dec8_sound_w)
+void dec8_state::dec8_sound_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->set_input_line(m6502_device::NMI_LINE, ASSERT_LINE);
@@ -233,57 +232,57 @@ WRITE_LINE_MEMBER(dec8_state::csilver_adpcm_int)
m_msm5205next <<= 4;
}
-READ8_MEMBER(dec8_state::csilver_adpcm_reset_r)
+uint8_t dec8_state::csilver_adpcm_reset_r()
{
m_msm->reset_w(0);
return 0;
}
-WRITE8_MEMBER(dec8_state::csilver_adpcm_data_w)
+void dec8_state::csilver_adpcm_data_w(uint8_t data)
{
m_msm5205next = data;
}
-WRITE8_MEMBER(dec8_state::csilver_sound_bank_w)
+void dec8_state::csilver_sound_bank_w(uint8_t data)
{
m_soundbank->set_entry((data & 0x08) >> 3);
}
/******************************************************************************/
-WRITE8_MEMBER(dec8_state::main_irq_on_w)
+void dec8_state::main_irq_on_w(uint8_t data)
{
m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
}
-WRITE8_MEMBER(dec8_state::main_irq_off_w)
+void dec8_state::main_irq_off_w(uint8_t data)
{
m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
}
-WRITE8_MEMBER(dec8_state::main_firq_off_w)
+void dec8_state::main_firq_off_w(uint8_t data)
{
m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
}
-WRITE8_MEMBER(dec8_state::sub_irq_on_w)
+void dec8_state::sub_irq_on_w(uint8_t data)
{
m_subcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
}
-WRITE8_MEMBER(dec8_state::sub_irq_off_w)
+void dec8_state::sub_irq_off_w(uint8_t data)
{
m_subcpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
}
-WRITE8_MEMBER(dec8_state::sub_firq_off_w)
+void dec8_state::sub_firq_off_w(uint8_t data)
{
m_subcpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
}
/******************************************************************************/
-WRITE8_MEMBER(dec8_state::flip_screen_w){ flip_screen_set(data); }
+void dec8_state::flip_screen_w(uint8_t data) { flip_screen_set(data); }
/******************************************************************************/
@@ -1768,7 +1767,7 @@ WRITE_LINE_MEMBER(dec8_state::oscar_coin_irq)
m_coin_state = bool(state);
}
-WRITE8_MEMBER(dec8_state::oscar_coin_clear_w)
+void dec8_state::oscar_coin_clear_w(uint8_t data)
{
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp
index 24ad15cadc2..c74c7a8aaf8 100644
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@@ -119,12 +119,12 @@
/***************************************************************************/
-READ32_MEMBER(deco_mlc_state::mlc_440008_r)
+u32 deco_mlc_state::mlc_440008_r()
{
return 0xffffffff;
}
-READ32_MEMBER(deco_mlc_state::mlc_44001c_r)
+u32 deco_mlc_state::mlc_44001c_r(offs_t offset)
{
/*
test3 7 - vbl loop on 0x10 0000 at end of IRQ
@@ -137,11 +137,11 @@ READ32_MEMBER(deco_mlc_state::mlc_44001c_r)
return 0xffffffff;
}
-WRITE32_MEMBER(deco_mlc_state::mlc_44001c_w)
+void deco_mlc_state::mlc_44001c_w(u32 data)
{
}
-READ32_MEMBER(deco_mlc_state::mlc_200070_r)
+u32 deco_mlc_state::mlc_200070_r()
{
if (!machine().side_effects_disabled())
m_vbl_i ^= 0xffffffff;
@@ -150,29 +150,29 @@ READ32_MEMBER(deco_mlc_state::mlc_200070_r)
return m_vbl_i;
}
-READ32_MEMBER(deco_mlc_state::mlc_200000_r)
+u32 deco_mlc_state::mlc_200000_r()
{
return 0xffffffff;
}
-READ32_MEMBER(deco_mlc_state::mlc_200004_r)
+u32 deco_mlc_state::mlc_200004_r()
{
return 0xffffffff;
}
-READ32_MEMBER(deco_mlc_state::mlc_20007c_r)
+u32 deco_mlc_state::mlc_20007c_r()
{
return 0xffffffff;
}
-READ32_MEMBER(deco_mlc_state::mlc_scanline_r)
+u32 deco_mlc_state::mlc_scanline_r()
{
// logerror("read scanline counter (%d)\n", m_screen->vpos());
return m_screen->vpos();
}
-WRITE32_MEMBER(deco_mlc_state::eeprom_w)
+void deco_mlc_state::eeprom_w(offs_t offset, u32 data, u32 mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -200,7 +200,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(deco_mlc_state::interrupt_gen)
m_maincpu->set_input_line(m_irqLevel, HOLD_LINE);
}
-WRITE32_MEMBER(deco_mlc_state::irq_ram_w)
+void deco_mlc_state::irq_ram_w(offs_t offset, u32 data, u32 mem_mask)
{
// int scanline=m_screen->vpos();
COMBINE_DATA(&m_irq_ram[offset]);
@@ -249,7 +249,7 @@ WRITE32_MEMBER(deco_mlc_state::irq_ram_w)
}
-READ32_MEMBER( deco_mlc_state::spriteram_r )
+u32 deco_mlc_state::spriteram_r(offs_t offset, u32 mem_mask)
{
u32 retdata = 0;
@@ -267,7 +267,7 @@ READ32_MEMBER( deco_mlc_state::spriteram_r )
}
-WRITE32_MEMBER( deco_mlc_state::spriteram_w )
+void deco_mlc_state::spriteram_w(offs_t offset, u32 data, u32 mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -280,7 +280,7 @@ WRITE32_MEMBER( deco_mlc_state::spriteram_w )
}
}
-READ16_MEMBER( deco_mlc_state::sh96_protection_region_0_146_r )
+u16 deco_mlc_state::sh96_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;
@@ -289,7 +289,7 @@ READ16_MEMBER( deco_mlc_state::sh96_protection_region_0_146_r )
return data;
}
-WRITE16_MEMBER( deco_mlc_state::sh96_protection_region_0_146_w )
+void deco_mlc_state::sh96_protection_region_0_146_w(offs_t offset, u16 data, u16 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;
@@ -938,7 +938,7 @@ void deco_mlc_state::descramble_sound( )
std::copy(buf.begin(), buf.end(), &rom[0]);
}
-READ32_MEMBER(deco_mlc_state::avengrgs_speedup_r)
+u32 deco_mlc_state::avengrgs_speedup_r()
{
const u32 a = m_mainram[0x89a0 / 4];
const u32 p = m_maincpu->pc();
@@ -963,7 +963,7 @@ void deco_mlc_state::init_avengrgs()
dynamic_cast<sh2_device *>(m_maincpu.target())->sh2drc_add_fastram(0x0280000, 0x029ffff, 0, &m_vram[0]);
m_irqLevel = 1;
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x01089a0, 0x01089a3, read32_delegate(*this, FUNC(deco_mlc_state::avengrgs_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x01089a0, 0x01089a3, read32smo_delegate(*this, FUNC(deco_mlc_state::avengrgs_speedup_r)));
descramble_sound();
}
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index a27db56a0e6..43327afaf76 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -64,16 +64,16 @@
*
***************************************************************************/
-WRITE8_MEMBER(decocass_state::mirrorvideoram_w) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); decocass_fgvideoram_w(space, offset, data, mem_mask); }
-WRITE8_MEMBER(decocass_state::mirrorcolorram_w) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); decocass_colorram_w(space, offset, data, mem_mask); }
+void decocass_state::mirrorvideoram_w(offs_t offset, uint8_t data) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); decocass_fgvideoram_w(offset, data); }
+void decocass_state::mirrorcolorram_w(offs_t offset, uint8_t data) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); decocass_colorram_w(offset, data); }
-READ8_MEMBER(decocass_state::mirrorvideoram_r)
+uint8_t decocass_state::mirrorvideoram_r(offs_t offset)
{
offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5);
return m_fgvideoram[offset];
}
-READ8_MEMBER(decocass_state::mirrorcolorram_r)
+uint8_t decocass_state::mirrorcolorram_r(offs_t offset)
{
offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5);
return m_colorram[offset];
@@ -2061,9 +2061,9 @@ ROM_END
void decocass_state::init_decocass()
{
- /* Call the state save setup code in machine/decocass.c */
+ /* Call the state save setup code in machine/decocass.cpp */
decocass_machine_state_save_init();
- /* and in video/decocass.c, too */
+ /* and in video/decocass.cpp, too */
decocass_video_state_save_init();
}
@@ -2074,17 +2074,17 @@ void decocass_state::init_decocrom()
/* convert charram to a banked ROM */
m_maincpu->space(AS_PROGRAM).install_read_bank(0x6000, 0xafff, "bank1");
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x6000, 0xafff, write8_delegate(*this, FUNC(decocass_state::decocass_de0091_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x6000, 0xafff, write8sm_delegate(*this, FUNC(decocass_state::decocass_de0091_w)));
membank("bank1")->configure_entry(0, m_charram);
membank("bank1")->configure_entry(1, memregion("user3")->base());
membank("bank1")->configure_entry(2, memregion("user3")->base()+0x5000);
membank("bank1")->set_entry(0);
/* install the bank selector */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xe900, 0xe900, write8_delegate(*this, FUNC(decocass_state::decocass_e900_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xe900, 0xe900, write8smo_delegate(*this, FUNC(decocass_state::decocass_e900_w)));
}
-READ8_MEMBER(decocass_state::cdsteljn_input_r )
+uint8_t decocass_state::cdsteljn_input_r(offs_t offset)
{
uint8_t res;
static const char *const portnames[2][4] = {
@@ -2092,14 +2092,14 @@ READ8_MEMBER(decocass_state::cdsteljn_input_r )
{"P2_MP0", "P2_MP1", "P2_MP2", "P2_MP3"} };
if(offset & 6)
- return decocass_input_r(space,offset);
+ return decocass_input_r(offset);
res = ioport(portnames[offset & 1][m_mux_data])->read();
return res;
}
-WRITE8_MEMBER(decocass_state::cdsteljn_mux_w )
+void decocass_state::cdsteljn_mux_w(uint8_t data)
{
m_mux_data = (data & 0xc) >> 2;
/* bit 0 and 1 are p1/p2 lamps */
@@ -2114,8 +2114,8 @@ void decocass_state::init_cdsteljn()
init_decocass();
/* install custom mahjong panel */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xe413, 0xe413, write8_delegate(*this, FUNC(decocass_state::cdsteljn_mux_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xe600, 0xe6ff, read8_delegate(*this, FUNC(decocass_state::cdsteljn_input_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xe413, 0xe413, write8smo_delegate(*this, FUNC(decocass_state::cdsteljn_mux_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xe600, 0xe6ff, read8sm_delegate(*this, FUNC(decocass_state::cdsteljn_input_r)));
}
/* -- */ GAME( 1981, decocass, 0, decocass, decocass, decocass_state, init_decocass, ROT270, "Data East Corporation", "DECO Cassette System", MACHINE_IS_BIOS_ROOT )
diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp
index a325f105097..818cbfe1c3d 100644
--- a/src/mame/drivers/dietgo.cpp
+++ b/src/mame/drivers/dietgo.cpp
@@ -34,7 +34,7 @@ PAL16R6A 11H
#include "speaker.h"
-READ16_MEMBER( dietgo_state::dietgo_protection_region_0_104_r )
+uint16_t dietgo_state::dietgo_protection_region_0_104_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;
@@ -43,7 +43,7 @@ READ16_MEMBER( dietgo_state::dietgo_protection_region_0_104_r )
return data;
}
-WRITE16_MEMBER( dietgo_state::dietgo_protection_region_0_104_w )
+void dietgo_state::dietgo_protection_region_0_104_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/divebomb.cpp b/src/mame/drivers/divebomb.cpp
index 48f4a2bc4bd..aaf70faceee 100644
--- a/src/mame/drivers/divebomb.cpp
+++ b/src/mame/drivers/divebomb.cpp
@@ -134,7 +134,7 @@ void divebomb_state::divebomb_fgcpu_iomap(address_map &map)
}
-READ8_MEMBER(divebomb_state::fgcpu_comm_flags_r)
+uint8_t divebomb_state::fgcpu_comm_flags_r()
{
uint8_t result = 0;
@@ -170,7 +170,7 @@ void divebomb_state::divebomb_spritecpu_iomap(address_map &map)
}
-WRITE8_MEMBER(divebomb_state::spritecpu_port00_w)
+void divebomb_state::spritecpu_port00_w(uint8_t data)
{
// Written with 0x00 on reset
// Written with 0x34 7 times in succession on occasion (see PC:0x00E3)
@@ -184,14 +184,14 @@ WRITE8_MEMBER(divebomb_state::spritecpu_port00_w)
*************************************/
template<int Chip>
-WRITE8_MEMBER(divebomb_state::rozcpu_wrap_enable_w)
+void divebomb_state::rozcpu_wrap_enable_w(uint8_t data)
{
m_k051316[Chip]->wraparound_enable(!(data & 1));
}
template<int Chip>
-WRITE8_MEMBER(divebomb_state::rozcpu_enable_w)
+void divebomb_state::rozcpu_enable_w(uint8_t data)
{
m_roz_enable[Chip] = !(data & 1);
}
@@ -222,7 +222,7 @@ void divebomb_state::divebomb_rozcpu_iomap(address_map &map)
}
-WRITE8_MEMBER(divebomb_state::rozcpu_bank_w)
+void divebomb_state::rozcpu_bank_w(uint8_t data)
{
uint32_t bank = bitswap<8>(data, 4, 5, 6, 7, 3, 2, 1, 0) >> 4;
m_rozbank->set_entry(bank);
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index d006205fddf..acdefe1c530 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -150,19 +150,19 @@ Notes:
/* KANEKO BEAST state */
-READ8_MEMBER(djboy_state::beast_status_r)
+uint8_t djboy_state::beast_status_r()
{
return (m_slavelatch->pending_r() ? 0x0 : 0x4) | (m_beastlatch->pending_r() ? 0x8 : 0x0);
}
/******************************************************************************/
-WRITE8_MEMBER(djboy_state::trigger_nmi_on_mastercpu)
+void djboy_state::trigger_nmi_on_mastercpu(uint8_t data)
{
m_mastercpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-WRITE8_MEMBER(djboy_state::mastercpu_bankswitch_w)
+void djboy_state::mastercpu_bankswitch_w(uint8_t data)
{
data ^= m_bankxor;
m_masterbank->set_entry(data);
@@ -177,7 +177,7 @@ WRITE8_MEMBER(djboy_state::mastercpu_bankswitch_w)
* ---x---- screen flip
* ----xxxx bank
*/
-WRITE8_MEMBER(djboy_state::slavecpu_bankswitch_w)
+void djboy_state::slavecpu_bankswitch_w(uint8_t data)
{
m_videoreg = data;
@@ -185,7 +185,7 @@ WRITE8_MEMBER(djboy_state::slavecpu_bankswitch_w)
m_slavebank->set_entry((data & 0xf));
}
-WRITE8_MEMBER(djboy_state::coin_count_w)
+void djboy_state::coin_count_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
@@ -193,7 +193,7 @@ WRITE8_MEMBER(djboy_state::coin_count_w)
/******************************************************************************/
-WRITE8_MEMBER(djboy_state::soundcpu_bankswitch_w)
+void djboy_state::soundcpu_bankswitch_w(uint8_t data)
{
m_soundbank->set_entry(data); // shall we check data<0x07?
}
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index 07562467680..5cccc63dbfe 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -88,7 +88,7 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB
*
*************************************/
-WRITE32_MEMBER(djmain_state::sndram_bank_w)
+void djmain_state::sndram_bank_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -96,7 +96,7 @@ WRITE32_MEMBER(djmain_state::sndram_bank_w)
}
}
-READ32_MEMBER(djmain_state::sndram_r)
+uint32_t djmain_state::sndram_r(offs_t offset, uint32_t mem_mask)
{
uint32_t data = 0;
@@ -116,7 +116,7 @@ READ32_MEMBER(djmain_state::sndram_r)
return data;
}
-WRITE32_MEMBER(djmain_state::sndram_w)
+void djmain_state::sndram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
offset |= 0x20000 * m_sndram_bank;
if (ACCESSING_BITS_24_31)
@@ -135,7 +135,7 @@ WRITE32_MEMBER(djmain_state::sndram_w)
//---------
-READ32_MEMBER(djmain_state::obj_ctrl_r)
+uint32_t djmain_state::obj_ctrl_r(offs_t offset)
{
// read m_obj_regs[0x0c/4]: unknown
// read m_obj_regs[0x24/4]: unknown
@@ -143,14 +143,14 @@ READ32_MEMBER(djmain_state::obj_ctrl_r)
return m_obj_regs[offset];
}
-WRITE32_MEMBER(djmain_state::obj_ctrl_w)
+void djmain_state::obj_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// write m_obj_regs[0x28/4]: bank for rom readthrough
COMBINE_DATA(&m_obj_regs[offset]);
}
-READ32_MEMBER(djmain_state::obj_rom_r)
+uint32_t djmain_state::obj_rom_r(offs_t offset, uint32_t mem_mask)
{
uint8_t *mem8 = memregion("gfx1")->base();
int bank = m_obj_regs[0x28/4] >> 16;
@@ -170,7 +170,7 @@ READ32_MEMBER(djmain_state::obj_rom_r)
//---------
-WRITE32_MEMBER(djmain_state::v_ctrl_w)
+void djmain_state::v_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -186,7 +186,7 @@ WRITE32_MEMBER(djmain_state::v_ctrl_w)
}
}
-READ32_MEMBER(djmain_state::v_rom_r)
+uint32_t djmain_state::v_rom_r(offs_t offset, uint32_t mem_mask)
{
uint8_t *mem8 = memregion("k056832")->base();
int bank = m_k056832->word_r(0x34/2);
@@ -207,19 +207,19 @@ READ32_MEMBER(djmain_state::v_rom_r)
//---------
-READ8_MEMBER(djmain_state::inp1_r)
+uint8_t djmain_state::inp1_r(offs_t offset)
{
static const char *const portnames[] = { "DSW3", "BTN3", "BTN2", "BTN1" };
return ioport(portnames[ offset & 0x03 ])->read();
}
-READ8_MEMBER(djmain_state::inp2_r)
+uint8_t djmain_state::inp2_r(offs_t offset)
{
static const char *const portnames[] = { "DSW1", "DSW2", "UNK2", "UNK1" };
return ioport(portnames[ offset & 0x03 ])->read();
}
-READ32_MEMBER(djmain_state::turntable_r)
+uint32_t djmain_state::turntable_r(offs_t offset, uint32_t mem_mask)
{
uint32_t result = 0;
@@ -244,7 +244,7 @@ READ32_MEMBER(djmain_state::turntable_r)
return result;
}
-WRITE32_MEMBER(djmain_state::turntable_select_w)
+void djmain_state::turntable_select_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_23)
m_turntable_select = (data >> 19) & 1;
@@ -284,7 +284,7 @@ WRITE32_MEMBER(djmain_state::turntable_select_w)
15: not used? (always low)
*/
-WRITE32_MEMBER(djmain_state::light_ctrl_1_w)
+void djmain_state::light_ctrl_1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -295,7 +295,7 @@ WRITE32_MEMBER(djmain_state::light_ctrl_1_w)
}
}
-WRITE32_MEMBER(djmain_state::light_ctrl_2_w)
+void djmain_state::light_ctrl_2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_16_31)
{
@@ -312,17 +312,17 @@ WRITE32_MEMBER(djmain_state::light_ctrl_2_w)
// unknown ports :-(
-WRITE32_MEMBER(djmain_state::unknown590000_w)
+void djmain_state::unknown590000_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
//logerror("%08X: unknown 590000 write %08X: %08X & %08X\n", m_maincpu->pcbase(), offset, data, mem_mask);
}
-WRITE32_MEMBER(djmain_state::unknown802000_w)
+void djmain_state::unknown802000_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
//logerror("%08X: unknown 802000 write %08X: %08X & %08X\n", m_maincpu->pcbase(), offset, data, mem_mask);
}
-WRITE32_MEMBER(djmain_state::unknownc02000_w)
+void djmain_state::unknownc02000_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
//logerror("%08X: unknown c02000 write %08X: %08X & %08X\n", m_maincpu->pcbase(), offset, data, mem_mask);
}
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index 0fd9536d9c5..3d8c7c68ec3 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -607,12 +607,12 @@ void dkong_state::p8257_ctl_w(uint8_t data)
*
*************************************/
-WRITE8_MEMBER(dkong_state::dkong3_coin_counter_w)
+void dkong_state::dkong3_coin_counter_w(offs_t offset, uint8_t data)
{
machine().bookkeeping().coin_counter_w(offset, data & 0x01);
}
-WRITE8_MEMBER(dkong_state::p8257_drq_w)
+void dkong_state::p8257_drq_w(uint8_t data)
{
m_dma8257->dreq0_w(data & 0x01);
m_dma8257->dreq1_w(data & 0x01);
@@ -620,7 +620,7 @@ WRITE8_MEMBER(dkong_state::p8257_drq_w)
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100)); // smooth things out a bit
}
-READ8_MEMBER(dkong_state::dkong_in2_r)
+uint8_t dkong_state::dkong_in2_r(offs_t offset)
{
// 2 board DK and all DKjr has a watchdog
if (m_watchdog)
@@ -634,7 +634,7 @@ READ8_MEMBER(dkong_state::dkong_in2_r)
}
-READ8_MEMBER(dkong_state::epos_decrypt_rom)
+uint8_t dkong_state::epos_decrypt_rom(offs_t offset)
{
if (offset & 0x01)
{
@@ -662,7 +662,7 @@ READ8_MEMBER(dkong_state::epos_decrypt_rom)
}
-WRITE8_MEMBER(dkong_state::s2650_data_w)
+void dkong_state::s2650_data_w(uint8_t data)
{
#if DEBUG_PROTECTION
logerror("write : pc = %04x, loopback = %02x\n",m_maincpu->pc(), data);
@@ -683,7 +683,7 @@ WRITE_LINE_MEMBER(dkong_state::s2650_fo_w)
m_hunchloopback = 0xfb;
}
-READ8_MEMBER(dkong_state::s2650_port0_r)
+uint8_t dkong_state::s2650_port0_r()
{
#if DEBUG_PROTECTION
logerror("port 0 : pc = %04x, loopback = %02x fo=%d\n",m_maincpu->pc(), m_hunchloopback, m_main_fo);
@@ -707,7 +707,7 @@ READ8_MEMBER(dkong_state::s2650_port0_r)
}
-READ8_MEMBER(dkong_state::s2650_port1_r)
+uint8_t dkong_state::s2650_port1_r()
{
#if DEBUG_PROTECTION
logerror("port 1 : pc = %04x, loopback = %02x fo=%d\n",m_maincpu->pc(), m_hunchloopback, m_main_fo);
@@ -728,7 +728,7 @@ READ8_MEMBER(dkong_state::s2650_port1_r)
}
-WRITE8_MEMBER(dkong_state::dkong3_2a03_reset_w)
+void dkong_state::dkong3_2a03_reset_w(uint8_t data)
{
if (data & 1)
{
@@ -742,7 +742,7 @@ WRITE8_MEMBER(dkong_state::dkong3_2a03_reset_w)
}
}
-READ8_MEMBER(dkong_state::strtheat_inputport_0_r)
+uint8_t dkong_state::strtheat_inputport_0_r()
{
if(ioport("DSW0")->read() & 0x40)
{
@@ -757,7 +757,7 @@ READ8_MEMBER(dkong_state::strtheat_inputport_0_r)
}
-READ8_MEMBER(dkong_state::strtheat_inputport_1_r)
+uint8_t dkong_state::strtheat_inputport_1_r()
{
if(ioport("DSW0")->read() & 0x40)
{
@@ -771,12 +771,12 @@ READ8_MEMBER(dkong_state::strtheat_inputport_1_r)
}
}
-WRITE8_MEMBER(dkong_state::dkong_z80dma_rdy_w)
+void dkong_state::dkong_z80dma_rdy_w(uint8_t data)
{
m_z80dma->rdy_w(data & 0x01);
}
-WRITE8_MEMBER(dkong_state::nmi_mask_w)
+void dkong_state::nmi_mask_w(uint8_t data)
{
m_nmi_mask = data & 1;
if (!m_nmi_mask)
@@ -1612,7 +1612,7 @@ GFXDECODE_END
*
*************************************/
-READ8_MEMBER(dkong_state::braze_eeprom_r)
+uint8_t dkong_state::braze_eeprom_r()
{
return m_eeprom->do_read();
}
@@ -1623,12 +1623,12 @@ WRITE_LINE_MEMBER(dkong_state::dk_braze_a15)
membank("bank2")->set_entry(state & 0x01);
}
-WRITE8_MEMBER(dkong_state::dk_braze_a15_w)
+void dkong_state::dk_braze_a15_w(uint8_t data)
{
dk_braze_a15(data);
}
-WRITE8_MEMBER(dkong_state::braze_eeprom_w)
+void dkong_state::braze_eeprom_w(uint8_t data)
{
m_eeprom->di_write(data & 0x01);
m_eeprom->cs_write(data & 0x04 ? ASSERT_LINE : CLEAR_LINE);
@@ -3609,8 +3609,8 @@ void dkong_state::init_strtheat()
drakton_decrypt_rom(0x88, 0x1c000, bs[3]);
/* custom handlers supporting Joystick or Steering Wheel */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x7c00, 0x7c00, read8_delegate(*this, FUNC(dkong_state::strtheat_inputport_0_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x7c80, 0x7c80, read8_delegate(*this, FUNC(dkong_state::strtheat_inputport_1_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x7c00, 0x7c00, read8smo_delegate(*this, FUNC(dkong_state::strtheat_inputport_0_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x7c80, 0x7c80, read8smo_delegate(*this, FUNC(dkong_state::strtheat_inputport_1_r)));
}
void dkong_state::dk_braze_decrypt()
@@ -3633,8 +3633,8 @@ void dkong_state::init_dkonghs()
dk_braze_decrypt();
address_space &space = m_maincpu->space(AS_PROGRAM);
- space.install_read_handler(0xc000, 0xc000, read8_delegate(*this, FUNC(dkong_state::braze_eeprom_r)));
- space.install_write_handler(0xc000, 0xc000, write8_delegate(*this, FUNC(dkong_state::braze_eeprom_w)));
+ space.install_read_handler(0xc000, 0xc000, read8smo_delegate(*this, FUNC(dkong_state::braze_eeprom_r)));
+ space.install_write_handler(0xc000, 0xc000, write8smo_delegate(*this, FUNC(dkong_state::braze_eeprom_w)));
}
void dkong_state::init_dkongx()
@@ -3642,10 +3642,10 @@ void dkong_state::init_dkongx()
dk_braze_decrypt();
address_space &space = m_maincpu->space(AS_PROGRAM);
- space.install_write_handler(0xe000, 0xe000, write8_delegate(*this, FUNC(dkong_state::dk_braze_a15_w)));
+ space.install_write_handler(0xe000, 0xe000, write8smo_delegate(*this, FUNC(dkong_state::dk_braze_a15_w)));
- space.install_read_handler(0xc800, 0xc800, read8_delegate(*this, FUNC(dkong_state::braze_eeprom_r)));
- space.install_write_handler(0xc800, 0xc800, write8_delegate(*this, FUNC(dkong_state::braze_eeprom_w)));
+ space.install_read_handler(0xc800, 0xc800, read8smo_delegate(*this, FUNC(dkong_state::braze_eeprom_r)));
+ space.install_write_handler(0xc800, 0xc800, write8smo_delegate(*this, FUNC(dkong_state::braze_eeprom_w)));
}
void dkong_state::init_dkong3hs()
@@ -3658,8 +3658,8 @@ void dkong_state::init_dkong3hs()
m_maincpu->space(AS_PROGRAM).install_rom(0x8000, 0xffff, m_decrypted.get() + 0x8000);
address_space &space = m_maincpu->space(AS_PROGRAM);
- space.install_read_handler(0xc000, 0xc000, read8_delegate(*this, FUNC(dkong_state::braze_eeprom_r)));
- space.install_write_handler(0xc000, 0xc000, write8_delegate(*this, FUNC(dkong_state::braze_eeprom_w)));
+ space.install_read_handler(0xc000, 0xc000, read8smo_delegate(*this, FUNC(dkong_state::braze_eeprom_r)));
+ space.install_write_handler(0xc000, 0xc000, write8smo_delegate(*this, FUNC(dkong_state::braze_eeprom_w)));
}
void dkong_state::init_dkingjr()
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index 44c03cde393..6160394ee64 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -57,31 +57,31 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
}
}
-READ8_MEMBER( dm7000_state::dm7000_iic0_r )
+uint8_t dm7000_state::dm7000_iic0_r(offs_t offset)
{
uint8_t data = 0; // dummy
verboselog(*this, 9, "(IIC0) %08X -> %08X\n", 0x40030000 + offset, data);
return data;
}
-WRITE8_MEMBER( dm7000_state::dm7000_iic0_w )
+void dm7000_state::dm7000_iic0_w(offs_t offset, uint8_t data)
{
verboselog(*this, 9, "(IIC0) %08X <- %08X\n", 0x40030000 + offset, data);
}
-READ8_MEMBER( dm7000_state::dm7000_iic1_r )
+uint8_t dm7000_state::dm7000_iic1_r(offs_t offset)
{
uint8_t data = 0; // dummy
verboselog(*this, 9, "(IIC1) %08X -> %08X\n", 0x400b0000 + offset, data);
return data;
}
-WRITE8_MEMBER( dm7000_state::dm7000_iic1_w )
+void dm7000_state::dm7000_iic1_w(offs_t offset, uint8_t data)
{
verboselog(*this, 9, "(IIC1) %08X <- %08X\n", 0x400b0000 + offset, data);
}
-READ8_MEMBER( dm7000_state::dm7000_scc0_r )
+uint8_t dm7000_state::dm7000_scc0_r(offs_t offset)
{
uint8_t data = 0;
switch(offset) {
@@ -102,7 +102,7 @@ READ8_MEMBER( dm7000_state::dm7000_scc0_r )
return data;
}
-WRITE8_MEMBER( dm7000_state::dm7000_scc0_w )
+void dm7000_state::dm7000_scc0_w(offs_t offset, uint8_t data)
{
switch(offset) {
case UART_THR:
@@ -118,19 +118,19 @@ WRITE8_MEMBER( dm7000_state::dm7000_scc0_w )
verboselog(*this, 9, "(SCC0) %08X <- %08X\n", 0x40040000 + offset, data);
}
-READ8_MEMBER( dm7000_state::dm7000_gpio0_r )
+uint8_t dm7000_state::dm7000_gpio0_r(offs_t offset)
{
uint8_t data = 0; // dummy
verboselog(*this, 9, "(GPIO0) %08X -> %08X\n", 0x40060000 + offset, data);
return data;
}
-WRITE8_MEMBER( dm7000_state::dm7000_gpio0_w )
+void dm7000_state::dm7000_gpio0_w(offs_t offset, uint8_t data)
{
verboselog(*this, 9, "(GPIO0) %08X <- %08X\n", 0x40060000 + offset, data);
}
-READ8_MEMBER( dm7000_state::dm7000_scp0_r )
+uint8_t dm7000_state::dm7000_scp0_r(offs_t offset)
{
uint8_t data = 0; // dummy
switch(offset) {
@@ -142,7 +142,7 @@ READ8_MEMBER( dm7000_state::dm7000_scp0_r )
return data;
}
-WRITE8_MEMBER( dm7000_state::dm7000_scp0_w )
+void dm7000_state::dm7000_scp0_w(offs_t offset, uint8_t data)
{
verboselog(*this, 9, "(SCP0) %08X <- %08X\n", 0x400c0000 + offset, data);
switch(offset) {
@@ -152,7 +152,7 @@ WRITE8_MEMBER( dm7000_state::dm7000_scp0_w )
}
}
-READ16_MEMBER( dm7000_state::dm7000_enet_r )
+uint16_t dm7000_state::dm7000_enet_r(offs_t offset)
{
uint16_t data;
switch (offset) {
@@ -173,7 +173,7 @@ READ16_MEMBER( dm7000_state::dm7000_enet_r )
return data;
}
-WRITE16_MEMBER( dm7000_state::dm7000_enet_w )
+void dm7000_state::dm7000_enet_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
verboselog(*this, 9, "(ENET) %08X <- %08X\n", 0x72000600 + (offset), data);
COMBINE_DATA(&m_enet_regs[offset]);
@@ -261,8 +261,8 @@ void dm7000_state::machine_reset()
dcr[DCRSTB045_FRAME_BUFR_BASE] = 0x0f000000;
m_scc0_lsr = UART_LSR_THRE | UART_LSR_TEMT;
- m_maincpu->ppc4xx_set_dcr_read_handler(read32_delegate(*this, FUNC(dm7000_state::dcr_r)));
- m_maincpu->ppc4xx_set_dcr_write_handler(write32_delegate(*this, FUNC(dm7000_state::dcr_w)));
+ m_maincpu->ppc4xx_set_dcr_read_handler(read32sm_delegate(*this, FUNC(dm7000_state::dcr_r)));
+ m_maincpu->ppc4xx_set_dcr_write_handler(write32sm_delegate(*this, FUNC(dm7000_state::dcr_w)));
}
void dm7000_state::video_start()
@@ -274,7 +274,7 @@ uint32_t dm7000_state::screen_update_dm7000(screen_device &screen, bitmap_rgb32
return 0;
}
-READ32_MEMBER( dm7000_state::dcr_r )
+uint32_t dm7000_state::dcr_r(offs_t offset)
{
osd_printf_debug("DCR %03X read\n", offset);
if(offset>=1024) {printf("get %04X\n", offset); return 0;} else
@@ -287,7 +287,7 @@ READ32_MEMBER( dm7000_state::dcr_r )
}
-WRITE32_MEMBER( dm7000_state::dcr_w )
+void dm7000_state::dcr_w(offs_t offset, uint32_t data)
{
osd_printf_debug("DCR %03X write = %08X\n", offset, data);
if(offset>=1024) {printf("get %04X\n", offset); } else
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index 7215ecd1bfa..70bc9ca10e5 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -199,14 +199,14 @@ WRITE_LINE_MEMBER(docastle_state::idsoccer_adpcm_int)
}
}
-READ8_MEMBER(docastle_state::idsoccer_adpcm_status_r)
+uint8_t docastle_state::idsoccer_adpcm_status_r()
{
// this is wrong, but the samples work anyway!!
m_adpcm_status ^= 0x80;
return m_adpcm_status;
}
-WRITE8_MEMBER(docastle_state::idsoccer_adpcm_w)
+void docastle_state::idsoccer_adpcm_w(uint8_t data)
{
if (data & 0x80)
{
diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp
index 2932100f5b8..e41975ae3b2 100644
--- a/src/mame/drivers/dogfgt.cpp
+++ b/src/mame/drivers/dogfgt.cpp
@@ -16,24 +16,24 @@ driver by Nicola Salmoria
#include "speaker.h"
-WRITE8_MEMBER(dogfgt_state::subirqtrigger_w)
+void dogfgt_state::subirqtrigger_w(uint8_t data)
{
/* bit 0 used but unknown */
if (data & 0x04)
m_subcpu->set_input_line(0, ASSERT_LINE);
}
-WRITE8_MEMBER(dogfgt_state::sub_irqack_w)
+void dogfgt_state::sub_irqack_w(uint8_t data)
{
m_subcpu->set_input_line(0, CLEAR_LINE);
}
-WRITE8_MEMBER(dogfgt_state::soundlatch_w)
+void dogfgt_state::soundlatch_w(uint8_t data)
{
m_soundlatch = data;
}
-WRITE8_MEMBER(dogfgt_state::soundcontrol_w)
+void dogfgt_state::soundcontrol_w(uint8_t data)
{
/* bit 5 goes to YM2149 #0 BDIR pin */
if ((m_last_snd_ctrl & 0x20) == 0x20 && (data & 0x20) == 0x00)
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index 5cfa432e01f..80b403fee17 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -58,7 +58,7 @@ void dragrace_state::speed2_w(uint8_t data)
output().set_value("tachometer2", freq);
}
-READ8_MEMBER(dragrace_state::dragrace_input_r)
+uint8_t dragrace_state::dragrace_input_r(offs_t offset)
{
int val = ioport("IN2")->read();
static const char *const portnames[] = { "IN0", "IN1" };
@@ -81,7 +81,7 @@ READ8_MEMBER(dragrace_state::dragrace_input_r)
}
-READ8_MEMBER(dragrace_state::dragrace_steering_r)
+uint8_t dragrace_state::dragrace_steering_r()
{
int bitA[2];
int bitB[2];
@@ -101,7 +101,7 @@ READ8_MEMBER(dragrace_state::dragrace_steering_r)
}
-READ8_MEMBER(dragrace_state::dragrace_scanline_r)
+uint8_t dragrace_state::dragrace_scanline_r()
{
return (m_screen->vpos() ^ 0xf0) | 0x0f;
}
diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp
index 6148eb941cc..de0b955221c 100644
--- a/src/mame/drivers/drgnmst.cpp
+++ b/src/mame/drivers/drgnmst.cpp
@@ -48,20 +48,20 @@ Notes:
#include "speaker.h"
-WRITE16_MEMBER(drgnmst_base_state::coin_w)
+void drgnmst_base_state::coin_w(uint16_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 0x100);
machine().bookkeeping().coin_lockout_w(0, ~data & 0x400);
machine().bookkeeping().coin_lockout_w(1, ~data & 0x800);
}
-WRITE8_MEMBER(drgnmst_pic_state::snd_command_w)
+void drgnmst_pic_state::snd_command_w(uint8_t data)
{
m_snd_command = data;
m_maincpu->yield();
}
-WRITE8_MEMBER(drgnmst_pic_state::snd_flag_w)
+void drgnmst_pic_state::snd_flag_w(uint8_t data)
{
/* Enables the following 68K write operation to latch through to the PIC */
m_snd_flag = 1;
diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp
index 032f099d9ec..53d202e1a29 100644
--- a/src/mame/drivers/drmicro.cpp
+++ b/src/mame/drivers/drmicro.cpp
@@ -34,7 +34,7 @@ INTERRUPT_GEN_MEMBER(drmicro_state::drmicro_interrupt)
device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-WRITE8_MEMBER(drmicro_state::nmi_enable_w)
+void drmicro_state::nmi_enable_w(uint8_t data)
{
m_nmi_enable = data & 1;
m_flipscreen = (data & 2) ? 1 : 0;
@@ -64,7 +64,7 @@ WRITE_LINE_MEMBER(drmicro_state::pcm_w)
m_msm->reset_w(1);
}
-WRITE8_MEMBER(drmicro_state::pcm_set_w)
+void drmicro_state::pcm_set_w(uint8_t data)
{
m_pcm_adr = ((data & 0x3f) << 9);
pcm_w(1);
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index 12609ba5e68..2df382fecae 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -114,7 +114,7 @@ WRITE_LINE_MEMBER(dynax_state::sprtmtch_blitter_irq_w)
m_mainirq->rst4_w(1);
}
-WRITE8_MEMBER(dynax_state::dynax_vblank_ack_w)
+void dynax_state::dynax_vblank_ack_w(uint8_t data)
{
m_mainirq->rst2_w(0);
}
@@ -138,7 +138,7 @@ WRITE_LINE_MEMBER(dynax_state::sprtmtch_vblank_w)
***************************************************************************/
/* It runs in IM 0, thus needs an opcode on the data bus */
-WRITE8_MEMBER(dynax_state::jantouki_vblank_ack_w)
+void dynax_state::jantouki_vblank_ack_w(uint8_t data)
{
m_mainirq->rst4_w(0);
}
@@ -183,7 +183,7 @@ WRITE_LINE_MEMBER(dynax_state::jantouki_vblank_w)
Jantouki - Sound CPU
***************************************************************************/
-WRITE8_MEMBER(dynax_state::jantouki_sound_vblank_ack_w)
+void dynax_state::jantouki_sound_vblank_ack_w(uint8_t data)
{
m_soundirq->rst4_w(0);
}
@@ -211,13 +211,13 @@ WRITE_LINE_MEMBER(dynax_state::coincounter_1_w)
machine().bookkeeping().coin_counter_w(1, state);
}
-READ8_MEMBER(dynax_state::ret_ff)
+uint8_t dynax_state::ret_ff()
{
return 0xff;
}
-READ8_MEMBER(dynax_state::hanamai_keyboard_0_r)
+uint8_t dynax_state::hanamai_keyboard_0_r()
{
int res = 0x3f;
@@ -231,7 +231,7 @@ READ8_MEMBER(dynax_state::hanamai_keyboard_0_r)
return res;
}
-READ8_MEMBER(dynax_state::hanamai_keyboard_1_r)
+uint8_t dynax_state::hanamai_keyboard_1_r()
{
int res = 0x3f;
@@ -245,36 +245,36 @@ READ8_MEMBER(dynax_state::hanamai_keyboard_1_r)
return res;
}
-WRITE8_MEMBER(dynax_state::hanamai_keyboard_w)
+void dynax_state::hanamai_keyboard_w(uint8_t data)
{
m_keyb = data;
}
-WRITE8_MEMBER(dynax_state::dynax_rombank_w)
+void dynax_state::dynax_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x0f);
}
-WRITE8_MEMBER(dynax_state::jantouki_sound_rombank_w)
+void dynax_state::jantouki_sound_rombank_w(uint8_t data)
{
membank("bank2")->set_entry(data);
}
-WRITE8_MEMBER(dynax_state::hnoridur_rombank_w)
+void dynax_state::hnoridur_rombank_w(uint8_t data)
{
m_bankdev->set_bank(data & 0x1f);
}
-WRITE8_MEMBER(dynax_state::hnoridur_palette_lo_w)
+void dynax_state::hnoridur_palette_lo_w(offs_t offset, uint8_t data)
{
m_palette_ram[256 * m_palbank + offset + 16 * 256] = data;
hnoridur_palette_update(offset);
}
-WRITE8_MEMBER(dynax_state::hnoridur_palette_hi_w)
+void dynax_state::hnoridur_palette_hi_w(offs_t offset, uint8_t data)
{
m_palette_ram[256 * m_palbank + offset] = data;
hnoridur_palette_update(offset);
@@ -290,13 +290,13 @@ void dynax_state::hnoridur_palette_update(offs_t offset)
m_palette->set_pen_color(256 * m_palbank + offset, pal5bit(r), pal5bit(g), pal5bit(b));
}
-WRITE8_MEMBER(dynax_state::nanajign_palette_lo_w)
+void dynax_state::nanajign_palette_lo_w(offs_t offset, uint8_t data)
{
m_palette_ram[256 * m_palbank + offset + 16 * 256] = data;
nanajign_palette_update(offset);
}
-WRITE8_MEMBER(dynax_state::nanajign_palette_hi_w)
+void dynax_state::nanajign_palette_hi_w(offs_t offset, uint8_t data)
{
m_palette_ram[256 * m_palbank + offset] = data;
nanajign_palette_update(offset);
@@ -341,12 +341,12 @@ WRITE_LINE_MEMBER(dynax_state::adpcm_int_cpu1)
}
-WRITE8_MEMBER(dynax_state::adpcm_data_w)
+void dynax_state::adpcm_data_w(uint8_t data)
{
m_msm5205next = data;
}
-WRITE8_MEMBER(dynax_state::adpcm_reset_w)
+void dynax_state::adpcm_reset_w(uint8_t data)
{
m_resetkludge = data & 1;
m_msm->reset_w(~data & 1);
@@ -569,14 +569,14 @@ uint8_t dynax_state::hjingi_hopper_bit()
return (m_hopper && !(m_screen->frame_number() % 10)) ? 0 : (1 << 6);
}
-READ8_MEMBER(dynax_state::hjingi_keyboard_0_r)
+uint8_t dynax_state::hjingi_keyboard_0_r()
{
- return hanamai_keyboard_0_r(space, 0) | hjingi_hopper_bit();
+ return hanamai_keyboard_0_r() | hjingi_hopper_bit();
}
-READ8_MEMBER(dynax_state::hjingi_keyboard_1_r)
+uint8_t dynax_state::hjingi_keyboard_1_r()
{
- return hanamai_keyboard_1_r(space, 0) | ioport("BET")->read();
+ return hanamai_keyboard_1_r() | ioport("BET")->read();
}
void dynax_state::hjingi_mem_map(address_map &map)
@@ -647,7 +647,7 @@ void dynax_state::hjingi_io_map(address_map &map)
Yarunara / Quiz TV Q&Q / Mahjong Angels
***************************************************************************/
-WRITE8_MEMBER(dynax_state::yarunara_input_w)
+void dynax_state::yarunara_input_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -660,7 +660,7 @@ WRITE8_MEMBER(dynax_state::yarunara_input_w)
}
-READ8_MEMBER(dynax_state::yarunara_input_r)
+uint8_t dynax_state::yarunara_input_r(offs_t offset)
{
static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" };
static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" };
@@ -704,12 +704,12 @@ READ8_MEMBER(dynax_state::yarunara_input_r)
return 0xff;
}
-WRITE8_MEMBER(dynax_state::yarunara_rombank_w)
+void dynax_state::yarunara_rombank_w(uint8_t data)
{
m_bankdev->set_bank(data & 0x3f);
}
-WRITE8_MEMBER(dynax_state::yarunara_blit_romregion_w)
+void dynax_state::yarunara_blit_romregion_w(uint8_t data)
{
switch(data)
{
@@ -870,18 +870,18 @@ void dynax_state::nanajign_io_map(address_map &map)
Jantouki - Main CPU
***************************************************************************/
-READ8_MEMBER(dynax_state::jantouki_soundlatch_ack_r)
+uint8_t dynax_state::jantouki_soundlatch_ack_r()
{
machine().scheduler().synchronize();
return m_soundlatch->pending_r() ? 0x80 : 0;
}
-READ8_MEMBER(dynax_state::jantouki_blitter_busy_r)
+uint8_t dynax_state::jantouki_blitter_busy_r()
{
return 0; // bit 0 & 1
}
-WRITE8_MEMBER(dynax_state::jantouki_rombank_w)
+void dynax_state::jantouki_rombank_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x0f);
m_led = BIT(data, 4); // maybe
@@ -921,7 +921,7 @@ void dynax_state::jantouki_io_map(address_map &map)
Jantouki - Sound CPU
***************************************************************************/
-READ8_MEMBER(dynax_state::jantouki_soundlatch_status_r)
+uint8_t dynax_state::jantouki_soundlatch_status_r()
{
return m_soundlatch->pending_r() ? 0 : 0x80;
}
@@ -947,12 +947,12 @@ void dynax_state::jantouki_sound_io_map(address_map &map)
Mahjong Electron Base
***************************************************************************/
-READ8_MEMBER(dynax_state::mjelctrn_keyboard_1_r)
+uint8_t dynax_state::mjelctrn_keyboard_1_r()
{
- return (hanamai_keyboard_1_r(space, 0) & 0x3f) | (ioport("FAKE")->read() ? 0x40 : 0);
+ return (hanamai_keyboard_1_r() & 0x3f) | (ioport("FAKE")->read() ? 0x40 : 0);
}
-READ8_MEMBER(dynax_state::mjelctrn_dsw_r)
+uint8_t dynax_state::mjelctrn_dsw_r()
{
int dsw = (m_keyb & 0xc0) >> 6;
static const char *const dswnames[] = { "DSW0", "DSW1", "DSW2", "DSW3" };
@@ -1026,7 +1026,7 @@ void dynax_state::mjembase_io_map(address_map &map)
Mahjong Tenkaigen
***************************************************************************/
-WRITE8_MEMBER(dynax_state::tenkai_ipsel_w)
+void dynax_state::tenkai_ipsel_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -1039,7 +1039,7 @@ WRITE8_MEMBER(dynax_state::tenkai_ipsel_w)
}
-WRITE8_MEMBER(dynax_state::tenkai_ip_w)
+void dynax_state::tenkai_ip_w(uint8_t data)
{
switch (m_input_sel)
{
@@ -1059,7 +1059,7 @@ WRITE8_MEMBER(dynax_state::tenkai_ip_w)
logerror("%04x: unmapped ip_sel=%02x written with %02x\n", m_maincpu->pc(), m_input_sel, data);
}
-READ8_MEMBER(dynax_state::tenkai_ip_r)
+uint8_t dynax_state::tenkai_ip_r(offs_t offset)
{
static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" };
//static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" };
@@ -1125,12 +1125,12 @@ uint8_t dynax_state::tenkai_dsw_r()
return 0xff;
}
-READ8_MEMBER(dynax_state::tenkai_palette_r)
+uint8_t dynax_state::tenkai_palette_r(offs_t offset)
{
return m_palette_ram[512 * m_palbank + offset];
}
-WRITE8_MEMBER(dynax_state::tenkai_palette_w)
+void dynax_state::tenkai_palette_w(offs_t offset, uint8_t data)
{
int addr = 512 * m_palbank + offset;
m_palette_ram[addr] = data;
@@ -1216,7 +1216,7 @@ WRITE_LINE_MEMBER(dynax_state::tenkai_70_w)
tenkai_show_6c();
}
-WRITE8_MEMBER(dynax_state::tenkai_blit_romregion_w)
+void dynax_state::tenkai_blit_romregion_w(uint8_t data)
{
switch (data)
{
@@ -1261,7 +1261,7 @@ void dynax_state::tenkai_banked_map(address_map &map)
Mahjong Gekisha
***************************************************************************/
-READ8_MEMBER(dynax_state::gekisha_keyboard_0_r)
+uint8_t dynax_state::gekisha_keyboard_0_r()
{
int res = 0x3f;
@@ -1273,7 +1273,7 @@ READ8_MEMBER(dynax_state::gekisha_keyboard_0_r)
return res;
}
-READ8_MEMBER(dynax_state::gekisha_keyboard_1_r)
+uint8_t dynax_state::gekisha_keyboard_1_r()
{
int res = 0x3f;
@@ -1291,7 +1291,7 @@ READ8_MEMBER(dynax_state::gekisha_keyboard_1_r)
return res;
}
-WRITE8_MEMBER(dynax_state::gekisha_hopper_w)
+void dynax_state::gekisha_hopper_w(offs_t offset, uint8_t data)
{
m_gekisha_val[offset] = data;
// popmessage("%02x %02x", gekisha_val[0], gekisha_val[1]);
@@ -1339,7 +1339,7 @@ void dynax_state::gekisha_banked_map(address_map &map)
Castle Of Dracula
***************************************************************************/
-WRITE8_MEMBER(dynax_state::cdracula_sound_rombank_w)
+void dynax_state::cdracula_sound_rombank_w(uint8_t data)
{
// logerror("%s: sound bank = %02x\n", machine().describe_context(), data);
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 6a503699e61..10e0b7c9f70 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -1073,7 +1073,7 @@ void fcrash_state::init_cawingbl()
{
m_maincpu->space(AS_PROGRAM).install_read_port(0x882000, 0x882001, "IN1");
m_maincpu->space(AS_PROGRAM).install_write_handler(0x882006, 0x882007, write16_delegate(*this, FUNC(fcrash_state::cawingbl_soundlatch_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x882008, 0x88200f, read16_delegate(*this, FUNC(fcrash_state::cps1_dsw_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x882008, 0x88200f, read16sm_delegate(*this, FUNC(fcrash_state::cps1_dsw_r)));
init_cps1();
}
@@ -1081,8 +1081,8 @@ void fcrash_state::init_cawingbl()
void fcrash_state::init_kodb()
{
m_maincpu->space(AS_PROGRAM).install_read_port(0x800000, 0x800007, "IN1");
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x800018, 0x80001f, read16_delegate(*this, FUNC(fcrash_state::cps1_dsw_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x800180, 0x800187, write16_delegate(*this, FUNC(fcrash_state::cps1_soundlatch_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x800018, 0x80001f, read16sm_delegate(*this, FUNC(fcrash_state::cps1_dsw_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x800180, 0x800187, write16s_delegate(*this, FUNC(fcrash_state::cps1_soundlatch_w)));
m_maincpu->space(AS_PROGRAM).install_write_handler(0x980000, 0x98002f, write16_delegate(*this, FUNC(fcrash_state::kodb_layer_w)));
/* the original game alternates between 2 sprite ram areas to achieve flashing sprites - the bootleg doesn't do the write to the register to achieve this
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 83523b472ea..0ed58f9e0e5 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -809,12 +809,12 @@ TIMER_CALLBACK_MEMBER(galaga_state::cpu3_interrupt_callback)
}
-READ8_MEMBER(digdug_state::earom_read)
+uint8_t digdug_state::earom_read()
{
return m_earom->data();
}
-WRITE8_MEMBER(digdug_state::earom_write)
+void digdug_state::earom_write(offs_t offset, uint8_t data)
{
m_earom->set_address(offset & 0x3f);
m_earom->set_data(data);
diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp
index beff496823a..8e4c49b45a3 100644
--- a/src/mame/drivers/galaxia.cpp
+++ b/src/mame/drivers/galaxia.cpp
@@ -103,7 +103,7 @@ WRITE8_MEMBER(galaxia_state::galaxia_video_w)
{
// m_screen->update_partial(m_screen->vpos());
m_bg_tilemap->mark_tile_dirty(offset);
- cvs_video_or_color_ram_w(space, offset, data);
+ cvs_video_or_color_ram_w(offset, data);
}
WRITE8_MEMBER(galaxia_state::galaxia_scroll_w)
diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index 8eac1e483ab..7fe4d9926b5 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -308,7 +308,7 @@ READ8_MEMBER(vicdual_state::depthch_io_r)
WRITE8_MEMBER(vicdual_state::depthch_io_w)
{
if (offset & 0x01) assert_coin_status();
- if (offset & 0x04) depthch_audio_w(space, 0, data);
+ if (offset & 0x04) depthch_audio_w(data);
}
@@ -1159,8 +1159,8 @@ WRITE8_MEMBER(vicdual_state::spacetrk_io_w)
WRITE8_MEMBER(carnival_state::carnival_io_w)
{
- if (offset & 0x01) carnival_audio_1_w(space, 0, data);
- if (offset & 0x02) carnival_audio_2_w(space, 0, data);
+ if (offset & 0x01) carnival_audio_1_w(data);
+ if (offset & 0x02) carnival_audio_2_w(data);
if (offset & 0x08) assert_coin_status();
if (offset & 0x40) palette_bank_w(space, 0, data);
}
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index c3f3a6d8ddf..b091dbc4f60 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -49,21 +49,21 @@ public:
int m_sound_command2;
// common
- DECLARE_WRITE16_MEMBER(flipscreen_w);
- DECLARE_WRITE16_MEMBER(background_videoram_w);
- DECLARE_WRITE16_MEMBER(text_videoram_w);
+ void flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void background_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void text_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
// cabal specific
void sound_irq_trigger_word_w(offs_t, u16 data, u16 mem_mask);
// cabalbl specific
- DECLARE_WRITE16_MEMBER(cabalbl_sndcmd_w);
- DECLARE_WRITE16_MEMBER(cabalbl_sound_irq_trigger_word_w);
- DECLARE_READ8_MEMBER(cabalbl_snd2_r);
- DECLARE_READ8_MEMBER(cabalbl_snd1_r);
- DECLARE_WRITE8_MEMBER(cabalbl_coin_w);
- DECLARE_WRITE8_MEMBER(cabalbl_1_adpcm_w);
- DECLARE_WRITE8_MEMBER(cabalbl_2_adpcm_w);
+ void cabalbl_sndcmd_w(offs_t offset, uint16_t data);
+ void cabalbl_sound_irq_trigger_word_w(uint16_t data);
+ uint8_t cabalbl_snd2_r();
+ uint8_t cabalbl_snd1_r();
+ void cabalbl_coin_w(uint8_t data);
+ void cabalbl_1_adpcm_w(uint8_t data);
+ void cabalbl_2_adpcm_w(uint8_t data);
void init_cabal();
DECLARE_MACHINE_START(cabalbl);
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index 071555e0e30..20ac1c23ba2 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -49,8 +49,8 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE8_MEMBER(calomega_videoram_w);
- DECLARE_WRITE8_MEMBER(calomega_colorram_w);
+ void calomega_videoram_w(offs_t offset, uint8_t data);
+ void calomega_colorram_w(offs_t offset, uint8_t data);
uint8_t s903_mux_port_r();
void s903_mux_w(uint8_t data);
uint8_t s905_mux_port_r();
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index 440db879b0d..f54b2002a85 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -44,15 +44,15 @@ public:
void canyon(machine_config &config);
protected:
- DECLARE_READ8_MEMBER(canyon_switches_r);
- DECLARE_READ8_MEMBER(canyon_options_r);
- DECLARE_WRITE8_MEMBER(output_latch_w);
- DECLARE_WRITE8_MEMBER(canyon_videoram_w);
+ uint8_t canyon_switches_r(offs_t offset);
+ uint8_t canyon_options_r(offs_t offset);
+ void output_latch_w(offs_t offset, uint8_t data);
+ void canyon_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
void canyon_palette(palette_device &palette) const;
uint32_t screen_update_canyon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(canyon_motor_w);
- DECLARE_WRITE8_MEMBER(canyon_explode_w);
+ void canyon_motor_w(offs_t offset, uint8_t data);
+ void canyon_explode_w(uint8_t data);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void draw_bombs( bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 98e3c539a12..74b2f787de0 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -55,19 +55,19 @@ public:
emu_timer *m_update_timer;
// common
- DECLARE_READ8_MEMBER(track_0_r);
- DECLARE_READ8_MEMBER(track_1_r);
- DECLARE_WRITE8_MEMBER(track_reset_w);
- DECLARE_WRITE8_MEMBER(sndcmd_w);
- DECLARE_WRITE8_MEMBER(tms34061_w);
- DECLARE_READ8_MEMBER(tms34061_r);
+ uint8_t track_0_r();
+ uint8_t track_1_r();
+ void track_reset_w(uint8_t data);
+ void sndcmd_w(uint8_t data);
+ void tms34061_w(offs_t offset, uint8_t data);
+ uint8_t tms34061_r(offs_t offset);
// capbowl specific
- DECLARE_WRITE8_MEMBER(capbowl_rom_select_w);
+ void capbowl_rom_select_w(uint8_t data);
// bowlrama specific
- DECLARE_WRITE8_MEMBER(bowlrama_blitter_w);
- DECLARE_READ8_MEMBER(bowlrama_blitter_r);
+ void bowlrama_blitter_w(offs_t offset, uint8_t data);
+ uint8_t bowlrama_blitter_r(offs_t offset);
void init_capbowl();
virtual void machine_start() override;
diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h
index 05ad10fb525..2cee3be3776 100644
--- a/src/mame/includes/carpolo.h
+++ b/src/mame/includes/carpolo.h
@@ -99,20 +99,20 @@ private:
std::unique_ptr<bitmap_ind16> m_sprite_goal_collision_bitmap2;
std::unique_ptr<bitmap_ind16> m_sprite_border_collision_bitmap;
- DECLARE_READ8_MEMBER(ball_screen_collision_cause_r);
- DECLARE_READ8_MEMBER(car_ball_collision_x_r);
- DECLARE_READ8_MEMBER(car_ball_collision_y_r);
- DECLARE_READ8_MEMBER(car_car_collision_cause_r);
- DECLARE_READ8_MEMBER(car_goal_collision_cause_r);
- DECLARE_READ8_MEMBER(car_ball_collision_cause_r);
- DECLARE_READ8_MEMBER(car_border_collision_cause_r);
- DECLARE_READ8_MEMBER(interrupt_cause_r);
- DECLARE_WRITE8_MEMBER(ball_screen_interrupt_clear_w);
- DECLARE_WRITE8_MEMBER(car_car_interrupt_clear_w);
- DECLARE_WRITE8_MEMBER(car_goal_interrupt_clear_w);
- DECLARE_WRITE8_MEMBER(car_ball_interrupt_clear_w);
- DECLARE_WRITE8_MEMBER(car_border_interrupt_clear_w);
- DECLARE_WRITE8_MEMBER(timer_interrupt_clear_w);
+ uint8_t ball_screen_collision_cause_r();
+ uint8_t car_ball_collision_x_r();
+ uint8_t car_ball_collision_y_r();
+ uint8_t car_car_collision_cause_r();
+ uint8_t car_goal_collision_cause_r();
+ uint8_t car_ball_collision_cause_r();
+ uint8_t car_border_collision_cause_r();
+ uint8_t interrupt_cause_r();
+ void ball_screen_interrupt_clear_w(uint8_t data);
+ void car_car_interrupt_clear_w(uint8_t data);
+ void car_goal_interrupt_clear_w(uint8_t data);
+ void car_ball_interrupt_clear_w(uint8_t data);
+ void car_border_interrupt_clear_w(uint8_t data);
+ void timer_interrupt_clear_w(uint8_t data);
void carpolo_palette(palette_device &palette) const;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h
index fdc500074ff..c6c1e95c1b6 100644
--- a/src/mame/includes/cbasebal.h
+++ b/src/mame/includes/cbasebal.h
@@ -39,17 +39,17 @@ public:
/* misc */
uint8_t m_rambank;
- DECLARE_WRITE8_MEMBER(cbasebal_bankswitch_w);
- DECLARE_READ8_MEMBER(bankedram_r);
- DECLARE_WRITE8_MEMBER(bankedram_w);
- DECLARE_WRITE8_MEMBER(cbasebal_coinctrl_w);
- DECLARE_WRITE8_MEMBER(cbasebal_textram_w);
- DECLARE_READ8_MEMBER(cbasebal_textram_r);
- DECLARE_WRITE8_MEMBER(cbasebal_scrollram_w);
- DECLARE_READ8_MEMBER(cbasebal_scrollram_r);
- DECLARE_WRITE8_MEMBER(cbasebal_gfxctrl_w);
- DECLARE_WRITE8_MEMBER(cbasebal_scrollx_w);
- DECLARE_WRITE8_MEMBER(cbasebal_scrolly_w);
+ void cbasebal_bankswitch_w(uint8_t data);
+ uint8_t bankedram_r(offs_t offset);
+ void bankedram_w(offs_t offset, uint8_t data);
+ void cbasebal_coinctrl_w(uint8_t data);
+ void cbasebal_textram_w(offs_t offset, uint8_t data);
+ uint8_t cbasebal_textram_r(offs_t offset);
+ void cbasebal_scrollram_w(offs_t offset, uint8_t data);
+ uint8_t cbasebal_scrollram_r(offs_t offset);
+ void cbasebal_gfxctrl_w(uint8_t data);
+ void cbasebal_scrollx_w(offs_t offset, uint8_t data);
+ void cbasebal_scrolly_w(offs_t offset, uint8_t data);
void init_cbasebal();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index 9cbaad33aa5..f67243d9115 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -36,20 +36,20 @@ public:
void ccastles(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_READ8_MEMBER(leta_r);
- DECLARE_WRITE8_MEMBER(nvram_recall_w);
+ void irq_ack_w(uint8_t data);
+ uint8_t leta_r(offs_t offset);
+ void nvram_recall_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(nvram_store_w);
- DECLARE_READ8_MEMBER(nvram_r);
- DECLARE_WRITE8_MEMBER(nvram_w);
- DECLARE_WRITE8_MEMBER(ccastles_hscroll_w);
- DECLARE_WRITE8_MEMBER(ccastles_vscroll_w);
- DECLARE_WRITE8_MEMBER(ccastles_video_control_w);
- DECLARE_WRITE8_MEMBER(ccastles_paletteram_w);
- DECLARE_WRITE8_MEMBER(ccastles_videoram_w);
- DECLARE_READ8_MEMBER(ccastles_bitmode_r);
- DECLARE_WRITE8_MEMBER(ccastles_bitmode_w);
- DECLARE_WRITE8_MEMBER(ccastles_bitmode_addr_w);
+ uint8_t nvram_r(address_space &space, offs_t offset);
+ void nvram_w(offs_t offset, uint8_t data);
+ void ccastles_hscroll_w(uint8_t data);
+ void ccastles_vscroll_w(uint8_t data);
+ void ccastles_video_control_w(offs_t offset, uint8_t data);
+ void ccastles_paletteram_w(offs_t offset, uint8_t data);
+ void ccastles_videoram_w(offs_t offset, uint8_t data);
+ uint8_t ccastles_bitmode_r();
+ void ccastles_bitmode_w(uint8_t data);
+ void ccastles_bitmode_addr_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/cchasm.h b/src/mame/includes/cchasm.h
index 8fbcfeeb673..b4f20542a0e 100644
--- a/src/mame/includes/cchasm.h
+++ b/src/mame/includes/cchasm.h
@@ -58,14 +58,14 @@ public:
int m_ycenter;
emu_timer *m_refresh_end_timer;
- DECLARE_WRITE16_MEMBER(led_w);
- DECLARE_WRITE16_MEMBER(refresh_control_w);
- DECLARE_WRITE8_MEMBER(reset_coin_flag_w);
- DECLARE_READ8_MEMBER(coin_sound_r);
- DECLARE_READ8_MEMBER(soundlatch2_r);
- DECLARE_WRITE8_MEMBER(soundlatch4_w);
- DECLARE_WRITE16_MEMBER(io_w);
- DECLARE_READ16_MEMBER(io_r);
+ void led_w(offs_t offset, uint16_t data);
+ void refresh_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void reset_coin_flag_w(uint8_t data);
+ uint8_t coin_sound_r();
+ uint8_t soundlatch2_r();
+ void soundlatch4_w(uint8_t data);
+ void io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t io_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(ctc_timer_1_w);
DECLARE_WRITE_LINE_MEMBER(ctc_timer_2_w);
diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h
index c0c91c6dbc7..a77b8390b27 100644
--- a/src/mame/includes/cdi.h
+++ b/src/mame/includes/cdi.h
@@ -61,8 +61,8 @@ private:
void cdimono2_mem(address_map &map);
void cdi070_cpuspace(address_map &map);
- DECLARE_READ16_MEMBER(dvc_r);
- DECLARE_WRITE16_MEMBER(dvc_w);
+ uint16_t dvc_r(offs_t offset, uint16_t mem_mask = ~0);
+ void dvc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
required_shared_ptr<uint16_t> m_planea;
optional_device<cdislave_hle_device> m_slave_hle;
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index 15e5f462a4c..4d6a0f2d1ac 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -82,39 +82,39 @@ private:
tilemap_t *m_bg_tilemap;
// drivers/centiped.cpp
- DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_READ8_MEMBER(centiped_IN0_r);
- DECLARE_READ8_MEMBER(centiped_IN2_r);
- DECLARE_READ8_MEMBER(milliped_IN1_r);
- DECLARE_READ8_MEMBER(milliped_IN2_r);
+ void irq_ack_w(uint8_t data);
+ uint8_t centiped_IN0_r();
+ uint8_t centiped_IN2_r();
+ uint8_t milliped_IN1_r();
+ uint8_t milliped_IN2_r();
DECLARE_WRITE_LINE_MEMBER(input_select_w);
DECLARE_WRITE_LINE_MEMBER(control_select_w);
- DECLARE_READ8_MEMBER(mazeinv_input_r);
- DECLARE_WRITE8_MEMBER(mazeinv_input_select_w);
- DECLARE_READ8_MEMBER(bullsdrt_data_port_r);
+ uint8_t mazeinv_input_r();
+ void mazeinv_input_select_w(offs_t offset, uint8_t data);
+ uint8_t bullsdrt_data_port_r();
DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_center_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w);
DECLARE_WRITE_LINE_MEMBER(bullsdrt_coin_count_w);
- DECLARE_READ8_MEMBER(earom_read);
- DECLARE_WRITE8_MEMBER(earom_write);
+ uint8_t earom_read();
+ void earom_write(offs_t offset, uint8_t data);
void earom_control_w(uint8_t data);
uint8_t caterplr_unknown_r();
- DECLARE_WRITE8_MEMBER(caterplr_AY8910_w);
- DECLARE_READ8_MEMBER(caterplr_AY8910_r);
- DECLARE_READ8_MEMBER(multiped_eeprom_r);
- DECLARE_WRITE8_MEMBER(multiped_eeprom_w);
- DECLARE_WRITE8_MEMBER(multiped_prgbank_w);
+ void caterplr_AY8910_w(offs_t offset, uint8_t data);
+ uint8_t caterplr_AY8910_r(offs_t offset);
+ uint8_t multiped_eeprom_r();
+ void multiped_eeprom_w(offs_t offset, uint8_t data);
+ void multiped_prgbank_w(uint8_t data);
// video/centiped.cpp
- DECLARE_WRITE8_MEMBER(centiped_videoram_w);
+ void centiped_videoram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flip_screen_w);
- DECLARE_WRITE8_MEMBER(multiped_gfxbank_w);
- DECLARE_WRITE8_MEMBER(bullsdrt_tilesbank_w);
- DECLARE_WRITE8_MEMBER(bullsdrt_sprites_bank_w);
- DECLARE_WRITE8_MEMBER(centiped_paletteram_w);
- DECLARE_WRITE8_MEMBER(milliped_paletteram_w);
- DECLARE_WRITE8_MEMBER(mazeinv_paletteram_w);
+ void multiped_gfxbank_w(uint8_t data);
+ void bullsdrt_tilesbank_w(offs_t offset, uint8_t data);
+ void bullsdrt_sprites_bank_w(uint8_t data);
+ void centiped_paletteram_w(offs_t offset, uint8_t data);
+ void milliped_paletteram_w(offs_t offset, uint8_t data);
+ void mazeinv_paletteram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(centiped_get_tile_info);
TILE_GET_INFO_MEMBER(warlords_get_tile_info);
TILE_GET_INFO_MEMBER(milliped_get_tile_info);
diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h
index 035892acb00..554d4605f52 100644
--- a/src/mame/includes/cgc7900.h
+++ b/src/mame/includes/cgc7900.h
@@ -61,20 +61,20 @@ public:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
required_memory_region m_char_rom;
- required_shared_ptr<uint16_t> m_chrom_ram;
- required_shared_ptr<uint16_t> m_plane_ram;
- required_shared_ptr<uint16_t> m_clut_ram;
- required_shared_ptr<uint16_t> m_overlay_ram;
- required_shared_ptr<uint16_t> m_roll_bitmap;
- required_shared_ptr<uint16_t> m_pan_x;
- required_shared_ptr<uint16_t> m_pan_y;
- required_shared_ptr<uint16_t> m_zoom;
- required_shared_ptr<uint16_t> m_blink_select;
- required_shared_ptr<uint16_t> m_plane_select;
- required_shared_ptr<uint16_t> m_plane_switch;
- required_shared_ptr<uint16_t> m_color_status_fg;
- required_shared_ptr<uint16_t> m_color_status_bg;
- required_shared_ptr<uint16_t> m_roll_overlay;
+ required_shared_ptr<u16> m_chrom_ram;
+ required_shared_ptr<u16> m_plane_ram;
+ required_shared_ptr<u16> m_clut_ram;
+ required_shared_ptr<u16> m_overlay_ram;
+ required_shared_ptr<u16> m_roll_bitmap;
+ required_shared_ptr<u16> m_pan_x;
+ required_shared_ptr<u16> m_pan_y;
+ required_shared_ptr<u16> m_zoom;
+ required_shared_ptr<u16> m_blink_select;
+ required_shared_ptr<u16> m_plane_select;
+ required_shared_ptr<u16> m_plane_switch;
+ required_shared_ptr<u16> m_color_status_fg;
+ required_shared_ptr<u16> m_color_status_bg;
+ required_shared_ptr<u16> m_roll_overlay;
required_device<i8251_device> m_i8251_0;
required_device<i8251_device> m_i8251_1;
@@ -82,20 +82,20 @@ public:
virtual void machine_reset() override;
void cgc7900_palette(palette_device &palette) const;
- uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
- DECLARE_READ16_MEMBER( keyboard_r );
- DECLARE_WRITE16_MEMBER( keyboard_w );
- DECLARE_WRITE16_MEMBER( interrupt_mask_w );
- DECLARE_READ16_MEMBER( disk_data_r );
- DECLARE_WRITE16_MEMBER( disk_data_w );
- DECLARE_READ16_MEMBER( disk_status_r );
- DECLARE_WRITE16_MEMBER( disk_command_w );
- DECLARE_READ16_MEMBER( z_mode_r );
- DECLARE_WRITE16_MEMBER( z_mode_w );
- DECLARE_WRITE16_MEMBER( color_status_w );
- DECLARE_READ16_MEMBER( sync_r );
- DECLARE_READ16_MEMBER( unmapped_r );
+ u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+ u16 keyboard_r();
+ void keyboard_w(u16 data);
+ void interrupt_mask_w(u16 data);
+ u16 disk_data_r();
+ void disk_data_w(u16 data);
+ u16 disk_status_r();
+ void disk_command_w(u16 data);
+ u16 z_mode_r();
+ void z_mode_w(u16 data);
+ void color_status_w(u16 data);
+ u16 sync_r();
+ u16 unmapped_r();
template <unsigned N> DECLARE_WRITE_LINE_MEMBER(irq) { irq_encoder(N, state); }
@@ -104,7 +104,7 @@ public:
void draw_overlay(screen_device *screen, bitmap_rgb32 &bitmap);
/* interrupt state */
- uint16_t m_int_mask, m_int_active;
+ u16 m_int_mask, m_int_active;
/* video state */
rgb_t m_clut[256];
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index 37245d4f931..9c5daaae3ae 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -44,15 +44,15 @@ public:
uint8_t m_flip_x;
uint8_t m_flip_y;
- DECLARE_WRITE8_MEMBER(coinlock_w);
- DECLARE_READ8_MEMBER(gfxmode_r);
- DECLARE_WRITE8_MEMBER(gfxmode_w);
- DECLARE_WRITE8_MEMBER(txram_w);
- DECLARE_WRITE8_MEMBER(attrram_w);
+ void coinlock_w(uint8_t data);
+ uint8_t gfxmode_r();
+ void gfxmode_w(uint8_t data);
+ void txram_w(offs_t offset, uint8_t data);
+ void attrram_w(offs_t offset, uint8_t data);
void unknown_port_1_w(uint8_t data);
void unknown_port_2_w(uint8_t data);
void unknown_port_3_w(uint8_t data);
- DECLARE_READ8_MEMBER(mcu_status_r);
+ uint8_t mcu_status_r();
TILE_GET_INFO_MEMBER(get_tx_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index 7d9bda9d32c..917c80d9ab7 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -52,11 +52,11 @@ public:
protected:
// handlers
DECLARE_WRITE_LINE_MEMBER(irq_enable_w);
- DECLARE_READ8_MEMBER(champbja_protection_r);
+ uint8_t champbja_protection_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
- DECLARE_WRITE8_MEMBER(tilemap_w);
+ void tilemap_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(gfxbank_w);
DECLARE_WRITE_LINE_MEMBER(palette_bank_w);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h
index 619ca9b5457..54c7c7c6d56 100644
--- a/src/mame/includes/changela.h
+++ b/src/mame/includes/changela.h
@@ -54,27 +54,27 @@ public:
int m_dir_31;
/* devices */
- DECLARE_READ8_MEMBER(mcu_r);
- DECLARE_WRITE8_MEMBER(mcu_w);
+ uint8_t mcu_r();
+ void mcu_w(uint8_t data);
void changela_68705_port_a_w(uint8_t data);
void changela_68705_port_c_w(uint8_t data);
- DECLARE_READ8_MEMBER(changela_24_r);
- DECLARE_READ8_MEMBER(changela_25_r);
- DECLARE_READ8_MEMBER(changela_30_r);
- DECLARE_READ8_MEMBER(changela_31_r);
- DECLARE_READ8_MEMBER(changela_2c_r);
- DECLARE_READ8_MEMBER(changela_2d_r);
+ uint8_t changela_24_r();
+ uint8_t changela_25_r();
+ uint8_t changela_30_r();
+ uint8_t changela_31_r();
+ uint8_t changela_2c_r();
+ uint8_t changela_2d_r();
DECLARE_WRITE_LINE_MEMBER(mcu_pc_0_w);
DECLARE_WRITE_LINE_MEMBER(collision_reset_0_w);
DECLARE_WRITE_LINE_MEMBER(collision_reset_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
- DECLARE_WRITE8_MEMBER(changela_colors_w);
- DECLARE_WRITE8_MEMBER(changela_mem_device_select_w);
- DECLARE_WRITE8_MEMBER(changela_mem_device_w);
- DECLARE_READ8_MEMBER(changela_mem_device_r);
- DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_hi_w);
- DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_lo_w);
+ void changela_colors_w(offs_t offset, uint8_t data);
+ void changela_mem_device_select_w(uint8_t data);
+ void changela_mem_device_w(offs_t offset, uint8_t data);
+ uint8_t changela_mem_device_r(offs_t offset);
+ void changela_slope_rom_addr_hi_w(uint8_t data);
+ void changela_slope_rom_addr_lo_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h
index d28b2dcb026..37b9390eda8 100644
--- a/src/mame/includes/channelf.h
+++ b/src/mame/includes/channelf.h
@@ -29,14 +29,14 @@ public:
, m_cart(*this, "cartslot")
{ }
- DECLARE_READ8_MEMBER(port_0_r);
- DECLARE_READ8_MEMBER(port_1_r);
- DECLARE_READ8_MEMBER(port_4_r);
- DECLARE_READ8_MEMBER(port_5_r);
- DECLARE_WRITE8_MEMBER(port_0_w);
- DECLARE_WRITE8_MEMBER(port_1_w);
- DECLARE_WRITE8_MEMBER(port_4_w);
- DECLARE_WRITE8_MEMBER(port_5_w);
+ uint8_t port_0_r();
+ uint8_t port_1_r();
+ uint8_t port_4_r();
+ uint8_t port_5_r();
+ void port_0_w(uint8_t data);
+ void port_1_w(uint8_t data);
+ void port_4_w(uint8_t data);
+ void port_5_w(uint8_t data);
uint8_t *m_p_videoram;
uint8_t m_latch[6];
uint8_t m_val_reg;
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index 0992ecbf486..66a1afc2823 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -41,8 +41,8 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE8_MEMBER(port_40_w);
- DECLARE_WRITE8_MEMBER(port_80_w);
+ void port_40_w(uint8_t data);
+ void port_80_w(uint8_t data);
INTERRUPT_GEN_MEMBER(vblank_irq);
diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h
index 6eea620bec3..0775d127f94 100644
--- a/src/mame/includes/chqflag.h
+++ b/src/mame/includes/chqflag.h
@@ -34,13 +34,13 @@ public:
{
}
- template<int Chip> DECLARE_READ8_MEMBER(k051316_ramrom_r);
- DECLARE_WRITE8_MEMBER(chqflag_bankswitch_w);
- DECLARE_WRITE8_MEMBER(chqflag_vreg_w);
- DECLARE_WRITE8_MEMBER(select_analog_ctrl_w);
- DECLARE_READ8_MEMBER(analog_read_r);
- DECLARE_WRITE8_MEMBER(k007232_bankswitch_w);
- DECLARE_WRITE8_MEMBER(k007232_extvolume_w);
+ template<int Chip> uint8_t k051316_ramrom_r(offs_t offset);
+ void chqflag_bankswitch_w(uint8_t data);
+ void chqflag_vreg_w(uint8_t data);
+ void select_analog_ctrl_w(uint8_t data);
+ uint8_t analog_read_r();
+ void k007232_bankswitch_w(uint8_t data);
+ void k007232_extvolume_w(uint8_t data);
void volume_callback0(uint8_t data);
void volume_callback1(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(background_brt_w);
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index 241b4672cab..02642938f5e 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -69,13 +69,13 @@ public:
rgb_t m_vector_color;
int16_t m_lastx;
int16_t m_lasty;
- DECLARE_READ8_MEMBER(inputs_r);
- DECLARE_READ8_MEMBER(switches_r);
- DECLARE_READ8_MEMBER(coin_input_r);
+ uint8_t inputs_r(offs_t offset);
+ uint8_t switches_r(offs_t offset);
+ uint8_t coin_input_r();
WRITE_LINE_MEMBER(coin_reset_w);
WRITE_LINE_MEMBER(mux_select_w);
- DECLARE_READ8_MEMBER(speedfrk_wheel_r);
- DECLARE_READ8_MEMBER(speedfrk_gear_r);
+ uint8_t speedfrk_wheel_r(offs_t offset);
+ uint8_t speedfrk_gear_r(offs_t offset);
virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w);
uint8_t joystick_read();
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
@@ -182,7 +182,7 @@ public:
protected:
virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
- DECLARE_READ8_MEMBER(sundance_inputs_r);
+ uint8_t sundance_inputs_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(sundance_sound0_w);
DECLARE_WRITE_LINE_MEMBER(sundance_sound1_w);
DECLARE_WRITE_LINE_MEMBER(sundance_sound2_w);
@@ -229,7 +229,7 @@ public:
protected:
virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
- DECLARE_READ8_MEMBER(boxingb_dial_r);
+ uint8_t boxingb_dial_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(boxingb_sound0_w);
DECLARE_WRITE_LINE_MEMBER(boxingb_sound1_w);
DECLARE_WRITE_LINE_MEMBER(boxingb_sound2_w);
@@ -282,9 +282,9 @@ public:
protected:
virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
- DECLARE_READ8_MEMBER(qb3_frame_r);
- DECLARE_WRITE8_MEMBER(qb3_ram_bank_w);
- DECLARE_WRITE8_MEMBER(qb3_sound_fifo_w);
+ uint8_t qb3_frame_r();
+ void qb3_ram_bank_w(uint8_t data);
+ void qb3_sound_fifo_w(uint8_t data);
virtual void sound_reset() override;
diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h
index 892d803c7af..a4af97a1f9f 100644
--- a/src/mame/includes/circusc.h
+++ b/src/mame/includes/circusc.h
@@ -59,14 +59,14 @@ public:
bool m_irq_mask;
- DECLARE_READ8_MEMBER(circusc_sh_timer_r);
- DECLARE_WRITE8_MEMBER(circusc_sh_irqtrigger_w);
+ uint8_t circusc_sh_timer_r();
+ void circusc_sh_irqtrigger_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
- DECLARE_WRITE8_MEMBER(circusc_sound_w);
+ void circusc_sound_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(irq_mask_w);
- DECLARE_WRITE8_MEMBER(circusc_videoram_w);
- DECLARE_WRITE8_MEMBER(circusc_colorram_w);
+ void circusc_videoram_w(offs_t offset, uint8_t data);
+ void circusc_colorram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
DECLARE_WRITE_LINE_MEMBER(spritebank_w);
void init_circusc();
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index b2ff49d017f..105f4b39b7d 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -42,37 +42,37 @@ public:
, m_leds(*this, "led%u", 0U)
{}
- DECLARE_WRITE16_MEMBER(scudhamm_motor_command_w);
- DECLARE_WRITE16_MEMBER(scudhamm_leds_w);
- DECLARE_WRITE16_MEMBER(scudhamm_enable_w);
- DECLARE_WRITE16_MEMBER(scudhamm_oki_bank_w);
- DECLARE_WRITE16_MEMBER(bigrun_soundbank_w);
- DECLARE_READ16_MEMBER(scudhamm_motor_status_r);
- DECLARE_READ16_MEMBER(scudhamm_motor_pos_r);
+ void scudhamm_motor_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void scudhamm_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void scudhamm_enable_w(uint16_t data);
+ void scudhamm_oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void bigrun_soundbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t scudhamm_motor_status_r();
+ uint16_t scudhamm_motor_pos_r();
uint8_t scudhamm_analog_r();
- DECLARE_READ16_MEMBER(bigrun_ip_select_r);
- DECLARE_WRITE16_MEMBER(leds_out_w);
- DECLARE_WRITE16_MEMBER(unknown_out_w);
- DECLARE_WRITE16_MEMBER(motor_out_w);
- DECLARE_WRITE16_MEMBER(wheel_out_w);
- DECLARE_WRITE16_MEMBER(ip_select_w);
- DECLARE_WRITE16_MEMBER(ip_select_plus1_w);
- DECLARE_WRITE16_MEMBER(bigrun_comms_w);
- DECLARE_WRITE16_MEMBER(active_layers_w);
- DECLARE_READ16_MEMBER(cischeat_ip_select_r);
- DECLARE_WRITE16_MEMBER(cischeat_soundlatch_w);
- DECLARE_WRITE16_MEMBER(cischeat_comms_w);
- DECLARE_READ16_MEMBER(f1gpstar_wheel_r);
- DECLARE_READ16_MEMBER(f1gpstr2_ioready_r);
- DECLARE_READ16_MEMBER(wildplt_xy_r);
- DECLARE_READ16_MEMBER(wildplt_mux_r);
- DECLARE_WRITE16_MEMBER(wildplt_mux_w);
- DECLARE_WRITE16_MEMBER(f1gpstar_motor_w);
- DECLARE_WRITE16_MEMBER(f1gpstar_soundint_w);
- DECLARE_WRITE16_MEMBER(f1gpstar_comms_w);
- DECLARE_WRITE16_MEMBER(f1gpstr2_io_w);
- DECLARE_WRITE16_MEMBER(cischeat_soundbank_1_w);
- DECLARE_WRITE16_MEMBER(cischeat_soundbank_2_w);
+ uint16_t bigrun_ip_select_r();
+ void leds_out_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void unknown_out_w(uint16_t data);
+ void motor_out_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wheel_out_w(uint16_t data);
+ void ip_select_w(uint16_t data);
+ void ip_select_plus1_w(uint16_t data);
+ void bigrun_comms_w(uint16_t data);
+ void active_layers_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cischeat_ip_select_r();
+ void cischeat_soundlatch_w(uint16_t data);
+ void cischeat_comms_w(uint16_t data);
+ uint16_t f1gpstar_wheel_r();
+ uint16_t f1gpstr2_ioready_r();
+ uint16_t wildplt_xy_r();
+ uint16_t wildplt_mux_r();
+ void wildplt_mux_w(uint16_t data);
+ void f1gpstar_motor_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void f1gpstar_soundint_w(uint16_t data);
+ void f1gpstar_comms_w(uint16_t data);
+ void f1gpstr2_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cischeat_soundbank_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cischeat_soundbank_2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(sound_irq);
void init_cischeat();
void init_bigrun();
@@ -165,10 +165,10 @@ public:
m_armold = 0;
}
- DECLARE_READ16_MEMBER(motor_status_r);
- DECLARE_WRITE16_MEMBER(motor_command_w);
+ uint16_t motor_status_r();
+ void motor_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint8_t analog_r();
- DECLARE_WRITE16_MEMBER(output_w);
+ void output_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void armchmp2(machine_config &config);
void armchmp2_map(address_map &map);
@@ -193,7 +193,7 @@ public:
std::unique_ptr<uint16_t[]> m_allocated_spriteram;
void wildplt_map(address_map &map);
void wildplt(machine_config &config);
- DECLARE_WRITE16_MEMBER(sprite_dma_w);
+ void sprite_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
protected:
virtual void video_start() override;
@@ -224,12 +224,12 @@ public:
void init_captflag();
private:
- DECLARE_WRITE16_MEMBER(motor_command_right_w);
- DECLARE_WRITE16_MEMBER(motor_command_left_w);
+ void motor_command_right_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void motor_command_left_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void motor_move(int side, uint16_t data);
- DECLARE_WRITE16_MEMBER(oki_bank_w);
+ void oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_WRITE16_MEMBER(leds_w);
+ void leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TIMER_DEVICE_CALLBACK_MEMBER(captflag_scanline);
diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h
index 575107088a3..246424f4fe7 100644
--- a/src/mame/includes/citycon.h
+++ b/src/mame/includes/citycon.h
@@ -43,11 +43,11 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- DECLARE_READ8_MEMBER(citycon_in_r);
- DECLARE_READ8_MEMBER(citycon_irq_ack_r);
- DECLARE_WRITE8_MEMBER(citycon_videoram_w);
- DECLARE_WRITE8_MEMBER(citycon_linecolor_w);
- DECLARE_WRITE8_MEMBER(citycon_background_w);
+ uint8_t citycon_in_r();
+ uint8_t citycon_irq_ack_r();
+ void citycon_videoram_w(offs_t offset, uint8_t data);
+ void citycon_linecolor_w(offs_t offset, uint8_t data);
+ void citycon_background_w(uint8_t data);
void init_citycon();
TILEMAP_MAPPER_MEMBER(citycon_scan);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index 42f7c8e3cd5..0ea34881c72 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -33,15 +33,15 @@ public:
protected:
DECLARE_WRITE_LINE_MEMBER(coin_counter_l_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_r_w);
- DECLARE_WRITE8_MEMBER(cloak_custom_w);
- DECLARE_WRITE8_MEMBER(cloak_irq_reset_0_w);
- DECLARE_WRITE8_MEMBER(cloak_irq_reset_1_w);
- DECLARE_WRITE8_MEMBER(cloak_nvram_enable_w);
- DECLARE_WRITE8_MEMBER(cloak_paletteram_w);
- DECLARE_WRITE8_MEMBER(cloak_clearbmp_w);
- DECLARE_READ8_MEMBER(graph_processor_r);
- DECLARE_WRITE8_MEMBER(graph_processor_w);
- DECLARE_WRITE8_MEMBER(cloak_videoram_w);
+ void cloak_custom_w(uint8_t data);
+ void cloak_irq_reset_0_w(uint8_t data);
+ void cloak_irq_reset_1_w(uint8_t data);
+ void cloak_nvram_enable_w(uint8_t data);
+ void cloak_paletteram_w(offs_t offset, uint8_t data);
+ void cloak_clearbmp_w(uint8_t data);
+ uint8_t graph_processor_r(offs_t offset);
+ void graph_processor_w(offs_t offset, uint8_t data);
+ void cloak_videoram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(cocktail_w);
void set_current_bitmap_videoram_pointer();
void adjust_xy(int offset);
diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h
index bdbafab66c2..42548c2d434 100644
--- a/src/mame/includes/cloud9.h
+++ b/src/mame/includes/cloud9.h
@@ -35,15 +35,15 @@ public:
void cloud9(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_READ8_MEMBER(leta_r);
- DECLARE_WRITE8_MEMBER(nvram_recall_w);
- DECLARE_WRITE8_MEMBER(nvram_store_w);
- DECLARE_WRITE8_MEMBER(cloud9_paletteram_w);
- DECLARE_WRITE8_MEMBER(cloud9_videoram_w);
- DECLARE_READ8_MEMBER(cloud9_bitmode_r);
- DECLARE_WRITE8_MEMBER(cloud9_bitmode_w);
- DECLARE_WRITE8_MEMBER(cloud9_bitmode_addr_w);
+ void irq_ack_w(uint8_t data);
+ uint8_t leta_r(offs_t offset);
+ void nvram_recall_w(uint8_t data);
+ void nvram_store_w(uint8_t data);
+ void cloud9_paletteram_w(offs_t offset, uint8_t data);
+ void cloud9_videoram_w(offs_t offset, uint8_t data);
+ uint8_t cloud9_bitmode_r();
+ void cloud9_bitmode_w(uint8_t data);
+ void cloud9_bitmode_addr_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/clshroad.h b/src/mame/includes/clshroad.h
index 82a8b23df83..946873909f8 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -40,12 +40,12 @@ public:
tilemap_t *m_tilemap_0b;
tilemap_t *m_tilemap_1;
- DECLARE_READ8_MEMBER(input_r);
+ uint8_t input_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(main_irq_mask_w);
DECLARE_WRITE_LINE_MEMBER(sound_irq_mask_w);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
- DECLARE_WRITE8_MEMBER(vram_0_w);
- DECLARE_WRITE8_MEMBER(vram_1_w);
+ void vram_0_w(offs_t offset, uint8_t data);
+ void vram_1_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info_0a);
TILE_GET_INFO_MEMBER(get_tile_info_0b);
diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h
index 28174d7ccc7..707fcf561d2 100644
--- a/src/mame/includes/cninja.h
+++ b/src/mame/includes/cninja.h
@@ -57,7 +57,7 @@ public:
uint16_t m_priority;
- template<int Chip> DECLARE_WRITE16_MEMBER(cninja_pf_control_w);
+ template<int Chip> void cninja_pf_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void sound_bankswitch_w(uint8_t data);
void cninjabl2_oki_bank_w(uint8_t data);
void init_mutantf();
@@ -83,19 +83,19 @@ public:
DECOSPR_PRIORITY_CB_MEMBER(pri_callback);
u16 robocop2_mix_callback(u16 p, u16 p2);
- DECLARE_READ16_MEMBER( edrandy_protection_region_6_146_r );
- DECLARE_WRITE16_MEMBER( edrandy_protection_region_6_146_w );
- DECLARE_READ16_MEMBER( edrandy_protection_region_8_146_r );
- DECLARE_WRITE16_MEMBER( edrandy_protection_region_8_146_w );
+ uint16_t edrandy_protection_region_6_146_r(offs_t offset);
+ void edrandy_protection_region_6_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t edrandy_protection_region_8_146_r(offs_t offset);
+ void edrandy_protection_region_8_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER( mutantf_protection_region_0_146_r );
- DECLARE_WRITE16_MEMBER( mutantf_protection_region_0_146_w );
- DECLARE_READ16_MEMBER( cninja_protection_region_0_104_r );
- DECLARE_WRITE16_MEMBER( cninja_protection_region_0_104_w );
+ uint16_t mutantf_protection_region_0_146_r(offs_t offset);
+ void mutantf_protection_region_0_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cninja_protection_region_0_104_r(offs_t offset);
+ void cninja_protection_region_0_104_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(cninjabl2_sprite_dma_r);
- DECLARE_WRITE16_MEMBER(robocop2_priority_w);
- DECLARE_READ16_MEMBER(mutantf_71_r);
+ uint16_t cninjabl2_sprite_dma_r();
+ void robocop2_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t mutantf_71_r();
void cninjabl(machine_config &config);
void edrandy(machine_config &config);
void cninja(machine_config &config);
diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h
index b5f47d5180a..01c3bb55e56 100644
--- a/src/mame/includes/coleco.h
+++ b/src/mame/includes/coleco.h
@@ -43,11 +43,11 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( cart_r );
- DECLARE_READ8_MEMBER( paddle_1_r );
- DECLARE_READ8_MEMBER( paddle_2_r );
- DECLARE_WRITE8_MEMBER( paddle_off_w );
- DECLARE_WRITE8_MEMBER( paddle_on_w );
+ uint8_t cart_r(offs_t offset);
+ uint8_t paddle_1_r();
+ uint8_t paddle_2_r();
+ void paddle_off_w(uint8_t data);
+ void paddle_on_w(uint8_t data);
TIMER_CALLBACK_MEMBER(paddle_d7reset_callback);
TIMER_CALLBACK_MEMBER(paddle_irqreset_callback);
@@ -117,13 +117,11 @@ public:
void bit90(machine_config &config);
- DECLARE_READ8_MEMBER( bankswitch_u4_r );
- DECLARE_READ8_MEMBER( bankswitch_u3_r );
- DECLARE_READ8_MEMBER( keyboard_r );
- DECLARE_WRITE8_MEMBER( u32_w );
+ uint8_t bankswitch_u4_r(address_space &space);
+ uint8_t bankswitch_u3_r(address_space &space);
+ uint8_t keyboard_r(address_space &space);
+ void u32_w(uint8_t data);
- uint8_t m_keyselect;
- uint8_t m_unknown;
protected:
required_memory_bank m_bank;
required_ioport_array<8> m_io_keyboard;
@@ -131,6 +129,9 @@ protected:
private:
void bit90_map(address_map &map);
void bit90_io_map(address_map &map);
+
+ uint8_t m_keyselect;
+ uint8_t m_unknown;
};
#endif
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index 3fc18a36bd9..0f4ac2db76c 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -78,30 +78,30 @@ public:
optional_ioport_array<4> m_track_ports;
- DECLARE_WRITE8_MEMBER(combatsc_vreg_w);
- DECLARE_READ8_MEMBER(combatscb_io_r);
- DECLARE_WRITE8_MEMBER(combatscb_priority_w);
- DECLARE_WRITE8_MEMBER(combatsc_bankselect_w);
- DECLARE_WRITE8_MEMBER(combatscb_io_w);
- DECLARE_WRITE8_MEMBER(combatscb_bankselect_w);
- DECLARE_WRITE8_MEMBER(combatsc_coin_counter_w);
- DECLARE_READ8_MEMBER(trackball_r);
- DECLARE_WRITE8_MEMBER(protection_w);
- DECLARE_READ8_MEMBER(protection_r);
- DECLARE_READ8_MEMBER(unk_r);
- DECLARE_WRITE8_MEMBER(protection_clock_w);
- DECLARE_WRITE8_MEMBER(combatsc_sh_irqtrigger_w);
- DECLARE_READ8_MEMBER(combatsc_video_r);
- DECLARE_WRITE8_MEMBER(combatsc_video_w);
- DECLARE_WRITE8_MEMBER(combatsc_pf_control_w);
- DECLARE_READ8_MEMBER(combatsc_scrollram_r);
- DECLARE_WRITE8_MEMBER(combatsc_scrollram_w);
- DECLARE_READ8_MEMBER(combatsc_busy_r);
- DECLARE_WRITE8_MEMBER(combatsc_play_w);
- DECLARE_WRITE8_MEMBER(combatsc_voice_reset_w);
+ void combatsc_vreg_w(uint8_t data);
+ uint8_t combatscb_io_r(offs_t offset);
+ void combatscb_priority_w(uint8_t data);
+ void combatsc_bankselect_w(uint8_t data);
+ void combatscb_io_w(offs_t offset, uint8_t data);
+ void combatscb_bankselect_w(address_space &space, uint8_t data);
+ void combatsc_coin_counter_w(uint8_t data);
+ uint8_t trackball_r(offs_t offset);
+ void protection_w(offs_t offset, uint8_t data);
+ uint8_t protection_r(offs_t offset);
+ uint8_t unk_r();
+ void protection_clock_w(uint8_t data);
+ void combatsc_sh_irqtrigger_w(uint8_t data);
+ uint8_t combatsc_video_r(offs_t offset);
+ void combatsc_video_w(offs_t offset, uint8_t data);
+ void combatsc_pf_control_w(offs_t offset, uint8_t data);
+ uint8_t combatsc_scrollram_r(offs_t offset);
+ void combatsc_scrollram_w(offs_t offset, uint8_t data);
+ uint8_t combatsc_busy_r();
+ void combatsc_play_w(uint8_t data);
+ void combatsc_voice_reset_w(uint8_t data);
void combatsc_portA_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(combatscb_msm_w);
- DECLARE_WRITE8_MEMBER(combatscb_sound_irq_ack);
+ void combatscb_msm_w(uint8_t data);
+ void combatscb_sound_irq_ack(uint8_t data);
void init_combatsc();
TILE_GET_INFO_MEMBER(get_tile_info0);
TILE_GET_INFO_MEMBER(get_tile_info1);
diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h
index e0810e7494d..57756047162 100644
--- a/src/mame/includes/commando.h
+++ b/src/mame/includes/commando.h
@@ -37,13 +37,13 @@ public:
void commando(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(commando_videoram_w);
- DECLARE_WRITE8_MEMBER(commando_colorram_w);
- DECLARE_WRITE8_MEMBER(commando_videoram2_w);
- DECLARE_WRITE8_MEMBER(commando_colorram2_w);
- DECLARE_WRITE8_MEMBER(commando_scrollx_w);
- DECLARE_WRITE8_MEMBER(commando_scrolly_w);
- DECLARE_WRITE8_MEMBER(commando_c804_w);
+ void commando_videoram_w(offs_t offset, uint8_t data);
+ void commando_colorram_w(offs_t offset, uint8_t data);
+ void commando_videoram2_w(offs_t offset, uint8_t data);
+ void commando_colorram2_w(offs_t offset, uint8_t data);
+ void commando_scrollx_w(offs_t offset, uint8_t data);
+ void commando_scrolly_w(offs_t offset, uint8_t data);
+ void commando_c804_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h
index 2ea2d0fcee7..e5dc36ed3ac 100644
--- a/src/mame/includes/comx35.h
+++ b/src/mame/includes/comx35.h
@@ -67,11 +67,11 @@ public:
void check_interrupt();
- DECLARE_READ8_MEMBER( mem_r );
- DECLARE_WRITE8_MEMBER( mem_w );
- DECLARE_READ8_MEMBER( io_r );
- DECLARE_WRITE8_MEMBER( io_w );
- DECLARE_WRITE8_MEMBER( cdp1869_w );
+ uint8_t mem_r(offs_t offset);
+ void mem_w(offs_t offset, uint8_t data);
+ uint8_t io_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
+ void cdp1869_w(offs_t offset, uint8_t data);
DECLARE_READ_LINE_MEMBER( clear_r );
DECLARE_READ_LINE_MEMBER( ef2_r );
DECLARE_READ_LINE_MEMBER( ef4_r );
diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h
index 84d39e3f397..6df7630a23c 100644
--- a/src/mame/includes/concept.h
+++ b/src/mame/includes/concept.h
@@ -57,8 +57,8 @@ private:
uint8_t m_pending_interrupts;
bool m_clock_enable;
uint8_t m_clock_address;
- DECLARE_READ8_MEMBER(io_r);
- DECLARE_WRITE8_MEMBER(io_w);
+ uint8_t io_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index a24cd8e5252..5ec2cde2f89 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -61,18 +61,18 @@ public:
required_device<cpu_device> m_audiocpu;
required_device<k007121_device> m_k007121_1;
required_device<k007121_device> m_k007121_2;
- DECLARE_WRITE8_MEMBER(contra_bankswitch_w);
- DECLARE_WRITE8_MEMBER(contra_sh_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(sirq_clear_w);
- DECLARE_WRITE8_MEMBER(contra_coin_counter_w);
- DECLARE_WRITE8_MEMBER(contra_fg_vram_w);
- DECLARE_WRITE8_MEMBER(contra_fg_cram_w);
- DECLARE_WRITE8_MEMBER(contra_bg_vram_w);
- DECLARE_WRITE8_MEMBER(contra_bg_cram_w);
- DECLARE_WRITE8_MEMBER(contra_text_vram_w);
- DECLARE_WRITE8_MEMBER(contra_text_cram_w);
- DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_0_w);
- DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_1_w);
+ void contra_bankswitch_w(uint8_t data);
+ void contra_sh_irqtrigger_w(uint8_t data);
+ void sirq_clear_w(uint8_t data);
+ void contra_coin_counter_w(uint8_t data);
+ void contra_fg_vram_w(offs_t offset, uint8_t data);
+ void contra_fg_cram_w(offs_t offset, uint8_t data);
+ void contra_bg_vram_w(offs_t offset, uint8_t data);
+ void contra_bg_cram_w(offs_t offset, uint8_t data);
+ void contra_text_vram_w(offs_t offset, uint8_t data);
+ void contra_text_cram_w(offs_t offset, uint8_t data);
+ void contra_K007121_ctrl_0_w(offs_t offset, uint8_t data);
+ void contra_K007121_ctrl_1_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h
index c9b9dcdbfcf..989d44a75fb 100644
--- a/src/mame/includes/coolpool.h
+++ b/src/mame/includes/coolpool.h
@@ -52,18 +52,18 @@ public:
uint8_t m_nvram_write_enable;
bool m_old_cmd;
uint8_t m_same_cmd_count;
- DECLARE_WRITE16_MEMBER(nvram_thrash_w);
- DECLARE_WRITE16_MEMBER(nvram_data_w);
- DECLARE_WRITE16_MEMBER(nvram_thrash_data_w);
- DECLARE_WRITE16_MEMBER(amerdart_misc_w);
+ void nvram_thrash_w(offs_t offset, uint16_t data);
+ void nvram_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void nvram_thrash_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void amerdart_misc_w(uint16_t data);
DECLARE_READ_LINE_MEMBER(amerdart_dsp_bio_line_r);
- DECLARE_READ16_MEMBER(amerdart_trackball_r);
- DECLARE_WRITE16_MEMBER(coolpool_misc_w);
+ uint16_t amerdart_trackball_r(offs_t offset);
+ void coolpool_misc_w(uint16_t data);
uint16_t dsp_bio_line_r();
uint16_t dsp_hold_line_r();
- DECLARE_READ16_MEMBER(dsp_rom_r);
- DECLARE_WRITE16_MEMBER(dsp_romaddr_w);
- DECLARE_READ16_MEMBER(coolpool_input_r);
+ uint16_t dsp_rom_r();
+ void dsp_romaddr_w(offs_t offset, uint16_t data);
+ uint16_t coolpool_input_r(offs_t offset);
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
TMS340X0_SCANLINE_RGB32_CB_MEMBER(amerdart_scanline);
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index 76617d41940..09c58b6adda 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -51,17 +51,13 @@ public:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- DECLARE_WRITE8_MEMBER(cop01_sound_command_w);
- DECLARE_READ8_MEMBER(cop01_sound_command_r);
- DECLARE_WRITE8_MEMBER(cop01_irq_ack_w);
- DECLARE_READ8_MEMBER(cop01_sound_irq_ack_w);
- DECLARE_READ8_MEMBER(kludge);
- DECLARE_WRITE8_MEMBER(cop01_background_w);
- DECLARE_WRITE8_MEMBER(cop01_foreground_w);
- DECLARE_WRITE8_MEMBER(cop01_vreg_w);
- DECLARE_WRITE8_MEMBER(prot_address_w);
- DECLARE_WRITE8_MEMBER(prot_data_w);
- DECLARE_READ8_MEMBER(prot_data_r);
+ void cop01_sound_command_w(uint8_t data);
+ uint8_t cop01_sound_command_r();
+ void cop01_irq_ack_w(uint8_t data);
+ uint8_t cop01_sound_irq_ack_w();
+ void cop01_background_w(offs_t offset, uint8_t data);
+ void cop01_foreground_w(offs_t offset, uint8_t data);
+ void cop01_vreg_w(offs_t offset, uint8_t data);
template <int Mask> DECLARE_READ_LINE_MEMBER(mightguy_area_r);
void init_mightguy();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h
index 5b5c0785e8f..418a7d6b92a 100644
--- a/src/mame/includes/copsnrob.h
+++ b/src/mame/includes/copsnrob.h
@@ -43,8 +43,8 @@ protected:
void copsnrob_audio(machine_config &config);
void main_map(address_map &map);
- DECLARE_READ8_MEMBER(copsnrob_misc_r);
- DECLARE_WRITE8_MEMBER(copsnrob_misc2_w);
+ uint8_t copsnrob_misc_r();
+ void copsnrob_misc2_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(one_start_w);
uint32_t screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index 7d4c6edddf1..4f7a9e8b5be 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -68,19 +68,19 @@ public:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- DECLARE_WRITE8_MEMBER(panic_sound_output_w);
- DECLARE_WRITE8_MEMBER(panic_sound_output2_w);
- DECLARE_WRITE8_MEMBER(cosmicg_output_w);
- DECLARE_WRITE8_MEMBER(cosmica_sound_output_w);
- DECLARE_WRITE8_MEMBER(dac_w);
- DECLARE_READ8_MEMBER(cosmica_pixel_clock_r);
- DECLARE_READ8_MEMBER(cosmicg_port_0_r);
- DECLARE_READ8_MEMBER(cosmicg_port_1_r);
- DECLARE_READ8_MEMBER(magspot_coinage_dip_r);
- DECLARE_READ8_MEMBER(nomnlnd_port_0_1_r);
- DECLARE_WRITE8_MEMBER(flip_screen_w);
- DECLARE_WRITE8_MEMBER(cosmic_color_register_w);
- DECLARE_WRITE8_MEMBER(cosmic_background_enable_w);
+ void panic_sound_output_w(offs_t offset, uint8_t data);
+ void panic_sound_output2_w(offs_t offset, uint8_t data);
+ void cosmicg_output_w(offs_t offset, uint8_t data);
+ void cosmica_sound_output_w(offs_t offset, uint8_t data);
+ void dac_w(uint8_t data);
+ uint8_t cosmica_pixel_clock_r();
+ uint8_t cosmicg_port_0_r(offs_t offset);
+ uint8_t cosmicg_port_1_r(offs_t offset);
+ uint8_t magspot_coinage_dip_r(offs_t offset);
+ uint8_t nomnlnd_port_0_1_r(offs_t offset);
+ void flip_screen_w(uint8_t data);
+ void cosmic_color_register_w(offs_t offset, uint8_t data);
+ void cosmic_background_enable_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(panic_coin_inserted);
DECLARE_INPUT_CHANGED_MEMBER(cosmica_coin_inserted);
DECLARE_INPUT_CHANGED_MEMBER(cosmicg_coin_inserted);
diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h
index 3d17661440f..de67ba76e37 100644
--- a/src/mame/includes/cosmicos.h
+++ b/src/mame/includes/cosmicos.h
@@ -59,17 +59,17 @@ public:
m_leds(*this, "led%u", 0U)
{ }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( video_off_r );
- DECLARE_READ8_MEMBER( video_on_r );
- DECLARE_WRITE8_MEMBER( audio_latch_w );
- DECLARE_READ8_MEMBER( hex_keyboard_r );
- DECLARE_WRITE8_MEMBER( hex_keylatch_w );
- DECLARE_READ8_MEMBER( reset_counter_r );
- DECLARE_WRITE8_MEMBER( segment_w );
- DECLARE_READ8_MEMBER( data_r );
- DECLARE_WRITE8_MEMBER( display_w );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
+ uint8_t video_off_r();
+ uint8_t video_on_r();
+ void audio_latch_w(uint8_t data);
+ uint8_t hex_keyboard_r();
+ void hex_keylatch_w(uint8_t data);
+ uint8_t reset_counter_r();
+ void segment_w(uint8_t data);
+ uint8_t data_r();
+ void display_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( dmaout_w );
DECLARE_WRITE_LINE_MEMBER( efx_w );
DECLARE_READ_LINE_MEMBER( wait_r );
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 58fa58bd266..c4265f9ec5f 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -171,37 +171,37 @@ protected:
DECLARE_MACHINE_START(ganbare);
DECLARE_MACHINE_RESET(cps);
- DECLARE_READ16_MEMBER(cps1_dsw_r);
- DECLARE_READ16_MEMBER(cps1_in1_r);
- DECLARE_READ16_MEMBER(cps1_in2_r);
- DECLARE_READ16_MEMBER(cps1_in3_r);
- DECLARE_WRITE16_MEMBER(cps1_coinctrl_w);
- DECLARE_WRITE16_MEMBER(cpsq_coinctrl2_w);
- DECLARE_WRITE16_MEMBER(cps1_cps_a_w);
- DECLARE_READ16_MEMBER(cps1_cps_b_r);
- DECLARE_WRITE16_MEMBER(cps1_cps_b_w);
- DECLARE_WRITE16_MEMBER(cps1_gfxram_w);
- DECLARE_WRITE16_MEMBER(cps1_soundlatch_w);
- DECLARE_WRITE16_MEMBER(cps1_soundlatch2_w);
- DECLARE_WRITE8_MEMBER(cps1_snd_bankswitch_w);
- DECLARE_WRITE8_MEMBER(cps1_oki_pin7_w);
- DECLARE_READ16_MEMBER(qsound_rom_r);
- DECLARE_READ16_MEMBER(qsound_sharedram1_r);
- DECLARE_WRITE16_MEMBER(qsound_sharedram1_w);
- DECLARE_READ16_MEMBER(qsound_sharedram2_r);
- DECLARE_WRITE16_MEMBER(qsound_sharedram2_w);
- DECLARE_WRITE8_MEMBER(qsound_banksw_w);
- DECLARE_READ16_MEMBER(ganbare_ram_r);
- DECLARE_WRITE16_MEMBER(ganbare_ram_w);
- DECLARE_READ16_MEMBER(cps1_hack_dsw_r);
- DECLARE_READ16_MEMBER(sf2rb_prot_r);
- DECLARE_READ16_MEMBER(sf2rb2_prot_r);
- DECLARE_READ16_MEMBER(sf2dongb_prot_r);
- DECLARE_READ16_MEMBER(sf2ceblp_prot_r);
- DECLARE_WRITE16_MEMBER(sf2ceblp_prot_w);
- DECLARE_WRITE16_MEMBER(sf2m3_layer_w);
- DECLARE_READ16_MEMBER(dinohunt_sound_r);
- DECLARE_WRITE16_MEMBER(varthb2_cps_a_w);
+ uint16_t cps1_dsw_r(offs_t offset);
+ uint16_t cps1_in1_r();
+ uint16_t cps1_in2_r();
+ uint16_t cps1_in3_r();
+ void cps1_coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cpsq_coinctrl2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cps1_cps_a_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cps1_cps_b_r(offs_t offset);
+ void cps1_cps_b_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cps1_gfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cps1_soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cps1_soundlatch2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cps1_snd_bankswitch_w(uint8_t data);
+ void cps1_oki_pin7_w(uint8_t data);
+ uint16_t qsound_rom_r(offs_t offset);
+ uint16_t qsound_sharedram1_r(offs_t offset);
+ void qsound_sharedram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t qsound_sharedram2_r(offs_t offset);
+ void qsound_sharedram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void qsound_banksw_w(uint8_t data);
+ uint16_t ganbare_ram_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ganbare_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cps1_hack_dsw_r(offs_t offset);
+ uint16_t sf2rb_prot_r(offs_t offset);
+ uint16_t sf2rb2_prot_r(offs_t offset);
+ uint16_t sf2dongb_prot_r(offs_t offset);
+ uint16_t sf2ceblp_prot_r();
+ void sf2ceblp_prot_w(uint16_t data);
+ void sf2m3_layer_w(offs_t offset, uint16_t data);
+ uint16_t dinohunt_sound_r();
+ void varthb2_cps_a_w(offs_t offset, uint16_t data);
TILEMAP_MAPPER_MEMBER(tilemap0_scan);
TILEMAP_MAPPER_MEMBER(tilemap1_scan);
@@ -345,22 +345,22 @@ public:
private:
void init_digital_volume();
- DECLARE_READ16_MEMBER(gigaman2_dummyqsound_r);
- DECLARE_WRITE16_MEMBER(gigaman2_dummyqsound_w);
+ uint16_t gigaman2_dummyqsound_r(offs_t offset);
+ void gigaman2_dummyqsound_w(offs_t offset, uint16_t data);
void gigaman2_gfx_reorder();
- DECLARE_WRITE16_MEMBER(cps2_eeprom_port_w);
- DECLARE_READ16_MEMBER(cps2_qsound_volume_r);
- DECLARE_READ16_MEMBER(kludge_r);
- DECLARE_READ16_MEMBER(joy_or_paddle_r);
- DECLARE_READ16_MEMBER(joy_or_paddle_ecofghtr_r);
+ void cps2_eeprom_port_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cps2_qsound_volume_r();
+ uint16_t kludge_r();
+ uint16_t joy_or_paddle_r();
+ uint16_t joy_or_paddle_ecofghtr_r();
TIMER_DEVICE_CALLBACK_MEMBER(cps2_interrupt);
TIMER_CALLBACK_MEMBER(cps2_update_digital_volume);
- DECLARE_WRITE16_MEMBER(cps2_objram_bank_w);
- DECLARE_READ16_MEMBER(cps2_objram1_r);
- DECLARE_READ16_MEMBER(cps2_objram2_r);
- DECLARE_WRITE16_MEMBER(cps2_objram1_w);
- DECLARE_WRITE16_MEMBER(cps2_objram2_w);
+ void cps2_objram_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cps2_objram1_r(offs_t offset);
+ uint16_t cps2_objram2_r(offs_t offset);
+ void cps2_objram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void cps2_objram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void unshuffle(uint64_t *buf, int len);
void cps2_gfx_decode();
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h
index 75dcb438616..3b1977a993a 100644
--- a/src/mame/includes/cps3.h
+++ b/src/mame/includes/cps3.h
@@ -139,30 +139,30 @@ private:
u16 m_lastb2;
u8* m_user5;
- DECLARE_READ8_MEMBER(ssram_r);
- DECLARE_WRITE8_MEMBER(ssram_w);
- DECLARE_WRITE8_MEMBER(ssregs_w);
- DECLARE_WRITE32_MEMBER(sh2cache_ram_w);
- DECLARE_WRITE32_MEMBER(cram_bank_w);
- DECLARE_READ32_MEMBER(cram_data_r);
- DECLARE_WRITE32_MEMBER(cram_data_w);
- DECLARE_READ32_MEMBER(gfxflash_r);
- DECLARE_WRITE32_MEMBER(gfxflash_w);
- DECLARE_READ32_MEMBER(flash1_r);
- DECLARE_READ32_MEMBER(flash2_r);
- DECLARE_WRITE32_MEMBER(flash1_w);
- DECLARE_WRITE32_MEMBER(flash2_w);
- DECLARE_WRITE32_MEMBER(cram_gfxflash_bank_w);
- DECLARE_READ16_MEMBER(dma_status_r);
- DECLARE_READ16_MEMBER(dev_dipsw_r);
- DECLARE_READ32_MEMBER(eeprom_r);
- DECLARE_WRITE32_MEMBER(eeprom_w);
- DECLARE_WRITE32_MEMBER(palettedma_w);
- DECLARE_WRITE32_MEMBER(characterdma_w);
- DECLARE_READ16_MEMBER(colourram_r);
- DECLARE_WRITE16_MEMBER(colourram_w);
- DECLARE_WRITE16_MEMBER(outport_w);
- DECLARE_WRITE16_MEMBER(spritedma_w);
+ u8 ssram_r(offs_t offset);
+ void ssram_w(offs_t offset, u8 data);
+ void ssregs_w(offs_t offset, u8 data);
+ void sh2cache_ram_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void cram_bank_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 cram_data_r(offs_t offset);
+ void cram_data_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 gfxflash_r(offs_t offset, u32 mem_mask = ~0);
+ void gfxflash_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 flash1_r(offs_t offset, u32 mem_mask = ~0);
+ u32 flash2_r(offs_t offset, u32 mem_mask = ~0);
+ void flash1_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void flash2_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void cram_gfxflash_bank_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u16 dma_status_r();
+ u16 dev_dipsw_r();
+ u32 eeprom_r(offs_t offset, u32 mem_mask = ~0);
+ void eeprom_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void palettedma_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void characterdma_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u16 colourram_r(offs_t offset);
+ void colourram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void outport_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void spritedma_w(offs_t offset, u16 data, u16 mem_mask = ~0);
SH2_DMA_KLUDGE_CB(dma_callback);
void draw_fg_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index 46509e6a8e9..d52a2229761 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -46,11 +46,11 @@ public:
uint8_t m_collision_address_clear;
tilemap_t *m_bg_tilemap;
uint8_t m_irq_mask;
- DECLARE_WRITE8_MEMBER(pc3092_w);
- DECLARE_READ8_MEMBER(pc3259_r);
- DECLARE_WRITE8_MEMBER(port_sound_w);
- DECLARE_WRITE8_MEMBER(crbaloon_videoram_w);
- DECLARE_WRITE8_MEMBER(crbaloon_colorram_w);
+ void pc3092_w(offs_t offset, uint8_t data);
+ uint8_t pc3259_r(offs_t offset);
+ void port_sound_w(uint8_t data);
+ void crbaloon_videoram_w(offs_t offset, uint8_t data);
+ void crbaloon_colorram_w(offs_t offset, uint8_t data);
DECLARE_CUSTOM_INPUT_MEMBER(pc3092_r);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_reset() override;
@@ -58,9 +58,9 @@ public:
void crbaloon_palette(palette_device &palette) const;
uint32_t screen_update_crbaloon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_irq);
- DECLARE_WRITE8_MEMBER(crbaloon_audio_set_music_freq);
- DECLARE_WRITE8_MEMBER(crbaloon_audio_set_music_enable);
- DECLARE_WRITE8_MEMBER(crbaloon_audio_set_laugh_enable);
+ void crbaloon_audio_set_music_freq(uint8_t data);
+ void crbaloon_audio_set_music_enable(uint8_t data);
+ void crbaloon_audio_set_laugh_enable(uint8_t data);
uint16_t crbaloon_get_collision_address();
void crbaloon_set_clear_collision_address(int _crbaloon_collision_address_clear);
void draw_sprite_and_check_collision(bitmap_ind16 &bitmap);
diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h
index 34f2ea93be2..4b95ca4ea8f 100644
--- a/src/mame/includes/crgolf.h
+++ b/src/mame/includes/crgolf.h
@@ -55,21 +55,21 @@ public:
required_device<cpu_device> m_audiocpu;
optional_device<msm5205_device> m_msm;
required_device<palette_device> m_palette;
- DECLARE_WRITE8_MEMBER(rom_bank_select_w);
- DECLARE_READ8_MEMBER(switch_input_r);
- DECLARE_READ8_MEMBER(analog_input_r);
- DECLARE_WRITE8_MEMBER(switch_input_select_w);
- DECLARE_WRITE8_MEMBER(unknown_w);
+ void rom_bank_select_w(uint8_t data);
+ uint8_t switch_input_r();
+ uint8_t analog_input_r();
+ void switch_input_select_w(uint8_t data);
+ void unknown_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(color_select_w);
DECLARE_WRITE_LINE_MEMBER(screen_flip_w);
DECLARE_WRITE_LINE_MEMBER(screen_select_w);
DECLARE_WRITE_LINE_MEMBER(screena_enable_w);
DECLARE_WRITE_LINE_MEMBER(screenb_enable_w);
- DECLARE_WRITE8_MEMBER(crgolfhi_sample_w);
- DECLARE_READ8_MEMBER(unk_sub_02_r);
- DECLARE_READ8_MEMBER(unk_sub_05_r);
- DECLARE_READ8_MEMBER(unk_sub_07_r);
- DECLARE_WRITE8_MEMBER(unk_sub_0c_w);
+ void crgolfhi_sample_w(offs_t offset, uint8_t data);
+ uint8_t unk_sub_02_r();
+ uint8_t unk_sub_05_r();
+ uint8_t unk_sub_07_r();
+ void unk_sub_0c_w(uint8_t data);
void init_crgolfhi();
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h
index cfd2bd1c04c..6c32182f3e2 100644
--- a/src/mame/includes/crimfght.h
+++ b/src/mame/includes/crimfght.h
@@ -45,10 +45,10 @@ public:
required_device<generic_latch_8_device> m_soundlatch;
required_memory_bank m_rombank;
- DECLARE_WRITE8_MEMBER(crimfght_coin_w);
- DECLARE_WRITE8_MEMBER(sound_w);
- DECLARE_READ8_MEMBER(k052109_051960_r);
- DECLARE_WRITE8_MEMBER(k052109_051960_w);
+ void crimfght_coin_w(uint8_t data);
+ void sound_w(uint8_t data);
+ uint8_t k052109_051960_r(offs_t offset);
+ void k052109_051960_w(offs_t offset, uint8_t data);
IRQ_CALLBACK_MEMBER(audiocpu_irq_ack);
void ym2151_ct_w(uint8_t data);
virtual void machine_start() override;
diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h
index 8bead5943f1..0f89130b31f 100644
--- a/src/mame/includes/crshrace.h
+++ b/src/mame/includes/crshrace.h
@@ -57,11 +57,11 @@ public:
uint32_t crshrace_tile_callback( uint32_t code );
/* devices */
- DECLARE_WRITE8_MEMBER(crshrace_sh_bankswitch_w);
- DECLARE_WRITE16_MEMBER(crshrace_videoram1_w);
- DECLARE_WRITE16_MEMBER(crshrace_videoram2_w);
- DECLARE_WRITE16_MEMBER(crshrace_roz_bank_w);
- DECLARE_WRITE16_MEMBER(crshrace_gfxctrl_w);
+ void crshrace_sh_bankswitch_w(uint8_t data);
+ void crshrace_videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void crshrace_videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void crshrace_roz_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void crshrace_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void init_crshrace2();
void init_crshrace();
TILE_GET_INFO_MEMBER(get_tile_info1);
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index c4eba96d595..3acc02031c1 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -61,35 +61,35 @@ public:
protected:
DECLARE_WRITE_LINE_MEMBER(write_s2650_flag); // used by galaxia_state
- DECLARE_READ8_MEMBER(huncholy_prot_r);
- DECLARE_READ8_MEMBER(superbik_prot_r);
- DECLARE_READ8_MEMBER(hero_prot_r);
+ uint8_t huncholy_prot_r(offs_t offset);
+ uint8_t superbik_prot_r();
+ uint8_t hero_prot_r(offs_t offset);
DECLARE_READ_LINE_MEMBER(speech_rom_read_bit);
DECLARE_WRITE_LINE_MEMBER(cvs_slave_cpu_interrupt);
- DECLARE_READ8_MEMBER(cvs_input_r);
- DECLARE_WRITE8_MEMBER(cvs_speech_rom_address_lo_w);
- DECLARE_WRITE8_MEMBER(cvs_speech_rom_address_hi_w);
- DECLARE_READ8_MEMBER(cvs_speech_command_r);
- DECLARE_WRITE8_MEMBER(audio_command_w);
- DECLARE_READ8_MEMBER(cvs_video_or_color_ram_r);
- DECLARE_WRITE8_MEMBER(cvs_video_or_color_ram_w);
- DECLARE_READ8_MEMBER(cvs_bullet_ram_or_palette_r);
- DECLARE_WRITE8_MEMBER(cvs_bullet_ram_or_palette_w);
- DECLARE_READ8_MEMBER(cvs_s2636_0_or_character_ram_r);
- DECLARE_WRITE8_MEMBER(cvs_s2636_0_or_character_ram_w);
- DECLARE_READ8_MEMBER(cvs_s2636_1_or_character_ram_r);
- DECLARE_WRITE8_MEMBER(cvs_s2636_1_or_character_ram_w);
- DECLARE_READ8_MEMBER(cvs_s2636_2_or_character_ram_r);
- DECLARE_WRITE8_MEMBER(cvs_s2636_2_or_character_ram_w);
- DECLARE_WRITE8_MEMBER(cvs_video_fx_w);
- DECLARE_READ8_MEMBER(cvs_collision_r);
- DECLARE_READ8_MEMBER(cvs_collision_clear);
- DECLARE_WRITE8_MEMBER(cvs_scroll_w);
+ uint8_t cvs_input_r(offs_t offset);
+ void cvs_speech_rom_address_lo_w(uint8_t data);
+ void cvs_speech_rom_address_hi_w(uint8_t data);
+ uint8_t cvs_speech_command_r();
+ void audio_command_w(uint8_t data);
+ uint8_t cvs_video_or_color_ram_r(offs_t offset);
+ void cvs_video_or_color_ram_w(offs_t offset, uint8_t data);
+ uint8_t cvs_bullet_ram_or_palette_r(offs_t offset);
+ void cvs_bullet_ram_or_palette_w(offs_t offset, uint8_t data);
+ uint8_t cvs_s2636_0_or_character_ram_r(offs_t offset);
+ void cvs_s2636_0_or_character_ram_w(offs_t offset, uint8_t data);
+ uint8_t cvs_s2636_1_or_character_ram_r(offs_t offset);
+ void cvs_s2636_1_or_character_ram_w(offs_t offset, uint8_t data);
+ uint8_t cvs_s2636_2_or_character_ram_r(offs_t offset);
+ void cvs_s2636_2_or_character_ram_w(offs_t offset, uint8_t data);
+ void cvs_video_fx_w(uint8_t data);
+ uint8_t cvs_collision_r();
+ uint8_t cvs_collision_clear();
+ void cvs_scroll_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(tms_clock_r);
- DECLARE_WRITE8_MEMBER(cvs_4_bit_dac_data_w);
- DECLARE_WRITE8_MEMBER(cvs_unknown_w);
- DECLARE_WRITE8_MEMBER(cvs_tms5110_ctl_w);
- DECLARE_WRITE8_MEMBER(cvs_tms5110_pdc_w);
+ void cvs_4_bit_dac_data_w(offs_t offset, uint8_t data);
+ void cvs_unknown_w(offs_t offset, uint8_t data);
+ void cvs_tms5110_ctl_w(offs_t offset, uint8_t data);
+ void cvs_tms5110_pdc_w(offs_t offset, uint8_t data);
DECLARE_VIDEO_START(cvs);
void cvs_palette(palette_device &palette) const;
uint32_t screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/cxhumax.h b/src/mame/includes/cxhumax.h
index a72a39ea63f..627d5107814 100644
--- a/src/mame/includes/cxhumax.h
+++ b/src/mame/includes/cxhumax.h
@@ -47,77 +47,77 @@ public:
required_shared_ptr<uint32_t> m_ram;
required_device<generic_terminal_device> m_terminal;
- DECLARE_WRITE32_MEMBER ( flash_w );
- DECLARE_READ32_MEMBER ( flash_r );
-
- DECLARE_WRITE32_MEMBER ( cx_hsx_w );
- DECLARE_READ32_MEMBER ( cx_hsx_r );
-
- DECLARE_WRITE32_MEMBER ( cx_romdescr_w );
- DECLARE_READ32_MEMBER ( cx_romdescr_r );
- DECLARE_WRITE32_MEMBER ( cx_isaromdescr_w );
- DECLARE_READ32_MEMBER ( cx_isaromdescr_r );
- DECLARE_WRITE32_MEMBER ( cx_isadescr_w );
- DECLARE_READ32_MEMBER ( cx_isadescr_r );
- DECLARE_WRITE32_MEMBER ( cx_rommap_w );
- DECLARE_READ32_MEMBER ( cx_rommap_r );
- DECLARE_WRITE32_MEMBER ( cx_rommode_w );
- DECLARE_READ32_MEMBER ( cx_rommode_r );
- DECLARE_WRITE32_MEMBER ( cx_xoemask_w );
- DECLARE_READ32_MEMBER ( cx_xoemask_r );
- DECLARE_WRITE32_MEMBER ( cx_pci_w );
- DECLARE_READ32_MEMBER ( cx_pci_r );
- DECLARE_WRITE32_MEMBER ( cx_extdesc_w );
- DECLARE_READ32_MEMBER ( cx_extdesc_r );
-
- DECLARE_WRITE32_MEMBER ( cx_remap_w );
- DECLARE_WRITE32_MEMBER ( cx_scratch_w );
- DECLARE_READ32_MEMBER ( cx_scratch_r );
-
- DECLARE_WRITE32_MEMBER ( cx_timers_w );
- DECLARE_READ32_MEMBER ( cx_timers_r );
-
- DECLARE_WRITE32_MEMBER ( cx_uart2_w );
- DECLARE_READ32_MEMBER ( cx_uart2_r );
-
- DECLARE_WRITE32_MEMBER ( cx_pll_w );
- DECLARE_READ32_MEMBER ( cx_pll_r );
- DECLARE_WRITE32_MEMBER ( cx_clkdiv_w );
- DECLARE_READ32_MEMBER ( cx_clkdiv_r );
- DECLARE_WRITE32_MEMBER ( cx_pllprescale_w );
- DECLARE_READ32_MEMBER ( cx_pllprescale_r );
-
- DECLARE_WRITE32_MEMBER ( cx_chipcontrol_w );
- DECLARE_READ32_MEMBER ( cx_chipcontrol_r );
-
- DECLARE_WRITE32_MEMBER ( cx_intctrl_w );
- DECLARE_READ32_MEMBER ( cx_intctrl_r );
-
- DECLARE_WRITE32_MEMBER ( cx_ss_w );
- DECLARE_READ32_MEMBER ( cx_ss_r );
-
- DECLARE_WRITE32_MEMBER ( cx_i2c0_w );
- DECLARE_READ32_MEMBER ( cx_i2c0_r );
- DECLARE_WRITE32_MEMBER ( cx_i2c1_w );
- DECLARE_READ32_MEMBER ( cx_i2c1_r );
- DECLARE_WRITE32_MEMBER ( cx_i2c2_w );
- DECLARE_READ32_MEMBER ( cx_i2c2_r );
-
- DECLARE_WRITE32_MEMBER ( cx_mc_cfg_w );
- DECLARE_READ32_MEMBER ( cx_mc_cfg_r );
-
- DECLARE_WRITE32_MEMBER ( cx_drm0_w );
- DECLARE_READ32_MEMBER ( cx_drm0_r );
- DECLARE_WRITE32_MEMBER ( cx_drm1_w );
- DECLARE_READ32_MEMBER ( cx_drm1_r );
-
- DECLARE_WRITE32_MEMBER ( cx_hdmi_w );
- DECLARE_READ32_MEMBER ( cx_hdmi_r );
-
- DECLARE_WRITE32_MEMBER ( cx_gxa_w );
- DECLARE_READ32_MEMBER ( cx_gxa_r );
-
- DECLARE_READ32_MEMBER ( dummy_flash_r );
+ void flash_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t flash_r(offs_t offset, uint32_t mem_mask = ~0);
+
+ void cx_hsx_w(offs_t offset, uint32_t data);
+ uint32_t cx_hsx_r(offs_t offset);
+
+ void cx_romdescr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_romdescr_r(offs_t offset);
+ void cx_isaromdescr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_isaromdescr_r(offs_t offset);
+ void cx_isadescr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_isadescr_r(offs_t offset);
+ void cx_rommap_w(offs_t offset, uint32_t data);
+ uint32_t cx_rommap_r(offs_t offset);
+ void cx_rommode_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_rommode_r(offs_t offset);
+ void cx_xoemask_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_xoemask_r(offs_t offset);
+ void cx_pci_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_pci_r(offs_t offset);
+ void cx_extdesc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_extdesc_r(offs_t offset);
+
+ void cx_remap_w(offs_t offset, uint32_t data);
+ void cx_scratch_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_scratch_r(offs_t offset);
+
+ void cx_timers_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_timers_r(offs_t offset);
+
+ void cx_uart2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_uart2_r(offs_t offset);
+
+ void cx_pll_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_pll_r(offs_t offset);
+ void cx_clkdiv_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_clkdiv_r(offs_t offset);
+ void cx_pllprescale_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_pllprescale_r(offs_t offset);
+
+ void cx_chipcontrol_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_chipcontrol_r(offs_t offset);
+
+ void cx_intctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_intctrl_r(offs_t offset);
+
+ void cx_ss_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_ss_r(offs_t offset);
+
+ void cx_i2c0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_i2c0_r(offs_t offset);
+ void cx_i2c1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_i2c1_r(offs_t offset);
+ void cx_i2c2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_i2c2_r(offs_t offset);
+
+ void cx_mc_cfg_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_mc_cfg_r(offs_t offset);
+
+ void cx_drm0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_drm0_r(offs_t offset);
+ void cx_drm1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_drm1_r(offs_t offset);
+
+ void cx_hdmi_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_hdmi_r(offs_t offset);
+
+ void cx_gxa_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t cx_gxa_r(offs_t offset);
+
+ uint32_t dummy_flash_r();
uint32_t m_romdescr_reg;
uint32_t m_isaromdescr_regs[0x0C/4];
diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h
index 392bc655ec8..26525a1cabb 100644
--- a/src/mame/includes/cyberbal.h
+++ b/src/mame/includes/cyberbal.h
@@ -69,7 +69,7 @@ public:
void cyberbal2p(machine_config &config);
protected:
- DECLARE_READ16_MEMBER(sound_state_r);
+ uint16_t sound_state_r();
virtual void machine_reset() override;
virtual void video_start() override;
@@ -111,7 +111,7 @@ public:
void cyberbalt(machine_config &config);
protected:
- DECLARE_WRITE16_MEMBER(p2_reset_w);
+ void p2_reset_w(uint16_t data);
TILE_GET_INFO_MEMBER(get_alpha2_tile_info);
TILE_GET_INFO_MEMBER(get_playfield2_tile_info);
diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h
index d3328dbed76..e82bc7f27d6 100644
--- a/src/mame/includes/cybiko.h
+++ b/src/mame/includes/cybiko.h
@@ -51,23 +51,23 @@ public:
, m_debug_serial(*this, "debug_serial")
{ }
- DECLARE_WRITE16_MEMBER(serflash_w);
- DECLARE_READ16_MEMBER(clock_r);
- DECLARE_WRITE16_MEMBER(clock_w);
- DECLARE_READ16_MEMBER(xtclock_r);
- DECLARE_WRITE16_MEMBER(xtclock_w);
- DECLARE_READ16_MEMBER(xtpower_r);
- DECLARE_READ16_MEMBER(adc1_r);
- DECLARE_READ16_MEMBER(adc2_r);
- DECLARE_READ16_MEMBER(port0_r);
+ void serflash_w(uint16_t data);
+ uint16_t clock_r();
+ void clock_w(uint16_t data);
+ uint16_t xtclock_r();
+ void xtclock_w(uint16_t data);
+ uint16_t xtpower_r();
+ uint16_t adc1_r();
+ uint16_t adc2_r();
+ uint16_t port0_r();
- DECLARE_READ16_MEMBER(cybiko_lcd_r);
- DECLARE_WRITE16_MEMBER(cybiko_lcd_w);
- DECLARE_READ16_MEMBER(cybikov1_key_r);
- DECLARE_READ16_MEMBER(cybikov2_key_r);
- DECLARE_READ16_MEMBER(cybikoxt_key_r);
- DECLARE_WRITE16_MEMBER(cybiko_usb_w);
- int cybiko_key_r( offs_t offset, int mem_mask);
+ uint16_t cybiko_lcd_r(offs_t offset, uint16_t mem_mask = ~0);
+ void cybiko_lcd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cybikov1_key_r(offs_t offset, uint16_t mem_mask = ~0);
+ uint16_t cybikov2_key_r(offs_t offset, uint16_t mem_mask = ~0);
+ uint16_t cybikoxt_key_r(offs_t offset, uint16_t mem_mask = ~0);
+ void cybiko_usb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ int cybiko_key_r(offs_t offset, int mem_mask);
required_device<h8_device> m_maincpu;
required_device<hd66421_device> m_crtc;
diff --git a/src/mame/includes/cybstorm.h b/src/mame/includes/cybstorm.h
index c734e67d985..05aa4bcace2 100644
--- a/src/mame/includes/cybstorm.h
+++ b/src/mame/includes/cybstorm.h
@@ -37,8 +37,8 @@ protected:
virtual void machine_start() override;
virtual void video_start() override;
- DECLARE_READ32_MEMBER(special_port1_r);
- DECLARE_WRITE32_MEMBER(latch_w);
+ uint32_t special_port1_r();
+ void latch_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h
index dbb16e37288..ac99048d192 100644
--- a/src/mame/includes/dai.h
+++ b/src/mame/includes/dai.h
@@ -55,13 +55,13 @@ private:
uint8_t m_cassette_motor[2];
uint8_t m_keyboard_scan_mask;
unsigned short m_4_colours_palette[4];
- DECLARE_WRITE8_MEMBER(dai_stack_interrupt_circuit_w);
- DECLARE_READ8_MEMBER(dai_io_discrete_devices_r);
- DECLARE_WRITE8_MEMBER(dai_io_discrete_devices_w);
- DECLARE_READ8_MEMBER(dai_amd9511_r);
- DECLARE_WRITE8_MEMBER(dai_amd9511_w);
- DECLARE_READ8_MEMBER(dai_pit_r);
- DECLARE_WRITE8_MEMBER(dai_pit_w);
+ void dai_stack_interrupt_circuit_w(uint8_t data);
+ uint8_t dai_io_discrete_devices_r(offs_t offset);
+ void dai_io_discrete_devices_w(offs_t offset, uint8_t data);
+ uint8_t dai_amd9511_r();
+ void dai_amd9511_w(offs_t offset, uint8_t data);
+ uint8_t dai_pit_r(offs_t offset);
+ void dai_pit_w(offs_t offset, uint8_t data);
uint8_t dai_keyboard_r();
void dai_keyboard_w(uint8_t data);
void dai_palette(palette_device &palette) const;
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index 1516ec41c17..019fcfc9bc7 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -60,8 +60,8 @@ private:
tilemap_t *m_fgtilemap;
tilemap_t *m_txtilemap;
- DECLARE_WRITE8_MEMBER(hw_w);
- DECLARE_WRITE8_MEMBER(tx_vram_w);
+ void hw_w(uint8_t data);
+ void tx_vram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bgtile_info);
TILE_GET_INFO_MEMBER(get_fgtile_info);
diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h
index 068f494de04..ea5ec8eed56 100644
--- a/src/mame/includes/darkseal.h
+++ b/src/mame/includes/darkseal.h
@@ -35,9 +35,9 @@ public:
void init_darkseal();
private:
- DECLARE_WRITE16_MEMBER(irq_ack_w);
- DECLARE_WRITE16_MEMBER(palette_w);
- DECLARE_WRITE16_MEMBER(palette_ext_w);
+ void irq_ack_w(uint16_t data);
+ void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void palette_ext_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void update_palette(int offset);
diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h
index 0d40debec59..c81ea54563b 100644
--- a/src/mame/includes/dassault.h
+++ b/src/mame/includes/dassault.h
@@ -55,12 +55,12 @@ private:
uint16_t m_priority;
- DECLARE_WRITE16_MEMBER(priority_w);
- DECLARE_WRITE16_MEMBER(main_irq_ack_w);
- DECLARE_WRITE16_MEMBER(sub_irq_ack_w);
- DECLARE_READ16_MEMBER(dassault_control_r);
- DECLARE_WRITE16_MEMBER(dassault_control_w);
- DECLARE_READ16_MEMBER(dassault_sub_control_r);
+ void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void main_irq_ack_w(uint16_t data);
+ void sub_irq_ack_w(uint16_t data);
+ uint16_t dassault_control_r(offs_t offset);
+ void dassault_control_w(uint16_t data);
+ uint16_t dassault_sub_control_r();
void sound_bankswitch_w(uint8_t data);
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index 3f2b7b99de6..9a3f5689c38 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -75,11 +75,11 @@ private:
required_ioport m_dsw2;
- DECLARE_WRITE16_MEMBER(dbzcontrol_w);
- DECLARE_WRITE16_MEMBER(dbz_sound_command_w);
- DECLARE_WRITE16_MEMBER(dbz_sound_cause_nmi);
- DECLARE_WRITE16_MEMBER(dbz_bg2_videoram_w);
- DECLARE_WRITE16_MEMBER(dbz_bg1_videoram_w);
+ void dbzcontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void dbz_sound_command_w(uint16_t data);
+ void dbz_sound_cause_nmi(uint16_t data);
+ void dbz_bg2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void dbz_bg1_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(dbz_irq2_ack_w);
TILE_GET_INFO_MEMBER(get_dbz_bg2_tile_info);
TILE_GET_INFO_MEMBER(get_dbz_bg1_tile_info);
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index 3ef2fc51cf1..4a6e8208601 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -59,29 +59,29 @@ class dc_state : public driver_device
virtual void machine_reset() override;
TIMER_CALLBACK_MEMBER(g2_dma_irq);
TIMER_CALLBACK_MEMBER(ch2_dma_irq);
- DECLARE_READ32_MEMBER(dc_aica_reg_r);
- DECLARE_WRITE32_MEMBER(dc_aica_reg_w);
- DECLARE_READ32_MEMBER(dc_arm_aica_r);
- DECLARE_WRITE32_MEMBER(dc_arm_aica_w);
+ uint32_t dc_aica_reg_r(offs_t offset, uint32_t mem_mask = ~0);
+ void dc_aica_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t dc_arm_aica_r(offs_t offset);
+ void dc_arm_aica_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
void g2_dma_execute(address_space &space, int channel);
inline int decode_reg32_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift);
inline int decode_reg3216_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift);
int dc_compute_interrupt_level();
void dc_update_interrupt_status();
inline int decode_reg_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift);
- DECLARE_READ64_MEMBER( dc_sysctrl_r );
- DECLARE_WRITE64_MEMBER( dc_sysctrl_w );
- DECLARE_READ64_MEMBER( dc_gdrom_r );
- DECLARE_WRITE64_MEMBER( dc_gdrom_w );
- DECLARE_READ64_MEMBER( dc_g2_ctrl_r );
- DECLARE_WRITE64_MEMBER( dc_g2_ctrl_w );
- DECLARE_READ64_MEMBER( dc_modem_r );
- DECLARE_WRITE64_MEMBER( dc_modem_w );
+ uint64_t dc_sysctrl_r(offs_t offset, uint64_t mem_mask = ~0);
+ void dc_sysctrl_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t dc_gdrom_r(offs_t offset, uint64_t mem_mask = ~0);
+ void dc_gdrom_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t dc_g2_ctrl_r(offs_t offset, uint64_t mem_mask = ~0);
+ void dc_g2_ctrl_w(address_space &space, offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t dc_modem_r(offs_t offset, uint64_t mem_mask = ~0);
+ void dc_modem_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
void g1_irq(uint8_t data);
void pvr_irq(uint8_t data);
void maple_irq(uint8_t data);
- DECLARE_READ16_MEMBER( soundram_r );
- DECLARE_WRITE16_MEMBER( soundram_w );
+ uint16_t soundram_r(offs_t offset);
+ void soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(aica_irq);
DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq);
DECLARE_WRITE_LINE_MEMBER(external_irq);
diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h
index 8ed88874c64..02a829f0b31 100644
--- a/src/mame/includes/dccons.h
+++ b/src/mame/includes/dccons.h
@@ -30,13 +30,11 @@ public:
void init_dcjp();
void init_tream();
- DECLARE_READ64_MEMBER(dcus_idle_skip_r);
- DECLARE_READ64_MEMBER(dcjp_idle_skip_r);
+ uint64_t dcus_idle_skip_r();
+ uint64_t dcjp_idle_skip_r();
- DECLARE_READ64_MEMBER(dc_pdtra_r);
- DECLARE_WRITE64_MEMBER(dc_pdtra_w);
- DECLARE_READ64_MEMBER(dc_arm_r);
- DECLARE_WRITE64_MEMBER(dc_arm_w);
+ uint64_t dc_pdtra_r();
+ void dc_pdtra_w(uint64_t data);
DECLARE_WRITE_LINE_MEMBER(aica_irq);
DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq);
DECLARE_WRITE_LINE_MEMBER(ata_interrupt);
@@ -44,10 +42,10 @@ public:
TIMER_CALLBACK_MEMBER( atapi_xfer_end );
void dreamcast_atapi_init();
- DECLARE_READ32_MEMBER( dc_mess_g1_ctrl_r );
- DECLARE_WRITE32_MEMBER( dc_mess_g1_ctrl_w );
- DECLARE_READ8_MEMBER( dc_flash_r );
- DECLARE_WRITE8_MEMBER( dc_flash_w );
+ uint32_t dc_mess_g1_ctrl_r(offs_t offset);
+ void dc_mess_g1_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint8_t dc_flash_r(offs_t offset);
+ void dc_flash_w(offs_t offset, uint8_t data);
static void gdrom_config(device_t *device);
void dc_base(machine_config &config);
diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h
index a3fa7728da1..fc9e190e7af 100644
--- a/src/mame/includes/dcheese.h
+++ b/src/mame/includes/dcheese.h
@@ -77,16 +77,16 @@ private:
required_device<bsmt2000_device> m_bsmt;
required_device<generic_latch_8_device> m_soundlatch;
- DECLARE_WRITE16_MEMBER(eeprom_control_w);
- DECLARE_READ8_MEMBER(sound_status_r);
- DECLARE_WRITE8_MEMBER(sound_control_w);
- DECLARE_WRITE8_MEMBER(bsmt_data_w);
- DECLARE_WRITE16_MEMBER(blitter_color_w);
- DECLARE_WRITE16_MEMBER(blitter_xparam_w);
- DECLARE_WRITE16_MEMBER(blitter_yparam_w);
- DECLARE_WRITE16_MEMBER(blitter_vidparam_w);
- DECLARE_WRITE16_MEMBER(blitter_unknown_w);
- DECLARE_READ16_MEMBER(blitter_vidparam_r);
+ void eeprom_control_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u8 sound_status_r();
+ void sound_control_w(u8 data);
+ void bsmt_data_w(offs_t offset, u8 data);
+ void blitter_color_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void blitter_xparam_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void blitter_yparam_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void blitter_vidparam_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void blitter_unknown_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u16 blitter_vidparam_r(offs_t offset);
void dcheese_palette(palette_device &palette) const;
u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank);
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index cb1c099b149..a4040e52b2d 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -54,11 +54,11 @@ private:
void layer_en_w(uint16_t data);
void layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_WRITE16_MEMBER(gfxbank_w);
- DECLARE_WRITE16_MEMBER(background_w);
- DECLARE_WRITE16_MEMBER(foreground_w);
- DECLARE_WRITE16_MEMBER(midground_w);
- DECLARE_WRITE16_MEMBER(text_w);
+ void gfxbank_w(uint16_t data);
+ void background_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_back_tile_info);
TILE_GET_INFO_MEMBER(get_fore_tile_info);
diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h
index 915ef446637..ed424d3bdad 100644
--- a/src/mame/includes/dday.h
+++ b/src/mame/includes/dday.h
@@ -65,14 +65,14 @@ private:
required_device<palette_device> m_palette;
required_device<ay8912_device> m_ay1;
- DECLARE_READ8_MEMBER(dday_countdown_timer_r);
- DECLARE_WRITE8_MEMBER(dday_bgvideoram_w);
- DECLARE_WRITE8_MEMBER(dday_fgvideoram_w);
- DECLARE_WRITE8_MEMBER(dday_textvideoram_w);
- DECLARE_WRITE8_MEMBER(dday_colorram_w);
- DECLARE_READ8_MEMBER(dday_colorram_r);
- DECLARE_WRITE8_MEMBER(dday_sl_control_w);
- DECLARE_WRITE8_MEMBER(dday_control_w);
+ uint8_t dday_countdown_timer_r();
+ void dday_bgvideoram_w(offs_t offset, uint8_t data);
+ void dday_fgvideoram_w(offs_t offset, uint8_t data);
+ void dday_textvideoram_w(offs_t offset, uint8_t data);
+ void dday_colorram_w(offs_t offset, uint8_t data);
+ uint8_t dday_colorram_r(offs_t offset);
+ void dday_sl_control_w(uint8_t data);
+ void dday_control_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_text_tile_info);
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index f5031bde663..117d0c4e1d4 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -96,8 +96,8 @@ protected:
int m_m5205_clk;
#endif
- DECLARE_WRITE8_MEMBER(ddragon_bgvideoram_w);
- DECLARE_WRITE8_MEMBER(ddragon_fgvideoram_w);
+ void ddragon_bgvideoram_w(offs_t offset, uint8_t data);
+ void ddragon_fgvideoram_w(offs_t offset, uint8_t data);
TILEMAP_MAPPER_MEMBER(background_scan);
@@ -137,16 +137,16 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(ddragon_scanline);
- DECLARE_WRITE8_MEMBER(ddragon_bankswitch_w);
- DECLARE_READ8_MEMBER(ddragon_interrupt_r);
- DECLARE_WRITE8_MEMBER(ddragon_interrupt_w);
- DECLARE_WRITE8_MEMBER(ddragon2_sub_irq_ack_w);
- DECLARE_WRITE8_MEMBER(ddragon2_sub_irq_w);
+ void ddragon_bankswitch_w(uint8_t data);
+ uint8_t ddragon_interrupt_r(offs_t offset);
+ void ddragon_interrupt_w(offs_t offset, uint8_t data);
+ void ddragon2_sub_irq_ack_w(uint8_t data);
+ void ddragon2_sub_irq_w(uint8_t data);
void sub_port6_w(uint8_t data);
- DECLARE_READ8_MEMBER(ddragon_comram_r);
- DECLARE_WRITE8_MEMBER(ddragon_comram_w);
- DECLARE_WRITE8_MEMBER(dd_adpcm_w);
- DECLARE_READ8_MEMBER(dd_adpcm_status_r);
+ uint8_t ddragon_comram_r(offs_t offset);
+ void ddragon_comram_w(offs_t offset, uint8_t data);
+ void dd_adpcm_w(offs_t offset, uint8_t data);
+ uint8_t dd_adpcm_status_r();
void ddragonba_port_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_1);
DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_2);
@@ -178,9 +178,9 @@ public:
void init_darktowr();
private:
- DECLARE_READ8_MEMBER(darktowr_mcu_bank_r);
- DECLARE_WRITE8_MEMBER(darktowr_mcu_bank_w);
- DECLARE_WRITE8_MEMBER(darktowr_bankswitch_w);
+ uint8_t darktowr_mcu_bank_r(offs_t offset);
+ void darktowr_mcu_bank_w(offs_t offset, uint8_t data);
+ void darktowr_bankswitch_w(uint8_t data);
void mcu_port_a_w(offs_t offset, uint8_t data);
void darktowr_map(address_map &map);
@@ -206,7 +206,7 @@ public:
void init_toffy();
private:
- DECLARE_WRITE8_MEMBER(toffy_bankswitch_w);
+ void toffy_bankswitch_w(uint8_t data);
void toffy_map(address_map &map);
};
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index 579d4f51b31..13355d261c7 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -82,10 +82,10 @@ protected:
required_device<okim6295_device> m_oki;
required_device<screen_device> m_screen;
- DECLARE_WRITE16_MEMBER(ddragon3_scroll_w);
- DECLARE_READ16_MEMBER(ddragon3_scroll_r);
- DECLARE_WRITE16_MEMBER(ddragon3_bg_videoram_w);
- DECLARE_WRITE16_MEMBER(ddragon3_fg_videoram_w);
+ void ddragon3_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t ddragon3_scroll_r(offs_t offset);
+ void ddragon3_bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void ddragon3_fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -94,10 +94,10 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE16_MEMBER(ddragon3_vreg_w);
- DECLARE_WRITE16_MEMBER(irq6_ack_w);
- DECLARE_WRITE16_MEMBER(irq5_ack_w);
- DECLARE_WRITE8_MEMBER(oki_bankswitch_w);
+ void ddragon3_vreg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void irq6_ack_w(uint16_t data);
+ void irq5_ack_w(uint16_t data);
+ void oki_bankswitch_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void machine_start() override;
@@ -137,15 +137,15 @@ private:
required_shared_ptr<uint16_t> m_paletteram;
required_ioport_array<2> m_dsw;
tilemap_t *m_fg0_tilemap;
- DECLARE_WRITE16_MEMBER(wwfwfest_fg0_videoram_w);
+ void wwfwfest_fg0_videoram_w(offs_t offset, uint16_t data);
//required_device<buffered_spriteram16_device> m_spriteram;
- DECLARE_WRITE8_MEMBER(wwfwfest_priority_w);
- DECLARE_WRITE16_MEMBER(wwfwfest_irq_ack_w);
- DECLARE_WRITE16_MEMBER(wwfwfest_flipscreen_w);
- DECLARE_READ16_MEMBER(wwfwfest_paletteram_r);
- DECLARE_WRITE16_MEMBER(wwfwfest_paletteram_w);
- DECLARE_WRITE16_MEMBER(wwfwfest_soundwrite);
+ void wwfwfest_priority_w(uint8_t data);
+ void wwfwfest_irq_ack_w(offs_t offset, uint16_t data);
+ void wwfwfest_flipscreen_w(uint16_t data);
+ uint16_t wwfwfest_paletteram_r(offs_t offset);
+ void wwfwfest_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wwfwfest_soundwrite(uint16_t data);
TILE_GET_INFO_MEMBER(get_fg0_tile_info);
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index 1b72fc0e5c3..d40df1f9228 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -65,16 +65,16 @@ private:
required_device<filter_rc_device> m_filter3;
required_device<gfxdecode_device> m_gfxdecode;
- DECLARE_WRITE8_MEMBER(ddribble_bankswitch_w);
- DECLARE_READ8_MEMBER(ddribble_sharedram_r);
- DECLARE_WRITE8_MEMBER(ddribble_sharedram_w);
- DECLARE_READ8_MEMBER(ddribble_snd_sharedram_r);
- DECLARE_WRITE8_MEMBER(ddribble_snd_sharedram_w);
- DECLARE_WRITE8_MEMBER(ddribble_coin_counter_w);
- DECLARE_WRITE8_MEMBER(K005885_0_w);
- DECLARE_WRITE8_MEMBER(K005885_1_w);
- DECLARE_WRITE8_MEMBER(ddribble_fg_videoram_w);
- DECLARE_WRITE8_MEMBER(ddribble_bg_videoram_w);
+ void ddribble_bankswitch_w(uint8_t data);
+ uint8_t ddribble_sharedram_r(offs_t offset);
+ void ddribble_sharedram_w(offs_t offset, uint8_t data);
+ uint8_t ddribble_snd_sharedram_r(offs_t offset);
+ void ddribble_snd_sharedram_w(offs_t offset, uint8_t data);
+ void ddribble_coin_counter_w(uint8_t data);
+ void K005885_0_w(offs_t offset, uint8_t data);
+ void K005885_1_w(offs_t offset, uint8_t data);
+ void ddribble_fg_videoram_w(offs_t offset, uint8_t data);
+ void ddribble_bg_videoram_w(offs_t offset, uint8_t data);
uint8_t ddribble_vlm5030_busy_r();
void ddribble_vlm5030_ctrl_w(uint8_t data);
TILEMAP_MAPPER_MEMBER(tilemap_scan);
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index 2ee6c6aa4b8..22562f751e9 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -37,7 +37,7 @@ public:
void init_deadang();
void init_ghunter();
- DECLARE_WRITE16_MEMBER(foreground_w);
+ void foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILEMAP_MAPPER_MEMBER(bg_scan);
TILE_GET_INFO_MEMBER(get_pf1_tile_info);
@@ -67,8 +67,8 @@ protected:
tilemap_t *m_pf1_layer;
tilemap_t *m_text_layer;
- DECLARE_WRITE16_MEMBER(text_w);
- DECLARE_WRITE16_MEMBER(bank_w);
+ void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void sound_decrypted_opcodes_map(address_map &map);
void sound_map(address_map &map);
@@ -79,8 +79,8 @@ protected:
optional_device<seibu_adpcm_device> m_adpcm1;
optional_device<seibu_adpcm_device> m_adpcm2;
- DECLARE_READ16_MEMBER(ghunter_trackball_low_r);
- DECLARE_READ16_MEMBER(ghunter_trackball_high_r);
+ uint16_t ghunter_trackball_low_r();
+ uint16_t ghunter_trackball_high_r();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -107,7 +107,7 @@ protected:
private:
TILE_GET_INFO_MEMBER(get_popnrun_text_tile_info);
- DECLARE_WRITE16_MEMBER(popnrun_text_w);
+ void popnrun_text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void popnrun_main_map(address_map &map);
void popnrun_sub_map(address_map &map);
void popnrun_sound_map(address_map &map);
diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h
index 35409944e54..db134ddfd58 100644
--- a/src/mame/includes/dec0.h
+++ b/src/mame/includes/dec0.h
@@ -80,9 +80,9 @@ protected:
uint16_t *m_buffered_spriteram;
uint16_t m_pri;
- DECLARE_READ16_MEMBER(dec0_controls_r);
- DECLARE_READ16_MEMBER(slyspy_controls_r);
- DECLARE_WRITE16_MEMBER(priority_w);
+ uint16_t dec0_controls_r(offs_t offset);
+ uint16_t slyspy_controls_r(offs_t offset);
+ void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_VIDEO_START(dec0_nodma);
DECLARE_VIDEO_START(slyspy);
@@ -115,28 +115,28 @@ private:
int m_hippodrm_lsb;
uint8_t m_i8751_ports[4];
- DECLARE_WRITE16_MEMBER(dec0_control_w);
- DECLARE_WRITE16_MEMBER(midres_sound_w);
- DECLARE_READ16_MEMBER(slyspy_protection_r);
- DECLARE_WRITE16_MEMBER(slyspy_state_w);
- DECLARE_READ16_MEMBER(slyspy_state_r);
- DECLARE_READ16_MEMBER(midres_controls_r);
- DECLARE_READ8_MEMBER(hippodrm_prot_r);
- DECLARE_WRITE8_MEMBER(hippodrm_prot_w);
+ void dec0_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void midres_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t slyspy_protection_r(offs_t offset);
+ void slyspy_state_w(uint16_t data);
+ uint16_t slyspy_state_r();
+ uint16_t midres_controls_r(offs_t offset);
+ uint8_t hippodrm_prot_r(offs_t offset);
+ void hippodrm_prot_w(offs_t offset, uint8_t data);
uint8_t dec0_mcu_port0_r();
void dec0_mcu_port0_w(uint8_t data);
void dec0_mcu_port1_w(uint8_t data);
void dec0_mcu_port2_w(uint8_t data);
void dec0_mcu_port3_w(uint8_t data);
- DECLARE_READ16_MEMBER(hippodrm_68000_share_r);
- DECLARE_WRITE16_MEMBER(hippodrm_68000_share_w);
- DECLARE_WRITE16_MEMBER(sprite_mirror_w);
- DECLARE_READ16_MEMBER(robocop_68000_share_r);
- DECLARE_WRITE16_MEMBER(robocop_68000_share_w);
- DECLARE_READ16_MEMBER(ffantasybl_242024_r);
+ uint16_t hippodrm_68000_share_r(offs_t offset);
+ void hippodrm_68000_share_w(offs_t offset, uint16_t data);
+ void sprite_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t robocop_68000_share_r(offs_t offset);
+ void robocop_68000_share_w(offs_t offset, uint16_t data);
+ uint16_t ffantasybl_242024_r();
- DECLARE_READ8_MEMBER(slyspy_sound_state_r);
- DECLARE_READ8_MEMBER(slyspy_sound_state_reset_r);
+ uint8_t slyspy_sound_state_r();
+ uint8_t slyspy_sound_state_reset_r();
virtual void machine_start() override;
DECLARE_MACHINE_RESET(slyspy);
@@ -196,14 +196,14 @@ private:
bool m_adpcm_toggle[2];
uint16_t m_automat_scroll_regs[4];
- DECLARE_WRITE16_MEMBER(automat_control_w);
- DECLARE_READ16_MEMBER( automat_palette_r );
- DECLARE_WRITE16_MEMBER( automat_palette_w );
- DECLARE_WRITE16_MEMBER( automat_scroll_w )
+ void automat_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t automat_palette_r(offs_t offset);
+ void automat_palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void automat_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0)
{
COMBINE_DATA(&m_automat_scroll_regs[offset]);
}
- DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+ void sound_bankswitch_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(msm1_vclk_cb);
DECLARE_WRITE_LINE_MEMBER(msm2_vclk_cb);
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index f1d4f14c79d..dedea1a1171 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -127,26 +127,26 @@ private:
emu_timer *m_i8751_timer;
emu_timer *m_m6502_timer;
- DECLARE_WRITE8_MEMBER(dec8_mxc06_karn_buffer_spriteram_w);
- DECLARE_READ8_MEMBER(i8751_h_r);
- DECLARE_READ8_MEMBER(i8751_l_r);
- DECLARE_WRITE8_MEMBER(i8751_reset_w);
- DECLARE_READ8_MEMBER(gondo_player_1_r);
- DECLARE_READ8_MEMBER(gondo_player_2_r);
- DECLARE_WRITE8_MEMBER(dec8_i8751_w);
- DECLARE_WRITE8_MEMBER(dec8_bank_w);
+ void dec8_mxc06_karn_buffer_spriteram_w(uint8_t data);
+ uint8_t i8751_h_r();
+ uint8_t i8751_l_r();
+ void i8751_reset_w(uint8_t data);
+ uint8_t gondo_player_1_r(offs_t offset);
+ uint8_t gondo_player_2_r(offs_t offset);
+ void dec8_i8751_w(offs_t offset, uint8_t data);
+ void dec8_bank_w(uint8_t data);
void ghostb_bank_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(csilver_control_w);
- DECLARE_WRITE8_MEMBER(dec8_sound_w);
- DECLARE_WRITE8_MEMBER(csilver_adpcm_data_w);
- DECLARE_WRITE8_MEMBER(csilver_sound_bank_w);
- DECLARE_WRITE8_MEMBER(main_irq_on_w);
- DECLARE_WRITE8_MEMBER(main_irq_off_w);
- DECLARE_WRITE8_MEMBER(main_firq_off_w);
- DECLARE_WRITE8_MEMBER(sub_irq_on_w);
- DECLARE_WRITE8_MEMBER(sub_irq_off_w);
- DECLARE_WRITE8_MEMBER(sub_firq_off_w);
- DECLARE_WRITE8_MEMBER(flip_screen_w);
+ void csilver_control_w(uint8_t data);
+ void dec8_sound_w(uint8_t data);
+ void csilver_adpcm_data_w(uint8_t data);
+ void csilver_sound_bank_w(uint8_t data);
+ void main_irq_on_w(uint8_t data);
+ void main_irq_off_w(uint8_t data);
+ void main_firq_off_w(uint8_t data);
+ void sub_irq_on_w(uint8_t data);
+ void sub_irq_off_w(uint8_t data);
+ void sub_firq_off_w(uint8_t data);
+ void flip_screen_w(uint8_t data);
uint8_t i8751_port0_r();
void i8751_port0_w(uint8_t data);
uint8_t i8751_port1_r();
@@ -155,18 +155,18 @@ private:
void shackled_mcu_to_main_w(uint8_t data);
void srdarwin_mcu_to_main_w(uint8_t data);
void csilver_mcu_to_main_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(dec8_bg_data_w);
- DECLARE_READ8_MEMBER(dec8_bg_data_r);
- DECLARE_WRITE8_MEMBER(dec8_videoram_w);
- DECLARE_WRITE8_MEMBER(srdarwin_videoram_w);
- DECLARE_WRITE8_MEMBER(dec8_scroll2_w);
- DECLARE_WRITE8_MEMBER(srdarwin_control_w);
- DECLARE_WRITE8_MEMBER(lastmisn_control_w);
- DECLARE_WRITE8_MEMBER(shackled_control_w);
- DECLARE_WRITE8_MEMBER(lastmisn_scrollx_w);
- DECLARE_WRITE8_MEMBER(lastmisn_scrolly_w);
- DECLARE_WRITE8_MEMBER(gondo_scroll_w);
- DECLARE_READ8_MEMBER(csilver_adpcm_reset_r);
+ void dec8_bg_data_w(offs_t offset, uint8_t data);
+ uint8_t dec8_bg_data_r(offs_t offset);
+ void dec8_videoram_w(offs_t offset, uint8_t data);
+ void srdarwin_videoram_w(offs_t offset, uint8_t data);
+ void dec8_scroll2_w(offs_t offset, uint8_t data);
+ void srdarwin_control_w(offs_t offset, uint8_t data);
+ void lastmisn_control_w(uint8_t data);
+ void shackled_control_w(uint8_t data);
+ void lastmisn_scrollx_w(uint8_t data);
+ void lastmisn_scrolly_w(uint8_t data);
+ void gondo_scroll_w(offs_t offset, uint8_t data);
+ uint8_t csilver_adpcm_reset_r();
TILE_GET_INFO_MEMBER(get_cobracom_fix_tile_info);
TILE_GET_INFO_MEMBER(get_ghostb_fix_tile_info);
TILE_GET_INFO_MEMBER(get_oscar_fix_tile_info);
@@ -198,7 +198,7 @@ private:
uint32_t screen_update_cobracom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_dec8);
DECLARE_WRITE_LINE_MEMBER(oscar_coin_irq);
- DECLARE_WRITE8_MEMBER(oscar_coin_clear_w);
+ void oscar_coin_clear_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(shackled_coin_irq);
void srdarwin_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &primap);
void gondo_colpri_cb(u32 &colour, u32 &pri_mask);
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 8f6d2baca09..1a1bbd34669 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -146,7 +146,7 @@ public:
private:
required_ioport_array<2> m_io_in;
-// DECLARE_WRITE32_MEMBER(sound_w);
+// void sound_w(u32 data);
u32 unk_status_r();
virtual void video_start() override;
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index 4df1ba20ee6..4eca0a33e09 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -72,23 +72,23 @@ private:
std::unique_ptr<u16[]> m_spriteram_spare;
std::unique_ptr<u16[]> m_buffered_spriteram;
- DECLARE_READ32_MEMBER(mlc_440008_r);
- DECLARE_READ32_MEMBER(mlc_44001c_r);
- DECLARE_WRITE32_MEMBER(mlc_44001c_w);
-
- DECLARE_READ32_MEMBER(mlc_200000_r);
- DECLARE_READ32_MEMBER(mlc_200004_r);
- DECLARE_READ32_MEMBER(mlc_200070_r);
- DECLARE_READ32_MEMBER(mlc_20007c_r);
- DECLARE_READ32_MEMBER(mlc_scanline_r);
- DECLARE_WRITE32_MEMBER(irq_ram_w);
- DECLARE_READ32_MEMBER(avengrgs_speedup_r);
- DECLARE_WRITE32_MEMBER(eeprom_w);
- DECLARE_READ32_MEMBER(spriteram_r);
- DECLARE_WRITE32_MEMBER(spriteram_w);
-
- DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r );
- DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w );
+ u32 mlc_440008_r();
+ u32 mlc_44001c_r(offs_t offset);
+ void mlc_44001c_w(u32 data);
+
+ u32 mlc_200000_r();
+ u32 mlc_200004_r();
+ u32 mlc_200070_r();
+ u32 mlc_20007c_r();
+ u32 mlc_scanline_r();
+ void irq_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ u32 avengrgs_speedup_r();
+ void eeprom_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ u32 spriteram_r(offs_t offset, uint32_t mem_mask = ~0);
+ void spriteram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+ u16 sh96_protection_region_0_146_r(offs_t offset);
+ void sh96_protection_region_0_146_w(offs_t offset, u16 data, u16 mem_mask = ~0);
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_mlc);
diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h
index df5b855a856..41c29721431 100644
--- a/src/mame/includes/decocass.h
+++ b/src/mame/includes/decocass.h
@@ -65,8 +65,8 @@ protected:
required_device<upi41_cpu_device> m_mcu;
/* dongles-related */
- read8_delegate m_dongle_r; // TODO: why isn't this a virtual method?
- write8_delegate m_dongle_w; // TODO: why isn't this a virtual method?
+ read8sm_delegate m_dongle_r; // TODO: why isn't this a virtual method?
+ write8sm_delegate m_dongle_w; // TODO: why isn't this a virtual method?
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -148,28 +148,28 @@ private:
void decocass_palette(palette_device &palette) const;
uint32_t screen_update_decocass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(decocass_coin_counter_w);
- DECLARE_WRITE8_MEMBER(decocass_sound_command_w);
- DECLARE_READ8_MEMBER(decocass_sound_command_main_r);
- DECLARE_READ8_MEMBER(decocass_sound_data_r);
- DECLARE_READ8_MEMBER(decocass_sound_ack_r);
- DECLARE_WRITE8_MEMBER(decocass_sound_data_w);
- DECLARE_READ8_MEMBER(decocass_sound_command_r);
- DECLARE_WRITE8_MEMBER(decocass_sound_nmi_enable_w);
- DECLARE_READ8_MEMBER(decocass_sound_nmi_enable_r);
- DECLARE_READ8_MEMBER(decocass_sound_data_ack_reset_r);
- DECLARE_WRITE8_MEMBER(decocass_sound_data_ack_reset_w);
- DECLARE_WRITE8_MEMBER(decocass_nmi_reset_w);
- DECLARE_WRITE8_MEMBER(decocass_quadrature_decoder_reset_w);
- DECLARE_WRITE8_MEMBER(decocass_adc_w);
- DECLARE_READ8_MEMBER(decocass_input_r);
-
- DECLARE_WRITE8_MEMBER(decocass_reset_w);
-
- DECLARE_READ8_MEMBER(decocass_e5xx_r);
- DECLARE_WRITE8_MEMBER(decocass_e5xx_w);
- DECLARE_WRITE8_MEMBER(decocass_de0091_w);
- DECLARE_WRITE8_MEMBER(decocass_e900_w);
+ void decocass_coin_counter_w(uint8_t data);
+ void decocass_sound_command_w(uint8_t data);
+ uint8_t decocass_sound_command_main_r();
+ uint8_t decocass_sound_data_r();
+ uint8_t decocass_sound_ack_r();
+ void decocass_sound_data_w(uint8_t data);
+ uint8_t decocass_sound_command_r();
+ void decocass_sound_nmi_enable_w(uint8_t data);
+ uint8_t decocass_sound_nmi_enable_r();
+ uint8_t decocass_sound_data_ack_reset_r();
+ void decocass_sound_data_ack_reset_w(uint8_t data);
+ void decocass_nmi_reset_w(uint8_t data);
+ void decocass_quadrature_decoder_reset_w(uint8_t data);
+ void decocass_adc_w(uint8_t data);
+ uint8_t decocass_input_r(offs_t offset);
+
+ void decocass_reset_w(offs_t offset, uint8_t data);
+
+ uint8_t decocass_e5xx_r(offs_t offset);
+ void decocass_e5xx_w(offs_t offset, uint8_t data);
+ void decocass_de0091_w(offs_t offset, uint8_t data);
+ void decocass_e900_w(uint8_t data);
void i8041_p1_w(uint8_t data);
@@ -179,35 +179,35 @@ private:
void decocass_machine_state_save_init();
- DECLARE_WRITE8_MEMBER(decocass_paletteram_w);
- DECLARE_WRITE8_MEMBER(decocass_charram_w);
- DECLARE_WRITE8_MEMBER(decocass_fgvideoram_w);
- DECLARE_WRITE8_MEMBER(decocass_colorram_w);
- DECLARE_WRITE8_MEMBER(decocass_bgvideoram_w);
- DECLARE_WRITE8_MEMBER(decocass_tileram_w);
- DECLARE_WRITE8_MEMBER(decocass_objectram_w);
-
- DECLARE_WRITE8_MEMBER(decocass_watchdog_count_w);
- DECLARE_WRITE8_MEMBER(decocass_watchdog_flip_w);
- DECLARE_WRITE8_MEMBER(decocass_color_missiles_w);
- DECLARE_WRITE8_MEMBER(decocass_mode_set_w);
- DECLARE_WRITE8_MEMBER(decocass_color_center_bot_w);
- DECLARE_WRITE8_MEMBER(decocass_back_h_shift_w);
- DECLARE_WRITE8_MEMBER(decocass_back_vl_shift_w);
- DECLARE_WRITE8_MEMBER(decocass_back_vr_shift_w);
- DECLARE_WRITE8_MEMBER(decocass_part_h_shift_w);
- DECLARE_WRITE8_MEMBER(decocass_part_v_shift_w);
- DECLARE_WRITE8_MEMBER(decocass_center_h_shift_space_w);
- DECLARE_WRITE8_MEMBER(decocass_center_v_shift_w);
+ void decocass_paletteram_w(offs_t offset, uint8_t data);
+ void decocass_charram_w(offs_t offset, uint8_t data);
+ void decocass_fgvideoram_w(offs_t offset, uint8_t data);
+ void decocass_colorram_w(offs_t offset, uint8_t data);
+ void decocass_bgvideoram_w(offs_t offset, uint8_t data);
+ void decocass_tileram_w(offs_t offset, uint8_t data);
+ void decocass_objectram_w(offs_t offset, uint8_t data);
+
+ void decocass_watchdog_count_w(uint8_t data);
+ void decocass_watchdog_flip_w(uint8_t data);
+ void decocass_color_missiles_w(uint8_t data);
+ void decocass_mode_set_w(uint8_t data);
+ void decocass_color_center_bot_w(uint8_t data);
+ void decocass_back_h_shift_w(uint8_t data);
+ void decocass_back_vl_shift_w(uint8_t data);
+ void decocass_back_vr_shift_w(uint8_t data);
+ void decocass_part_h_shift_w(uint8_t data);
+ void decocass_part_v_shift_w(uint8_t data);
+ void decocass_center_h_shift_space_w(uint8_t data);
+ void decocass_center_v_shift_w(uint8_t data);
void decocass_video_state_save_init();
- DECLARE_WRITE8_MEMBER(mirrorvideoram_w);
- DECLARE_WRITE8_MEMBER(mirrorcolorram_w);
- DECLARE_READ8_MEMBER(mirrorvideoram_r);
- DECLARE_READ8_MEMBER(mirrorcolorram_r);
- DECLARE_READ8_MEMBER(cdsteljn_input_r);
- DECLARE_WRITE8_MEMBER(cdsteljn_mux_w);
+ void mirrorvideoram_w(offs_t offset, uint8_t data);
+ void mirrorcolorram_w(offs_t offset, uint8_t data);
+ uint8_t mirrorvideoram_r(offs_t offset);
+ uint8_t mirrorcolorram_r(offs_t offset);
+ uint8_t cdsteljn_input_r(offs_t offset);
+ void cdsteljn_mux_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(decocass_audio_nmi_gen);
void decocass_map(address_map &map);
void decocass_sound_map(address_map &map);
@@ -276,7 +276,7 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_type1_r);
+ uint8_t decocass_type1_r(offs_t offset);
/* dongle type #1 */
uint32_t m_type1_inmap;
@@ -297,8 +297,8 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_type2_r);
- DECLARE_WRITE8_MEMBER(decocass_type2_w);
+ uint8_t decocass_type2_r(offs_t offset);
+ void decocass_type2_w(offs_t offset, uint8_t data);
/* dongle type #2: status of the latches */
int32_t m_type2_d2_latch; /* latched 8041-STATUS D2 value */
@@ -350,8 +350,8 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_type3_r);
- DECLARE_WRITE8_MEMBER(decocass_type3_w);
+ uint8_t decocass_type3_r(offs_t offset);
+ void decocass_type3_w(offs_t offset, uint8_t data);
/* dongle type #3: status and patches */
int32_t m_type3_ctrs; /* 12 bit counter stage */
@@ -375,8 +375,8 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_type4_r);
- DECLARE_WRITE8_MEMBER(decocass_type4_w);
+ uint8_t decocass_type4_r(offs_t offset);
+ void decocass_type4_w(offs_t offset, uint8_t data);
/* dongle type #4: status */
int32_t m_type4_ctrs; /* latched PROM address (E5x0 LSB, E5x1 MSB) */
@@ -397,8 +397,8 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_type5_r);
- DECLARE_WRITE8_MEMBER(decocass_type5_w);
+ uint8_t decocass_type5_r(offs_t offset);
+ void decocass_type5_w(offs_t offset, uint8_t data);
/* dongle type #5: status */
int32_t m_type5_latch; /* latched enable PROM (1100xxxx written to E5x1) */
@@ -418,7 +418,7 @@ private:
//virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_nodong_r);
+ uint8_t decocass_nodong_r(offs_t offset);
};
@@ -435,8 +435,8 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER(decocass_widel_r);
- DECLARE_WRITE8_MEMBER(decocass_widel_w);
+ uint8_t decocass_widel_r(offs_t offset);
+ void decocass_widel_w(offs_t offset, uint8_t data);
/* dongle type widel: status */
int32_t m_widel_ctrs; /* latched PROM address (E5x0 LSB, E5x1 MSB) */
diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h
index b5e66e5512f..9b906c2f93d 100644
--- a/src/mame/includes/dgn_beta.h
+++ b/src/mame/includes/dgn_beta.h
@@ -105,23 +105,23 @@ public:
void dgnbeta(machine_config &config);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b0_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b1_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b2_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b3_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b4_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b5_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b6_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b7_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b8_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_b9_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bA_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bB_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bC_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bD_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bE_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bF_w);
- DECLARE_WRITE8_MEMBER(dgnbeta_ram_bG_w);
+ void dgnbeta_ram_b0_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b1_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b2_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b3_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b4_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b5_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b6_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b7_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b8_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_b9_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bA_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bB_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bC_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bD_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bE_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bF_w(offs_t offset, uint8_t data);
+ void dgnbeta_ram_bG_w(offs_t offset, uint8_t data);
private:
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -218,15 +218,15 @@ private:
DECLARE_WRITE_LINE_MEMBER(dgnbeta_fdc_drq_w);
DECLARE_WRITE_LINE_MEMBER(dgnbeta_vsync_changed);
/* 74HC670 4x4bit colour ram */
- DECLARE_WRITE8_MEMBER(dgnbeta_colour_ram_w);
+ void dgnbeta_colour_ram_w(offs_t offset, uint8_t data);
// Page IO at FE00
- DECLARE_READ8_MEMBER(dgn_beta_page_r);
- DECLARE_WRITE8_MEMBER(dgn_beta_page_w);
+ uint8_t dgn_beta_page_r(offs_t offset);
+ void dgn_beta_page_w(offs_t offset, uint8_t data);
MC6845_UPDATE_ROW(crtc_update_row);
/* WD2797 FDC */
- DECLARE_READ8_MEMBER(dgnbeta_wd2797_r);
- DECLARE_WRITE8_MEMBER(dgnbeta_wd2797_w);
+ uint8_t dgnbeta_wd2797_r(offs_t offset);
+ void dgnbeta_wd2797_w(offs_t offset, uint8_t data);
void dgnbeta_vid_set_gctrl(int data);
void UpdateBanks(int first, int last);
diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h
index d27dd420bb0..7a6196eb70f 100644
--- a/src/mame/includes/dietgo.h
+++ b/src/mame/includes/dietgo.h
@@ -49,8 +49,8 @@ private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECO16IC_BANK_CB_MEMBER(bank_callback);
- DECLARE_READ16_MEMBER( dietgo_protection_region_0_104_r );
- DECLARE_WRITE16_MEMBER( dietgo_protection_region_0_104_w );
+ uint16_t dietgo_protection_region_0_104_r(offs_t offset);
+ void dietgo_protection_region_0_104_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void decrypted_opcodes_map(address_map &map);
void dietgo_map(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h
index 95b1be0892a..11b061a204f 100644
--- a/src/mame/includes/digdug.h
+++ b/src/mame/includes/digdug.h
@@ -40,13 +40,13 @@ private:
void digdug_palette(palette_device &palette) const;
uint32_t screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(digdug_videoram_w);
+ void digdug_videoram_w(offs_t offset, uint8_t data);
void bg_select_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(tx_color_mode_w);
DECLARE_WRITE_LINE_MEMBER(bg_disable_w);
- DECLARE_READ8_MEMBER(earom_read);
- DECLARE_WRITE8_MEMBER(earom_write);
+ uint8_t earom_read();
+ void earom_write(offs_t offset, uint8_t data);
void earom_control_w(uint8_t data);
virtual void machine_start() override;
diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h
index 8ad9025236a..7c144f67d3b 100644
--- a/src/mame/includes/divebomb.h
+++ b/src/mame/includes/divebomb.h
@@ -76,15 +76,15 @@ private:
TILE_GET_INFO_MEMBER(get_fg_tile_info);
- DECLARE_READ8_MEMBER(fgcpu_comm_flags_r);
- DECLARE_WRITE8_MEMBER(fgram_w);
+ uint8_t fgcpu_comm_flags_r();
+ void fgram_w(offs_t offset, uint8_t data);
- DECLARE_WRITE8_MEMBER(spritecpu_port00_w);
+ void spritecpu_port00_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(rozcpu_bank_w);
- template<int Chip> DECLARE_WRITE8_MEMBER(rozcpu_wrap_enable_w);
- template<int Chip> DECLARE_WRITE8_MEMBER(rozcpu_enable_w);
- DECLARE_WRITE8_MEMBER(rozcpu_pal_w);
+ void rozcpu_bank_w(uint8_t data);
+ template<int Chip> void rozcpu_wrap_enable_w(uint8_t data);
+ template<int Chip> void rozcpu_enable_w(uint8_t data);
+ void rozcpu_pal_w(uint8_t data);
void divebomb_fgcpu_iomap(address_map &map);
void divebomb_fgcpu_map(address_map &map);
void divebomb_rozcpu_iomap(address_map &map);
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index 8f8646a88d7..448e6de113e 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -86,12 +86,12 @@ private:
required_device<generic_latch_8_device> m_slavelatch;
required_device<generic_latch_8_device> m_beastlatch;
- DECLARE_READ8_MEMBER(beast_status_r);
- DECLARE_WRITE8_MEMBER(trigger_nmi_on_mastercpu);
- DECLARE_WRITE8_MEMBER(mastercpu_bankswitch_w);
- DECLARE_WRITE8_MEMBER(slavecpu_bankswitch_w);
- DECLARE_WRITE8_MEMBER(coin_count_w);
- DECLARE_WRITE8_MEMBER(soundcpu_bankswitch_w);
+ uint8_t beast_status_r();
+ void trigger_nmi_on_mastercpu(uint8_t data);
+ void mastercpu_bankswitch_w(uint8_t data);
+ void slavecpu_bankswitch_w(uint8_t data);
+ void coin_count_w(uint8_t data);
+ void soundcpu_bankswitch_w(uint8_t data);
uint8_t beast_p0_r();
void beast_p0_w(uint8_t data);
uint8_t beast_p1_r();
@@ -100,10 +100,10 @@ private:
void beast_p2_w(uint8_t data);
uint8_t beast_p3_r();
void beast_p3_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(djboy_scrollx_w);
- DECLARE_WRITE8_MEMBER(djboy_scrolly_w);
- DECLARE_WRITE8_MEMBER(djboy_videoram_w);
- DECLARE_WRITE8_MEMBER(djboy_paletteram_w);
+ void djboy_scrollx_w(uint8_t data);
+ void djboy_scrolly_w(uint8_t data);
+ void djboy_videoram_w(offs_t offset, uint8_t data);
+ void djboy_paletteram_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/djmain.h b/src/mame/includes/djmain.h
index 0c5c35abf5d..61ae69a3ba9 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -47,23 +47,23 @@ public:
void init_bmclubmx();
private:
- DECLARE_WRITE32_MEMBER(sndram_bank_w);
- DECLARE_READ32_MEMBER(sndram_r);
- DECLARE_WRITE32_MEMBER(sndram_w);
- DECLARE_READ32_MEMBER(obj_ctrl_r);
- DECLARE_WRITE32_MEMBER(obj_ctrl_w);
- DECLARE_READ32_MEMBER(obj_rom_r);
- DECLARE_WRITE32_MEMBER(v_ctrl_w);
- DECLARE_READ32_MEMBER(v_rom_r);
- DECLARE_READ8_MEMBER(inp1_r);
- DECLARE_READ8_MEMBER(inp2_r);
- DECLARE_READ32_MEMBER(turntable_r);
- DECLARE_WRITE32_MEMBER(turntable_select_w);
- DECLARE_WRITE32_MEMBER(light_ctrl_1_w);
- DECLARE_WRITE32_MEMBER(light_ctrl_2_w);
- DECLARE_WRITE32_MEMBER(unknown590000_w);
- DECLARE_WRITE32_MEMBER(unknown802000_w);
- DECLARE_WRITE32_MEMBER(unknownc02000_w);
+ void sndram_bank_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sndram_r(offs_t offset, uint32_t mem_mask = ~0);
+ void sndram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t obj_ctrl_r(offs_t offset);
+ void obj_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t obj_rom_r(offs_t offset, uint32_t mem_mask = ~0);
+ void v_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t v_rom_r(offs_t offset, uint32_t mem_mask = ~0);
+ uint8_t inp1_r(offs_t offset);
+ uint8_t inp2_r(offs_t offset);
+ uint32_t turntable_r(offs_t offset, uint32_t mem_mask = ~0);
+ void turntable_select_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void light_ctrl_1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void light_ctrl_2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void unknown590000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void unknown802000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void unknownc02000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
uint32_t screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vb_interrupt);
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index 456fdd43d69..d91a7ef830f 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -263,34 +263,34 @@ private:
int16_t m_rev_map[0x200];
uint8_t hb_dma_read_byte(offs_t offset);
void hb_dma_write_byte(offs_t offset, uint8_t data);
- DECLARE_WRITE8_MEMBER(dkong3_coin_counter_w);
- DECLARE_READ8_MEMBER(dkong_in2_r);
- DECLARE_READ8_MEMBER(epos_decrypt_rom);
- DECLARE_WRITE8_MEMBER(s2650_data_w);
+ void dkong3_coin_counter_w(offs_t offset, uint8_t data);
+ uint8_t dkong_in2_r(offs_t offset);
+ uint8_t epos_decrypt_rom(offs_t offset);
+ void s2650_data_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(s2650_fo_w);
- DECLARE_READ8_MEMBER(s2650_port0_r);
- DECLARE_READ8_MEMBER(s2650_port1_r);
- DECLARE_WRITE8_MEMBER(dkong3_2a03_reset_w);
- DECLARE_READ8_MEMBER(strtheat_inputport_0_r);
- DECLARE_READ8_MEMBER(strtheat_inputport_1_r);
- DECLARE_WRITE8_MEMBER(nmi_mask_w);
- DECLARE_WRITE8_MEMBER(dk_braze_a15_w);
- DECLARE_WRITE8_MEMBER(dkong_videoram_w);
- DECLARE_WRITE8_MEMBER(dkongjr_gfxbank_w);
- DECLARE_WRITE8_MEMBER(dkong3_gfxbank_w);
- DECLARE_WRITE8_MEMBER(dkong_palettebank_w);
- DECLARE_WRITE8_MEMBER(radarscp_grid_enable_w);
- DECLARE_WRITE8_MEMBER(radarscp_grid_color_w);
- DECLARE_WRITE8_MEMBER(dkong_flipscreen_w);
- DECLARE_WRITE8_MEMBER(dkong_spritebank_w);
+ uint8_t s2650_port0_r();
+ uint8_t s2650_port1_r();
+ void dkong3_2a03_reset_w(uint8_t data);
+ uint8_t strtheat_inputport_0_r();
+ uint8_t strtheat_inputport_1_r();
+ void nmi_mask_w(uint8_t data);
+ void dk_braze_a15_w(uint8_t data);
+ void dkong_videoram_w(offs_t offset, uint8_t data);
+ void dkongjr_gfxbank_w(uint8_t data);
+ void dkong3_gfxbank_w(uint8_t data);
+ void dkong_palettebank_w(offs_t offset, uint8_t data);
+ void radarscp_grid_enable_w(uint8_t data);
+ void radarscp_grid_color_w(uint8_t data);
+ void dkong_flipscreen_w(uint8_t data);
+ void dkong_spritebank_w(uint8_t data);
void dkong_voice_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(dkong_audio_irq_w);
+ void dkong_audio_irq_w(uint8_t data);
uint8_t p8257_ctl_r();
void p8257_ctl_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(p8257_drq_w);
- DECLARE_WRITE8_MEMBER(dkong_z80dma_rdy_w);
- DECLARE_READ8_MEMBER(braze_eeprom_r);
- DECLARE_WRITE8_MEMBER(braze_eeprom_w);
+ void p8257_drq_w(uint8_t data);
+ void dkong_z80dma_rdy_w(uint8_t data);
+ uint8_t braze_eeprom_r();
+ void braze_eeprom_w(uint8_t data);
TILE_GET_INFO_MEMBER(dkong_bg_tile_info);
TILE_GET_INFO_MEMBER(radarscp1_bg_tile_info);
DECLARE_MACHINE_START(dkong2b);
@@ -312,8 +312,6 @@ private:
uint8_t dkong_voice_status_r();
uint8_t dkong_tune_r(offs_t offset);
void dkong_p1_w(uint8_t data);
- DECLARE_READ8_MEMBER(sound_t0_r);
- DECLARE_READ8_MEMBER(sound_t1_r);
uint32_t screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_pestplce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_spclforc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h
index 34e92ef5c35..508513d365c 100644
--- a/src/mame/includes/dm7000.h
+++ b/src/mame/includes/dm7000.h
@@ -25,30 +25,30 @@ private:
required_device<ppc4xx_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
- DECLARE_WRITE8_MEMBER ( dm7000_iic0_w );
- DECLARE_READ8_MEMBER ( dm7000_iic0_r );
- DECLARE_WRITE8_MEMBER ( dm7000_iic1_w );
- DECLARE_READ8_MEMBER ( dm7000_iic1_r );
+ void dm7000_iic0_w(offs_t offset, uint8_t data);
+ uint8_t dm7000_iic0_r(offs_t offset);
+ void dm7000_iic1_w(offs_t offset, uint8_t data);
+ uint8_t dm7000_iic1_r(offs_t offset);
- DECLARE_WRITE8_MEMBER ( dm7000_scc0_w );
- DECLARE_READ8_MEMBER ( dm7000_scc0_r );
+ void dm7000_scc0_w(offs_t offset, uint8_t data);
+ uint8_t dm7000_scc0_r(offs_t offset);
void kbd_put(u8 data);
uint8_t m_scc0_lcr;
uint8_t m_scc0_lsr;
uint8_t m_term_data;
- DECLARE_WRITE8_MEMBER ( dm7000_gpio0_w );
- DECLARE_READ8_MEMBER ( dm7000_gpio0_r );
+ void dm7000_gpio0_w(offs_t offset, uint8_t data);
+ uint8_t dm7000_gpio0_r(offs_t offset);
- DECLARE_WRITE8_MEMBER ( dm7000_scp0_w );
- DECLARE_READ8_MEMBER ( dm7000_scp0_r );
+ void dm7000_scp0_w(offs_t offset, uint8_t data);
+ uint8_t dm7000_scp0_r(offs_t offset);
- DECLARE_WRITE16_MEMBER ( dm7000_enet_w );
- DECLARE_READ16_MEMBER ( dm7000_enet_r );
+ void dm7000_enet_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dm7000_enet_r(offs_t offset);
- DECLARE_READ32_MEMBER( dcr_r );
- DECLARE_WRITE32_MEMBER( dcr_w );
+ uint32_t dcr_r(offs_t offset);
+ void dcr_w(offs_t offset, uint32_t data);
uint16_t m_enet_regs[32];
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index b099ad6ef67..b58fe16c7a4 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -72,17 +72,17 @@ private:
uint8_t m_buffer0[9];
uint8_t m_buffer1[9];
- DECLARE_READ8_MEMBER(docastle_shared0_r);
- DECLARE_READ8_MEMBER(docastle_shared1_r);
- DECLARE_WRITE8_MEMBER(docastle_shared0_w);
- DECLARE_WRITE8_MEMBER(docastle_shared1_w);
- DECLARE_WRITE8_MEMBER(docastle_nmitrigger_w);
- DECLARE_WRITE8_MEMBER(docastle_videoram_w);
- DECLARE_WRITE8_MEMBER(docastle_colorram_w);
- DECLARE_READ8_MEMBER(inputs_flipscreen_r);
- DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_READ8_MEMBER(idsoccer_adpcm_status_r);
- DECLARE_WRITE8_MEMBER(idsoccer_adpcm_w);
+ uint8_t docastle_shared0_r(offs_t offset);
+ uint8_t docastle_shared1_r(offs_t offset);
+ void docastle_shared0_w(offs_t offset, uint8_t data);
+ void docastle_shared1_w(offs_t offset, uint8_t data);
+ void docastle_nmitrigger_w(uint8_t data);
+ void docastle_videoram_w(offs_t offset, uint8_t data);
+ void docastle_colorram_w(offs_t offset, uint8_t data);
+ uint8_t inputs_flipscreen_r(offs_t offset);
+ void flipscreen_w(offs_t offset, uint8_t data);
+ uint8_t idsoccer_adpcm_status_r();
+ void idsoccer_adpcm_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
void docastle_palette(palette_device &palette) const;
DECLARE_VIDEO_START(dorunrun);
diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h
index 1c41ad924ef..1b8cfb99265 100644
--- a/src/mame/includes/dogfgt.h
+++ b/src/mame/includes/dogfgt.h
@@ -65,17 +65,17 @@ private:
int m_soundlatch;
int m_last_snd_ctrl;
- DECLARE_WRITE8_MEMBER(subirqtrigger_w);
- DECLARE_WRITE8_MEMBER(sub_irqack_w);
- DECLARE_WRITE8_MEMBER(soundlatch_w);
- DECLARE_WRITE8_MEMBER(soundcontrol_w);
- DECLARE_WRITE8_MEMBER(plane_select_w);
- DECLARE_READ8_MEMBER(bitmapram_r);
- DECLARE_WRITE8_MEMBER(internal_bitmapram_w);
- DECLARE_WRITE8_MEMBER(bitmapram_w);
- DECLARE_WRITE8_MEMBER(bgvideoram_w);
- DECLARE_WRITE8_MEMBER(scroll_w);
- DECLARE_WRITE8_MEMBER(_1800_w);
+ void subirqtrigger_w(uint8_t data);
+ void sub_irqack_w(uint8_t data);
+ void soundlatch_w(uint8_t data);
+ void soundcontrol_w(uint8_t data);
+ void plane_select_w(uint8_t data);
+ uint8_t bitmapram_r(offs_t offset);
+ void internal_bitmapram_w(offs_t offset, uint8_t data);
+ void bitmapram_w(offs_t offset, uint8_t data);
+ void bgvideoram_w(offs_t offset, uint8_t data);
+ void scroll_w(offs_t offset, uint8_t data);
+ void _1800_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index 1ca05f7c273..f2440d851ed 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -53,9 +53,9 @@ public:
private:
void speed1_w(uint8_t data);
void speed2_w(uint8_t data);
- DECLARE_READ8_MEMBER(dragrace_input_r);
- DECLARE_READ8_MEMBER(dragrace_steering_r);
- DECLARE_READ8_MEMBER(dragrace_scanline_r);
+ uint8_t dragrace_input_r(offs_t offset);
+ uint8_t dragrace_steering_r();
+ uint8_t dragrace_scanline_r();
TILE_GET_INFO_MEMBER(get_tile_info);
void dragrace_palette(palette_device &palette) const;
uint32_t screen_update_dragrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h
index 03628b4f4a8..89f86a924b8 100644
--- a/src/mame/includes/drgnmst.h
+++ b/src/mame/includes/drgnmst.h
@@ -59,10 +59,10 @@ private:
required_shared_ptr<uint16_t> m_spriteram;
/* devices */
- DECLARE_WRITE16_MEMBER(coin_w);
- DECLARE_WRITE16_MEMBER(fg_videoram_w);
- DECLARE_WRITE16_MEMBER(bg_videoram_w);
- DECLARE_WRITE16_MEMBER(md_videoram_w);
+ void coin_w(uint16_t data);
+ void fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void md_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_md_tile_info);
@@ -111,8 +111,8 @@ private:
uint8_t m_pic16c5x_port0;
uint8_t m_oki_bank[2];
- DECLARE_WRITE8_MEMBER(snd_command_w);
- DECLARE_WRITE8_MEMBER(snd_flag_w);
+ void snd_command_w(uint8_t data);
+ void snd_flag_w(uint8_t data);
uint8_t pic16c5x_port0_r();
uint8_t snd_command_r();
uint8_t snd_flag_r();
diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h
index b4ede40f7ac..c539caf45c8 100644
--- a/src/mame/includes/drmicro.h
+++ b/src/mame/includes/drmicro.h
@@ -42,9 +42,9 @@ private:
/* devices */
required_device<msm5205_device> m_msm;
- DECLARE_WRITE8_MEMBER(nmi_enable_w);
- DECLARE_WRITE8_MEMBER(pcm_set_w);
- DECLARE_WRITE8_MEMBER(drmicro_videoram_w);
+ void nmi_enable_w(uint8_t data);
+ void pcm_set_w(uint8_t data);
+ void drmicro_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg1_tile_info);
TILE_GET_INFO_MEMBER(get_bg2_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index a0d3e1f0010..d3c852d88e9 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -102,11 +102,11 @@ protected:
DECLARE_VIDEO_START(hnoridur);
- DECLARE_WRITE8_MEMBER(dynax_vblank_ack_w);
+ void dynax_vblank_ack_w(uint8_t data);
void dynax_blit_dest_w(uint8_t data);
void dynax_blit_romregion_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(dynax_extra_scrollx_w);
- DECLARE_WRITE8_MEMBER(dynax_extra_scrolly_w);
+ void dynax_extra_scrollx_w(uint8_t data);
+ void dynax_extra_scrolly_w(uint8_t data);
void hanamai_copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int i );
@@ -116,51 +116,51 @@ protected:
void htengoku_banked_map(address_map &map);
private:
- DECLARE_WRITE8_MEMBER(jantouki_vblank_ack_w);
+ void jantouki_vblank_ack_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(jantouki_blitter_ack_w);
DECLARE_WRITE_LINE_MEMBER(jantouki_blitter_irq_w);
DECLARE_WRITE_LINE_MEMBER(jantouki_blitter2_ack_w);
DECLARE_WRITE_LINE_MEMBER(jantouki_blitter2_irq_w);
- DECLARE_WRITE8_MEMBER(jantouki_sound_vblank_ack_w);
+ void jantouki_sound_vblank_ack_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coincounter_0_w);
DECLARE_WRITE_LINE_MEMBER(coincounter_1_w);
- DECLARE_READ8_MEMBER(ret_ff);
- DECLARE_READ8_MEMBER(hanamai_keyboard_0_r);
- DECLARE_READ8_MEMBER(hanamai_keyboard_1_r);
- DECLARE_WRITE8_MEMBER(hanamai_keyboard_w);
- DECLARE_WRITE8_MEMBER(dynax_rombank_w);
- DECLARE_WRITE8_MEMBER(jantouki_sound_rombank_w);
- DECLARE_WRITE8_MEMBER(cdracula_sound_rombank_w);
- DECLARE_WRITE8_MEMBER(hnoridur_rombank_w);
- DECLARE_WRITE8_MEMBER(hnoridur_palbank_w);
- DECLARE_WRITE8_MEMBER(hnoridur_palette_lo_w);
- DECLARE_WRITE8_MEMBER(hnoridur_palette_hi_w);
+ uint8_t ret_ff();
+ uint8_t hanamai_keyboard_0_r();
+ uint8_t hanamai_keyboard_1_r();
+ void hanamai_keyboard_w(uint8_t data);
+ void dynax_rombank_w(uint8_t data);
+ void jantouki_sound_rombank_w(uint8_t data);
+ void cdracula_sound_rombank_w(uint8_t data);
+ void hnoridur_rombank_w(uint8_t data);
+ void hnoridur_palbank_w(uint8_t data);
+ void hnoridur_palette_lo_w(offs_t offset, uint8_t data);
+ void hnoridur_palette_hi_w(offs_t offset, uint8_t data);
void hnoridur_palette_update(offs_t offset);
- DECLARE_WRITE8_MEMBER(nanajign_palette_lo_w);
- DECLARE_WRITE8_MEMBER(nanajign_palette_hi_w);
+ void nanajign_palette_lo_w(offs_t offset, uint8_t data);
+ void nanajign_palette_hi_w(offs_t offset, uint8_t data);
void nanajign_palette_update(offs_t offset);
- DECLARE_WRITE8_MEMBER(adpcm_data_w);
+ void adpcm_data_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(hjingi_lockout_w);
DECLARE_WRITE_LINE_MEMBER(hjingi_hopper_w);
uint8_t hjingi_hopper_bit();
- DECLARE_READ8_MEMBER(hjingi_keyboard_0_r);
- DECLARE_READ8_MEMBER(hjingi_keyboard_1_r);
- DECLARE_WRITE8_MEMBER(yarunara_input_w);
- DECLARE_READ8_MEMBER(yarunara_input_r);
- DECLARE_WRITE8_MEMBER(yarunara_rombank_w);
- DECLARE_WRITE8_MEMBER(yarunara_blit_romregion_w);
- DECLARE_READ8_MEMBER(jantouki_soundlatch_ack_r);
- DECLARE_WRITE8_MEMBER(jantouki_soundlatch_w);
- DECLARE_READ8_MEMBER(jantouki_blitter_busy_r);
- DECLARE_WRITE8_MEMBER(jantouki_rombank_w);
- DECLARE_READ8_MEMBER(jantouki_soundlatch_status_r);
- DECLARE_READ8_MEMBER(mjelctrn_keyboard_1_r);
- DECLARE_READ8_MEMBER(mjelctrn_dsw_r);
- DECLARE_WRITE8_MEMBER(tenkai_ipsel_w);
- DECLARE_WRITE8_MEMBER(tenkai_ip_w);
- DECLARE_READ8_MEMBER(tenkai_ip_r);
- DECLARE_READ8_MEMBER(tenkai_palette_r);
- DECLARE_WRITE8_MEMBER(tenkai_palette_w);
+ uint8_t hjingi_keyboard_0_r();
+ uint8_t hjingi_keyboard_1_r();
+ void yarunara_input_w(offs_t offset, uint8_t data);
+ uint8_t yarunara_input_r(offs_t offset);
+ void yarunara_rombank_w(uint8_t data);
+ void yarunara_blit_romregion_w(uint8_t data);
+ uint8_t jantouki_soundlatch_ack_r();
+ void jantouki_soundlatch_w(uint8_t data);
+ uint8_t jantouki_blitter_busy_r();
+ void jantouki_rombank_w(uint8_t data);
+ uint8_t jantouki_soundlatch_status_r();
+ uint8_t mjelctrn_keyboard_1_r();
+ uint8_t mjelctrn_dsw_r();
+ void tenkai_ipsel_w(offs_t offset, uint8_t data);
+ void tenkai_ip_w(uint8_t data);
+ uint8_t tenkai_ip_r(offs_t offset);
+ uint8_t tenkai_palette_r(offs_t offset);
+ void tenkai_palette_w(offs_t offset, uint8_t data);
uint8_t tenkai_p3_r();
void tenkai_p3_w(uint8_t data);
void tenkai_p4_w(uint8_t data);
@@ -171,32 +171,32 @@ private:
uint8_t tenkai_p8_r();
DECLARE_WRITE_LINE_MEMBER(tenkai_6c_w);
DECLARE_WRITE_LINE_MEMBER(tenkai_70_w);
- DECLARE_WRITE8_MEMBER(tenkai_blit_romregion_w);
- DECLARE_READ8_MEMBER(gekisha_keyboard_0_r);
- DECLARE_READ8_MEMBER(gekisha_keyboard_1_r);
- DECLARE_WRITE8_MEMBER(gekisha_hopper_w);
+ void tenkai_blit_romregion_w(uint8_t data);
+ uint8_t gekisha_keyboard_0_r();
+ uint8_t gekisha_keyboard_1_r();
+ void gekisha_hopper_w(offs_t offset, uint8_t data);
void gekisha_p4_w(uint8_t data);
- //DECLARE_WRITE8_MEMBER(dynax_blit_pen_w);
- DECLARE_WRITE8_MEMBER(dynax_blit2_dest_w);
- DECLARE_WRITE8_MEMBER(tenkai_blit_dest_w);
- DECLARE_WRITE8_MEMBER(mjembase_blit_dest_w);
- DECLARE_WRITE8_MEMBER(dynax_blit_backpen_w);
- DECLARE_WRITE8_MEMBER(dynax_blit_palette01_w);
- DECLARE_WRITE8_MEMBER(tenkai_blit_palette01_w);
- DECLARE_WRITE8_MEMBER(dynax_blit_palette45_w);
- DECLARE_WRITE8_MEMBER(dynax_blit_palette23_w);
- DECLARE_WRITE8_MEMBER(tenkai_blit_palette23_w);
- DECLARE_WRITE8_MEMBER(mjembase_blit_palette23_w);
- DECLARE_WRITE8_MEMBER(dynax_blit_palette67_w);
+ //void dynax_blit_pen_w(uint8_t data);
+ void dynax_blit2_dest_w(uint8_t data);
+ void tenkai_blit_dest_w(uint8_t data);
+ void mjembase_blit_dest_w(uint8_t data);
+ void dynax_blit_backpen_w(uint8_t data);
+ void dynax_blit_palette01_w(uint8_t data);
+ void tenkai_blit_palette01_w(uint8_t data);
+ void dynax_blit_palette45_w(uint8_t data);
+ void dynax_blit_palette23_w(uint8_t data);
+ void tenkai_blit_palette23_w(uint8_t data);
+ void mjembase_blit_palette23_w(uint8_t data);
+ void dynax_blit_palette67_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(blit_palbank_w);
DECLARE_WRITE_LINE_MEMBER(blit2_palbank_w);
DECLARE_WRITE_LINE_MEMBER(mjdialq2_blit_dest0_w);
DECLARE_WRITE_LINE_MEMBER(mjdialq2_blit_dest1_w);
- DECLARE_WRITE8_MEMBER(dynax_layer_enable_w);
- DECLARE_WRITE8_MEMBER(jantouki_layer_enable_w);
+ void dynax_layer_enable_w(uint8_t data);
+ void jantouki_layer_enable_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(mjdialq2_layer0_enable_w);
DECLARE_WRITE_LINE_MEMBER(mjdialq2_layer1_enable_w);
- DECLARE_WRITE8_MEMBER(dynax_blit2_romregion_w);
+ void dynax_blit2_romregion_w(uint8_t data);
void hanamai_blit_pixel_w(offs_t offset, uint8_t data);
void cdracula_blit_pixel_w(offs_t offset, uint8_t data);
void drgpunch_blit_pixel_w(offs_t offset, uint8_t data);
@@ -207,9 +207,9 @@ private:
void dynax_blit2_scrolly_w(uint8_t data);
void tenkai_blit_scrollx_w(uint8_t data);
void tenkai_blit_scrolly_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(hanamai_priority_w);
- DECLARE_WRITE8_MEMBER(tenkai_priority_w);
- DECLARE_WRITE8_MEMBER(mjembase_priority_w);
+ void hanamai_priority_w(uint8_t data);
+ void tenkai_priority_w(uint8_t data);
+ void mjembase_priority_w(uint8_t data);
uint32_t screen_update_hanamai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_hnoridur(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -228,7 +228,7 @@ private:
DECLARE_WRITE_LINE_MEMBER(adpcm_int_cpu1);
DECLARE_MACHINE_RESET(adpcm);
- DECLARE_WRITE8_MEMBER(adpcm_reset_w);
+ void adpcm_reset_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(adpcm_reset_kludge_w);
void tenkai_dswsel_w(uint8_t data);
uint8_t tenkai_dsw_r();
diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h
index 1f4b6298894..49f963c366a 100644
--- a/src/mame/includes/dynduke.h
+++ b/src/mame/includes/dynduke.h
@@ -55,11 +55,11 @@ private:
int m_old_back;
int m_old_fore;
- DECLARE_WRITE16_MEMBER(background_w);
- DECLARE_WRITE16_MEMBER(foreground_w);
- DECLARE_WRITE16_MEMBER(text_w);
- DECLARE_WRITE16_MEMBER(gfxbank_w);
- DECLARE_WRITE16_MEMBER(control_w);
+ void background_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void gfxbank_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);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index e10c6e46856..63c01123ac2 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -154,7 +154,7 @@ protected:
TIMER_CALLBACK_MEMBER( frogs_croak_callback );
/*----------- defined in audio/depthch.cpp -----------*/
- DECLARE_WRITE8_MEMBER( depthch_audio_w );
+ void depthch_audio_w(uint8_t data);
/*----------- defined in audio/invinco.cpp -----------*/
DECLARE_WRITE8_MEMBER( invinco_audio_w );
@@ -281,8 +281,8 @@ protected:
DECLARE_WRITE8_MEMBER(carnival_io_w);
/*----------- defined in audio/carnival.cpp -----------*/
- DECLARE_WRITE8_MEMBER( carnival_audio_1_w );
- DECLARE_WRITE8_MEMBER( carnival_audio_2_w );
+ void carnival_audio_1_w(uint8_t data);
+ void carnival_audio_2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( carnival_music_port_t1_r );
void carnivala_music_port_1_w(uint8_t data);
void carnivala_music_port_2_w(uint8_t data);
diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h
index ea348221a12..1dbe48a7f02 100644
--- a/src/mame/machine/cammu.h
+++ b/src/mame/machine/cammu.h
@@ -269,28 +269,28 @@ public:
void set_cammu_id(const u32 cammu_id) { m_control = cammu_id; }
- DECLARE_READ32_MEMBER(s_pdo_r) { return m_s_pdo; }
- DECLARE_WRITE32_MEMBER(s_pdo_w) { m_s_pdo = ((m_s_pdo & ~mem_mask) | (data & mem_mask)) & PDO_MASK; }
- DECLARE_READ32_MEMBER(u_pdo_r) { return m_u_pdo; }
- DECLARE_WRITE32_MEMBER(u_pdo_w) { m_u_pdo = ((m_u_pdo & ~mem_mask) | (data & mem_mask)) & PDO_MASK; }
-
- virtual DECLARE_READ32_MEMBER(control_r) = 0;
- virtual DECLARE_WRITE32_MEMBER(control_w) = 0;
-
- DECLARE_READ32_MEMBER(i_fault_r) { return m_i_fault; }
- DECLARE_WRITE32_MEMBER(i_fault_w) { m_i_fault = data; }
- DECLARE_READ32_MEMBER(fault_address_1_r) { return m_fault_address_1; }
- DECLARE_WRITE32_MEMBER(fault_address_1_w) { m_fault_address_1 = data; }
- DECLARE_READ32_MEMBER(fault_address_2_r) { return m_fault_address_2; }
- DECLARE_WRITE32_MEMBER(fault_address_2_w) { m_fault_address_2 = data; }
- DECLARE_READ32_MEMBER(fault_data_1_lo_r) { return m_fault_data_1_lo; }
- DECLARE_WRITE32_MEMBER(fault_data_1_lo_w) { m_fault_data_1_lo = data; }
- DECLARE_READ32_MEMBER(fault_data_1_hi_r) { return m_fault_data_1_hi; }
- DECLARE_WRITE32_MEMBER(fault_data_1_hi_w) { m_fault_data_1_hi = data; }
- DECLARE_READ32_MEMBER(fault_data_2_lo_r) { return m_fault_data_2_lo; }
- DECLARE_WRITE32_MEMBER(fault_data_2_lo_w) { m_fault_data_2_lo = data; }
- DECLARE_READ32_MEMBER(fault_data_2_hi_r) { return m_fault_data_2_hi; }
- DECLARE_WRITE32_MEMBER(fault_data_2_hi_w) { m_fault_data_2_hi = data; }
+ u32 s_pdo_r() { return m_s_pdo; }
+ void s_pdo_w(offs_t offset, u32 data, u32 mem_mask = ~0) { m_s_pdo = ((m_s_pdo & ~mem_mask) | (data & mem_mask)) & PDO_MASK; }
+ u32 u_pdo_r() { return m_u_pdo; }
+ void u_pdo_w(offs_t offset, u32 data, u32 mem_mask = ~0) { m_u_pdo = ((m_u_pdo & ~mem_mask) | (data & mem_mask)) & PDO_MASK; }
+
+ virtual u32 control_r() = 0;
+ virtual void control_w(offs_t offset, u32 data, u32 mem_mask = ~0) = 0;
+
+ u32 i_fault_r() { return m_i_fault; }
+ void i_fault_w(u32 data) { m_i_fault = data; }
+ u32 fault_address_1_r() { return m_fault_address_1; }
+ void fault_address_1_w(u32 data) { m_fault_address_1 = data; }
+ u32 fault_address_2_r() { return m_fault_address_2; }
+ void fault_address_2_w(u32 data) { m_fault_address_2 = data; }
+ u32 fault_data_1_lo_r() { return m_fault_data_1_lo; }
+ void fault_data_1_lo_w(u32 data) { m_fault_data_1_lo = data; }
+ u32 fault_data_1_hi_r() { return m_fault_data_1_hi; }
+ void fault_data_1_hi_w(u32 data) { m_fault_data_1_hi = data; }
+ u32 fault_data_2_lo_r() { return m_fault_data_2_lo; }
+ void fault_data_2_lo_w(u32 data) { m_fault_data_2_lo = data; }
+ u32 fault_data_2_hi_r() { return m_fault_data_2_hi; }
+ void fault_data_2_hi_w(u32 data) { m_fault_data_2_hi = data; }
protected:
cammu_c4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -322,14 +322,14 @@ public:
virtual void map(address_map &map) override;
- DECLARE_READ32_MEMBER(ram_line_r) { return m_ram_line; }
- DECLARE_WRITE32_MEMBER(ram_line_w) { m_ram_line = data; }
+ u32 ram_line_r() { return m_ram_line; }
+ void ram_line_w(u32 data) { m_ram_line = data; }
- DECLARE_READ32_MEMBER(htlb_offset_r) { return m_htlb_offset; }
- DECLARE_WRITE32_MEMBER(htlb_offset_w) { m_htlb_offset = data; }
+ u32 htlb_offset_r() { return m_htlb_offset; }
+ void htlb_offset_w(u32 data) { m_htlb_offset = data; }
- DECLARE_READ32_MEMBER(c4_bus_poll_r) { return m_c4_bus_poll; }
- DECLARE_WRITE32_MEMBER(c4_bus_poll_w) { m_c4_bus_poll = data; }
+ u32 c4_bus_poll_r() { return m_c4_bus_poll; }
+ void c4_bus_poll_w(u32 data) { m_c4_bus_poll = data; }
enum control_mask : u32
{
@@ -361,27 +361,27 @@ public:
CID_C4T = 0x00000000 // unknown
};
- virtual DECLARE_READ32_MEMBER(control_r) override { return m_control; }
- virtual DECLARE_WRITE32_MEMBER(control_w) override { m_control = ((m_control & (~mem_mask | CNTL_CID)) | (data & (mem_mask & ~CNTL_CID))); }
- DECLARE_READ32_MEMBER(bio_control_r) { return m_bio_control; }
- DECLARE_WRITE32_MEMBER(bio_control_w) { m_bio_control = data; }
- DECLARE_READ32_MEMBER(bio_address_tag_r) { return m_bio_address_tag; }
- DECLARE_WRITE32_MEMBER(bio_address_tag_w) { m_bio_address_tag = data; }
-
- DECLARE_READ32_MEMBER(cache_data_lo_r) { return m_cache_data_lo; }
- DECLARE_WRITE32_MEMBER(cache_data_lo_w) { m_cache_data_lo = data; }
- DECLARE_READ32_MEMBER(cache_data_hi_r) { return m_cache_data_hi; }
- DECLARE_WRITE32_MEMBER(cache_data_hi_w) { m_cache_data_hi = data; }
- DECLARE_READ32_MEMBER(cache_cpu_tag_r) { return m_cache_cpu_tag; }
- DECLARE_WRITE32_MEMBER(cache_cpu_tag_w) { m_cache_cpu_tag = data; }
- DECLARE_READ32_MEMBER(cache_system_tag_valid_r) { return m_cache_system_tag_valid; }
- DECLARE_WRITE32_MEMBER(cache_system_tag_valid_w) { m_cache_system_tag_valid = data; }
- DECLARE_READ32_MEMBER(cache_system_tag_r) { return m_cache_system_tag; }
- DECLARE_WRITE32_MEMBER(cache_system_tag_w) { m_cache_system_tag = data; }
- DECLARE_READ32_MEMBER(tlb_va_line_r) { return m_tlb_va_line; }
- DECLARE_WRITE32_MEMBER(tlb_va_line_w) { m_tlb_va_line = data; }
- DECLARE_READ32_MEMBER(tlb_ra_line_r) { return m_tlb_ra_line; }
- DECLARE_WRITE32_MEMBER(tlb_ra_line_w) { m_tlb_ra_line = data; }
+ virtual u32 control_r() override { return m_control; }
+ virtual void control_w(offs_t offset, u32 data, u32 mem_mask = ~0) override { m_control = ((m_control & (~mem_mask | CNTL_CID)) | (data & (mem_mask & ~CNTL_CID))); }
+ u32 bio_control_r() { return m_bio_control; }
+ void bio_control_w(u32 data) { m_bio_control = data; }
+ u32 bio_address_tag_r() { return m_bio_address_tag; }
+ void bio_address_tag_w(u32 data) { m_bio_address_tag = data; }
+
+ u32 cache_data_lo_r() { return m_cache_data_lo; }
+ void cache_data_lo_w(u32 data) { m_cache_data_lo = data; }
+ u32 cache_data_hi_r() { return m_cache_data_hi; }
+ void cache_data_hi_w(u32 data) { m_cache_data_hi = data; }
+ u32 cache_cpu_tag_r() { return m_cache_cpu_tag; }
+ void cache_cpu_tag_w(u32 data) { m_cache_cpu_tag = data; }
+ u32 cache_system_tag_valid_r() { return m_cache_system_tag_valid; }
+ void cache_system_tag_valid_w(u32 data) { m_cache_system_tag_valid = data; }
+ u32 cache_system_tag_r() { return m_cache_system_tag; }
+ void cache_system_tag_w(u32 data) { m_cache_system_tag = data; }
+ u32 tlb_va_line_r() { return m_tlb_va_line; }
+ void tlb_va_line_w(u32 data) { m_tlb_va_line = data; }
+ u32 tlb_ra_line_r() { return m_tlb_ra_line; }
+ void tlb_ra_line_w(u32 data) { m_tlb_ra_line = data; }
protected:
virtual void device_start() override;
@@ -453,8 +453,8 @@ public:
CID_C4IR2 = 0x02000000
};
- virtual DECLARE_READ32_MEMBER(control_r) override { return m_control; }
- virtual DECLARE_WRITE32_MEMBER(control_w) override { m_control = ((m_control & (~mem_mask | CNTL_CID)) | (data & (mem_mask & ~CNTL_CID))); }
+ virtual u32 control_r() override { return m_control; }
+ virtual void control_w(offs_t offset, u32 data, u32 mem_mask) override { m_control = ((m_control & (~mem_mask | CNTL_CID)) | (data & (mem_mask & ~CNTL_CID))); }
enum reset_mask : u32
{
@@ -467,23 +467,23 @@ public:
RESET_FLUSH = 0x40000000, // flush out burst io buffer
RESET_CFR = 0x80000000 // clear fault registers
};
- DECLARE_READ32_MEMBER(reset_r) { return m_reset; }
- DECLARE_WRITE32_MEMBER(reset_w) { m_reset = data; }
-
- DECLARE_READ32_MEMBER(clr_s_data_tlb_r) { return m_clr_s_data_tlb; }
- DECLARE_WRITE32_MEMBER(clr_s_data_tlb_w) { m_clr_s_data_tlb = data; }
- DECLARE_READ32_MEMBER(clr_u_data_tlb_r) { return m_clr_u_data_tlb; }
- DECLARE_WRITE32_MEMBER(clr_u_data_tlb_w) { m_clr_u_data_tlb = data; }
- DECLARE_READ32_MEMBER(clr_s_insn_tlb_r) { return m_clr_s_insn_tlb; }
- DECLARE_WRITE32_MEMBER(clr_s_insn_tlb_w) { m_clr_s_insn_tlb = data; }
- DECLARE_READ32_MEMBER(clr_u_insn_tlb_r) { return m_clr_u_insn_tlb; }
- DECLARE_WRITE32_MEMBER(clr_u_insn_tlb_w) { m_clr_u_insn_tlb = data; }
-
- DECLARE_READ32_MEMBER(test_data_r) { return m_test_data; }
- DECLARE_WRITE32_MEMBER(test_data_w) { m_test_data = data; }
-
- DECLARE_READ32_MEMBER(test_address_r) { return m_test_address; }
- DECLARE_WRITE32_MEMBER(test_address_w) { m_test_address = data; }
+ u32 reset_r() { return m_reset; }
+ void reset_w(u32 data) { m_reset = data; }
+
+ u32 clr_s_data_tlb_r() { return m_clr_s_data_tlb; }
+ void clr_s_data_tlb_w(u32 data) { m_clr_s_data_tlb = data; }
+ u32 clr_u_data_tlb_r() { return m_clr_u_data_tlb; }
+ void clr_u_data_tlb_w(u32 data) { m_clr_u_data_tlb = data; }
+ u32 clr_s_insn_tlb_r() { return m_clr_s_insn_tlb; }
+ void clr_s_insn_tlb_w(u32 data) { m_clr_s_insn_tlb = data; }
+ u32 clr_u_insn_tlb_r() { return m_clr_u_insn_tlb; }
+ void clr_u_insn_tlb_w(u32 data) { m_clr_u_insn_tlb = data; }
+
+ u32 test_data_r() { return m_test_data; }
+ void test_data_w(u32 data) { m_test_data = data; }
+
+ u32 test_address_r() { return m_test_address; }
+ void test_address_w(u32 data) { m_test_address = data; }
protected:
virtual void device_start() override;
diff --git a/src/mame/machine/carpolo.cpp b/src/mame/machine/carpolo.cpp
index fa646234294..b7fa090757b 100644
--- a/src/mame/machine/carpolo.cpp
+++ b/src/mame/machine/carpolo.cpp
@@ -136,7 +136,7 @@ void carpolo_state::generate_car_border_interrupt(int car, int horizontal_border
}
-READ8_MEMBER(carpolo_state::ball_screen_collision_cause_r)
+uint8_t carpolo_state::ball_screen_collision_cause_r()
{
/* bit 0 - 0=ball collided with border
bit 1 - 0=ball collided with goal
@@ -145,19 +145,19 @@ READ8_MEMBER(carpolo_state::ball_screen_collision_cause_r)
return m_ball_screen_collision_cause;
}
-READ8_MEMBER(carpolo_state::car_ball_collision_x_r)
+uint8_t carpolo_state::car_ball_collision_x_r()
{
/* the x coordinate of the colliding pixel */
return m_car_ball_collision_x;
}
-READ8_MEMBER(carpolo_state::car_ball_collision_y_r)
+uint8_t carpolo_state::car_ball_collision_y_r()
{
/* the y coordinate of the colliding pixel */
return m_car_ball_collision_y;
}
-READ8_MEMBER(carpolo_state::car_car_collision_cause_r)
+uint8_t carpolo_state::car_car_collision_cause_r()
{
/* bit 0 - car 4 collided
bit 1 - car 3 collided
@@ -166,7 +166,7 @@ READ8_MEMBER(carpolo_state::car_car_collision_cause_r)
return m_car_car_collision_cause;
}
-READ8_MEMBER(carpolo_state::car_goal_collision_cause_r)
+uint8_t carpolo_state::car_goal_collision_cause_r()
{
/* bit 0-1 - which car collided
bit 2 - horizontal timing bit 1TEC4 (not accessed)
@@ -174,14 +174,14 @@ READ8_MEMBER(carpolo_state::car_goal_collision_cause_r)
return m_car_goal_collision_cause;
}
-READ8_MEMBER(carpolo_state::car_ball_collision_cause_r)
+uint8_t carpolo_state::car_ball_collision_cause_r()
{
/* bit 0-1 - which car collided
bit 2-3 - unconnected */
return m_car_ball_collision_cause;
}
-READ8_MEMBER(carpolo_state::car_border_collision_cause_r)
+uint8_t carpolo_state::car_border_collision_cause_r()
{
/* bit 0-1 - which car collided
bit 2 - 0=vertical border, 1=horizontal border */
@@ -189,7 +189,7 @@ READ8_MEMBER(carpolo_state::car_border_collision_cause_r)
}
-READ8_MEMBER(carpolo_state::interrupt_cause_r)
+uint8_t carpolo_state::interrupt_cause_r()
{
/* the output of the 148 goes to bits 1-3 (which is priority ^ 7) */
return (m_ttl74148_3s->output_r() << 1) | m_priority_0_extension;
@@ -280,37 +280,37 @@ WRITE_LINE_MEMBER(carpolo_state::coin4_interrupt_clear_w)
m_ttl7474_2u_2->clear_w(state);
}
-WRITE8_MEMBER(carpolo_state::ball_screen_interrupt_clear_w)
+void carpolo_state::ball_screen_interrupt_clear_w(uint8_t data)
{
m_ttl74148_3s->input_line_w(BALL_SCREEN_PRIORITY_LINE, 1);
m_ttl74148_3s->update();
}
-WRITE8_MEMBER(carpolo_state::car_car_interrupt_clear_w)
+void carpolo_state::car_car_interrupt_clear_w(uint8_t data)
{
m_ttl74148_3s->input_line_w(CAR_CAR_PRIORITY_LINE, 1);
m_ttl74148_3s->update();
}
-WRITE8_MEMBER(carpolo_state::car_goal_interrupt_clear_w)
+void carpolo_state::car_goal_interrupt_clear_w(uint8_t data)
{
m_ttl74148_3s->input_line_w(CAR_GOAL_PRIORITY_LINE, 1);
m_ttl74148_3s->update();
}
-WRITE8_MEMBER(carpolo_state::car_ball_interrupt_clear_w)
+void carpolo_state::car_ball_interrupt_clear_w(uint8_t data)
{
m_ttl74148_3s->input_line_w(PRI0_PRIORTITY_LINE, 1);
m_ttl74148_3s->update();
}
-WRITE8_MEMBER(carpolo_state::car_border_interrupt_clear_w)
+void carpolo_state::car_border_interrupt_clear_w(uint8_t data)
{
m_ttl74148_3s->input_line_w(PRI0_PRIORTITY_LINE, 1);
m_ttl74148_3s->update();
}
-WRITE8_MEMBER(carpolo_state::timer_interrupt_clear_w)
+void carpolo_state::timer_interrupt_clear_w(uint8_t data)
{
m_ttl74148_3s->input_line_w(PRI0_PRIORTITY_LINE, 1);
m_ttl74148_3s->update();
diff --git a/src/mame/machine/cchasm.cpp b/src/mame/machine/cchasm.cpp
index 0f13a3c413d..4a6ce9a397c 100644
--- a/src/mame/machine/cchasm.cpp
+++ b/src/mame/machine/cchasm.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "includes/cchasm.h"
-WRITE16_MEMBER(cchasm_state::led_w)
+void cchasm_state::led_w(offs_t offset, uint16_t data)
{
/*logerror("LED write %x to %x\n", data, offset);*/
}
diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp
index d718b589c49..39ffdee4361 100644
--- a/src/mame/machine/cdicdic.cpp
+++ b/src/mame/machine/cdicdic.cpp
@@ -842,7 +842,7 @@ void cdicdic_device::process_delayed_command()
}
}
-READ16_MEMBER( cdicdic_device::regs_r )
+uint16_t cdicdic_device::regs_r(offs_t offset, uint16_t mem_mask)
{
uint32_t addr = offset + 0x3c00/2;
@@ -923,7 +923,7 @@ READ16_MEMBER( cdicdic_device::regs_r )
}
}
-WRITE16_MEMBER( cdicdic_device::regs_w )
+void cdicdic_device::regs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint32_t addr = offset + 0x3c00/2;
@@ -1183,12 +1183,12 @@ void cdicdic_device::device_reset()
m_intreq_callback(CLEAR_LINE);
}
-WRITE16_MEMBER( cdicdic_device::ram_w )
+void cdicdic_device::ram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_ram[offset]);
}
-READ16_MEMBER( cdicdic_device::ram_r )
+uint16_t cdicdic_device::ram_r(offs_t offset, uint16_t mem_mask)
{
return m_ram[offset];
}
diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h
index 8a40b82f364..556052a8376 100644
--- a/src/mame/machine/cdicdic.h
+++ b/src/mame/machine/cdicdic.h
@@ -55,10 +55,10 @@ public:
void sample_trigger();
void process_delayed_command();
- DECLARE_READ16_MEMBER( regs_r );
- DECLARE_WRITE16_MEMBER( regs_w );
- DECLARE_READ16_MEMBER( ram_r );
- DECLARE_WRITE16_MEMBER( ram_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);
+ uint16_t ram_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint8_t intack_r();
diff --git a/src/mame/machine/cdislavehle.cpp b/src/mame/machine/cdislavehle.cpp
index 0c1f7f5f827..f420e1c8dc8 100644
--- a/src/mame/machine/cdislavehle.cpp
+++ b/src/mame/machine/cdislavehle.cpp
@@ -119,7 +119,7 @@ ioport_constructor cdislave_hle_device::device_input_ports() const
return INPUT_PORTS_NAME(cdislave_mouse);
}
-READ16_MEMBER( cdislave_hle_device::slave_r )
+uint16_t cdislave_hle_device::slave_r(offs_t offset)
{
if (m_channel[offset].m_out_count)
{
@@ -172,7 +172,7 @@ void cdislave_hle_device::set_mouse_position()
}
}
-WRITE16_MEMBER( cdislave_hle_device::slave_w )
+void cdislave_hle_device::slave_w(offs_t offset, uint16_t data)
{
LOGMASKED(LOG_WRITES, "slave_w: Channel %d: %d = %02x\n", offset, m_in_index, data & 0x00ff);
switch (offset)
diff --git a/src/mame/machine/cdislavehle.h b/src/mame/machine/cdislavehle.h
index fea077c65e8..167437722fe 100644
--- a/src/mame/machine/cdislavehle.h
+++ b/src/mame/machine/cdislavehle.h
@@ -41,8 +41,8 @@ public:
uint8_t* get_lcd_state() { return m_lcd_state; }
- DECLARE_READ16_MEMBER( slave_r );
- DECLARE_WRITE16_MEMBER( slave_w );
+ uint16_t slave_r(offs_t offset);
+ void slave_w(offs_t offset, uint16_t data);
protected:
// device-level overrides
diff --git a/src/mame/machine/concept.cpp b/src/mame/machine/concept.cpp
index 4be4dbc15f9..83de6b7e48b 100644
--- a/src/mame/machine/concept.cpp
+++ b/src/mame/machine/concept.cpp
@@ -169,7 +169,7 @@ WRITE_LINE_MEMBER(concept_state::via_irq_func)
concept_set_interrupt(TIMINT_level, state);
}
-READ8_MEMBER(concept_state::io_r)
+uint8_t concept_state::io_r(offs_t offset)
{
switch ((offset >> 8) & 7)
{
@@ -277,7 +277,7 @@ READ8_MEMBER(concept_state::io_r)
return 0;
}
-WRITE8_MEMBER(concept_state::io_w)
+void concept_state::io_w(offs_t offset, uint8_t data)
{
switch ((offset >> 8) & 7)
{
diff --git a/src/mame/machine/cybiko.cpp b/src/mame/machine/cybiko.cpp
index 31eef3f34ea..e35055ff545 100644
--- a/src/mame/machine/cybiko.cpp
+++ b/src/mame/machine/cybiko.cpp
@@ -85,7 +85,7 @@ void cybiko_state::machine_reset()
// READ/WRITE HANDLERS //
/////////////////////////
-READ16_MEMBER( cybiko_state::cybiko_lcd_r )
+uint16_t cybiko_state::cybiko_lcd_r(offs_t offset, uint16_t mem_mask)
{
uint16_t data = 0;
if (ACCESSING_BITS_8_15) data |= (m_crtc->reg_idx_r() << 8);
@@ -93,13 +93,13 @@ READ16_MEMBER( cybiko_state::cybiko_lcd_r )
return data;
}
-WRITE16_MEMBER( cybiko_state::cybiko_lcd_w )
+void cybiko_state::cybiko_lcd_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15) m_crtc->reg_idx_w((data >> 8) & 0xff);
if (ACCESSING_BITS_0_7) m_crtc->reg_dat_w((data >> 0) & 0xff);
}
-int cybiko_state::cybiko_key_r( offs_t offset, int mem_mask)
+int cybiko_state::cybiko_key_r(offs_t offset, int mem_mask)
{
uint16_t data = 0xFFFF;
for (uint8_t i = 0; i < 15; i++)
@@ -114,12 +114,12 @@ int cybiko_state::cybiko_key_r( offs_t offset, int mem_mask)
return data;
}
-READ16_MEMBER( cybiko_state::cybikov1_key_r )
+uint16_t cybiko_state::cybikov1_key_r(offs_t offset, uint16_t mem_mask)
{
return cybiko_key_r(offset, mem_mask);
}
-READ16_MEMBER( cybiko_state::cybikov2_key_r )
+uint16_t cybiko_state::cybikov2_key_r(offs_t offset, uint16_t mem_mask)
{
uint16_t data = cybiko_key_r(offset, mem_mask);
if (!BIT(offset, 0))
@@ -127,13 +127,13 @@ READ16_MEMBER( cybiko_state::cybikov2_key_r )
return data;
}
-READ16_MEMBER( cybiko_state::cybikoxt_key_r )
+uint16_t cybiko_state::cybikoxt_key_r(offs_t offset, uint16_t mem_mask)
{
return cybiko_key_r(offset, mem_mask);
}
#if 0
-READ16_MEMBER( cybiko_state::cybikov1_io_reg_r )
+uint16_t cybiko_state::cybikov1_io_reg_r(offs_t offset)
{
uint16_t data = 0;
#if 0
@@ -181,7 +181,7 @@ READ16_MEMBER( cybiko_state::cybikov1_io_reg_r )
return data;
}
-READ16_MEMBER( cybiko_state::cybikov2_io_reg_r )
+uint16_t cybiko_state::cybikov2_io_reg_r(offs_t offset)
{
uint16_t data = 0;
#if 0
@@ -229,7 +229,7 @@ READ16_MEMBER( cybiko_state::cybikov2_io_reg_r )
return data;
}
-READ16_MEMBER( cybiko_state::cybikoxt_io_reg_r )
+uint16_t cybiko_state::cybikoxt_io_reg_r(offs_t offset)
{
uint16_t data = 0;
#if 0
@@ -269,7 +269,7 @@ READ16_MEMBER( cybiko_state::cybikoxt_io_reg_r )
return data;
}
-WRITE16_MEMBER( cybiko_state::cybikov1_io_reg_w )
+void cybiko_state::cybikov1_io_reg_w(offs_t offset, uint16_t data)
{
#if 0
_logerror( 2, ("cybikov1_io_reg_w (%08X/%02X)\n", offset, data));
@@ -312,7 +312,7 @@ WRITE16_MEMBER( cybiko_state::cybikov1_io_reg_w )
#endif
}
-WRITE16_MEMBER( cybiko_state::cybikov2_io_reg_w )
+void cybiko_state::cybikov2_io_reg_w(offs_t offset, uint16_t data)
{
#if 0
_logerror( 2, ("cybikov2_io_reg_w (%08X/%02X)\n", offset, data));
@@ -355,7 +355,7 @@ WRITE16_MEMBER( cybiko_state::cybikov2_io_reg_w )
#endif
}
-WRITE16_MEMBER( cybiko_state::cybikoxt_io_reg_w )
+void cybiko_state::cybikoxt_io_reg_w(offs_t offset, uint16_t data)
{
#if 0
_logerror( 2, ("cybikoxt_io_reg_w (%08X/%02X)\n", offset, data));
@@ -395,7 +395,7 @@ WRITE16_MEMBER( cybiko_state::cybikoxt_io_reg_w )
// 00/01, 00/C0, 0F/32, 0D/03, 0B/03, 09/50, 07/D6, 05/00, 04/00, 20/00, 23/08, 27/01, 2F/08, 2C/02, 2B/08, 28/01
// 04/80, 05/02, 00/C8, 00/C8, 00/C0, 1B/2C, 00/01, 00/C0, 1B/6C, 0F/10, 0D/07, 0B/07, 09/D2, 07/D6, 05/00, 04/00,
// 20/00, 23/08, 27/01, 2F/08, 2C/02, 2B/08, 28/01, 37/08, 34/04, 33/08, 30/03, 04/80, 05/02, 1B/6C, 00/C8
-WRITE16_MEMBER( cybiko_state::cybiko_usb_w )
+void cybiko_state::cybiko_usb_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15) _logerror( 2, ("[%08X] <- %02X\n", 0x200000 + offset * 2 + 0, (data >> 8) & 0xFF));
if (ACCESSING_BITS_0_7) _logerror( 2, ("[%08X] <- %02X\n", 0x200000 + offset * 2 + 1, (data >> 0) & 0xFF));
diff --git a/src/mame/machine/dai.cpp b/src/mame/machine/dai.cpp
index 095e8c320d8..06cca62cf93 100644
--- a/src/mame/machine/dai.cpp
+++ b/src/mame/machine/dai.cpp
@@ -41,7 +41,7 @@ void dai_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
/* Memory */
-WRITE8_MEMBER(dai_state::dai_stack_interrupt_circuit_w)
+void dai_state::dai_stack_interrupt_circuit_w(uint8_t data)
{
m_tms5501->sens_w(1);
m_tms5501->sens_w(0);
@@ -120,7 +120,7 @@ void dai_state::machine_reset()
bit 6-7 ROM bank switching
***************************************************************************/
-READ8_MEMBER(dai_state::dai_io_discrete_devices_r)
+uint8_t dai_state::dai_io_discrete_devices_r(offs_t offset)
{
uint8_t data = 0x00;
@@ -143,7 +143,7 @@ READ8_MEMBER(dai_state::dai_io_discrete_devices_r)
return data;
}
-WRITE8_MEMBER(dai_state::dai_io_discrete_devices_w)
+void dai_state::dai_io_discrete_devices_w(offs_t offset, uint8_t data)
{
switch(offset & 0x000f) {
case 0x04:
@@ -188,12 +188,12 @@ WRITE8_MEMBER(dai_state::dai_io_discrete_devices_w)
***************************************************************************/
-READ8_MEMBER(dai_state::dai_pit_r)
+uint8_t dai_state::dai_pit_r(offs_t offset)
{
return m_pit->read((offset >> 1) & 3);
}
-WRITE8_MEMBER(dai_state::dai_pit_w)
+void dai_state::dai_pit_w(offs_t offset, uint8_t data)
{
m_pit->write((offset >> 1) & 3, data);
}
@@ -204,13 +204,13 @@ WRITE8_MEMBER(dai_state::dai_pit_w)
***************************************************************************/
-READ8_MEMBER(dai_state::dai_amd9511_r)
+uint8_t dai_state::dai_amd9511_r()
{
/* optional and no present at this moment */
return 0xff;
}
-WRITE8_MEMBER(dai_state::dai_amd9511_w)
+void dai_state::dai_amd9511_w(offs_t offset, uint8_t data)
{
logerror ("Writing to AMD9511 math chip, %04x, %02x\n", offset, data);
}
diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp
index f432e2aa96f..c681fe19bc2 100644
--- a/src/mame/machine/dc.cpp
+++ b/src/mame/machine/dc.cpp
@@ -367,7 +367,7 @@ void dc_state::dc_update_interrupt_status()
}
}
-READ64_MEMBER(dc_state::dc_sysctrl_r )
+uint64_t dc_state::dc_sysctrl_r(offs_t offset, uint64_t mem_mask)
{
int reg;
uint64_t shift;
@@ -384,7 +384,7 @@ READ64_MEMBER(dc_state::dc_sysctrl_r )
return (uint64_t)dc_sysctrl_regs[reg] << shift;
}
-WRITE64_MEMBER(dc_state::dc_sysctrl_w )
+void dc_state::dc_sysctrl_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
int reg;
uint64_t shift;
@@ -480,7 +480,7 @@ WRITE64_MEMBER(dc_state::dc_sysctrl_w )
#endif
}
-READ64_MEMBER(dc_state::dc_gdrom_r )
+uint64_t dc_state::dc_gdrom_r(offs_t offset, uint64_t mem_mask)
{
uint32_t off;
@@ -501,7 +501,7 @@ READ64_MEMBER(dc_state::dc_gdrom_r )
return 0;
}
-WRITE64_MEMBER(dc_state::dc_gdrom_w )
+void dc_state::dc_gdrom_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
uint32_t dat,off;
@@ -519,7 +519,7 @@ WRITE64_MEMBER(dc_state::dc_gdrom_w )
osd_printf_verbose("GDROM: [%08x=%x]write %x to %x, mask %x\n", 0x5f7000+off*4, dat, data, offset, mem_mask);
}
-READ64_MEMBER(dc_state::dc_g2_ctrl_r )
+uint64_t dc_state::dc_g2_ctrl_r(offs_t offset, uint64_t mem_mask)
{
int reg;
uint64_t shift;
@@ -529,7 +529,7 @@ READ64_MEMBER(dc_state::dc_g2_ctrl_r )
return (uint64_t)g2bus_regs[reg] << shift;
}
-WRITE64_MEMBER(dc_state::dc_g2_ctrl_w )
+void dc_state::dc_g2_ctrl_w(address_space &space, offs_t offset, uint64_t data, uint64_t mem_mask)
{
int reg;
uint64_t shift;
@@ -609,7 +609,7 @@ int dc_state::decode_reg_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift)
return reg;
}
-READ64_MEMBER(dc_state::dc_modem_r )
+uint64_t dc_state::dc_modem_r(offs_t offset, uint64_t mem_mask)
{
int reg;
uint64_t shift;
@@ -627,7 +627,7 @@ READ64_MEMBER(dc_state::dc_modem_r )
return 0;
}
-WRITE64_MEMBER(dc_state::dc_modem_w )
+void dc_state::dc_modem_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
int reg;
uint64_t shift;
@@ -677,7 +677,7 @@ void dc_state::machine_reset()
dc_sysctrl_regs[SB_SBREV] = 0x0b;
}
-READ32_MEMBER(dc_state::dc_aica_reg_r)
+uint32_t dc_state::dc_aica_reg_r(offs_t offset, uint32_t mem_mask)
{
// osd_printf_verbose("AICA REG: [%08x] read %x, mask %x\n", 0x700000+reg*4, (uint64_t)offset, mem_mask);
@@ -687,7 +687,7 @@ READ32_MEMBER(dc_state::dc_aica_reg_r)
return m_aica->read(offset*2);
}
-WRITE32_MEMBER(dc_state::dc_aica_reg_w)
+void dc_state::dc_aica_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (offset == (0x2c00/4))
{
@@ -713,22 +713,22 @@ WRITE32_MEMBER(dc_state::dc_aica_reg_w)
// osd_printf_verbose("AICA REG: [%08x=%x] write %x to %x, mask %x\n", 0x700000+reg*4, data, offset, mem_mask);
}
-READ32_MEMBER(dc_state::dc_arm_aica_r)
+uint32_t dc_state::dc_arm_aica_r(offs_t offset)
{
return m_aica->read(offset*2) & 0xffff;
}
-WRITE32_MEMBER(dc_state::dc_arm_aica_w)
+void dc_state::dc_arm_aica_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
m_aica->write(offset*2, data, mem_mask&0xffff);
}
-READ16_MEMBER(dc_state::soundram_r )
+uint16_t dc_state::soundram_r(offs_t offset)
{
return dc_sound_ram[offset];
}
-WRITE16_MEMBER(dc_state::soundram_w )
+void dc_state::soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&dc_sound_ram[offset]);
}
diff --git a/src/mame/machine/dccons.cpp b/src/mame/machine/dccons.cpp
index a33b02ec83f..08634ce1bd2 100644
--- a/src/mame/machine/dccons.cpp
+++ b/src/mame/machine/dccons.cpp
@@ -114,7 +114,7 @@ c000776 - DMA triggered to c008000
*/
-READ32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_r )
+uint32_t dc_cons_state::dc_mess_g1_ctrl_r(offs_t offset)
{
switch(offset)
{
@@ -142,7 +142,7 @@ READ32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_r )
return g1bus_regs[offset];
}
-WRITE32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_w )
+void dc_cons_state::dc_mess_g1_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
g1bus_regs[offset] = data; // 5f7400+reg*4=dat
// osd_printf_verbose("G1CTRL: [%08x=%x] write %x to %x, mask %x\n", 0x5f7400+reg*4, dat, data, offset, mem_mask);
diff --git a/src/mame/machine/dec0.cpp b/src/mame/machine/dec0.cpp
index 7a97398ffe3..befcf91b42d 100644
--- a/src/mame/machine/dec0.cpp
+++ b/src/mame/machine/dec0.cpp
@@ -25,7 +25,7 @@ void dec0_state::machine_start()
save_item(NAME(m_i8751_ports));
}
-READ16_MEMBER(dec0_state::dec0_controls_r)
+uint16_t dec0_state::dec0_controls_r(offs_t offset)
{
switch (offset<<1)
{
@@ -50,7 +50,7 @@ READ16_MEMBER(dec0_state::dec0_controls_r)
/******************************************************************************/
-READ16_MEMBER(dec0_state::midres_controls_r)
+uint16_t dec0_state::midres_controls_r(offs_t offset)
{
switch (offset<<1)
{
@@ -85,7 +85,7 @@ READ16_MEMBER(dec0_state::midres_controls_r)
/******************************************************************************/
-READ8_MEMBER(dec0_state::hippodrm_prot_r)
+uint8_t dec0_state::hippodrm_prot_r(offs_t offset)
{
//logerror("6280 PC %06x - Read %06x\n",cpu_getpc(),offset+0x1d0000);
if (m_hippodrm_lsb == 0x45) return 0x4e;
@@ -93,7 +93,7 @@ READ8_MEMBER(dec0_state::hippodrm_prot_r)
return 0;
}
-WRITE8_MEMBER(dec0_state::hippodrm_prot_w)
+void dec0_state::hippodrm_prot_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -103,13 +103,13 @@ WRITE8_MEMBER(dec0_state::hippodrm_prot_w)
//logerror("6280 PC %06x - Wrote %06x to %04x\n",cpu_getpc(),data,offset+0x1d0000);
}
-READ16_MEMBER(dec0_state::hippodrm_68000_share_r)
+uint16_t dec0_state::hippodrm_68000_share_r(offs_t offset)
{
if (offset == 0) m_maincpu->yield(); /* A wee helper */
return m_hippodrm_shared_ram[offset] & 0xff;
}
-WRITE16_MEMBER(dec0_state::hippodrm_68000_share_w)
+void dec0_state::hippodrm_68000_share_w(offs_t offset, uint16_t data)
{
m_hippodrm_shared_ram[offset] = data & 0xff;
}
@@ -249,21 +249,21 @@ void dec0_state::dec0_i8751_reset()
/******************************************************************************/
-WRITE16_MEMBER(dec0_state::sprite_mirror_w)
+void dec0_state::sprite_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_spriteram->live()[offset]);
}
/******************************************************************************/
-READ16_MEMBER(dec0_state::robocop_68000_share_r)
+uint16_t dec0_state::robocop_68000_share_r(offs_t offset)
{
//logerror("%08x: Share read %04x\n",m_maincpu->pc(),offset);
return m_robocop_shared_ram[offset];
}
-WRITE16_MEMBER(dec0_state::robocop_68000_share_w)
+void dec0_state::robocop_68000_share_w(offs_t offset, uint16_t data)
{
// logerror("%08x: Share write %04x %04x\n",m_maincpu->pc(),offset,data);
diff --git a/src/mame/machine/decioga.cpp b/src/mame/machine/decioga.cpp
index b0a8939214d..e8e60182696 100644
--- a/src/mame/machine/decioga.cpp
+++ b/src/mame/machine/decioga.cpp
@@ -27,7 +27,7 @@ void dec_ioga_device::map(address_map &map)
map(0x040120, 0x040123).rw(FUNC(dec_ioga_device::imsk_r), FUNC(dec_ioga_device::imsk_w));
}
-dec_ioga_device::dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+dec_ioga_device::dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, DECSTATION_IOGA, tag, owner, clock),
m_irq_out_cb(*this)
{
@@ -47,12 +47,12 @@ void dec_ioga_device::device_reset()
m_csr = m_intr = m_imsk = 0;
}
-READ32_MEMBER(dec_ioga_device::csr_r)
+u32 dec_ioga_device::csr_r()
{
return m_csr;
}
-WRITE32_MEMBER(dec_ioga_device::csr_w)
+void dec_ioga_device::csr_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_csr);
#if 0
@@ -65,9 +65,9 @@ WRITE32_MEMBER(dec_ioga_device::csr_w)
#endif
}
-READ32_MEMBER(dec_ioga_device::intr_r)
+u32 dec_ioga_device::intr_r()
{
- uint32_t rv = m_intr;
+ u32 rv = m_intr;
m_intr &= ~0x20; // 5000/133 boot ROM tests that reading clears this bit
return rv;
}
@@ -84,27 +84,27 @@ void dec_ioga_device::recalc_irq()
}
}
-WRITE32_MEMBER(dec_ioga_device::intr_w)
+void dec_ioga_device::intr_w(u32 data)
{
m_intr &= ~data; // clear bits on write
}
-READ32_MEMBER(dec_ioga_device::imsk_r)
+u32 dec_ioga_device::imsk_r()
{
return m_imsk;
}
-WRITE32_MEMBER(dec_ioga_device::imsk_w)
+void dec_ioga_device::imsk_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_imsk);
}
-READ32_MEMBER(dec_ioga_device::dmaptr_r)
+u32 dec_ioga_device::dmaptr_r(offs_t offset)
{
return m_dmaptrs[offset/4];
}
-WRITE32_MEMBER(dec_ioga_device::dmaptr_w)
+void dec_ioga_device::dmaptr_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_dmaptrs[offset/4]);
LOGMASKED(LOG_DMA, "DECIOGA: %08x to DMA pointer %x (addr %x)\n", data, offset/4, offset*4);
diff --git a/src/mame/machine/decioga.h b/src/mame/machine/decioga.h
index fa0a5b3f9f8..88c70556dfb 100644
--- a/src/mame/machine/decioga.h
+++ b/src/mame/machine/decioga.h
@@ -15,7 +15,7 @@
class dec_ioga_device : public device_t
{
public:
- dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
void map(address_map &map);
@@ -37,14 +37,14 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- DECLARE_READ32_MEMBER(csr_r);
- DECLARE_WRITE32_MEMBER(csr_w);
- DECLARE_READ32_MEMBER(intr_r);
- DECLARE_WRITE32_MEMBER(intr_w);
- DECLARE_READ32_MEMBER(imsk_r);
- DECLARE_WRITE32_MEMBER(imsk_w);
- DECLARE_READ32_MEMBER(dmaptr_r);
- DECLARE_WRITE32_MEMBER(dmaptr_w);
+ u32 csr_r();
+ void csr_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 intr_r();
+ void intr_w(u32 data);
+ u32 imsk_r();
+ void imsk_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 dmaptr_r(offs_t offset);
+ void dmaptr_w(offs_t offset, u32 data, u32 mem_mask = ~0);
address_space *m_maincpu_space;
diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp
index eeb7bac79b5..f85fa959d8c 100644
--- a/src/mame/machine/decocass.cpp
+++ b/src/mame/machine/decocass.cpp
@@ -43,18 +43,18 @@ enum {
};
-WRITE8_MEMBER(decocass_state::decocass_coin_counter_w)
+void decocass_state::decocass_coin_counter_w(uint8_t data)
{
}
-READ8_MEMBER( decocass_state::decocass_sound_command_main_r)
+uint8_t decocass_state::decocass_sound_command_main_r()
{
// cgraplop2 needs to read something here or it will reset when you coin-up
// could do with further investigation
return 0xc0;
}
-WRITE8_MEMBER(decocass_state::decocass_sound_command_w)
+void decocass_state::decocass_sound_command_w(uint8_t data)
{
LOG(2,("CPU %s sound command -> $%02x\n", m_maincpu->tag(), data));
m_soundlatch->write(data);
@@ -64,28 +64,28 @@ WRITE8_MEMBER(decocass_state::decocass_sound_command_w)
m_audiocpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
}
-READ8_MEMBER(decocass_state::decocass_sound_data_r)
+uint8_t decocass_state::decocass_sound_data_r()
{
uint8_t data = m_soundlatch2->read();
LOG(2,("CPU %s sound data <- $%02x\n", m_maincpu->tag(), data));
return data;
}
-READ8_MEMBER(decocass_state::decocass_sound_ack_r)
+uint8_t decocass_state::decocass_sound_ack_r()
{
uint8_t data = m_sound_ack; /* D6+D7 */
LOG(4,("CPU %s sound ack <- $%02x\n", m_maincpu->tag(), data));
return data;
}
-WRITE8_MEMBER(decocass_state::decocass_sound_data_w)
+void decocass_state::decocass_sound_data_w(uint8_t data)
{
LOG(2,("CPU %s sound data -> $%02x\n", m_audiocpu->tag(), data));
m_soundlatch2->write(data);
m_sound_ack |= 0x40;
}
-READ8_MEMBER(decocass_state::decocass_sound_command_r)
+uint8_t decocass_state::decocass_sound_command_r()
{
uint8_t data = m_soundlatch->read();
LOG(4,("CPU %s sound command <- $%02x\n", m_audiocpu->tag(), data));
@@ -101,20 +101,20 @@ TIMER_DEVICE_CALLBACK_MEMBER(decocass_state::decocass_audio_nmi_gen)
m_audiocpu->set_input_line(INPUT_LINE_NMI, (m_audio_nmi_enabled && m_audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER(decocass_state::decocass_sound_nmi_enable_w)
+void decocass_state::decocass_sound_nmi_enable_w(uint8_t data)
{
m_audio_nmi_enabled = 1;
m_audiocpu->set_input_line(INPUT_LINE_NMI, (m_audio_nmi_enabled && m_audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER(decocass_state::decocass_sound_nmi_enable_r)
+uint8_t decocass_state::decocass_sound_nmi_enable_r()
{
m_audio_nmi_enabled = 1;
m_audiocpu->set_input_line(INPUT_LINE_NMI, (m_audio_nmi_enabled && m_audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE);
return 0xff;
}
-READ8_MEMBER(decocass_state::decocass_sound_data_ack_reset_r)
+uint8_t decocass_state::decocass_sound_data_ack_reset_r()
{
uint8_t data = 0xff;
LOG(2,("CPU %s sound ack rst <- $%02x\n", m_audiocpu->tag(), data));
@@ -122,18 +122,18 @@ READ8_MEMBER(decocass_state::decocass_sound_data_ack_reset_r)
return data;
}
-WRITE8_MEMBER(decocass_state::decocass_sound_data_ack_reset_w)
+void decocass_state::decocass_sound_data_ack_reset_w(uint8_t data)
{
LOG(2,("CPU %s sound ack rst -> $%02x\n", m_audiocpu->tag(), data));
m_sound_ack &= ~0x40;
}
-WRITE8_MEMBER(decocass_state::decocass_nmi_reset_w)
+void decocass_state::decocass_nmi_reset_w(uint8_t data)
{
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE );
}
-WRITE8_MEMBER(decocass_state::decocass_quadrature_decoder_reset_w)
+void decocass_state::decocass_quadrature_decoder_reset_w(uint8_t data)
{
/* just latch the analog controls here */
m_quadrature_decoder[0] = ioport("AN0")->read();
@@ -142,7 +142,7 @@ WRITE8_MEMBER(decocass_state::decocass_quadrature_decoder_reset_w)
m_quadrature_decoder[3] = ioport("AN3")->read();
}
-WRITE8_MEMBER(decocass_state::decocass_adc_w)
+void decocass_state::decocass_adc_w(uint8_t data)
{
}
@@ -156,7 +156,7 @@ WRITE8_MEMBER(decocass_state::decocass_adc_w)
* E6x6 ""
* E6x7 a/d converter read
*/
-READ8_MEMBER(decocass_state::decocass_input_r)
+uint8_t decocass_state::decocass_input_r(offs_t offset)
{
uint8_t data = 0xff;
static const char *const portnames[] = { "IN0", "IN1", "IN2" };
@@ -190,7 +190,7 @@ READ8_MEMBER(decocass_state::decocass_input_r)
#define E5XX_MASK 0x02 /* use 0x0e for old style board */
-WRITE8_MEMBER(decocass_state::decocass_reset_w)
+void decocass_state::decocass_reset_w(offs_t offset, uint8_t data)
{
LOG(1,("%10s 6502-PC: %04x decocass_reset_w(%02x): $%02x\n", machine().time().as_string(6), m_maincpu->pcbase(), offset, data));
m_decocass_reset = data;
@@ -241,7 +241,7 @@ void decocass_state::decocass_fno( offs_t offset, uint8_t data )
#endif
-READ8_MEMBER(decocass_type1_state::decocass_type1_r)
+uint8_t decocass_type1_state::decocass_type1_r(offs_t offset)
{
if (!m_type1_map)
return 0x00;
@@ -508,7 +508,7 @@ MACHINE_RESET_MEMBER(decocass_type1_state,clocknchj) /* 11 */
* - Pro Tennis
*
***************************************************************************/
-READ8_MEMBER(decocass_type2_state::decocass_type2_r)
+uint8_t decocass_type2_state::decocass_type2_r(offs_t offset)
{
uint8_t data;
@@ -537,7 +537,7 @@ READ8_MEMBER(decocass_type2_state::decocass_type2_r)
return data;
}
-WRITE8_MEMBER(decocass_type2_state::decocass_type2_w)
+void decocass_type2_state::decocass_type2_w(offs_t offset, uint8_t data)
{
if (1 == m_type2_xx_latch)
{
@@ -590,7 +590,7 @@ WRITE8_MEMBER(decocass_type2_state::decocass_type2_w)
* - Fighting Ice Hockey
*
***************************************************************************/
-READ8_MEMBER(decocass_type3_state::decocass_type3_r)
+uint8_t decocass_type3_state::decocass_type3_r(offs_t offset)
{
uint8_t data, save;
@@ -788,7 +788,7 @@ READ8_MEMBER(decocass_type3_state::decocass_type3_r)
return data;
}
-WRITE8_MEMBER(decocass_type3_state::decocass_type3_w)
+void decocass_type3_state::decocass_type3_w(offs_t offset, uint8_t data)
{
if (1 == (offset & 1))
{
@@ -828,7 +828,7 @@ WRITE8_MEMBER(decocass_type3_state::decocass_type3_w)
*
***************************************************************************/
-READ8_MEMBER(decocass_type4_state::decocass_type4_r)
+uint8_t decocass_type4_state::decocass_type4_r(offs_t offset)
{
uint8_t data;
@@ -873,7 +873,7 @@ READ8_MEMBER(decocass_type4_state::decocass_type4_r)
return data;
}
-WRITE8_MEMBER(decocass_type4_state::decocass_type4_w)
+void decocass_type4_state::decocass_type4_w(offs_t offset, uint8_t data)
{
if (1 == (offset & 1))
{
@@ -911,7 +911,7 @@ WRITE8_MEMBER(decocass_type4_state::decocass_type4_w)
*
***************************************************************************/
-READ8_MEMBER(decocass_type5_state::decocass_type5_r)
+uint8_t decocass_type5_state::decocass_type5_r(offs_t offset)
{
uint8_t data;
@@ -953,7 +953,7 @@ READ8_MEMBER(decocass_type5_state::decocass_type5_r)
return data;
}
-WRITE8_MEMBER(decocass_type5_state::decocass_type5_w)
+void decocass_type5_state::decocass_type5_w(offs_t offset, uint8_t data)
{
if (1 == (offset & 1))
{
@@ -987,7 +987,7 @@ WRITE8_MEMBER(decocass_type5_state::decocass_type5_w)
*
***************************************************************************/
-READ8_MEMBER(decocass_nodong_state::decocass_nodong_r)
+uint8_t decocass_nodong_state::decocass_nodong_r(offs_t offset)
{
uint8_t data;
@@ -1029,7 +1029,7 @@ READ8_MEMBER(decocass_nodong_state::decocass_nodong_r)
*
***************************************************************************/
-READ8_MEMBER(decocass_widel_state::decocass_widel_r)
+uint8_t decocass_widel_state::decocass_widel_r(offs_t offset)
{
uint8_t data;
@@ -1078,7 +1078,7 @@ READ8_MEMBER(decocass_widel_state::decocass_widel_r)
return data;
}
-WRITE8_MEMBER(decocass_widel_state::decocass_widel_w)
+void decocass_widel_state::decocass_widel_w(offs_t offset, uint8_t data)
{
if (1 == (offset & 1))
{
@@ -1117,7 +1117,7 @@ WRITE8_MEMBER(decocass_widel_state::decocass_widel_w)
*
***************************************************************************/
-READ8_MEMBER(decocass_state::decocass_e5xx_r)
+uint8_t decocass_state::decocass_e5xx_r(offs_t offset)
{
uint8_t data;
@@ -1152,18 +1152,18 @@ READ8_MEMBER(decocass_state::decocass_e5xx_r)
else
{
if (!m_dongle_r.isnull())
- data = m_dongle_r(space, offset, mem_mask);
+ data = m_dongle_r(offset);
else
data = 0xff;
}
return data;
}
-WRITE8_MEMBER(decocass_state::decocass_e5xx_w)
+void decocass_state::decocass_e5xx_w(offs_t offset, uint8_t data)
{
if (!m_dongle_w.isnull())
{
- m_dongle_w(space, offset, data, mem_mask);
+ m_dongle_w(offset, data);
return;
}
@@ -1193,7 +1193,7 @@ WRITE8_MEMBER(decocass_state::decocass_e5xx_w)
*
***************************************************************************/
-WRITE8_MEMBER(decocass_state::decocass_e900_w)
+void decocass_state::decocass_e900_w(uint8_t data)
{
m_de0091_enable = data & 3;
@@ -1203,11 +1203,11 @@ WRITE8_MEMBER(decocass_state::decocass_e900_w)
membank("bank1")->set_entry(data & 3);
}
-WRITE8_MEMBER(decocass_state::decocass_de0091_w)
+void decocass_state::decocass_de0091_w(offs_t offset, uint8_t data)
{
/* don't allow writes to the ROMs - actually cexplore requires us to allow them */
//if (!m_de0091_enable)
- decocass_charram_w(space, offset, data);
+ decocass_charram_w(offset, data);
}
/***************************************************************************
@@ -1251,8 +1251,8 @@ void decocass_state::machine_reset()
m_firsttime = 1;
m_latch1 = 0;
- m_dongle_r = read8_delegate(*this);
- m_dongle_w = write8_delegate(*this);
+ m_dongle_r = read8sm_delegate(*this);
+ m_dongle_w = write8sm_delegate(*this);
m_decocass_reset = 0;
m_i8041_p1 = 0xff;
@@ -1292,7 +1292,7 @@ void decocass_type1_state::machine_reset()
{
decocass_state::machine_reset();
- m_dongle_r = read8_delegate(*this, FUNC(decocass_type1_state::decocass_type1_r));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_type1_state::decocass_type1_r));
m_type1_inmap = MAKE_MAP(0,1,2,3,4,5,6,7);
m_type1_outmap = MAKE_MAP(0,1,2,3,4,5,6,7);
}
@@ -1309,8 +1309,8 @@ void decocass_type2_state::machine_reset()
decocass_state::machine_reset();
LOG(0,("dongle type #2 (CS82-007)\n"));
- m_dongle_r = read8_delegate(*this, FUNC(decocass_type2_state::decocass_type2_r));
- m_dongle_w = write8_delegate(*this, FUNC(decocass_type2_state::decocass_type2_w));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_type2_state::decocass_type2_r));
+ m_dongle_w = write8sm_delegate(*this, FUNC(decocass_type2_state::decocass_type2_w));
m_type2_d2_latch = 0;
m_type2_xx_latch = 0;
@@ -1329,8 +1329,8 @@ void decocass_type3_state::machine_reset()
{
decocass_state::machine_reset();
- m_dongle_r = read8_delegate(*this, FUNC(decocass_type3_state::decocass_type3_r));
- m_dongle_w = write8_delegate(*this, FUNC(decocass_type3_state::decocass_type3_w));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_type3_state::decocass_type3_r));
+ m_dongle_w = write8sm_delegate(*this, FUNC(decocass_type3_state::decocass_type3_w));
m_type3_ctrs = 0;
m_type3_d0_latch = 0;
@@ -1349,8 +1349,8 @@ void decocass_type4_state::machine_reset()
decocass_state::machine_reset();
LOG(0,("dongle type #4 (32K ROM)\n"));
- m_dongle_r = read8_delegate(*this, FUNC(decocass_type4_state::decocass_type4_r));
- m_dongle_w = write8_delegate(*this, FUNC(decocass_type4_state::decocass_type4_w));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_type4_state::decocass_type4_r));
+ m_dongle_w = write8sm_delegate(*this, FUNC(decocass_type4_state::decocass_type4_w));
m_type4_ctrs = 0;
m_type4_latch = 0;
@@ -1366,8 +1366,8 @@ void decocass_type5_state::machine_reset()
decocass_state::machine_reset();
LOG(0,("dongle type #5 (NOP)\n"));
- m_dongle_r = read8_delegate(*this, FUNC(decocass_type5_state::decocass_type5_r));
- m_dongle_w = write8_delegate(*this, FUNC(decocass_type5_state::decocass_type5_w));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_type5_state::decocass_type5_r));
+ m_dongle_w = write8sm_delegate(*this, FUNC(decocass_type5_state::decocass_type5_w));
m_type5_latch = 0;
}
@@ -1376,7 +1376,7 @@ void decocass_nodong_state::machine_reset()
{
decocass_state::machine_reset();
LOG(0, ("no dongle\n"));
- m_dongle_r = read8_delegate(*this, FUNC(decocass_nodong_state::decocass_nodong_r));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_nodong_state::decocass_nodong_r));
}
MACHINE_RESET_MEMBER(decocass_type1_state,ctsttape)
@@ -1622,8 +1622,8 @@ void decocass_widel_state::machine_reset()
{
decocass_state::machine_reset();
LOG(0,("Deco Multigame Dongle\n"));
- m_dongle_r = read8_delegate(*this, FUNC(decocass_widel_state::decocass_widel_r));
- m_dongle_w = write8_delegate(*this, FUNC(decocass_widel_state::decocass_widel_w));
+ m_dongle_r = read8sm_delegate(*this, FUNC(decocass_widel_state::decocass_widel_r));
+ m_dongle_w = write8sm_delegate(*this, FUNC(decocass_widel_state::decocass_widel_w));
m_widel_ctrs = 0;
m_widel_latch = 0;
diff --git a/src/mame/machine/dgn_beta.cpp b/src/mame/machine/dgn_beta.cpp
index 7b85873b59b..7412954bb45 100644
--- a/src/mame/machine/dgn_beta.cpp
+++ b/src/mame/machine/dgn_beta.cpp
@@ -95,7 +95,7 @@
// Info for bank switcher
struct bank_info_entry
{
- void (dgn_beta_state::*func)(address_space &, offs_t, u8, u8); // pointer to write handler
+ void (dgn_beta_state::*func)(offs_t, u8); // pointer to write handler
char const *name; // write handler name
offs_t start; // offset of start of block
offs_t end; // offset of end of block
@@ -180,7 +180,7 @@ void dgn_beta_state::UpdateBanks(int first, int last)
readbank = &m_ram->pointer()[(MapPage*RamPageSize)-256];
logerror("Error RAM in Last page !\n");
}
- write8_delegate func(*this, bank_info[Page].func, bank_info[Page].name);
+ write8sm_delegate func(*this, bank_info[Page].func, bank_info[Page].name);
space_0.install_write_handler(bank_start, bank_end, func);
space_1.install_write_handler(bank_start, bank_end, func);
}
@@ -249,7 +249,7 @@ void dgn_beta_state::SetDefaultTask()
}
// Return the value of a page register
-READ8_MEMBER(dgn_beta_state::dgn_beta_page_r)
+uint8_t dgn_beta_state::dgn_beta_page_r(offs_t offset)
{
return m_PageRegs[m_PIATaskReg][offset].value;
}
@@ -258,7 +258,7 @@ READ8_MEMBER(dgn_beta_state::dgn_beta_page_r)
// if memory banking is active, if it is, it calls UpdateBanks, to actually
// setup the mappings.
-WRITE8_MEMBER(dgn_beta_state::dgn_beta_page_w )
+void dgn_beta_state::dgn_beta_page_w(offs_t offset, uint8_t data)
{
m_PageRegs[m_PIATaskReg][offset].value=data;
@@ -279,87 +279,87 @@ void dgn_beta_state::dgn_beta_bank_memory(int offset, int data, int bank)
m_PageRegs[m_TaskReg][bank].memory[offset]=data;
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b0_w )
+void dgn_beta_state::dgnbeta_ram_b0_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,0);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b1_w )
+void dgn_beta_state::dgnbeta_ram_b1_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,1);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b2_w )
+void dgn_beta_state::dgnbeta_ram_b2_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,2);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b3_w )
+void dgn_beta_state::dgnbeta_ram_b3_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,3);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b4_w )
+void dgn_beta_state::dgnbeta_ram_b4_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,4);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b5_w )
+void dgn_beta_state::dgnbeta_ram_b5_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,5);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b6_w )
+void dgn_beta_state::dgnbeta_ram_b6_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,6);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b7_w )
+void dgn_beta_state::dgnbeta_ram_b7_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,7);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b8_w )
+void dgn_beta_state::dgnbeta_ram_b8_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,8);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_b9_w )
+void dgn_beta_state::dgnbeta_ram_b9_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,9);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bA_w )
+void dgn_beta_state::dgnbeta_ram_bA_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,10);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bB_w )
+void dgn_beta_state::dgnbeta_ram_bB_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,11);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bC_w )
+void dgn_beta_state::dgnbeta_ram_bC_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,12);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bD_w )
+void dgn_beta_state::dgnbeta_ram_bD_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,13);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bE_w )
+void dgn_beta_state::dgnbeta_ram_bE_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,14);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bF_w )
+void dgn_beta_state::dgnbeta_ram_bF_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,15);
}
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_ram_bG_w )
+void dgn_beta_state::dgnbeta_ram_bG_w(offs_t offset, uint8_t data)
{
dgn_beta_bank_memory(offset,data,16);
}
@@ -812,12 +812,12 @@ WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_drq_w )
cpu1_recalc_firq(state);
}
-READ8_MEMBER( dgn_beta_state::dgnbeta_wd2797_r )
+uint8_t dgn_beta_state::dgnbeta_wd2797_r(offs_t offset)
{
return m_fdc->read(offset & 0x03);
}
-WRITE8_MEMBER( dgn_beta_state::dgnbeta_wd2797_w )
+void dgn_beta_state::dgnbeta_wd2797_w(offs_t offset, uint8_t data)
{
m_wd2797_written = 1;
m_fdc->write(offset & 0x03, data);
diff --git a/src/mame/machine/docastle.cpp b/src/mame/machine/docastle.cpp
index 977419a32d5..b7126d1f80f 100644
--- a/src/mame/machine/docastle.cpp
+++ b/src/mame/machine/docastle.cpp
@@ -33,7 +33,7 @@ if it was a small shared buffer. The order of operations is:
bytes and write its own 9 bytes
4) resume execution of CPU 0.
*/
-READ8_MEMBER(docastle_state::docastle_shared0_r)
+uint8_t docastle_state::docastle_shared0_r(offs_t offset)
{
if (offset == 8 && LOG)
logerror("CPU #0 shared0r clock = %d\n", (uint32_t)m_maincpu->total_cycles());
@@ -42,7 +42,7 @@ READ8_MEMBER(docastle_state::docastle_shared0_r)
}
-READ8_MEMBER(docastle_state::docastle_shared1_r)
+uint8_t docastle_state::docastle_shared1_r(offs_t offset)
{
if (offset == 8 && LOG)
logerror("CPU #1 shared1r clock = %d\n", (uint32_t)m_slave->total_cycles());
@@ -51,7 +51,7 @@ READ8_MEMBER(docastle_state::docastle_shared1_r)
}
-WRITE8_MEMBER(docastle_state::docastle_shared0_w)
+void docastle_state::docastle_shared0_w(offs_t offset, uint8_t data)
{
if (offset == 8 && LOG)
logerror("CPU #1 shared0w %02x %02x %02x %02x %02x %02x %02x %02x %02x clock = %d\n",
@@ -67,7 +67,7 @@ WRITE8_MEMBER(docastle_state::docastle_shared0_w)
}
-WRITE8_MEMBER(docastle_state::docastle_shared1_w)
+void docastle_state::docastle_shared1_w(offs_t offset, uint8_t data)
{
m_buffer1[offset] = data;
@@ -84,7 +84,7 @@ WRITE8_MEMBER(docastle_state::docastle_shared1_w)
-WRITE8_MEMBER(docastle_state::docastle_nmitrigger_w)
+void docastle_state::docastle_nmitrigger_w(uint8_t data)
{
m_slave->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp
index 5c582fc92d9..13e7fcee3a5 100644
--- a/src/mame/machine/docg3.cpp
+++ b/src/mame/machine/docg3.cpp
@@ -103,7 +103,7 @@ uint8_t diskonchip_g3_device::g3_read_data()
return data;
}
-READ16_MEMBER( diskonchip_g3_device::sec_1_r )
+uint16_t diskonchip_g3_device::sec_1_r(offs_t offset)
{
uint16_t data;
if (m_sec_2[0x1B] & 0x40)
@@ -142,7 +142,7 @@ void diskonchip_g3_device::g3_write_data(uint8_t data)
m_transfer_offset++;
}
-WRITE16_MEMBER( diskonchip_g3_device::sec_1_w )
+void diskonchip_g3_device::sec_1_w(offs_t offset, uint16_t data)
{
verboselog(*this, 9, "(DOC) %08X <- %04X\n", 0x0800 + (offset << 1), data);
if (m_sec_2[0x1B] & 0x40)
@@ -691,7 +691,7 @@ void diskonchip_g3_device::sec_2_write8(uint32_t offset, uint8_t data)
}
}
-READ16_MEMBER( diskonchip_g3_device::sec_2_r )
+uint16_t diskonchip_g3_device::sec_2_r(offs_t offset, uint16_t mem_mask)
{
if (mem_mask == 0xffff)
{
@@ -712,7 +712,7 @@ READ16_MEMBER( diskonchip_g3_device::sec_2_r )
}
}
-WRITE16_MEMBER( diskonchip_g3_device::sec_2_w )
+void diskonchip_g3_device::sec_2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (mem_mask == 0xffff)
{
@@ -732,14 +732,14 @@ WRITE16_MEMBER( diskonchip_g3_device::sec_2_w )
}
}
-READ16_MEMBER( diskonchip_g3_device::sec_3_r )
+uint16_t diskonchip_g3_device::sec_3_r(offs_t offset)
{
uint16_t data = 0;
verboselog(*this, 9, "(DOC) %08X -> %04X\n", 0x1800 + (offset << 1), data);
return data;
}
-WRITE16_MEMBER( diskonchip_g3_device::sec_3_w )
+void diskonchip_g3_device::sec_3_w(offs_t offset, uint16_t data)
{
verboselog(*this, 9, "(DOC) %08X <- %02X\n", 0x1800 + (offset << 1), data);
}
diff --git a/src/mame/machine/docg3.h b/src/mame/machine/docg3.h
index a05659884b9..fa0f8033587 100644
--- a/src/mame/machine/docg3.h
+++ b/src/mame/machine/docg3.h
@@ -32,12 +32,12 @@ protected:
virtual void nvram_read(emu_file &file) override;
virtual void nvram_write(emu_file &file) override;
public:
- DECLARE_READ16_MEMBER( sec_1_r );
- DECLARE_WRITE16_MEMBER( sec_1_w );
- DECLARE_READ16_MEMBER( sec_2_r );
- DECLARE_WRITE16_MEMBER( sec_2_w );
- DECLARE_READ16_MEMBER( sec_3_r );
- DECLARE_WRITE16_MEMBER( sec_3_w );
+ uint16_t sec_1_r(offs_t offset);
+ void sec_1_w(offs_t offset, uint16_t data);
+ uint16_t sec_2_r(offs_t offset, uint16_t mem_mask = ~0);
+ void sec_2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t sec_3_r(offs_t offset);
+ void sec_3_w(offs_t offset, uint16_t data);
private:
uint32_t g3_offset_data_1();
uint32_t g3_offset_data_2();
diff --git a/src/mame/video/cabal.cpp b/src/mame/video/cabal.cpp
index bc013275509..c1b34569689 100644
--- a/src/mame/video/cabal.cpp
+++ b/src/mame/video/cabal.cpp
@@ -50,7 +50,7 @@ void cabal_state::video_start()
/**************************************************************************/
-WRITE16_MEMBER(cabal_state::flipscreen_w)
+void cabal_state::flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -62,13 +62,13 @@ WRITE16_MEMBER(cabal_state::flipscreen_w)
}
}
-WRITE16_MEMBER(cabal_state::background_videoram_w)
+void cabal_state::background_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram[offset]);
m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(cabal_state::text_videoram_w)
+void cabal_state::text_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_colorram[offset]);
m_text_layer->mark_tile_dirty(offset);
diff --git a/src/mame/video/calomega.cpp b/src/mame/video/calomega.cpp
index 34be7e21893..0395ef70eab 100644
--- a/src/mame/video/calomega.cpp
+++ b/src/mame/video/calomega.cpp
@@ -19,13 +19,13 @@
#include "includes/calomega.h"
-WRITE8_MEMBER(calomega_state::calomega_videoram_w)
+void calomega_state::calomega_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(calomega_state::calomega_colorram_w)
+void calomega_state::calomega_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/canyon.cpp b/src/mame/video/canyon.cpp
index 7e22b311ebe..a5ac16e9d64 100644
--- a/src/mame/video/canyon.cpp
+++ b/src/mame/video/canyon.cpp
@@ -10,7 +10,7 @@ Atari Canyon Bomber video emulation
#include "includes/canyon.h"
-WRITE8_MEMBER(canyon_state::canyon_videoram_w)
+void canyon_state::canyon_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/capbowl.cpp b/src/mame/video/capbowl.cpp
index 86153598849..f39ea193571 100644
--- a/src/mame/video/capbowl.cpp
+++ b/src/mame/video/capbowl.cpp
@@ -17,7 +17,7 @@
*
*************************************/
-WRITE8_MEMBER(capbowl_state::tms34061_w)
+void capbowl_state::tms34061_w(offs_t offset, uint8_t data)
{
int func = (offset >> 8) & 3;
int col = offset & 0xff;
@@ -32,7 +32,7 @@ WRITE8_MEMBER(capbowl_state::tms34061_w)
}
-READ8_MEMBER(capbowl_state::tms34061_r)
+uint8_t capbowl_state::tms34061_r(offs_t offset)
{
int func = (offset >> 8) & 3;
int col = offset & 0xff;
@@ -54,7 +54,7 @@ READ8_MEMBER(capbowl_state::tms34061_r)
*
*************************************/
-WRITE8_MEMBER(capbowl_state::bowlrama_blitter_w)
+void capbowl_state::bowlrama_blitter_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -77,7 +77,7 @@ WRITE8_MEMBER(capbowl_state::bowlrama_blitter_w)
}
-READ8_MEMBER(capbowl_state::bowlrama_blitter_r)
+uint8_t capbowl_state::bowlrama_blitter_r(offs_t offset)
{
uint8_t data = memregion("gfx1")->base()[m_blitter_addr];
uint8_t result = 0;
diff --git a/src/mame/video/cbasebal.cpp b/src/mame/video/cbasebal.cpp
index aa370ac3de7..df91ad74b1f 100644
--- a/src/mame/video/cbasebal.cpp
+++ b/src/mame/video/cbasebal.cpp
@@ -58,29 +58,29 @@ void cbasebal_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(cbasebal_state::cbasebal_textram_w)
+void cbasebal_state::cbasebal_textram_w(offs_t offset, uint8_t data)
{
m_textram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-READ8_MEMBER(cbasebal_state::cbasebal_textram_r)
+uint8_t cbasebal_state::cbasebal_textram_r(offs_t offset)
{
return m_textram[offset];
}
-WRITE8_MEMBER(cbasebal_state::cbasebal_scrollram_w)
+void cbasebal_state::cbasebal_scrollram_w(offs_t offset, uint8_t data)
{
m_scrollram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_MEMBER(cbasebal_state::cbasebal_scrollram_r)
+uint8_t cbasebal_state::cbasebal_scrollram_r(offs_t offset)
{
return m_scrollram[offset];
}
-WRITE8_MEMBER(cbasebal_state::cbasebal_gfxctrl_w)
+void cbasebal_state::cbasebal_gfxctrl_w(uint8_t data)
{
/* bit 0 is unknown - toggles continuously */
@@ -110,13 +110,13 @@ WRITE8_MEMBER(cbasebal_state::cbasebal_gfxctrl_w)
/* other bits unknown, but used */
}
-WRITE8_MEMBER(cbasebal_state::cbasebal_scrollx_w)
+void cbasebal_state::cbasebal_scrollx_w(offs_t offset, uint8_t data)
{
m_scroll_x[offset] = data;
m_bg_tilemap->set_scrollx(0, m_scroll_x[0] + 256 * m_scroll_x[1]);
}
-WRITE8_MEMBER(cbasebal_state::cbasebal_scrolly_w)
+void cbasebal_state::cbasebal_scrolly_w(offs_t offset, uint8_t data)
{
m_scroll_y[offset] = data;
m_bg_tilemap->set_scrolly(0, m_scroll_y[0] + 256 * m_scroll_y[1]);
diff --git a/src/mame/video/ccastles.cpp b/src/mame/video/ccastles.cpp
index 79571327ddd..175f7f694d0 100644
--- a/src/mame/video/ccastles.cpp
+++ b/src/mame/video/ccastles.cpp
@@ -49,20 +49,20 @@ void ccastles_state::video_start()
*
*************************************/
-WRITE8_MEMBER(ccastles_state::ccastles_hscroll_w)
+void ccastles_state::ccastles_hscroll_w(uint8_t data)
{
m_screen->update_partial(m_screen->vpos());
m_hscroll = data;
}
-WRITE8_MEMBER(ccastles_state::ccastles_vscroll_w)
+void ccastles_state::ccastles_vscroll_w(uint8_t data)
{
m_vscroll = data;
}
-WRITE8_MEMBER(ccastles_state::ccastles_video_control_w)
+void ccastles_state::ccastles_video_control_w(offs_t offset, uint8_t data)
{
/* only D3 matters */
m_outlatch[1]->write_bit(offset, BIT(data, 3));
@@ -76,7 +76,7 @@ WRITE8_MEMBER(ccastles_state::ccastles_video_control_w)
*
*************************************/
-WRITE8_MEMBER(ccastles_state::ccastles_paletteram_w)
+void ccastles_state::ccastles_paletteram_w(offs_t offset, uint8_t data)
{
int bit0, bit1, bit2;
int r, g, b;
@@ -191,7 +191,7 @@ inline void ccastles_state::bitmode_autoinc( )
*
*************************************/
-WRITE8_MEMBER(ccastles_state::ccastles_videoram_w)
+void ccastles_state::ccastles_videoram_w(offs_t offset, uint8_t data)
{
/* direct writes to VRAM go through the write protect PROM as well */
ccastles_write_vram(offset, data, 0, 0);
@@ -205,7 +205,7 @@ WRITE8_MEMBER(ccastles_state::ccastles_videoram_w)
*
*************************************/
-READ8_MEMBER(ccastles_state::ccastles_bitmode_r)
+uint8_t ccastles_state::ccastles_bitmode_r()
{
/* in bitmode, the address comes from the autoincrement latches */
uint16_t addr = (m_bitmode_addr[1] << 7) | (m_bitmode_addr[0] >> 1);
@@ -221,7 +221,7 @@ READ8_MEMBER(ccastles_state::ccastles_bitmode_r)
}
-WRITE8_MEMBER(ccastles_state::ccastles_bitmode_w)
+void ccastles_state::ccastles_bitmode_w(uint8_t data)
{
/* in bitmode, the address comes from the autoincrement latches */
uint16_t addr = (m_bitmode_addr[1] << 7) | (m_bitmode_addr[0] >> 1);
@@ -237,7 +237,7 @@ WRITE8_MEMBER(ccastles_state::ccastles_bitmode_w)
}
-WRITE8_MEMBER(ccastles_state::ccastles_bitmode_addr_w)
+void ccastles_state::ccastles_bitmode_addr_w(offs_t offset, uint8_t data)
{
/* write through to video RAM and also to the addressing latches */
ccastles_write_vram(offset, data, 0, 0);
diff --git a/src/mame/video/cchasm.cpp b/src/mame/video/cchasm.cpp
index e515db965c8..8f91bee8cc0 100644
--- a/src/mame/video/cchasm.cpp
+++ b/src/mame/video/cchasm.cpp
@@ -109,7 +109,7 @@ void cchasm_state::refresh ()
}
-WRITE16_MEMBER(cchasm_state::refresh_control_w)
+void cchasm_state::refresh_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
diff --git a/src/mame/video/centiped.cpp b/src/mame/video/centiped.cpp
index afd67bf8fcd..6a772a440c1 100644
--- a/src/mame/video/centiped.cpp
+++ b/src/mame/video/centiped.cpp
@@ -134,11 +134,9 @@ VIDEO_START_MEMBER(centiped_state,bullsdrt)
*
*************************************/
-WRITE8_MEMBER(centiped_state::centiped_videoram_w)
+void centiped_state::centiped_videoram_w(offs_t offset, uint8_t data)
{
- uint8_t *videoram = m_videoram;
-
- videoram[offset] = data;
+ m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
@@ -163,7 +161,7 @@ WRITE_LINE_MEMBER(centiped_state::flip_screen_w)
*
*************************************/
-WRITE8_MEMBER(centiped_state::multiped_gfxbank_w)
+void centiped_state::multiped_gfxbank_w(uint8_t data)
{
// d0-d6: N/C?
// d7: gfx rom bank
@@ -176,14 +174,14 @@ WRITE8_MEMBER(centiped_state::multiped_gfxbank_w)
}
-WRITE8_MEMBER(centiped_state::bullsdrt_tilesbank_w)
+void centiped_state::bullsdrt_tilesbank_w(offs_t offset, uint8_t data)
{
m_bullsdrt_tiles_bankram[offset] = data;
m_bg_tilemap->mark_all_dirty();
}
-WRITE8_MEMBER(centiped_state::bullsdrt_sprites_bank_w)
+void centiped_state::bullsdrt_sprites_bank_w(uint8_t data)
{
m_bullsdrt_sprites_bank = data;
}
@@ -217,7 +215,7 @@ WRITE8_MEMBER(centiped_state::bullsdrt_sprites_bank_w)
***************************************************************************/
-WRITE8_MEMBER(centiped_state::centiped_paletteram_w)
+void centiped_state::centiped_paletteram_w(offs_t offset, uint8_t data)
{
m_paletteram[offset] = data;
@@ -398,7 +396,7 @@ void centiped_state::milliped_set_color(offs_t offset, uint8_t data)
}
-WRITE8_MEMBER(centiped_state::milliped_paletteram_w)
+void centiped_state::milliped_paletteram_w(offs_t offset, uint8_t data)
{
m_paletteram[offset] = data;
@@ -406,7 +404,7 @@ WRITE8_MEMBER(centiped_state::milliped_paletteram_w)
}
-WRITE8_MEMBER(centiped_state::mazeinv_paletteram_w)
+void centiped_state::mazeinv_paletteram_w(offs_t offset, uint8_t data)
{
m_paletteram[offset] = data;
diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp
index 4eb02ed07e8..4ce2acbd448 100644
--- a/src/mame/video/cgc7900.cpp
+++ b/src/mame/video/cgc7900.cpp
@@ -45,7 +45,7 @@ void cgc7900_state::cgc7900_palette(palette_device &palette) const
cgc7900_z_mode_r - Z mode read
-------------------------------------------------*/
-READ16_MEMBER( cgc7900_state::z_mode_r )
+u16 cgc7900_state::z_mode_r()
{
return 0;
}
@@ -54,7 +54,7 @@ READ16_MEMBER( cgc7900_state::z_mode_r )
cgc7900_z_mode_w - Z mode write
-------------------------------------------------*/
-WRITE16_MEMBER( cgc7900_state::z_mode_w )
+void cgc7900_state::z_mode_w(u16 data)
{
}
@@ -62,7 +62,7 @@ WRITE16_MEMBER( cgc7900_state::z_mode_w )
cgc7900_color_status_w - color status write
-------------------------------------------------*/
-WRITE16_MEMBER( cgc7900_state::color_status_w )
+void cgc7900_state::color_status_w(u16 data)
{
}
@@ -70,7 +70,7 @@ WRITE16_MEMBER( cgc7900_state::color_status_w )
cgc7900_sync_r - sync information read
-------------------------------------------------*/
-READ16_MEMBER( cgc7900_state::sync_r )
+u16 cgc7900_state::sync_r()
{
u16 data = 0xffff;
@@ -115,11 +115,11 @@ void cgc7900_state::update_clut()
{
for (int i = 0; i < 256; i++)
{
- uint16_t addr = i * 2;
- uint32_t data = (m_clut_ram[addr + 1] << 16) | m_clut_ram[addr];
- uint8_t b = data & 0xff;
- uint8_t g = (data >> 8) & 0xff;
- uint8_t r = (data >> 16) & 0xff;
+ u16 addr = i * 2;
+ u32 data = (m_clut_ram[addr + 1] << 16) | m_clut_ram[addr];
+ u8 b = data & 0xff;
+ u8 g = (data >> 8) & 0xff;
+ u8 r = (data >> 16) & 0xff;
m_clut[i] = rgb_t(r, g, b);
}
@@ -147,9 +147,9 @@ void cgc7900_state::draw_overlay(screen_device *screen, bitmap_rgb32 &bitmap)
for (int sx = 0; sx < 85; sx++)
{
- uint16_t addr = (sy * 170) + (sx * 2);
- uint32_t cell = (m_overlay_ram[addr] << 16) | m_overlay_ram[addr + 1];
- uint8_t data = m_char_rom->base()[(OVERLAY_DATA << 3) | line];
+ u16 addr = (sy * 170) + (sx * 2);
+ u32 cell = (m_overlay_ram[addr] << 16) | m_overlay_ram[addr + 1];
+ u8 data = m_char_rom->base()[(OVERLAY_DATA << 3) | line];
int fg = (cell >> 8) & 0x07;
int bg = (cell >> 16) & 0x07;
@@ -187,7 +187,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cgc7900_state::blink_tick)
m_blink = !m_blink;
}
-uint32_t cgc7900_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+u32 cgc7900_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
update_clut();
draw_bitmap(&screen, bitmap);
diff --git a/src/mame/video/chaknpop.cpp b/src/mame/video/chaknpop.cpp
index 83c7826674c..06905c73deb 100644
--- a/src/mame/video/chaknpop.cpp
+++ b/src/mame/video/chaknpop.cpp
@@ -66,12 +66,12 @@ void chaknpop_state::tx_tilemap_mark_all_dirty()
m_tx_tilemap->set_flip(m_flip_x | m_flip_y);
}
-READ8_MEMBER(chaknpop_state::gfxmode_r)
+uint8_t chaknpop_state::gfxmode_r()
{
return m_gfxmode;
}
-WRITE8_MEMBER(chaknpop_state::gfxmode_w)
+void chaknpop_state::gfxmode_w(uint8_t data)
{
if (m_gfxmode != data)
{
@@ -97,13 +97,13 @@ WRITE8_MEMBER(chaknpop_state::gfxmode_w)
}
}
-WRITE8_MEMBER(chaknpop_state::txram_w)
+void chaknpop_state::txram_w(offs_t offset, uint8_t data)
{
m_tx_ram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(chaknpop_state::attrram_w)
+void chaknpop_state::attrram_w(offs_t offset, uint8_t data)
{
if (m_attr_ram[offset] != data)
{
diff --git a/src/mame/video/champbas.cpp b/src/mame/video/champbas.cpp
index 21d1963200a..67df4e28aa7 100644
--- a/src/mame/video/champbas.cpp
+++ b/src/mame/video/champbas.cpp
@@ -175,7 +175,7 @@ void exctsccr_state::video_start()
*
*************************************/
-WRITE8_MEMBER(champbas_state::tilemap_w)
+void champbas_state::tilemap_w(offs_t offset, uint8_t data)
{
m_vram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
diff --git a/src/mame/video/changela.cpp b/src/mame/video/changela.cpp
index 4391174bde3..098359b15f4 100644
--- a/src/mame/video/changela.cpp
+++ b/src/mame/video/changela.cpp
@@ -728,12 +728,12 @@ uint32_t changela_state::screen_update_changela(screen_device &screen, bitmap_in
return 0;
}
-WRITE8_MEMBER(changela_state::changela_colors_w)
+void changela_state::changela_colors_w(offs_t offset, uint8_t data)
{
- /* Each color is combined from 3 bits from open-colelctor outputs of ram.
+ /* Each color is combined from 3 bits from open-collector outputs of ram.
Each of the bits is connected to a 220, 470, or 1000 Ohm resistor.
There is also a 680 Ohm pull-up resistor connected to 5V, and a
- 2.2k resisor connected to GND. Thus these output voltages are obtained:
+ 2.2k resistor connected to GND. Thus these output voltages are obtained:
Val | Vout
000 | 0.766 (220 || 470 || 1k || 2.2k)
001 | 0.855 (220 || 470 || 2.2k)
@@ -765,7 +765,7 @@ WRITE8_MEMBER(changela_state::changela_colors_w)
}
-WRITE8_MEMBER(changela_state::changela_mem_device_select_w)
+void changela_state::changela_mem_device_select_w(uint8_t data)
{
m_mem_dev_selected = (data & 0x07) * 0x800;
m_tree_en = (data & 0x30) >> 4;
@@ -781,7 +781,7 @@ WRITE8_MEMBER(changela_state::changela_mem_device_select_w)
*/
}
-WRITE8_MEMBER(changela_state::changela_mem_device_w)
+void changela_state::changela_mem_device_w(offs_t offset, uint8_t data)
{
m_memory_devices[m_mem_dev_selected + offset] = data;
@@ -793,18 +793,18 @@ WRITE8_MEMBER(changela_state::changela_mem_device_w)
}
-READ8_MEMBER(changela_state::changela_mem_device_r)
+uint8_t changela_state::changela_mem_device_r(offs_t offset)
{
return m_memory_devices[m_mem_dev_selected + offset];
}
-WRITE8_MEMBER(changela_state::changela_slope_rom_addr_hi_w)
+void changela_state::changela_slope_rom_addr_hi_w(uint8_t data)
{
m_slopeROM_bank = (data & 0x03) << 9;
}
-WRITE8_MEMBER(changela_state::changela_slope_rom_addr_lo_w)
+void changela_state::changela_slope_rom_addr_lo_w(uint8_t data)
{
m_horizon = data;
}
diff --git a/src/mame/video/cheekyms.cpp b/src/mame/video/cheekyms.cpp
index a35f1c399e0..ffbb90db6aa 100644
--- a/src/mame/video/cheekyms.cpp
+++ b/src/mame/video/cheekyms.cpp
@@ -40,7 +40,7 @@ void cheekyms_state::cheekyms_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(cheekyms_state::port_40_w)
+void cheekyms_state::port_40_w(uint8_t data)
{
m_sound_board->music_w(BIT(data, 7));
m_sound_board->cheese_w(BIT(data, 6));
@@ -52,7 +52,7 @@ WRITE8_MEMBER(cheekyms_state::port_40_w)
}
-WRITE8_MEMBER(cheekyms_state::port_80_w)
+void cheekyms_state::port_80_w(uint8_t data)
{
m_sound_board->coin_extra_w(BIT(data, 1));
m_sound_board->mute_w(BIT(data, 0));
diff --git a/src/mame/video/circusc.cpp b/src/mame/video/circusc.cpp
index da91cbea072..835e7b84f01 100644
--- a/src/mame/video/circusc.cpp
+++ b/src/mame/video/circusc.cpp
@@ -133,13 +133,13 @@ void circusc_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(circusc_state::circusc_videoram_w)
+void circusc_state::circusc_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(circusc_state::circusc_colorram_w)
+void circusc_state::circusc_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/cischeat.cpp b/src/mame/video/cischeat.cpp
index 633162ad2b0..6507535ad67 100644
--- a/src/mame/video/cischeat.cpp
+++ b/src/mame/video/cischeat.cpp
@@ -98,7 +98,7 @@ void wildplt_state::video_start()
m_spriteram = m_allocated_spriteram.get();
}
-WRITE16_MEMBER(wildplt_state::sprite_dma_w)
+void wildplt_state::sprite_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// bit 13: 0 -> 1 transition triggers a sprite DMA
if(data & 0x2000 && (m_sprite_dma_reg & 0x2000) == 0)
@@ -131,7 +131,7 @@ WRITE16_MEMBER(wildplt_state::sprite_dma_w)
Big Run
**************************************************************************/
-READ16_MEMBER(cischeat_state::bigrun_ip_select_r)
+uint16_t cischeat_state::bigrun_ip_select_r()
{
switch (m_ip_select & 0x3)
{
@@ -144,13 +144,13 @@ READ16_MEMBER(cischeat_state::bigrun_ip_select_r)
}
-WRITE16_MEMBER(cischeat_state::unknown_out_w)
+void cischeat_state::unknown_out_w(uint16_t data)
{
// ?? 91/1/91/1 ...
}
-WRITE16_MEMBER(cischeat_state::motor_out_w)
+void cischeat_state::motor_out_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// motor (seat?)
if (ACCESSING_BITS_0_7)
@@ -159,26 +159,26 @@ WRITE16_MEMBER(cischeat_state::motor_out_w)
}
-WRITE16_MEMBER(cischeat_state::wheel_out_w)
+void cischeat_state::wheel_out_w(uint16_t data)
{
// motor (wheel?)
}
-WRITE16_MEMBER(cischeat_state::ip_select_w)
+void cischeat_state::ip_select_w(uint16_t data)
{
m_ip_select = data;
}
-WRITE16_MEMBER(cischeat_state::ip_select_plus1_w)
+void cischeat_state::ip_select_plus1_w(uint16_t data)
{
// value above + 1
m_ip_select = data + 1;
}
-WRITE16_MEMBER(cischeat_state::bigrun_comms_w)
+void cischeat_state::bigrun_comms_w(uint16_t data)
{
/* Not sure about this one.. */
m_cpu2->set_input_line(INPUT_LINE_RESET, (data & 2) ? ASSERT_LINE : CLEAR_LINE);
@@ -187,7 +187,7 @@ WRITE16_MEMBER(cischeat_state::bigrun_comms_w)
}
// TODO: fake port, never written to my knowledge!
-WRITE16_MEMBER(cischeat_state::active_layers_w)
+void cischeat_state::active_layers_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_active_layers);
}
@@ -197,7 +197,7 @@ WRITE16_MEMBER(cischeat_state::active_layers_w)
Cisco Heat
**************************************************************************/
-READ16_MEMBER(cischeat_state::cischeat_ip_select_r)
+uint16_t cischeat_state::cischeat_ip_select_r()
{
switch (m_ip_select & 0x3)
{
@@ -209,7 +209,7 @@ READ16_MEMBER(cischeat_state::cischeat_ip_select_r)
}
-WRITE16_MEMBER(cischeat_state::cischeat_soundlatch_w)
+void cischeat_state::cischeat_soundlatch_w(uint16_t data)
{
/* Sound CPU: reads latch during int 4, and stores command */
m_soundlatch->write(data);
@@ -217,7 +217,7 @@ WRITE16_MEMBER(cischeat_state::cischeat_soundlatch_w)
}
-WRITE16_MEMBER(cischeat_state::cischeat_comms_w)
+void cischeat_state::cischeat_comms_w(uint16_t data)
{
/* Not sure about this one.. */
m_cpu2->set_input_line(INPUT_LINE_RESET, (data & 2) ? ASSERT_LINE : CLEAR_LINE);
@@ -231,13 +231,13 @@ WRITE16_MEMBER(cischeat_state::cischeat_comms_w)
F1 GrandPrix Star
**************************************************************************/
-READ16_MEMBER(cischeat_state::f1gpstar_wheel_r)
+uint16_t cischeat_state::f1gpstar_wheel_r()
{
return (ioport("PEDAL")->read() & 0xff) + ((ioport("IN5")->read() & 0xff)<<8);
}
-READ16_MEMBER(cischeat_state::f1gpstr2_ioready_r)
+uint16_t cischeat_state::f1gpstr2_ioready_r()
{
return (m_f1gpstr2_ioready[0]&1) ? 0xff : 0xf0;
}
@@ -248,7 +248,7 @@ READ16_MEMBER(cischeat_state::f1gpstr2_ioready_r)
**************************************************************************/
-WRITE16_MEMBER(cischeat_state::f1gpstar_motor_w)
+void cischeat_state::f1gpstar_motor_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// "shudder" motors, leds
if (ACCESSING_BITS_0_7)
@@ -263,14 +263,14 @@ WRITE16_MEMBER(cischeat_state::f1gpstar_motor_w)
}
-WRITE16_MEMBER(cischeat_state::f1gpstar_soundint_w)
+void cischeat_state::f1gpstar_soundint_w(uint16_t data)
{
/* $80008 and $80018 usually written in sequence, but not always */
m_soundcpu->set_input_line(4, HOLD_LINE);
}
-WRITE16_MEMBER(cischeat_state::f1gpstar_comms_w)
+void cischeat_state::f1gpstar_comms_w(uint16_t data)
{
/* Not sure about this one. Values: $10 then 0, $7 then 0 */
m_cpu2->set_input_line(INPUT_LINE_RESET, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
@@ -279,7 +279,7 @@ WRITE16_MEMBER(cischeat_state::f1gpstar_comms_w)
}
-WRITE16_MEMBER(cischeat_state::f1gpstr2_io_w)
+void cischeat_state::f1gpstr2_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -999,8 +999,8 @@ if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed
popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%02X",
m_scudhamm_motor_command,
- scudhamm_motor_pos_r(space,0,0xffff),
- scudhamm_motor_status_r(space,0,0xffff),
+ scudhamm_motor_pos_r(),
+ scudhamm_motor_status_r(),
scudhamm_analog_r() );
#if 0
diff --git a/src/mame/video/citycon.cpp b/src/mame/video/citycon.cpp
index da4f67d466e..14955208533 100644
--- a/src/mame/video/citycon.cpp
+++ b/src/mame/video/citycon.cpp
@@ -67,20 +67,20 @@ void citycon_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(citycon_state::citycon_videoram_w)
+void citycon_state::citycon_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(citycon_state::citycon_linecolor_w)
+void citycon_state::citycon_linecolor_w(offs_t offset, uint8_t data)
{
m_linecolor[offset] = data;
}
-WRITE8_MEMBER(citycon_state::citycon_background_w)
+void citycon_state::citycon_background_w(uint8_t data)
{
/* bits 4-7 control the background image */
if (m_bg_image != (data >> 4))
diff --git a/src/mame/video/cloak.cpp b/src/mame/video/cloak.cpp
index a793c375c44..92208ef7ac4 100644
--- a/src/mame/video/cloak.cpp
+++ b/src/mame/video/cloak.cpp
@@ -40,7 +40,7 @@
***************************************************************************/
-WRITE8_MEMBER(cloak_state::cloak_paletteram_w)
+void cloak_state::cloak_paletteram_w(offs_t offset, uint8_t data)
{
m_palette_ram[offset & 0x3f] = ((offset & 0x40) << 2) | data;
set_pen(offset & 0x3f);
@@ -90,7 +90,7 @@ void cloak_state::set_current_bitmap_videoram_pointer()
m_current_bitmap_videoram_displayed = m_bitmap_videoram_selected ? m_bitmap_videoram2.get() : m_bitmap_videoram1.get();
}
-WRITE8_MEMBER(cloak_state::cloak_clearbmp_w)
+void cloak_state::cloak_clearbmp_w(uint8_t data)
{
// m_screen->update_now();
m_screen->update_partial(m_screen->vpos());
@@ -115,7 +115,7 @@ void cloak_state::adjust_xy(int offset)
}
}
-READ8_MEMBER(cloak_state::graph_processor_r)
+uint8_t cloak_state::graph_processor_r(offs_t offset)
{
uint8_t ret = m_current_bitmap_videoram_displayed[(m_bitmap_videoram_address_y << 8) | m_bitmap_videoram_address_x];
@@ -124,7 +124,7 @@ READ8_MEMBER(cloak_state::graph_processor_r)
return ret;
}
-WRITE8_MEMBER(cloak_state::graph_processor_w)
+void cloak_state::graph_processor_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -138,11 +138,9 @@ WRITE8_MEMBER(cloak_state::graph_processor_w)
}
}
-WRITE8_MEMBER(cloak_state::cloak_videoram_w)
+void cloak_state::cloak_videoram_w(offs_t offset, uint8_t data)
{
- uint8_t *videoram = m_videoram;
-
- videoram[offset] = data;
+ m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/cloud9.cpp b/src/mame/video/cloud9.cpp
index f126bf98acb..c3debb52445 100644
--- a/src/mame/video/cloud9.cpp
+++ b/src/mame/video/cloud9.cpp
@@ -52,7 +52,7 @@ void cloud9_state::video_start()
*
*************************************/
-WRITE8_MEMBER(cloud9_state::cloud9_paletteram_w)
+void cloud9_state::cloud9_paletteram_w(offs_t offset, uint8_t data)
{
int bit0, bit1, bit2;
int r, g, b;
@@ -160,7 +160,7 @@ inline void cloud9_state::bitmode_autoinc( )
*
*************************************/
-WRITE8_MEMBER(cloud9_state::cloud9_videoram_w)
+void cloud9_state::cloud9_videoram_w(offs_t offset, uint8_t data)
{
/* direct writes to VRAM go through the write protect PROM as well */
cloud9_write_vram(offset, data, 0, 0);
@@ -174,7 +174,7 @@ WRITE8_MEMBER(cloud9_state::cloud9_videoram_w)
*
*************************************/
-READ8_MEMBER(cloud9_state::cloud9_bitmode_r)
+uint8_t cloud9_state::cloud9_bitmode_r()
{
/* in bitmode, the address comes from the autoincrement latches */
uint16_t addr = (m_bitmode_addr[1] << 6) | (m_bitmode_addr[0] >> 2);
@@ -190,7 +190,7 @@ READ8_MEMBER(cloud9_state::cloud9_bitmode_r)
}
-WRITE8_MEMBER(cloud9_state::cloud9_bitmode_w)
+void cloud9_state::cloud9_bitmode_w(uint8_t data)
{
/* in bitmode, the address comes from the autoincrement latches */
uint16_t addr = (m_bitmode_addr[1] << 6) | (m_bitmode_addr[0] >> 2);
@@ -206,7 +206,7 @@ WRITE8_MEMBER(cloud9_state::cloud9_bitmode_w)
}
-WRITE8_MEMBER(cloud9_state::cloud9_bitmode_addr_w)
+void cloud9_state::cloud9_bitmode_addr_w(offs_t offset, uint8_t data)
{
/* write through to video RAM and also to the addressing latches */
cloud9_write_vram(offset, data, 0, 0);
diff --git a/src/mame/video/clshroad.cpp b/src/mame/video/clshroad.cpp
index 822f871a012..3a42a03373a 100644
--- a/src/mame/video/clshroad.cpp
+++ b/src/mame/video/clshroad.cpp
@@ -127,7 +127,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0b)
0);
}
-WRITE8_MEMBER(clshroad_state::vram_0_w)
+void clshroad_state::vram_0_w(offs_t offset, uint8_t data)
{
int tile_index = offset / 2;
int tile = (tile_index & 0x1f) + (tile_index & ~0x3f)/2;
@@ -192,7 +192,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_1)
0);
}
-WRITE8_MEMBER(clshroad_state::vram_1_w)
+void clshroad_state::vram_1_w(offs_t offset, uint8_t data)
{
m_vram_1[offset] = data;
m_tilemap_1->mark_tile_dirty(offset % 0x400);
diff --git a/src/mame/video/combatsc.cpp b/src/mame/video/combatsc.cpp
index d352453a57a..a77789f9e71 100644
--- a/src/mame/video/combatsc.cpp
+++ b/src/mame/video/combatsc.cpp
@@ -293,12 +293,12 @@ VIDEO_START_MEMBER(combatsc_state,combatscb)
***************************************************************************/
-READ8_MEMBER(combatsc_state::combatsc_video_r)
+uint8_t combatsc_state::combatsc_video_r(offs_t offset)
{
return m_videoram[offset];
}
-WRITE8_MEMBER(combatsc_state::combatsc_video_w)
+void combatsc_state::combatsc_video_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
@@ -315,7 +315,7 @@ WRITE8_MEMBER(combatsc_state::combatsc_video_w)
}
}
-WRITE8_MEMBER(combatsc_state::combatsc_pf_control_w)
+void combatsc_state::combatsc_pf_control_w(offs_t offset, uint8_t data)
{
k007121_device *k007121 = m_video_circuit ? m_k007121_2 : m_k007121_1;
k007121->ctrl_w(offset, data);
@@ -338,12 +338,12 @@ WRITE8_MEMBER(combatsc_state::combatsc_pf_control_w)
}
}
-READ8_MEMBER(combatsc_state::combatsc_scrollram_r)
+uint8_t combatsc_state::combatsc_scrollram_r(offs_t offset)
{
return m_scrollram[offset];
}
-WRITE8_MEMBER(combatsc_state::combatsc_scrollram_w)
+void combatsc_state::combatsc_scrollram_w(offs_t offset, uint8_t data)
{
m_scrollram[offset] = data;
}
diff --git a/src/mame/video/commando.cpp b/src/mame/video/commando.cpp
index c9d8d53a510..0297de67b10 100644
--- a/src/mame/video/commando.cpp
+++ b/src/mame/video/commando.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Nicola Salmoria
/***************************************************************************
- video.c
+ commando.cpp
Functions to emulate the video hardware of the machine.
@@ -12,43 +12,43 @@
#include "includes/commando.h"
-WRITE8_MEMBER(commando_state::commando_videoram_w)
+void commando_state::commando_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(commando_state::commando_colorram_w)
+void commando_state::commando_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(commando_state::commando_videoram2_w)
+void commando_state::commando_videoram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(commando_state::commando_colorram2_w)
+void commando_state::commando_colorram2_w(offs_t offset, uint8_t data)
{
m_colorram2[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(commando_state::commando_scrollx_w)
+void commando_state::commando_scrollx_w(offs_t offset, uint8_t data)
{
m_scroll_x[offset] = data;
m_bg_tilemap->set_scrollx(0, m_scroll_x[0] | (m_scroll_x[1] << 8));
}
-WRITE8_MEMBER(commando_state::commando_scrolly_w)
+void commando_state::commando_scrolly_w(offs_t offset, uint8_t data)
{
m_scroll_y[offset] = data;
m_bg_tilemap->set_scrolly(0, m_scroll_y[0] | (m_scroll_y[1] << 8));
}
-WRITE8_MEMBER(commando_state::commando_c804_w)
+void commando_state::commando_c804_w(uint8_t data)
{
// bits 0 and 1 are coin counters
machine().bookkeeping().coin_counter_w(0, data & 0x01);
diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp
index abbec0ff506..2930a025e5d 100644
--- a/src/mame/video/comx35.cpp
+++ b/src/mame/video/comx35.cpp
@@ -11,7 +11,7 @@
#include "screen.h"
#include "speaker.h"
-WRITE8_MEMBER( comx35_state::cdp1869_w )
+void comx35_state::cdp1869_w(offs_t offset, uint8_t data)
{
uint16_t ma = m_maincpu->get_memory_address();
diff --git a/src/mame/video/contra.cpp b/src/mame/video/contra.cpp
index 3c0ee32cf1e..c7e2db4e44c 100644
--- a/src/mame/video/contra.cpp
+++ b/src/mame/video/contra.cpp
@@ -168,43 +168,43 @@ void contra_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(contra_state::contra_fg_vram_w)
+void contra_state::contra_fg_vram_w(offs_t offset, uint8_t data)
{
m_fg_vram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(contra_state::contra_fg_cram_w)
+void contra_state::contra_fg_cram_w(offs_t offset, uint8_t data)
{
m_fg_cram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(contra_state::contra_bg_vram_w)
+void contra_state::contra_bg_vram_w(offs_t offset, uint8_t data)
{
m_bg_vram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(contra_state::contra_bg_cram_w)
+void contra_state::contra_bg_cram_w(offs_t offset, uint8_t data)
{
m_bg_cram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(contra_state::contra_text_vram_w)
+void contra_state::contra_text_vram_w(offs_t offset, uint8_t data)
{
m_tx_vram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(contra_state::contra_text_cram_w)
+void contra_state::contra_text_cram_w(offs_t offset, uint8_t data)
{
m_tx_cram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(contra_state::contra_K007121_ctrl_0_w)
+void contra_state::contra_K007121_ctrl_0_w(offs_t offset, uint8_t data)
{
uint8_t ctrl_6 = m_k007121_1->ctrlram_r(6);
@@ -228,7 +228,7 @@ WRITE8_MEMBER(contra_state::contra_K007121_ctrl_0_w)
m_k007121_1->ctrl_w(offset, data);
}
-WRITE8_MEMBER(contra_state::contra_K007121_ctrl_1_w)
+void contra_state::contra_K007121_ctrl_1_w(offs_t offset, uint8_t data)
{
uint8_t ctrl_6 = m_k007121_2->ctrlram_r(6);
diff --git a/src/mame/video/cop01.cpp b/src/mame/video/cop01.cpp
index 363585d2469..b01de2e98d5 100644
--- a/src/mame/video/cop01.cpp
+++ b/src/mame/video/cop01.cpp
@@ -115,19 +115,19 @@ void cop01_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(cop01_state::cop01_background_w)
+void cop01_state::cop01_background_w(offs_t offset, uint8_t data)
{
m_bgvideoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_MEMBER(cop01_state::cop01_foreground_w)
+void cop01_state::cop01_foreground_w(offs_t offset, uint8_t data)
{
m_fgvideoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(cop01_state::cop01_vreg_w)
+void cop01_state::cop01_vreg_w(offs_t offset, uint8_t data)
{
/* 0x40: --xx---- sprite bank, coin counters, flip screen
* -----x-- flip screen
diff --git a/src/mame/video/cosmic.cpp b/src/mame/video/cosmic.cpp
index 970b21e1732..f8fa7e1f4e5 100644
--- a/src/mame/video/cosmic.cpp
+++ b/src/mame/video/cosmic.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Nicola Salmoria, Lee Taylor
/***************************************************************************
- cosmic.c
+ cosmic.cpp
emulation of video hardware of cosmic machines of 1979-1980(ish)
@@ -12,7 +12,7 @@
#include "includes/cosmic.h"
-WRITE8_MEMBER(cosmic_state::cosmic_color_register_w)
+void cosmic_state::cosmic_color_register_w(offs_t offset, uint8_t data)
{
m_color_registers[offset] = data ? 1 : 0;
}
@@ -205,7 +205,7 @@ void cosmic_state::nomnlnd_palette(palette_device &palette)
}
-WRITE8_MEMBER(cosmic_state::cosmic_background_enable_w)
+void cosmic_state::cosmic_background_enable_w(uint8_t data)
{
m_background_enable = data;
}
diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp
index d13af9d0f41..4b19b98d93f 100644
--- a/src/mame/video/cps1.cpp
+++ b/src/mame/video/cps1.cpp
@@ -2049,7 +2049,7 @@ inline uint16_t *cps_state::cps1_base( int offset, int boundary )
-WRITE16_MEMBER(cps_state::cps1_cps_a_w)
+void cps_state::cps1_cps_a_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_cps_a_regs[offset]);
@@ -2075,7 +2075,7 @@ WRITE16_MEMBER(cps_state::cps1_cps_a_w)
}
-READ16_MEMBER(cps_state::cps1_cps_b_r)
+uint16_t cps_state::cps1_cps_b_r(offs_t offset)
{
/* Some games interrogate a couple of registers on bootup. */
/* These are CPS1 board B self test checks. They wander from game to */
@@ -2119,7 +2119,7 @@ READ16_MEMBER(cps_state::cps1_cps_b_r)
}
-WRITE16_MEMBER(cps_state::cps1_cps_b_w)
+void cps_state::cps1_cps_b_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_cps_b_regs[offset]);
@@ -2376,7 +2376,7 @@ void cps_state::cps1_get_video_base()
}
-WRITE16_MEMBER(cps_state::cps1_gfxram_w)
+void cps_state::cps1_gfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int page = (offset >> 7) & 0x3c0;
COMBINE_DATA(&m_gfxram[offset]);
@@ -2915,13 +2915,13 @@ void cps_state::cps1_render_sprites( screen_device &screen, bitmap_ind16 &bitmap
-WRITE16_MEMBER(cps2_state::cps2_objram_bank_w)
+void cps2_state::cps2_objram_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_objram_bank = data & 1;
}
-READ16_MEMBER(cps2_state::cps2_objram1_r)
+uint16_t cps2_state::cps2_objram1_r(offs_t offset)
{
if (m_objram_bank & 1)
return m_objram2[offset];
@@ -2929,7 +2929,7 @@ READ16_MEMBER(cps2_state::cps2_objram1_r)
return m_objram1[offset];
}
-READ16_MEMBER(cps2_state::cps2_objram2_r)
+uint16_t cps2_state::cps2_objram2_r(offs_t offset)
{
if (m_objram_bank & 1)
return m_objram1[offset];
@@ -2937,7 +2937,7 @@ READ16_MEMBER(cps2_state::cps2_objram2_r)
return m_objram2[offset];
}
-WRITE16_MEMBER(cps2_state::cps2_objram1_w)
+void cps2_state::cps2_objram1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (m_objram_bank & 1)
COMBINE_DATA(&m_objram2[offset]);
@@ -2945,7 +2945,7 @@ WRITE16_MEMBER(cps2_state::cps2_objram1_w)
COMBINE_DATA(&m_objram1[offset]);
}
-WRITE16_MEMBER(cps2_state::cps2_objram2_w)
+void cps2_state::cps2_objram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (m_objram_bank & 1)
COMBINE_DATA(&m_objram1[offset]);
diff --git a/src/mame/video/crbaloon.cpp b/src/mame/video/crbaloon.cpp
index ee9cfcfce84..2de79bf7b2f 100644
--- a/src/mame/video/crbaloon.cpp
+++ b/src/mame/video/crbaloon.cpp
@@ -41,13 +41,13 @@ void crbaloon_state::crbaloon_palette(palette_device &palette) const
}
-WRITE8_MEMBER(crbaloon_state::crbaloon_videoram_w)
+void crbaloon_state::crbaloon_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(crbaloon_state::crbaloon_colorram_w)
+void crbaloon_state::crbaloon_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/crshrace.cpp b/src/mame/video/crshrace.cpp
index cd635d387d8..91afcfa9058 100644
--- a/src/mame/video/crshrace.cpp
+++ b/src/mame/video/crshrace.cpp
@@ -56,19 +56,19 @@ void crshrace_state::video_start()
***************************************************************************/
-WRITE16_MEMBER(crshrace_state::crshrace_videoram1_w)
+void crshrace_state::crshrace_videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram1[offset]);
m_tilemap1->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(crshrace_state::crshrace_videoram2_w)
+void crshrace_state::crshrace_videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram2[offset]);
m_tilemap2->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(crshrace_state::crshrace_roz_bank_w)
+void crshrace_state::crshrace_roz_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -81,7 +81,7 @@ WRITE16_MEMBER(crshrace_state::crshrace_roz_bank_w)
}
-WRITE16_MEMBER(crshrace_state::crshrace_gfxctrl_w)
+void crshrace_state::crshrace_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
diff --git a/src/mame/video/cvs.cpp b/src/mame/video/cvs.cpp
index 0dc5d7ef7a1..243ebd384de 100644
--- a/src/mame/video/cvs.cpp
+++ b/src/mame/video/cvs.cpp
@@ -78,7 +78,7 @@ void cvs_state::set_pens( )
-WRITE8_MEMBER(cvs_state::cvs_video_fx_w)
+void cvs_state::cvs_video_fx_w(uint8_t data)
{
if (data & 0xce)
logerror("%4x : CVS: Unimplemented CVS video fx = %2x\n",m_maincpu->pc(), data & 0xce);
@@ -98,19 +98,19 @@ WRITE8_MEMBER(cvs_state::cvs_video_fx_w)
-READ8_MEMBER(cvs_state::cvs_collision_r)
+uint8_t cvs_state::cvs_collision_r()
{
return m_collision_register;
}
-READ8_MEMBER(cvs_state::cvs_collision_clear)
+uint8_t cvs_state::cvs_collision_clear()
{
m_collision_register = 0;
return 0;
}
-WRITE8_MEMBER(cvs_state::cvs_scroll_w)
+void cvs_state::cvs_scroll_w(uint8_t data)
{
m_scroll_reg = 255 - data;
}
diff --git a/src/mame/video/darkmist.cpp b/src/mame/video/darkmist.cpp
index c4b707b9aa5..9cc0bbd7d45 100644
--- a/src/mame/video/darkmist.cpp
+++ b/src/mame/video/darkmist.cpp
@@ -194,7 +194,7 @@ uint32_t darkmist_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
return 0;
}
-WRITE8_MEMBER(darkmist_state::tx_vram_w)
+void darkmist_state::tx_vram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_txtilemap->mark_tile_dirty(offset & 0x3ff);
diff --git a/src/mame/video/darkseal.cpp b/src/mame/video/darkseal.cpp
index 77538fd78f6..f8b71bda064 100644
--- a/src/mame/video/darkseal.cpp
+++ b/src/mame/video/darkseal.cpp
@@ -40,13 +40,13 @@ void darkseal_state::update_palette(int offset)
m_palette->set_pen_color(offset,rgb_t(r,g,b));
}
-WRITE16_MEMBER(darkseal_state::palette_w)
+void darkseal_state::palette_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_paletteram[offset]);
update_palette(offset);
}
-WRITE16_MEMBER(darkseal_state::palette_ext_w)
+void darkseal_state::palette_ext_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_paletteram_ext[offset]);
update_palette(offset);
diff --git a/src/mame/video/dbz.cpp b/src/mame/video/dbz.cpp
index 5e2b5a088f2..efb24e1a753 100644
--- a/src/mame/video/dbz.cpp
+++ b/src/mame/video/dbz.cpp
@@ -37,7 +37,7 @@ K053246_CB_MEMBER(dbz_state::sprite_callback)
/* Background Tilemaps */
-WRITE16_MEMBER(dbz_state::dbz_bg2_videoram_w)
+void dbz_state::dbz_bg2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_bg2_videoram[offset]);
m_bg2_tilemap->mark_tile_dirty(offset / 2);
@@ -54,7 +54,7 @@ TILE_GET_INFO_MEMBER(dbz_state::get_dbz_bg2_tile_info)
tileinfo.set(0, tileno, colour + (m_layer_colorbase[5] << 1), flag);
}
-WRITE16_MEMBER(dbz_state::dbz_bg1_videoram_w)
+void dbz_state::dbz_bg1_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_bg1_videoram[offset]);
m_bg1_tilemap->mark_tile_dirty(offset / 2);
diff --git a/src/mame/video/dcheese.cpp b/src/mame/video/dcheese.cpp
index 17fc90b3993..02f530d70d1 100644
--- a/src/mame/video/dcheese.cpp
+++ b/src/mame/video/dcheese.cpp
@@ -220,25 +220,25 @@ void dcheese_state::do_blit()
*
*************************************/
-WRITE16_MEMBER(dcheese_state::blitter_color_w)
+void dcheese_state::blitter_color_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_blitter_color[offset]);
}
-WRITE16_MEMBER(dcheese_state::blitter_xparam_w)
+void dcheese_state::blitter_xparam_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_blitter_xparam[offset]);
}
-WRITE16_MEMBER(dcheese_state::blitter_yparam_w)
+void dcheese_state::blitter_yparam_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_blitter_yparam[offset]);
}
-WRITE16_MEMBER(dcheese_state::blitter_vidparam_w)
+void dcheese_state::blitter_vidparam_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_blitter_vidparam[offset]);
@@ -282,14 +282,14 @@ WRITE16_MEMBER(dcheese_state::blitter_vidparam_w)
}
-WRITE16_MEMBER(dcheese_state::blitter_unknown_w)
+void dcheese_state::blitter_unknown_w(offs_t offset, u16 data, u16 mem_mask)
{
/* written to just before the blitter command register is written */
logerror("%06X:write to %06X = %04X & %04X\n", m_maincpu->pc(), 0x300000 + 2 * offset, data, mem_mask);
}
-READ16_MEMBER(dcheese_state::blitter_vidparam_r)
+u16 dcheese_state::blitter_vidparam_r(offs_t offset)
{
/* analog inputs seem to be hooked up here -- might not actually map to blitter */
if (offset == 0x02/2)
diff --git a/src/mame/video/dcon.cpp b/src/mame/video/dcon.cpp
index 2f331396755..2509bbbbe57 100644
--- a/src/mame/video/dcon.cpp
+++ b/src/mame/video/dcon.cpp
@@ -13,7 +13,7 @@
/******************************************************************************/
-WRITE16_MEMBER(dcon_state::gfxbank_w)
+void dcon_state::gfxbank_w(uint16_t data)
{
if (data&1)
m_gfx_bank_select=0x1000;
@@ -21,25 +21,25 @@ WRITE16_MEMBER(dcon_state::gfxbank_w)
m_gfx_bank_select=0;
}
-WRITE16_MEMBER(dcon_state::background_w)
+void dcon_state::background_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_back_data[offset]);
m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(dcon_state::foreground_w)
+void dcon_state::foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_fore_data[offset]);
m_foreground_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(dcon_state::midground_w)
+void dcon_state::midground_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_mid_data[offset]);
m_midground_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(dcon_state::text_w)
+void dcon_state::text_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_textram[offset]);
m_text_layer->mark_tile_dirty(offset);
diff --git a/src/mame/video/dday.cpp b/src/mame/video/dday.cpp
index 89f1872f6a5..b18a56db2bd 100644
--- a/src/mame/video/dday.cpp
+++ b/src/mame/video/dday.cpp
@@ -20,7 +20,7 @@
Thanks Zwaxy for the timer info. */
-READ8_MEMBER(dday_state::dday_countdown_timer_r)
+uint8_t dday_state::dday_countdown_timer_r()
{
return ((m_timer_value / 10) << 4) | (m_timer_value % 10);
}
@@ -219,44 +219,42 @@ void dday_state::video_start()
start_countdown_timer();
}
-WRITE8_MEMBER(dday_state::dday_bgvideoram_w)
+void dday_state::dday_bgvideoram_w(offs_t offset, uint8_t data)
{
m_bgvideoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(dday_state::dday_fgvideoram_w)
+void dday_state::dday_fgvideoram_w(offs_t offset, uint8_t data)
{
m_fgvideoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
m_fg_tilemap->mark_tile_dirty(offset ^ 0x1f); /* for flipx case */
}
-WRITE8_MEMBER(dday_state::dday_textvideoram_w)
+void dday_state::dday_textvideoram_w(offs_t offset, uint8_t data)
{
m_textvideoram[offset] = data;
m_text_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(dday_state::dday_colorram_w)
+void dday_state::dday_colorram_w(offs_t offset, uint8_t data)
{
- int i;
-
offset &= 0x03e0;
m_colorram[offset & 0x3e0] = data;
- for (i = 0; i < 0x20; i++)
+ for (int i = 0; i < 0x20; i++)
m_fg_tilemap->mark_tile_dirty(offset + i);
}
-READ8_MEMBER(dday_state::dday_colorram_r)
+uint8_t dday_state::dday_colorram_r(offs_t offset)
{
return m_colorram[offset & 0x03e0];
}
-WRITE8_MEMBER(dday_state::dday_sl_control_w)
+void dday_state::dday_sl_control_w(uint8_t data)
{
if (m_sl_image != data)
{
@@ -266,7 +264,7 @@ WRITE8_MEMBER(dday_state::dday_sl_control_w)
}
-WRITE8_MEMBER(dday_state::dday_control_w)
+void dday_state::dday_control_w(uint8_t data)
{
//if (data & 0xac) logerror("Control = %02X\n", data & 0xac);
diff --git a/src/mame/video/ddragon.cpp b/src/mame/video/ddragon.cpp
index cafdc0160af..52a77e06239 100644
--- a/src/mame/video/ddragon.cpp
+++ b/src/mame/video/ddragon.cpp
@@ -114,13 +114,13 @@ VIDEO_START_MEMBER(ddragon_state,ddragon)
***************************************************************************/
-WRITE8_MEMBER(ddragon_state::ddragon_bgvideoram_w)
+void ddragon_state::ddragon_bgvideoram_w(offs_t offset, uint8_t data)
{
m_bgvideoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_MEMBER(ddragon_state::ddragon_fgvideoram_w)
+void ddragon_state::ddragon_fgvideoram_w(offs_t offset, uint8_t data)
{
m_fgvideoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset >> 1);
diff --git a/src/mame/video/ddragon3.cpp b/src/mame/video/ddragon3.cpp
index c74ae9574d9..8cac741d536 100644
--- a/src/mame/video/ddragon3.cpp
+++ b/src/mame/video/ddragon3.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "includes/ddragon3.h"
-WRITE16_MEMBER(ddragon3_state::ddragon3_scroll_w)
+void ddragon3_state::ddragon3_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
switch (offset)
{
@@ -27,7 +27,7 @@ WRITE16_MEMBER(ddragon3_state::ddragon3_scroll_w)
}
}
-READ16_MEMBER(ddragon3_state::ddragon3_scroll_r)
+uint16_t ddragon3_state::ddragon3_scroll_r(offs_t offset)
{
switch (offset)
{
@@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_bg_tile_info)
-WRITE16_MEMBER(ddragon3_state::ddragon3_bg_videoram_w)
+void ddragon3_state::ddragon3_bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_bg_videoram[offset]);
m_bg_tilemap->mark_tile_dirty(offset);
@@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_fg_tile_info)
-WRITE16_MEMBER(ddragon3_state::ddragon3_fg_videoram_w)
+void ddragon3_state::ddragon3_fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_fg_videoram[offset]);
m_fg_tilemap->mark_tile_dirty(offset / 2);
@@ -110,7 +110,7 @@ TILE_GET_INFO_MEMBER(wwfwfest_state::get_fg0_tile_info)
0);
}
-WRITE16_MEMBER(wwfwfest_state::wwfwfest_fg0_videoram_w)
+void wwfwfest_state::wwfwfest_fg0_videoram_w(offs_t offset, uint16_t data)
{
/* Videoram is 8 bit, upper & lower byte writes end up in the same place due to m68k byte smearing */
m_fg0_videoram[offset]=data&0xff;
diff --git a/src/mame/video/ddribble.cpp b/src/mame/video/ddribble.cpp
index b265ba83f7e..53d7d6b4de9 100644
--- a/src/mame/video/ddribble.cpp
+++ b/src/mame/video/ddribble.cpp
@@ -28,7 +28,7 @@ void ddribble_state::ddribble_palette(palette_device &palette) const
}
-WRITE8_MEMBER(ddribble_state::K005885_0_w)
+void ddribble_state::K005885_0_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -46,7 +46,7 @@ WRITE8_MEMBER(ddribble_state::K005885_0_w)
m_vregs[0][offset] = data;
}
-WRITE8_MEMBER(ddribble_state::K005885_1_w)
+void ddribble_state::K005885_1_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -116,13 +116,13 @@ void ddribble_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(ddribble_state::ddribble_fg_videoram_w)
+void ddribble_state::ddribble_fg_videoram_w(offs_t offset, uint8_t data)
{
m_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset & 0xbff);
}
-WRITE8_MEMBER(ddribble_state::ddribble_bg_videoram_w)
+void ddribble_state::ddribble_bg_videoram_w(offs_t offset, uint8_t data)
{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset & 0xbff);
diff --git a/src/mame/video/deadang.cpp b/src/mame/video/deadang.cpp
index 1864dad1500..182e4b2b528 100644
--- a/src/mame/video/deadang.cpp
+++ b/src/mame/video/deadang.cpp
@@ -7,25 +7,25 @@
/******************************************************************************/
-WRITE16_MEMBER(deadang_state::foreground_w)
+void deadang_state::foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_video_data[offset]);
m_pf1_layer->mark_tile_dirty(offset );
}
-WRITE16_MEMBER(deadang_state::text_w)
+void deadang_state::text_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram[offset]);
m_text_layer->mark_tile_dirty(offset );
}
-WRITE16_MEMBER(popnrun_state::popnrun_text_w)
+void popnrun_state::popnrun_text_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram[offset]);
m_text_layer->mark_tile_dirty(offset / 2);
}
-WRITE16_MEMBER(deadang_state::bank_w)
+void deadang_state::bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
diff --git a/src/mame/video/dec0.cpp b/src/mame/video/dec0.cpp
index f9103919935..00771e46c62 100644
--- a/src/mame/video/dec0.cpp
+++ b/src/mame/video/dec0.cpp
@@ -269,7 +269,7 @@ uint32_t dec0_automat_state::screen_update_secretab(screen_device &screen, bitma
/******************************************************************************/
-WRITE16_MEMBER(dec0_state::priority_w)
+void dec0_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_pri);
}
diff --git a/src/mame/video/dec8.cpp b/src/mame/video/dec8.cpp
index 4d89823bf17..76ab7a4a0b9 100644
--- a/src/mame/video/dec8.cpp
+++ b/src/mame/video/dec8.cpp
@@ -46,37 +46,37 @@ sprites.
#include "emu.h"
#include "includes/dec8.h"
-WRITE8_MEMBER(dec8_state::dec8_bg_data_w)
+void dec8_state::dec8_bg_data_w(offs_t offset, uint8_t data)
{
m_bg_data[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_MEMBER(dec8_state::dec8_bg_data_r)
+uint8_t dec8_state::dec8_bg_data_r(offs_t offset)
{
return m_bg_data[offset];
}
-WRITE8_MEMBER(dec8_state::dec8_videoram_w)
+void dec8_state::dec8_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fix_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(dec8_state::srdarwin_videoram_w)
+void dec8_state::srdarwin_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(dec8_state::dec8_scroll2_w)
+void dec8_state::dec8_scroll2_w(offs_t offset, uint8_t data)
{
m_scroll2[offset] = data;
}
-WRITE8_MEMBER(dec8_state::srdarwin_control_w)
+void dec8_state::srdarwin_control_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -91,7 +91,7 @@ WRITE8_MEMBER(dec8_state::srdarwin_control_w)
}
}
-WRITE8_MEMBER(dec8_state::lastmisn_control_w)
+void dec8_state::lastmisn_control_w(uint8_t data)
{
/*
Bit 0x0f - ROM bank switch.
@@ -111,7 +111,7 @@ WRITE8_MEMBER(dec8_state::lastmisn_control_w)
m_subcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-WRITE8_MEMBER(dec8_state::shackled_control_w)
+void dec8_state::shackled_control_w(uint8_t data)
{
/* Bottom 4 bits - bank switch, Bits 4 & 5 - Scroll MSBs */
m_mainbank->set_entry(data & 0x0f);
@@ -120,17 +120,17 @@ WRITE8_MEMBER(dec8_state::shackled_control_w)
m_scroll2[2] = (data >> 6) & 1;
}
-WRITE8_MEMBER(dec8_state::lastmisn_scrollx_w)
+void dec8_state::lastmisn_scrollx_w(uint8_t data)
{
m_scroll2[1] = data;
}
-WRITE8_MEMBER(dec8_state::lastmisn_scrolly_w)
+void dec8_state::lastmisn_scrolly_w(uint8_t data)
{
m_scroll2[3] = data;
}
-WRITE8_MEMBER(dec8_state::gondo_scroll_w)
+void dec8_state::gondo_scroll_w(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/mame/video/decocass.cpp b/src/mame/video/decocass.cpp
index 476603d7e10..5cbc3d5e104 100644
--- a/src/mame/video/decocass.cpp
+++ b/src/mame/video/decocass.cpp
@@ -321,7 +321,7 @@ void decocass_state::draw_center(bitmap_ind16 &bitmap, const rectangle &cliprect
memory handlers
********************************************/
-WRITE8_MEMBER(decocass_state::decocass_paletteram_w )
+void decocass_state::decocass_paletteram_w(offs_t offset, uint8_t data)
{
/*
* RGB output is inverted and A4 is inverted too
@@ -333,7 +333,7 @@ WRITE8_MEMBER(decocass_state::decocass_paletteram_w )
m_palette->set_indirect_color(offset, rgb_t(pal3bit(~data >> 0), pal3bit(~data >> 3), pal2bit(~data >> 6)));
}
-WRITE8_MEMBER(decocass_state::decocass_charram_w )
+void decocass_state::decocass_charram_w(offs_t offset, uint8_t data)
{
m_charram[offset] = data;
/* dirty sprite */
@@ -343,13 +343,13 @@ WRITE8_MEMBER(decocass_state::decocass_charram_w )
}
-WRITE8_MEMBER(decocass_state::decocass_fgvideoram_w )
+void decocass_state::decocass_fgvideoram_w(offs_t offset, uint8_t data)
{
m_fgvideoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(decocass_state::decocass_colorram_w )
+void decocass_state::decocass_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
@@ -361,7 +361,7 @@ void decocass_state::mark_bg_tile_dirty(offs_t offset )
m_bg_tilemap_l->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(decocass_state::decocass_tileram_w )
+void decocass_state::decocass_tileram_w(offs_t offset, uint8_t data)
{
m_tileram[offset] = data;
/* dirty tile (64 bytes per tile) */
@@ -371,7 +371,7 @@ WRITE8_MEMBER(decocass_state::decocass_tileram_w )
mark_bg_tile_dirty(offset);
}
-WRITE8_MEMBER(decocass_state::decocass_objectram_w )
+void decocass_state::decocass_objectram_w(offs_t offset, uint8_t data)
{
m_objectram[offset] = data;
/* dirty the object */
@@ -379,26 +379,26 @@ WRITE8_MEMBER(decocass_state::decocass_objectram_w )
m_gfxdecode->gfx(3)->mark_dirty(1);
}
-WRITE8_MEMBER(decocass_state::decocass_bgvideoram_w )
+void decocass_state::decocass_bgvideoram_w(offs_t offset, uint8_t data)
{
m_bgvideoram[offset] = data;
mark_bg_tile_dirty(offset);
}
/* The watchdog is a 4bit counter counting down every frame */
-WRITE8_MEMBER(decocass_state::decocass_watchdog_count_w )
+void decocass_state::decocass_watchdog_count_w(uint8_t data)
{
LOG(1,("decocass_watchdog_count_w: $%02x\n", data));
m_watchdog_count = data & 0x0f;
}
-WRITE8_MEMBER(decocass_state::decocass_watchdog_flip_w )
+void decocass_state::decocass_watchdog_flip_w(uint8_t data)
{
LOG(1,("decocass_watchdog_flip_w: $%02x\n", data));
m_watchdog_flip = data;
}
-WRITE8_MEMBER(decocass_state::decocass_color_missiles_w )
+void decocass_state::decocass_color_missiles_w(uint8_t data)
{
LOG(1,("decocass_color_missiles_w: $%02x\n", data));
/* only bits D0-D2 and D4-D6 are connected to
@@ -419,7 +419,7 @@ WRITE8_MEMBER(decocass_state::decocass_color_missiles_w )
* D6 - tunnel
* D7 - part h enable
*/
-WRITE8_MEMBER(decocass_state::decocass_mode_set_w )
+void decocass_state::decocass_mode_set_w(uint8_t data)
{
if (data == m_mode_set)
return;
@@ -436,7 +436,7 @@ WRITE8_MEMBER(decocass_state::decocass_mode_set_w )
m_mode_set = data;
}
-WRITE8_MEMBER(decocass_state::decocass_color_center_bot_w )
+void decocass_state::decocass_color_center_bot_w(uint8_t data)
{
if (data == m_color_center_bot)
return;
@@ -462,7 +462,7 @@ WRITE8_MEMBER(decocass_state::decocass_color_center_bot_w )
m_color_center_bot = data;
}
-WRITE8_MEMBER(decocass_state::decocass_back_h_shift_w )
+void decocass_state::decocass_back_h_shift_w(uint8_t data)
{
if (data == m_back_h_shift)
return;
@@ -470,7 +470,7 @@ WRITE8_MEMBER(decocass_state::decocass_back_h_shift_w )
m_back_h_shift = data;
}
-WRITE8_MEMBER(decocass_state::decocass_back_vl_shift_w )
+void decocass_state::decocass_back_vl_shift_w(uint8_t data)
{
if (data == m_back_vl_shift)
return;
@@ -478,7 +478,7 @@ WRITE8_MEMBER(decocass_state::decocass_back_vl_shift_w )
m_back_vl_shift = data;
}
-WRITE8_MEMBER(decocass_state::decocass_back_vr_shift_w )
+void decocass_state::decocass_back_vr_shift_w(uint8_t data)
{
if (data == m_back_vr_shift)
return;
@@ -486,7 +486,7 @@ WRITE8_MEMBER(decocass_state::decocass_back_vr_shift_w )
m_back_vr_shift = data;
}
-WRITE8_MEMBER(decocass_state::decocass_part_h_shift_w )
+void decocass_state::decocass_part_h_shift_w(uint8_t data)
{
if (data == m_part_h_shift )
return;
@@ -494,7 +494,7 @@ WRITE8_MEMBER(decocass_state::decocass_part_h_shift_w )
m_part_h_shift = data;
}
-WRITE8_MEMBER(decocass_state::decocass_part_v_shift_w )
+void decocass_state::decocass_part_v_shift_w(uint8_t data)
{
if (data == m_part_v_shift )
return;
@@ -502,7 +502,7 @@ WRITE8_MEMBER(decocass_state::decocass_part_v_shift_w )
m_part_v_shift = data;
}
-WRITE8_MEMBER(decocass_state::decocass_center_h_shift_space_w )
+void decocass_state::decocass_center_h_shift_space_w(uint8_t data)
{
if (data == m_center_h_shift_space)
return;
@@ -510,7 +510,7 @@ WRITE8_MEMBER(decocass_state::decocass_center_h_shift_space_w )
m_center_h_shift_space = data;
}
-WRITE8_MEMBER(decocass_state::decocass_center_v_shift_w )
+void decocass_state::decocass_center_v_shift_w(uint8_t data)
{
LOG(1,("decocass_center_v_shift_w: $%02x\n", data));
m_center_v_shift = data;
diff --git a/src/mame/video/dgn_beta.cpp b/src/mame/video/dgn_beta.cpp
index 0909a8200af..8d1795f2e72 100644
--- a/src/mame/video/dgn_beta.cpp
+++ b/src/mame/video/dgn_beta.cpp
@@ -280,7 +280,7 @@ void dgn_beta_state::dgnbeta_vid_set_gctrl(int data)
/* Write handler for colour, palette ram */
-WRITE8_MEMBER(dgn_beta_state::dgnbeta_colour_ram_w)
+void dgn_beta_state::dgnbeta_colour_ram_w(offs_t offset, uint8_t data)
{
m_ColourRAM[offset]=data&0x0f; /* Colour ram 4 bit and write only to CPU */
}
diff --git a/src/mame/video/digdug.cpp b/src/mame/video/digdug.cpp
index d19e69f7c42..336a76f6815 100644
--- a/src/mame/video/digdug.cpp
+++ b/src/mame/video/digdug.cpp
@@ -165,7 +165,7 @@ VIDEO_START_MEMBER(digdug_state,digdug)
***************************************************************************/
-WRITE8_MEMBER( digdug_state::digdug_videoram_w )
+void digdug_state::digdug_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
diff --git a/src/mame/video/divebomb.cpp b/src/mame/video/divebomb.cpp
index 62d0098e6de..2fbb8e1bc6b 100644
--- a/src/mame/video/divebomb.cpp
+++ b/src/mame/video/divebomb.cpp
@@ -58,14 +58,14 @@ K051316_CB_MEMBER(divebomb_state::zoom_callback_2)
*
*************************************/
-WRITE8_MEMBER(divebomb_state::fgram_w)
+void divebomb_state::fgram_w(offs_t offset, uint8_t data)
{
m_fgram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_MEMBER(divebomb_state::rozcpu_pal_w)
+void divebomb_state::rozcpu_pal_w(uint8_t data)
{
//.... ..xx K051316 1 palette select
//..xx .... K051316 2 palette select
diff --git a/src/mame/video/djboy.cpp b/src/mame/video/djboy.cpp
index 83f83b13da9..888831a9194 100644
--- a/src/mame/video/djboy.cpp
+++ b/src/mame/video/djboy.cpp
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Phil Stroffolino
/**
- * @file video/djboy.c
+ * @file video/djboy.cpp
*
* video hardware for DJ Boy
*/
@@ -9,12 +9,12 @@
#include "video/kan_pand.h"
#include "includes/djboy.h"
-WRITE8_MEMBER(djboy_state::djboy_scrollx_w)
+void djboy_state::djboy_scrollx_w(uint8_t data)
{
m_scrollx = data;
}
-WRITE8_MEMBER(djboy_state::djboy_scrolly_w)
+void djboy_state::djboy_scrolly_w(uint8_t data)
{
m_scrolly = data;
}
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(djboy_state::get_bg_tile_info)
tileinfo.set(1, code, color, 0); /* no flip */
}
-WRITE8_MEMBER(djboy_state::djboy_videoram_w)
+void djboy_state::djboy_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_background->mark_tile_dirty(offset & 0x7ff);
@@ -42,7 +42,7 @@ void djboy_state::video_start()
m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(djboy_state::get_bg_tile_info)), TILEMAP_SCAN_ROWS, 16, 16, 64, 32);
}
-WRITE8_MEMBER(djboy_state::djboy_paletteram_w)
+void djboy_state::djboy_paletteram_w(offs_t offset, uint8_t data)
{
int val;
diff --git a/src/mame/video/dkong.cpp b/src/mame/video/dkong.cpp
index 798a89ea6e9..bab2c20a215 100644
--- a/src/mame/video/dkong.cpp
+++ b/src/mame/video/dkong.cpp
@@ -453,7 +453,7 @@ TILE_GET_INFO_MEMBER(dkong_state::radarscp1_bg_tile_info)
***************************************************************************/
-WRITE8_MEMBER(dkong_state::dkong_videoram_w)
+void dkong_state::dkong_videoram_w(offs_t offset, uint8_t data)
{
if (m_video_ram[offset] != data)
{
@@ -462,7 +462,7 @@ WRITE8_MEMBER(dkong_state::dkong_videoram_w)
}
}
-WRITE8_MEMBER(dkong_state::dkongjr_gfxbank_w)
+void dkong_state::dkongjr_gfxbank_w(uint8_t data)
{
if (m_gfx_bank != (data & 0x01))
{
@@ -471,7 +471,7 @@ WRITE8_MEMBER(dkong_state::dkongjr_gfxbank_w)
}
}
-WRITE8_MEMBER(dkong_state::dkong3_gfxbank_w)
+void dkong_state::dkong3_gfxbank_w(uint8_t data)
{
if (m_gfx_bank != (~data & 0x01))
{
@@ -480,7 +480,7 @@ WRITE8_MEMBER(dkong_state::dkong3_gfxbank_w)
}
}
-WRITE8_MEMBER(dkong_state::dkong_palettebank_w)
+void dkong_state::dkong_palettebank_w(offs_t offset, uint8_t data)
{
int newbank;
@@ -498,23 +498,23 @@ WRITE8_MEMBER(dkong_state::dkong_palettebank_w)
}
}
-WRITE8_MEMBER(dkong_state::radarscp_grid_enable_w)
+void dkong_state::radarscp_grid_enable_w(uint8_t data)
{
m_grid_on = data & 0x01;
}
-WRITE8_MEMBER(dkong_state::radarscp_grid_color_w)
+void dkong_state::radarscp_grid_color_w(uint8_t data)
{
m_grid_col = (data & 0x07) ^ 0x07;
/* popmessage("Gridcol: %d", m_grid_col); */
}
-WRITE8_MEMBER(dkong_state::dkong_flipscreen_w)
+void dkong_state::dkong_flipscreen_w(uint8_t data)
{
m_flip = data & 0x01;
}
-WRITE8_MEMBER(dkong_state::dkong_spritebank_w)
+void dkong_state::dkong_spritebank_w(uint8_t data)
{
m_sprite_bank = data & 0x01;
}
diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp
index 4b2f63cacee..e4df2a5b281 100644
--- a/src/mame/video/docastle.cpp
+++ b/src/mame/video/docastle.cpp
@@ -64,19 +64,19 @@ void docastle_state::docastle_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(docastle_state::docastle_videoram_w)
+void docastle_state::docastle_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_do_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(docastle_state::docastle_colorram_w)
+void docastle_state::docastle_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_do_tilemap->mark_tile_dirty(offset);
}
-READ8_MEMBER(docastle_state::inputs_flipscreen_r)
+uint8_t docastle_state::inputs_flipscreen_r(offs_t offset)
{
// inputs pass through LS244 non-inverting buffer
uint8_t buf = (m_inp[1]->read_h() << 4) | m_inp[0]->read_h();
@@ -89,7 +89,7 @@ READ8_MEMBER(docastle_state::inputs_flipscreen_r)
return buf;
}
-WRITE8_MEMBER(docastle_state::flipscreen_w)
+void docastle_state::flipscreen_w(offs_t offset, uint8_t data)
{
flip_screen_set(BIT(offset, 7));
}
diff --git a/src/mame/video/dogfgt.cpp b/src/mame/video/dogfgt.cpp
index 3d60cfa028c..154e2d2380a 100644
--- a/src/mame/video/dogfgt.cpp
+++ b/src/mame/video/dogfgt.cpp
@@ -84,12 +84,12 @@ void dogfgt_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(dogfgt_state::plane_select_w)
+void dogfgt_state::plane_select_w(uint8_t data)
{
m_bm_plane = data;
}
-READ8_MEMBER(dogfgt_state::bitmapram_r)
+uint8_t dogfgt_state::bitmapram_r(offs_t offset)
{
if (m_bm_plane > 2)
{
@@ -100,7 +100,7 @@ READ8_MEMBER(dogfgt_state::bitmapram_r)
return m_bitmapram[offset + BITMAPRAM_SIZE / 3 * m_bm_plane];
}
-WRITE8_MEMBER(dogfgt_state::internal_bitmapram_w)
+void dogfgt_state::internal_bitmapram_w(offs_t offset, uint8_t data)
{
m_bitmapram[offset] = data;
@@ -122,7 +122,7 @@ WRITE8_MEMBER(dogfgt_state::internal_bitmapram_w)
}
}
-WRITE8_MEMBER(dogfgt_state::bitmapram_w)
+void dogfgt_state::bitmapram_w(offs_t offset, uint8_t data)
{
if (m_bm_plane > 2)
{
@@ -130,23 +130,23 @@ WRITE8_MEMBER(dogfgt_state::bitmapram_w)
return;
}
- internal_bitmapram_w(space, offset + BITMAPRAM_SIZE / 3 * m_bm_plane, data);
+ internal_bitmapram_w(offset + BITMAPRAM_SIZE / 3 * m_bm_plane, data);
}
-WRITE8_MEMBER(dogfgt_state::bgvideoram_w)
+void dogfgt_state::bgvideoram_w(offs_t offset, uint8_t data)
{
m_bgvideoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_MEMBER(dogfgt_state::scroll_w)
+void dogfgt_state::scroll_w(offs_t offset, uint8_t data)
{
m_scroll[offset] = data;
m_bg_tilemap->set_scrollx(0, m_scroll[0] + 256 * m_scroll[1] + 256);
m_bg_tilemap->set_scrolly(0, m_scroll[2] + 256 * m_scroll[3]);
}
-WRITE8_MEMBER(dogfgt_state::_1800_w)
+void dogfgt_state::_1800_w(uint8_t data)
{
/* bits 0 and 1 are probably text color (not verified because PROM is missing) */
m_pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1);
@@ -201,13 +201,11 @@ uint32_t dogfgt_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
{
if (m_lastflip != flip_screen() || m_lastpixcolor != m_pixcolor)
{
- address_space &space = m_maincpu->space(AS_PROGRAM);
-
m_lastflip = flip_screen();
m_lastpixcolor = m_pixcolor;
for (int offs = 0; offs < BITMAPRAM_SIZE; offs++)
- internal_bitmapram_w(space, offs, m_bitmapram[offs]);
+ internal_bitmapram_w(offs, m_bitmapram[offs]);
}
diff --git a/src/mame/video/drgnmst.cpp b/src/mame/video/drgnmst.cpp
index 53d1c04c13a..dee61d8fa63 100644
--- a/src/mame/video/drgnmst.cpp
+++ b/src/mame/video/drgnmst.cpp
@@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(drgnmst_base_state::get_fg_tile_info)
tileinfo.set(1, tileno, colour, TILE_FLIPYX(flipyx));
}
-WRITE16_MEMBER(drgnmst_base_state::fg_videoram_w)
+void drgnmst_base_state::fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_fg_videoram[offset]);
m_fg_tilemap->mark_tile_dirty(offset / 2);
@@ -67,7 +67,7 @@ TILE_GET_INFO_MEMBER(drgnmst_base_state::get_bg_tile_info)
tileinfo.set(3, tileno, colour, TILE_FLIPYX(flipyx));
}
-WRITE16_MEMBER(drgnmst_base_state::bg_videoram_w)
+void drgnmst_base_state::bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_bg_videoram[offset]);
m_bg_tilemap->mark_tile_dirty(offset / 2);
@@ -89,7 +89,7 @@ TILE_GET_INFO_MEMBER(drgnmst_base_state::get_md_tile_info)
tileinfo.set(2, tileno, colour, TILE_FLIPYX(flipyx));
}
-WRITE16_MEMBER(drgnmst_base_state::md_videoram_w)
+void drgnmst_base_state::md_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_md_videoram[offset]);
m_md_tilemap->mark_tile_dirty(offset / 2);
diff --git a/src/mame/video/drmicro.cpp b/src/mame/video/drmicro.cpp
index 99157b19c61..63e12ede6a3 100644
--- a/src/mame/video/drmicro.cpp
+++ b/src/mame/video/drmicro.cpp
@@ -15,7 +15,7 @@ Video hardware
/****************************************************************************/
-WRITE8_MEMBER(drmicro_state::drmicro_videoram_w)
+void drmicro_state::drmicro_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
diff --git a/src/mame/video/dynax.cpp b/src/mame/video/dynax.cpp
index 5d31aea9f8b..0fd9007937c 100644
--- a/src/mame/video/dynax.cpp
+++ b/src/mame/video/dynax.cpp
@@ -77,12 +77,12 @@ void dynax_state::janyuki_palette(palette_device &palette) const
#define LAYOUT_MJDIALQ2 3 // 2 layers
#define LAYOUT_JANTOUKI 4 // 2 x (4 couples of layers, interleaved)
-WRITE8_MEMBER(dynax_state::dynax_extra_scrollx_w)
+void dynax_state::dynax_extra_scrollx_w(uint8_t data)
{
m_extra_scroll_x = data;
}
-WRITE8_MEMBER(dynax_state::dynax_extra_scrolly_w)
+void dynax_state::dynax_extra_scrolly_w(uint8_t data)
{
m_extra_scroll_y = data;
}
@@ -98,13 +98,13 @@ void dynax_state::dynax_blit_dest_w(uint8_t data)
LOG("D=%02X ", data);
}
-WRITE8_MEMBER(dynax_state::dynax_blit2_dest_w)
+void dynax_state::dynax_blit2_dest_w(uint8_t data)
{
m_blit2_dest = data;
LOG("D'=%02X ", data);
}
-WRITE8_MEMBER(dynax_state::tenkai_blit_dest_w)
+void dynax_state::tenkai_blit_dest_w(uint8_t data)
{
dynax_blit_dest_w(bitswap<8>(data, 7, 6, 5, 4, 0, 1, 2, 3));
}
@@ -113,14 +113,14 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_dest_w)
mjelctrn: 7 d e -> 1 - 4 8
mjembase: b d e -> - 2 4 8
*/
-WRITE8_MEMBER(dynax_state::mjembase_blit_dest_w)
+void dynax_state::mjembase_blit_dest_w(uint8_t data)
{
dynax_blit_dest_w(bitswap<8>(data, 7, 6, 5, 4, 2, 3, 1, 0));
}
/* Background Color */
-WRITE8_MEMBER(dynax_state::dynax_blit_backpen_w)
+void dynax_state::dynax_blit_backpen_w(uint8_t data)
{
m_blit_backpen = data;
LOG("B=%02X ", data);
@@ -128,7 +128,7 @@ WRITE8_MEMBER(dynax_state::dynax_blit_backpen_w)
/* Layers 0&1 Palettes (Low Bits) */
-WRITE8_MEMBER(dynax_state::dynax_blit_palette01_w)
+void dynax_state::dynax_blit_palette01_w(uint8_t data)
{
if (m_layer_layout == LAYOUT_HNORIDUR)
m_blit_palettes = (m_blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
@@ -137,7 +137,7 @@ WRITE8_MEMBER(dynax_state::dynax_blit_palette01_w)
LOG("P01=%02X ", data);
}
-WRITE8_MEMBER(dynax_state::tenkai_blit_palette01_w)
+void dynax_state::tenkai_blit_palette01_w(uint8_t data)
{
m_blit_palettes = (m_blit_palettes & 0xff00) | data;
LOG("P01=%02X ", data);
@@ -145,7 +145,7 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_palette01_w)
/* Layers 4&5 Palettes (Low Bits) */
-WRITE8_MEMBER(dynax_state::dynax_blit_palette45_w)
+void dynax_state::dynax_blit_palette45_w(uint8_t data)
{
if (m_layer_layout == LAYOUT_HNORIDUR)
m_blit2_palettes = (m_blit2_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
@@ -156,7 +156,7 @@ WRITE8_MEMBER(dynax_state::dynax_blit_palette45_w)
/* Layer 2&3 Palettes (Low Bits) */
-WRITE8_MEMBER(dynax_state::dynax_blit_palette23_w)
+void dynax_state::dynax_blit_palette23_w(uint8_t data)
{
if (m_layer_layout == LAYOUT_HNORIDUR)
m_blit_palettes = (m_blit_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4);
@@ -165,20 +165,20 @@ WRITE8_MEMBER(dynax_state::dynax_blit_palette23_w)
LOG("P23=%02X ", data);
}
-WRITE8_MEMBER(dynax_state::tenkai_blit_palette23_w)
+void dynax_state::tenkai_blit_palette23_w(uint8_t data)
{
m_blit_palettes = (m_blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
LOG("P23=%02X ", data);
}
-WRITE8_MEMBER(dynax_state::mjembase_blit_palette23_w)
+void dynax_state::mjembase_blit_palette23_w(uint8_t data)
{
- dynax_blit_palette23_w(space, offset, bitswap<8>(data, 3, 2, 1, 0, 7, 6, 5, 4), mem_mask);
+ dynax_blit_palette23_w(bitswap<8>(data, 3, 2, 1, 0, 7, 6, 5, 4));
}
/* Layer 6&7 Palettes (Low Bits) */
-WRITE8_MEMBER(dynax_state::dynax_blit_palette67_w)
+void dynax_state::dynax_blit_palette67_w(uint8_t data)
{
if (m_layer_layout == LAYOUT_HNORIDUR)
m_blit2_palettes = (m_blit2_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4);
@@ -201,7 +201,7 @@ WRITE_LINE_MEMBER(dynax_state::blit2_palbank_w)
LOG("PB'=%d ", state);
}
-WRITE8_MEMBER(dynax_state::hnoridur_palbank_w)
+void dynax_state::hnoridur_palbank_w(uint8_t data)
{
m_palbank = data & 0x0f;
m_blit_palbank = data; // ???
@@ -239,13 +239,13 @@ WRITE_LINE_MEMBER(dynax_state::mjdialq2_blit_dest1_w)
/* Layers Enable */
-WRITE8_MEMBER(dynax_state::dynax_layer_enable_w)
+void dynax_state::dynax_layer_enable_w(uint8_t data)
{
m_layer_enable = data;
LOG("E=%02X ", data);
}
-WRITE8_MEMBER(dynax_state::jantouki_layer_enable_w)
+void dynax_state::jantouki_layer_enable_w(offs_t offset, uint8_t data)
{
int mask = 1 << (7 - offset);
m_layer_enable = (m_layer_enable & ~mask) | ((data & 1) ? mask : 0);
@@ -283,7 +283,7 @@ void dynax_state::dynax_blit_romregion_w(uint8_t data)
LOG("GFX%X ", data + 1);
}
-WRITE8_MEMBER(dynax_state::dynax_blit2_romregion_w)
+void dynax_state::dynax_blit2_romregion_w(uint8_t data)
{
if (data + 1 < 8)
m_blitter2->set_rom_bank(data);
@@ -830,12 +830,12 @@ void dynax_state::mjdialq2_copylayer( bitmap_ind16 &bitmap, const rectangle &cli
}
}
-WRITE8_MEMBER(dynax_state::hanamai_priority_w)
+void dynax_state::hanamai_priority_w(uint8_t data)
{
m_hanamai_priority = data;
}
-WRITE8_MEMBER(dynax_state::tenkai_priority_w)
+void dynax_state::tenkai_priority_w(uint8_t data)
{
m_hanamai_priority = bitswap<8>(data, 3, 2, 1, 0, 4, 7, 5, 6);
}
@@ -845,7 +845,7 @@ mjembase: priority: 00 08 10 18 20 28; enable: 1,2,4
Convert to:
mjelctrn: priority: 00 20 10 40 30 50; enable: 1,2,8
*/
-WRITE8_MEMBER(dynax_state::mjembase_priority_w)
+void dynax_state::mjembase_priority_w(uint8_t data)
{
m_hanamai_priority = bitswap<8>(data, 6, 5, 4, 3, 2, 7, 1, 0);
}
diff --git a/src/mame/video/dynduke.cpp b/src/mame/video/dynduke.cpp
index 300a26a5254..6d6295411a4 100644
--- a/src/mame/video/dynduke.cpp
+++ b/src/mame/video/dynduke.cpp
@@ -7,19 +7,19 @@
/******************************************************************************/
-WRITE16_MEMBER(dynduke_state::background_w)
+void dynduke_state::background_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_back_data[offset]);
m_bg_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(dynduke_state::foreground_w)
+void dynduke_state::foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_fore_data[offset]);
m_fg_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(dynduke_state::text_w)
+void dynduke_state::text_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram[offset]);
m_tx_layer->mark_tile_dirty(offset);
@@ -83,7 +83,7 @@ void dynduke_state::video_start()
save_item(NAME(m_old_fore));
}
-WRITE16_MEMBER(dynduke_state::gfxbank_w)
+void dynduke_state::gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -101,7 +101,7 @@ WRITE16_MEMBER(dynduke_state::gfxbank_w)
}
-WRITE16_MEMBER(dynduke_state::control_w)
+void dynduke_state::control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{