summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-06-05 18:10:01 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-06-05 18:10:01 +0200
commit2fd4687debf3efec1d7c6bc04cf49a154a1a46b4 (patch)
tree8addf2b2378820bdfb34aa39430d067350a9395f
parent203841fc890b47b7deb2bf8e437f75ecb9d68498 (diff)
drivers starting with a and b: finished removing READ/WRITE macros (nw)
-rw-r--r--src/devices/bus/lpci/pci.cpp16
-rw-r--r--src/devices/bus/lpci/pci.h8
-rw-r--r--src/mame/audio/asteroid.cpp6
-rw-r--r--src/mame/audio/astrof.cpp8
-rw-r--r--src/mame/audio/avalnche.cpp2
-rw-r--r--src/mame/audio/aztarac.cpp10
-rw-r--r--src/mame/audio/bsktball.cpp4
-rw-r--r--src/mame/audio/llander.cpp4
-rw-r--r--src/mame/drivers/abc1600.cpp34
-rw-r--r--src/mame/drivers/actfancr.cpp2
-rw-r--r--src/mame/drivers/adam.cpp24
-rw-r--r--src/mame/drivers/aeroboto.cpp8
-rw-r--r--src/mame/drivers/aerofgt.cpp24
-rw-r--r--src/mame/drivers/airbustr.cpp20
-rw-r--r--src/mame/drivers/ajax.cpp4
-rw-r--r--src/mame/drivers/aliens.cpp8
-rw-r--r--src/mame/drivers/ampoker2.cpp16
-rw-r--r--src/mame/drivers/amspdwy.cpp6
-rw-r--r--src/mame/drivers/angelkds.cpp8
-rw-r--r--src/mame/drivers/apollo.cpp72
-rw-r--r--src/mame/drivers/appoooh.cpp2
-rw-r--r--src/mame/drivers/aquarius.cpp18
-rw-r--r--src/mame/drivers/arkanoid.cpp20
-rw-r--r--src/mame/drivers/artmagic.cpp8
-rw-r--r--src/mame/drivers/asterix.cpp12
-rw-r--r--src/mame/drivers/asteroid.cpp6
-rw-r--r--src/mame/drivers/astrocde.cpp28
-rw-r--r--src/mame/drivers/astrof.cpp38
-rw-r--r--src/mame/drivers/atarig1.cpp10
-rw-r--r--src/mame/drivers/atarig42.cpp20
-rw-r--r--src/mame/drivers/atarigt.cpp24
-rw-r--r--src/mame/drivers/atarigx2.cpp27
-rw-r--r--src/mame/drivers/atarist.cpp58
-rw-r--r--src/mame/drivers/atetris.cpp6
-rw-r--r--src/mame/drivers/aussiebyte.cpp22
-rw-r--r--src/mame/drivers/avalnche.cpp2
-rw-r--r--src/mame/drivers/avigo.cpp28
-rw-r--r--src/mame/drivers/aztarac.cpp2
-rw-r--r--src/mame/drivers/badlands.cpp2
-rw-r--r--src/mame/drivers/badlandsbl.cpp10
-rw-r--r--src/mame/drivers/bagman.cpp4
-rw-r--r--src/mame/drivers/batman.cpp2
-rw-r--r--src/mame/drivers/battlane.cpp2
-rw-r--r--src/mame/drivers/battlnts.cpp4
-rw-r--r--src/mame/drivers/bbusters.cpp14
-rw-r--r--src/mame/drivers/beathead.cpp8
-rw-r--r--src/mame/drivers/bebox.cpp8
-rw-r--r--src/mame/drivers/bfm_sc4.cpp28
-rw-r--r--src/mame/drivers/bfm_sc5.cpp16
-rw-r--r--src/mame/drivers/bigevglf.cpp22
-rw-r--r--src/mame/drivers/bishi.cpp10
-rw-r--r--src/mame/drivers/bking.cpp18
-rw-r--r--src/mame/drivers/bladestl.cpp8
-rw-r--r--src/mame/drivers/blktiger.cpp8
-rw-r--r--src/mame/drivers/blmbycar.cpp14
-rw-r--r--src/mame/drivers/blockout.cpp4
-rw-r--r--src/mame/drivers/bloodbro.cpp2
-rw-r--r--src/mame/drivers/blueprnt.cpp8
-rw-r--r--src/mame/drivers/bogeyman.cpp4
-rw-r--r--src/mame/drivers/bombjack.cpp4
-rw-r--r--src/mame/drivers/boogwing.cpp6
-rw-r--r--src/mame/drivers/bottom9.cpp30
-rw-r--r--src/mame/drivers/brkthru.cpp4
-rw-r--r--src/mame/drivers/btime.cpp8
-rw-r--r--src/mame/drivers/btoads.cpp18
-rw-r--r--src/mame/drivers/buggychl.cpp12
-rw-r--r--src/mame/drivers/bullet.cpp38
-rw-r--r--src/mame/drivers/busicom.cpp12
-rw-r--r--src/mame/drivers/bwidow.cpp14
-rw-r--r--src/mame/drivers/bwing.cpp10
-rw-r--r--src/mame/includes/abc1600.h22
-rw-r--r--src/mame/includes/actfancr.h2
-rw-r--r--src/mame/includes/adam.h18
-rw-r--r--src/mame/includes/aeroboto.h16
-rw-r--r--src/mame/includes/aerofgt.h48
-rw-r--r--src/mame/includes/airbustr.h20
-rw-r--r--src/mame/includes/ajax.h14
-rw-r--r--src/mame/includes/aliens.h8
-rw-r--r--src/mame/includes/amiga.h12
-rw-r--r--src/mame/includes/ampoker2.h18
-rw-r--r--src/mame/includes/amspdwy.h12
-rw-r--r--src/mame/includes/angelkds.h26
-rw-r--r--src/mame/includes/apollo.h110
-rw-r--r--src/mame/includes/appoooh.h14
-rw-r--r--src/mame/includes/aquarius.h22
-rw-r--r--src/mame/includes/arabian.h4
-rw-r--r--src/mame/includes/archimds.h18
-rw-r--r--src/mame/includes/arkanoid.h26
-rw-r--r--src/mame/includes/artmagic.h10
-rw-r--r--src/mame/includes/asterix.h10
-rw-r--r--src/mame/includes/asteroid.h22
-rw-r--r--src/mame/includes/astrocde.h46
-rw-r--r--src/mame/includes/astrof.h30
-rw-r--r--src/mame/includes/atarifb.h28
-rw-r--r--src/mame/includes/atarig1.h8
-rw-r--r--src/mame/includes/atarig42.h16
-rw-r--r--src/mame/includes/atarigt.h22
-rw-r--r--src/mame/includes/atarigx2.h18
-rw-r--r--src/mame/includes/atarist.h152
-rw-r--r--src/mame/includes/atarisy1.h10
-rw-r--r--src/mame/includes/atarisy2.h10
-rw-r--r--src/mame/includes/atetris.h8
-rw-r--r--src/mame/includes/aussiebyte.h36
-rw-r--r--src/mame/includes/avalnche.h4
-rw-r--r--src/mame/includes/avigo.h38
-rw-r--r--src/mame/includes/aztarac.h12
-rw-r--r--src/mame/includes/b2m.h10
-rw-r--r--src/mame/includes/badlands.h14
-rw-r--r--src/mame/includes/bagman.h10
-rw-r--r--src/mame/includes/balsente.h46
-rw-r--r--src/mame/includes/bankp.h12
-rw-r--r--src/mame/includes/baraduke.h18
-rw-r--r--src/mame/includes/batman.h2
-rw-r--r--src/mame/includes/battlane.h16
-rw-r--r--src/mame/includes/battlex.h12
-rw-r--r--src/mame/includes/battlnts.h6
-rw-r--r--src/mame/includes/bbusters.h16
-rw-r--r--src/mame/includes/beathead.h30
-rw-r--r--src/mame/includes/bebox.h42
-rw-r--r--src/mame/includes/bfm_sc4.h18
-rw-r--r--src/mame/includes/bfm_sc5.h12
-rw-r--r--src/mame/includes/bigevglf.h32
-rw-r--r--src/mame/includes/bigstrkb.h6
-rw-r--r--src/mame/includes/bishi.h10
-rw-r--r--src/mame/includes/bk.h22
-rw-r--r--src/mame/includes/bking.h48
-rw-r--r--src/mame/includes/bladestl.h8
-rw-r--r--src/mame/includes/blktiger.h26
-rw-r--r--src/mame/includes/blmbycar.h14
-rw-r--r--src/mame/includes/blockout.h4
-rw-r--r--src/mame/includes/bloodbro.h8
-rw-r--r--src/mame/includes/blueprnt.h14
-rw-r--r--src/mame/includes/bogeyman.h12
-rw-r--r--src/mame/includes/bombjack.h12
-rw-r--r--src/mame/includes/boogwing.h6
-rw-r--r--src/mame/includes/bosco.h8
-rw-r--r--src/mame/includes/bottom9.h22
-rw-r--r--src/mame/includes/brkthru.h10
-rw-r--r--src/mame/includes/bsktball.h8
-rw-r--r--src/mame/includes/btime.h38
-rw-r--r--src/mame/includes/btoads.h46
-rw-r--r--src/mame/includes/bublbobl.h48
-rw-r--r--src/mame/includes/buggychl.h22
-rw-r--r--src/mame/includes/bullet.h38
-rw-r--r--src/mame/includes/busicom.h12
-rw-r--r--src/mame/includes/bwidow.h14
-rw-r--r--src/mame/includes/bwing.h22
-rw-r--r--src/mame/machine/abc1600mac.cpp38
-rw-r--r--src/mame/machine/abc1600mac.h22
-rw-r--r--src/mame/machine/ajax.cpp14
-rw-r--r--src/mame/machine/amiga.cpp14
-rw-r--r--src/mame/machine/apollo.cpp41
-rw-r--r--src/mame/machine/archimds.cpp22
-rw-r--r--src/mame/machine/arkanoid.cpp10
-rw-r--r--src/mame/machine/asteroid.cpp8
-rw-r--r--src/mame/machine/atarifb.cpp22
-rw-r--r--src/mame/machine/atarixga.cpp12
-rw-r--r--src/mame/machine/atarixga.h16
-rw-r--r--src/mame/machine/awboard.cpp16
-rw-r--r--src/mame/machine/awboard.h16
-rw-r--r--src/mame/machine/b2m.cpp18
-rw-r--r--src/mame/machine/bagman.cpp25
-rw-r--r--src/mame/machine/balsente.cpp40
-rw-r--r--src/mame/machine/bebox.cpp70
-rw-r--r--src/mame/machine/bk.cpp22
-rw-r--r--src/mame/machine/bsktball.cpp2
-rw-r--r--src/mame/machine/btime.cpp4
-rw-r--r--src/mame/machine/bublbobl.cpp48
-rw-r--r--src/mame/video/aeroboto.cpp8
-rw-r--r--src/mame/video/aerofgt.cpp24
-rw-r--r--src/mame/video/airbustr.cpp2
-rw-r--r--src/mame/video/ampoker2.cpp2
-rw-r--r--src/mame/video/amspdwy.cpp6
-rw-r--r--src/mame/video/angelkds.cpp18
-rw-r--r--src/mame/video/apollo.cpp36
-rw-r--r--src/mame/video/appoooh.cpp12
-rw-r--r--src/mame/video/aquarius.cpp10
-rw-r--r--src/mame/video/arabian.cpp4
-rw-r--r--src/mame/video/arkanoid.cpp12
-rw-r--r--src/mame/video/artmagic.cpp4
-rw-r--r--src/mame/video/asterix.cpp2
-rw-r--r--src/mame/video/astrocde.cpp20
-rw-r--r--src/mame/video/atarifb.cpp6
-rw-r--r--src/mame/video/atarigx2.cpp2
-rw-r--r--src/mame/video/atarist.cpp84
-rw-r--r--src/mame/video/atarisy1.cpp10
-rw-r--r--src/mame/video/atarisy2.cpp10
-rw-r--r--src/mame/video/atetris.cpp11
-rw-r--r--src/mame/video/aussiebyte.cpp14
-rw-r--r--src/mame/video/avigo.cpp4
-rw-r--r--src/mame/video/badlands.cpp2
-rw-r--r--src/mame/video/bagman.cpp6
-rw-r--r--src/mame/video/balsente.cpp10
-rw-r--r--src/mame/video/bankp.cpp12
-rw-r--r--src/mame/video/baraduke.cpp22
-rw-r--r--src/mame/video/battlane.cpp14
-rw-r--r--src/mame/video/battlex.cpp12
-rw-r--r--src/mame/video/battlnts.cpp2
-rw-r--r--src/mame/video/bbusters.cpp2
-rw-r--r--src/mame/video/beathead.cpp14
-rw-r--r--src/mame/video/bigevglf.cpp16
-rw-r--r--src/mame/video/bigstrkb.cpp6
-rw-r--r--src/mame/video/bking.cpp30
-rw-r--r--src/mame/video/blktiger.cpp26
-rw-r--r--src/mame/video/bloodbro.cpp6
-rw-r--r--src/mame/video/blueprnt.cpp6
-rw-r--r--src/mame/video/bogeyman.cpp8
-rw-r--r--src/mame/video/bombjack.cpp10
-rw-r--r--src/mame/video/bosco.cpp8
-rw-r--r--src/mame/video/brkthru.cpp6
-rw-r--r--src/mame/video/bsktball.cpp2
-rw-r--r--src/mame/video/btime.cpp32
-rw-r--r--src/mame/video/btoads.cpp28
-rw-r--r--src/mame/video/buggychl.cpp10
-rw-r--r--src/mame/video/bwing.cpp12
215 files changed, 1847 insertions, 1867 deletions
diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp
index 41591758c7d..bb9f8f4c113 100644
--- a/src/devices/bus/lpci/pci.cpp
+++ b/src/devices/bus/lpci/pci.cpp
@@ -104,7 +104,7 @@ pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, d
INLINE FUNCTIONS
***************************************************************************/
-READ32_MEMBER( pci_bus_device::read )
+uint32_t pci_bus_device::read(offs_t offset, uint32_t mem_mask)
{
uint32_t result = 0xffffffff;
int function, reg;
@@ -158,7 +158,7 @@ pci_bus_device *pci_bus_device::pci_search_bustree(int busnum, int devicenum, pc
-WRITE32_MEMBER( pci_bus_device::write )
+void pci_bus_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
offset %= 2;
@@ -206,25 +206,25 @@ WRITE32_MEMBER( pci_bus_device::write )
-READ64_MEMBER(pci_bus_device::read_64be)
+uint64_t pci_bus_device::read_64be(offs_t offset, uint64_t mem_mask)
{
uint64_t result = 0;
mem_mask = swapendian_int64(mem_mask);
if (ACCESSING_BITS_0_31)
- result |= (uint64_t)read(space, offset * 2 + 0, mem_mask >> 0) << 0;
+ result |= (uint64_t)read(offset * 2 + 0, mem_mask >> 0) << 0;
if (ACCESSING_BITS_32_63)
- result |= (uint64_t)read(space, offset * 2 + 1, mem_mask >> 32) << 32;
+ result |= (uint64_t)read(offset * 2 + 1, mem_mask >> 32) << 32;
return swapendian_int64(result);
}
-WRITE64_MEMBER(pci_bus_device::write_64be)
+void pci_bus_device::write_64be(offs_t offset, uint64_t data, uint64_t mem_mask)
{
data = swapendian_int64(data);
mem_mask = swapendian_int64(mem_mask);
if (ACCESSING_BITS_0_31)
- write(space, offset * 2 + 0, data >> 0, mem_mask >> 0);
+ write(offset * 2 + 0, data >> 0, mem_mask >> 0);
if (ACCESSING_BITS_32_63)
- write(space, offset * 2 + 1, data >> 32, mem_mask >> 32);
+ write(offset * 2 + 1, data >> 32, mem_mask >> 32);
}
diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h
index 83606aec5da..81fe3b759e5 100644
--- a/src/devices/bus/lpci/pci.h
+++ b/src/devices/bus/lpci/pci.h
@@ -72,11 +72,11 @@ public:
// construction/destruction
pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ32_MEMBER( read );
- DECLARE_WRITE32_MEMBER( write );
+ uint32_t read(offs_t offset, uint32_t mem_mask = ~0);
+ void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_READ64_MEMBER( read_64be );
- DECLARE_WRITE64_MEMBER( write_64be );
+ uint64_t read_64be(offs_t offset, uint64_t mem_mask = ~0);
+ void write_64be(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
void set_busnum(int busnum) { m_busnum = busnum; }
template <typename T>
diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp
index cbae5ac9efb..ba965b77f4f 100644
--- a/src/mame/audio/asteroid.cpp
+++ b/src/mame/audio/asteroid.cpp
@@ -281,7 +281,7 @@ static DISCRETE_SOUND_START(astdelux_discrete)
DISCRETE_SOUND_END
-WRITE8_MEMBER(asteroid_state::asteroid_explode_w)
+void asteroid_state::asteroid_explode_w(uint8_t data)
{
m_discrete->write(ASTEROID_EXPLODE_DATA,(data&0x3c)>>2); // Volume
/* We will modify the pitch data to send the divider value. */
@@ -303,13 +303,13 @@ WRITE8_MEMBER(asteroid_state::asteroid_explode_w)
m_discrete->write(ASTEROID_EXPLODE_PITCH, data);
}
-WRITE8_MEMBER(asteroid_state::asteroid_thump_w)
+void asteroid_state::asteroid_thump_w(uint8_t data)
{
m_discrete->write(ASTEROID_THUMP_EN, data & 0x10);
m_discrete->write(ASTEROID_THUMP_DATA, data & 0x0f);
}
-WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w)
+void asteroid_state::asteroid_noise_reset_w(uint8_t data)
{
m_discrete->write(ASTEROID_NOISE_RESET, 0);
}
diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp
index 663013e1bc8..63ea0bdf085 100644
--- a/src/mame/audio/astrof.cpp
+++ b/src/mame/audio/astrof.cpp
@@ -33,7 +33,7 @@
#define CHANNEL_FUEL 3
-WRITE8_MEMBER(astrof_state::astrof_audio_1_w)
+void astrof_state::astrof_audio_1_w(uint8_t data)
{
uint8_t rising_bits = data & ~m_port_1_last;
@@ -78,7 +78,7 @@ WRITE8_MEMBER(astrof_state::astrof_audio_1_w)
}
-WRITE8_MEMBER(astrof_state::astrof_audio_2_w)
+void astrof_state::astrof_audio_2_w(uint8_t data)
{
uint8_t rising_bits = data & ~m_port_2_last;
@@ -156,7 +156,7 @@ void astrof_state::astrof_audio(machine_config &config)
*
*************************************/
-WRITE8_MEMBER(astrof_state::spfghmk2_audio_w)
+void astrof_state::spfghmk2_audio_w(uint8_t data)
{
/* nothing yet */
}
@@ -175,7 +175,7 @@ void astrof_state::spfghmk2_audio(machine_config &config)
*
*************************************/
-WRITE8_MEMBER(astrof_state::tomahawk_audio_w)
+void astrof_state::tomahawk_audio_w(uint8_t data)
{
/* D0 - sonar */
diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp
index 471c73a8e5c..3f63d9ca6b1 100644
--- a/src/mame/audio/avalnche.cpp
+++ b/src/mame/audio/avalnche.cpp
@@ -24,7 +24,7 @@
Avalanche memory audio output handlers
***************************************************************************/
-WRITE8_MEMBER(avalnche_state::avalnche_noise_amplitude_w)
+void avalnche_state::avalnche_noise_amplitude_w(uint8_t data)
{
m_discrete->write(AVALNCHE_SOUNDLVL_DATA, data & 0x3f);
}
diff --git a/src/mame/audio/aztarac.cpp b/src/mame/audio/aztarac.cpp
index 24d0a930fd3..4297509c8a7 100644
--- a/src/mame/audio/aztarac.cpp
+++ b/src/mame/audio/aztarac.cpp
@@ -11,12 +11,12 @@
#include "includes/aztarac.h"
-READ16_MEMBER(aztarac_state::sound_r)
+uint16_t aztarac_state::sound_r()
{
return m_sound_status & 0x01;
}
-WRITE16_MEMBER(aztarac_state::sound_w)
+void aztarac_state::sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -28,19 +28,19 @@ WRITE16_MEMBER(aztarac_state::sound_w)
}
}
-READ8_MEMBER(aztarac_state::snd_command_r)
+uint8_t aztarac_state::snd_command_r()
{
m_sound_status |= 0x01;
m_sound_status &= ~0x20;
return m_soundlatch->read();
}
-READ8_MEMBER(aztarac_state::snd_status_r)
+uint8_t aztarac_state::snd_status_r()
{
return m_sound_status & ~0x01;
}
-WRITE8_MEMBER(aztarac_state::snd_status_w)
+void aztarac_state::snd_status_w(uint8_t data)
{
m_sound_status &= ~0x10;
}
diff --git a/src/mame/audio/bsktball.cpp b/src/mame/audio/bsktball.cpp
index 3acf428145b..082322e41ff 100644
--- a/src/mame/audio/bsktball.cpp
+++ b/src/mame/audio/bsktball.cpp
@@ -12,13 +12,13 @@
/***************************************************************************
Sound handlers
***************************************************************************/
-WRITE8_MEMBER(bsktball_state::bsktball_bounce_w)
+void bsktball_state::bsktball_bounce_w(uint8_t data)
{
m_discrete->write(BSKTBALL_CROWD_DATA, data & 0x0f); // Crowd
m_discrete->write(BSKTBALL_BOUNCE_EN, data & 0x10); // Bounce
}
-WRITE8_MEMBER(bsktball_state::bsktball_note_w)
+void bsktball_state::bsktball_note_w(uint8_t data)
{
m_discrete->write(BSKTBALL_NOTE_DATA, data); // Note
}
diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp
index 80429f032f4..82324455beb 100644
--- a/src/mame/audio/llander.cpp
+++ b/src/mame/audio/llander.cpp
@@ -83,13 +83,13 @@ static DISCRETE_SOUND_START(llander_discrete)
DISCRETE_OUTPUT(NODE_90, 65534.0/(9.2+9.2+600+1000)) // Take the output from the mixer
DISCRETE_SOUND_END
-WRITE8_MEMBER(asteroid_state::llander_snd_reset_w)
+void asteroid_state::llander_snd_reset_w(uint8_t data)
{
/* Resets the LFSR that is used for the white noise generator */
m_discrete->write(LLANDER_NOISE_RESET, 0); /* Reset */
}
-WRITE8_MEMBER(asteroid_state::llander_sounds_w)
+void asteroid_state::llander_sounds_w(uint8_t data)
{
m_discrete->write(LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */
m_discrete->write(LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index 01d1f86e677..89e2ab0bb6b 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -122,7 +122,7 @@ enum
// bus_r -
//-------------------------------------------------
-READ8_MEMBER( abc1600_state::bus_r )
+uint8_t abc1600_state::bus_r(offs_t offset)
{
uint8_t data = 0;
@@ -264,7 +264,7 @@ READ8_MEMBER( abc1600_state::bus_r )
// bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_state::bus_w )
+void abc1600_state::bus_w(offs_t offset, uint8_t data)
{
uint8_t cs = (m_cs7 << 7) | ((offset >> 5) & 0x3f);
@@ -360,7 +360,7 @@ WRITE8_MEMBER( abc1600_state::bus_w )
// fw0_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_state::fw0_w )
+void abc1600_state::fw0_w(uint8_t data)
{
/*
@@ -397,7 +397,7 @@ WRITE8_MEMBER( abc1600_state::fw0_w )
// fw1_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_state::fw1_w )
+void abc1600_state::fw1_w(uint8_t data)
{
/*
@@ -428,7 +428,7 @@ WRITE8_MEMBER( abc1600_state::fw1_w )
// spec_contr_reg_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_state::spec_contr_reg_w )
+void abc1600_state::spec_contr_reg_w(uint8_t data)
{
int state = BIT(data, 3);
@@ -602,41 +602,41 @@ void abc1600_state::update_drdy2()
// Z80DART
//-------------------------------------------------
-READ8_MEMBER( abc1600_state::dart_r )
+uint8_t abc1600_state::dart_r(offs_t offset)
{
return m_dart->ba_cd_r(A2_A1 ^ 0x03);
}
-WRITE8_MEMBER( abc1600_state::dart_w )
+void abc1600_state::dart_w(offs_t offset, uint8_t data)
{
m_dart->ba_cd_w(A2_A1 ^ 0x03, data);
}
//-------------------------------------------------
-// SCC8530_INTERFACE( sc_intf )
+// SCC8530
//-------------------------------------------------
-READ8_MEMBER( abc1600_state::scc_r )
+uint8_t abc1600_state::scc_r(offs_t offset)
{
return m_scc->ab_dc_r(A2_A1);
}
-WRITE8_MEMBER( abc1600_state::scc_w )
+void abc1600_state::scc_w(offs_t offset, uint8_t data)
{
m_scc->ab_dc_w(A2_A1, data);
}
//-------------------------------------------------
-// Z8536_INTERFACE( cio_intf )
+// Z8536
//-------------------------------------------------
-READ8_MEMBER( abc1600_state::cio_r )
+uint8_t abc1600_state::cio_r(offs_t offset)
{
return m_cio->read(A2_A1);
}
-WRITE8_MEMBER( abc1600_state::cio_w )
+void abc1600_state::cio_w(offs_t offset, uint8_t data)
{
m_cio->write(A2_A1, data);
}
@@ -828,17 +828,15 @@ void abc1600_state::machine_start()
void abc1600_state::machine_reset()
{
- address_space &program = m_maincpu->space(AS_PROGRAM);
-
// clear special control register
for (int i = 0; i < 8; i++)
{
- spec_contr_reg_w(program, 0, i);
+ spec_contr_reg_w(i);
}
// clear floppy registers
- fw0_w(program, 0, 0);
- fw1_w(program, 0, 0);
+ fw0_w(0);
+ fw1_w(0);
// clear NMI
m_maincpu->set_input_line(M68K_IRQ_7, CLEAR_LINE);
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 496d0bbb17a..14c6642b530 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -51,7 +51,7 @@ uint8_t actfancr_state::triothep_control_r()
/******************************************************************************/
-WRITE8_MEMBER(actfancr_state::buffer_spriteram_w)
+void actfancr_state::buffer_spriteram_w(uint8_t data)
{
uint8_t *src = reinterpret_cast<uint8_t *>(memshare("spriteram")->ptr());
// copy to a 16-bit region for our sprite draw code too
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index eb4b4e4387b..c4052ae3162 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -347,7 +347,7 @@ enum
// mreq_r - memory request read
//-------------------------------------------------
-READ8_MEMBER( adam_state::mreq_r )
+uint8_t adam_state::mreq_r(offs_t offset)
{
int bmreq = 0, biorq = 1, eos_enable = 1, boot_rom_cs = 1, aux_decode_1 = 1, aux_rom_cs = 1, cas1 = 1, cas2 = 1, cs1 = 1, cs2 = 1, cs3 = 1, cs4 = 1;
@@ -470,7 +470,7 @@ READ8_MEMBER( adam_state::mreq_r )
// mreq_w - memory request write
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::mreq_w )
+void adam_state::mreq_w(offs_t offset, uint8_t data)
{
int bmreq = 0, biorq = 1, aux_rom_cs = 1, cas1 = 1, cas2 = 1;
@@ -526,7 +526,7 @@ WRITE8_MEMBER( adam_state::mreq_w )
// iorq_r - I/O request read
//-------------------------------------------------
-READ8_MEMBER( adam_state::iorq_r )
+uint8_t adam_state::iorq_r(offs_t offset)
{
int bmreq = 1, biorq = 0, aux_rom_cs = 1, cas1 = 1, cas2 = 1;
@@ -535,11 +535,11 @@ READ8_MEMBER( adam_state::iorq_r )
switch ((offset >> 5) & 0x07)
{
case 1:
- data = adamnet_r(space, 0);
+ data = adamnet_r();
break;
case 3:
- data = mioc_r(space, 0);
+ data = mioc_r();
break;
case 5:
@@ -569,18 +569,18 @@ READ8_MEMBER( adam_state::iorq_r )
// iorq_w - I/O request write
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::iorq_w )
+void adam_state::iorq_w(offs_t offset, uint8_t data)
{
int bmreq = 1, biorq = 0, aux_rom_cs = 1, cas1 = 1, cas2 = 1;
switch ((offset >> 5) & 0x07)
{
case 1:
- adamnet_w(space, 0, data);
+ adamnet_w(data);
break;
case 3:
- mioc_w(space, 0, data);
+ mioc_w(data);
break;
case 4:
@@ -619,7 +619,7 @@ WRITE8_MEMBER( adam_state::iorq_w )
// mioc_r -
//-------------------------------------------------
-READ8_MEMBER( adam_state::mioc_r )
+uint8_t adam_state::mioc_r()
{
return m_mioc & 0x0f;
}
@@ -629,7 +629,7 @@ READ8_MEMBER( adam_state::mioc_r )
// mioc_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::mioc_w )
+void adam_state::mioc_w(uint8_t data)
{
/*
@@ -659,7 +659,7 @@ WRITE8_MEMBER( adam_state::mioc_w )
// adamnet_r -
//-------------------------------------------------
-READ8_MEMBER( adam_state::adamnet_r )
+uint8_t adam_state::adamnet_r()
{
return m_an & 0x0f;
}
@@ -669,7 +669,7 @@ READ8_MEMBER( adam_state::adamnet_r )
// adamnet_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_state::adamnet_w )
+void adam_state::adamnet_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index 9ec149faaa6..7957ef66f23 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -36,7 +36,7 @@ Revisions:
#include "speaker.h"
-READ8_MEMBER(aeroboto_state::aeroboto_201_r)
+uint8_t aeroboto_state::aeroboto_201_r()
{
/* if you keep a button pressed during boot, the game will expect this */
/* serie of values to be returned from 3004, and display "PASS 201" if it is */
@@ -60,19 +60,19 @@ WRITE_LINE_MEMBER(aeroboto_state::vblank_irq)
}
}
-READ8_MEMBER(aeroboto_state::aeroboto_irq_ack_r)
+uint8_t aeroboto_state::aeroboto_irq_ack_r()
{
m_maincpu->set_input_line(0, CLEAR_LINE);
return 0xff;
}
-READ8_MEMBER(aeroboto_state::aeroboto_2973_r)
+uint8_t aeroboto_state::aeroboto_2973_r()
{
m_mainram[0x02be] = 0;
return 0xff;
}
-WRITE8_MEMBER(aeroboto_state::aeroboto_1a2_w)
+void aeroboto_state::aeroboto_1a2_w(uint8_t data)
{
m_mainram[0x01a2] = data;
if (data)
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 0c1ee42e98e..638208e532b 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -75,34 +75,34 @@ Verification still needed for the other PCBs.
#include "speaker.h"
-WRITE8_MEMBER(aerofgt_state::karatblzbl_soundlatch_w)
+void aerofgt_state::karatblzbl_soundlatch_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-READ8_MEMBER(aerofgt_state::pending_command_r)
+uint8_t aerofgt_state::pending_command_r()
{
return m_soundlatch->pending_r();
}
-WRITE8_MEMBER(aerofgt_state::aerofgt_sh_bankswitch_w)
+void aerofgt_state::aerofgt_sh_bankswitch_w(uint8_t data)
{
m_soundbank->set_entry(data & 0x03);
}
-WRITE8_MEMBER(aerofgt_state::spinlbrk_sh_bankswitch_w)
+void aerofgt_state::spinlbrk_sh_bankswitch_w(uint8_t data)
{
m_soundbank->set_entry(data & 0x01);
}
-WRITE16_MEMBER(aerofgt_state::pspikesb_oki_banking_w)
+void aerofgt_state::pspikesb_oki_banking_w(uint16_t data)
{
m_oki->set_rom_bank(data & 3);
}
/*TODO: sound banking. */
-WRITE16_MEMBER(aerofgt_state::aerfboo2_okim6295_banking_w)
+void aerofgt_state::aerfboo2_okim6295_banking_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// if(ACCESSING_BITS_8_15)
// {
@@ -110,40 +110,40 @@ WRITE16_MEMBER(aerofgt_state::aerfboo2_okim6295_banking_w)
// }
}
-WRITE8_MEMBER(aerofgt_state::aerfboot_okim6295_banking_w)
+void aerofgt_state::aerfboot_okim6295_banking_w(uint8_t data)
{
/*bit 2 (0x4) set too?*/
if (data & 0x4)
m_okibank->set_entry(data & 0x3);
}
-WRITE8_MEMBER(aerofgt_state::karatblzbl_d7759_write_port_0_w)
+void aerofgt_state::karatblzbl_d7759_write_port_0_w(uint8_t data)
{
m_upd7759->port_w(data);
m_upd7759->start_w(0);
m_upd7759->start_w(1);
}
-WRITE8_MEMBER(aerofgt_state::karatblzbl_d7759_reset_w)
+void aerofgt_state::karatblzbl_d7759_reset_w(uint8_t data)
{
m_upd7759->reset_w(BIT(data, 7));
}
template<int Layer>
-WRITE16_MEMBER(aerofgt_state::vram_w)
+void aerofgt_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram[Layer][offset]);
m_tilemap[Layer]->mark_tile_dirty(offset);
}
template<int Layer>
-WRITE16_MEMBER(aerofgt_state::scrollx_w)
+void aerofgt_state::scrollx_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_scrollx[Layer]);
}
template<int Layer>
-WRITE16_MEMBER(aerofgt_state::scrolly_w)
+void aerofgt_state::scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_scrolly[Layer]);
}
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index 9c757d3f2e5..50d0d447d76 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -229,7 +229,7 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit
/* Read/Write Handlers */
-READ8_MEMBER(airbustr_state::devram_r)
+uint8_t airbustr_state::devram_r(address_space &space, offs_t offset)
{
// There's an MCU here, possibly
switch (offset)
@@ -262,17 +262,17 @@ READ8_MEMBER(airbustr_state::devram_r)
}
}
-WRITE8_MEMBER(airbustr_state::master_nmi_trigger_w)
+void airbustr_state::master_nmi_trigger_w(uint8_t data)
{
m_slave->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-WRITE8_MEMBER(airbustr_state::master_bankswitch_w)
+void airbustr_state::master_bankswitch_w(uint8_t data)
{
m_masterbank->set_entry(data & 0x07);
}
-WRITE8_MEMBER(airbustr_state::slave_bankswitch_w)
+void airbustr_state::slave_bankswitch_w(uint8_t data)
{
m_slavebank->set_entry(data & 0x07);
@@ -285,12 +285,12 @@ WRITE8_MEMBER(airbustr_state::slave_bankswitch_w)
m_pandora->set_clear_bitmap(BIT(data, 5));
}
-WRITE8_MEMBER(airbustr_state::sound_bankswitch_w)
+void airbustr_state::sound_bankswitch_w(uint8_t data)
{
m_audiobank->set_entry(data & 0x07);
}
-READ8_MEMBER(airbustr_state::soundcommand_status_r)
+uint8_t airbustr_state::soundcommand_status_r()
{
// bits: 2 <-> ? 1 <-> soundlatch full 0 <-> soundlatch2 empty
return 4 | (m_soundlatch[0]->pending_r() << 1) | !m_soundlatch[1]->pending_r();
@@ -298,20 +298,20 @@ READ8_MEMBER(airbustr_state::soundcommand_status_r)
template<int Layer>
-WRITE8_MEMBER(airbustr_state::videoram_w)
+void airbustr_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[Layer][offset] = data;
m_tilemap[Layer]->mark_tile_dirty(offset);
}
template<int Layer>
-WRITE8_MEMBER(airbustr_state::colorram_w)
+void airbustr_state::colorram_w(offs_t offset, uint8_t data)
{
m_colorram[Layer][offset] = data;
m_tilemap[Layer]->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(airbustr_state::coin_counter_w)
+void airbustr_state::coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
@@ -699,7 +699,7 @@ ROM_END
void airbustr_state::init_airbustr()
{
- m_master->space(AS_PROGRAM).install_read_handler(0xe000, 0xefff, read8_delegate(*this, FUNC(airbustr_state::devram_r))); // protection device lives here
+ m_master->space(AS_PROGRAM).install_read_handler(0xe000, 0xefff, read8m_delegate(*this, FUNC(airbustr_state::devram_r))); // protection device lives here
}
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index cba3c579e0e..6daf1ff2c29 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -136,7 +136,7 @@ INPUT_PORTS_END
0 / 2MBANK
*/
-WRITE8_MEMBER(ajax_state::sound_bank_w)
+void ajax_state::sound_bank_w(uint8_t data)
{
int bank_A, bank_B;
@@ -157,7 +157,7 @@ void ajax_state::volume_callback0(uint8_t data)
m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11);
}
-WRITE8_MEMBER(ajax_state::k007232_extvol_w)
+void ajax_state::k007232_extvol_w(uint8_t data)
{
/* channel A volume (mono) */
m_k007232_2->set_volume(0, (data & 0x0f) * 0x11/2, (data & 0x0f) * 0x11/2);
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index ddf4af77576..61323201803 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -20,7 +20,7 @@ Preliminary driver by:
#include "speaker.h"
-WRITE8_MEMBER(aliens_state::aliens_coin_counter_w)
+void aliens_state::aliens_coin_counter_w(uint8_t data)
{
/* bits 0-1 = coin counters */
machine().bookkeeping().coin_counter_w(0, data & 0x01);
@@ -42,7 +42,7 @@ WRITE8_MEMBER(aliens_state::aliens_coin_counter_w)
#endif
}
-WRITE8_MEMBER(aliens_state::aliens_sh_irqtrigger_w)
+void aliens_state::aliens_sh_irqtrigger_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->set_input_line(0, HOLD_LINE);
@@ -60,7 +60,7 @@ void aliens_state::aliens_snd_bankswitch_w(uint8_t data)
}
-READ8_MEMBER(aliens_state::k052109_051960_r)
+uint8_t aliens_state::k052109_051960_r(offs_t offset)
{
if (m_k052109->get_rmrd_line() == CLEAR_LINE)
{
@@ -75,7 +75,7 @@ READ8_MEMBER(aliens_state::k052109_051960_r)
return m_k052109->read(offset);
}
-WRITE8_MEMBER(aliens_state::k052109_051960_w)
+void aliens_state::k052109_051960_w(offs_t offset, uint8_t data)
{
if (offset >= 0x3800 && offset < 0x3808)
m_k051960->k051937_w(offset - 0x3800, data);
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index c216303d114..8f660b72250 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -482,7 +482,7 @@ void ampoker2_state::machine_start()
*/
-WRITE8_MEMBER(ampoker2_state::port30_w)
+void ampoker2_state::port30_w(uint8_t data)
/*-------------------------------------------------
PORT_30 C000H ;OUTPUT PORT 30H
---------------------------------------------------
@@ -496,7 +496,7 @@ WRITE8_MEMBER(ampoker2_state::port30_w)
}
-WRITE8_MEMBER(ampoker2_state::port31_w)
+void ampoker2_state::port31_w(uint8_t data)
/*-------------------------------------------------
PORT_31 C001H ;OUTPUT PORT 31H
---------------------------------------------------
@@ -514,7 +514,7 @@ WRITE8_MEMBER(ampoker2_state::port31_w)
}
-WRITE8_MEMBER(ampoker2_state::port32_w)
+void ampoker2_state::port32_w(uint8_t data)
/*-------------------------------------------------
PORT_32 C002H ;OUTPUT PORT 32H
---------------------------------------------------
@@ -529,7 +529,7 @@ WRITE8_MEMBER(ampoker2_state::port32_w)
}
-WRITE8_MEMBER(ampoker2_state::port33_w)
+void ampoker2_state::port33_w(uint8_t data)
/*-------------------------------------------------
PORT_33 C003H ;OUTPUT PORT 33H
---------------------------------------------------
@@ -543,7 +543,7 @@ WRITE8_MEMBER(ampoker2_state::port33_w)
}
-WRITE8_MEMBER(ampoker2_state::port34_w)
+void ampoker2_state::port34_w(uint8_t data)
/*-------------------------------------------------
PORT_34 C004H ;OUTPUT PORT 34H
---------------------------------------------------
@@ -558,7 +558,7 @@ WRITE8_MEMBER(ampoker2_state::port34_w)
}
-WRITE8_MEMBER(ampoker2_state::port35_w)
+void ampoker2_state::port35_w(uint8_t data)
/*-------------------------------------------------
PORT_35 C005H ;OUTPUT PORT 35H
---------------------------------------------------
@@ -572,7 +572,7 @@ WRITE8_MEMBER(ampoker2_state::port35_w)
}
-WRITE8_MEMBER(ampoker2_state::port36_w)
+void ampoker2_state::port36_w(uint8_t data)
/*-------------------------------------------------
PORT_36 C006H ;OUTPUT PORT 36H
---------------------------------------------------
@@ -590,7 +590,7 @@ WRITE8_MEMBER(ampoker2_state::port36_w)
}
-WRITE8_MEMBER(ampoker2_state::watchdog_reset_w)
+void ampoker2_state::watchdog_reset_w(uint8_t data)
/*-------------------------------------------------
PORT_37 C007H ;OUTPUT PORT 37H
---------------------------------------------------
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp
index c25682bca61..4acfac17ad0 100644
--- a/src/mame/drivers/amspdwy.cpp
+++ b/src/mame/drivers/amspdwy.cpp
@@ -54,19 +54,19 @@ uint8_t amspdwy_state::amspdwy_wheel_r( int index )
return m_wheel_return[index] | ioport(portnames[index])->read();
}
-READ8_MEMBER(amspdwy_state::amspdwy_wheel_0_r)
+uint8_t amspdwy_state::amspdwy_wheel_0_r()
{
// player 1
return amspdwy_wheel_r(0);
}
-READ8_MEMBER(amspdwy_state::amspdwy_wheel_1_r)
+uint8_t amspdwy_state::amspdwy_wheel_1_r()
{
// player 2
return amspdwy_wheel_r(1);
}
-READ8_MEMBER(amspdwy_state::amspdwy_sound_r)
+uint8_t amspdwy_state::amspdwy_sound_r()
{
return (m_ym2151->status_r() & ~0x30) | ioport("IN0")->read();
}
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index 6de1129f59c..15e2457d6bf 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -427,22 +427,22 @@ sound related ?
*/
-WRITE8_MEMBER(angelkds_state::angelkds_main_sound_w)
+void angelkds_state::angelkds_main_sound_w(offs_t offset, uint8_t data)
{
m_sound[offset] = data;
}
-READ8_MEMBER(angelkds_state::angelkds_main_sound_r)
+uint8_t angelkds_state::angelkds_main_sound_r(offs_t offset)
{
return m_sound2[offset];
}
-WRITE8_MEMBER(angelkds_state::angelkds_sub_sound_w)
+void angelkds_state::angelkds_sub_sound_w(offs_t offset, uint8_t data)
{
m_sound2[offset] = data;
}
-READ8_MEMBER(angelkds_state::angelkds_sub_sound_r)
+uint8_t angelkds_state::angelkds_sub_sound_r(offs_t offset)
{
return m_sound[offset];
}
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 8fb2137437b..a20a69a1fc1 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -206,7 +206,7 @@ uint8_t apollo_get_ram_config_byte(void) {
apollo_instruction_hook
must be called by the CPU core before executing each instruction
***************************************************************************/
-READ32_MEMBER(apollo_state::apollo_instruction_hook)
+uint32_t apollo_state::apollo_instruction_hook(offs_t offset)
{
static uint16_t idle_counter = 0;
@@ -289,7 +289,7 @@ u16 apollo_state::apollo_irq_acknowledge(offs_t offset)
DN3500 Cache Control/Status Register at 0x10200
***************************************************************************/
-WRITE8_MEMBER(apollo_state::cache_control_register_w){
+void apollo_state::cache_control_register_w(offs_t offset, uint8_t data){
if (apollo_is_dn5500())
{
SLOG1(("Error: writing DN5500 Cache Status Register at offset %02x = %02x", offset, data));
@@ -302,7 +302,7 @@ WRITE8_MEMBER(apollo_state::cache_control_register_w){
}
}
-READ8_MEMBER(apollo_state::cache_status_register_r){
+uint8_t apollo_state::cache_status_register_r(offs_t offset){
uint8_t data = cache_status_register;
if (apollo_is_dn5500()) {
@@ -328,13 +328,13 @@ void apollo_set_cache_status_register(device_t *device,uint8_t mask, uint8_t dat
DN3500 Task Alias Register at 0x10300
***************************************************************************/
-WRITE8_MEMBER(apollo_state::task_alias_register_w){
+void apollo_state::task_alias_register_w(offs_t offset, uint8_t data){
task_alias_register = data;
apollo_set_cache_status_register(this,0x07, data);
SLOG(("writing Task Alias Register at offset %02x = %02x",offset, data));
}
-READ8_MEMBER(apollo_state::task_alias_register_r){
+uint8_t apollo_state::task_alias_register_r(offs_t offset){
uint8_t data = 0xff;
SLOG(("reading Task Alias Register at offset %02x = %02x", offset, data));
return data;
@@ -344,12 +344,12 @@ READ8_MEMBER(apollo_state::task_alias_register_r){
DN3000/DN3500 Latch Page on Parity Error Register at 0x9300/0x11300
***************************************************************************/
-WRITE16_MEMBER(apollo_state::latch_page_on_parity_error_register_w){
+void apollo_state::latch_page_on_parity_error_register_w(offs_t offset, uint16_t data){
latch_page_on_parity_error_register = data;
SLOG1(("writing Latch Page on Error Parity Register at offset %02x = %04x", offset*2, data));
}
-READ16_MEMBER(apollo_state::latch_page_on_parity_error_register_r){
+uint16_t apollo_state::latch_page_on_parity_error_register_r(offs_t offset){
uint16_t data = latch_page_on_parity_error_register;
SLOG2(("reading Latch Page on Error Parity Register at offset %02x = %04x", offset*2, data));
return data;
@@ -359,12 +359,12 @@ READ16_MEMBER(apollo_state::latch_page_on_parity_error_register_r){
DN3500 Master REQ Register at 0x11600
***************************************************************************/
-WRITE8_MEMBER(apollo_state::master_req_register_w){
+void apollo_state::master_req_register_w(offs_t offset, uint8_t data){
master_req_register = data;
SLOG2(("writing Master REQ Register at offset %02x = %02x", offset, data));
}
-READ8_MEMBER(apollo_state::master_req_register_r){
+uint8_t apollo_state::master_req_register_r(offs_t offset){
uint8_t data = 0xff;
SLOG1(("reading Master REQ Register at offset %02x = %02x", offset, data));
return data;
@@ -374,7 +374,7 @@ READ8_MEMBER(apollo_state::master_req_register_r){
DN3500 Selective Clear Locations at 0x11600
***************************************************************************/
-WRITE16_MEMBER(apollo_state::selective_clear_locations_w){
+void apollo_state::selective_clear_locations_w(offs_t offset, uint16_t data){
SLOG2(("writing Selective Clear Locations at offset %02x = %02x", offset*2, data));
switch (offset * 2) {
case 0x00: // Clear All
@@ -394,7 +394,7 @@ WRITE16_MEMBER(apollo_state::selective_clear_locations_w){
}
}
-READ16_MEMBER(apollo_state::selective_clear_locations_r){
+uint16_t apollo_state::selective_clear_locations_r(offs_t offset){
uint16_t data = 0xffff;
SLOG1(("reading Selective Clear Locations at offset %02x = %02x", offset*2, data));
return data;
@@ -404,7 +404,7 @@ READ16_MEMBER(apollo_state::selective_clear_locations_r){
DN3000/DN3500 RAM with parity (and null proc loop delay for DomainOS)
***************************************************************************/
-READ32_MEMBER(apollo_state::ram_with_parity_r){
+uint32_t apollo_state::ram_with_parity_r(offs_t offset, uint32_t mem_mask){
uint32_t data = m_messram_ptr[parity_error_offset+offset];
SLOG2(("memory dword read with parity error at %08x = %08x & %08x parity_byte=%04x",
@@ -424,7 +424,7 @@ READ32_MEMBER(apollo_state::ram_with_parity_r){
return data;
}
-WRITE32_MEMBER(apollo_state::ram_with_parity_w){
+void apollo_state::ram_with_parity_w(offs_t offset, uint32_t data, uint32_t mem_mask){
COMBINE_DATA(m_messram_ptr+offset);
if (apollo_csr_get_control_register() & APOLLO_CSR_CR_FORCE_BAD_PARITY) {
@@ -444,7 +444,7 @@ WRITE32_MEMBER(apollo_state::ram_with_parity_w){
// no more than 192 read/write handlers may be used
// see table_assign_handler in memory.c
if (parity_error_handler_install_counter < 40) {
- m_maincpu->space(AS_PROGRAM).install_read_handler(ram_base_address+offset*4, ram_base_address+offset*4+3, read32_delegate(*this, FUNC(apollo_state::ram_with_parity_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(ram_base_address+offset*4, ram_base_address+offset*4+3, read32s_delegate(*this, FUNC(apollo_state::ram_with_parity_r)));
parity_error_handler_is_installed = 1;
parity_error_handler_install_counter++;
}
@@ -467,7 +467,7 @@ WRITE32_MEMBER(apollo_state::ram_with_parity_w){
DN3000/DN3500 unmapped memory
***************************************************************************/
-READ32_MEMBER(apollo_state::apollo_unmapped_r)
+uint32_t apollo_state::apollo_unmapped_r(offs_t offset, uint32_t mem_mask)
{
offs_t address = offset * 4;
@@ -496,7 +496,7 @@ READ32_MEMBER(apollo_state::apollo_unmapped_r)
return 0xffffffff;
}
-WRITE32_MEMBER(apollo_state::apollo_unmapped_w)
+void apollo_state::apollo_unmapped_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
SLOG(("unmapped memory dword write to %08x = %08x & %08x", offset * 4, data, mem_mask));
@@ -508,7 +508,7 @@ WRITE32_MEMBER(apollo_state::apollo_unmapped_w)
DN3000/DN3500 ROM write
***************************************************************************/
-WRITE32_MEMBER(apollo_state::apollo_rom_w)
+void apollo_state::apollo_rom_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
offs_t address = offset * 4;
offs_t pc = m_maincpu->pcbase();
@@ -524,7 +524,7 @@ WRITE32_MEMBER(apollo_state::apollo_rom_w)
DN3000/DN3500 AT Bus I/O space
***************************************************************************/
-READ16_MEMBER(apollo_state::apollo_atbus_io_r)
+uint16_t apollo_state::apollo_atbus_io_r(offs_t offset, uint16_t mem_mask)
{
uint32_t isa_addr = (offset & 3) + ((offset & ~0x1ff) >> 7);
@@ -536,7 +536,7 @@ READ16_MEMBER(apollo_state::apollo_atbus_io_r)
return data;
}
-WRITE16_MEMBER(apollo_state::apollo_atbus_io_w)
+void apollo_state::apollo_atbus_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint32_t isa_addr = (offset & 3) + ((offset & ~0x1ff) >> 7);
@@ -550,7 +550,7 @@ WRITE16_MEMBER(apollo_state::apollo_atbus_io_w)
DN3000/DN3500 AT Bus memory space
***************************************************************************/
-READ16_MEMBER(apollo_state::apollo_atbus_memory_r)
+uint16_t apollo_state::apollo_atbus_memory_r(offs_t offset, uint16_t mem_mask)
{
uint16_t data;
@@ -561,7 +561,7 @@ READ16_MEMBER(apollo_state::apollo_atbus_memory_r)
return data;
}
-WRITE16_MEMBER(apollo_state::apollo_atbus_memory_w)
+void apollo_state::apollo_atbus_memory_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
SLOG2(("apollo_atbus_memory_w at %08x = %04x & %04x", ATBUS_MEMORY_BASE + offset*2, data, mem_mask));
@@ -573,7 +573,7 @@ WRITE16_MEMBER(apollo_state::apollo_atbus_memory_w)
DN3000/DN3500 AT Bus unmapped read/write
***************************************************************************/
-READ16_MEMBER(apollo_state::apollo_atbus_unmap_io_r)
+uint16_t apollo_state::apollo_atbus_unmap_io_r(offs_t offset, uint16_t mem_mask)
{
// ISA bus has 0xff for unmapped addresses
uint16_t data = 0xffff;
@@ -582,13 +582,13 @@ READ16_MEMBER(apollo_state::apollo_atbus_unmap_io_r)
return data;
}
-WRITE16_MEMBER(apollo_state::apollo_atbus_unmap_io_w)
+void apollo_state::apollo_atbus_unmap_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint32_t isa_addr = (offset & 3) + ((offset & ~0x1ff) >> 7);
SLOG1(("apollo_atbus_unmap_io_w at %08x -> %04x = %04x & %04x", ATBUS_IO_BASE + offset*2, isa_addr*2, data, mem_mask));
}
-READ8_MEMBER(apollo_state::apollo_atbus_unmap_r)
+uint8_t apollo_state::apollo_atbus_unmap_r(offs_t offset, uint8_t mem_mask)
{
// ISA bus has 0xff for unmapped addresses
uint8_t data = 0xff;
@@ -596,7 +596,7 @@ READ8_MEMBER(apollo_state::apollo_atbus_unmap_r)
return data;
}
-WRITE8_MEMBER(apollo_state::apollo_atbus_unmap_w)
+void apollo_state::apollo_atbus_unmap_w(offs_t offset, uint8_t data, uint8_t mem_mask)
{
SLOG1(("apollo_atbus_unmap_w at %08x = %02x & %02x", ATBUS_MEMORY_BASE + offset, data, mem_mask));
}
@@ -606,11 +606,11 @@ WRITE8_MEMBER(apollo_state::apollo_atbus_unmap_w)
Strange: documented but not used
***************************************************************************/
-WRITE8_MEMBER(apollo_state::dn5500_memory_present_register_w){
+void apollo_state::dn5500_memory_present_register_w(offs_t offset, uint8_t data){
SLOG(("Error: writing DN5500 Memory Present Register at offset %02x = %02x", offset, data));
}
-READ8_MEMBER(apollo_state::dn5500_memory_present_register_r){
+uint8_t apollo_state::dn5500_memory_present_register_r(offs_t offset){
uint8_t data = DN5500_MEM_PRESENT_BYTE;
SLOG(("reading DN5500 Memory Present Register at offset %02x = %02x", offset, data));
return data;
@@ -620,11 +620,11 @@ READ8_MEMBER(apollo_state::dn5500_memory_present_register_r){
DN5500 11500 Registers at 0x11500-0x115ff (undocumented, what does it do?)
***************************************************************************/
-WRITE8_MEMBER(apollo_state::dn5500_11500_w){
+void apollo_state::dn5500_11500_w(offs_t offset, uint8_t data){
SLOG1(("writing DN5500 11500 at offset %02x = %02x", offset, data));
}
-READ8_MEMBER(apollo_state::dn5500_11500_r){
+uint8_t apollo_state::dn5500_11500_r(offs_t offset){
uint8_t data = 0xff;
SLOG1(("reading DN5500 11500 at offset %02x = %02x", offset, data));
return data;
@@ -634,12 +634,12 @@ READ8_MEMBER(apollo_state::dn5500_11500_r){
DN5500 I/O Protection Map at 0x7000000-0x700FFFF
***************************************************************************/
-WRITE8_MEMBER(apollo_state::dn5500_io_protection_map_w){
+void apollo_state::dn5500_io_protection_map_w(offs_t offset, uint8_t data){
// TODO
SLOG1(("writing DN5500 I/O Protection Map at offset %02x = %02x", offset, data));
}
-READ8_MEMBER(apollo_state::dn5500_io_protection_map_r){
+uint8_t apollo_state::dn5500_io_protection_map_r(offs_t offset){
uint8_t data = 0xff;
SLOG1(("reading DN5500 I/O Protection Map at offset %02x = %02x", offset, data));
return data;
@@ -650,7 +650,7 @@ READ8_MEMBER(apollo_state::dn5500_io_protection_map_r){
DN3000/DN3500 at f8000000 - ffffffff (used by fpa and/or color7?)
***************************************************************************/
-READ32_MEMBER(apollo_state::apollo_f8_r){
+uint32_t apollo_state::apollo_f8_r(offs_t offset, uint32_t mem_mask){
offs_t address = 0xf8000000 + offset * 4;
uint32_t data = 0xffffffff;
SLOG2(("unexpected memory dword read from %08x = %08x & %08x",
@@ -658,7 +658,7 @@ READ32_MEMBER(apollo_state::apollo_f8_r){
return data;
}
-WRITE32_MEMBER(apollo_state::apollo_f8_w){
+void apollo_state::apollo_f8_w(offs_t offset, uint32_t data, uint32_t mem_mask){
offs_t address = 0xf8000000 +offset * 4;
SLOG2(("unexpected memory dword write to %08x = %08x & %08x",
@@ -916,7 +916,7 @@ void apollo_state::machine_reset()
}
#if 0
- m_maincpu->set_instruction_hook(read32_delegate(*this, FUNC(apollo_state::apollo_instruction_hook)));
+ m_maincpu->set_instruction_hook(read32sm_delegate(*this, FUNC(apollo_state::apollo_instruction_hook)));
#endif
}
@@ -954,8 +954,8 @@ void apollo_state::machine_start(){
MACHINE_START_CALL_MEMBER(apollo);
// install nop handlers for unmapped ISA bus addresses
- m_isa->install16_device((ATBUS_IO_BASE - 0x40000) >> 7, (ATBUS_IO_END - 0x40000) >> 7, read16_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_io_r)), write16_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_io_w)));
- m_isa->install_memory(0, ATBUS_MEMORY_END, read8_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_r)), write8_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_w)));
+ m_isa->install16_device((ATBUS_IO_BASE - 0x40000) >> 7, (ATBUS_IO_END - 0x40000) >> 7, read16s_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_io_r)), write16s_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_io_w)));
+ m_isa->install_memory(0, ATBUS_MEMORY_END, read8s_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_r)), write8s_delegate(*this, FUNC(apollo_state::apollo_atbus_unmap_w)));
}
/***************************************************************************
diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp
index 839da3daa58..86e97564fb5 100644
--- a/src/mame/drivers/appoooh.cpp
+++ b/src/mame/drivers/appoooh.cpp
@@ -199,7 +199,7 @@ WRITE_LINE_MEMBER(appoooh_state::adpcm_int)
}
/* adpcm address write */
-WRITE8_MEMBER(appoooh_state::adpcm_w)
+void appoooh_state::adpcm_w(uint8_t data)
{
m_adpcm_address = data << 8;
m_msm->reset_w(0);
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index 8ee2e9f7b3c..b1d9abb6d3b 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -67,7 +67,7 @@ X-6026 : Roll of paper for the printer
mark cycle. Control must be returned at that time to the cassette routine
in order to maintain data integrity.
*/
-READ8_MEMBER(aquarius_state::cassette_r)
+uint8_t aquarius_state::cassette_r()
{
return ((m_cassette)->input() < +0.0) ? 0 : 1;
}
@@ -78,7 +78,7 @@ READ8_MEMBER(aquarius_state::cassette_r)
will appear on audio output. Sound port is a simple one bit I/O and therefore
it must be toggled at a specific rate under software control.
*/
-WRITE8_MEMBER(aquarius_state::cassette_w)
+void aquarius_state::cassette_w(uint8_t data)
{
m_speaker->level_w(BIT(data, 0));
m_cassette->output(BIT(data, 0) ? +1.0 : -1.0);
@@ -97,7 +97,7 @@ WRITE8_MEMBER(aquarius_state::cassette_w)
+ + +
+++++ +++++++++
*/
-READ8_MEMBER(aquarius_state::vsync_r)
+uint8_t aquarius_state::vsync_r()
{
return m_screen->vblank() ? 0 : 1;
}
@@ -108,7 +108,7 @@ READ8_MEMBER(aquarius_state::vsync_r)
map with the upper 16K. A 1 in this bit indicates swapping. This bit is reset
after power up initialization.
*/
-WRITE8_MEMBER(aquarius_state::mapper_w)
+void aquarius_state::mapper_w(uint8_t data)
{
}
@@ -118,7 +118,7 @@ WRITE8_MEMBER(aquarius_state::mapper_w)
to send status from PRNHASK pin at bit D0. A 1 indicates printer is ready,
0 means not ready.
*/
-READ8_MEMBER(aquarius_state::printer_r)
+uint8_t aquarius_state::printer_r()
{
return 1; /* ready */
}
@@ -130,7 +130,7 @@ READ8_MEMBER(aquarius_state::printer_r)
baudrate is variable. In BASIC this is a 1200 baud printer port for
the 40 column thermal printer.
*/
-WRITE8_MEMBER(aquarius_state::printer_w)
+void aquarius_state::printer_w(uint8_t data)
{
}
@@ -146,7 +146,7 @@ WRITE8_MEMBER(aquarius_state::printer_w)
Therefore the keyboard can be scanned by placing a specific scanning
pattern in (A) or (B) and reading the result returned on rows.
*/
-READ8_MEMBER(aquarius_state::keyboard_r)
+uint8_t aquarius_state::keyboard_r(offs_t offset)
{
uint8_t result = 0xff;
@@ -181,12 +181,12 @@ READ8_MEMBER(aquarius_state::keyboard_r)
routine. For game cartridge the lock pattern is generated from data in the
game cartridge itself.
*/
-WRITE8_MEMBER(aquarius_state::scrambler_w)
+void aquarius_state::scrambler_w(uint8_t data)
{
m_scrambler = data;
}
-READ8_MEMBER(aquarius_state::cartridge_r)
+uint8_t aquarius_state::cartridge_r(offs_t offset)
{
uint8_t data = 0;
if (m_cart->exists())
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index 0af2be3c662..a9a9687eb90 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -873,13 +873,13 @@ void arkanoid_state::hexa_map(address_map &map)
map(0xe000, 0xe7ff).ram().w(FUNC(arkanoid_state::arkanoid_videoram_w)).share("videoram");
}
-READ8_MEMBER(arkanoid_state::hexaa_f000_r)
+uint8_t arkanoid_state::hexaa_f000_r()
{
// return m_hexaa_from_sub;
return machine().rand();
}
-WRITE8_MEMBER(arkanoid_state::hexaa_f000_w)
+void arkanoid_state::hexaa_f000_w(uint8_t data)
{
m_hexaa_from_main = data;
}
@@ -904,12 +904,12 @@ void arkanoid_state::hexaa_sub_map(address_map &map)
}
-WRITE8_MEMBER(arkanoid_state::hexaa_sub_80_w)
+void arkanoid_state::hexaa_sub_80_w(uint8_t data)
{
m_hexaa_from_sub = data;
}
-READ8_MEMBER(arkanoid_state::hexaa_sub_90_r)
+uint8_t arkanoid_state::hexaa_sub_90_r()
{
return m_hexaa_from_main;
// return machine().rand();
@@ -2114,10 +2114,10 @@ ROM_END
void arkanoid_state::arkanoid_bootleg_init()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xf000, 0xf000, read8_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_f000_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xf002, 0xf002, read8_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_f002_r)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xd018, 0xd018, write8_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_d018_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xd008, 0xd008, read8_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_d008_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xf000, 0xf000, read8smo_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_f000_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xf002, 0xf002, read8smo_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_f002_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xd018, 0xd018, write8smo_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_d018_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xd008, 0xd008, read8smo_delegate(*this, FUNC(arkanoid_state::arkanoid_bootleg_d008_r)));
}
void arkanoid_state::init_arkangc()
@@ -2195,12 +2195,12 @@ void arkanoid_state::init_tetrsark()
ROM[x] = ROM[x] ^ 0x94;
}
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xd008, 0xd008, write8_delegate(*this, FUNC(arkanoid_state::tetrsark_d008_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xd008, 0xd008, write8smo_delegate(*this, FUNC(arkanoid_state::tetrsark_d008_w)));
}
void arkanoid_state::init_tetrsark2()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xd008, 0xd008, write8_delegate(*this, FUNC(arkanoid_state::tetrsark_d008_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xd008, 0xd008, write8smo_delegate(*this, FUNC(arkanoid_state::tetrsark_d008_w)));
}
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index cebde8ce792..4c7f43c87b2 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -98,7 +98,7 @@ void artmagic_state::machine_reset()
*
*************************************/
-WRITE16_MEMBER(artmagic_state::control_w)
+void artmagic_state::control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_control[offset]);
@@ -133,7 +133,7 @@ void artmagic_state::device_timer(emu_timer &timer, device_timer_id id, int para
}
-READ16_MEMBER(artmagic_state::ultennis_hack_r)
+uint16_t artmagic_state::ultennis_hack_r()
{
/* IRQ5 points to: jsr (a5); rte */
uint32_t pc = m_maincpu->pc();
@@ -377,7 +377,7 @@ READ_LINE_MEMBER(artmagic_state::prot_r)
}
-WRITE16_MEMBER(artmagic_state::protection_bit_w)
+void artmagic_state::protection_bit_w(offs_t offset, uint16_t data)
{
/* shift in the new bit based on the offset */
m_prot_input[m_prot_input_index] <<= 1;
@@ -1157,7 +1157,7 @@ void artmagic_state::init_ultennis()
m_protection_handler = &artmagic_state::ultennis_protection;
/* additional (protection?) hack */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16_delegate(*this, FUNC(artmagic_state::ultennis_hack_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16smo_delegate(*this, FUNC(artmagic_state::ultennis_hack_r)));
}
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index 97cff42f8e8..086d4477dbf 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -27,13 +27,13 @@ TODO:
#if 0
-READ16_MEMBER(asterix_state::control2_r)
+uint16_t asterix_state::control2_r()
{
return m_cur_control2;
}
#endif
-WRITE16_MEMBER(asterix_state::control2_w)
+void asterix_state::control2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -77,13 +77,13 @@ void asterix_state::device_timer(emu_timer &timer, device_timer_id id, int param
}
}
-WRITE8_MEMBER(asterix_state::sound_arm_nmi_w)
+void asterix_state::sound_arm_nmi_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
timer_set(attotime::from_usec(5), TIMER_NMI);
}
-WRITE16_MEMBER(asterix_state::sound_irq_w)
+void asterix_state::sound_irq_w(uint16_t data)
{
m_audiocpu->set_input_line(0, HOLD_LINE);
}
@@ -92,7 +92,7 @@ WRITE16_MEMBER(asterix_state::sound_irq_w)
// You're not supposed to laugh.
// This emulation is grossly overkill but hey, I'm having fun.
#if 0
-WRITE16_MEMBER(asterix_state::protection_w)
+void asterix_state::protection_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_prot + offset);
@@ -130,7 +130,7 @@ WRITE16_MEMBER(asterix_state::protection_w)
}
#endif
-WRITE16_MEMBER(asterix_state::protection_w)
+void asterix_state::protection_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_prot + offset);
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index d3480749f66..3162a133510 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -291,12 +291,12 @@ WRITE_LINE_MEMBER(asteroid_state::coin_counter_right_w)
*
*************************************/
-READ8_MEMBER(asteroid_state::earom_read)
+uint8_t asteroid_state::earom_read()
{
return m_earom->data();
}
-WRITE8_MEMBER(asteroid_state::earom_write)
+void asteroid_state::earom_write(offs_t offset, uint8_t data)
{
m_earom->set_address(offset & 0x3f);
m_earom->set_data(data);
@@ -1174,7 +1174,7 @@ void asteroid_state::init_asteroidb()
void asteroid_state::init_asterock()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x2007, read8_delegate(*this, FUNC(asteroid_state::asterock_IN0_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x2007, read8sm_delegate(*this, FUNC(asteroid_state::asterock_IN0_r)));
}
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index f3123075e8a..cb8c2cb98ae 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -141,20 +141,20 @@
*
*************************************/
-WRITE8_MEMBER(astrocde_state::protected_ram_enable_w)
+void astrocde_state::protected_ram_enable_w(uint8_t data)
{
m_ram_write_enable = true;
}
-READ8_MEMBER(astrocde_state::protected_ram_r)
+uint8_t astrocde_state::protected_ram_r(offs_t offset)
{
m_ram_write_enable = false;
return m_protected_ram ? m_protected_ram[offset] : m_nvram[offset];
}
-WRITE8_MEMBER(astrocde_state::protected_ram_w)
+void astrocde_state::protected_ram_w(offs_t offset, uint8_t data)
{
if (m_ram_write_enable)
(m_protected_ram ? m_protected_ram : m_nvram)[offset] = data;
@@ -169,7 +169,7 @@ WRITE8_MEMBER(astrocde_state::protected_ram_w)
*
*************************************/
-WRITE8_MEMBER(seawolf2_state::sound_1_w)// Port 40
+void seawolf2_state::sound_1_w(uint8_t data) // Port 40
{
uint8_t rising_bits = data & ~m_port_1_last;
m_port_1_last = data;
@@ -183,7 +183,7 @@ WRITE8_MEMBER(seawolf2_state::sound_1_w)// Port 40
}
-WRITE8_MEMBER(seawolf2_state::sound_2_w)// Port 41
+void seawolf2_state::sound_2_w(uint8_t data) // Port 41
{
uint8_t rising_bits = data & ~m_port_2_last;
m_port_2_last = data;
@@ -253,13 +253,13 @@ CUSTOM_INPUT_MEMBER(ebases_state::trackball_r)
}
-WRITE8_MEMBER(ebases_state::trackball_select_w)
+void ebases_state::trackball_select_w(uint8_t data)
{
m_input_select = data & 3;
}
-WRITE8_MEMBER(ebases_state::coin_w)
+void ebases_state::coin_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
}
@@ -286,7 +286,7 @@ WRITE_LINE_MEMBER(astrocde_state::gorf_sound_switch_w)
*
*************************************/
-WRITE8_MEMBER(astrocde_state::demndrgn_banksw_w)
+void astrocde_state::demndrgn_banksw_w(uint8_t data)
{
int bank = (data >> 5) & 3;
m_bank4000->set_bank(bank);
@@ -304,7 +304,7 @@ CUSTOM_INPUT_MEMBER(demndrgn_state::joystick_r)
}
-WRITE8_MEMBER(demndrgn_state::sound_w)
+void demndrgn_state::sound_w(uint8_t data)
{
logerror("Trigger sound sample 0x%02x\n",data);
}
@@ -318,9 +318,9 @@ WRITE8_MEMBER(demndrgn_state::sound_w)
*************************************/
-WRITE8_MEMBER(astrocde_state::profpac_banksw_w)
+void astrocde_state::profpac_banksw_w(uint8_t data)
{
- demndrgn_banksw_w(space, 0, data);
+ demndrgn_banksw_w(data);
if (data & 0x80)
{
@@ -343,7 +343,7 @@ WRITE8_MEMBER(astrocde_state::profpac_banksw_w)
*
*************************************/
-WRITE8_MEMBER(tenpindx_state::lamp_w)
+void tenpindx_state::lamp_w(offs_t offset, uint8_t data)
{
/* lamps */
if (offset == 0)
@@ -365,14 +365,14 @@ WRITE8_MEMBER(tenpindx_state::lamp_w)
}
-WRITE8_MEMBER(tenpindx_state::counter_w)
+void tenpindx_state::counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
if (data & 0xfc) osd_printf_debug("tenpindx_counter_w = %02X\n", data);
}
-WRITE8_MEMBER(tenpindx_state::lights_w)
+void tenpindx_state::lights_w(uint8_t data)
{
/* "flashlights" */
int which = data >> 4;
diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp
index 8862a3ff6d0..0418872e0de 100644
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@@ -81,7 +81,7 @@
*
*************************************/
-READ8_MEMBER(astrof_state::irq_clear_r)
+uint8_t astrof_state::irq_clear_r()
{
m_maincpu->set_input_line(0, CLEAR_LINE);
@@ -270,21 +270,21 @@ void astrof_state::tomahawk_get_pens( pen_t *pens )
}
-WRITE8_MEMBER(astrof_state::astrof_videoram_w)
+void astrof_state::astrof_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_colorram[offset >> 1] = *m_astrof_color & 0x0e;
}
-WRITE8_MEMBER(astrof_state::tomahawk_videoram_w)
+void astrof_state::tomahawk_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_colorram[offset >> 1] = (*m_astrof_color & 0x0e) | ((*m_astrof_color & 0x01) << 4);
}
-WRITE8_MEMBER(astrof_state::video_control_1_w)
+void astrof_state::video_control_1_w(uint8_t data)
{
m_flipscreen = ((data >> 0) & 0x01) & ioport("CAB")->read();
@@ -312,7 +312,7 @@ void astrof_state::astrof_set_video_control_2( uint8_t data )
/* D4-D7 - not connected */
}
-WRITE8_MEMBER(astrof_state::astrof_video_control_2_w)
+void astrof_state::astrof_video_control_2_w(uint8_t data)
{
astrof_set_video_control_2(data);
m_screen->update_partial(m_screen->vpos());
@@ -330,7 +330,7 @@ void astrof_state::spfghmk2_set_video_control_2( uint8_t data )
/* D3-D7 - not connected */
}
-WRITE8_MEMBER(astrof_state::spfghmk2_video_control_2_w)
+void astrof_state::spfghmk2_video_control_2_w(uint8_t data)
{
spfghmk2_set_video_control_2(data);
m_screen->update_partial(m_screen->vpos());
@@ -347,7 +347,7 @@ void astrof_state::tomahawk_set_video_control_2( uint8_t data )
m_red_on = (data & 0x08) ? true : false;
}
-WRITE8_MEMBER(astrof_state::tomahawk_video_control_2_w)
+void astrof_state::tomahawk_video_control_2_w(uint8_t data)
{
tomahawk_set_video_control_2(data);
m_screen->update_partial(m_screen->vpos());
@@ -429,28 +429,28 @@ uint32_t astrof_state::screen_update_tomahawk(screen_device &screen, bitmap_rgb3
*
*************************************/
-READ8_MEMBER(astrof_state::shoot_r)
+uint8_t astrof_state::shoot_r()
{
/* not really sure about this */
return machine().rand() & 8;
}
-READ8_MEMBER(astrof_state::abattle_coin_prot_r)
+uint8_t astrof_state::abattle_coin_prot_r()
{
m_abattle_count = (m_abattle_count + 1) % 0x0101;
return m_abattle_count ? 0x07 : 0x00;
}
-READ8_MEMBER(astrof_state::afire_coin_prot_r)
+uint8_t astrof_state::afire_coin_prot_r()
{
m_abattle_count = m_abattle_count ^ 0x01;
return m_abattle_count ? 0x07 : 0x00;
}
-READ8_MEMBER(astrof_state::tomahawk_protection_r)
+uint8_t astrof_state::tomahawk_protection_r()
{
/* flip the byte */
return bitswap<8>(*m_tomahawk_protection, 0, 1, 2, 3, 4, 5, 6, 7);
@@ -1341,8 +1341,8 @@ void astrof_state::init_abattle()
rom[i] = prom[rom[i]];
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(*this, FUNC(astrof_state::shoot_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(*this, FUNC(astrof_state::abattle_coin_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8smo_delegate(*this, FUNC(astrof_state::shoot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8smo_delegate(*this, FUNC(astrof_state::abattle_coin_prot_r)));
}
@@ -1353,8 +1353,8 @@ void astrof_state::init_afire()
rom[i] = ~rom[i];
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(*this, FUNC(astrof_state::shoot_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(*this, FUNC(astrof_state::afire_coin_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8smo_delegate(*this, FUNC(astrof_state::shoot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8smo_delegate(*this, FUNC(astrof_state::afire_coin_prot_r)));
}
@@ -1365,15 +1365,15 @@ void astrof_state::init_sstarbtl()
rom[i] = ~rom[i];
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(*this, FUNC(astrof_state::shoot_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(*this, FUNC(astrof_state::abattle_coin_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8smo_delegate(*this, FUNC(astrof_state::shoot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8smo_delegate(*this, FUNC(astrof_state::abattle_coin_prot_r)));
}
void astrof_state::init_acombat3()
{
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(*this, FUNC(astrof_state::shoot_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(*this, FUNC(astrof_state::abattle_coin_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8smo_delegate(*this, FUNC(astrof_state::shoot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8smo_delegate(*this, FUNC(astrof_state::abattle_coin_prot_r)));
}
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index 78e6253ac26..a7859b9ad14 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -48,7 +48,7 @@ void atarig1_state::video_int_ack_w(uint16_t data)
*
*************************************/
-WRITE16_MEMBER(atarig1_state::mo_command_w)
+void atarig1_state::mo_command_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_mo_command);
m_rle->command_write((data == 0 && m_is_pitfight) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW);
@@ -62,14 +62,14 @@ WRITE16_MEMBER(atarig1_state::mo_command_w)
*
*************************************/
-WRITE16_MEMBER(atarig1_state::a2d_select_w)
+void atarig1_state::a2d_select_w(offs_t offset, uint16_t data)
{
if (m_adc.found())
m_adc->address_offset_start_w(offset, 0);
}
-READ16_MEMBER(atarig1_state::a2d_data_r)
+uint16_t atarig1_state::a2d_data_r()
{
if (m_adc.found())
return m_adc->data_r() << 8;
@@ -113,7 +113,7 @@ void atarig1_state::device_post_load()
}
-READ16_MEMBER(atarig1_state::pitfightb_cheap_slapstic_r)
+uint16_t atarig1_state::pitfightb_cheap_slapstic_r(offs_t offset)
{
int result = m_bslapstic_base[offset & 0xfff];
@@ -143,7 +143,7 @@ READ16_MEMBER(atarig1_state::pitfightb_cheap_slapstic_r)
void atarig1_state::pitfightb_cheap_slapstic_init()
{
/* install a read handler */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x038000, 0x03ffff, read16_delegate(*this, FUNC(atarig1_state::pitfightb_cheap_slapstic_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x038000, 0x03ffff, read16sm_delegate(*this, FUNC(atarig1_state::pitfightb_cheap_slapstic_r)));
m_bslapstic_base = (uint16_t *)(memregion("maincpu")->base() + 0x38000);
/* allocate memory for a copy of bank 0 */
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 876501e6ddb..a39b2d36ab7 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -59,14 +59,14 @@ void atarig42_state::machine_start()
*
*************************************/
-WRITE8_MEMBER(atarig42_state::a2d_select_w)
+void atarig42_state::a2d_select_w(offs_t offset, uint8_t data)
{
if (m_adc.found())
m_adc->address_offset_start_w(offset, 0);
}
-READ8_MEMBER(atarig42_state::a2d_data_r)
+uint8_t atarig42_state::a2d_data_r(offs_t offset)
{
if (!m_adc.found())
return 0xff;
@@ -78,7 +78,7 @@ READ8_MEMBER(atarig42_state::a2d_data_r)
}
-WRITE16_MEMBER(atarig42_state::io_latch_w)
+void atarig42_state::io_latch_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* upper byte */
if (ACCESSING_BITS_8_15)
@@ -105,7 +105,7 @@ WRITE16_MEMBER(atarig42_state::io_latch_w)
}
-WRITE16_MEMBER(atarig42_state::mo_command_w)
+void atarig42_state::mo_command_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_mo_command);
m_rle->command_write((data == 0) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW);
@@ -231,7 +231,7 @@ void atarig42_0x200_state::roadriot_sloop_tweak(int offset)
}
-READ16_MEMBER(atarig42_0x200_state::roadriot_sloop_data_r)
+uint16_t atarig42_0x200_state::roadriot_sloop_data_r(offs_t offset)
{
roadriot_sloop_tweak(offset);
if (offset < 0x78000/2)
@@ -241,7 +241,7 @@ READ16_MEMBER(atarig42_0x200_state::roadriot_sloop_data_r)
}
-WRITE16_MEMBER(atarig42_0x200_state::roadriot_sloop_data_w)
+void atarig42_0x200_state::roadriot_sloop_data_w(offs_t offset, uint16_t data)
{
roadriot_sloop_tweak(offset);
}
@@ -288,7 +288,7 @@ void atarig42_0x400_state::guardians_sloop_tweak(int offset)
}
-READ16_MEMBER(atarig42_0x400_state::guardians_sloop_data_r)
+uint16_t atarig42_0x400_state::guardians_sloop_data_r(offs_t offset)
{
guardians_sloop_tweak(offset);
if (offset < 0x78000/2)
@@ -298,7 +298,7 @@ READ16_MEMBER(atarig42_0x400_state::guardians_sloop_data_r)
}
-WRITE16_MEMBER(atarig42_0x400_state::guardians_sloop_data_w)
+void atarig42_0x400_state::guardians_sloop_data_w(offs_t offset, uint16_t data)
{
guardians_sloop_tweak(offset);
}
@@ -825,7 +825,7 @@ void atarig42_0x200_state::init_roadriot()
m_playfield_base = 0x400;
address_space &main = m_maincpu->space(AS_PROGRAM);
- main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(*this, FUNC(atarig42_0x200_state::roadriot_sloop_data_r)), write16_delegate(*this, FUNC(atarig42_0x200_state::roadriot_sloop_data_w)));
+ main.install_readwrite_handler(0x000000, 0x07ffff, read16sm_delegate(*this, FUNC(atarig42_0x200_state::roadriot_sloop_data_r)), write16sm_delegate(*this, FUNC(atarig42_0x200_state::roadriot_sloop_data_w)));
m_sloop_base = (uint16_t *)memregion("maincpu")->base();
/*
@@ -860,7 +860,7 @@ void atarig42_0x400_state::init_guardian()
*(uint16_t *)&memregion("maincpu")->base()[0x80000] = 0x4E75;
address_space &main = m_maincpu->space(AS_PROGRAM);
- main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(*this, FUNC(atarig42_0x400_state::guardians_sloop_data_r)), write16_delegate(*this, FUNC(atarig42_0x400_state::guardians_sloop_data_w)));
+ main.install_readwrite_handler(0x000000, 0x07ffff, read16sm_delegate(*this, FUNC(atarig42_0x400_state::guardians_sloop_data_r)), write16sm_delegate(*this, FUNC(atarig42_0x400_state::guardians_sloop_data_w)));
m_sloop_base = (uint16_t *)memregion("maincpu")->base();
/*
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index e17cbfc0c1e..30fdeef7acd 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -137,7 +137,7 @@ void atarigt_state::cage_irq_callback(uint8_t data)
*
*************************************/
-READ32_MEMBER(atarigt_state::special_port2_r)
+uint32_t atarigt_state::special_port2_r()
{
int temp = m_service_io->read();
temp ^= 0x0001; /* /A2DRDY always high for now */
@@ -145,7 +145,7 @@ READ32_MEMBER(atarigt_state::special_port2_r)
}
-READ32_MEMBER(atarigt_state::special_port3_r)
+uint32_t atarigt_state::special_port3_r()
{
int temp = m_coin_io->read();
if (m_video_int_state) temp ^= 0x0001;
@@ -187,7 +187,7 @@ inline void atarigt_state::compute_fake_pots(int *pots)
}
-READ8_MEMBER(atarigt_state::analog_port_r)
+uint8_t atarigt_state::analog_port_r(offs_t offset)
{
if (!m_adc.found())
return 0xff;
@@ -224,7 +224,7 @@ READ8_MEMBER(atarigt_state::analog_port_r)
*
*************************************/
-WRITE32_MEMBER(atarigt_state::latch_w)
+void atarigt_state::latch_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/*
D13 = 68.DISA
@@ -253,7 +253,7 @@ WRITE32_MEMBER(atarigt_state::latch_w)
}
-WRITE32_MEMBER(atarigt_state::mo_command_w)
+void atarigt_state::mo_command_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(m_mo_command);
if (ACCESSING_BITS_0_15)
@@ -261,7 +261,7 @@ WRITE32_MEMBER(atarigt_state::mo_command_w)
}
-WRITE32_MEMBER(atarigt_state::led_w)
+void atarigt_state::led_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// logerror("LED = %08X & %08X\n", data, mem_mask);
}
@@ -274,7 +274,7 @@ WRITE32_MEMBER(atarigt_state::led_w)
*
*************************************/
-READ32_MEMBER(atarigt_state::sound_data_r)
+uint32_t atarigt_state::sound_data_r(offs_t offset, uint32_t mem_mask)
{
uint32_t result = 0;
@@ -286,7 +286,7 @@ READ32_MEMBER(atarigt_state::sound_data_r)
}
-WRITE32_MEMBER(atarigt_state::sound_data_w)
+void atarigt_state::sound_data_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (ACCESSING_BITS_0_15)
m_cage->control_w(data);
@@ -584,7 +584,7 @@ if (LOG_PROTECTION)
*
*************************************/
-READ32_MEMBER(atarigt_state::colorram_protection_r)
+uint32_t atarigt_state::colorram_protection_r(address_space &space, offs_t offset, uint32_t mem_mask)
{
offs_t address = 0xd80000 + offset * 4;
uint32_t result32 = 0;
@@ -607,7 +607,7 @@ READ32_MEMBER(atarigt_state::colorram_protection_r)
}
-WRITE32_MEMBER(atarigt_state::colorram_protection_w)
+void atarigt_state::colorram_protection_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask)
{
offs_t address = 0xd80000 + offset * 4;
@@ -1325,7 +1325,7 @@ ROM_END
*
*************************************/
-WRITE32_MEMBER(atarigt_state::tmek_pf_w)
+void atarigt_state::tmek_pf_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
offs_t pc = m_maincpu->pc();
@@ -1353,7 +1353,7 @@ void atarigt_state::init_tmek()
m_protection_w = &atarigt_state::tmek_protection_w;
/* temp hack */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0xd72000, 0xd75fff, write32_delegate(*this, FUNC(atarigt_state::tmek_pf_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xd72000, 0xd75fff, write32s_delegate(*this, FUNC(atarigt_state::tmek_pf_w)));
}
diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp
index bce0c440ccf..7703e968d48 100644
--- a/src/mame/drivers/atarigx2.cpp
+++ b/src/mame/drivers/atarigx2.cpp
@@ -54,14 +54,14 @@ void atarigx2_state::video_int_ack_w(uint32_t data)
*
*************************************/
-READ32_MEMBER(atarigx2_state::special_port2_r)
+uint32_t atarigx2_state::special_port2_r()
{
int temp = ioport("SERVICE")->read();
return (temp << 16) | temp;
}
-READ32_MEMBER(atarigx2_state::special_port3_r)
+uint32_t atarigx2_state::special_port3_r()
{
int temp = ioport("SPECIAL")->read();
return (temp << 16) | temp;
@@ -69,7 +69,7 @@ READ32_MEMBER(atarigx2_state::special_port3_r)
-READ8_MEMBER(atarigx2_state::a2d_data_r)
+uint8_t atarigx2_state::a2d_data_r(offs_t offset)
{
uint8_t result = m_adc->data_r();
if (!machine().side_effects_disabled())
@@ -78,7 +78,7 @@ READ8_MEMBER(atarigx2_state::a2d_data_r)
}
-WRITE32_MEMBER(atarigx2_state::latch_w)
+void atarigx2_state::latch_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/*
D13 = 68.DISA
@@ -106,7 +106,7 @@ WRITE32_MEMBER(atarigx2_state::latch_w)
}
-WRITE32_MEMBER(atarigx2_state::mo_command_w)
+void atarigx2_state::mo_command_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(m_mo_command);
if (ACCESSING_BITS_0_15)
@@ -123,7 +123,7 @@ WRITE32_MEMBER(atarigx2_state::mo_command_w)
/* Note: Will all eventually be handled in machine/atarixga.cpp */
-WRITE32_MEMBER(atarigx2_state::atarigx2_protection_w)
+void atarigx2_state::atarigx2_protection_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
{
int pc = m_maincpu->pcbase();
@@ -200,7 +200,7 @@ uint32_t ftest4(uint32_t num)
*********************/
-READ32_MEMBER(atarigx2_state::atarigx2_protection_r)
+uint32_t atarigx2_state::atarigx2_protection_r(offs_t offset, uint32_t mem_mask)
{
static const uint32_t lookup_table[][2] =
{
@@ -1168,7 +1168,7 @@ READ32_MEMBER(atarigx2_state::atarigx2_protection_r)
}
-READ32_MEMBER( atarigx2_state::rrreveng_prot_r )
+uint32_t atarigx2_state::rrreveng_prot_r()
{
return 0;
}
@@ -2258,8 +2258,9 @@ void atarigx2_state::init_spclords()
{
m_playfield_base = 0x000;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc80f00, 0xc80fff, read32_delegate(downcast<atari_136095_0072_device &>(*m_xga), FUNC(atari_136095_0072_device::polylsb_read)), write32_delegate(downcast<atari_136095_0072_device &>(*m_xga), FUNC(atari_136095_0072_device::polylsb_write)));
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xca0000, 0xca0fff, read32_delegate(*m_xga, FUNC(atari_xga_device::read)), write32_delegate(*m_xga, FUNC(atari_xga_device::write)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xc80f00, 0xc80fff, read32s_delegate(downcast<atari_136095_0072_device &>(*m_xga), FUNC(atari_136095_0072_device::polylsb_read)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0xc80f00, 0xc80fff, write32sm_delegate(downcast<atari_136095_0072_device &>(*m_xga), FUNC(atari_136095_0072_device::polylsb_write)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xca0000, 0xca0fff, read32s_delegate(*m_xga, FUNC(atari_xga_device::read)), write32s_delegate(*m_xga, FUNC(atari_xga_device::write)));
}
@@ -2288,15 +2289,15 @@ XMEM=68.A23*E.A22*!E.A21*68.A20 = 1101 xxxx = d0
+68.A23*E.A22*!E.A21*!68.A20*68.A19 = 1100 1xxx = c80000-cfffff
+!68.A23*!E.A22*!E.A21 = 000x xxxx = 000000-1fffff
*/
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xca0000, 0xca0fff, read32_delegate(*m_xga, FUNC(atari_xga_device::read)), write32_delegate(*m_xga, FUNC(atari_xga_device::write)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xca0000, 0xca0fff, read32s_delegate(*m_xga, FUNC(atari_xga_device::read)), write32s_delegate(*m_xga, FUNC(atari_xga_device::write)));
}
void atarigx2_state::init_rrreveng()
{
m_playfield_base = 0x000;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xca0000, 0xca0fff, read32_delegate(*this, FUNC(atarigx2_state::atarigx2_protection_r)), write32_delegate(*this, FUNC(atarigx2_state::atarigx2_protection_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xca0fc0, 0xca0fc3, read32_delegate(*this, FUNC(atarigx2_state::rrreveng_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xca0000, 0xca0fff, read32s_delegate(*this, FUNC(atarigx2_state::atarigx2_protection_r)), write32s_delegate(*this, FUNC(atarigx2_state::atarigx2_protection_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xca0fc0, 0xca0fc3, read32smo_delegate(*this, FUNC(atarigx2_state::rrreveng_prot_r)));
}
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 20525df7dad..0ed90004cfa 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -242,7 +242,7 @@ void st_state::fdc_dma_transfer()
// fdc_data_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::fdc_data_r )
+uint16_t st_state::fdc_data_r(offs_t offset)
{
uint8_t data = 0;
@@ -274,7 +274,7 @@ READ16_MEMBER( st_state::fdc_data_r )
// fdc_data_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::fdc_data_w )
+void st_state::fdc_data_w(offs_t offset, uint16_t data)
{
if (m_fdc_mode & DMA_MODE_SECTOR_COUNT)
{
@@ -316,7 +316,7 @@ WRITE16_MEMBER( st_state::fdc_data_w )
// dma_status_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::dma_status_r )
+uint16_t st_state::dma_status_r()
{
uint16_t data = 0;
@@ -337,7 +337,7 @@ READ16_MEMBER( st_state::dma_status_r )
// dma_mode_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::dma_mode_w )
+void st_state::dma_mode_w(uint16_t data)
{
if (LOG) logerror("DMA Mode %04x\n", data);
@@ -360,7 +360,7 @@ WRITE16_MEMBER( st_state::dma_mode_w )
// dma_counter_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::dma_counter_r )
+uint8_t st_state::dma_counter_r(offs_t offset)
{
uint8_t data = 0;
@@ -385,7 +385,7 @@ READ8_MEMBER( st_state::dma_counter_r )
// dma_base_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::dma_base_w )
+void st_state::dma_base_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -416,7 +416,7 @@ WRITE8_MEMBER( st_state::dma_base_w )
// mmu_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::mmu_r )
+uint8_t st_state::mmu_r()
{
return m_mmu;
}
@@ -426,7 +426,7 @@ READ8_MEMBER( st_state::mmu_r )
// mmu_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::mmu_w )
+void st_state::mmu_w(uint8_t data)
{
if (LOG) logerror("Memory Configuration Register: %02x\n", data);
@@ -434,13 +434,13 @@ WRITE8_MEMBER( st_state::mmu_w )
}
-WRITE16_MEMBER( st_state::berr_w )
+void st_state::berr_w(uint16_t data)
{
m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE);
m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE);
}
-READ16_MEMBER( st_state::berr_r )
+uint16_t st_state::berr_r()
{
if (!machine().side_effects_disabled())
{
@@ -712,14 +712,14 @@ void st_state::ikbd_port4_w(uint8_t data)
// fpu_r -
//-------------------------------------------------
-READ16_MEMBER( megast_state::fpu_r )
+uint16_t megast_state::fpu_r()
{
// HACK diagnostic cartridge wants to see this value
return 0x0802;
}
-WRITE16_MEMBER( megast_state::fpu_w )
+void megast_state::fpu_w(uint16_t data)
{
}
@@ -845,7 +845,7 @@ void ste_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
// sound_dma_control_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::sound_dma_control_r )
+uint8_t ste_state::sound_dma_control_r()
{
return m_dmasnd_ctrl;
}
@@ -855,7 +855,7 @@ READ8_MEMBER( ste_state::sound_dma_control_r )
// sound_dma_base_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::sound_dma_base_r )
+uint8_t ste_state::sound_dma_base_r(offs_t offset)
{
uint8_t data = 0;
@@ -882,7 +882,7 @@ READ8_MEMBER( ste_state::sound_dma_base_r )
// sound_dma_counter_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::sound_dma_counter_r )
+uint8_t ste_state::sound_dma_counter_r(offs_t offset)
{
uint8_t data = 0;
@@ -909,7 +909,7 @@ READ8_MEMBER( ste_state::sound_dma_counter_r )
// sound_dma_end_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::sound_dma_end_r )
+uint8_t ste_state::sound_dma_end_r(offs_t offset)
{
uint8_t data = 0;
@@ -936,7 +936,7 @@ READ8_MEMBER( ste_state::sound_dma_end_r )
// sound_mode_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::sound_mode_r )
+uint8_t ste_state::sound_mode_r()
{
return m_dmasnd_mode;
}
@@ -946,7 +946,7 @@ READ8_MEMBER( ste_state::sound_mode_r )
// sound_dma_control_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::sound_dma_control_w )
+void ste_state::sound_dma_control_w(uint8_t data)
{
m_dmasnd_ctrl = data & 0x03;
@@ -970,7 +970,7 @@ WRITE8_MEMBER( ste_state::sound_dma_control_w )
// sound_dma_base_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::sound_dma_base_w )
+void ste_state::sound_dma_base_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -996,7 +996,7 @@ WRITE8_MEMBER( ste_state::sound_dma_base_w )
// sound_dma_end_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::sound_dma_end_w )
+void ste_state::sound_dma_end_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -1022,7 +1022,7 @@ WRITE8_MEMBER( ste_state::sound_dma_end_w )
// sound_mode_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::sound_mode_w )
+void ste_state::sound_mode_w(uint8_t data)
{
m_dmasnd_mode = data & 0x83;
}
@@ -1084,7 +1084,7 @@ void ste_state::microwire_tick()
// microwire_data_r -
//-------------------------------------------------
-READ16_MEMBER( ste_state::microwire_data_r )
+uint16_t ste_state::microwire_data_r()
{
return m_mw_data;
}
@@ -1094,7 +1094,7 @@ READ16_MEMBER( ste_state::microwire_data_r )
// microwire_data_w -
//-------------------------------------------------
-WRITE16_MEMBER( ste_state::microwire_data_w )
+void ste_state::microwire_data_w(uint16_t data)
{
if (!m_microwire_timer->enabled())
{
@@ -1108,7 +1108,7 @@ WRITE16_MEMBER( ste_state::microwire_data_w )
// microwire_mask_r -
//-------------------------------------------------
-READ16_MEMBER( ste_state::microwire_mask_r )
+uint16_t ste_state::microwire_mask_r()
{
return m_mw_mask;
}
@@ -1118,7 +1118,7 @@ READ16_MEMBER( ste_state::microwire_mask_r )
// microwire_mask_w -
//-------------------------------------------------
-WRITE16_MEMBER( ste_state::microwire_mask_w )
+void ste_state::microwire_mask_w(uint16_t data)
{
if (!m_microwire_timer->enabled())
{
@@ -1136,7 +1136,7 @@ WRITE16_MEMBER( ste_state::microwire_mask_w )
// cache_r -
//-------------------------------------------------
-READ16_MEMBER( megaste_state::cache_r )
+uint16_t megaste_state::cache_r()
{
return m_cache;
}
@@ -1146,7 +1146,7 @@ READ16_MEMBER( megaste_state::cache_r )
// cache_w -
//-------------------------------------------------
-WRITE16_MEMBER( megaste_state::cache_w )
+void megaste_state::cache_w(uint16_t data)
{
m_cache = data;
@@ -1163,7 +1163,7 @@ WRITE16_MEMBER( megaste_state::cache_w )
// config_r -
//-------------------------------------------------
-READ16_MEMBER( stbook_state::config_r )
+uint16_t stbook_state::config_r()
{
/*
@@ -1196,7 +1196,7 @@ READ16_MEMBER( stbook_state::config_r )
// lcd_control_w -
//-------------------------------------------------
-WRITE16_MEMBER( stbook_state::lcd_control_w )
+void stbook_state::lcd_control_w(uint16_t data)
{
/*
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 42a3ead991f..ab55df326ad 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -85,7 +85,7 @@ TIMER_CALLBACK_MEMBER(atetris_state::interrupt_gen)
}
-WRITE8_MEMBER(atetris_state::irq_ack_w)
+void atetris_state::irq_ack_w(uint8_t data)
{
m_maincpu->set_input_line(0, CLEAR_LINE);
}
@@ -134,7 +134,7 @@ void atetris_state::machine_reset()
*
*************************************/
-READ8_MEMBER(atetris_state::slapstic_r)
+uint8_t atetris_state::slapstic_r(address_space &space, offs_t offset)
{
int result = m_slapstic_base[0x2000 + offset];
int new_bank = m_slapstic->slapstic_tweak(space, offset) & 1;
@@ -156,7 +156,7 @@ READ8_MEMBER(atetris_state::slapstic_r)
*
*************************************/
-WRITE8_MEMBER(atetris_state::coincount_w)
+void atetris_state::coincount_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, (data >> 5) & 1);
machine().bookkeeping().coin_counter_w(1, (data >> 4) & 1);
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index de25077c325..a8256bd35eb 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -97,7 +97,7 @@ INPUT_PORTS_END
I/O Ports
************************************************************/
-WRITE8_MEMBER( aussiebyte_state::port15_w )
+void aussiebyte_state::port15_w(uint8_t data)
{
membank("bankr0")->set_entry(m_port15); // point at ram
m_port15 = true;
@@ -115,7 +115,7 @@ WRITE8_MEMBER( aussiebyte_state::port15_w )
5 Disable 5.25 inch floppy spindle motors.
6 Unused.
7 Enable write precompensation on WD2797 controller. */
-WRITE8_MEMBER( aussiebyte_state::port16_w )
+void aussiebyte_state::port16_w(uint8_t data)
{
floppy_image_device *m_floppy = nullptr;
if ((data & 15) == 0)
@@ -142,7 +142,7 @@ WRITE8_MEMBER( aussiebyte_state::port16_w )
5 - SIO Ch D
6 - Ext ready 1
7 - Ext ready 2 */
-WRITE8_MEMBER( aussiebyte_state::port17_w )
+void aussiebyte_state::port17_w(uint8_t data)
{
m_port17 = data & 7;
m_dma->rdy_w(BIT(m_port17_rdy, data));
@@ -151,19 +151,19 @@ WRITE8_MEMBER( aussiebyte_state::port17_w )
/* FDC params
2 EXC: WD2797 clock frequency. H = 5.25"; L = 8"
3 WIEN: WD2797 Double density select. */
-WRITE8_MEMBER( aussiebyte_state::port18_w )
+void aussiebyte_state::port18_w(uint8_t data)
{
m_fdc->set_unscaled_clock(BIT(data, 2) ? 1e6 : 2e6);
m_fdc->dden_w(BIT(data, 3));
}
-READ8_MEMBER( aussiebyte_state::port19_r )
+uint8_t aussiebyte_state::port19_r()
{
return m_port19;
}
// Memory banking
-WRITE8_MEMBER( aussiebyte_state::port1a_w )
+void aussiebyte_state::port1a_w(uint8_t data)
{
data &= 7;
switch (data)
@@ -208,12 +208,12 @@ WRITE8_MEMBER( aussiebyte_state::port1a_w )
}
// Winchester control
-WRITE8_MEMBER( aussiebyte_state::port1b_w )
+void aussiebyte_state::port1b_w(uint8_t data)
{
}
// GPEHB control
-WRITE8_MEMBER( aussiebyte_state::port1c_w )
+void aussiebyte_state::port1c_w(uint8_t data)
{
}
@@ -224,7 +224,7 @@ void aussiebyte_state::port20_w(uint8_t data)
m_rtc->hold_w(BIT(data, 0));
}
-READ8_MEMBER( aussiebyte_state::port28_r )
+uint8_t aussiebyte_state::port28_r()
{
return m_port28;
}
@@ -234,7 +234,7 @@ READ8_MEMBER( aussiebyte_state::port28_r )
RTC
************************************************************/
-READ8_MEMBER( aussiebyte_state::rtc_r )
+uint8_t aussiebyte_state::rtc_r(offs_t offset)
{
m_rtc->read_w(1);
m_rtc->address_w(offset);
@@ -243,7 +243,7 @@ READ8_MEMBER( aussiebyte_state::rtc_r )
return data;
}
-WRITE8_MEMBER( aussiebyte_state::rtc_w )
+void aussiebyte_state::rtc_w(offs_t offset, uint8_t data)
{
m_rtc->address_w(offset);
m_rtc->data_w(data);
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index 4655321726d..5b3f930a43e 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -89,7 +89,7 @@ WRITE_LINE_MEMBER(avalnche_state::video_invert_w)
m_avalance_video_inverted = state;
}
-WRITE8_MEMBER(avalnche_state::catch_coin_counter_w)
+void avalnche_state::catch_coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 7488b860100..a1b26ee0273 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -186,7 +186,7 @@ void avigo_state::avigo_mem(address_map &map)
}
-READ8_MEMBER(avigo_state::key_data_read_r)
+uint8_t avigo_state::key_data_read_r()
{
uint8_t data = 0x0f;
@@ -217,7 +217,7 @@ READ8_MEMBER(avigo_state::key_data_read_r)
/* set key line(s) to read */
/* bit 0 set for line 0, bit 1 set for line 1, bit 2 set for line 2 */
-WRITE8_MEMBER(avigo_state::set_key_line_w)
+void avigo_state::set_key_line_w(uint8_t data)
{
/* 5, 101, read back 3 */
m_key_line = data;
@@ -225,19 +225,19 @@ WRITE8_MEMBER(avigo_state::set_key_line_w)
m_warm_start = BIT(data, 3);
}
-READ8_MEMBER(avigo_state::irq_r)
+uint8_t avigo_state::irq_r()
{
return m_irq;
}
-WRITE8_MEMBER(avigo_state::irq_w)
+void avigo_state::irq_w(uint8_t data)
{
m_irq &= data;
refresh_ints();
}
-WRITE8_MEMBER(avigo_state::port2_w)
+void avigo_state::port2_w(uint8_t data)
{
/*
bit 4 LCD backlight on/off
@@ -250,17 +250,17 @@ WRITE8_MEMBER(avigo_state::port2_w)
m_port2 = data;
}
-READ8_MEMBER(avigo_state::bank1_r)
+uint8_t avigo_state::bank1_r(offs_t offset)
{
return offset ? m_bank1_h: m_bank1_l;
}
-READ8_MEMBER(avigo_state::bank2_r)
+uint8_t avigo_state::bank2_r(offs_t offset)
{
return offset ? m_bank2_h: m_bank2_l;
}
-WRITE8_MEMBER(avigo_state::bank1_w)
+void avigo_state::bank1_w(offs_t offset, uint8_t data)
{
if (offset)
{
@@ -276,7 +276,7 @@ WRITE8_MEMBER(avigo_state::bank1_w)
m_bankdev1->set_bank(((m_bank1_h & 0x07) << 8) | m_bank1_l);
}
-WRITE8_MEMBER(avigo_state::bank2_w)
+void avigo_state::bank2_w(offs_t offset, uint8_t data)
{
if (offset)
{
@@ -292,14 +292,14 @@ WRITE8_MEMBER(avigo_state::bank2_w)
m_bankdev2->set_bank(((m_bank2_h & 0x07) << 8) | m_bank2_l);
}
-READ8_MEMBER(avigo_state::ad_control_status_r)
+uint8_t avigo_state::ad_control_status_r()
{
LOG(("avigo ad control read %02x\n", (int) m_ad_control_status));
return m_ad_control_status;
}
-WRITE8_MEMBER(avigo_state::ad_control_status_w)
+void avigo_state::ad_control_status_w(uint8_t data)
{
LOG(("avigo ad control w %02x\n",data));
@@ -375,7 +375,7 @@ WRITE8_MEMBER(avigo_state::ad_control_status_w)
m_ad_control_status = data | 1;
}
-READ8_MEMBER(avigo_state::ad_data_r)
+uint8_t avigo_state::ad_data_r()
{
uint8_t data = 0;
@@ -477,7 +477,7 @@ READ8_MEMBER(avigo_state::ad_data_r)
}
-WRITE8_MEMBER(avigo_state::speaker_w)
+void avigo_state::speaker_w(uint8_t data)
{
/* Speaker output state */
m_speaker->level_w(BIT(data, 3));
@@ -490,7 +490,7 @@ WRITE8_MEMBER(avigo_state::speaker_w)
/* port 0x029:
port 0x02e */
-READ8_MEMBER(avigo_state::port_04_r)
+uint8_t avigo_state::port_04_r()
{
/* must be both 0 for it to boot! */
return 0x0ff^((1<<7) | (1<<5));
diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp
index 43c8dc6fb72..49c038a60f2 100644
--- a/src/mame/drivers/aztarac.cpp
+++ b/src/mame/drivers/aztarac.cpp
@@ -63,7 +63,7 @@ void aztarac_state::nvram_store_w(uint16_t data)
*
*************************************/
-READ16_MEMBER(aztarac_state::joystick_r)
+uint16_t aztarac_state::joystick_r()
{
return (((ioport("STICKZ")->read() - 0xf) << 8) |
((ioport("STICKY")->read() - 0xf) & 0xff));
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index 17ee6814ee0..a8968cae49b 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -226,7 +226,7 @@ INTERRUPT_GEN_MEMBER(badlands_state::vblank_int)
m_maincpu->set_input_line(M68K_IRQ_1, ASSERT_LINE);
}
-WRITE16_MEMBER(badlands_state::video_int_ack_w)
+void badlands_state::video_int_ack_w(uint16_t data)
{
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
}
diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp
index cfbb3e1de5d..e828b3abf54 100644
--- a/src/mame/drivers/badlandsbl.cpp
+++ b/src/mame/drivers/badlandsbl.cpp
@@ -76,23 +76,23 @@ uint32_t badlandsbl_state::screen_update_badlandsbl(screen_device &screen, bitma
}
-READ16_MEMBER(badlandsbl_state::badlandsb_unk_r)
+uint16_t badlandsbl_state::badlandsb_unk_r()
{
return 0xffff;
}
// TODO: this prolly mimics audio_io_r/_w in original version
-READ8_MEMBER(badlandsbl_state::bootleg_shared_r)
+uint8_t badlandsbl_state::bootleg_shared_r(offs_t offset)
{
return m_b_sharedram[offset];
}
-WRITE8_MEMBER(badlandsbl_state::bootleg_shared_w)
+void badlandsbl_state::bootleg_shared_w(offs_t offset, uint8_t data)
{
m_b_sharedram[offset] = data;
}
-READ8_MEMBER(badlandsbl_state::sound_response_r)
+uint8_t badlandsbl_state::sound_response_r()
{
m_maincpu->set_input_line(2, CLEAR_LINE);
return m_sound_response;
@@ -127,7 +127,7 @@ void badlandsbl_state::bootleg_map(address_map &map)
map(0xfff000, 0xffffff).ram();
}
-WRITE8_MEMBER(badlandsbl_state::bootleg_main_irq_w)
+void badlandsbl_state::bootleg_main_irq_w(uint8_t data)
{
m_maincpu->set_input_line(2, ASSERT_LINE);
m_sound_response = data;
diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp
index c54be51c780..61f4db5acd1 100644
--- a/src/mame/drivers/bagman.cpp
+++ b/src/mame/drivers/bagman.cpp
@@ -89,9 +89,9 @@ void squaitsa_state::machine_start()
}
-WRITE8_MEMBER(bagman_state::ls259_w)
+void bagman_state::ls259_w(offs_t offset, uint8_t data)
{
- pal16r6_w(space, offset,data); /*this is just a simulation*/
+ pal16r6_w(offset, data); /*this is just a simulation*/
if (m_tmslatch.found())
m_tmslatch->write_bit(offset, data & 1);
diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp
index f95324f26ee..d284fbd1eb5 100644
--- a/src/mame/drivers/batman.cpp
+++ b/src/mame/drivers/batman.cpp
@@ -49,7 +49,7 @@ void batman_state::machine_start()
*
*************************************/
-WRITE16_MEMBER(batman_state::latch_w)
+void batman_state::latch_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int oldword = m_latch_data;
COMBINE_DATA(&m_latch_data);
diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp
index 56ba430372c..bf752bdc4a7 100644
--- a/src/mame/drivers/battlane.cpp
+++ b/src/mame/drivers/battlane.cpp
@@ -27,7 +27,7 @@
*
*************************************/
-WRITE8_MEMBER(battlane_state::battlane_cpu_command_w)
+void battlane_state::battlane_cpu_command_w(uint8_t data)
{
m_cpu_control = data;
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index b076294bb2b..a43185575e1 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -37,12 +37,12 @@ WRITE_LINE_MEMBER(battlnts_state::vblank_irq)
m_maincpu->set_input_line(HD6309_IRQ_LINE, HOLD_LINE);
}
-WRITE8_MEMBER(battlnts_state::battlnts_sh_irqtrigger_w)
+void battlnts_state::battlnts_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
-WRITE8_MEMBER(battlnts_state::battlnts_bankswitch_w)
+void battlnts_state::battlnts_bankswitch_w(uint8_t data)
{
/* bits 6 & 7 = bank number */
m_rombank->set_entry((data & 0xc0) >> 6);
diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp
index 74720a212f0..b1f6b26f756 100644
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@@ -249,32 +249,32 @@ void bbusters_state::machine_start()
bbusters_state_base::machine_start();
}
-WRITE8_MEMBER(bbusters_state_base::sound_cpu_w)
+void bbusters_state_base::sound_cpu_w(uint8_t data)
{
m_soundlatch[0]->write(data&0xff);
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
/* Eprom is byte wide, top half of word _must_ be 0xff */
-READ16_MEMBER(bbusters_state::eprom_r)
+uint16_t bbusters_state::eprom_r(offs_t offset)
{
return (m_eprom_data[offset]&0xff) | 0xff00;
}
-WRITE16_MEMBER(bbusters_state::three_gun_output_w)
+void bbusters_state::three_gun_output_w(uint16_t data)
{
for (int i = 0; i < 3; i++)
m_gun_recoil[i] = BIT(data, i);
}
template<int Layer>
-WRITE16_MEMBER(bbusters_state_base::pf_w)
+void bbusters_state_base::pf_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_pf_data[Layer][offset]);
m_pf_tilemap[Layer]->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bbusters_state_base::coin_counter_w)
+void bbusters_state_base::coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
machine().bookkeeping().coin_counter_w(1, BIT(data, 1));
@@ -312,13 +312,13 @@ void bbusters_state::bbusters_map(address_map &map)
/*******************************************************************************/
-WRITE16_MEMBER(mechatt_state::two_gun_output_w)
+void mechatt_state::two_gun_output_w(uint16_t data)
{
for (int i = 0; i < 2; i++)
m_gun_recoil[i] = BIT(data, i);
}
-READ16_MEMBER(mechatt_state::mechatt_gun_r)
+uint16_t mechatt_state::mechatt_gun_r(offs_t offset)
{
int x, y;
diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp
index bcb16369f56..142766c28d8 100644
--- a/src/mame/drivers/beathead.cpp
+++ b/src/mame/drivers/beathead.cpp
@@ -187,7 +187,7 @@ void beathead_state::update_interrupts()
}
-WRITE32_MEMBER( beathead_state::interrupt_control_w )
+void beathead_state::interrupt_control_w(offs_t offset, uint32_t data)
{
int irq = offset & 3;
int control = (offset >> 2) & 1;
@@ -205,7 +205,7 @@ WRITE32_MEMBER( beathead_state::interrupt_control_w )
}
-READ32_MEMBER( beathead_state::interrupt_control_r )
+uint32_t beathead_state::interrupt_control_r()
{
/* return the enables as a bitfield */
return (m_irq_enable[0]) | (m_irq_enable[1] << 1) | (m_irq_enable[2] << 2);
@@ -219,7 +219,7 @@ READ32_MEMBER( beathead_state::interrupt_control_r )
*
*************************************/
-WRITE32_MEMBER( beathead_state::sound_reset_w )
+void beathead_state::sound_reset_w(offs_t offset, uint32_t data)
{
logerror("Sound reset = %d\n", !offset);
m_jsa->soundcpu().set_input_line(INPUT_LINE_RESET, offset ? CLEAR_LINE : ASSERT_LINE);
@@ -233,7 +233,7 @@ WRITE32_MEMBER( beathead_state::sound_reset_w )
*
*************************************/
-WRITE32_MEMBER( beathead_state::coin_count_w )
+void beathead_state::coin_count_w(offs_t offset, uint32_t data)
{
machine().bookkeeping().coin_counter_w(0, !offset);
}
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index 24c93e75ef5..ccd3f04adbb 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -28,8 +28,8 @@
#include "formats/pc_dsk.h"
#include "machine/8042kbdc.h"
-READ8_MEMBER(bebox_state::at_dma8237_1_r) { return m_dma8237[1]->read(offset / 2); }
-WRITE8_MEMBER(bebox_state::at_dma8237_1_w) { m_dma8237[1]->write(offset / 2, data); }
+uint8_t bebox_state::at_dma8237_1_r(offs_t offset) { return m_dma8237[1]->read(offset / 2); }
+void bebox_state::at_dma8237_1_w(offs_t offset, uint8_t data) { m_dma8237[1]->write(offset / 2, data); }
void bebox_state::main_mem(address_map &map)
{
@@ -71,7 +71,7 @@ void bebox_state::main_mem(address_map &map)
// The following is a gross hack to let the BeBox boot ROM identify the processors correctly.
// This needs to be done in a better way if someone comes up with one.
-READ64_MEMBER(bebox_state::bb_slave_64be_r)
+uint64_t bebox_state::bb_slave_64be_r(offs_t offset, uint64_t mem_mask)
{
// 2e94 is the real address, 2e84 is where the PC appears to be under full DRC
if ((m_ppc[1]->pc() == 0xfff02e94) || (m_ppc[1]->pc() == 0xfff02e84))
@@ -79,7 +79,7 @@ READ64_MEMBER(bebox_state::bb_slave_64be_r)
return 0x108000ff; // indicate slave CPU
}
- return m_pcibus->read_64be(space, offset, mem_mask);
+ return m_pcibus->read_64be(offset, mem_mask);
}
void bebox_state::slave_mem(address_map &map)
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index fc346f97d84..2b306b9070d 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -271,7 +271,7 @@ uint8_t sc4_state::read_input_matrix(int row)
return value;
}
-READ16_MEMBER(sc4_state::sc4_cs1_r)
+uint16_t sc4_state::sc4_cs1_r(offs_t offset, uint16_t mem_mask)
{
int pc = m_maincpu->pc();
@@ -321,7 +321,7 @@ READ16_MEMBER(sc4_state::sc4_cs1_r)
return 0x0000;
}
-READ16_MEMBER(sc4_state::sc4_mem_r)
+uint16_t sc4_state::sc4_mem_r(offs_t offset, uint16_t mem_mask)
{
int pc = m_maincpu->pc();
int cs = m_maincpu->get_cs(offset * 2);
@@ -333,7 +333,7 @@ READ16_MEMBER(sc4_state::sc4_mem_r)
switch ( cs )
{
case 1:
- return sc4_cs1_r(space,offset,mem_mask);
+ return sc4_cs1_r(offset);
case 2:
base = 0x800000/2;
@@ -452,7 +452,7 @@ void bfm_sc45_state::machine_start()
m_digits.resolve();
}
-WRITE8_MEMBER(bfm_sc45_state::mux_output_w)
+void bfm_sc45_state::mux_output_w(offs_t offset, uint8_t data)
{
int const off = offset<<3;
@@ -460,7 +460,7 @@ WRITE8_MEMBER(bfm_sc45_state::mux_output_w)
m_lamps[off+i] = BIT(data, i);
}
-WRITE8_MEMBER(bfm_sc45_state::mux_output2_w)
+void bfm_sc45_state::mux_output2_w(offs_t offset, uint8_t data)
{
int const off = offset<<3;
@@ -495,7 +495,7 @@ WRITE8_MEMBER(bfm_sc45_state::mux_output2_w)
}
}
-WRITE16_MEMBER(sc4_state::sc4_mem_w)
+void sc4_state::sc4_mem_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int pc = m_maincpu->pc();
int cs = m_maincpu->get_cs(offset * 2);
@@ -536,7 +536,7 @@ WRITE16_MEMBER(sc4_state::sc4_mem_w)
if (ACCESSING_BITS_0_7)
{ // lamps
- mux_output_w(space, (addr & 0x01f0)>>4, data);
+ mux_output_w((addr & 0x01f0)>>4, data);
}
}
@@ -549,7 +549,7 @@ WRITE16_MEMBER(sc4_state::sc4_mem_w)
if (ACCESSING_BITS_0_7)
{ // lamps
- mux_output2_w(space, (addr & 0x01f0)>>4, data);
+ mux_output2_w((addr & 0x01f0)>>4, data);
}
}
else
@@ -571,7 +571,7 @@ WRITE16_MEMBER(sc4_state::sc4_mem_w)
break;
case 0x1330:
- bfm_sc4_reel4_w(space,0,data&0xf);
+ bfm_sc4_reel4_w(data&0xf);
//m_meterstatus = (m_meterstatus&0x3f) | ((data & 0x30) << 2);
m_sec->data_w(~data&0x10);
break;
@@ -621,7 +621,7 @@ void sc4_state::sc4_map(address_map &map)
-READ32_MEMBER(sc4_adder4_state::adder4_mem_r)
+uint32_t sc4_adder4_state::adder4_mem_r(offs_t offset, uint32_t mem_mask)
{
int pc = m_adder4cpu->pc();
int cs = m_adder4cpu->get_cs(offset * 4);
@@ -644,7 +644,7 @@ READ32_MEMBER(sc4_adder4_state::adder4_mem_r)
return 0x0000;
}
-WRITE32_MEMBER(sc4_adder4_state::adder4_mem_w)
+void sc4_adder4_state::adder4_mem_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
int pc = m_adder4cpu->pc();
int cs = m_adder4cpu->get_cs(offset * 4);
@@ -749,7 +749,7 @@ void sc4_state::bfm_sc4_68307_porta_w(address_space &space, bool dedicated, uint
}
}
-WRITE8_MEMBER( sc4_state::bfm_sc4_reel3_w )
+void sc4_state::bfm_sc4_reel3_w(uint8_t data)
{
m_reel3_latch = data;
@@ -760,7 +760,7 @@ WRITE8_MEMBER( sc4_state::bfm_sc4_reel3_w )
}
}
-WRITE8_MEMBER( sc4_state::bfm_sc4_reel4_w )
+void sc4_state::bfm_sc4_reel4_w(uint8_t data)
{
m_reel4_latch = data;
@@ -781,7 +781,7 @@ void sc4_state::bfm_sc4_68307_portb_w(address_space &space, bool dedicated, uint
bfm_sc45_write_serial_vfd((data & 0x4000)?1:0, (data & 0x1000)?1:0, !(data & 0x2000)?1:0);
- bfm_sc4_reel3_w(space, 0, (data&0x0f00)>>8, 0xff);
+ bfm_sc4_reel3_w((data&0x0f00)>>8);
}
}
diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp
index b4b64fba746..7aecae41f74 100644
--- a/src/mame/drivers/bfm_sc5.cpp
+++ b/src/mame/drivers/bfm_sc5.cpp
@@ -147,7 +147,7 @@ PL1 = Compact Flash Slot
-WRITE16_MEMBER( bfm_sc5_state::sc5_duart_w )
+void bfm_sc5_state::sc5_duart_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// clearly a duart of some kind, write patterns are the same as SC4 games
// logerror("%s: duart_w %1x %04x %04x\n", machine().describe_context(), offset, data, mem_mask);
@@ -163,7 +163,7 @@ WRITE16_MEMBER( bfm_sc5_state::sc5_duart_w )
}
-READ8_MEMBER( bfm_sc5_state::sc5_mux1_r )
+uint8_t bfm_sc5_state::sc5_mux1_r(offs_t offset)
{
switch (offset)
{
@@ -177,11 +177,11 @@ READ8_MEMBER( bfm_sc5_state::sc5_mux1_r )
}
-WRITE8_MEMBER( bfm_sc5_state::sc5_mux1_w )
+void bfm_sc5_state::sc5_mux1_w(offs_t offset, uint8_t data)
{
if ((offset&0xf)==0)
{
- mux_output_w(space, (offset & 0x01f0)>>4, data);
+ mux_output_w((offset & 0x01f0)>>4, data);
}
else
{
@@ -191,11 +191,11 @@ WRITE8_MEMBER( bfm_sc5_state::sc5_mux1_w )
-WRITE8_MEMBER( bfm_sc5_state::sc5_mux2_w )
+void bfm_sc5_state::sc5_mux2_w(offs_t offset, uint8_t data)
{
if ((offset&0xf)==0)
{
- mux_output2_w(space, (offset & 0x01f0)>>4, data);
+ mux_output2_w((offset & 0x01f0)>>4, data);
}
else
{
@@ -281,7 +281,7 @@ void bfm_sc5_state::sc5_map(address_map &map)
INPUT_PORTS_START( bfm_sc5 )
INPUT_PORTS_END
-READ8_MEMBER( bfm_sc5_state::sc5_10202F0_r )
+uint8_t bfm_sc5_state::sc5_10202F0_r(offs_t offset)
{
switch (offset)
{
@@ -296,7 +296,7 @@ READ8_MEMBER( bfm_sc5_state::sc5_10202F0_r )
return 0;
}
-WRITE8_MEMBER( bfm_sc5_state::sc5_10202F0_w )
+void bfm_sc5_state::sc5_10202F0_w(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp
index ce0aa3614f9..b5892da6ace 100644
--- a/src/mame/drivers/bigevglf.cpp
+++ b/src/mame/drivers/bigevglf.cpp
@@ -69,7 +69,7 @@ J1100072A
#include "speaker.h"
-WRITE8_MEMBER(bigevglf_state::beg_banking_w)
+void bigevglf_state::beg_banking_w(uint8_t data)
{
m_beg_bank = data;
@@ -79,7 +79,7 @@ WRITE8_MEMBER(bigevglf_state::beg_banking_w)
membank("bank1")->set_entry(m_beg_bank & 0xff); /* empty sockets for IC37-IC44 ROMS */
}
-READ8_MEMBER(bigevglf_state::soundstate_r)
+uint8_t bigevglf_state::soundstate_r()
{
uint8_t sound_state = m_soundlatch[0]->pending_r() ? 0 : 1;
sound_state |= m_soundlatch[1]->pending_r() ? 2 : 0;
@@ -94,27 +94,27 @@ TIMER_CALLBACK_MEMBER(bigevglf_state::deferred_ls74_w)
}
/* do this on a timer to let the CPUs synchronize */
-WRITE8_MEMBER(bigevglf_state::beg13_a_clr_w)
+void bigevglf_state::beg13_a_clr_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(bigevglf_state::deferred_ls74_w),this), (0 << 8) | 0);
}
-WRITE8_MEMBER(bigevglf_state::beg13_b_clr_w)
+void bigevglf_state::beg13_b_clr_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(bigevglf_state::deferred_ls74_w),this), (1 << 8) | 0);
}
-WRITE8_MEMBER(bigevglf_state::beg13_a_set_w)
+void bigevglf_state::beg13_a_set_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(bigevglf_state::deferred_ls74_w),this), (0 << 8) | 1);
}
-WRITE8_MEMBER(bigevglf_state::beg13_b_set_w)
+void bigevglf_state::beg13_b_set_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(bigevglf_state::deferred_ls74_w),this), (1 << 8) | 1);
}
-READ8_MEMBER(bigevglf_state::beg_status_r)
+uint8_t bigevglf_state::beg_status_r()
{
/* d0 = Q of 74ls74 IC13(partA)
d1 = Q of 74ls74 IC13(partB)
@@ -131,21 +131,21 @@ READ8_MEMBER(bigevglf_state::beg_status_r)
}
-READ8_MEMBER(bigevglf_state::beg_trackball_x_r)
+uint8_t bigevglf_state::beg_trackball_x_r()
{
static const char *const portx_name[2] = { "P1X", "P2X" };
return ioport(portx_name[m_port_select])->read();
}
-READ8_MEMBER(bigevglf_state::beg_trackball_y_r)
+uint8_t bigevglf_state::beg_trackball_y_r()
{
static const char *const porty_name[2] = { "P1Y", "P2Y" };
return ioport(porty_name[m_port_select])->read();
}
-WRITE8_MEMBER(bigevglf_state::beg_port08_w)
+void bigevglf_state::beg_port08_w(uint8_t data)
{
m_port_select = (data & 0x04) >> 2;
}
@@ -269,7 +269,7 @@ void bigevglf_state::sub_map(address_map &map)
}
-READ8_MEMBER(bigevglf_state::sub_cpu_mcu_coin_port_r)
+uint8_t bigevglf_state::sub_cpu_mcu_coin_port_r()
{
/*
bit 0 and bit 1 = coin inputs
diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp
index 07d62161665..570d7d89314 100644
--- a/src/mame/drivers/bishi.cpp
+++ b/src/mame/drivers/bishi.cpp
@@ -93,18 +93,18 @@ Notes:
#include "speaker.h"
-READ16_MEMBER(bishi_state::control_r)
+uint16_t bishi_state::control_r()
{
return m_cur_control;
}
-WRITE16_MEMBER(bishi_state::control_w)
+void bishi_state::control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// bit 8 = interrupt gate
COMBINE_DATA(&m_cur_control);
}
-WRITE16_MEMBER(bishi_state::control2_w)
+void bishi_state::control2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// bit 12 = part of the banking calculation for the K056832 ROM readback
COMBINE_DATA(&m_cur_control2);
@@ -125,12 +125,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(bishi_state::bishi_scanline)
}
/* compensate for a bug in the ram/rom test */
-READ16_MEMBER(bishi_state::bishi_mirror_r)
+uint16_t bishi_state::bishi_mirror_r(offs_t offset)
{
return m_palette->basemem().read16(offset);
}
-READ16_MEMBER(bishi_state::bishi_K056832_rom_r)
+uint16_t bishi_state::bishi_K056832_rom_r(offs_t offset)
{
uint16_t ouroffs;
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index a0fc581bb76..a7552593bba 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -29,50 +29,50 @@ DIP Locations verified for:
#include "speaker.h"
-READ8_MEMBER(bking_state::bking_sndnmi_disable_r)
+uint8_t bking_state::bking_sndnmi_disable_r()
{
m_soundnmi->in_w<1>(0);
return 0;
}
-WRITE8_MEMBER(bking_state::bking_sndnmi_enable_w)
+void bking_state::bking_sndnmi_enable_w(uint8_t data)
{
m_soundnmi->in_w<1>(1);
}
-WRITE8_MEMBER(bking_state::bking_soundlatch_w)
+void bking_state::bking_soundlatch_w(uint8_t data)
{
m_soundlatch->write(bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7));
}
-WRITE8_MEMBER(bking_state::bking3_addr_l_w)
+void bking_state::bking3_addr_l_w(uint8_t data)
{
m_addr_l = data;
}
-WRITE8_MEMBER(bking_state::bking3_addr_h_w)
+void bking_state::bking3_addr_h_w(uint8_t data)
{
m_addr_h = data;
}
-READ8_MEMBER(bking_state::bking3_extrarom_r)
+uint8_t bking_state::bking3_extrarom_r()
{
uint8_t *rom = memregion("user2")->base();
return rom[m_addr_h * 256 + m_addr_l];
}
-WRITE8_MEMBER(bking_state::unk_w)
+void bking_state::unk_w(uint8_t data)
{
// 0 = finished reading extra rom
// 1 = started reading extra rom
}
-READ8_MEMBER(bking_state::bking3_ext_check_r)
+uint8_t bking_state::bking3_ext_check_r()
{
return 0x31; //no "bad rom.", no "bad ext."
}
-READ8_MEMBER(bking_state::bking3_mcu_status_r)
+uint8_t bking_state::bking3_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
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index c3158356de4..225f8c8495f 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -57,7 +57,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(bladestl_state::bladestl_scanline)
*
*************************************/
-READ8_MEMBER(bladestl_state::trackball_r)
+uint8_t bladestl_state::trackball_r(offs_t offset)
{
int curr = m_trackball[offset]->read();
int delta = (curr - m_last_track[offset]) & 0xff;
@@ -66,7 +66,7 @@ READ8_MEMBER(bladestl_state::trackball_r)
return (delta & 0x80) | (curr >> 1);
}
-WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w)
+void bladestl_state::bladestl_bankswitch_w(uint8_t data)
{
/* bits 0 & 1 = coin counters */
machine().bookkeeping().coin_counter_w(0,data & 0x01);
@@ -101,12 +101,12 @@ void bladestl_state::bladestl_port_B_w(uint8_t data)
m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */
}
-READ8_MEMBER(bladestl_state::bladestl_speech_busy_r)
+uint8_t bladestl_state::bladestl_speech_busy_r()
{
return m_upd7759->busy_r() ? 1 : 0;
}
-WRITE8_MEMBER(bladestl_state::bladestl_speech_ctrl_w)
+void bladestl_state::bladestl_speech_ctrl_w(uint8_t data)
{
m_upd7759->reset_w(data & 1);
m_upd7759->start_w(data & 2);
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index d986e70e341..56996780be5 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -32,12 +32,12 @@ Protection comms between main cpu and i8751
**************************************************/
-READ8_MEMBER(blktiger_state::blktiger_from_mcu_r)
+uint8_t blktiger_state::blktiger_from_mcu_r()
{
return m_i8751_latch;
}
-WRITE8_MEMBER(blktiger_state::blktiger_to_mcu_w)
+void blktiger_state::blktiger_to_mcu_w(uint8_t data)
{
m_mcu->set_input_line(MCS51_INT1_LINE, ASSERT_LINE);
m_z80_latch = data;
@@ -58,12 +58,12 @@ void blktiger_state::blktiger_to_main_w(uint8_t data)
-WRITE8_MEMBER(blktiger_state::blktiger_bankswitch_w)
+void blktiger_state::blktiger_bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x0f);
}
-WRITE8_MEMBER(blktiger_state::blktiger_coinlockout_w)
+void blktiger_state::blktiger_coinlockout_w(uint8_t data)
{
if (ioport("COIN_LOCKOUT")->read() & 0x01)
{
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index 827c4be384f..f713061b1e0 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -46,7 +46,7 @@ Check game speed, it depends on a bit we toggle..
/* The top 64k of samples are banked (16 banks total) */
-WRITE8_MEMBER(blmbycar_state::okibank_w)
+void blmbycar_state::okibank_w(uint8_t data)
{
m_okibank->set_entry(data & 0x0f);
}
@@ -61,19 +61,19 @@ WRITE8_MEMBER(blmbycar_state::okibank_w)
/* Preliminary potentiometric wheel support */
-WRITE8_MEMBER(blmbycar_state::blmbycar_pot_wheel_reset_w)
+void blmbycar_state::blmbycar_pot_wheel_reset_w(uint8_t data)
{
m_pot_wheel = m_pot_wheel_io->read() & 0xff;
}
-WRITE8_MEMBER(blmbycar_state::blmbycar_pot_wheel_shift_w)
+void blmbycar_state::blmbycar_pot_wheel_shift_w(uint8_t data)
{
if ( ((m_old_val & 0xff) == 0xff) && ((data & 0xff) == 0) )
m_pot_wheel <<= 1;
m_old_val = data;
}
-READ16_MEMBER(blmbycar_state::blmbycar_pot_wheel_r)
+uint16_t blmbycar_state::blmbycar_pot_wheel_r()
{
return ((m_pot_wheel & 0x80) ? 0x04 : 0) | (machine().rand() & 0x08);
}
@@ -81,7 +81,7 @@ READ16_MEMBER(blmbycar_state::blmbycar_pot_wheel_r)
/* Preliminary optical wheel support */
-READ16_MEMBER(blmbycar_state::blmbycar_opt_wheel_r)
+uint16_t blmbycar_state::blmbycar_opt_wheel_r()
{
return ((m_opt_wheel_io->read() & 0xff) << 8) | 0xff;
}
@@ -96,7 +96,7 @@ READ16_MEMBER(blmbycar_state::blmbycar_opt_wheel_r)
***************************************************************************/
template<int Layer>
-WRITE16_MEMBER(blmbycar_state::vram_w)
+void blmbycar_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram[Layer][offset]);
m_tilemap[Layer]->mark_tile_dirty(offset / 2);
@@ -144,7 +144,7 @@ void blmbycar_state::blmbycar_map(address_map &map)
map(0x70007b, 0x70007b).w(FUNC(blmbycar_state::blmbycar_pot_wheel_shift_w)); //
}
-READ16_MEMBER(blmbycar_state::waterball_unk_r)
+uint16_t blmbycar_state::waterball_unk_r()
{
m_retvalue ^= 0x0008; // must toggle.. but not vblank?
return m_retvalue;
diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp
index 1820a11a08d..fdc42205044 100644
--- a/src/mame/drivers/blockout.cpp
+++ b/src/mame/drivers/blockout.cpp
@@ -79,12 +79,12 @@
#define MAIN_CLOCK XTAL(10'000'000)
#define AUDIO_CLOCK XTAL(3'579'545)
-WRITE16_MEMBER(blockout_state::blockout_irq6_ack_w)
+void blockout_state::blockout_irq6_ack_w(uint16_t data)
{
m_maincpu->set_input_line(6, CLEAR_LINE);
}
-WRITE16_MEMBER(blockout_state::blockout_irq5_ack_w)
+void blockout_state::blockout_irq5_ack_w(uint16_t data)
{
m_maincpu->set_input_line(5, CLEAR_LINE);
}
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index cbef8a0c7d9..b0e516c735a 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -515,7 +515,7 @@ void bloodbro_state::layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_m
COMBINE_DATA(&m_scrollram[offset]);
}
-WRITE16_MEMBER( bloodbro_state::weststry_layer_scroll_w )
+void bloodbro_state::weststry_layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_scrollram[offset]);
}
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index 7795f327f4e..07343c7bb3a 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -70,12 +70,12 @@ void blueprnt_state::dipsw_w(uint8_t data)
m_dipsw = data;
}
-READ8_MEMBER(blueprnt_state::blueprnt_sh_dipsw_r)
+uint8_t blueprnt_state::blueprnt_sh_dipsw_r()
{
return m_dipsw;
}
-READ8_MEMBER(blueprnt_state::grasspin_sh_dipsw_r)
+uint8_t blueprnt_state::grasspin_sh_dipsw_r()
{
// judging from the disasm, it looks like simple protection was added
// d6: small possibility it's for comms? but the fact that there's a Freeze switch on the pcb rules this out
@@ -83,13 +83,13 @@ READ8_MEMBER(blueprnt_state::grasspin_sh_dipsw_r)
return (m_dipsw & 0x7f) | 0x80;
}
-WRITE8_MEMBER(blueprnt_state::blueprnt_sound_command_w)
+void blueprnt_state::blueprnt_sound_command_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-WRITE8_MEMBER(blueprnt_state::blueprnt_coin_counter_w)
+void blueprnt_state::blueprnt_coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp
index a8a83bdc7c0..5c806149779 100644
--- a/src/mame/drivers/bogeyman.cpp
+++ b/src/mame/drivers/bogeyman.cpp
@@ -25,12 +25,12 @@
// Sound section is copied from Mysterious Stones driver by Nicola, Mike, Brad
-WRITE8_MEMBER(bogeyman_state::ay8910_latch_w)
+void bogeyman_state::ay8910_latch_w(uint8_t data)
{
m_psg_latch = data;
}
-WRITE8_MEMBER(bogeyman_state::ay8910_control_w)
+void bogeyman_state::ay8910_control_w(uint8_t data)
{
// bit 0 is flipscreen
flip_screen_set(data & 0x01);
diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp
index c884dc89d10..d1106f59f12 100644
--- a/src/mame/drivers/bombjack.cpp
+++ b/src/mame/drivers/bombjack.cpp
@@ -106,7 +106,7 @@ Dip Locations and factory settings verified with manual
#include "speaker.h"
-READ8_MEMBER(bombjack_state::soundlatch_read_and_clear)
+uint8_t bombjack_state::soundlatch_read_and_clear()
{
// An extra flip-flop is used to clear the LS273 after reading it through a LS245
// (this flip-flop is then cleared in sync with the sound CPU clock)
@@ -123,7 +123,7 @@ READ8_MEMBER(bombjack_state::soundlatch_read_and_clear)
*
*************************************/
-WRITE8_MEMBER(bombjack_state::irq_mask_w)
+void bombjack_state::irq_mask_w(uint8_t data)
{
m_nmi_mask = BIT(data, 0);
if (!m_nmi_mask)
diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp
index 687957c58e5..c94102fd4f2 100644
--- a/src/mame/drivers/boogwing.cpp
+++ b/src/mame/drivers/boogwing.cpp
@@ -96,7 +96,7 @@
#define MAIN_XTAL XTAL(28'000'000)
#define SOUND_XTAL XTAL(32'220'000)
-READ16_MEMBER( boogwing_state::boogwing_protection_region_0_104_r )
+uint16_t boogwing_state::boogwing_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;
@@ -105,7 +105,7 @@ READ16_MEMBER( boogwing_state::boogwing_protection_region_0_104_r )
return data;
}
-WRITE16_MEMBER( boogwing_state::boogwing_protection_region_0_104_w )
+void boogwing_state::boogwing_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;
@@ -113,7 +113,7 @@ WRITE16_MEMBER( boogwing_state::boogwing_protection_region_0_104_w )
m_deco104->write_data( deco146_addr, data, mem_mask, cs );
}
-WRITE16_MEMBER( boogwing_state::priority_w )
+void boogwing_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_priority);
}
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index 8276aca6732..ccbfb0fdae6 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -25,7 +25,7 @@
#include "speaker.h"
-READ8_MEMBER(bottom9_state::k052109_051960_r)
+uint8_t bottom9_state::k052109_051960_r(offs_t offset)
{
if (m_k052109->get_rmrd_line() == CLEAR_LINE)
{
@@ -40,7 +40,7 @@ READ8_MEMBER(bottom9_state::k052109_051960_r)
return m_k052109->read(offset);
}
-WRITE8_MEMBER(bottom9_state::k052109_051960_w)
+void bottom9_state::k052109_051960_w(offs_t offset, uint8_t data)
{
if (offset >= 0x3800 && offset < 0x3808)
m_k051960->k051937_w(offset - 0x3800, data);
@@ -50,10 +50,10 @@ WRITE8_MEMBER(bottom9_state::k052109_051960_w)
m_k051960->k051960_w(offset - 0x3c00, data);
}
-READ8_MEMBER(bottom9_state::bottom9_bankedram1_r)
+uint8_t bottom9_state::bottom9_bankedram1_r(offs_t offset)
{
if (m_k052109_selected)
- return k052109_051960_r(space, offset);
+ return k052109_051960_r(offset);
else
{
if (m_zoomreadroms)
@@ -63,31 +63,31 @@ READ8_MEMBER(bottom9_state::bottom9_bankedram1_r)
}
}
-WRITE8_MEMBER(bottom9_state::bottom9_bankedram1_w)
+void bottom9_state::bottom9_bankedram1_w(offs_t offset, uint8_t data)
{
if (m_k052109_selected)
- k052109_051960_w(space, offset, data);
+ k052109_051960_w(offset, data);
else
m_k051316->write(offset, data);
}
-READ8_MEMBER(bottom9_state::bottom9_bankedram2_r)
+uint8_t bottom9_state::bottom9_bankedram2_r(offs_t offset)
{
if (m_k052109_selected)
- return k052109_051960_r(space, offset + 0x2000);
+ return k052109_051960_r(offset + 0x2000);
else
return m_palette->basemem().read8(offset);
}
-WRITE8_MEMBER(bottom9_state::bottom9_bankedram2_w)
+void bottom9_state::bottom9_bankedram2_w(offs_t offset, uint8_t data)
{
if (m_k052109_selected)
- k052109_051960_w(space, offset + 0x2000, data);
+ k052109_051960_w(offset + 0x2000, data);
else
m_palette->write8(offset, data);
}
-WRITE8_MEMBER(bottom9_state::bankswitch_w)
+void bottom9_state::bankswitch_w(uint8_t data)
{
int bank;
@@ -104,7 +104,7 @@ WRITE8_MEMBER(bottom9_state::bankswitch_w)
membank("bank1")->set_entry(bank);
}
-WRITE8_MEMBER(bottom9_state::bottom9_1f90_w)
+void bottom9_state::bottom9_1f90_w(uint8_t data)
{
/* bits 0/1 = coin counters */
machine().bookkeeping().coin_counter_w(0, data & 0x01);
@@ -123,7 +123,7 @@ WRITE8_MEMBER(bottom9_state::bottom9_1f90_w)
m_k052109_selected = data & 0x20;
}
-WRITE8_MEMBER(bottom9_state::bottom9_sh_irqtrigger_w)
+void bottom9_state::bottom9_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
@@ -134,12 +134,12 @@ INTERRUPT_GEN_MEMBER(bottom9_state::bottom9_sound_interrupt)
device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-WRITE8_MEMBER(bottom9_state::nmi_enable_w)
+void bottom9_state::nmi_enable_w(uint8_t data)
{
m_nmienable = data;
}
-WRITE8_MEMBER(bottom9_state::sound_bank_w)
+void bottom9_state::sound_bank_w(uint8_t data)
{
int bank_A, bank_B;
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index 7293fe25c9b..61cb4aa1e5e 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -160,7 +160,7 @@ buttons down after the game has started then pressing F3 to reset the game.
*
*************************************/
-WRITE8_MEMBER(brkthru_state::brkthru_1803_w)
+void brkthru_state::brkthru_1803_w(uint8_t data)
{
/* bit 0 = NMI enable */
m_nmi_mask = ~data & 1;
@@ -171,7 +171,7 @@ WRITE8_MEMBER(brkthru_state::brkthru_1803_w)
/* bit 1 = ? maybe IRQ acknowledge */
}
-WRITE8_MEMBER(brkthru_state::darwin_0803_w)
+void brkthru_state::darwin_0803_w(uint8_t data)
{
/* bit 0 = NMI enable */
m_nmi_mask = data & 1;
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index ceda47a9c61..75524d8120a 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -167,7 +167,7 @@ enum
};
-WRITE8_MEMBER(btime_state::audio_nmi_enable_w)
+void btime_state::audio_nmi_enable_w(uint8_t data)
{
/* for most games, this serves as the NMI enable for the audio CPU; however,
lnc and disco use bit 0 of the first AY-8910's port A instead; many other
@@ -380,7 +380,7 @@ INPUT_CHANGED_MEMBER(btime_state::coin_inserted_nmi_lo)
}
-READ8_MEMBER(btime_state::zoar_dsw1_read)
+uint8_t btime_state::zoar_dsw1_read()
{
return (!m_screen->vblank() << 7) | (ioport("DSW1")->read() & 0x7f);
}
@@ -2090,7 +2090,7 @@ ROM_START( sdtennis )
ROM_LOAD( "ao_04.10f", 0x1000, 0x1000, CRC(921952af) SHA1(4e9248f3493a5f4651278f27c11f507571242317) )
ROM_END
-READ8_MEMBER(btime_state::wtennis_reset_hack_r)
+uint8_t btime_state::wtennis_reset_hack_r()
{
uint8_t *RAM = memregion("maincpu")->base();
@@ -2171,7 +2171,7 @@ void btime_state::init_protennb()
void btime_state::init_wtennis()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xc15f, 0xc15f, read8_delegate(*this, FUNC(btime_state::wtennis_reset_hack_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xc15f, 0xc15f, read8smo_delegate(*this, FUNC(btime_state::wtennis_reset_hack_r)));
m_audiocpu->space(AS_PROGRAM).install_read_bank(0x0200, 0x0fff, "bank10");
membank("bank10")->set_base(memregion("audiocpu")->base() + 0xe200);
diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp
index 5137bde47ed..d6e70fca2d8 100644
--- a/src/mame/drivers/btoads.cpp
+++ b/src/mame/drivers/btoads.cpp
@@ -59,14 +59,14 @@ void btoads_state::device_timer(emu_timer &timer, device_timer_id id, int param,
}
-WRITE16_MEMBER( btoads_state::main_sound_w )
+void btoads_state::main_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
synchronize(TIMER_ID_DELAYED_SOUND, data & 0xff);
}
-READ16_MEMBER( btoads_state::main_sound_r )
+uint16_t btoads_state::main_sound_r()
{
m_sound_to_main_ready = 0;
return m_sound_to_main_data;
@@ -92,27 +92,27 @@ READ_LINE_MEMBER( btoads_state::sound_to_main_r )
*
*************************************/
-WRITE8_MEMBER( btoads_state::sound_data_w )
+void btoads_state::sound_data_w(uint8_t data)
{
m_sound_to_main_data = data;
m_sound_to_main_ready = 1;
}
-READ8_MEMBER( btoads_state::sound_data_r )
+uint8_t btoads_state::sound_data_r()
{
m_main_to_sound_ready = 0;
return m_main_to_sound_data;
}
-READ8_MEMBER( btoads_state::sound_ready_to_send_r )
+uint8_t btoads_state::sound_ready_to_send_r()
{
return m_sound_to_main_ready ? 0x00 : 0x80;
}
-READ8_MEMBER( btoads_state::sound_data_ready_r )
+uint8_t btoads_state::sound_data_ready_r()
{
if (m_audiocpu->pc() == 0xd50 && !m_main_to_sound_ready)
m_audiocpu->spin_until_interrupt();
@@ -127,7 +127,7 @@ READ8_MEMBER( btoads_state::sound_data_ready_r )
*
*************************************/
-WRITE8_MEMBER( btoads_state::sound_int_state_w )
+void btoads_state::sound_int_state_w(uint8_t data)
{
/* top bit controls BSMT2000 reset */
if (!(m_sound_int_state & 0x80) && (data & 0x80))
@@ -146,13 +146,13 @@ WRITE8_MEMBER( btoads_state::sound_int_state_w )
*
*************************************/
-READ8_MEMBER( btoads_state::bsmt_ready_r )
+uint8_t btoads_state::bsmt_ready_r()
{
return m_bsmt->read_status() << 7;
}
-WRITE8_MEMBER( btoads_state::bsmt2000_port_w )
+void btoads_state::bsmt2000_port_w(offs_t offset, uint8_t data)
{
m_bsmt->write_reg(offset >> 8);
m_bsmt->write_data(((offset & 0xff) << 8) | data);
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index 4095286ebbb..b474c67b9f7 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -103,12 +103,12 @@ Schematics show the jumper set to the 6mhz setting.
#include "buggychl.lh"
-WRITE8_MEMBER(buggychl_state::bankswitch_w)
+void buggychl_state::bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x07); // shall we check if data&7 < # banks?
}
-WRITE8_MEMBER(buggychl_state::sound_enable_w)
+void buggychl_state::sound_enable_w(uint8_t data)
{
// does this really only control the sound irq 'timer' enable state, rather than the entire sound system?
// this would be more in line with the (admittedly incorrect) schematic...
@@ -116,7 +116,7 @@ WRITE8_MEMBER(buggychl_state::sound_enable_w)
machine().sound().system_enable(data & 1);
}
-READ8_MEMBER(buggychl_state::mcu_status_r)
+uint8_t buggychl_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
@@ -134,12 +134,12 @@ READ8_MEMBER(buggychl_state::mcu_status_r)
// a cpu read of soundlatch2 sets ic12.1 so /Q is low, so cpu bit 0 and sound bit 1 read as clear
// a sound read of soundlatch clears ic12.2 so /Q is high, so cpu bit 1 and sound bit 0 read as set
// ic12.1 is set and ic12.2 is cleared by /SRESET
-READ8_MEMBER(buggychl_state::sound_status_main_r)
+uint8_t buggychl_state::sound_status_main_r()
{
return (m_soundlatch2->pending_r() ? 1 : 0) | (m_soundlatch->pending_r() ? 0 : 2);
}
-READ8_MEMBER(buggychl_state::sound_status_sound_r)
+uint8_t buggychl_state::sound_status_sound_r()
{
return (m_soundlatch2->pending_r() ? 2 : 0) | (m_soundlatch->pending_r() ? 0 : 1);
}
@@ -458,7 +458,7 @@ static GFXDECODE_START( gfx_buggychl )
GFXDECODE_END
-WRITE8_MEMBER(buggychl_state::ta7630_volbal_msm_w)
+void buggychl_state::ta7630_volbal_msm_w(uint8_t data)
{
m_ta7630->set_device_volume(m_msm, data >> 4);
}
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index 471327d69e4..548a9472b46 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -103,7 +103,7 @@ enum
// mreq_r -
//-------------------------------------------------
-READ8_MEMBER( bullet_state::mreq_r )
+uint8_t bullet_state::mreq_r(offs_t offset)
{
uint8_t data = 0;
@@ -131,7 +131,7 @@ READ8_MEMBER( bullet_state::mreq_r )
// mreq_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::mreq_w )
+void bullet_state::mreq_w(offs_t offset, uint8_t data)
{
if (offset < 0xc000)
{
@@ -148,7 +148,7 @@ WRITE8_MEMBER( bullet_state::mreq_w )
// win_r -
//-------------------------------------------------
-READ8_MEMBER( bullet_state::win_r )
+uint8_t bullet_state::win_r()
{
return 0;
}
@@ -158,7 +158,7 @@ READ8_MEMBER( bullet_state::win_r )
// wstrobe_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::wstrobe_w )
+void bullet_state::wstrobe_w(uint8_t data)
{
}
@@ -167,7 +167,7 @@ WRITE8_MEMBER( bullet_state::wstrobe_w )
// brom_r -
//-------------------------------------------------
-READ8_MEMBER( bullet_state::brom_r )
+uint8_t bullet_state::brom_r()
{
m_brom = 1;
@@ -179,7 +179,7 @@ READ8_MEMBER( bullet_state::brom_r )
// brom_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::brom_w )
+void bullet_state::brom_w(uint8_t data)
{
m_brom = 1;
}
@@ -189,7 +189,7 @@ WRITE8_MEMBER( bullet_state::brom_w )
// exdsk_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::exdsk_w )
+void bullet_state::exdsk_w(uint8_t data)
{
/*
@@ -248,7 +248,7 @@ WRITE8_MEMBER( bullet_state::exdsk_w )
// exdma_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::exdma_w )
+void bullet_state::exdma_w(uint8_t data)
{
/*
@@ -277,7 +277,7 @@ WRITE8_MEMBER( bullet_state::exdma_w )
// hdcon_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::hdcon_w )
+void bullet_state::hdcon_w(uint8_t data)
{
/*
@@ -314,7 +314,7 @@ WRITE8_MEMBER( bullet_state::hdcon_w )
// info_r -
//-------------------------------------------------
-READ8_MEMBER( bullet_state::info_r )
+uint8_t bullet_state::info_r()
{
/*
@@ -350,7 +350,7 @@ READ8_MEMBER( bullet_state::info_r )
// segst_w -
//-------------------------------------------------
-WRITE8_MEMBER( bullet_state::segst_w )
+void bullet_state::segst_w(uint8_t data)
{
m_segst = BIT(data, 0);
}
@@ -360,7 +360,7 @@ WRITE8_MEMBER( bullet_state::segst_w )
// mreq_r -
//-------------------------------------------------
-READ8_MEMBER( bulletf_state::mreq_r )
+uint8_t bulletf_state::mreq_r(offs_t offset)
{
uint8_t data = 0;
@@ -395,7 +395,7 @@ READ8_MEMBER( bulletf_state::mreq_r )
// mreq_w -
//-------------------------------------------------
-WRITE8_MEMBER( bulletf_state::mreq_w )
+void bulletf_state::mreq_w(offs_t offset, uint8_t data)
{
if (offset < 0xc000)
{
@@ -419,7 +419,7 @@ WRITE8_MEMBER( bulletf_state::mreq_w )
// xdma0_w -
//-------------------------------------------------
-WRITE8_MEMBER( bulletf_state::xdma0_w )
+void bulletf_state::xdma0_w(uint8_t data)
{
/*
@@ -446,7 +446,7 @@ WRITE8_MEMBER( bulletf_state::xdma0_w )
// xfdc_w -
//-------------------------------------------------
-WRITE8_MEMBER( bulletf_state::xfdc_w )
+void bulletf_state::xfdc_w(uint8_t data)
{
/*
@@ -506,7 +506,7 @@ WRITE8_MEMBER( bulletf_state::xfdc_w )
// mbank_w -
//-------------------------------------------------
-WRITE8_MEMBER( bulletf_state::mbank_w )
+void bulletf_state::mbank_w(uint8_t data)
{
/*
@@ -531,7 +531,7 @@ WRITE8_MEMBER( bulletf_state::mbank_w )
// scsi_r -
//-------------------------------------------------
-READ8_MEMBER( bulletf_state::scsi_r )
+uint8_t bulletf_state::scsi_r()
{
uint8_t data = m_scsi_data_in->read();
@@ -548,7 +548,7 @@ READ8_MEMBER( bulletf_state::scsi_r )
// scsi_w -
//-------------------------------------------------
-WRITE8_MEMBER( bulletf_state::scsi_w )
+void bulletf_state::scsi_w(uint8_t data)
{
m_scsi_data_out->write(data);
@@ -562,7 +562,7 @@ WRITE8_MEMBER( bulletf_state::scsi_w )
// hwsts_r -
//-------------------------------------------------
-READ8_MEMBER( bulletf_state::hwsts_r )
+uint8_t bulletf_state::hwsts_r()
{
/*
diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp
index c12e1a7f9a3..4d008f8c7e7 100644
--- a/src/mame/drivers/busicom.cpp
+++ b/src/mame/drivers/busicom.cpp
@@ -23,12 +23,12 @@ uint8_t busicom_state::get_bit_selected(uint32_t val,int num)
return 0;
}
-READ8_MEMBER(busicom_state::keyboard_r)
+uint8_t busicom_state::keyboard_r()
{
return m_input_lines[get_bit_selected(m_keyboard_shifter & 0x3ff, 10)]->read();
}
-READ8_MEMBER(busicom_state::printer_r)
+uint8_t busicom_state::printer_r()
{
uint8_t retVal = 0;
if (m_drum_index==0) retVal |= 1;
@@ -37,7 +37,7 @@ READ8_MEMBER(busicom_state::printer_r)
}
-WRITE8_MEMBER(busicom_state::shifter_w)
+void busicom_state::shifter_w(uint8_t data)
{
// FIXME: detect edges, maybe make 4003 shifter a device
if (BIT(data,0)) {
@@ -50,7 +50,7 @@ WRITE8_MEMBER(busicom_state::shifter_w)
}
}
-WRITE8_MEMBER(busicom_state::printer_w)
+void busicom_state::printer_w(uint8_t data)
{
int i,j;
if (BIT(data,0)) {
@@ -85,7 +85,7 @@ WRITE8_MEMBER(busicom_state::printer_w)
}
}
-WRITE8_MEMBER(busicom_state::status_w)
+void busicom_state::status_w(uint8_t data)
{
#if 0
uint8_t mem_lamp = BIT(data,0);
@@ -95,7 +95,7 @@ WRITE8_MEMBER(busicom_state::status_w)
//logerror("status %c %c %c\n",mem_lamp ? 'M':'x',over_lamp ? 'O':'x',minus_lamp ? '-':'x');
}
-WRITE8_MEMBER(busicom_state::printer_ctrl_w)
+void busicom_state::printer_ctrl_w(uint8_t data)
{
}
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index 77376396b47..c7197bca545 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -258,7 +258,7 @@ Typically, only the high 2 bits are read.
*/
-READ8_MEMBER(bwidow_state::spacduel_IN3_r)
+uint8_t bwidow_state::spacduel_IN3_r(offs_t offset)
{
int res;
int res1;
@@ -314,7 +314,7 @@ READ_LINE_MEMBER(bwidow_state::clock_r)
return (m_maincpu->total_cycles() & 0x100) ? 1 : 0;
}
-READ8_MEMBER(bwidow_state::bwidowp_in_r)
+uint8_t bwidow_state::bwidowp_in_r()
{
return (m_in4->read() & 0x0f) | ((m_in3->read() & 0x0f) << 4);
}
@@ -325,7 +325,7 @@ READ8_MEMBER(bwidow_state::bwidowp_in_r)
*
*************************************/
-WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
+void bwidow_state::bwidow_misc_w(uint8_t data)
{
/*
0x10 = p1 led
@@ -342,7 +342,7 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
m_lastdata = data;
}
-WRITE8_MEMBER(bwidow_state::spacduel_coin_counter_w)
+void bwidow_state::spacduel_coin_counter_w(uint8_t data)
{
if (data == m_lastdata) return;
m_leds[0] = BIT(~data, 5); // start lamp
@@ -362,12 +362,12 @@ WRITE8_MEMBER(bwidow_state::spacduel_coin_counter_w)
*
*************************************/
-READ8_MEMBER(bwidow_state::earom_read)
+uint8_t bwidow_state::earom_read()
{
return m_earom->data();
}
-WRITE8_MEMBER(bwidow_state::earom_write)
+void bwidow_state::earom_write(offs_t offset, uint8_t data)
{
m_earom->set_address(offset & 0x3f);
m_earom->set_data(data);
@@ -392,7 +392,7 @@ void bwidow_state::machine_reset()
*
*************************************/
-WRITE8_MEMBER(bwidow_state::irq_ack_w)
+void bwidow_state::irq_ack_w(uint8_t data)
{
m_maincpu->set_input_line(0, CLEAR_LINE);
}
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index 3b1b4570df8..d16ce37a618 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -48,23 +48,23 @@ INTERRUPT_GEN_MEMBER(bwing_state::bwp3_interrupt)
//****************************************************************************
// Memory and I/O Handlers
-WRITE8_MEMBER(bwing_state::bwp3_u8F_w)
+void bwing_state::bwp3_u8F_w(uint8_t data)
{
m_bwp3_u8F_d = data; // prepares custom chip for various operations
}
-WRITE8_MEMBER(bwing_state::bwp3_nmimask_w)
+void bwing_state::bwp3_nmimask_w(uint8_t data)
{
m_bwp3_nmimask = data & 0x80;
}
-WRITE8_MEMBER(bwing_state::bwp3_nmiack_w)
+void bwing_state::bwp3_nmiack_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
-WRITE8_MEMBER(bwing_state::bwp1_ctrl_w)
+void bwing_state::bwp1_ctrl_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -103,7 +103,7 @@ WRITE8_MEMBER(bwing_state::bwp1_ctrl_w)
}
-WRITE8_MEMBER(bwing_state::bwp2_ctrl_w)
+void bwing_state::bwp2_ctrl_w(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h
index ecd4a238f19..0165a8e83b4 100644
--- a/src/mame/includes/abc1600.h
+++ b/src/mame/includes/abc1600.h
@@ -103,17 +103,17 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( bus_r );
- DECLARE_WRITE8_MEMBER( bus_w );
- DECLARE_READ8_MEMBER( dart_r );
- DECLARE_WRITE8_MEMBER( dart_w );
- DECLARE_READ8_MEMBER( scc_r );
- DECLARE_WRITE8_MEMBER( scc_w );
- DECLARE_READ8_MEMBER( cio_r );
- DECLARE_WRITE8_MEMBER( cio_w );
- DECLARE_WRITE8_MEMBER( fw0_w );
- DECLARE_WRITE8_MEMBER( fw1_w );
- DECLARE_WRITE8_MEMBER( spec_contr_reg_w );
+ uint8_t bus_r(offs_t offset);
+ void bus_w(offs_t offset, uint8_t data);
+ uint8_t dart_r(offs_t offset);
+ void dart_w(offs_t offset, uint8_t data);
+ uint8_t scc_r(offs_t offset);
+ void scc_w(offs_t offset, uint8_t data);
+ uint8_t cio_r(offs_t offset);
+ void cio_w(offs_t offset, uint8_t data);
+ void fw0_w(uint8_t data);
+ void fw1_w(uint8_t data);
+ void spec_contr_reg_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( dbrq_w );
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index d8b05b1d102..43640d7063e 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -40,7 +40,7 @@ public:
void triothep_control_select_w(uint8_t data);
uint8_t triothep_control_r();
- DECLARE_WRITE8_MEMBER(buffer_spriteram_w);
+ void buffer_spriteram_w(uint8_t data);
DECLARE_MACHINE_START(triothep);
DECLARE_MACHINE_RESET(triothep);
virtual void video_start() override;
diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h
index 7ccb8923f44..e4f74309486 100644
--- a/src/mame/includes/adam.h
+++ b/src/mame/includes/adam.h
@@ -69,15 +69,15 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( mreq_r );
- DECLARE_WRITE8_MEMBER( mreq_w );
- DECLARE_READ8_MEMBER( iorq_r );
- DECLARE_WRITE8_MEMBER( iorq_w );
-
- DECLARE_READ8_MEMBER( adamnet_r );
- DECLARE_WRITE8_MEMBER( adamnet_w );
- DECLARE_READ8_MEMBER( mioc_r );
- DECLARE_WRITE8_MEMBER( mioc_w );
+ uint8_t mreq_r(offs_t offset);
+ void mreq_w(offs_t offset, uint8_t data);
+ uint8_t iorq_r(offs_t offset);
+ void iorq_w(offs_t offset, uint8_t data);
+
+ uint8_t adamnet_r();
+ void adamnet_w(uint8_t data);
+ uint8_t mioc_r();
+ void mioc_w(uint8_t data);
void m6801_p1_w(uint8_t data);
uint8_t m6801_p2_r();
diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h
index b2a2e29453b..c5bf0c830a2 100644
--- a/src/mame/includes/aeroboto.h
+++ b/src/mame/includes/aeroboto.h
@@ -60,14 +60,14 @@ public:
/* misc */
int m_count;
int m_disable_irq;
- DECLARE_READ8_MEMBER(aeroboto_201_r);
- DECLARE_READ8_MEMBER(aeroboto_irq_ack_r);
- DECLARE_READ8_MEMBER(aeroboto_2973_r);
- DECLARE_WRITE8_MEMBER(aeroboto_1a2_w);
- DECLARE_READ8_MEMBER(aeroboto_in0_r);
- DECLARE_WRITE8_MEMBER(aeroboto_3000_w);
- DECLARE_WRITE8_MEMBER(aeroboto_videoram_w);
- DECLARE_WRITE8_MEMBER(aeroboto_tilecolor_w);
+ uint8_t aeroboto_201_r();
+ uint8_t aeroboto_irq_ack_r();
+ uint8_t aeroboto_2973_r();
+ void aeroboto_1a2_w(uint8_t data);
+ uint8_t aeroboto_in0_r();
+ void aeroboto_3000_w(uint8_t data);
+ void aeroboto_videoram_w(offs_t offset, uint8_t data);
+ void aeroboto_tilecolor_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index 334f23ced1d..c444a3fa007 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -80,30 +80,30 @@ public:
uint32_t spinbrk_tile_callback( uint32_t code );
/* handlers */
- DECLARE_WRITE8_MEMBER(karatblzbl_soundlatch_w);
- DECLARE_READ8_MEMBER(pending_command_r);
- DECLARE_WRITE8_MEMBER(aerofgt_sh_bankswitch_w);
- DECLARE_WRITE8_MEMBER(spinlbrk_sh_bankswitch_w);
- DECLARE_WRITE8_MEMBER(aerfboot_okim6295_banking_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(vram_w);
- DECLARE_WRITE8_MEMBER(pspikes_gfxbank_w);
- DECLARE_WRITE16_MEMBER(pspikesb_gfxbank_w);
- DECLARE_WRITE16_MEMBER(spikes91_lookup_w);
- DECLARE_WRITE8_MEMBER(karatblz_gfxbank_w);
- DECLARE_WRITE8_MEMBER(spinlbrk_gfxbank_w);
- DECLARE_WRITE8_MEMBER(kickball_gfxbank_w);
- DECLARE_WRITE16_MEMBER(turbofrc_gfxbank_w);
- DECLARE_WRITE16_MEMBER(aerofgt_gfxbank_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(scrollx_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(scrolly_w);
- DECLARE_WRITE8_MEMBER(pspikes_palette_bank_w);
- DECLARE_WRITE8_MEMBER(spinlbrk_flip_screen_w);
- DECLARE_WRITE8_MEMBER(turbofrc_flip_screen_w);
- DECLARE_WRITE16_MEMBER(wbbc97_bitmap_enable_w);
- DECLARE_WRITE16_MEMBER(pspikesb_oki_banking_w);
- DECLARE_WRITE16_MEMBER(aerfboo2_okim6295_banking_w);
- DECLARE_WRITE8_MEMBER(karatblzbl_d7759_write_port_0_w);
- DECLARE_WRITE8_MEMBER(karatblzbl_d7759_reset_w);
+ void karatblzbl_soundlatch_w(uint8_t data);
+ uint8_t pending_command_r();
+ void aerofgt_sh_bankswitch_w(uint8_t data);
+ void spinlbrk_sh_bankswitch_w(uint8_t data);
+ void aerfboot_okim6295_banking_w(uint8_t data);
+ template<int Layer> void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void pspikes_gfxbank_w(uint8_t data);
+ void pspikesb_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void spikes91_lookup_w(uint16_t data);
+ void karatblz_gfxbank_w(uint8_t data);
+ void spinlbrk_gfxbank_w(uint8_t data);
+ void kickball_gfxbank_w(uint8_t data);
+ void turbofrc_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void aerofgt_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void scrollx_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void pspikes_palette_bank_w(uint8_t data);
+ void spinlbrk_flip_screen_w(uint8_t data);
+ void turbofrc_flip_screen_w(uint8_t data);
+ void wbbc97_bitmap_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void pspikesb_oki_banking_w(uint16_t data);
+ void aerfboo2_okim6295_banking_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void karatblzbl_d7759_write_port_0_w(uint8_t data);
+ void karatblzbl_d7759_reset_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_pspikes_tile_info);
template<int Layer> TILE_GET_INFO_MEMBER(karatblz_tile_info);
template<int Layer> TILE_GET_INFO_MEMBER(spinlbrk_tile_info);
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index b44e16d0fde..0deb971ef52 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -67,16 +67,16 @@ public:
required_device<watchdog_timer_device> m_watchdog;
required_device_array<generic_latch_8_device, 2> m_soundlatch;
- DECLARE_READ8_MEMBER(devram_r);
- DECLARE_WRITE8_MEMBER(master_nmi_trigger_w);
- DECLARE_WRITE8_MEMBER(master_bankswitch_w);
- DECLARE_WRITE8_MEMBER(slave_bankswitch_w);
- DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
- DECLARE_READ8_MEMBER(soundcommand_status_r);
- DECLARE_WRITE8_MEMBER(coin_counter_w);
- template<int Layer> DECLARE_WRITE8_MEMBER(videoram_w);
- template<int Layer> DECLARE_WRITE8_MEMBER(colorram_w);
- DECLARE_WRITE8_MEMBER(scrollregs_w);
+ uint8_t devram_r(address_space &space, offs_t offset);
+ void master_nmi_trigger_w(uint8_t data);
+ void master_bankswitch_w(uint8_t data);
+ void slave_bankswitch_w(uint8_t data);
+ void sound_bankswitch_w(uint8_t data);
+ uint8_t soundcommand_status_r();
+ void coin_counter_w(uint8_t data);
+ template<int Layer> void videoram_w(offs_t offset, uint8_t data);
+ template<int Layer> void colorram_w(offs_t offset, uint8_t data);
+ void scrollregs_w(offs_t offset, uint8_t data);
void init_airbustr();
template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index 6dba7a9e698..105ad24ff37 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -33,13 +33,13 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
- DECLARE_WRITE8_MEMBER(sound_bank_w);
- DECLARE_READ8_MEMBER(ls138_f10_r);
- DECLARE_WRITE8_MEMBER(ls138_f10_w);
- DECLARE_WRITE8_MEMBER(bankswitch_2_w);
- DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_WRITE8_MEMBER(lamps_w);
- DECLARE_WRITE8_MEMBER(k007232_extvol_w);
+ void sound_bank_w(uint8_t data);
+ uint8_t ls138_f10_r(offs_t offset);
+ void ls138_f10_w(offs_t offset, uint8_t data);
+ void bankswitch_2_w(uint8_t data);
+ void bankswitch_w(uint8_t data);
+ void lamps_w(uint8_t data);
+ void k007232_extvol_w(uint8_t data);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void volume_callback0(uint8_t data);
void volume_callback1(uint8_t data);
diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h
index 48e8cc1a5e2..a02f6a10c68 100644
--- a/src/mame/includes/aliens.h
+++ b/src/mame/includes/aliens.h
@@ -42,10 +42,10 @@ public:
required_device<generic_latch_8_device> m_soundlatch;
required_memory_bank m_rombank;
- DECLARE_WRITE8_MEMBER(aliens_coin_counter_w);
- DECLARE_WRITE8_MEMBER(aliens_sh_irqtrigger_w);
- DECLARE_READ8_MEMBER(k052109_051960_r);
- DECLARE_WRITE8_MEMBER(k052109_051960_w);
+ void aliens_coin_counter_w(uint8_t data);
+ void aliens_sh_irqtrigger_w(uint8_t data);
+ uint8_t k052109_051960_r(offs_t offset);
+ void k052109_051960_w(offs_t offset, uint8_t data);
void aliens_snd_bankswitch_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index 65dcf561ee1..9400deb6bd1 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -433,9 +433,9 @@ public:
DECLARE_WRITE_LINE_MEMBER( m68k_reset );
DECLARE_WRITE_LINE_MEMBER( kbreset_w );
- DECLARE_READ16_MEMBER( cia_r );
- DECLARE_WRITE16_MEMBER( cia_w );
- DECLARE_WRITE16_MEMBER( gayle_cia_w );
+ uint16_t cia_r(offs_t offset, uint16_t mem_mask = ~0);
+ void cia_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void gayle_cia_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void cia_0_port_a_write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( cia_0_irq );
uint8_t cia_1_port_a_read();
@@ -453,13 +453,13 @@ public:
DECLARE_WRITE_LINE_MEMBER( centronics_perror_w );
DECLARE_WRITE_LINE_MEMBER( centronics_select_w );
- DECLARE_READ16_MEMBER( custom_chip_r );
+ uint16_t custom_chip_r(offs_t offset);
void custom_chip_w(offs_t offset, uint16_t data);
DECLARE_WRITE_LINE_MEMBER( paula_int_w );
- DECLARE_READ16_MEMBER( rom_mirror_r );
- DECLARE_READ32_MEMBER( rom_mirror32_r );
+ uint16_t rom_mirror_r(offs_t offset, uint16_t mem_mask = ~0);
+ uint32_t rom_mirror32_r(offs_t offset, uint32_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(fdc_dskblk_w);
DECLARE_WRITE_LINE_MEMBER(fdc_dsksyn_w);
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index 45c1a4dbc56..66d1d7bbd62 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -31,15 +31,15 @@ protected:
virtual void machine_start() override;
private:
- DECLARE_WRITE8_MEMBER(port30_w);
- DECLARE_WRITE8_MEMBER(port31_w);
- DECLARE_WRITE8_MEMBER(port32_w);
- DECLARE_WRITE8_MEMBER(port33_w);
- DECLARE_WRITE8_MEMBER(port34_w);
- DECLARE_WRITE8_MEMBER(port35_w);
- DECLARE_WRITE8_MEMBER(port36_w);
- DECLARE_WRITE8_MEMBER(watchdog_reset_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
+ void port30_w(uint8_t data);
+ void port31_w(uint8_t data);
+ void port32_w(uint8_t data);
+ void port33_w(uint8_t data);
+ void port34_w(uint8_t data);
+ void port35_w(uint8_t data);
+ void port36_w(uint8_t data);
+ void watchdog_reset_w(uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(s2k_get_bg_tile_info);
void ampoker2_palette(palette_device &palette) const;
diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h
index cbd4bf74ef4..50346d8da64 100644
--- a/src/mame/includes/amspdwy.h
+++ b/src/mame/includes/amspdwy.h
@@ -63,12 +63,12 @@ private:
uint8_t m_wheel_old[2];
uint8_t m_wheel_return[2];
- DECLARE_READ8_MEMBER(amspdwy_wheel_0_r);
- DECLARE_READ8_MEMBER(amspdwy_wheel_1_r);
- DECLARE_WRITE8_MEMBER(amspdwy_flipscreen_w);
- DECLARE_WRITE8_MEMBER(amspdwy_videoram_w);
- DECLARE_WRITE8_MEMBER(amspdwy_colorram_w);
- DECLARE_READ8_MEMBER(amspdwy_sound_r);
+ uint8_t amspdwy_wheel_0_r();
+ uint8_t amspdwy_wheel_1_r();
+ void amspdwy_flipscreen_w(uint8_t data);
+ void amspdwy_videoram_w(offs_t offset, uint8_t data);
+ void amspdwy_colorram_w(offs_t offset, uint8_t data);
+ uint8_t amspdwy_sound_r();
TILE_GET_INFO_MEMBER(get_tile_info);
TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_back);
diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h
index 473ad31203c..72787df8cd1 100644
--- a/src/mame/includes/angelkds.h
+++ b/src/mame/includes/angelkds.h
@@ -48,19 +48,19 @@ public:
required_device<cpu_device> m_subcpu;
uint8_t angeklds_ff_r() { return 0xff; };
void angelkds_cpu_bank_write(uint8_t data);
- DECLARE_WRITE8_MEMBER(angelkds_main_sound_w);
- DECLARE_READ8_MEMBER(angelkds_main_sound_r);
- DECLARE_WRITE8_MEMBER(angelkds_sub_sound_w);
- DECLARE_READ8_MEMBER(angelkds_sub_sound_r);
- DECLARE_WRITE8_MEMBER(angelkds_txvideoram_w);
- DECLARE_WRITE8_MEMBER(angelkds_txbank_write);
- DECLARE_WRITE8_MEMBER(angelkds_bgtopvideoram_w);
- DECLARE_WRITE8_MEMBER(angelkds_bgtopbank_write);
- DECLARE_WRITE8_MEMBER(angelkds_bgtopscroll_write);
- DECLARE_WRITE8_MEMBER(angelkds_bgbotvideoram_w);
- DECLARE_WRITE8_MEMBER(angelkds_bgbotbank_write);
- DECLARE_WRITE8_MEMBER(angelkds_bgbotscroll_write);
- DECLARE_WRITE8_MEMBER(angelkds_layer_ctrl_write);
+ void angelkds_main_sound_w(offs_t offset, uint8_t data);
+ uint8_t angelkds_main_sound_r(offs_t offset);
+ void angelkds_sub_sound_w(offs_t offset, uint8_t data);
+ uint8_t angelkds_sub_sound_r(offs_t offset);
+ void angelkds_txvideoram_w(offs_t offset, uint8_t data);
+ void angelkds_txbank_write(uint8_t data);
+ void angelkds_bgtopvideoram_w(offs_t offset, uint8_t data);
+ void angelkds_bgtopbank_write(uint8_t data);
+ void angelkds_bgtopscroll_write(uint8_t data);
+ void angelkds_bgbotvideoram_w(offs_t offset, uint8_t data);
+ void angelkds_bgbotbank_write(uint8_t data);
+ void angelkds_bgbotscroll_write(uint8_t data);
+ void angelkds_layer_ctrl_write(uint8_t data);
void init_angelkds();
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(get_bgtop_tile_info);
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 352e02b9f69..ca852a59235 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -155,53 +155,53 @@ public:
optional_device<apollo_graphics_15i> m_graphics;
optional_device<apollo_kbd_device> m_keyboard;
- DECLARE_WRITE16_MEMBER(apollo_csr_status_register_w);
- DECLARE_READ16_MEMBER(apollo_csr_status_register_r);
- DECLARE_WRITE16_MEMBER(apollo_csr_control_register_w);
- DECLARE_READ16_MEMBER(apollo_csr_control_register_r);
- DECLARE_WRITE8_MEMBER(apollo_dma_1_w);
- DECLARE_READ8_MEMBER(apollo_dma_1_r);
- DECLARE_WRITE8_MEMBER(apollo_dma_2_w);
- DECLARE_READ8_MEMBER(apollo_dma_2_r);
- DECLARE_WRITE8_MEMBER(apollo_dma_page_register_w);
- DECLARE_READ8_MEMBER(apollo_dma_page_register_r);
- DECLARE_WRITE16_MEMBER(apollo_address_translation_map_w);
- DECLARE_READ16_MEMBER(apollo_address_translation_map_r);
+ void apollo_csr_status_register_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t apollo_csr_status_register_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_csr_control_register_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t apollo_csr_control_register_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_dma_1_w(offs_t offset, uint8_t data);
+ uint8_t apollo_dma_1_r(offs_t offset);
+ void apollo_dma_2_w(offs_t offset, uint8_t data);
+ uint8_t apollo_dma_2_r(offs_t offset);
+ void apollo_dma_page_register_w(offs_t offset, uint8_t data);
+ uint8_t apollo_dma_page_register_r(offs_t offset);
+ void apollo_address_translation_map_w(offs_t offset, uint16_t data);
+ uint16_t apollo_address_translation_map_r(offs_t offset);
uint8_t apollo_dma_read_byte(offs_t offset);
void apollo_dma_write_byte(offs_t offset, uint8_t data);
uint8_t apollo_dma_read_word(offs_t offset);
void apollo_dma_write_word(offs_t offset, uint8_t data);
- DECLARE_WRITE8_MEMBER(apollo_rtc_w);
- DECLARE_READ8_MEMBER(apollo_rtc_r);
- DECLARE_WRITE8_MEMBER(cache_control_register_w);
- DECLARE_READ8_MEMBER(cache_status_register_r);
- DECLARE_WRITE8_MEMBER(task_alias_register_w);
- DECLARE_READ8_MEMBER(task_alias_register_r);
- DECLARE_WRITE16_MEMBER(latch_page_on_parity_error_register_w);
- DECLARE_READ16_MEMBER(latch_page_on_parity_error_register_r);
- DECLARE_WRITE8_MEMBER(master_req_register_w);
- DECLARE_READ8_MEMBER(master_req_register_r);
- DECLARE_WRITE16_MEMBER(selective_clear_locations_w);
- DECLARE_READ16_MEMBER(selective_clear_locations_r);
- DECLARE_READ32_MEMBER(ram_with_parity_r);
- DECLARE_WRITE32_MEMBER(ram_with_parity_w);
- DECLARE_READ32_MEMBER(apollo_unmapped_r);
- DECLARE_WRITE32_MEMBER(apollo_unmapped_w);
- DECLARE_WRITE32_MEMBER(apollo_rom_w);
- DECLARE_READ16_MEMBER(apollo_atbus_io_r);
- DECLARE_WRITE16_MEMBER(apollo_atbus_io_w);
- DECLARE_READ16_MEMBER(apollo_atbus_memory_r);
- DECLARE_WRITE16_MEMBER(apollo_atbus_memory_w);
- DECLARE_READ16_MEMBER(apollo_atbus_unmap_io_r);
- DECLARE_WRITE16_MEMBER(apollo_atbus_unmap_io_w);
- DECLARE_READ8_MEMBER(apollo_atbus_unmap_r);
- DECLARE_WRITE8_MEMBER(apollo_atbus_unmap_w);
- DECLARE_WRITE8_MEMBER(dn5500_memory_present_register_w);
- DECLARE_READ8_MEMBER(dn5500_memory_present_register_r);
- DECLARE_WRITE8_MEMBER(dn5500_11500_w);
- DECLARE_READ8_MEMBER(dn5500_11500_r);
- DECLARE_WRITE8_MEMBER(dn5500_io_protection_map_w);
- DECLARE_READ8_MEMBER(dn5500_io_protection_map_r);
+ void apollo_rtc_w(offs_t offset, uint8_t data);
+ uint8_t apollo_rtc_r(offs_t offset);
+ void cache_control_register_w(offs_t offset, uint8_t data);
+ uint8_t cache_status_register_r(offs_t offset);
+ void task_alias_register_w(offs_t offset, uint8_t data);
+ uint8_t task_alias_register_r(offs_t offset);
+ void latch_page_on_parity_error_register_w(offs_t offset, uint16_t data);
+ uint16_t latch_page_on_parity_error_register_r(offs_t offset);
+ void master_req_register_w(offs_t offset, uint8_t data);
+ uint8_t master_req_register_r(offs_t offset);
+ void selective_clear_locations_w(offs_t offset, uint16_t data);
+ uint16_t selective_clear_locations_r(offs_t offset);
+ uint32_t ram_with_parity_r(offs_t offset, uint32_t mem_mask = ~0);
+ void ram_with_parity_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t apollo_unmapped_r(offs_t offset, uint32_t mem_mask = ~0);
+ void apollo_unmapped_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void apollo_rom_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t apollo_atbus_io_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_atbus_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t apollo_atbus_memory_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_atbus_memory_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t apollo_atbus_unmap_io_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_atbus_unmap_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t apollo_atbus_unmap_r(offs_t offset, uint8_t mem_mask = ~0);
+ void apollo_atbus_unmap_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0);
+ void dn5500_memory_present_register_w(offs_t offset, uint8_t data);
+ uint8_t dn5500_memory_present_register_r(offs_t offset);
+ void dn5500_11500_w(offs_t offset, uint8_t data);
+ uint8_t dn5500_11500_r(offs_t offset);
+ void dn5500_io_protection_map_w(offs_t offset, uint8_t data);
+ uint8_t dn5500_io_protection_map_r(offs_t offset);
void init_dsp3000();
void init_dsp5500();
void init_dn3500();
@@ -384,8 +384,8 @@ public:
virtual const char *custom_instance_name() const noexcept override { return "node_id"; }
virtual const char *custom_brief_instance_name() const noexcept override { return "ni"; }
- DECLARE_WRITE16_MEMBER(write);
- DECLARE_READ16_MEMBER(read);
+ void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t read(offs_t offset, uint16_t mem_mask = ~0);
void set_node_id_from_disk();
@@ -414,22 +414,22 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// monochrome control
- DECLARE_READ8_MEMBER( apollo_mcr_r );
- DECLARE_WRITE8_MEMBER( apollo_mcr_w );
+ uint8_t apollo_mcr_r(offs_t offset);
+ void apollo_mcr_w(offs_t offset, uint8_t data);
// monochrome and color memory
- DECLARE_READ16_MEMBER( apollo_mem_r );
- DECLARE_WRITE16_MEMBER( apollo_mem_w );
+ uint16_t apollo_mem_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_mem_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
// color control
- DECLARE_READ8_MEMBER( apollo_ccr_r );
- DECLARE_WRITE8_MEMBER( apollo_ccr_w );
+ uint8_t apollo_ccr_r(offs_t offset);
+ void apollo_ccr_w(offs_t offset, uint8_t data);
- DECLARE_READ16_MEMBER( apollo_mgm_r );
- DECLARE_WRITE16_MEMBER( apollo_mgm_w );
+ uint16_t apollo_mgm_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_mgm_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER( apollo_cgm_r );
- DECLARE_WRITE16_MEMBER( apollo_cgm_w );
+ uint16_t apollo_cgm_r(offs_t offset, uint16_t mem_mask = ~0);
+ void apollo_cgm_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void vblank_state_changed(screen_device &screen, bool vblank_state);
diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h
index 88673f98215..31f5c587605 100644
--- a/src/mame/includes/appoooh.h
+++ b/src/mame/includes/appoooh.h
@@ -33,13 +33,13 @@ public:
void robowrese(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(adpcm_w);
- DECLARE_WRITE8_MEMBER(scroll_w);
- DECLARE_WRITE8_MEMBER(fg_videoram_w);
- DECLARE_WRITE8_MEMBER(fg_colorram_w);
- DECLARE_WRITE8_MEMBER(bg_videoram_w);
- DECLARE_WRITE8_MEMBER(bg_colorram_w);
- DECLARE_WRITE8_MEMBER(out_w);
+ void adpcm_w(uint8_t data);
+ void scroll_w(uint8_t data);
+ void fg_videoram_w(offs_t offset, uint8_t data);
+ void fg_colorram_w(offs_t offset, uint8_t data);
+ void bg_videoram_w(offs_t offset, uint8_t data);
+ void bg_colorram_w(offs_t offset, uint8_t data);
+ void out_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h
index 2d8ebfaa678..d1c8ea069d1 100644
--- a/src/mame/includes/aquarius.h
+++ b/src/mame/includes/aquarius.h
@@ -84,17 +84,17 @@ private:
uint8_t m_scrambler;
tilemap_t *m_tilemap;
- DECLARE_WRITE8_MEMBER(aquarius_videoram_w);
- DECLARE_WRITE8_MEMBER(aquarius_colorram_w);
- DECLARE_READ8_MEMBER(cassette_r);
- DECLARE_WRITE8_MEMBER(cassette_w);
- DECLARE_READ8_MEMBER(vsync_r);
- DECLARE_WRITE8_MEMBER(mapper_w);
- DECLARE_READ8_MEMBER(printer_r);
- DECLARE_WRITE8_MEMBER(printer_w);
- DECLARE_READ8_MEMBER(keyboard_r);
- DECLARE_WRITE8_MEMBER(scrambler_w);
- DECLARE_READ8_MEMBER(cartridge_r);
+ void aquarius_videoram_w(offs_t offset, uint8_t data);
+ void aquarius_colorram_w(offs_t offset, uint8_t data);
+ uint8_t cassette_r();
+ void cassette_w(uint8_t data);
+ uint8_t vsync_r();
+ void mapper_w(uint8_t data);
+ uint8_t printer_r();
+ void printer_w(uint8_t data);
+ uint8_t keyboard_r(offs_t offset);
+ void scrambler_w(uint8_t data);
+ uint8_t cartridge_r(offs_t offset);
TILE_GET_INFO_MEMBER(aquarius_gettileinfo);
void aquarius_palette(palette_device &palette) const;
uint32_t screen_update_aquarius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h
index 0455606a2b8..3142cf04773 100644
--- a/src/mame/includes/arabian.h
+++ b/src/mame/includes/arabian.h
@@ -49,8 +49,8 @@ private:
uint8_t mcu_portk_r();
void mcu_port_o_w(uint8_t data);
void mcu_port_p_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(arabian_blitter_w);
- DECLARE_WRITE8_MEMBER(arabian_videoram_w);
+ void arabian_blitter_w(offs_t offset, uint8_t data);
+ void arabian_videoram_w(offs_t offset, uint8_t data);
void ay8910_porta_w(uint8_t data);
void ay8910_portb_w(uint8_t data);
void arabian_palette(palette_device &palette) const;
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index e545d01f476..5cb53b4ff44 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -71,13 +71,13 @@ public:
void archimedes_clear_irq_b(int mask);
void archimedes_clear_fiq(int mask);
- DECLARE_READ32_MEMBER(aristmk5_drame_memc_logical_r);
- DECLARE_READ32_MEMBER(archimedes_memc_logical_r);
- DECLARE_WRITE32_MEMBER(archimedes_memc_logical_w);
- DECLARE_WRITE32_MEMBER(archimedes_memc_w);
- DECLARE_WRITE32_MEMBER(archimedes_memc_page_w);
- DECLARE_READ32_MEMBER(archimedes_ioc_r);
- DECLARE_WRITE32_MEMBER(archimedes_ioc_w);
+ uint32_t aristmk5_drame_memc_logical_r(offs_t offset);
+ uint32_t archimedes_memc_logical_r(offs_t offset);
+ void archimedes_memc_logical_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void archimedes_memc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void archimedes_memc_page_w(uint32_t data);
+ uint32_t archimedes_ioc_r(offs_t offset, uint32_t mem_mask = ~0);
+ void archimedes_ioc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER( a310_kart_rx_w );
DECLARE_WRITE_LINE_MEMBER( a310_kart_tx_w );
@@ -112,8 +112,8 @@ private:
void latch_timer_cnt(int tmr);
void a310_set_timer(int tmr);
- DECLARE_READ32_MEMBER(ioc_ctrl_r);
- DECLARE_WRITE32_MEMBER(ioc_ctrl_w);
+ uint32_t ioc_ctrl_r(offs_t offset);
+ void ioc_ctrl_w(offs_t offset, uint32_t data);
uint32_t *m_archimedes_memc_physmem;
uint32_t m_memc_pagesize;
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index 82a62040406..491efd6ca03 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -66,19 +66,19 @@ public:
required_device<palette_device> m_palette;
- DECLARE_READ8_MEMBER(arkanoid_bootleg_f000_r);
- DECLARE_READ8_MEMBER(arkanoid_bootleg_f002_r);
- DECLARE_WRITE8_MEMBER(arkanoid_bootleg_d018_w);
- DECLARE_READ8_MEMBER(arkanoid_bootleg_d008_r);
- DECLARE_WRITE8_MEMBER(arkanoid_videoram_w);
- DECLARE_WRITE8_MEMBER(arkanoid_d008_w);
- DECLARE_WRITE8_MEMBER(tetrsark_d008_w);
- DECLARE_WRITE8_MEMBER(brixian_d008_w);
- DECLARE_WRITE8_MEMBER(hexa_d008_w);
- DECLARE_READ8_MEMBER(hexaa_f000_r);
- DECLARE_WRITE8_MEMBER(hexaa_f000_w);
- DECLARE_WRITE8_MEMBER(hexaa_sub_80_w);
- DECLARE_READ8_MEMBER(hexaa_sub_90_r);
+ uint8_t arkanoid_bootleg_f000_r();
+ uint8_t arkanoid_bootleg_f002_r();
+ void arkanoid_bootleg_d018_w(uint8_t data);
+ uint8_t arkanoid_bootleg_d008_r();
+ void arkanoid_videoram_w(offs_t offset, uint8_t data);
+ void arkanoid_d008_w(uint8_t data);
+ void tetrsark_d008_w(uint8_t data);
+ void brixian_d008_w(uint8_t data);
+ void hexa_d008_w(uint8_t data);
+ uint8_t hexaa_f000_r();
+ void hexaa_f000_w(uint8_t data);
+ void hexaa_sub_80_w(uint8_t data);
+ uint8_t hexaa_sub_90_r();
DECLARE_CUSTOM_INPUT_MEMBER(arkanoid_semaphore_input_r);
uint8_t input_mux_r();
void init_block2();
diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h
index 2256d3ce787..cda9dc3195a 100644
--- a/src/mame/includes/artmagic.h
+++ b/src/mame/includes/artmagic.h
@@ -58,11 +58,11 @@ public:
uint8_t m_blitter_page;
attotime m_blitter_busy_until;
emu_timer * m_irq_off_timer;
- DECLARE_WRITE16_MEMBER(control_w);
- DECLARE_READ16_MEMBER(ultennis_hack_r);
- DECLARE_WRITE16_MEMBER(protection_bit_w);
- DECLARE_READ16_MEMBER(blitter_r);
- DECLARE_WRITE16_MEMBER(blitter_w);
+ void control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t ultennis_hack_r();
+ void protection_bit_w(offs_t offset, uint16_t data);
+ uint16_t blitter_r();
+ void blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(m68k_gen_int);
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h
index 5bceb9f5c59..fd9dcd43459 100644
--- a/src/mame/includes/asterix.h
+++ b/src/mame/includes/asterix.h
@@ -50,11 +50,11 @@ public:
required_device<k056832_device> m_k056832;
required_device<k05324x_device> m_k053244;
required_device<k053251_device> m_k053251;
- DECLARE_WRITE16_MEMBER(control2_w);
- DECLARE_WRITE8_MEMBER(sound_arm_nmi_w);
- DECLARE_WRITE16_MEMBER(sound_irq_w);
- DECLARE_WRITE16_MEMBER(protection_w);
- DECLARE_WRITE16_MEMBER(asterix_spritebank_w);
+ void control2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void sound_arm_nmi_w(uint8_t data);
+ void sound_irq_w(uint16_t data);
+ void protection_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void asterix_spritebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void init_asterix();
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h
index 71081755291..56540eaa55c 100644
--- a/src/mame/includes/asteroid.h
+++ b/src/mame/includes/asteroid.h
@@ -43,18 +43,18 @@ public:
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_READ8_MEMBER(asteroid_IN0_r);
- DECLARE_READ8_MEMBER(asterock_IN0_r);
- DECLARE_READ8_MEMBER(asteroid_IN1_r);
- DECLARE_READ8_MEMBER(asteroid_DSW1_r);
- DECLARE_WRITE8_MEMBER(asteroid_explode_w);
- DECLARE_WRITE8_MEMBER(asteroid_thump_w);
- DECLARE_WRITE8_MEMBER(asteroid_noise_reset_w);
- DECLARE_WRITE8_MEMBER(llander_snd_reset_w);
- DECLARE_WRITE8_MEMBER(llander_sounds_w);
+ uint8_t asteroid_IN0_r(offs_t offset);
+ uint8_t asterock_IN0_r(offs_t offset);
+ uint8_t asteroid_IN1_r(offs_t offset);
+ uint8_t asteroid_DSW1_r(offs_t offset);
+ void asteroid_explode_w(uint8_t data);
+ void asteroid_thump_w(uint8_t data);
+ void asteroid_noise_reset_w(uint8_t data);
+ void llander_snd_reset_w(uint8_t data);
+ void llander_sounds_w(uint8_t data);
- 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);
DECLARE_READ_LINE_MEMBER(clock_r);
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index e37a6f80952..975e5258c8b 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -111,25 +111,25 @@ public:
uint8_t m_profpac_writemode;
uint16_t m_profpac_writemask;
uint8_t m_profpac_vw;
- DECLARE_WRITE8_MEMBER(protected_ram_enable_w);
- DECLARE_READ8_MEMBER(protected_ram_r);
- DECLARE_WRITE8_MEMBER(protected_ram_w);
+ void protected_ram_enable_w(uint8_t data);
+ uint8_t protected_ram_r(offs_t offset);
+ void protected_ram_w(offs_t offset, uint8_t data);
uint8_t input_mux_r(offs_t offset);
template<int Coin> DECLARE_WRITE_LINE_MEMBER(coin_counter_w);
template<int Bit> DECLARE_WRITE_LINE_MEMBER(sparkle_w);
DECLARE_WRITE_LINE_MEMBER(gorf_sound_switch_w);
- DECLARE_WRITE8_MEMBER(profpac_banksw_w);
- DECLARE_WRITE8_MEMBER(demndrgn_banksw_w);
- DECLARE_READ8_MEMBER(video_register_r);
- DECLARE_WRITE8_MEMBER(video_register_w);
- DECLARE_WRITE8_MEMBER(astrocade_funcgen_w);
- DECLARE_WRITE8_MEMBER(expand_register_w);
- DECLARE_WRITE8_MEMBER(astrocade_pattern_board_w);
- DECLARE_WRITE8_MEMBER(profpac_page_select_w);
- DECLARE_READ8_MEMBER(profpac_intercept_r);
- DECLARE_WRITE8_MEMBER(profpac_screenram_ctrl_w);
- DECLARE_READ8_MEMBER(profpac_videoram_r);
- DECLARE_WRITE8_MEMBER(profpac_videoram_w);
+ void profpac_banksw_w(uint8_t data);
+ void demndrgn_banksw_w(uint8_t data);
+ uint8_t video_register_r(offs_t offset);
+ void video_register_w(offs_t offset, uint8_t data);
+ void astrocade_funcgen_w(address_space &space, offs_t offset, uint8_t data);
+ void expand_register_w(uint8_t data);
+ void astrocade_pattern_board_w(offs_t offset, uint8_t data);
+ void profpac_page_select_w(uint8_t data);
+ uint8_t profpac_intercept_r();
+ void profpac_screenram_ctrl_w(offs_t offset, uint8_t data);
+ uint8_t profpac_videoram_r(offs_t offset);
+ void profpac_videoram_w(offs_t offset, uint8_t data);
DECLARE_INPUT_CHANGED_MEMBER(spacezap_monitor);
DECLARE_WRITE_LINE_MEMBER(lightpen_trigger_w);
void init_profpac();
@@ -197,8 +197,8 @@ public:
void seawolf2(machine_config &config);
private:
- DECLARE_WRITE8_MEMBER(sound_1_w);
- DECLARE_WRITE8_MEMBER(sound_2_w);
+ void sound_1_w(uint8_t data);
+ void sound_2_w(uint8_t data);
void port_map_discrete(address_map &map);
@@ -220,8 +220,8 @@ public:
void ebases(machine_config &config);
DECLARE_CUSTOM_INPUT_MEMBER(trackball_r);
private:
- DECLARE_WRITE8_MEMBER(trackball_select_w);
- DECLARE_WRITE8_MEMBER(coin_w);
+ void trackball_select_w(uint8_t data);
+ void coin_w(uint8_t data);
void ebases_map(address_map &map);
void port_map_ebases(address_map &map);
@@ -241,7 +241,7 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(joystick_r);
private:
DECLARE_WRITE_LINE_MEMBER(input_select_w);
- DECLARE_WRITE8_MEMBER(sound_w);
+ void sound_w(uint8_t data);
void port_map_16col_pattern_demndrgn(address_map &map);
@@ -259,9 +259,9 @@ public:
void tenpindx(machine_config &config);
private:
- DECLARE_WRITE8_MEMBER(lamp_w);
- DECLARE_WRITE8_MEMBER(counter_w);
- DECLARE_WRITE8_MEMBER(lights_w);
+ void lamp_w(offs_t offset, uint8_t data);
+ void counter_w(uint8_t data);
+ void lights_w(uint8_t data);
virtual void machine_start() override;
diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h
index 80b3c6a5029..e4bf8971d1f 100644
--- a/src/mame/includes/astrof.h
+++ b/src/mame/includes/astrof.h
@@ -51,24 +51,24 @@ public:
optional_device<samples_device> m_samples; // astrof & abattle
optional_device<sn76477_device> m_sn; // tomahawk
required_device<screen_device> m_screen;
- DECLARE_READ8_MEMBER(irq_clear_r);
- DECLARE_WRITE8_MEMBER(astrof_videoram_w);
- DECLARE_WRITE8_MEMBER(tomahawk_videoram_w);
- DECLARE_WRITE8_MEMBER(video_control_1_w);
- DECLARE_WRITE8_MEMBER(astrof_video_control_2_w);
- DECLARE_WRITE8_MEMBER(spfghmk2_video_control_2_w);
- DECLARE_WRITE8_MEMBER(tomahawk_video_control_2_w);
- DECLARE_READ8_MEMBER(shoot_r);
- DECLARE_READ8_MEMBER(abattle_coin_prot_r);
- DECLARE_READ8_MEMBER(afire_coin_prot_r);
- DECLARE_READ8_MEMBER(tomahawk_protection_r);
+ uint8_t irq_clear_r();
+ void astrof_videoram_w(offs_t offset, uint8_t data);
+ void tomahawk_videoram_w(offs_t offset, uint8_t data);
+ void video_control_1_w(uint8_t data);
+ void astrof_video_control_2_w(uint8_t data);
+ void spfghmk2_video_control_2_w(uint8_t data);
+ void tomahawk_video_control_2_w(uint8_t data);
+ uint8_t shoot_r();
+ uint8_t abattle_coin_prot_r();
+ uint8_t afire_coin_prot_r();
+ uint8_t tomahawk_protection_r();
DECLARE_CUSTOM_INPUT_MEMBER(astrof_p1_controls_r);
DECLARE_CUSTOM_INPUT_MEMBER(astrof_p2_controls_r);
DECLARE_CUSTOM_INPUT_MEMBER(tomahawk_controls_r);
- DECLARE_WRITE8_MEMBER(astrof_audio_1_w);
- DECLARE_WRITE8_MEMBER(astrof_audio_2_w);
- DECLARE_WRITE8_MEMBER(spfghmk2_audio_w);
- DECLARE_WRITE8_MEMBER(tomahawk_audio_w);
+ void astrof_audio_1_w(uint8_t data);
+ void astrof_audio_2_w(uint8_t data);
+ void spfghmk2_audio_w(uint8_t data);
+ void tomahawk_audio_w(uint8_t data);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
DECLARE_INPUT_CHANGED_MEMBER(service_coin_inserted);
void init_afire();
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index d3d6ea9b31f..738fb508096 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -42,20 +42,20 @@ public:
m_leds(*this, "led%u", 0U)
{ }
- DECLARE_WRITE8_MEMBER(atarifb_out1_w);
- DECLARE_WRITE8_MEMBER(atarifb4_out1_w);
- DECLARE_WRITE8_MEMBER(abaseb_out1_w);
- DECLARE_WRITE8_MEMBER(soccer_out1_w);
- DECLARE_WRITE8_MEMBER(atarifb_out2_w);
- DECLARE_WRITE8_MEMBER(soccer_out2_w);
- DECLARE_WRITE8_MEMBER(atarifb_out3_w);
- DECLARE_READ8_MEMBER(atarifb_in0_r);
- DECLARE_READ8_MEMBER(atarifb_in2_r);
- DECLARE_READ8_MEMBER(atarifb4_in0_r);
- DECLARE_READ8_MEMBER(atarifb4_in2_r);
- DECLARE_WRITE8_MEMBER(atarifb_alpha1_videoram_w);
- DECLARE_WRITE8_MEMBER(atarifb_alpha2_videoram_w);
- DECLARE_WRITE8_MEMBER(atarifb_field_videoram_w);
+ void atarifb_out1_w(uint8_t data);
+ void atarifb4_out1_w(uint8_t data);
+ void abaseb_out1_w(uint8_t data);
+ void soccer_out1_w(uint8_t data);
+ void atarifb_out2_w(uint8_t data);
+ void soccer_out2_w(uint8_t data);
+ void atarifb_out3_w(uint8_t data);
+ uint8_t atarifb_in0_r();
+ uint8_t atarifb_in2_r();
+ uint8_t atarifb4_in0_r();
+ uint8_t atarifb4_in2_r();
+ void atarifb_alpha1_videoram_w(offs_t offset, uint8_t data);
+ void atarifb_alpha2_videoram_w(offs_t offset, uint8_t data);
+ void atarifb_field_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(alpha1_get_tile_info);
TILE_GET_INFO_MEMBER(alpha2_get_tile_info);
TILE_GET_INFO_MEMBER(field_get_tile_info);
diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h
index a7073dcca7a..cf648105dc0 100644
--- a/src/mame/includes/atarig1.h
+++ b/src/mame/includes/atarig1.h
@@ -56,10 +56,10 @@ public:
virtual void device_post_load() override;
void video_int_ack_w(uint16_t data = 0);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_update);
- DECLARE_WRITE16_MEMBER(mo_command_w);
- DECLARE_WRITE16_MEMBER(a2d_select_w);
- DECLARE_READ16_MEMBER(a2d_data_r);
- DECLARE_READ16_MEMBER(pitfightb_cheap_slapstic_r);
+ void mo_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void a2d_select_w(offs_t offset, uint16_t data);
+ uint16_t a2d_data_r();
+ uint16_t pitfightb_cheap_slapstic_r(offs_t offset);
void update_bank(int bank);
void init_hydrap();
void init_hydra();
diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h
index 92edd38aa69..155585e2d5e 100644
--- a/src/mame/includes/atarig42.h
+++ b/src/mame/includes/atarig42.h
@@ -37,10 +37,10 @@ protected:
virtual void machine_start() override;
void video_int_ack_w(uint16_t data = 0);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_update);
- DECLARE_WRITE8_MEMBER(a2d_select_w);
- DECLARE_READ8_MEMBER(a2d_data_r);
- DECLARE_WRITE16_MEMBER(io_latch_w);
- DECLARE_WRITE16_MEMBER(mo_command_w);
+ void a2d_select_w(offs_t offset, uint8_t data);
+ uint8_t a2d_data_r(offs_t offset);
+ void io_latch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void mo_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILEMAP_MAPPER_MEMBER(atarig42_playfield_scan);
@@ -84,8 +84,8 @@ public:
void atarig42_0x200(machine_config &config);
protected:
- DECLARE_READ16_MEMBER(roadriot_sloop_data_r);
- DECLARE_WRITE16_MEMBER(roadriot_sloop_data_w);
+ uint16_t roadriot_sloop_data_r(offs_t offset);
+ void roadriot_sloop_data_w(offs_t offset, uint16_t data);
void roadriot_sloop_tweak(int offset);
};
@@ -97,8 +97,8 @@ public:
void atarig42_0x400(machine_config &config);
protected:
- DECLARE_READ16_MEMBER(guardians_sloop_data_r);
- DECLARE_WRITE16_MEMBER(guardians_sloop_data_w);
+ uint16_t guardians_sloop_data_r(offs_t offset);
+ void guardians_sloop_data_w(offs_t offset, uint16_t data);
void guardians_sloop_tweak(int offset);
};
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index b914be2cc18..3b37ca4a666 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -82,17 +82,17 @@ public:
void scanline_int_ack_w(uint32_t data = 0);
void video_int_ack_w(uint32_t data = 0);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_update);
- DECLARE_READ32_MEMBER(special_port2_r);
- DECLARE_READ32_MEMBER(special_port3_r);
- DECLARE_READ8_MEMBER(analog_port_r);
- DECLARE_WRITE32_MEMBER(latch_w);
- DECLARE_WRITE32_MEMBER(mo_command_w);
- DECLARE_WRITE32_MEMBER(led_w);
- DECLARE_READ32_MEMBER(sound_data_r);
- DECLARE_WRITE32_MEMBER(sound_data_w);
- DECLARE_READ32_MEMBER(colorram_protection_r);
- DECLARE_WRITE32_MEMBER(colorram_protection_w);
- DECLARE_WRITE32_MEMBER(tmek_pf_w);
+ uint32_t special_port2_r();
+ uint32_t special_port3_r();
+ uint8_t analog_port_r(offs_t offset);
+ void latch_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void mo_command_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void led_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sound_data_r(offs_t offset, uint32_t mem_mask = ~0);
+ void sound_data_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t colorram_protection_r(address_space &space, offs_t offset, uint32_t mem_mask = ~0);
+ void colorram_protection_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void tmek_pf_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
void cage_irq_callback(uint8_t data);
diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h
index 2ff617ae91e..0a7c65d2f98 100644
--- a/src/mame/includes/atarigx2.h
+++ b/src/mame/includes/atarigx2.h
@@ -43,19 +43,19 @@ protected:
virtual void video_start() override;
void video_int_ack_w(uint32_t data = 0);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_update);
- DECLARE_READ32_MEMBER(special_port2_r);
- DECLARE_READ32_MEMBER(special_port3_r);
- DECLARE_READ8_MEMBER(a2d_data_r);
- DECLARE_WRITE32_MEMBER(latch_w);
- DECLARE_WRITE32_MEMBER(mo_command_w);
- DECLARE_WRITE32_MEMBER(atarigx2_protection_w);
- DECLARE_READ32_MEMBER(atarigx2_protection_r);
- DECLARE_READ32_MEMBER(rrreveng_prot_r);
+ uint32_t special_port2_r();
+ uint32_t special_port3_r();
+ uint8_t a2d_data_r(offs_t offset);
+ void latch_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void mo_command_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void atarigx2_protection_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t atarigx2_protection_r(offs_t offset, uint32_t mem_mask = ~0);
+ uint32_t rrreveng_prot_r();
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILEMAP_MAPPER_MEMBER(atarigx2_playfield_scan);
uint32_t screen_update_atarigx2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE16_MEMBER( atarigx2_mo_control_w );
+ void atarigx2_mo_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void atarigx2(machine_config &config);
void main_map(address_map &map);
diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h
index 600939053f7..8b740f24b59 100644
--- a/src/mame/includes/atarist.h
+++ b/src/mame/includes/atarist.h
@@ -168,42 +168,42 @@ protected:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// video
- DECLARE_READ8_MEMBER( shifter_base_r );
- DECLARE_READ8_MEMBER( shifter_counter_r );
- DECLARE_READ8_MEMBER( shifter_sync_r );
- DECLARE_READ16_MEMBER( shifter_palette_r );
- DECLARE_READ8_MEMBER( shifter_mode_r );
-
- DECLARE_WRITE8_MEMBER( shifter_base_w );
- DECLARE_WRITE8_MEMBER( shifter_sync_w );
- DECLARE_WRITE16_MEMBER( shifter_palette_w );
- DECLARE_WRITE8_MEMBER( shifter_mode_w );
-
- DECLARE_READ16_MEMBER( blitter_halftone_r );
- DECLARE_READ16_MEMBER( blitter_src_inc_x_r );
- DECLARE_READ16_MEMBER( blitter_src_inc_y_r );
- DECLARE_READ16_MEMBER( blitter_src_r );
- DECLARE_READ16_MEMBER( blitter_end_mask_r );
- DECLARE_READ16_MEMBER( blitter_dst_inc_x_r );
- DECLARE_READ16_MEMBER( blitter_dst_inc_y_r );
- DECLARE_READ16_MEMBER( blitter_dst_r );
- DECLARE_READ16_MEMBER( blitter_count_x_r );
- DECLARE_READ16_MEMBER( blitter_count_y_r );
- DECLARE_READ16_MEMBER( blitter_op_r );
- DECLARE_READ16_MEMBER( blitter_ctrl_r );
-
- DECLARE_WRITE16_MEMBER( blitter_halftone_w );
- DECLARE_WRITE16_MEMBER( blitter_src_inc_x_w );
- DECLARE_WRITE16_MEMBER( blitter_src_inc_y_w );
- DECLARE_WRITE16_MEMBER( blitter_src_w );
- DECLARE_WRITE16_MEMBER( blitter_end_mask_w );
- DECLARE_WRITE16_MEMBER( blitter_dst_inc_x_w );
- DECLARE_WRITE16_MEMBER( blitter_dst_inc_y_w );
- DECLARE_WRITE16_MEMBER( blitter_dst_w );
- DECLARE_WRITE16_MEMBER( blitter_count_x_w );
- DECLARE_WRITE16_MEMBER( blitter_count_y_w );
- DECLARE_WRITE16_MEMBER( blitter_op_w );
- DECLARE_WRITE16_MEMBER( blitter_ctrl_w );
+ uint8_t shifter_base_r(offs_t offset);
+ uint8_t shifter_counter_r(offs_t offset);
+ uint8_t shifter_sync_r();
+ uint16_t shifter_palette_r(offs_t offset);
+ uint8_t shifter_mode_r();
+
+ void shifter_base_w(offs_t offset, uint8_t data);
+ void shifter_sync_w(uint8_t data);
+ void shifter_palette_w(offs_t offset, uint16_t data);
+ void shifter_mode_w(uint8_t data);
+
+ uint16_t blitter_halftone_r(offs_t offset);
+ uint16_t blitter_src_inc_x_r();
+ uint16_t blitter_src_inc_y_r();
+ uint16_t blitter_src_r(offs_t offset);
+ uint16_t blitter_end_mask_r(offs_t offset);
+ uint16_t blitter_dst_inc_x_r();
+ uint16_t blitter_dst_inc_y_r();
+ uint16_t blitter_dst_r(offs_t offset);
+ uint16_t blitter_count_x_r();
+ uint16_t blitter_count_y_r();
+ uint16_t blitter_op_r(offs_t offset, uint16_t mem_mask = ~0);
+ uint16_t blitter_ctrl_r(offs_t offset, uint16_t mem_mask = ~0);
+
+ void blitter_halftone_w(offs_t offset, uint16_t data);
+ void blitter_src_inc_x_w(uint16_t data);
+ void blitter_src_inc_y_w(uint16_t data);
+ void blitter_src_w(offs_t offset, uint16_t data);
+ void blitter_end_mask_w(offs_t offset, uint16_t data);
+ void blitter_dst_inc_x_w(uint16_t data);
+ void blitter_dst_inc_y_w(uint16_t data);
+ void blitter_dst_w(offs_t offset, uint16_t data);
+ void blitter_count_x_w(uint16_t data);
+ void blitter_count_y_w(uint16_t data);
+ void blitter_op_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void blitter_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void mouse_tick();
inline pen_t shift_mode_0();
@@ -220,16 +220,16 @@ protected:
void blitter_tick();
// driver
- DECLARE_READ16_MEMBER( fdc_data_r );
- DECLARE_WRITE16_MEMBER( fdc_data_w );
- DECLARE_READ16_MEMBER( dma_status_r );
- DECLARE_WRITE16_MEMBER( dma_mode_w );
- DECLARE_READ8_MEMBER( dma_counter_r );
- DECLARE_WRITE8_MEMBER( dma_base_w );
- DECLARE_READ8_MEMBER( mmu_r );
- DECLARE_WRITE8_MEMBER( mmu_w );
- DECLARE_READ16_MEMBER( berr_r );
- DECLARE_WRITE16_MEMBER( berr_w );
+ uint16_t fdc_data_r(offs_t offset);
+ void fdc_data_w(offs_t offset, uint16_t data);
+ uint16_t dma_status_r();
+ void dma_mode_w(uint16_t data);
+ uint8_t dma_counter_r(offs_t offset);
+ void dma_base_w(offs_t offset, uint8_t data);
+ uint8_t mmu_r();
+ void mmu_w(uint8_t data);
+ uint16_t berr_r();
+ void berr_w(uint16_t data);
uint8_t ikbd_port1_r();
uint8_t ikbd_port2_r();
void ikbd_port2_w(uint8_t data);
@@ -353,8 +353,8 @@ public:
: st_state(mconfig, type, tag)
{ }
- DECLARE_READ16_MEMBER( fpu_r );
- DECLARE_WRITE16_MEMBER( fpu_w );
+ uint16_t fpu_r();
+ void fpu_w(uint16_t data);
void megast(machine_config &config);
void megast_map(address_map &map);
};
@@ -375,29 +375,29 @@ public:
optional_device<lmc1992_device> m_lmc1992;
- DECLARE_READ8_MEMBER( shifter_base_low_r );
- DECLARE_WRITE8_MEMBER( shifter_base_low_w );
- DECLARE_READ8_MEMBER( shifter_counter_r );
- DECLARE_WRITE8_MEMBER( shifter_counter_w );
- DECLARE_WRITE16_MEMBER( shifter_palette_w );
- DECLARE_READ8_MEMBER( shifter_lineofs_r );
- DECLARE_WRITE8_MEMBER( shifter_lineofs_w );
- DECLARE_READ8_MEMBER( shifter_pixelofs_r );
- DECLARE_WRITE8_MEMBER( shifter_pixelofs_w );
-
- DECLARE_READ8_MEMBER( sound_dma_control_r );
- DECLARE_READ8_MEMBER( sound_dma_base_r );
- DECLARE_READ8_MEMBER( sound_dma_counter_r );
- DECLARE_READ8_MEMBER( sound_dma_end_r );
- DECLARE_READ8_MEMBER( sound_mode_r );
- DECLARE_WRITE8_MEMBER( sound_dma_control_w );
- DECLARE_WRITE8_MEMBER( sound_dma_base_w );
- DECLARE_WRITE8_MEMBER( sound_dma_end_w );
- DECLARE_WRITE8_MEMBER( sound_mode_w );
- DECLARE_READ16_MEMBER( microwire_data_r );
- DECLARE_WRITE16_MEMBER( microwire_data_w );
- DECLARE_READ16_MEMBER( microwire_mask_r );
- DECLARE_WRITE16_MEMBER( microwire_mask_w );
+ uint8_t shifter_base_low_r();
+ void shifter_base_low_w(uint8_t data);
+ uint8_t shifter_counter_r(offs_t offset);
+ void shifter_counter_w(offs_t offset, uint8_t data);
+ void shifter_palette_w(offs_t offset, uint16_t data);
+ uint8_t shifter_lineofs_r();
+ void shifter_lineofs_w(uint8_t data);
+ uint8_t shifter_pixelofs_r();
+ void shifter_pixelofs_w(uint8_t data);
+
+ uint8_t sound_dma_control_r();
+ uint8_t sound_dma_base_r(offs_t offset);
+ uint8_t sound_dma_counter_r(offs_t offset);
+ uint8_t sound_dma_end_r(offs_t offset);
+ uint8_t sound_mode_r();
+ void sound_dma_control_w(uint8_t data);
+ void sound_dma_base_w(offs_t offset, uint8_t data);
+ void sound_dma_end_w(offs_t offset, uint8_t data);
+ void sound_mode_w(uint8_t data);
+ uint16_t microwire_data_r();
+ void microwire_data_w(uint16_t data);
+ uint16_t microwire_mask_r();
+ void microwire_mask_w(uint16_t data);
DECLARE_WRITE_LINE_MEMBER( write_monochrome );
@@ -450,8 +450,8 @@ public:
: ste_state(mconfig, type, tag)
{ }
- DECLARE_READ16_MEMBER( cache_r );
- DECLARE_WRITE16_MEMBER( cache_w );
+ uint16_t cache_r();
+ void cache_w(uint16_t data);
uint16_t m_cache;
void megaste(machine_config &config);
@@ -471,11 +471,11 @@ public:
required_ioport m_sw400;
- DECLARE_READ16_MEMBER( config_r );
- DECLARE_WRITE16_MEMBER( lcd_control_w );
+ uint16_t config_r();
+ void lcd_control_w(uint16_t data);
void psg_pa_w(uint8_t data);
- DECLARE_READ8_MEMBER( mfp_gpio_r );
+ uint8_t mfp_gpio_r();
void stbook_map(address_map &map);
protected:
virtual void machine_start() override;
diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h
index fd5eb7b9f43..aac95be7055 100644
--- a/src/mame/includes/atarisy1.h
+++ b/src/mame/includes/atarisy1.h
@@ -135,12 +135,12 @@ protected:
virtual void update_timers(int scanline);
void decode_gfx(uint16_t *pflookup, uint16_t *molookup);
int get_bank(uint8_t prom1, uint8_t prom2, int bpp);
- DECLARE_READ16_MEMBER( atarisy1_int3state_r );
- DECLARE_WRITE16_MEMBER( atarisy1_spriteram_w );
+ uint16_t atarisy1_int3state_r();
+ void atarisy1_spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void bankselect_w(uint8_t data);
- DECLARE_WRITE16_MEMBER( atarisy1_xscroll_w );
- DECLARE_WRITE16_MEMBER( atarisy1_yscroll_w );
- DECLARE_WRITE16_MEMBER( atarisy1_priority_w );
+ void atarisy1_xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void atarisy1_yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void atarisy1_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
static const atari_motion_objects_config s_mob_config;
void add_adc(machine_config &config);
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index e0c171be570..d3e54ff346d 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -146,11 +146,11 @@ private:
DECLARE_WRITE_LINE_MEMBER(vblank_int);
TIMER_CALLBACK_MEMBER(delayed_int_enable_w);
TIMER_CALLBACK_MEMBER(reset_yscroll_callback);
- DECLARE_READ16_MEMBER(slapstic_r);
- DECLARE_WRITE16_MEMBER(slapstic_w);
- DECLARE_WRITE16_MEMBER(yscroll_w);
- DECLARE_WRITE16_MEMBER(xscroll_w);
- DECLARE_WRITE16_MEMBER(spriteram_w);
+ uint16_t slapstic_r(address_space &space, offs_t offset);
+ void slapstic_w(address_space &space, offs_t offset, uint16_t data);
+ void yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
static rgb_t RRRRGGGGBBBBIIII(uint32_t raw);
static const atari_motion_objects_config s_mob_config;
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index ad7c4da8c86..2a29c4b7325 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -54,10 +54,10 @@ protected:
emu_timer *m_interrupt_timer;
tilemap_t *m_bg_tilemap;
- DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_READ8_MEMBER(slapstic_r);
- DECLARE_WRITE8_MEMBER(coincount_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
+ void irq_ack_w(uint8_t data);
+ uint8_t slapstic_r(address_space &space, offs_t offset);
+ void coincount_w(uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(interrupt_gen);
diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h
index 7974d53210c..488b8f249ff 100644
--- a/src/mame/includes/aussiebyte.h
+++ b/src/mame/includes/aussiebyte.h
@@ -75,23 +75,23 @@ protected:
uint8_t io_read_byte(offs_t offset);
void io_write_byte(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
- DECLARE_WRITE8_MEMBER(port15_w);
- DECLARE_WRITE8_MEMBER(port16_w);
- DECLARE_WRITE8_MEMBER(port17_w);
- DECLARE_WRITE8_MEMBER(port18_w);
- DECLARE_READ8_MEMBER(port19_r);
- DECLARE_WRITE8_MEMBER(port1a_w);
- DECLARE_WRITE8_MEMBER(port1b_w);
- DECLARE_WRITE8_MEMBER(port1c_w);
+ void port15_w(uint8_t data);
+ void port16_w(uint8_t data);
+ void port17_w(uint8_t data);
+ void port18_w(uint8_t data);
+ uint8_t port19_r();
+ void port1a_w(uint8_t data);
+ void port1b_w(uint8_t data);
+ void port1c_w(uint8_t data);
void port20_w(uint8_t data);
- DECLARE_READ8_MEMBER(port28_r);
- DECLARE_READ8_MEMBER(port33_r);
- DECLARE_WRITE8_MEMBER(port34_w);
- DECLARE_WRITE8_MEMBER(port35_w);
- DECLARE_READ8_MEMBER(port36_r);
- DECLARE_READ8_MEMBER(port37_r);
- DECLARE_READ8_MEMBER(rtc_r);
- DECLARE_WRITE8_MEMBER(rtc_w);
+ uint8_t port28_r();
+ uint8_t port33_r();
+ void port34_w(uint8_t data);
+ void port35_w(uint8_t data);
+ uint8_t port36_r();
+ uint8_t port37_r();
+ uint8_t rtc_r(offs_t offset);
+ void rtc_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
DECLARE_WRITE_LINE_MEMBER(busreq_w);
@@ -101,8 +101,8 @@ protected:
DECLARE_WRITE_LINE_MEMBER(sio2_rdya_w);
DECLARE_WRITE_LINE_MEMBER(sio2_rdyb_w);
DECLARE_WRITE_LINE_MEMBER(ctc_z2_w);
- DECLARE_WRITE8_MEMBER(address_w);
- DECLARE_WRITE8_MEMBER(register_w);
+ void address_w(uint8_t data);
+ void register_w(uint8_t data);
MC6845_UPDATE_ROW(crtc_update_row);
MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr);
diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h
index f32a56e5500..124fe10a1b2 100644
--- a/src/mame/includes/avalnche.h
+++ b/src/mame/includes/avalnche.h
@@ -27,13 +27,13 @@ public:
uint8_t m_avalance_video_inverted;
DECLARE_WRITE_LINE_MEMBER(video_invert_w);
- DECLARE_WRITE8_MEMBER(catch_coin_counter_w);
+ void catch_coin_counter_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(credit_1_lamp_w);
DECLARE_WRITE_LINE_MEMBER(credit_2_lamp_w);
DECLARE_WRITE_LINE_MEMBER(start_lamp_w);
virtual void machine_start() override;
uint32_t screen_update_avalnche(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(avalnche_noise_amplitude_w);
+ void avalnche_noise_amplitude_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(catch_aud0_w);
DECLARE_WRITE_LINE_MEMBER(catch_aud1_w);
DECLARE_WRITE_LINE_MEMBER(catch_aud2_w);
diff --git a/src/mame/includes/avigo.h b/src/mame/includes/avigo.h
index 3462ebd91cb..aa9390808a1 100644
--- a/src/mame/includes/avigo.h
+++ b/src/mame/includes/avigo.h
@@ -54,7 +54,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(power_down_irq);
protected:
- // defined in drivers/avigo.c
+ // defined in drivers/avigo.cpp
virtual void machine_start() override;
virtual void machine_reset() override;
void refresh_ints();
@@ -63,26 +63,26 @@ protected:
DECLARE_WRITE_LINE_MEMBER( tc8521_alarm_int );
DECLARE_WRITE_LINE_MEMBER( com_interrupt );
- DECLARE_READ8_MEMBER(key_data_read_r);
- DECLARE_WRITE8_MEMBER(set_key_line_w);
- DECLARE_WRITE8_MEMBER(port2_w);
- DECLARE_READ8_MEMBER(irq_r);
- DECLARE_WRITE8_MEMBER(irq_w);
- DECLARE_READ8_MEMBER(bank1_r);
- DECLARE_READ8_MEMBER(bank2_r);
- DECLARE_WRITE8_MEMBER(bank1_w);
- DECLARE_WRITE8_MEMBER(bank2_w);
- DECLARE_READ8_MEMBER(ad_control_status_r);
- DECLARE_WRITE8_MEMBER(ad_control_status_w);
- DECLARE_READ8_MEMBER(ad_data_r);
- DECLARE_WRITE8_MEMBER(speaker_w);
- DECLARE_READ8_MEMBER(port_04_r);
-
- // defined in video/avigo.c
+ uint8_t key_data_read_r();
+ void set_key_line_w(uint8_t data);
+ void port2_w(uint8_t data);
+ uint8_t irq_r();
+ void irq_w(uint8_t data);
+ uint8_t bank1_r(offs_t offset);
+ uint8_t bank2_r(offs_t offset);
+ void bank1_w(offs_t offset, uint8_t data);
+ void bank2_w(offs_t offset, uint8_t data);
+ uint8_t ad_control_status_r();
+ void ad_control_status_w(uint8_t data);
+ uint8_t ad_data_r();
+ void speaker_w(uint8_t data);
+ uint8_t port_04_r();
+
+ // defined in video/avigo.cpp
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_READ8_MEMBER(vid_memory_r);
- DECLARE_WRITE8_MEMBER(vid_memory_w);
+ uint8_t vid_memory_r(offs_t offset);
+ void vid_memory_w(offs_t offset, uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(avigo_scan_timer);
TIMER_DEVICE_CALLBACK_MEMBER(avigo_1hz_timer);
diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h
index 116944048e0..53895de975f 100644
--- a/src/mame/includes/aztarac.h
+++ b/src/mame/includes/aztarac.h
@@ -39,13 +39,13 @@ public:
int m_ycenter;
void nvram_store_w(uint16_t data);
- DECLARE_READ16_MEMBER(joystick_r);
+ uint16_t joystick_r();
void ubr_w(uint8_t data);
- DECLARE_READ16_MEMBER(sound_r);
- DECLARE_WRITE16_MEMBER(sound_w);
- DECLARE_READ8_MEMBER(snd_command_r);
- DECLARE_READ8_MEMBER(snd_status_r);
- DECLARE_WRITE8_MEMBER(snd_status_w);
+ uint16_t sound_r();
+ void sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t snd_command_r();
+ uint8_t snd_status_r();
+ void snd_status_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h
index 2961d4daa7d..520a569d9bb 100644
--- a/src/mame/includes/b2m.h
+++ b/src/mame/includes/b2m.h
@@ -35,11 +35,11 @@ public:
, m_pic(*this, "pic8259")
{ }
- DECLARE_READ8_MEMBER(b2m_keyboard_r);
- DECLARE_WRITE8_MEMBER(b2m_palette_w);
- DECLARE_READ8_MEMBER(b2m_palette_r);
- DECLARE_WRITE8_MEMBER(b2m_localmachine_w);
- DECLARE_READ8_MEMBER(b2m_localmachine_r);
+ uint8_t b2m_keyboard_r(offs_t offset);
+ void b2m_palette_w(offs_t offset, uint8_t data);
+ uint8_t b2m_palette_r(offs_t offset);
+ void b2m_localmachine_w(uint8_t data);
+ uint8_t b2m_localmachine_r();
void init_b2m();
void b2m_palette(palette_device &palette) const;
diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h
index 2aa555dfa97..bcf7d47311f 100644
--- a/src/mame/includes/badlands.h
+++ b/src/mame/includes/badlands.h
@@ -74,9 +74,9 @@ public:
DECLARE_VIDEO_START(badlands);
uint32_t screen_update_badlands(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_int);
- DECLARE_WRITE16_MEMBER(video_int_ack_w);
+ void video_int_ack_w(uint16_t data);
TIMER_DEVICE_CALLBACK_MEMBER(sound_scanline);
- DECLARE_WRITE16_MEMBER( badlands_pf_bank_w );
+ void badlands_pf_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
static const atari_motion_objects_config s_mob_config;
void badlands(machine_config &config);
@@ -97,11 +97,11 @@ public:
m_spriteram(*this, "spriteram")
{}
- DECLARE_READ8_MEMBER(bootleg_shared_r);
- DECLARE_WRITE8_MEMBER(bootleg_shared_w);
- DECLARE_WRITE8_MEMBER(bootleg_main_irq_w);
- DECLARE_READ16_MEMBER(badlandsb_unk_r);
- DECLARE_READ8_MEMBER(sound_response_r);
+ uint8_t bootleg_shared_r(offs_t offset);
+ void bootleg_shared_w(offs_t offset, uint8_t data);
+ void bootleg_main_irq_w(uint8_t data);
+ uint16_t badlandsb_unk_r();
+ uint8_t sound_response_r();
TIMER_DEVICE_CALLBACK_MEMBER(bootleg_sound_scanline);
void badlandsb(machine_config &config);
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index 1973072600b..8d1cba713d8 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -36,19 +36,19 @@ protected:
// common
DECLARE_WRITE_LINE_MEMBER(coin_counter_w);
DECLARE_WRITE_LINE_MEMBER(irq_mask_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(colorram_w);
+ void videoram_w(offs_t offset, uint8_t data);
+ void colorram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flipscreen_x_w);
DECLARE_WRITE_LINE_MEMBER(flipscreen_y_w);
DECLARE_WRITE_LINE_MEMBER(video_enable_w);
// bagman
- DECLARE_WRITE8_MEMBER(ls259_w);
+ void ls259_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(tmsprom_bit_w);
DECLARE_WRITE_LINE_MEMBER(tmsprom_csq0_w);
DECLARE_WRITE_LINE_MEMBER(tmsprom_csq1_w);
- DECLARE_WRITE8_MEMBER(pal16r6_w);
- DECLARE_READ8_MEMBER(pal16r6_r);
+ void pal16r6_w(offs_t offset, uint8_t data);
+ uint8_t pal16r6_r();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index 70405d7b53c..3de49567989 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -95,10 +95,10 @@ public:
void init_gghost();
private:
- DECLARE_WRITE8_MEMBER(random_reset_w);
- DECLARE_READ8_MEMBER(random_num_r);
- DECLARE_WRITE8_MEMBER(rombank_select_w);
- DECLARE_WRITE8_MEMBER(rombank2_select_w);
+ void random_reset_w(uint8_t data);
+ uint8_t random_num_r();
+ void rombank_select_w(uint8_t data);
+ void rombank2_select_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(out0_w);
DECLARE_WRITE_LINE_MEMBER(out1_w);
DECLARE_WRITE_LINE_MEMBER(out2_w);
@@ -107,25 +107,25 @@ private:
DECLARE_WRITE_LINE_MEMBER(out5_w);
DECLARE_WRITE_LINE_MEMBER(out6_w);
DECLARE_WRITE_LINE_MEMBER(nvrecall_w);
- DECLARE_READ8_MEMBER(novram_8bit_r);
- DECLARE_WRITE8_MEMBER(novram_8bit_w);
- DECLARE_WRITE8_MEMBER(acia_w);
- DECLARE_READ8_MEMBER(adc_data_r);
- DECLARE_WRITE8_MEMBER(adc_select_w);
- DECLARE_WRITE8_MEMBER(spiker_expand_w);
- DECLARE_READ8_MEMBER(spiker_expand_r);
- DECLARE_READ8_MEMBER(grudge_steering_r);
- DECLARE_READ8_MEMBER(shrike_shared_6809_r);
- DECLARE_WRITE8_MEMBER(shrike_shared_6809_w);
- DECLARE_WRITE16_MEMBER(shrike_io_68k_w);
- DECLARE_READ16_MEMBER(shrike_io_68k_r);
- DECLARE_READ8_MEMBER(teamht_extra_r);
- DECLARE_WRITE8_MEMBER(teamht_multiplex_select_w);
-
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(palette_select_w);
- DECLARE_WRITE8_MEMBER(paletteram_w);
- DECLARE_WRITE8_MEMBER(shrike_sprite_select_w);
+ uint8_t novram_8bit_r(address_space &space, offs_t offset);
+ void novram_8bit_w(offs_t offset, uint8_t data);
+ void acia_w(offs_t offset, uint8_t data);
+ uint8_t adc_data_r();
+ void adc_select_w(offs_t offset, uint8_t data);
+ void spiker_expand_w(offs_t offset, uint8_t data);
+ uint8_t spiker_expand_r();
+ uint8_t grudge_steering_r();
+ uint8_t shrike_shared_6809_r(offs_t offset);
+ void shrike_shared_6809_w(offs_t offset, uint8_t data);
+ void shrike_io_68k_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t shrike_io_68k_r(offs_t offset, uint16_t mem_mask = ~0);
+ uint8_t teamht_extra_r();
+ void teamht_multiplex_select_w(offs_t offset, uint8_t data);
+
+ void videoram_w(offs_t offset, uint8_t data);
+ void palette_select_w(uint8_t data);
+ void paletteram_w(offs_t offset, uint8_t data);
+ void shrike_sprite_select_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h
index bd716183e49..b1750f95f6b 100644
--- a/src/mame/includes/bankp.h
+++ b/src/mame/includes/bankp.h
@@ -40,12 +40,12 @@ public:
int m_priority;
uint8_t m_nmi_mask;
- DECLARE_WRITE8_MEMBER(scroll_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(colorram_w);
- DECLARE_WRITE8_MEMBER(videoram2_w);
- DECLARE_WRITE8_MEMBER(colorram2_w);
- DECLARE_WRITE8_MEMBER(out_w);
+ void scroll_w(uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
+ void colorram_w(offs_t offset, uint8_t data);
+ void videoram2_w(offs_t offset, uint8_t data);
+ void colorram2_w(offs_t offset, uint8_t data);
+ void out_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void machine_reset() override;
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index 8c3a1178ad0..4cd1216a85d 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -31,14 +31,14 @@ public:
void baraduke_lamps_w(uint8_t data);
void baraduke_irq_ack_w(uint8_t data);
uint8_t soundkludge_r();
- DECLARE_READ8_MEMBER(baraduke_videoram_r);
- DECLARE_WRITE8_MEMBER(baraduke_videoram_w);
- DECLARE_READ8_MEMBER(baraduke_textram_r);
- DECLARE_WRITE8_MEMBER(baraduke_textram_w);
- DECLARE_WRITE8_MEMBER(baraduke_scroll0_w);
- DECLARE_WRITE8_MEMBER(baraduke_scroll1_w);
- DECLARE_READ8_MEMBER(baraduke_spriteram_r);
- DECLARE_WRITE8_MEMBER(baraduke_spriteram_w);
+ uint8_t baraduke_videoram_r(offs_t offset);
+ void baraduke_videoram_w(offs_t offset, uint8_t data);
+ uint8_t baraduke_textram_r(offs_t offset);
+ void baraduke_textram_w(offs_t offset, uint8_t data);
+ void baraduke_scroll0_w(offs_t offset, uint8_t data);
+ void baraduke_scroll1_w(offs_t offset, uint8_t data);
+ uint8_t baraduke_spriteram_r(offs_t offset);
+ void baraduke_spriteram_w(offs_t offset, uint8_t data);
void init_baraduke();
TILEMAP_MAPPER_MEMBER(tx_tilemap_scan);
TILE_GET_INFO_MEMBER(tx_get_tile_info);
@@ -48,7 +48,7 @@ public:
void baraduke_palette(palette_device &palette) const;
uint32_t screen_update_baraduke(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_baraduke);
- void scroll_w(address_space &space, int layer, int offset, int data);
+ void scroll_w(int layer, int offset, int data);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_priority);
void set_scroll(int layer);
void baraduke(machine_config &config);
diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h
index 811d410c91b..219118a7e8a 100644
--- a/src/mame/includes/batman.h
+++ b/src/mame/includes/batman.h
@@ -33,7 +33,7 @@ public:
protected:
virtual void machine_start() override;
- DECLARE_WRITE16_MEMBER(latch_w);
+ void latch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILE_GET_INFO_MEMBER(get_playfield2_tile_info);
diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h
index 25103c5057a..742e73e802b 100644
--- a/src/mame/includes/battlane.h
+++ b/src/mame/includes/battlane.h
@@ -37,14 +37,14 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- DECLARE_WRITE8_MEMBER(battlane_cpu_command_w);
- DECLARE_WRITE8_MEMBER(battlane_palette_w);
- DECLARE_WRITE8_MEMBER(battlane_scrollx_w);
- DECLARE_WRITE8_MEMBER(battlane_scrolly_w);
- DECLARE_WRITE8_MEMBER(battlane_tileram_w);
- DECLARE_WRITE8_MEMBER(battlane_spriteram_w);
- DECLARE_WRITE8_MEMBER(battlane_bitmap_w);
- DECLARE_WRITE8_MEMBER(battlane_video_ctrl_w);
+ void battlane_cpu_command_w(uint8_t data);
+ void battlane_palette_w(offs_t offset, uint8_t data);
+ void battlane_scrollx_w(uint8_t data);
+ void battlane_scrolly_w(uint8_t data);
+ void battlane_tileram_w(offs_t offset, uint8_t data);
+ void battlane_spriteram_w(offs_t offset, uint8_t data);
+ void battlane_bitmap_w(offs_t offset, uint8_t data);
+ void battlane_video_ctrl_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info_bg);
TILEMAP_MAPPER_MEMBER(battlane_tilemap_scan_rows_2x2);
virtual void machine_start() override;
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index f38fc2606a1..b8ac7a1dee9 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -31,12 +31,12 @@ public:
uint8_t m_scroll_lsb;
uint8_t m_scroll_msb;
uint8_t m_starfield_enabled;
- DECLARE_WRITE8_MEMBER(battlex_palette_w);
- DECLARE_WRITE8_MEMBER(battlex_scroll_x_lsb_w);
- DECLARE_WRITE8_MEMBER(battlex_scroll_x_msb_w);
- DECLARE_WRITE8_MEMBER(battlex_scroll_starfield_w);
- DECLARE_WRITE8_MEMBER(battlex_videoram_w);
- DECLARE_WRITE8_MEMBER(battlex_flipscreen_w);
+ void battlex_palette_w(offs_t offset, uint8_t data);
+ void battlex_scroll_x_lsb_w(uint8_t data);
+ void battlex_scroll_x_msb_w(uint8_t data);
+ void battlex_scroll_starfield_w(uint8_t data);
+ void battlex_videoram_w(offs_t offset, uint8_t data);
+ void battlex_flipscreen_w(uint8_t data);
DECLARE_CUSTOM_INPUT_MEMBER(battlex_in0_b4_r);
void init_battlex();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h
index 3d15885af5c..8580e7bf8f6 100644
--- a/src/mame/includes/battlnts.h
+++ b/src/mame/includes/battlnts.h
@@ -37,9 +37,9 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_memory_bank m_rombank;
- DECLARE_WRITE8_MEMBER(battlnts_sh_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(battlnts_bankswitch_w);
- DECLARE_WRITE8_MEMBER(battlnts_spritebank_w);
+ void battlnts_sh_irqtrigger_w(uint8_t data);
+ void battlnts_bankswitch_w(uint8_t data);
+ void battlnts_spritebank_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_battlnts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index e0e23fd988c..251888e4419 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -54,10 +54,10 @@ protected:
TILE_GET_INFO_MEMBER(get_tile_info);
template<int Layer, int Gfx> TILE_GET_INFO_MEMBER(get_pf_tile_info);
- DECLARE_WRITE8_MEMBER(sound_cpu_w);
- DECLARE_WRITE16_MEMBER(video_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(pf_w);
- DECLARE_WRITE8_MEMBER(coin_counter_w);
+ void sound_cpu_w(uint8_t data);
+ void video_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ template<int Layer> void pf_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void coin_counter_w(uint8_t data);
const uint8_t *get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block);
void draw_block(screen_device &screen, bitmap_ind16 &dest,int x,int y,int size,int flipx,int flipy,uint32_t sprite,int color,int bank,int block,int priority);
@@ -83,8 +83,8 @@ protected:
private:
required_shared_ptr<uint16_t> m_eprom_data;
- DECLARE_READ16_MEMBER(eprom_r);
- DECLARE_WRITE16_MEMBER(three_gun_output_w);
+ uint16_t eprom_r(offs_t offset);
+ void three_gun_output_w(uint16_t data);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void bbusters_map(address_map &map);
@@ -104,8 +104,8 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE16_MEMBER(two_gun_output_w);
- DECLARE_READ16_MEMBER(mechatt_gun_r);
+ void two_gun_output_w(uint16_t data);
+ uint16_t mechatt_gun_r(offs_t offset);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void mechatt_map(address_map &map);
diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h
index 639f23c5480..1eaf5d5f7d3 100644
--- a/src/mame/includes/beathead.h
+++ b/src/mame/includes/beathead.h
@@ -36,23 +36,21 @@ public:
void beathead(machine_config &config);
protected:
- // in drivers/beathead.c
+ // in drivers/beathead.cpp
void update_interrupts();
- DECLARE_WRITE32_MEMBER( interrupt_control_w );
- DECLARE_READ32_MEMBER( interrupt_control_r );
- DECLARE_WRITE32_MEMBER( sound_reset_w );
- DECLARE_WRITE32_MEMBER( coin_count_w );
- DECLARE_READ32_MEMBER( speedup_r );
- DECLARE_READ32_MEMBER( movie_speedup_r );
-
- // in video/beathead.c
- DECLARE_WRITE32_MEMBER( vram_transparent_w );
- DECLARE_WRITE32_MEMBER( vram_bulk_w );
- DECLARE_WRITE32_MEMBER( vram_latch_w );
- DECLARE_WRITE32_MEMBER( vram_copy_w );
- DECLARE_WRITE32_MEMBER( finescroll_w );
- DECLARE_READ32_MEMBER( hsync_ram_r );
- DECLARE_WRITE32_MEMBER( hsync_ram_w );
+ void interrupt_control_w(offs_t offset, uint32_t data);
+ uint32_t interrupt_control_r();
+ void sound_reset_w(offs_t offset, uint32_t data);
+ void coin_count_w(offs_t offset, uint32_t data);
+
+ // in video/beathead.cpp
+ void vram_transparent_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void vram_bulk_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void vram_latch_w(offs_t offset, uint32_t data);
+ void vram_copy_w(offs_t offset, uint32_t data);
+ void finescroll_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t hsync_ram_r(offs_t offset);
+ void hsync_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback);
virtual void machine_reset() override;
diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h
index 542b2b99c44..aa2bbc60d8f 100644
--- a/src/mame/includes/bebox.h
+++ b/src/mame/includes/bebox.h
@@ -80,29 +80,29 @@ public:
DECLARE_WRITE_LINE_MEMBER(pc_dack2_w);
DECLARE_WRITE_LINE_MEMBER(pc_dack3_w);
DECLARE_WRITE_LINE_MEMBER(bebox_timer0_w);
- DECLARE_READ64_MEMBER(bebox_cpu0_imask_r);
- DECLARE_READ64_MEMBER(bebox_cpu1_imask_r);
- DECLARE_READ64_MEMBER(bebox_interrupt_sources_r);
- DECLARE_READ64_MEMBER(bebox_crossproc_interrupts_r);
- DECLARE_READ64_MEMBER(bebox_interrupt_ack_r);
- DECLARE_READ8_MEMBER(bebox_page_r);
- DECLARE_READ8_MEMBER(bebox_80000480_r);
- DECLARE_READ8_MEMBER(bebox_flash_r);
-
- DECLARE_WRITE64_MEMBER(bebox_cpu0_imask_w);
- DECLARE_WRITE64_MEMBER(bebox_cpu1_imask_w);
- DECLARE_WRITE64_MEMBER(bebox_crossproc_interrupts_w);
- DECLARE_WRITE64_MEMBER(bebox_processor_resets_w);
- DECLARE_WRITE8_MEMBER(bebox_page_w);
- DECLARE_WRITE8_MEMBER(bebox_80000480_w);
- DECLARE_WRITE8_MEMBER(bebox_flash_w);
- DECLARE_READ8_MEMBER(at_dma8237_1_r);
- DECLARE_WRITE8_MEMBER(at_dma8237_1_w);
+ uint64_t bebox_cpu0_imask_r();
+ uint64_t bebox_cpu1_imask_r();
+ uint64_t bebox_interrupt_sources_r();
+ uint64_t bebox_crossproc_interrupts_r(address_space &space);
+ uint64_t bebox_interrupt_ack_r();
+ uint8_t bebox_page_r(offs_t offset);
+ uint8_t bebox_80000480_r();
+ uint8_t bebox_flash_r(offs_t offset);
+
+ void bebox_cpu0_imask_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void bebox_cpu1_imask_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void bebox_crossproc_interrupts_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void bebox_processor_resets_w(uint64_t data);
+ void bebox_page_w(offs_t offset, uint8_t data);
+ void bebox_80000480_w(offs_t offset, uint8_t data);
+ void bebox_flash_w(offs_t offset, uint8_t data);
+ uint8_t at_dma8237_1_r(offs_t offset);
+ void at_dma8237_1_w(offs_t offset, uint8_t data);
uint8_t bebox_dma_read_byte(offs_t offset);
void bebox_dma_write_byte(offs_t offset, uint8_t data);
- DECLARE_READ64_MEMBER(scsi53c810_r);
- DECLARE_WRITE64_MEMBER(scsi53c810_w);
- DECLARE_READ64_MEMBER(bb_slave_64be_r);
+ uint64_t scsi53c810_r(offs_t offset, uint64_t mem_mask = ~0);
+ void scsi53c810_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ uint64_t bb_slave_64be_r(offs_t offset, uint64_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(bebox_ide_interrupt);
diff --git a/src/mame/includes/bfm_sc4.h b/src/mame/includes/bfm_sc4.h
index 8a80b640a3d..1c722adfaa1 100644
--- a/src/mame/includes/bfm_sc4.h
+++ b/src/mame/includes/bfm_sc4.h
@@ -120,8 +120,8 @@ protected:
virtual void machine_start() override;
- DECLARE_WRITE8_MEMBER(mux_output_w);
- DECLARE_WRITE8_MEMBER(mux_output2_w);
+ void mux_output_w(offs_t offset, uint8_t data);
+ void mux_output2_w(offs_t offset, uint8_t data);
void bfm_sc4_reset_serial_vfd();
void bfm_sc45_write_serial_vfd(bool cs, bool clock, bool data);
};
@@ -175,10 +175,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(bfmdm01_busy);
- DECLARE_READ16_MEMBER(sc4_mem_r);
- DECLARE_WRITE16_MEMBER(sc4_mem_w);
+ uint16_t sc4_mem_r(offs_t offset, uint16_t mem_mask = ~0);
+ void sc4_mem_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ16_MEMBER(sc4_cs1_r);
+ uint16_t sc4_cs1_r(offs_t offset, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER(bfm_sc4_duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(bfm_sc4_duart_txa);
@@ -605,8 +605,8 @@ public:
virtual void machine_reset() override;
void bfm_sc4_68307_porta_w(address_space &space, bool dedicated, uint8_t data, uint8_t line_mask);
- DECLARE_WRITE8_MEMBER( bfm_sc4_reel3_w );
- DECLARE_WRITE8_MEMBER( bfm_sc4_reel4_w );
+ void bfm_sc4_reel3_w(uint8_t data);
+ void bfm_sc4_reel4_w(uint8_t data);
void bfm_sc4_68307_portb_w(address_space &space, bool dedicated, uint16_t data, uint16_t line_mask);
uint8_t bfm_sc4_68307_porta_r(address_space &space, bool dedicated, uint8_t line_mask);
uint16_t bfm_sc4_68307_portb_r(address_space &space, bool dedicated, uint16_t line_mask);
@@ -656,8 +656,8 @@ public:
required_region_ptr<uint32_t> m_adder4cpuregion;
std::unique_ptr<uint32_t[]> m_adder4ram;
- DECLARE_READ32_MEMBER(adder4_mem_r);
- DECLARE_WRITE32_MEMBER(adder4_mem_w);
+ uint32_t adder4_mem_r(offs_t offset, uint32_t mem_mask = ~0);
+ void adder4_mem_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
virtual void machine_start() override;
// devices
diff --git a/src/mame/includes/bfm_sc5.h b/src/mame/includes/bfm_sc5.h
index 1a59bb8b572..2f461a33fcd 100644
--- a/src/mame/includes/bfm_sc5.h
+++ b/src/mame/includes/bfm_sc5.h
@@ -25,13 +25,13 @@ protected:
required_device<m68000_base_device> m_maincpu;
- DECLARE_READ8_MEMBER( sc5_10202F0_r );
- DECLARE_WRITE8_MEMBER( sc5_10202F0_w );
- DECLARE_WRITE16_MEMBER( sc5_duart_w );
+ uint8_t sc5_10202F0_r(offs_t offset);
+ void sc5_10202F0_w(offs_t offset, uint8_t data);
+ void sc5_duart_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
- DECLARE_READ8_MEMBER( sc5_mux1_r );
- DECLARE_WRITE8_MEMBER( sc5_mux1_w );
- DECLARE_WRITE8_MEMBER( sc5_mux2_w );
+ uint8_t sc5_mux1_r(offs_t offset);
+ void sc5_mux1_w(offs_t offset, uint8_t data);
+ void sc5_mux2_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(bfm_sc5_duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(bfm_sc5_duart_txa);
diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h
index b5e56b13393..727d2a51e1a 100644
--- a/src/mame/includes/bigevglf.h
+++ b/src/mame/includes/bigevglf.h
@@ -46,22 +46,22 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
optional_device<taito68705_mcu_device> m_bmcu;
- DECLARE_WRITE8_MEMBER(beg_banking_w);
- DECLARE_READ8_MEMBER(soundstate_r);
- DECLARE_WRITE8_MEMBER(beg13_a_clr_w);
- DECLARE_WRITE8_MEMBER(beg13_b_clr_w);
- DECLARE_WRITE8_MEMBER(beg13_a_set_w);
- DECLARE_WRITE8_MEMBER(beg13_b_set_w);
- DECLARE_READ8_MEMBER(beg_status_r);
- DECLARE_READ8_MEMBER(beg_trackball_x_r);
- DECLARE_READ8_MEMBER(beg_trackball_y_r);
- DECLARE_WRITE8_MEMBER(beg_port08_w);
- DECLARE_READ8_MEMBER(sub_cpu_mcu_coin_port_r);
- DECLARE_WRITE8_MEMBER(bigevglf_palette_w);
- DECLARE_WRITE8_MEMBER(bigevglf_gfxcontrol_w);
- DECLARE_WRITE8_MEMBER(bigevglf_vidram_addr_w);
- DECLARE_WRITE8_MEMBER(bigevglf_vidram_w);
- DECLARE_READ8_MEMBER(bigevglf_vidram_r);
+ void beg_banking_w(uint8_t data);
+ uint8_t soundstate_r();
+ void beg13_a_clr_w(uint8_t data);
+ void beg13_b_clr_w(uint8_t data);
+ void beg13_a_set_w(uint8_t data);
+ void beg13_b_set_w(uint8_t data);
+ uint8_t beg_status_r();
+ uint8_t beg_trackball_x_r();
+ uint8_t beg_trackball_y_r();
+ void beg_port08_w(uint8_t data);
+ uint8_t sub_cpu_mcu_coin_port_r();
+ void bigevglf_palette_w(offs_t offset, uint8_t data);
+ void bigevglf_gfxcontrol_w(uint8_t data);
+ void bigevglf_vidram_addr_w(uint8_t data);
+ void bigevglf_vidram_w(offs_t offset, uint8_t data);
+ uint8_t bigevglf_vidram_r(offs_t offset);
void init_bigevglf();
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h
index 27aedc05d4b..2339443675d 100644
--- a/src/mame/includes/bigstrkb.h
+++ b/src/mame/includes/bigstrkb.h
@@ -39,9 +39,9 @@ public:
tilemap_t *m_tilemap2;
tilemap_t *m_tilemap3;
- DECLARE_WRITE16_MEMBER(videoram_w);
- DECLARE_WRITE16_MEMBER(videoram2_w);
- DECLARE_WRITE16_MEMBER(videoram3_w);
+ void videoram_w(offs_t offset, uint16_t data);
+ void videoram2_w(offs_t offset, uint16_t data);
+ void videoram3_w(offs_t offset, uint16_t data);
TILEMAP_MAPPER_MEMBER(bg_scan);
TILE_GET_INFO_MEMBER(get_tile_info);
diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h
index 7fc4b1b1ef0..b58de249bfa 100644
--- a/src/mame/includes/bishi.h
+++ b/src/mame/includes/bishi.h
@@ -35,11 +35,11 @@ public:
m_screen(*this, "screen")
{ }
- DECLARE_READ16_MEMBER(control_r);
- DECLARE_WRITE16_MEMBER(control_w);
- DECLARE_WRITE16_MEMBER(control2_w);
- DECLARE_READ16_MEMBER(bishi_mirror_r);
- DECLARE_READ16_MEMBER(bishi_K056832_rom_r);
+ uint16_t control_r();
+ void control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void control2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t bishi_mirror_r(offs_t offset);
+ uint16_t bishi_K056832_rom_r(offs_t offset);
uint32_t screen_update_bishi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(bishi_scanline);
K056832_CB_MEMBER(tile_callback);
diff --git a/src/mame/includes/bk.h b/src/mame/includes/bk.h
index 91e7a4463d9..702f983989b 100644
--- a/src/mame/includes/bk.h
+++ b/src/mame/includes/bk.h
@@ -36,17 +36,17 @@ private:
uint16_t m_key_irq_vector;
uint16_t m_drive;
emu_timer *m_kbd_timer;
- DECLARE_READ16_MEMBER(bk_key_state_r);
- DECLARE_READ16_MEMBER(bk_key_code_r);
- DECLARE_READ16_MEMBER(bk_vid_scrool_r);
- DECLARE_READ16_MEMBER(bk_key_press_r);
- DECLARE_WRITE16_MEMBER(bk_key_state_w);
- DECLARE_WRITE16_MEMBER(bk_vid_scrool_w);
- DECLARE_WRITE16_MEMBER(bk_key_press_w);
- DECLARE_READ16_MEMBER(bk_floppy_cmd_r);
- DECLARE_WRITE16_MEMBER(bk_floppy_cmd_w);
- DECLARE_READ16_MEMBER(bk_floppy_data_r);
- DECLARE_WRITE16_MEMBER(bk_floppy_data_w);
+ uint16_t bk_key_state_r();
+ uint16_t bk_key_code_r();
+ uint16_t bk_vid_scrool_r();
+ uint16_t bk_key_press_r();
+ void bk_key_state_w(uint16_t data);
+ void bk_vid_scrool_w(uint16_t data);
+ void bk_key_press_w(uint16_t data);
+ uint16_t bk_floppy_cmd_r();
+ void bk_floppy_cmd_w(uint16_t data);
+ uint16_t bk_floppy_data_r();
+ void bk_floppy_data_w(uint16_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index ebb1c5495f4..4b35e8e0265 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -64,30 +64,30 @@ public:
required_device<generic_latch_8_device> m_soundlatch;
required_device<input_merger_device> m_soundnmi;
- DECLARE_READ8_MEMBER(bking_sndnmi_disable_r);
- DECLARE_WRITE8_MEMBER(bking_sndnmi_enable_w);
- DECLARE_WRITE8_MEMBER(bking_soundlatch_w);
- DECLARE_WRITE8_MEMBER(bking3_addr_l_w);
- DECLARE_WRITE8_MEMBER(bking3_addr_h_w);
- DECLARE_READ8_MEMBER(bking3_extrarom_r);
- DECLARE_READ8_MEMBER(bking3_ext_check_r);
- DECLARE_READ8_MEMBER(bking3_mcu_status_r);
- DECLARE_WRITE8_MEMBER(bking_xld1_w);
- DECLARE_WRITE8_MEMBER(bking_yld1_w);
- DECLARE_WRITE8_MEMBER(bking_xld2_w);
- DECLARE_WRITE8_MEMBER(bking_yld2_w);
- DECLARE_WRITE8_MEMBER(bking_xld3_w);
- DECLARE_WRITE8_MEMBER(bking_yld3_w);
- DECLARE_WRITE8_MEMBER(bking_cont1_w);
- DECLARE_WRITE8_MEMBER(bking_cont2_w);
- DECLARE_WRITE8_MEMBER(bking_cont3_w);
- DECLARE_WRITE8_MEMBER(bking_msk_w);
- DECLARE_WRITE8_MEMBER(bking_hitclr_w);
- DECLARE_WRITE8_MEMBER(bking_playfield_w);
- DECLARE_READ8_MEMBER(bking_input_port_5_r);
- DECLARE_READ8_MEMBER(bking_input_port_6_r);
- DECLARE_READ8_MEMBER(bking_pos_r);
- DECLARE_WRITE8_MEMBER(unk_w);
+ uint8_t bking_sndnmi_disable_r();
+ void bking_sndnmi_enable_w(uint8_t data);
+ void bking_soundlatch_w(uint8_t data);
+ void bking3_addr_l_w(uint8_t data);
+ void bking3_addr_h_w(uint8_t data);
+ uint8_t bking3_extrarom_r();
+ uint8_t bking3_ext_check_r();
+ uint8_t bking3_mcu_status_r();
+ void bking_xld1_w(uint8_t data);
+ void bking_yld1_w(uint8_t data);
+ void bking_xld2_w(uint8_t data);
+ void bking_yld2_w(uint8_t data);
+ void bking_xld3_w(uint8_t data);
+ void bking_yld3_w(uint8_t data);
+ void bking_cont1_w(uint8_t data);
+ void bking_cont2_w(uint8_t data);
+ void bking_cont3_w(uint8_t data);
+ void bking_msk_w(uint8_t data);
+ void bking_hitclr_w(uint8_t data);
+ void bking_playfield_w(offs_t offset, uint8_t data);
+ uint8_t bking_input_port_5_r();
+ uint8_t bking_input_port_6_r();
+ uint8_t bking_pos_r(offs_t offset);
+ void unk_w(uint8_t data);
void port_b_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h
index 89709fcbeed..8bbb13efc93 100644
--- a/src/mame/includes/bladestl.h
+++ b/src/mame/includes/bladestl.h
@@ -40,11 +40,11 @@ public:
{ }
/* devices */
- DECLARE_READ8_MEMBER(trackball_r);
- DECLARE_WRITE8_MEMBER(bladestl_bankswitch_w);
+ uint8_t trackball_r(offs_t offset);
+ void bladestl_bankswitch_w(uint8_t data);
void bladestl_port_B_w(uint8_t data);
- DECLARE_READ8_MEMBER(bladestl_speech_busy_r);
- DECLARE_WRITE8_MEMBER(bladestl_speech_ctrl_w);
+ uint8_t bladestl_speech_busy_r();
+ void bladestl_speech_ctrl_w(uint8_t data);
void bladestl_palette(palette_device &palette) const;
uint32_t screen_update_bladestl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(bladestl_scanline);
diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h
index abac0a027b0..0c3b92bd972 100644
--- a/src/mame/includes/blktiger.h
+++ b/src/mame/includes/blktiger.h
@@ -53,21 +53,21 @@ public:
/* devices */
optional_device<i8751_device> m_mcu;
required_device<cpu_device> m_audiocpu;
- DECLARE_READ8_MEMBER(blktiger_from_mcu_r);
- DECLARE_WRITE8_MEMBER(blktiger_to_mcu_w);
+ uint8_t blktiger_from_mcu_r();
+ void blktiger_to_mcu_w(uint8_t data);
uint8_t blktiger_from_main_r();
void blktiger_to_main_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(blktiger_bankswitch_w);
- DECLARE_WRITE8_MEMBER(blktiger_coinlockout_w);
- DECLARE_WRITE8_MEMBER(blktiger_txvideoram_w);
- DECLARE_READ8_MEMBER(blktiger_bgvideoram_r);
- DECLARE_WRITE8_MEMBER(blktiger_bgvideoram_w);
- DECLARE_WRITE8_MEMBER(blktiger_bgvideoram_bank_w);
- DECLARE_WRITE8_MEMBER(blktiger_scrolly_w);
- DECLARE_WRITE8_MEMBER(blktiger_scrollx_w);
- DECLARE_WRITE8_MEMBER(blktiger_video_control_w);
- DECLARE_WRITE8_MEMBER(blktiger_video_enable_w);
- DECLARE_WRITE8_MEMBER(blktiger_screen_layout_w);
+ void blktiger_bankswitch_w(uint8_t data);
+ void blktiger_coinlockout_w(uint8_t data);
+ void blktiger_txvideoram_w(offs_t offset, uint8_t data);
+ uint8_t blktiger_bgvideoram_r(offs_t offset);
+ void blktiger_bgvideoram_w(offs_t offset, uint8_t data);
+ void blktiger_bgvideoram_bank_w(uint8_t data);
+ void blktiger_scrolly_w(offs_t offset, uint8_t data);
+ void blktiger_scrollx_w(offs_t offset, uint8_t data);
+ void blktiger_video_control_w(uint8_t data);
+ void blktiger_video_enable_w(uint8_t data);
+ void blktiger_screen_layout_w(uint8_t data);
TILEMAP_MAPPER_MEMBER(bg8x4_scan);
TILEMAP_MAPPER_MEMBER(bg4x8_scan);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index cb8735713a9..f324137c431 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -58,17 +58,17 @@ private:
int m_retvalue; // waterball
// common
- DECLARE_WRITE8_MEMBER(okibank_w);
- template<int Layer> DECLARE_WRITE16_MEMBER(vram_w);
+ void okibank_w(uint8_t data);
+ template<int Layer> void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
// blmbycar
- DECLARE_WRITE8_MEMBER(blmbycar_pot_wheel_reset_w);
- DECLARE_WRITE8_MEMBER(blmbycar_pot_wheel_shift_w);
- DECLARE_READ16_MEMBER(blmbycar_pot_wheel_r);
- DECLARE_READ16_MEMBER(blmbycar_opt_wheel_r);
+ void blmbycar_pot_wheel_reset_w(uint8_t data);
+ void blmbycar_pot_wheel_shift_w(uint8_t data);
+ uint16_t blmbycar_pot_wheel_r();
+ uint16_t blmbycar_opt_wheel_r();
// waterball
- DECLARE_READ16_MEMBER(waterball_unk_r);
+ uint16_t waterball_unk_r();
template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info);
diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h
index b29e177f1ae..5e86bc1bd39 100644
--- a/src/mame/includes/blockout.h
+++ b/src/mame/includes/blockout.h
@@ -41,8 +41,8 @@ public:
required_device<generic_latch_8_device> m_soundlatch;
DECLARE_WRITE_LINE_MEMBER(irq_handler);
- DECLARE_WRITE16_MEMBER(blockout_irq6_ack_w);
- DECLARE_WRITE16_MEMBER(blockout_irq5_ack_w);
+ void blockout_irq6_ack_w(uint16_t data);
+ void blockout_irq5_ack_w(uint16_t data);
void frontcolor_w(offs_t offset, u16 data, u16 mem_mask = ~0);
u8 videoram_r(offs_t offset);
void videoram_w(offs_t offset, u8 data);
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index 27faffcb43b..c0528c9c6bf 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -62,12 +62,12 @@ private:
bool m_weststry_opl_irq;
bool m_weststry_soundnmi_mask;
- DECLARE_WRITE16_MEMBER(bgvideoram_w);
- DECLARE_WRITE16_MEMBER(fgvideoram_w);
- DECLARE_WRITE16_MEMBER(txvideoram_w);
+ void bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
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(weststry_layer_scroll_w);
+ void weststry_layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void weststry_soundlatch_w(offs_t offset, u8 data);
DECLARE_WRITE_LINE_MEMBER(weststry_opl_irq_w);
void weststry_opl_w(offs_t offset, uint8_t data);
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index c4a798c41ae..ffaf731db18 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -48,13 +48,13 @@ public:
/* misc */
int m_dipsw;
- DECLARE_READ8_MEMBER(blueprnt_sh_dipsw_r);
- DECLARE_READ8_MEMBER(grasspin_sh_dipsw_r);
- DECLARE_WRITE8_MEMBER(blueprnt_sound_command_w);
- DECLARE_WRITE8_MEMBER(blueprnt_coin_counter_w);
- DECLARE_WRITE8_MEMBER(blueprnt_videoram_w);
- DECLARE_WRITE8_MEMBER(blueprnt_colorram_w);
- DECLARE_WRITE8_MEMBER(blueprnt_flipscreen_w);
+ uint8_t blueprnt_sh_dipsw_r();
+ uint8_t grasspin_sh_dipsw_r();
+ void blueprnt_sound_command_w(uint8_t data);
+ void blueprnt_coin_counter_w(uint8_t data);
+ void blueprnt_videoram_w(offs_t offset, uint8_t data);
+ void blueprnt_colorram_w(offs_t offset, uint8_t data);
+ void blueprnt_flipscreen_w(uint8_t data);
void dipsw_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index 38bf922346c..647c5a77a24 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -62,12 +62,12 @@ private:
int m_last_write;
int m_colbank;
- DECLARE_WRITE8_MEMBER(ay8910_latch_w);
- DECLARE_WRITE8_MEMBER(ay8910_control_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(colorram_w);
- DECLARE_WRITE8_MEMBER(videoram2_w);
- DECLARE_WRITE8_MEMBER(colorram2_w);
+ void ay8910_latch_w(uint8_t data);
+ void ay8910_control_w(uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
+ void colorram_w(offs_t offset, uint8_t data);
+ void videoram2_w(offs_t offset, uint8_t data);
+ void colorram2_w(offs_t offset, uint8_t data);
void colbank_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index 3ce4bbaaf3e..8234037c5f2 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -36,12 +36,12 @@ protected:
virtual void video_start() override;
private:
- DECLARE_READ8_MEMBER(soundlatch_read_and_clear);
- DECLARE_WRITE8_MEMBER(irq_mask_w);
- DECLARE_WRITE8_MEMBER(bombjack_videoram_w);
- DECLARE_WRITE8_MEMBER(bombjack_colorram_w);
- DECLARE_WRITE8_MEMBER(bombjack_background_w);
- DECLARE_WRITE8_MEMBER(bombjack_flipscreen_w);
+ uint8_t soundlatch_read_and_clear();
+ void irq_mask_w(uint8_t data);
+ void bombjack_videoram_w(offs_t offset, uint8_t data);
+ void bombjack_colorram_w(offs_t offset, uint8_t data);
+ void bombjack_background_w(uint8_t data);
+ void bombjack_flipscreen_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
uint32_t screen_update_bombjack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h
index fc1411b2b63..dc28c12ee82 100644
--- a/src/mame/includes/boogwing.h
+++ b/src/mame/includes/boogwing.h
@@ -52,14 +52,14 @@ public:
bitmap_ind16 m_alpha_tmap_bitmap;
void sound_bankswitch_w(uint8_t data);
- DECLARE_WRITE16_MEMBER(priority_w);
+ void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void init_boogwing();
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void mix_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_READ16_MEMBER( boogwing_protection_region_0_104_r );
- DECLARE_WRITE16_MEMBER( boogwing_protection_region_0_104_w );
+ uint16_t boogwing_protection_region_0_104_r(offs_t offset);
+ void boogwing_protection_region_0_104_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECO16IC_BANK_CB_MEMBER(bank_callback);
DECO16IC_BANK_CB_MEMBER(bank_callback2);
diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h
index efab2b90bad..439e142dcd2 100644
--- a/src/mame/includes/bosco.h
+++ b/src/mame/includes/bosco.h
@@ -42,10 +42,10 @@ public:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int flip);
void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect, int flip);
void draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, int flip);
- DECLARE_WRITE8_MEMBER( bosco_videoram_w );
- DECLARE_WRITE8_MEMBER( bosco_scrollx_w );
- DECLARE_WRITE8_MEMBER( bosco_scrolly_w );
- DECLARE_WRITE8_MEMBER( bosco_starclr_w );
+ void bosco_videoram_w(offs_t offset, uint8_t data);
+ void bosco_scrollx_w(uint8_t data);
+ void bosco_scrolly_w(uint8_t data);
+ void bosco_starclr_w(uint8_t data);
void bosco(machine_config &config);
void bosco_map(address_map &map);
};
diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h
index 4c43831bb46..7f912617590 100644
--- a/src/mame/includes/bottom9.h
+++ b/src/mame/includes/bottom9.h
@@ -47,17 +47,17 @@ public:
required_device<k051960_device> m_k051960;
required_device<k051316_device> m_k051316;
required_device<palette_device> m_palette;
- DECLARE_READ8_MEMBER(k052109_051960_r);
- DECLARE_WRITE8_MEMBER(k052109_051960_w);
- DECLARE_READ8_MEMBER(bottom9_bankedram1_r);
- DECLARE_WRITE8_MEMBER(bottom9_bankedram1_w);
- DECLARE_READ8_MEMBER(bottom9_bankedram2_r);
- DECLARE_WRITE8_MEMBER(bottom9_bankedram2_w);
- DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_WRITE8_MEMBER(bottom9_1f90_w);
- DECLARE_WRITE8_MEMBER(bottom9_sh_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(nmi_enable_w);
- DECLARE_WRITE8_MEMBER(sound_bank_w);
+ uint8_t k052109_051960_r(offs_t offset);
+ void k052109_051960_w(offs_t offset, uint8_t data);
+ uint8_t bottom9_bankedram1_r(offs_t offset);
+ void bottom9_bankedram1_w(offs_t offset, uint8_t data);
+ uint8_t bottom9_bankedram2_r(offs_t offset);
+ void bottom9_bankedram2_w(offs_t offset, uint8_t data);
+ void bankswitch_w(uint8_t data);
+ void bottom9_1f90_w(uint8_t data);
+ void bottom9_sh_irqtrigger_w(uint8_t data);
+ void nmi_enable_w(uint8_t data);
+ void sound_bank_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_bottom9(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h
index c8fcc491ba0..41754832569 100644
--- a/src/mame/includes/brkthru.h
+++ b/src/mame/includes/brkthru.h
@@ -49,11 +49,11 @@ public:
required_device<generic_latch_8_device> m_soundlatch;
uint8_t m_nmi_mask;
- DECLARE_WRITE8_MEMBER(brkthru_1803_w);
- DECLARE_WRITE8_MEMBER(darwin_0803_w);
- DECLARE_WRITE8_MEMBER(brkthru_bgram_w);
- DECLARE_WRITE8_MEMBER(brkthru_fgram_w);
- DECLARE_WRITE8_MEMBER(brkthru_1800_w);
+ void brkthru_1803_w(uint8_t data);
+ void darwin_0803_w(uint8_t data);
+ void brkthru_bgram_w(offs_t offset, uint8_t data);
+ void brkthru_fgram_w(offs_t offset, uint8_t data);
+ void brkthru_1800_w(offs_t offset, uint8_t data);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
void init_brkthru();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index 975be60d772..bcd301bc07a 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -41,14 +41,14 @@ protected:
DECLARE_WRITE_LINE_MEMBER(nmion_w);
DECLARE_WRITE_LINE_MEMBER(ld1_w);
DECLARE_WRITE_LINE_MEMBER(ld2_w);
- DECLARE_READ8_MEMBER(bsktball_in0_r);
- DECLARE_WRITE8_MEMBER(bsktball_videoram_w);
+ uint8_t bsktball_in0_r();
+ void bsktball_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
void bsktball_palette(palette_device &palette) const;
uint32_t screen_update_bsktball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(bsktball_scanline);
- DECLARE_WRITE8_MEMBER(bsktball_bounce_w);
- DECLARE_WRITE8_MEMBER(bsktball_note_w);
+ void bsktball_bounce_w(uint8_t data);
+ void bsktball_note_w(uint8_t data);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
protected:
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index 40fa11d8ddd..4a744791185 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -79,25 +79,25 @@ public:
optional_device<generic_latch_8_device> m_soundlatch;
optional_memory_region m_prom_region;
- DECLARE_WRITE8_MEMBER(audio_nmi_enable_w);
- DECLARE_READ8_MEMBER(zoar_dsw1_read);
- DECLARE_READ8_MEMBER(wtennis_reset_hack_r);
- DECLARE_READ8_MEMBER(mmonkey_protection_r);
- DECLARE_WRITE8_MEMBER(mmonkey_protection_w);
- DECLARE_WRITE8_MEMBER(lnc_videoram_w);
- DECLARE_READ8_MEMBER(btime_mirrorvideoram_r);
- DECLARE_READ8_MEMBER(btime_mirrorcolorram_r);
- DECLARE_WRITE8_MEMBER(btime_mirrorvideoram_w);
- DECLARE_WRITE8_MEMBER(lnc_mirrorvideoram_w);
- DECLARE_WRITE8_MEMBER(btime_mirrorcolorram_w);
- DECLARE_WRITE8_MEMBER(deco_charram_w);
- DECLARE_WRITE8_MEMBER(bnj_background_w);
- DECLARE_WRITE8_MEMBER(bnj_scroll1_w);
- DECLARE_WRITE8_MEMBER(bnj_scroll2_w);
- DECLARE_WRITE8_MEMBER(btime_video_control_w);
- DECLARE_WRITE8_MEMBER(bnj_video_control_w);
- DECLARE_WRITE8_MEMBER(zoar_video_control_w);
- DECLARE_WRITE8_MEMBER(disco_video_control_w);
+ void audio_nmi_enable_w(uint8_t data);
+ uint8_t zoar_dsw1_read();
+ uint8_t wtennis_reset_hack_r();
+ uint8_t mmonkey_protection_r(offs_t offset);
+ void mmonkey_protection_w(offs_t offset, uint8_t data);
+ void lnc_videoram_w(offs_t offset, uint8_t data);
+ uint8_t btime_mirrorvideoram_r(offs_t offset);
+ uint8_t btime_mirrorcolorram_r(offs_t offset);
+ void btime_mirrorvideoram_w(offs_t offset, uint8_t data);
+ void lnc_mirrorvideoram_w(offs_t offset, uint8_t data);
+ void btime_mirrorcolorram_w(offs_t offset, uint8_t data);
+ void deco_charram_w(offs_t offset, uint8_t data);
+ void bnj_background_w(offs_t offset, uint8_t data);
+ void bnj_scroll1_w(uint8_t data);
+ void bnj_scroll2_w(uint8_t data);
+ void btime_video_control_w(uint8_t data);
+ void bnj_video_control_w(uint8_t data);
+ void zoar_video_control_w(uint8_t data);
+ void disco_video_control_w(uint8_t data);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted_irq_hi);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted_irq_lo);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted_nmi_lo);
diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h
index f52d244c833..c8b51de940c 100644
--- a/src/mame/includes/btoads.h
+++ b/src/mame/includes/btoads.h
@@ -84,31 +84,31 @@ private:
int m_xcount;
// in drivers/btoads
- DECLARE_WRITE16_MEMBER( main_sound_w );
- DECLARE_READ16_MEMBER( main_sound_r );
- DECLARE_WRITE8_MEMBER( sound_data_w );
- DECLARE_READ8_MEMBER( sound_data_r );
- DECLARE_READ8_MEMBER( sound_ready_to_send_r );
- DECLARE_READ8_MEMBER( sound_data_ready_r );
- DECLARE_WRITE8_MEMBER( sound_int_state_w );
- DECLARE_READ8_MEMBER( bsmt_ready_r );
- DECLARE_WRITE8_MEMBER( bsmt2000_port_w );
+ void main_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t main_sound_r();
+ void sound_data_w(uint8_t data);
+ uint8_t sound_data_r();
+ uint8_t sound_ready_to_send_r();
+ uint8_t sound_data_ready_r();
+ void sound_int_state_w(uint8_t data);
+ uint8_t bsmt_ready_r();
+ void bsmt2000_port_w(offs_t offset, uint8_t data);
// in video/btoads
- DECLARE_WRITE16_MEMBER( misc_control_w );
- DECLARE_WRITE16_MEMBER( display_control_w );
- DECLARE_WRITE16_MEMBER( scroll0_w );
- DECLARE_WRITE16_MEMBER( scroll1_w );
- DECLARE_WRITE16_MEMBER( paletteram_w );
- DECLARE_READ16_MEMBER( paletteram_r );
- DECLARE_WRITE16_MEMBER( vram_bg0_w );
- DECLARE_WRITE16_MEMBER( vram_bg1_w );
- DECLARE_READ16_MEMBER( vram_bg0_r );
- DECLARE_READ16_MEMBER( vram_bg1_r );
- DECLARE_WRITE16_MEMBER( vram_fg_display_w );
- DECLARE_WRITE16_MEMBER( vram_fg_draw_w );
- DECLARE_READ16_MEMBER( vram_fg_display_r );
- DECLARE_READ16_MEMBER( vram_fg_draw_r );
+ void misc_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void display_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void scroll0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void scroll1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void paletteram_w(offs_t offset, uint16_t data);
+ uint16_t paletteram_r(offs_t offset);
+ void vram_bg0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void vram_bg1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t vram_bg0_r(offs_t offset);
+ uint16_t vram_bg1_r(offs_t offset);
+ void vram_fg_display_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void vram_fg_draw_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t vram_fg_display_r(offs_t offset);
+ uint16_t vram_fg_draw_r(offs_t offset);
void render_sprite_row(uint16_t *sprite_source, uint32_t address);
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index c698c7bca3c..2dfb75c3fd9 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -94,30 +94,30 @@ public:
void bublbobl_bankswitch_w(uint8_t data);
void tokio_bankswitch_w(uint8_t data);
void tokio_videoctrl_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(bublbobl_nmitrigger_w);
- DECLARE_READ8_MEMBER(tokiob_mcu_r);
- DECLARE_WRITE8_MEMBER(bublbobl_soundcpu_reset_w);
- DECLARE_READ8_MEMBER(common_sound_semaphores_r);
- DECLARE_READ8_MEMBER(bublbobl_mcu_ddr1_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr1_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_ddr2_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr2_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_ddr3_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr3_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_ddr4_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr4_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_port1_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_port1_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_port2_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_port2_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_port3_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_port3_w);
- DECLARE_READ8_MEMBER(bublbobl_mcu_port4_r);
- DECLARE_WRITE8_MEMBER(bublbobl_mcu_port4_w);
- DECLARE_READ8_MEMBER(boblbobl_ic43_a_r);
- DECLARE_WRITE8_MEMBER(boblbobl_ic43_a_w);
- DECLARE_WRITE8_MEMBER(boblbobl_ic43_b_w);
- DECLARE_READ8_MEMBER(boblbobl_ic43_b_r);
+ void bublbobl_nmitrigger_w(uint8_t data);
+ uint8_t tokiob_mcu_r();
+ void bublbobl_soundcpu_reset_w(uint8_t data);
+ uint8_t common_sound_semaphores_r();
+ uint8_t bublbobl_mcu_ddr1_r();
+ void bublbobl_mcu_ddr1_w(uint8_t data);
+ uint8_t bublbobl_mcu_ddr2_r();
+ void bublbobl_mcu_ddr2_w(uint8_t data);
+ uint8_t bublbobl_mcu_ddr3_r();
+ void bublbobl_mcu_ddr3_w(uint8_t data);
+ uint8_t bublbobl_mcu_ddr4_r();
+ void bublbobl_mcu_ddr4_w(uint8_t data);
+ uint8_t bublbobl_mcu_port1_r();
+ void bublbobl_mcu_port1_w(uint8_t data);
+ uint8_t bublbobl_mcu_port2_r();
+ void bublbobl_mcu_port2_w(uint8_t data);
+ uint8_t bublbobl_mcu_port3_r();
+ void bublbobl_mcu_port3_w(uint8_t data);
+ uint8_t bublbobl_mcu_port4_r();
+ void bublbobl_mcu_port4_w(uint8_t data);
+ uint8_t boblbobl_ic43_a_r(offs_t offset);
+ void boblbobl_ic43_a_w(offs_t offset, uint8_t data);
+ void boblbobl_ic43_b_w(offs_t offset, uint8_t data);
+ uint8_t boblbobl_ic43_b_r(offs_t offset);
void init_dland();
void init_common();
diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h
index 123e3543811..15b5e5febcb 100644
--- a/src/mame/includes/buggychl.h
+++ b/src/mame/includes/buggychl.h
@@ -69,21 +69,21 @@ public:
output_finder<1> m_led;
- DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_WRITE8_MEMBER(sound_enable_w);
- DECLARE_READ8_MEMBER(mcu_status_r);
- DECLARE_READ8_MEMBER(sound_status_main_r);
- DECLARE_READ8_MEMBER(sound_status_sound_r);
- DECLARE_WRITE8_MEMBER(buggychl_chargen_w);
- DECLARE_WRITE8_MEMBER(buggychl_sprite_lookup_bank_w);
- DECLARE_WRITE8_MEMBER(buggychl_sprite_lookup_w);
- DECLARE_WRITE8_MEMBER(buggychl_ctrl_w);
- DECLARE_WRITE8_MEMBER(buggychl_bg_scrollx_w);
+ void bankswitch_w(uint8_t data);
+ void sound_enable_w(uint8_t data);
+ uint8_t mcu_status_r();
+ uint8_t sound_status_main_r();
+ uint8_t sound_status_sound_r();
+ void buggychl_chargen_w(offs_t offset, uint8_t data);
+ void buggychl_sprite_lookup_bank_w(uint8_t data);
+ void buggychl_sprite_lookup_w(offs_t offset, uint8_t data);
+ void buggychl_ctrl_w(uint8_t data);
+ void buggychl_bg_scrollx_w(uint8_t data);
void ta7630_volbal_ay1_w(uint8_t data);
void port_b_0_w(uint8_t data);
void ta7630_volbal_ay2_w(uint8_t data);
void port_b_1_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(ta7630_volbal_msm_w);
+ void ta7630_volbal_msm_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/bullet.h b/src/mame/includes/bullet.h
index 3f93f37023e..ca3f3e4c705 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -57,17 +57,17 @@ public:
{
}
- DECLARE_READ8_MEMBER( mreq_r );
- DECLARE_WRITE8_MEMBER( mreq_w );
- DECLARE_READ8_MEMBER( info_r );
- DECLARE_READ8_MEMBER( brom_r );
- DECLARE_WRITE8_MEMBER( brom_w );
- DECLARE_READ8_MEMBER( win_r );
- DECLARE_WRITE8_MEMBER( wstrobe_w );
- DECLARE_WRITE8_MEMBER( exdsk_w );
- DECLARE_WRITE8_MEMBER( exdma_w );
- DECLARE_WRITE8_MEMBER( hdcon_w );
- DECLARE_WRITE8_MEMBER( segst_w );
+ uint8_t mreq_r(offs_t offset);
+ void mreq_w(offs_t offset, uint8_t data);
+ uint8_t info_r();
+ uint8_t brom_r();
+ void brom_w(uint8_t data);
+ uint8_t win_r();
+ void wstrobe_w(uint8_t data);
+ void exdsk_w(uint8_t data);
+ void exdma_w(uint8_t data);
+ void hdcon_w(uint8_t data);
+ void segst_w(uint8_t data);
uint8_t dma_mreq_r(offs_t offset);
void dma_mreq_w(offs_t offset, uint8_t data);
uint8_t pio_pb_r();
@@ -148,14 +148,14 @@ public:
{
}
- DECLARE_READ8_MEMBER( mreq_r );
- DECLARE_WRITE8_MEMBER( mreq_w );
- DECLARE_WRITE8_MEMBER( xdma0_w );
- DECLARE_WRITE8_MEMBER( xfdc_w );
- DECLARE_WRITE8_MEMBER( mbank_w );
- DECLARE_READ8_MEMBER( hwsts_r );
- DECLARE_READ8_MEMBER( scsi_r );
- DECLARE_WRITE8_MEMBER( scsi_w );
+ uint8_t mreq_r(offs_t offset);
+ void mreq_w(offs_t offset, uint8_t data);
+ void xdma0_w(uint8_t data);
+ void xfdc_w(uint8_t data);
+ void mbank_w(uint8_t data);
+ uint8_t hwsts_r();
+ uint8_t scsi_r();
+ void scsi_w(uint8_t data);
uint8_t dma_mreq_r(offs_t offset);
void dma_mreq_w(offs_t offset, uint8_t data);
diff --git a/src/mame/includes/busicom.h b/src/mame/includes/busicom.h
index 2a61b4d42f5..5b999e7e838 100644
--- a/src/mame/includes/busicom.h
+++ b/src/mame/includes/busicom.h
@@ -34,12 +34,12 @@ protected:
virtual void video_start() override;
private:
- DECLARE_READ8_MEMBER(keyboard_r);
- DECLARE_READ8_MEMBER(printer_r);
- DECLARE_WRITE8_MEMBER(shifter_w);
- DECLARE_WRITE8_MEMBER(printer_w);
- DECLARE_WRITE8_MEMBER(status_w);
- DECLARE_WRITE8_MEMBER(printer_ctrl_w);
+ uint8_t keyboard_r();
+ uint8_t printer_r();
+ void shifter_w(uint8_t data);
+ void printer_w(uint8_t data);
+ void status_w(uint8_t data);
+ void printer_ctrl_w(uint8_t data);
void busicom_palette(palette_device &palette) const;
uint32_t screen_update_busicom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(timer_callback);
diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h
index 5bdea57a1eb..4bcbb74868e 100644
--- a/src/mame/includes/bwidow.h
+++ b/src/mame/includes/bwidow.h
@@ -34,13 +34,13 @@ public:
DECLARE_READ_LINE_MEMBER(clock_r);
protected:
- DECLARE_READ8_MEMBER(spacduel_IN3_r);
- DECLARE_READ8_MEMBER(bwidowp_in_r);
- DECLARE_WRITE8_MEMBER(bwidow_misc_w);
- DECLARE_WRITE8_MEMBER(spacduel_coin_counter_w);
- DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_READ8_MEMBER(earom_read);
- DECLARE_WRITE8_MEMBER(earom_write);
+ uint8_t spacduel_IN3_r(offs_t offset);
+ uint8_t bwidowp_in_r();
+ void bwidow_misc_w(uint8_t data);
+ void spacduel_coin_counter_w(uint8_t data);
+ void irq_ack_w(uint8_t data);
+ uint8_t earom_read();
+ void earom_write(offs_t offset, uint8_t data);
void earom_control_w(uint8_t data);
void bwidow_map(address_map &map);
diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h
index 9c017d299e2..6675aca703a 100644
--- a/src/mame/includes/bwing.h
+++ b/src/mame/includes/bwing.h
@@ -61,17 +61,17 @@ public:
int m_bwp3_nmimask;
int m_bwp3_u8F_d;
- DECLARE_WRITE8_MEMBER(bwp3_u8F_w);
- DECLARE_WRITE8_MEMBER(bwp3_nmimask_w);
- DECLARE_WRITE8_MEMBER(bwp3_nmiack_w);
- DECLARE_WRITE8_MEMBER(bwp1_ctrl_w);
- DECLARE_WRITE8_MEMBER(bwp2_ctrl_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(fgscrollram_w);
- DECLARE_WRITE8_MEMBER(bgscrollram_w);
- DECLARE_WRITE8_MEMBER(gfxram_w);
- DECLARE_WRITE8_MEMBER(scrollreg_w);
- DECLARE_WRITE8_MEMBER(paletteram_w);
+ void bwp3_u8F_w(uint8_t data);
+ void bwp3_nmimask_w(uint8_t data);
+ void bwp3_nmiack_w(uint8_t data);
+ void bwp1_ctrl_w(offs_t offset, uint8_t data);
+ void bwp2_ctrl_w(offs_t offset, uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
+ void fgscrollram_w(offs_t offset, uint8_t data);
+ void bgscrollram_w(offs_t offset, uint8_t data);
+ void gfxram_w(offs_t offset, uint8_t data);
+ void scrollreg_w(offs_t offset, uint8_t data);
+ void paletteram_w(offs_t offset, uint8_t data);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
DECLARE_INPUT_CHANGED_MEMBER(tilt_pressed);
diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp
index 59136727141..37c70a11433 100644
--- a/src/mame/machine/abc1600mac.cpp
+++ b/src/mame/machine/abc1600mac.cpp
@@ -275,24 +275,24 @@ void abc1600_mac_device::write_user_memory(offs_t offset, uint8_t data)
// read_supervisor_memory -
//-------------------------------------------------
-uint8_t abc1600_mac_device::read_supervisor_memory(address_space &space, offs_t offset)
+uint8_t abc1600_mac_device::read_supervisor_memory(offs_t offset)
{
uint8_t data = 0;
if (!A2 && !A1)
{
// _EP
- data = page_r(space, offset);
+ data = page_r(offset);
}
else if (!A2 && A1 && A0)
{
// _ES
- data = segment_r(space, offset);
+ data = segment_r(offset);
}
else if (A2 && A1 && A0)
{
// _CAUSE
- data = cause_r(space, offset);
+ data = cause_r();
}
return data;
@@ -303,22 +303,22 @@ uint8_t abc1600_mac_device::read_supervisor_memory(address_space &space, offs_t
// write_supervisor_memory -
//-------------------------------------------------
-void abc1600_mac_device::write_supervisor_memory(address_space &space, offs_t offset, uint8_t data)
+void abc1600_mac_device::write_supervisor_memory(offs_t offset, uint8_t data)
{
if (!A2 && !A1)
{
// _WEP
- page_w(space, offset, data);
+ page_w(offset, data);
}
else if (!A2 && A1 && A0)
{
// _WES
- segment_w(space, offset, data);
+ segment_w(offset, data);
}
else if (A2 && !A1 && A0)
{
// W(C)
- task_w(space, offset, data);
+ task_w(offset, data);
}
}
@@ -341,7 +341,7 @@ int abc1600_mac_device::get_fc()
// read -
//-------------------------------------------------
-READ8_MEMBER( abc1600_mac_device::read )
+uint8_t abc1600_mac_device::read(offs_t offset)
{
int fc = get_fc();
@@ -354,7 +354,7 @@ READ8_MEMBER( abc1600_mac_device::read )
}
else if (A19 && !m_ifc2 && !FC1)
{
- data = read_supervisor_memory(space, offset);
+ data = read_supervisor_memory(offset);
}
else
{
@@ -369,13 +369,13 @@ READ8_MEMBER( abc1600_mac_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_mac_device::write )
+void abc1600_mac_device::write(offs_t offset, uint8_t data)
{
int fc = get_fc();
if (A19 && !m_ifc2 && !FC1)
{
- write_supervisor_memory(space, offset, data);
+ write_supervisor_memory(offset, data);
}
else
{
@@ -388,7 +388,7 @@ WRITE8_MEMBER( abc1600_mac_device::write )
// cause_r -
//-------------------------------------------------
-READ8_MEMBER( abc1600_mac_device::cause_r )
+uint8_t abc1600_mac_device::cause_r()
{
/*
@@ -420,7 +420,7 @@ READ8_MEMBER( abc1600_mac_device::cause_r )
// task_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_mac_device::task_w )
+void abc1600_mac_device::task_w(offs_t offset, uint8_t data)
{
/*
@@ -447,7 +447,7 @@ WRITE8_MEMBER( abc1600_mac_device::task_w )
// segment_r -
//-------------------------------------------------
-READ8_MEMBER( abc1600_mac_device::segment_r )
+uint8_t abc1600_mac_device::segment_r(offs_t offset)
{
/*
@@ -475,7 +475,7 @@ READ8_MEMBER( abc1600_mac_device::segment_r )
// segment_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_mac_device::segment_w )
+void abc1600_mac_device::segment_w(offs_t offset, uint8_t data)
{
/*
@@ -504,7 +504,7 @@ WRITE8_MEMBER( abc1600_mac_device::segment_w )
// page_r -
//-------------------------------------------------
-READ8_MEMBER( abc1600_mac_device::page_r )
+uint8_t abc1600_mac_device::page_r(offs_t offset)
{
/*
@@ -559,7 +559,7 @@ READ8_MEMBER( abc1600_mac_device::page_r )
// page_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_mac_device::page_w )
+void abc1600_mac_device::page_w(offs_t offset, uint8_t data)
{
/*
@@ -681,7 +681,7 @@ void abc1600_mac_device::dma_iorq_w(int index, uint16_t offset, uint8_t data)
// dmamap_w - DMA map write
//-------------------------------------------------
-WRITE8_MEMBER( abc1600_mac_device::dmamap_w )
+void abc1600_mac_device::dmamap_w(offs_t offset, uint8_t data)
{
/*
diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h
index 47cdef8a7ec..a0b1a4c0097 100644
--- a/src/mame/machine/abc1600mac.h
+++ b/src/mame/machine/abc1600mac.h
@@ -39,13 +39,13 @@ public:
virtual void map(address_map &map);
- DECLARE_READ8_MEMBER( cause_r );
- DECLARE_WRITE8_MEMBER( task_w );
- DECLARE_READ8_MEMBER( segment_r );
- DECLARE_WRITE8_MEMBER( segment_w );
- DECLARE_READ8_MEMBER( page_r );
- DECLARE_WRITE8_MEMBER( page_w );
- DECLARE_WRITE8_MEMBER( dmamap_w );
+ uint8_t cause_r();
+ void task_w(offs_t offset, uint8_t data);
+ uint8_t segment_r(offs_t offset);
+ void segment_w(offs_t offset, uint8_t data);
+ uint8_t page_r(offs_t offset);
+ void page_w(offs_t offset, uint8_t data);
+ void dmamap_w(offs_t offset, uint8_t data);
uint8_t dma0_mreq_r(offs_t offset) { return dma_mreq_r(DMAMAP_R0_LO, offset); }
void dma0_mreq_w(offs_t offset, uint8_t data) { dma_mreq_w(DMAMAP_R0_LO, offset, data); }
@@ -84,8 +84,8 @@ private:
DMAMAP_R0_HI
};
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
int get_current_task(offs_t offset);
offs_t get_segment_address(offs_t offset);
@@ -94,8 +94,8 @@ private:
uint8_t read_user_memory(offs_t offset);
void write_user_memory(offs_t offset, uint8_t data);
int get_fc();
- uint8_t read_supervisor_memory(address_space &space, offs_t offset);
- void write_supervisor_memory(address_space &space, offs_t offset, uint8_t data);
+ uint8_t read_supervisor_memory(offs_t offset);
+ void write_supervisor_memory(offs_t offset, uint8_t data);
offs_t get_dma_address(int index, uint16_t offset);
uint8_t dma_mreq_r(int index, uint16_t offset);
void dma_mreq_w(int index, uint16_t offset, uint8_t data);
diff --git a/src/mame/machine/ajax.cpp b/src/mame/machine/ajax.cpp
index e8a78eca2e9..e7e2b57571c 100644
--- a/src/mame/machine/ajax.cpp
+++ b/src/mame/machine/ajax.cpp
@@ -33,7 +33,7 @@
(*) The Coin Counters are handled by the Konami Custom 051550
*/
-WRITE8_MEMBER(ajax_state::bankswitch_w)
+void ajax_state::bankswitch_w(uint8_t data)
{
int bank = 0;
@@ -77,7 +77,7 @@ WRITE8_MEMBER(ajax_state::bankswitch_w)
LS393 C20 Dual -ve edge trigger 4-bit Binary Ripple Counter with Resets
*/
-WRITE8_MEMBER(ajax_state::lamps_w)
+void ajax_state::lamps_w(uint8_t data)
{
m_lamps[1] = BIT(data, 1); /* super weapon lamp */
m_lamps[2] = BIT(data, 2); /* power up lamps */
@@ -106,7 +106,7 @@ WRITE8_MEMBER(ajax_state::lamps_w)
0x01c0 (r) MIO2 Enables DIPSW #3 reading
*/
-READ8_MEMBER(ajax_state::ls138_f10_r)
+uint8_t ajax_state::ls138_f10_r(offs_t offset)
{
int data = 0, index;
static const char *const portnames[] = { "SYSTEM", "P1", "DSW1", "DSW2" };
@@ -134,7 +134,7 @@ READ8_MEMBER(ajax_state::ls138_f10_r)
return data;
}
-WRITE8_MEMBER(ajax_state::ls138_f10_w)
+void ajax_state::ls138_f10_w(offs_t offset, uint8_t data)
{
switch ((offset & 0x01c0) >> 6)
{
@@ -153,10 +153,10 @@ WRITE8_MEMBER(ajax_state::ls138_f10_w)
m_soundlatch->write(data);
break;
case 0x03: /* Bankswitch + coin counters + priority*/
- bankswitch_w(space, 0, data);
+ bankswitch_w(data);
break;
case 0x05: /* Lamps + Joystick vibration + Control panel quaking */
- lamps_w(space, 0, data);
+ lamps_w(data);
break;
default:
@@ -179,7 +179,7 @@ WRITE8_MEMBER(ajax_state::ls138_f10_w)
0 SRB0 /
*/
-WRITE8_MEMBER(ajax_state::bankswitch_2_w)
+void ajax_state::bankswitch_2_w(uint8_t data)
{
/* enable char ROM reading through the video RAM */
m_k052109->set_rmrd_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp
index afb7e5ebb6f..2db6151d286 100644
--- a/src/mame/machine/amiga.cpp
+++ b/src/mame/machine/amiga.cpp
@@ -217,12 +217,12 @@ WRITE_LINE_MEMBER( amiga_state::kbreset_w )
}
// simple mirror of region 0xf80000 to 0xfbffff
-READ16_MEMBER( amiga_state::rom_mirror_r )
+uint16_t amiga_state::rom_mirror_r(offs_t offset, uint16_t mem_mask)
{
return m_maincpu->space(AS_PROGRAM).read_word(offset + 0xf80000, mem_mask);
}
-READ32_MEMBER( amiga_state::rom_mirror32_r )
+uint32_t amiga_state::rom_mirror32_r(offs_t offset, uint32_t mem_mask)
{
return m_maincpu->space(AS_PROGRAM).read_dword(offset + 0xf80000, mem_mask);
}
@@ -1027,7 +1027,7 @@ WRITE_LINE_MEMBER( amiga_state::centronics_select_w )
// CIA-A access: 101x xxxx xxx0 oooo xxxx xxx1
// CIA-B access: 101x xxxx xx0x oooo xxxx xxx0
-READ16_MEMBER( amiga_state::cia_r )
+uint16_t amiga_state::cia_r(offs_t offset, uint16_t mem_mask)
{
uint16_t data = 0;
@@ -1043,7 +1043,7 @@ READ16_MEMBER( amiga_state::cia_r )
return data;
}
-WRITE16_MEMBER( amiga_state::cia_w )
+void amiga_state::cia_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (LOG_CIA)
logerror("%s: cia_w(%06x) = %04x & %04x\n", machine().describe_context(), offset, data, mem_mask);
@@ -1055,7 +1055,7 @@ WRITE16_MEMBER( amiga_state::cia_w )
m_cia_1->write(offset >> 7, data >> 8);
}
-WRITE16_MEMBER( amiga_state::gayle_cia_w )
+void amiga_state::gayle_cia_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// the first write to cia 0 after a reset switches in chip ram
if (m_gayle_reset && (offset & 0x1000/2) == 0 && ACCESSING_BITS_0_7)
@@ -1065,7 +1065,7 @@ WRITE16_MEMBER( amiga_state::gayle_cia_w )
}
// hand down to the standard cia handler
- cia_w(space, offset, data, mem_mask);
+ cia_w(offset, data, mem_mask);
}
CUSTOM_INPUT_MEMBER( amiga_state::floppy_drive_status )
@@ -1143,7 +1143,7 @@ void amiga_state::custom_chip_reset()
CUSTOM_REG(REG_BEAMCON0) = (m_agnus_id & 0x10) ? 0x0000 : 0x0020;
}
-READ16_MEMBER( amiga_state::custom_chip_r )
+uint16_t amiga_state::custom_chip_r(offs_t offset)
{
uint16_t temp;
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index f01699170ff..4d6e1f29afe 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -217,7 +217,7 @@ void apollo_csr_set_status_register(uint16_t mask, uint16_t data)
DN3000/DN3500 CPU Status Register at 0x8000/0x10000
-------------------------------------------------*/
-WRITE16_MEMBER(apollo_state::apollo_csr_status_register_w){
+void apollo_state::apollo_csr_status_register_w(offs_t offset, uint16_t data, uint16_t mem_mask){
// To clear bus timeouts or parity conditions from status register,
// write to the status register. This register is readonly.
// in DN3500 bit 15 is always set (undocumented !?)
@@ -225,7 +225,7 @@ WRITE16_MEMBER(apollo_state::apollo_csr_status_register_w){
SLOG1(("writing CPU Status Register at offset %X = %04x & %04x (%04x)", offset, data, mem_mask, cpu_status_register));
}
-READ16_MEMBER(apollo_state::apollo_csr_status_register_r){
+uint16_t apollo_state::apollo_csr_status_register_r(offs_t offset, uint16_t mem_mask){
SLOG2(("reading CPU Status Register at offset %X = %04x & %04x", offset, cpu_status_register, mem_mask));
return cpu_status_register & mem_mask;
}
@@ -234,7 +234,7 @@ READ16_MEMBER(apollo_state::apollo_csr_status_register_r){
DN3000/DN3500 CPU Control Register at 0x8100/0x10100
-------------------------------------------------*/
-WRITE16_MEMBER(apollo_state::apollo_csr_control_register_w)
+void apollo_state::apollo_csr_control_register_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int leds;
@@ -288,7 +288,7 @@ WRITE16_MEMBER(apollo_state::apollo_csr_control_register_w)
}
}
-READ16_MEMBER(apollo_state::apollo_csr_control_register_r)
+uint16_t apollo_state::apollo_csr_control_register_r(offs_t offset, uint16_t mem_mask)
{
SLOG1(("reading CPU Control Register at offset %X = %04x & %04x", offset, cpu_control_register, mem_mask));
return cpu_control_register & mem_mask;
@@ -315,12 +315,12 @@ static uint8_t dn3000_dma_channel2 = 5; // 5 = memory dma channel
DN3000/DN3500 DMA Controller 1 at 0x9000/0x10c00
-------------------------------------------------*/
-WRITE8_MEMBER(apollo_state::apollo_dma_1_w){
+void apollo_state::apollo_dma_1_w(offs_t offset, uint8_t data){
SLOG1(("apollo_dma_1_w: writing DMA Controller 1 at offset %02x = %02x", offset, data));
m_dma8237_1->write(offset, data);
}
-READ8_MEMBER(apollo_state::apollo_dma_1_r){
+uint8_t apollo_state::apollo_dma_1_r(offs_t offset){
uint8_t data = m_dma8237_1->read(offset);
SLOG1(("apollo_dma_1_r: reading DMA Controller 1 at offset %02x = %02x", offset, data));
return data;
@@ -330,12 +330,12 @@ READ8_MEMBER(apollo_state::apollo_dma_1_r){
DN3000/DN3500 DMA Controller 2 at 0x9100/0x10d00
-------------------------------------------------*/
-WRITE8_MEMBER(apollo_state::apollo_dma_2_w){
+void apollo_state::apollo_dma_2_w(offs_t offset, uint8_t data){
SLOG1(("apollo_dma_2_w: writing DMA Controller 2 at offset %02x = %02x", offset/2, data));
m_dma8237_2->write(offset / 2, data);
}
-READ8_MEMBER(apollo_state::apollo_dma_2_r){
+uint8_t apollo_state::apollo_dma_2_r(offs_t offset){
// Nasty hack (13-06-15 - ost):
// MD self_test will test wrong DMA register and
// mem-to-mem DMA in am9517a.c is often starting much too late (for MD self_test)
@@ -360,12 +360,12 @@ READ8_MEMBER(apollo_state::apollo_dma_2_r){
DN3000 DMA Page Register at 0x9200
***************************************************************************/
-WRITE8_MEMBER(apollo_state::apollo_dma_page_register_w){
+void apollo_state::apollo_dma_page_register_w(offs_t offset, uint8_t data){
dma_page_register[offset & 0x0f] = data;
SLOG1(("writing DMA Page Register at offset %02x = %02x", offset, data));
}
-READ8_MEMBER(apollo_state::apollo_dma_page_register_r){
+uint8_t apollo_state::apollo_dma_page_register_r(offs_t offset){
uint8_t data = dma_page_register[offset & 0x0f];
SLOG1(("reading DMA Page Register at offset %02x = %02x", offset, data));
return data;
@@ -375,12 +375,12 @@ READ8_MEMBER(apollo_state::apollo_dma_page_register_r){
DN3500 Address Translation Map at 0x017000
-------------------------------------------------*/
-WRITE16_MEMBER(apollo_state::apollo_address_translation_map_w){
+void apollo_state::apollo_address_translation_map_w(offs_t offset, uint16_t data){
address_translation_map[offset & 0x3ff] = data;
SLOG2(("writing Address Translation Map at offset %02x = %04x", offset, data));
}
-READ16_MEMBER(apollo_state::apollo_address_translation_map_r){
+uint16_t apollo_state::apollo_address_translation_map_r(offs_t offset){
uint16_t data = address_translation_map[offset & 0x3ff];
SLOG2(("reading Address Translation Map at offset %02x = %04x", offset, data));
return data;
@@ -672,7 +672,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_ptm_irq_function)
DN3000/DN3500 Realtime Calendar MC146818 at 0x8900/0x10900
***************************************************************************/
-WRITE8_MEMBER(apollo_state::apollo_rtc_w)
+void apollo_state::apollo_rtc_w(offs_t offset, uint8_t data)
{
m_rtc->write_direct(offset, data);
if (offset >= 0x0b && offset <= 0x0c)
@@ -681,7 +681,7 @@ WRITE8_MEMBER(apollo_state::apollo_rtc_w)
}
}
-READ8_MEMBER(apollo_state::apollo_rtc_r)
+uint8_t apollo_state::apollo_rtc_r(offs_t offset)
{
uint8_t data;
data = m_rtc->read_direct(offset);
@@ -899,12 +899,12 @@ void apollo_ni::set_node_id(uint32_t node_id)
// read/write
//-------------------------------------------------
-WRITE16_MEMBER(apollo_ni::write)
+void apollo_ni::write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
CLOG1(("Error: writing node id ROM at offset %02x = %04x & %04x", offset, data, mem_mask));
}
-READ16_MEMBER(apollo_ni::read)
+uint16_t apollo_ni::read(offs_t offset, uint16_t mem_mask)
{
uint16_t data = 0;
switch (offset & 0x0f)
@@ -1207,8 +1207,7 @@ MACHINE_START_MEMBER(apollo_state,apollo)
MACHINE_RESET_MEMBER(apollo_state,apollo)
{
- address_space &space = m_maincpu->space(AS_PROGRAM);
- uint8_t year = apollo_rtc_r(space, 9);
+ uint8_t year = apollo_rtc_r(9);
MLOG1(("machine_reset_apollo"));
@@ -1219,18 +1218,18 @@ MACHINE_RESET_MEMBER(apollo_state,apollo)
if (year < 25 && apollo_config(APOLLO_CONF_25_YEARS_AGO))
{
year += 75;
- apollo_rtc_w(space, 9, year);
+ apollo_rtc_w(9, year);
}
else if (year < 20 && apollo_config(APOLLO_CONF_20_YEARS_AGO))
{
year += 80;
- apollo_rtc_w(space, 9, year);
+ apollo_rtc_w(9, year);
}
else if (year >= 80 && !apollo_config(APOLLO_CONF_20_YEARS_AGO)
&& !apollo_config(APOLLO_CONF_25_YEARS_AGO))
{
year -= 80;
- apollo_rtc_w(space, 9, year);
+ apollo_rtc_w(9, year);
}
ptm_counter = 0;
diff --git a/src/mame/machine/archimds.cpp b/src/mame/machine/archimds.cpp
index 86f8cc67ac3..d940cb4a11c 100644
--- a/src/mame/machine/archimds.cpp
+++ b/src/mame/machine/archimds.cpp
@@ -260,7 +260,7 @@ void archimedes_state::archimedes_init()
m_timer[3]->adjust(attotime::never);
}
-READ32_MEMBER(archimedes_state::archimedes_memc_logical_r)
+uint32_t archimedes_state::archimedes_memc_logical_r(offs_t offset)
{
uint32_t page, poffs;
@@ -298,7 +298,7 @@ READ32_MEMBER(archimedes_state::archimedes_memc_logical_r)
-WRITE32_MEMBER(archimedes_state::archimedes_memc_logical_w)
+void archimedes_state::archimedes_memc_logical_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t page, poffs;
@@ -327,7 +327,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_memc_logical_w)
}
/* Aristocrat Mark 5 - same as normal AA except with Dram emulator */
-READ32_MEMBER(archimedes_state::aristmk5_drame_memc_logical_r)
+uint32_t archimedes_state::aristmk5_drame_memc_logical_r(offs_t offset)
{
uint32_t page, poffs;
@@ -448,7 +448,7 @@ bool archimedes_state::check_floppy_ready()
}
/* TODO: should be a 8-bit handler */
-READ32_MEMBER( archimedes_state::ioc_ctrl_r )
+uint32_t archimedes_state::ioc_ctrl_r(offs_t offset)
{
if(IOC_LOG)
logerror("IOC: R %s = %02x (PC=%x) %02x\n", ioc_regnames[offset&0x1f], m_ioc_regs[offset&0x1f], m_maincpu->pc(),offset & 0x1f);
@@ -521,7 +521,7 @@ READ32_MEMBER( archimedes_state::ioc_ctrl_r )
}
/* TODO: should be a 8-bit handler */
-WRITE32_MEMBER( archimedes_state::ioc_ctrl_w )
+void archimedes_state::ioc_ctrl_w(offs_t offset, uint32_t data)
{
if(IOC_LOG)
logerror("IOC: W %02x @ reg %s (PC=%x)\n", data&0xff, ioc_regnames[offset&0x1f], m_maincpu->pc());
@@ -651,7 +651,7 @@ WRITE32_MEMBER( archimedes_state::ioc_ctrl_w )
}
}
-READ32_MEMBER(archimedes_state::archimedes_ioc_r)
+uint32_t archimedes_state::archimedes_ioc_r(offs_t offset, uint32_t mem_mask)
{
uint32_t ioc_addr;
@@ -668,7 +668,7 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r)
{
switch((ioc_addr & 0x70000) >> 16)
{
- case 0: return ioc_ctrl_r(space,offset,mem_mask);
+ case 0: return ioc_ctrl_r(offset);
case 1:
if (m_fdc)
{
@@ -732,7 +732,7 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r)
return 0;
}
-WRITE32_MEMBER(archimedes_state::archimedes_ioc_w)
+void archimedes_state::archimedes_ioc_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t ioc_addr;
@@ -749,7 +749,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w)
{
switch((ioc_addr & 0x70000) >> 16)
{
- case 0: ioc_ctrl_w(space,offset,data,mem_mask); return;
+ case 0: ioc_ctrl_w(offset,data); return;
case 1:
if (m_fdc)
{
@@ -852,7 +852,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w)
logerror("(PC=%08x) I/O: W %x @ %x (mask %08x)\n", m_maincpu->pc(), data, (offset*4)+0x3000000, mem_mask);
}
-WRITE32_MEMBER(archimedes_state::archimedes_memc_w)
+void archimedes_state::archimedes_memc_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// is it a register?
if ((data & 0x0fe00000) == 0x03600000)
@@ -970,7 +970,7 @@ The physical page is encoded differently depending on the page size :
1 being bit 6
*/
-WRITE32_MEMBER(archimedes_state::archimedes_memc_page_w)
+void archimedes_state::archimedes_memc_page_w(uint32_t data)
{
uint32_t log, phys, memc;
diff --git a/src/mame/machine/arkanoid.cpp b/src/mame/machine/arkanoid.cpp
index a6762df998a..19a3776fd23 100644
--- a/src/mame/machine/arkanoid.cpp
+++ b/src/mame/machine/arkanoid.cpp
@@ -91,7 +91,7 @@ TO DO (2006.09.12) :
/* Kludge for some bootlegs that read this address */
-READ8_MEMBER(arkanoid_state::arkanoid_bootleg_f000_r)
+uint8_t arkanoid_state::arkanoid_bootleg_f000_r()
{
uint8_t arkanoid_bootleg_val = 0x00;
@@ -133,7 +133,7 @@ READ8_MEMBER(arkanoid_state::arkanoid_bootleg_f000_r)
}
/* Kludge for some bootlegs that read this address */
-READ8_MEMBER(arkanoid_state::arkanoid_bootleg_f002_r)
+uint8_t arkanoid_state::arkanoid_bootleg_f002_r()
{
uint8_t arkanoid_bootleg_val = 0x00;
@@ -220,7 +220,7 @@ READ8_MEMBER(arkanoid_state::arkanoid_bootleg_f002_r)
}
/* Kludge for some bootlegs that write this address */
-WRITE8_MEMBER(arkanoid_state::arkanoid_bootleg_d018_w)
+void arkanoid_state::arkanoid_bootleg_d018_w(uint8_t data)
{
m_bootleg_cmd = 0x00;
@@ -475,14 +475,14 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_bootleg_d018_w)
}
#ifdef UNUSED_CODE
-READ8_MEMBER(arkanoid_state::block2_bootleg_f000_r)
+uint8_t arkanoid_state::block2_bootleg_f000_r()
{
return m_bootleg_cmd;
}
#endif
/* Kludge for some bootlegs that read this address */
-READ8_MEMBER(arkanoid_state::arkanoid_bootleg_d008_r)
+uint8_t arkanoid_state::arkanoid_bootleg_d008_r()
{
uint8_t arkanoid_bootleg_d008_bit[8];
uint8_t arkanoid_bootleg_d008_val;
diff --git a/src/mame/machine/asteroid.cpp b/src/mame/machine/asteroid.cpp
index 69c8818de1c..1f629d4917c 100644
--- a/src/mame/machine/asteroid.cpp
+++ b/src/mame/machine/asteroid.cpp
@@ -43,7 +43,7 @@ WRITE_LINE_MEMBER(asteroid_state::cocktail_inv_w)
m_dvg->set_flip_y(flip);
}
-READ8_MEMBER(asteroid_state::asteroid_IN0_r)
+uint8_t asteroid_state::asteroid_IN0_r(offs_t offset)
{
int res = ioport("IN0")->read();
int bitmask = (1 << offset);
@@ -57,7 +57,7 @@ READ8_MEMBER(asteroid_state::asteroid_IN0_r)
}
-READ8_MEMBER(asteroid_state::asterock_IN0_r)
+uint8_t asteroid_state::asterock_IN0_r(offs_t offset)
{
int res = ioport("IN0")->read();
int bitmask = (1 << offset);
@@ -75,7 +75,7 @@ READ8_MEMBER(asteroid_state::asterock_IN0_r)
* Typically, only the high bit is used. This is handled by one input port.
*/
-READ8_MEMBER(asteroid_state::asteroid_IN1_r)
+uint8_t asteroid_state::asteroid_IN1_r(offs_t offset)
{
int res = ioport("IN1")->read();
int bitmask = (1 << (offset & 0x7));
@@ -89,7 +89,7 @@ READ8_MEMBER(asteroid_state::asteroid_IN1_r)
}
-READ8_MEMBER(asteroid_state::asteroid_DSW1_r)
+uint8_t asteroid_state::asteroid_DSW1_r(offs_t offset)
{
// 765432-- not used
// ------1- ls253 dsw selector 2y
diff --git a/src/mame/machine/atarifb.cpp b/src/mame/machine/atarifb.cpp
index 91cc61ce55a..74a5e59aa79 100644
--- a/src/mame/machine/atarifb.cpp
+++ b/src/mame/machine/atarifb.cpp
@@ -11,7 +11,7 @@
#include "sound/discrete.h"
-WRITE8_MEMBER(atarifb_state::atarifb_out1_w)
+void atarifb_state::atarifb_out1_w(uint8_t data)
{
m_CTRLD = data;
@@ -22,7 +22,7 @@ WRITE8_MEMBER(atarifb_state::atarifb_out1_w)
}
-WRITE8_MEMBER(atarifb_state::atarifb4_out1_w)
+void atarifb_state::atarifb4_out1_w(uint8_t data)
{
m_CTRLD = data;
@@ -35,7 +35,7 @@ WRITE8_MEMBER(atarifb_state::atarifb4_out1_w)
}
-WRITE8_MEMBER(atarifb_state::abaseb_out1_w)
+void atarifb_state::abaseb_out1_w(uint8_t data)
{
m_CTRLD = data;
@@ -59,7 +59,7 @@ WRITE8_MEMBER(atarifb_state::abaseb_out1_w)
}
-WRITE8_MEMBER(atarifb_state::soccer_out1_w)
+void atarifb_state::soccer_out1_w(uint8_t data)
{
m_CTRLD = data;
@@ -81,7 +81,7 @@ WRITE8_MEMBER(atarifb_state::soccer_out1_w)
}
-WRITE8_MEMBER(atarifb_state::atarifb_out2_w)
+void atarifb_state::atarifb_out2_w(uint8_t data)
{
m_discrete->write(ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
@@ -89,7 +89,7 @@ WRITE8_MEMBER(atarifb_state::atarifb_out2_w)
}
-WRITE8_MEMBER(atarifb_state::soccer_out2_w)
+void atarifb_state::soccer_out2_w(uint8_t data)
{
m_discrete->write(ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
@@ -107,7 +107,7 @@ WRITE8_MEMBER(atarifb_state::soccer_out2_w)
*************************************/
/* FIXME: almost surely not tied with screen vertical position */
-WRITE8_MEMBER(atarifb_state::atarifb_out3_w)
+void atarifb_state::atarifb_out3_w(uint8_t data)
{
int loop = m_screen->vpos() >= 123;
@@ -134,7 +134,7 @@ WRITE8_MEMBER(atarifb_state::atarifb_out3_w)
}
-READ8_MEMBER(atarifb_state::atarifb_in0_r)
+uint8_t atarifb_state::atarifb_in0_r()
{
if ((m_CTRLD & 0x20) == 0x00)
{
@@ -171,7 +171,7 @@ READ8_MEMBER(atarifb_state::atarifb_in0_r)
}
-READ8_MEMBER(atarifb_state::atarifb_in2_r)
+uint8_t atarifb_state::atarifb_in2_r()
{
if ((m_CTRLD & 0x20) == 0x00)
{
@@ -200,7 +200,7 @@ READ8_MEMBER(atarifb_state::atarifb_in2_r)
}
}
-READ8_MEMBER(atarifb_state::atarifb4_in0_r)
+uint8_t atarifb_state::atarifb4_in0_r()
{
/* LD1 and LD2 low, return sign bits */
if ((m_CTRLD & 0x60) == 0x00)
@@ -266,7 +266,7 @@ READ8_MEMBER(atarifb_state::atarifb4_in0_r)
}
-READ8_MEMBER(atarifb_state::atarifb4_in2_r)
+uint8_t atarifb_state::atarifb4_in2_r()
{
if ((m_CTRLD & 0x40) == 0x00)
{
diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp
index 119d8c42acd..9e17b6018b6 100644
--- a/src/mame/machine/atarixga.cpp
+++ b/src/mame/machine/atarixga.cpp
@@ -189,7 +189,7 @@ uint16_t atari_136094_0072_device::decipher(uint8_t k, uint16_t c)
*
*************************************/
-WRITE32_MEMBER(atari_136094_0072_device::write)
+void atari_136094_0072_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
switch (m_mode)
{
@@ -221,7 +221,7 @@ WRITE32_MEMBER(atari_136094_0072_device::write)
}
}
-READ32_MEMBER(atari_136094_0072_device::read)
+uint32_t atari_136094_0072_device::read(offs_t offset, uint32_t mem_mask)
{
switch (offset << 2)
{
@@ -392,13 +392,13 @@ uint16_t atari_136095_0072_device::decipher(uint8_t k, uint16_t c)
return p;
}
-WRITE32_MEMBER(atari_136095_0072_device::polylsb_write)
+void atari_136095_0072_device::polylsb_write(offs_t offset, uint32_t data)
{
m_update.addr = offset;
m_update.data[offset] = data;
}
-READ32_MEMBER(atari_136095_0072_device::polylsb_read)
+uint32_t atari_136095_0072_device::polylsb_read(offs_t offset, uint32_t mem_mask)
{
if (m_update.addr == offset)
{
@@ -414,7 +414,7 @@ READ32_MEMBER(atari_136095_0072_device::polylsb_read)
return m_update.data[offset];
}
-WRITE32_MEMBER(atari_136095_0072_device::write)
+void atari_136095_0072_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint16_t address, value = 0;
@@ -471,7 +471,7 @@ WRITE32_MEMBER(atari_136095_0072_device::write)
}
}
-READ32_MEMBER(atari_136095_0072_device::read)
+uint32_t atari_136095_0072_device::read(offs_t offset, uint32_t mem_mask)
{
uint16_t address;
uint32_t reply = 0;
diff --git a/src/mame/machine/atarixga.h b/src/mame/machine/atarixga.h
index 6f1ab1c52ad..4b199c2a730 100644
--- a/src/mame/machine/atarixga.h
+++ b/src/mame/machine/atarixga.h
@@ -17,8 +17,8 @@ DECLARE_DEVICE_TYPE(ATARI_136095_0072, atari_136095_0072_device)
class atari_xga_device : public device_t
{
public:
- virtual DECLARE_WRITE32_MEMBER(write) = 0;
- virtual DECLARE_READ32_MEMBER(read) = 0;
+ virtual void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) = 0;
+ virtual uint32_t read(offs_t offset, uint32_t mem_mask = ~0) = 0;
protected:
// construction/destruction
@@ -38,8 +38,8 @@ class atari_136094_0072_device : public atari_xga_device
public:
atari_136094_0072_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_WRITE32_MEMBER(write) override;
- virtual DECLARE_READ32_MEMBER(read) override;
+ virtual void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
+ virtual uint32_t read(offs_t offset, uint32_t mem_mask = ~0) override;
protected:
virtual void device_start() override;
@@ -70,11 +70,11 @@ class atari_136095_0072_device : public atari_xga_device
public:
atari_136095_0072_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE32_MEMBER(polylsb_write);
- DECLARE_READ32_MEMBER(polylsb_read);
+ void polylsb_write(offs_t offset, uint32_t data);
+ uint32_t polylsb_read(offs_t offset, uint32_t mem_mask = ~0);
- virtual DECLARE_WRITE32_MEMBER(write) override;
- virtual DECLARE_READ32_MEMBER(read) override;
+ virtual void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override;
+ virtual uint32_t read(offs_t offset, uint32_t mem_mask = ~0) override;
protected:
virtual void device_start() override;
diff --git a/src/mame/machine/awboard.cpp b/src/mame/machine/awboard.cpp
index 3ff85c137de..bc2146640e2 100644
--- a/src/mame/machine/awboard.cpp
+++ b/src/mame/machine/awboard.cpp
@@ -294,7 +294,7 @@ void aw_rom_board::device_reset()
dma_limit = 0;
}
-READ16_MEMBER(aw_rom_board::pio_r)
+uint16_t aw_rom_board::pio_r()
{
uint32_t roffset = epr_offset & 0x3ffffff;
if (roffset >= (mpr_offset / 2))
@@ -303,44 +303,44 @@ READ16_MEMBER(aw_rom_board::pio_r)
return retval;
}
-WRITE16_MEMBER(aw_rom_board::pio_w)
+void aw_rom_board::pio_w(uint16_t data)
{
// write to ROM board address space, including FlashROM programming using CFI (TODO)
if (epr_offset == 0x7fffff)
mpr_bank = data & 3;
}
-WRITE16_MEMBER(aw_rom_board::epr_offsetl_w)
+void aw_rom_board::epr_offsetl_w(uint16_t data)
{
epr_offset = (epr_offset & 0xffff0000) | data;
recalc_dma_offset(EPR);
}
-WRITE16_MEMBER(aw_rom_board::epr_offseth_w)
+void aw_rom_board::epr_offseth_w(uint16_t data)
{
epr_offset = (epr_offset & 0x0000ffff) | (data << 16);
recalc_dma_offset(EPR);
}
-WRITE16_MEMBER(aw_rom_board::mpr_record_index_w)
+void aw_rom_board::mpr_record_index_w(uint16_t data)
{
mpr_record_index = data;
recalc_dma_offset(MPR_RECORD);
}
-WRITE16_MEMBER(aw_rom_board::mpr_first_file_index_w)
+void aw_rom_board::mpr_first_file_index_w(uint16_t data)
{
mpr_first_file_index = data;
recalc_dma_offset(MPR_FILE);
}
-WRITE16_MEMBER(aw_rom_board::mpr_file_offsetl_w)
+void aw_rom_board::mpr_file_offsetl_w(uint16_t data)
{
mpr_file_offset = (mpr_file_offset & 0xffff0000) | data;
recalc_dma_offset(MPR_FILE);
}
-WRITE16_MEMBER(aw_rom_board::mpr_file_offseth_w)
+void aw_rom_board::mpr_file_offseth_w(uint16_t data)
{
mpr_file_offset = (mpr_file_offset & 0x0000ffff) | (data << 16);
diff --git a/src/mame/machine/awboard.h b/src/mame/machine/awboard.h
index 7164f646948..274b1d364cd 100644
--- a/src/mame/machine/awboard.h
+++ b/src/mame/machine/awboard.h
@@ -15,14 +15,14 @@ public:
virtual void submap(address_map &map) override;
- DECLARE_WRITE16_MEMBER(epr_offsetl_w); // 5f7000
- DECLARE_WRITE16_MEMBER(epr_offseth_w); // 5f7004
- DECLARE_WRITE16_MEMBER(mpr_record_index_w); // 5f700c
- DECLARE_WRITE16_MEMBER(mpr_first_file_index_w); // 5f7010
- DECLARE_WRITE16_MEMBER(mpr_file_offsetl_w); // 5f7014
- DECLARE_WRITE16_MEMBER(mpr_file_offseth_w); // 5f7018
- DECLARE_READ16_MEMBER(pio_r); // 5f7080
- DECLARE_WRITE16_MEMBER(pio_w); // 5f7080
+ void epr_offsetl_w(uint16_t data); // 5f7000
+ void epr_offseth_w(uint16_t data); // 5f7004
+ void mpr_record_index_w(uint16_t data); // 5f700c
+ void mpr_first_file_index_w(uint16_t data); // 5f7010
+ void mpr_file_offsetl_w(uint16_t data); // 5f7014
+ void mpr_file_offseth_w(uint16_t data); // 5f7018
+ uint16_t pio_r(); // 5f7080
+ void pio_w(uint16_t data); // 5f7080
protected:
virtual void device_start() override;
diff --git a/src/mame/machine/b2m.cpp b/src/mame/machine/b2m.cpp
index 0ae0242c9ad..511dfed6fbb 100644
--- a/src/mame/machine/b2m.cpp
+++ b/src/mame/machine/b2m.cpp
@@ -18,7 +18,7 @@
#include "includes/b2m.h"
#include "machine/ram.h"
-READ8_MEMBER(b2m_state::b2m_keyboard_r)
+uint8_t b2m_state::b2m_keyboard_r(offs_t offset)
{
uint8_t key = 0x00;
if (offset < 0x100) {
@@ -80,7 +80,7 @@ void b2m_state::b2m_set_bank(int bank)
space.unmap_write(0xe000, 0xffff);
membank("bank1")->set_base(ram);
- space.install_read_handler(0x2800, 0x2fff, read8_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+ space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
membank("bank3")->set_base(ram + 0x10000);
membank("bank4")->set_base(ram + 0x7000);
membank("bank5")->set_base(rom + 0x10000);
@@ -90,7 +90,7 @@ void b2m_state::b2m_set_bank(int bank)
space.unmap_write(0xe000, 0xffff);
membank("bank1")->set_base(ram);
- space.install_read_handler(0x2800, 0x2fff, read8_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+ space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
membank("bank3")->set_base(ram + 0x14000);
membank("bank4")->set_base(ram + 0x7000);
membank("bank5")->set_base(rom + 0x10000);
@@ -100,7 +100,7 @@ void b2m_state::b2m_set_bank(int bank)
space.unmap_write(0xe000, 0xffff);
membank("bank1")->set_base(ram);
- space.install_read_handler(0x2800, 0x2fff, read8_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+ space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
membank("bank3")->set_base(ram + 0x18000);
membank("bank4")->set_base(ram + 0x7000);
membank("bank5")->set_base(rom + 0x10000);
@@ -111,7 +111,7 @@ void b2m_state::b2m_set_bank(int bank)
space.unmap_write(0xe000, 0xffff);
membank("bank1")->set_base(ram);
- space.install_read_handler(0x2800, 0x2fff, read8_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+ space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
membank("bank3")->set_base(ram + 0x1c000);
membank("bank4")->set_base(ram + 0x7000);
membank("bank5")->set_base(rom + 0x10000);
@@ -229,7 +229,7 @@ void b2m_state::init_b2m()
m_vblank_state = 0;
}
-WRITE8_MEMBER(b2m_state::b2m_palette_w)
+void b2m_state::b2m_palette_w(offs_t offset, uint8_t data)
{
uint8_t b = (3 - ((data >> 6) & 3)) * 0x55;
uint8_t g = (3 - ((data >> 4) & 3)) * 0x55;
@@ -246,17 +246,17 @@ WRITE8_MEMBER(b2m_state::b2m_palette_w)
}
}
-READ8_MEMBER(b2m_state::b2m_palette_r)
+uint8_t b2m_state::b2m_palette_r(offs_t offset)
{
return m_b2m_color[offset];
}
-WRITE8_MEMBER(b2m_state::b2m_localmachine_w)
+void b2m_state::b2m_localmachine_w(uint8_t data)
{
m_b2m_localmachine = data;
}
-READ8_MEMBER(b2m_state::b2m_localmachine_r)
+uint8_t b2m_state::b2m_localmachine_r()
{
return m_b2m_localmachine;
}
diff --git a/src/mame/machine/bagman.cpp b/src/mame/machine/bagman.cpp
index 1b51fbb35a1..da0158aa1a9 100644
--- a/src/mame/machine/bagman.cpp
+++ b/src/mame/machine/bagman.cpp
@@ -201,30 +201,27 @@ uint8_t row, column, val;
}
-WRITE8_MEMBER(bagman_state::pal16r6_w)
+void bagman_state::pal16r6_w(offs_t offset, uint8_t data)
{
-uint8_t line;
-
- line = offset * 4;
+ uint8_t line = offset * 4;
m_columnvalue[line ] = data & 1;
m_columnvalue[line + 1] = 1 - (data & 1);
}
void bagman_state::machine_reset()
{
- address_space &space = m_maincpu->space(AS_PROGRAM);
- pal16r6_w(space, 0, 1); /*pin 2*/
- pal16r6_w(space, 1, 1); /*pin 3*/
- pal16r6_w(space, 2, 1); /*pin 4*/
- pal16r6_w(space, 3, 1); /*pin 5*/
- pal16r6_w(space, 4, 1); /*pin 6*/
- pal16r6_w(space, 5, 1); /*pin 7*/
- pal16r6_w(space, 6, 1); /*pin 8*/
- pal16r6_w(space, 7, 1); /*pin 9*/
+ pal16r6_w(0, 1); /*pin 2*/
+ pal16r6_w(1, 1); /*pin 3*/
+ pal16r6_w(2, 1); /*pin 4*/
+ pal16r6_w(3, 1); /*pin 5*/
+ pal16r6_w(4, 1); /*pin 6*/
+ pal16r6_w(5, 1); /*pin 7*/
+ pal16r6_w(6, 1); /*pin 8*/
+ pal16r6_w(7, 1); /*pin 9*/
update_pal();
}
-READ8_MEMBER(bagman_state::pal16r6_r)
+uint8_t bagman_state::pal16r6_r()
{
update_pal();
return (m_outvalue[6]) + (m_outvalue[5] << 1) + (m_outvalue[4] << 2) +
diff --git a/src/mame/machine/balsente.cpp b/src/mame/machine/balsente.cpp
index af750998a90..c22e849ad72 100644
--- a/src/mame/machine/balsente.cpp
+++ b/src/mame/machine/balsente.cpp
@@ -132,18 +132,16 @@ void balsente_state::poly17_init()
}
}
-WRITE8_MEMBER(balsente_state::random_reset_w)
+void balsente_state::random_reset_w(uint8_t data)
{
/* reset random number generator */
}
-READ8_MEMBER(balsente_state::random_num_r)
+uint8_t balsente_state::random_num_r()
{
- uint32_t cc;
-
/* CPU runs at 1.25MHz, noise source at 100kHz --> multiply by 12.5 */
- cc = m_maincpu->total_cycles();
+ uint32_t cc = m_maincpu->total_cycles();
/* 12.5 = 8 + 4 + 0.5 */
cc = (cc << 3) + (cc << 2) + (cc >> 1);
@@ -158,7 +156,7 @@ READ8_MEMBER(balsente_state::random_num_r)
*
*************************************/
-WRITE8_MEMBER(balsente_state::rombank_select_w)
+void balsente_state::rombank_select_w(uint8_t data)
{
/* the bank number comes from bits 4-6 */
m_bankab->set_entry((data >> 4) & 7);
@@ -167,7 +165,7 @@ WRITE8_MEMBER(balsente_state::rombank_select_w)
}
-WRITE8_MEMBER(balsente_state::rombank2_select_w)
+void balsente_state::rombank2_select_w(uint8_t data)
{
/* Night Stocker and Name that Tune only so far.... */
int bank = data & 7;
@@ -241,12 +239,12 @@ WRITE_LINE_MEMBER(balsente_state::nvrecall_w)
m_novram[1]->recall(!state);
}
-READ8_MEMBER(balsente_state::novram_8bit_r)
+uint8_t balsente_state::novram_8bit_r(address_space &space, offs_t offset)
{
return (m_novram[0]->read(space, offset) & 0x0f) | (m_novram[1]->read(space, offset) << 4);
}
-WRITE8_MEMBER(balsente_state::novram_8bit_w)
+void balsente_state::novram_8bit_w(offs_t offset, uint8_t data)
{
m_novram[0]->write(offset, data & 0x0f);
m_novram[1]->write(offset, data >> 4);
@@ -260,7 +258,7 @@ WRITE8_MEMBER(balsente_state::novram_8bit_w)
*
*************************************/
-WRITE8_MEMBER(balsente_state::acia_w)
+void balsente_state::acia_w(offs_t offset, uint8_t data)
{
// Ugly workaround: suppress soft reset command in order to avert race condition
m_acia->write(offset, (BIT(offset, 0) && data == 0xe0) ? 0 : data);
@@ -322,14 +320,14 @@ TIMER_CALLBACK_MEMBER(balsente_state::adc_finished)
}
-READ8_MEMBER(balsente_state::adc_data_r)
+uint8_t balsente_state::adc_data_r()
{
/* just return the last value read */
return m_adc_value;
}
-WRITE8_MEMBER(balsente_state::adc_select_w)
+void balsente_state::adc_select_w(offs_t offset, uint8_t data)
{
/* set a timer to go off and read the value after 50us */
/* it's important that we do this for Mini Golf */
@@ -337,13 +335,13 @@ WRITE8_MEMBER(balsente_state::adc_select_w)
machine().scheduler().timer_set(attotime::from_usec(50), timer_expired_delegate(FUNC(balsente_state::adc_finished),this), offset & 7);
}
-READ8_MEMBER(balsente_state::teamht_extra_r)
+uint8_t balsente_state::teamht_extra_r()
{
return m_teamht_input;
}
-WRITE8_MEMBER(balsente_state::teamht_multiplex_select_w)
+void balsente_state::teamht_multiplex_select_w(offs_t offset, uint8_t data)
{
logerror("multiplex_select %d\n", offset & 7);
switch (offset & 7)
@@ -376,7 +374,7 @@ CUSTOM_INPUT_MEMBER(balsente_state::nstocker_bits_r)
}
-WRITE8_MEMBER(balsente_state::spiker_expand_w)
+void balsente_state::spiker_expand_w(offs_t offset, uint8_t data)
{
/* offset 0 is the bit pattern */
if (offset == 0)
@@ -391,7 +389,7 @@ WRITE8_MEMBER(balsente_state::spiker_expand_w)
m_spiker_expand_color = data;
}
-READ8_MEMBER(balsente_state::spiker_expand_r)
+uint8_t balsente_state::spiker_expand_r()
{
uint8_t left, right;
@@ -451,7 +449,7 @@ void balsente_state::update_grudge_steering()
}
-READ8_MEMBER(balsente_state::grudge_steering_r)
+uint8_t balsente_state::grudge_steering_r()
{
logerror("%s:grudge_steering_r(@%d)\n", machine().describe_context(), m_screen->vpos());
m_grudge_steering_result |= 0x80;
@@ -466,7 +464,7 @@ READ8_MEMBER(balsente_state::grudge_steering_r)
*
*************************************/
-READ8_MEMBER(balsente_state::shrike_shared_6809_r)
+uint8_t balsente_state::shrike_shared_6809_r(offs_t offset)
{
uint16_t mem_mask_int = offset & 1 ? 0xff00 : 0x00ff;
@@ -480,7 +478,7 @@ READ8_MEMBER(balsente_state::shrike_shared_6809_r)
}
-WRITE8_MEMBER(balsente_state::shrike_shared_6809_w)
+void balsente_state::shrike_shared_6809_w(offs_t offset, uint8_t data)
{
uint16_t mem_mask_int = offset & 1 ? 0xff00 : 0x00ff;
m_shrike_shared[offset >> 1] = ( m_shrike_shared[offset >> 1] & mem_mask_int ) | ( data << ( mem_mask_int & 0x8 ) );
@@ -488,12 +486,12 @@ WRITE8_MEMBER(balsente_state::shrike_shared_6809_w)
// uses movep, so writes even 8 bit addresses to odd 16 bit addresses, reads as 16 bit from odd addresses
// i.e. write 0xdeadbeef to 10000, read 0xde from 10001, 0xad from 10003, 0xbe from 10005...
-WRITE16_MEMBER(balsente_state::shrike_io_68k_w)
+void balsente_state::shrike_io_68k_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA( &m_shrike_io[offset] );
}
-READ16_MEMBER(balsente_state::shrike_io_68k_r)
+uint16_t balsente_state::shrike_io_68k_r(offs_t offset, uint16_t mem_mask)
{
return ( m_shrike_io[offset] & mem_mask ) >> ( 8 & ~mem_mask );
}
diff --git a/src/mame/machine/bebox.cpp b/src/mame/machine/bebox.cpp
index e8bb4eecf71..ea64354a1f4 100644
--- a/src/mame/machine/bebox.cpp
+++ b/src/mame/machine/bebox.cpp
@@ -128,22 +128,22 @@ static void bebox_mbreg32_w(uint32_t *target, uint64_t data, uint64_t mem_mask)
}
-READ64_MEMBER(bebox_state::bebox_cpu0_imask_r )
+uint64_t bebox_state::bebox_cpu0_imask_r()
{
return ((uint64_t) m_cpu_imask[0]) << 32;
}
-READ64_MEMBER(bebox_state::bebox_cpu1_imask_r )
+uint64_t bebox_state::bebox_cpu1_imask_r()
{
return ((uint64_t) m_cpu_imask[1]) << 32;
}
-READ64_MEMBER(bebox_state::bebox_interrupt_sources_r )
+uint64_t bebox_state::bebox_interrupt_sources_r()
{
return ((uint64_t) m_interrupts) << 32;
}
-WRITE64_MEMBER(bebox_state::bebox_cpu0_imask_w )
+void bebox_state::bebox_cpu0_imask_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
uint32_t old_imask = m_cpu_imask[0];
@@ -160,7 +160,7 @@ WRITE64_MEMBER(bebox_state::bebox_cpu0_imask_w )
}
}
-WRITE64_MEMBER(bebox_state::bebox_cpu1_imask_w )
+void bebox_state::bebox_cpu1_imask_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
uint32_t old_imask = m_cpu_imask[1];
@@ -177,7 +177,7 @@ WRITE64_MEMBER(bebox_state::bebox_cpu1_imask_w )
}
}
-READ64_MEMBER(bebox_state::bebox_crossproc_interrupts_r )
+uint64_t bebox_state::bebox_crossproc_interrupts_r(address_space &space)
{
uint32_t result;
result = m_crossproc_interrupts;
@@ -191,7 +191,7 @@ READ64_MEMBER(bebox_state::bebox_crossproc_interrupts_r )
return ((uint64_t) result) << 32;
}
-WRITE64_MEMBER(bebox_state::bebox_crossproc_interrupts_w )
+void bebox_state::bebox_crossproc_interrupts_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
static const struct
{
@@ -234,7 +234,7 @@ WRITE64_MEMBER(bebox_state::bebox_crossproc_interrupts_w )
}
}
-WRITE64_MEMBER(bebox_state::bebox_processor_resets_w )
+void bebox_state::bebox_processor_resets_w(uint64_t data)
{
uint8_t b = (uint8_t) (data >> 56);
@@ -345,7 +345,7 @@ WRITE_LINE_MEMBER( bebox_state::fdc_interrupt )
*
*************************************/
-READ64_MEMBER(bebox_state::bebox_interrupt_ack_r )
+uint64_t bebox_state::bebox_interrupt_ack_r()
{
uint32_t result;
result = m_pic8259[0]->acknowledge();
@@ -389,50 +389,50 @@ WRITE_LINE_MEMBER(bebox_state::bebox_ide_interrupt)
*
*************************************/
/*
-static READ64_MEMBER(bebox_state::bebox_video_r )
+uint64_t bebox_state::bebox_video_r(offs_t offset, uint64_t mem_mask)
{
uint64_t result = 0;
mem_mask = FLIPENDIAN_INT64(mem_mask);
if (ACCESSING_BITS_0_7)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 0, mem_mask >> 0) << 0;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 0, mem_mask >> 0) << 0;
if (ACCESSING_BITS_8_15)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 1, mem_mask >> 8) << 8;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 1, mem_mask >> 8) << 8;
if (ACCESSING_BITS_16_23)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 2, mem_mask >> 16) << 16;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 2, mem_mask >> 16) << 16;
if (ACCESSING_BITS_24_31)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 3, mem_mask >> 24) << 24;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 3, mem_mask >> 24) << 24;
if (ACCESSING_BITS_32_39)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 4, mem_mask >> 32) << 32;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 4, mem_mask >> 32) << 32;
if (ACCESSING_BITS_40_47)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 5, mem_mask >> 40) << 40;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 5, mem_mask >> 40) << 40;
if (ACCESSING_BITS_48_55)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 6, mem_mask >> 48) << 48;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 6, mem_mask >> 48) << 48;
if (ACCESSING_BITS_56_63)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 7, mem_mask >> 56) << 56;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 7, mem_mask >> 56) << 56;
return FLIPENDIAN_INT64(result);
}
-static WRITE64_MEMBER(bebox_state::bebox_video_w )
+void bebox_state::bebox_video_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
if (ACCESSING_BITS_0_7)
- vga_mem_linear_w(space, offset * 8 + 0, data >> 0 , mem_mask >> 0);
+ vga_mem_linear_w(offset * 8 + 0, data >> 0 , mem_mask >> 0);
if (ACCESSING_BITS_8_15)
- vga_mem_linear_w(space, offset * 8 + 1, data >> 8 , mem_mask >> 8);
+ vga_mem_linear_w(offset * 8 + 1, data >> 8 , mem_mask >> 8);
if (ACCESSING_BITS_16_23)
- vga_mem_linear_w(space, offset * 8 + 2, data >> 16, mem_mask >> 16);
+ vga_mem_linear_w(offset * 8 + 2, data >> 16, mem_mask >> 16);
if (ACCESSING_BITS_24_31)
- vga_mem_linear_w(space, offset * 8 + 3, data >> 24, mem_mask >> 24);
+ vga_mem_linear_w(offset * 8 + 3, data >> 24, mem_mask >> 24);
if (ACCESSING_BITS_32_39)
- vga_mem_linear_w(space, offset * 8 + 4, data >> 32, mem_mask >> 32);
+ vga_mem_linear_w(offset * 8 + 4, data >> 32, mem_mask >> 32);
if (ACCESSING_BITS_40_47)
- vga_mem_linear_w(space, offset * 8 + 5, data >> 40, mem_mask >> 40);
+ vga_mem_linear_w(offset * 8 + 5, data >> 40, mem_mask >> 40);
if (ACCESSING_BITS_48_55)
- vga_mem_linear_w(space, offset * 8 + 6, data >> 48, mem_mask >> 48);
+ vga_mem_linear_w(offset * 8 + 6, data >> 48, mem_mask >> 48);
if (ACCESSING_BITS_56_63)
- vga_mem_linear_w(space, offset * 8 + 7, data >> 56, mem_mask >> 56);
+ vga_mem_linear_w(offset * 8 + 7, data >> 56, mem_mask >> 56);
}
*/
/*************************************
@@ -442,7 +442,7 @@ static WRITE64_MEMBER(bebox_state::bebox_video_w )
*************************************/
-READ8_MEMBER(bebox_state::bebox_page_r)
+uint8_t bebox_state::bebox_page_r(offs_t offset)
{
uint8_t data = m_at_pages[offset % 0x10];
@@ -465,7 +465,7 @@ READ8_MEMBER(bebox_state::bebox_page_r)
}
-WRITE8_MEMBER(bebox_state::bebox_page_w)
+void bebox_state::bebox_page_w(offs_t offset, uint8_t data)
{
m_at_pages[offset % 0x10] = data;
@@ -491,7 +491,7 @@ WRITE8_MEMBER(bebox_state::bebox_page_w)
}
-WRITE8_MEMBER(bebox_state::bebox_80000480_w)
+void bebox_state::bebox_80000480_w(offs_t offset, uint8_t data)
{
switch(offset % 8)
{
@@ -515,7 +515,7 @@ WRITE8_MEMBER(bebox_state::bebox_80000480_w)
}
-READ8_MEMBER(bebox_state::bebox_80000480_r)
+uint8_t bebox_state::bebox_80000480_r()
{
fatalerror("NYI\n");
}
@@ -580,14 +580,14 @@ WRITE_LINE_MEMBER(bebox_state::bebox_timer0_w)
*
*************************************/
-READ8_MEMBER(bebox_state::bebox_flash_r)
+uint8_t bebox_state::bebox_flash_r(offs_t offset)
{
offset = (offset & ~7) | (7 - (offset & 7));
return m_flash->read(offset);
}
-WRITE8_MEMBER(bebox_state::bebox_flash_w)
+void bebox_state::bebox_flash_w(offs_t offset, uint8_t data)
{
offset = (offset & ~7) | (7 - (offset & 7));
m_flash->write(offset, data);
@@ -600,7 +600,7 @@ WRITE8_MEMBER(bebox_state::bebox_flash_w)
*************************************/
-READ64_MEMBER(bebox_state::scsi53c810_r )
+uint64_t bebox_state::scsi53c810_r(offs_t offset, uint64_t mem_mask)
{
int reg = offset*8;
uint64_t r = 0;
@@ -633,7 +633,7 @@ READ64_MEMBER(bebox_state::scsi53c810_r )
}
-WRITE64_MEMBER(bebox_state::scsi53c810_w )
+void bebox_state::scsi53c810_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
int reg = offset*8;
if (!ACCESSING_BITS_56_63) {
diff --git a/src/mame/machine/bk.cpp b/src/mame/machine/bk.cpp
index 7fa379cfbd7..c1c077d278c 100644
--- a/src/mame/machine/bk.cpp
+++ b/src/mame/machine/bk.cpp
@@ -74,22 +74,22 @@ void bk_state::machine_reset()
m_scrool = 01330;
}
-READ16_MEMBER(bk_state::bk_key_state_r)
+uint16_t bk_state::bk_key_state_r()
{
return m_kbd_state;
}
-READ16_MEMBER(bk_state::bk_key_code_r)
+uint16_t bk_state::bk_key_code_r()
{
m_kbd_state &= ~0x80; // mark reading done
m_key_pressed = 0;
return m_key_code;
}
-READ16_MEMBER(bk_state::bk_vid_scrool_r)
+uint16_t bk_state::bk_vid_scrool_r()
{
return m_scrool;
}
-READ16_MEMBER(bk_state::bk_key_press_r)
+uint16_t bk_state::bk_key_press_r()
{
double level = m_cassette->input();
uint16_t cas = (level < 0) ? 0 : 0x20;
@@ -97,27 +97,27 @@ READ16_MEMBER(bk_state::bk_key_press_r)
return 0x8080 | m_key_pressed | cas;
}
-WRITE16_MEMBER(bk_state::bk_key_state_w)
+void bk_state::bk_key_state_w(uint16_t data)
{
m_kbd_state = (m_kbd_state & ~0x40) | (data & 0x40);
}
-WRITE16_MEMBER(bk_state::bk_vid_scrool_w)
+void bk_state::bk_vid_scrool_w(uint16_t data)
{
m_scrool = data;
}
-WRITE16_MEMBER(bk_state::bk_key_press_w)
+void bk_state::bk_key_press_w(uint16_t data)
{
m_cassette->output(BIT(data, 6) ? 1.0 : -1.0);
}
-READ16_MEMBER(bk_state::bk_floppy_cmd_r)
+uint16_t bk_state::bk_floppy_cmd_r()
{
return 0;
}
-WRITE16_MEMBER(bk_state::bk_floppy_cmd_w)
+void bk_state::bk_floppy_cmd_w(uint16_t data)
{
if (BIT(data, 0))
m_drive = 0;
@@ -135,11 +135,11 @@ WRITE16_MEMBER(bk_state::bk_floppy_cmd_w)
m_drive = -1;
}
-READ16_MEMBER(bk_state::bk_floppy_data_r)
+uint16_t bk_state::bk_floppy_data_r()
{
return 0;
}
-WRITE16_MEMBER(bk_state::bk_floppy_data_w)
+void bk_state::bk_floppy_data_w(uint16_t data)
{
}
diff --git a/src/mame/machine/bsktball.cpp b/src/mame/machine/bsktball.cpp
index e6c6e904e14..5f3877d840c 100644
--- a/src/mame/machine/bsktball.cpp
+++ b/src/mame/machine/bsktball.cpp
@@ -52,7 +52,7 @@ WRITE_LINE_MEMBER(bsktball_state::ld2_w)
bsktball_in0_r
***************************************************************************/
-READ8_MEMBER(bsktball_state::bsktball_in0_r)
+uint8_t bsktball_state::bsktball_in0_r()
{
int p1_horiz;
int p1_vert;
diff --git a/src/mame/machine/btime.cpp b/src/mame/machine/btime.cpp
index 7eaffda5e26..8d3df4633dd 100644
--- a/src/mame/machine/btime.cpp
+++ b/src/mame/machine/btime.cpp
@@ -6,7 +6,7 @@
#define BASE 0xb000
-READ8_MEMBER(btime_state::mmonkey_protection_r)
+uint8_t btime_state::mmonkey_protection_r(offs_t offset)
{
uint8_t *RAM = memregion("maincpu")->base();
int ret = 0;
@@ -23,7 +23,7 @@ READ8_MEMBER(btime_state::mmonkey_protection_r)
return ret;
}
-WRITE8_MEMBER(btime_state::mmonkey_protection_w)
+void btime_state::mmonkey_protection_w(offs_t offset, uint8_t data)
{
uint8_t *RAM = memregion("maincpu")->base();
diff --git a/src/mame/machine/bublbobl.cpp b/src/mame/machine/bublbobl.cpp
index 8a55e1538de..2af8ab904bd 100644
--- a/src/mame/machine/bublbobl.cpp
+++ b/src/mame/machine/bublbobl.cpp
@@ -113,12 +113,12 @@ void bublbobl_state::tokio_videoctrl_w(uint8_t data)
flip_screen_set(data & 0x80);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_nmitrigger_w)
+void bublbobl_state::bublbobl_nmitrigger_w(uint8_t data)
{
m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-READ8_MEMBER(bublbobl_state::tokiob_mcu_r)
+uint8_t bublbobl_state::tokiob_mcu_r()
{
/* This return value is literally set by a resistor on the bootleg tokio pcb;
the MCU footprint is unpopulated but for a resistor tying what would be the
@@ -139,13 +139,13 @@ void bublbobl_state::device_timer(emu_timer &timer, device_timer_id id, int para
}
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_soundcpu_reset_w)
+void bublbobl_state::bublbobl_soundcpu_reset_w(uint8_t data)
{
//logerror("soundcpu_reset_w called with data of %d\n", data);
common_sreset(data ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER(bublbobl_state::common_sound_semaphores_r)
+uint8_t bublbobl_state::common_sound_semaphores_r()
{
uint8_t ret = 0xfc;
ret |= m_main_to_sound->pending_r() ? 0x2 : 0x0;
@@ -161,54 +161,54 @@ Bubble Bobble MCU
***************************************************************************/
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr1_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr1_r()
{
return m_ddr1;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr1_w)
+void bublbobl_state::bublbobl_mcu_ddr1_w(uint8_t data)
{
m_ddr1 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr2_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr2_r()
{
return m_ddr2;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr2_w)
+void bublbobl_state::bublbobl_mcu_ddr2_w(uint8_t data)
{
m_ddr2 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr3_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr3_r()
{
return m_ddr3;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr3_w)
+void bublbobl_state::bublbobl_mcu_ddr3_w(uint8_t data)
{
m_ddr3 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr4_r()
{
return m_ddr4;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_w)
+void bublbobl_state::bublbobl_mcu_ddr4_w(uint8_t data)
{
m_ddr4 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port1_r)
+uint8_t bublbobl_state::bublbobl_mcu_port1_r()
{
//logerror("%04x: 6801U4 port 1 read\n", m_mcu->pc());
m_port1_in = ioport("IN0")->read();
return (m_port1_out & m_ddr1) | (m_port1_in & ~m_ddr1);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w)
+void bublbobl_state::bublbobl_mcu_port1_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 1 write %02x\n", m_mcu->pc(), data);
@@ -231,13 +231,13 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w)
m_port1_out = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port2_r)
+uint8_t bublbobl_state::bublbobl_mcu_port2_r()
{
//logerror("%04x: 6801U4 port 2 read\n", m_mcu->pc());
return (m_port2_out & m_ddr2) | (m_port2_in & ~m_ddr2);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port2_w)
+void bublbobl_state::bublbobl_mcu_port2_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 2 write %02x\n", m_mcu->pc(), data);
static const char *const portnames[] = { "DSW0", "DSW1", "IN1", "IN2" };
@@ -271,25 +271,25 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port2_w)
m_port2_out = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port3_r)
+uint8_t bublbobl_state::bublbobl_mcu_port3_r()
{
//logerror("%04x: 6801U4 port 3 read\n", m_mcu->pc());
return (m_port3_out & m_ddr3) | (m_port3_in & ~m_ddr3);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port3_w)
+void bublbobl_state::bublbobl_mcu_port3_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 3 write %02x\n", m_mcu->pc(), data);
m_port3_out = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port4_r)
+uint8_t bublbobl_state::bublbobl_mcu_port4_r()
{
//logerror("%04x: 6801U4 port 4 read\n", m_mcu->pc());
return (m_port4_out & m_ddr4) | (m_port4_in & ~m_ddr4);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port4_w)
+void bublbobl_state::bublbobl_mcu_port4_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 4 write %02x\n", m_mcu->pc(), data);
@@ -307,7 +307,7 @@ in boblbobl, so they don't matter. All checks are patched out in sboblbob.
***************************************************************************/
-READ8_MEMBER(bublbobl_state::boblbobl_ic43_a_r)
+uint8_t bublbobl_state::boblbobl_ic43_a_r(offs_t offset)
{
// if (offset >= 2)
// logerror("%04x: ic43_a_r (offs %d) res = %02x\n", m_mcu->pc(), offset, res);
@@ -318,7 +318,7 @@ READ8_MEMBER(bublbobl_state::boblbobl_ic43_a_r)
return machine().rand() & 0xff;
}
-WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_a_w)
+void bublbobl_state::boblbobl_ic43_a_w(offs_t offset, uint8_t data)
{
int res = 0;
@@ -356,7 +356,7 @@ WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_a_w)
m_ic43_a = res;
}
-WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_b_w)
+void bublbobl_state::boblbobl_ic43_b_w(offs_t offset, uint8_t data)
{
static const int xorval[4] = { 4, 1, 8, 2 };
@@ -364,7 +364,7 @@ WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_b_w)
m_ic43_b = (data >> 4) ^ xorval[offset];
}
-READ8_MEMBER(bublbobl_state::boblbobl_ic43_b_r)
+uint8_t bublbobl_state::boblbobl_ic43_b_r(offs_t offset)
{
// logerror("%04x: ic43_b_r (offs %d)\n", m_mcu->pc(), offset);
if (offset == 0)
diff --git a/src/mame/video/aeroboto.cpp b/src/mame/video/aeroboto.cpp
index 8392d6239b1..50fb751fe95 100644
--- a/src/mame/video/aeroboto.cpp
+++ b/src/mame/video/aeroboto.cpp
@@ -74,12 +74,12 @@ void aeroboto_state::video_start()
***************************************************************************/
-READ8_MEMBER(aeroboto_state::aeroboto_in0_r)
+uint8_t aeroboto_state::aeroboto_in0_r()
{
return ioport(flip_screen() ? "P2" : "P1")->read();
}
-WRITE8_MEMBER(aeroboto_state::aeroboto_3000_w)
+void aeroboto_state::aeroboto_3000_w(uint8_t data)
{
/* bit 0 selects both flip screen and player1/player2 controls */
flip_screen_set(data & 0x01);
@@ -95,13 +95,13 @@ WRITE8_MEMBER(aeroboto_state::aeroboto_3000_w)
m_starsoff = data & 0x4;
}
-WRITE8_MEMBER(aeroboto_state::aeroboto_videoram_w)
+void aeroboto_state::aeroboto_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(aeroboto_state::aeroboto_tilecolor_w)
+void aeroboto_state::aeroboto_tilecolor_w(offs_t offset, uint8_t data)
{
if (m_tilecolor[offset] != data)
{
diff --git a/src/mame/video/aerofgt.cpp b/src/mame/video/aerofgt.cpp
index 673cd21bd8a..1fb4a2d8d5f 100644
--- a/src/mame/video/aerofgt.cpp
+++ b/src/mame/video/aerofgt.cpp
@@ -163,25 +163,25 @@ void aerofgt_state::setbank( int layer, int num, int bank )
}
}
-WRITE8_MEMBER(aerofgt_state::pspikes_gfxbank_w)
+void aerofgt_state::pspikes_gfxbank_w(uint8_t data)
{
setbank(0, 0, (data & 0xf0) >> 4);
setbank(0, 1, data & 0x0f);
}
-WRITE8_MEMBER(aerofgt_state::karatblz_gfxbank_w)
+void aerofgt_state::karatblz_gfxbank_w(uint8_t data)
{
setbank(0, 0, (data & 0x01));
setbank(1, 1, (data & 0x08) >> 3);
}
-WRITE8_MEMBER(aerofgt_state::spinlbrk_gfxbank_w)
+void aerofgt_state::spinlbrk_gfxbank_w(uint8_t data)
{
setbank(0, 0, (data & 0x07));
setbank(1, 1, (data & 0x38) >> 3);
}
-WRITE16_MEMBER(aerofgt_state::turbofrc_gfxbank_w)
+void aerofgt_state::turbofrc_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_bank[offset]);
@@ -191,7 +191,7 @@ WRITE16_MEMBER(aerofgt_state::turbofrc_gfxbank_w)
setbank(offset, 4 * offset + 3, (data >> 12) & 0x0f);
}
-WRITE16_MEMBER(aerofgt_state::aerofgt_gfxbank_w)
+void aerofgt_state::aerofgt_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_bank[offset]);
@@ -199,14 +199,14 @@ WRITE16_MEMBER(aerofgt_state::aerofgt_gfxbank_w)
setbank(offset >> 1, 2 * offset + 1, (data >> 0) & 0xff);
}
-WRITE8_MEMBER(aerofgt_state::kickball_gfxbank_w)
+void aerofgt_state::kickball_gfxbank_w(uint8_t data)
{
// I strongly doubt this logic is correct
setbank(0, 0, (data & 0x0f)&~0x01);
setbank(0, 1, (data & 0x0f));
}
-WRITE8_MEMBER(aerofgt_state::pspikes_palette_bank_w)
+void aerofgt_state::pspikes_palette_bank_w(uint8_t data)
{
m_spritepalettebank = data & 0x03;
if (m_charpalettebank != (data & 0x1c) >> 2)
@@ -219,14 +219,14 @@ WRITE8_MEMBER(aerofgt_state::pspikes_palette_bank_w)
m_tilemap[0]->set_flip(m_flip_screen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
}
-WRITE8_MEMBER(aerofgt_state::spinlbrk_flip_screen_w)
+void aerofgt_state::spinlbrk_flip_screen_w(uint8_t data)
{
m_flip_screen = BIT(data, 7);
m_tilemap[0]->set_flip(m_flip_screen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
m_tilemap[1]->set_flip(m_flip_screen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
}
-WRITE8_MEMBER(aerofgt_state::turbofrc_flip_screen_w)
+void aerofgt_state::turbofrc_flip_screen_w(uint8_t data)
{
m_flip_screen = BIT(data, 7);
m_tilemap[0]->set_flip(m_flip_screen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
@@ -380,7 +380,7 @@ VIDEO_START_MEMBER(aerofgt_state,wbbc97)
}
// BOOTLEG
-WRITE16_MEMBER(aerofgt_state::pspikesb_gfxbank_w)
+void aerofgt_state::pspikesb_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_rasterram[0x200 / 2]);
@@ -389,13 +389,13 @@ WRITE16_MEMBER(aerofgt_state::pspikesb_gfxbank_w)
}
// BOOTLEG
-WRITE16_MEMBER(aerofgt_state::spikes91_lookup_w)
+void aerofgt_state::spikes91_lookup_w(uint16_t data)
{
m_spikes91_lookup = data & 1;
}
// BOOTLEG
-WRITE16_MEMBER(aerofgt_state::wbbc97_bitmap_enable_w)
+void aerofgt_state::wbbc97_bitmap_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_wbbc97_bitmap_enable);
}
diff --git a/src/mame/video/airbustr.cpp b/src/mame/video/airbustr.cpp
index 1cfc52505ea..e3a847d2247 100644
--- a/src/mame/video/airbustr.cpp
+++ b/src/mame/video/airbustr.cpp
@@ -47,7 +47,7 @@
Bg Y Bg X Fg Y Fg X <-Scroll High Bits (complemented!)
*/
-WRITE8_MEMBER(airbustr_state::scrollregs_w)
+void airbustr_state::scrollregs_w(offs_t offset, uint8_t data)
{
switch (offset) // offset 0 <-> port 4
{
diff --git a/src/mame/video/ampoker2.cpp b/src/mame/video/ampoker2.cpp
index 7a91aa49eac..01c27166f82 100644
--- a/src/mame/video/ampoker2.cpp
+++ b/src/mame/video/ampoker2.cpp
@@ -117,7 +117,7 @@ void ampoker2_state::ampoker2_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(ampoker2_state::videoram_w)
+void ampoker2_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
diff --git a/src/mame/video/amspdwy.cpp b/src/mame/video/amspdwy.cpp
index 4b3f56f3063..612d3703bd3 100644
--- a/src/mame/video/amspdwy.cpp
+++ b/src/mame/video/amspdwy.cpp
@@ -18,7 +18,7 @@
#include "includes/amspdwy.h"
-WRITE8_MEMBER(amspdwy_state::amspdwy_flipscreen_w)
+void amspdwy_state::amspdwy_flipscreen_w(uint8_t data)
{
m_flipscreen ^= 1;
flip_screen_set(m_flipscreen);
@@ -47,13 +47,13 @@ TILE_GET_INFO_MEMBER(amspdwy_state::get_tile_info)
0);
}
-WRITE8_MEMBER(amspdwy_state::amspdwy_videoram_w)
+void amspdwy_state::amspdwy_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(amspdwy_state::amspdwy_colorram_w)
+void amspdwy_state::amspdwy_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/angelkds.cpp b/src/mame/video/angelkds.cpp
index 95bf08aa7e7..13e72c78934 100644
--- a/src/mame/video/angelkds.cpp
+++ b/src/mame/video/angelkds.cpp
@@ -25,13 +25,13 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_tx_tile_info)
tileinfo.set(0, tileno, 0, 0);
}
-WRITE8_MEMBER(angelkds_state::angelkds_txvideoram_w)
+void angelkds_state::angelkds_txvideoram_w(offs_t offset, uint8_t data)
{
m_txvideoram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(angelkds_state::angelkds_txbank_write)
+void angelkds_state::angelkds_txbank_write(uint8_t data)
{
if (m_txbank != data)
{
@@ -54,13 +54,13 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgtop_tile_info)
tileinfo.set(1, tileno, 0, 0);
}
-WRITE8_MEMBER(angelkds_state::angelkds_bgtopvideoram_w)
+void angelkds_state::angelkds_bgtopvideoram_w(offs_t offset, uint8_t data)
{
m_bgtopvideoram[offset] = data;
m_bgtop_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(angelkds_state::angelkds_bgtopbank_write)
+void angelkds_state::angelkds_bgtopbank_write(uint8_t data)
{
if (m_bgtopbank != data)
{
@@ -69,7 +69,7 @@ WRITE8_MEMBER(angelkds_state::angelkds_bgtopbank_write)
}
}
-WRITE8_MEMBER(angelkds_state::angelkds_bgtopscroll_write)
+void angelkds_state::angelkds_bgtopscroll_write(uint8_t data)
{
m_bgtop_tilemap->set_scrollx(0, data);
}
@@ -88,14 +88,14 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgbot_tile_info)
tileinfo.set(2, tileno, 1, 0);
}
-WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w)
+void angelkds_state::angelkds_bgbotvideoram_w(offs_t offset, uint8_t data)
{
m_bgbotvideoram[offset] = data;
m_bgbot_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(angelkds_state::angelkds_bgbotbank_write)
+void angelkds_state::angelkds_bgbotbank_write(uint8_t data)
{
if (m_bgbotbank != data)
{
@@ -104,13 +104,13 @@ WRITE8_MEMBER(angelkds_state::angelkds_bgbotbank_write)
}
}
-WRITE8_MEMBER(angelkds_state::angelkds_bgbotscroll_write)
+void angelkds_state::angelkds_bgbotscroll_write(uint8_t data)
{
m_bgbot_tilemap->set_scrollx(0, data);
}
-WRITE8_MEMBER(angelkds_state::angelkds_layer_ctrl_write)
+void angelkds_state::angelkds_layer_ctrl_write(uint8_t data)
{
m_layer_ctrl = data;
}
diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp
index 5a24cda3962..e4124bab8cd 100644
--- a/src/mame/video/apollo.cpp
+++ b/src/mame/video/apollo.cpp
@@ -728,7 +728,7 @@ void apollo_graphics_15i::set_lut_cr(uint8_t data)
}
}
-READ8_MEMBER( apollo_graphics_15i::apollo_mcr_r )
+uint8_t apollo_graphics_15i::apollo_mcr_r(offs_t offset)
{
uint8_t data;
switch (offset & 0x407)
@@ -773,7 +773,7 @@ READ8_MEMBER( apollo_graphics_15i::apollo_mcr_r )
return data;
}
-WRITE8_MEMBER( apollo_graphics_15i::apollo_mcr_w )
+void apollo_graphics_15i::apollo_mcr_w(offs_t offset, uint8_t data)
{
MLOG1(("writing Graphics Controller at offset %03x = %02x (%s)", offset, data, cr_text(offset, data, 0)));
switch (offset & 0x407)
@@ -999,7 +999,7 @@ void apollo_graphics_15i::blt(uint32_t dest_addr, uint16_t mem_mask)
Color graphics memory space at A0000 - BFFFF
***************************************************************************/
-READ16_MEMBER( apollo_graphics_15i::apollo_mem_r )
+uint16_t apollo_graphics_15i::apollo_mem_r(offs_t offset, uint16_t mem_mask)
{
uint16_t data;
uint32_t src_addr;
@@ -1038,7 +1038,7 @@ READ16_MEMBER( apollo_graphics_15i::apollo_mem_r )
return data;
}
-WRITE16_MEMBER( apollo_graphics_15i::apollo_mem_w )
+void apollo_graphics_15i::apollo_mem_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint32_t dest_addr;
uint32_t src_addr;
@@ -1156,7 +1156,7 @@ WRITE16_MEMBER( apollo_graphics_15i::apollo_mem_w )
Color Screen
***************************************************************************/
-READ8_MEMBER( apollo_graphics_15i::apollo_ccr_r )
+uint8_t apollo_graphics_15i::apollo_ccr_r(offs_t offset)
{
uint8_t data;
@@ -1171,7 +1171,7 @@ READ8_MEMBER( apollo_graphics_15i::apollo_ccr_r )
data = m_ad_result;
break;
default:
- return apollo_mcr_r(space, offset, mem_mask);
+ return apollo_mcr_r(offset);
}
}
else if (m_n_planes == 8)
@@ -1230,7 +1230,7 @@ READ8_MEMBER( apollo_graphics_15i::apollo_ccr_r )
data = m_cr3b;
break;
default:
- return apollo_mcr_r(space, offset, mem_mask);
+ return apollo_mcr_r(offset);
}
}
else
@@ -1398,7 +1398,7 @@ uint8_t apollo_graphics_15i::c8p_read_adc(uint8_t data)
return value;
}
-WRITE8_MEMBER( apollo_graphics_15i::apollo_ccr_w )
+void apollo_graphics_15i::apollo_ccr_w(offs_t offset, uint8_t data)
{
static const uint8_t rgb_value[16] =
{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb,
@@ -1439,7 +1439,7 @@ WRITE8_MEMBER( apollo_graphics_15i::apollo_ccr_w )
m_sr |= SR_DONE;
break;
default:
- apollo_mcr_w(space, offset, data, mem_mask);
+ apollo_mcr_w(offset, data);
return;
}
}
@@ -1514,7 +1514,7 @@ WRITE8_MEMBER( apollo_graphics_15i::apollo_ccr_w )
set_cr3b(data);
break;
default:
- apollo_mcr_w(space, offset, data, mem_mask);
+ apollo_mcr_w(offset, data);
return;
}
}
@@ -1522,11 +1522,11 @@ WRITE8_MEMBER( apollo_graphics_15i::apollo_ccr_w )
MLOG1(("writing Color Graphics Controller at offset %03x = %02x (%s)", offset, data, cr_text(offset, data, 0)));
}
-READ16_MEMBER( apollo_graphics_15i::apollo_cgm_r )
+uint16_t apollo_graphics_15i::apollo_cgm_r(offs_t offset, uint16_t mem_mask)
{
if (!is_mono())
{
- return apollo_mem_r(space, offset, mem_mask);
+ return apollo_mem_r(offset, mem_mask);
}
else
{
@@ -1534,11 +1534,11 @@ READ16_MEMBER( apollo_graphics_15i::apollo_cgm_r )
}
}
-WRITE16_MEMBER( apollo_graphics_15i::apollo_cgm_w )
+void apollo_graphics_15i::apollo_cgm_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (!is_mono())
{
- apollo_mem_w(space, offset, data, mem_mask);
+ apollo_mem_w(offset, data, mem_mask);
}
}
@@ -1940,11 +1940,11 @@ void apollo_graphics_19i::device_reset()
}
-READ16_MEMBER( apollo_graphics_15i::apollo_mgm_r )
+uint16_t apollo_graphics_15i::apollo_mgm_r(offs_t offset, uint16_t mem_mask)
{
if (is_mono())
{
- return apollo_mem_r(space, offset, mem_mask);
+ return apollo_mem_r(offset, mem_mask);
}
else
{
@@ -1952,10 +1952,10 @@ READ16_MEMBER( apollo_graphics_15i::apollo_mgm_r )
}
}
-WRITE16_MEMBER( apollo_graphics_15i::apollo_mgm_w )
+void apollo_graphics_15i::apollo_mgm_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (is_mono())
{
- apollo_mem_w(space, offset, data, mem_mask);
+ apollo_mem_w(offset, data, mem_mask);
}
}
diff --git a/src/mame/video/appoooh.cpp b/src/mame/video/appoooh.cpp
index 655f2e25aad..59c1bfa62c6 100644
--- a/src/mame/video/appoooh.cpp
+++ b/src/mame/video/appoooh.cpp
@@ -135,37 +135,37 @@ void appoooh_state::video_start()
save_item(NAME(m_priority));
}
-WRITE8_MEMBER(appoooh_state::scroll_w)
+void appoooh_state::scroll_w(uint8_t data)
{
m_scroll_x = data;
}
-WRITE8_MEMBER(appoooh_state::fg_videoram_w)
+void appoooh_state::fg_videoram_w(offs_t offset, uint8_t data)
{
m_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(appoooh_state::fg_colorram_w)
+void appoooh_state::fg_colorram_w(offs_t offset, uint8_t data)
{
m_fg_colorram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(appoooh_state::bg_videoram_w)
+void appoooh_state::bg_videoram_w(offs_t offset, uint8_t data)
{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(appoooh_state::bg_colorram_w)
+void appoooh_state::bg_colorram_w(offs_t offset, uint8_t data)
{
m_bg_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(appoooh_state::out_w)
+void appoooh_state::out_w(uint8_t data)
{
/* bit 0 controls NMI */
m_nmi_mask = data & 1;
diff --git a/src/mame/video/aquarius.cpp b/src/mame/video/aquarius.cpp
index 67b6a99bb2d..8241282c106 100644
--- a/src/mame/video/aquarius.cpp
+++ b/src/mame/video/aquarius.cpp
@@ -41,14 +41,13 @@ void aquarius_state::aquarius_palette(palette_device &palette) const
palette.set_pen_indirect(i, aquarius_pens[i]);
}
-WRITE8_MEMBER(aquarius_state::aquarius_videoram_w)
+void aquarius_state::aquarius_videoram_w(offs_t offset, uint8_t data)
{
- uint8_t *videoram = m_videoram;
- videoram[offset] = data;
+ m_videoram[offset] = data;
m_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(aquarius_state::aquarius_colorram_w)
+void aquarius_state::aquarius_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_tilemap->mark_tile_dirty(offset);
@@ -56,9 +55,8 @@ WRITE8_MEMBER(aquarius_state::aquarius_colorram_w)
TILE_GET_INFO_MEMBER(aquarius_state::aquarius_gettileinfo)
{
- uint8_t *videoram = m_videoram;
int bank = 0;
- int code = videoram[tile_index];
+ int code = m_videoram[tile_index];
int color = m_colorram[tile_index];
int flags = 0;
diff --git a/src/mame/video/arabian.cpp b/src/mame/video/arabian.cpp
index 5e68b8cb240..79eba00ca0c 100644
--- a/src/mame/video/arabian.cpp
+++ b/src/mame/video/arabian.cpp
@@ -263,7 +263,7 @@ void arabian_state::blit_area( uint8_t plane, uint16_t src, uint8_t x, uint8_t y
*
*************************************/
-WRITE8_MEMBER(arabian_state::arabian_blitter_w)
+void arabian_state::arabian_blitter_w(offs_t offset, uint8_t data)
{
/* write the data */
m_blitter[offset] = data;
@@ -292,7 +292,7 @@ WRITE8_MEMBER(arabian_state::arabian_blitter_w)
*
*************************************/
-WRITE8_MEMBER(arabian_state::arabian_videoram_w)
+void arabian_state::arabian_videoram_w(offs_t offset, uint8_t data)
{
uint8_t *base;
uint8_t x, y;
diff --git a/src/mame/video/arkanoid.cpp b/src/mame/video/arkanoid.cpp
index 1dea7095915..df5984f9322 100644
--- a/src/mame/video/arkanoid.cpp
+++ b/src/mame/video/arkanoid.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Brad Oliver
/***************************************************************************
- video.c
+ arkanoid.cpp
Functions to emulate the video hardware of the machine.
@@ -12,13 +12,13 @@
#include "includes/arkanoid.h"
-WRITE8_MEMBER(arkanoid_state::arkanoid_videoram_w)
+void arkanoid_state::arkanoid_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(arkanoid_state::arkanoid_d008_w)
+void arkanoid_state::arkanoid_d008_w(uint8_t data)
{
int bank;
@@ -60,7 +60,7 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_d008_w)
}
-WRITE8_MEMBER(arkanoid_state::brixian_d008_w)
+void arkanoid_state::brixian_d008_w(uint8_t data)
{
int bank;
@@ -100,7 +100,7 @@ WRITE8_MEMBER(arkanoid_state::brixian_d008_w)
/* different hook-up, everything except for bits 0-1 and 7 aren't tested afaik. */
-WRITE8_MEMBER(arkanoid_state::tetrsark_d008_w)
+void arkanoid_state::tetrsark_d008_w(uint8_t data)
{
int bank;
@@ -137,7 +137,7 @@ WRITE8_MEMBER(arkanoid_state::tetrsark_d008_w)
}
-WRITE8_MEMBER(arkanoid_state::hexa_d008_w)
+void arkanoid_state::hexa_d008_w(uint8_t data)
{
/* bits 0 and 1 flip X and Y */
flip_screen_x_set(data & 0x01);
diff --git a/src/mame/video/artmagic.cpp b/src/mame/video/artmagic.cpp
index 389ecc34091..1060e828688 100644
--- a/src/mame/video/artmagic.cpp
+++ b/src/mame/video/artmagic.cpp
@@ -294,7 +294,7 @@ void artmagic_state::execute_blit()
}
-READ16_MEMBER(artmagic_state::blitter_r)
+uint16_t artmagic_state::blitter_r()
{
/*
bit 1 is a busy flag; loops tightly if clear
@@ -310,7 +310,7 @@ READ16_MEMBER(artmagic_state::blitter_r)
}
-WRITE16_MEMBER(artmagic_state::blitter_w)
+void artmagic_state::blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_blitter_data[offset]);
diff --git a/src/mame/video/asterix.cpp b/src/mame/video/asterix.cpp
index 77f904e3853..22f79e3ce5f 100644
--- a/src/mame/video/asterix.cpp
+++ b/src/mame/video/asterix.cpp
@@ -14,7 +14,7 @@ void asterix_state::reset_spritebank()
m_spritebanks[3] = (m_spritebank << 3) & 0x7000;
}
-WRITE16_MEMBER(asterix_state::asterix_spritebank_w)
+void asterix_state::asterix_spritebank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_spritebank);
reset_spritebank();
diff --git a/src/mame/video/astrocde.cpp b/src/mame/video/astrocde.cpp
index 74a48a24821..43bb3cb1a97 100644
--- a/src/mame/video/astrocde.cpp
+++ b/src/mame/video/astrocde.cpp
@@ -484,7 +484,7 @@ TIMER_CALLBACK_MEMBER(astrocde_state::scanline_callback)
*
*************************************/
-READ8_MEMBER(astrocde_state::video_register_r)
+uint8_t astrocde_state::video_register_r(offs_t offset)
{
uint8_t result = 0xff;
@@ -509,7 +509,7 @@ READ8_MEMBER(astrocde_state::video_register_r)
}
-WRITE8_MEMBER(astrocde_state::video_register_w)
+void astrocde_state::video_register_w(offs_t offset, uint8_t data)
{
/* these are the core registers */
switch (offset & 0xff)
@@ -589,7 +589,7 @@ WRITE8_MEMBER(astrocde_state::video_register_w)
*
*************************************/
-WRITE8_MEMBER(astrocde_state::astrocade_funcgen_w)
+void astrocde_state::astrocade_funcgen_w(address_space &space, offs_t offset, uint8_t data)
{
uint8_t prev_data;
@@ -677,7 +677,7 @@ WRITE8_MEMBER(astrocde_state::astrocade_funcgen_w)
}
-WRITE8_MEMBER(astrocde_state::expand_register_w)
+void astrocde_state::expand_register_w(uint8_t data)
{
m_funcgen_expand_color[0] = data & 0x03;
m_funcgen_expand_color[1] = (data >> 2) & 0x03;
@@ -818,7 +818,7 @@ void astrocde_state::execute_blit()
}
-WRITE8_MEMBER(astrocde_state::astrocade_pattern_board_w)
+void astrocde_state::astrocade_pattern_board_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -933,7 +933,7 @@ void astrocde_state::init_sparklestar()
*
*************************************/
-WRITE8_MEMBER(astrocde_state::profpac_page_select_w)
+void astrocde_state::profpac_page_select_w(uint8_t data)
{
m_profpac_readpage = data & 3;
m_profpac_writepage = (data >> 2) & 3;
@@ -941,13 +941,13 @@ WRITE8_MEMBER(astrocde_state::profpac_page_select_w)
}
-READ8_MEMBER(astrocde_state::profpac_intercept_r)
+uint8_t astrocde_state::profpac_intercept_r()
{
return m_profpac_intercept;
}
-WRITE8_MEMBER(astrocde_state::profpac_screenram_ctrl_w)
+void astrocde_state::profpac_screenram_ctrl_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -988,7 +988,7 @@ WRITE8_MEMBER(astrocde_state::profpac_screenram_ctrl_w)
*
*************************************/
-READ8_MEMBER(astrocde_state::profpac_videoram_r)
+uint8_t astrocde_state::profpac_videoram_r(offs_t offset)
{
uint16_t temp = m_profpac_videoram[m_profpac_readpage * 0x4000 + offset] >> m_profpac_readshift;
return ((temp >> 6) & 0xc0) | ((temp >> 4) & 0x30) | ((temp >> 2) & 0x0c) | ((temp >> 0) & 0x03);
@@ -996,7 +996,7 @@ READ8_MEMBER(astrocde_state::profpac_videoram_r)
/* All this information comes from decoding the PLA at U39 on the screen ram board */
-WRITE8_MEMBER(astrocde_state::profpac_videoram_w)
+void astrocde_state::profpac_videoram_w(offs_t offset, uint8_t data)
{
uint16_t oldbits = m_profpac_videoram[m_profpac_writepage * 0x4000 + offset];
uint16_t newbits, result = 0;
diff --git a/src/mame/video/atarifb.cpp b/src/mame/video/atarifb.cpp
index 136efd8ef10..b773aa60c2d 100644
--- a/src/mame/video/atarifb.cpp
+++ b/src/mame/video/atarifb.cpp
@@ -58,21 +58,21 @@ TILE_GET_INFO_MEMBER(atarifb_state::field_get_tile_info)
*
*************************************/
-WRITE8_MEMBER(atarifb_state::atarifb_alpha1_videoram_w)
+void atarifb_state::atarifb_alpha1_videoram_w(offs_t offset, uint8_t data)
{
m_alphap1_videoram[offset] = data;
m_alpha1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(atarifb_state::atarifb_alpha2_videoram_w)
+void atarifb_state::atarifb_alpha2_videoram_w(offs_t offset, uint8_t data)
{
m_alphap2_videoram[offset] = data;
m_alpha2_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(atarifb_state::atarifb_field_videoram_w)
+void atarifb_state::atarifb_field_videoram_w(offs_t offset, uint8_t data)
{
m_field_videoram[offset] = data;
m_field_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/atarigx2.cpp b/src/mame/video/atarigx2.cpp
index aff4e83dfb6..870fbbe9b42 100644
--- a/src/mame/video/atarigx2.cpp
+++ b/src/mame/video/atarigx2.cpp
@@ -88,7 +88,7 @@ void atarigx2_state::video_start()
*
*************************************/
-WRITE16_MEMBER( atarigx2_state::atarigx2_mo_control_w )
+void atarigx2_state::atarigx2_mo_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
logerror("MOCONT = %d (scan = %d)\n", data, m_screen->vpos());
diff --git a/src/mame/video/atarist.cpp b/src/mame/video/atarist.cpp
index 11285b4872e..89f0d060ece 100644
--- a/src/mame/video/atarist.cpp
+++ b/src/mame/video/atarist.cpp
@@ -317,7 +317,7 @@ void st_state::set_screen_parameters()
// shifter_base_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::shifter_base_r )
+uint8_t st_state::shifter_base_r(offs_t offset)
{
uint8_t data = 0;
@@ -340,7 +340,7 @@ READ8_MEMBER( st_state::shifter_base_r )
// shifter_base_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::shifter_base_w )
+void st_state::shifter_base_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -361,7 +361,7 @@ WRITE8_MEMBER( st_state::shifter_base_w )
// shifter_counter_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::shifter_counter_r )
+uint8_t st_state::shifter_counter_r(offs_t offset)
{
uint8_t data = 0;
@@ -388,7 +388,7 @@ READ8_MEMBER( st_state::shifter_counter_r )
// shifter_sync_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::shifter_sync_r )
+uint8_t st_state::shifter_sync_r()
{
return m_shifter_sync;
}
@@ -398,7 +398,7 @@ READ8_MEMBER( st_state::shifter_sync_r )
// shifter_sync_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::shifter_sync_w )
+void st_state::shifter_sync_w(uint8_t data)
{
m_shifter_sync = data;
logerror("SHIFTER Sync %x\n", m_shifter_sync);
@@ -410,7 +410,7 @@ WRITE8_MEMBER( st_state::shifter_sync_w )
// shifter_mode_r -
//-------------------------------------------------
-READ8_MEMBER( st_state::shifter_mode_r )
+uint8_t st_state::shifter_mode_r()
{
return m_shifter_mode;
}
@@ -420,7 +420,7 @@ READ8_MEMBER( st_state::shifter_mode_r )
// shifter_mode_w -
//-------------------------------------------------
-WRITE8_MEMBER( st_state::shifter_mode_w )
+void st_state::shifter_mode_w(uint8_t data)
{
m_shifter_mode = data;
logerror("SHIFTER Mode %x\n", m_shifter_mode);
@@ -431,7 +431,7 @@ WRITE8_MEMBER( st_state::shifter_mode_w )
// shifter_palette_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::shifter_palette_r )
+uint16_t st_state::shifter_palette_r(offs_t offset)
{
return m_shifter_palette[offset] | 0xf888;
}
@@ -441,7 +441,7 @@ READ16_MEMBER( st_state::shifter_palette_r )
// shifter_palette_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::shifter_palette_w )
+void st_state::shifter_palette_w(offs_t offset, uint16_t data)
{
m_shifter_palette[offset] = data;
// logerror("SHIFTER Palette[%x] = %x\n", offset, data);
@@ -459,7 +459,7 @@ WRITE16_MEMBER( st_state::shifter_palette_w )
// shifter_base_low_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::shifter_base_low_r )
+uint8_t ste_state::shifter_base_low_r()
{
return m_shifter_base & 0xfe;
}
@@ -469,7 +469,7 @@ READ8_MEMBER( ste_state::shifter_base_low_r )
// shifter_base_low_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::shifter_base_low_w )
+void ste_state::shifter_base_low_w(uint8_t data)
{
m_shifter_base = (m_shifter_base & 0x3fff00) | (data & 0xfe);
logerror("SHIFTER Video Base Address %06x\n", m_shifter_base);
@@ -480,7 +480,7 @@ WRITE8_MEMBER( ste_state::shifter_base_low_w )
// shifter_counter_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::shifter_counter_r )
+uint8_t ste_state::shifter_counter_r(offs_t offset)
{
uint8_t data = 0;
@@ -507,7 +507,7 @@ READ8_MEMBER( ste_state::shifter_counter_r )
// shifter_counter_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::shifter_counter_w )
+void ste_state::shifter_counter_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -533,7 +533,7 @@ WRITE8_MEMBER( ste_state::shifter_counter_w )
// shifter_palette_w -
//-------------------------------------------------
-WRITE16_MEMBER( ste_state::shifter_palette_w )
+void ste_state::shifter_palette_w(offs_t offset, uint16_t data)
{
int r = ((data >> 7) & 0x0e) | BIT(data, 11);
int g = ((data >> 3) & 0x0e) | BIT(data, 7);
@@ -550,7 +550,7 @@ WRITE16_MEMBER( ste_state::shifter_palette_w )
// shifter_lineofs_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::shifter_lineofs_r )
+uint8_t ste_state::shifter_lineofs_r()
{
return m_shifter_lineofs;
}
@@ -560,7 +560,7 @@ READ8_MEMBER( ste_state::shifter_lineofs_r )
// shifter_lineofs_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::shifter_lineofs_w )
+void ste_state::shifter_lineofs_w(uint8_t data)
{
m_shifter_lineofs = data;
logerror("SHIFTER Line Offset %x\n", m_shifter_lineofs);
@@ -571,7 +571,7 @@ WRITE8_MEMBER( ste_state::shifter_lineofs_w )
// shifter_pixelofs_r -
//-------------------------------------------------
-READ8_MEMBER( ste_state::shifter_pixelofs_r )
+uint8_t ste_state::shifter_pixelofs_r()
{
return m_shifter_pixelofs;
}
@@ -581,7 +581,7 @@ READ8_MEMBER( ste_state::shifter_pixelofs_r )
// shifter_pixelofs_w -
//-------------------------------------------------
-WRITE8_MEMBER( ste_state::shifter_pixelofs_w )
+void ste_state::shifter_pixelofs_w(uint8_t data)
{
m_shifter_pixelofs = data & 0x0f;
logerror("SHIFTER Pixel Offset %x\n", m_shifter_pixelofs);
@@ -731,7 +731,7 @@ void st_state::blitter_tick()
// blitter_halftone_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_halftone_r )
+uint16_t st_state::blitter_halftone_r(offs_t offset)
{
return m_blitter_halftone[offset];
}
@@ -741,7 +741,7 @@ READ16_MEMBER( st_state::blitter_halftone_r )
// blitter_src_inc_x_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_src_inc_x_r )
+uint16_t st_state::blitter_src_inc_x_r()
{
return m_blitter_src_inc_x;
}
@@ -751,7 +751,7 @@ READ16_MEMBER( st_state::blitter_src_inc_x_r )
// blitter_src_inc_y_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_src_inc_y_r )
+uint16_t st_state::blitter_src_inc_y_r()
{
return m_blitter_src_inc_y;
}
@@ -761,7 +761,7 @@ READ16_MEMBER( st_state::blitter_src_inc_y_r )
// blitter_src_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_src_r )
+uint16_t st_state::blitter_src_r(offs_t offset)
{
switch (offset)
{
@@ -779,7 +779,7 @@ READ16_MEMBER( st_state::blitter_src_r )
// blitter_end_mask_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_end_mask_r )
+uint16_t st_state::blitter_end_mask_r(offs_t offset)
{
switch (offset)
{
@@ -799,7 +799,7 @@ READ16_MEMBER( st_state::blitter_end_mask_r )
// blitter_dst_inc_x_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_dst_inc_x_r )
+uint16_t st_state::blitter_dst_inc_x_r()
{
return m_blitter_dst_inc_x;
}
@@ -809,7 +809,7 @@ READ16_MEMBER( st_state::blitter_dst_inc_x_r )
// blitter_dst_inc_y_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_dst_inc_y_r )
+uint16_t st_state::blitter_dst_inc_y_r()
{
return m_blitter_dst_inc_y;
}
@@ -819,7 +819,7 @@ READ16_MEMBER( st_state::blitter_dst_inc_y_r )
// blitter_dst_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_dst_r )
+uint16_t st_state::blitter_dst_r(offs_t offset)
{
switch (offset)
{
@@ -837,7 +837,7 @@ READ16_MEMBER( st_state::blitter_dst_r )
// blitter_count_x_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_count_x_r )
+uint16_t st_state::blitter_count_x_r()
{
return m_blitter_xcount;
}
@@ -847,7 +847,7 @@ READ16_MEMBER( st_state::blitter_count_x_r )
// blitter_count_y_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_count_y_r )
+uint16_t st_state::blitter_count_y_r()
{
return m_blitter_ycount;
}
@@ -857,7 +857,7 @@ READ16_MEMBER( st_state::blitter_count_y_r )
// blitter_op_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_op_r )
+uint16_t st_state::blitter_op_r(offs_t offset, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -874,7 +874,7 @@ READ16_MEMBER( st_state::blitter_op_r )
// blitter_ctrl_r -
//-------------------------------------------------
-READ16_MEMBER( st_state::blitter_ctrl_r )
+uint16_t st_state::blitter_ctrl_r(offs_t offset, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -891,7 +891,7 @@ READ16_MEMBER( st_state::blitter_ctrl_r )
// blitter_halftone_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_halftone_w )
+void st_state::blitter_halftone_w(offs_t offset, uint16_t data)
{
m_blitter_halftone[offset] = data;
}
@@ -901,7 +901,7 @@ WRITE16_MEMBER( st_state::blitter_halftone_w )
// blitter_src_inc_x_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_src_inc_x_w )
+void st_state::blitter_src_inc_x_w(uint16_t data)
{
m_blitter_src_inc_x = data & 0xfffe;
}
@@ -911,7 +911,7 @@ WRITE16_MEMBER( st_state::blitter_src_inc_x_w )
// blitter_src_inc_y_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_src_inc_y_w )
+void st_state::blitter_src_inc_y_w(uint16_t data)
{
m_blitter_src_inc_y = data & 0xfffe;
}
@@ -921,7 +921,7 @@ WRITE16_MEMBER( st_state::blitter_src_inc_y_w )
// blitter_src_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_src_w )
+void st_state::blitter_src_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -940,7 +940,7 @@ WRITE16_MEMBER( st_state::blitter_src_w )
// blitter_end_mask_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_end_mask_w )
+void st_state::blitter_end_mask_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -963,7 +963,7 @@ WRITE16_MEMBER( st_state::blitter_end_mask_w )
// blitter_dst_inc_x_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_dst_inc_x_w )
+void st_state::blitter_dst_inc_x_w(uint16_t data)
{
m_blitter_dst_inc_x = data & 0xfffe;
}
@@ -973,7 +973,7 @@ WRITE16_MEMBER( st_state::blitter_dst_inc_x_w )
// blitter_dst_inc_y_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_dst_inc_y_w )
+void st_state::blitter_dst_inc_y_w(uint16_t data)
{
m_blitter_dst_inc_y = data & 0xfffe;
}
@@ -983,7 +983,7 @@ WRITE16_MEMBER( st_state::blitter_dst_inc_y_w )
// blitter_dst_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_dst_w )
+void st_state::blitter_dst_w(offs_t offset, uint16_t data)
{
switch (offset)
{
@@ -1002,7 +1002,7 @@ WRITE16_MEMBER( st_state::blitter_dst_w )
// blitter_count_x_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_count_x_w )
+void st_state::blitter_count_x_w(uint16_t data)
{
m_blitter_xcount = data;
}
@@ -1012,7 +1012,7 @@ WRITE16_MEMBER( st_state::blitter_count_x_w )
// blitter_count_y_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_count_y_w )
+void st_state::blitter_count_y_w(uint16_t data)
{
m_blitter_ycount = data;
}
@@ -1022,7 +1022,7 @@ WRITE16_MEMBER( st_state::blitter_count_y_w )
// blitter_op_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_op_w )
+void st_state::blitter_op_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -1039,7 +1039,7 @@ WRITE16_MEMBER( st_state::blitter_op_w )
// blitter_ctrl_w -
//-------------------------------------------------
-WRITE16_MEMBER( st_state::blitter_ctrl_w )
+void st_state::blitter_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
diff --git a/src/mame/video/atarisy1.cpp b/src/mame/video/atarisy1.cpp
index ef579908e9c..44a7129aff6 100644
--- a/src/mame/video/atarisy1.cpp
+++ b/src/mame/video/atarisy1.cpp
@@ -235,7 +235,7 @@ void atarisy1_state::bankselect_w(uint8_t data)
*
*************************************/
-WRITE16_MEMBER( atarisy1_state::atarisy1_priority_w )
+void atarisy1_state::atarisy1_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t oldpens = m_playfield_priority_pens;
uint16_t newpens = oldpens;
@@ -255,7 +255,7 @@ WRITE16_MEMBER( atarisy1_state::atarisy1_priority_w )
*
*************************************/
-WRITE16_MEMBER( atarisy1_state::atarisy1_xscroll_w )
+void atarisy1_state::atarisy1_xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t oldscroll = *m_xscroll;
uint16_t newscroll = oldscroll;
@@ -286,7 +286,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_state::reset_yscroll_callback)
}
-WRITE16_MEMBER( atarisy1_state::atarisy1_yscroll_w )
+void atarisy1_state::atarisy1_yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t oldscroll = *m_yscroll;
uint16_t newscroll = oldscroll;
@@ -320,7 +320,7 @@ WRITE16_MEMBER( atarisy1_state::atarisy1_yscroll_w )
*
*************************************/
-WRITE16_MEMBER( atarisy1_state::atarisy1_spriteram_w )
+void atarisy1_state::atarisy1_spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int active_bank = m_mob->bank();
uint16_t *spriteram = m_mob->spriteram();
@@ -392,7 +392,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_state::int3_callback)
*
*************************************/
-READ16_MEMBER( atarisy1_state::atarisy1_int3state_r )
+uint16_t atarisy1_state::atarisy1_int3state_r()
{
return m_scanline_int_state ? 0x0080 : 0x0000;
}
diff --git a/src/mame/video/atarisy2.cpp b/src/mame/video/atarisy2.cpp
index 93e0dc5f468..95c75cfee5b 100644
--- a/src/mame/video/atarisy2.cpp
+++ b/src/mame/video/atarisy2.cpp
@@ -92,7 +92,7 @@ void atarisy2_state::video_start()
*
*************************************/
-WRITE16_MEMBER( atarisy2_state::xscroll_w )
+void atarisy2_state::xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t oldscroll = *m_xscroll;
uint16_t newscroll = oldscroll;
@@ -123,7 +123,7 @@ TIMER_CALLBACK_MEMBER(atarisy2_state::reset_yscroll_callback)
}
-WRITE16_MEMBER( atarisy2_state::yscroll_w )
+void atarisy2_state::yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint16_t oldscroll = *m_yscroll;
uint16_t newscroll = oldscroll;
@@ -187,7 +187,7 @@ rgb_t atarisy2_state::RRRRGGGGBBBBIIII(uint32_t raw)
*
*************************************/
-READ16_MEMBER( atarisy2_state::slapstic_r )
+uint16_t atarisy2_state::slapstic_r(address_space &space, offs_t offset)
{
int result = m_slapstic_base[offset];
m_slapstic->slapstic_tweak(space, offset);
@@ -198,7 +198,7 @@ READ16_MEMBER( atarisy2_state::slapstic_r )
}
-WRITE16_MEMBER( atarisy2_state::slapstic_w )
+void atarisy2_state::slapstic_w(address_space &space, offs_t offset, uint16_t data)
{
m_slapstic->slapstic_tweak(space, offset);
@@ -213,7 +213,7 @@ WRITE16_MEMBER( atarisy2_state::slapstic_w )
*
*************************************/
-WRITE16_MEMBER( atarisy2_state::spriteram_w )
+void atarisy2_state::spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* force an update if the link of object 0 is about to change */
if (offset == 0x0003)
diff --git a/src/mame/video/atetris.cpp b/src/mame/video/atetris.cpp
index cddad9368eb..387bcc4e71e 100644
--- a/src/mame/video/atetris.cpp
+++ b/src/mame/video/atetris.cpp
@@ -18,9 +18,8 @@
TILE_GET_INFO_MEMBER(atetris_state::get_tile_info)
{
- uint8_t *videoram = m_videoram;
- int code = videoram[tile_index * 2] | ((videoram[tile_index * 2 + 1] & 7) << 8);
- int color = (videoram[tile_index * 2 + 1] & 0xf0) >> 4;
+ int code = m_videoram[tile_index * 2] | ((m_videoram[tile_index * 2 + 1] & 7) << 8);
+ int color = (m_videoram[tile_index * 2 + 1] & 0xf0) >> 4;
tileinfo.set(0, code, color, 0);
}
@@ -33,11 +32,9 @@ TILE_GET_INFO_MEMBER(atetris_state::get_tile_info)
*
*************************************/
-WRITE8_MEMBER(atetris_state::videoram_w)
+void atetris_state::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 / 2);
}
diff --git a/src/mame/video/aussiebyte.cpp b/src/mame/video/aussiebyte.cpp
index da24476a701..5a24027e773 100644
--- a/src/mame/video/aussiebyte.cpp
+++ b/src/mame/video/aussiebyte.cpp
@@ -21,7 +21,7 @@
************************************************************/
// dummy read port, forces requested action to happen
-READ8_MEMBER( aussiebyte_state::port33_r )
+uint8_t aussiebyte_state::port33_r()
{
return 0xff;
}
@@ -34,17 +34,17 @@ d5 - /SRRD - controls write of data to either vram or aram (1=vram, 0=aram)
d6 - /VWR - 0 = enable write vdata to vram, read from aram to vdata ; 1 = enable write to aram from vdata
d7 - OE on port 35
*/
-WRITE8_MEMBER( aussiebyte_state::port34_w )
+void aussiebyte_state::port34_w(uint8_t data)
{
m_port34 = data;
}
-WRITE8_MEMBER( aussiebyte_state::port35_w )
+void aussiebyte_state::port35_w(uint8_t data)
{
m_port35 = data;
}
-READ8_MEMBER( aussiebyte_state::port36_r )
+uint8_t aussiebyte_state::port36_r()
{
if (BIT(m_port34, 5))
{
@@ -57,7 +57,7 @@ READ8_MEMBER( aussiebyte_state::port36_r )
return m_p_attribram[m_alpha_address & 0x7ff];
}
-READ8_MEMBER( aussiebyte_state::port37_r )
+uint8_t aussiebyte_state::port37_r()
{
return m_crtc->de_r() ? 0xff : 0xfe;
}
@@ -74,7 +74,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( aussiebyte_state::crtc_update_addr )
// m_video_address = address;// & 0x7ff;
}
-WRITE8_MEMBER( aussiebyte_state::address_w )
+void aussiebyte_state::address_w(uint8_t data)
{
m_crtc->address_w(data);
@@ -98,7 +98,7 @@ WRITE8_MEMBER( aussiebyte_state::address_w )
}
}
-WRITE8_MEMBER( aussiebyte_state::register_w )
+void aussiebyte_state::register_w(uint8_t data)
{
m_crtc->register_w(data);
uint16_t temp = m_alpha_address;
diff --git a/src/mame/video/avigo.cpp b/src/mame/video/avigo.cpp
index ca21f5867e2..5e84eb94e69 100644
--- a/src/mame/video/avigo.cpp
+++ b/src/mame/video/avigo.cpp
@@ -24,7 +24,7 @@
#define LOG(x) do { if (AVIGO_VIDEO_DEBUG) logerror x; } while (0)
-READ8_MEMBER(avigo_state::vid_memory_r)
+uint8_t avigo_state::vid_memory_r(offs_t offset)
{
if (!offset)
return m_screen_column;
@@ -39,7 +39,7 @@ READ8_MEMBER(avigo_state::vid_memory_r)
return m_video_memory[m_screen_column + ((offset&0xff)*(AVIGO_SCREEN_WIDTH>>3))];
}
-WRITE8_MEMBER(avigo_state::vid_memory_w)
+void avigo_state::vid_memory_w(offs_t offset, uint8_t data)
{
if (!offset)
{
diff --git a/src/mame/video/badlands.cpp b/src/mame/video/badlands.cpp
index 067e716ef00..9582a100e23 100644
--- a/src/mame/video/badlands.cpp
+++ b/src/mame/video/badlands.cpp
@@ -82,7 +82,7 @@ VIDEO_START_MEMBER(badlands_state,badlands)
*
*************************************/
-WRITE16_MEMBER( badlands_state::badlands_pf_bank_w )
+void badlands_state::badlands_pf_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
if (m_playfield_tile_bank != (data & 1))
diff --git a/src/mame/video/bagman.cpp b/src/mame/video/bagman.cpp
index 43a137f592f..a520555e60e 100644
--- a/src/mame/video/bagman.cpp
+++ b/src/mame/video/bagman.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Nicola Salmoria
/***************************************************************************
- bagman.c
+ bagman.cpp
Functions to emulate the video hardware of the machine.
@@ -13,13 +13,13 @@
#include "includes/bagman.h"
-WRITE8_MEMBER(bagman_state::videoram_w)
+void bagman_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bagman_state::colorram_w)
+void bagman_state::colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/balsente.cpp b/src/mame/video/balsente.cpp
index 3027915d902..3b7e65aec1a 100644
--- a/src/mame/video/balsente.cpp
+++ b/src/mame/video/balsente.cpp
@@ -42,7 +42,7 @@ void balsente_state::video_start()
*
*************************************/
-WRITE8_MEMBER(balsente_state::videoram_w)
+void balsente_state::videoram_w(offs_t offset, uint8_t data)
{
/* expand the two pixel values into two bytes */
m_videoram[offset] = data;
@@ -59,7 +59,7 @@ WRITE8_MEMBER(balsente_state::videoram_w)
*
*************************************/
-WRITE8_MEMBER(balsente_state::palette_select_w)
+void balsente_state::palette_select_w(uint8_t data)
{
/* only update if changed */
if (m_palettebank_vis != (data & 3))
@@ -80,7 +80,7 @@ WRITE8_MEMBER(balsente_state::palette_select_w)
*
*************************************/
-WRITE8_MEMBER(balsente_state::paletteram_w)
+void balsente_state::paletteram_w(offs_t offset, uint8_t data)
{
int r, g, b;
@@ -101,7 +101,7 @@ WRITE8_MEMBER(balsente_state::paletteram_w)
*
*************************************/
-WRITE8_MEMBER(balsente_state::shrike_sprite_select_w)
+void balsente_state::shrike_sprite_select_w(uint8_t data)
{
if( m_sprite_data != m_sprite_bank[(data & 0x80 >> 7) ^ 1 ])
{
@@ -110,7 +110,7 @@ WRITE8_MEMBER(balsente_state::shrike_sprite_select_w)
m_sprite_data = m_sprite_bank[(data & 0x80 >> 7) ^ 1];
}
- shrike_shared_6809_w( space, 1, data );
+ shrike_shared_6809_w( 1, data );
}
diff --git a/src/mame/video/bankp.cpp b/src/mame/video/bankp.cpp
index 1843de485b2..73dbf04cd30 100644
--- a/src/mame/video/bankp.cpp
+++ b/src/mame/video/bankp.cpp
@@ -79,36 +79,36 @@ void bankp_state::bankp_palette(palette_device &palette) const
// the bottom half of the PROM seems to be not used
}
-WRITE8_MEMBER(bankp_state::scroll_w)
+void bankp_state::scroll_w(uint8_t data)
{
m_scroll_x = data;
}
-WRITE8_MEMBER(bankp_state::videoram_w)
+void bankp_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bankp_state::colorram_w)
+void bankp_state::colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bankp_state::videoram2_w)
+void bankp_state::videoram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bankp_state::colorram2_w)
+void bankp_state::colorram2_w(offs_t offset, uint8_t data)
{
m_colorram2[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bankp_state::out_w)
+void bankp_state::out_w(uint8_t data)
{
/* bits 0-1 are playfield priority */
/* TODO: understand how this works */
diff --git a/src/mame/video/baraduke.cpp b/src/mame/video/baraduke.cpp
index 44811a156ec..1dcd91ee06a 100644
--- a/src/mame/video/baraduke.cpp
+++ b/src/mame/video/baraduke.cpp
@@ -137,30 +137,30 @@ void baraduke_state::video_start()
***************************************************************************/
-READ8_MEMBER(baraduke_state::baraduke_videoram_r)
+uint8_t baraduke_state::baraduke_videoram_r(offs_t offset)
{
return m_videoram[offset];
}
-WRITE8_MEMBER(baraduke_state::baraduke_videoram_w)
+void baraduke_state::baraduke_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset&0xfff)/2);
}
-READ8_MEMBER(baraduke_state::baraduke_textram_r)
+uint8_t baraduke_state::baraduke_textram_r(offs_t offset)
{
return m_textram[offset];
}
-WRITE8_MEMBER(baraduke_state::baraduke_textram_w)
+void baraduke_state::baraduke_textram_w(offs_t offset, uint8_t data)
{
m_textram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-void baraduke_state::scroll_w(address_space &space, int layer, int offset, int data)
+void baraduke_state::scroll_w(int layer, int offset, int data)
{
switch (offset)
{
@@ -176,23 +176,23 @@ void baraduke_state::scroll_w(address_space &space, int layer, int offset, int d
}
}
-WRITE8_MEMBER(baraduke_state::baraduke_scroll0_w)
+void baraduke_state::baraduke_scroll0_w(offs_t offset, uint8_t data)
{
- scroll_w(space, 0, offset, data);
+ scroll_w(0, offset, data);
}
-WRITE8_MEMBER(baraduke_state::baraduke_scroll1_w)
+void baraduke_state::baraduke_scroll1_w(offs_t offset, uint8_t data)
{
- scroll_w(space, 1, offset, data);
+ scroll_w(1, offset, data);
}
-READ8_MEMBER(baraduke_state::baraduke_spriteram_r)
+uint8_t baraduke_state::baraduke_spriteram_r(offs_t offset)
{
return m_spriteram[offset];
}
-WRITE8_MEMBER(baraduke_state::baraduke_spriteram_w)
+void baraduke_state::baraduke_spriteram_w(offs_t offset, uint8_t data)
{
m_spriteram[offset] = data;
diff --git a/src/mame/video/battlane.cpp b/src/mame/video/battlane.cpp
index bf4c28736e6..83de94e3da9 100644
--- a/src/mame/video/battlane.cpp
+++ b/src/mame/video/battlane.cpp
@@ -17,7 +17,7 @@
0x01 = Scroll MSB
*/
-WRITE8_MEMBER(battlane_state::battlane_palette_w)
+void battlane_state::battlane_palette_w(offs_t offset, uint8_t data)
{
int r, g, b;
int bit0, bit1, bit2;
@@ -46,28 +46,28 @@ WRITE8_MEMBER(battlane_state::battlane_palette_w)
m_palette->set_pen_color(offset, rgb_t(r, g, b));
}
-WRITE8_MEMBER(battlane_state::battlane_scrollx_w)
+void battlane_state::battlane_scrollx_w(uint8_t data)
{
m_bg_tilemap->set_scrollx(0, ((m_video_ctrl & 0x01) << 8) + data);
}
-WRITE8_MEMBER(battlane_state::battlane_scrolly_w)
+void battlane_state::battlane_scrolly_w(uint8_t data)
{
m_bg_tilemap->set_scrolly(0, ((m_cpu_control & 0x01) << 8) + data);
}
-WRITE8_MEMBER(battlane_state::battlane_tileram_w)
+void battlane_state::battlane_tileram_w(offs_t offset, uint8_t data)
{
m_tileram[offset] = data;
//m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(battlane_state::battlane_spriteram_w)
+void battlane_state::battlane_spriteram_w(offs_t offset, uint8_t data)
{
m_spriteram[offset] = data;
}
-WRITE8_MEMBER(battlane_state::battlane_bitmap_w)
+void battlane_state::battlane_bitmap_w(offs_t offset, uint8_t data)
{
int i, orval;
@@ -89,7 +89,7 @@ WRITE8_MEMBER(battlane_state::battlane_bitmap_w)
}
}
-WRITE8_MEMBER(battlane_state::battlane_video_ctrl_w)
+void battlane_state::battlane_video_ctrl_w(uint8_t data)
{
m_video_ctrl = data;
}
diff --git a/src/mame/video/battlex.cpp b/src/mame/video/battlex.cpp
index 15508121688..73cfa6351ea 100644
--- a/src/mame/video/battlex.cpp
+++ b/src/mame/video/battlex.cpp
@@ -10,7 +10,7 @@
#include "includes/battlex.h"
-WRITE8_MEMBER(battlex_state::battlex_palette_w)
+void battlex_state::battlex_palette_w(offs_t offset, uint8_t data)
{
int palette_num = offset / 8;
int color_num = offset & 7;
@@ -21,27 +21,27 @@ WRITE8_MEMBER(battlex_state::battlex_palette_w)
m_palette->set_pen_color(64+palette_num*16+color_num+8, pal2bit((data >> 0)&1), pal2bit((data >> 2)&1), pal2bit( (data >> 1) &1));
}
-WRITE8_MEMBER(battlex_state::battlex_scroll_x_lsb_w)
+void battlex_state::battlex_scroll_x_lsb_w(uint8_t data)
{
m_scroll_lsb = data;
}
-WRITE8_MEMBER(battlex_state::battlex_scroll_x_msb_w)
+void battlex_state::battlex_scroll_x_msb_w(uint8_t data)
{
m_scroll_msb = data;
}
-WRITE8_MEMBER(battlex_state::battlex_scroll_starfield_w)
+void battlex_state::battlex_scroll_starfield_w(uint8_t data)
{
}
-WRITE8_MEMBER(battlex_state::battlex_videoram_w)
+void battlex_state::battlex_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(battlex_state::battlex_flipscreen_w)
+void battlex_state::battlex_flipscreen_w(uint8_t data)
{
m_starfield_enabled = data & 0x10;
diff --git a/src/mame/video/battlnts.cpp b/src/mame/video/battlnts.cpp
index 5fa060a2ff7..18850a5d688 100644
--- a/src/mame/video/battlnts.cpp
+++ b/src/mame/video/battlnts.cpp
@@ -28,7 +28,7 @@ K007420_CALLBACK_MEMBER(battlnts_state::battlnts_sprite_callback)
*color = 0;
}
-WRITE8_MEMBER(battlnts_state::battlnts_spritebank_w)
+void battlnts_state::battlnts_spritebank_w(uint8_t data)
{
m_spritebank = 1024 * (data & 1);
}
diff --git a/src/mame/video/bbusters.cpp b/src/mame/video/bbusters.cpp
index 283a8c293a9..9f9132cf9ff 100644
--- a/src/mame/video/bbusters.cpp
+++ b/src/mame/video/bbusters.cpp
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(bbusters_state_base::get_pf_tile_info)
tileinfo.set(Gfx,tile&0xfff,tile>>12,0);
}
-WRITE16_MEMBER(bbusters_state_base::video_w)
+void bbusters_state_base::video_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram[offset]);
m_fix_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/beathead.cpp b/src/mame/video/beathead.cpp
index daff388b72a..42598de2481 100644
--- a/src/mame/video/beathead.cpp
+++ b/src/mame/video/beathead.cpp
@@ -34,7 +34,7 @@ void beathead_state::video_start()
*
*************************************/
-WRITE32_MEMBER( beathead_state::vram_transparent_w )
+void beathead_state::vram_transparent_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/* writes to this area appear to handle transparency */
if (!(data & 0x000000ff)) mem_mask &= ~0x000000ff;
@@ -45,7 +45,7 @@ WRITE32_MEMBER( beathead_state::vram_transparent_w )
}
-WRITE32_MEMBER( beathead_state::vram_bulk_w )
+void beathead_state::vram_bulk_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/* it appears that writes to this area pass in a mask for 4 words in VRAM */
/* allowing them to be filled from a preset latch */
@@ -60,14 +60,14 @@ WRITE32_MEMBER( beathead_state::vram_bulk_w )
}
-WRITE32_MEMBER( beathead_state::vram_latch_w )
+void beathead_state::vram_latch_w(offs_t offset, uint32_t data)
{
/* latch the address */
m_vram_latch_offset = (4 * offset) & 0x7ffff;
}
-WRITE32_MEMBER( beathead_state::vram_copy_w )
+void beathead_state::vram_copy_w(offs_t offset, uint32_t data)
{
/* copy from VRAM to VRAM, for 1024 bytes */
offs_t dest_offset = (4 * offset) & 0x7ffff;
@@ -82,7 +82,7 @@ WRITE32_MEMBER( beathead_state::vram_copy_w )
*
*************************************/
-WRITE32_MEMBER( beathead_state::finescroll_w )
+void beathead_state::finescroll_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t oldword = m_finescroll;
uint32_t newword = COMBINE_DATA(&m_finescroll);
@@ -103,7 +103,7 @@ WRITE32_MEMBER( beathead_state::finescroll_w )
*
*************************************/
-READ32_MEMBER( beathead_state::hsync_ram_r )
+uint32_t beathead_state::hsync_ram_r(offs_t offset)
{
/* offset 0 is probably write-only */
if (offset == 0)
@@ -116,7 +116,7 @@ READ32_MEMBER( beathead_state::hsync_ram_r )
return 0;
}
-WRITE32_MEMBER( beathead_state::hsync_ram_w )
+void beathead_state::hsync_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/* offset 0 selects the address, and can specify the start address */
if (offset == 0)
diff --git a/src/mame/video/bigevglf.cpp b/src/mame/video/bigevglf.cpp
index 0d22bda8cb1..f7cc450a09f 100644
--- a/src/mame/video/bigevglf.cpp
+++ b/src/mame/video/bigevglf.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Jarek Burczynski, Tomasz Slanina
/***************************************************************************
- video.c
+ bigevglf.cpp
Functions to emulate the video hardware of the machine.
@@ -11,16 +11,14 @@
#include "includes/bigevglf.h"
-WRITE8_MEMBER(bigevglf_state::bigevglf_palette_w)
+void bigevglf_state::bigevglf_palette_w(offs_t offset, uint8_t data)
{
- int color;
-
m_paletteram[offset] = data;
- color = m_paletteram[offset & 0x3ff] | (m_paletteram[0x400 + (offset & 0x3ff)] << 8);
+ int color = m_paletteram[offset & 0x3ff] | (m_paletteram[0x400 + (offset & 0x3ff)] << 8);
m_palette->set_pen_color(offset & 0x3ff, pal4bit(color >> 4), pal4bit(color >> 0), pal4bit(color >> 8));
}
-WRITE8_MEMBER(bigevglf_state::bigevglf_gfxcontrol_w)
+void bigevglf_state::bigevglf_gfxcontrol_w(uint8_t data)
{
/* bits used: 0,1,2,3
0 and 2 select plane,
@@ -30,12 +28,12 @@ WRITE8_MEMBER(bigevglf_state::bigevglf_gfxcontrol_w)
m_plane_visible = ((data & 8) >> 2) | ((data & 2) >> 1);
}
-WRITE8_MEMBER(bigevglf_state::bigevglf_vidram_addr_w)
+void bigevglf_state::bigevglf_vidram_addr_w(uint8_t data)
{
m_vidram_bank = (data & 0xff) * 0x100;
}
-WRITE8_MEMBER(bigevglf_state::bigevglf_vidram_w)
+void bigevglf_state::bigevglf_vidram_w(offs_t offset, uint8_t data)
{
uint32_t x, y, o;
o = m_vidram_bank + offset;
@@ -45,7 +43,7 @@ WRITE8_MEMBER(bigevglf_state::bigevglf_vidram_w)
m_tmp_bitmap[m_plane_selected].pix16(y, x) = data;
}
-READ8_MEMBER(bigevglf_state::bigevglf_vidram_r)
+uint8_t bigevglf_state::bigevglf_vidram_r(offs_t offset)
{
return m_vidram[0x10000 * m_plane_selected + m_vidram_bank + offset];
}
diff --git a/src/mame/video/bigstrkb.cpp b/src/mame/video/bigstrkb.cpp
index 8ae3ca8f3b9..b9014336f09 100644
--- a/src/mame/video/bigstrkb.cpp
+++ b/src/mame/video/bigstrkb.cpp
@@ -70,7 +70,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_tile_info)
tileinfo.set(0,tileno,col>>12,0);
}
-WRITE16_MEMBER(bigstrkb_state::videoram_w)
+void bigstrkb_state::videoram_w(offs_t offset, uint16_t data)
{
m_videoram[offset] = data;
m_tilemap->mark_tile_dirty(offset);
@@ -86,7 +86,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_tile2_info)
tileinfo.set(1,tileno,col>>12,0);
}
-WRITE16_MEMBER(bigstrkb_state::videoram2_w)
+void bigstrkb_state::videoram2_w(offs_t offset, uint16_t data)
{
m_videoram2[offset] = data;
m_tilemap2->mark_tile_dirty(offset);
@@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_tile3_info)
tileinfo.set(1,tileno+0x2000,(col>>12)+(0x100/16),0);
}
-WRITE16_MEMBER(bigstrkb_state::videoram3_w)
+void bigstrkb_state::videoram3_w(offs_t offset, uint16_t data)
{
m_videoram3[offset] = data;
m_tilemap3->mark_tile_dirty(offset);
diff --git a/src/mame/video/bking.cpp b/src/mame/video/bking.cpp
index ebdddca5d88..868a648a01e 100644
--- a/src/mame/video/bking.cpp
+++ b/src/mame/video/bking.cpp
@@ -80,38 +80,38 @@ void bking_state::bking_palette(palette_device &palette) const
}
-WRITE8_MEMBER(bking_state::bking_xld1_w)
+void bking_state::bking_xld1_w(uint8_t data)
{
m_xld1 = -data;
}
-WRITE8_MEMBER(bking_state::bking_yld1_w)
+void bking_state::bking_yld1_w(uint8_t data)
{
m_yld1 = -data;
}
-WRITE8_MEMBER(bking_state::bking_xld2_w)
+void bking_state::bking_xld2_w(uint8_t data)
{
m_xld2 = -data;
}
-WRITE8_MEMBER(bking_state::bking_yld2_w)
+void bking_state::bking_yld2_w(uint8_t data)
{
m_yld2 = -data;
}
-WRITE8_MEMBER(bking_state::bking_xld3_w)
+void bking_state::bking_xld3_w(uint8_t data)
{
m_xld3 = -data;
}
-WRITE8_MEMBER(bking_state::bking_yld3_w)
+void bking_state::bking_yld3_w(uint8_t data)
{
m_yld3 = -data;
}
-WRITE8_MEMBER(bking_state::bking_cont1_w)
+void bking_state::bking_cont1_w(uint8_t data)
{
/* D0 = COIN LOCK */
/* D1 = BALL 5 (Controller selection) */
@@ -128,7 +128,7 @@ WRITE8_MEMBER(bking_state::bking_cont1_w)
m_crow_pic = (data >> 4) & 0x0f;
}
-WRITE8_MEMBER(bking_state::bking_cont2_w)
+void bking_state::bking_cont2_w(uint8_t data)
{
/* D0-D2 = BALL10 - BALL12 (Selects player 1 ball picture) */
/* D3-D5 = BALL20 - BALL22 (Selects player 2 ball picture) */
@@ -141,7 +141,7 @@ WRITE8_MEMBER(bking_state::bking_cont2_w)
m_hit = data >> 6;
}
-WRITE8_MEMBER(bking_state::bking_cont3_w)
+void bking_state::bking_cont3_w(uint8_t data)
{
/* D0 = CROW INV (inverts Crow picture and coordinates) */
/* D1-D2 = COLOR 0 - COLOR 1 (switches 4 color palettes, global across all graphics) */
@@ -159,13 +159,13 @@ WRITE8_MEMBER(bking_state::bking_cont3_w)
}
-WRITE8_MEMBER(bking_state::bking_msk_w)
+void bking_state::bking_msk_w(uint8_t data)
{
m_pc3259_mask++;
}
-WRITE8_MEMBER(bking_state::bking_hitclr_w)
+void bking_state::bking_hitclr_w(uint8_t data)
{
m_pc3259_mask = 0;
@@ -176,24 +176,24 @@ WRITE8_MEMBER(bking_state::bking_hitclr_w)
}
-WRITE8_MEMBER(bking_state::bking_playfield_w)
+void bking_state::bking_playfield_w(offs_t offset, uint8_t data)
{
m_playfield_ram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_MEMBER(bking_state::bking_input_port_5_r)
+uint8_t bking_state::bking_input_port_5_r()
{
return ioport(m_controller ? "TRACK1_X" : "TRACK0_X")->read();
}
-READ8_MEMBER(bking_state::bking_input_port_6_r)
+uint8_t bking_state::bking_input_port_6_r()
{
return ioport(m_controller ? "TRACK1_Y" : "TRACK0_Y")->read();
}
-READ8_MEMBER(bking_state::bking_pos_r)
+uint8_t bking_state::bking_pos_r(offs_t offset)
{
return m_pc3259_output[offset / 8] << 4;
}
diff --git a/src/mame/video/blktiger.cpp b/src/mame/video/blktiger.cpp
index 115fa5a944b..4f5c245bee4 100644
--- a/src/mame/video/blktiger.cpp
+++ b/src/mame/video/blktiger.cpp
@@ -97,18 +97,18 @@ void blktiger_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(blktiger_state::blktiger_txvideoram_w)
+void blktiger_state::blktiger_txvideoram_w(offs_t offset, uint8_t data)
{
m_txvideoram[offset] = data;
m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-READ8_MEMBER(blktiger_state::blktiger_bgvideoram_r)
+uint8_t blktiger_state::blktiger_bgvideoram_r(offs_t offset)
{
return m_scroll_ram[offset + m_scroll_bank];
}
-WRITE8_MEMBER(blktiger_state::blktiger_bgvideoram_w)
+void blktiger_state::blktiger_bgvideoram_w(offs_t offset, uint8_t data)
{
offset += m_scroll_bank;
@@ -117,34 +117,30 @@ WRITE8_MEMBER(blktiger_state::blktiger_bgvideoram_w)
m_bg_tilemap4x8->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(blktiger_state::blktiger_bgvideoram_bank_w)
+void blktiger_state::blktiger_bgvideoram_bank_w(uint8_t data)
{
m_scroll_bank = (data % BGRAM_BANKS) * BGRAM_BANK_SIZE;
}
-WRITE8_MEMBER(blktiger_state::blktiger_scrolly_w)
+void blktiger_state::blktiger_scrolly_w(offs_t offset, uint8_t data)
{
- int scrolly;
-
m_scroll_y[offset] = data;
- scrolly = m_scroll_y[0] | (m_scroll_y[1] << 8);
+ int scrolly = m_scroll_y[0] | (m_scroll_y[1] << 8);
m_bg_tilemap8x4->set_scrolly(0, scrolly);
m_bg_tilemap4x8->set_scrolly(0, scrolly);
}
-WRITE8_MEMBER(blktiger_state::blktiger_scrollx_w)
+void blktiger_state::blktiger_scrollx_w(offs_t offset, uint8_t data)
{
- int scrollx;
-
m_scroll_x[offset] = data;
- scrollx = m_scroll_x[0] | (m_scroll_x[1] << 8);
+ int scrollx = m_scroll_x[0] | (m_scroll_x[1] << 8);
m_bg_tilemap8x4->set_scrollx(0, scrollx);
m_bg_tilemap4x8->set_scrollx(0, scrollx);
}
-WRITE8_MEMBER(blktiger_state::blktiger_video_control_w)
+void blktiger_state::blktiger_video_control_w(uint8_t data)
{
/* bits 0 and 1 are coin counters */
machine().bookkeeping().coin_counter_w(0,data & 1);
@@ -160,7 +156,7 @@ WRITE8_MEMBER(blktiger_state::blktiger_video_control_w)
m_chon = ~data & 0x80;
}
-WRITE8_MEMBER(blktiger_state::blktiger_video_enable_w)
+void blktiger_state::blktiger_video_enable_w(uint8_t data)
{
/* not sure which is which, but I think that bit 1 and 2 enable background and sprites */
/* bit 1 enables bg ? */
@@ -170,7 +166,7 @@ WRITE8_MEMBER(blktiger_state::blktiger_video_enable_w)
m_objon = ~data & 0x04;
}
-WRITE8_MEMBER(blktiger_state::blktiger_screen_layout_w)
+void blktiger_state::blktiger_screen_layout_w(uint8_t data)
{
m_screen_layout = data;
m_bg_tilemap8x4->enable(m_screen_layout);
diff --git a/src/mame/video/bloodbro.cpp b/src/mame/video/bloodbro.cpp
index c4cb61f5571..ff8dc287b90 100644
--- a/src/mame/video/bloodbro.cpp
+++ b/src/mame/video/bloodbro.cpp
@@ -77,19 +77,19 @@ void bloodbro_state::video_start()
***************************************************************************/
-WRITE16_MEMBER(bloodbro_state::bgvideoram_w)
+void bloodbro_state::bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_bgvideoram[offset]);
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(bloodbro_state::fgvideoram_w)
+void bloodbro_state::fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_fgvideoram[offset]);
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(bloodbro_state::txvideoram_w)
+void bloodbro_state::txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_txvideoram[offset]);
m_tx_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/blueprnt.cpp b/src/mame/video/blueprnt.cpp
index d7c7cf8d098..16adfaf2c61 100644
--- a/src/mame/video/blueprnt.cpp
+++ b/src/mame/video/blueprnt.cpp
@@ -45,13 +45,13 @@ void blueprnt_state::blueprnt_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(blueprnt_state::blueprnt_videoram_w)
+void blueprnt_state::blueprnt_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(blueprnt_state::blueprnt_colorram_w)
+void blueprnt_state::blueprnt_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
@@ -67,7 +67,7 @@ WRITE8_MEMBER(blueprnt_state::blueprnt_colorram_w)
}
-WRITE8_MEMBER(blueprnt_state::blueprnt_flipscreen_w)
+void blueprnt_state::blueprnt_flipscreen_w(uint8_t data)
{
flip_screen_set(~data & 0x02);
diff --git a/src/mame/video/bogeyman.cpp b/src/mame/video/bogeyman.cpp
index 5575d481042..9f253793bc3 100644
--- a/src/mame/video/bogeyman.cpp
+++ b/src/mame/video/bogeyman.cpp
@@ -36,25 +36,25 @@ void bogeyman_state::bogeyman_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(bogeyman_state::videoram_w)
+void bogeyman_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bogeyman_state::colorram_w)
+void bogeyman_state::colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bogeyman_state::videoram2_w)
+void bogeyman_state::videoram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bogeyman_state::colorram2_w)
+void bogeyman_state::colorram2_w(offs_t offset, uint8_t data)
{
m_colorram2[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/bombjack.cpp b/src/mame/video/bombjack.cpp
index 116bd7e3216..49a0e4d0211 100644
--- a/src/mame/video/bombjack.cpp
+++ b/src/mame/video/bombjack.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Mirko Buffoni
/***************************************************************************
- video.c
+ bombjack.cpp
Functions to emulate the video hardware of the machine.
@@ -11,19 +11,19 @@
#include "emu.h"
#include "includes/bombjack.h"
-WRITE8_MEMBER(bombjack_state::bombjack_videoram_w)
+void bombjack_state::bombjack_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bombjack_state::bombjack_colorram_w)
+void bombjack_state::bombjack_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bombjack_state::bombjack_background_w)
+void bombjack_state::bombjack_background_w(uint8_t data)
{
if (m_background_image != data)
{
@@ -32,7 +32,7 @@ WRITE8_MEMBER(bombjack_state::bombjack_background_w)
}
}
-WRITE8_MEMBER(bombjack_state::bombjack_flipscreen_w)
+void bombjack_state::bombjack_flipscreen_w(uint8_t data)
{
if (flip_screen() != (data & 0x01))
{
diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp
index 66abbd42dc0..d8eca509011 100644
--- a/src/mame/video/bosco.cpp
+++ b/src/mame/video/bosco.cpp
@@ -144,7 +144,7 @@ VIDEO_START_MEMBER(bosco_state,bosco)
***************************************************************************/
-WRITE8_MEMBER( bosco_state::bosco_videoram_w )
+void bosco_state::bosco_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
if (offset & 0x400)
@@ -153,17 +153,17 @@ WRITE8_MEMBER( bosco_state::bosco_videoram_w )
m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_MEMBER( bosco_state::bosco_scrollx_w )
+void bosco_state::bosco_scrollx_w(uint8_t data)
{
m_bg_tilemap->set_scrollx(0,data);
}
-WRITE8_MEMBER( bosco_state::bosco_scrolly_w )
+void bosco_state::bosco_scrolly_w(uint8_t data)
{
m_bg_tilemap->set_scrolly(0,data);
}
-WRITE8_MEMBER( bosco_state::bosco_starclr_w )
+void bosco_state::bosco_starclr_w(uint8_t data)
{
// On any write to $9840, turn on starfield
m_bosco_starclr = 0;
diff --git a/src/mame/video/brkthru.cpp b/src/mame/video/brkthru.cpp
index 0de0d9dfce6..63d4215f1c5 100644
--- a/src/mame/video/brkthru.cpp
+++ b/src/mame/video/brkthru.cpp
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(brkthru_state::get_bg_tile_info)
tileinfo.set(region, code & 0x7f, colour,0);
}
-WRITE8_MEMBER(brkthru_state::brkthru_bgram_w)
+void brkthru_state::brkthru_bgram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
@@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(brkthru_state::get_fg_tile_info)
tileinfo.set(0, code, 0, 0);
}
-WRITE8_MEMBER(brkthru_state::brkthru_fgram_w)
+void brkthru_state::brkthru_fgram_w(offs_t offset, uint8_t data)
{
m_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
@@ -116,7 +116,7 @@ void brkthru_state::video_start()
}
-WRITE8_MEMBER(brkthru_state::brkthru_1800_w)
+void brkthru_state::brkthru_1800_w(offs_t offset, uint8_t data)
{
if (offset == 0) /* low 8 bits of scroll */
m_bgscroll = (m_bgscroll & 0x100) | data;
diff --git a/src/mame/video/bsktball.cpp b/src/mame/video/bsktball.cpp
index e9449d3a91d..2f6fb27d2d5 100644
--- a/src/mame/video/bsktball.cpp
+++ b/src/mame/video/bsktball.cpp
@@ -10,7 +10,7 @@
#include "includes/bsktball.h"
-WRITE8_MEMBER(bsktball_state::bsktball_videoram_w)
+void bsktball_state::bsktball_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/btime.cpp b/src/mame/video/btime.cpp
index 663e8362d75..7e592aeb0dd 100644
--- a/src/mame/video/btime.cpp
+++ b/src/mame/video/btime.cpp
@@ -131,13 +131,13 @@ VIDEO_START_MEMBER(btime_state,bnj)
save_item(NAME(*m_background_bitmap));
}
-WRITE8_MEMBER(btime_state::lnc_videoram_w)
+void btime_state::lnc_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_colorram[offset] = *m_lnc_charbank;
}
-READ8_MEMBER(btime_state::btime_mirrorvideoram_r)
+uint8_t btime_state::btime_mirrorvideoram_r(offs_t offset)
{
int x, y;
@@ -149,7 +149,7 @@ READ8_MEMBER(btime_state::btime_mirrorvideoram_r)
return m_videoram[offset];
}
-READ8_MEMBER(btime_state::btime_mirrorcolorram_r)
+uint8_t btime_state::btime_mirrorcolorram_r(offs_t offset)
{
int x, y;
@@ -161,7 +161,7 @@ READ8_MEMBER(btime_state::btime_mirrorcolorram_r)
return m_colorram[offset];
}
-WRITE8_MEMBER(btime_state::btime_mirrorvideoram_w)
+void btime_state::btime_mirrorvideoram_w(offs_t offset, uint8_t data)
{
int x, y;
@@ -173,7 +173,7 @@ WRITE8_MEMBER(btime_state::btime_mirrorvideoram_w)
m_videoram[offset] = data;
}
-WRITE8_MEMBER(btime_state::lnc_mirrorvideoram_w)
+void btime_state::lnc_mirrorvideoram_w(offs_t offset, uint8_t data)
{
int x, y;
@@ -182,10 +182,10 @@ WRITE8_MEMBER(btime_state::lnc_mirrorvideoram_w)
y = offset % 32;
offset = 32 * y + x;
- lnc_videoram_w(space, offset, data);
+ lnc_videoram_w(offset, data);
}
-WRITE8_MEMBER(btime_state::btime_mirrorcolorram_w)
+void btime_state::btime_mirrorcolorram_w(offs_t offset, uint8_t data)
{
int x, y;
@@ -197,7 +197,7 @@ WRITE8_MEMBER(btime_state::btime_mirrorcolorram_w)
m_colorram[offset] = data;
}
-WRITE8_MEMBER(btime_state::deco_charram_w)
+void btime_state::deco_charram_w(offs_t offset, uint8_t data)
{
if (m_deco_charram[offset] == data)
return;
@@ -213,22 +213,22 @@ WRITE8_MEMBER(btime_state::deco_charram_w)
m_gfxdecode->gfx(0)->mark_dirty(offset >> 3);
}
-WRITE8_MEMBER(btime_state::bnj_background_w)
+void btime_state::bnj_background_w(offs_t offset, uint8_t data)
{
m_bnj_backgroundram[offset] = data;
}
-WRITE8_MEMBER(btime_state::bnj_scroll1_w)
+void btime_state::bnj_scroll1_w(uint8_t data)
{
m_bnj_scroll1 = data;
}
-WRITE8_MEMBER(btime_state::bnj_scroll2_w)
+void btime_state::bnj_scroll2_w(uint8_t data)
{
m_bnj_scroll2 = data;
}
-WRITE8_MEMBER(btime_state::btime_video_control_w)
+void btime_state::btime_video_control_w(uint8_t data)
{
// Btime video control
//
@@ -238,7 +238,7 @@ WRITE8_MEMBER(btime_state::btime_video_control_w)
flip_screen_set(data & 0x01);
}
-WRITE8_MEMBER(btime_state::bnj_video_control_w)
+void btime_state::bnj_video_control_w(uint8_t data)
{
/* Bnj/Lnc works a little differently than the btime/eggs (apparently). */
/* According to the information at: */
@@ -251,10 +251,10 @@ WRITE8_MEMBER(btime_state::bnj_video_control_w)
/* are in upright controls mode. */
if (ioport("DSW1")->read() & 0x40) /* cocktail mode */
- btime_video_control_w(space, offset, data);
+ btime_video_control_w(data);
}
-WRITE8_MEMBER(btime_state::zoar_video_control_w)
+void btime_state::zoar_video_control_w(uint8_t data)
{
// Zoar video control
//
@@ -268,7 +268,7 @@ WRITE8_MEMBER(btime_state::zoar_video_control_w)
flip_screen_set(data & 0x80);
}
-WRITE8_MEMBER(btime_state::disco_video_control_w)
+void btime_state::disco_video_control_w(uint8_t data)
{
m_btime_palette = (data >> 2) & 0x03;
diff --git a/src/mame/video/btoads.cpp b/src/mame/video/btoads.cpp
index 5bcbfb82067..c301aa02c28 100644
--- a/src/mame/video/btoads.cpp
+++ b/src/mame/video/btoads.cpp
@@ -47,7 +47,7 @@ void btoads_state::video_start()
*
*************************************/
-WRITE16_MEMBER( btoads_state::misc_control_w )
+void btoads_state::misc_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_misc_control);
@@ -56,7 +56,7 @@ WRITE16_MEMBER( btoads_state::misc_control_w )
}
-WRITE16_MEMBER( btoads_state::display_control_w )
+void btoads_state::display_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -90,7 +90,7 @@ WRITE16_MEMBER( btoads_state::display_control_w )
*
*************************************/
-WRITE16_MEMBER( btoads_state::scroll0_w )
+void btoads_state::scroll0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* allow multiple changes during display */
// m_screen->update_now();
@@ -104,7 +104,7 @@ WRITE16_MEMBER( btoads_state::scroll0_w )
}
-WRITE16_MEMBER( btoads_state::scroll1_w )
+void btoads_state::scroll1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* allow multiple changes during display */
// m_screen->update_now();
@@ -125,13 +125,13 @@ WRITE16_MEMBER( btoads_state::scroll1_w )
*
*************************************/
-WRITE16_MEMBER( btoads_state::paletteram_w )
+void btoads_state::paletteram_w(offs_t offset, uint16_t data)
{
m_tlc34076->write(offset/2, data);
}
-READ16_MEMBER( btoads_state::paletteram_r )
+uint16_t btoads_state::paletteram_r(offs_t offset)
{
return m_tlc34076->read(offset/2);
}
@@ -144,25 +144,25 @@ READ16_MEMBER( btoads_state::paletteram_r )
*
*************************************/
-WRITE16_MEMBER( btoads_state::vram_bg0_w )
+void btoads_state::vram_bg0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram_bg0[offset & 0x3fcff]);
}
-WRITE16_MEMBER( btoads_state::vram_bg1_w )
+void btoads_state::vram_bg1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_vram_bg1[offset & 0x3fcff]);
}
-READ16_MEMBER( btoads_state::vram_bg0_r )
+uint16_t btoads_state::vram_bg0_r(offs_t offset)
{
return m_vram_bg0[offset & 0x3fcff];
}
-READ16_MEMBER( btoads_state::vram_bg1_r )
+uint16_t btoads_state::vram_bg1_r(offs_t offset)
{
return m_vram_bg1[offset & 0x3fcff];
}
@@ -175,27 +175,27 @@ READ16_MEMBER( btoads_state::vram_bg1_r )
*
*************************************/
-WRITE16_MEMBER( btoads_state::vram_fg_display_w )
+void btoads_state::vram_fg_display_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_vram_fg_display[offset] = data;
}
-WRITE16_MEMBER( btoads_state::vram_fg_draw_w )
+void btoads_state::vram_fg_draw_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
m_vram_fg_draw[offset] = data;
}
-READ16_MEMBER( btoads_state::vram_fg_display_r )
+uint16_t btoads_state::vram_fg_display_r(offs_t offset)
{
return m_vram_fg_display[offset];
}
-READ16_MEMBER( btoads_state::vram_fg_draw_r )
+uint16_t btoads_state::vram_fg_draw_r(offs_t offset)
{
return m_vram_fg_draw[offset];
}
diff --git a/src/mame/video/buggychl.cpp b/src/mame/video/buggychl.cpp
index 26bf22f4ff4..e3c98e953c9 100644
--- a/src/mame/video/buggychl.cpp
+++ b/src/mame/video/buggychl.cpp
@@ -24,7 +24,7 @@ void buggychl_state::video_start()
-WRITE8_MEMBER(buggychl_state::buggychl_chargen_w)
+void buggychl_state::buggychl_chargen_w(offs_t offset, uint8_t data)
{
if (m_charram[offset] != data)
{
@@ -33,17 +33,17 @@ WRITE8_MEMBER(buggychl_state::buggychl_chargen_w)
}
}
-WRITE8_MEMBER(buggychl_state::buggychl_sprite_lookup_bank_w)
+void buggychl_state::buggychl_sprite_lookup_bank_w(uint8_t data)
{
m_sl_bank = (data & 0x10) << 8;
}
-WRITE8_MEMBER(buggychl_state::buggychl_sprite_lookup_w)
+void buggychl_state::buggychl_sprite_lookup_w(offs_t offset, uint8_t data)
{
m_sprite_lookup[offset + m_sl_bank] = data;
}
-WRITE8_MEMBER(buggychl_state::buggychl_ctrl_w)
+void buggychl_state::buggychl_ctrl_w(uint8_t data)
{
/*
bit7 = lamp
@@ -67,7 +67,7 @@ WRITE8_MEMBER(buggychl_state::buggychl_ctrl_w)
m_led[0] = BIT(~data, 7);
}
-WRITE8_MEMBER(buggychl_state::buggychl_bg_scrollx_w)
+void buggychl_state::buggychl_bg_scrollx_w(uint8_t data)
{
m_bg_scrollx = -(data - 0x12);
}
diff --git a/src/mame/video/bwing.cpp b/src/mame/video/bwing.cpp
index 3c30e6b7459..d722416fd28 100644
--- a/src/mame/video/bwing.cpp
+++ b/src/mame/video/bwing.cpp
@@ -19,28 +19,28 @@ revised by Alex W. Jackson
// Exports
-WRITE8_MEMBER(bwing_state::videoram_w)
+void bwing_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_charmap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bwing_state::fgscrollram_w)
+void bwing_state::fgscrollram_w(offs_t offset, uint8_t data)
{
m_fgscrollram[offset] = data;
m_fgmap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bwing_state::bgscrollram_w)
+void bwing_state::bgscrollram_w(offs_t offset, uint8_t data)
{
m_bgscrollram[offset] = data;
m_bgmap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(bwing_state::gfxram_w)
+void bwing_state::gfxram_w(offs_t offset, uint8_t data)
{
m_gfxram[offset] = data;
int whichgfx = (offset & 0x1000) ? 3 : 2;
@@ -48,7 +48,7 @@ WRITE8_MEMBER(bwing_state::gfxram_w)
}
-WRITE8_MEMBER(bwing_state::scrollreg_w)
+void bwing_state::scrollreg_w(offs_t offset, uint8_t data)
{
m_sreg[offset] = data;
@@ -64,7 +64,7 @@ WRITE8_MEMBER(bwing_state::scrollreg_w)
}
-WRITE8_MEMBER(bwing_state::paletteram_w)
+void bwing_state::paletteram_w(offs_t offset, uint8_t data)
{
static const float rgb[4][3] = {
{0.85f, 0.95f, 1.00f},