summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-06-13 14:14:01 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-06-13 14:14:01 +0200
commitd9d432b379de0ed82923ef1a6f7a7e6e399300a1 (patch)
tree279cf640ad09dc3e3c30a0612fcf3426adc3d62f
parentf409bab241e81fff76915dcf0da700ad6ff8fa6e (diff)
drivers starting with p and q: removed read* and write* macros (nw)
-rw-r--r--src/mame/audio/poolshrk.cpp8
-rw-r--r--src/mame/audio/pulsar.cpp4
-rw-r--r--src/mame/drivers/pacland.cpp10
-rw-r--r--src/mame/drivers/pacman.cpp86
-rw-r--r--src/mame/drivers/pandoras.cpp8
-rw-r--r--src/mame/drivers/paradise.cpp10
-rw-r--r--src/mame/drivers/parodius.cpp8
-rw-r--r--src/mame/drivers/pbaction.cpp22
-rw-r--r--src/mame/drivers/pc4.cpp6
-rw-r--r--src/mame/drivers/pc6001.cpp92
-rw-r--r--src/mame/drivers/pc8001.cpp10
-rw-r--r--src/mame/drivers/pc8401a.cpp22
-rw-r--r--src/mame/drivers/pc8801.cpp196
-rw-r--r--src/mame/drivers/pc88va.cpp54
-rw-r--r--src/mame/drivers/pc9801.cpp210
-rw-r--r--src/mame/drivers/pcktgal.cpp10
-rw-r--r--src/mame/drivers/pcw.cpp28
-rw-r--r--src/mame/drivers/pcw16.cpp54
-rw-r--r--src/mame/drivers/pgm2.cpp60
-rw-r--r--src/mame/drivers/phc25.cpp4
-rw-r--r--src/mame/drivers/pingpong.cpp10
-rw-r--r--src/mame/drivers/pirates.cpp6
-rw-r--r--src/mame/drivers/pktgaldx.cpp12
-rw-r--r--src/mame/drivers/playch10.cpp8
-rw-r--r--src/mame/drivers/playmark.cpp12
-rw-r--r--src/mame/drivers/plygonet.cpp40
-rw-r--r--src/mame/drivers/pokechmp.cpp6
-rw-r--r--src/mame/drivers/polepos.cpp10
-rw-r--r--src/mame/drivers/policetr.cpp12
-rw-r--r--src/mame/drivers/poly880.cpp2
-rw-r--r--src/mame/drivers/poolshrk.cpp10
-rw-r--r--src/mame/drivers/popeye.cpp4
-rw-r--r--src/mame/drivers/portrait.cpp6
-rw-r--r--src/mame/drivers/prehisle.cpp4
-rw-r--r--src/mame/drivers/prof180x.cpp12
-rw-r--r--src/mame/drivers/prof80.cpp8
-rw-r--r--src/mame/drivers/psikyo.cpp12
-rw-r--r--src/mame/drivers/psikyo4.cpp14
-rw-r--r--src/mame/drivers/psion.cpp10
-rw-r--r--src/mame/drivers/psion5.cpp4
-rw-r--r--src/mame/drivers/psychic5.cpp10
-rw-r--r--src/mame/drivers/punchout.cpp10
-rw-r--r--src/mame/drivers/px8.cpp16
-rw-r--r--src/mame/drivers/qdrmfgp.cpp20
-rw-r--r--src/mame/drivers/quasar.cpp14
-rw-r--r--src/mame/drivers/quizdna.cpp4
-rw-r--r--src/mame/drivers/vicdual.cpp4
-rw-r--r--src/mame/includes/p2000t.h18
-rw-r--r--src/mame/includes/pacland.h20
-rw-r--r--src/mame/includes/pacman.h92
-rw-r--r--src/mame/includes/pandoras.h14
-rw-r--r--src/mame/includes/paradise.h24
-rw-r--r--src/mame/includes/parodius.h8
-rw-r--r--src/mame/includes/pass.h4
-rw-r--r--src/mame/includes/pbaction.h32
-rw-r--r--src/mame/includes/pc1251.h4
-rw-r--r--src/mame/includes/pc1350.h4
-rw-r--r--src/mame/includes/pc1401.h4
-rw-r--r--src/mame/includes/pc1403.h8
-rw-r--r--src/mame/includes/pc4.h16
-rw-r--r--src/mame/includes/pc6001.h92
-rw-r--r--src/mame/includes/pc8001.h10
-rw-r--r--src/mame/includes/pc8401a.h22
-rw-r--r--src/mame/includes/pc8801.h142
-rw-r--r--src/mame/includes/pc88va.h54
-rw-r--r--src/mame/includes/pc9801.h208
-rw-r--r--src/mame/includes/pce.h8
-rw-r--r--src/mame/includes/pcktgal.h10
-rw-r--r--src/mame/includes/pcw.h30
-rw-r--r--src/mame/includes/pcw16.h54
-rw-r--r--src/mame/includes/pecom.h14
-rw-r--r--src/mame/includes/pgm2.h56
-rw-r--r--src/mame/includes/phc25.h4
-rw-r--r--src/mame/includes/phoenix.h10
-rw-r--r--src/mame/includes/pingpong.h10
-rw-r--r--src/mame/includes/pirates.h10
-rw-r--r--src/mame/includes/pitnrun.h20
-rw-r--r--src/mame/includes/pk8000.h24
-rw-r--r--src/mame/includes/pktgaldx.h12
-rw-r--r--src/mame/includes/playch10.h46
-rw-r--r--src/mame/includes/playmark.h32
-rw-r--r--src/mame/includes/plygonet.h48
-rw-r--r--src/mame/includes/pmd85.h8
-rw-r--r--src/mame/includes/pokechmp.h10
-rw-r--r--src/mame/includes/polepos.h32
-rw-r--r--src/mame/includes/policetr.h14
-rw-r--r--src/mame/includes/poly.h28
-rw-r--r--src/mame/includes/poly880.h2
-rw-r--r--src/mame/includes/polyplay.h2
-rw-r--r--src/mame/includes/poolshrk.h18
-rw-r--r--src/mame/includes/pooyan.h4
-rw-r--r--src/mame/includes/popeye.h12
-rw-r--r--src/mame/includes/portrait.h10
-rw-r--r--src/mame/includes/pp01.h18
-rw-r--r--src/mame/includes/prehisle.h8
-rw-r--r--src/mame/includes/prof180x.h10
-rw-r--r--src/mame/includes/prof80.h6
-rw-r--r--src/mame/includes/psikyo.h12
-rw-r--r--src/mame/includes/psikyo4.h14
-rw-r--r--src/mame/includes/psion.h10
-rw-r--r--src/mame/includes/psion5.h4
-rw-r--r--src/mame/includes/psychic5.h28
-rw-r--r--src/mame/includes/punchout.h19
-rw-r--r--src/mame/includes/px8.h16
-rw-r--r--src/mame/includes/qdrmfgp.h21
-rw-r--r--src/mame/includes/qix.h34
-rw-r--r--src/mame/includes/quasar.h14
-rw-r--r--src/mame/includes/quizdna.h16
-rw-r--r--src/mame/includes/quizpani.h6
-rw-r--r--src/mame/includes/vicdual.h4
-rw-r--r--src/mame/machine/p2000t.cpp18
-rw-r--r--src/mame/machine/pacman.cpp2
-rw-r--r--src/mame/machine/pc1403.cpp4
-rw-r--r--src/mame/machine/pce.cpp16
-rw-r--r--src/mame/machine/pecom.cpp20
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.cpp24
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.h4
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.cpp8
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.h4
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp28
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.h14
-rw-r--r--src/mame/machine/pitnrun.cpp6
-rw-r--r--src/mame/machine/playch10.cpp66
-rw-r--r--src/mame/machine/pmd85.cpp8
-rw-r--r--src/mame/machine/poly.cpp28
-rw-r--r--src/mame/machine/pp01.cpp30
-rw-r--r--src/mame/machine/qix.cpp20
-rw-r--r--src/mame/video/pacland.cpp10
-rw-r--r--src/mame/video/pacman.cpp16
-rw-r--r--src/mame/video/pandoras.cpp6
-rw-r--r--src/mame/video/paradise.cpp18
-rw-r--r--src/mame/video/pass.cpp4
-rw-r--r--src/mame/video/pbaction.cpp14
-rw-r--r--src/mame/video/pc080sn.cpp10
-rw-r--r--src/mame/video/pc080sn.h10
-rw-r--r--src/mame/video/pc1251.cpp4
-rw-r--r--src/mame/video/pc1350.cpp4
-rw-r--r--src/mame/video/pc1401.cpp4
-rw-r--r--src/mame/video/pc1403.cpp4
-rw-r--r--src/mame/video/pc4.cpp10
-rw-r--r--src/mame/video/pc9801.cpp22
-rw-r--r--src/mame/video/pecom.cpp2
-rw-r--r--src/mame/video/pgm2.cpp4
-rw-r--r--src/mame/video/phoenix.cpp10
-rw-r--r--src/mame/video/pingpong.cpp4
-rw-r--r--src/mame/video/pirates.cpp6
-rw-r--r--src/mame/video/pitnrun.cpp14
-rw-r--r--src/mame/video/pk8000.cpp24
-rw-r--r--src/mame/video/playch10.cpp5
-rw-r--r--src/mame/video/playmark.cpp20
-rw-r--r--src/mame/video/plygonet.cpp8
-rw-r--r--src/mame/video/pokechmp.cpp7
-rw-r--r--src/mame/video/polepos.cpp24
-rw-r--r--src/mame/video/policetr.cpp4
-rw-r--r--src/mame/video/polyplay.cpp2
-rw-r--r--src/mame/video/pooyan.cpp4
-rw-r--r--src/mame/video/popeye.cpp8
-rw-r--r--src/mame/video/portrait.cpp4
-rw-r--r--src/mame/video/powervr2.cpp228
-rw-r--r--src/mame/video/powervr2.h234
-rw-r--r--src/mame/video/prehisle.cpp4
-rw-r--r--src/mame/video/psychic5.cpp18
-rw-r--r--src/mame/video/punchout.cpp10
-rw-r--r--src/mame/video/qix.cpp16
-rw-r--r--src/mame/video/quizdna.cpp12
-rw-r--r--src/mame/video/quizpani.cpp6
166 files changed, 1915 insertions, 1925 deletions
diff --git a/src/mame/audio/poolshrk.cpp b/src/mame/audio/poolshrk.cpp
index 9a966f31b9a..b69d2f4c9b4 100644
--- a/src/mame/audio/poolshrk.cpp
+++ b/src/mame/audio/poolshrk.cpp
@@ -157,22 +157,22 @@ DISCRETE_SOUND_END
*
*************************************/
-WRITE8_MEMBER(poolshrk_state::scratch_sound_w)
+void poolshrk_state::scratch_sound_w(offs_t offset, uint8_t data)
{
m_discrete->write(POOLSHRK_SCRATCH_SND, offset & 1);
}
-WRITE8_MEMBER(poolshrk_state::score_sound_w)
+void poolshrk_state::score_sound_w(uint8_t data)
{
m_discrete->write(POOLSHRK_SCORE_EN, 1); /* this will trigger the sound code for 1 sample */
}
-WRITE8_MEMBER(poolshrk_state::click_sound_w)
+void poolshrk_state::click_sound_w(uint8_t data)
{
m_discrete->write(POOLSHRK_CLICK_EN, 1); /* this will trigger the sound code for 1 sample */
}
-WRITE8_MEMBER(poolshrk_state::bump_sound_w)
+void poolshrk_state::bump_sound_w(offs_t offset, uint8_t data)
{
m_discrete->write(POOLSHRK_BUMP_EN, offset & 1);
}
diff --git a/src/mame/audio/pulsar.cpp b/src/mame/audio/pulsar.cpp
index 63daee06b11..4e7a50e60c5 100644
--- a/src/mame/audio/pulsar.cpp
+++ b/src/mame/audio/pulsar.cpp
@@ -71,7 +71,7 @@ enum
};
-WRITE8_MEMBER( vicdual_state::pulsar_audio_1_w )
+void vicdual_state::pulsar_audio_1_w(uint8_t data)
{
int bitsChanged;
//int bitsGoneHigh;
@@ -120,7 +120,7 @@ WRITE8_MEMBER( vicdual_state::pulsar_audio_1_w )
}
-WRITE8_MEMBER( vicdual_state::pulsar_audio_2_w )
+void vicdual_state::pulsar_audio_2_w(uint8_t data)
{
int bitsChanged;
int bitsGoneHigh;
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index 98b6a328c36..b22c3ec342d 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -206,20 +206,20 @@ void pacland_state::machine_start()
save_item(NAME(m_mcu_irq_mask));
}
-WRITE8_MEMBER(pacland_state::subreset_w)
+void pacland_state::subreset_w(offs_t offset, uint8_t data)
{
int bit = !BIT(offset,11);
m_mcu->set_input_line(INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
}
-WRITE8_MEMBER(pacland_state::flipscreen_w)
+void pacland_state::flipscreen_w(offs_t offset, uint8_t data)
{
int bit = !BIT(offset,11);
flip_screen_set(bit);
}
-READ8_MEMBER(pacland_state::input_r)
+uint8_t pacland_state::input_r(offs_t offset)
{
int shift = 4 * (offset & 1);
int port = offset & 2;
@@ -243,7 +243,7 @@ void pacland_state::led_w(uint8_t data)
m_leds[1] = BIT(data, 4);
}
-WRITE8_MEMBER(pacland_state::irq_1_ctrl_w)
+void pacland_state::irq_1_ctrl_w(offs_t offset, uint8_t data)
{
int bit = !BIT(offset, 11);
m_main_irq_mask = bit;
@@ -251,7 +251,7 @@ WRITE8_MEMBER(pacland_state::irq_1_ctrl_w)
m_maincpu->set_input_line(0, CLEAR_LINE);
}
-WRITE8_MEMBER(pacland_state::irq_2_ctrl_w)
+void pacland_state::irq_2_ctrl_w(offs_t offset, uint8_t data)
{
int bit = !BIT(offset, 13);
m_mcu_irq_mask = bit;
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index c699c6221c2..392fe08c228 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -435,7 +435,7 @@ WRITE_LINE_MEMBER(pacman_state::irq_mask_w)
m_irq_mask = state;
}
-WRITE8_MEMBER(pacman_state::pacman_interrupt_vector_w)
+void pacman_state::pacman_interrupt_vector_w(uint8_t data)
{
m_maincpu->set_input_line_vector(0, data); // Z80
m_maincpu->set_input_line(0, CLEAR_LINE);
@@ -498,7 +498,7 @@ did look at(sprite buffer), was copied from Pacman. The addresses for the varia
to be the same as well.
*/
-WRITE8_MEMBER(pacman_state::piranha_interrupt_vector_w)
+void pacman_state::piranha_interrupt_vector_w(uint8_t data)
{
if (data == 0xfa) data = 0x78;
if (data == 0xfc) data = 0xfc;
@@ -506,7 +506,7 @@ WRITE8_MEMBER(pacman_state::piranha_interrupt_vector_w)
}
-WRITE8_MEMBER(pacman_state::nmouse_interrupt_vector_w)
+void pacman_state::nmouse_interrupt_vector_w(uint8_t data)
{
if (data == 0xbf) data = 0x3c;
if (data == 0xc6) data = 0x40;
@@ -541,7 +541,7 @@ WRITE_LINE_MEMBER(pacman_state::coin_lockout_global_w)
*
*************************************/
-WRITE8_MEMBER(pacman_state::alibaba_sound_w)
+void pacman_state::alibaba_sound_w(offs_t offset, uint8_t data)
{
/* since the sound region in Ali Baba is not contiguous, translate the
offset into the 0-0x1f range */
@@ -549,7 +549,7 @@ WRITE8_MEMBER(pacman_state::alibaba_sound_w)
m_namco_sound->pacman_sound_w(offset, data);
}
-READ8_MEMBER(pacman_state::alibaba_mystery_1_r)
+uint8_t pacman_state::alibaba_mystery_1_r()
{
/* The return value determines what the mystery item is. Each bit corresponds
to a question mark */
@@ -558,7 +558,7 @@ READ8_MEMBER(pacman_state::alibaba_mystery_1_r)
}
-READ8_MEMBER(pacman_state::alibaba_mystery_2_r)
+uint8_t pacman_state::alibaba_mystery_2_r()
{
/* The single bit return value determines when the mystery is lit up.
This is certainly wrong */
@@ -574,7 +574,7 @@ READ8_MEMBER(pacman_state::alibaba_mystery_2_r)
*
*************************************/
-WRITE8_MEMBER(pacman_state::maketrax_protection_w)
+void pacman_state::maketrax_protection_w(uint8_t data)
{
if (data == 0) // disable protection / reset?
{
@@ -600,7 +600,7 @@ WRITE8_MEMBER(pacman_state::maketrax_protection_w)
}
}
-READ8_MEMBER(pacman_state::maketrax_special_port2_r)
+uint8_t pacman_state::maketrax_special_port2_r(offs_t offset)
{
const uint8_t protdata[0x1e] = { // table at $ebd (odd entries)
0x00, 0xc0, 0x00, 0x40, 0xc0, 0x40, 0x00, 0xc0, 0x00, 0x40, 0x00, 0xc0, 0x00, 0x40, 0xc0, 0x40,
@@ -628,7 +628,7 @@ READ8_MEMBER(pacman_state::maketrax_special_port2_r)
return data;
}
-READ8_MEMBER(pacman_state::maketrax_special_port3_r)
+uint8_t pacman_state::maketrax_special_port3_r(offs_t offset)
{
const uint8_t protdata[0x1e] = { // table at $ebd (even entries)
0x1f, 0x3f, 0x2f, 0x2f, 0x0f, 0x0f, 0x0f, 0x3f, 0x0f, 0x0f, 0x1c, 0x3c, 0x2c, 0x2c, 0x0c, 0x0c,
@@ -651,7 +651,7 @@ READ8_MEMBER(pacman_state::maketrax_special_port3_r)
}
}
-READ8_MEMBER(pacman_state::mbrush_prot_r)
+uint8_t pacman_state::mbrush_prot_r(offs_t offset)
{
uint8_t data = ioport("DSW1")->read() & 0x3f;
@@ -690,7 +690,7 @@ READ8_MEMBER(pacman_state::mbrush_prot_r)
*
*************************************/
-READ8_MEMBER(pacman_state::mschamp_kludge_r)
+uint8_t pacman_state::mschamp_kludge_r()
{
return m_counter++;
}
@@ -702,12 +702,12 @@ READ8_MEMBER(pacman_state::mschamp_kludge_r)
*
************************************/
-WRITE8_MEMBER(pacman_state::bigbucks_bank_w)
+void pacman_state::bigbucks_bank_w(uint8_t data)
{
m_bigbucks_bank = data;
}
-READ8_MEMBER(pacman_state::bigbucks_question_r)
+uint8_t pacman_state::bigbucks_question_r(offs_t offset)
{
uint8_t *question = memregion("user1")->base();
uint8_t ret;
@@ -730,7 +730,7 @@ WRITE_LINE_MEMBER(pacman_state::s2650_interrupt)
m_maincpu->set_input_line(0, ASSERT_LINE);
}
-WRITE8_MEMBER(pacman_state::porky_banking_w)
+void pacman_state::porky_banking_w(uint8_t data)
{
membank("bank1")->set_entry(data & 1);
membank("bank2")->set_entry(data & 1);
@@ -738,7 +738,7 @@ WRITE8_MEMBER(pacman_state::porky_banking_w)
membank("bank4")->set_entry(data & 1);
}
-READ8_MEMBER(pacman_state::drivfrcp_port1_r)
+uint8_t pacman_state::drivfrcp_port1_r()
{
switch (m_maincpu->pc())
{
@@ -750,7 +750,7 @@ READ8_MEMBER(pacman_state::drivfrcp_port1_r)
return 0;
}
-READ8_MEMBER(pacman_state::_8bpm_port1_r)
+uint8_t pacman_state::_8bpm_port1_r()
{
switch (m_maincpu->pc())
{
@@ -762,7 +762,7 @@ READ8_MEMBER(pacman_state::_8bpm_port1_r)
return 0;
}
-READ8_MEMBER(pacman_state::porky_port1_r)
+uint8_t pacman_state::porky_port1_r()
{
switch (m_maincpu->pc())
{
@@ -782,37 +782,37 @@ READ8_MEMBER(pacman_state::porky_port1_r)
*
************************************/
-READ8_MEMBER(pacman_state::rocktrv2_prot1_data_r)
+uint8_t pacman_state::rocktrv2_prot1_data_r()
{
return m_rocktrv2_prot_data[0] >> 4;
}
-READ8_MEMBER(pacman_state::rocktrv2_prot2_data_r)
+uint8_t pacman_state::rocktrv2_prot2_data_r()
{
return m_rocktrv2_prot_data[1] >> 4;
}
-READ8_MEMBER(pacman_state::rocktrv2_prot3_data_r)
+uint8_t pacman_state::rocktrv2_prot3_data_r()
{
return m_rocktrv2_prot_data[2] >> 4;
}
-READ8_MEMBER(pacman_state::rocktrv2_prot4_data_r)
+uint8_t pacman_state::rocktrv2_prot4_data_r()
{
return m_rocktrv2_prot_data[3] >> 4;
}
-WRITE8_MEMBER(pacman_state::rocktrv2_prot_data_w)
+void pacman_state::rocktrv2_prot_data_w(offs_t offset, uint8_t data)
{
m_rocktrv2_prot_data[offset] = data;
}
-WRITE8_MEMBER(pacman_state::rocktrv2_question_bank_w)
+void pacman_state::rocktrv2_question_bank_w(uint8_t data)
{
m_rocktrv2_question_bank = data;
}
-READ8_MEMBER(pacman_state::rocktrv2_question_r)
+uint8_t pacman_state::rocktrv2_question_r(offs_t offset)
{
uint8_t *question = memregion("user1")->base();
@@ -962,21 +962,21 @@ void pacman_state::superabc_bank_w(uint8_t data)
#define mspacman_disable_decode_latch(m) m.root_device().membank("bank1")->set_entry(0)
// any access to these ROM addresses disables the decoder, and all you see is the original Pac-Man code
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x0038){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x0038]; }
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x03b0){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x03b0]; }
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x1600){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x1600]; }
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x2120){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x2120]; }
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x3ff0){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x3ff0]; }
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x8000){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x8000]; }
-READ8_MEMBER(pacman_state::mspacman_disable_decode_r_0x97f0){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x97f0]; }
-WRITE8_MEMBER(pacman_state::mspacman_disable_decode_w){ mspacman_disable_decode_latch(machine()); }
+uint8_t pacman_state::mspacman_disable_decode_r_0x0038(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x0038]; }
+uint8_t pacman_state::mspacman_disable_decode_r_0x03b0(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x03b0]; }
+uint8_t pacman_state::mspacman_disable_decode_r_0x1600(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x1600]; }
+uint8_t pacman_state::mspacman_disable_decode_r_0x2120(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x2120]; }
+uint8_t pacman_state::mspacman_disable_decode_r_0x3ff0(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x3ff0]; }
+uint8_t pacman_state::mspacman_disable_decode_r_0x8000(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x8000]; }
+uint8_t pacman_state::mspacman_disable_decode_r_0x97f0(offs_t offset){ mspacman_disable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x97f0]; }
+void pacman_state::mspacman_disable_decode_w(uint8_t data){ mspacman_disable_decode_latch(machine()); }
// any access to these ROM addresses enables the decoder, and you'll see the Ms. Pac-Man code
-READ8_MEMBER(pacman_state::mspacman_enable_decode_r_0x3ff8){ mspacman_enable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x3ff8+0x10000]; }
-WRITE8_MEMBER(pacman_state::mspacman_enable_decode_w){ mspacman_enable_decode_latch(machine()); }
+uint8_t pacman_state::mspacman_enable_decode_r_0x3ff8(offs_t offset){ mspacman_enable_decode_latch(machine()); return memregion("maincpu")->base()[offset+0x3ff8+0x10000]; }
+void pacman_state::mspacman_enable_decode_w(uint8_t data){ mspacman_enable_decode_latch(machine()); }
-READ8_MEMBER(pacman_state::pacman_read_nop)
+uint8_t pacman_state::pacman_read_nop()
{
// Return value of reading the bus with no devices enabled.
// This seems to be common but more tests are needed. Ms Pacman reads bytes in sequence
@@ -7196,9 +7196,9 @@ ROM_END
void pacman_state::init_maketrax()
{
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x5004, 0x5004, write8_delegate(*this, FUNC(pacman_state::maketrax_protection_w)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x5080, 0x50bf, read8_delegate(*this, FUNC(pacman_state::maketrax_special_port2_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x50c0, 0x50ff, read8_delegate(*this, FUNC(pacman_state::maketrax_special_port3_r)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x5004, 0x5004, write8smo_delegate(*this, FUNC(pacman_state::maketrax_protection_w)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x5080, 0x50bf, read8sm_delegate(*this, FUNC(pacman_state::maketrax_special_port2_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x50c0, 0x50ff, read8sm_delegate(*this, FUNC(pacman_state::maketrax_special_port3_r)));
save_item(NAME(m_maketrax_disable_protection));
save_item(NAME(m_maketrax_offset));
@@ -7208,7 +7208,7 @@ void pacman_state::init_maketrax()
void pacman_state::init_mbrush()
{
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x5080, 0x50ff, read8_delegate(*this, FUNC(pacman_state::mbrush_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x5080, 0x50ff, read8sm_delegate(*this, FUNC(pacman_state::mbrush_prot_r)));
}
void pacman_state::init_ponpoko()
@@ -7489,7 +7489,7 @@ void pacman_state::init_mspacmbe()
}
}
-READ8_MEMBER(pacman_state::mspacii_protection_r)
+uint8_t pacman_state::mspacii_protection_r(offs_t offset)
{
/* used by extra routine at $3FE, bit 4 of 504d needs to be low, and of 504e to be high */
uint8_t data = ioport("IN1")->read();
@@ -7499,7 +7499,7 @@ READ8_MEMBER(pacman_state::mspacii_protection_r)
void pacman_state::init_mspacii()
{
// protection
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x504d, 0x506f, read8_delegate(*this, FUNC(pacman_state::mspacii_protection_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x504d, 0x506f, read8sm_delegate(*this, FUNC(pacman_state::mspacii_protection_r)));
}
void pacman_state::init_superabc()
@@ -7512,7 +7512,7 @@ void pacman_state::init_superabc()
dest[i] = src[bitswap<24>(i,23,22,21,20,19,18,17, 12,13,14,16,15, 11,10,9,8,7,6,5,4,3,2,1,0)];
}
-READ8_MEMBER(pacman_state::cannonbp_protection_r)
+uint8_t pacman_state::cannonbp_protection_r(offs_t offset)
{
/* At 6p where a rom would usually be there is an epoxy resin chip with 'Novomatic Industrie' Cannon Ball tm 1984 label. */
/* As I have no clue about what shall be in this chip, what follows is only a simulation which is enough to play the game. */
@@ -7562,7 +7562,7 @@ void pacman_state::init_cannonbp()
m_maincpu->space(AS_PROGRAM).install_ram(0x4800, 0x4bff);
/* protection? */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x3000, 0x3fff, read8_delegate(*this, FUNC(pacman_state::cannonbp_protection_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x3000, 0x3fff, read8sm_delegate(*this, FUNC(pacman_state::cannonbp_protection_r)));
}
void pacman_state::init_pengomc1()
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index b14cf664010..70c9d9a8fea 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -65,7 +65,7 @@ WRITE_LINE_MEMBER(pandoras_state::cpub_irq_enable_w)
m_irq_enable_b = state;
}
-WRITE8_MEMBER(pandoras_state::pandoras_cpua_irqtrigger_w)
+void pandoras_state::pandoras_cpua_irqtrigger_w(uint8_t data)
{
if (!m_firq_old_data_a && data)
m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE);
@@ -73,7 +73,7 @@ WRITE8_MEMBER(pandoras_state::pandoras_cpua_irqtrigger_w)
m_firq_old_data_a = data;
}
-WRITE8_MEMBER(pandoras_state::pandoras_cpub_irqtrigger_w)
+void pandoras_state::pandoras_cpub_irqtrigger_w(uint8_t data)
{
if (!m_firq_old_data_b && data)
m_subcpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE);
@@ -81,7 +81,7 @@ WRITE8_MEMBER(pandoras_state::pandoras_cpub_irqtrigger_w)
m_firq_old_data_b = data;
}
-WRITE8_MEMBER(pandoras_state::pandoras_i8039_irqtrigger_w)
+void pandoras_state::pandoras_i8039_irqtrigger_w(uint8_t data)
{
m_mcu->set_input_line(0, ASSERT_LINE);
}
@@ -96,7 +96,7 @@ void pandoras_state::i8039_irqen_and_status_w(uint8_t data)
m_i8039_status = (data & 0x20) >> 5;
}
-WRITE8_MEMBER(pandoras_state::pandoras_z80_irqtrigger_w)
+void pandoras_state::pandoras_z80_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp
index 6db7f5a39be..39034aa2716 100644
--- a/src/mame/drivers/paradise.cpp
+++ b/src/mame/drivers/paradise.cpp
@@ -101,7 +101,7 @@ sticker from Jan 95 and factory sticker 94*41.
***************************************************************************/
-WRITE8_MEMBER(paradise_state::rombank_w)
+void paradise_state::rombank_w(uint8_t data)
{
int bank = data;
int bank_n = memregion("maincpu")->bytes() / 0x4000;
@@ -115,7 +115,7 @@ WRITE8_MEMBER(paradise_state::rombank_w)
membank("prgbank")->set_entry(bank);
}
-WRITE8_MEMBER(paradise_state::paradise_okibank_w)
+void paradise_state::paradise_okibank_w(uint8_t data)
{
if (data & ~0x02)
logerror("%s: unknown oki bank bits %02X\n", machine().describe_context(), data);
@@ -123,7 +123,7 @@ WRITE8_MEMBER(paradise_state::paradise_okibank_w)
m_oki2->set_rom_bank((data & 0x02) >> 1);
}
-WRITE8_MEMBER(paradise_state::torus_coin_counter_w)
+void paradise_state::torus_coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data ^ 0xff);
}
@@ -1408,14 +1408,14 @@ void paradise_state::init_paradise()
void paradise_state::init_tgtball()
{
m_sprite_inc = 4;
- m_maincpu->space(AS_IO).install_write_handler(0x2001, 0x2001, write8_delegate(*this, FUNC(paradise_state::tgtball_flipscreen_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0x2001, 0x2001, write8smo_delegate(*this, FUNC(paradise_state::tgtball_flipscreen_w)));
}
void paradise_state::init_torus()
{
m_sprite_inc = 4;
- m_maincpu->space(AS_IO).install_write_handler(0x2070, 0x2070, write8_delegate(*this, FUNC(paradise_state::torus_coin_counter_w)));
+ m_maincpu->space(AS_IO).install_write_handler(0x2070, 0x2070, write8smo_delegate(*this, FUNC(paradise_state::torus_coin_counter_w)));
}
diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp
index 7366c97c11d..f9cf3374adf 100644
--- a/src/mame/drivers/parodius.cpp
+++ b/src/mame/drivers/parodius.cpp
@@ -20,7 +20,7 @@
#include "speaker.h"
-WRITE8_MEMBER(parodius_state::parodius_videobank_w)
+void parodius_state::parodius_videobank_w(uint8_t data)
{
if (data & 0xf8)
logerror("%04x: videobank = %02x\n",m_maincpu->pc(),data);
@@ -37,7 +37,7 @@ WRITE8_MEMBER(parodius_state::parodius_videobank_w)
m_bank2000->set_bank((data & 2) >> 1);
}
-WRITE8_MEMBER(parodius_state::parodius_3fc0_w)
+void parodius_state::parodius_3fc0_w(uint8_t data)
{
if ((data & 0xf4) != 0x10)
logerror("%04x: 3fc0 = %02x\n",m_maincpu->pc(),data);
@@ -52,7 +52,7 @@ WRITE8_MEMBER(parodius_state::parodius_3fc0_w)
/* other bits unknown */
}
-WRITE8_MEMBER(parodius_state::parodius_sh_irqtrigger_w)
+void parodius_state::parodius_sh_irqtrigger_w(uint8_t data)
{
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
@@ -78,7 +78,7 @@ void parodius_state::device_timer(emu_timer &timer, device_timer_id id, int para
}
}
-WRITE8_MEMBER(parodius_state::sound_arm_nmi_w)
+void parodius_state::sound_arm_nmi_w(uint8_t data)
{
m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
timer_set(attotime::from_usec(50), TIMER_NMI); /* kludge until the K053260 is emulated correctly */
diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp
index f3a4ffcdb5e..033cdd32271 100644
--- a/src/mame/drivers/pbaction.cpp
+++ b/src/mame/drivers/pbaction.cpp
@@ -105,7 +105,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
#include "pbactiont.lh"
-WRITE8_MEMBER(pbaction_state::pbaction_sh_command_w)
+void pbaction_state::pbaction_sh_command_w(uint8_t data)
{
m_soundlatch->write(data);
m_soundcommand_timer->adjust(attotime::zero, 0);
@@ -117,7 +117,7 @@ TIMER_CALLBACK_MEMBER(pbaction_state::sound_trigger)
m_ctc->trg0(1);
}
-WRITE8_MEMBER(pbaction_state::nmi_mask_w)
+void pbaction_state::nmi_mask_w(uint8_t data)
{
m_nmi_mask = data & 1;
if (!m_nmi_mask)
@@ -150,14 +150,14 @@ void pbaction_state::decrypted_opcodes_map(address_map &map)
}
-READ8_MEMBER(pbaction_state::sound_data_r)
+uint8_t pbaction_state::sound_data_r()
{
if (!machine().side_effects_disabled())
m_audiocpu->set_input_line(0, CLEAR_LINE);
return m_soundlatch->read();
}
-WRITE8_MEMBER(pbaction_state::sound_irq_ack_w)
+void pbaction_state::sound_irq_ack_w(uint8_t data)
{
m_audiocpu->set_input_line(0, CLEAR_LINE);
machine().scheduler().synchronize();
@@ -203,7 +203,7 @@ WRITE_LINE_MEMBER(pbaction_tecfri_state::sub8001_w)
}
}
-WRITE8_MEMBER(pbaction_tecfri_state::sub8008_w)
+void pbaction_tecfri_state::sub8008_w(uint8_t data)
{
if (data != 0x00)
{
@@ -233,23 +233,23 @@ WRITE8_MEMBER(pbaction_tecfri_state::sub8008_w)
}
}
-WRITE8_MEMBER(pbaction_tecfri_state::subtomain_w)
+void pbaction_tecfri_state::subtomain_w(uint8_t data)
{
//m_subtomainlatch->write(data); // where does this go if it can't go to maincpu?
}
-READ8_MEMBER(pbaction_tecfri_state::maintosub_r)
+uint8_t pbaction_tecfri_state::maintosub_r()
{
return m_maintosublatch->read();
}
-READ8_MEMBER(pbaction_tecfri_state::subcpu_r)
+uint8_t pbaction_tecfri_state::subcpu_r()
{
return 0x00; // other values stop the flippers from working? are there different inputs from the custom cabinet in here somehow?
// return m_subtomainlatch->read();
}
-WRITE8_MEMBER(pbaction_tecfri_state::subcpu_w)
+void pbaction_tecfri_state::subcpu_w(uint8_t data)
{
m_maintosublatch->write(data);
m_subcommand_timer->adjust(attotime::zero, 0);
@@ -682,7 +682,7 @@ ROM_START( pbactiont )
ROM_LOAD( "b-f7.bin", 0x04000, 0x2000, CRC(af6e9817) SHA1(56f47d25761b3850c49a3a81b5ea35f12bd77b14) )
ROM_END
-READ8_MEMBER(pbaction_state::pbaction2_prot_kludge_r)
+uint8_t pbaction_state::pbaction2_prot_kludge_r()
{
/* on startup, the game expect this location to NOT act as RAM */
if (m_maincpu->pc() == 0xab80)
@@ -700,7 +700,7 @@ void pbaction_state::init_pbaction2()
rom[i] = bitswap<8>(rom[i], 7,6,5,4,1,2,3,0);
// install a protection (?) workaround
- m_maincpu->space(AS_PROGRAM).install_read_handler(0xc000, 0xc000, read8_delegate(*this, FUNC(pbaction_state::pbaction2_prot_kludge_r)) );
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0xc000, 0xc000, read8smo_delegate(*this, FUNC(pbaction_state::pbaction2_prot_kludge_r)) );
}
diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp
index ffdfd572770..64a154884ad 100644
--- a/src/mame/drivers/pc4.cpp
+++ b/src/mame/drivers/pc4.cpp
@@ -34,7 +34,7 @@
#include "speaker.h"
-READ8_MEMBER( pc4_state::kb_r )
+uint8_t pc4_state::kb_r(offs_t offset)
{
uint8_t data = 0xff;
@@ -49,13 +49,13 @@ READ8_MEMBER( pc4_state::kb_r )
return data;
}
-WRITE8_MEMBER( pc4_state::bank_w )
+void pc4_state::bank_w(uint8_t data)
{
//printf("set bank %x\n", data);
m_rombank->set_entry(data&0x07);
}
-WRITE8_MEMBER( pc4_state::beep_w )
+void pc4_state::beep_w(uint8_t data)
{
m_beep->set_state(data&0x40);
}
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index 489141cca63..26c01fe5cae 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -182,7 +182,7 @@ inline void pc6001_state::set_maincpu_irq_line(uint8_t vector_num)
m_maincpu->set_input_line(0, ASSERT_LINE);
}
-WRITE8_MEMBER(pc6001_state::system_latch_w)
+void pc6001_state::system_latch_w(uint8_t data)
{
static const uint16_t startaddr[] = {0xC000, 0xE000, 0x8000, 0xA000 };
@@ -196,7 +196,7 @@ WRITE8_MEMBER(pc6001_state::system_latch_w)
}
-READ8_MEMBER(pc6001_state::nec_ppi8255_r)
+uint8_t pc6001_state::nec_ppi8255_r(offs_t offset)
{
if (offset==2)
return m_port_c_8255;
@@ -211,7 +211,7 @@ READ8_MEMBER(pc6001_state::nec_ppi8255_r)
return m_ppi->read(offset);
}
-WRITE8_MEMBER(pc6001_state::nec_ppi8255_w)
+void pc6001_state::nec_ppi8255_w(offs_t offset, uint8_t data)
{
if (offset==3)
{
@@ -425,7 +425,7 @@ static const uint32_t banksw_table_r1[0x10*4][4] = {
{ INVALID(0), INVALID(0), INVALID(0), INVALID(0) } //0x0f: <invalid setting>
};
-WRITE8_MEMBER(pc6001mk2_state::mk2_bank_r0_w)
+void pc6001mk2_state::mk2_bank_r0_w(uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
uint8_t *gfx_data = m_region_gfx1->base();
@@ -445,7 +445,7 @@ WRITE8_MEMBER(pc6001mk2_state::mk2_bank_r0_w)
m_bank4->set_base(&gfx_data[m_cgrom_bank_addr]);
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_bank_r1_w)
+void pc6001mk2_state::mk2_bank_r1_w(uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
@@ -461,12 +461,12 @@ WRITE8_MEMBER(pc6001mk2_state::mk2_bank_r1_w)
m_bank8->set_base(&ROM[banksw_table_r1[((data & 0xf0)>>4)+(m_bank_opt*0x10)][3]]);
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_bank_w0_w)
+void pc6001mk2_state::mk2_bank_w0_w(uint8_t data)
{
m_bank_w = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_opt_bank_w)
+void pc6001mk2_state::mk2_opt_bank_w(uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
uint8_t *gfx_data = m_region_gfx1->base();
@@ -494,56 +494,56 @@ WRITE8_MEMBER(pc6001mk2_state::mk2_opt_bank_w)
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram0_w)
+void pc6001mk2_state::mk2_work_ram0_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x01) ? WRAM(0) : EXWRAM(0))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram1_w)
+void pc6001mk2_state::mk2_work_ram1_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x01) ? WRAM(1) : EXWRAM(1))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram2_w)
+void pc6001mk2_state::mk2_work_ram2_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x04) ? WRAM(2) : EXWRAM(2))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram3_w)
+void pc6001mk2_state::mk2_work_ram3_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x04) ? WRAM(3) : EXWRAM(3))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram4_w)
+void pc6001mk2_state::mk2_work_ram4_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x10) ? WRAM(4) : EXWRAM(4))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram5_w)
+void pc6001mk2_state::mk2_work_ram5_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x10) ? WRAM(5) : EXWRAM(5))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram6_w)
+void pc6001mk2_state::mk2_work_ram6_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x40) ? WRAM(6) : EXWRAM(6))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_work_ram7_w)
+void pc6001mk2_state::mk2_work_ram7_w(offs_t offset, uint8_t data)
{
uint8_t *ROM = m_region_maincpu->base();
ROM[offset+((m_bank_w & 0x40) ? WRAM(7) : EXWRAM(7))] = data;
}
-WRITE8_MEMBER(pc6001mk2_state::necmk2_ppi8255_w)
+void pc6001mk2_state::necmk2_ppi8255_w(offs_t offset, uint8_t data)
{
if (offset==3)
{
@@ -581,7 +581,7 @@ void pc6001mk2_state::vram_bank_change(uint8_t vram_bank)
// popmessage("%02x",vram_bank);
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_system_latch_w)
+void pc6001mk2_state::mk2_system_latch_w(uint8_t data)
{
cassette_latch_control((data & 8) == 8);
m_sys_latch = data;
@@ -605,7 +605,7 @@ inline void pc6001mk2_state::refresh_crtc_params()
m_screen->configure(m_screen->width(), m_screen->height(), visarea, m_screen->frame_period().attoseconds());
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_vram_bank_w)
+void pc6001mk2_state::mk2_vram_bank_w(uint8_t data)
{
//static const uint32_t startaddr[] = {WRAM(6), WRAM(6), WRAM(0), WRAM(4) };
@@ -625,13 +625,13 @@ WRITE8_MEMBER(pc6001mk2_state::mk2_vram_bank_w)
// m_video_ram = work_ram + startaddr[(data >> 1) & 0x03];
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_col_bank_w)
+void pc6001mk2_state::mk2_col_bank_w(uint8_t data)
{
m_bgcol_bank = (data & 7);
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_0xf3_w)
+void pc6001mk2_state::mk2_0xf3_w(uint8_t data)
{
/*
x--- ---- M1 (?) wait setting
@@ -653,27 +653,27 @@ inline void pc6001_state::set_timer_divider(uint8_t data)
m_timer_irq_timer->adjust(period, 0, period);
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_timer_adj_w)
+void pc6001mk2_state::mk2_timer_adj_w(uint8_t data)
{
set_timer_divider(data);
}
-WRITE8_MEMBER(pc6001mk2_state::mk2_timer_irqv_w)
+void pc6001mk2_state::mk2_timer_irqv_w(uint8_t data)
{
m_timer_irq_vector = data;
}
-READ8_MEMBER(pc6001mk2_state::mk2_bank_r0_r)
+uint8_t pc6001mk2_state::mk2_bank_r0_r()
{
return m_bank_r0;
}
-READ8_MEMBER(pc6001mk2_state::mk2_bank_r1_r)
+uint8_t pc6001mk2_state::mk2_bank_r1_r()
{
return m_bank_r1;
}
-READ8_MEMBER(pc6001mk2_state::mk2_bank_w0_r)
+uint8_t pc6001mk2_state::mk2_bank_w0_r()
{
return m_bank_w;
}
@@ -732,12 +732,12 @@ void pc6001mk2_state::pc6001mk2_io(address_map &map)
// disk device placeholder
// TODO: identify & hook-up this FDC
-READ8_MEMBER(pc6601_state::fdc_r)
+uint8_t pc6601_state::fdc_r()
{
return machine().rand();
}
-WRITE8_MEMBER(pc6601_state::fdc_w)
+void pc6601_state::fdc_w(uint8_t data)
{
}
@@ -778,12 +778,12 @@ void pc6601_state::pc6601_io(address_map &map)
#define SR_NULL(_v_) \
0x80000+(0x1000*_v_)
-READ8_MEMBER(pc6001sr_state::sr_bank_rn_r)
+uint8_t pc6001sr_state::sr_bank_rn_r(offs_t offset)
{
return m_sr_bank_r[offset];
}
-WRITE8_MEMBER(pc6001sr_state::sr_bank_rn_w)
+void pc6001sr_state::sr_bank_rn_w(offs_t offset, uint8_t data)
{
memory_bank *bank[8] = { m_bank1, m_bank2, m_bank3, m_bank4, m_bank5, m_bank6, m_bank7, m_bank8 };
uint8_t *ROM = m_region_maincpu->base();
@@ -805,22 +805,22 @@ WRITE8_MEMBER(pc6001sr_state::sr_bank_rn_w)
}
}
-READ8_MEMBER(pc6001sr_state::sr_bank_wn_r)
+uint8_t pc6001sr_state::sr_bank_wn_r(offs_t offset)
{
return m_sr_bank_w[offset];
}
-WRITE8_MEMBER(pc6001sr_state::sr_bank_wn_w)
+void pc6001sr_state::sr_bank_wn_w(offs_t offset, uint8_t data)
{
m_sr_bank_w[offset] = data;
}
-WRITE8_MEMBER(pc6001sr_state::sr_bitmap_yoffs_w)
+void pc6001sr_state::sr_bitmap_yoffs_w(uint8_t data)
{
m_bitmap_yoffs = data;
}
-WRITE8_MEMBER(pc6001sr_state::sr_bitmap_xoffs_w)
+void pc6001sr_state::sr_bitmap_xoffs_w(uint8_t data)
{
m_bitmap_xoffs = data;
}
@@ -836,7 +836,7 @@ WRITE8_MEMBER(pc6001sr_state::sr_bitmap_xoffs_w)
ROM[offset+(SR_EXRAM0(bank_num))] = data; \
}
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram0_w)
+void pc6001sr_state::sr_work_ram0_w(offs_t offset, uint8_t data)
{
// TODO: not entirely correct
if(m_sr_text_mode == false && m_sr_bank_w[0] == 0)
@@ -850,15 +850,15 @@ WRITE8_MEMBER(pc6001sr_state::sr_work_ram0_w)
SR_WRAM_BANK_W(0);
}
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram1_w){ SR_WRAM_BANK_W(1); }
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram2_w){ SR_WRAM_BANK_W(2); }
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram3_w){ SR_WRAM_BANK_W(3); }
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram4_w){ SR_WRAM_BANK_W(4); }
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram5_w){ SR_WRAM_BANK_W(5); }
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram6_w){ SR_WRAM_BANK_W(6); }
-WRITE8_MEMBER(pc6001sr_state::sr_work_ram7_w){ SR_WRAM_BANK_W(7); }
+void pc6001sr_state::sr_work_ram1_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(1); }
+void pc6001sr_state::sr_work_ram2_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(2); }
+void pc6001sr_state::sr_work_ram3_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(3); }
+void pc6001sr_state::sr_work_ram4_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(4); }
+void pc6001sr_state::sr_work_ram5_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(5); }
+void pc6001sr_state::sr_work_ram6_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(6); }
+void pc6001sr_state::sr_work_ram7_w(offs_t offset, uint8_t data){ SR_WRAM_BANK_W(7); }
-WRITE8_MEMBER(pc6001sr_state::sr_mode_w)
+void pc6001sr_state::sr_mode_w(uint8_t data)
{
// if 1 text mode else bitmap mode
m_sr_text_mode = bool(BIT(data,3));
@@ -869,12 +869,12 @@ WRITE8_MEMBER(pc6001sr_state::sr_mode_w)
assert("PC-6001SR in Mk-2 compatibility mode not yet supported!\n");
}
-WRITE8_MEMBER(pc6001sr_state::sr_vram_bank_w)
+void pc6001sr_state::sr_vram_bank_w(uint8_t data)
{
set_videoram_bank(0x70000 + ((data & 0x0f)*0x1000));
}
-WRITE8_MEMBER(pc6001sr_state::sr_system_latch_w)
+void pc6001sr_state::sr_system_latch_w(uint8_t data)
{
cassette_latch_control((data & 8) == 8);
m_sys_latch = data;
@@ -885,7 +885,7 @@ WRITE8_MEMBER(pc6001sr_state::sr_system_latch_w)
//printf("%02x B0\n",data);
}
-WRITE8_MEMBER(pc6001sr_state::necsr_ppi8255_w)
+void pc6001sr_state::necsr_ppi8255_w(offs_t offset, uint8_t data)
{
if (offset==3)
{
@@ -905,7 +905,7 @@ WRITE8_MEMBER(pc6001sr_state::necsr_ppi8255_w)
m_ppi->write(offset,data);
}
-READ8_MEMBER(pc6001sr_state::hw_rev_r)
+uint8_t pc6001sr_state::hw_rev_r()
{
// bit 1 is active for pc6601sr, causes a direct jump to "video telopper" for pc6001mk2sr
return 0;
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index d46cb293930..5cf12026495 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -30,7 +30,7 @@
/* Read/Write Handlers */
-WRITE8_MEMBER( pc8001_state::port10_w )
+void pc8001_state::port10_w(uint8_t data)
{
/*
@@ -57,7 +57,7 @@ WRITE8_MEMBER( pc8001_state::port10_w )
m_cent_data_out->write(data);
}
-WRITE8_MEMBER( pc8001_state::port30_w )
+void pc8001_state::port30_w(uint8_t data)
{
/*
@@ -84,7 +84,7 @@ WRITE8_MEMBER( pc8001_state::port30_w )
m_cassette->change_state(BIT(data,3) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
}
-WRITE8_MEMBER( pc8001mk2_state::port31_w )
+void pc8001mk2_state::port31_w(uint8_t data)
{
/*
@@ -112,7 +112,7 @@ WRITE_LINE_MEMBER( pc8001_state::write_centronics_ack )
m_centronics_ack = state;
}
-READ8_MEMBER( pc8001_state::port40_r )
+uint8_t pc8001_state::port40_r()
{
/*
@@ -139,7 +139,7 @@ READ8_MEMBER( pc8001_state::port40_r )
return data;
}
-WRITE8_MEMBER( pc8001_state::port40_w )
+void pc8001_state::port40_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp
index c3dcd4be00b..ad6e29ccbe4 100644
--- a/src/mame/drivers/pc8401a.cpp
+++ b/src/mame/drivers/pc8401a.cpp
@@ -169,7 +169,7 @@ void pc8401a_state::bankswitch(uint8_t data)
}
}
-WRITE8_MEMBER( pc8401a_state::mmr_w )
+void pc8401a_state::mmr_w(uint8_t data)
{
/*
@@ -194,12 +194,12 @@ WRITE8_MEMBER( pc8401a_state::mmr_w )
m_mmr = data;
}
-READ8_MEMBER( pc8401a_state::mmr_r )
+uint8_t pc8401a_state::mmr_r()
{
return m_mmr;
}
-READ8_MEMBER( pc8401a_state::rtc_r )
+uint8_t pc8401a_state::rtc_r()
{
/*
@@ -219,7 +219,7 @@ READ8_MEMBER( pc8401a_state::rtc_r )
return (m_rtc->data_out_r() << 1) | (m_rtc->tp_r() << 2);
}
-WRITE8_MEMBER( pc8401a_state::rtc_cmd_w )
+void pc8401a_state::rtc_cmd_w(uint8_t data)
{
/*
@@ -242,7 +242,7 @@ WRITE8_MEMBER( pc8401a_state::rtc_cmd_w )
m_rtc->data_in_w(BIT(data, 3));
}
-WRITE8_MEMBER( pc8401a_state::rtc_ctrl_w )
+void pc8401a_state::rtc_ctrl_w(uint8_t data)
{
/*
@@ -264,13 +264,13 @@ WRITE8_MEMBER( pc8401a_state::rtc_ctrl_w )
m_rtc->clk_w(BIT(data, 2));
}
-READ8_MEMBER( pc8401a_state::io_rom_data_r )
+uint8_t pc8401a_state::io_rom_data_r()
{
//logerror("I/O ROM read from %05x\n", m_io_addr);
return m_io_cart->read_rom(m_io_addr);
}
-WRITE8_MEMBER( pc8401a_state::io_rom_addr_w )
+void pc8401a_state::io_rom_addr_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -292,7 +292,7 @@ WRITE8_MEMBER( pc8401a_state::io_rom_addr_w )
}
}
-READ8_MEMBER( pc8401a_state::port70_r )
+uint8_t pc8401a_state::port70_r()
{
/*
@@ -312,17 +312,17 @@ READ8_MEMBER( pc8401a_state::port70_r )
return 0x10 | m_key_strobe;
}
-READ8_MEMBER( pc8401a_state::port71_r )
+uint8_t pc8401a_state::port71_r()
{
return m_key_latch;
}
-WRITE8_MEMBER( pc8401a_state::port70_w )
+void pc8401a_state::port70_w(uint8_t data)
{
m_key_strobe = 0;
}
-WRITE8_MEMBER( pc8401a_state::port71_w )
+void pc8401a_state::port71_w(uint8_t data)
{
m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index a1a8764ee4e..8733c5cde34 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -661,7 +661,7 @@ uint32_t pc8801_state::screen_update( screen_device &screen, bitmap_ind16 &bitma
return 0;
}
-READ8_MEMBER(pc8801_state::pc8801_alu_r)
+uint8_t pc8801_state::pc8801_alu_r(offs_t offset)
{
int i;
uint8_t b,r,g;
@@ -680,7 +680,7 @@ READ8_MEMBER(pc8801_state::pc8801_alu_r)
return b & r & g;
}
-WRITE8_MEMBER(pc8801_state::pc8801_alu_w)
+void pc8801_state::pc8801_alu_w(offs_t offset, uint8_t data)
{
int i;
@@ -723,17 +723,17 @@ WRITE8_MEMBER(pc8801_state::pc8801_alu_w)
}
-READ8_MEMBER(pc8801_state::pc8801_wram_r)
+uint8_t pc8801_state::pc8801_wram_r(offs_t offset)
{
return m_work_ram[offset];
}
-WRITE8_MEMBER(pc8801_state::pc8801_wram_w)
+void pc8801_state::pc8801_wram_w(offs_t offset, uint8_t data)
{
m_work_ram[offset] = data;
}
-READ8_MEMBER(pc8801_state::pc8801_ext_wram_r)
+uint8_t pc8801_state::pc8801_ext_wram_r(offs_t offset)
{
if(offset < m_extram_size)
return m_ext_work_ram[offset];
@@ -741,83 +741,83 @@ READ8_MEMBER(pc8801_state::pc8801_ext_wram_r)
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_ext_wram_w)
+void pc8801_state::pc8801_ext_wram_w(offs_t offset, uint8_t data)
{
if(offset < m_extram_size)
m_ext_work_ram[offset] = data;
}
-READ8_MEMBER(pc8801_state::pc8801_nbasic_rom_r)
+uint8_t pc8801_state::pc8801_nbasic_rom_r(offs_t offset)
{
return m_n80rom[offset];
}
-READ8_MEMBER(pc8801_state::pc8801_n88basic_rom_r)
+uint8_t pc8801_state::pc8801_n88basic_rom_r(offs_t offset)
{
return m_n88rom[offset];
}
-READ8_MEMBER(pc8801_state::pc8801_gvram_r)
+uint8_t pc8801_state::pc8801_gvram_r(offs_t offset)
{
return m_gvram[offset];
}
-WRITE8_MEMBER(pc8801_state::pc8801_gvram_w)
+void pc8801_state::pc8801_gvram_w(offs_t offset, uint8_t data)
{
m_gvram[offset] = data;
}
-READ8_MEMBER(pc8801_state::pc8801_high_wram_r)
+uint8_t pc8801_state::pc8801_high_wram_r(offs_t offset)
{
return m_hi_work_ram[offset];
}
-WRITE8_MEMBER(pc8801_state::pc8801_high_wram_w)
+void pc8801_state::pc8801_high_wram_w(offs_t offset, uint8_t data)
{
m_hi_work_ram[offset] = data;
}
-READ8_MEMBER(pc8801_state::pc8801ma_dic_r)
+uint8_t pc8801_state::pc8801ma_dic_r(offs_t offset)
{
uint8_t *dic_rom = memregion("dictionary")->base();
return dic_rom[offset];
}
-READ8_MEMBER(pc8801_state::pc8801_cdbios_rom_r)
+uint8_t pc8801_state::pc8801_cdbios_rom_r(offs_t offset)
{
uint8_t *cdrom_bios = memregion("cdrom")->base();
return cdrom_bios[offset];
}
-READ8_MEMBER(pc8801_state::pc8801_mem_r)
+uint8_t pc8801_state::pc8801_mem_r(offs_t offset)
{
if(offset <= 0x7fff)
{
if(m_extram_mode & 1)
- return pc8801_ext_wram_r(space,offset | (m_extram_bank * 0x8000));
+ return pc8801_ext_wram_r(offset | (m_extram_bank * 0x8000));
if(m_gfx_ctrl & 2)
- return pc8801_wram_r(space,offset);
+ return pc8801_wram_r(offset);
if(m_has_cdrom && m_cdrom_reg[9] & 0x10)
- return pc8801_cdbios_rom_r(space,(offset & 0x7fff) | ((m_gfx_ctrl & 4) ? 0x8000 : 0x0000));
+ return pc8801_cdbios_rom_r((offset & 0x7fff) | ((m_gfx_ctrl & 4) ? 0x8000 : 0x0000));
if(m_gfx_ctrl & 4)
- return pc8801_nbasic_rom_r(space,offset);
+ return pc8801_nbasic_rom_r(offset);
if(offset >= 0x6000 && offset <= 0x7fff && ((m_ext_rom_bank & 1) == 0))
- return pc8801_n88basic_rom_r(space,0x8000 + (offset & 0x1fff) + (0x2000 * (m_misc_ctrl & 3)));
+ return pc8801_n88basic_rom_r(0x8000 + (offset & 0x1fff) + (0x2000 * (m_misc_ctrl & 3)));
- return pc8801_n88basic_rom_r(space,offset);
+ return pc8801_n88basic_rom_r(offset);
}
else if(offset >= 0x8000 && offset <= 0x83ff) // work RAM window
{
uint32_t window_offset;
if(m_gfx_ctrl & 6) //wram read select or n basic select banks this as normal wram
- return pc8801_wram_r(space,offset);
+ return pc8801_wram_r(offset);
window_offset = (offset & 0x3ff) + (m_window_offset_bank << 8);
@@ -825,18 +825,18 @@ READ8_MEMBER(pc8801_state::pc8801_mem_r)
printf("Read from 0xf000 - 0xffff window offset\n"); //accessed by Castle Excellent, no noticeable quirk
if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10))
- return pc8801_high_wram_r(space,window_offset & 0xfff);
+ return pc8801_high_wram_r(window_offset & 0xfff);
- return pc8801_wram_r(space,window_offset);
+ return pc8801_wram_r(window_offset);
}
else if(offset >= 0x8400 && offset <= 0xbfff)
{
- return pc8801_wram_r(space,offset);
+ return pc8801_wram_r(offset);
}
else if(offset >= 0xc000 && offset <= 0xffff)
{
if(m_has_dictionary && m_dic_ctrl)
- return pc8801ma_dic_r(space,(offset & 0x3fff) + ((m_dic_bank & 0x1f) * 0x4000));
+ return pc8801ma_dic_r((offset & 0x3fff) + ((m_dic_bank & 0x1f) * 0x4000));
if(m_misc_ctrl & 0x40)
{
@@ -844,38 +844,38 @@ READ8_MEMBER(pc8801_state::pc8801_mem_r)
m_vram_sel = 3;
if(m_alu_ctrl2 & 0x80)
- return pc8801_alu_r(space,offset & 0x3fff);
+ return pc8801_alu_r(offset & 0x3fff);
}
if(m_vram_sel == 3)
{
if(offset >= 0xf000 && offset <= 0xffff && (m_misc_ctrl & 0x10))
- return pc8801_high_wram_r(space,offset & 0xfff);
+ return pc8801_high_wram_r(offset & 0xfff);
- return pc8801_wram_r(space,offset);
+ return pc8801_wram_r(offset);
}
- return pc8801_gvram_r(space,(offset & 0x3fff) + (0x4000 * m_vram_sel));
+ return pc8801_gvram_r((offset & 0x3fff) + (0x4000 * m_vram_sel));
}
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_mem_w)
+void pc8801_state::pc8801_mem_w(offs_t offset, uint8_t data)
{
if(offset <= 0x7fff)
{
if(m_extram_mode & 0x10)
- pc8801_ext_wram_w(space,offset | (m_extram_bank * 0x8000),data);
+ pc8801_ext_wram_w(offset | (m_extram_bank * 0x8000),data);
else
- pc8801_wram_w(space,offset,data);
+ pc8801_wram_w(offset,data);
return;
}
else if(offset >= 0x8000 && offset <= 0x83ff)
{
if(m_gfx_ctrl & 6) //wram read select or n basic select banks this as normal wram
- pc8801_wram_w(space,offset,data);
+ pc8801_wram_w(offset,data);
else
{
uint32_t window_offset;
@@ -886,16 +886,16 @@ WRITE8_MEMBER(pc8801_state::pc8801_mem_w)
printf("Write to 0xf000 - 0xffff window offset\n"); //accessed by Castle Excellent, no noticeable quirk
if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10))
- pc8801_high_wram_w(space,window_offset & 0xfff,data);
+ pc8801_high_wram_w(window_offset & 0xfff,data);
else
- pc8801_wram_w(space,window_offset,data);
+ pc8801_wram_w(window_offset,data);
}
return;
}
else if(offset >= 0x8400 && offset <= 0xbfff)
{
- pc8801_wram_w(space,offset,data);
+ pc8801_wram_w(offset,data);
return;
}
else if(offset >= 0xc000 && offset <= 0xffff)
@@ -907,7 +907,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_mem_w)
if(m_alu_ctrl2 & 0x80)
{
- pc8801_alu_w(space,offset & 0x3fff,data);
+ pc8801_alu_w(offset & 0x3fff,data);
return;
}
}
@@ -916,15 +916,15 @@ WRITE8_MEMBER(pc8801_state::pc8801_mem_w)
{
if(offset >= 0xf000 && offset <= 0xffff && (m_misc_ctrl & 0x10))
{
- pc8801_high_wram_w(space,offset & 0xfff,data);
+ pc8801_high_wram_w(offset & 0xfff,data);
return;
}
- pc8801_wram_w(space,offset,data);
+ pc8801_wram_w(offset,data);
return;
}
- pc8801_gvram_w(space,(offset & 0x3fff) + (0x4000 * m_vram_sel),data);
+ pc8801_gvram_w((offset & 0x3fff) + (0x4000 * m_vram_sel),data);
return;
}
}
@@ -934,7 +934,7 @@ void pc8801_state::pc8801_mem(address_map &map)
map(0x0000, 0xffff).rw(FUNC(pc8801_state::pc8801_mem_r), FUNC(pc8801_state::pc8801_mem_w));
}
-READ8_MEMBER(pc8801_state::pc8801_ctrl_r)
+uint8_t pc8801_state::pc8801_ctrl_r()
{
/*
11-- ----
@@ -948,7 +948,7 @@ READ8_MEMBER(pc8801_state::pc8801_ctrl_r)
return ioport("CTRL")->read();
}
-WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w)
+void pc8801_state::pc8801_ctrl_w(uint8_t data)
{
/*
x--- ---- SING (buzzer mask?)
@@ -1000,12 +1000,12 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w)
m_device_ctrl_data = data;
}
-READ8_MEMBER(pc8801_state::pc8801_ext_rom_bank_r)
+uint8_t pc8801_state::pc8801_ext_rom_bank_r()
{
return m_ext_rom_bank;
}
-WRITE8_MEMBER(pc8801_state::pc8801_ext_rom_bank_w)
+void pc8801_state::pc8801_ext_rom_bank_w(uint8_t data)
{
m_ext_rom_bank = data;
}
@@ -1043,7 +1043,7 @@ void pc8801_state::pc8801_dynamic_res_change(void)
m_screen->configure(xsize, ysize, visarea, refresh);
}
-WRITE8_MEMBER(pc8801_state::pc8801_gfx_ctrl_w)
+void pc8801_state::pc8801_gfx_ctrl_w(uint8_t data)
{
/*
--x- ---- ???
@@ -1059,19 +1059,19 @@ WRITE8_MEMBER(pc8801_state::pc8801_gfx_ctrl_w)
pc8801_dynamic_res_change();
}
-READ8_MEMBER(pc8801_state::pc8801_vram_select_r)
+uint8_t pc8801_state::pc8801_vram_select_r()
{
return 0xf8 | ((m_vram_sel == 3) ? 0 : (1 << m_vram_sel));
}
-WRITE8_MEMBER(pc8801_state::pc8801_vram_select_w)
+void pc8801_state::pc8801_vram_select_w(offs_t offset, uint8_t data)
{
m_vram_sel = offset & 3;
}
#if USE_PROPER_I8214
-WRITE8_MEMBER(pc8801_state::i8214_irq_level_w)
+void pc8801_state::i8214_irq_level_w(uint8_t data)
{
if(data & 8)
m_pic->b_w(7);
@@ -1079,7 +1079,7 @@ WRITE8_MEMBER(pc8801_state::i8214_irq_level_w)
m_pic->b_w(data & 0x07);
}
-WRITE8_MEMBER(pc8801_state::i8214_irq_mask_w)
+void pc8801_state::i8214_irq_mask_w(uint8_t data)
{
m_timer_irq_mask = data & 1;
m_vblank_irq_mask = data & 2;
@@ -1087,7 +1087,7 @@ WRITE8_MEMBER(pc8801_state::i8214_irq_mask_w)
#else
-WRITE8_MEMBER(pc8801_state::pc8801_irq_level_w)
+void pc8801_state::pc8801_irq_level_w(uint8_t data)
{
if(data & 8)
m_i8214_irq_level = 7;
@@ -1098,7 +1098,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_irq_level_w)
}
-WRITE8_MEMBER(pc8801_state::pc8801_irq_mask_w)
+void pc8801_state::pc8801_irq_mask_w(uint8_t data)
{
m_timer_irq_mask = data & 1;
m_vrtc_irq_mask = data & 2;
@@ -1119,28 +1119,28 @@ WRITE8_MEMBER(pc8801_state::pc8801_irq_mask_w)
}
#endif
-READ8_MEMBER(pc8801_state::pc8801_window_bank_r)
+uint8_t pc8801_state::pc8801_window_bank_r()
{
return m_window_offset_bank;
}
-WRITE8_MEMBER(pc8801_state::pc8801_window_bank_w)
+void pc8801_state::pc8801_window_bank_w(uint8_t data)
{
m_window_offset_bank = data;
}
-WRITE8_MEMBER(pc8801_state::pc8801_window_bank_inc_w)
+void pc8801_state::pc8801_window_bank_inc_w(uint8_t data)
{
m_window_offset_bank++;
m_window_offset_bank&=0xff;
}
-READ8_MEMBER(pc8801_state::pc8801_misc_ctrl_r)
+uint8_t pc8801_state::pc8801_misc_ctrl_r()
{
return m_misc_ctrl;
}
-WRITE8_MEMBER(pc8801_state::pc8801_misc_ctrl_w)
+void pc8801_state::pc8801_misc_ctrl_w(uint8_t data)
{
/*
x--- ---- sound irq mask, active low
@@ -1170,13 +1170,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_misc_ctrl_w)
#endif
}
-WRITE8_MEMBER(pc8801_state::pc8801_bgpal_w)
+void pc8801_state::pc8801_bgpal_w(uint8_t data)
{
if(data)
printf("BG Pal %02x\n",data);
}
-WRITE8_MEMBER(pc8801_state::pc8801_palram_w)
+void pc8801_state::pc8801_palram_w(offs_t offset, uint8_t data)
{
if(m_misc_ctrl & 0x20) //analog palette
{
@@ -1200,7 +1200,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_palram_w)
m_palette->set_pen_color(offset, pal3bit(m_palram[offset].r), pal3bit(m_palram[offset].g), pal3bit(m_palram[offset].b));
}
-WRITE8_MEMBER(pc8801_state::pc8801_layer_masking_w)
+void pc8801_state::pc8801_layer_masking_w(uint8_t data)
{
/*
---- x--- green gvram masked flag
@@ -1212,13 +1212,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_layer_masking_w)
m_layer_mask = data;
}
-READ8_MEMBER(pc8801_state::pc8801_crtc_param_r)
+uint8_t pc8801_state::pc8801_crtc_param_r()
{
printf("CRTC param reading\n");
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc88_crtc_param_w)
+void pc8801_state::pc88_crtc_param_w(uint8_t data)
{
if(m_crtc.param_count < 5)
{
@@ -1230,7 +1230,7 @@ WRITE8_MEMBER(pc8801_state::pc88_crtc_param_w)
}
}
-READ8_MEMBER(pc8801_state::pc8801_crtc_status_r)
+uint8_t pc8801_state::pc8801_crtc_status_r()
{
/*
---x ---- video enable
@@ -1257,7 +1257,7 @@ static const char *const crtc_command[] =
};
#endif
-WRITE8_MEMBER(pc8801_state::pc88_crtc_cmd_w)
+void pc8801_state::pc88_crtc_cmd_w(uint8_t data)
{
m_crtc.cmd = (data & 0xe0) >> 5;
m_crtc.param_count = 0;
@@ -1294,13 +1294,13 @@ WRITE8_MEMBER(pc8801_state::pc88_crtc_cmd_w)
// printf("CRTC cmd %s polled %02x\n",crtc_command[data >> 5],data & 0x1f);
}
-READ8_MEMBER(pc8801_state::pc8801_dmac_r)
+uint8_t pc8801_state::pc8801_dmac_r(offs_t offset)
{
printf("DMAC R %08x\n",offset);
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_dmac_w)
+void pc8801_state::pc8801_dmac_w(offs_t offset, uint8_t data)
{
if(offset & 1)
m_dma_counter[offset >> 1] = (m_dmac_ff) ? (m_dma_counter[offset >> 1]&0xff)|(data<<8) : (m_dma_counter[offset >> 1]&0xff00)|(data&0xff);
@@ -1310,13 +1310,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_dmac_w)
m_dmac_ff ^= 1;
}
-READ8_MEMBER(pc8801_state::pc8801_dmac_status_r)
+uint8_t pc8801_state::pc8801_dmac_status_r()
{
printf("DMAC R STATUS\n");
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_dmac_mode_w)
+void pc8801_state::pc8801_dmac_mode_w(uint8_t data)
{
m_dmac_mode = data;
m_dmac_ff = 0;
@@ -1325,12 +1325,12 @@ WRITE8_MEMBER(pc8801_state::pc8801_dmac_mode_w)
printf("%02x DMAC mode\n",data);
}
-READ8_MEMBER(pc8801_state::pc8801_extram_mode_r)
+uint8_t pc8801_state::pc8801_extram_mode_r()
{
return (m_extram_mode ^ 0x11) | 0xee;
}
-WRITE8_MEMBER(pc8801_state::pc8801_extram_mode_w)
+void pc8801_state::pc8801_extram_mode_w(uint8_t data)
{
/*
---x ---- Write EXT RAM access at 0x0000 - 0x7fff
@@ -1340,33 +1340,33 @@ WRITE8_MEMBER(pc8801_state::pc8801_extram_mode_w)
m_extram_mode = data & 0x11;
}
-READ8_MEMBER(pc8801_state::pc8801_extram_bank_r)
+uint8_t pc8801_state::pc8801_extram_bank_r()
{
return m_extram_bank;
}
-WRITE8_MEMBER(pc8801_state::pc8801_extram_bank_w)
+void pc8801_state::pc8801_extram_bank_w(uint8_t data)
{
m_extram_bank = data;
}
-WRITE8_MEMBER(pc8801_state::pc8801_alu_ctrl1_w)
+void pc8801_state::pc8801_alu_ctrl1_w(uint8_t data)
{
m_alu_ctrl1 = data;
}
-WRITE8_MEMBER(pc8801_state::pc8801_alu_ctrl2_w)
+void pc8801_state::pc8801_alu_ctrl2_w(uint8_t data)
{
m_alu_ctrl2 = data;
}
-WRITE8_MEMBER(pc8801_state::pc8801_pcg8100_w)
+void pc8801_state::pc8801_pcg8100_w(offs_t offset, uint8_t data)
{
if(data)
printf("Write to PCG-8100 %02x %02x\n",offset,data);
}
-WRITE8_MEMBER(pc8801_state::pc8801_txt_cmt_ctrl_w)
+void pc8801_state::pc8801_txt_cmt_ctrl_w(uint8_t data)
{
/* bits 2 to 5 are cmt related */
@@ -1377,7 +1377,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_txt_cmt_ctrl_w)
}
-READ8_MEMBER(pc8801_state::pc8801_kanji_r)
+uint8_t pc8801_state::pc8801_kanji_r(offs_t offset)
{
if((offset & 2) == 0)
return m_kanji_rom[m_knj_addr[0]*2+((offset & 1) ^ 1)];
@@ -1385,13 +1385,13 @@ READ8_MEMBER(pc8801_state::pc8801_kanji_r)
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_kanji_w)
+void pc8801_state::pc8801_kanji_w(offs_t offset, uint8_t data)
{
if((offset & 2) == 0)
m_knj_addr[0] = ((offset & 1) == 0) ? ((m_knj_addr[0]&0xff00)|(data&0xff)) : ((m_knj_addr[0]&0x00ff)|(data<<8));
}
-READ8_MEMBER(pc8801_state::pc8801_kanji_lv2_r)
+uint8_t pc8801_state::pc8801_kanji_lv2_r(offs_t offset)
{
if((offset & 2) == 0)
return m_kanji_rom[m_knj_addr[1]*2+((offset & 1) ^ 1)];
@@ -1399,27 +1399,27 @@ READ8_MEMBER(pc8801_state::pc8801_kanji_lv2_r)
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_kanji_lv2_w)
+void pc8801_state::pc8801_kanji_lv2_w(offs_t offset, uint8_t data)
{
if((offset & 2) == 0)
m_knj_addr[1] = ((offset & 1) == 0) ? ((m_knj_addr[1]&0xff00)|(data&0xff)) : ((m_knj_addr[1]&0x00ff)|(data<<8));
}
-WRITE8_MEMBER(pc8801_state::pc8801_dic_bank_w)
+void pc8801_state::pc8801_dic_bank_w(uint8_t data)
{
printf("JISHO BANK = %02x\n",data);
if(m_has_dictionary)
m_dic_bank = data & 0x1f;
}
-WRITE8_MEMBER(pc8801_state::pc8801_dic_ctrl_w)
+void pc8801_state::pc8801_dic_ctrl_w(uint8_t data)
{
printf("JISHO CTRL = %02x\n",data);
if(m_has_dictionary)
m_dic_ctrl = (data ^ 1) & 1;
}
-READ8_MEMBER(pc8801_state::pc8801_cdrom_r)
+uint8_t pc8801_state::pc8801_cdrom_r()
{
//printf("CD-ROM read [%02x]\n",offset);
@@ -1429,7 +1429,7 @@ READ8_MEMBER(pc8801_state::pc8801_cdrom_r)
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_cdrom_w)
+void pc8801_state::pc8801_cdrom_w(offs_t offset, uint8_t data)
{
/*
[9] ---x ---- CD-ROM BIOS bank
@@ -1441,7 +1441,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_cdrom_w)
m_cdrom_reg[offset] = data;
}
-READ8_MEMBER(pc8801_state::pc8801_cpuclock_r)
+uint8_t pc8801_state::pc8801_cpuclock_r()
{
if(m_has_clock_speed)
return 0x10 | m_clock_setting;
@@ -1449,7 +1449,7 @@ READ8_MEMBER(pc8801_state::pc8801_cpuclock_r)
return 0xff;
}
-READ8_MEMBER(pc8801_state::pc8801_baudrate_r)
+uint8_t pc8801_state::pc8801_baudrate_r()
{
if(m_has_clock_speed)
return 0xf0 | m_baudrate_val;
@@ -1457,13 +1457,13 @@ READ8_MEMBER(pc8801_state::pc8801_baudrate_r)
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_baudrate_w)
+void pc8801_state::pc8801_baudrate_w(uint8_t data)
{
if(m_has_clock_speed)
m_baudrate_val = data & 0xf;
}
-WRITE8_MEMBER(pc8801_state::pc8801_rtc_w)
+void pc8801_state::pc8801_rtc_w(uint8_t data)
{
m_rtc->c0_w((data & 1) >> 0);
m_rtc->c1_w((data & 2) >> 1);
@@ -1473,7 +1473,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_rtc_w)
/* TODO: remaining bits */
}
-READ8_MEMBER(pc8801_state::pc8801_sound_board_r)
+uint8_t pc8801_state::pc8801_sound_board_r(offs_t offset)
{
if(m_has_opna)
return m_opna->read(offset);
@@ -1481,7 +1481,7 @@ READ8_MEMBER(pc8801_state::pc8801_sound_board_r)
return (offset & 2) ? 0xff : m_opn->read(offset);
}
-WRITE8_MEMBER(pc8801_state::pc8801_sound_board_w)
+void pc8801_state::pc8801_sound_board_w(offs_t offset, uint8_t data)
{
if(m_has_opna)
m_opna->write(offset,data);
@@ -1489,7 +1489,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_sound_board_w)
m_opn->write(offset, data);
}
-READ8_MEMBER(pc8801_state::pc8801_opna_r)
+uint8_t pc8801_state::pc8801_opna_r(offs_t offset)
{
if(m_has_opna && (offset & 2) == 0)
return m_opna->read((offset & 1) | ((offset & 4) >> 1));
@@ -1497,7 +1497,7 @@ READ8_MEMBER(pc8801_state::pc8801_opna_r)
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_opna_w)
+void pc8801_state::pc8801_opna_w(offs_t offset, uint8_t data)
{
if(m_has_opna && (offset & 2) == 0)
m_opna->write((offset & 1) | ((offset & 4) >> 1),data);
@@ -1520,13 +1520,13 @@ WRITE8_MEMBER(pc8801_state::pc8801_opna_w)
}
}
-READ8_MEMBER(pc8801_state::pc8801_unk_r)
+uint8_t pc8801_state::pc8801_unk_r()
{
printf("Read port 0x33\n");
return 0xff;
}
-WRITE8_MEMBER(pc8801_state::pc8801_unk_w)
+void pc8801_state::pc8801_unk_w(uint8_t data)
{
printf("Write port 0x33\n");
}
@@ -1646,13 +1646,13 @@ TIMER_CALLBACK_MEMBER(pc8801_state::pc8801fd_upd765_tc_to_zero)
m_fdc->tc_w(false);
}
-WRITE8_MEMBER(pc8801_state::upd765_mc_w)
+void pc8801_state::upd765_mc_w(uint8_t data)
{
m_fdd[0]->get_device()->mon_w(!(data & 1));
m_fdd[1]->get_device()->mon_w(!(data & 2));
}
-READ8_MEMBER(pc8801_state::upd765_tc_r)
+uint8_t pc8801_state::upd765_tc_r()
{
//printf("%04x 1\n",m_fdccpu->pc());
@@ -1663,13 +1663,13 @@ READ8_MEMBER(pc8801_state::upd765_tc_r)
return 0xff; // value is meaningless
}
-WRITE8_MEMBER(pc8801_state::fdc_irq_vector_w)
+void pc8801_state::fdc_irq_vector_w(uint8_t data)
{
popmessage("Write to FDC IRQ vector I/O %02x, contact MESSdev\n",data);
m_fdc_irq_opcode = data;
}
-WRITE8_MEMBER(pc8801_state::fdc_drive_mode_w)
+void pc8801_state::fdc_drive_mode_w(uint8_t data)
{
logerror("FDC drive mode %02x\n", data);
m_fdd[0]->get_device()->set_rpm(data & 0x01 ? 360 : 300);
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index 350c09cbf77..1f6cc8ea76c 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -422,12 +422,12 @@ void pc88va_state::pc88va_map(address_map &map)
/* 0x40000 - 0x4ffff Kanji ROM 2*/
/* 0x50000 - 0x53fff Backup RAM */
/* above that is a NOP presumably */
-READ8_MEMBER(pc88va_state::kanji_ram_r)
+uint8_t pc88va_state::kanji_ram_r(offs_t offset)
{
return m_kanjiram[offset];
}
-WRITE8_MEMBER(pc88va_state::kanji_ram_w)
+void pc88va_state::kanji_ram_w(offs_t offset, uint8_t data)
{
// TODO: there's an area that can be write protected
m_kanjiram[offset] = data;
@@ -452,7 +452,7 @@ void pc88va_state::sysbank_map(address_map &map)
}
/* IDP = NEC uPD72022 */
-READ8_MEMBER(pc88va_state::idp_status_r)
+uint8_t pc88va_state::idp_status_r()
{
/*
x--- ---- LP Light-pen signal detection (with VA use failure)
@@ -482,7 +482,7 @@ READ8_MEMBER(pc88va_state::idp_status_r)
#define SPRSW 0x85
#define SPROV 0x81
-WRITE8_MEMBER(pc88va_state::idp_command_w)
+void pc88va_state::idp_command_w(uint8_t data)
{
switch(data)
{
@@ -697,7 +697,7 @@ void pc88va_state::execute_sprsw_cmd()
tsp_sprite_enable(m_tsp.spr_offset + (m_buf_ram[0] & 0xf8), (m_buf_ram[0] & 2) << 8);
}
-WRITE8_MEMBER(pc88va_state::idp_param_w)
+void pc88va_state::idp_param_w(uint8_t data)
{
if(m_cmd == DSPOFF || m_cmd == EXIT || m_cmd == SPROFF || m_cmd == SPROV) // no param commands
return;
@@ -727,7 +727,7 @@ WRITE8_MEMBER(pc88va_state::idp_param_w)
}
}
-WRITE16_MEMBER(pc88va_state::palette_ram_w)
+void pc88va_state::palette_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int r,g,b;
COMBINE_DATA(&m_palram[offset]);
@@ -739,7 +739,7 @@ WRITE16_MEMBER(pc88va_state::palette_ram_w)
m_palette->set_pen_color(offset,pal4bit(r),pal4bit(g),pal4bit(b));
}
-READ16_MEMBER(pc88va_state::sys_port4_r)
+uint16_t pc88va_state::sys_port4_r()
{
uint8_t vrtc,sw1;
vrtc = (m_screen->vpos() < 200) ? 0x20 : 0x00; // vblank
@@ -749,12 +749,12 @@ READ16_MEMBER(pc88va_state::sys_port4_r)
return vrtc | sw1 | 0xc0;
}
-READ16_MEMBER(pc88va_state::bios_bank_r)
+uint16_t pc88va_state::bios_bank_r()
{
return m_bank_reg;
}
-WRITE16_MEMBER(pc88va_state::bios_bank_w)
+void pc88va_state::bios_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/*
-x-- ---- ---- ---- SMM (compatibility mode)
@@ -784,12 +784,12 @@ WRITE16_MEMBER(pc88va_state::bios_bank_w)
}
}
-READ8_MEMBER(pc88va_state::rom_bank_r)
+uint8_t pc88va_state::rom_bank_r()
{
return 0xff; // bit 7 low is va91 rom bank status
}
-READ8_MEMBER(pc88va_state::key_r)
+uint8_t pc88va_state::key_r(offs_t offset)
{
// note row D bit 2 does something at POST ... some kind of test mode?
static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3",
@@ -800,22 +800,22 @@ READ8_MEMBER(pc88va_state::key_r)
return ioport(keynames[offset])->read();
}
-WRITE16_MEMBER(pc88va_state::backupram_wp_1_w)
+void pc88va_state::backupram_wp_1_w(uint16_t data)
{
m_backupram_wp = 1;
}
-WRITE16_MEMBER(pc88va_state::backupram_wp_0_w)
+void pc88va_state::backupram_wp_0_w(uint16_t data)
{
m_backupram_wp = 0;
}
-READ8_MEMBER(pc88va_state::hdd_status_r)
+uint8_t pc88va_state::hdd_status_r()
{
return 0x20;
}
-READ8_MEMBER(pc88va_state::pc88va_fdc_r)
+uint8_t pc88va_state::pc88va_fdc_r(offs_t offset)
{
printf("%08x\n",offset);
@@ -868,7 +868,7 @@ void pc88va_state::pc88va_fdc_update_ready(floppy_image_device *, int)
m_fdc->ready_w(ready);
}
-WRITE8_MEMBER(pc88va_state::pc88va_fdc_w)
+void pc88va_state::pc88va_fdc_w(offs_t offset, uint8_t data)
{
printf("%08x %02x\n",offset<<1,data);
switch(offset<<1)
@@ -945,7 +945,7 @@ WRITE8_MEMBER(pc88va_state::pc88va_fdc_w)
}
-READ16_MEMBER(pc88va_state::sysop_r)
+uint16_t pc88va_state::sysop_r()
{
uint8_t sys_op;
@@ -954,12 +954,12 @@ READ16_MEMBER(pc88va_state::sysop_r)
return 0xfffc | sys_op; // docs says all the other bits are high
}
-READ16_MEMBER(pc88va_state::screen_ctrl_r)
+uint16_t pc88va_state::screen_ctrl_r()
{
return m_screen_ctrl_reg;
}
-WRITE16_MEMBER(pc88va_state::screen_ctrl_w)
+void pc88va_state::screen_ctrl_w(uint16_t data)
{
m_screen_ctrl_reg = data;
}
@@ -974,7 +974,7 @@ TIMER_CALLBACK_MEMBER(pc88va_state::t3_mouse_callback)
}
}
-WRITE8_MEMBER(pc88va_state::timer3_ctrl_reg_w)
+void pc88va_state::timer3_ctrl_reg_w(uint8_t data)
{
/*
x--- ---- MINTEN (TCU irq enable)
@@ -991,12 +991,12 @@ WRITE8_MEMBER(pc88va_state::timer3_ctrl_reg_w)
}
}
-WRITE16_MEMBER(pc88va_state::video_pri_w)
+void pc88va_state::video_pri_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_video_pri_reg[offset]);
}
-READ8_MEMBER(pc88va_state::backupram_dsw_r)
+uint8_t pc88va_state::backupram_dsw_r(offs_t offset)
{
if(offset == 0)
return m_kanjiram[0x1fc2 / 2] & 0xff;
@@ -1004,13 +1004,13 @@ READ8_MEMBER(pc88va_state::backupram_dsw_r)
return m_kanjiram[0x1fc6 / 2] & 0xff;
}
-WRITE8_MEMBER(pc88va_state::sys_port1_w)
+void pc88va_state::sys_port1_w(uint8_t data)
{
// ...
}
#if !TEST_SUBFDC
-READ8_MEMBER(pc88va_state::no_subfdc_r)
+uint8_t pc88va_state::no_subfdc_r()
{
return machine().rand();
}
@@ -1107,19 +1107,19 @@ void pc88va_state::pc88va_z80_map(address_map &map)
map(0x4000, 0x7fff).ram();
}
-READ8_MEMBER(pc88va_state::upd765_tc_r)
+uint8_t pc88va_state::upd765_tc_r()
{
m_fdc->tc_w(true);
timer_set(attotime::from_usec(50), TIMER_PC8801FD_UPD765_TC_TO_ZERO);
return 0;
}
-WRITE8_MEMBER(pc88va_state::fdc_irq_vector_w)
+void pc88va_state::fdc_irq_vector_w(uint8_t data)
{
m_fdc_irq_opcode = data;
}
-WRITE8_MEMBER(pc88va_state::upd765_mc_w)
+void pc88va_state::upd765_mc_w(uint8_t data)
{
m_fdd[0]->get_device()->mon_w(!(data & 1));
m_fdd[1]->get_device()->mon_w(!(data & 2));
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index bf951c87ce8..55edd570c65 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -395,7 +395,7 @@ Keyboard TX commands:
-WRITE8_MEMBER(pc9801_state::rtc_w)
+void pc9801_state::rtc_w(uint8_t data)
{
m_rtc->c0_w((data & 0x01) >> 0);
m_rtc->c1_w((data & 0x02) >> 1);
@@ -407,13 +407,13 @@ WRITE8_MEMBER(pc9801_state::rtc_w)
logerror("RTC write to undefined bits %02x\n",data & 0xc0);
}
-WRITE8_MEMBER(pc9801_state::dmapg4_w)
+void pc9801_state::dmapg4_w(offs_t offset, uint8_t data)
{
if(offset < 4)
m_dma_offset[(offset+1) & 3] = data & 0x0f;
}
-WRITE8_MEMBER(pc9801_state::dmapg8_w)
+void pc9801_state::dmapg8_w(offs_t offset, uint8_t data)
{
if(offset == 4)
m_dma_autoinc[data & 3] = (data >> 2) & 3;
@@ -421,22 +421,22 @@ WRITE8_MEMBER(pc9801_state::dmapg8_w)
m_dma_offset[(offset+1) & 3] = data;
}
-WRITE8_MEMBER(pc9801_state::nmi_ctrl_w)
+void pc9801_state::nmi_ctrl_w(offs_t offset, uint8_t data)
{
m_nmi_ff = offset;
}
-WRITE8_MEMBER(pc9801_state::vrtc_clear_w)
+void pc9801_state::vrtc_clear_w(uint8_t data)
{
m_pic1->ir2_w(0);
}
-READ8_MEMBER(pc9801_state::fdc_2hd_ctrl_r)
+uint8_t pc9801_state::fdc_2hd_ctrl_r()
{
return 0x44; //unknown port meaning 2hd flag?
}
-WRITE8_MEMBER(pc9801_state::fdc_2hd_ctrl_w)
+void pc9801_state::fdc_2hd_ctrl_w(uint8_t data)
{
//logerror("%02x ctrl\n",data);
if(((m_fdc_2hd_ctrl & 0x80) == 0) && (data & 0x80))
@@ -465,14 +465,14 @@ WRITE8_MEMBER(pc9801_state::fdc_2hd_ctrl_w)
}
-READ8_MEMBER(pc9801_state::fdc_2dd_ctrl_r)
+uint8_t pc9801_state::fdc_2dd_ctrl_r()
{
int ret = (!m_fdc_2dd->subdevice<floppy_connector>("0")->get_device()->ready_r()) ? 0x10 : 0;
ret |= (m_fdc_2dd->subdevice<floppy_connector>("1")->get_device()->ready_r()) ? 0x10 : 0;
return ret | 0x40; //unknown port meaning, might be 0x70
}
-WRITE8_MEMBER(pc9801_state::fdc_2dd_ctrl_w)
+void pc9801_state::fdc_2dd_ctrl_w(uint8_t data)
{
logerror("%02x ctrl\n",data);
if(((m_fdc_2dd_ctrl & 0x80) == 0) && (data & 0x80))
@@ -483,7 +483,7 @@ WRITE8_MEMBER(pc9801_state::fdc_2dd_ctrl_w)
m_fdc_2dd->subdevice<floppy_connector>("1")->get_device()->mon_w(data & 8 ? CLEAR_LINE : ASSERT_LINE);
}
-READ8_MEMBER(pc9801_state::ide_ctrl_r)
+uint8_t pc9801_state::ide_ctrl_r()
{
address_space &ram = m_maincpu->space(AS_PROGRAM);
// this makes the ide driver not do 512 to 256 byte sector translation, the 9821 looks for bit 6 of offset 0xac403 of the kanji ram to set this, the rs unknown
@@ -491,28 +491,28 @@ READ8_MEMBER(pc9801_state::ide_ctrl_r)
return m_ide_sel;
}
-WRITE8_MEMBER(pc9801_state::ide_ctrl_w)
+void pc9801_state::ide_ctrl_w(uint8_t data)
{
if(!(data & 0x80))
m_ide_sel = data & 1;
}
-READ16_MEMBER(pc9801_state::ide_cs0_r)
+uint16_t pc9801_state::ide_cs0_r(offs_t offset, uint16_t mem_mask)
{
return m_ide[m_ide_sel]->cs0_r(offset, mem_mask);
}
-WRITE16_MEMBER(pc9801_state::ide_cs0_w)
+void pc9801_state::ide_cs0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_ide[m_ide_sel]->cs0_w(offset, data, mem_mask);
}
-READ16_MEMBER(pc9801_state::ide_cs1_r)
+uint16_t pc9801_state::ide_cs1_r(offs_t offset, uint16_t mem_mask)
{
return m_ide[m_ide_sel]->cs1_r(offset, mem_mask);
}
-WRITE16_MEMBER(pc9801_state::ide_cs1_w)
+void pc9801_state::ide_cs1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
m_ide[m_ide_sel]->cs1_w(offset, data, mem_mask);
}
@@ -574,7 +574,7 @@ WRITE_LINE_MEMBER( pc9801_state::write_sasi_req )
}
-READ8_MEMBER( pc9801_state::sasi_status_r )
+uint8_t pc9801_state::sasi_status_r()
{
uint8_t res = 0;
@@ -604,7 +604,7 @@ READ8_MEMBER( pc9801_state::sasi_status_r )
return res;
}
-WRITE8_MEMBER( pc9801_state::sasi_ctrl_w )
+void pc9801_state::sasi_ctrl_w(uint8_t data)
{
/*
x--- ---- channel enable
@@ -630,7 +630,7 @@ WRITE8_MEMBER( pc9801_state::sasi_ctrl_w )
// m_sasibus->write_sel(BIT(data, 0));
}
-READ8_MEMBER(pc9801_state::f0_r)
+uint8_t pc9801_state::f0_r(offs_t offset)
{
if(offset == 0)
{
@@ -703,7 +703,7 @@ void pc9801_state::pc9801_io(address_map &map)
/* TODO: it's possible that the offset calculation is actually linear. */
/* TODO: having this non-linear makes the system to boot in BASIC for PC-9821. Perhaps it stores settings? How to change these? */
-READ8_MEMBER(pc9801_state::pc9801rs_knjram_r)
+uint8_t pc9801_state::pc9801rs_knjram_r(offs_t offset)
{
uint32_t pcg_offset;
@@ -728,7 +728,7 @@ READ8_MEMBER(pc9801_state::pc9801rs_knjram_r)
return m_kanji_rom[pcg_offset];
}
-WRITE8_MEMBER(pc9801_state::pc9801rs_knjram_w)
+void pc9801_state::pc9801rs_knjram_w(offs_t offset, uint8_t data)
{
uint32_t pcg_offset;
@@ -744,7 +744,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_knjram_w)
}
/* FF-based */
-WRITE8_MEMBER(pc9801_state::pc9801rs_bank_w)
+void pc9801_state::pc9801rs_bank_w(offs_t offset, uint8_t data)
{
if(offset == 1)
{
@@ -770,17 +770,17 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_bank_w)
}
}
-READ8_MEMBER(pc9801_state::a20_ctrl_r)
+uint8_t pc9801_state::a20_ctrl_r(offs_t offset)
{
if(offset == 0x01)
return (m_gate_a20 ^ 1) | 0xfe;
else if(offset == 0x03)
return (m_gate_a20 ^ 1) | (m_nmi_ff << 1);
- return f0_r(space,offset);
+ return f0_r(offset);
}
-WRITE8_MEMBER(pc9801_state::a20_ctrl_w)
+void pc9801_state::a20_ctrl_w(offs_t offset, uint8_t data)
{
if(offset == 0x00)
{
@@ -807,7 +807,7 @@ WRITE8_MEMBER(pc9801_state::a20_ctrl_w)
m_maincpu->set_input_line(INPUT_LINE_A20, m_gate_a20);
}
-READ8_MEMBER(pc9801_state::grcg_r)
+uint8_t pc9801_state::grcg_r(offs_t offset)
{
if(offset == 6)
{
@@ -819,10 +819,10 @@ READ8_MEMBER(pc9801_state::grcg_r)
logerror("GRCG tile R\n");
return 0xff;
}
- return txt_scrl_r(space,offset);
+ return txt_scrl_r(offset);
}
-WRITE8_MEMBER(pc9801_state::grcg_w)
+void pc9801_state::grcg_w(offs_t offset, uint8_t data)
{
if(offset == 6)
{
@@ -840,10 +840,10 @@ WRITE8_MEMBER(pc9801_state::grcg_w)
return;
}
- txt_scrl_w(space,offset,data);
+ txt_scrl_w(offset,data);
}
-WRITE16_MEMBER(pc9801_state::egc_w)
+void pc9801_state::egc_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if(!m_ex_video_ff[2])
return;
@@ -885,12 +885,12 @@ WRITE16_MEMBER(pc9801_state::egc_w)
}
}
-READ8_MEMBER(pc9801_state::fdc_mode_ctrl_r)
+uint8_t pc9801_state::fdc_mode_ctrl_r()
{
return (m_fdc_ctrl & 3) | 0xf0 | 8 | 4;
}
-WRITE8_MEMBER(pc9801_state::fdc_mode_ctrl_w)
+void pc9801_state::fdc_mode_ctrl_w(uint8_t data)
{
/*
---- x--- ready line?
@@ -909,7 +909,7 @@ WRITE8_MEMBER(pc9801_state::fdc_mode_ctrl_w)
}
#if 0
-READ8_MEMBER(pc9801_state::pc9801rs_2dd_r)
+uint8_t pc9801_state::pc9801rs_2dd_r()
{
// if(m_fdc_ctrl & 1)
// return 0xff;
@@ -918,8 +918,8 @@ READ8_MEMBER(pc9801_state::pc9801rs_2dd_r)
{
switch(offset & 6)
{
- case 0: return m_fdc_2hd->msr_r(space, 0, 0xff);
- case 2: return m_fdc_2hd->fifo_r(space, 0, 0xff);
+ case 0: return m_fdc_2hd->msr_r();
+ case 2: return m_fdc_2hd->fifo_r();
case 4: return 0x44; //2dd flag
}
}
@@ -929,7 +929,7 @@ READ8_MEMBER(pc9801_state::pc9801rs_2dd_r)
return 0xff;
}
-WRITE8_MEMBER(pc9801_state::pc9801rs_2dd_w)
+void pc9801_state::pc9801rs_2dd_w(uint8_t data)
{
// if(m_fdc_ctrl & 1)
// return;
@@ -938,7 +938,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_2dd_w)
{
switch(offset & 6)
{
- case 2: m_fdc_2hd->fifo_w(space, 0, data, 0xff); return;
+ case 2: m_fdc_2hd->fifo_w(data); return;
case 4: logerror("%02x 2DD FDC ctrl\n",data); return;
}
}
@@ -947,7 +947,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_2dd_w)
}
#endif
-WRITE8_MEMBER(pc9801_state::pc9801rs_video_ff_w)
+void pc9801_state::pc9801rs_video_ff_w(offs_t offset, uint8_t data)
{
if(offset == 1)
{
@@ -972,10 +972,10 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_video_ff_w)
return;
}
- pc9801_video_ff_w(space,offset,data);
+ pc9801_video_ff_w(data);
}
-WRITE8_MEMBER(pc9801_state::pc9801rs_a0_w)
+void pc9801_state::pc9801rs_a0_w(offs_t offset, uint8_t data)
{
if((offset & 1) == 0 && offset & 8 && m_ex_video_ff[ANALOG_16_MODE])
{
@@ -994,10 +994,10 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_a0_w)
return;
}
- pc9801_a0_w(space,offset,data);
+ pc9801_a0_w(offset,data);
}
-READ8_MEMBER( pc9801_state::access_ctrl_r )
+uint8_t pc9801_state::access_ctrl_r(offs_t offset)
{
if(offset == 1)
return m_access_ctrl;
@@ -1005,13 +1005,13 @@ READ8_MEMBER( pc9801_state::access_ctrl_r )
return 0xff;
}
-WRITE8_MEMBER( pc9801_state::access_ctrl_w )
+void pc9801_state::access_ctrl_w(offs_t offset, uint8_t data)
{
if(offset == 1)
m_access_ctrl = data;
}
-WRITE8_MEMBER( pc9801_state::pc9801rs_mouse_freq_w )
+void pc9801_state::pc9801rs_mouse_freq_w(offs_t offset, uint8_t data)
{
/* TODO: bit 3 used */
if(offset == 3)
@@ -1021,44 +1021,44 @@ WRITE8_MEMBER( pc9801_state::pc9801rs_mouse_freq_w )
}
}
-READ8_MEMBER( pc9801_state::midi_r )
+uint8_t pc9801_state::midi_r()
{
/* unconnect, needed by Amaranth KH to boot */
return 0xff;
}
-READ8_MEMBER(pc9801_state::pic_r)
+uint8_t pc9801_state::pic_r(offs_t offset)
{
return ((offset >= 4) ? m_pic2 : m_pic1)->read(offset & 3);
}
-WRITE8_MEMBER(pc9801_state::pic_w)
+void pc9801_state::pic_w(offs_t offset, uint8_t data)
{
((offset >= 4) ? m_pic2 : m_pic1)->write(offset & 3, data);
}
-READ16_MEMBER(pc9801_state::grcg_gvram_r)
+uint16_t pc9801_state::grcg_gvram_r(offs_t offset, uint16_t mem_mask)
{
- uint16_t ret = upd7220_grcg_r(space, (offset + 0x4000) | (m_vram_bank << 16), mem_mask);
+ uint16_t ret = upd7220_grcg_r((offset + 0x4000) | (m_vram_bank << 16), mem_mask);
return bitswap<16>(ret,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
}
-WRITE16_MEMBER(pc9801_state::grcg_gvram_w)
+void pc9801_state::grcg_gvram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = bitswap<16>(data,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
- upd7220_grcg_w(space, (offset + 0x4000) | (m_vram_bank << 16), data, mem_mask);
+ upd7220_grcg_w((offset + 0x4000) | (m_vram_bank << 16), data, mem_mask);
}
-READ16_MEMBER(pc9801_state::grcg_gvram0_r)
+uint16_t pc9801_state::grcg_gvram0_r(offs_t offset, uint16_t mem_mask)
{
- uint16_t ret = upd7220_grcg_r(space, offset | (m_vram_bank << 16), mem_mask);
+ uint16_t ret = upd7220_grcg_r(offset | (m_vram_bank << 16), mem_mask);
return bitswap<16>(ret,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
}
-WRITE16_MEMBER(pc9801_state::grcg_gvram0_w)
+void pc9801_state::grcg_gvram0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = bitswap<16>(data,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7);
- upd7220_grcg_w(space, offset | (m_vram_bank << 16), data, mem_mask);
+ upd7220_grcg_w(offset | (m_vram_bank << 16), data, mem_mask);
}
void pc9801_state::ipl_bank(address_map &map)
@@ -1122,7 +1122,7 @@ void pc9801_state::pc9801rs_io(address_map &map)
*
************************************/
-WRITE8_MEMBER(pc9801_state::pc9821_video_ff_w)
+void pc9801_state::pc9821_video_ff_w(offs_t offset, uint8_t data)
{
if(offset == 1)
{
@@ -1135,10 +1135,10 @@ WRITE8_MEMBER(pc9801_state::pc9821_video_ff_w)
}
/* Intentional fall-through */
- pc9801rs_video_ff_w(space,offset,data);
+ pc9801rs_video_ff_w(offset,data);
}
-READ8_MEMBER(pc9801_state::pc9821_a0_r)
+uint8_t pc9801_state::pc9821_a0_r(offs_t offset)
{
if((offset & 1) == 0 && offset & 8)
{
@@ -1163,10 +1163,10 @@ READ8_MEMBER(pc9801_state::pc9821_a0_r)
}
}
- return pc9801_a0_r(space,offset);
+ return pc9801_a0_r(offset);
}
-WRITE8_MEMBER(pc9801_state::pc9821_a0_w)
+void pc9801_state::pc9821_a0_w(offs_t offset, uint8_t data)
{
if((offset & 1) == 0 && offset & 8 && m_ex_video_ff[ANALOG_256_MODE])
{
@@ -1185,10 +1185,10 @@ WRITE8_MEMBER(pc9801_state::pc9821_a0_w)
return;
}
- pc9801rs_a0_w(space,offset,data);
+ pc9801rs_a0_w(offset,data);
}
-READ8_MEMBER(pc9801_state::window_bank_r)
+uint8_t pc9801_state::window_bank_r(offs_t offset)
{
if(offset == 1)
return m_pc9821_window_bank & 0xfe;
@@ -1196,7 +1196,7 @@ READ8_MEMBER(pc9801_state::window_bank_r)
return 0xff;
}
-WRITE8_MEMBER(pc9801_state::window_bank_w)
+void pc9801_state::window_bank_w(offs_t offset, uint8_t data)
{
if(offset == 1)
m_pc9821_window_bank = data & 0xfe;
@@ -1224,31 +1224,31 @@ void pc9801_state::m_sdip_write(uint16_t port, uint8_t sdip_offset,uint8_t data)
logerror("Warning: write from unknown SDIP area %02x %04x %02x\n",port,0x841c + port + (sdip_offset % 12)*0x100,data);
}
-READ8_MEMBER(pc9801_state::sdip_0_r) { return m_sdip_read(offset, 0+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_1_r) { return m_sdip_read(offset, 1+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_2_r) { return m_sdip_read(offset, 2+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_3_r) { return m_sdip_read(offset, 3+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_4_r) { return m_sdip_read(offset, 4+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_5_r) { return m_sdip_read(offset, 5+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_6_r) { return m_sdip_read(offset, 6+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_7_r) { return m_sdip_read(offset, 7+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_8_r) { return m_sdip_read(offset, 8+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_9_r) { return m_sdip_read(offset, 9+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_a_r) { return m_sdip_read(offset, 10+m_sdip_bank*12); }
-READ8_MEMBER(pc9801_state::sdip_b_r) { return m_sdip_read(offset, 11+m_sdip_bank*12); }
-
-WRITE8_MEMBER(pc9801_state::sdip_0_w) { m_sdip_write(offset,0+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_1_w) { m_sdip_write(offset,1+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_2_w) { m_sdip_write(offset,2+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_3_w) { m_sdip_write(offset,3+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_4_w) { m_sdip_write(offset,4+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_5_w) { m_sdip_write(offset,5+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_6_w) { m_sdip_write(offset,6+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_7_w) { m_sdip_write(offset,7+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_8_w) { m_sdip_write(offset,8+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_9_w) { m_sdip_write(offset,9+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_a_w) { m_sdip_write(offset,10+m_sdip_bank*12,data); }
-WRITE8_MEMBER(pc9801_state::sdip_b_w)
+uint8_t pc9801_state::sdip_0_r(offs_t offset) { return m_sdip_read(offset, 0+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_1_r(offs_t offset) { return m_sdip_read(offset, 1+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_2_r(offs_t offset) { return m_sdip_read(offset, 2+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_3_r(offs_t offset) { return m_sdip_read(offset, 3+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_4_r(offs_t offset) { return m_sdip_read(offset, 4+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_5_r(offs_t offset) { return m_sdip_read(offset, 5+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_6_r(offs_t offset) { return m_sdip_read(offset, 6+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_7_r(offs_t offset) { return m_sdip_read(offset, 7+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_8_r(offs_t offset) { return m_sdip_read(offset, 8+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_9_r(offs_t offset) { return m_sdip_read(offset, 9+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_a_r(offs_t offset) { return m_sdip_read(offset, 10+m_sdip_bank*12); }
+uint8_t pc9801_state::sdip_b_r(offs_t offset) { return m_sdip_read(offset, 11+m_sdip_bank*12); }
+
+void pc9801_state::sdip_0_w(offs_t offset, uint8_t data) { m_sdip_write(offset,0+m_sdip_bank*12,data); }
+void pc9801_state::sdip_1_w(offs_t offset, uint8_t data) { m_sdip_write(offset,1+m_sdip_bank*12,data); }
+void pc9801_state::sdip_2_w(offs_t offset, uint8_t data) { m_sdip_write(offset,2+m_sdip_bank*12,data); }
+void pc9801_state::sdip_3_w(offs_t offset, uint8_t data) { m_sdip_write(offset,3+m_sdip_bank*12,data); }
+void pc9801_state::sdip_4_w(offs_t offset, uint8_t data) { m_sdip_write(offset,4+m_sdip_bank*12,data); }
+void pc9801_state::sdip_5_w(offs_t offset, uint8_t data) { m_sdip_write(offset,5+m_sdip_bank*12,data); }
+void pc9801_state::sdip_6_w(offs_t offset, uint8_t data) { m_sdip_write(offset,6+m_sdip_bank*12,data); }
+void pc9801_state::sdip_7_w(offs_t offset, uint8_t data) { m_sdip_write(offset,7+m_sdip_bank*12,data); }
+void pc9801_state::sdip_8_w(offs_t offset, uint8_t data) { m_sdip_write(offset,8+m_sdip_bank*12,data); }
+void pc9801_state::sdip_9_w(offs_t offset, uint8_t data) { m_sdip_write(offset,9+m_sdip_bank*12,data); }
+void pc9801_state::sdip_a_w(offs_t offset, uint8_t data) { m_sdip_write(offset,10+m_sdip_bank*12,data); }
+void pc9801_state::sdip_b_w(offs_t offset, uint8_t data)
{
if(offset == 3)
m_sdip_bank = (data & 0x40) >> 6;
@@ -1260,7 +1260,7 @@ WRITE8_MEMBER(pc9801_state::sdip_b_w)
logerror("SDIP area B write %02x %02x\n",offset,data);
}
-READ16_MEMBER(pc9801_state::timestamp_r)
+uint16_t pc9801_state::timestamp_r(offs_t offset)
{
return (m_maincpu->total_cycles() >> (16 * offset));
}
@@ -1268,7 +1268,7 @@ READ16_MEMBER(pc9801_state::timestamp_r)
/* basically a read-back of various registers */
// bit 1: GDC clock select (port 0x6a, selects with 0x84 & bit 0)
// bit 0: current setting
-READ8_MEMBER(pc9801_state::ext2_video_ff_r)
+uint8_t pc9801_state::ext2_video_ff_r()
{
uint8_t res;
@@ -1319,25 +1319,25 @@ READ8_MEMBER(pc9801_state::ext2_video_ff_r)
return res;
}
-WRITE8_MEMBER(pc9801_state::ext2_video_ff_w)
+void pc9801_state::ext2_video_ff_w(uint8_t data)
{
m_ext2_ff = data;
}
-/*READ8_MEMBER(pc9801_state::winram_r)
+/*uint8_t pc9801_state::winram_r(offs_t offset)
{
offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000;
return
}
-WRITE8_MEMBER(pc9801_state::winram_w)
+void pc9801_state::winram_w(offs_t offset, uint8_t data)
{
offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000;
}*/
// TODO: analog 256 mode needs HW tests
-READ16_MEMBER(pc9801_state::pc9821_grcg_gvram_r)
+uint16_t pc9801_state::pc9821_grcg_gvram_r(offs_t offset, uint16_t mem_mask)
{
if(m_ex_video_ff[ANALOG_256_MODE])
{
@@ -1348,10 +1348,10 @@ READ16_MEMBER(pc9801_state::pc9821_grcg_gvram_r)
return 0xffff;
}
- return grcg_gvram_r(space,offset,mem_mask);
+ return grcg_gvram_r(offset, mem_mask);
}
-WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram_w)
+void pc9801_state::pc9821_grcg_gvram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if(m_ex_video_ff[ANALOG_256_MODE])
{
@@ -1362,10 +1362,10 @@ WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram_w)
return;
}
- grcg_gvram_w(space,offset,data,mem_mask);
+ grcg_gvram_w(offset,data,mem_mask);
}
-READ16_MEMBER(pc9801_state::pc9821_grcg_gvram0_r)
+uint16_t pc9801_state::pc9821_grcg_gvram0_r(offs_t offset, uint16_t mem_mask)
{
if(m_ex_video_ff[ANALOG_256_MODE])
{
@@ -1378,10 +1378,10 @@ READ16_MEMBER(pc9801_state::pc9821_grcg_gvram0_r)
//return 0;
}
- return grcg_gvram0_r(space,offset,mem_mask);
+ return grcg_gvram0_r(offset, mem_mask);
}
-WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram0_w)
+void pc9801_state::pc9821_grcg_gvram0_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if(m_ex_video_ff[ANALOG_256_MODE])
{
@@ -1397,7 +1397,7 @@ WRITE16_MEMBER(pc9801_state::pc9821_grcg_gvram0_w)
return;
}
- grcg_gvram0_w(space,offset,data,mem_mask);
+ grcg_gvram0_w(offset,data,mem_mask);
}
@@ -1422,7 +1422,7 @@ void pc9801_state::pc9821_io(address_map &map)
{
// map.unmap_value_high(); // TODO: a read to somewhere makes this to fail at POST
map(0x0000, 0x001f).rw(m_dmac, FUNC(am9517a_device::read), FUNC(am9517a_device::write)).umask32(0xff00ff00);
- map(0x0000, 0x001f).lr8(NAME([this] (address_space &s, offs_t o, u8 mm) { return BIT(o, 1) ? 0xff : pic_r(s, o, mm); })).umask32(0x00ff00ff);
+ map(0x0000, 0x001f).lr8(NAME([this] (offs_t o) { return BIT(o, 1) ? 0xff : pic_r(o); })).umask32(0x00ff00ff);
map(0x0000, 0x001f).w(FUNC(pc9801_state::pic_w)).umask32(0x00ff00ff); // i8259 PIC (bit 3 ON slave / master) / i8237 DMA
map(0x0020, 0x002f).w(FUNC(pc9801_state::rtc_w)).umask32(0x000000ff);
map(0x0020, 0x002f).w(FUNC(pc9801_state::dmapg8_w)).umask32(0xff00ff00);
@@ -1507,7 +1507,7 @@ void pc9801_state::pc9821_io(address_map &map)
}
// TODO: identify this, might be an alt way to access SDIP?
-READ8_MEMBER(pc9801_state::as_unkdev_data_r)
+uint8_t pc9801_state::as_unkdev_data_r(offs_t offset)
{
if (offset == 0)
return m_unkdev0468[m_unkdev0468_addr];
@@ -1515,7 +1515,7 @@ READ8_MEMBER(pc9801_state::as_unkdev_data_r)
return 0xff;
}
-WRITE8_MEMBER(pc9801_state::as_unkdev_data_w)
+void pc9801_state::as_unkdev_data_w(offs_t offset, uint8_t data)
{
if (offset == 0)
m_unkdev0468[m_unkdev0468_addr] = data;
@@ -1523,7 +1523,7 @@ WRITE8_MEMBER(pc9801_state::as_unkdev_data_w)
// offset == 0: access bit?
}
-WRITE8_MEMBER(pc9801_state::as_unkdev_addr_w)
+void pc9801_state::as_unkdev_addr_w(offs_t offset, uint8_t data)
{
if (offset == 0)
m_unkdev0468_addr = data;
@@ -1985,7 +1985,7 @@ void pc9801_state::ppi_mouse_portc_w(uint8_t data)
m_mouse.control = data;
}
-READ8_MEMBER(pc9801_state::unk_r)
+uint8_t pc9801_state::unk_r()
{
return 0xff;
}
diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp
index 7132430614c..c35ba9a8f74 100644
--- a/src/mame/drivers/pcktgal.cpp
+++ b/src/mame/drivers/pcktgal.cpp
@@ -27,7 +27,7 @@
/***************************************************************************/
-WRITE8_MEMBER(pcktgal_state::bank_w)
+void pcktgal_state::bank_w(uint8_t data)
{
if (data & 1) { membank("bank1")->set_entry(0); }
else { membank("bank1")->set_entry(1); }
@@ -36,13 +36,13 @@ WRITE8_MEMBER(pcktgal_state::bank_w)
else { membank("bank2")->set_entry(1); }
}
-WRITE8_MEMBER(pcktgal_state::sound_bank_w)
+void pcktgal_state::sound_bank_w(uint8_t data)
{
membank("bank3")->set_entry((data >> 2) & 1);
m_msm->reset_w((data & 2) >> 1);
}
-WRITE8_MEMBER(pcktgal_state::sound_w)
+void pcktgal_state::sound_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
@@ -59,12 +59,12 @@ WRITE_LINE_MEMBER(pcktgal_state::adpcm_int)
m_audiocpu->set_input_line(M6502_IRQ_LINE, HOLD_LINE);
}
-WRITE8_MEMBER(pcktgal_state::adpcm_data_w)
+void pcktgal_state::adpcm_data_w(uint8_t data)
{
m_msm5205next = data;
}
-READ8_MEMBER(pcktgal_state::sound_unk_r)
+uint8_t pcktgal_state::sound_unk_r()
{
// POST only? Unknown purpose
// m_msm->reset_w(0);
diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp
index a2041353726..e4d294675f2 100644
--- a/src/mame/drivers/pcw.cpp
+++ b/src/mame/drivers/pcw.cpp
@@ -229,7 +229,7 @@ uint8_t pcw_state::pcw_keyboard_r(offs_t offset)
return m_iptlines[offset]->read();
}
-READ8_MEMBER(pcw_state::pcw_keyboard_data_r)
+uint8_t pcw_state::pcw_keyboard_data_r(offs_t offset)
{
return m_mcu_keyboard_data[offset];
}
@@ -246,7 +246,7 @@ void pcw_state::pcw_update_read_memory_block(int block, int bank)
if (bank == 3)
{
/* when upper 16 bytes are accessed use keyboard read handler */
- space.install_read_handler( block * 0x04000 + 0x3ff0, block * 0x04000 + 0x3fff, read8_delegate(*this, FUNC(pcw_state::pcw_keyboard_data_r)));
+ space.install_read_handler( block * 0x04000 + 0x3ff0, block * 0x04000 + 0x3fff, read8sm_delegate(*this, FUNC(pcw_state::pcw_keyboard_data_r)));
LOGMEM("MEM: read block %i -> bank %i\n", block, bank);
}
else
@@ -355,7 +355,7 @@ int pcw_state::pcw_get_sys_status()
| (m_system_status & 0x20);
}
-READ8_MEMBER(pcw_state::pcw_interrupt_counter_r)
+uint8_t pcw_state::pcw_interrupt_counter_r()
{
int data;
@@ -373,7 +373,7 @@ READ8_MEMBER(pcw_state::pcw_interrupt_counter_r)
}
-WRITE8_MEMBER(pcw_state::pcw_bank_select_w)
+void pcw_state::pcw_bank_select_w(offs_t offset, uint8_t data)
{
LOGBANK("BANK: %2x %x\n", offset, data);
m_banks[offset] = data;
@@ -382,7 +382,7 @@ WRITE8_MEMBER(pcw_state::pcw_bank_select_w)
LOGBANK("RAM Banks: %02x %02x %02x %02x Lock:%02x",m_banks[0],m_banks[1],m_banks[2],m_banks[3],m_bank_force);
}
-WRITE8_MEMBER(pcw_state::pcw_bank_force_selection_w)
+void pcw_state::pcw_bank_force_selection_w(uint8_t data)
{
m_bank_force = data;
@@ -393,7 +393,7 @@ WRITE8_MEMBER(pcw_state::pcw_bank_force_selection_w)
}
-WRITE8_MEMBER(pcw_state::pcw_roller_ram_addr_w)
+void pcw_state::pcw_roller_ram_addr_w(uint8_t data)
{
/*
Address of roller RAM. b7-5: bank (0-7). b4-1: address / 512. */
@@ -403,19 +403,19 @@ WRITE8_MEMBER(pcw_state::pcw_roller_ram_addr_w)
LOGRRAM("Roller-RAM: Address set to 0x%05x\n", m_roller_ram_addr);
}
-WRITE8_MEMBER(pcw_state::pcw_pointer_table_top_scan_w)
+void pcw_state::pcw_pointer_table_top_scan_w(uint8_t data)
{
m_roller_ram_offset = data;
LOGRRAM("Roller-RAM: offset set to 0x%05x\n", m_roller_ram_offset);
}
-WRITE8_MEMBER(pcw_state::pcw_vdu_video_control_register_w)
+void pcw_state::pcw_vdu_video_control_register_w(uint8_t data)
{
m_vdu_video_control_register = data;
LOGRRAM("Roller-RAM: control reg set to 0x%02x\n", data);
}
-WRITE8_MEMBER(pcw_state::pcw_system_control_w)
+void pcw_state::pcw_system_control_w(uint8_t data)
{
LOGSYS("SYSTEM CONTROL: %d\n", data);
@@ -568,7 +568,7 @@ WRITE8_MEMBER(pcw_state::pcw_system_control_w)
}
}
-READ8_MEMBER(pcw_state::pcw_system_status_r)
+uint8_t pcw_state::pcw_system_status_r()
{
/* from Jacob Nevins docs */
uint8_t ret = pcw_get_sys_status();
@@ -578,7 +578,7 @@ READ8_MEMBER(pcw_state::pcw_system_status_r)
/* read from expansion hardware - additional hardware not part of
the PCW custom ASIC */
-READ8_MEMBER(pcw_state::pcw_expansion_r)
+uint8_t pcw_state::pcw_expansion_r(offs_t offset)
{
LOGEXP("pcw expansion r: %04x\n", offset+0x080);
@@ -627,7 +627,7 @@ READ8_MEMBER(pcw_state::pcw_expansion_r)
/* write to expansion hardware - additional hardware not part of
the PCW custom ASIC */
-WRITE8_MEMBER(pcw_state::pcw_expansion_w)
+void pcw_state::pcw_expansion_w(offs_t offset, uint8_t data)
{
LOGEXP("pcw expansion w: %04x %02x\n", offset+0x080, data);
}
@@ -922,7 +922,7 @@ READ_LINE_MEMBER(pcw_state::mcu_kb_t0_r)
}
/* TODO: Implement parallel port! */
-READ8_MEMBER(pcw_state::pcw9512_parallel_r)
+uint8_t pcw_state::pcw9512_parallel_r(offs_t offset)
{
if (offset==1)
{
@@ -934,7 +934,7 @@ READ8_MEMBER(pcw_state::pcw9512_parallel_r)
}
/* TODO: Implement parallel port! */
-WRITE8_MEMBER(pcw_state::pcw9512_parallel_w)
+void pcw_state::pcw9512_parallel_w(offs_t offset, uint8_t data)
{
LOGPAR("pcw9512 parallel w: offs: %04x data: %02x\n", offset, data);
}
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index 32e3b4154f1..236bcb5abc8 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -148,7 +148,7 @@ void pcw16_state::pcw16_map(address_map &map)
}
-WRITE8_MEMBER(pcw16_state::pcw16_palette_w)
+void pcw16_state::pcw16_palette_w(offs_t offset, uint8_t data)
{
m_colour_palette[offset & 0x0f] = data & 31;
}
@@ -232,7 +232,7 @@ void pcw16_state::pcw16_write_mem(uint8_t bank, uint16_t offset, uint8_t data)
}
}
-READ8_MEMBER(pcw16_state::pcw16_mem_r)
+uint8_t pcw16_state::pcw16_mem_r(offs_t offset)
{
if(offset < 0x4000)
return pcw16_read_mem(0,offset);
@@ -246,7 +246,7 @@ READ8_MEMBER(pcw16_state::pcw16_mem_r)
return 0xff;
}
-WRITE8_MEMBER(pcw16_state::pcw16_mem_w)
+void pcw16_state::pcw16_mem_w(offs_t offset, uint8_t data)
{
if(offset < 0x4000)
pcw16_write_mem(0,offset,data);
@@ -258,21 +258,21 @@ WRITE8_MEMBER(pcw16_state::pcw16_mem_w)
pcw16_write_mem(3,offset-0xc000,data);
}
-READ8_MEMBER(pcw16_state::pcw16_bankhw_r)
+uint8_t pcw16_state::pcw16_bankhw_r(offs_t offset)
{
// logerror("bank r: %d \n", offset);
return m_banks[offset];
}
-WRITE8_MEMBER(pcw16_state::pcw16_bankhw_w)
+void pcw16_state::pcw16_bankhw_w(offs_t offset, uint8_t data)
{
//logerror("bank w: %d block: %02x\n", offset, data);
m_banks[offset] = data;
}
-WRITE8_MEMBER(pcw16_state::pcw16_video_control_w)
+void pcw16_state::pcw16_video_control_w(uint8_t data)
{
//logerror("video control w: %02x\n", data);
@@ -376,7 +376,7 @@ void pcw16_state::pcw16_keyboard_reset()
}
/* interfaces to a pc-at keyboard */
-READ8_MEMBER(pcw16_state::pcw16_keyboard_data_shift_r)
+uint8_t pcw16_state::pcw16_keyboard_data_shift_r()
{
//logerror("keyboard data shift r: %02x\n", m_keyboard_data_shift);
m_keyboard_state &= ~(PCW16_KEYBOARD_BUSY_STATUS);
@@ -433,7 +433,7 @@ void pcw16_state::pcw16_keyboard_signal_byte_received(int data)
}
-WRITE8_MEMBER(pcw16_state::pcw16_keyboard_data_shift_w)
+void pcw16_state::pcw16_keyboard_data_shift_w(uint8_t data)
{
//logerror("Keyboard Data Shift: %02x\n", data);
/* writing to shift register clears parity */
@@ -449,7 +449,7 @@ WRITE8_MEMBER(pcw16_state::pcw16_keyboard_data_shift_w)
}
-READ8_MEMBER(pcw16_state::pcw16_keyboard_status_r)
+uint8_t pcw16_state::pcw16_keyboard_status_r()
{
/* bit 2,3 are bits 8 and 9 of vdu pointer */
return (m_keyboard_state &
@@ -461,7 +461,7 @@ READ8_MEMBER(pcw16_state::pcw16_keyboard_status_r)
PCW16_KEYBOARD_TRANSMIT_MODE));
}
-WRITE8_MEMBER(pcw16_state::pcw16_keyboard_control_w)
+void pcw16_state::pcw16_keyboard_control_w(uint8_t data)
{
//logerror("Keyboard control w: %02x\n",data);
@@ -642,74 +642,74 @@ TIMER_DEVICE_CALLBACK_MEMBER(pcw16_state::rtc_timer_callback)
}
}
-READ8_MEMBER(pcw16_state::rtc_year_invalid_r)
+uint8_t pcw16_state::rtc_year_invalid_r()
{
/* year in lower 7 bits. RTC Invalid status is m_rtc_control bit 0
inverted */
return (m_rtc_years & 0x07f) | (((m_rtc_control & 0x01)<<7)^0x080);
}
-READ8_MEMBER(pcw16_state::rtc_month_r)
+uint8_t pcw16_state::rtc_month_r()
{
return m_rtc_months;
}
-READ8_MEMBER(pcw16_state::rtc_days_r)
+uint8_t pcw16_state::rtc_days_r()
{
return m_rtc_days;
}
-READ8_MEMBER(pcw16_state::rtc_hours_r)
+uint8_t pcw16_state::rtc_hours_r()
{
return m_rtc_hours;
}
-READ8_MEMBER(pcw16_state::rtc_minutes_r)
+uint8_t pcw16_state::rtc_minutes_r()
{
return m_rtc_minutes;
}
-READ8_MEMBER(pcw16_state::rtc_seconds_r)
+uint8_t pcw16_state::rtc_seconds_r()
{
return m_rtc_seconds;
}
-READ8_MEMBER(pcw16_state::rtc_256ths_seconds_r)
+uint8_t pcw16_state::rtc_256ths_seconds_r()
{
return m_rtc_256ths_seconds;
}
-WRITE8_MEMBER(pcw16_state::rtc_control_w)
+void pcw16_state::rtc_control_w(uint8_t data)
{
/* write control */
m_rtc_control = data;
}
-WRITE8_MEMBER(pcw16_state::rtc_seconds_w)
+void pcw16_state::rtc_seconds_w(uint8_t data)
{
/* TODO: Writing register could cause next to increment! */
m_rtc_seconds = data;
}
-WRITE8_MEMBER(pcw16_state::rtc_minutes_w)
+void pcw16_state::rtc_minutes_w(uint8_t data)
{
/* TODO: Writing register could cause next to increment! */
m_rtc_minutes = data;
}
-WRITE8_MEMBER(pcw16_state::rtc_hours_w)
+void pcw16_state::rtc_hours_w(uint8_t data)
{
/* TODO: Writing register could cause next to increment! */
m_rtc_hours = data;
}
-WRITE8_MEMBER(pcw16_state::rtc_days_w)
+void pcw16_state::rtc_days_w(uint8_t data)
{
/* TODO: Writing register could cause next to increment! */
m_rtc_days = data;
}
-WRITE8_MEMBER(pcw16_state::rtc_month_w)
+void pcw16_state::rtc_month_w(uint8_t data)
{
/* TODO: Writing register could cause next to increment! */
m_rtc_months = data;
@@ -718,7 +718,7 @@ WRITE8_MEMBER(pcw16_state::rtc_month_w)
}
-WRITE8_MEMBER(pcw16_state::rtc_year_w)
+void pcw16_state::rtc_year_w(uint8_t data)
{
/* TODO: Writing register could cause next to increment! */
m_rtc_hours = data;
@@ -771,14 +771,14 @@ void pcw16_state::trigger_fdc_int()
m_previous_fdc_int_state = state;
}
-READ8_MEMBER(pcw16_state::pcw16_system_status_r)
+uint8_t pcw16_state::pcw16_system_status_r()
{
// logerror("system status r: \n");
return m_system_status | (m_io_extra->read() & 0x04);
}
-READ8_MEMBER(pcw16_state::pcw16_timer_interrupt_counter_r)
+uint8_t pcw16_state::pcw16_timer_interrupt_counter_r()
{
int data;
@@ -794,7 +794,7 @@ READ8_MEMBER(pcw16_state::pcw16_timer_interrupt_counter_r)
}
-WRITE8_MEMBER(pcw16_state::pcw16_system_control_w)
+void pcw16_state::pcw16_system_control_w(uint8_t data)
{
//logerror("0x0f8: function: %d\n",data);
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 5ef0c1a3f7f..72cf0583f85 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -95,30 +95,30 @@
#include "includes/pgm2.h"
// checked on startup, or doesn't boot
-READ32_MEMBER(pgm2_state::unk_startup_r)
+u32 pgm2_state::unk_startup_r()
{
logerror("%s: unk_startup_r\n", machine().describe_context().c_str());
return 0x00000180;
}
-READ32_MEMBER(pgm2_state::rtc_r)
+u32 pgm2_state::rtc_r()
{
// write to FFFFFD20 if bit 18 set (0x40000) probably reset this RTC timer
// TODO: somehow hook here current time/date, which is a bit complicated because value is relative, later to it added "base time" stored in SRAM
return machine().time().seconds();
}
-READ8_MEMBER(pgm2_state::encryption_r)
+u8 pgm2_state::encryption_r(offs_t offset)
{
return m_encryption_table[offset];
}
-WRITE8_MEMBER(pgm2_state::encryption_w)
+void pgm2_state::encryption_w(offs_t offset, u8 data)
{
m_encryption_table[offset] = data;
}
-WRITE32_MEMBER(pgm2_state::sprite_encryption_w)
+void pgm2_state::sprite_encryption_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_spritekey);
@@ -152,7 +152,7 @@ void pgm2_state::device_post_load()
}
}
-WRITE32_MEMBER(pgm2_state::encryption_do_w)
+void pgm2_state::encryption_do_w(u32 data)
{
igs036_decryptor decrypter(m_encryption_table);
if (m_romboard_ram)
@@ -168,16 +168,16 @@ WRITE32_MEMBER(pgm2_state::encryption_do_w)
}
-WRITE16_MEMBER(pgm2_state::share_bank_w)
+void pgm2_state::share_bank_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_share_bank);
}
-READ8_MEMBER(pgm2_state::shareram_r)
+u8 pgm2_state::shareram_r(offs_t offset)
{
return m_shareram[offset + (m_share_bank & 1) * 128];
}
-WRITE8_MEMBER(pgm2_state::shareram_w)
+void pgm2_state::shareram_w(offs_t offset, u8 data)
{
m_shareram[offset + (m_share_bank & 1) * 128] = data;
}
@@ -332,12 +332,12 @@ void pgm2_state::mcu_command(bool is_command)
}
}
-READ32_MEMBER(pgm2_state::mcu_r)
+u32 pgm2_state::mcu_r(offs_t offset)
{
return m_mcu_regs[(offset >> 15) & 7];
}
-WRITE32_MEMBER(pgm2_state::mcu_w)
+void pgm2_state::mcu_w(offs_t offset, u32 data, u32 mem_mask)
{
int reg = (offset >> 15) & 7;
COMBINE_DATA(&m_mcu_regs[reg]);
@@ -351,12 +351,12 @@ WRITE32_MEMBER(pgm2_state::mcu_w)
}
}
-WRITE16_MEMBER(pgm2_state::vbl_ack_w)
+void pgm2_state::vbl_ack_w(u16 data)
{
m_arm_aic->set_irq(12, CLEAR_LINE);
}
-WRITE16_MEMBER(pgm2_state::unk30120014_w)
+void pgm2_state::unk30120014_w(offs_t offset, u16 data)
{
if (offset == 0)
{
@@ -448,7 +448,7 @@ void pgm2_state::module_clk_w(int state)
module_prev_state = state;
}
-READ16_MEMBER(pgm2_state::module_rom_r)
+u16 pgm2_state::module_rom_r(offs_t offset)
{
if (module_sum_read && offset > 0 && offset < 5) // checksum read mode
{
@@ -461,7 +461,7 @@ READ16_MEMBER(pgm2_state::module_rom_r)
return ((u16 *)m_mainrom->base())[offset];
}
-WRITE16_MEMBER(pgm2_state::module_rom_w)
+void pgm2_state::module_rom_w(offs_t offset, u16 data)
{
//logerror("module write %04X at %08X\n", data, offset);
u32 const dec_val = ((module_key->key[0] | (module_key->key[1] << 8) | (module_key->key[2] << 16)) >> 6) & 0xffff;
@@ -490,19 +490,19 @@ WRITE16_MEMBER(pgm2_state::module_rom_w)
}
// very primitive Atmel ARM PIO simulation, should be improved and devicified
-WRITE32_MEMBER(pgm2_state::pio_sodr_w)
+void pgm2_state::pio_sodr_w(offs_t offset, u32 data, u32 mem_mask)
{
m_pio_out_data |= data & mem_mask;
module_data_w((m_pio_out_data & 0x100) ? ASSERT_LINE : CLEAR_LINE);
module_clk_w((m_pio_out_data & 0x200) ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE32_MEMBER(pgm2_state::pio_codr_w)
+void pgm2_state::pio_codr_w(offs_t offset, u32 data, u32 mem_mask)
{
m_pio_out_data &= ~(data & mem_mask);
module_data_w((m_pio_out_data & 0x100) ? ASSERT_LINE : CLEAR_LINE);
module_clk_w((m_pio_out_data & 0x200) ? ASSERT_LINE : CLEAR_LINE);
}
-READ32_MEMBER(pgm2_state::pio_pdsr_r)
+u32 pgm2_state::pio_pdsr_r()
{
return (module_data_r() == ASSERT_LINE ? 1 : 0) << 8; // fpga data read and status (bit 7, must be 0)
}
@@ -1257,7 +1257,7 @@ static void sprite_colour_decode(u16* rom, int len)
}
}
-READ32_MEMBER(pgm2_state::orleg2_speedup_r)
+u32 pgm2_state::orleg2_speedup_r()
{
u32 const pc = m_maincpu->pc();
if ((pc == 0x1002faec) || (pc == 0x1002f9b8))
@@ -1273,7 +1273,7 @@ READ32_MEMBER(pgm2_state::orleg2_speedup_r)
return m_mainram[0x20114 / 4];
}
-READ32_MEMBER(pgm2_state::kov2nl_speedup_r)
+u32 pgm2_state::kov2nl_speedup_r()
{
u32 const pc = m_maincpu->pc();
@@ -1292,7 +1292,7 @@ READ32_MEMBER(pgm2_state::kov2nl_speedup_r)
return m_mainram[0x20470 / 4];
}
-READ32_MEMBER(pgm2_state::kof98umh_speedup_r)
+u32 pgm2_state::kof98umh_speedup_r()
{
u32 const pc = m_maincpu->pc();
@@ -1311,7 +1311,7 @@ READ32_MEMBER(pgm2_state::kof98umh_speedup_r)
return m_mainram[0x00060 / 4];
}
-READ32_MEMBER(pgm2_state::kov3_speedup_r)
+u32 pgm2_state::kov3_speedup_r()
{
u32 const pc = m_maincpu->pc();
@@ -1333,7 +1333,7 @@ READ32_MEMBER(pgm2_state::kov3_speedup_r)
-READ32_MEMBER(pgm2_state::ddpdojt_speedup_r)
+u32 pgm2_state::ddpdojt_speedup_r()
{
u32 const pc = m_maincpu->pc();
@@ -1352,7 +1352,7 @@ READ32_MEMBER(pgm2_state::ddpdojt_speedup_r)
return m_mainram[0x00060 / 4];
}
-READ32_MEMBER(pgm2_state::ddpdojt_speedup2_r)
+u32 pgm2_state::ddpdojt_speedup2_r()
{
u32 const pc = m_maincpu->pc();
@@ -1394,20 +1394,20 @@ void pgm2_state::common_encryption_init()
void pgm2_state::init_orleg2()
{
common_encryption_init();
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x20020114, 0x20020117, read32_delegate(*this, FUNC(pgm2_state::orleg2_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20020114, 0x20020117, read32smo_delegate(*this, FUNC(pgm2_state::orleg2_speedup_r)));
}
void pgm2_state::init_kov2nl()
{
common_encryption_init();
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x20020470, 0x20020473, read32_delegate(*this, FUNC(pgm2_state::kov2nl_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20020470, 0x20020473, read32smo_delegate(*this, FUNC(pgm2_state::kov2nl_speedup_r)));
}
void pgm2_state::init_ddpdojt()
{
common_encryption_init();
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32_delegate(*this, FUNC(pgm2_state::ddpdojt_speedup_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x20021e04, 0x20021e07, read32_delegate(*this, FUNC(pgm2_state::ddpdojt_speedup2_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32smo_delegate(*this, FUNC(pgm2_state::ddpdojt_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20021e04, 0x20021e07, read32smo_delegate(*this, FUNC(pgm2_state::ddpdojt_speedup2_r)));
}
// currently we don't know how to derive address/data xor values from real keys, so we need both
@@ -1419,7 +1419,7 @@ static const kov3_module_key kov3_100_key = { { 0x40,0xac,0x30,0x00,0x47,0x49,0x
void pgm2_state::init_kov3()
{
common_encryption_init();
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000b4, 0x200000b7, read32_delegate(*this, FUNC(pgm2_state::kov3_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000b4, 0x200000b7, read32smo_delegate(*this, FUNC(pgm2_state::kov3_speedup_r)));
}
void pgm2_state::decrypt_kov3_module(u32 addrxor, u16 dataxor)
@@ -1464,7 +1464,7 @@ void pgm2_state::init_kov3_100()
void pgm2_state::init_kof98umh()
{
common_encryption_init();
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32_delegate(*this, FUNC(pgm2_state::kof98umh_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32smo_delegate(*this, FUNC(pgm2_state::kof98umh_speedup_r)));
}
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index b6f162e6690..ccfeabcb8d2 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -45,7 +45,7 @@ RUN
/* Read/Write Handlers */
-READ8_MEMBER( phc25_state::port40_r )
+uint8_t phc25_state::port40_r()
{
/*
@@ -79,7 +79,7 @@ READ8_MEMBER( phc25_state::port40_r )
return data;
}
-WRITE8_MEMBER( phc25_state::port40_w )
+void phc25_state::port40_w(uint8_t data)
{
/*
diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp
index 36d45dd24fd..9aab2be8226 100644
--- a/src/mame/drivers/pingpong.cpp
+++ b/src/mame/drivers/pingpong.cpp
@@ -18,7 +18,7 @@ Ping Pong (c) 1985 Konami
-WRITE8_MEMBER(pingpong_state::cashquiz_question_bank_high_w)
+void pingpong_state::cashquiz_question_bank_high_w(uint8_t data)
{
if( data != 0xff )
{
@@ -35,7 +35,7 @@ WRITE8_MEMBER(pingpong_state::cashquiz_question_bank_high_w)
}
}
-WRITE8_MEMBER(pingpong_state::cashquiz_question_bank_low_w)
+void pingpong_state::cashquiz_question_bank_low_w(uint8_t data)
{
if(data >= 0x60 && data <= 0xdf)
{
@@ -49,7 +49,7 @@ WRITE8_MEMBER(pingpong_state::cashquiz_question_bank_low_w)
}
-WRITE8_MEMBER(pingpong_state::coin_w)
+void pingpong_state::coin_w(uint8_t data)
{
/* bit 2 = irq enable, bit 3 = nmi enable */
m_intenable = data & 0x0c;
@@ -582,8 +582,8 @@ void pingpong_state::init_cashquiz()
ROM[i] = bitswap<8>(ROM[i],0,1,2,3,4,5,6,7);
/* questions banking handlers */
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x4000, 0x4000, write8_delegate(*this, FUNC(pingpong_state::cashquiz_question_bank_high_w)));
- m_maincpu->space(AS_PROGRAM).install_write_handler(0x4001, 0x4001, write8_delegate(*this, FUNC(pingpong_state::cashquiz_question_bank_low_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x4000, 0x4000, write8smo_delegate(*this, FUNC(pingpong_state::cashquiz_question_bank_high_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x4001, 0x4001, write8smo_delegate(*this, FUNC(pingpong_state::cashquiz_question_bank_low_w)));
// 8 independents banks for questions
m_maincpu->space(AS_PROGRAM).install_read_bank(0x5000, 0x50ff, "bank1");
diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp
index f0a280eb436..67dd40ad851 100644
--- a/src/mame/drivers/pirates.cpp
+++ b/src/mame/drivers/pirates.cpp
@@ -99,7 +99,7 @@ Notes:
#include "speaker.h"
-WRITE16_MEMBER(pirates_state::out_w)
+void pirates_state::out_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -450,7 +450,7 @@ void pirates_state::init_pirates()
rom[0x62c0/2] = 0x6006; // beq -> bra
}
-READ16_MEMBER(pirates_state::genix_prot_r){ if(!offset) return 0x0004; else return 0x0000; }
+uint16_t pirates_state::genix_prot_r(offs_t offset){ if(!offset) return 0x0004; else return 0x0000; }
void pirates_state::init_genix()
{
@@ -461,7 +461,7 @@ void pirates_state::init_genix()
/* If this value is increased then something has gone wrong and the protection failed */
/* Write-protect it for now */
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x109e98, 0x109e9b, read16_delegate(*this, FUNC(pirates_state::genix_prot_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x109e98, 0x109e9b, read16sm_delegate(*this, FUNC(pirates_state::genix_prot_r)));
}
/* GAME */
diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp
index 4d403610520..22609266cc5 100644
--- a/src/mame/drivers/pktgaldx.cpp
+++ b/src/mame/drivers/pktgaldx.cpp
@@ -69,14 +69,14 @@ bootleg todo:
/**********************************************************************************/
-WRITE16_MEMBER(pktgaldx_state::pktgaldx_oki_bank_w)
+void pktgaldx_state::pktgaldx_oki_bank_w(uint16_t data)
{
m_oki2->set_rom_bank(data & 3);
}
/**********************************************************************************/
-READ16_MEMBER( pktgaldx_state::pktgaldx_protection_region_f_104_r )
+uint16_t pktgaldx_state::pktgaldx_protection_region_f_104_r(offs_t offset)
{
int real_address = 0 + (offset *2);
uint8_t cs = 0;
@@ -84,7 +84,7 @@ READ16_MEMBER( pktgaldx_state::pktgaldx_protection_region_f_104_r )
return data;
}
-WRITE16_MEMBER( pktgaldx_state::pktgaldx_protection_region_f_104_w )
+void pktgaldx_state::pktgaldx_protection_region_f_104_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int real_address = 0 + (offset *2);
uint8_t cs = 0;
@@ -97,7 +97,7 @@ WRITE_LINE_MEMBER( pktgaldx_state::vblank_w )
m_maincpu->set_input_line(6, ASSERT_LINE);
}
-WRITE16_MEMBER( pktgaldx_state::vblank_ack_w )
+void pktgaldx_state::vblank_ack_w(uint16_t data)
{
m_maincpu->set_input_line(6, CLEAR_LINE);
}
@@ -135,12 +135,12 @@ void pktgaldx_state::decrypted_opcodes_map(address_map &map)
/* Pocket Gal Deluxe (bootleg!) */
-READ16_MEMBER(pktgaldx_state::pckgaldx_unknown_r)
+uint16_t pktgaldx_state::pckgaldx_unknown_r()
{
return 0xffff;
}
-READ16_MEMBER(pktgaldx_state::pckgaldx_protection_r)
+uint16_t pktgaldx_state::pckgaldx_protection_r()
{
logerror("pckgaldx_protection_r address %06x\n",m_maincpu->pc());
return -1;
diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp
index d879d0f381d..f11ea81963c 100644
--- a/src/mame/drivers/playch10.cpp
+++ b/src/mame/drivers/playch10.cpp
@@ -314,7 +314,7 @@ WRITE_LINE_MEMBER(playch10_state::up8w_w)
m_up_8w = state;
}
-READ8_MEMBER(playch10_state::ram_8w_r)
+uint8_t playch10_state::ram_8w_r(offs_t offset)
{
if ( offset >= 0x400 && m_up_8w )
return m_ram_8w[offset];
@@ -322,7 +322,7 @@ READ8_MEMBER(playch10_state::ram_8w_r)
return m_ram_8w[offset & 0x3ff];
}
-WRITE8_MEMBER(playch10_state::ram_8w_w)
+void playch10_state::ram_8w_w(offs_t offset, uint8_t data)
{
if ( offset >= 0x400 && m_up_8w )
m_ram_8w[offset] = data;
@@ -330,7 +330,7 @@ WRITE8_MEMBER(playch10_state::ram_8w_w)
m_ram_8w[offset & 0x3ff] = data;
}
-WRITE8_MEMBER(playch10_state::sprite_dma_w)
+void playch10_state::sprite_dma_w(address_space &space, uint8_t data)
{
int source = ( data & 7 );
m_ppu->spriteram_dma(space, source);
@@ -338,7 +338,7 @@ WRITE8_MEMBER(playch10_state::sprite_dma_w)
/* Only used in single monitor bios */
-WRITE8_MEMBER(playch10_state::time_w)
+void playch10_state::time_w(offs_t offset, uint8_t data)
{
constexpr static uint8_t DIGIT_MAP[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index dfb52b9ac93..4eb6efbb0b7 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -100,7 +100,7 @@ TODO:
#include "speaker.h"
-WRITE16_MEMBER(playmark_state::coinctrl_w)
+void playmark_state::coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_8_15)
{
@@ -118,7 +118,7 @@ WRITE16_MEMBER(playmark_state::coinctrl_w)
***************************************************************************/
-WRITE16_MEMBER(playmark_state::wbeachvl_coin_eeprom_w)
+void playmark_state::wbeachvl_coin_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -135,7 +135,7 @@ WRITE16_MEMBER(playmark_state::wbeachvl_coin_eeprom_w)
}
}
-WRITE16_MEMBER(playmark_state::hotmind_coin_eeprom_w)
+void playmark_state::hotmind_coin_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -163,7 +163,7 @@ WRITE16_MEMBER(playmark_state::hotmind_coin_eeprom_w)
}
}
-WRITE16_MEMBER(playmark_state::luckboomh_dispenser_w)
+void playmark_state::luckboomh_dispenser_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
@@ -187,13 +187,13 @@ WRITE16_MEMBER(playmark_state::luckboomh_dispenser_w)
}
}
-WRITE16_MEMBER(playmark_state::hrdtimes_coin_w)
+void playmark_state::hrdtimes_coin_w(uint16_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
}
-WRITE16_MEMBER(playmark_state::playmark_snd_command_w)
+void playmark_state::playmark_snd_command_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index c0eae5db1e7..c86f3902fe2 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -76,13 +76,13 @@
enum { BANK_GROUP_A, BANK_GROUP_B, INVALID_BANK_GROUP };
-READ8_MEMBER(polygonet_state::polygonet_inputs_r)
+uint8_t polygonet_state::polygonet_inputs_r(offs_t offset)
{
return m_inputs[offset]->read();
}
-WRITE8_MEMBER(polygonet_state::polygonet_sys_w)
+void polygonet_state::polygonet_sys_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -135,14 +135,14 @@ INTERRUPT_GEN_MEMBER(polygonet_state::polygonet_interrupt)
device.execute().set_input_line(M68K_IRQ_5, ASSERT_LINE);
}
-WRITE32_MEMBER(polygonet_state::sound_irq_w)
+void polygonet_state::sound_irq_w(uint32_t data)
{
// Auto-acknowledged interrupt
m_audiocpu->set_input_line(0, HOLD_LINE);
}
/* DSP communications */
-READ32_MEMBER(polygonet_state::dsp_host_interface_r)
+uint32_t polygonet_state::dsp_host_interface_r(offs_t offset, uint32_t mem_mask)
{
uint32_t value;
uint8_t hi_addr = offset << 1;
@@ -160,7 +160,7 @@ READ32_MEMBER(polygonet_state::dsp_host_interface_r)
return value;
}
-WRITE32_MEMBER(polygonet_state::shared_ram_write)
+void polygonet_state::shared_ram_write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_shared_ram[offset]);
@@ -199,7 +199,7 @@ WRITE32_MEMBER(polygonet_state::shared_ram_write)
}
}
-WRITE32_MEMBER(polygonet_state::dsp_w_lines)
+void polygonet_state::dsp_w_lines(offs_t offset, uint32_t data, uint32_t mem_mask)
{
logerror("2w %08x %08x %08x\n", offset, mem_mask, data);
@@ -218,7 +218,7 @@ WRITE32_MEMBER(polygonet_state::dsp_w_lines)
/* 0x04000000 is the COMBNK line - it switches who has access to the shared RAM - the dsp or the 68020 */
}
-WRITE32_MEMBER(polygonet_state::dsp_host_interface_w)
+void polygonet_state::dsp_host_interface_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint8_t hi_data = 0x00;
uint8_t hi_addr = offset << 1;
@@ -234,7 +234,7 @@ WRITE32_MEMBER(polygonet_state::dsp_host_interface_w)
}
-READ32_MEMBER(polygonet_state::network_r)
+uint32_t polygonet_state::network_r()
{
return 0x08000000;
}
@@ -245,7 +245,7 @@ READ32_MEMBER(polygonet_state::network_r)
/**********************************************************************************/
/* It's believed this is hard-wired to return (at least) bit 15 as 0 - causes a host interface bootup */
-READ16_MEMBER(polygonet_state::dsp56156_bootload_r)
+uint16_t polygonet_state::dsp56156_bootload_r()
{
return 0x7fff;
}
@@ -304,7 +304,7 @@ static uint8_t dsp56156_bank_num(device_t* cpu, uint8_t bank_group)
/* BANK HANDLERS */
-READ16_MEMBER(polygonet_state::dsp56156_ram_bank00_read)
+uint16_t polygonet_state::dsp56156_ram_bank00_read(offs_t offset)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -313,7 +313,7 @@ READ16_MEMBER(polygonet_state::dsp56156_ram_bank00_read)
return m_dsp56156_bank00_ram[driver_bank_offset + offset];
}
-WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank00_write)
+void polygonet_state::dsp56156_ram_bank00_write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -323,7 +323,7 @@ WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank00_write)
}
-READ16_MEMBER(polygonet_state::dsp56156_ram_bank01_read)
+uint16_t polygonet_state::dsp56156_ram_bank01_read(offs_t offset)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -332,7 +332,7 @@ READ16_MEMBER(polygonet_state::dsp56156_ram_bank01_read)
return m_dsp56156_bank01_ram[driver_bank_offset + offset];
}
-WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank01_write)
+void polygonet_state::dsp56156_ram_bank01_write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -345,7 +345,7 @@ WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank01_write)
}
-READ16_MEMBER(polygonet_state::dsp56156_ram_bank02_read)
+uint16_t polygonet_state::dsp56156_ram_bank02_read(offs_t offset)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -354,7 +354,7 @@ READ16_MEMBER(polygonet_state::dsp56156_ram_bank02_read)
return m_dsp56156_bank02_ram[driver_bank_offset + offset];
}
-WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank02_write)
+void polygonet_state::dsp56156_ram_bank02_write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -364,7 +364,7 @@ WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank02_write)
}
-READ16_MEMBER(polygonet_state::dsp56156_shared_ram_read)
+uint16_t polygonet_state::dsp56156_shared_ram_read(offs_t offset)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -373,7 +373,7 @@ READ16_MEMBER(polygonet_state::dsp56156_shared_ram_read)
return m_dsp56156_shared_ram_16[driver_bank_offset + offset];
}
-WRITE16_MEMBER(polygonet_state::dsp56156_shared_ram_write)
+void polygonet_state::dsp56156_shared_ram_write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -392,7 +392,7 @@ WRITE16_MEMBER(polygonet_state::dsp56156_shared_ram_write)
}
-READ16_MEMBER(polygonet_state::dsp56156_ram_bank04_read)
+uint16_t polygonet_state::dsp56156_ram_bank04_read(offs_t offset)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -401,7 +401,7 @@ READ16_MEMBER(polygonet_state::dsp56156_ram_bank04_read)
return m_dsp56156_bank04_ram[driver_bank_offset + offset];
}
-WRITE16_MEMBER(polygonet_state::dsp56156_ram_bank04_write)
+void polygonet_state::dsp56156_ram_bank04_write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
uint8_t en_group = dsp56156_bank_group(m_dsp.target());
uint8_t bank_num = dsp56156_bank_num(m_dsp.target(), en_group);
@@ -458,7 +458,7 @@ void polygonet_state::dsp_data_map(address_map &map)
/**********************************************************************************/
-WRITE8_MEMBER(polygonet_state::sound_ctrl_w)
+void polygonet_state::sound_ctrl_w(uint8_t data)
{
// .... .xxx - Sound bank
// ...x .... - NMI clear (clocked?)
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index ff28ce6829d..172e5110403 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -52,7 +52,7 @@ ClawGrip, Jul 2006
#include "speaker.h"
-WRITE8_MEMBER(pokechmp_state::pokechmp_bank_w)
+void pokechmp_state::pokechmp_bank_w(uint8_t data)
{
uint8_t *ROM = memregion("maincpu")->base();
@@ -65,14 +65,14 @@ WRITE8_MEMBER(pokechmp_state::pokechmp_bank_w)
}
-WRITE8_MEMBER(pokechmp_state::pokechmp_sound_bank_w)
+void pokechmp_state::pokechmp_sound_bank_w(uint8_t data)
{
uint8_t *ROM = memregion("oki")->base();
membank("okibank")->set_base(&ROM[data*0x8000]);
}
-WRITE8_MEMBER(pokechmp_state::pokechmp_sound_w)
+void pokechmp_state::pokechmp_sound_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index ce713c5868a..526e454dac0 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -251,7 +251,7 @@ Todo:
/* Pole Position II protection */
/*************************************************************************************/
-READ16_MEMBER(polepos_state::polepos2_ic25_r)
+uint16_t polepos_state::polepos2_ic25_r(offs_t offset)
{
int result;
/* protection states */
@@ -280,7 +280,7 @@ uint8_t polepos_state::analog_r()
return ioport(m_adc_input ? "ACCEL" : "BRAKE")->read();
}
-READ8_MEMBER(polepos_state::ready_r)
+uint8_t polepos_state::ready_r()
{
int ret = 0xff;
@@ -303,7 +303,7 @@ WRITE_LINE_MEMBER(polepos_state::sb0_w)
m_auto_start_mask = !state;
}
-template<bool sub1> WRITE16_MEMBER(polepos_state::z8002_nvi_enable_w)
+template<bool sub1> void polepos_state::z8002_nvi_enable_w(uint16_t data)
{
data &= 1;
@@ -953,7 +953,7 @@ void polepos_state::polepos(machine_config &config)
polepos.add_route(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77);
}
-WRITE8_MEMBER(polepos_state::bootleg_soundlatch_w)
+void polepos_state::bootleg_soundlatch_w(uint8_t data)
{
if (m_soundlatch.found()) // topracern also uses this; no idea what it should do there
m_soundlatch->write(data | 0xfc);
@@ -2451,7 +2451,7 @@ ROM_END
void polepos_state::init_polepos2()
{
/* note that the bootleg version doesn't need this custom IC; it has a hacked ROM in its place */
- m_subcpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x5fff, read16_delegate(*this, FUNC(polepos_state::polepos2_ic25_r)));
+ m_subcpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x5fff, read16sm_delegate(*this, FUNC(polepos_state::polepos2_ic25_r)));
}
diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp
index ce632d335d9..c36c1dc1fcd 100644
--- a/src/mame/drivers/policetr.cpp
+++ b/src/mame/drivers/policetr.cpp
@@ -120,7 +120,7 @@ WRITE_LINE_MEMBER(policetr_state::vblank)
*
*************************************/
-WRITE32_MEMBER(policetr_state::control_w)
+void policetr_state::control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// bit $80000000 = BSMT access/ROM read
// bit $40000000 = N.C. (per schematic)
@@ -176,7 +176,7 @@ WRITE32_MEMBER(policetr_state::control_w)
*
*************************************/
-WRITE32_MEMBER(policetr_state::bsmt2000_reg_w)
+void policetr_state::bsmt2000_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (BIT(m_control_data, 31))
m_bsmt->write_data(data);
@@ -185,7 +185,7 @@ WRITE32_MEMBER(policetr_state::bsmt2000_reg_w)
}
-WRITE32_MEMBER(policetr_state::bsmt2000_data_w)
+void policetr_state::bsmt2000_data_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
m_bsmt->write_reg(data);
COMBINE_DATA(&m_bsmt_data_bank);
@@ -198,7 +198,7 @@ READ_LINE_MEMBER(policetr_state::bsmt_status_r)
}
-READ8_MEMBER(policetr_state::bsmt2000_data_r)
+uint8_t policetr_state::bsmt2000_data_r(offs_t offset)
{
return m_bsmt_region[(m_bsmt_data_bank << 16) + m_bsmt_data_offset];
}
@@ -211,7 +211,7 @@ READ8_MEMBER(policetr_state::bsmt2000_data_r)
*
*************************************/
-WRITE32_MEMBER(policetr_state::speedup_w)
+void policetr_state::speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(m_speedup_data);
@@ -742,7 +742,7 @@ ROM_END
void policetr_state::driver_init()
{
- m_maincpu->space(AS_PROGRAM).install_write_handler(m_speedup_addr, m_speedup_addr+3, write32_delegate(*this, FUNC(policetr_state::speedup_w)));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(m_speedup_addr, m_speedup_addr+3, write32s_delegate(*this, FUNC(policetr_state::speedup_w)));
m_speedup_data = m_rambase + m_speedup_addr/4;
}
diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp
index bcfd58e5e48..df06b44c498 100644
--- a/src/mame/drivers/poly880.cpp
+++ b/src/mame/drivers/poly880.cpp
@@ -45,7 +45,7 @@ void poly880_state::update_display()
m_digits[7 - i] = m_segment;
}
-WRITE8_MEMBER( poly880_state::cldig_w )
+void poly880_state::cldig_w(uint8_t data)
{
m_digit = data;
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index 0a7fb1bdcb6..c8bcabdbc36 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -49,13 +49,13 @@ void poolshrk_state::init_poolshrk()
}
-WRITE8_MEMBER(poolshrk_state::da_latch_w)
+void poolshrk_state::da_latch_w(uint8_t data)
{
m_da_latch = data & 15;
}
-WRITE8_MEMBER(poolshrk_state::led_w)
+void poolshrk_state::led_w(offs_t offset, uint8_t data)
{
if (offset & 2)
m_leds[0] = BIT(offset, 0);
@@ -64,7 +64,7 @@ WRITE8_MEMBER(poolshrk_state::led_w)
}
-WRITE8_MEMBER(poolshrk_state::watchdog_w)
+void poolshrk_state::watchdog_w(offs_t offset, uint8_t data)
{
if ((offset & 3) == 3)
{
@@ -73,7 +73,7 @@ WRITE8_MEMBER(poolshrk_state::watchdog_w)
}
-READ8_MEMBER(poolshrk_state::input_r)
+uint8_t poolshrk_state::input_r(offs_t offset)
{
static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3" };
uint8_t val = ioport(portnames[offset & 3])->read();
@@ -93,7 +93,7 @@ READ8_MEMBER(poolshrk_state::input_r)
}
-READ8_MEMBER(poolshrk_state::irq_reset_r)
+uint8_t poolshrk_state::irq_reset_r()
{
m_maincpu->set_input_line(0, CLEAR_LINE);
diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp
index a45df0c7509..19429df5a63 100644
--- a/src/mame/drivers/popeye.cpp
+++ b/src/mame/drivers/popeye.cpp
@@ -143,7 +143,7 @@ WRITE_LINE_MEMBER(tpp2_state::screen_vblank)
/* the protection device simply returns the last two values written shifted left */
/* by a variable amount. */
-READ8_MEMBER(tnx1_state::protection_r)
+uint8_t tnx1_state::protection_r(offs_t offset)
{
if (offset == 0)
{
@@ -156,7 +156,7 @@ READ8_MEMBER(tnx1_state::protection_r)
}
}
-WRITE8_MEMBER(tnx1_state::protection_w)
+void tnx1_state::protection_w(offs_t offset, uint8_t data)
{
if (offset == 0)
{
diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp
index 5f0ea95b14e..74e4a1851b0 100644
--- a/src/mame/drivers/portrait.cpp
+++ b/src/mame/drivers/portrait.cpp
@@ -101,7 +101,7 @@ DM81LS95 = TriState buffer
#include "speaker.h"
-WRITE8_MEMBER(portrait_state::ctrl_w)
+void portrait_state::ctrl_w(uint8_t data)
{
/* bits 4 and 5 are unknown */
@@ -117,12 +117,12 @@ WRITE8_MEMBER(portrait_state::ctrl_w)
output().set_value("photo", (data >> 7) & 1);
}
-WRITE8_MEMBER(portrait_state::positive_scroll_w)
+void portrait_state::positive_scroll_w(uint8_t data)
{
m_scroll = data;
}
-WRITE8_MEMBER(portrait_state::negative_scroll_w)
+void portrait_state::negative_scroll_w(uint8_t data)
{
m_scroll = - (data ^ 0xff);
}
diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp
index 5d96ac4f858..9f1b2bb5570 100644
--- a/src/mame/drivers/prehisle.cpp
+++ b/src/mame/drivers/prehisle.cpp
@@ -22,7 +22,7 @@
/******************************************************************************/
-WRITE16_MEMBER(prehisle_state::soundcmd_w)
+void prehisle_state::soundcmd_w(u16 data)
{
m_soundlatch->write(data & 0xff);
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
@@ -56,7 +56,7 @@ void prehisle_state::prehisle_map(address_map &map)
/******************************************************************************/
-WRITE8_MEMBER(prehisle_state::upd_port_w)
+void prehisle_state::upd_port_w(u8 data)
{
m_upd7759->port_w(data);
m_upd7759->start_w(0);
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index 26c5581756f..3cc98ffc296 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -39,7 +39,7 @@ uint32_t prof180x_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm
}
-READ8_MEMBER( prof180x_state::read )
+uint8_t prof180x_state::read(offs_t offset)
{
uint8_t data = 0;
@@ -72,7 +72,7 @@ READ8_MEMBER( prof180x_state::read )
return data;
}
-WRITE8_MEMBER( prof180x_state::write )
+void prof180x_state::write(offs_t offset, uint8_t data)
{
if (offset < 0x40000)
{
@@ -122,7 +122,7 @@ WRITE_LINE_MEMBER(prof180x_state::mm1_flag_w)
m_mm1 = state;
}
-READ8_MEMBER( prof180x_state::status0_r )
+uint8_t prof180x_state::status0_r()
{
/*
@@ -142,7 +142,7 @@ READ8_MEMBER( prof180x_state::status0_r )
return 0;
}
-READ8_MEMBER( prof180x_state::status1_r )
+uint8_t prof180x_state::status1_r()
{
/*
@@ -162,9 +162,9 @@ READ8_MEMBER( prof180x_state::status1_r )
return 0;
}
-READ8_MEMBER( prof180x_state::status_r )
+uint8_t prof180x_state::status_r(offs_t offset)
{
- return BIT(offset, 8) ? status1_r(space, offset) : status0_r(space, offset);
+ return BIT(offset, 8) ? status1_r() : status0_r();
}
/* Address Maps */
diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp
index e9e1c6b917f..703cba82c62 100644
--- a/src/mame/drivers/prof80.cpp
+++ b/src/mame/drivers/prof80.cpp
@@ -123,7 +123,7 @@ WRITE_LINE_MEMBER(prof80_state::mstop_w)
// flr_w - flag register
//-------------------------------------------------
-WRITE8_MEMBER( prof80_state::flr_w )
+void prof80_state::flr_w(uint8_t data)
{
/*
@@ -149,7 +149,7 @@ WRITE8_MEMBER( prof80_state::flr_w )
// status_r -
//-------------------------------------------------
-READ8_MEMBER( prof80_state::status_r )
+uint8_t prof80_state::status_r()
{
/*
@@ -186,7 +186,7 @@ READ8_MEMBER( prof80_state::status_r )
// status2_r -
//-------------------------------------------------
-READ8_MEMBER( prof80_state::status2_r )
+uint8_t prof80_state::status2_r()
{
/*
@@ -241,7 +241,7 @@ READ8_MEMBER( prof80_state::status2_r )
// UNIO
/*
-WRITE8_MEMBER( prof80_state::unio_ctrl_w )
+void prof80_state::unio_ctrl_w(uint8_t data)
{
// int flag = BIT(data, 0);
int flad = (data >> 1) & 0x07;
diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp
index 4a21b874d11..678e4cea91c 100644
--- a/src/mame/drivers/psikyo.cpp
+++ b/src/mame/drivers/psikyo.cpp
@@ -201,7 +201,7 @@ void psikyo_state::s1945_mcu_command_w(uint8_t data)
}
// TODO: make this handler 8-bit
-uint32_t psikyo_state::s1945_mcu_data_r()
+u32 psikyo_state::s1945_mcu_data_r()
{
u32 res;
if (m_s1945_mcu_control & 16)
@@ -265,12 +265,12 @@ void psikyo_state::psikyo_map(address_map &map)
}
template<int Shift>
-WRITE8_MEMBER(psikyo_state::sound_bankswitch_w)
+void psikyo_state::sound_bankswitch_w(u8 data)
{
m_audiobank->set_entry((data >> Shift) & 0x03);
}
-WRITE8_MEMBER(psikyo_state::s1945bl_okibank_w)
+void psikyo_state::s1945bl_okibank_w(u8 data)
{
// not at all sure about this, it seems to write 0 too often
if (data < 5)
@@ -306,7 +306,7 @@ void psikyo_state::psikyo_bootleg_map(address_map &map)
Sengoku Ace / Samurai Aces
***************************************************************************/
-READ32_MEMBER(psikyo_state::sngkace_input_r)
+u32 psikyo_state::sngkace_input_r(offs_t offset)
{
switch (offset)
{
@@ -346,7 +346,7 @@ void psikyo_state::sngkace_sound_io_map(address_map &map)
Gun Bird
***************************************************************************/
-READ32_MEMBER(psikyo_state::gunbird_input_r)
+u32 psikyo_state::gunbird_input_r(offs_t offset)
{
switch (offset)
{
@@ -391,7 +391,7 @@ void psikyo_state::gunbird_sound_io_map(address_map &map)
Strikers 1945 / Tengai
***************************************************************************/
-READ32_MEMBER(psikyo_state::s1945_input_r)
+u32 psikyo_state::s1945_input_r(offs_t offset)
{
switch (offset)
{
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index 0a194d99d09..02d14e58273 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -151,7 +151,7 @@ static GFXDECODE_START( gfx_ps4 )
GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x000, 0x40 ) // 8bpp tiles
GFXDECODE_END
-WRITE8_MEMBER(psikyo4_state::eeprom_w)
+void psikyo4_state::eeprom_w(offs_t offset, uint8_t data, uint8_t mem_mask)
{
m_eeprom->di_write((data & 0x20) ? 1 : 0);
m_eeprom->cs_write((data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
@@ -179,7 +179,7 @@ CUSTOM_INPUT_MEMBER(psikyo4_state::mahjong_ctrl_r)/* used by hotgmck/hgkairak */
return ret;
}
-WRITE32_MEMBER(psikyo4_state::paletteram_w)
+void psikyo4_state::paletteram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_paletteram[offset]);
@@ -192,7 +192,7 @@ WRITE32_MEMBER(psikyo4_state::paletteram_w)
}
template<int Screen>
-WRITE32_MEMBER(psikyo4_state::bgpen_w)
+void psikyo4_state::bgpen_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&m_bgpen[Screen][0]);
@@ -204,7 +204,7 @@ WRITE32_MEMBER(psikyo4_state::bgpen_w)
}
template<int Screen>
-WRITE8_MEMBER(psikyo4_state::screen_brt_w)
+void psikyo4_state::screen_brt_w(uint8_t data)
{
/* Need separate brightness for both screens if displaying together */
double brt = data & 0xff;
@@ -225,7 +225,7 @@ WRITE8_MEMBER(psikyo4_state::screen_brt_w)
/* I believe this to be separate rgb brightness due to strings in hotdebut, unused in 4 dumped games */
}
-WRITE32_MEMBER(psikyo4_state::vidregs_w)
+void psikyo4_state::vidregs_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t const old = m_vidregs[offset];
data = COMBINE_DATA(&m_vidregs[offset]);
@@ -240,7 +240,7 @@ WRITE32_MEMBER(psikyo4_state::vidregs_w)
}
}
-WRITE16_MEMBER(psikyo4_state::ymf_bank_w)
+void psikyo4_state::ymf_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// YMF banking
uint16_t bankdata = data;
@@ -258,7 +258,7 @@ WRITE16_MEMBER(psikyo4_state::ymf_bank_w)
}
}
-WRITE8_MEMBER(psikyo4_state::io_select_w)
+void psikyo4_state::io_select_w(uint8_t data)
{
// mahjong input multiplexing
m_io_select = data;
diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp
index 4686114bfc8..32614e2e5b0 100644
--- a/src/mame/drivers/psion.cpp
+++ b/src/mame/drivers/psion.cpp
@@ -170,7 +170,7 @@ void psion_state::io_rw(uint16_t offset)
}
}
-WRITE8_MEMBER( psion_state::io_w )
+void psion_state::io_w(offs_t offset, uint8_t data)
{
switch (offset & 0x0ffc0)
{
@@ -182,7 +182,7 @@ WRITE8_MEMBER( psion_state::io_w )
}
}
-READ8_MEMBER( psion_state::io_r )
+uint8_t psion_state::io_r(offs_t offset)
{
switch (offset & 0xffc0)
{
@@ -203,19 +203,19 @@ INPUT_CHANGED_MEMBER(psion_state::psion_on)
m_maincpu->reset();
}
-READ8_MEMBER( psion1_state::reset_kb_counter_r )
+uint8_t psion1_state::reset_kb_counter_r()
{
m_kb_counter = 0;
return 0;
}
-READ8_MEMBER( psion1_state::inc_kb_counter_r )
+uint8_t psion1_state::inc_kb_counter_r()
{
m_kb_counter++;
return 0;
}
-READ8_MEMBER( psion1_state::switchoff_r )
+uint8_t psion1_state::switchoff_r()
{
if (!m_stby_pwr)
{
diff --git a/src/mame/drivers/psion5.cpp b/src/mame/drivers/psion5.cpp
index 6e86916795c..88263c4d814 100644
--- a/src/mame/drivers/psion5.cpp
+++ b/src/mame/drivers/psion5.cpp
@@ -198,7 +198,7 @@ void psion5mx_state::set_timer_ctrl(int timer, uint32_t value)
}
}
-READ32_MEMBER(psion5mx_state::periphs_r)
+uint32_t psion5mx_state::periphs_r(offs_t offset, uint32_t mem_mask)
{
const uint32_t reg = offset << 2;
uint32_t data = 0;
@@ -452,7 +452,7 @@ READ32_MEMBER(psion5mx_state::periphs_r)
return data;
}
-WRITE32_MEMBER(psion5mx_state::periphs_w)
+void psion5mx_state::periphs_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
const uint32_t reg = offset << 2;
switch (reg)
diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp
index 723f791b6ab..60c0562ae52 100644
--- a/src/mame/drivers/psychic5.cpp
+++ b/src/mame/drivers/psychic5.cpp
@@ -384,12 +384,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(psychic5_state::scanline)
***************************************************************************/
-READ8_MEMBER(psychic5_state::bankselect_r)
+uint8_t psychic5_state::bankselect_r()
{
return m_bank_latch;
}
-WRITE8_MEMBER(psychic5_state::psychic5_bankselect_w)
+void psychic5_state::psychic5_bankselect_w(uint8_t data)
{
if (m_bank_latch != data)
{
@@ -398,7 +398,7 @@ WRITE8_MEMBER(psychic5_state::psychic5_bankselect_w)
}
}
-WRITE8_MEMBER(psychic5_state::bombsa_bankselect_w)
+void psychic5_state::bombsa_bankselect_w(uint8_t data)
{
if (m_bank_latch != data)
{
@@ -407,7 +407,7 @@ WRITE8_MEMBER(psychic5_state::bombsa_bankselect_w)
}
}
-WRITE8_MEMBER(psychic5_state::psychic5_coin_counter_w)
+void psychic5_state::psychic5_coin_counter_w(uint8_t data)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
@@ -419,7 +419,7 @@ WRITE8_MEMBER(psychic5_state::psychic5_coin_counter_w)
}
}
-WRITE8_MEMBER(psychic5_state::bombsa_flipscreen_w)
+void psychic5_state::bombsa_flipscreen_w(uint8_t data)
{
// bit 7 toggles flip screen
if (data & 0x80)
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index 503d74a0a3a..c18d6806095 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -202,7 +202,7 @@ void punchout_state::punchout_vlm_map(address_map &map)
// e.g. relying on the masking done by the internal registers.
// The RP5H01 one-time PROM (OTP) is confirmed to be unprogrammed.
-READ8_MEMBER(punchout_state::spunchout_exp_r)
+uint8_t punchout_state::spunchout_exp_r(offs_t offset)
{
// d0-d3: D0-D3 from RP5C01
// d4: N/C
@@ -218,23 +218,23 @@ READ8_MEMBER(punchout_state::spunchout_exp_r)
return ret;
}
-WRITE8_MEMBER(punchout_state::spunchout_exp_w)
+void punchout_state::spunchout_exp_w(offs_t offset, uint8_t data)
{
// d0-d3: D0-D3 to RP5C01
m_rtc->write(offset >> 4 & 0xf, data & 0xf);
}
-WRITE8_MEMBER(punchout_state::spunchout_rp5h01_reset_w)
+void punchout_state::spunchout_rp5h01_reset_w(uint8_t data)
{
// d0: 74LS74 2D
// 74LS74 2Q -> RP5H01 RESET
// 74LS74 _2Q -> 74LS74 _1 RESET
m_rp5h01->reset_w(data & 1);
if (data & 1)
- spunchout_rp5h01_clock_w(space, 0, 0);
+ spunchout_rp5h01_clock_w(0);
}
-WRITE8_MEMBER(punchout_state::spunchout_rp5h01_clock_w)
+void punchout_state::spunchout_rp5h01_clock_w(uint8_t data)
{
// d0: 74LS74 1D
// 74LS74 1Q -> RP5H01 DATA CLOCK + TEST
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index a925282f4ac..b33a203f1a2 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -125,7 +125,7 @@ void px8_state::bankswitch()
gah40m_r - GAH40M read
-------------------------------------------------*/
-READ8_MEMBER( px8_state::gah40m_r )
+uint8_t px8_state::gah40m_r(offs_t offset)
{
switch (offset)
{
@@ -273,7 +273,7 @@ READ8_MEMBER( px8_state::gah40m_r )
gah40m_w - GAH40M write
-------------------------------------------------*/
-WRITE8_MEMBER( px8_state::gah40m_w )
+void px8_state::gah40m_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -379,7 +379,7 @@ WRITE8_MEMBER( px8_state::gah40m_w )
gah40s_r - GAH40S read
-------------------------------------------------*/
-READ8_MEMBER( px8_state::gah40s_r )
+uint8_t px8_state::gah40s_r(offs_t offset)
{
uint8_t data = 0xff;
@@ -405,7 +405,7 @@ READ8_MEMBER( px8_state::gah40s_r )
gah40s_w - GAH40S write
-------------------------------------------------*/
-WRITE8_MEMBER( px8_state::gah40s_w )
+void px8_state::gah40s_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -448,7 +448,7 @@ WRITE8_MEMBER( px8_state::gah40s_w )
gah40s_ier_w - interrupt enable register write
-------------------------------------------------*/
-WRITE8_MEMBER( px8_state::gah40s_ier_w )
+void px8_state::gah40s_ier_w(uint8_t data)
{
m_ier = data;
}
@@ -482,7 +482,7 @@ uint8_t px8_state::krtn_read()
krtn_0_3_r - keyboard return 0..3 read
-------------------------------------------------*/
-READ8_MEMBER( px8_state::krtn_0_3_r )
+uint8_t px8_state::krtn_0_3_r()
{
return krtn_read() & 0x0f;
}
@@ -491,7 +491,7 @@ READ8_MEMBER( px8_state::krtn_0_3_r )
krtn_4_7_r - keyboard return 4..7 read
-------------------------------------------------*/
-READ8_MEMBER( px8_state::krtn_4_7_r )
+uint8_t px8_state::krtn_4_7_r()
{
return krtn_read() >> 4;
}
@@ -500,7 +500,7 @@ READ8_MEMBER( px8_state::krtn_4_7_r )
ksc_w - keyboard scan write
-------------------------------------------------*/
-WRITE8_MEMBER( px8_state::ksc_w )
+void px8_state::ksc_w(uint8_t data)
{
m_ksc = data;
}
diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp
index 2215ac85e3b..72c2b47804f 100644
--- a/src/mame/drivers/qdrmfgp.cpp
+++ b/src/mame/drivers/qdrmfgp.cpp
@@ -35,7 +35,7 @@ GP1 HDD data contents:
*
*************************************/
-READ16_MEMBER(qdrmfgp_state::inputs_r)
+uint16_t qdrmfgp_state::inputs_r()
{
return m_control & 0x0080 ? m_inputs_port->read() : m_dsw_port->read();
}
@@ -47,7 +47,7 @@ CUSTOM_INPUT_MEMBER(qdrmfgp_state::battery_sensor_r)
}
-WRITE16_MEMBER(qdrmfgp_state::gp_control_w)
+void qdrmfgp_state::gp_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* bit 0 enable irq 1 (sound) */
/* bit 1 enable irq 2 (not used) */
@@ -90,7 +90,7 @@ WRITE16_MEMBER(qdrmfgp_state::gp_control_w)
}
}
-WRITE16_MEMBER(qdrmfgp_state::gp2_control_w)
+void qdrmfgp_state::gp2_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
/* bit 2 enable irq 3 (sound) */
/* bit 3 enable irq 4 (vblank) */
@@ -129,7 +129,7 @@ WRITE16_MEMBER(qdrmfgp_state::gp2_control_w)
}
-READ16_MEMBER(qdrmfgp_state::v_rom_r)
+uint16_t qdrmfgp_state::v_rom_r(offs_t offset)
{
uint8_t *mem8 = memregion("k056832")->base();
int bank = m_k056832->word_r(0x34/2);
@@ -143,7 +143,7 @@ READ16_MEMBER(qdrmfgp_state::v_rom_r)
}
-READ16_MEMBER(qdrmfgp_state::gp2_vram_r)
+uint16_t qdrmfgp_state::gp2_vram_r(offs_t offset)
{
if (offset < 0x1000 / 2)
return m_k056832->ram_word_r(offset * 2 + 1);
@@ -151,7 +151,7 @@ READ16_MEMBER(qdrmfgp_state::gp2_vram_r)
return m_k056832->ram_word_r((offset - 0x1000 / 2) * 2);
}
-READ16_MEMBER(qdrmfgp_state::gp2_vram_mirror_r)
+uint16_t qdrmfgp_state::gp2_vram_mirror_r(offs_t offset)
{
if (offset < 0x1000 / 2)
return m_k056832->ram_word_r(offset * 2);
@@ -159,7 +159,7 @@ READ16_MEMBER(qdrmfgp_state::gp2_vram_mirror_r)
return m_k056832->ram_word_r((offset - 0x1000 / 2) * 2 + 1);
}
-WRITE16_MEMBER(qdrmfgp_state::gp2_vram_w)
+void qdrmfgp_state::gp2_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset < 0x1000 / 2)
m_k056832->ram_word_w(offset * 2 + 1, data, mem_mask);
@@ -167,7 +167,7 @@ WRITE16_MEMBER(qdrmfgp_state::gp2_vram_w)
m_k056832->ram_word_w((offset - 0x1000 / 2) * 2, data, mem_mask);
}
-WRITE16_MEMBER(qdrmfgp_state::gp2_vram_mirror_w)
+void qdrmfgp_state::gp2_vram_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (offset < 0x1000 / 2)
m_k056832->ram_word_w(offset * 2, data, mem_mask);
@@ -178,7 +178,7 @@ WRITE16_MEMBER(qdrmfgp_state::gp2_vram_mirror_w)
/*************/
-READ16_MEMBER(qdrmfgp_state::sndram_r)
+uint16_t qdrmfgp_state::sndram_r(offs_t offset, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
return m_sndram[offset];
@@ -186,7 +186,7 @@ READ16_MEMBER(qdrmfgp_state::sndram_r)
return 0;
}
-WRITE16_MEMBER(qdrmfgp_state::sndram_w)
+void qdrmfgp_state::sndram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{
diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp
index 4bb931d739c..8477e9a32a9 100644
--- a/src/mame/drivers/quasar.cpp
+++ b/src/mame/drivers/quasar.cpp
@@ -46,17 +46,17 @@ I8085 Sound Board
************************************************************************/
-WRITE8_MEMBER(quasar_state::video_page_select_w)
+void quasar_state::video_page_select_w(offs_t offset, uint8_t data)
{
m_page = offset & 0x03;
}
-WRITE8_MEMBER(quasar_state::io_page_select_w)
+void quasar_state::io_page_select_w(offs_t offset, uint8_t data)
{
m_io_page = offset & 0x03;
}
-WRITE8_MEMBER(quasar_state::quasar_video_w)
+void quasar_state::quasar_video_w(offs_t offset, uint8_t data)
{
switch (m_page)
{
@@ -67,7 +67,7 @@ WRITE8_MEMBER(quasar_state::quasar_video_w)
}
}
-READ8_MEMBER(quasar_state::quasar_IO_r)
+uint8_t quasar_state::quasar_IO_r()
{
uint8_t ans = 0;
@@ -82,12 +82,12 @@ READ8_MEMBER(quasar_state::quasar_IO_r)
return ans;
}
-WRITE8_MEMBER(quasar_state::quasar_bullet_w)
+void quasar_state::quasar_bullet_w(offs_t offset, uint8_t data)
{
m_bullet_ram[offset] = (data ^ 0xff);
}
-WRITE8_MEMBER(quasar_state::quasar_sh_command_w)
+void quasar_state::quasar_sh_command_w(uint8_t data)
{
// bit 4 = Sound Invader : Linked to an NE555V circuit
// Not handled yet
@@ -98,7 +98,7 @@ WRITE8_MEMBER(quasar_state::quasar_sh_command_w)
m_soundlatch->write((data & 8) + ((data >> 1) & 3) + ((data << 2) & 4));
}
-READ8_MEMBER(quasar_state::quasar_sh_command_r)
+uint8_t quasar_state::quasar_sh_command_r()
{
return m_soundlatch->read() + (ioport("DSW2")->read() & 0x30);
}
diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp
index f4ed0324cc1..73b6b845476 100644
--- a/src/mame/drivers/quizdna.cpp
+++ b/src/mame/drivers/quizdna.cpp
@@ -21,12 +21,12 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face
#define MCLK 16000000
-WRITE8_MEMBER(quizdna_state::rombank_w)
+void quizdna_state::rombank_w(uint8_t data)
{
membank("mainbank")->set_entry(data & 0x3f);
}
-WRITE8_MEMBER(quizdna_state::gekiretu_rombank_w)
+void quizdna_state::gekiretu_rombank_w(uint8_t data)
{
membank("mainbank")->set_entry((data & 0x3f) ^ 0x0a);
}
diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index b281fd32a01..f66dfe8c582 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -1180,8 +1180,8 @@ WRITE8_MEMBER(vicdual_state::brdrline_io_w)
WRITE8_MEMBER(vicdual_state::pulsar_io_w)
{
- if (offset & 0x01) pulsar_audio_1_w(space, 0, data);
- if (offset & 0x02) pulsar_audio_2_w(space, 0, data);
+ if (offset & 0x01) pulsar_audio_1_w(data);
+ if (offset & 0x02) pulsar_audio_2_w(data);
if (offset & 0x08) assert_coin_status();
if (offset & 0x40) palette_bank_w(space, 0, data);
}
diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h
index c4616a5a7e0..3999d02c345 100644
--- a/src/mame/includes/p2000t.h
+++ b/src/mame/includes/p2000t.h
@@ -32,15 +32,15 @@ public:
void p2000t(machine_config &config);
protected:
- DECLARE_READ8_MEMBER(p2000t_port_000f_r);
- DECLARE_READ8_MEMBER(p2000t_port_202f_r);
- DECLARE_WRITE8_MEMBER(p2000t_port_101f_w);
- DECLARE_WRITE8_MEMBER(p2000t_port_303f_w);
- DECLARE_WRITE8_MEMBER(p2000t_port_505f_w);
- DECLARE_WRITE8_MEMBER(p2000t_port_707f_w);
- DECLARE_WRITE8_MEMBER(p2000t_port_888b_w);
- DECLARE_WRITE8_MEMBER(p2000t_port_8c90_w);
- DECLARE_WRITE8_MEMBER(p2000t_port_9494_w);
+ uint8_t p2000t_port_000f_r(offs_t offset);
+ uint8_t p2000t_port_202f_r();
+ void p2000t_port_101f_w(uint8_t data);
+ void p2000t_port_303f_w(uint8_t data);
+ void p2000t_port_505f_w(uint8_t data);
+ void p2000t_port_707f_w(uint8_t data);
+ void p2000t_port_888b_w(uint8_t data);
+ void p2000t_port_8c90_w(uint8_t data);
+ void p2000t_port_9494_w(uint8_t data);
uint8_t videoram_r(offs_t offset);
INTERRUPT_GEN_MEMBER(p2000_interrupt);
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index 4bae20f5433..992b257ea53 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -54,18 +54,18 @@ public:
uint8_t m_main_irq_mask;
uint8_t m_mcu_irq_mask;
- DECLARE_WRITE8_MEMBER(subreset_w);
- DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_READ8_MEMBER(input_r);
+ void subreset_w(offs_t offset, uint8_t data);
+ void flipscreen_w(offs_t offset, uint8_t data);
+ uint8_t input_r(offs_t offset);
void coin_w(uint8_t data);
void led_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(irq_1_ctrl_w);
- DECLARE_WRITE8_MEMBER(irq_2_ctrl_w);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(videoram2_w);
- DECLARE_WRITE8_MEMBER(scroll0_w);
- DECLARE_WRITE8_MEMBER(scroll1_w);
- DECLARE_WRITE8_MEMBER(bankswitch_w);
+ void irq_1_ctrl_w(offs_t offset, uint8_t data);
+ void irq_2_ctrl_w(offs_t offset, uint8_t data);
+ void videoram_w(offs_t offset, uint8_t data);
+ void videoram2_w(offs_t offset, uint8_t data);
+ void scroll0_w(offs_t offset, uint8_t data);
+ void scroll1_w(offs_t offset, uint8_t data);
+ void bankswitch_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index b0b9726810e..fcfe679c2ff 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -99,60 +99,60 @@ protected:
uint8_t m_irq_mask;
- DECLARE_WRITE8_MEMBER(pacman_interrupt_vector_w);
- DECLARE_WRITE8_MEMBER(piranha_interrupt_vector_w);
- DECLARE_WRITE8_MEMBER(nmouse_interrupt_vector_w);
+ void pacman_interrupt_vector_w(uint8_t data);
+ void piranha_interrupt_vector_w(uint8_t data);
+ void nmouse_interrupt_vector_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coin_counter_w);
DECLARE_WRITE_LINE_MEMBER(coin_lockout_global_w);
- DECLARE_WRITE8_MEMBER(alibaba_sound_w);
- DECLARE_READ8_MEMBER(alibaba_mystery_1_r);
- DECLARE_READ8_MEMBER(alibaba_mystery_2_r);
- DECLARE_WRITE8_MEMBER(maketrax_protection_w);
- DECLARE_READ8_MEMBER(mbrush_prot_r);
- DECLARE_READ8_MEMBER(maketrax_special_port2_r);
- DECLARE_READ8_MEMBER(maketrax_special_port3_r);
- DECLARE_READ8_MEMBER(mschamp_kludge_r);
- DECLARE_WRITE8_MEMBER(bigbucks_bank_w);
- DECLARE_READ8_MEMBER(bigbucks_question_r);
- DECLARE_WRITE8_MEMBER(porky_banking_w);
- DECLARE_READ8_MEMBER(drivfrcp_port1_r);
- DECLARE_READ8_MEMBER(_8bpm_port1_r);
- DECLARE_READ8_MEMBER(porky_port1_r);
- DECLARE_READ8_MEMBER(rocktrv2_prot1_data_r);
- DECLARE_READ8_MEMBER(rocktrv2_prot2_data_r);
- DECLARE_READ8_MEMBER(rocktrv2_prot3_data_r);
- DECLARE_READ8_MEMBER(rocktrv2_prot4_data_r);
- DECLARE_WRITE8_MEMBER(rocktrv2_prot_data_w);
- DECLARE_WRITE8_MEMBER(rocktrv2_question_bank_w);
- DECLARE_READ8_MEMBER(rocktrv2_question_r);
- DECLARE_READ8_MEMBER(pacman_read_nop);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x0038);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x03b0);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x1600);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x2120);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x3ff0);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x8000);
- DECLARE_READ8_MEMBER(mspacman_disable_decode_r_0x97f0);
- DECLARE_WRITE8_MEMBER(mspacman_disable_decode_w);
- DECLARE_READ8_MEMBER(mspacman_enable_decode_r_0x3ff8);
- DECLARE_WRITE8_MEMBER(mspacman_enable_decode_w);
+ void alibaba_sound_w(offs_t offset, uint8_t data);
+ uint8_t alibaba_mystery_1_r();
+ uint8_t alibaba_mystery_2_r();
+ void maketrax_protection_w(uint8_t data);
+ uint8_t mbrush_prot_r(offs_t offset);
+ uint8_t maketrax_special_port2_r(offs_t offset);
+ uint8_t maketrax_special_port3_r(offs_t offset);
+ uint8_t mschamp_kludge_r();
+ void bigbucks_bank_w(uint8_t data);
+ uint8_t bigbucks_question_r(offs_t offset);
+ void porky_banking_w(uint8_t data);
+ uint8_t drivfrcp_port1_r();
+ uint8_t _8bpm_port1_r();
+ uint8_t porky_port1_r();
+ uint8_t rocktrv2_prot1_data_r();
+ uint8_t rocktrv2_prot2_data_r();
+ uint8_t rocktrv2_prot3_data_r();
+ uint8_t rocktrv2_prot4_data_r();
+ void rocktrv2_prot_data_w(offs_t offset, uint8_t data);
+ void rocktrv2_question_bank_w(uint8_t data);
+ uint8_t rocktrv2_question_r(offs_t offset);
+ uint8_t pacman_read_nop();
+ uint8_t mspacman_disable_decode_r_0x0038(offs_t offset);
+ uint8_t mspacman_disable_decode_r_0x03b0(offs_t offset);
+ uint8_t mspacman_disable_decode_r_0x1600(offs_t offset);
+ uint8_t mspacman_disable_decode_r_0x2120(offs_t offset);
+ uint8_t mspacman_disable_decode_r_0x3ff0(offs_t offset);
+ uint8_t mspacman_disable_decode_r_0x8000(offs_t offset);
+ uint8_t mspacman_disable_decode_r_0x97f0(offs_t offset);
+ void mspacman_disable_decode_w(uint8_t data);
+ uint8_t mspacman_enable_decode_r_0x3ff8(offs_t offset);
+ void mspacman_enable_decode_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(irq_mask_w);
- DECLARE_READ8_MEMBER(mspacii_protection_r);
- DECLARE_READ8_MEMBER(cannonbp_protection_r);
- DECLARE_WRITE8_MEMBER(pacman_videoram_w);
- DECLARE_WRITE8_MEMBER(pacman_colorram_w);
+ uint8_t mspacii_protection_r(offs_t offset);
+ uint8_t cannonbp_protection_r(offs_t offset);
+ void pacman_videoram_w(offs_t offset, uint8_t data);
+ void pacman_colorram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
DECLARE_WRITE_LINE_MEMBER(pengo_palettebank_w);
DECLARE_WRITE_LINE_MEMBER(pengo_colortablebank_w);
DECLARE_WRITE_LINE_MEMBER(pengo_gfxbank_w);
- DECLARE_WRITE8_MEMBER(s2650games_videoram_w);
- DECLARE_WRITE8_MEMBER(s2650games_colorram_w);
- DECLARE_WRITE8_MEMBER(s2650games_scroll_w);
- DECLARE_WRITE8_MEMBER(s2650games_tilesbank_w);
- DECLARE_WRITE8_MEMBER(jrpacman_videoram_w);
+ void s2650games_videoram_w(offs_t offset, uint8_t data);
+ void s2650games_colorram_w(offs_t offset, uint8_t data);
+ void s2650games_scroll_w(offs_t offset, uint8_t data);
+ void s2650games_tilesbank_w(offs_t offset, uint8_t data);
+ void jrpacman_videoram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(jrpacman_charbank_w);
DECLARE_WRITE_LINE_MEMBER(jrpacman_spritebank_w);
- DECLARE_WRITE8_MEMBER(jrpacman_scroll_w);
+ void jrpacman_scroll_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(jrpacman_bgpriority_w);
void superabc_bank_w(uint8_t data);
@@ -252,7 +252,7 @@ public:
void eeekkp(machine_config &config);
protected:
- DECLARE_READ8_MEMBER(epos_decryption_w);
+ uint8_t epos_decryption_w(offs_t offset);
DECLARE_MACHINE_START(theglobp);
DECLARE_MACHINE_RESET(theglobp);
DECLARE_MACHINE_START(eeekkp);
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index b0d000d7cc2..723847d2570 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -55,16 +55,16 @@ public:
DECLARE_WRITE_LINE_MEMBER(cpua_irq_enable_w);
DECLARE_WRITE_LINE_MEMBER(cpub_irq_enable_w);
- DECLARE_WRITE8_MEMBER(pandoras_cpua_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(pandoras_cpub_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(pandoras_i8039_irqtrigger_w);
+ void pandoras_cpua_irqtrigger_w(uint8_t data);
+ void pandoras_cpub_irqtrigger_w(uint8_t data);
+ void pandoras_i8039_irqtrigger_w(uint8_t data);
void i8039_irqen_and_status_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(pandoras_z80_irqtrigger_w);
+ void pandoras_z80_irqtrigger_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
- DECLARE_WRITE8_MEMBER(pandoras_vram_w);
- DECLARE_WRITE8_MEMBER(pandoras_cram_w);
- DECLARE_WRITE8_MEMBER(pandoras_scrolly_w);
+ void pandoras_vram_w(offs_t offset, uint8_t data);
+ void pandoras_cram_w(offs_t offset, uint8_t data);
+ void pandoras_scrolly_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
uint8_t pandoras_portA_r();
uint8_t pandoras_portB_r();
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index 6ef945255b9..07ab6777bf6 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -73,24 +73,24 @@ private:
int m_irq_count;
// common
- DECLARE_WRITE8_MEMBER(rombank_w);
- DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_WRITE8_MEMBER(palette_w);
- DECLARE_WRITE8_MEMBER(palbank_w);
- DECLARE_WRITE8_MEMBER(vram_0_w);
- DECLARE_WRITE8_MEMBER(vram_1_w);
- DECLARE_WRITE8_MEMBER(vram_2_w);
- DECLARE_WRITE8_MEMBER(pixmap_w);
- DECLARE_WRITE8_MEMBER(priority_w);
+ void rombank_w(uint8_t data);
+ void flipscreen_w(uint8_t data);
+ void palette_w(offs_t offset, uint8_t data);
+ void palbank_w(uint8_t data);
+ void vram_0_w(offs_t offset, uint8_t data);
+ void vram_1_w(offs_t offset, uint8_t data);
+ void vram_2_w(offs_t offset, uint8_t data);
+ void pixmap_w(offs_t offset, uint8_t data);
+ void priority_w(uint8_t data);
// paradise specific
- DECLARE_WRITE8_MEMBER(paradise_okibank_w);
+ void paradise_okibank_w(uint8_t data);
// torus specific
- DECLARE_WRITE8_MEMBER(torus_coin_counter_w);
+ void torus_coin_counter_w(uint8_t data);
// tgtball specific
- DECLARE_WRITE8_MEMBER(tgtball_flipscreen_w);
+ void tgtball_flipscreen_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h
index 11347f3ac2b..81769d70731 100644
--- a/src/mame/includes/parodius.h
+++ b/src/mame/includes/parodius.h
@@ -52,10 +52,10 @@ public:
required_device<k052109_device> m_k052109;
required_device<k05324x_device> m_k053245;
required_device<k053251_device> m_k053251;
- DECLARE_WRITE8_MEMBER(parodius_videobank_w);
- DECLARE_WRITE8_MEMBER(parodius_3fc0_w);
- DECLARE_WRITE8_MEMBER(parodius_sh_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(sound_arm_nmi_w);
+ void parodius_videobank_w(uint8_t data);
+ void parodius_3fc0_w(uint8_t data);
+ void parodius_sh_irqtrigger_w(uint8_t data);
+ void sound_arm_nmi_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_parodius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h
index 8ed2a2ece2c..5ec351ab35f 100644
--- a/src/mame/includes/pass.h
+++ b/src/mame/includes/pass.h
@@ -27,8 +27,8 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE16_MEMBER(pass_bg_videoram_w);
- DECLARE_WRITE16_MEMBER(pass_fg_videoram_w);
+ void pass_bg_videoram_w(offs_t offset, uint16_t data);
+ void pass_fg_videoram_w(offs_t offset, uint16_t data);
TILE_GET_INFO_MEMBER(get_pass_bg_tile_info);
TILE_GET_INFO_MEMBER(get_pass_fg_tile_info);
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index c347478a79a..2680ac1edfe 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -60,18 +60,18 @@ public:
emu_timer *m_soundcommand_timer;
uint8_t m_nmi_mask;
- DECLARE_WRITE8_MEMBER(pbaction_sh_command_w);
+ void pbaction_sh_command_w(uint8_t data);
TIMER_CALLBACK_MEMBER(sound_trigger);
- DECLARE_WRITE8_MEMBER(nmi_mask_w);
- DECLARE_READ8_MEMBER(sound_data_r);
- DECLARE_WRITE8_MEMBER(sound_irq_ack_w);
- DECLARE_READ8_MEMBER(pbaction2_prot_kludge_r);
- DECLARE_WRITE8_MEMBER(pbaction_videoram_w);
- DECLARE_WRITE8_MEMBER(pbaction_colorram_w);
- DECLARE_WRITE8_MEMBER(pbaction_videoram2_w);
- DECLARE_WRITE8_MEMBER(pbaction_colorram2_w);
- DECLARE_WRITE8_MEMBER(pbaction_scroll_w);
- DECLARE_WRITE8_MEMBER(pbaction_flipscreen_w);
+ void nmi_mask_w(uint8_t data);
+ uint8_t sound_data_r();
+ void sound_irq_ack_w(uint8_t data);
+ uint8_t pbaction2_prot_kludge_r();
+ void pbaction_videoram_w(offs_t offset, uint8_t data);
+ void pbaction_colorram_w(offs_t offset, uint8_t data);
+ void pbaction_videoram2_w(offs_t offset, uint8_t data);
+ void pbaction_colorram2_w(offs_t offset, uint8_t data);
+ void pbaction_scroll_w(uint8_t data);
+ void pbaction_flipscreen_w(uint8_t data);
void init_pbaction2();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
@@ -117,15 +117,15 @@ private:
TIMER_CALLBACK_MEMBER(sub_trigger);
emu_timer *m_subcommand_timer;
- DECLARE_READ8_MEMBER(subcpu_r);
- DECLARE_WRITE8_MEMBER(subcpu_w);
+ uint8_t subcpu_r();
+ void subcpu_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(sub8000_w);
DECLARE_WRITE_LINE_MEMBER(sub8001_w);
- DECLARE_WRITE8_MEMBER(sub8008_w);
+ void sub8008_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(subtomain_w);
- DECLARE_READ8_MEMBER(maintosub_r);
+ void subtomain_w(uint8_t data);
+ uint8_t maintosub_r();
required_device<z80_device> m_subcpu;
required_device<z80ctc_device> m_ctc2;
diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h
index b452e946e66..50d01e79643 100644
--- a/src/mame/includes/pc1251.h
+++ b/src/mame/includes/pc1251.h
@@ -45,8 +45,8 @@ protected:
DECLARE_READ_LINE_MEMBER(reset_r);
uint8_t in_a_r();
uint8_t in_b_r();
- DECLARE_READ8_MEMBER(lcd_read);
- DECLARE_WRITE8_MEMBER(lcd_write);
+ uint8_t lcd_read(offs_t offset);
+ void lcd_write(offs_t offset, uint8_t data);
private:
required_ioport_array<10> m_keys;
diff --git a/src/mame/includes/pc1350.h b/src/mame/includes/pc1350.h
index 1c7f6181884..bf7e8d0e021 100644
--- a/src/mame/includes/pc1350.h
+++ b/src/mame/includes/pc1350.h
@@ -37,8 +37,8 @@ protected:
uint8_t in_a_r();
uint8_t in_b_r();
- DECLARE_READ8_MEMBER(lcd_read);
- DECLARE_WRITE8_MEMBER(lcd_write);
+ uint8_t lcd_read(offs_t offset);
+ void lcd_write(offs_t offset, uint8_t data);
uint8_t keyboard_line_r();
private:
diff --git a/src/mame/includes/pc1401.h b/src/mame/includes/pc1401.h
index 7914bdfd71d..d3c10f8154a 100644
--- a/src/mame/includes/pc1401.h
+++ b/src/mame/includes/pc1401.h
@@ -39,8 +39,8 @@ protected:
void out_c_w(uint8_t data);
uint8_t in_a_r();
uint8_t in_b_r();
- DECLARE_READ8_MEMBER(lcd_read);
- DECLARE_WRITE8_MEMBER(lcd_write);
+ uint8_t lcd_read(offs_t offset);
+ void lcd_write(offs_t offset, uint8_t data);
private:
required_ioport_array<13> m_keys;
diff --git a/src/mame/includes/pc1403.h b/src/mame/includes/pc1403.h
index 56c285f80aa..deb5363ce31 100644
--- a/src/mame/includes/pc1403.h
+++ b/src/mame/includes/pc1403.h
@@ -39,10 +39,10 @@ protected:
void out_c_w(uint8_t data);
uint8_t in_a_r();
- DECLARE_READ8_MEMBER(asic_read);
- DECLARE_WRITE8_MEMBER(asic_write);
- DECLARE_READ8_MEMBER(lcd_read);
- DECLARE_WRITE8_MEMBER(lcd_write);
+ uint8_t asic_read(offs_t offset);
+ void asic_write(offs_t offset, uint8_t data);
+ uint8_t lcd_read(offs_t offset);
+ void lcd_write(offs_t offset, uint8_t data);
int m_down;
int m_right;
diff --git a/src/mame/includes/pc4.h b/src/mame/includes/pc4.h
index ed5eac80488..bb5008a7003 100644
--- a/src/mame/includes/pc4.h
+++ b/src/mame/includes/pc4.h
@@ -38,19 +38,19 @@ protected:
private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER( beep_w );
- DECLARE_WRITE8_MEMBER( bank_w );
- DECLARE_READ8_MEMBER( kb_r );
+ void beep_w(uint8_t data);
+ void bank_w(uint8_t data);
+ uint8_t kb_r(offs_t offset);
//LCD controller
void update_ac();
void set_busy_flag(uint16_t usec);
- DECLARE_WRITE8_MEMBER(lcd_control_w);
- DECLARE_READ8_MEMBER(lcd_control_r);
- DECLARE_WRITE8_MEMBER(lcd_data_w);
- DECLARE_READ8_MEMBER(lcd_data_r);
- DECLARE_WRITE8_MEMBER( lcd_offset_w );
+ void lcd_control_w(uint8_t data);
+ uint8_t lcd_control_r();
+ void lcd_data_w(uint8_t data);
+ uint8_t lcd_data_r();
+ void lcd_offset_w(uint8_t data);
void pc4_palette(palette_device &palette) const;
diff --git a/src/mame/includes/pc6001.h b/src/mame/includes/pc6001.h
index 796968b9821..cd3f2701ed9 100644
--- a/src/mame/includes/pc6001.h
+++ b/src/mame/includes/pc6001.h
@@ -48,9 +48,9 @@ public:
m_palette(*this, "palette")
{ }
- DECLARE_WRITE8_MEMBER(system_latch_w);
- DECLARE_READ8_MEMBER(nec_ppi8255_r);
- DECLARE_WRITE8_MEMBER(nec_ppi8255_w);
+ void system_latch_w(uint8_t data);
+ uint8_t nec_ppi8255_r(offs_t offset);
+ void nec_ppi8255_w(offs_t offset, uint8_t data);
void pc6001_palette(palette_device &palette) const;
@@ -151,28 +151,28 @@ public:
m_bank8(*this, "bank8")
{ }
- DECLARE_READ8_MEMBER(mk2_bank_r0_r);
- DECLARE_READ8_MEMBER(mk2_bank_r1_r);
- DECLARE_READ8_MEMBER(mk2_bank_w0_r);
- DECLARE_WRITE8_MEMBER(mk2_bank_r0_w);
- DECLARE_WRITE8_MEMBER(mk2_bank_r1_w);
- DECLARE_WRITE8_MEMBER(mk2_bank_w0_w);
- DECLARE_WRITE8_MEMBER(mk2_opt_bank_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram0_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram1_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram2_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram3_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram4_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram5_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram6_w);
- DECLARE_WRITE8_MEMBER(mk2_work_ram7_w);
- DECLARE_WRITE8_MEMBER(necmk2_ppi8255_w);
- DECLARE_WRITE8_MEMBER(mk2_system_latch_w);
- DECLARE_WRITE8_MEMBER(mk2_vram_bank_w);
- DECLARE_WRITE8_MEMBER(mk2_col_bank_w);
- DECLARE_WRITE8_MEMBER(mk2_0xf3_w);
- DECLARE_WRITE8_MEMBER(mk2_timer_adj_w);
- DECLARE_WRITE8_MEMBER(mk2_timer_irqv_w);
+ uint8_t mk2_bank_r0_r();
+ uint8_t mk2_bank_r1_r();
+ uint8_t mk2_bank_w0_r();
+ void mk2_bank_r0_w(uint8_t data);
+ void mk2_bank_r1_w(uint8_t data);
+ void mk2_bank_w0_w(uint8_t data);
+ void mk2_opt_bank_w(uint8_t data);
+ void mk2_work_ram0_w(offs_t offset, uint8_t data);
+ void mk2_work_ram1_w(offs_t offset, uint8_t data);
+ void mk2_work_ram2_w(offs_t offset, uint8_t data);
+ void mk2_work_ram3_w(offs_t offset, uint8_t data);
+ void mk2_work_ram4_w(offs_t offset, uint8_t data);
+ void mk2_work_ram5_w(offs_t offset, uint8_t data);
+ void mk2_work_ram6_w(offs_t offset, uint8_t data);
+ void mk2_work_ram7_w(offs_t offset, uint8_t data);
+ void necmk2_ppi8255_w(offs_t offset, uint8_t data);
+ void mk2_system_latch_w(uint8_t data);
+ void mk2_vram_bank_w(uint8_t data);
+ void mk2_col_bank_w(uint8_t data);
+ void mk2_0xf3_w(uint8_t data);
+ void mk2_timer_adj_w(uint8_t data);
+ void mk2_timer_irqv_w(uint8_t data);
void pc6001mk2_palette(palette_device &palette) const;
void pc6001mk2(machine_config &config);
@@ -216,8 +216,8 @@ public:
pc6001mk2_state(mconfig, type, tag)
{ }
- DECLARE_READ8_MEMBER(fdc_r);
- DECLARE_WRITE8_MEMBER(fdc_w);
+ uint8_t fdc_r();
+ void fdc_w(uint8_t data);
void pc6601(machine_config &config);
void pc6601_io(address_map &map);
@@ -231,25 +231,25 @@ public:
m_sr_irq_vectors(*this, "irq_vectors")
{ }
- DECLARE_READ8_MEMBER(hw_rev_r);
- DECLARE_READ8_MEMBER(sr_bank_rn_r);
- DECLARE_WRITE8_MEMBER(sr_bank_rn_w);
- DECLARE_READ8_MEMBER(sr_bank_wn_r);
- DECLARE_WRITE8_MEMBER(sr_bank_wn_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram0_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram1_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram2_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram3_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram4_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram5_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram6_w);
- DECLARE_WRITE8_MEMBER(sr_work_ram7_w);
- DECLARE_WRITE8_MEMBER(sr_mode_w);
- DECLARE_WRITE8_MEMBER(sr_vram_bank_w);
- DECLARE_WRITE8_MEMBER(sr_system_latch_w);
- DECLARE_WRITE8_MEMBER(necsr_ppi8255_w);
- DECLARE_WRITE8_MEMBER(sr_bitmap_yoffs_w);
- DECLARE_WRITE8_MEMBER(sr_bitmap_xoffs_w);
+ uint8_t hw_rev_r();
+ uint8_t sr_bank_rn_r(offs_t offset);
+ void sr_bank_rn_w(offs_t offset, uint8_t data);
+ uint8_t sr_bank_wn_r(offs_t offset);
+ void sr_bank_wn_w(offs_t offset, uint8_t data);
+ void sr_work_ram0_w(offs_t offset, uint8_t data);
+ void sr_work_ram1_w(offs_t offset, uint8_t data);
+ void sr_work_ram2_w(offs_t offset, uint8_t data);
+ void sr_work_ram3_w(offs_t offset, uint8_t data);
+ void sr_work_ram4_w(offs_t offset, uint8_t data);
+ void sr_work_ram5_w(offs_t offset, uint8_t data);
+ void sr_work_ram6_w(offs_t offset, uint8_t data);
+ void sr_work_ram7_w(offs_t offset, uint8_t data);
+ void sr_mode_w(uint8_t data);
+ void sr_vram_bank_w(uint8_t data);
+ void sr_system_latch_w(uint8_t data);
+ void necsr_ppi8255_w(offs_t offset, uint8_t data);
+ void sr_bitmap_yoffs_w(uint8_t data);
+ void sr_bitmap_xoffs_w(uint8_t data);
INTERRUPT_GEN_MEMBER(sr_vrtc_irq);
diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h
index 3481adc6438..12002ed8dcd 100644
--- a/src/mame/includes/pc8001.h
+++ b/src/mame/includes/pc8001.h
@@ -59,10 +59,10 @@ public:
virtual void machine_start() override;
- DECLARE_WRITE8_MEMBER( port10_w );
- DECLARE_WRITE8_MEMBER( port30_w );
- DECLARE_READ8_MEMBER( port40_r );
- DECLARE_WRITE8_MEMBER( port40_w );
+ void port10_w(uint8_t data);
+ void port30_w(uint8_t data);
+ uint8_t port40_r();
+ void port40_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( hrq_w );
uint8_t dma_mem_r(offs_t offset);
@@ -91,7 +91,7 @@ public:
required_memory_region m_kanji_rom;
- DECLARE_WRITE8_MEMBER( port31_w );
+ void port31_w(uint8_t data);
void pc8001mk2(machine_config &config);
void pc8001mk2_io(address_map &map);
void pc8001mk2_mem(address_map &map);
diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h
index 115abacb7d8..738ad4749c9 100644
--- a/src/mame/includes/pc8401a.h
+++ b/src/mame/includes/pc8401a.h
@@ -70,17 +70,17 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
- DECLARE_WRITE8_MEMBER( mmr_w );
- DECLARE_READ8_MEMBER( mmr_r );
- DECLARE_READ8_MEMBER( rtc_r );
- DECLARE_WRITE8_MEMBER( rtc_cmd_w );
- DECLARE_WRITE8_MEMBER( rtc_ctrl_w );
- DECLARE_READ8_MEMBER( io_rom_data_r );
- DECLARE_WRITE8_MEMBER( io_rom_addr_w );
- DECLARE_READ8_MEMBER( port70_r );
- DECLARE_READ8_MEMBER( port71_r );
- DECLARE_WRITE8_MEMBER( port70_w );
- DECLARE_WRITE8_MEMBER( port71_w );
+ void mmr_w(uint8_t data);
+ uint8_t mmr_r();
+ uint8_t rtc_r();
+ void rtc_cmd_w(uint8_t data);
+ void rtc_ctrl_w(uint8_t data);
+ uint8_t io_rom_data_r();
+ void io_rom_addr_w(offs_t offset, uint8_t data);
+ uint8_t port70_r();
+ uint8_t port71_r();
+ void port70_w(uint8_t data);
+ void port71_w(uint8_t data);
uint8_t ppi_pc_r();
void ppi_pc_w(uint8_t data);
void pc8401a_palette(palette_device &palette) const;
diff --git a/src/mame/includes/pc8801.h b/src/mame/includes/pc8801.h
index 7a5f2b30000..c7638663895 100644
--- a/src/mame/includes/pc8801.h
+++ b/src/mame/includes/pc8801.h
@@ -152,79 +152,79 @@ private:
uint32_t m_extram_size;
uint8_t m_has_opna;
- DECLARE_READ8_MEMBER(pc8801_alu_r);
- DECLARE_WRITE8_MEMBER(pc8801_alu_w);
- DECLARE_READ8_MEMBER(pc8801_wram_r);
- DECLARE_WRITE8_MEMBER(pc8801_wram_w);
- DECLARE_READ8_MEMBER(pc8801_ext_wram_r);
- DECLARE_WRITE8_MEMBER(pc8801_ext_wram_w);
- DECLARE_READ8_MEMBER(pc8801_nbasic_rom_r);
- DECLARE_READ8_MEMBER(pc8801_n88basic_rom_r);
- DECLARE_READ8_MEMBER(pc8801_gvram_r);
- DECLARE_WRITE8_MEMBER(pc8801_gvram_w);
- DECLARE_READ8_MEMBER(pc8801_high_wram_r);
- DECLARE_WRITE8_MEMBER(pc8801_high_wram_w);
- DECLARE_READ8_MEMBER(pc8801ma_dic_r);
- DECLARE_READ8_MEMBER(pc8801_cdbios_rom_r);
- DECLARE_READ8_MEMBER(pc8801_mem_r);
- DECLARE_WRITE8_MEMBER(pc8801_mem_w);
- DECLARE_READ8_MEMBER(pc8801_ctrl_r);
- DECLARE_WRITE8_MEMBER(pc8801_ctrl_w);
- DECLARE_READ8_MEMBER(pc8801_ext_rom_bank_r);
- DECLARE_WRITE8_MEMBER(pc8801_ext_rom_bank_w);
- DECLARE_WRITE8_MEMBER(pc8801_gfx_ctrl_w);
- DECLARE_READ8_MEMBER(pc8801_vram_select_r);
- DECLARE_WRITE8_MEMBER(pc8801_vram_select_w);
- DECLARE_WRITE8_MEMBER(pc8801_irq_level_w);
- DECLARE_WRITE8_MEMBER(pc8801_irq_mask_w);
- DECLARE_READ8_MEMBER(pc8801_window_bank_r);
- DECLARE_WRITE8_MEMBER(pc8801_window_bank_w);
- DECLARE_WRITE8_MEMBER(pc8801_window_bank_inc_w);
- DECLARE_READ8_MEMBER(pc8801_misc_ctrl_r);
- DECLARE_WRITE8_MEMBER(pc8801_misc_ctrl_w);
- DECLARE_WRITE8_MEMBER(pc8801_bgpal_w);
- DECLARE_WRITE8_MEMBER(pc8801_palram_w);
- DECLARE_WRITE8_MEMBER(pc8801_layer_masking_w);
- DECLARE_READ8_MEMBER(pc8801_crtc_param_r);
- DECLARE_WRITE8_MEMBER(pc88_crtc_param_w);
- DECLARE_READ8_MEMBER(pc8801_crtc_status_r);
- DECLARE_WRITE8_MEMBER(pc88_crtc_cmd_w);
- DECLARE_READ8_MEMBER(pc8801_dmac_r);
- DECLARE_WRITE8_MEMBER(pc8801_dmac_w);
- DECLARE_READ8_MEMBER(pc8801_dmac_status_r);
- DECLARE_WRITE8_MEMBER(pc8801_dmac_mode_w);
- DECLARE_READ8_MEMBER(pc8801_extram_mode_r);
- DECLARE_WRITE8_MEMBER(pc8801_extram_mode_w);
- DECLARE_READ8_MEMBER(pc8801_extram_bank_r);
- DECLARE_WRITE8_MEMBER(pc8801_extram_bank_w);
- DECLARE_WRITE8_MEMBER(pc8801_alu_ctrl1_w);
- DECLARE_WRITE8_MEMBER(pc8801_alu_ctrl2_w);
- DECLARE_WRITE8_MEMBER(pc8801_pcg8100_w);
- DECLARE_WRITE8_MEMBER(pc8801_txt_cmt_ctrl_w);
- DECLARE_READ8_MEMBER(pc8801_kanji_r);
- DECLARE_WRITE8_MEMBER(pc8801_kanji_w);
- DECLARE_READ8_MEMBER(pc8801_kanji_lv2_r);
- DECLARE_WRITE8_MEMBER(pc8801_kanji_lv2_w);
- DECLARE_WRITE8_MEMBER(pc8801_dic_bank_w);
- DECLARE_WRITE8_MEMBER(pc8801_dic_ctrl_w);
- DECLARE_READ8_MEMBER(pc8801_cdrom_r);
- DECLARE_WRITE8_MEMBER(pc8801_cdrom_w);
- DECLARE_READ8_MEMBER(pc8801_cpuclock_r);
- DECLARE_READ8_MEMBER(pc8801_baudrate_r);
- DECLARE_WRITE8_MEMBER(pc8801_baudrate_w);
- DECLARE_WRITE8_MEMBER(pc8801_rtc_w);
- DECLARE_WRITE8_MEMBER(upd765_mc_w);
- DECLARE_READ8_MEMBER(upd765_tc_r);
- DECLARE_WRITE8_MEMBER(fdc_irq_vector_w);
- DECLARE_WRITE8_MEMBER(fdc_drive_mode_w);
+ uint8_t pc8801_alu_r(offs_t offset);
+ void pc8801_alu_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_wram_r(offs_t offset);
+ void pc8801_wram_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_ext_wram_r(offs_t offset);
+ void pc8801_ext_wram_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_nbasic_rom_r(offs_t offset);
+ uint8_t pc8801_n88basic_rom_r(offs_t offset);
+ uint8_t pc8801_gvram_r(offs_t offset);
+ void pc8801_gvram_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_high_wram_r(offs_t offset);
+ void pc8801_high_wram_w(offs_t offset, uint8_t data);
+ uint8_t pc8801ma_dic_r(offs_t offset);
+ uint8_t pc8801_cdbios_rom_r(offs_t offset);
+ uint8_t pc8801_mem_r(offs_t offset);
+ void pc8801_mem_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_ctrl_r();
+ void pc8801_ctrl_w(uint8_t data);
+ uint8_t pc8801_ext_rom_bank_r();
+ void pc8801_ext_rom_bank_w(uint8_t data);
+ void pc8801_gfx_ctrl_w(uint8_t data);
+ uint8_t pc8801_vram_select_r();
+ void pc8801_vram_select_w(offs_t offset, uint8_t data);
+ void pc8801_irq_level_w(uint8_t data);
+ void pc8801_irq_mask_w(uint8_t data);
+ uint8_t pc8801_window_bank_r();
+ void pc8801_window_bank_w(uint8_t data);
+ void pc8801_window_bank_inc_w(uint8_t data);
+ uint8_t pc8801_misc_ctrl_r();
+ void pc8801_misc_ctrl_w(uint8_t data);
+ void pc8801_bgpal_w(uint8_t data);
+ void pc8801_palram_w(offs_t offset, uint8_t data);
+ void pc8801_layer_masking_w(uint8_t data);
+ uint8_t pc8801_crtc_param_r();
+ void pc88_crtc_param_w(uint8_t data);
+ uint8_t pc8801_crtc_status_r();
+ void pc88_crtc_cmd_w(uint8_t data);
+ uint8_t pc8801_dmac_r(offs_t offset);
+ void pc8801_dmac_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_dmac_status_r();
+ void pc8801_dmac_mode_w(uint8_t data);
+ uint8_t pc8801_extram_mode_r();
+ void pc8801_extram_mode_w(uint8_t data);
+ uint8_t pc8801_extram_bank_r();
+ void pc8801_extram_bank_w(uint8_t data);
+ void pc8801_alu_ctrl1_w(uint8_t data);
+ void pc8801_alu_ctrl2_w(uint8_t data);
+ void pc8801_pcg8100_w(offs_t offset, uint8_t data);
+ void pc8801_txt_cmt_ctrl_w(uint8_t data);
+ uint8_t pc8801_kanji_r(offs_t offset);
+ void pc8801_kanji_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_kanji_lv2_r(offs_t offset);
+ void pc8801_kanji_lv2_w(offs_t offset, uint8_t data);
+ void pc8801_dic_bank_w(uint8_t data);
+ void pc8801_dic_ctrl_w(uint8_t data);
+ uint8_t pc8801_cdrom_r();
+ void pc8801_cdrom_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_cpuclock_r();
+ uint8_t pc8801_baudrate_r();
+ void pc8801_baudrate_w(uint8_t data);
+ void pc8801_rtc_w(uint8_t data);
+ void upd765_mc_w(uint8_t data);
+ uint8_t upd765_tc_r();
+ void fdc_irq_vector_w(uint8_t data);
+ void fdc_drive_mode_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(txdata_callback);
DECLARE_WRITE_LINE_MEMBER(rxrdy_w);
- DECLARE_READ8_MEMBER(pc8801_sound_board_r);
- DECLARE_WRITE8_MEMBER(pc8801_sound_board_w);
- DECLARE_READ8_MEMBER(pc8801_opna_r);
- DECLARE_WRITE8_MEMBER(pc8801_opna_w);
- DECLARE_READ8_MEMBER(pc8801_unk_r);
- DECLARE_WRITE8_MEMBER(pc8801_unk_w);
+ uint8_t pc8801_sound_board_r(offs_t offset);
+ void pc8801_sound_board_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_opna_r(offs_t offset);
+ void pc8801_opna_w(offs_t offset, uint8_t data);
+ uint8_t pc8801_unk_r();
+ void pc8801_unk_w(uint8_t data);
uint8_t pc8801_pixel_clock(void);
void pc8801_dynamic_res_change(void);
diff --git a/src/mame/includes/pc88va.h b/src/mame/includes/pc88va.h
index 8d01eff1228..38c3719ab63 100644
--- a/src/mame/includes/pc88va.h
+++ b/src/mame/includes/pc88va.h
@@ -121,37 +121,35 @@ private:
uint8_t m_i8255_1_pc;
uint8_t m_fdc_mode;
uint8_t m_fdc_irq_opcode;
- DECLARE_READ16_MEMBER(sys_mem_r);
- DECLARE_WRITE16_MEMBER(sys_mem_w);
- DECLARE_READ8_MEMBER(idp_status_r);
- DECLARE_WRITE8_MEMBER(idp_command_w);
- DECLARE_WRITE8_MEMBER(idp_param_w);
- DECLARE_WRITE16_MEMBER(palette_ram_w);
- DECLARE_READ16_MEMBER(sys_port4_r);
- DECLARE_READ16_MEMBER(bios_bank_r);
- DECLARE_WRITE16_MEMBER(bios_bank_w);
- DECLARE_READ8_MEMBER(rom_bank_r);
- DECLARE_READ8_MEMBER(key_r);
- DECLARE_WRITE16_MEMBER(backupram_wp_1_w);
- DECLARE_WRITE16_MEMBER(backupram_wp_0_w);
- DECLARE_READ8_MEMBER(kanji_ram_r);
- DECLARE_WRITE8_MEMBER(kanji_ram_w);
- DECLARE_READ8_MEMBER(hdd_status_r);
+ uint8_t idp_status_r();
+ void idp_command_w(uint8_t data);
+ void idp_param_w(uint8_t data);
+ void palette_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t sys_port4_r();
+ uint16_t bios_bank_r();
+ void bios_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t rom_bank_r();
+ uint8_t key_r(offs_t offset);
+ void backupram_wp_1_w(uint16_t data);
+ void backupram_wp_0_w(uint16_t data);
+ uint8_t kanji_ram_r(offs_t offset);
+ void kanji_ram_w(offs_t offset, uint8_t data);
+ uint8_t hdd_status_r();
#if TEST_SUBFDC
- DECLARE_READ8_MEMBER(upd765_tc_r);
- DECLARE_WRITE8_MEMBER(upd765_mc_w);
+ uint8_t upd765_tc_r();
+ void upd765_mc_w(uint8_t data);
#else
- DECLARE_READ8_MEMBER(no_subfdc_r);
+ uint8_t no_subfdc_r();
#endif
- DECLARE_READ8_MEMBER(pc88va_fdc_r);
- DECLARE_WRITE8_MEMBER(pc88va_fdc_w);
- DECLARE_READ16_MEMBER(sysop_r);
- DECLARE_READ16_MEMBER(screen_ctrl_r);
- DECLARE_WRITE16_MEMBER(screen_ctrl_w);
- DECLARE_WRITE8_MEMBER(timer3_ctrl_reg_w);
- DECLARE_WRITE16_MEMBER(video_pri_w);
- DECLARE_READ8_MEMBER(backupram_dsw_r);
- DECLARE_WRITE8_MEMBER(sys_port1_w);
+ uint8_t pc88va_fdc_r(offs_t offset);
+ void pc88va_fdc_w(offs_t offset, uint8_t data);
+ uint16_t sysop_r();
+ uint16_t screen_ctrl_r();
+ void screen_ctrl_w(uint16_t data);
+ void timer3_ctrl_reg_w(uint8_t data);
+ void video_pri_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t backupram_dsw_r(offs_t offset);
+ void sys_port1_w(uint8_t data);
uint32_t screen_update_pc88va(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(pc88va_vrtc_irq);
uint8_t cpu_8255_c_r();
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index faf78f1bee7..d953b947464 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -162,114 +162,114 @@ private:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
- DECLARE_WRITE8_MEMBER(rtc_w);
- DECLARE_WRITE8_MEMBER(dmapg4_w);
- DECLARE_WRITE8_MEMBER(dmapg8_w);
- DECLARE_WRITE8_MEMBER(nmi_ctrl_w);
- DECLARE_WRITE8_MEMBER(vrtc_clear_w);
- DECLARE_WRITE8_MEMBER(pc9801_video_ff_w);
- DECLARE_READ8_MEMBER(txt_scrl_r);
- DECLARE_WRITE8_MEMBER(txt_scrl_w);
- DECLARE_READ8_MEMBER(grcg_r);
- DECLARE_WRITE8_MEMBER(grcg_w);
- DECLARE_WRITE16_MEMBER(egc_w);
- DECLARE_READ8_MEMBER(pc9801_a0_r);
- DECLARE_WRITE8_MEMBER(pc9801_a0_w);
- DECLARE_READ8_MEMBER(fdc_2hd_ctrl_r);
- DECLARE_WRITE8_MEMBER(fdc_2hd_ctrl_w);
- DECLARE_READ8_MEMBER(fdc_2dd_ctrl_r);
- DECLARE_WRITE8_MEMBER(fdc_2dd_ctrl_w);
- DECLARE_READ16_MEMBER(tvram_r);
- DECLARE_WRITE16_MEMBER(tvram_w);
- DECLARE_READ8_MEMBER(gvram_r);
- DECLARE_WRITE8_MEMBER(gvram_w);
- DECLARE_WRITE8_MEMBER(pc9801rs_mouse_freq_w);
- DECLARE_READ16_MEMBER(grcg_gvram_r);
- DECLARE_WRITE16_MEMBER(grcg_gvram_w);
- DECLARE_READ16_MEMBER(grcg_gvram0_r);
- DECLARE_WRITE16_MEMBER(grcg_gvram0_w);
-
- DECLARE_READ16_MEMBER(pc9821_grcg_gvram_r);
- DECLARE_WRITE16_MEMBER(pc9821_grcg_gvram_w);
- DECLARE_READ16_MEMBER(pc9821_grcg_gvram0_r);
- DECLARE_WRITE16_MEMBER(pc9821_grcg_gvram0_w);
-
- DECLARE_READ16_MEMBER(upd7220_grcg_r);
- DECLARE_WRITE16_MEMBER(upd7220_grcg_w);
-
- DECLARE_READ8_MEMBER(ide_ctrl_r);
- DECLARE_WRITE8_MEMBER(ide_ctrl_w);
- DECLARE_READ16_MEMBER(ide_cs0_r);
- DECLARE_WRITE16_MEMBER(ide_cs0_w);
- DECLARE_READ16_MEMBER(ide_cs1_r);
- DECLARE_WRITE16_MEMBER(ide_cs1_w);
+ void rtc_w(uint8_t data);
+ void dmapg4_w(offs_t offset, uint8_t data);
+ void dmapg8_w(offs_t offset, uint8_t data);
+ void nmi_ctrl_w(offs_t offset, uint8_t data);
+ void vrtc_clear_w(uint8_t data);
+ void pc9801_video_ff_w(uint8_t data);
+ uint8_t txt_scrl_r(offs_t offset);
+ void txt_scrl_w(offs_t offset, uint8_t data);
+ uint8_t grcg_r(offs_t offset);
+ void grcg_w(offs_t offset, uint8_t data);
+ void egc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t pc9801_a0_r(offs_t offset);
+ void pc9801_a0_w(offs_t offset, uint8_t data);
+ uint8_t fdc_2hd_ctrl_r();
+ void fdc_2hd_ctrl_w(uint8_t data);
+ uint8_t fdc_2dd_ctrl_r();
+ void fdc_2dd_ctrl_w(uint8_t data);
+ uint16_t tvram_r(offs_t offset, uint16_t mem_mask = ~0);
+ void tvram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t gvram_r(offs_t offset);
+ void gvram_w(offs_t offset, uint8_t data);
+ void pc9801rs_mouse_freq_w(offs_t offset, uint8_t data);
+ uint16_t grcg_gvram_r(offs_t offset, uint16_t mem_mask = ~0);
+ void grcg_gvram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t grcg_gvram0_r(offs_t offset, uint16_t mem_mask = ~0);
+ void grcg_gvram0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+
+ uint16_t pc9821_grcg_gvram_r(offs_t offset, uint16_t mem_mask = ~0);
+ void pc9821_grcg_gvram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t pc9821_grcg_gvram0_r(offs_t offset, uint16_t mem_mask = ~0);
+ void pc9821_grcg_gvram0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+
+ uint16_t upd7220_grcg_r(offs_t offset, uint16_t mem_mask = ~0);
+ void upd7220_grcg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+
+ uint8_t ide_ctrl_r();
+ void ide_ctrl_w(uint8_t data);
+ uint16_t ide_cs0_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ide_cs0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t ide_cs1_r(offs_t offset, uint16_t mem_mask = ~0);
+ void ide_cs1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void sasi_data_w(uint8_t data);
uint8_t sasi_data_r();
DECLARE_WRITE_LINE_MEMBER(write_sasi_io);
DECLARE_WRITE_LINE_MEMBER(write_sasi_req);
- DECLARE_READ8_MEMBER(sasi_status_r);
- DECLARE_WRITE8_MEMBER(sasi_ctrl_w);
-
- DECLARE_READ8_MEMBER(pc9801rs_knjram_r);
- DECLARE_WRITE8_MEMBER(pc9801rs_knjram_w);
- DECLARE_WRITE8_MEMBER(pc9801rs_bank_w);
- DECLARE_READ8_MEMBER(f0_r);
-
- DECLARE_READ8_MEMBER(a20_ctrl_r);
- DECLARE_WRITE8_MEMBER(a20_ctrl_w);
- DECLARE_READ8_MEMBER(fdc_mode_ctrl_r);
- DECLARE_WRITE8_MEMBER(fdc_mode_ctrl_w);
-// DECLARE_READ8_MEMBER(pc9801rs_2dd_r);
-// DECLARE_WRITE8_MEMBER(pc9801rs_2dd_w);
- DECLARE_WRITE8_MEMBER(pc9801rs_video_ff_w);
- DECLARE_WRITE8_MEMBER(pc9801rs_a0_w);
- DECLARE_WRITE8_MEMBER(pc9821_video_ff_w);
- DECLARE_READ8_MEMBER(pc9821_a0_r);
- DECLARE_WRITE8_MEMBER(pc9821_a0_w);
- DECLARE_READ8_MEMBER(access_ctrl_r);
- DECLARE_WRITE8_MEMBER(access_ctrl_w);
- DECLARE_READ8_MEMBER(midi_r);
-// DECLARE_READ8_MEMBER(winram_r);
-// DECLARE_WRITE8_MEMBER(winram_w);
- DECLARE_READ8_MEMBER(pic_r);
- DECLARE_WRITE8_MEMBER(pic_w);
-
- DECLARE_READ8_MEMBER(sdip_0_r);
- DECLARE_READ8_MEMBER(sdip_1_r);
- DECLARE_READ8_MEMBER(sdip_2_r);
- DECLARE_READ8_MEMBER(sdip_3_r);
- DECLARE_READ8_MEMBER(sdip_4_r);
- DECLARE_READ8_MEMBER(sdip_5_r);
- DECLARE_READ8_MEMBER(sdip_6_r);
- DECLARE_READ8_MEMBER(sdip_7_r);
- DECLARE_READ8_MEMBER(sdip_8_r);
- DECLARE_READ8_MEMBER(sdip_9_r);
- DECLARE_READ8_MEMBER(sdip_a_r);
- DECLARE_READ8_MEMBER(sdip_b_r);
-
- DECLARE_WRITE8_MEMBER(sdip_0_w);
- DECLARE_WRITE8_MEMBER(sdip_1_w);
- DECLARE_WRITE8_MEMBER(sdip_2_w);
- DECLARE_WRITE8_MEMBER(sdip_3_w);
- DECLARE_WRITE8_MEMBER(sdip_4_w);
- DECLARE_WRITE8_MEMBER(sdip_5_w);
- DECLARE_WRITE8_MEMBER(sdip_6_w);
- DECLARE_WRITE8_MEMBER(sdip_7_w);
- DECLARE_WRITE8_MEMBER(sdip_8_w);
- DECLARE_WRITE8_MEMBER(sdip_9_w);
- DECLARE_WRITE8_MEMBER(sdip_a_w);
- DECLARE_WRITE8_MEMBER(sdip_b_w);
-
- DECLARE_READ8_MEMBER(as_unkdev_data_r);
- DECLARE_WRITE8_MEMBER(as_unkdev_data_w);
- DECLARE_WRITE8_MEMBER(as_unkdev_addr_w);
-
- DECLARE_READ8_MEMBER(window_bank_r);
- DECLARE_WRITE8_MEMBER(window_bank_w);
- DECLARE_READ16_MEMBER(timestamp_r);
- DECLARE_READ8_MEMBER(ext2_video_ff_r);
- DECLARE_WRITE8_MEMBER(ext2_video_ff_w);
+ uint8_t sasi_status_r();
+ void sasi_ctrl_w(uint8_t data);
+
+ uint8_t pc9801rs_knjram_r(offs_t offset);
+ void pc9801rs_knjram_w(offs_t offset, uint8_t data);
+ void pc9801rs_bank_w(offs_t offset, uint8_t data);
+ uint8_t f0_r(offs_t offset);
+
+ uint8_t a20_ctrl_r(offs_t offset);
+ void a20_ctrl_w(offs_t offset, uint8_t data);
+ uint8_t fdc_mode_ctrl_r();
+ void fdc_mode_ctrl_w(uint8_t data);
+// uint8_t pc9801rs_2dd_r();
+// void pc9801rs_2dd_w(uint8_t data);
+ void pc9801rs_video_ff_w(offs_t offset, uint8_t data);
+ void pc9801rs_a0_w(offs_t offset, uint8_t data);
+ void pc9821_video_ff_w(offs_t offset, uint8_t data);
+ uint8_t pc9821_a0_r(offs_t offset);
+ void pc9821_a0_w(offs_t offset, uint8_t data);
+ uint8_t access_ctrl_r(offs_t offset);
+ void access_ctrl_w(offs_t offset, uint8_t data);
+ uint8_t midi_r();
+// uint8_t winram_r();
+// void winram_w(uint8_t data);
+ uint8_t pic_r(offs_t offset);
+ void pic_w(offs_t offset, uint8_t data);
+
+ uint8_t sdip_0_r(offs_t offset);
+ uint8_t sdip_1_r(offs_t offset);
+ uint8_t sdip_2_r(offs_t offset);
+ uint8_t sdip_3_r(offs_t offset);
+ uint8_t sdip_4_r(offs_t offset);
+ uint8_t sdip_5_r(offs_t offset);
+ uint8_t sdip_6_r(offs_t offset);
+ uint8_t sdip_7_r(offs_t offset);
+ uint8_t sdip_8_r(offs_t offset);
+ uint8_t sdip_9_r(offs_t offset);
+ uint8_t sdip_a_r(offs_t offset);
+ uint8_t sdip_b_r(offs_t offset);
+
+ void sdip_0_w(offs_t offset, uint8_t data) ;
+ void sdip_1_w(offs_t offset, uint8_t data) ;
+ void sdip_2_w(offs_t offset, uint8_t data) ;
+ void sdip_3_w(offs_t offset, uint8_t data) ;
+ void sdip_4_w(offs_t offset, uint8_t data) ;
+ void sdip_5_w(offs_t offset, uint8_t data) ;
+ void sdip_6_w(offs_t offset, uint8_t data) ;
+ void sdip_7_w(offs_t offset, uint8_t data) ;
+ void sdip_8_w(offs_t offset, uint8_t data) ;
+ void sdip_9_w(offs_t offset, uint8_t data) ;
+ void sdip_a_w(offs_t offset, uint8_t data) ;
+ void sdip_b_w(offs_t offset, uint8_t data) ;
+
+ uint8_t as_unkdev_data_r(offs_t offset);
+ void as_unkdev_data_w(offs_t offset, uint8_t data);
+ void as_unkdev_addr_w(offs_t offset, uint8_t data);
+
+ uint8_t window_bank_r(offs_t offset);
+ void window_bank_w(offs_t offset, uint8_t data);
+ uint16_t timestamp_r(offs_t offset);
+ uint8_t ext2_video_ff_r();
+ void ext2_video_ff_w(uint8_t data);
DECLARE_FLOPPY_FORMATS( floppy_formats );
UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
@@ -308,7 +308,7 @@ private:
void ppi_mouse_portb_w(uint8_t data);
void ppi_mouse_portc_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER( mouse_irq_cb );
- DECLARE_READ8_MEMBER(unk_r);
+ uint8_t unk_r();
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h
index 2a9538dfe2c..585c911ed01 100644
--- a/src/mame/includes/pce.h
+++ b/src/mame/includes/pce.h
@@ -66,10 +66,10 @@ public:
uint8_t m_joy_6b_packet[5];
void mess_pce_joystick_w(uint8_t data);
uint8_t mess_pce_joystick_r();
- DECLARE_WRITE8_MEMBER(pce_cd_intf_w);
- DECLARE_READ8_MEMBER(pce_cd_intf_r);
- DECLARE_READ8_MEMBER(pce_cd_acard_wram_r);
- DECLARE_WRITE8_MEMBER(pce_cd_acard_wram_w);
+ void pce_cd_intf_w(offs_t offset, uint8_t data);
+ uint8_t pce_cd_intf_r(offs_t offset);
+ uint8_t pce_cd_acard_wram_r(offs_t offset);
+ void pce_cd_acard_wram_w(offs_t offset, uint8_t data);
void init_sgx();
void init_tg16();
void init_mess_pce();
diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h
index 203abb95a84..798b8d1d36e 100644
--- a/src/mame/includes/pcktgal.h
+++ b/src/mame/includes/pcktgal.h
@@ -38,11 +38,11 @@ public:
int m_msm5205next;
int m_toggle;
- DECLARE_WRITE8_MEMBER(bank_w);
- DECLARE_WRITE8_MEMBER(sound_bank_w);
- DECLARE_WRITE8_MEMBER(sound_w);
- DECLARE_WRITE8_MEMBER(adpcm_data_w);
- DECLARE_READ8_MEMBER(sound_unk_r);
+ void bank_w(uint8_t data);
+ void sound_bank_w(uint8_t data);
+ void sound_w(uint8_t data);
+ void adpcm_data_w(uint8_t data);
+ uint8_t sound_unk_r();
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
void init_pcktgal();
diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h
index 7c96c7637e6..77337c91bbc 100644
--- a/src/mame/includes/pcw.h
+++ b/src/mame/includes/pcw.h
@@ -85,21 +85,17 @@ public:
emu_timer *m_pulse_timer;
emu_timer *m_beep_setup_timer;
uint8_t pcw_keyboard_r(offs_t offset);
- DECLARE_READ8_MEMBER(pcw_keyboard_data_r);
- DECLARE_READ8_MEMBER(pcw_interrupt_counter_r);
- DECLARE_WRITE8_MEMBER(pcw_bank_select_w);
- DECLARE_WRITE8_MEMBER(pcw_bank_force_selection_w);
- DECLARE_WRITE8_MEMBER(pcw_roller_ram_addr_w);
- DECLARE_WRITE8_MEMBER(pcw_pointer_table_top_scan_w);
- DECLARE_WRITE8_MEMBER(pcw_vdu_video_control_register_w);
- DECLARE_WRITE8_MEMBER(pcw_system_control_w);
- DECLARE_READ8_MEMBER(pcw_system_status_r);
- DECLARE_READ8_MEMBER(pcw_expansion_r);
- DECLARE_WRITE8_MEMBER(pcw_expansion_w);
- DECLARE_WRITE8_MEMBER(pcw_printer_data_w);
- DECLARE_WRITE8_MEMBER(pcw_printer_command_w);
- DECLARE_READ8_MEMBER(pcw_printer_data_r);
- DECLARE_READ8_MEMBER(pcw_printer_status_r);
+ uint8_t pcw_keyboard_data_r(offs_t offset);
+ uint8_t pcw_interrupt_counter_r();
+ void pcw_bank_select_w(offs_t offset, uint8_t data);
+ void pcw_bank_force_selection_w(uint8_t data);
+ void pcw_roller_ram_addr_w(uint8_t data);
+ void pcw_pointer_table_top_scan_w(uint8_t data);
+ void pcw_vdu_video_control_register_w(uint8_t data);
+ void pcw_system_control_w(uint8_t data);
+ uint8_t pcw_system_status_r();
+ uint8_t pcw_expansion_r(offs_t offset);
+ void pcw_expansion_w(offs_t offset, uint8_t data);
uint8_t mcu_printer_p1_r();
void mcu_printer_p1_w(uint8_t data);
uint8_t mcu_printer_p2_r();
@@ -113,8 +109,8 @@ public:
uint8_t mcu_kb_data_r();
DECLARE_READ_LINE_MEMBER(mcu_kb_t1_r);
DECLARE_READ_LINE_MEMBER(mcu_kb_t0_r);
- DECLARE_READ8_MEMBER(pcw9512_parallel_r);
- DECLARE_WRITE8_MEMBER(pcw9512_parallel_w);
+ uint8_t pcw9512_parallel_r(offs_t offset);
+ void pcw9512_parallel_w(offs_t offset, uint8_t data);
void mcu_transmit_serial(uint8_t bit);
void init_pcw();
virtual void machine_start() override;
diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h
index 0447234b860..be35c241c7c 100644
--- a/src/mame/includes/pcw16.h
+++ b/src/mame/includes/pcw16.h
@@ -54,33 +54,33 @@ public:
void pcw16(machine_config &config);
protected:
- DECLARE_WRITE8_MEMBER(pcw16_palette_w);
- DECLARE_READ8_MEMBER(pcw16_bankhw_r);
- DECLARE_WRITE8_MEMBER(pcw16_bankhw_w);
- DECLARE_WRITE8_MEMBER(pcw16_video_control_w);
- DECLARE_READ8_MEMBER(pcw16_keyboard_data_shift_r);
- DECLARE_WRITE8_MEMBER(pcw16_keyboard_data_shift_w);
- DECLARE_READ8_MEMBER(pcw16_keyboard_status_r);
- DECLARE_WRITE8_MEMBER(pcw16_keyboard_control_w);
- DECLARE_READ8_MEMBER(rtc_year_invalid_r);
- DECLARE_READ8_MEMBER(rtc_month_r);
- DECLARE_READ8_MEMBER(rtc_days_r);
- DECLARE_READ8_MEMBER(rtc_hours_r);
- DECLARE_READ8_MEMBER(rtc_minutes_r);
- DECLARE_READ8_MEMBER(rtc_seconds_r);
- DECLARE_READ8_MEMBER(rtc_256ths_seconds_r);
- DECLARE_WRITE8_MEMBER(rtc_control_w);
- DECLARE_WRITE8_MEMBER(rtc_seconds_w);
- DECLARE_WRITE8_MEMBER(rtc_minutes_w);
- DECLARE_WRITE8_MEMBER(rtc_hours_w);
- DECLARE_WRITE8_MEMBER(rtc_days_w);
- DECLARE_WRITE8_MEMBER(rtc_month_w);
- DECLARE_WRITE8_MEMBER(rtc_year_w);
- DECLARE_READ8_MEMBER(pcw16_system_status_r);
- DECLARE_READ8_MEMBER(pcw16_timer_interrupt_counter_r);
- DECLARE_WRITE8_MEMBER(pcw16_system_control_w);
- DECLARE_READ8_MEMBER(pcw16_mem_r);
- DECLARE_WRITE8_MEMBER(pcw16_mem_w);
+ void pcw16_palette_w(offs_t offset, uint8_t data);
+ uint8_t pcw16_bankhw_r(offs_t offset);
+ void pcw16_bankhw_w(offs_t offset, uint8_t data);
+ void pcw16_video_control_w(uint8_t data);
+ uint8_t pcw16_keyboard_data_shift_r();
+ void pcw16_keyboard_data_shift_w(uint8_t data);
+ uint8_t pcw16_keyboard_status_r();
+ void pcw16_keyboard_control_w(uint8_t data);
+ uint8_t rtc_year_invalid_r();
+ uint8_t rtc_month_r();
+ uint8_t rtc_days_r();
+ uint8_t rtc_hours_r();
+ uint8_t rtc_minutes_r();
+ uint8_t rtc_seconds_r();
+ uint8_t rtc_256ths_seconds_r();
+ void rtc_control_w(uint8_t data);
+ void rtc_seconds_w(uint8_t data);
+ void rtc_minutes_w(uint8_t data);
+ void rtc_hours_w(uint8_t data);
+ void rtc_days_w(uint8_t data);
+ void rtc_month_w(uint8_t data);
+ void rtc_year_w(uint8_t data);
+ uint8_t pcw16_system_status_r();
+ uint8_t pcw16_timer_interrupt_counter_r();
+ void pcw16_system_control_w(uint8_t data);
+ uint8_t pcw16_mem_r(offs_t offset);
+ void pcw16_mem_w(offs_t offset, uint8_t data);
void pcw16_keyboard_init();
void pcw16_keyboard_refresh_outputs();
void pcw16_keyboard_set_clock_state(int state);
diff --git a/src/mame/includes/pecom.h b/src/mame/includes/pecom.h
index 8b20ab27ca7..8a53ef880d7 100644
--- a/src/mame/includes/pecom.h
+++ b/src/mame/includes/pecom.h
@@ -37,13 +37,13 @@ public:
void pecom64(machine_config &config);
protected:
- DECLARE_READ8_MEMBER(pecom_cdp1869_charram_r);
- DECLARE_WRITE8_MEMBER(pecom_cdp1869_charram_w);
- DECLARE_READ8_MEMBER(pecom_cdp1869_pageram_r);
- DECLARE_WRITE8_MEMBER(pecom_cdp1869_pageram_w);
- DECLARE_WRITE8_MEMBER(pecom_bank_w);
- DECLARE_READ8_MEMBER(pecom_keyboard_r);
- DECLARE_WRITE8_MEMBER(pecom_cdp1869_w);
+ uint8_t pecom_cdp1869_charram_r(offs_t offset);
+ void pecom_cdp1869_charram_w(offs_t offset, uint8_t data);
+ uint8_t pecom_cdp1869_pageram_r(offs_t offset);
+ void pecom_cdp1869_pageram_w(offs_t offset, uint8_t data);
+ void pecom_bank_w(uint8_t data);
+ uint8_t pecom_keyboard_r();
+ void pecom_cdp1869_w(offs_t offset, uint8_t data);
TIMER_CALLBACK_MEMBER(reset_tick);
DECLARE_READ_LINE_MEMBER(clear_r);
DECLARE_READ_LINE_MEMBER(ef2_r);
diff --git a/src/mame/includes/pgm2.h b/src/mame/includes/pgm2.h
index 276886c7928..598b75840b9 100644
--- a/src/mame/includes/pgm2.h
+++ b/src/mame/includes/pgm2.h
@@ -75,38 +75,38 @@ public:
void pgm2_ram_rom_map(address_map &map);
void pgm2_rom_map(address_map &map);
private:
- DECLARE_READ32_MEMBER(unk_startup_r);
- DECLARE_READ32_MEMBER(rtc_r);
- DECLARE_READ32_MEMBER(mcu_r);
- DECLARE_WRITE32_MEMBER(fg_videoram_w);
- DECLARE_WRITE32_MEMBER(bg_videoram_w);
- DECLARE_WRITE32_MEMBER(mcu_w);
- DECLARE_WRITE16_MEMBER(share_bank_w);
- DECLARE_READ8_MEMBER(shareram_r);
- DECLARE_WRITE8_MEMBER(shareram_w);
- DECLARE_WRITE16_MEMBER(vbl_ack_w);
- DECLARE_WRITE16_MEMBER(unk30120014_w);
-
- DECLARE_WRITE32_MEMBER(pio_sodr_w);
- DECLARE_WRITE32_MEMBER(pio_codr_w);
- DECLARE_READ32_MEMBER(pio_pdsr_r);
- DECLARE_WRITE16_MEMBER(module_rom_w);
- DECLARE_READ16_MEMBER(module_rom_r);
+ u32 unk_startup_r();
+ u32 rtc_r();
+ u32 mcu_r(offs_t offset);
+ void fg_videoram_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void bg_videoram_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void mcu_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void share_bank_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ u8 shareram_r(offs_t offset);
+ void shareram_w(offs_t offset, u8 data);
+ void vbl_ack_w(u16 data);
+ void unk30120014_w(offs_t offset, u16 data);
+
+ void pio_sodr_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ void pio_codr_w(offs_t offset, u32 data, u32 mem_mask = ~0);
+ u32 pio_pdsr_r();
+ void module_rom_w(offs_t offset, u16 data);
+ u16 module_rom_r(offs_t offset);
int module_data_r();
void module_data_w(int state);
void module_clk_w(int state);
- DECLARE_READ32_MEMBER(orleg2_speedup_r);
- DECLARE_READ32_MEMBER(kov2nl_speedup_r);
- DECLARE_READ32_MEMBER(kof98umh_speedup_r);
- DECLARE_READ32_MEMBER(ddpdojt_speedup_r);
- DECLARE_READ32_MEMBER(ddpdojt_speedup2_r);
- DECLARE_READ32_MEMBER(kov3_speedup_r);
-
- DECLARE_READ8_MEMBER(encryption_r);
- DECLARE_WRITE8_MEMBER(encryption_w);
- DECLARE_WRITE32_MEMBER(encryption_do_w);
- DECLARE_WRITE32_MEMBER(sprite_encryption_w);
+ u32 orleg2_speedup_r();
+ u32 kov2nl_speedup_r();
+ u32 kof98umh_speedup_r();
+ u32 ddpdojt_speedup_r();
+ u32 ddpdojt_speedup2_r();
+ u32 kov3_speedup_r();
+
+ u8 encryption_r(offs_t offset);
+ void encryption_w(offs_t offset, u8 data);
+ void encryption_do_w(u32 data);
+ void sprite_encryption_w(offs_t offset, u32 data, u32 mem_mask = ~0);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h
index 839560480ef..360520185ee 100644
--- a/src/mame/includes/phc25.h
+++ b/src/mame/includes/phc25.h
@@ -35,8 +35,8 @@ public:
{ }
DECLARE_WRITE_LINE_MEMBER( write_centronics_busy );
- DECLARE_READ8_MEMBER( port40_r );
- DECLARE_WRITE8_MEMBER( port40_w );
+ uint8_t port40_r();
+ void port40_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(irq_w);
uint8_t video_ram_r(offs_t offset);
MC6847_GET_CHARROM_MEMBER(ntsc_char_rom_r);
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index 4c4508e366a..51c8c7e78a8 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -23,11 +23,11 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(phoenix_videoram_w);
- DECLARE_WRITE8_MEMBER(phoenix_videoreg_w);
- DECLARE_WRITE8_MEMBER(pleiads_videoreg_w);
- DECLARE_WRITE8_MEMBER(phoenix_scroll_w);
- DECLARE_READ8_MEMBER(survival_input_port_0_r);
+ void phoenix_videoram_w(offs_t offset, uint8_t data);
+ void phoenix_videoreg_w(uint8_t data);
+ void pleiads_videoreg_w(uint8_t data);
+ void phoenix_scroll_w(uint8_t data);
+ uint8_t survival_input_port_0_r();
DECLARE_CUSTOM_INPUT_MEMBER(player_input_r);
DECLARE_READ_LINE_MEMBER(pleiads_protection_r);
void init_oneprom();
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index 237490a086b..9d281856b39 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -32,11 +32,11 @@ public:
required_device<palette_device> m_palette;
tilemap_t *m_bg_tilemap;
- DECLARE_WRITE8_MEMBER(cashquiz_question_bank_high_w);
- DECLARE_WRITE8_MEMBER(cashquiz_question_bank_low_w);
- DECLARE_WRITE8_MEMBER(coin_w);
- DECLARE_WRITE8_MEMBER(pingpong_videoram_w);
- DECLARE_WRITE8_MEMBER(pingpong_colorram_w);
+ void cashquiz_question_bank_high_w(uint8_t data);
+ void cashquiz_question_bank_low_w(uint8_t data);
+ void coin_w(uint8_t data);
+ void pingpong_videoram_w(offs_t offset, uint8_t data);
+ void pingpong_colorram_w(offs_t offset, uint8_t data);
void init_cashquiz();
void init_merlinmm();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index 2a47a3cbb2c..8da6c12f91b 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -51,11 +51,11 @@ private:
tilemap_t *m_fg_tilemap;
tilemap_t *m_bg_tilemap;
- DECLARE_WRITE16_MEMBER(out_w);
- DECLARE_WRITE16_MEMBER(tx_tileram_w);
- DECLARE_WRITE16_MEMBER(fg_tileram_w);
- DECLARE_WRITE16_MEMBER(bg_tileram_w);
- DECLARE_READ16_MEMBER(genix_prot_r);
+ void out_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void tx_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void fg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void bg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t genix_prot_r(offs_t offset);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index ddf89851b06..0e8569a5486 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -62,22 +62,22 @@ private:
DECLARE_WRITE_LINE_MEMBER(nmi_enable_w);
DECLARE_WRITE_LINE_MEMBER(hflip_w);
DECLARE_WRITE_LINE_MEMBER(vflip_w);
- DECLARE_READ8_MEMBER(mcu_data_r);
- DECLARE_WRITE8_MEMBER(mcu_data_w);
- DECLARE_READ8_MEMBER(mcu_status_r);
+ uint8_t mcu_data_r();
+ void mcu_data_w(uint8_t data);
+ uint8_t mcu_status_r();
uint8_t m68705_porta_r();
void m68705_porta_w(uint8_t data);
uint8_t m68705_portb_r();
void m68705_portb_w(uint8_t data);
uint8_t m68705_portc_r();
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(videoram2_w);
+ void videoram_w(offs_t offset, uint8_t data);
+ void videoram2_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(char_bank_select_w);
- DECLARE_WRITE8_MEMBER(scroll_w);
- DECLARE_WRITE8_MEMBER(scroll_y_w);
- DECLARE_WRITE8_MEMBER(ha_w);
- DECLARE_WRITE8_MEMBER(h_heed_w);
- DECLARE_WRITE8_MEMBER(v_heed_w);
+ void scroll_w(offs_t offset, uint8_t data);
+ void scroll_y_w(uint8_t data);
+ void ha_w(uint8_t data);
+ void h_heed_w(uint8_t data);
+ void v_heed_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(color_select_w);
TILE_GET_INFO_MEMBER(get_tile_info1);
diff --git a/src/mame/includes/pk8000.h b/src/mame/includes/pk8000.h
index 829b8434628..925abf465bb 100644
--- a/src/mame/includes/pk8000.h
+++ b/src/mame/includes/pk8000.h
@@ -20,18 +20,18 @@ public:
void _84_portc_w(uint8_t data);
protected:
- DECLARE_READ8_MEMBER(video_color_r);
- DECLARE_WRITE8_MEMBER(video_color_w);
- DECLARE_READ8_MEMBER(text_start_r);
- DECLARE_WRITE8_MEMBER(text_start_w);
- DECLARE_READ8_MEMBER(chargen_start_r);
- DECLARE_WRITE8_MEMBER(chargen_start_w);
- DECLARE_READ8_MEMBER(video_start_r);
- DECLARE_WRITE8_MEMBER(video_start_w);
- DECLARE_READ8_MEMBER(color_start_r);
- DECLARE_WRITE8_MEMBER(color_start_w);
- DECLARE_READ8_MEMBER(color_r);
- DECLARE_WRITE8_MEMBER(color_w);
+ uint8_t video_color_r();
+ void video_color_w(uint8_t data);
+ uint8_t text_start_r();
+ void text_start_w(uint8_t data);
+ uint8_t chargen_start_r();
+ void chargen_start_w(uint8_t data);
+ uint8_t video_start_r();
+ void video_start_w(uint8_t data);
+ uint8_t color_start_r();
+ void color_start_w(uint8_t data);
+ uint8_t color_r(offs_t offset);
+ void color_w(offs_t offset, uint8_t data);
void pk8000_palette(palette_device &palette) const;
uint32_t video_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *videomem);
diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h
index c521899f25b..266e1765aa0 100644
--- a/src/mame/includes/pktgaldx.h
+++ b/src/mame/includes/pktgaldx.h
@@ -60,17 +60,17 @@ private:
required_device<palette_device> m_palette;
optional_shared_ptr<uint16_t> m_decrypted_opcodes;
- DECLARE_READ16_MEMBER(pckgaldx_unknown_r);
- DECLARE_READ16_MEMBER(pckgaldx_protection_r);
- DECLARE_WRITE16_MEMBER(pktgaldx_oki_bank_w);
+ uint16_t pckgaldx_unknown_r();
+ uint16_t pckgaldx_protection_r();
+ void pktgaldx_oki_bank_w(uint16_t data);
virtual void machine_start() override;
uint32_t screen_update_pktgaldx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_pktgaldb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- READ16_MEMBER( pktgaldx_protection_region_f_104_r );
- WRITE16_MEMBER( pktgaldx_protection_region_f_104_w );
+ uint16_t pktgaldx_protection_region_f_104_r(offs_t offset);
+ void pktgaldx_protection_region_f_104_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
DECLARE_WRITE_LINE_MEMBER( vblank_w );
- DECLARE_WRITE16_MEMBER( vblank_ack_w );
+ void vblank_ack_w(uint16_t data);
DECO16IC_BANK_CB_MEMBER(bank_callback);
void decrypted_opcodes_map(address_map &map);
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index 747f18c10ed..b3f96abdad4 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -56,10 +56,10 @@ public:
private:
DECLARE_WRITE_LINE_MEMBER(up8w_w);
- DECLARE_READ8_MEMBER(ram_8w_r);
- DECLARE_WRITE8_MEMBER(ram_8w_w);
- DECLARE_WRITE8_MEMBER(sprite_dma_w);
- DECLARE_WRITE8_MEMBER(time_w);
+ uint8_t ram_8w_r(offs_t offset);
+ void ram_8w_w(offs_t offset, uint8_t data);
+ void sprite_dma_w(address_space &space, uint8_t data);
+ void time_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(sdcs_w);
DECLARE_WRITE_LINE_MEMBER(cntrl_mask_w);
DECLARE_WRITE_LINE_MEMBER(disp_mask_w);
@@ -67,26 +67,26 @@ private:
DECLARE_WRITE_LINE_MEMBER(nmi_enable_w);
DECLARE_WRITE_LINE_MEMBER(dog_di_w);
DECLARE_WRITE_LINE_MEMBER(ppu_reset_w);
- DECLARE_READ8_MEMBER(pc10_detectclr_r);
+ uint8_t pc10_detectclr_r();
void cart_sel_w(uint8_t data);
- DECLARE_READ8_MEMBER(pc10_prot_r);
- DECLARE_WRITE8_MEMBER(pc10_prot_w);
- DECLARE_WRITE8_MEMBER(pc10_in0_w);
- DECLARE_READ8_MEMBER(pc10_in0_r);
- DECLARE_READ8_MEMBER(pc10_in1_r);
- DECLARE_WRITE8_MEMBER(pc10_nt_w);
- DECLARE_READ8_MEMBER(pc10_nt_r);
- DECLARE_WRITE8_MEMBER(pc10_chr_w);
- DECLARE_READ8_MEMBER(pc10_chr_r);
- DECLARE_WRITE8_MEMBER(mmc1_rom_switch_w);
- DECLARE_WRITE8_MEMBER(aboard_vrom_switch_w);
- DECLARE_WRITE8_MEMBER(bboard_rom_switch_w);
- DECLARE_WRITE8_MEMBER(cboard_vrom_switch_w);
- DECLARE_WRITE8_MEMBER(eboard_rom_switch_w);
- DECLARE_WRITE8_MEMBER(gboard_rom_switch_w);
- DECLARE_WRITE8_MEMBER(iboard_rom_switch_w);
- DECLARE_WRITE8_MEMBER(hboard_rom_switch_w);
- DECLARE_WRITE8_MEMBER(playch10_videoram_w);
+ uint8_t pc10_prot_r();
+ void pc10_prot_w(uint8_t data);
+ void pc10_in0_w(uint8_t data);
+ uint8_t pc10_in0_r();
+ uint8_t pc10_in1_r();
+ void pc10_nt_w(offs_t offset, uint8_t data);
+ uint8_t pc10_nt_r(offs_t offset);
+ void pc10_chr_w(offs_t offset, uint8_t data);
+ uint8_t pc10_chr_r(offs_t offset);
+ void mmc1_rom_switch_w(offs_t offset, uint8_t data);
+ void aboard_vrom_switch_w(uint8_t data);
+ void bboard_rom_switch_w(uint8_t data);
+ void cboard_vrom_switch_w(uint8_t data);
+ void eboard_rom_switch_w(offs_t offset, uint8_t data);
+ void gboard_rom_switch_w(offs_t offset, uint8_t data);
+ void iboard_rom_switch_w(uint8_t data);
+ void hboard_rom_switch_w(offs_t offset, uint8_t data);
+ void playch10_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index e9070277f17..e0bc0d5035d 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -84,27 +84,27 @@ protected:
required_device<okim6295_device> m_oki;
optional_memory_bank m_okibank;
optional_device<eeprom_serial_93cxx_device> m_eeprom;
- DECLARE_WRITE16_MEMBER(coinctrl_w);
- DECLARE_WRITE16_MEMBER(wbeachvl_coin_eeprom_w);
- DECLARE_WRITE16_MEMBER(hotmind_coin_eeprom_w);
- DECLARE_WRITE16_MEMBER(luckboomh_dispenser_w);
- DECLARE_WRITE16_MEMBER(hrdtimes_coin_w);
- DECLARE_WRITE16_MEMBER(playmark_snd_command_w);
+ void coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wbeachvl_coin_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void hotmind_coin_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void luckboomh_dispenser_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void hrdtimes_coin_w(uint16_t data);
+ void playmark_snd_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint8_t playmark_snd_command_r();
uint8_t playmark_snd_flag_r();
void playmark_oki_w(uint8_t data);
void playmark_snd_control_w(uint8_t data);
void hrdtimes_snd_control_w(uint8_t data);
- DECLARE_WRITE16_MEMBER(wbeachvl_txvideoram_w);
- DECLARE_WRITE16_MEMBER(wbeachvl_fgvideoram_w);
- DECLARE_WRITE16_MEMBER(wbeachvl_bgvideoram_w);
- DECLARE_WRITE16_MEMBER(hrdtimes_txvideoram_w);
- DECLARE_WRITE16_MEMBER(hrdtimes_fgvideoram_w);
- DECLARE_WRITE16_MEMBER(hrdtimes_bgvideoram_w);
- DECLARE_WRITE16_MEMBER(bigtwin_scroll_w);
- DECLARE_WRITE16_MEMBER(wbeachvl_scroll_w);
- DECLARE_WRITE16_MEMBER(excelsr_scroll_w);
- DECLARE_WRITE16_MEMBER(hrdtimes_scroll_w);
+ void wbeachvl_txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wbeachvl_fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wbeachvl_bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void hrdtimes_txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void hrdtimes_fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void hrdtimes_bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void bigtwin_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void wbeachvl_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void excelsr_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void hrdtimes_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void playmark_oki_banking_w(uint8_t data);
TILE_GET_INFO_MEMBER(bigtwin_get_tx_tile_info);
TILE_GET_INFO_MEMBER(bigtwin_get_fg_tile_info);
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index 55615a4761b..0aecb32eee6 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -79,30 +79,30 @@ private:
uint16_t m_dsp56156_shared_ram_16[2 * 8 * dsp56156_shared_ram_16_size];
uint16_t m_dsp56156_bank04_ram[2 * 8 * dsp56156_bank04_size];
- DECLARE_WRITE8_MEMBER(polygonet_sys_w);
- DECLARE_READ8_MEMBER(polygonet_inputs_r);
- DECLARE_WRITE32_MEMBER(sound_irq_w);
- DECLARE_READ32_MEMBER(dsp_host_interface_r);
- DECLARE_WRITE32_MEMBER(shared_ram_write);
- DECLARE_WRITE32_MEMBER(dsp_w_lines);
- DECLARE_WRITE32_MEMBER(dsp_host_interface_w);
- DECLARE_READ32_MEMBER(network_r);
- DECLARE_READ16_MEMBER(dsp56156_bootload_r);
- DECLARE_READ16_MEMBER(dsp56156_ram_bank00_read);
- DECLARE_WRITE16_MEMBER(dsp56156_ram_bank00_write);
- DECLARE_READ16_MEMBER(dsp56156_ram_bank01_read);
- DECLARE_WRITE16_MEMBER(dsp56156_ram_bank01_write);
- DECLARE_READ16_MEMBER(dsp56156_ram_bank02_read);
- DECLARE_WRITE16_MEMBER(dsp56156_ram_bank02_write);
- DECLARE_READ16_MEMBER(dsp56156_shared_ram_read);
- DECLARE_WRITE16_MEMBER(dsp56156_shared_ram_write);
- DECLARE_READ16_MEMBER(dsp56156_ram_bank04_read);
- DECLARE_WRITE16_MEMBER(dsp56156_ram_bank04_write);
- DECLARE_WRITE8_MEMBER(sound_ctrl_w);
- DECLARE_READ32_MEMBER(polygonet_ttl_ram_r);
- DECLARE_WRITE32_MEMBER(polygonet_ttl_ram_w);
- DECLARE_READ32_MEMBER(polygonet_roz_ram_r);
- DECLARE_WRITE32_MEMBER(polygonet_roz_ram_w);
+ void polygonet_sys_w(offs_t offset, uint8_t data);
+ uint8_t polygonet_inputs_r(offs_t offset);
+ void sound_irq_w(uint32_t data);
+ uint32_t dsp_host_interface_r(offs_t offset, uint32_t mem_mask = ~0);
+ void shared_ram_write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void dsp_w_lines(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void dsp_host_interface_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t network_r();
+ uint16_t dsp56156_bootload_r();
+ uint16_t dsp56156_ram_bank00_read(offs_t offset);
+ void dsp56156_ram_bank00_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dsp56156_ram_bank01_read(offs_t offset);
+ void dsp56156_ram_bank01_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dsp56156_ram_bank02_read(offs_t offset);
+ void dsp56156_ram_bank02_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dsp56156_shared_ram_read(offs_t offset);
+ void dsp56156_shared_ram_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t dsp56156_ram_bank04_read(offs_t offset);
+ void dsp56156_ram_bank04_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void sound_ctrl_w(uint8_t data);
+ uint32_t polygonet_ttl_ram_r(offs_t offset);
+ void polygonet_ttl_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t polygonet_roz_ram_r(offs_t offset);
+ void polygonet_roz_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(ttl_get_tile_info);
TILE_GET_INFO_MEMBER(roz_get_tile_info);
diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h
index cc2f40762ce..28d79e9739a 100644
--- a/src/mame/includes/pmd85.h
+++ b/src/mame/includes/pmd85.h
@@ -88,10 +88,10 @@ private:
uint8_t m_model;
emu_timer * m_cassette_timer;
void (pmd85_state::*update_memory)();
- DECLARE_READ8_MEMBER(pmd85_io_r);
- DECLARE_WRITE8_MEMBER(pmd85_io_w);
- DECLARE_READ8_MEMBER(mato_io_r);
- DECLARE_WRITE8_MEMBER(mato_io_w);
+ uint8_t pmd85_io_r(offs_t offset);
+ void pmd85_io_w(offs_t offset, uint8_t data);
+ uint8_t mato_io_r(offs_t offset);
+ void mato_io_w(offs_t offset, uint8_t data);
virtual void machine_reset() override;
uint32_t screen_update_pmd85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index ab72fb3baea..77b8137c07f 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -31,11 +31,11 @@ private:
required_shared_ptr<uint8_t> m_videoram;
tilemap_t *m_bg_tilemap;
required_shared_ptr<uint8_t> m_spriteram;
- DECLARE_WRITE8_MEMBER(pokechmp_bank_w);
- DECLARE_WRITE8_MEMBER(pokechmp_sound_bank_w);
- DECLARE_WRITE8_MEMBER(pokechmp_sound_w);
- DECLARE_WRITE8_MEMBER(pokechmp_videoram_w);
- DECLARE_WRITE8_MEMBER(pokechmp_flipscreen_w);
+ void pokechmp_bank_w(uint8_t data);
+ void pokechmp_sound_bank_w(uint8_t data);
+ void pokechmp_sound_w(uint8_t data);
+ void pokechmp_videoram_w(offs_t offset, uint8_t data);
+ void pokechmp_flipscreen_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(sound_irq);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void video_start() override;
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index d9b8a643fbc..d816e7c010b 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -89,25 +89,25 @@ private:
uint16_t m_scroll;
uint8_t m_sub_irq_mask;
- DECLARE_READ16_MEMBER(polepos2_ic25_r);
+ uint16_t polepos2_ic25_r(offs_t offset);
uint8_t analog_r();
- DECLARE_READ8_MEMBER(ready_r);
+ uint8_t ready_r();
DECLARE_WRITE_LINE_MEMBER(gasel_w);
DECLARE_WRITE_LINE_MEMBER(sb0_w);
DECLARE_WRITE_LINE_MEMBER(chacl_w);
- template<bool sub1> DECLARE_WRITE16_MEMBER(z8002_nvi_enable_w);
- DECLARE_READ8_MEMBER(sprite_r);
- DECLARE_WRITE8_MEMBER(sprite_w);
- DECLARE_READ8_MEMBER(road_r);
- DECLARE_WRITE8_MEMBER(road_w);
- DECLARE_WRITE16_MEMBER(road16_vscroll_w);
- DECLARE_WRITE16_MEMBER(view16_w);
- DECLARE_READ8_MEMBER(view_r);
- DECLARE_WRITE8_MEMBER(view_w);
- DECLARE_WRITE16_MEMBER(view16_hscroll_w);
- DECLARE_WRITE16_MEMBER(alpha16_w);
- DECLARE_READ8_MEMBER(alpha_r);
- DECLARE_WRITE8_MEMBER(alpha_w);
+ template<bool sub1> void z8002_nvi_enable_w(uint16_t data);
+ uint8_t sprite_r(offs_t offset);
+ void sprite_w(offs_t offset, uint8_t data);
+ uint8_t road_r(offs_t offset);
+ void road_w(offs_t offset, uint8_t data);
+ void road16_vscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0);
+ void view16_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0);
+ uint8_t view_r(offs_t offset);
+ void view_w(offs_t offset, uint8_t data);
+ void view16_hscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0);
+ void alpha16_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0);
+ uint8_t alpha_r(offs_t offset);
+ void alpha_w(offs_t offset, uint8_t data);
void out(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(lockout);
uint8_t namco_52xx_rom_r(offs_t offset);
@@ -115,7 +115,7 @@ private:
uint8_t namco_53xx_k_r();
uint8_t steering_changed_r();
uint8_t steering_delta_r();
- DECLARE_WRITE8_MEMBER(bootleg_soundlatch_w);
+ void bootleg_soundlatch_w(uint8_t data);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
TILE_GET_INFO_MEMBER(tx_get_tile_info);
void polepos_palette(palette_device &palette);
diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h
index 4a6cadd1086..73186b9d8da 100644
--- a/src/mame/includes/policetr.h
+++ b/src/mame/includes/policetr.h
@@ -54,15 +54,15 @@ protected:
void ramdac_map(address_map& map);
- DECLARE_WRITE32_MEMBER(control_w);
- DECLARE_WRITE32_MEMBER(speedup_w);
+ void control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_WRITE32_MEMBER(bsmt2000_reg_w);
- DECLARE_WRITE32_MEMBER(bsmt2000_data_w);
- DECLARE_READ8_MEMBER(bsmt2000_data_r);
+ void bsmt2000_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void bsmt2000_data_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint8_t bsmt2000_data_r(offs_t offset);
- DECLARE_WRITE32_MEMBER(video_w);
- DECLARE_READ32_MEMBER(video_r);
+ void video_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t video_r();
DECLARE_WRITE_LINE_MEMBER(vblank);
void render_display_list(offs_t offset);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/poly.h b/src/mame/includes/poly.h
index c96de186760..fd9cd12ce5b 100644
--- a/src/mame/includes/poly.h
+++ b/src/mame/includes/poly.h
@@ -92,9 +92,9 @@ public:
virtual void poly_bank(address_map &map);
private:
- DECLARE_READ8_MEMBER( logical_mem_r );
- DECLARE_WRITE8_MEMBER( logical_mem_w );
- DECLARE_READ8_MEMBER( vector_r );
+ uint8_t logical_mem_r(offs_t offset);
+ void logical_mem_w(offs_t offset, uint8_t data);
+ uint8_t vector_r(offs_t offset);
void kbd_put(u8 data); // remove when KR2376 is implemented
DECLARE_READ_LINE_MEMBER( kbd_shift_r );
DECLARE_READ_LINE_MEMBER( kbd_control_r );
@@ -105,14 +105,14 @@ private:
uint8_t videoram_2_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER( ptm_o2_callback );
DECLARE_WRITE_LINE_MEMBER( ptm_o3_callback );
- DECLARE_WRITE8_MEMBER( baud_rate_w );
+ void baud_rate_w(uint8_t data);
TIMER_CALLBACK_MEMBER( set_protect );
- DECLARE_WRITE8_MEMBER( set_protect_w );
- DECLARE_READ8_MEMBER( select_map_r );
- DECLARE_WRITE8_MEMBER( select_map1_w );
- DECLARE_WRITE8_MEMBER( select_map2_w );
- DECLARE_READ8_MEMBER( network_r );
- DECLARE_WRITE8_MEMBER( network_w );
+ void set_protect_w(uint8_t data);
+ uint8_t select_map_r();
+ void select_map1_w(uint8_t data);
+ void select_map2_w(uint8_t data);
+ uint8_t network_r(offs_t offset);
+ void network_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( network_clk_w );
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -165,11 +165,11 @@ public:
void polydev(machine_config &config);
private:
- DECLARE_WRITE8_MEMBER(drive_register_w);
- DECLARE_READ8_MEMBER(drive_register_r);
+ void drive_register_w(uint8_t data);
+ uint8_t drive_register_r();
DECLARE_WRITE_LINE_MEMBER(motor_w);
- DECLARE_READ8_MEMBER(fdc_inv_r);
- DECLARE_WRITE8_MEMBER(fdc_inv_w);
+ uint8_t fdc_inv_r(offs_t offset);
+ void fdc_inv_w(offs_t offset, uint8_t data);
virtual void poly_bank(address_map &map) override;
diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h
index 70bc058a303..7f717469f73 100644
--- a/src/mame/includes/poly880.h
+++ b/src/mame/includes/poly880.h
@@ -48,7 +48,7 @@ private:
virtual void machine_start() override;
- DECLARE_WRITE8_MEMBER( cldig_w );
+ void cldig_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( ctc_z0_w );
DECLARE_WRITE_LINE_MEMBER( ctc_z1_w );
void pio1_pa_w(uint8_t data);
diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h
index 16823abeaf3..952183544c9 100644
--- a/src/mame/includes/polyplay.h
+++ b/src/mame/includes/polyplay.h
@@ -59,7 +59,7 @@ private:
uint8_t pio_portb_r();
void pio_portb_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(polyplay_characterram_w);
+ void polyplay_characterram_w(offs_t offset, uint8_t data);
void polyplay_palette(palette_device &palette) const;
uint32_t screen_update_polyplay(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void polyplay_io_zre(address_map &map);
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index 6ff8cfaa90e..72a35aba359 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -38,15 +38,15 @@ public:
void init_poolshrk();
private:
- DECLARE_WRITE8_MEMBER(da_latch_w);
- DECLARE_WRITE8_MEMBER(led_w);
- DECLARE_WRITE8_MEMBER(watchdog_w);
- DECLARE_READ8_MEMBER(input_r);
- DECLARE_READ8_MEMBER(irq_reset_r);
- DECLARE_WRITE8_MEMBER(scratch_sound_w);
- DECLARE_WRITE8_MEMBER(score_sound_w);
- DECLARE_WRITE8_MEMBER(click_sound_w);
- DECLARE_WRITE8_MEMBER(bump_sound_w);
+ void da_latch_w(uint8_t data);
+ void led_w(offs_t offset, uint8_t data);
+ void watchdog_w(offs_t offset, uint8_t data);
+ uint8_t input_r(offs_t offset);
+ uint8_t irq_reset_r();
+ void scratch_sound_w(offs_t offset, uint8_t data);
+ void score_sound_w(uint8_t data);
+ void click_sound_w(uint8_t data);
+ void bump_sound_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_tile_info);
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index b8e826fa5de..1fc02ab9c37 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -45,8 +45,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(irq_enable_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_2_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_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h
index 2ddfe2bcee3..8621a0ccf9c 100644
--- a/src/mame/includes/popeye.h
+++ b/src/mame/includes/popeye.h
@@ -83,11 +83,11 @@ protected:
std::array<bitmap_ind16, 2> m_bitmap; // bitmaps for fields
virtual void refresh_w(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER(protection_r);
- DECLARE_WRITE8_MEMBER(protection_w);
- DECLARE_WRITE8_MEMBER(popeye_videoram_w);
- DECLARE_WRITE8_MEMBER(popeye_colorram_w);
- virtual DECLARE_WRITE8_MEMBER(background_w);
+ uint8_t protection_r(offs_t offset);
+ void protection_w(offs_t offset, uint8_t data);
+ void popeye_videoram_w(offs_t offset, uint8_t data);
+ void popeye_colorram_w(offs_t offset, uint8_t data);
+ virtual void background_w(offs_t offset, uint8_t data);
void popeye_portB_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void driver_start() override;
@@ -146,7 +146,7 @@ protected:
virtual void maincpu_program_map(address_map &map) override;
virtual void decrypt_rom() override;
virtual void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect) override;
- virtual DECLARE_WRITE8_MEMBER(background_w) override;
+ virtual void background_w(offs_t offset, uint8_t data) override;
};
class tpp2_noalu_state : public tpp2_state
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index e33a7cce80d..a9eee413f00 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -33,11 +33,11 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE8_MEMBER(ctrl_w);
- DECLARE_WRITE8_MEMBER(positive_scroll_w);
- DECLARE_WRITE8_MEMBER(negative_scroll_w);
- DECLARE_WRITE8_MEMBER(bgvideo_write);
- DECLARE_WRITE8_MEMBER(fgvideo_write);
+ void ctrl_w(uint8_t data);
+ void positive_scroll_w(uint8_t data);
+ void negative_scroll_w(uint8_t data);
+ void bgvideo_write(offs_t offset, uint8_t data);
+ void fgvideo_write(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h
index 4d43d31097f..754d8d2663e 100644
--- a/src/mame/includes/pp01.h
+++ b/src/mame/includes/pp01.h
@@ -59,15 +59,15 @@ private:
bool m_txe, m_txd, m_rts, m_casspol;
u8 m_cass_data[4];
- DECLARE_WRITE8_MEMBER(video_write_mode_w);
- DECLARE_WRITE8_MEMBER(video_r_1_w);
- DECLARE_WRITE8_MEMBER(video_g_1_w);
- DECLARE_WRITE8_MEMBER(video_b_1_w);
- DECLARE_WRITE8_MEMBER(video_r_2_w);
- DECLARE_WRITE8_MEMBER(video_g_2_w);
- DECLARE_WRITE8_MEMBER(video_b_2_w);
- DECLARE_WRITE8_MEMBER(mem_block_w);
- DECLARE_READ8_MEMBER(mem_block_r);
+ void video_write_mode_w(uint8_t data);
+ void video_r_1_w(offs_t offset, uint8_t data);
+ void video_g_1_w(offs_t offset, uint8_t data);
+ void video_b_1_w(offs_t offset, uint8_t data);
+ void video_r_2_w(offs_t offset, uint8_t data);
+ void video_g_2_w(offs_t offset, uint8_t data);
+ void video_b_2_w(offs_t offset, uint8_t data);
+ void mem_block_w(offs_t offset, uint8_t data);
+ uint8_t mem_block_r(offs_t offset);
TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
void pp01_palette(palette_device &palette) const;
uint32_t screen_update_pp01(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h
index e3ba5cbba53..efae38f0d00 100644
--- a/src/mame/includes/prehisle.h
+++ b/src/mame/includes/prehisle.h
@@ -35,14 +35,14 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE16_MEMBER(soundcmd_w);
- DECLARE_WRITE16_MEMBER(fg_vram_w);
- DECLARE_WRITE16_MEMBER(tx_vram_w);
+ void soundcmd_w(u16 data);
+ void fg_vram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void tx_vram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void fg_scrolly_w(offs_t offset, u16 data, u16 mem_mask);
void fg_scrollx_w(offs_t offset, u16 data, u16 mem_mask);
void bg_scrolly_w(offs_t offset, u16 data, u16 mem_mask);
void bg_scrollx_w(offs_t offset, u16 data, u16 mem_mask);
- DECLARE_WRITE8_MEMBER(upd_port_w);
+ void upd_port_w(u8 data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
diff --git a/src/mame/includes/prof180x.h b/src/mame/includes/prof180x.h
index d5184d62f0e..49bf15f041b 100644
--- a/src/mame/includes/prof180x.h
+++ b/src/mame/includes/prof180x.h
@@ -31,12 +31,12 @@ private:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER( status0_r );
- DECLARE_READ8_MEMBER( status1_r );
- DECLARE_READ8_MEMBER( status_r );
+ uint8_t status0_r();
+ uint8_t status1_r();
+ uint8_t status_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(c0_flag_w);
DECLARE_WRITE_LINE_MEMBER(c1_flag_w);
diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h
index a5a35457325..272e3070746 100644
--- a/src/mame/includes/prof80.h
+++ b/src/mame/includes/prof80.h
@@ -76,9 +76,9 @@ private:
TIMER_ID_MOTOR
};
- DECLARE_WRITE8_MEMBER(flr_w);
- DECLARE_READ8_MEMBER(status_r);
- DECLARE_READ8_MEMBER(status2_r);
+ void flr_w(uint8_t data);
+ uint8_t status_r();
+ uint8_t status2_r();
void motor(int mon);
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index ef3fdf2a77b..37c26454da2 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -112,18 +112,18 @@ private:
u8 m_s1945_mcu_bctrl;
const u8 *m_s1945_mcu_table;
- DECLARE_READ32_MEMBER(sngkace_input_r);
- DECLARE_READ32_MEMBER(gunbird_input_r);
+ u32 sngkace_input_r(offs_t offset);
+ u32 gunbird_input_r(offs_t offset);
void s1945_mcu_data_w(uint8_t data);
void s1945_mcu_control_w(uint8_t data);
void s1945_mcu_direction_w(uint8_t data);
void s1945_mcu_bctrl_w(uint8_t data);
void s1945_mcu_command_w(uint8_t data);
- uint32_t s1945_mcu_data_r();
+ u32 s1945_mcu_data_r();
uint8_t s1945_mcu_control_r();
- DECLARE_READ32_MEMBER(s1945_input_r);
- DECLARE_WRITE8_MEMBER(s1945bl_okibank_w);
- template<int Shift> DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+ u32 s1945_input_r(offs_t offset);
+ void s1945bl_okibank_w(u8 data);
+ template<int Shift> void sound_bankswitch_w(u8 data);
template<int Layer> u16 vram_r(offs_t offset);
template<int Layer> void vram_w(offs_t offset, u16 data, u16 mem_mask);
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index f6b0e48f207..844535f953a 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -66,13 +66,13 @@ private:
optional_ioport m_system;
optional_ioport_array<8> m_keys;
- DECLARE_WRITE32_MEMBER(paletteram_w);
- template<int Screen> DECLARE_WRITE32_MEMBER(bgpen_w);
- template<int Screen> DECLARE_WRITE8_MEMBER(screen_brt_w);
- DECLARE_WRITE32_MEMBER(vidregs_w);
- DECLARE_WRITE16_MEMBER(ymf_bank_w);
- DECLARE_WRITE8_MEMBER(io_select_w);
- DECLARE_WRITE8_MEMBER(eeprom_w);
+ void paletteram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ template<int Screen> void bgpen_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ template<int Screen> void screen_brt_w(uint8_t data);
+ void vidregs_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void ymf_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void io_select_w(uint8_t data);
+ void eeprom_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/psion.h b/src/mame/includes/psion.h
index 8a7eed54b45..02997271111 100644
--- a/src/mame/includes/psion.h
+++ b/src/mame/includes/psion.h
@@ -88,8 +88,8 @@ protected:
void port6_w(uint8_t data);
uint8_t port6_r();
void io_rw(uint16_t offset);
- DECLARE_WRITE8_MEMBER( io_w );
- DECLARE_READ8_MEMBER( io_r );
+ void io_w(offs_t offset, uint8_t data);
+ uint8_t io_r(offs_t offset);
void psion_palette(palette_device &palette) const;
TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer);
@@ -115,9 +115,9 @@ public:
private:
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( reset_kb_counter_r );
- DECLARE_READ8_MEMBER( inc_kb_counter_r );
- DECLARE_READ8_MEMBER( switchoff_r );
+ uint8_t reset_kb_counter_r();
+ uint8_t inc_kb_counter_r();
+ uint8_t switchoff_r();
HD44780_PIXEL_UPDATE(psion1_pixel_update);
void psion1_mem(address_map &map);
diff --git a/src/mame/includes/psion5.h b/src/mame/includes/psion5.h
index 45e7fd2e7cc..0427b7c31d5 100644
--- a/src/mame/includes/psion5.h
+++ b/src/mame/includes/psion5.h
@@ -53,8 +53,8 @@ protected:
private:
void palette_init(palette_device &palette);
- DECLARE_READ32_MEMBER(periphs_r);
- DECLARE_WRITE32_MEMBER(periphs_w);
+ uint32_t periphs_r(offs_t offset, uint32_t mem_mask = ~0);
+ void periphs_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
void update_timer(int timer);
void set_timer_ctrl(int timer, uint32_t value);
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index 513ad0985b8..992a8d29ccf 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -59,24 +59,24 @@ private:
int m_sy1;
int m_sy2;
- DECLARE_READ8_MEMBER(bankselect_r);
- DECLARE_READ8_MEMBER(vram_page_select_r);
- DECLARE_WRITE8_MEMBER(vram_page_select_w);
- DECLARE_WRITE8_MEMBER(fg_videoram_w);
- DECLARE_WRITE8_MEMBER(bg_videoram_w);
- DECLARE_WRITE8_MEMBER(sprite_col_w);
- DECLARE_WRITE8_MEMBER(bg_col_w);
- DECLARE_WRITE8_MEMBER(tx_col_w);
+ uint8_t bankselect_r();
+ uint8_t vram_page_select_r();
+ void vram_page_select_w(uint8_t data);
+ void fg_videoram_w(offs_t offset, uint8_t data);
+ void bg_videoram_w(offs_t offset, uint8_t data);
+ void sprite_col_w(offs_t offset, uint8_t data);
+ void bg_col_w(offs_t offset, uint8_t data);
+ void tx_col_w(offs_t offset, uint8_t data);
/* psychic5 specific */
- DECLARE_WRITE8_MEMBER(psychic5_coin_counter_w);
- DECLARE_WRITE8_MEMBER(psychic5_bankselect_w);
- DECLARE_WRITE8_MEMBER(psychic5_title_screen_w);
+ void psychic5_coin_counter_w(uint8_t data);
+ void psychic5_bankselect_w(uint8_t data);
+ void psychic5_title_screen_w(uint8_t data);
/* bombsa specific */
- DECLARE_WRITE8_MEMBER(bombsa_bankselect_w);
- DECLARE_WRITE8_MEMBER(bombsa_flipscreen_w);
- DECLARE_WRITE8_MEMBER(bombsa_unknown_w);
+ void bombsa_bankselect_w(uint8_t data);
+ void bombsa_flipscreen_w(uint8_t data);
+ void bombsa_unknown_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index e544bf42c9d..99ccb41946d 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -69,17 +69,16 @@ private:
tilemap_t *m_spr2_tilemap;
bool m_nmi_mask;
- DECLARE_WRITE8_MEMBER(punchout_2a03_reset_w);
- DECLARE_READ8_MEMBER(spunchout_exp_r);
- DECLARE_WRITE8_MEMBER(spunchout_exp_w);
- DECLARE_WRITE8_MEMBER(spunchout_rp5h01_reset_w);
- DECLARE_WRITE8_MEMBER(spunchout_rp5h01_clock_w);
+ uint8_t spunchout_exp_r(offs_t offset);
+ void spunchout_exp_w(offs_t offset, uint8_t data);
+ void spunchout_rp5h01_reset_w(uint8_t data);
+ void spunchout_rp5h01_clock_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(nmi_mask_w);
- DECLARE_WRITE8_MEMBER(punchout_bg_top_videoram_w);
- DECLARE_WRITE8_MEMBER(punchout_bg_bot_videoram_w);
- DECLARE_WRITE8_MEMBER(armwrest_fg_videoram_w);
- DECLARE_WRITE8_MEMBER(punchout_spr1_videoram_w);
- DECLARE_WRITE8_MEMBER(punchout_spr2_videoram_w);
+ void punchout_bg_top_videoram_w(offs_t offset, uint8_t data);
+ void punchout_bg_bot_videoram_w(offs_t offset, uint8_t data);
+ void armwrest_fg_videoram_w(offs_t offset, uint8_t data);
+ void punchout_spr1_videoram_w(offs_t offset, uint8_t data);
+ void punchout_spr2_videoram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(top_get_info);
TILE_GET_INFO_MEMBER(armwrest_top_get_info);
TILE_GET_INFO_MEMBER(bot_get_info);
diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h
index 3a3cb11fed1..81c6ccd6c9d 100644
--- a/src/mame/includes/px8.h
+++ b/src/mame/includes/px8.h
@@ -52,14 +52,14 @@ private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_READ8_MEMBER( gah40m_r );
- DECLARE_WRITE8_MEMBER( gah40m_w );
- DECLARE_READ8_MEMBER( gah40s_r );
- DECLARE_WRITE8_MEMBER( gah40s_w );
- DECLARE_WRITE8_MEMBER( gah40s_ier_w );
- DECLARE_READ8_MEMBER( krtn_0_3_r );
- DECLARE_READ8_MEMBER( krtn_4_7_r );
- DECLARE_WRITE8_MEMBER( ksc_w );
+ uint8_t gah40m_r(offs_t offset);
+ void gah40m_w(offs_t offset, uint8_t data);
+ uint8_t gah40s_r(offs_t offset);
+ void gah40s_w(offs_t offset, uint8_t data);
+ void gah40s_ier_w(uint8_t data);
+ uint8_t krtn_0_3_r();
+ uint8_t krtn_4_7_r();
+ void ksc_w(uint8_t data);
void bankswitch();
uint8_t krtn_read();
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index 59e5f7e4a74..aa2aef28911 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -58,17 +58,16 @@ private:
int32_t m_pal;
emu_timer *m_gp2_timer;
- DECLARE_WRITE16_MEMBER(gp_control_w);
- DECLARE_WRITE16_MEMBER(gp2_control_w);
- DECLARE_READ16_MEMBER(v_rom_r);
- DECLARE_READ16_MEMBER(gp2_vram_r);
- DECLARE_READ16_MEMBER(gp2_vram_mirror_r);
- DECLARE_WRITE16_MEMBER(gp2_vram_w);
- DECLARE_WRITE16_MEMBER(gp2_vram_mirror_w);
- DECLARE_READ16_MEMBER(sndram_r);
- DECLARE_WRITE16_MEMBER(sndram_w);
- DECLARE_READ16_MEMBER(gp2_ide_std_r);
- DECLARE_READ16_MEMBER(inputs_r);
+ void gp_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void gp2_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t v_rom_r(offs_t offset);
+ uint16_t gp2_vram_r(offs_t offset);
+ uint16_t gp2_vram_mirror_r(offs_t offset);
+ void gp2_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void gp2_vram_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t sndram_r(offs_t offset, uint16_t mem_mask = ~0);
+ void sndram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t inputs_r();
DECLARE_MACHINE_START(qdrmfgp);
DECLARE_VIDEO_START(qdrmfgp);
diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h
index 7d8386505a8..7ba49a2d8c8 100644
--- a/src/mame/includes/qix.h
+++ b/src/mame/includes/qix.h
@@ -103,22 +103,22 @@ protected:
required_device<screen_device> m_screen;
pen_t m_pens[0x400];
- DECLARE_WRITE8_MEMBER(qix_data_firq_w);
- DECLARE_WRITE8_MEMBER(qix_data_firq_ack_w);
- DECLARE_READ8_MEMBER(qix_data_firq_r);
- DECLARE_READ8_MEMBER(qix_data_firq_ack_r);
- DECLARE_WRITE8_MEMBER(qix_video_firq_w);
- DECLARE_WRITE8_MEMBER(qix_video_firq_ack_w);
- DECLARE_READ8_MEMBER(qix_video_firq_r);
- DECLARE_READ8_MEMBER(qix_video_firq_ack_r);
- DECLARE_READ8_MEMBER(qix_videoram_r);
- DECLARE_WRITE8_MEMBER(qix_videoram_w);
- DECLARE_WRITE8_MEMBER(slither_videoram_w);
- DECLARE_READ8_MEMBER(qix_addresslatch_r);
- DECLARE_WRITE8_MEMBER(qix_addresslatch_w);
- DECLARE_WRITE8_MEMBER(slither_addresslatch_w);
- DECLARE_WRITE8_MEMBER(qix_paletteram_w);
- DECLARE_WRITE8_MEMBER(qix_palettebank_w);
+ void qix_data_firq_w(uint8_t data);
+ void qix_data_firq_ack_w(uint8_t data);
+ uint8_t qix_data_firq_r(address_space &space);
+ uint8_t qix_data_firq_ack_r(address_space &space);
+ void qix_video_firq_w(uint8_t data);
+ void qix_video_firq_ack_w(uint8_t data);
+ uint8_t qix_video_firq_r(address_space &space);
+ uint8_t qix_video_firq_ack_r(address_space &space);
+ uint8_t qix_videoram_r(offs_t offset);
+ void qix_videoram_w(offs_t offset, uint8_t data);
+ void slither_videoram_w(offs_t offset, uint8_t data);
+ uint8_t qix_addresslatch_r(offs_t offset);
+ void qix_addresslatch_w(offs_t offset, uint8_t data);
+ void slither_addresslatch_w(offs_t offset, uint8_t data);
+ void qix_paletteram_w(offs_t offset, uint8_t data);
+ void qix_palettebank_w(uint8_t data);
TIMER_CALLBACK_MEMBER(pia_w_callback);
TIMER_CALLBACK_MEMBER(deferred_sndpia1_porta_w);
@@ -200,7 +200,7 @@ protected:
virtual void machine_start() override;
private:
- DECLARE_WRITE8_MEMBER(bankswitch_w);
+ void bankswitch_w(uint8_t data);
void main_map(address_map &map);
void video_map(address_map &map);
diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h
index 7453770564f..144487b51a1 100644
--- a/src/mame/includes/quasar.h
+++ b/src/mame/includes/quasar.h
@@ -27,13 +27,13 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE8_MEMBER(video_page_select_w);
- DECLARE_WRITE8_MEMBER(io_page_select_w);
- DECLARE_WRITE8_MEMBER(quasar_video_w);
- DECLARE_READ8_MEMBER(quasar_IO_r);
- DECLARE_WRITE8_MEMBER(quasar_bullet_w);
- DECLARE_WRITE8_MEMBER(quasar_sh_command_w);
- DECLARE_READ8_MEMBER(quasar_sh_command_r);
+ void video_page_select_w(offs_t offset, uint8_t data);
+ void io_page_select_w(offs_t offset, uint8_t data);
+ void quasar_video_w(offs_t offset, uint8_t data);
+ uint8_t quasar_IO_r();
+ void quasar_bullet_w(offs_t offset, uint8_t data);
+ void quasar_sh_command_w(uint8_t data);
+ uint8_t quasar_sh_command_r();
DECLARE_READ_LINE_MEMBER(audio_t1_r);
void quasar_palette(palette_device &palette) const;
uint32_t screen_update_quasar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index 4e35e89c3a2..4fe4ad3a010 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -36,16 +36,16 @@ private:
int m_video_enable;
// common
- DECLARE_WRITE8_MEMBER(bg_ram_w);
- DECLARE_WRITE8_MEMBER(fg_ram_w);
- DECLARE_WRITE8_MEMBER(bg_yscroll_w);
- DECLARE_WRITE8_MEMBER(bg_xscroll_w);
- DECLARE_WRITE8_MEMBER(screen_ctrl_w);
- DECLARE_WRITE8_MEMBER(paletteram_xBGR_RRRR_GGGG_BBBB_w);
- DECLARE_WRITE8_MEMBER(rombank_w);
+ void bg_ram_w(offs_t offset, uint8_t data);
+ void fg_ram_w(offs_t offset, uint8_t data);
+ void bg_yscroll_w(uint8_t data);
+ void bg_xscroll_w(offs_t offset, uint8_t data);
+ void screen_ctrl_w(uint8_t data);
+ void paletteram_xBGR_RRRR_GGGG_BBBB_w(offs_t offset, uint8_t data);
+ void rombank_w(uint8_t data);
// game specific
- DECLARE_WRITE8_MEMBER(gekiretu_rombank_w);
+ void gekiretu_rombank_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index ed9048acc95..157158adada 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -32,9 +32,9 @@ public:
int m_bgbank;
int m_txtbank;
- DECLARE_WRITE16_MEMBER(bg_videoram_w);
- DECLARE_WRITE16_MEMBER(txt_videoram_w);
- DECLARE_WRITE16_MEMBER(tilesbank_w);
+ void bg_videoram_w(offs_t offset, uint16_t data);
+ void txt_videoram_w(offs_t offset, uint16_t data);
+ void tilesbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILEMAP_MAPPER_MEMBER(bg_scan);
TILE_GET_INFO_MEMBER(bg_tile_info);
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index 4a6bbad3b86..c952d56afb7 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -160,8 +160,8 @@ protected:
void invinco_audio_w(uint8_t data);
/*----------- defined in audio/pulsar.cpp -----------*/
- DECLARE_WRITE8_MEMBER( pulsar_audio_1_w );
- DECLARE_WRITE8_MEMBER( pulsar_audio_2_w );
+ void pulsar_audio_1_w(uint8_t data);
+ void pulsar_audio_2_w(uint8_t data);
/*----------- defined in audio/tranqgun.cpp -----------*/
DECLARE_WRITE8_MEMBER( tranqgun_audio_w );
diff --git a/src/mame/machine/p2000t.cpp b/src/mame/machine/p2000t.cpp
index 81b639c8814..459c6a97d34 100644
--- a/src/mame/machine/p2000t.cpp
+++ b/src/mame/machine/p2000t.cpp
@@ -42,7 +42,7 @@
If the keyboard interrupt is disabled, reading one of these ports
will read the corresponding keyboard matrix row
*/
-READ8_MEMBER( p2000t_state::p2000t_port_000f_r )
+uint8_t p2000t_state::p2000t_port_000f_r(offs_t offset)
{
if (m_port_101f & P2000M_101F_KEYINT)
{
@@ -75,7 +75,7 @@ READ8_MEMBER( p2000t_state::p2000t_port_000f_r )
bit 6 - Cassette read clock
bit 7 - Cassette read data
*/
-READ8_MEMBER( p2000t_state::p2000t_port_202f_r )
+uint8_t p2000t_state::p2000t_port_202f_r()
{
return (0xff);
}
@@ -93,7 +93,7 @@ READ8_MEMBER( p2000t_state::p2000t_port_202f_r )
bit 6 - Keyboard interrupt enable
bit 7 - Printer output
*/
-WRITE8_MEMBER( p2000t_state::p2000t_port_101f_w )
+void p2000t_state::p2000t_port_101f_w(uint8_t data)
{
m_port_101f = data;
}
@@ -110,7 +110,7 @@ WRITE8_MEMBER( p2000t_state::p2000t_port_101f_w )
bit 6 - \
bit 7 - Video disable (0 = enabled)
*/
-WRITE8_MEMBER( p2000t_state::p2000t_port_303f_w )
+void p2000t_state::p2000t_port_303f_w(uint8_t data)
{
m_port_303f = data;
}
@@ -127,7 +127,7 @@ WRITE8_MEMBER( p2000t_state::p2000t_port_303f_w )
bit 6 - Unused
bit 7 - Unused
*/
-WRITE8_MEMBER( p2000t_state::p2000t_port_505f_w )
+void p2000t_state::p2000t_port_505f_w(uint8_t data)
{
m_speaker->level_w(BIT(data, 0));
}
@@ -148,11 +148,11 @@ WRITE8_MEMBER( p2000t_state::p2000t_port_505f_w )
video refresh is disabled when the CPU accesses video memory
*/
-WRITE8_MEMBER( p2000t_state::p2000t_port_707f_w )
+void p2000t_state::p2000t_port_707f_w(uint8_t data)
{
m_port_707f = data;
}
-WRITE8_MEMBER( p2000t_state::p2000t_port_888b_w ) {}
-WRITE8_MEMBER( p2000t_state::p2000t_port_8c90_w ) {}
-WRITE8_MEMBER( p2000t_state::p2000t_port_9494_w ) {}
+void p2000t_state::p2000t_port_888b_w(uint8_t data) {}
+void p2000t_state::p2000t_port_8c90_w(uint8_t data) {}
+void p2000t_state::p2000t_port_9494_w(uint8_t data) {}
diff --git a/src/mame/machine/pacman.cpp b/src/mame/machine/pacman.cpp
index fdea0795787..9f6140b486d 100644
--- a/src/mame/machine/pacman.cpp
+++ b/src/mame/machine/pacman.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "includes/pacman.h"
-READ8_MEMBER(epospm_state::epos_decryption_w)
+uint8_t epospm_state::epos_decryption_w(offs_t offset)
{
if (offset & 0x01)
{
diff --git a/src/mame/machine/pc1403.cpp b/src/mame/machine/pc1403.cpp
index 358296b74cd..5d8fb61b7a4 100644
--- a/src/mame/machine/pc1403.cpp
+++ b/src/mame/machine/pc1403.cpp
@@ -21,7 +21,7 @@
bits 0..6 keyboard output select matrix line
*/
-WRITE8_MEMBER(pc1403_state::asic_write)
+void pc1403_state::asic_write(offs_t offset, uint8_t data)
{
m_asic[offset >> 9] = data;
switch (offset >> 9)
@@ -42,7 +42,7 @@ WRITE8_MEMBER(pc1403_state::asic_write)
}
}
-READ8_MEMBER(pc1403_state::asic_read)
+uint8_t pc1403_state::asic_read(offs_t offset)
{
uint8_t data = m_asic[offset >> 9];
switch (offset >> 9)
diff --git a/src/mame/machine/pce.cpp b/src/mame/machine/pce.cpp
index 1b02bf07575..43a811da9d8 100644
--- a/src/mame/machine/pce.cpp
+++ b/src/mame/machine/pce.cpp
@@ -120,13 +120,13 @@ MACHINE_RESET_MEMBER(pce_state,mess_pce)
if (m_cartslot->get_type() == PCE_CDSYS3J)
{
m_sys3_card = 1;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x080000, 0x087fff, read8_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_r)), write8_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x080000, 0x087fff, read8sm_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_r)), write8sm_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_w)));
}
if (m_cartslot->get_type() == PCE_CDSYS3U)
{
m_sys3_card = 3;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x080000, 0x087fff, read8_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_r)), write8_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x080000, 0x087fff, read8sm_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_r)), write8sm_delegate(*this, FUNC(pce_state::pce_cd_acard_wram_w)));
}
}
@@ -201,7 +201,7 @@ uint8_t pce_state::mess_pce_joystick_r()
}
-WRITE8_MEMBER(pce_state::pce_cd_intf_w)
+void pce_state::pce_cd_intf_w(offs_t offset, uint8_t data)
{
m_cd->update();
@@ -213,7 +213,7 @@ WRITE8_MEMBER(pce_state::pce_cd_intf_w)
m_cd->update();
}
-READ8_MEMBER(pce_state::pce_cd_intf_r)
+uint8_t pce_state::pce_cd_intf_r(offs_t offset)
{
m_cd->update();
@@ -237,12 +237,12 @@ READ8_MEMBER(pce_state::pce_cd_intf_r)
}
-READ8_MEMBER(pce_state::pce_cd_acard_wram_r)
+uint8_t pce_state::pce_cd_acard_wram_r(offs_t offset)
{
- return pce_cd_intf_r(space, 0x200 | (offset & 0x6000) >> 9);
+ return pce_cd_intf_r(0x200 | (offset & 0x6000) >> 9);
}
-WRITE8_MEMBER(pce_state::pce_cd_acard_wram_w)
+void pce_state::pce_cd_acard_wram_w(offs_t offset, uint8_t data)
{
- pce_cd_intf_w(space, 0x200 | (offset & 0x6000) >> 9, data);
+ pce_cd_intf_w(0x200 | (offset & 0x6000) >> 9, data);
}
diff --git a/src/mame/machine/pecom.cpp b/src/mame/machine/pecom.cpp
index 880b6474982..e74c9a38770 100644
--- a/src/mame/machine/pecom.cpp
+++ b/src/mame/machine/pecom.cpp
@@ -44,27 +44,27 @@ void pecom_state::machine_reset()
m_reset_timer->adjust(attotime::from_msec(5));
}
-READ8_MEMBER(pecom_state::pecom_cdp1869_charram_r)
+uint8_t pecom_state::pecom_cdp1869_charram_r(offs_t offset)
{
return m_cdp1869->char_ram_r(offset);
}
-WRITE8_MEMBER(pecom_state::pecom_cdp1869_charram_w)
+void pecom_state::pecom_cdp1869_charram_w(offs_t offset, uint8_t data)
{
return m_cdp1869->char_ram_w(offset, data);
}
-READ8_MEMBER(pecom_state::pecom_cdp1869_pageram_r)
+uint8_t pecom_state::pecom_cdp1869_pageram_r(offs_t offset)
{
return m_cdp1869->page_ram_r(offset);
}
-WRITE8_MEMBER(pecom_state::pecom_cdp1869_pageram_w)
+void pecom_state::pecom_cdp1869_pageram_w(offs_t offset, uint8_t data)
{
return m_cdp1869->page_ram_w(offset, data);
}
-WRITE8_MEMBER(pecom_state::pecom_bank_w)
+void pecom_state::pecom_bank_w(uint8_t data)
{
address_space &space2 = m_cdp1802->space(AS_PROGRAM);
uint8_t *rom = memregion(CDP1802_TAG)->base();
@@ -73,10 +73,10 @@ WRITE8_MEMBER(pecom_state::pecom_bank_w)
if (data==2)
{
- space2.install_read_handler (0xf000, 0xf7ff, read8_delegate(*this, FUNC(pecom_state::pecom_cdp1869_charram_r)));
- space2.install_write_handler(0xf000, 0xf7ff, write8_delegate(*this, FUNC(pecom_state::pecom_cdp1869_charram_w)));
- space2.install_read_handler (0xf800, 0xffff, read8_delegate(*this, FUNC(pecom_state::pecom_cdp1869_pageram_r)));
- space2.install_write_handler(0xf800, 0xffff, write8_delegate(*this, FUNC(pecom_state::pecom_cdp1869_pageram_w)));
+ space2.install_read_handler (0xf000, 0xf7ff, read8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_charram_r)));
+ space2.install_write_handler(0xf000, 0xf7ff, write8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_charram_w)));
+ space2.install_read_handler (0xf800, 0xffff, read8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_pageram_r)));
+ space2.install_write_handler(0xf800, 0xffff, write8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_pageram_w)));
}
else
{
@@ -89,7 +89,7 @@ WRITE8_MEMBER(pecom_state::pecom_bank_w)
}
}
-READ8_MEMBER(pecom_state::pecom_keyboard_r)
+uint8_t pecom_state::pecom_keyboard_r()
{
/*
INP command BUS -> M(R(X)) BUS -> D
diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp
index e3aea0cd43e..7f98480d1d8 100644
--- a/src/mame/machine/pgmprot_igs027a_type1.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type1.cpp
@@ -495,7 +495,7 @@ void pgm_arm_type1_state::init_kovqhsgs()
bp A71A0,1,{d0=0x12;g}
*/
-READ16_MEMBER(pgm_arm_type1_state::arm7_type1_sim_r )
+u16 pgm_arm_type1_state::arm7_type1_sim_r(offs_t offset)
{
if (offset == 0)
{
@@ -1723,7 +1723,7 @@ void pgm_arm_type1_state::command_handler_oldsplus(int pc)
}
}
-WRITE16_MEMBER(pgm_arm_type1_state::arm7_type1_sim_w )
+void pgm_arm_type1_state::arm7_type1_sim_w(offs_t offset, u16 data)
{
const int pc = m_maincpu->pc();
@@ -1789,7 +1789,7 @@ void pgm_arm_type1_state::init_ddp3()
pgm_basic_init(false);
pgm_py2k2_decrypt(machine()); // yes, it's the same as photo y2k2
arm_sim_handler = &pgm_arm_type1_state::command_handler_ddp3;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
}
void pgm_arm_type1_state::init_ket()
@@ -1797,7 +1797,7 @@ void pgm_arm_type1_state::init_ket()
pgm_basic_init(false);
pgm_ket_decrypt(machine());
arm_sim_handler = &pgm_arm_type1_state::command_handler_ddp3;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x400000, 0x400005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x400000, 0x400005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
}
void pgm_arm_type1_state::init_espgal()
@@ -1805,7 +1805,7 @@ void pgm_arm_type1_state::init_espgal()
pgm_basic_init(false);
pgm_espgal_decrypt(machine());
arm_sim_handler = &pgm_arm_type1_state::command_handler_ddp3;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x400000, 0x400005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x400000, 0x400005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
}
@@ -2090,7 +2090,7 @@ void pgm_arm_type1_state::init_puzzli2()
pgm_puzzli2_decrypt(machine());
arm_sim_handler = &pgm_arm_type1_state::command_handler_puzzli2;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
m_irq4_disabled = 1; // // doesn't like this irq?? - seems to be RTC related
@@ -2219,7 +2219,7 @@ void pgm_arm_type1_state::init_py2k2()
pgm_basic_init();
pgm_py2k2_decrypt(machine());
arm_sim_handler = &pgm_arm_type1_state::command_handler_py2k2;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
}
@@ -2228,7 +2228,7 @@ void pgm_arm_type1_state::init_pgm3in1()
pgm_basic_init();
pgm_decrypt_pgm3in1(machine());
arm_sim_handler = &pgm_arm_type1_state::command_handler_py2k2;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005,read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005,read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
m_irq4_disabled = 1; // // doesn't like this irq??
}
@@ -2248,7 +2248,7 @@ void pgm_arm_type1_state::init_pstar()
memset(m_slots, 0, 16 * sizeof(u32));
arm_sim_handler = &pgm_arm_type1_state::command_handler_pstars;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::pstars_arm7_type1_sim_protram_r)));
save_item(NAME(m_pstar_e7_value));
@@ -2267,7 +2267,7 @@ void pgm_arm_type1_state::init_kov()
m_kov_cb_value = 0;
m_kov_fe_value = 0;
arm_sim_handler = &pgm_arm_type1_state::command_handler_kov;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
}
@@ -2281,7 +2281,7 @@ void pgm_arm_type1_state::init_kovboot()
m_kov_cb_value = 0;
m_kov_fe_value = 0;
arm_sim_handler = &pgm_arm_type1_state::command_handler_kov;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
}
@@ -2294,7 +2294,7 @@ void pgm_arm_type1_state::init_oldsplus()
memset(m_extra_ram, 0, 0x100 * sizeof(u16));
memset(m_slots, 0, 0x100 * sizeof(u32));
arm_sim_handler = &pgm_arm_type1_state::command_handler_oldsplus;
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
save_item(NAME(m_extra_ram));
}
diff --git a/src/mame/machine/pgmprot_igs027a_type1.h b/src/mame/machine/pgmprot_igs027a_type1.h
index 6eebf0b828e..6e7abe406e2 100644
--- a/src/mame/machine/pgmprot_igs027a_type1.h
+++ b/src/mame/machine/pgmprot_igs027a_type1.h
@@ -92,14 +92,14 @@ private:
void pgm_decode_kovlsqh2_samples();
void pgm_decode_kovqhsgs_program();
void pgm_decode_kovqhsgs2_program();
- DECLARE_READ16_MEMBER( arm7_type1_sim_r );
+ u16 arm7_type1_sim_r(offs_t offset);
void command_handler_ddp3(int pc);
void command_handler_puzzli2(int pc);
void command_handler_py2k2(int pc);
void command_handler_pstars(int pc);
void command_handler_kov(int pc);
void command_handler_oldsplus(int pc);
- DECLARE_WRITE16_MEMBER( arm7_type1_sim_w );
+ void arm7_type1_sim_w(offs_t offset, u16 data);
u16 arm7_type1_sim_protram_r(offs_t offset);
u16 pstars_arm7_type1_sim_protram_r(offs_t offset);
int m_simregion;
diff --git a/src/mame/machine/pgmprot_igs027a_type2.cpp b/src/mame/machine/pgmprot_igs027a_type2.cpp
index 3ef761f2de6..6353877ec73 100644
--- a/src/mame/machine/pgmprot_igs027a_type2.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type2.cpp
@@ -217,7 +217,7 @@ void pgm_arm_type2_state::init_martmast()
}
-READ32_MEMBER(pgm_arm_type2_state::ddp2_speedup_r )
+u32 pgm_arm_type2_state::ddp2_speedup_r(address_space &space)
{
const int pc = m_prot->pc();
const u32 data = m_arm_ram[0x300c/4];
@@ -238,7 +238,7 @@ READ32_MEMBER(pgm_arm_type2_state::ddp2_speedup_r )
return data;
}
-READ16_MEMBER(pgm_arm_type2_state::ddp2_main_speedup_r )
+u16 pgm_arm_type2_state::ddp2_main_speedup_r()
{
const u16 data = m_mainram[0x0ee54/2];
const int pc = m_maincpu->pc();
@@ -256,8 +256,8 @@ void pgm_arm_type2_state::init_ddp2()
pgm_ddp2_decrypt(machine());
kov2_latch_init();
- m_prot->space(AS_PROGRAM).install_read_handler(0x1800300c, 0x1800300f, read32_delegate(*this, FUNC(pgm_arm_type2_state::ddp2_speedup_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x80ee54, 0x80ee55, read16_delegate(*this, FUNC(pgm_arm_type2_state::ddp2_main_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0x1800300c, 0x1800300f, read32mo_delegate(*this, FUNC(pgm_arm_type2_state::ddp2_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x80ee54, 0x80ee55, read16smo_delegate(*this, FUNC(pgm_arm_type2_state::ddp2_main_speedup_r)));
}
diff --git a/src/mame/machine/pgmprot_igs027a_type2.h b/src/mame/machine/pgmprot_igs027a_type2.h
index 2776ef67ea4..3d562995d48 100644
--- a/src/mame/machine/pgmprot_igs027a_type2.h
+++ b/src/mame/machine/pgmprot_igs027a_type2.h
@@ -42,8 +42,8 @@ private:
void martmast_arm_region_w(offs_t offset, u32 data, u32 mem_mask = ~0);
void kov2_arm_region_w(offs_t offset, u32 data, u32 mem_mask = ~0);
void kov2p_arm_region_w(offs_t offset, u32 data, u32 mem_mask = ~0);
- DECLARE_READ32_MEMBER( ddp2_speedup_r );
- DECLARE_READ16_MEMBER( ddp2_main_speedup_r );
+ u32 ddp2_speedup_r(address_space &space);
+ u16 ddp2_main_speedup_r();
void _55857F_arm7_map(address_map &map);
void kov2_mem(address_map &map);
};
diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp
index dbc0868e6eb..c153fc6f828 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type3.cpp
@@ -266,7 +266,7 @@ void pgm_arm_type3_state::svg_latch_init()
save_item(NAME(m_svg_latchdata_arm_w));
}
-READ32_MEMBER(pgm_arm_type3_state::theglad_speedup_r )
+u32 pgm_arm_type3_state::theglad_speedup_r()
{
const int pc = m_prot->pc();
if (pc == 0x7c4) m_prot->eat_cycles(500);
@@ -275,7 +275,7 @@ READ32_MEMBER(pgm_arm_type3_state::theglad_speedup_r )
}
-READ32_MEMBER(pgm_arm_type3_state::happy6_speedup_r )
+u32 pgm_arm_type3_state::happy6_speedup_r()
{
const int pc = m_prot->pc();
if (pc == 0x0a08) m_prot->eat_cycles(500);
@@ -284,14 +284,14 @@ READ32_MEMBER(pgm_arm_type3_state::happy6_speedup_r )
}
// installed over rom
-READ32_MEMBER(pgm_arm_type3_state::svg_speedup_r )
+u32 pgm_arm_type3_state::svg_speedup_r()
{
const int pc = m_prot->pc();
if (pc == 0xb90) m_prot->eat_cycles(500);
return m_armrom[0xb90/4];
}
-READ32_MEMBER(pgm_arm_type3_state::svgpcb_speedup_r )
+u32 pgm_arm_type3_state::svgpcb_speedup_r()
{
const int pc = m_prot->pc();
if (pc == 0x9e0) m_prot->eat_cycles(500);
@@ -530,7 +530,7 @@ void pgm_arm_type3_state::init_theglad()
pgm_create_dummy_internal_arm_region_theglad(0);
- m_prot->space(AS_PROGRAM).install_read_handler(0x1000000c, 0x1000000f, read32_delegate(*this, FUNC(pgm_arm_type3_state::theglad_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0x1000000c, 0x1000000f, read32smo_delegate(*this, FUNC(pgm_arm_type3_state::theglad_speedup_r)));
}
@@ -664,7 +664,7 @@ void pgm_arm_type3_state::init_svg()
svg_latch_init();
pgm_create_dummy_internal_arm_region_theglad(1);
m_armrom = (u32 *)memregion("prot")->base();
- m_prot->space(AS_PROGRAM).install_read_handler(0xB90, 0xB93, read32_delegate(*this, FUNC(pgm_arm_type3_state::svg_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0xB90, 0xB93, read32smo_delegate(*this, FUNC(pgm_arm_type3_state::svg_speedup_r)));
}
void pgm_arm_type3_state::init_svgpcb()
@@ -674,11 +674,11 @@ void pgm_arm_type3_state::init_svgpcb()
svg_latch_init();
pgm_create_dummy_internal_arm_region_theglad(0);
m_armrom = (u32 *)memregion("prot")->base();
- m_prot->space(AS_PROGRAM).install_read_handler(0x9e0, 0x9e3, read32_delegate(*this, FUNC(pgm_arm_type3_state::svgpcb_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0x9e0, 0x9e3, read32smo_delegate(*this, FUNC(pgm_arm_type3_state::svgpcb_speedup_r)));
}
-READ32_MEMBER(pgm_arm_type3_state::killbldp_speedup_r )
+u32 pgm_arm_type3_state::killbldp_speedup_r()
{
const int pc = m_prot->pc();
if (pc == 0x7d8) m_prot->eat_cycles(500);
@@ -692,7 +692,7 @@ void pgm_arm_type3_state::init_killbldp()
pgm_killbldp_decrypt(machine());
svg_latch_init();
- m_prot->space(AS_PROGRAM).install_read_handler(0x1000000c, 0x1000000f, read32_delegate(*this, FUNC(pgm_arm_type3_state::killbldp_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0x1000000c, 0x1000000f, read32smo_delegate(*this, FUNC(pgm_arm_type3_state::killbldp_speedup_r)));
// u16 *temp16 = (u16 *)memregion("prot")->base();
// int base = 0xfc; // startup table uploads
@@ -709,7 +709,7 @@ void pgm_arm_type3_state::init_killbldp()
}
-READ32_MEMBER(pgm_arm_type3_state::dmnfrnt_speedup_r )
+u32 pgm_arm_type3_state::dmnfrnt_speedup_r()
{
const int pc = m_prot->pc();
if (pc == 0x8000fea) m_prot->eat_cycles(500);
@@ -717,7 +717,7 @@ READ32_MEMBER(pgm_arm_type3_state::dmnfrnt_speedup_r )
return m_arm_ram[0x000444/4];
}
-READ16_MEMBER(pgm_arm_type3_state::dmnfrnt_main_speedup_r )
+u16 pgm_arm_type3_state::dmnfrnt_main_speedup_r()
{
u16 data = m_mainram[0xa03c/2];
const int pc = m_maincpu->pc();
@@ -735,8 +735,8 @@ void pgm_arm_type3_state::init_dmnfrnt()
/* put some fake code for the ARM here ... */
pgm_create_dummy_internal_arm_region(0x4000);
- m_prot->space(AS_PROGRAM).install_read_handler(0x18000444, 0x18000447, read32_delegate(*this, FUNC(pgm_arm_type3_state::dmnfrnt_speedup_r)));
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x80a03c, 0x80a03d, read16_delegate(*this, FUNC(pgm_arm_type3_state::dmnfrnt_main_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0x18000444, 0x18000447, read32smo_delegate(*this, FUNC(pgm_arm_type3_state::dmnfrnt_speedup_r)));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x80a03c, 0x80a03d, read16smo_delegate(*this, FUNC(pgm_arm_type3_state::dmnfrnt_main_speedup_r)));
m_svg_ram_sel = 1;
@@ -844,5 +844,5 @@ void pgm_arm_type3_state::init_happy6()
svg_latch_init();
pgm_create_dummy_internal_arm_region_theglad(0);
- m_prot->space(AS_PROGRAM).install_read_handler(0x1000000c, 0x1000000f, read32_delegate(*this, FUNC(pgm_arm_type3_state::happy6_speedup_r)));
+ m_prot->space(AS_PROGRAM).install_read_handler(0x1000000c, 0x1000000f, read32smo_delegate(*this, FUNC(pgm_arm_type3_state::happy6_speedup_r)));
}
diff --git a/src/mame/machine/pgmprot_igs027a_type3.h b/src/mame/machine/pgmprot_igs027a_type3.h
index 88f394d5920..5d5f37b3972 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.h
+++ b/src/mame/machine/pgmprot_igs027a_type3.h
@@ -59,13 +59,13 @@ private:
void pgm_descramble_happy6(u8* src);
void pgm_descramble_happy6_2(u8* src);
void svg_latch_init();
- DECLARE_READ32_MEMBER( dmnfrnt_speedup_r );
- DECLARE_READ16_MEMBER( dmnfrnt_main_speedup_r );
- DECLARE_READ32_MEMBER( killbldp_speedup_r );
- DECLARE_READ32_MEMBER( theglad_speedup_r );
- DECLARE_READ32_MEMBER( happy6_speedup_r );
- DECLARE_READ32_MEMBER( svg_speedup_r );
- DECLARE_READ32_MEMBER( svgpcb_speedup_r );
+ u32 dmnfrnt_speedup_r();
+ u16 dmnfrnt_main_speedup_r();
+ u32 killbldp_speedup_r();
+ u32 theglad_speedup_r();
+ u32 happy6_speedup_r();
+ u32 svg_speedup_r();
+ u32 svgpcb_speedup_r();
void _55857G_arm7_map(address_map &map);
void svg_68k_mem(address_map &map);
};
diff --git a/src/mame/machine/pitnrun.cpp b/src/mame/machine/pitnrun.cpp
index 05b53daccac..b2dff097218 100644
--- a/src/mame/machine/pitnrun.cpp
+++ b/src/mame/machine/pitnrun.cpp
@@ -38,7 +38,7 @@ TIMER_CALLBACK_MEMBER(pitnrun_state::mcu_real_data_r)
m_zaccept = 1;
}
-READ8_MEMBER(pitnrun_state::mcu_data_r)
+uint8_t pitnrun_state::mcu_data_r()
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(pitnrun_state::mcu_real_data_r),this));
return m_toz80;
@@ -51,13 +51,13 @@ TIMER_CALLBACK_MEMBER(pitnrun_state::mcu_real_data_w)
m_fromz80 = param;
}
-WRITE8_MEMBER(pitnrun_state::mcu_data_w)
+void pitnrun_state::mcu_data_w(uint8_t data)
{
machine().scheduler().synchronize(timer_expired_delegate(FUNC(pitnrun_state::mcu_real_data_w),this), data);
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(5));
}
-READ8_MEMBER(pitnrun_state::mcu_status_r)
+uint8_t pitnrun_state::mcu_status_r()
{
/* mcu synchronization */
/* bit 0 = the 68705 has read data from the Z80 */
diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp
index a10cc9233a1..6c6f11574d4 100644
--- a/src/mame/machine/playch10.cpp
+++ b/src/mame/machine/playch10.cpp
@@ -46,8 +46,8 @@ void playch10_state::machine_start()
/* move to individual boards as documentation of actual boards allows */
m_nt_ram = std::make_unique<uint8_t[]>(0x1000);
- m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(*this, FUNC(playch10_state::pc10_chr_r)), write8_delegate(*this, FUNC(playch10_state::pc10_chr_w)));
- m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(playch10_state::pc10_nt_r)), write8_delegate(*this, FUNC(playch10_state::pc10_nt_w)));
+ m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8sm_delegate(*this, FUNC(playch10_state::pc10_chr_r)), write8sm_delegate(*this, FUNC(playch10_state::pc10_chr_w)));
+ m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8sm_delegate(*this, FUNC(playch10_state::pc10_nt_r)), write8sm_delegate(*this, FUNC(playch10_state::pc10_nt_w)));
if (nullptr != m_vram)
set_videoram_bank(0, 8, 0, 8);
@@ -69,8 +69,8 @@ MACHINE_START_MEMBER(playch10_state,playch10_hboard)
m_vram = std::make_unique<uint8_t[]>(0x2000);
- m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(*this, FUNC(playch10_state::pc10_chr_r)), write8_delegate(*this, FUNC(playch10_state::pc10_chr_w)));
- m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(playch10_state::pc10_nt_r)), write8_delegate(*this, FUNC(playch10_state::pc10_nt_w)));
+ m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8sm_delegate(*this, FUNC(playch10_state::pc10_chr_r)), write8sm_delegate(*this, FUNC(playch10_state::pc10_chr_w)));
+ m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8sm_delegate(*this, FUNC(playch10_state::pc10_nt_r)), write8sm_delegate(*this, FUNC(playch10_state::pc10_nt_w)));
}
/*************************************
@@ -126,7 +126,7 @@ WRITE_LINE_MEMBER(playch10_state::ppu_reset_w)
m_ppu->reset();
}
-READ8_MEMBER(playch10_state::pc10_detectclr_r)
+uint8_t playch10_state::pc10_detectclr_r()
{
m_pc10_int_detect = 0;
@@ -145,7 +145,7 @@ void playch10_state::cart_sel_w(uint8_t data)
*
*************************************/
-READ8_MEMBER(playch10_state::pc10_prot_r)
+uint8_t playch10_state::pc10_prot_r()
{
int data = 0xe7;
@@ -158,7 +158,7 @@ READ8_MEMBER(playch10_state::pc10_prot_r)
return data;
}
-WRITE8_MEMBER(playch10_state::pc10_prot_w)
+void playch10_state::pc10_prot_w(uint8_t data)
{
/* we only support a single cart connected at slot 0 */
if (m_cart_sel == 0)
@@ -176,7 +176,7 @@ WRITE8_MEMBER(playch10_state::pc10_prot_w)
*
*************************************/
-WRITE8_MEMBER(playch10_state::pc10_in0_w)
+void playch10_state::pc10_in0_w(uint8_t data)
{
/* Toggling bit 0 high then low resets both controllers */
if (data & 1)
@@ -194,7 +194,7 @@ WRITE8_MEMBER(playch10_state::pc10_in0_w)
}
}
-READ8_MEMBER(playch10_state::pc10_in0_r)
+uint8_t playch10_state::pc10_in0_r()
{
int ret = (m_input_latch[0]) & 1;
@@ -208,7 +208,7 @@ READ8_MEMBER(playch10_state::pc10_in0_r)
return ret;
}
-READ8_MEMBER(playch10_state::pc10_in1_r)
+uint8_t playch10_state::pc10_in1_r()
{
int ret = (m_input_latch[1]) & 1;
@@ -264,19 +264,19 @@ READ8_MEMBER(playch10_state::pc10_in1_r)
*
*************************************/
-WRITE8_MEMBER(playch10_state::pc10_nt_w)
+void playch10_state::pc10_nt_w(offs_t offset, uint8_t data)
{
int page = ((offset & 0xc00) >> 10);
m_nametable[page][offset & 0x3ff] = data;
}
-READ8_MEMBER(playch10_state::pc10_nt_r)
+uint8_t playch10_state::pc10_nt_r(offs_t offset)
{
int page = ((offset & 0xc00) >> 10);
return m_nametable[page][offset & 0x3ff];
}
-WRITE8_MEMBER(playch10_state::pc10_chr_w)
+void playch10_state::pc10_chr_w(offs_t offset, uint8_t data)
{
int bank = offset >> 10;
if (m_chr_page[bank].writable)
@@ -285,7 +285,7 @@ WRITE8_MEMBER(playch10_state::pc10_chr_w)
}
}
-READ8_MEMBER(playch10_state::pc10_chr_r)
+uint8_t playch10_state::pc10_chr_r(offs_t offset)
{
int bank = offset >> 10;
return m_chr_page[bank].chr[offset & 0x3ff];
@@ -428,7 +428,7 @@ void playch10_state::init_pc_hrz()
/* MMC1 mapper, used by D and F boards */
-WRITE8_MEMBER(playch10_state::mmc1_rom_switch_w)
+void playch10_state::mmc1_rom_switch_w(offs_t offset, uint8_t data)
{
/* basically, a MMC1 mapper from the nes */
static int size16k, switchlow, vrom4k;
@@ -547,7 +547,7 @@ WRITE8_MEMBER(playch10_state::mmc1_rom_switch_w)
/**********************************************************************************/
/* A Board games (Track & Field, Gradius) */
-WRITE8_MEMBER(playch10_state::aboard_vrom_switch_w)
+void playch10_state::aboard_vrom_switch_w(uint8_t data)
{
pc10_set_videorom_bank(0, 8, (data & 3), 8);
}
@@ -555,7 +555,7 @@ WRITE8_MEMBER(playch10_state::aboard_vrom_switch_w)
void playch10_state::init_pcaboard()
{
/* switches vrom with writes to the $803e-$8041 area */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0x8fff, write8_delegate(*this, FUNC(playch10_state::aboard_vrom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0x8fff, write8smo_delegate(*this, FUNC(playch10_state::aboard_vrom_switch_w)));
/* common init */
init_playch10();
@@ -570,7 +570,7 @@ void playch10_state::init_pcaboard()
/**********************************************************************************/
/* B Board games (Contra, Rush N' Attach, Pro Wrestling) */
-WRITE8_MEMBER(playch10_state::bboard_rom_switch_w)
+void playch10_state::bboard_rom_switch_w(uint8_t data)
{
int bankoffset = 0x10000 + ((data & 7) * 0x4000);
uint8_t *prg = memregion("cart")->base();
@@ -587,7 +587,7 @@ void playch10_state::init_pcbboard()
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::bboard_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8smo_delegate(*this, FUNC(playch10_state::bboard_rom_switch_w)));
/* common init */
init_playch10();
@@ -604,7 +604,7 @@ void playch10_state::init_pcbboard()
/**********************************************************************************/
/* C Board games (The Goonies) */
-WRITE8_MEMBER(playch10_state::cboard_vrom_switch_w)
+void playch10_state::cboard_vrom_switch_w(uint8_t data)
{
pc10_set_videorom_bank(0, 8, ((data >> 1) & 1), 8);
}
@@ -612,7 +612,7 @@ WRITE8_MEMBER(playch10_state::cboard_vrom_switch_w)
void playch10_state::init_pccboard()
{
/* switches vrom with writes to $6000 */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x6000, 0x6000, write8_delegate(*this, FUNC(playch10_state::cboard_vrom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x6000, 0x6000, write8smo_delegate(*this, FUNC(playch10_state::cboard_vrom_switch_w)));
/* we have no vram, make sure switching games doesn't point to an old allocation */
m_vram = nullptr;
@@ -635,7 +635,7 @@ void playch10_state::init_pcdboard()
m_mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w)));
/* common init */
@@ -690,7 +690,7 @@ void playch10_state::mapper9_latch(offs_t offset )
}
}
-WRITE8_MEMBER(playch10_state::eboard_rom_switch_w)
+void playch10_state::eboard_rom_switch_w(offs_t offset, uint8_t data)
{
/* a variation of mapper 9 on a nes */
switch (offset & 0x7000)
@@ -746,7 +746,7 @@ void playch10_state::init_pceboard()
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* basically a mapper 9 on a nes */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::eboard_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(playch10_state::eboard_rom_switch_w)));
/* ppu_latch callback */
m_ppu->set_latch(*this, FUNC(playch10_state::mapper9_latch));
@@ -776,7 +776,7 @@ void playch10_state::init_pcfboard()
m_mmc1_rom_mask = ((len - 0x10000) / 0x4000) - 1;
/* MMC mapper at writes to $8000-$ffff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w)));
/* common init */
init_playch10();
@@ -816,7 +816,7 @@ void playch10_state::gboard_scanline_cb( int scanline, int vblank, int blanked )
}
}
-WRITE8_MEMBER(playch10_state::gboard_rom_switch_w)
+void playch10_state::gboard_rom_switch_w(offs_t offset, uint8_t data)
{
/* basically, a MMC3 mapper from the nes */
@@ -960,7 +960,7 @@ void playch10_state::init_pcgboard()
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* MMC3 mapper at writes to $8000-$ffff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::gboard_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(playch10_state::gboard_rom_switch_w)));
/* extra ram at $6000-$7fff */
m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
@@ -992,7 +992,7 @@ void playch10_state::init_pcgboard_type2()
/**********************************************************************************/
/* i Board games (Captain Sky Hawk, Solar Jetman) */
-WRITE8_MEMBER(playch10_state::iboard_rom_switch_w)
+void playch10_state::iboard_rom_switch_w(uint8_t data)
{
int bank = data & 7;
uint8_t *prg = memregion("cart")->base();
@@ -1014,7 +1014,7 @@ void playch10_state::init_pciboard()
memcpy(&prg[0x08000], &prg[0x10000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::iboard_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8smo_delegate(*this, FUNC(playch10_state::iboard_rom_switch_w)));
/* common init */
init_playch10();
@@ -1028,7 +1028,7 @@ void playch10_state::init_pciboard()
/**********************************************************************************/
/* H Board games (PinBot) */
-WRITE8_MEMBER(playch10_state::hboard_rom_switch_w)
+void playch10_state::hboard_rom_switch_w(offs_t offset, uint8_t data)
{
switch (offset & 0x7001)
{
@@ -1070,7 +1070,7 @@ WRITE8_MEMBER(playch10_state::hboard_rom_switch_w)
}
}
};
- gboard_rom_switch_w(space,offset,data);
+ gboard_rom_switch_w(offset,data);
}
@@ -1081,7 +1081,7 @@ void playch10_state::init_pchboard()
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* Roms are banked at $8000 to $bfff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::hboard_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(playch10_state::hboard_rom_switch_w)));
/* extra ram at $6000-$7fff */
m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
@@ -1116,7 +1116,7 @@ void playch10_state::init_pckboard()
m_cartcpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
/* Roms are banked at $8000 to $bfff */
- m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w)));
+ m_cartcpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(playch10_state::mmc1_rom_switch_w)));
/* common init */
init_playch10();
diff --git a/src/mame/machine/pmd85.cpp b/src/mame/machine/pmd85.cpp
index c824b233618..fde67618240 100644
--- a/src/mame/machine/pmd85.cpp
+++ b/src/mame/machine/pmd85.cpp
@@ -459,7 +459,7 @@ void pmd85_state::pmd85_ppi_3_portc_w(uint8_t data)
*******************************************************************************/
-READ8_MEMBER(pmd85_state::pmd85_io_r)
+uint8_t pmd85_state::pmd85_io_r(offs_t offset)
{
if (m_startup_mem_map)
{
@@ -513,7 +513,7 @@ READ8_MEMBER(pmd85_state::pmd85_io_r)
return 0xff;
}
-WRITE8_MEMBER(pmd85_state::pmd85_io_w)
+void pmd85_state::pmd85_io_w(offs_t offset, uint8_t data)
{
if (m_startup_mem_map)
{
@@ -589,7 +589,7 @@ WRITE8_MEMBER(pmd85_state::pmd85_io_w)
*******************************************************************************/
-READ8_MEMBER(pmd85_state::mato_io_r)
+uint8_t pmd85_state::mato_io_r(offs_t offset)
{
if (m_startup_mem_map)
{
@@ -611,7 +611,7 @@ READ8_MEMBER(pmd85_state::mato_io_r)
return 0xff;
}
-WRITE8_MEMBER(pmd85_state::mato_io_w)
+void pmd85_state::mato_io_w(offs_t offset, uint8_t data)
{
if (m_startup_mem_map)
{
diff --git a/src/mame/machine/poly.cpp b/src/mame/machine/poly.cpp
index b865ab1c558..cb1bbc5379c 100644
--- a/src/mame/machine/poly.cpp
+++ b/src/mame/machine/poly.cpp
@@ -16,18 +16,18 @@ inline offs_t poly_state::physical(offs_t offset)
return (((~m_dat[(m_dat_bank << 3) | (offset >> 13)]) & 0x0f) << 13) | (offset & 0x1fff);
}
-READ8_MEMBER(poly_state::logical_mem_r)
+uint8_t poly_state::logical_mem_r(offs_t offset)
{
return m_user->base()[physical(offset)];
}
-WRITE8_MEMBER(poly_state::logical_mem_w)
+void poly_state::logical_mem_w(offs_t offset, uint8_t data)
{
m_user->base()[physical(offset)] = data;
}
-READ8_MEMBER(poly_state::vector_r)
+uint8_t poly_state::vector_r(offs_t offset)
{
/* system mode is selected by a vector fetch (interrupt and reset) */
m_bankdev->set_bank(0);
@@ -41,24 +41,24 @@ TIMER_CALLBACK_MEMBER(poly_state::set_protect)
m_bankdev->set_bank(1);
}
-WRITE8_MEMBER(poly_state::set_protect_w)
+void poly_state::set_protect_w(uint8_t data)
{
/* set protect after 1 E cycle */
machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(2), timer_expired_delegate(FUNC(poly_state::set_protect), this));
}
-READ8_MEMBER(poly_state::select_map_r)
+uint8_t poly_state::select_map_r()
{
return 0x00;
}
-WRITE8_MEMBER(poly_state::select_map1_w)
+void poly_state::select_map1_w(uint8_t data)
{
m_dat_bank = 0;
}
-WRITE8_MEMBER(poly_state::select_map2_w)
+void poly_state::select_map2_w(uint8_t data)
{
m_dat_bank = 1;
}
@@ -148,19 +148,19 @@ WRITE_LINE_MEMBER(poly_state::ptm_o3_callback)
m_speaker->level_w(state);
}
-WRITE8_MEMBER(poly_state::baud_rate_w )
+void poly_state::baud_rate_w (uint8_t data)
{
/* baud rate controller (0=9600,2=4800,4=2400,6=1200,8=600,A=300) */
int selector = (data & 0x0e) >> 1;
m_acia_clock->set_clock_scale((selector <= 5) ? 1.0 / (1 << selector) : 0.0);
}
-READ8_MEMBER(poly_state::network_r)
+uint8_t poly_state::network_r(offs_t offset)
{
return m_adlc->read(offset >> 1);
}
-WRITE8_MEMBER(poly_state::network_w)
+void poly_state::network_w(offs_t offset, uint8_t data)
{
m_adlc->write(offset >> 1, data);
}
@@ -172,7 +172,7 @@ WRITE_LINE_MEMBER(poly_state::network_clk_w)
}
-WRITE8_MEMBER(polydev_state::drive_register_w)
+void polydev_state::drive_register_w(uint8_t data)
{
/* drive select */
switch (data & 0x03)
@@ -198,7 +198,7 @@ WRITE8_MEMBER(polydev_state::drive_register_w)
}
}
-READ8_MEMBER(polydev_state::drive_register_r)
+uint8_t polydev_state::drive_register_r()
{
/* disk change */
return (m_current_floppy ? m_current_floppy->dskchg_r() : 1) << 1;
@@ -209,12 +209,12 @@ WRITE_LINE_MEMBER(polydev_state::motor_w)
if (m_current_floppy) m_current_floppy->mon_w(!state);
}
-READ8_MEMBER(polydev_state::fdc_inv_r)
+uint8_t polydev_state::fdc_inv_r(offs_t offset)
{
return m_fdc->read(offset) ^ 0xff;
}
-WRITE8_MEMBER(polydev_state::fdc_inv_w)
+void polydev_state::fdc_inv_w(offs_t offset, uint8_t data)
{
m_fdc->write(offset, data ^ 0xff);
}
diff --git a/src/mame/machine/pp01.cpp b/src/mame/machine/pp01.cpp
index 6e3b4ce7479..23db9f8bf1b 100644
--- a/src/mame/machine/pp01.cpp
+++ b/src/mame/machine/pp01.cpp
@@ -13,7 +13,7 @@
#include "includes/pp01.h"
-WRITE8_MEMBER(pp01_state::video_write_mode_w)
+void pp01_state::video_write_mode_w(uint8_t data)
{
m_video_write_mode = data & 0x0f;
}
@@ -53,28 +53,28 @@ void pp01_state::video_w(uint8_t block,uint16_t offset,uint8_t data,uint8_t part
}
}
-WRITE8_MEMBER(pp01_state::video_r_1_w)
+void pp01_state::video_r_1_w(offs_t offset, uint8_t data)
{
video_w(0,offset,data,0);
}
-WRITE8_MEMBER(pp01_state::video_g_1_w)
+void pp01_state::video_g_1_w(offs_t offset, uint8_t data)
{
video_w(1,offset,data,0);
}
-WRITE8_MEMBER(pp01_state::video_b_1_w)
+void pp01_state::video_b_1_w(offs_t offset, uint8_t data)
{
video_w(2,offset,data,0);
}
-WRITE8_MEMBER(pp01_state::video_r_2_w)
+void pp01_state::video_r_2_w(offs_t offset, uint8_t data)
{
video_w(0,offset,data,1);
}
-WRITE8_MEMBER(pp01_state::video_g_2_w)
+void pp01_state::video_g_2_w(offs_t offset, uint8_t data)
{
video_w(1,offset,data,1);
}
-WRITE8_MEMBER(pp01_state::video_b_2_w)
+void pp01_state::video_b_2_w(offs_t offset, uint8_t data)
{
video_w(2,offset,data,1);
}
@@ -94,22 +94,22 @@ void pp01_state::set_memory(uint8_t block, uint8_t data)
space.install_read_bank (startaddr, endaddr, bank);
switch(data) {
case 0xe6 :
- space.install_write_handler(startaddr, endaddr, write8_delegate(*this, FUNC(pp01_state::video_r_1_w)));
+ space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_r_1_w)));
break;
case 0xe7:
- space.install_write_handler(startaddr, endaddr, write8_delegate(*this, FUNC(pp01_state::video_r_2_w)));
+ space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_r_2_w)));
break;
case 0xea:
- space.install_write_handler(startaddr, endaddr, write8_delegate(*this, FUNC(pp01_state::video_g_1_w)));
+ space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_g_1_w)));
break;
case 0xeb:
- space.install_write_handler(startaddr, endaddr, write8_delegate(*this, FUNC(pp01_state::video_g_2_w)));
+ space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_g_2_w)));
break;
case 0xee:
- space.install_write_handler(startaddr, endaddr, write8_delegate(*this, FUNC(pp01_state::video_b_1_w)));
+ space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_b_1_w)));
break;
case 0xef:
- space.install_write_handler(startaddr, endaddr, write8_delegate(*this, FUNC(pp01_state::video_b_2_w)));
+ space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_b_2_w)));
break;
default:
space.install_write_bank(startaddr, endaddr, bank);
@@ -138,13 +138,13 @@ void pp01_state::machine_reset()
m_uart->write_cts(0);
}
-WRITE8_MEMBER(pp01_state::mem_block_w)
+void pp01_state::mem_block_w(offs_t offset, uint8_t data)
{
m_memory_block[offset] = data;
set_memory(offset, data);
}
-READ8_MEMBER(pp01_state::mem_block_r)
+uint8_t pp01_state::mem_block_r(offs_t offset)
{
return m_memory_block[offset];
}
diff --git a/src/mame/machine/qix.cpp b/src/mame/machine/qix.cpp
index 8b224f8fc51..e7f9b38d3fe 100644
--- a/src/mame/machine/qix.cpp
+++ b/src/mame/machine/qix.cpp
@@ -60,11 +60,11 @@ WRITE_LINE_MEMBER(qix_state::qix_vsync_changed)
*
*************************************/
-WRITE8_MEMBER(zookeep_state::bankswitch_w)
+void zookeep_state::bankswitch_w(uint8_t data)
{
m_vidbank->set_entry(BIT(data, 2));
/* not necessary, but technically correct */
- qix_palettebank_w(space, offset, data);
+ qix_palettebank_w(data);
}
@@ -75,19 +75,19 @@ WRITE8_MEMBER(zookeep_state::bankswitch_w)
*
*************************************/
-WRITE8_MEMBER(qix_state::qix_data_firq_w)
+void qix_state::qix_data_firq_w(uint8_t data)
{
m_maincpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE);
}
-WRITE8_MEMBER(qix_state::qix_data_firq_ack_w)
+void qix_state::qix_data_firq_ack_w(uint8_t data)
{
m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
}
-READ8_MEMBER(qix_state::qix_data_firq_r)
+uint8_t qix_state::qix_data_firq_r(address_space &space)
{
if (!machine().side_effects_disabled())
m_maincpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE);
@@ -95,7 +95,7 @@ READ8_MEMBER(qix_state::qix_data_firq_r)
}
-READ8_MEMBER(qix_state::qix_data_firq_ack_r)
+uint8_t qix_state::qix_data_firq_ack_r(address_space &space)
{
if (!machine().side_effects_disabled())
m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
@@ -110,19 +110,19 @@ READ8_MEMBER(qix_state::qix_data_firq_ack_r)
*
*************************************/
-WRITE8_MEMBER(qix_state::qix_video_firq_w)
+void qix_state::qix_video_firq_w(uint8_t data)
{
m_videocpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE);
}
-WRITE8_MEMBER(qix_state::qix_video_firq_ack_w)
+void qix_state::qix_video_firq_ack_w(uint8_t data)
{
m_videocpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
}
-READ8_MEMBER(qix_state::qix_video_firq_r)
+uint8_t qix_state::qix_video_firq_r(address_space &space)
{
if (!machine().side_effects_disabled())
m_videocpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE);
@@ -130,7 +130,7 @@ READ8_MEMBER(qix_state::qix_video_firq_r)
}
-READ8_MEMBER(qix_state::qix_video_firq_ack_r)
+uint8_t qix_state::qix_video_firq_ack_r(address_space &space)
{
if (!machine().side_effects_disabled())
m_videocpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE);
diff --git a/src/mame/video/pacland.cpp b/src/mame/video/pacland.cpp
index 4e620eb35f1..30164aeb8bb 100644
--- a/src/mame/video/pacland.cpp
+++ b/src/mame/video/pacland.cpp
@@ -222,29 +222,29 @@ void pacland_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(pacland_state::videoram_w)
+void pacland_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(pacland_state::videoram2_w)
+void pacland_state::videoram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_MEMBER(pacland_state::scroll0_w)
+void pacland_state::scroll0_w(offs_t offset, uint8_t data)
{
m_scroll0 = data + 256 * offset;
}
-WRITE8_MEMBER(pacland_state::scroll1_w)
+void pacland_state::scroll1_w(offs_t offset, uint8_t data)
{
m_scroll1 = data + 256 * offset;
}
-WRITE8_MEMBER(pacland_state::bankswitch_w)
+void pacland_state::bankswitch_w(uint8_t data)
{
membank("bank1")->set_entry(data & 0x07);
diff --git a/src/mame/video/pacman.cpp b/src/mame/video/pacman.cpp
index b2b1f72305a..07a933fbdca 100644
--- a/src/mame/video/pacman.cpp
+++ b/src/mame/video/pacman.cpp
@@ -181,13 +181,13 @@ VIDEO_START_MEMBER(pacman_state,birdiy)
m_inv_spr = 1; // sprites are mirrored in X-axis compared to normal behaviour
}
-WRITE8_MEMBER(pacman_state::pacman_videoram_w)
+void pacman_state::pacman_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset );
}
-WRITE8_MEMBER(pacman_state::pacman_colorram_w)
+void pacman_state::pacman_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset );
@@ -428,13 +428,13 @@ uint32_t pacman_state::screen_update_s2650games(screen_device &screen, bitmap_in
return 0;
}
-WRITE8_MEMBER(pacman_state::s2650games_videoram_w)
+void pacman_state::s2650games_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pacman_state::s2650games_colorram_w)
+void pacman_state::s2650games_colorram_w(offs_t offset, uint8_t data)
{
int i;
m_colorram[offset & 0x1f] = data;
@@ -442,12 +442,12 @@ WRITE8_MEMBER(pacman_state::s2650games_colorram_w)
m_bg_tilemap->mark_tile_dirty(i);
}
-WRITE8_MEMBER(pacman_state::s2650games_scroll_w)
+void pacman_state::s2650games_scroll_w(offs_t offset, uint8_t data)
{
m_bg_tilemap->set_scrolly(offset, data);
}
-WRITE8_MEMBER(pacman_state::s2650games_tilesbank_w)
+void pacman_state::s2650games_tilesbank_w(offs_t offset, uint8_t data)
{
m_s2650games_tileram[offset] = data;
m_bg_tilemap->mark_all_dirty();
@@ -548,7 +548,7 @@ VIDEO_START_MEMBER(pacman_state,jrpacman)
m_bg_tilemap->set_scroll_cols(36 );
}
-WRITE8_MEMBER(pacman_state::jrpacman_videoram_w)
+void pacman_state::jrpacman_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
jrpacman_mark_tile_dirty(offset);
@@ -565,7 +565,7 @@ WRITE_LINE_MEMBER(pacman_state::jrpacman_spritebank_w)
m_spritebank = state;
}
-WRITE8_MEMBER(pacman_state::jrpacman_scroll_w)
+void pacman_state::jrpacman_scroll_w(uint8_t data)
{
int i;
for( i = 2; i < 34; i++ )
diff --git a/src/mame/video/pandoras.cpp b/src/mame/video/pandoras.cpp
index 3b9202fa254..08b018cdc04 100644
--- a/src/mame/video/pandoras.cpp
+++ b/src/mame/video/pandoras.cpp
@@ -114,19 +114,19 @@ void pandoras_state::video_start()
***************************************************************************/
-WRITE8_MEMBER(pandoras_state::pandoras_vram_w)
+void pandoras_state::pandoras_vram_w(offs_t offset, uint8_t data)
{
m_layer0->mark_tile_dirty(offset);
m_videoram[offset] = data;
}
-WRITE8_MEMBER(pandoras_state::pandoras_cram_w)
+void pandoras_state::pandoras_cram_w(offs_t offset, uint8_t data)
{
m_layer0->mark_tile_dirty(offset);
m_colorram[offset] = data;
}
-WRITE8_MEMBER(pandoras_state::pandoras_scrolly_w)
+void pandoras_state::pandoras_scrolly_w(uint8_t data)
{
m_layer0->set_scrolly(0, data);
}
diff --git a/src/mame/video/paradise.cpp b/src/mame/video/paradise.cpp
index 4880da2384d..47a012fece8 100644
--- a/src/mame/video/paradise.cpp
+++ b/src/mame/video/paradise.cpp
@@ -30,12 +30,12 @@ Note: if MAME_DEBUG is defined, pressing Z with:
#include "emu.h"
#include "includes/paradise.h"
-WRITE8_MEMBER(paradise_state::flipscreen_w)
+void paradise_state::flipscreen_w(uint8_t data)
{
flip_screen_set(data ? 0 : 1);
}
-WRITE8_MEMBER(paradise_state::tgtball_flipscreen_w)
+void paradise_state::tgtball_flipscreen_w(uint8_t data)
{
flip_screen_set(data ? 1 : 0);
}
@@ -54,7 +54,7 @@ void paradise_state::update_pix_palbank()
}
/* 800 bytes for red, followed by 800 bytes for green & 800 bytes for blue */
-WRITE8_MEMBER(paradise_state::palette_w)
+void paradise_state::palette_w(offs_t offset, uint8_t data)
{
m_paletteram[offset] = data;
offset %= 0x800;
@@ -76,14 +76,14 @@ WRITE8_MEMBER(paradise_state::palette_w)
***************************************************************************/
/* Background */
-WRITE8_MEMBER(paradise_state::vram_0_w)
+void paradise_state::vram_0_w(offs_t offset, uint8_t data)
{
m_vram_0[offset] = data;
m_tilemap_0->mark_tile_dirty(offset % 0x400);
}
/* 16 color tiles with paradise_palbank as color code */
-WRITE8_MEMBER(paradise_state::palbank_w)
+void paradise_state::palbank_w(uint8_t data)
{
int bank1 = (data & 0x0e) | 1;
int bank2 = (data & 0xf0);
@@ -107,7 +107,7 @@ TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_0)
/* Midground */
-WRITE8_MEMBER(paradise_state::vram_1_w)
+void paradise_state::vram_1_w(offs_t offset, uint8_t data)
{
m_vram_1[offset] = data;
m_tilemap_1->mark_tile_dirty(offset % 0x400);
@@ -121,7 +121,7 @@ TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_1)
/* Foreground */
-WRITE8_MEMBER(paradise_state::vram_2_w)
+void paradise_state::vram_2_w(offs_t offset, uint8_t data)
{
m_vram_2[offset] = data;
m_tilemap_2->mark_tile_dirty(offset % 0x400);
@@ -135,7 +135,7 @@ TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_2)
/* 256 x 256 bitmap. 4 bits per pixel so every byte encodes 2 pixels */
-WRITE8_MEMBER(paradise_state::pixmap_w)
+void paradise_state::pixmap_w(offs_t offset, uint8_t data)
{
int x, y;
@@ -180,7 +180,7 @@ void paradise_state::video_start()
***************************************************************************/
/* Sprites / Layers priority */
-WRITE8_MEMBER(paradise_state::priority_w)
+void paradise_state::priority_w(uint8_t data)
{
m_priority = data;
}
diff --git a/src/mame/video/pass.cpp b/src/mame/video/pass.cpp
index e3122aa1c7c..9748c4099e6 100644
--- a/src/mame/video/pass.cpp
+++ b/src/mame/video/pass.cpp
@@ -17,7 +17,7 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_bg_tile_info)
}
-WRITE16_MEMBER(pass_state::pass_bg_videoram_w)
+void pass_state::pass_bg_videoram_w(offs_t offset, uint16_t data)
{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_fg_tile_info)
}
-WRITE16_MEMBER(pass_state::pass_fg_videoram_w)
+void pass_state::pass_fg_videoram_w(offs_t offset, uint16_t data)
{
m_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/pbaction.cpp b/src/mame/video/pbaction.cpp
index 4f6d9cc0a52..658d115bebb 100644
--- a/src/mame/video/pbaction.cpp
+++ b/src/mame/video/pbaction.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Nicola Salmoria
/***************************************************************************
- video.c
+ pbaction.cpp
Functions to emulate the video hardware of the machine.
@@ -11,31 +11,31 @@
#include "emu.h"
#include "includes/pbaction.h"
-WRITE8_MEMBER(pbaction_state::pbaction_videoram_w)
+void pbaction_state::pbaction_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pbaction_state::pbaction_colorram_w)
+void pbaction_state::pbaction_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pbaction_state::pbaction_videoram2_w)
+void pbaction_state::pbaction_videoram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pbaction_state::pbaction_colorram2_w)
+void pbaction_state::pbaction_colorram2_w(offs_t offset, uint8_t data)
{
m_colorram2[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pbaction_state::pbaction_scroll_w)
+void pbaction_state::pbaction_scroll_w(uint8_t data)
{
m_scroll = data - 3;
if (flip_screen())
@@ -45,7 +45,7 @@ WRITE8_MEMBER(pbaction_state::pbaction_scroll_w)
m_fg_tilemap->set_scrollx(0, m_scroll);
}
-WRITE8_MEMBER(pbaction_state::pbaction_flipscreen_w)
+void pbaction_state::pbaction_flipscreen_w(uint8_t data)
{
flip_screen_set(data & 0x01);
}
diff --git a/src/mame/video/pc080sn.cpp b/src/mame/video/pc080sn.cpp
index 5942c98b75c..9dc539435cf 100644
--- a/src/mame/video/pc080sn.cpp
+++ b/src/mame/video/pc080sn.cpp
@@ -184,12 +184,12 @@ TILE_GET_INFO_MEMBER(pc080sn_device::get_fg_tile_info)
common_get_pc080sn_fg_tile_info( tileinfo, tile_index, m_bg_ram[1], m_gfxnum );
}
-READ16_MEMBER( pc080sn_device::word_r )
+u16 pc080sn_device::word_r(offs_t offset)
{
return m_ram[offset];
}
-WRITE16_MEMBER( pc080sn_device::word_w )
+void pc080sn_device::word_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_ram[offset]);
@@ -209,7 +209,7 @@ WRITE16_MEMBER( pc080sn_device::word_w )
}
}
-WRITE16_MEMBER( pc080sn_device::xscroll_word_w )
+void pc080sn_device::xscroll_word_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_ctrl[offset]);
@@ -227,7 +227,7 @@ WRITE16_MEMBER( pc080sn_device::xscroll_word_w )
}
}
-WRITE16_MEMBER( pc080sn_device::yscroll_word_w )
+void pc080sn_device::yscroll_word_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_ctrl[offset + 2]);
@@ -248,7 +248,7 @@ WRITE16_MEMBER( pc080sn_device::yscroll_word_w )
}
}
-WRITE16_MEMBER( pc080sn_device::ctrl_word_w )
+void pc080sn_device::ctrl_word_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_ctrl[offset + 4]);
diff --git a/src/mame/video/pc080sn.h b/src/mame/video/pc080sn.h
index 1c607573196..7396913d260 100644
--- a/src/mame/video/pc080sn.h
+++ b/src/mame/video/pc080sn.h
@@ -24,11 +24,11 @@ public:
m_y_offset = y_offset;
}
- DECLARE_READ16_MEMBER( word_r );
- DECLARE_WRITE16_MEMBER( word_w );
- DECLARE_WRITE16_MEMBER( xscroll_word_w );
- DECLARE_WRITE16_MEMBER( yscroll_word_w );
- DECLARE_WRITE16_MEMBER( ctrl_word_w );
+ u16 word_r(offs_t offset);
+ void word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void xscroll_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void yscroll_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+ void ctrl_word_w(offs_t offset, u16 data, u16 mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/video/pc1251.cpp b/src/mame/video/pc1251.cpp
index ee7780d2e3d..454ed3dad4e 100644
--- a/src/mame/video/pc1251.cpp
+++ b/src/mame/video/pc1251.cpp
@@ -77,14 +77,14 @@ const char *const pc1251_state::s_rsv[5] =
"1 1 11 1 "
};
-READ8_MEMBER(pc1251_state::lcd_read)
+uint8_t pc1251_state::lcd_read(offs_t offset)
{
uint8_t data = m_reg[offset & 0xff];
LOGMASKED(LOG_LCD, "pc1251 read %.3x %.2x\n", offset, data);
return data;
}
-WRITE8_MEMBER(pc1251_state::lcd_write)
+void pc1251_state::lcd_write(offs_t offset, uint8_t data)
{
LOGMASKED(LOG_LCD, "pc1251 write %.3x %.2x\n", offset, data);
m_reg[offset & 0xff] = data;
diff --git a/src/mame/video/pc1350.cpp b/src/mame/video/pc1350.cpp
index 4d8876bcbbc..d8a60d178a9 100644
--- a/src/mame/video/pc1350.cpp
+++ b/src/mame/video/pc1350.cpp
@@ -61,14 +61,14 @@ const char* const pc1350_state::s_sml[5] =
"11 1 1 111"
};
-READ8_MEMBER(pc1350_state::lcd_read)
+uint8_t pc1350_state::lcd_read(offs_t offset)
{
uint8_t data = m_reg[offset & 0xfff];
LOGMASKED(LOG_LCD, "pc1350 read %.3x %.2x\n",offset,data);
return data;
}
-WRITE8_MEMBER(pc1350_state::lcd_write)
+void pc1350_state::lcd_write(offs_t offset, uint8_t data)
{
LOGMASKED(LOG_LCD, "pc1350 write %.3x %.2x\n",offset,data);
m_reg[offset & 0xfff] = data;
diff --git a/src/mame/video/pc1401.cpp b/src/mame/video/pc1401.cpp
index 08fb2cd911b..9fffbe75374 100644
--- a/src/mame/video/pc1401.cpp
+++ b/src/mame/video/pc1401.cpp
@@ -21,12 +21,12 @@
603d: 0 BUSY, 1 DEF, 2 SHIFT, 3 BGN, 4 STAT, 5 FIN, 6 PRINT
607c: 0 E, 1 M, 2 BAL, 3 INT, 4 PRN, 5 Sum-Sign, 6 PRO */
-READ8_MEMBER(pc1401_state::lcd_read)
+uint8_t pc1401_state::lcd_read(offs_t offset)
{
return m_reg[offset & 0xff];
}
-WRITE8_MEMBER(pc1401_state::lcd_write)
+void pc1401_state::lcd_write(offs_t offset, uint8_t data)
{
m_reg[offset & 0xff] = data;
}
diff --git a/src/mame/video/pc1403.cpp b/src/mame/video/pc1403.cpp
index d007dd4c82c..f9c23cd9bec 100644
--- a/src/mame/video/pc1403.cpp
+++ b/src/mame/video/pc1403.cpp
@@ -39,12 +39,12 @@ void pc1403h_state::video_start()
m_right = 155;
}
-READ8_MEMBER(pc1403_state::lcd_read)
+uint8_t pc1403_state::lcd_read(offs_t offset)
{
return m_reg[offset];
}
-WRITE8_MEMBER(pc1403_state::lcd_write)
+void pc1403_state::lcd_write(offs_t offset, uint8_t data)
{
m_reg[offset] = data;
}
diff --git a/src/mame/video/pc4.cpp b/src/mame/video/pc4.cpp
index 81a829500bf..4e427652b5b 100644
--- a/src/mame/video/pc4.cpp
+++ b/src/mame/video/pc4.cpp
@@ -72,7 +72,7 @@ void pc4_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
}
}
-WRITE8_MEMBER(pc4_state::lcd_control_w)
+void pc4_state::lcd_control_w(uint8_t data)
{
if (BIT(data, 7))
{
@@ -142,7 +142,7 @@ WRITE8_MEMBER(pc4_state::lcd_control_w)
}
-READ8_MEMBER(pc4_state::lcd_control_r)
+uint8_t pc4_state::lcd_control_r()
{
return (m_busy_flag<<7) | (m_ac & 0x7f);
}
@@ -162,13 +162,13 @@ void pc4_state::update_ac(void)
m_data_bus_flag = 0;
}
-WRITE8_MEMBER( pc4_state::lcd_offset_w )
+void pc4_state::lcd_offset_w(uint8_t data)
{
m_cursor_pos = m_ac = (data%0xa0);
}
-WRITE8_MEMBER(pc4_state::lcd_data_w)
+void pc4_state::lcd_data_w(uint8_t data)
{
if (m_ac_mode == 0)
m_ddram[m_ac] = data;
@@ -179,7 +179,7 @@ WRITE8_MEMBER(pc4_state::lcd_data_w)
set_busy_flag(41);
}
-READ8_MEMBER(pc4_state::lcd_data_r)
+uint8_t pc4_state::lcd_data_r()
{
uint8_t data;
diff --git a/src/mame/video/pc9801.cpp b/src/mame/video/pc9801.cpp
index e421b995cd5..bddd9e7129e 100644
--- a/src/mame/video/pc9801.cpp
+++ b/src/mame/video/pc9801.cpp
@@ -244,7 +244,7 @@ UPD7220_DRAW_TEXT_LINE_MEMBER( pc9801_state::hgdc_draw_text )
*
************************************************/
-WRITE8_MEMBER(pc9801_state::pc9801_video_ff_w)
+void pc9801_state::pc9801_video_ff_w(uint8_t data)
{
/*
TODO: this is my best bet so far. Register 4 is annoying, the pattern seems to be:
@@ -289,7 +289,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_video_ff_w)
}
}
-READ8_MEMBER(pc9801_state::txt_scrl_r)
+uint8_t pc9801_state::txt_scrl_r(offs_t offset)
{
//logerror("Read to display register [%02x]\n",offset+0x70);
/* TODO: ok? */
@@ -298,7 +298,7 @@ READ8_MEMBER(pc9801_state::txt_scrl_r)
return 0xff;
}
-WRITE8_MEMBER(pc9801_state::txt_scrl_w)
+void pc9801_state::txt_scrl_w(offs_t offset, uint8_t data)
{
//logerror("Write to display register [%02x] %02x\n",offset+0x70,data);
if(offset <= 5)
@@ -313,7 +313,7 @@ WRITE8_MEMBER(pc9801_state::txt_scrl_w)
*
************************************************/
-READ8_MEMBER(pc9801_state::pc9801_a0_r)
+uint8_t pc9801_state::pc9801_a0_r(offs_t offset)
{
if((offset & 1) == 0)
{
@@ -358,7 +358,7 @@ READ8_MEMBER(pc9801_state::pc9801_a0_r)
}
}
-WRITE8_MEMBER(pc9801_state::pc9801_a0_w)
+void pc9801_state::pc9801_a0_w(offs_t offset, uint8_t data)
{
if((offset & 1) == 0)
{
@@ -441,7 +441,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_a0_w)
************************************************/
/* TODO: banking? */
-READ16_MEMBER(pc9801_state::tvram_r)
+uint16_t pc9801_state::tvram_r(offs_t offset, uint16_t mem_mask)
{
uint16_t res;
@@ -456,7 +456,7 @@ READ16_MEMBER(pc9801_state::tvram_r)
return res;
}
-WRITE16_MEMBER(pc9801_state::tvram_w)
+void pc9801_state::tvram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if(offset < (0x3fe2>>1))
COMBINE_DATA(&m_tvram[offset]);
@@ -473,12 +473,12 @@ WRITE16_MEMBER(pc9801_state::tvram_w)
************************************************/
/* +0x8000 is trusted (bank 0 is actually used by 16 colors mode) */
-READ8_MEMBER(pc9801_state::gvram_r)
+uint8_t pc9801_state::gvram_r(offs_t offset)
{
return bitswap<8>(m_video_ram_2[(offset>>1)+0x04000+m_vram_bank*0x10000] >> ((offset & 1) << 3),0,1,2,3,4,5,6,7);
}
-WRITE8_MEMBER(pc9801_state::gvram_w)
+void pc9801_state::gvram_w(offs_t offset, uint8_t data)
{
uint16_t ram = m_video_ram_2[(offset>>1)+0x04000+m_vram_bank*0x10000];
int mask = (offset & 1) << 3;
@@ -492,7 +492,7 @@ WRITE8_MEMBER(pc9801_state::gvram_w)
*
************************************************/
-READ16_MEMBER(pc9801_state::upd7220_grcg_r)
+uint16_t pc9801_state::upd7220_grcg_r(offs_t offset, uint16_t mem_mask)
{
uint16_t res = 0;
@@ -520,7 +520,7 @@ READ16_MEMBER(pc9801_state::upd7220_grcg_r)
return res;
}
-WRITE16_MEMBER(pc9801_state::upd7220_grcg_w)
+void pc9801_state::upd7220_grcg_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if(!(m_grcg.mode & 0x80))
COMBINE_DATA(&m_video_ram_2[offset]);
diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp
index 303c28b7dd8..01cce66819d 100644
--- a/src/mame/video/pecom.cpp
+++ b/src/mame/video/pecom.cpp
@@ -15,7 +15,7 @@
#include "speaker.h"
-WRITE8_MEMBER(pecom_state::pecom_cdp1869_w)
+void pecom_state::pecom_cdp1869_w(offs_t offset, uint8_t data)
{
uint16_t ma = m_cdp1802->get_memory_address();
diff --git a/src/mame/video/pgm2.cpp b/src/mame/video/pgm2.cpp
index 692d5460c28..3c7dc40e10e 100644
--- a/src/mame/video/pgm2.cpp
+++ b/src/mame/video/pgm2.cpp
@@ -339,7 +339,7 @@ WRITE_LINE_MEMBER(pgm2_state::screen_vblank)
}
}
-WRITE32_MEMBER(pgm2_state::fg_videoram_w)
+void pgm2_state::fg_videoram_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_fg_videoram[offset]);
m_fg_tilemap->mark_tile_dirty(offset);
@@ -354,7 +354,7 @@ TILE_GET_INFO_MEMBER(pgm2_state::get_fg_tile_info)
tileinfo.set(0, tileno, colour, TILE_FLIPXY(flipxy));
}
-WRITE32_MEMBER(pgm2_state::bg_videoram_w)
+void pgm2_state::bg_videoram_w(offs_t offset, u32 data, u32 mem_mask)
{
COMBINE_DATA(&m_bg_videoram[offset]);
m_bg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp
index e70e13fb26c..4bb58d0d7c4 100644
--- a/src/mame/video/phoenix.cpp
+++ b/src/mame/video/phoenix.cpp
@@ -211,7 +211,7 @@ VIDEO_START_MEMBER(phoenix_state,phoenix)
***************************************************************************/
-WRITE8_MEMBER(phoenix_state::phoenix_videoram_w)
+void phoenix_state::phoenix_videoram_w(offs_t offset, uint8_t data)
{
uint8_t *rom = memregion("maincpu")->base();
@@ -230,7 +230,7 @@ WRITE8_MEMBER(phoenix_state::phoenix_videoram_w)
}
-WRITE8_MEMBER(phoenix_state::phoenix_videoreg_w)
+void phoenix_state::phoenix_videoreg_w(uint8_t data)
{
if (m_videoram_pg_index != (data & 1))
{
@@ -253,7 +253,7 @@ WRITE8_MEMBER(phoenix_state::phoenix_videoreg_w)
}
}
-WRITE8_MEMBER(phoenix_state::pleiads_videoreg_w)
+void phoenix_state::pleiads_videoreg_w(uint8_t data)
{
if (m_videoram_pg_index != (data & 1))
{
@@ -288,7 +288,7 @@ WRITE8_MEMBER(phoenix_state::pleiads_videoreg_w)
}
-WRITE8_MEMBER(phoenix_state::phoenix_scroll_w)
+void phoenix_state::phoenix_scroll_w(uint8_t data)
{
m_bg_tilemap->set_scrollx(0,data);
}
@@ -350,7 +350,7 @@ READ_LINE_MEMBER(phoenix_state::pleiads_protection_r)
*/
#define REMAP_JS(js) ((ret & 0xf) | ( (js & 0xf) << 4))
-READ8_MEMBER(phoenix_state::survival_input_port_0_r)
+uint8_t phoenix_state::survival_input_port_0_r()
{
uint8_t ret;
diff --git a/src/mame/video/pingpong.cpp b/src/mame/video/pingpong.cpp
index f5661b8f86a..73ff2d3be5c 100644
--- a/src/mame/video/pingpong.cpp
+++ b/src/mame/video/pingpong.cpp
@@ -80,13 +80,13 @@ void pingpong_state::pingpong_palette(palette_device &palette) const
}
}
-WRITE8_MEMBER(pingpong_state::pingpong_videoram_w)
+void pingpong_state::pingpong_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pingpong_state::pingpong_colorram_w)
+void pingpong_state::pingpong_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/pirates.cpp b/src/mame/video/pirates.cpp
index 12c96d84f8b..82eb84825d8 100644
--- a/src/mame/video/pirates.cpp
+++ b/src/mame/video/pirates.cpp
@@ -49,19 +49,19 @@ void pirates_state::video_start()
-WRITE16_MEMBER(pirates_state::tx_tileram_w)
+void pirates_state::tx_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_tx_tileram+offset);
m_tx_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_MEMBER(pirates_state::fg_tileram_w)
+void pirates_state::fg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_fg_tileram+offset);
m_fg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_MEMBER(pirates_state::bg_tileram_w)
+void pirates_state::bg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(m_bg_tileram+offset);
m_bg_tilemap->mark_tile_dirty(offset/2);
diff --git a/src/mame/video/pitnrun.cpp b/src/mame/video/pitnrun.cpp
index f71bd515720..a9ff5caa885 100644
--- a/src/mame/video/pitnrun.cpp
+++ b/src/mame/video/pitnrun.cpp
@@ -41,13 +41,13 @@ TILE_GET_INFO_MEMBER(pitnrun_state::get_tile_info2)
0);
}
-WRITE8_MEMBER(pitnrun_state::videoram_w)
+void pitnrun_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg ->mark_all_dirty();
}
-WRITE8_MEMBER(pitnrun_state::videoram2_w)
+void pitnrun_state::videoram2_w(offs_t offset, uint8_t data)
{
m_videoram2[offset] = data;
m_bg ->mark_all_dirty();
@@ -60,28 +60,28 @@ WRITE_LINE_MEMBER(pitnrun_state::char_bank_select_w)
}
-WRITE8_MEMBER(pitnrun_state::scroll_w)
+void pitnrun_state::scroll_w(offs_t offset, uint8_t data)
{
m_scroll = (m_scroll & (0xff<<((offset)?0:8))) |( data<<((offset)?8:0));
m_bg->set_scrollx(0, m_scroll);
}
-WRITE8_MEMBER(pitnrun_state::scroll_y_w)
+void pitnrun_state::scroll_y_w(uint8_t data)
{
m_bg->set_scrolly(0, data);
}
-WRITE8_MEMBER(pitnrun_state::ha_w)
+void pitnrun_state::ha_w(uint8_t data)
{
m_ha=data;
}
-WRITE8_MEMBER(pitnrun_state::h_heed_w)
+void pitnrun_state::h_heed_w(uint8_t data)
{
m_h_heed=data;
}
-WRITE8_MEMBER(pitnrun_state::v_heed_w)
+void pitnrun_state::v_heed_w(uint8_t data)
{
m_v_heed=data;
}
diff --git a/src/mame/video/pk8000.cpp b/src/mame/video/pk8000.cpp
index 02e4cba5c31..e47b81066fe 100644
--- a/src/mame/video/pk8000.cpp
+++ b/src/mame/video/pk8000.cpp
@@ -3,62 +3,62 @@
#include "emu.h"
#include "includes/pk8000.h"
-READ8_MEMBER(pk8000_base_state::video_color_r)
+uint8_t pk8000_base_state::video_color_r()
{
return m_video_color;
}
-WRITE8_MEMBER(pk8000_base_state::video_color_w)
+void pk8000_base_state::video_color_w(uint8_t data)
{
m_video_color = data;
}
-READ8_MEMBER(pk8000_base_state::text_start_r)
+uint8_t pk8000_base_state::text_start_r()
{
return m_text_start;
}
-WRITE8_MEMBER(pk8000_base_state::text_start_w)
+void pk8000_base_state::text_start_w(uint8_t data)
{
m_text_start = data;
}
-READ8_MEMBER(pk8000_base_state::chargen_start_r)
+uint8_t pk8000_base_state::chargen_start_r()
{
return m_chargen_start;
}
-WRITE8_MEMBER(pk8000_base_state::chargen_start_w)
+void pk8000_base_state::chargen_start_w(uint8_t data)
{
m_chargen_start = data;
}
-READ8_MEMBER(pk8000_base_state::video_start_r)
+uint8_t pk8000_base_state::video_start_r()
{
return m_video_start;
}
-WRITE8_MEMBER(pk8000_base_state::video_start_w)
+void pk8000_base_state::video_start_w(uint8_t data)
{
m_video_start = data;
}
-READ8_MEMBER(pk8000_base_state::color_start_r)
+uint8_t pk8000_base_state::color_start_r()
{
return m_color_start;
}
-WRITE8_MEMBER(pk8000_base_state::color_start_w)
+void pk8000_base_state::color_start_w(uint8_t data)
{
m_color_start = data;
}
-READ8_MEMBER(pk8000_base_state::color_r)
+uint8_t pk8000_base_state::color_r(offs_t offset)
{
return m_color[offset];
}
-WRITE8_MEMBER(pk8000_base_state::color_w)
+void pk8000_base_state::color_w(offs_t offset, uint8_t data)
{
m_color[offset] = data;
}
diff --git a/src/mame/video/playch10.cpp b/src/mame/video/playch10.cpp
index f6bdefca2cd..306b38127db 100644
--- a/src/mame/video/playch10.cpp
+++ b/src/mame/video/playch10.cpp
@@ -7,12 +7,11 @@
#include "screen.h"
-WRITE8_MEMBER(playch10_state::playch10_videoram_w)
+void playch10_state::playch10_videoram_w(offs_t offset, uint8_t data)
{
- uint8_t *videoram = m_videoram;
if (m_pc10_sdcs)
{
- videoram[offset] = data;
+ m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
}
diff --git a/src/mame/video/playmark.cpp b/src/mame/video/playmark.cpp
index becc97f0b06..dd6eff32dd6 100644
--- a/src/mame/video/playmark.cpp
+++ b/src/mame/video/playmark.cpp
@@ -246,43 +246,43 @@ VIDEO_START_MEMBER(playmark_state,hrdtimes)
***************************************************************************/
-WRITE16_MEMBER(playmark_state::wbeachvl_txvideoram_w)
+void playmark_state::wbeachvl_txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram1[offset]);
m_tx_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_MEMBER(playmark_state::wbeachvl_fgvideoram_w)
+void playmark_state::wbeachvl_fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram2[offset]);
m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_MEMBER(playmark_state::wbeachvl_bgvideoram_w)
+void playmark_state::wbeachvl_bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram3[offset]);
m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_MEMBER(playmark_state::hrdtimes_txvideoram_w)
+void playmark_state::hrdtimes_txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram1[offset]);
m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(playmark_state::hrdtimes_fgvideoram_w)
+void playmark_state::hrdtimes_fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram2[offset]);
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(playmark_state::hrdtimes_bgvideoram_w)
+void playmark_state::hrdtimes_bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_videoram3[offset]);
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(playmark_state::bigtwin_scroll_w)
+void playmark_state::bigtwin_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_scroll[offset]);
@@ -300,7 +300,7 @@ WRITE16_MEMBER(playmark_state::bigtwin_scroll_w)
}
}
-WRITE16_MEMBER(playmark_state::wbeachvl_scroll_w)
+void playmark_state::wbeachvl_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_scroll[offset]);
@@ -317,7 +317,7 @@ WRITE16_MEMBER(playmark_state::wbeachvl_scroll_w)
}
}
-WRITE16_MEMBER(playmark_state::excelsr_scroll_w)
+void playmark_state::excelsr_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_scroll[offset]);
@@ -335,7 +335,7 @@ WRITE16_MEMBER(playmark_state::excelsr_scroll_w)
}
}
-WRITE16_MEMBER(playmark_state::hrdtimes_scroll_w)
+void playmark_state::hrdtimes_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
data = COMBINE_DATA(&m_scroll[offset]);
diff --git a/src/mame/video/plygonet.cpp b/src/mame/video/plygonet.cpp
index c52be827f65..2bb0ca7a6ae 100644
--- a/src/mame/video/plygonet.cpp
+++ b/src/mame/video/plygonet.cpp
@@ -37,14 +37,14 @@ TILE_GET_INFO_MEMBER(polygonet_state::roz_get_tile_info)
tileinfo.set(0, code, attr, 0);
}
-READ32_MEMBER(polygonet_state::polygonet_ttl_ram_r)
+uint32_t polygonet_state::polygonet_ttl_ram_r(offs_t offset)
{
uint32_t *vram = (uint32_t *)m_ttl_vram;
return vram[offset];
}
-WRITE32_MEMBER(polygonet_state::polygonet_ttl_ram_w)
+void polygonet_state::polygonet_ttl_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t *vram = (uint32_t *)m_ttl_vram;
@@ -54,14 +54,14 @@ WRITE32_MEMBER(polygonet_state::polygonet_ttl_ram_w)
m_ttl_tilemap->mark_tile_dirty(offset*2+1);
}
-READ32_MEMBER(polygonet_state::polygonet_roz_ram_r)
+uint32_t polygonet_state::polygonet_roz_ram_r(offs_t offset)
{
uint32_t *vram = (uint32_t *)m_roz_vram;
return vram[offset];
}
-WRITE32_MEMBER(polygonet_state::polygonet_roz_ram_w)
+void polygonet_state::polygonet_roz_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t *vram = (uint32_t *)m_roz_vram;
diff --git a/src/mame/video/pokechmp.cpp b/src/mame/video/pokechmp.cpp
index c3fb4df564d..25a1cfa72d4 100644
--- a/src/mame/video/pokechmp.cpp
+++ b/src/mame/video/pokechmp.cpp
@@ -6,14 +6,13 @@
#include "includes/pokechmp.h"
-WRITE8_MEMBER(pokechmp_state::pokechmp_videoram_w)
+void pokechmp_state::pokechmp_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);
}
-WRITE8_MEMBER(pokechmp_state::pokechmp_flipscreen_w)
+void pokechmp_state::pokechmp_flipscreen_w(uint8_t data)
{
if (flip_screen() != (data & 0x80))
{
diff --git a/src/mame/video/polepos.cpp b/src/mame/video/polepos.cpp
index d35dab4d235..eeaf594a590 100644
--- a/src/mame/video/polepos.cpp
+++ b/src/mame/video/polepos.cpp
@@ -205,12 +205,12 @@ void polepos_state::video_start()
***************************************************************************/
-READ8_MEMBER(polepos_state::sprite_r)
+uint8_t polepos_state::sprite_r(offs_t offset)
{
return m_sprite16_memory[offset] & 0xff;
}
-WRITE8_MEMBER(polepos_state::sprite_w)
+void polepos_state::sprite_w(offs_t offset, uint8_t data)
{
m_sprite16_memory[offset] = (m_sprite16_memory[offset] & 0xff00) | data;
}
@@ -222,17 +222,17 @@ WRITE8_MEMBER(polepos_state::sprite_w)
***************************************************************************/
-READ8_MEMBER(polepos_state::road_r)
+uint8_t polepos_state::road_r(offs_t offset)
{
return m_road16_memory[offset] & 0xff;
}
-WRITE8_MEMBER(polepos_state::road_w)
+void polepos_state::road_w(offs_t offset, uint8_t data)
{
m_road16_memory[offset] = (m_road16_memory[offset] & 0xff00) | data;
}
-WRITE16_MEMBER(polepos_state::road16_vscroll_w)
+void polepos_state::road16_vscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_road16_vscroll);
}
@@ -244,26 +244,26 @@ WRITE16_MEMBER(polepos_state::road16_vscroll_w)
***************************************************************************/
-WRITE16_MEMBER(polepos_state::view16_w)
+void polepos_state::view16_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_view16_memory[offset]);
if (offset < 0x400)
m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_MEMBER(polepos_state::view_r)
+uint8_t polepos_state::view_r(offs_t offset)
{
return m_view16_memory[offset] & 0xff;
}
-WRITE8_MEMBER(polepos_state::view_w)
+void polepos_state::view_w(offs_t offset, uint8_t data)
{
m_view16_memory[offset] = (m_view16_memory[offset] & 0xff00) | data;
if (offset < 0x400)
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(polepos_state::view16_hscroll_w)
+void polepos_state::view16_hscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_scroll);
m_bg_tilemap->set_scrollx(0,m_scroll);
@@ -282,18 +282,18 @@ WRITE_LINE_MEMBER(polepos_state::chacl_w)
***************************************************************************/
-WRITE16_MEMBER(polepos_state::alpha16_w)
+void polepos_state::alpha16_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_alpha16_memory[offset]);
m_tx_tilemap->mark_tile_dirty(offset);
}
-READ8_MEMBER(polepos_state::alpha_r)
+uint8_t polepos_state::alpha_r(offs_t offset)
{
return m_alpha16_memory[offset] & 0xff;
}
-WRITE8_MEMBER(polepos_state::alpha_w)
+void polepos_state::alpha_w(offs_t offset, uint8_t data)
{
m_alpha16_memory[offset] = (m_alpha16_memory[offset] & 0xff00) | data;
m_tx_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/policetr.cpp b/src/mame/video/policetr.cpp
index 061308015e8..4fd79e3f28f 100644
--- a/src/mame/video/policetr.cpp
+++ b/src/mame/video/policetr.cpp
@@ -136,7 +136,7 @@ void policetr_state::render_display_list(offs_t offset)
*
*************************************/
-WRITE32_MEMBER(policetr_state::video_w)
+void policetr_state::video_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
/* 4 offsets */
switch (offset)
@@ -249,7 +249,7 @@ WRITE32_MEMBER(policetr_state::video_w)
*
*************************************/
-READ32_MEMBER(policetr_state::video_r)
+uint32_t policetr_state::video_r()
{
int inputval;
int width = m_screen->width();
diff --git a/src/mame/video/polyplay.cpp b/src/mame/video/polyplay.cpp
index a8146e3f79d..4a69bde51bc 100644
--- a/src/mame/video/polyplay.cpp
+++ b/src/mame/video/polyplay.cpp
@@ -29,7 +29,7 @@ void polyplay_state::polyplay_palette(palette_device &palette) const
palette.set_pen_color(9, rgb_t(0xff, 0xff, 0xff));
}
-WRITE8_MEMBER(polyplay_state::polyplay_characterram_w)
+void polyplay_state::polyplay_characterram_w(offs_t offset, uint8_t data)
{
if (m_characterram[offset] != data)
{
diff --git a/src/mame/video/pooyan.cpp b/src/mame/video/pooyan.cpp
index eff2e3e7596..235640b0659 100644
--- a/src/mame/video/pooyan.cpp
+++ b/src/mame/video/pooyan.cpp
@@ -124,14 +124,14 @@ void pooyan_state::video_start()
*
*************************************/
-WRITE8_MEMBER(pooyan_state::videoram_w)
+void pooyan_state::videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(pooyan_state::colorram_w)
+void pooyan_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/popeye.cpp b/src/mame/video/popeye.cpp
index 56515ac25f6..45d09c0ab12 100644
--- a/src/mame/video/popeye.cpp
+++ b/src/mame/video/popeye.cpp
@@ -190,7 +190,7 @@ void tnx1_state::update_palette()
m_palette_bank_cache = m_palette_bank;
}
-WRITE8_MEMBER(tnx1_state::background_w)
+void tnx1_state::background_w(offs_t offset, uint8_t data)
{
// TODO: confirm the memory layout
bool lsn = (data & 0x80) == 0;
@@ -204,7 +204,7 @@ WRITE8_MEMBER(tnx1_state::background_w)
}
}
-WRITE8_MEMBER(tpp2_state::background_w)
+void tpp2_state::background_w(offs_t offset, uint8_t data)
{
// TODO: confirm the memory layout
bool lsn = (offset & 0x40) == 0;
@@ -219,13 +219,13 @@ WRITE8_MEMBER(tpp2_state::background_w)
}
}
-WRITE8_MEMBER(tnx1_state::popeye_videoram_w)
+void tnx1_state::popeye_videoram_w(offs_t offset, uint8_t data)
{
m_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(tnx1_state::popeye_colorram_w)
+void tnx1_state::popeye_colorram_w(offs_t offset, uint8_t data)
{
m_colorram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/portrait.cpp b/src/mame/video/portrait.cpp
index 17731d8a07e..907fc540fbe 100644
--- a/src/mame/video/portrait.cpp
+++ b/src/mame/video/portrait.cpp
@@ -11,13 +11,13 @@
#include "includes/portrait.h"
-WRITE8_MEMBER(portrait_state::bgvideo_write)
+void portrait_state::bgvideo_write(offs_t offset, uint8_t data)
{
m_background->mark_tile_dirty(offset/2);
m_bgvideoram[offset] = data;
}
-WRITE8_MEMBER(portrait_state::fgvideo_write)
+void portrait_state::fgvideo_write(offs_t offset, uint8_t data)
{
m_foreground->mark_tile_dirty(offset/2);
m_fgvideoram[offset] = data;
diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp
index bd10a122f15..1584ac823a4 100644
--- a/src/mame/video/powervr2.cpp
+++ b/src/mame/video/powervr2.cpp
@@ -940,22 +940,22 @@ void powervr2_device::tex_get_info(texinfo *t)
}
-READ32_MEMBER( powervr2_device::id_r )
+uint32_t powervr2_device::id_r()
{
return 0x17fd11db;
}
-READ32_MEMBER( powervr2_device::revision_r )
+uint32_t powervr2_device::revision_r()
{
return 0x00000011;
}
-READ32_MEMBER( powervr2_device::softreset_r )
+uint32_t powervr2_device::softreset_r()
{
return softreset;
}
-WRITE32_MEMBER( powervr2_device::softreset_w )
+void powervr2_device::softreset_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&softreset);
if (softreset & 1) {
@@ -983,7 +983,7 @@ WRITE32_MEMBER( powervr2_device::softreset_w )
}
}
-WRITE32_MEMBER( powervr2_device::startrender_w )
+void powervr2_device::startrender_w(address_space &space, uint32_t data)
{
dc_state *state = machine().driver_data<dc_state>();
g_profiler.start(PROFILER_USER1);
@@ -1063,173 +1063,173 @@ WRITE32_MEMBER( powervr2_device::startrender_w )
}
-READ32_MEMBER( powervr2_device::param_base_r )
+uint32_t powervr2_device::param_base_r()
{
return param_base;
}
-WRITE32_MEMBER( powervr2_device::param_base_w )
+void powervr2_device::param_base_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&param_base);
}
-READ32_MEMBER( powervr2_device::region_base_r )
+uint32_t powervr2_device::region_base_r()
{
return region_base;
}
-WRITE32_MEMBER( powervr2_device::region_base_w )
+void powervr2_device::region_base_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&region_base);
}
-READ32_MEMBER( powervr2_device::vo_border_col_r )
+uint32_t powervr2_device::vo_border_col_r()
{
return vo_border_col;
}
-WRITE32_MEMBER( powervr2_device::vo_border_col_w )
+void powervr2_device::vo_border_col_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&vo_border_col);
}
-READ32_MEMBER( powervr2_device::fb_r_ctrl_r )
+uint32_t powervr2_device::fb_r_ctrl_r()
{
return fb_r_ctrl;
}
-WRITE32_MEMBER( powervr2_device::fb_r_ctrl_w )
+void powervr2_device::fb_r_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_r_ctrl);
}
-READ32_MEMBER( powervr2_device::fb_w_ctrl_r )
+uint32_t powervr2_device::fb_w_ctrl_r()
{
return fb_w_ctrl;
}
-WRITE32_MEMBER( powervr2_device::fb_w_ctrl_w )
+void powervr2_device::fb_w_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_w_ctrl);
}
-READ32_MEMBER( powervr2_device::fb_w_linestride_r )
+uint32_t powervr2_device::fb_w_linestride_r()
{
return fb_w_linestride;
}
-WRITE32_MEMBER( powervr2_device::fb_w_linestride_w )
+void powervr2_device::fb_w_linestride_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_w_linestride);
}
-READ32_MEMBER( powervr2_device::fb_r_sof1_r )
+uint32_t powervr2_device::fb_r_sof1_r()
{
return fb_r_sof1;
}
-WRITE32_MEMBER( powervr2_device::fb_r_sof1_w )
+void powervr2_device::fb_r_sof1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_r_sof1);
}
-READ32_MEMBER( powervr2_device::fb_r_sof2_r )
+uint32_t powervr2_device::fb_r_sof2_r()
{
return fb_r_sof2;
}
-WRITE32_MEMBER( powervr2_device::fb_r_sof2_w )
+void powervr2_device::fb_r_sof2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_r_sof2);
}
-READ32_MEMBER( powervr2_device::fb_r_size_r )
+uint32_t powervr2_device::fb_r_size_r()
{
return fb_r_size;
}
-WRITE32_MEMBER( powervr2_device::fb_r_size_w )
+void powervr2_device::fb_r_size_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_r_size);
}
-READ32_MEMBER( powervr2_device::fb_w_sof1_r )
+uint32_t powervr2_device::fb_w_sof1_r()
{
return fb_w_sof1;
}
-WRITE32_MEMBER( powervr2_device::fb_w_sof1_w )
+void powervr2_device::fb_w_sof1_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_w_sof1);
}
-READ32_MEMBER( powervr2_device::fb_w_sof2_r )
+uint32_t powervr2_device::fb_w_sof2_r()
{
return fb_w_sof2;
}
-WRITE32_MEMBER( powervr2_device::fb_w_sof2_w )
+void powervr2_device::fb_w_sof2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_w_sof2);
}
-READ32_MEMBER( powervr2_device::fb_x_clip_r )
+uint32_t powervr2_device::fb_x_clip_r()
{
return fb_x_clip;
}
-WRITE32_MEMBER( powervr2_device::fb_x_clip_w )
+void powervr2_device::fb_x_clip_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_x_clip);
}
-READ32_MEMBER( powervr2_device::fb_y_clip_r )
+uint32_t powervr2_device::fb_y_clip_r()
{
return fb_y_clip;
}
-WRITE32_MEMBER( powervr2_device::fb_y_clip_w )
+void powervr2_device::fb_y_clip_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fb_y_clip);
}
-READ32_MEMBER( powervr2_device::fpu_param_cfg_r )
+uint32_t powervr2_device::fpu_param_cfg_r()
{
return fpu_param_cfg;
}
-WRITE32_MEMBER( powervr2_device::fpu_param_cfg_w )
+void powervr2_device::fpu_param_cfg_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&fpu_param_cfg);
}
-READ32_MEMBER( powervr2_device::isp_backgnd_t_r )
+uint32_t powervr2_device::isp_backgnd_t_r()
{
return isp_backgnd_t;
}
-WRITE32_MEMBER( powervr2_device::isp_backgnd_t_w )
+void powervr2_device::isp_backgnd_t_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&isp_backgnd_t);
}
-READ32_MEMBER( powervr2_device::spg_hblank_int_r )
+uint32_t powervr2_device::spg_hblank_int_r()
{
return spg_hblank_int;
}
-WRITE32_MEMBER( powervr2_device::spg_hblank_int_w )
+void powervr2_device::spg_hblank_int_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_hblank_int);
/* TODO: timer adjust */
}
-READ32_MEMBER( powervr2_device::spg_vblank_int_r )
+uint32_t powervr2_device::spg_vblank_int_r()
{
return spg_vblank_int;
}
-WRITE32_MEMBER( powervr2_device::spg_vblank_int_w )
+void powervr2_device::spg_vblank_int_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_vblank_int);
@@ -1241,12 +1241,12 @@ WRITE32_MEMBER( powervr2_device::spg_vblank_int_w )
// vbout_timer->adjust(screen().time_until_pos((spg_vblank_int >> 16) & 0x3ff));
}
-READ32_MEMBER( powervr2_device::spg_control_r )
+uint32_t powervr2_device::spg_control_r()
{
return spg_control;
}
-WRITE32_MEMBER( powervr2_device::spg_control_w )
+void powervr2_device::spg_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_control);
update_screen_format();
@@ -1258,103 +1258,103 @@ WRITE32_MEMBER( powervr2_device::spg_control_w )
popmessage("SPG enabled VGA mode with interlace, contact MAME/MESSdev");
}
-READ32_MEMBER( powervr2_device::spg_hblank_r )
+uint32_t powervr2_device::spg_hblank_r()
{
return spg_hblank;
}
-WRITE32_MEMBER( powervr2_device::spg_hblank_w )
+void powervr2_device::spg_hblank_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_hblank);
update_screen_format();
}
-READ32_MEMBER( powervr2_device::spg_load_r )
+uint32_t powervr2_device::spg_load_r()
{
return spg_load;
}
-WRITE32_MEMBER( powervr2_device::spg_load_w )
+void powervr2_device::spg_load_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_load);
update_screen_format();
}
-READ32_MEMBER( powervr2_device::spg_vblank_r )
+uint32_t powervr2_device::spg_vblank_r()
{
return spg_vblank;
}
-WRITE32_MEMBER( powervr2_device::spg_vblank_w )
+void powervr2_device::spg_vblank_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_vblank);
update_screen_format();
}
-READ32_MEMBER( powervr2_device::spg_width_r )
+uint32_t powervr2_device::spg_width_r()
{
return spg_width;
}
-WRITE32_MEMBER( powervr2_device::spg_width_w )
+void powervr2_device::spg_width_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&spg_width);
update_screen_format();
}
-READ32_MEMBER( powervr2_device::text_control_r )
+uint32_t powervr2_device::text_control_r()
{
return text_control;
}
-WRITE32_MEMBER( powervr2_device::text_control_w )
+void powervr2_device::text_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&text_control);
}
-READ32_MEMBER( powervr2_device::vo_control_r )
+uint32_t powervr2_device::vo_control_r()
{
return vo_control;
}
-WRITE32_MEMBER( powervr2_device::vo_control_w )
+void powervr2_device::vo_control_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&vo_control);
}
-READ32_MEMBER( powervr2_device::vo_startx_r )
+uint32_t powervr2_device::vo_startx_r()
{
return vo_startx;
}
-WRITE32_MEMBER( powervr2_device::vo_startx_w )
+void powervr2_device::vo_startx_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&vo_startx);
update_screen_format();
}
-READ32_MEMBER( powervr2_device::vo_starty_r )
+uint32_t powervr2_device::vo_starty_r()
{
return vo_starty;
}
-WRITE32_MEMBER( powervr2_device::vo_starty_w )
+void powervr2_device::vo_starty_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&vo_starty);
update_screen_format();
}
-READ32_MEMBER( powervr2_device::pal_ram_ctrl_r )
+uint32_t powervr2_device::pal_ram_ctrl_r()
{
return pal_ram_ctrl;
}
-WRITE32_MEMBER( powervr2_device::pal_ram_ctrl_w )
+void powervr2_device::pal_ram_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&pal_ram_ctrl);
}
-READ32_MEMBER( powervr2_device::spg_status_r )
+uint32_t powervr2_device::spg_status_r()
{
uint32_t fieldnum = (screen().frame_number() & 1) ? 1 : 0;
int32_t spg_hbstart = spg_hblank & 0x3ff;
@@ -1375,72 +1375,72 @@ READ32_MEMBER( powervr2_device::spg_status_r )
}
-READ32_MEMBER( powervr2_device::ta_ol_base_r )
+uint32_t powervr2_device::ta_ol_base_r()
{
return ta_ol_base;
}
-WRITE32_MEMBER( powervr2_device::ta_ol_base_w )
+void powervr2_device::ta_ol_base_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_ol_base);
}
-READ32_MEMBER( powervr2_device::ta_isp_base_r )
+uint32_t powervr2_device::ta_isp_base_r()
{
return ta_isp_base;
}
-WRITE32_MEMBER( powervr2_device::ta_isp_base_w )
+void powervr2_device::ta_isp_base_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_isp_base);
}
-READ32_MEMBER( powervr2_device::ta_ol_limit_r )
+uint32_t powervr2_device::ta_ol_limit_r()
{
return ta_ol_limit;
}
-WRITE32_MEMBER( powervr2_device::ta_ol_limit_w )
+void powervr2_device::ta_ol_limit_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_ol_limit);
}
-READ32_MEMBER( powervr2_device::ta_isp_limit_r )
+uint32_t powervr2_device::ta_isp_limit_r()
{
return ta_isp_limit;
}
-WRITE32_MEMBER( powervr2_device::ta_isp_limit_w )
+void powervr2_device::ta_isp_limit_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_isp_limit);
}
-READ32_MEMBER( powervr2_device::ta_next_opb_r )
+uint32_t powervr2_device::ta_next_opb_r()
{
return ta_next_opb;
}
-READ32_MEMBER( powervr2_device::ta_itp_current_r )
+uint32_t powervr2_device::ta_itp_current_r()
{
return ta_itp_current;
}
-READ32_MEMBER( powervr2_device::ta_alloc_ctrl_r )
+uint32_t powervr2_device::ta_alloc_ctrl_r()
{
return ta_alloc_ctrl;
}
-WRITE32_MEMBER( powervr2_device::ta_alloc_ctrl_w )
+void powervr2_device::ta_alloc_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_alloc_ctrl);
}
-READ32_MEMBER( powervr2_device::ta_list_init_r )
+uint32_t powervr2_device::ta_list_init_r()
{
return 0; //bit 31 always return 0, a probable left-over in Crazy Taxi reads this and discards the read (?)
}
-WRITE32_MEMBER( powervr2_device::ta_list_init_w )
+void powervr2_device::ta_list_init_w(uint32_t data)
{
if(data & 0x80000000) {
tafifo_pos=0;
@@ -1501,12 +1501,12 @@ WRITE32_MEMBER( powervr2_device::ta_list_init_w )
}
-READ32_MEMBER( powervr2_device::ta_yuv_tex_base_r )
+uint32_t powervr2_device::ta_yuv_tex_base_r()
{
return ta_yuv_tex_base;
}
-WRITE32_MEMBER( powervr2_device::ta_yuv_tex_base_w )
+void powervr2_device::ta_yuv_tex_base_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_yuv_tex_base);
logerror("%s: ta_yuv_tex_base = %08x\n", tag(), ta_yuv_tex_base);
@@ -1517,12 +1517,12 @@ WRITE32_MEMBER( powervr2_device::ta_yuv_tex_base_w )
}
-READ32_MEMBER( powervr2_device::ta_yuv_tex_ctrl_r )
+uint32_t powervr2_device::ta_yuv_tex_ctrl_r()
{
return ta_yuv_tex_ctrl;
}
-WRITE32_MEMBER( powervr2_device::ta_yuv_tex_ctrl_w )
+void powervr2_device::ta_yuv_tex_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_yuv_tex_ctrl);
ta_yuv_x_size = ((ta_yuv_tex_ctrl & 0x3f)+1)*16;
@@ -1534,19 +1534,19 @@ WRITE32_MEMBER( powervr2_device::ta_yuv_tex_ctrl_w )
#include "debugger.h"
/* TODO */
-READ32_MEMBER( powervr2_device::ta_yuv_tex_cnt_r )
+uint32_t powervr2_device::ta_yuv_tex_cnt_r()
{
machine().debug_break();
return ta_yuv_tex_cnt;
}
-WRITE32_MEMBER( powervr2_device::ta_yuv_tex_cnt_w )
+void powervr2_device::ta_yuv_tex_cnt_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
machine().debug_break();
COMBINE_DATA(&ta_yuv_tex_cnt);
}
-WRITE32_MEMBER( powervr2_device::ta_list_cont_w )
+void powervr2_device::ta_list_cont_w(uint32_t data)
{
if(data & 0x80000000) {
tafifo_listtype= DISPLAY_LIST_NONE; // no list being received
@@ -1554,33 +1554,33 @@ WRITE32_MEMBER( powervr2_device::ta_list_cont_w )
}
}
-READ32_MEMBER( powervr2_device::ta_next_opb_init_r )
+uint32_t powervr2_device::ta_next_opb_init_r()
{
return ta_next_opb_init;
}
-WRITE32_MEMBER( powervr2_device::ta_next_opb_init_w )
+void powervr2_device::ta_next_opb_init_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&ta_next_opb_init);
}
-READ32_MEMBER( powervr2_device::fog_table_r )
+uint32_t powervr2_device::fog_table_r(offs_t offset)
{
return fog_table[offset];
}
-WRITE32_MEMBER( powervr2_device::fog_table_w )
+void powervr2_device::fog_table_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(fog_table+offset);
}
-READ32_MEMBER( powervr2_device::palette_r )
+uint32_t powervr2_device::palette_r(offs_t offset)
{
return palette[offset];
}
-WRITE32_MEMBER( powervr2_device::palette_w )
+void powervr2_device::palette_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(palette+offset);
}
@@ -1622,78 +1622,78 @@ void powervr2_device::update_screen_format()
}
-READ32_MEMBER( powervr2_device::sb_pdstap_r )
+uint32_t powervr2_device::sb_pdstap_r()
{
return sb_pdstap;
}
-WRITE32_MEMBER( powervr2_device::sb_pdstap_w )
+void powervr2_device::sb_pdstap_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pdstap);
m_pvr_dma.pvr_addr = sb_pdstap;
}
-READ32_MEMBER( powervr2_device::sb_pdstar_r )
+uint32_t powervr2_device::sb_pdstar_r()
{
return sb_pdstar;
}
-WRITE32_MEMBER( powervr2_device::sb_pdstar_w )
+void powervr2_device::sb_pdstar_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pdstar);
m_pvr_dma.sys_addr = sb_pdstar;
}
-READ32_MEMBER( powervr2_device::sb_pdlen_r )
+uint32_t powervr2_device::sb_pdlen_r()
{
return sb_pdlen;
}
-WRITE32_MEMBER( powervr2_device::sb_pdlen_w )
+void powervr2_device::sb_pdlen_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pdlen);
m_pvr_dma.size = sb_pdlen;
}
-READ32_MEMBER( powervr2_device::sb_pddir_r )
+uint32_t powervr2_device::sb_pddir_r()
{
return sb_pddir;
}
-WRITE32_MEMBER( powervr2_device::sb_pddir_w )
+void powervr2_device::sb_pddir_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pddir);
m_pvr_dma.dir = sb_pddir;
}
-READ32_MEMBER( powervr2_device::sb_pdtsel_r )
+uint32_t powervr2_device::sb_pdtsel_r()
{
return sb_pdtsel;
}
-WRITE32_MEMBER( powervr2_device::sb_pdtsel_w )
+void powervr2_device::sb_pdtsel_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pdtsel);
m_pvr_dma.sel = sb_pdtsel & 1;
}
-READ32_MEMBER( powervr2_device::sb_pden_r )
+uint32_t powervr2_device::sb_pden_r()
{
return sb_pden;
}
-WRITE32_MEMBER( powervr2_device::sb_pden_w )
+void powervr2_device::sb_pden_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pden);
m_pvr_dma.flag = sb_pden & 1;
}
-READ32_MEMBER( powervr2_device::sb_pdst_r )
+uint32_t powervr2_device::sb_pdst_r()
{
return sb_pdst;
}
-WRITE32_MEMBER( powervr2_device::sb_pdst_w )
+void powervr2_device::sb_pdst_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pdst);
@@ -1704,12 +1704,12 @@ WRITE32_MEMBER( powervr2_device::sb_pdst_w )
pvr_dma_execute(space);
}
-READ32_MEMBER( powervr2_device::sb_pdapro_r )
+uint32_t powervr2_device::sb_pdapro_r()
{
return sb_pdapro;
}
-WRITE32_MEMBER( powervr2_device::sb_pdapro_w )
+void powervr2_device::sb_pdapro_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&sb_pdapro);
}
@@ -2152,7 +2152,7 @@ void powervr2_device::process_ta_fifo()
}
}
-WRITE64_MEMBER( powervr2_device::ta_fifo_poly_w )
+void powervr2_device::ta_fifo_poly_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
if (mem_mask == 0xffffffffffffffffU) // 64 bit
{
@@ -2183,7 +2183,7 @@ TIMER_CALLBACK_MEMBER(powervr2_device::yuv_convert_end)
}
-WRITE8_MEMBER( powervr2_device::ta_fifo_yuv_w )
+void powervr2_device::ta_fifo_yuv_w(uint8_t data)
{
dc_state *state = machine().driver_data<dc_state>();
//printf("%08x %08x\n",ta_yuv_index++,ta_yuv_tex_ctrl);
@@ -2235,7 +2235,7 @@ WRITE8_MEMBER( powervr2_device::ta_fifo_yuv_w )
}
// SB_LMMODE0
-WRITE64_MEMBER(powervr2_device::ta_texture_directpath0_w )
+void powervr2_device::ta_texture_directpath0_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
// That's not in the pvr control address space, it's in g2's
// int mode = pvrctrl_regs[SB_LMMODE0]&1;
@@ -2252,7 +2252,7 @@ WRITE64_MEMBER(powervr2_device::ta_texture_directpath0_w )
}
// SB_LMMODE1
-WRITE64_MEMBER(powervr2_device::ta_texture_directpath1_w )
+void powervr2_device::ta_texture_directpath1_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
// That's not in the pvr control address space, it's in g2's
// int mode = pvrctrl_regs[SB_LMMODE1]&1;
@@ -3874,14 +3874,14 @@ uint32_t powervr2_device::screen_update(screen_device &screen, bitmap_rgb32 &bit
/* Naomi 2 attempts (TBD) */
-READ32_MEMBER( powervr2_device::pvr2_ta_r )
+uint32_t powervr2_device::pvr2_ta_r(offs_t offset)
{
printf("PVR2 %08x R\n", offset);
return 0;
}
-WRITE32_MEMBER( powervr2_device::pvr2_ta_w )
+void powervr2_device::pvr2_ta_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
// int reg;
// uint64_t shift;
@@ -3894,7 +3894,7 @@ WRITE32_MEMBER( powervr2_device::pvr2_ta_w )
}
// TODO: move to specific device
-READ32_MEMBER( powervr2_device::elan_regs_r )
+uint32_t powervr2_device::elan_regs_r(offs_t offset)
{
switch(offset)
{
@@ -3925,7 +3925,7 @@ READ32_MEMBER( powervr2_device::elan_regs_r )
return 0;
}
-WRITE32_MEMBER( powervr2_device::elan_regs_w )
+void powervr2_device::elan_regs_w(offs_t offset, uint32_t data)
{
switch(offset)
{
@@ -3936,10 +3936,10 @@ WRITE32_MEMBER( powervr2_device::elan_regs_w )
}
-WRITE32_MEMBER( powervr2_device::pvrs_ta_w )
+void powervr2_device::pvrs_ta_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
- // pvr_ta_w(space,offset,data,mem_mask);
- // pvr2_ta_w(space,offset,data,mem_mask);
+ // pvr_ta_w(offset,data,mem_mask);
+ // pvr2_ta_w(offset,data,mem_mask);
//printf("PVR2 %08x %08x\n",reg,dat);
}
diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h
index f6b54778004..7abb6ed05fe 100644
--- a/src/mame/video/powervr2.h
+++ b/src/mame/video/powervr2.h
@@ -197,123 +197,123 @@ public:
powervr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
auto irq_callback() { return irq_cb.bind(); }
- DECLARE_READ32_MEMBER( id_r );
- DECLARE_READ32_MEMBER( revision_r );
- DECLARE_READ32_MEMBER( softreset_r );
- DECLARE_WRITE32_MEMBER( softreset_w );
- DECLARE_WRITE32_MEMBER( startrender_w );
- DECLARE_READ32_MEMBER( param_base_r );
- DECLARE_WRITE32_MEMBER( param_base_w );
- DECLARE_READ32_MEMBER( region_base_r );
- DECLARE_WRITE32_MEMBER( region_base_w );
- DECLARE_READ32_MEMBER( vo_border_col_r );
- DECLARE_WRITE32_MEMBER( vo_border_col_w );
- DECLARE_READ32_MEMBER( fb_r_ctrl_r );
- DECLARE_WRITE32_MEMBER( fb_r_ctrl_w );
- DECLARE_READ32_MEMBER( fb_w_ctrl_r );
- DECLARE_WRITE32_MEMBER( fb_w_ctrl_w );
- DECLARE_READ32_MEMBER( fb_w_linestride_r );
- DECLARE_WRITE32_MEMBER( fb_w_linestride_w );
- DECLARE_READ32_MEMBER( fb_r_sof1_r );
- DECLARE_WRITE32_MEMBER( fb_r_sof1_w );
- DECLARE_READ32_MEMBER( fb_r_sof2_r );
- DECLARE_WRITE32_MEMBER( fb_r_sof2_w );
- DECLARE_READ32_MEMBER( fb_r_size_r );
- DECLARE_WRITE32_MEMBER( fb_r_size_w );
- DECLARE_READ32_MEMBER( fb_w_sof1_r );
- DECLARE_WRITE32_MEMBER( fb_w_sof1_w );
- DECLARE_READ32_MEMBER( fb_w_sof2_r );
- DECLARE_WRITE32_MEMBER( fb_w_sof2_w );
- DECLARE_READ32_MEMBER( fb_x_clip_r );
- DECLARE_WRITE32_MEMBER( fb_x_clip_w );
- DECLARE_READ32_MEMBER( fb_y_clip_r );
- DECLARE_WRITE32_MEMBER( fb_y_clip_w );
- DECLARE_READ32_MEMBER( fpu_param_cfg_r );
- DECLARE_WRITE32_MEMBER( fpu_param_cfg_w );
- DECLARE_READ32_MEMBER( isp_backgnd_t_r );
- DECLARE_WRITE32_MEMBER( isp_backgnd_t_w );
- DECLARE_READ32_MEMBER( spg_hblank_int_r );
- DECLARE_WRITE32_MEMBER( spg_hblank_int_w );
- DECLARE_READ32_MEMBER( spg_vblank_int_r );
- DECLARE_WRITE32_MEMBER( spg_vblank_int_w );
- DECLARE_READ32_MEMBER( spg_control_r );
- DECLARE_WRITE32_MEMBER( spg_control_w );
- DECLARE_READ32_MEMBER( spg_hblank_r );
- DECLARE_WRITE32_MEMBER( spg_hblank_w );
- DECLARE_READ32_MEMBER( spg_load_r );
- DECLARE_WRITE32_MEMBER( spg_load_w );
- DECLARE_READ32_MEMBER( spg_vblank_r );
- DECLARE_WRITE32_MEMBER( spg_vblank_w );
- DECLARE_READ32_MEMBER( spg_width_r );
- DECLARE_WRITE32_MEMBER( spg_width_w );
- DECLARE_READ32_MEMBER( text_control_r );
- DECLARE_WRITE32_MEMBER( text_control_w );
- DECLARE_READ32_MEMBER( vo_control_r );
- DECLARE_WRITE32_MEMBER( vo_control_w );
- DECLARE_READ32_MEMBER( vo_startx_r );
- DECLARE_WRITE32_MEMBER( vo_startx_w );
- DECLARE_READ32_MEMBER( vo_starty_r );
- DECLARE_WRITE32_MEMBER( vo_starty_w );
- DECLARE_READ32_MEMBER( pal_ram_ctrl_r );
- DECLARE_WRITE32_MEMBER( pal_ram_ctrl_w );
- DECLARE_READ32_MEMBER( spg_status_r );
-
- DECLARE_READ32_MEMBER( ta_ol_base_r );
- DECLARE_WRITE32_MEMBER( ta_ol_base_w );
- DECLARE_READ32_MEMBER( ta_isp_base_r );
- DECLARE_WRITE32_MEMBER( ta_isp_base_w );
- DECLARE_READ32_MEMBER( ta_ol_limit_r );
- DECLARE_WRITE32_MEMBER( ta_ol_limit_w );
- DECLARE_READ32_MEMBER( ta_isp_limit_r );
- DECLARE_WRITE32_MEMBER( ta_isp_limit_w );
- DECLARE_READ32_MEMBER( ta_next_opb_r );
- DECLARE_READ32_MEMBER( ta_itp_current_r );
- DECLARE_READ32_MEMBER( ta_alloc_ctrl_r );
- DECLARE_WRITE32_MEMBER( ta_alloc_ctrl_w );
- DECLARE_READ32_MEMBER( ta_list_init_r );
- DECLARE_WRITE32_MEMBER( ta_list_init_w );
- DECLARE_READ32_MEMBER( ta_yuv_tex_base_r );
- DECLARE_WRITE32_MEMBER( ta_yuv_tex_base_w );
- DECLARE_READ32_MEMBER( ta_yuv_tex_ctrl_r );
- DECLARE_WRITE32_MEMBER( ta_yuv_tex_ctrl_w );
- DECLARE_READ32_MEMBER( ta_yuv_tex_cnt_r );
- DECLARE_WRITE32_MEMBER( ta_yuv_tex_cnt_w );
- DECLARE_WRITE32_MEMBER( ta_list_cont_w );
- DECLARE_READ32_MEMBER( ta_next_opb_init_r );
- DECLARE_WRITE32_MEMBER( ta_next_opb_init_w );
-
-
- DECLARE_READ32_MEMBER( fog_table_r );
- DECLARE_WRITE32_MEMBER( fog_table_w );
- DECLARE_READ32_MEMBER( palette_r );
- DECLARE_WRITE32_MEMBER( palette_w );
-
- DECLARE_READ32_MEMBER( sb_pdstap_r );
- DECLARE_WRITE32_MEMBER( sb_pdstap_w );
- DECLARE_READ32_MEMBER( sb_pdstar_r );
- DECLARE_WRITE32_MEMBER( sb_pdstar_w );
- DECLARE_READ32_MEMBER( sb_pdlen_r );
- DECLARE_WRITE32_MEMBER( sb_pdlen_w );
- DECLARE_READ32_MEMBER( sb_pddir_r );
- DECLARE_WRITE32_MEMBER( sb_pddir_w );
- DECLARE_READ32_MEMBER( sb_pdtsel_r );
- DECLARE_WRITE32_MEMBER( sb_pdtsel_w );
- DECLARE_READ32_MEMBER( sb_pden_r );
- DECLARE_WRITE32_MEMBER( sb_pden_w );
- DECLARE_READ32_MEMBER( sb_pdst_r );
- DECLARE_WRITE32_MEMBER( sb_pdst_w );
- DECLARE_READ32_MEMBER( sb_pdapro_r );
- DECLARE_WRITE32_MEMBER( sb_pdapro_w );
-
- DECLARE_READ32_MEMBER( pvr2_ta_r );
- DECLARE_WRITE32_MEMBER( pvr2_ta_w );
- DECLARE_WRITE32_MEMBER( pvrs_ta_w );
- DECLARE_READ32_MEMBER( elan_regs_r );
- DECLARE_WRITE32_MEMBER( elan_regs_w );
- DECLARE_WRITE64_MEMBER( ta_fifo_poly_w );
- DECLARE_WRITE8_MEMBER( ta_fifo_yuv_w );
- DECLARE_WRITE64_MEMBER( ta_texture_directpath0_w );
- DECLARE_WRITE64_MEMBER( ta_texture_directpath1_w );
+ uint32_t id_r();
+ uint32_t revision_r();
+ uint32_t softreset_r();
+ void softreset_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void startrender_w(address_space &space, uint32_t data);
+ uint32_t param_base_r();
+ void param_base_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t region_base_r();
+ void region_base_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t vo_border_col_r();
+ void vo_border_col_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_r_ctrl_r();
+ void fb_r_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_w_ctrl_r();
+ void fb_w_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_w_linestride_r();
+ void fb_w_linestride_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_r_sof1_r();
+ void fb_r_sof1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_r_sof2_r();
+ void fb_r_sof2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_r_size_r();
+ void fb_r_size_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_w_sof1_r();
+ void fb_w_sof1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_w_sof2_r();
+ void fb_w_sof2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_x_clip_r();
+ void fb_x_clip_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fb_y_clip_r();
+ void fb_y_clip_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t fpu_param_cfg_r();
+ void fpu_param_cfg_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t isp_backgnd_t_r();
+ void isp_backgnd_t_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_hblank_int_r();
+ void spg_hblank_int_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_vblank_int_r();
+ void spg_vblank_int_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_control_r();
+ void spg_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_hblank_r();
+ void spg_hblank_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_load_r();
+ void spg_load_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_vblank_r();
+ void spg_vblank_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_width_r();
+ void spg_width_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t text_control_r();
+ void text_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t vo_control_r();
+ void vo_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t vo_startx_r();
+ void vo_startx_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t vo_starty_r();
+ void vo_starty_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t pal_ram_ctrl_r();
+ void pal_ram_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t spg_status_r();
+
+ uint32_t ta_ol_base_r();
+ void ta_ol_base_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_isp_base_r();
+ void ta_isp_base_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_ol_limit_r();
+ void ta_ol_limit_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_isp_limit_r();
+ void ta_isp_limit_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_next_opb_r();
+ uint32_t ta_itp_current_r();
+ uint32_t ta_alloc_ctrl_r();
+ void ta_alloc_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_list_init_r();
+ void ta_list_init_w(uint32_t data);
+ uint32_t ta_yuv_tex_base_r();
+ void ta_yuv_tex_base_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_yuv_tex_ctrl_r();
+ void ta_yuv_tex_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t ta_yuv_tex_cnt_r();
+ void ta_yuv_tex_cnt_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void ta_list_cont_w(uint32_t data);
+ uint32_t ta_next_opb_init_r();
+ void ta_next_opb_init_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+
+ uint32_t fog_table_r(offs_t offset);
+ void fog_table_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t palette_r(offs_t offset);
+ void palette_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+ uint32_t sb_pdstap_r();
+ void sb_pdstap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pdstar_r();
+ void sb_pdstar_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pdlen_r();
+ void sb_pdlen_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pddir_r();
+ void sb_pddir_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pdtsel_r();
+ void sb_pdtsel_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pden_r();
+ void sb_pden_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pdst_r();
+ void sb_pdst_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t sb_pdapro_r();
+ void sb_pdapro_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+ uint32_t pvr2_ta_r(offs_t offset);
+ void pvr2_ta_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void pvrs_ta_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t elan_regs_r(offs_t offset);
+ void elan_regs_w(offs_t offset, uint32_t data);
+ void ta_fifo_poly_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void ta_fifo_yuv_w(uint8_t data);
+ void ta_texture_directpath0_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void ta_texture_directpath1_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
TIMER_CALLBACK_MEMBER(vbin);
TIMER_CALLBACK_MEMBER(vbout);
diff --git a/src/mame/video/prehisle.cpp b/src/mame/video/prehisle.cpp
index 0ec2276b67a..b9c23d22920 100644
--- a/src/mame/video/prehisle.cpp
+++ b/src/mame/video/prehisle.cpp
@@ -14,13 +14,13 @@
#include "screen.h"
-WRITE16_MEMBER(prehisle_state::fg_vram_w)
+void prehisle_state::fg_vram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_fg_vram[offset]);
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(prehisle_state::tx_vram_w)
+void prehisle_state::tx_vram_w(offs_t offset, u16 data, u16 mem_mask)
{
COMBINE_DATA(&m_tx_vram[offset]);
m_tx_tilemap->mark_tile_dirty(offset);
diff --git a/src/mame/video/psychic5.cpp b/src/mame/video/psychic5.cpp
index 2b635b10ec1..68a0e336dd9 100644
--- a/src/mame/video/psychic5.cpp
+++ b/src/mame/video/psychic5.cpp
@@ -85,50 +85,50 @@ void psychic5_state::set_background_palette_intensity()
Memory handler
***************************************************************************/
-READ8_MEMBER(psychic5_state::vram_page_select_r)
+uint8_t psychic5_state::vram_page_select_r()
{
return m_ps5_vram_page;
}
-WRITE8_MEMBER(psychic5_state::vram_page_select_w)
+void psychic5_state::vram_page_select_w(uint8_t data)
{
m_ps5_vram_page = data & 1;
m_vrambank->set_bank(data);
}
-WRITE8_MEMBER(psychic5_state::psychic5_title_screen_w)
+void psychic5_state::psychic5_title_screen_w(uint8_t data)
{
m_title_screen = data;
}
-WRITE8_MEMBER(psychic5_state::sprite_col_w)
+void psychic5_state::sprite_col_w(offs_t offset, uint8_t data)
{
m_ps5_palette_ram_sp[offset] = data;
change_palette(offset,m_ps5_palette_ram_sp, 0x000);
}
-WRITE8_MEMBER(psychic5_state::bg_col_w)
+void psychic5_state::bg_col_w(offs_t offset, uint8_t data)
{
m_ps5_palette_ram_bg[offset] = data;
change_palette(offset,m_ps5_palette_ram_bg, 0x100);
}
-WRITE8_MEMBER(psychic5_state::tx_col_w)
+void psychic5_state::tx_col_w(offs_t offset, uint8_t data)
{
m_ps5_palette_ram_tx[offset] = data;
change_palette(offset,m_ps5_palette_ram_tx, 0x200);
}
-WRITE8_MEMBER(psychic5_state::fg_videoram_w)
+void psychic5_state::fg_videoram_w(offs_t offset, uint8_t data)
{
m_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_MEMBER( psychic5_state::bg_videoram_w )
+void psychic5_state::bg_videoram_w(offs_t offset, uint8_t data)
{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset >> 1);
@@ -136,7 +136,7 @@ WRITE8_MEMBER( psychic5_state::bg_videoram_w )
-WRITE8_MEMBER(psychic5_state::bombsa_unknown_w)
+void psychic5_state::bombsa_unknown_w(uint8_t data)
{
m_bombsa_unknown = data;
}
diff --git a/src/mame/video/punchout.cpp b/src/mame/video/punchout.cpp
index adad5eac22c..ec488021f21 100644
--- a/src/mame/video/punchout.cpp
+++ b/src/mame/video/punchout.cpp
@@ -128,25 +128,25 @@ VIDEO_START_MEMBER(punchout_state,armwrest)
-WRITE8_MEMBER(punchout_state::punchout_bg_top_videoram_w)
+void punchout_state::punchout_bg_top_videoram_w(offs_t offset, uint8_t data)
{
m_bg_top_videoram[offset] = data;
m_bg_top_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_MEMBER(punchout_state::punchout_bg_bot_videoram_w)
+void punchout_state::punchout_bg_bot_videoram_w(offs_t offset, uint8_t data)
{
m_bg_bot_videoram[offset] = data;
m_bg_bot_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_MEMBER(punchout_state::armwrest_fg_videoram_w)
+void punchout_state::armwrest_fg_videoram_w(offs_t offset, uint8_t data)
{
m_armwrest_fg_videoram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_MEMBER(punchout_state::punchout_spr1_videoram_w)
+void punchout_state::punchout_spr1_videoram_w(offs_t offset, uint8_t data)
{
m_spr1_videoram[offset] = data;
m_spr1_tilemap->mark_tile_dirty(offset/4);
@@ -154,7 +154,7 @@ WRITE8_MEMBER(punchout_state::punchout_spr1_videoram_w)
m_spr1_tilemap_flipx->mark_tile_dirty(offset/4);
}
-WRITE8_MEMBER(punchout_state::punchout_spr2_videoram_w)
+void punchout_state::punchout_spr2_videoram_w(offs_t offset, uint8_t data)
{
m_spr2_videoram[offset] = data;
m_spr2_tilemap->mark_tile_dirty(offset/4);
diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp
index 62eeb26c27d..87ef3557296 100644
--- a/src/mame/video/qix.cpp
+++ b/src/mame/video/qix.cpp
@@ -87,7 +87,7 @@ WRITE_LINE_MEMBER(qix_state::qix_flip_screen_w)
*
*************************************/
-READ8_MEMBER(qix_state::qix_videoram_r)
+uint8_t qix_state::qix_videoram_r(offs_t offset)
{
/* add in the upper bit of the address latch */
offset += (m_videoram_address[0] & 0x80) << 8;
@@ -95,7 +95,7 @@ READ8_MEMBER(qix_state::qix_videoram_r)
}
-WRITE8_MEMBER(qix_state::qix_videoram_w)
+void qix_state::qix_videoram_w(offs_t offset, uint8_t data)
{
/* update the screen in case the game is writing "behind" the beam -
Zookeeper likes to do this */
@@ -110,7 +110,7 @@ WRITE8_MEMBER(qix_state::qix_videoram_w)
}
-WRITE8_MEMBER(qix_state::slither_videoram_w)
+void qix_state::slither_videoram_w(offs_t offset, uint8_t data)
{
/* update the screen in case the game is writing "behind" the beam -
Zookeeper likes to do this */
@@ -141,7 +141,7 @@ WRITE8_MEMBER(qix_state::slither_videoram_w)
*
*************************************/
-READ8_MEMBER(qix_state::qix_addresslatch_r)
+uint8_t qix_state::qix_addresslatch_r(offs_t offset)
{
/* compute the value at the address latch */
offset = (m_videoram_address[0] << 8) | m_videoram_address[1];
@@ -149,7 +149,7 @@ READ8_MEMBER(qix_state::qix_addresslatch_r)
}
-WRITE8_MEMBER(qix_state::qix_addresslatch_w)
+void qix_state::qix_addresslatch_w(offs_t offset, uint8_t data)
{
/* update the screen in case the game is writing "behind" the beam */
// m_screen->update_now();
@@ -163,7 +163,7 @@ WRITE8_MEMBER(qix_state::qix_addresslatch_w)
}
-WRITE8_MEMBER(qix_state::slither_addresslatch_w)
+void qix_state::slither_addresslatch_w(offs_t offset, uint8_t data)
{
/* update the screen in case the game is writing "behind" the beam */
// m_screen->update_now();
@@ -185,7 +185,7 @@ WRITE8_MEMBER(qix_state::slither_addresslatch_w)
*************************************/
-WRITE8_MEMBER(qix_state::qix_paletteram_w)
+void qix_state::qix_paletteram_w(offs_t offset, uint8_t data)
{
uint8_t old_data = m_paletteram[offset];
@@ -204,7 +204,7 @@ WRITE8_MEMBER(qix_state::qix_paletteram_w)
}
-WRITE8_MEMBER(qix_state::qix_palettebank_w)
+void qix_state::qix_palettebank_w(uint8_t data)
{
/* set the bank value */
if (m_palette_bank != (data & 3))
diff --git a/src/mame/video/quizdna.cpp b/src/mame/video/quizdna.cpp
index 307aa4e8baf..cdf14d2c5bc 100644
--- a/src/mame/video/quizdna.cpp
+++ b/src/mame/video/quizdna.cpp
@@ -68,7 +68,7 @@ void quizdna_state::video_start()
save_item(NAME(m_video_enable));
}
-WRITE8_MEMBER(quizdna_state::bg_ram_w)
+void quizdna_state::bg_ram_w(offs_t offset, uint8_t data)
{
uint8_t *RAM = memregion("maincpu")->base();
m_bg_ram[offset] = data;
@@ -77,7 +77,7 @@ WRITE8_MEMBER(quizdna_state::bg_ram_w)
m_bg_tilemap->mark_tile_dirty((offset & 0xfff) / 2 );
}
-WRITE8_MEMBER(quizdna_state::fg_ram_w)
+void quizdna_state::fg_ram_w(offs_t offset, uint8_t data)
{
int i;
int offs = offset & 0xfff;
@@ -91,12 +91,12 @@ WRITE8_MEMBER(quizdna_state::fg_ram_w)
m_fg_tilemap->mark_tile_dirty(((offs/2) & 0x1f) + i*0x20 );
}
-WRITE8_MEMBER(quizdna_state::bg_yscroll_w)
+void quizdna_state::bg_yscroll_w(uint8_t data)
{
m_bg_tilemap->set_scrolldy(255-data, 255-data+1 );
}
-WRITE8_MEMBER(quizdna_state::bg_xscroll_w)
+void quizdna_state::bg_xscroll_w(offs_t offset, uint8_t data)
{
int x;
m_bg_xscroll[offset] = data;
@@ -105,7 +105,7 @@ WRITE8_MEMBER(quizdna_state::bg_xscroll_w)
m_bg_tilemap->set_scrolldx(x+64, x-64+10 );
}
-WRITE8_MEMBER(quizdna_state::screen_ctrl_w)
+void quizdna_state::screen_ctrl_w(uint8_t data)
{
int tmp = (data & 0x10) >> 4;
m_video_enable = data & 0x20;
@@ -121,7 +121,7 @@ WRITE8_MEMBER(quizdna_state::screen_ctrl_w)
m_fg_tilemap->set_scrolldx(64, -64 +16);
}
-WRITE8_MEMBER(quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w)
+void quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w(offs_t offset, uint8_t data)
{
int r,g,b,d0,d1;
int offs = offset & ~1;
diff --git a/src/mame/video/quizpani.cpp b/src/mame/video/quizpani.cpp
index 3d58d95b282..f8cd6090410 100644
--- a/src/mame/video/quizpani.cpp
+++ b/src/mame/video/quizpani.cpp
@@ -36,19 +36,19 @@ TILE_GET_INFO_MEMBER(quizpani_state::txt_tile_info)
0);
}
-WRITE16_MEMBER(quizpani_state::bg_videoram_w)
+void quizpani_state::bg_videoram_w(offs_t offset, uint16_t data)
{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(quizpani_state::txt_videoram_w)
+void quizpani_state::txt_videoram_w(offs_t offset, uint16_t data)
{
m_txt_videoram[offset] = data;
m_txt_tilemap->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(quizpani_state::tilesbank_w)
+void quizpani_state::tilesbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if (ACCESSING_BITS_0_7)
{