diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-15 18:09:06 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-15 18:09:06 +0200 |
commit | 351479f33f298ecfe98bfbd8f6e0eea92e06ff72 (patch) | |
tree | df4642c7b930c6b314fc6d646e3a99963b608a4e | |
parent | 6224f5059f7322ed2e4779a516538de9032f8c7b (diff) |
drivers starting with s: removed read* and write* macros (nw)
298 files changed, 2734 insertions, 2740 deletions
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index c3f483f93fb..ab30fb50eae 100644 --- a/src/devices/video/stvvdp1.cpp +++ b/src/devices/video/stvvdp1.cpp @@ -152,7 +152,7 @@ struct shaded_point -READ16_MEMBER( saturn_state::saturn_vdp1_regs_r ) +uint16_t saturn_state::saturn_vdp1_regs_r(offs_t offset) { //logerror ("%s VDP1: Read from Registers, Offset %04x\n", machine().describe_context(), offset); @@ -293,7 +293,7 @@ void saturn_state::stv_set_framebuffer_config( void ) stv_prepare_framebuffers(); } -WRITE16_MEMBER( saturn_state::saturn_vdp1_regs_w ) +void saturn_state::saturn_vdp1_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vdp1_regs[offset]); @@ -337,13 +337,13 @@ WRITE16_MEMBER( saturn_state::saturn_vdp1_regs_w ) } -READ32_MEMBER ( saturn_state::saturn_vdp1_vram_r ) +uint32_t saturn_state::saturn_vdp1_vram_r(offs_t offset) { return m_vdp1_vram[offset]; } -WRITE32_MEMBER ( saturn_state::saturn_vdp1_vram_w ) +void saturn_state::saturn_vdp1_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint8_t *vdp1 = m_vdp1.gfx_decode.get(); @@ -362,7 +362,7 @@ WRITE32_MEMBER ( saturn_state::saturn_vdp1_vram_w ) vdp1[offset*4+3] = (data & 0x000000ff) >> 0; } -WRITE32_MEMBER ( saturn_state::saturn_vdp1_framebuffer0_w ) +void saturn_state::saturn_vdp1_framebuffer0_w(offs_t offset, uint32_t data, uint32_t mem_mask) { //popmessage ("STV VDP1 Framebuffer 0 WRITE offset %08x data %08x",offset, data); if ( STV_VDP1_TVM & 1 ) @@ -404,7 +404,7 @@ WRITE32_MEMBER ( saturn_state::saturn_vdp1_framebuffer0_w ) } } -READ32_MEMBER ( saturn_state::saturn_vdp1_framebuffer0_r ) +uint32_t saturn_state::saturn_vdp1_framebuffer0_r(offs_t offset, uint32_t mem_mask) { uint32_t result = 0; //popmessage ("STV VDP1 Framebuffer 0 READ offset %08x",offset); @@ -439,12 +439,12 @@ READ32_MEMBER ( saturn_state::saturn_vdp1_framebuffer0_r ) } #ifdef UNUSED_FUNCTION -WRITE32_MEMBER ( saturn_state::saturn_vdp1_framebuffer1_w ) +void saturn_state::saturn_vdp1_framebuffer1_w(offs_t offset, uint32_t data) { //popmessage ("STV VDP1 Framebuffer 1 WRITE offset %08x data %08x",offset, data); } -READ32_MEMBER ( saturn_state::saturn_vdp1_framebuffer1_r ) +uint32_t saturn_state::saturn_vdp1_framebuffer1_r() { //popmessage ("STV VDP1 Framebuffer 1 READ offset %08x",offset); return 0xffff; diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 91d127499fd..473fa710f7d 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -5793,12 +5793,12 @@ void saturn_state::stv_vdp2_draw_back(bitmap_rgb32 &bitmap, const rectangle &cli } } -READ32_MEMBER ( saturn_state::saturn_vdp2_vram_r ) +uint32_t saturn_state::saturn_vdp2_vram_r(offs_t offset) { return m_vdp2_vram[offset]; } -WRITE32_MEMBER ( saturn_state::saturn_vdp2_vram_w ) +void saturn_state::saturn_vdp2_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint8_t* gfxdata = m_vdp2.gfx_decode.get(); @@ -5852,7 +5852,7 @@ WRITE32_MEMBER ( saturn_state::saturn_vdp2_vram_w ) } } -READ16_MEMBER ( saturn_state::saturn_vdp2_regs_r ) +uint16_t saturn_state::saturn_vdp2_regs_r(offs_t offset) { switch(offset) { @@ -5930,7 +5930,7 @@ READ16_MEMBER ( saturn_state::saturn_vdp2_regs_r ) return m_vdp2_regs[offset]; } -READ32_MEMBER ( saturn_state::saturn_vdp2_cram_r ) +uint32_t saturn_state::saturn_vdp2_cram_r(offs_t offset) { offset &= (0xfff) >> (2); return m_vdp2_cram[offset]; @@ -5939,7 +5939,7 @@ READ32_MEMBER ( saturn_state::saturn_vdp2_cram_r ) -WRITE32_MEMBER ( saturn_state::saturn_vdp2_cram_w ) +void saturn_state::saturn_vdp2_cram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { int r,g,b; uint8_t cmode0; @@ -6045,7 +6045,7 @@ void saturn_state::refresh_palette_data( void ) } } -WRITE16_MEMBER ( saturn_state::saturn_vdp2_regs_w ) +void saturn_state::saturn_vdp2_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vdp2_regs[offset]); diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index b2c6f43e029..4329d5012d1 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -134,7 +134,7 @@ void scramble_state::sh_init() // Harem (same as scorpion) -READ8_MEMBER(scramble_state::harem_digitalker_intr_r) +uint8_t scramble_state::harem_digitalker_intr_r() { return m_digitalker->digitalker_0_intr_r(); } @@ -220,7 +220,7 @@ void scramble_state::harem_digitalker_control_w(uint8_t data) * */ -WRITE8_MEMBER( scramble_state::ad2083_tms5110_ctrl_w ) +void scramble_state::ad2083_tms5110_ctrl_w(uint8_t data) { static const int tbl[8] = {0,4,2,6,1,5,3,7}; diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index b9d8567fe12..d71ec7edda9 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -244,7 +244,7 @@ void segag80r_state::astrob_sound_board(machine_config &config) * *************************************/ -WRITE8_MEMBER(segag80r_state::astrob_sound_w) +void segag80r_state::astrob_sound_w(offs_t offset, uint8_t data) { static const float attack_resistor[10] = { @@ -593,7 +593,7 @@ void segag80r_state::spaceod_sound_board(machine_config &config) * *************************************/ -WRITE8_MEMBER(segag80r_state::spaceod_sound_w) +void segag80r_state::spaceod_sound_w(offs_t offset, uint8_t data) { uint8_t diff = data ^ m_sound_state[offset]; m_sound_state[offset] = data; diff --git a/src/mame/audio/segag80v.cpp b/src/mame/audio/segag80v.cpp index ef5f4b59210..a6944b39d3b 100644 --- a/src/mame/audio/segag80v.cpp +++ b/src/mame/audio/segag80v.cpp @@ -137,7 +137,7 @@ d0 crafts joining */ -WRITE8_MEMBER(segag80v_state::elim1_sh_w) +void segag80v_state::elim1_sh_w(uint8_t data) { data ^= 0xff; @@ -170,7 +170,7 @@ WRITE8_MEMBER(segag80v_state::elim1_sh_w) } } -WRITE8_MEMBER(segag80v_state::elim2_sh_w) +void segag80v_state::elim2_sh_w(uint8_t data) { data ^= 0xff; @@ -196,7 +196,7 @@ WRITE8_MEMBER(segag80v_state::elim2_sh_w) } -WRITE8_MEMBER(segag80v_state::zektor1_sh_w) +void segag80v_state::zektor1_sh_w(uint8_t data) { data ^= 0xff; @@ -229,7 +229,7 @@ WRITE8_MEMBER(segag80v_state::zektor1_sh_w) } } -WRITE8_MEMBER(segag80v_state::zektor2_sh_w) +void segag80v_state::zektor2_sh_w(uint8_t data) { data ^= 0xff; @@ -256,7 +256,7 @@ WRITE8_MEMBER(segag80v_state::zektor2_sh_w) -WRITE8_MEMBER(segag80v_state::spacfury1_sh_w) +void segag80v_state::spacfury1_sh_w(uint8_t data) { data ^= 0xff; @@ -292,7 +292,7 @@ WRITE8_MEMBER(segag80v_state::spacfury1_sh_w) } -WRITE8_MEMBER(segag80v_state::spacfury2_sh_w) +void segag80v_state::spacfury2_sh_w(uint8_t data) { data ^= 0xff; diff --git a/src/mame/audio/senjyo.cpp b/src/mame/audio/senjyo.cpp index d06980adc55..aa9046524bc 100644 --- a/src/mame/audio/senjyo.cpp +++ b/src/mame/audio/senjyo.cpp @@ -28,7 +28,7 @@ WRITE_LINE_MEMBER(senjyo_state::sound_line_clock) } } -WRITE8_MEMBER(senjyo_state::volume_w) +void senjyo_state::volume_w(uint8_t data) { m_single_volume = data & 0x0f; } diff --git a/src/mame/audio/skyraid.cpp b/src/mame/audio/skyraid.cpp index d18e0a75cbf..36271762c5a 100644 --- a/src/mame/audio/skyraid.cpp +++ b/src/mame/audio/skyraid.cpp @@ -285,7 +285,7 @@ DISCRETE_SOUND_START( skyraid_discrete ) DISCRETE_SOUND_END -WRITE8_MEMBER(skyraid_state::skyraid_sound_w) +void skyraid_state::skyraid_sound_w(uint8_t data) { /* BIT0 => PLANE SWEEP */ /* BIT1 => MISSILE */ diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index 6ff1674c8af..3ae055f03b5 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -34,7 +34,7 @@ READ_LINE_MEMBER(spacefb_state::audio_t1_r) } -WRITE8_MEMBER(spacefb_state::port_1_w) +void spacefb_state::port_1_w(uint8_t data) { m_audiocpu->set_input_line(0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/audio/starwars.cpp b/src/mame/audio/starwars.cpp index 4f590f1d45f..2ade0c31c18 100644 --- a/src/mame/audio/starwars.cpp +++ b/src/mame/audio/starwars.cpp @@ -60,13 +60,13 @@ WRITE_LINE_MEMBER(starwars_state::boost_interleave_hack) } -READ8_MEMBER(starwars_state::starwars_main_ready_flag_r) +uint8_t starwars_state::starwars_main_ready_flag_r() { return m_riot->porta_in_get() & 0xc0; /* only upper two flag bits mapped */ } -WRITE8_MEMBER(starwars_state::starwars_soundrst_w) +void starwars_state::starwars_soundrst_w(uint8_t data) { m_soundlatch->acknowledge_w(); m_mainlatch->acknowledge_w(); diff --git a/src/mame/audio/subs.cpp b/src/mame/audio/subs.cpp index 10fd6c08118..7ca93c95fb5 100644 --- a/src/mame/audio/subs.cpp +++ b/src/mame/audio/subs.cpp @@ -2,7 +2,7 @@ // copyright-holders:Derrick Renaud /************************************************************************* - audio\subs.c + audio\subs.cpp *************************************************************************/ #include "emu.h" @@ -14,7 +14,7 @@ sub sound functions ***************************************************************************/ -WRITE8_MEMBER(subs_state::noise_reset_w) +void subs_state::noise_reset_w(uint8_t data) { /* Pulse noise reset */ m_discrete->write(SUBS_NOISE_RESET, 0); diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index b5c2cc66b9e..3dbacb36554 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -422,11 +422,11 @@ void goodejan_state::goodejan_io_map(address_map &map) { common_io_map(map); map(0x8000, 0x807f).lrw16( - NAME([this](address_space &space, offs_t offset, u16 mem_mask) { - return m_crtc->read(space, offset ^ 0x20, mem_mask); + NAME([this](offs_t offset) { + return m_crtc->read(offset ^ 0x20); }), - NAME([this](address_space &space, offs_t offset, u16 data, u16 mem_mask) { - m_crtc->write(space, offset ^ 0x20, data, mem_mask); + NAME([this](offs_t offset, u16 data) { + m_crtc->write(offset ^ 0x20, data); })); } diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 0c4da9f4d97..bf8e6abe45d 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -385,11 +385,11 @@ void legionna_state::cupsocs_map(address_map &map) map(0x000000, 0x0fffff).rom(); map(0x100000, 0x1003ff).ram(); map(0x100600, 0x10067f).lrw16( - NAME([this](address_space &space, offs_t offset, u16 mem_mask) { - return m_crtc->read(space, offset ^ 0x20, mem_mask); + NAME([this](offs_t offset) { + return m_crtc->read(offset ^ 0x20); }), - NAME([this](address_space &space, offs_t offset, u16 data, u16 mem_mask) { - m_crtc->write(space, offset ^ 0x20, data, mem_mask); + NAME([this](offs_t offset, u16 data) { + m_crtc->write(offset ^ 0x20, data); })); map(0x100680, 0x100681).nopw(); // irq ack? map(0x100700, 0x100701).portr("DSW1"); diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index ed08dd928a1..13e5e707ec2 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( s11_state::pia_irq ) } } -WRITE8_MEMBER( s11_state::sol3_w ) +void s11_state::sol3_w(uint8_t data) { } @@ -323,7 +323,7 @@ WRITE_LINE_MEMBER( s11_state::pia34_cb2_w ) m_bg->ctrl_w(state); } -WRITE8_MEMBER( s11_state::bank_w ) +void s11_state::bank_w(uint8_t data) { membank("bank0")->set_entry(BIT(data, 1)); membank("bank1")->set_entry(BIT(data, 0)); diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index b6868f14b4a..b1d793663f3 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -160,7 +160,7 @@ void s11a_state::dig0_w(uint8_t data) set_segment2(0); } -WRITE8_MEMBER( s11a_state::bgbank_w ) +void s11a_state::bgbank_w(uint8_t data) { membank("bgbank")->set_entry(data & 0x03); } diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index b4a12225c6d..1c9499fa456 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -157,7 +157,7 @@ MACHINE_RESET_MEMBER( s11b_state, s11b ) m_bgcpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } -WRITE8_MEMBER( s11b_state::bg_speech_clock_w ) +void s11b_state::bg_speech_clock_w(uint8_t data) { if(m_bg_hc55516) { @@ -167,7 +167,7 @@ WRITE8_MEMBER( s11b_state::bg_speech_clock_w ) } } -WRITE8_MEMBER( s11b_state::bg_speech_digit_w ) +void s11b_state::bg_speech_digit_w(uint8_t data) { if(m_bg_hc55516) m_bg_hc55516->digit_w(data); diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index 67bc5da3b9d..b0e0dece7bc 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -127,7 +127,7 @@ static INPUT_PORTS_START( s11c ) INPUT_PORTS_END /* -WRITE8_MEMBER( s11c_state::bgbank_w ) +void s11c_state::bgbank_w(uint8_t data) { uint8_t bank = ((data & 0x04) >> 2) | ((data & 0x03) << 1); membank("bgbank")->set_entry(bank); diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp index 716e1c0f0ae..d474456e1af 100644 --- a/src/mame/drivers/sage2.cpp +++ b/src/mame/drivers/sage2.cpp @@ -387,10 +387,10 @@ void sage2_state::machine_reset() address_space &program = m_maincpu->space(AS_PROGRAM); program.unmap_readwrite(0x000000, 0x07ffff); program.install_rom(0x000000, 0x001fff, 0x07e000, m_rom->base()); - program.install_read_handler(0xfe0000, 0xfe3fff, read16_delegate(*this, FUNC(sage2_state::rom_r))); + program.install_read_handler(0xfe0000, 0xfe3fff, read16sm_delegate(*this, FUNC(sage2_state::rom_r))); } -READ16_MEMBER(sage2_state::rom_r) +uint16_t sage2_state::rom_r(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); program.unmap_readwrite(0x000000, 0x07ffff); diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index 008ea5b07b4..7853ec00492 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -73,7 +73,7 @@ void samcoupe_state::device_timer(emu_timer &timer, device_timer_id id, int para I/O PORTS ***************************************************************************/ -READ8_MEMBER(samcoupe_state::samcoupe_disk_r) +uint8_t samcoupe_state::samcoupe_disk_r(offs_t offset) { /* drive and side is encoded into bit 5 and 3 */ floppy_connector *con = (BIT(offset, 4) ? m_wd1772_1 : m_wd1772_0); @@ -87,7 +87,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_disk_r) return m_fdc->read(offset & 0x03); } -WRITE8_MEMBER(samcoupe_state::samcoupe_disk_w) +void samcoupe_state::samcoupe_disk_w(offs_t offset, uint8_t data) { /* drive and side is encoded into bit 5 and 3 */ floppy_connector *con = (BIT(offset, 4) ? m_wd1772_1 : m_wd1772_0); @@ -101,7 +101,7 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_disk_w) return m_fdc->write(offset & 0x03, data); } -READ8_MEMBER(samcoupe_state::samcoupe_pen_r) +uint8_t samcoupe_state::samcoupe_pen_r(offs_t offset) { uint8_t data; @@ -124,12 +124,12 @@ READ8_MEMBER(samcoupe_state::samcoupe_pen_r) return data; } -WRITE8_MEMBER(samcoupe_state::samcoupe_clut_w) +void samcoupe_state::samcoupe_clut_w(offs_t offset, uint8_t data) { m_clut[(offset >> 8) & 0x0f] = data & 0x7f; } -READ8_MEMBER(samcoupe_state::samcoupe_status_r) +uint8_t samcoupe_state::samcoupe_status_r(offs_t offset) { uint8_t data = 0xe0; @@ -149,17 +149,17 @@ READ8_MEMBER(samcoupe_state::samcoupe_status_r) return data; } -WRITE8_MEMBER(samcoupe_state::samcoupe_line_int_w) +void samcoupe_state::samcoupe_line_int_w(uint8_t data) { m_line_int = data; } -READ8_MEMBER(samcoupe_state::samcoupe_lmpr_r) +uint8_t samcoupe_state::samcoupe_lmpr_r() { return m_lmpr; } -WRITE8_MEMBER(samcoupe_state::samcoupe_lmpr_w) +void samcoupe_state::samcoupe_lmpr_w(uint8_t data) { address_space &space_program = m_maincpu->space(AS_PROGRAM); @@ -167,12 +167,12 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_lmpr_w) samcoupe_update_memory(space_program); } -READ8_MEMBER(samcoupe_state::samcoupe_hmpr_r) +uint8_t samcoupe_state::samcoupe_hmpr_r() { return m_hmpr; } -WRITE8_MEMBER(samcoupe_state::samcoupe_hmpr_w) +void samcoupe_state::samcoupe_hmpr_w(uint8_t data) { address_space &space_program = m_maincpu->space(AS_PROGRAM); @@ -180,12 +180,12 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_hmpr_w) samcoupe_update_memory(space_program); } -READ8_MEMBER(samcoupe_state::samcoupe_vmpr_r) +uint8_t samcoupe_state::samcoupe_vmpr_r() { return m_vmpr; } -WRITE8_MEMBER(samcoupe_state::samcoupe_vmpr_w) +void samcoupe_state::samcoupe_vmpr_w(uint8_t data) { address_space &space_program = m_maincpu->space(AS_PROGRAM); @@ -193,18 +193,18 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_vmpr_w) samcoupe_update_memory(space_program); } -READ8_MEMBER(samcoupe_state::samcoupe_midi_r) +uint8_t samcoupe_state::samcoupe_midi_r() { logerror("%s: read from midi port\n", machine().describe_context()); return 0xff; } -WRITE8_MEMBER(samcoupe_state::samcoupe_midi_w) +void samcoupe_state::samcoupe_midi_w(uint8_t data) { logerror("%s: write to midi port: 0x%02x\n", machine().describe_context(), data); } -READ8_MEMBER(samcoupe_state::samcoupe_keyboard_r) +uint8_t samcoupe_state::samcoupe_keyboard_r(offs_t offset) { uint8_t data = 0x1f; @@ -243,7 +243,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_keyboard_r) return data; } -WRITE8_MEMBER(samcoupe_state::samcoupe_border_w) +void samcoupe_state::samcoupe_border_w(uint8_t data) { m_border = data; @@ -254,7 +254,7 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_border_w) m_speaker->level_w(BIT(data, 4)); } -READ8_MEMBER(samcoupe_state::samcoupe_attributes_r) +uint8_t samcoupe_state::samcoupe_attributes_r() { return m_attribute; } @@ -264,12 +264,12 @@ WRITE_LINE_MEMBER(samcoupe_state::write_lpt1_busy) m_lpt1_busy = state; } -READ8_MEMBER(samcoupe_state::samcoupe_lpt1_busy_r) +uint8_t samcoupe_state::samcoupe_lpt1_busy_r() { return m_lpt1_busy; } -WRITE8_MEMBER(samcoupe_state::samcoupe_lpt1_strobe_w) +void samcoupe_state::samcoupe_lpt1_strobe_w(uint8_t data) { m_lpt1->write_strobe(data & 1); } @@ -279,12 +279,12 @@ DECLARE_WRITE_LINE_MEMBER(samcoupe_state::write_lpt2_busy) m_lpt2_busy = state; } -READ8_MEMBER(samcoupe_state::samcoupe_lpt2_busy_r) +uint8_t samcoupe_state::samcoupe_lpt2_busy_r() { return m_lpt2_busy; } -WRITE8_MEMBER(samcoupe_state::samcoupe_lpt2_strobe_w) +void samcoupe_state::samcoupe_lpt2_strobe_w(uint8_t data) { m_lpt2->write_strobe(data & 1); } diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index 8c6399d45df..af61bc77b14 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -138,13 +138,13 @@ void sauro_state::machine_start() save_item(NAME(m_irq_enable)); } -WRITE8_MEMBER(sauro_state::sauro_sound_command_w) +void sauro_state::sauro_sound_command_w(uint8_t data) { data |= 0x80; m_soundlatch->write(data); } -READ8_MEMBER(sauro_state::sauro_sound_command_r) +uint8_t sauro_state::sauro_sound_command_r() { int ret = m_soundlatch->read(); m_soundlatch->clear_w(); @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER(sauro_state::flip_screen_w) flip_screen_set(state); } -WRITE8_MEMBER(sauro_state::adpcm_w) +void sauro_state::adpcm_w(uint8_t data) { m_sp0256->ald_w(data); } diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index ca67ca93144..e26f4fb0077 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -55,7 +55,7 @@ CPU/Video Board Parts: #include "speaker.h" -WRITE8_MEMBER(sbasketb_state::sbasketb_sh_irqtrigger_w) +void sbasketb_state::sbasketb_sh_irqtrigger_w(uint8_t data) { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index a8de6f17167..90a33e972f8 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -46,7 +46,7 @@ Stephh's notes (based on the game M6502 code and some tests) : #include "speaker.h" -WRITE8_MEMBER(scotrsht_state::ctrl_w) +void scotrsht_state::ctrl_w(uint8_t data) { m_irq_enable = data & 0x02; flip_screen_set(data & 0x08); @@ -58,7 +58,7 @@ WRITE_LINE_MEMBER(scotrsht_state::vblank_irq) m_maincpu->set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(scotrsht_state::soundlatch_w) +void scotrsht_state::soundlatch_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 6f28b4f99bf..6759deffc92 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -62,12 +62,12 @@ void scramble_state::scramble_map(address_map &map) map(0x8200, 0x8203).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)); } -READ8_MEMBER(scramble_state::scramble_soundram_r) +uint8_t scramble_state::scramble_soundram_r(offs_t offset) { return m_soundram[offset & 0x03ff]; } -WRITE8_MEMBER(scramble_state::scramble_soundram_w) +void scramble_state::scramble_soundram_w(offs_t offset, uint8_t data) { m_soundram[offset & 0x03ff] = data; } @@ -109,22 +109,22 @@ void scramble_state::ckongs_map(address_map &map) -READ8_MEMBER(scramble_state::mars_ppi8255_0_r) +uint8_t scramble_state::mars_ppi8255_0_r(offs_t offset) { return m_ppi8255_0->read(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01)); } -READ8_MEMBER(scramble_state::mars_ppi8255_1_r) +uint8_t scramble_state::mars_ppi8255_1_r(offs_t offset) { return m_ppi8255_1->read(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01)); } -WRITE8_MEMBER(scramble_state::mars_ppi8255_0_w) +void scramble_state::mars_ppi8255_0_w(offs_t offset, uint8_t data) { m_ppi8255_0->write(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data); } -WRITE8_MEMBER(scramble_state::mars_ppi8255_1_w) +void scramble_state::mars_ppi8255_1_w(offs_t offset, uint8_t data) { m_ppi8255_1->write(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data); } @@ -341,7 +341,7 @@ void scramble_state::hotshock_sound_io_map(address_map &map) -READ8_MEMBER(scramble_state::hncholms_prot_r) +uint8_t scramble_state::hncholms_prot_r() { if(m_maincpu->pc() == 0x2b || m_maincpu->pc() == 0xa27) return 1; diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index 4ab2643c85c..7008cbc210a 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -78,7 +78,7 @@ * R/W Handlers * ***************************/ -READ16_MEMBER(sderby_state::sderby_input_r) +uint16_t sderby_state::sderby_input_r(offs_t offset) { switch (offset) { @@ -93,7 +93,7 @@ READ16_MEMBER(sderby_state::sderby_input_r) return 0xffff; } -READ16_MEMBER(sderby_state::sderbya_input_r) +uint16_t sderby_state::sderbya_input_r(offs_t offset) { switch (offset) { @@ -109,7 +109,7 @@ READ16_MEMBER(sderby_state::sderbya_input_r) } -READ16_MEMBER(sderby_state::roulette_input_r) +uint16_t sderby_state::roulette_input_r(offs_t offset) { switch (offset) { @@ -146,7 +146,7 @@ READ16_MEMBER(sderby_state::roulette_input_r) ****************************************************************/ -READ16_MEMBER(sderby_state::rprot_r) +uint16_t sderby_state::rprot_r() { logerror("rprot_r : offset = %02x\n",m_maincpu->pc()); @@ -155,12 +155,12 @@ READ16_MEMBER(sderby_state::rprot_r) or simply throw a deliberated losing number. If someone more skilled in 68K code can help to trace it, - searching for an accurated response, I'll appreciate. + searching for an accurate response, I'll appreciate. */ return machine().rand() & 0x1f; } -WRITE16_MEMBER(sderby_state::rprot_w) +void sderby_state::rprot_w(uint16_t data) { logerror("rprot_w %02x\n", data); } @@ -170,7 +170,7 @@ WRITE16_MEMBER(sderby_state::rprot_w) * Outputs / Lamps * ******************************/ -WRITE16_MEMBER(sderby_state::sderby_out_w) +void sderby_state::sderby_out_w(uint16_t data) { /* --------------------------- @@ -214,7 +214,7 @@ WRITE16_MEMBER(sderby_state::sderby_out_w) } -WRITE16_MEMBER(sderby_state::scmatto_out_w) +void sderby_state::scmatto_out_w(uint16_t data) { /* ---------------------------------------- @@ -263,7 +263,7 @@ WRITE16_MEMBER(sderby_state::scmatto_out_w) } -WRITE16_MEMBER(sderby_state::roulette_out_w) +void sderby_state::roulette_out_w(uint16_t data) { /* ----------------------------------- diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index b73b75e57fc..2a4092247ee 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -169,7 +169,7 @@ void segag80r_state::machine_start() * *************************************/ -READ8_MEMBER(segag80r_state::g80r_opcode_r) +uint8_t segag80r_state::g80r_opcode_r(offs_t offset) { // opcodes themselves are not scrambled uint8_t op = m_maincpu->space(AS_PROGRAM).read_byte(offset); @@ -193,16 +193,16 @@ offs_t segag80r_state::decrypt_offset(offs_t offset) return (offset & 0xff00) | (*m_decrypt)(pc, offset & 0xff); } -WRITE8_MEMBER(segag80r_state::mainram_w) +void segag80r_state::mainram_w(offs_t offset, uint8_t data) { m_mainram[decrypt_offset(offset)] = data; } -WRITE8_MEMBER(segag80r_state::vidram_w){ segag80r_videoram_w(space, decrypt_offset(offset), data); } -WRITE8_MEMBER(segag80r_state::monsterb_vidram_w){ monsterb_videoram_w(space, decrypt_offset(offset), data); } -WRITE8_MEMBER(segag80r_state::pignewt_vidram_w){ pignewt_videoram_w(space, decrypt_offset(offset), data); } -WRITE8_MEMBER(segag80r_state::sindbadm_vidram_w){ sindbadm_videoram_w(space, decrypt_offset(offset), data); } -WRITE8_MEMBER(segag80r_state::usb_ram_w){ m_usbsnd->ram_w(decrypt_offset(offset), data); } +void segag80r_state::vidram_w(offs_t offset, uint8_t data){ segag80r_videoram_w(decrypt_offset(offset), data); } +void segag80r_state::monsterb_vidram_w(offs_t offset, uint8_t data){ monsterb_videoram_w(decrypt_offset(offset), data); } +void segag80r_state::pignewt_vidram_w(offs_t offset, uint8_t data){ pignewt_videoram_w(decrypt_offset(offset), data); } +void segag80r_state::sindbadm_vidram_w(offs_t offset, uint8_t data){ sindbadm_videoram_w(decrypt_offset(offset), data); } +void segag80r_state::usb_ram_w(offs_t offset, uint8_t data){ m_usbsnd->ram_w(decrypt_offset(offset), data); } @@ -221,7 +221,7 @@ inline uint8_t segag80r_state::demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2 } -READ8_MEMBER(segag80r_state::mangled_ports_r) +uint8_t segag80r_state::mangled_ports_r(offs_t offset) { /* The input ports are odd. Neighboring lines are read via a mux chip */ /* one bit at a time. This means that one bank of DIP switches will be */ @@ -237,7 +237,7 @@ READ8_MEMBER(segag80r_state::mangled_ports_r) } -READ8_MEMBER(segag80r_state::spaceod_mangled_ports_r) +uint8_t segag80r_state::spaceod_mangled_ports_r(offs_t offset) { /* Space Odyssey has different (and conflicting) wiring for upright */ /* versus cocktail cabinets; we fix this here. The input ports are */ @@ -265,7 +265,7 @@ READ8_MEMBER(segag80r_state::spaceod_mangled_ports_r) } -READ8_MEMBER(segag80r_state::spaceod_port_fc_r) +uint8_t segag80r_state::spaceod_port_fc_r() { uint8_t upright = ioport("D3D2")->read() & 0x04; uint8_t fc = ioport("FC")->read(); @@ -282,7 +282,7 @@ READ8_MEMBER(segag80r_state::spaceod_port_fc_r) } -WRITE8_MEMBER(segag80r_state::coin_count_w) +void segag80r_state::coin_count_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1); machine().bookkeeping().coin_counter_w(1, (data >> 6) & 1); @@ -306,11 +306,11 @@ void segag80r_state::sindbadm_misc_w(uint8_t data) /* the data lines are flipped */ -WRITE8_MEMBER(segag80r_state::sindbadm_sn1_SN76496_w) +void segag80r_state::sindbadm_sn1_SN76496_w(uint8_t data) { m_sn1->write(bitswap<8>(data, 0,1,2,3,4,5,6,7)); } -WRITE8_MEMBER(segag80r_state::sindbadm_sn2_SN76496_w) +void segag80r_state::sindbadm_sn2_SN76496_w(uint8_t data) { m_sn2->write(bitswap<8>(data, 0,1,2,3,4,5,6,7)); } @@ -1541,7 +1541,7 @@ void segag80r_state::init_astrob() iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w))); /* install Astro Blaster sound board */ - iospace.install_write_handler(0x3e, 0x3f, write8_delegate(*this, FUNC(segag80r_state::astrob_sound_w))); + iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*this, FUNC(segag80r_state::astrob_sound_w))); save_item(NAME(m_sound_state)); save_item(NAME(m_sound_rate)); @@ -1575,14 +1575,14 @@ void segag80r_state::init_spaceod() m_background_pcb = G80_BACKGROUND_SPACEOD; /* configure ports for the background board */ - iospace.install_readwrite_handler(0x08, 0x0f, read8_delegate(*this, FUNC(segag80r_state::spaceod_back_port_r)), write8_delegate(*this, FUNC(segag80r_state::spaceod_back_port_w))); + iospace.install_readwrite_handler(0x08, 0x0f, read8sm_delegate(*this, FUNC(segag80r_state::spaceod_back_port_r)), write8sm_delegate(*this, FUNC(segag80r_state::spaceod_back_port_w))); /* install Space Odyssey sound board */ - iospace.install_write_handler(0x0e, 0x0f, write8_delegate(*this, FUNC(segag80r_state::spaceod_sound_w))); + iospace.install_write_handler(0x0e, 0x0f, write8sm_delegate(*this, FUNC(segag80r_state::spaceod_sound_w))); /* install our wacky mangled ports */ - iospace.install_read_handler(0xf8, 0xfb, read8_delegate(*this, FUNC(segag80r_state::spaceod_mangled_ports_r))); - iospace.install_read_handler(0xfc, 0xfc, read8_delegate(*this, FUNC(segag80r_state::spaceod_port_fc_r))); + iospace.install_read_handler(0xf8, 0xfb, read8sm_delegate(*this, FUNC(segag80r_state::spaceod_mangled_ports_r))); + iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80r_state::spaceod_port_fc_r))); save_item(NAME(m_sound_state)); } @@ -1601,8 +1601,8 @@ void segag80r_state::init_monsterb() monsterb_expand_gfx("gfx1"); /* install background board handlers */ - iospace.install_write_handler(0xb8, 0xbd, write8_delegate(*this, FUNC(segag80r_state::monsterb_back_port_w))); - pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(*this, FUNC(segag80r_state::monsterb_vidram_w))); + iospace.install_write_handler(0xb8, 0xbd, write8sm_delegate(*this, FUNC(segag80r_state::monsterb_back_port_w))); + pgmspace.install_write_handler(0xe000, 0xffff, write8sm_delegate(*this, FUNC(segag80r_state::monsterb_vidram_w))); save_item(NAME(m_sound_state)); save_item(NAME(m_sound_addr)); @@ -1622,9 +1622,9 @@ void segag80r_state::init_monster2() monsterb_expand_gfx("gfx1"); /* install background board handlers */ - iospace.install_write_handler(0xb4, 0xb5, write8_delegate(*this, FUNC(segag80r_state::pignewt_back_color_w))); - iospace.install_write_handler(0xb8, 0xbd, write8_delegate(*this, FUNC(segag80r_state::pignewt_back_port_w))); - pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(*this, FUNC(segag80r_state::pignewt_vidram_w))); + iospace.install_write_handler(0xb4, 0xb5, write8sm_delegate(*this, FUNC(segag80r_state::pignewt_back_color_w))); + iospace.install_write_handler(0xb8, 0xbd, write8sm_delegate(*this, FUNC(segag80r_state::pignewt_back_port_w))); + pgmspace.install_write_handler(0xe000, 0xffff, write8sm_delegate(*this, FUNC(segag80r_state::pignewt_vidram_w))); save_item(NAME(m_sound_state)); save_item(NAME(m_sound_addr)); @@ -1644,14 +1644,14 @@ void segag80r_state::init_pignewt() monsterb_expand_gfx("gfx1"); /* install background board handlers */ - iospace.install_write_handler(0xb4, 0xb5, write8_delegate(*this, FUNC(segag80r_state::pignewt_back_color_w))); - iospace.install_write_handler(0xb8, 0xbd, write8_delegate(*this, FUNC(segag80r_state::pignewt_back_port_w))); - pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(*this, FUNC(segag80r_state::pignewt_vidram_w))); + iospace.install_write_handler(0xb4, 0xb5, write8sm_delegate(*this, FUNC(segag80r_state::pignewt_back_color_w))); + iospace.install_write_handler(0xb8, 0xbd, write8sm_delegate(*this, FUNC(segag80r_state::pignewt_back_port_w))); + pgmspace.install_write_handler(0xe000, 0xffff, write8sm_delegate(*this, FUNC(segag80r_state::pignewt_vidram_w))); /* install Universal sound board */ iospace.install_readwrite_handler(0x3f, 0x3f, read8smo_delegate(*m_usbsnd, FUNC(usb_sound_device::status_r)), write8smo_delegate(*m_usbsnd, FUNC(usb_sound_device::data_w))); pgmspace.install_read_handler(0xd000, 0xdfff, read8sm_delegate(*m_usbsnd, FUNC(usb_sound_device::ram_r))); - pgmspace.install_write_handler(0xd000, 0xdfff, write8_delegate(*this, FUNC(segag80r_state::usb_ram_w))); + pgmspace.install_write_handler(0xd000, 0xdfff, write8sm_delegate(*this, FUNC(segag80r_state::usb_ram_w))); } @@ -1667,8 +1667,8 @@ void segag80r_state::init_sindbadm() m_background_pcb = G80_BACKGROUND_SINDBADM; /* install background board handlers */ - iospace.install_write_handler(0x40, 0x41, write8_delegate(*this, FUNC(segag80r_state::sindbadm_back_port_w))); - pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(*this, FUNC(segag80r_state::sindbadm_vidram_w))); + iospace.install_write_handler(0x40, 0x41, write8sm_delegate(*this, FUNC(segag80r_state::sindbadm_back_port_w))); + pgmspace.install_write_handler(0xe000, 0xffff, write8sm_delegate(*this, FUNC(segag80r_state::sindbadm_vidram_w))); } diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp index a7a7b8ea5ba..0019926832d 100644 --- a/src/mame/drivers/segag80v.cpp +++ b/src/mame/drivers/segag80v.cpp @@ -189,7 +189,7 @@ void segag80v_state::machine_start() * *************************************/ -READ8_MEMBER(segag80v_state::g80v_opcode_r) +uint8_t segag80v_state::g80v_opcode_r(offs_t offset) { // opcodes themselves are not scrambled uint8_t op = m_maincpu->space(AS_PROGRAM).read_byte(offset); @@ -213,13 +213,13 @@ offs_t segag80v_state::decrypt_offset(offs_t offset) return (offset & 0xff00) | (*m_decrypt)(pc, offset & 0xff); } -WRITE8_MEMBER(segag80v_state::mainram_w) +void segag80v_state::mainram_w(offs_t offset, uint8_t data) { m_mainram[decrypt_offset(offset)] = data; } -WRITE8_MEMBER(segag80v_state::usb_ram_w){ m_usb->ram_w(decrypt_offset(offset), data); } -WRITE8_MEMBER(segag80v_state::vectorram_w) +void segag80v_state::usb_ram_w(offs_t offset, uint8_t data){ m_usb->ram_w(decrypt_offset(offset), data); } +void segag80v_state::vectorram_w(offs_t offset, uint8_t data) { m_vectorram[decrypt_offset(offset)] = data; } @@ -241,7 +241,7 @@ inline uint8_t segag80v_state::demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2 } -READ8_MEMBER(segag80v_state::mangled_ports_r) +uint8_t segag80v_state::mangled_ports_r(offs_t offset) { /* The input ports are odd. Neighboring lines are read via a mux chip */ /* one bit at a time. This means that one bank of DIP switches will be */ @@ -264,13 +264,13 @@ READ8_MEMBER(segag80v_state::mangled_ports_r) * *************************************/ -WRITE8_MEMBER(segag80v_state::spinner_select_w) +void segag80v_state::spinner_select_w(uint8_t data) { m_spinner_select = data; } -READ8_MEMBER(segag80v_state::spinner_input_r) +uint8_t segag80v_state::spinner_input_r() { int8_t delta; @@ -308,7 +308,7 @@ READ_LINE_MEMBER(segag80v_state::elim4_joint_coin_r) } -READ8_MEMBER(segag80v_state::elim4_input_r) +uint8_t segag80v_state::elim4_input_r() { uint8_t result = 0; @@ -341,7 +341,7 @@ READ8_MEMBER(segag80v_state::elim4_input_r) * *************************************/ -WRITE8_MEMBER(segag80v_state::multiply_w) +void segag80v_state::multiply_w(offs_t offset, uint8_t data) { m_mult_data[offset] = data; if (offset == 1) @@ -349,7 +349,7 @@ WRITE8_MEMBER(segag80v_state::multiply_w) } -READ8_MEMBER(segag80v_state::multiply_r) +uint8_t segag80v_state::multiply_r() { uint8_t result = m_mult_result; m_mult_result >>= 8; @@ -364,14 +364,14 @@ READ8_MEMBER(segag80v_state::multiply_r) * *************************************/ -WRITE8_MEMBER(segag80v_state::coin_count_w) +void segag80v_state::coin_count_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1); machine().bookkeeping().coin_counter_w(1, (data >> 6) & 1); } -WRITE8_MEMBER(segag80v_state::unknown_w) +void segag80v_state::unknown_w(uint8_t data) { /* writing an 0x04 here enables interrupts */ /* some games write 0x00/0x01 here as well */ @@ -1303,8 +1303,8 @@ void segag80v_state::init_elim2() m_decrypt = segag80_security(70); /* configure sound */ - iospace.install_write_handler(0x3e, 0x3e, write8_delegate(*this, FUNC(segag80v_state::elim1_sh_w))); - iospace.install_write_handler(0x3f, 0x3f, write8_delegate(*this, FUNC(segag80v_state::elim2_sh_w))); + iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::elim1_sh_w))); + iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::elim2_sh_w))); } @@ -1316,12 +1316,12 @@ void segag80v_state::init_elim4() m_decrypt = segag80_security(76); /* configure sound */ - iospace.install_write_handler(0x3e, 0x3e, write8_delegate(*this, FUNC(segag80v_state::elim1_sh_w))); - iospace.install_write_handler(0x3f, 0x3f, write8_delegate(*this, FUNC(segag80v_state::elim2_sh_w))); + iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::elim1_sh_w))); + iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::elim2_sh_w))); /* configure inputs */ - iospace.install_write_handler(0xf8, 0xf8, write8_delegate(*this, FUNC(segag80v_state::spinner_select_w))); - iospace.install_read_handler(0xfc, 0xfc, read8_delegate(*this, FUNC(segag80v_state::elim4_input_r))); + iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w))); + iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::elim4_input_r))); } @@ -1335,8 +1335,8 @@ void segag80v_state::init_spacfury() /* configure sound */ iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(speech_sound_device::data_w))); iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w))); - iospace.install_write_handler(0x3e, 0x3e, write8_delegate(*this, FUNC(segag80v_state::spacfury1_sh_w))); - iospace.install_write_handler(0x3f, 0x3f, write8_delegate(*this, FUNC(segag80v_state::spacfury2_sh_w))); + iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::spacfury1_sh_w))); + iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::spacfury2_sh_w))); } @@ -1351,12 +1351,12 @@ void segag80v_state::init_zektor() iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(speech_sound_device::data_w))); iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w))); iospace.install_write_handler(0x3c, 0x3d, write8sm_delegate(*m_aysnd, FUNC(ay8912_device::address_data_w))); - iospace.install_write_handler(0x3e, 0x3e, write8_delegate(*this, FUNC(segag80v_state::zektor1_sh_w))); - iospace.install_write_handler(0x3f, 0x3f, write8_delegate(*this, FUNC(segag80v_state::zektor2_sh_w))); + iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::zektor1_sh_w))); + iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::zektor2_sh_w))); /* configure inputs */ - iospace.install_write_handler(0xf8, 0xf8, write8_delegate(*this, FUNC(segag80v_state::spinner_select_w))); - iospace.install_read_handler(0xfc, 0xfc, read8_delegate(*this, FUNC(segag80v_state::spinner_input_r))); + iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w))); + iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::spinner_input_r))); } @@ -1371,11 +1371,11 @@ void segag80v_state::init_tacscan() /* configure sound */ iospace.install_readwrite_handler(0x3f, 0x3f, read8smo_delegate(*m_usb, FUNC(usb_sound_device::status_r)), write8smo_delegate(*m_usb, FUNC(usb_sound_device::data_w))); pgmspace.install_read_handler(0xd000, 0xdfff, read8sm_delegate(*m_usb, FUNC(usb_sound_device::ram_r))); - pgmspace.install_write_handler(0xd000, 0xdfff, write8_delegate(*this, FUNC(segag80v_state::usb_ram_w))); + pgmspace.install_write_handler(0xd000, 0xdfff, write8sm_delegate(*this, FUNC(segag80v_state::usb_ram_w))); /* configure inputs */ - iospace.install_write_handler(0xf8, 0xf8, write8_delegate(*this, FUNC(segag80v_state::spinner_select_w))); - iospace.install_read_handler(0xfc, 0xfc, read8_delegate(*this, FUNC(segag80v_state::spinner_input_r))); + iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w))); + iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::spinner_input_r))); } @@ -1393,11 +1393,11 @@ void segag80v_state::init_startrek() iospace.install_readwrite_handler(0x3f, 0x3f, read8smo_delegate(*m_usb, FUNC(usb_sound_device::status_r)), write8smo_delegate(*m_usb, FUNC(usb_sound_device::data_w))); pgmspace.install_read_handler(0xd000, 0xdfff, read8sm_delegate(*m_usb, FUNC(usb_sound_device::ram_r))); - pgmspace.install_write_handler(0xd000, 0xdfff, write8_delegate(*this, FUNC(segag80v_state::usb_ram_w))); + pgmspace.install_write_handler(0xd000, 0xdfff, write8sm_delegate(*this, FUNC(segag80v_state::usb_ram_w))); /* configure inputs */ - iospace.install_write_handler(0xf8, 0xf8, write8_delegate(*this, FUNC(segag80v_state::spinner_select_w))); - iospace.install_read_handler(0xfc, 0xfc, read8_delegate(*this, FUNC(segag80v_state::spinner_input_r))); + iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w))); + iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::spinner_input_r))); } diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index abfdf83238b..533ee43debe 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -232,7 +232,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(segahang_state::hangon_irq) // sound_data_r - read data from the sound latch //------------------------------------------------- -READ8_MEMBER( segahang_state::sound_data_r ) +uint8_t segahang_state::sound_data_r() { // assert ACK m_i8255_1->pc6_w(CLEAR_LINE); diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index 91927bd8bd5..338578930ef 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -485,10 +485,10 @@ void segaorun_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t // misc_io_r - miscellaneous I/O reads //------------------------------------------------- -READ16_MEMBER( segaorun_state::misc_io_r ) +uint16_t segaorun_state::misc_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { if (!m_custom_io_r.isnull()) - return m_custom_io_r(space, offset, mem_mask); + return m_custom_io_r(space, offset); logerror("%06X:misc_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2); return m_mapper->open_bus_r(); @@ -499,11 +499,11 @@ READ16_MEMBER( segaorun_state::misc_io_r ) // misc_io_w - miscellaneous I/O writes //------------------------------------------------- -WRITE16_MEMBER( segaorun_state::misc_io_w ) +void segaorun_state::misc_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { if (!m_custom_io_w.isnull()) { - m_custom_io_w(space, offset, data, mem_mask); + m_custom_io_w(offset, data, mem_mask); return; } @@ -515,7 +515,7 @@ WRITE16_MEMBER( segaorun_state::misc_io_w ) // nop_w - no-op write when mapping ROMs as RAM //------------------------------------------------- -WRITE16_MEMBER( segaorun_state::nop_w ) +void segaorun_state::nop_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { } @@ -640,7 +640,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(segaorun_state::bankmotor_update) // for Out Run //------------------------------------------------- -READ16_MEMBER( segaorun_state::outrun_custom_io_r ) +uint16_t segaorun_state::outrun_custom_io_r(address_space &space, offs_t offset) { offset &= 0x7f/2; switch (offset & 0x70/2) @@ -673,7 +673,7 @@ READ16_MEMBER( segaorun_state::outrun_custom_io_r ) // for Out Run //------------------------------------------------- -WRITE16_MEMBER( segaorun_state::outrun_custom_io_w ) +void segaorun_state::outrun_custom_io_w(offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= 0x7f/2; switch (offset & 0x70/2) @@ -708,7 +708,7 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w ) return; case 0x70/2: - m_sprites->draw_write(space, offset, data, mem_mask); + m_sprites->draw_write(data); return; default: @@ -724,7 +724,7 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w ) // for Super Hang-On //------------------------------------------------- -READ16_MEMBER( segaorun_state::shangon_custom_io_r ) +uint16_t segaorun_state::shangon_custom_io_r(address_space &space, offs_t offset) { offset &= 0x303f/2; switch (offset) @@ -754,7 +754,7 @@ READ16_MEMBER( segaorun_state::shangon_custom_io_r ) // for Super Hang-On //------------------------------------------------- -WRITE16_MEMBER( segaorun_state::shangon_custom_io_w ) +void segaorun_state::shangon_custom_io_w(offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= 0x303f/2; switch (offset) @@ -2923,8 +2923,8 @@ void segaorun_state::init_generic() void segaorun_state::init_outrun() { init_generic(); - m_custom_io_r = read16_delegate(*this, FUNC(segaorun_state::outrun_custom_io_r)); - m_custom_io_w = write16_delegate(*this, FUNC(segaorun_state::outrun_custom_io_w)); + m_custom_io_r = read16m_delegate(*this, FUNC(segaorun_state::outrun_custom_io_r)); + m_custom_io_w = write16s_delegate(*this, FUNC(segaorun_state::outrun_custom_io_w)); } void segaorun_state::init_outrunb() @@ -2969,8 +2969,8 @@ void segaorun_state::init_shangon() { init_generic(); m_shangon_video = true; - m_custom_io_r = read16_delegate(*this, FUNC(segaorun_state::shangon_custom_io_r)); - m_custom_io_w = write16_delegate(*this, FUNC(segaorun_state::shangon_custom_io_w)); + m_custom_io_r = read16m_delegate(*this, FUNC(segaorun_state::shangon_custom_io_r)); + m_custom_io_w = write16s_delegate(*this, FUNC(segaorun_state::shangon_custom_io_w)); } diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index 8a0ddeb7aa3..b3ea925202a 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -242,7 +242,7 @@ void segas16a_state::tilemap_sound_w(uint8_t data) // standard_io_r - default I/O handler for reads //------------------------------------------------- -READ16_MEMBER( segas16a_state::standard_io_r ) +uint16_t segas16a_state::standard_io_r(offs_t offset) { offset &= 0x3fff/2; switch (offset & (0x3000/2)) @@ -268,7 +268,7 @@ READ16_MEMBER( segas16a_state::standard_io_r ) // standard_io_r - default I/O handler for writes //------------------------------------------------- -WRITE16_MEMBER( segas16a_state::standard_io_w ) +void segas16a_state::standard_io_w(offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= 0x3fff/2; switch (offset & (0x3000/2)) @@ -288,10 +288,10 @@ WRITE16_MEMBER( segas16a_state::standard_io_w ) // misc_io_r - miscellaneous I/O reads //------------------------------------------------- -READ16_MEMBER( segas16a_state::misc_io_r ) +uint16_t segas16a_state::misc_io_r(offs_t offset) { // just call custom handler - return m_custom_io_r(space, offset, mem_mask); + return m_custom_io_r(offset); } @@ -299,10 +299,10 @@ READ16_MEMBER( segas16a_state::misc_io_r ) // misc_io_w - miscellaneous I/O writes //------------------------------------------------- -WRITE16_MEMBER( segas16a_state::misc_io_w ) +void segas16a_state::misc_io_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // just call custom handler - m_custom_io_w(space, offset, data, mem_mask); + m_custom_io_w(offset, data, mem_mask); } @@ -707,7 +707,7 @@ void segas16a_state::dumpmtmt_i8751_sim() // for Ace Attacker //------------------------------------------------- -READ16_MEMBER( segas16a_state::aceattaca_custom_io_r ) +uint16_t segas16a_state::aceattaca_custom_io_r(offs_t offset) { switch (offset & (0x3000/2)) { @@ -750,10 +750,10 @@ READ16_MEMBER( segas16a_state::aceattaca_custom_io_r ) return m_cxdio->read(offset & 0x0f); break; } - return standard_io_r(space, offset, mem_mask); + return standard_io_r(offset); } -WRITE16_MEMBER( segas16a_state::aceattaca_custom_io_w ) +void segas16a_state::aceattaca_custom_io_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -765,7 +765,7 @@ WRITE16_MEMBER( segas16a_state::aceattaca_custom_io_w ) } break; } - standard_io_w(space, offset, data, mem_mask); + standard_io_w(offset, data, mem_mask); } @@ -774,7 +774,7 @@ WRITE16_MEMBER( segas16a_state::aceattaca_custom_io_w ) // for Major League //------------------------------------------------- -READ16_MEMBER( segas16a_state::mjleague_custom_io_r ) +uint16_t segas16a_state::mjleague_custom_io_r(offs_t offset) { switch (offset & (0x3000/2)) { @@ -845,7 +845,7 @@ READ16_MEMBER( segas16a_state::mjleague_custom_io_r ) } break; } - return standard_io_r(space, offset, mem_mask); + return standard_io_r(offset); } @@ -854,7 +854,7 @@ READ16_MEMBER( segas16a_state::mjleague_custom_io_r ) // for Passing Shot //------------------------------------------------- -READ16_MEMBER( segas16a_state::passsht16a_custom_io_r ) +uint16_t segas16a_state::passsht16a_custom_io_r(offs_t offset) { switch (offset & (0x3000/2)) { @@ -878,7 +878,7 @@ READ16_MEMBER( segas16a_state::passsht16a_custom_io_r ) } break; } - return standard_io_r(space, offset, mem_mask); + return standard_io_r(offset); } @@ -887,7 +887,7 @@ READ16_MEMBER( segas16a_state::passsht16a_custom_io_r ) // for SDI //------------------------------------------------- -READ16_MEMBER( segas16a_state::sdi_custom_io_r ) +uint16_t segas16a_state::sdi_custom_io_r(offs_t offset) { switch (offset & (0x3000/2)) { @@ -899,7 +899,7 @@ READ16_MEMBER( segas16a_state::sdi_custom_io_r ) } break; } - return standard_io_r(space, offset, mem_mask); + return standard_io_r(offset); } @@ -908,7 +908,7 @@ READ16_MEMBER( segas16a_state::sdi_custom_io_r ) // for Sukeban Jansi Ryuko //------------------------------------------------- -READ16_MEMBER( segas16a_state::sjryuko_custom_io_r ) +uint16_t segas16a_state::sjryuko_custom_io_r(offs_t offset) { switch (offset & (0x3000/2)) { @@ -925,7 +925,7 @@ READ16_MEMBER( segas16a_state::sjryuko_custom_io_r ) } break; } - return standard_io_r(space, offset, mem_mask); + return standard_io_r(offset); } @@ -3889,8 +3889,8 @@ void segas16a_state::init_generic() m_nvram->set_base(m_workram, m_workram.bytes()); // create default read/write handlers - m_custom_io_r = read16_delegate(*this, FUNC(segas16a_state::standard_io_r)); - m_custom_io_w = write16_delegate(*this, FUNC(segas16a_state::standard_io_w)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas16a_state::standard_io_r)); + m_custom_io_w = write16s_delegate(*this, FUNC(segas16a_state::standard_io_w)); // save state save_item(NAME(m_video_control)); @@ -3911,8 +3911,8 @@ void segas16a_state::init_generic() void segas16a_state::init_aceattaca() { init_generic(); - m_custom_io_r = read16_delegate(*this, FUNC(segas16a_state::aceattaca_custom_io_r)); - m_custom_io_w = write16_delegate(*this, FUNC(segas16a_state::aceattaca_custom_io_w)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas16a_state::aceattaca_custom_io_r)); + m_custom_io_w = write16s_delegate(*this, FUNC(segas16a_state::aceattaca_custom_io_w)); } void segas16a_state::init_dumpmtmt() @@ -3924,25 +3924,25 @@ void segas16a_state::init_dumpmtmt() void segas16a_state::init_mjleague() { init_generic(); - m_custom_io_r = read16_delegate(*this, FUNC(segas16a_state::mjleague_custom_io_r)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas16a_state::mjleague_custom_io_r)); } void segas16a_state::init_passsht16a() { init_generic(); - m_custom_io_r = read16_delegate(*this, FUNC(segas16a_state::passsht16a_custom_io_r)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas16a_state::passsht16a_custom_io_r)); } void segas16a_state::init_sdi() { init_generic(); - m_custom_io_r = read16_delegate(*this, FUNC(segas16a_state::sdi_custom_io_r)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas16a_state::sdi_custom_io_r)); } void segas16a_state::init_sjryukoa() { init_generic(); - m_custom_io_r = read16_delegate(*this, FUNC(segas16a_state::sjryuko_custom_io_r)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas16a_state::sjryuko_custom_io_r)); m_lamp_changed_w = lamp_changed_delegate(&segas16a_state::sjryuko_lamp_changed_w, this); } diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 5ace9a3586b..280d33a625d 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -970,7 +970,7 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t } -WRITE16_MEMBER( segas16b_state::sound_w16 ) +void segas16b_state::sound_w16(uint16_t data) { if (m_soundlatch != nullptr) m_soundlatch->write(data & 0xff); @@ -987,7 +987,7 @@ WRITE16_MEMBER( segas16b_state::sound_w16 ) // selection //------------------------------------------------- -WRITE16_MEMBER( segas16b_state::rom_5704_bank_w ) +void segas16b_state::rom_5704_bank_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) m_segaic16vid->tilemap_set_bank(0, offset & 1, data & 7); @@ -999,7 +999,7 @@ WRITE16_MEMBER( segas16b_state::rom_5704_bank_w ) // math chip reads //------------------------------------------------- -READ16_MEMBER( segas16b_state::rom_5797_bank_math_r ) +uint16_t segas16b_state::rom_5797_bank_math_r(address_space &space, offs_t offset, uint16_t mem_mask) { offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1021,7 +1021,7 @@ READ16_MEMBER( segas16b_state::rom_5797_bank_math_r ) // math chip writes, plus tile bank selection //------------------------------------------------- -WRITE16_MEMBER( segas16b_state::rom_5797_bank_math_w ) +void segas16b_state::rom_5797_bank_math_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1049,7 +1049,7 @@ WRITE16_MEMBER( segas16b_state::rom_5797_bank_math_w ) // for now treat as a second compare/timer chip //------------------------------------------------- -READ16_MEMBER( segas16b_state::unknown_rgn2_r ) +uint16_t segas16b_state::unknown_rgn2_r(address_space &space, offs_t offset, uint16_t mem_mask) { logerror("Region 2: read from %04X\n", offset * 2); return m_cmptimer_2->read(offset); @@ -1061,7 +1061,7 @@ READ16_MEMBER( segas16b_state::unknown_rgn2_r ) // for now treat as a second compare/timer chip //------------------------------------------------- -WRITE16_MEMBER( segas16b_state::unknown_rgn2_w ) +void segas16b_state::unknown_rgn2_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { logerror("Region 2: write to %04X = %04X & %04X\n", offset * 2, data, mem_mask); m_cmptimer_2->write(offset, data, mem_mask); @@ -1072,7 +1072,7 @@ WRITE16_MEMBER( segas16b_state::unknown_rgn2_w ) // standard_io_r - default I/O handler for reads //------------------------------------------------- -READ16_MEMBER( segas16b_state::standard_io_r ) +uint16_t segas16b_state::standard_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1095,7 +1095,7 @@ READ16_MEMBER( segas16b_state::standard_io_r ) // standard_io_w - default I/O handler for writes //------------------------------------------------- -WRITE16_MEMBER( segas16b_state::standard_io_w ) +void segas16b_state::standard_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1131,7 +1131,7 @@ WRITE16_MEMBER( segas16b_state::standard_io_w ) // YM2413 directly from the main CPU //------------------------------------------------- -WRITE16_MEMBER( segas16b_state::atomicp_sound_w ) +void segas16b_state::atomicp_sound_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { m_ym2413->write(offset, data >> 8); } @@ -1422,7 +1422,7 @@ void segas16b_state::wb3_i8751_sim() // for Ace Attacker //------------------------------------------------- -READ16_MEMBER( segas16b_state::aceattac_custom_io_r ) +uint16_t segas16b_state::aceattac_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1464,7 +1464,7 @@ READ16_MEMBER( segas16b_state::aceattac_custom_io_r ) return standard_io_r(space, offset, mem_mask); } -WRITE16_MEMBER( segas16b_state::aceattac_custom_io_w ) +void segas16b_state::aceattac_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1485,7 +1485,7 @@ WRITE16_MEMBER( segas16b_state::aceattac_custom_io_w ) // for Dunk Shot //------------------------------------------------- -READ16_MEMBER( segas16b_state::dunkshot_custom_io_r ) +uint16_t segas16b_state::dunkshot_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1512,7 +1512,7 @@ READ16_MEMBER( segas16b_state::dunkshot_custom_io_r ) // handlers for Heavyweight Champ //------------------------------------------------- -READ16_MEMBER( segas16b_state::hwchamp_custom_io_r ) +uint16_t segas16b_state::hwchamp_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { uint16_t result; @@ -1559,7 +1559,7 @@ READ16_MEMBER( segas16b_state::hwchamp_custom_io_r ) return standard_io_r(space, offset, mem_mask); } -WRITE16_MEMBER( segas16b_state::hwchamp_custom_io_w ) +void segas16b_state::hwchamp_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1608,7 +1608,7 @@ WRITE16_MEMBER( segas16b_state::hwchamp_custom_io_w ) // for Passing Shot //------------------------------------------------- -READ16_MEMBER( segas16b_state::passshtj_custom_io_r ) +uint16_t segas16b_state::passshtj_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1631,7 +1631,7 @@ READ16_MEMBER( segas16b_state::passshtj_custom_io_r ) // for SDI //------------------------------------------------- -READ16_MEMBER( segas16b_state::sdi_custom_io_r ) +uint16_t segas16b_state::sdi_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1654,7 +1654,7 @@ READ16_MEMBER( segas16b_state::sdi_custom_io_r ) // handlers for Sukeban Jansi Ryuko //------------------------------------------------- -READ16_MEMBER( segas16b_state::sjryuko_custom_io_r ) +uint16_t segas16b_state::sjryuko_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1674,7 +1674,7 @@ READ16_MEMBER( segas16b_state::sjryuko_custom_io_r ) return standard_io_r(space, offset, mem_mask); } -WRITE16_MEMBER( segas16b_state::sjryuko_custom_io_w ) +void segas16b_state::sjryuko_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { switch (offset & (0x3000/2)) { @@ -1850,14 +1850,14 @@ void segas16b_state::fpointbl_sound_map(address_map &map) } -READ16_MEMBER(segas16b_state::bootleg_custom_io_r) +uint16_t segas16b_state::bootleg_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { return m_custom_io_r(space, offset, mem_mask); } -WRITE16_MEMBER(segas16b_state::bootleg_custom_io_w) +void segas16b_state::bootleg_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { - m_custom_io_w(space, offset, data,mem_mask); + m_custom_io_w(space, offset, data, mem_mask); } @@ -9817,26 +9817,26 @@ removed. -WRITE16_MEMBER( isgsm_state::cart_addr_high_w ) +void isgsm_state::cart_addr_high_w(uint16_t data) { m_cart_addrlatch = data; } -WRITE16_MEMBER( isgsm_state::cart_addr_low_w ) +void isgsm_state::cart_addr_low_w(uint16_t data) { m_cart_addr = data | (m_cart_addrlatch << 16); } // the cart can be read here 8-bits at a time. // when reading from this port the data is xored by a fixed value depending on the cart -READ16_MEMBER( isgsm_state::cart_data_r ) +uint16_t isgsm_state::cart_data_r() { int size = memregion("gamecart_rgn")->bytes(); uint8_t *rgn = memregion("gamecart_rgn")->base(); return rgn[(++m_cart_addr & (size - 1)) ^ 1] ^ m_read_xor; } -WRITE16_MEMBER( isgsm_state::data_w ) +void isgsm_state::data_w(uint16_t data) { uint8_t *dest = nullptr; @@ -9979,19 +9979,19 @@ WRITE16_MEMBER( isgsm_state::data_w ) } -WRITE16_MEMBER( isgsm_state::datatype_w ) +void isgsm_state::datatype_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //printf("type set to %04x %04x\n", data, mem_mask); m_data_type = data; } -WRITE16_MEMBER( isgsm_state::addr_high_w ) +void isgsm_state::addr_high_w(uint16_t data) { // this is latched, doesn't get applied until low part is written. m_addr_latch = data; } -WRITE16_MEMBER( isgsm_state::addr_low_w ) +void isgsm_state::addr_low_w(uint16_t data) { // update the address and mode m_data_mode = (m_addr_latch & 0xf000) >> 12; @@ -10003,7 +10003,7 @@ WRITE16_MEMBER( isgsm_state::addr_low_w ) m_rle_latched = false; } -WRITE16_MEMBER( isgsm_state::cart_security_high_w ) +void isgsm_state::cart_security_high_w(uint16_t data) { // this is latched, doesn't get applied until low part is written. m_security_latch = data; @@ -10022,7 +10022,7 @@ uint32_t isgsm_state::tetrbx_security(uint32_t input) -WRITE16_MEMBER( isgsm_state::cart_security_low_w ) +void isgsm_state::cart_security_low_w(uint16_t data) { m_security_value = data | m_security_latch << 16; // come up with security answer @@ -10030,17 +10030,17 @@ WRITE16_MEMBER( isgsm_state::cart_security_low_w ) m_security_value = m_security_callback(m_security_value); } -READ16_MEMBER( isgsm_state::cart_security_low_r ) +uint16_t isgsm_state::cart_security_low_r() { return m_security_value & 0xffff; } -READ16_MEMBER( isgsm_state::cart_security_high_r ) +uint16_t isgsm_state::cart_security_high_r() { return (m_security_value >> 16) & 0xffff; } -WRITE16_MEMBER( isgsm_state::sound_reset_w ) +void isgsm_state::sound_reset_w(uint16_t data) { if (data == 0) { @@ -10054,7 +10054,7 @@ WRITE16_MEMBER( isgsm_state::sound_reset_w ) } } -WRITE16_MEMBER( isgsm_state::main_bank_change_w ) +void isgsm_state::main_bank_change_w(uint16_t data) { // other values on real hw have strange results, change memory mapping etc?? if (data !=0 ) diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index 62ae430220c..12622617bef 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -203,7 +203,7 @@ void segas18_state::misc_outputs_w(uint8_t data) } -READ16_MEMBER( segas18_state::misc_io_r ) +uint16_t segas18_state::misc_io_r(address_space &space, offs_t offset, uint16_t mem_mask) { offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -222,12 +222,12 @@ READ16_MEMBER( segas18_state::misc_io_r ) } if (!m_custom_io_r.isnull()) - return m_custom_io_r(space, offset, mem_mask); + return m_custom_io_r(mem_mask); logerror("%06X:misc_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2); return m_mapper->open_bus_r(); } -WRITE16_MEMBER( segas18_state::misc_io_w ) +void segas18_state::misc_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -254,7 +254,7 @@ WRITE16_MEMBER( segas18_state::misc_io_w ) if (!m_custom_io_w.isnull()) { - m_custom_io_w(space, offset, data, mem_mask); + m_custom_io_w(offset, data); return; } logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", m_maincpu->pc(), offset * 2, data, mem_mask); @@ -281,7 +281,7 @@ void segas18_state::rom_5874_bank_w(uint8_t data) } -WRITE16_MEMBER( segas18_state::rom_5987_bank_w ) +void segas18_state::rom_5987_bank_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { if (!ACCESSING_BITS_0_7) return; @@ -309,7 +309,7 @@ WRITE16_MEMBER( segas18_state::rom_5987_bank_w ) } } -WRITE16_MEMBER( segas18_state::rom_837_7525_bank_w ) +void segas18_state::rom_837_7525_bank_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { if (!ACCESSING_BITS_0_7) return; @@ -343,7 +343,7 @@ WRITE16_MEMBER( segas18_state::rom_837_7525_bank_w ) * *************************************/ -READ16_MEMBER( segas18_state::ddcrew_custom_io_r ) +uint16_t segas18_state::ddcrew_custom_io_r(offs_t offset) { switch (offset) { @@ -367,7 +367,7 @@ READ16_MEMBER( segas18_state::ddcrew_custom_io_r ) * *************************************/ -READ16_MEMBER( segas18_state::lghost_custom_io_r ) +uint16_t segas18_state::lghost_custom_io_r(offs_t offset) { uint16_t result; switch (offset) @@ -383,7 +383,7 @@ READ16_MEMBER( segas18_state::lghost_custom_io_r ) return m_mapper->open_bus_r(); } -WRITE16_MEMBER( segas18_state::lghost_custom_io_w ) +void segas18_state::lghost_custom_io_w(offs_t offset, uint16_t data) { uint8_t pos_value_x, pos_value_y; @@ -579,7 +579,7 @@ void segas18_state::lghost_gun_recoil_w(uint8_t data) * *************************************/ -READ16_MEMBER( segas18_state::wwally_custom_io_r ) +uint16_t segas18_state::wwally_custom_io_r(offs_t offset) { if (offset >= 0x3000/2 && offset < 0x3018/2) return m_upd4701[(offset & 0x0018/2) >> 2]->read_xy(offset & 0x0006/2); @@ -588,7 +588,7 @@ READ16_MEMBER( segas18_state::wwally_custom_io_r ) } -WRITE16_MEMBER( segas18_state::wwally_custom_io_w ) +void segas18_state::wwally_custom_io_w(offs_t offset, uint16_t data) { if (offset >= 0x3000/2 && offset < 0x3018/2) m_upd4701[(offset & 0x0018/2) >> 2]->reset_xy_r(); @@ -3187,21 +3187,21 @@ void segas18_state::init_hamaway() void segas18_state::init_ddcrew() { init_generic_5987(); - m_custom_io_r = read16_delegate(*this, FUNC(segas18_state::ddcrew_custom_io_r)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas18_state::ddcrew_custom_io_r)); } void segas18_state::init_lghost() { init_generic_5987(); - m_custom_io_r = read16_delegate(*this, FUNC(segas18_state::lghost_custom_io_r)); - m_custom_io_w = write16_delegate(*this, FUNC(segas18_state::lghost_custom_io_w)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas18_state::lghost_custom_io_r)); + m_custom_io_w = write16sm_delegate(*this, FUNC(segas18_state::lghost_custom_io_w)); } void segas18_state::init_wwally() { init_generic_5987(); - m_custom_io_r = read16_delegate(*this, FUNC(segas18_state::wwally_custom_io_r)); - m_custom_io_w = write16_delegate(*this, FUNC(segas18_state::wwally_custom_io_w)); + m_custom_io_r = read16sm_delegate(*this, FUNC(segas18_state::wwally_custom_io_r)); + m_custom_io_w = write16sm_delegate(*this, FUNC(segas18_state::wwally_custom_io_w)); } diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp index 11920b84c8b..0547a0506a0 100644 --- a/src/mame/drivers/segas24.cpp +++ b/src/mame/drivers/segas24.cpp @@ -400,7 +400,7 @@ void segas24_state::device_post_load() } } -READ16_MEMBER( segas24_state::fdc_r ) +uint16_t segas24_state::fdc_r(offs_t offset) { if(!m_track_size) return 0xffff; @@ -435,7 +435,7 @@ READ16_MEMBER( segas24_state::fdc_r ) } } -WRITE16_MEMBER( segas24_state::fdc_w ) +void segas24_state::fdc_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(!m_track_size) return; @@ -525,7 +525,7 @@ WRITE16_MEMBER( segas24_state::fdc_w ) } } -READ16_MEMBER( segas24_state::fdc_status_r ) +uint16_t segas24_state::fdc_status_r() { if(!m_track_size) return 0xffff; @@ -533,7 +533,7 @@ READ16_MEMBER( segas24_state::fdc_status_r ) return 0x90 | (m_fdc_irq ? 2 : 0) | (m_fdc_drq ? 1 : 0) | (m_fdc_phys_track ? 0x40 : 0) | (m_fdc_index_count ? 0x20 : 0); } -WRITE16_MEMBER( segas24_state::fdc_ctrl_w ) +void segas24_state::fdc_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(ACCESSING_BITS_0_7) FDC_LOG(("FDC control %02x\n", data & 0xff)); @@ -576,13 +576,13 @@ void segas24_state::hotrod_lamps_w(uint8_t data) // Lamps } -READ16_MEMBER( segas24_state::iod_r ) +uint16_t segas24_state::iod_r(offs_t offset) { logerror("IO daughterboard read %02x %s\n", offset, machine().describe_context()); return 0xffff; } -WRITE16_MEMBER( segas24_state::iod_w ) +void segas24_state::iod_w(offs_t offset, uint16_t data, uint16_t mem_mask) { logerror("IO daughterboard write %02x, %04x & %04x %s\n", offset, data, mem_mask, machine().describe_context()); } @@ -685,30 +685,30 @@ void segas24_state::reset_bank() } } -READ8_MEMBER( segas24_state::curbank_r ) +uint8_t segas24_state::curbank_r() { return m_curbank; } -WRITE8_MEMBER( segas24_state::curbank_w ) +void segas24_state::curbank_w(uint8_t data) { m_curbank = data; reset_bank(); } -READ8_MEMBER( segas24_state::frc_mode_r ) +uint8_t segas24_state::frc_mode_r() { return m_frc_mode & 1; } -WRITE8_MEMBER( segas24_state::frc_mode_w ) +void segas24_state::frc_mode_w(uint8_t data) { /* reset frc if a write happens here */ m_frc_cnt_timer->reset(); m_frc_mode = data & 1; } -READ8_MEMBER( segas24_state::frc_r ) +uint8_t segas24_state::frc_r() { int32_t result = (m_frc_cnt_timer->time_elapsed() * (m_frc_mode ? FRC_CLOCK_MODE1 : FRC_CLOCK_MODE0).dvalue()).as_double(); @@ -717,7 +717,7 @@ READ8_MEMBER( segas24_state::frc_r ) return result; } -WRITE8_MEMBER( segas24_state::frc_w ) +void segas24_state::frc_w(uint8_t data) { /* Undocumented behaviour, Bonanza Bros. seems to use this for irq ack'ing ... */ m_maincpu->set_input_line(IRQ_FRC+1, CLEAR_LINE); @@ -736,12 +736,12 @@ const uint8_t segas24_state::s_quizmeku_mlt[8] = { 0, 3, 2, 4, 6, 1, 7, 5 }; const uint8_t segas24_state::s_dcclub_mlt[8] = { 4, 7, 3, 0, 2, 6, 5, 1 }; -READ8_MEMBER( segas24_state::mlatch_r ) +uint8_t segas24_state::mlatch_r() { return m_mlatch; } -WRITE8_MEMBER( segas24_state::mlatch_w ) +void segas24_state::mlatch_w(uint8_t data) { int i; uint8_t mxor = 0; @@ -876,7 +876,7 @@ void segas24_state::irq_init() m_irq_vsynctime = attotime::zero; } -WRITE16_MEMBER(segas24_state::irq_w) +void segas24_state::irq_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch(offset) { case 0: { @@ -925,7 +925,7 @@ WRITE16_MEMBER(segas24_state::irq_w) // 410 cycles/ligne // 410*0x200/26 = 8073 -READ16_MEMBER(segas24_state::irq_r) +uint16_t segas24_state::irq_r(offs_t offset) { switch(offset) { case 2: @@ -985,12 +985,12 @@ WRITE_LINE_MEMBER(segas24_state::irq_ym) // 315-5242 -READ16_MEMBER( segas24_state::paletteram_r ) +uint16_t segas24_state::paletteram_r(offs_t offset) { return m_paletteram[offset]; } -WRITE16_MEMBER( segas24_state::paletteram_w ) +void segas24_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int r, g, b; COMBINE_DATA (m_paletteram + offset); diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index ce33f9f330b..d07f28549dc 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -714,7 +714,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(segas32_state::signal_v60_irq_callback) } -READ8_MEMBER(segas32_state::int_control_r) +uint8_t segas32_state::int_control_r(offs_t offset) { switch (offset) { @@ -732,7 +732,7 @@ READ8_MEMBER(segas32_state::int_control_r) } -WRITE8_MEMBER(segas32_state::int_control_w) +void segas32_state::int_control_w(offs_t offset, uint8_t data) { int duration; @@ -876,12 +876,12 @@ WRITE_LINE_MEMBER(segas32_state::display_enable_w) * *************************************/ -WRITE16_MEMBER(segas32_state::random_number_w) +void segas32_state::random_number_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // osd_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", m_maincpu->pc(), offset*2, data, mem_mask); } -READ16_MEMBER(segas32_state::random_number_r) +uint16_t segas32_state::random_number_r() { return machine().rand(); } @@ -893,13 +893,13 @@ READ16_MEMBER(segas32_state::random_number_r) * *************************************/ -READ8_MEMBER(segas32_state::shared_ram_r) +uint8_t segas32_state::shared_ram_r(offs_t offset) { return m_z80_shared_ram[offset]; } -WRITE8_MEMBER(segas32_state::shared_ram_w) +void segas32_state::shared_ram_w(offs_t offset, uint8_t data) { m_z80_shared_ram[offset] = data; } @@ -950,7 +950,7 @@ void segas32_state::clear_sound_irq(int which) } -WRITE8_MEMBER(segas32_state::sound_int_control_lo_w) +void segas32_state::sound_int_control_lo_w(offs_t offset, uint8_t data) { /* odd offsets are interrupt acks */ if (offset & 1) @@ -965,7 +965,7 @@ WRITE8_MEMBER(segas32_state::sound_int_control_lo_w) } -WRITE8_MEMBER(segas32_state::sound_int_control_hi_w) +void segas32_state::sound_int_control_hi_w(offs_t offset, uint8_t data) { m_sound_irq_control[offset] = data; update_sound_irq_state(); @@ -987,28 +987,28 @@ WRITE_LINE_MEMBER(segas32_state::ym3438_irq_handler) * *************************************/ -WRITE8_MEMBER(segas32_state::sound_bank_lo_w) +void segas32_state::sound_bank_lo_w(uint8_t data) { m_sound_bank = (m_sound_bank & ~0x3f) | (data & 0x3f); m_soundrom_bank->set_entry(m_sound_bank); } -WRITE8_MEMBER(segas32_state::sound_bank_hi_w) +void segas32_state::sound_bank_hi_w(uint8_t data) { m_sound_bank = (m_sound_bank & 0x3f) | ((data & 0x04) << 4) | ((data & 0x03) << 7); m_soundrom_bank->set_entry(m_sound_bank); } -WRITE8_MEMBER(segas32_state::multipcm_bank_w) +void segas32_state::multipcm_bank_w(uint8_t data) { m_multipcm_bank_hi->set_entry((data >> 3) & 7); m_multipcm_bank_lo->set_entry(data & 7); } -WRITE8_MEMBER(segas32_state::scross_bank_w) +void segas32_state::scross_bank_w(uint8_t data) { m_multipcm_bank_hi->set_entry(data & 7); m_multipcm_bank_lo->set_entry(data & 7); @@ -1021,13 +1021,13 @@ WRITE8_MEMBER(segas32_state::scross_bank_w) * *************************************/ -READ8_MEMBER(segas32_state::sound_dummy_r) +uint8_t segas32_state::sound_dummy_r() { return m_sound_dummy_value; } -WRITE8_MEMBER(segas32_state::sound_dummy_w) +void segas32_state::sound_dummy_w(uint8_t data) { m_sound_dummy_value = data; } @@ -1077,7 +1077,7 @@ inline void segas32_state::update_color(int offset, uint16_t data) *************************************/ template<int Which> -READ16_MEMBER(segas32_state::paletteram_r) +uint16_t segas32_state::paletteram_r(offs_t offset) { int convert; @@ -1095,7 +1095,7 @@ READ16_MEMBER(segas32_state::paletteram_r) } template<int Which> -WRITE16_MEMBER(segas32_state::paletteram_w) +void segas32_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t value; int convert; @@ -1138,13 +1138,13 @@ WRITE16_MEMBER(segas32_state::paletteram_w) *************************************/ template<int Which> -READ16_MEMBER(segas32_state::mixer_r) +uint16_t segas32_state::mixer_r(offs_t offset) { return m_mixer_control[Which][offset]; } template<int Which> -WRITE16_MEMBER(segas32_state::mixer_w) +void segas32_state::mixer_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_mixer_control[Which][offset]); } @@ -2679,7 +2679,7 @@ ioport_value sega_multi32_analog_state::in3_analog_read() return m_analog_ports[m_analog_bank * 4 + 3].read_safe(0); } -WRITE8_MEMBER(sega_multi32_analog_state::analog_bank_w) +void sega_multi32_analog_state::analog_bank_w(uint8_t data) { m_analog_bank = data & 1; } @@ -5707,7 +5707,8 @@ void segas32_state::init_alien3() void segas32_state::init_arescue(int m_hasdsp) { segas32_common_init(); - if (m_hasdsp) m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa00007, read16_delegate(*this, FUNC(segas32_state::arescue_dsp_r)), write16_delegate(*this, FUNC(segas32_state::arescue_dsp_w))); + if (m_hasdsp) m_maincpu->space(AS_PROGRAM).install_read_handler(0xa00000, 0xa00007, read16sm_delegate(*this, FUNC(segas32_state::arescue_dsp_r))); + if (m_hasdsp) m_maincpu->space(AS_PROGRAM).install_write_handler(0xa00000, 0xa00007, write16s_delegate(*this, FUNC(segas32_state::arescue_dsp_w))); for (auto & elem : m_arescue_dsp_io) elem = 0x00; @@ -5728,8 +5729,8 @@ void segas32_state::init_brival() /* install protection handlers */ m_system32_protram = std::make_unique<uint16_t[]>(0x1000/2); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x20ba00, 0x20ba07, read16_delegate(*this, FUNC(segas32_state::brival_protection_r))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xa00000, 0xa00fff, write16_delegate(*this, FUNC(segas32_state::brival_protection_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x20ba00, 0x20ba07, read16s_delegate(*this, FUNC(segas32_state::brival_protection_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa00000, 0xa00fff, write16sm_delegate(*this, FUNC(segas32_state::brival_protection_w))); } @@ -5738,7 +5739,7 @@ void segas32_state::init_darkedge() segas32_common_init(); /* install protection handlers */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(*this, FUNC(segas32_state::darkedge_protection_r)), write16_delegate(*this, FUNC(segas32_state::darkedge_protection_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa7ffff, read16s_delegate(*this, FUNC(segas32_state::darkedge_protection_r)), write16s_delegate(*this, FUNC(segas32_state::darkedge_protection_w))); m_system32_prot_vblank = &segas32_state::darkedge_fd1149_vblank; } @@ -5748,7 +5749,8 @@ void segas32_state::init_dbzvrvs() segas32_common_init(); /* install protection handlers */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(*this, FUNC(segas32_state::dbzvrvs_protection_r)), write16_delegate(*this, FUNC(segas32_state::dbzvrvs_protection_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xa00000, 0xa7ffff, read16smo_delegate(*this, FUNC(segas32_state::dbzvrvs_protection_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa00000, 0xa7ffff, write16mo_delegate(*this, FUNC(segas32_state::dbzvrvs_protection_w))); // 0x810000 to 0x8107ff = link RAM? probably not a dual cabinet, though... } @@ -5849,7 +5851,7 @@ void segas32_state::init_radr() void segas32_state::init_scross() { segas32_common_init(); - m_soundcpu->space(AS_PROGRAM).install_write_handler(0xb0, 0xbf, write8_delegate(*this, FUNC(segas32_state::scross_bank_w))); + m_soundcpu->space(AS_PROGRAM).install_write_handler(0xb0, 0xbf, write8smo_delegate(*this, FUNC(segas32_state::scross_bank_w))); m_sw1_output = &segas32_state::scross_sw1_output; m_sw2_output = &segas32_state::scross_sw2_output; @@ -5869,7 +5871,7 @@ void segas32_state::init_sonic() segas32_common_init(); /* install protection handlers */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x20E5C4, 0x20E5C5, write16_delegate(*this, FUNC(segas32_state::sonic_level_load_protection))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x20E5C4, 0x20E5C5, write16s_delegate(*this, FUNC(segas32_state::sonic_level_load_protection))); } diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index 025384faa89..c13c2120879 100644 --- a/src/mame/drivers/segasp.cpp +++ b/src/mame/drivers/segasp.cpp @@ -88,14 +88,14 @@ G 171-8278G 315-6416 2x 512Mbit RMI #include "includes/segasp.h" #include "machine/naomim4.h" -READ64_MEMBER(segasp_state::sp_bank_r) +uint64_t segasp_state::sp_bank_r(offs_t offset, uint64_t mem_mask) { if (ACCESSING_BITS_32_63) return -1; return m_sp_bank; } -WRITE64_MEMBER(segasp_state::sp_bank_w) +void segasp_state::sp_bank_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_32_63) return; @@ -105,7 +105,7 @@ WRITE64_MEMBER(segasp_state::sp_bank_w) m_sp_bank = bank; } -READ64_MEMBER(segasp_state::sn_93c46a_r) +uint64_t segasp_state::sn_93c46a_r() { int res; @@ -115,7 +115,7 @@ READ64_MEMBER(segasp_state::sn_93c46a_r) return res; } -WRITE64_MEMBER(segasp_state::sn_93c46a_w) +void segasp_state::sn_93c46a_w(uint64_t data) { /* bit 4 is data */ /* bit 2 is clock */ @@ -125,14 +125,14 @@ WRITE64_MEMBER(segasp_state::sn_93c46a_w) m_eeprom->clk_write((data & 0x4) ? ASSERT_LINE : CLEAR_LINE); } -READ64_MEMBER(segasp_state::sp_eeprom_r) +uint64_t segasp_state::sp_eeprom_r(offs_t offset, uint64_t mem_mask) { if (ACCESSING_BITS_32_63) return -1; return m_sp_eeprom->do_read() << 4; } -WRITE64_MEMBER(segasp_state::sp_eeprom_w) +void segasp_state::sp_eeprom_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_32_63) return; @@ -141,14 +141,14 @@ WRITE64_MEMBER(segasp_state::sp_eeprom_w) m_sp_eeprom->clk_write((data & 4) ? ASSERT_LINE : CLEAR_LINE); } -READ64_MEMBER(segasp_state::sp_rombdflg_r) +uint64_t segasp_state::sp_rombdflg_r() { // bit 0 - romboard type, 1 = M4 // bit 1 - debug mode (enable easter eggs in BIOS, can boot game without proper eeproms/settings) return ioport("CFG")->read(); } -READ64_MEMBER(segasp_state::sp_io_r) +uint64_t segasp_state::sp_io_r(offs_t offset, uint64_t mem_mask) { uint64_t retval; diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 1478342320c..2c0e024f2ca 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -537,7 +537,7 @@ void segaxbd_state::pd_0_w(uint8_t data) // port //------------------------------------------------- -WRITE16_MEMBER( segaxbd_state::iocontrol_w ) +void segaxbd_state::iocontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -558,7 +558,7 @@ WRITE16_MEMBER( segaxbd_state::iocontrol_w ) // writes to this address for Line of Fire //------------------------------------------------- -WRITE16_MEMBER( segaxbd_state::loffire_sync0_w ) +void segaxbd_state::loffire_sync0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_loffire_sync[offset]); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10)); @@ -570,7 +570,7 @@ WRITE16_MEMBER( segaxbd_state::loffire_sync0_w ) // Super Monaco GP //------------------------------------------------- -READ16_MEMBER( segaxbd_state::smgp_excs_r ) +uint16_t segaxbd_state::smgp_excs_r(offs_t offset) { //logerror("%06X:smgp_excs_r(%04X)\n", m_maincpu->pc(), offset*2); return 0xffff; @@ -582,7 +582,7 @@ READ16_MEMBER( segaxbd_state::smgp_excs_r ) // Super Monaco GP //------------------------------------------------- -WRITE16_MEMBER( segaxbd_state::smgp_excs_w ) +void segaxbd_state::smgp_excs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //logerror("%06X:smgp_excs_w(%04X) = %04X & %04X\n", m_maincpu->pc(), offset*2, data, mem_mask); } @@ -721,7 +721,7 @@ void segaxbd_state::smgp_motor_w(uint8_t data) // dual-port communications RAM for Royal Ascot //------------------------------------------------- -READ8_MEMBER(segaxbd_rascot_state::commram_r) +uint8_t segaxbd_rascot_state::commram_r(offs_t offset) { return m_commram->right_r(m_commram_bank << 3 | offset); } @@ -732,7 +732,7 @@ READ8_MEMBER(segaxbd_rascot_state::commram_r) // dual-port communications RAM for Royal Ascot //------------------------------------------------- -WRITE8_MEMBER(segaxbd_rascot_state::commram_w) +void segaxbd_rascot_state::commram_w(offs_t offset, uint8_t data) { m_commram->right_w(m_commram_bank << 3 | offset, data); } @@ -743,7 +743,7 @@ WRITE8_MEMBER(segaxbd_rascot_state::commram_w) // of 8 bytes //------------------------------------------------- -WRITE8_MEMBER(segaxbd_rascot_state::commram_bank_w) +void segaxbd_rascot_state::commram_bank_w(uint8_t data) { m_commram_bank = data; } @@ -889,7 +889,7 @@ void segaxbd_state::palette_init() // paletteram_w - handle writes to palette RAM //------------------------------------------------- -WRITE16_MEMBER( segaxbd_state::paletteram_w ) +void segaxbd_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // compute the number of entries if (m_palette_entries == 0) @@ -4665,7 +4665,7 @@ void segaxbd_state::install_loffire(void) m_adc_reverse[1] = m_adc_reverse[3] = true; // install sync hack on core shared memory - m_maincpu->space(AS_PROGRAM).install_write_handler(0x29c000, 0x29c011, write16_delegate(*this, FUNC(segaxbd_state::loffire_sync0_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x29c000, 0x29c011, write16s_delegate(*this, FUNC(segaxbd_state::loffire_sync0_w))); m_loffire_sync = m_subram0; } @@ -4678,7 +4678,8 @@ void segaxbd_new_state::init_loffire() void segaxbd_state::install_smgp(void) { // map /EXCS space - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2f0000, 0x2f3fff, read16_delegate(*this, FUNC(segaxbd_state::smgp_excs_r)), write16_delegate(*this, FUNC(segaxbd_state::smgp_excs_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2f0000, 0x2f3fff, read16sm_delegate(*this, FUNC(segaxbd_state::smgp_excs_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x2f0000, 0x2f3fff, write16s_delegate(*this, FUNC(segaxbd_state::smgp_excs_w))); } void segaxbd_new_state::init_smgp() diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 5bb573c8934..240225bbac6 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -671,17 +671,17 @@ WRITE_LINE_MEMBER(segaybd_state::mb8421_intr) } -READ16_MEMBER(segaybd_state::link_r) +uint16_t segaybd_state::link_r() { return machine().rand(); } -READ16_MEMBER(segaybd_state::link2_r) +uint16_t segaybd_state::link2_r() { return 0x0000; } -WRITE16_MEMBER(segaybd_state::link2_w) +void segaybd_state::link2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data &= mem_mask; logerror("link2_w %04x\n", data); diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index ca791cf23d2..495b44ca4f0 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -2010,50 +2010,50 @@ void seibuspi_state::sys386f(machine_config &config) void seibuspi_state::init_senkyu() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x0018cb4, 0x0018cb7, read32_delegate(*this, FUNC(seibuspi_state::senkyu_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x0018cb4, 0x0018cb7, read32smo_delegate(*this, FUNC(seibuspi_state::senkyu_speedup_r))); init_sei252(); } void seibuspi_state::init_senkyua() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x0018c9c, 0x0018c9f, read32_delegate(*this, FUNC(seibuspi_state::senkyua_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x0018c9c, 0x0018c9f, read32smo_delegate(*this, FUNC(seibuspi_state::senkyua_speedup_r))); init_sei252(); } void seibuspi_state::init_batlball() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x0018db4, 0x0018db7, read32_delegate(*this, FUNC(seibuspi_state::batlball_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x0018db4, 0x0018db7, read32smo_delegate(*this, FUNC(seibuspi_state::batlball_speedup_r))); init_sei252(); } void seibuspi_state::init_viprp1() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x001e2e0, 0x001e2e3, read32_delegate(*this, FUNC(seibuspi_state::viprp1_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x001e2e0, 0x001e2e3, read32smo_delegate(*this, FUNC(seibuspi_state::viprp1_speedup_r))); init_sei252(); } void seibuspi_state::init_viprp1o() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x001d49c, 0x001d49f, read32_delegate(*this, FUNC(seibuspi_state::viprp1o_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x001d49c, 0x001d49f, read32smo_delegate(*this, FUNC(seibuspi_state::viprp1o_speedup_r))); init_sei252(); } void seibuspi_state::init_ejanhs() { // idle skip doesn't work properly? -// if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x002d224, 0x002d227, read32_delegate(*this, FUNC(seibuspi_state::ejanhs_speedup_r))); +// if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x002d224, 0x002d227, read32smo_delegate(*this, FUNC(seibuspi_state::ejanhs_speedup_r))); init_sei252(); } void seibuspi_state::init_rdft() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x00298d0, 0x00298d3, read32_delegate(*this, FUNC(seibuspi_state::rdft_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x00298d0, 0x00298d3, read32smo_delegate(*this, FUNC(seibuspi_state::rdft_speedup_r))); init_sei252(); } void seibuspi_state::init_rdft2() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x00282ac, 0x00282af, read32_delegate(*this, FUNC(seibuspi_state::rf2_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x00282ac, 0x00282af, read32smo_delegate(*this, FUNC(seibuspi_state::rf2_speedup_r))); rdft2_text_decrypt(memregion("chars")->base()); rdft2_bg_decrypt(memregion("tiles")->base(), memregion("tiles")->bytes()); @@ -2063,7 +2063,7 @@ void seibuspi_state::init_rdft2() void seibuspi_state::init_rfjet() { - if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x002894c, 0x002894f, read32_delegate(*this, FUNC(seibuspi_state::rfjet_speedup_r))); + if (ENABLE_SPEEDUP_HACKS) m_maincpu->space(AS_PROGRAM).install_read_handler(0x002894c, 0x002894f, read32smo_delegate(*this, FUNC(seibuspi_state::rfjet_speedup_r))); rfjet_text_decrypt(memregion("chars")->base()); rfjet_bg_decrypt(memregion("tiles")->base(), memregion("tiles")->bytes()); @@ -2072,21 +2072,21 @@ void seibuspi_state::init_rfjet() } -READ32_MEMBER(seibuspi_state::senkyu_speedup_r) +u32 seibuspi_state::senkyu_speedup_r() { if (m_maincpu->pc()==0x00305bb2) m_maincpu->spin_until_interrupt(); // idle return m_mainram[0x0018cb4/4]; } -READ32_MEMBER(seibuspi_state::senkyua_speedup_r) +u32 seibuspi_state::senkyua_speedup_r() { if (m_maincpu->pc()== 0x30582e) m_maincpu->spin_until_interrupt(); // idle return m_mainram[0x0018c9c/4]; } -READ32_MEMBER(seibuspi_state::batlball_speedup_r) +u32 seibuspi_state::batlball_speedup_r() { // printf("m_maincpu->pc() %06x\n", m_maincpu->pc()); @@ -2099,7 +2099,7 @@ READ32_MEMBER(seibuspi_state::batlball_speedup_r) return m_mainram[0x0018db4/4]; } -READ32_MEMBER(seibuspi_state::viprp1_speedup_r) +u32 seibuspi_state::viprp1_speedup_r() { /* viprp1 */ if (m_maincpu->pc()==0x0202769) m_maincpu->spin_until_interrupt(); // idle @@ -2115,7 +2115,7 @@ READ32_MEMBER(seibuspi_state::viprp1_speedup_r) return m_mainram[0x001e2e0/4]; } -READ32_MEMBER(seibuspi_state::viprp1o_speedup_r) +u32 seibuspi_state::viprp1o_speedup_r() { /* viperp1o */ if (m_maincpu->pc()==0x0201f99) m_maincpu->spin_until_interrupt(); // idle @@ -2125,7 +2125,7 @@ READ32_MEMBER(seibuspi_state::viprp1o_speedup_r) #ifdef UNUSED_FUNCTION // causes input problems? -READ32_MEMBER(seibuspi_state::ejanhs_speedup_r) +u32 seibuspi_state::ejanhs_speedup_r() { // osd_printf_debug("%08x\n",m_maincpu->pc()); if (m_maincpu->pc()==0x03032c7) m_maincpu->spin_until_interrupt(); // idle @@ -2133,7 +2133,7 @@ READ32_MEMBER(seibuspi_state::ejanhs_speedup_r) } #endif -READ32_MEMBER(seibuspi_state::rdft_speedup_r) +u32 seibuspi_state::rdft_speedup_r() { /* rdft */ if (m_maincpu->pc()==0x0203f06) m_maincpu->spin_until_interrupt(); // idle @@ -2161,7 +2161,7 @@ READ32_MEMBER(seibuspi_state::rdft_speedup_r) return m_mainram[0x00298d0/4]; } -READ32_MEMBER(seibuspi_state::rf2_speedup_r) +u32 seibuspi_state::rf2_speedup_r() { /* rdft22kc */ if (m_maincpu->pc()==0x0203926) m_maincpu->spin_until_interrupt(); // idle @@ -2180,7 +2180,7 @@ READ32_MEMBER(seibuspi_state::rf2_speedup_r) return m_mainram[0x0282ac/4]; } -READ32_MEMBER(seibuspi_state::rfjet_speedup_r) +u32 seibuspi_state::rfjet_speedup_r() { /* rfjet, rfjetu, rfjeta */ if (m_maincpu->pc()==0x0206082) m_maincpu->spin_until_interrupt(); // idle diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp index 3e0e0ea9040..7dcdf112645 100644 --- a/src/mame/drivers/seicross.cpp +++ b/src/mame/drivers/seicross.cpp @@ -105,7 +105,7 @@ void seicross_state::portB_w(uint8_t data) m_portb = data; } -WRITE8_MEMBER(seicross_state::dac_w) +void seicross_state::dac_w(uint8_t data) { m_dac->write(data >> 4); } diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 45283224ee8..8e7ccda05df 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -102,18 +102,18 @@ void senjyo_state::machine_reset() m_sound_state = 0; } -WRITE8_MEMBER(senjyo_state::irq_ctrl_w) +void senjyo_state::irq_ctrl_w(uint8_t data) { // irq ack is mandatory for senjyo: it's basically used as an irq mask during POST. m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(senjyo_state::flip_screen_w) +void senjyo_state::flip_screen_w(uint8_t data) { flip_screen_set(data); } -WRITE8_MEMBER(senjyo_state::sound_cmd_w) +void senjyo_state::sound_cmd_w(uint8_t data) { m_sound_cmd = data; @@ -185,13 +185,13 @@ void senjyo_state::senjyo_sound_io_map(address_map &map) /* For the bootleg */ /* are scroll registers 1+2 linked on the bootleg?, only one copy is written */ -WRITE8_MEMBER(senjyo_state::starforb_scrolly2) +void senjyo_state::starforb_scrolly2(offs_t offset, uint8_t data) { m_scrolly2[offset] = data; m_scrolly1[offset] = data; } -WRITE8_MEMBER(senjyo_state::starforb_scrollx2) +void senjyo_state::starforb_scrollx2(offs_t offset, uint8_t data) { m_scrollx2[offset] = data; m_scrollx1[offset] = data; diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 2819a1516f9..cd6205593f5 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -2489,13 +2489,13 @@ CUSTOM_INPUT_MEMBER( setaroul_state::coin_sensors_r ) // the spritey low bits are mapped to 1 in every 4 bytes here as if it were a 32-bit bus..which is weird // other ram is similar.. -WRITE16_MEMBER(setaroul_state::spritecode_w) +void setaroul_state::spritecode_w(offs_t offset, u16 data) { if ((offset & 1) == 1) m_seta001->spritecodelow_w8(offset >> 1, (data & 0xff00) >> 8); if ((offset & 1) == 0) m_seta001->spritecodehigh_w8(offset >> 1, (data & 0xff00) >> 8); } -READ16_MEMBER(setaroul_state::spritecode_r) +u16 setaroul_state::spritecode_r(offs_t offset) { u16 ret; if ((offset & 1) == 1) @@ -2505,18 +2505,18 @@ READ16_MEMBER(setaroul_state::spritecode_r) return ret << 8; } -WRITE16_MEMBER(setaroul_state::spriteylow_w) +void setaroul_state::spriteylow_w(offs_t offset, u16 data) { if ((offset & 1) == 0) m_seta001->spriteylow_w8(offset >> 1, (data & 0xff00) >> 8); } -WRITE16_MEMBER(setaroul_state::spritectrl_w) +void setaroul_state::spritectrl_w(offs_t offset, u16 data) { if ((offset & 1) == 0) m_seta001->spritectrl_w8(offset >> 1, (data & 0xff00) >> 8); } // RTC (To do: write a D4911C device) -READ16_MEMBER(setaroul_state::rtc_r) +u16 setaroul_state::rtc_r(offs_t offset) { if (offset >= 7) ++offset; @@ -2525,7 +2525,7 @@ READ16_MEMBER(setaroul_state::rtc_r) return (m_rtc->read(offset / 2) >> ((offset & 1) * 4)) & 0xf; } -WRITE16_MEMBER(setaroul_state::rtc_w) +void setaroul_state::rtc_w(u16 data) { } @@ -3194,7 +3194,7 @@ void seta_state::crazyfgt_map(address_map &map) ***************************************************************************/ // RTC (To do: write a D4911C device) -READ16_MEMBER(jockeyc_state::rtc_r) +u16 jockeyc_state::rtc_r(offs_t offset) { if (offset >= 7) ++offset; @@ -3203,7 +3203,7 @@ READ16_MEMBER(jockeyc_state::rtc_r) return (m_rtc->read(offset / 2) >> ((offset & 1) * 4)) & 0xf; } -WRITE16_MEMBER(jockeyc_state::rtc_w) +void jockeyc_state::rtc_w(u16 data) { } @@ -11853,7 +11853,7 @@ ROM_START( setaroul ) ROM_LOAD16_BYTE( "uf0-018.u51", 0x001, 0x200, CRC(1c584d5f) SHA1(f1c7e3da8b108d78b459cae53fabb6e28d3a7ee8) ) ROM_END -READ16_MEMBER(seta_state::twineagl_debug_r) +u16 seta_state::twineagl_debug_r() { /* At several points in the code, the program checks if four consecutive bytes in this range are equal to a string, and if they @@ -11900,13 +11900,13 @@ void seta_state::init_bank6502() /* Extra RAM ? Check code at 0x00ba90 */ /* 2000F8 = A3 enables it, 2000F8 = 00 disables? see downtown too */ -READ16_MEMBER(seta_state::twineagl_200100_r) +u16 seta_state::twineagl_200100_r(offs_t offset) { // protection check at boot logerror("%04x: twineagl_200100_r %d\n",m_maincpu->pc(), offset); return m_twineagl_xram[offset]; } -WRITE16_MEMBER(seta_state::twineagl_200100_w) +void seta_state::twineagl_200100_w(offs_t offset, u16 data, u16 mem_mask) { logerror("%04x: twineagl_200100_w %d = %02x\n",m_maincpu->pc(), offset,data); @@ -11920,15 +11920,16 @@ void seta_state::init_twineagl() { init_bank6502(); /* debug? */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x800000, 0x8000ff, read16_delegate(*this, FUNC(seta_state::twineagl_debug_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x800000, 0x8000ff, read16smo_delegate(*this, FUNC(seta_state::twineagl_debug_r))); /* This allows 2 simultaneous players and the use of the "Copyright" Dip Switch. */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x200100, 0x20010f, read16_delegate(*this, FUNC(seta_state::twineagl_200100_r)), write16_delegate(*this, FUNC(seta_state::twineagl_200100_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200100, 0x20010f, read16sm_delegate(*this, FUNC(seta_state::twineagl_200100_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x200100, 0x20010f, write16s_delegate(*this, FUNC(seta_state::twineagl_200100_w))); } /* Protection? NVRAM is handled writing commands here */ -READ16_MEMBER(seta_state::downtown_protection_r) +u16 seta_state::downtown_protection_r(offs_t offset) { const int job = m_downtown_protection[0xf8/2] & 0xff; @@ -11945,7 +11946,7 @@ READ16_MEMBER(seta_state::downtown_protection_r) } } -WRITE16_MEMBER(seta_state::downtown_protection_w) +void seta_state::downtown_protection_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_downtown_protection[offset]); } @@ -11957,11 +11958,12 @@ void seta_state::init_downtown() m_downtown_protection = make_unique_clear<u16[]>(0x200/2); save_pointer(NAME(m_downtown_protection),0x200/2); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x200000, 0x2001ff, read16_delegate(*this, FUNC(seta_state::downtown_protection_r)), write16_delegate(*this, FUNC(seta_state::downtown_protection_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x2001ff, read16sm_delegate(*this, FUNC(seta_state::downtown_protection_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x200000, 0x2001ff, write16s_delegate(*this, FUNC(seta_state::downtown_protection_w))); } -READ16_MEMBER(seta_state::arbalest_debug_r) +u16 seta_state::arbalest_debug_r() { /* At some points in the code, the program checks if four consecutive bytes in this range are equal to a string, and if they @@ -11978,11 +11980,11 @@ READ16_MEMBER(seta_state::arbalest_debug_r) void seta_state::init_arbalest() { init_bank6502(); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x80000, 0x8000f, read16_delegate(*this, FUNC(seta_state::arbalest_debug_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x80000, 0x8000f, read16smo_delegate(*this, FUNC(seta_state::arbalest_debug_r))); } -READ16_MEMBER(seta_state::metafox_protection_r) +u16 seta_state::metafox_protection_r(offs_t offset) { // very simplified protection simulation // 21c000-21c3ff, 21d000-21d3ff, and 21e000-21e3ff are tested as 8 bit reads/writes @@ -12007,7 +12009,7 @@ READ16_MEMBER(seta_state::metafox_protection_r) void seta_state::init_metafox() { init_bank6502(); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x21c000, 0x21ffff,read16_delegate(*this, FUNC(seta_state::metafox_protection_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x21c000, 0x21ffff,read16sm_delegate(*this, FUNC(seta_state::metafox_protection_r))); } diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index 671cfbf7a20..01164213908 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -135,7 +135,7 @@ void seta2_state::machine_start() m_lamps.resolve(); } -WRITE8_MEMBER(seta2_state::sound_bank_w) +void seta2_state::sound_bank_w(offs_t offset, uint8_t data) { m_x1_bank[offset & 7]->set_entry(data); } @@ -157,7 +157,7 @@ void seta2_state::x1_map(address_map &map) Guardians ***************************************************************************/ -WRITE8_MEMBER(seta2_state::grdians_lockout_w) +void seta2_state::grdians_lockout_w(uint8_t data) { // initially 0, then either $25 (coin 1) or $2a (coin 2) machine().bookkeeping().coin_counter_w(0,data & 0x01); // or 0x04 @@ -234,7 +234,7 @@ void mj4simai_state::machine_start() save_item(NAME(m_keyboard_row)); } -READ16_MEMBER(seta2_state::mj4simai_p1_r) +uint16_t seta2_state::mj4simai_p1_r() { switch (m_keyboard_row) { @@ -247,7 +247,7 @@ READ16_MEMBER(seta2_state::mj4simai_p1_r) } } -READ16_MEMBER(seta2_state::mj4simai_p2_r) +uint16_t seta2_state::mj4simai_p2_r() { switch (m_keyboard_row) { @@ -332,18 +332,18 @@ void seta2_state::myangel2_map(address_map &map) /* The game checks for a specific value read from the ROM region. The offset to use is stored in RAM at address 0x20BA16 */ -READ16_MEMBER(seta2_state::pzlbowl_protection_r) +uint16_t seta2_state::pzlbowl_protection_r(address_space &space) { uint32_t address = (space.read_word(0x20ba16) << 16) | space.read_word(0x20ba18); return memregion("maincpu")->base()[address - 2]; } -READ8_MEMBER(seta2_state::pzlbowl_coins_r) +uint8_t seta2_state::pzlbowl_coins_r() { return ioport("SYSTEM")->read() | (machine().rand() & 0x80 ); } -WRITE8_MEMBER(seta2_state::pzlbowl_coin_counter_w) +void seta2_state::pzlbowl_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0,data & 0x10); machine().bookkeeping().coin_counter_w(1,data & 0x20); @@ -434,7 +434,7 @@ void seta2_state::reelquak_leds_w(offs_t offset, uint16_t data, uint16_t mem_mas // popmessage("LED %04X", data); } -WRITE8_MEMBER(seta2_state::reelquak_coin_w) +void seta2_state::reelquak_coin_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin in machine().bookkeeping().coin_counter_w(1, data & 0x02); // coin in @@ -483,7 +483,7 @@ void seta2_state::namcostr_map(address_map &map) Sammy Outdoor Shooting ***************************************************************************/ -WRITE8_MEMBER(seta2_state::samshoot_coin_w) +void seta2_state::samshoot_coin_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x10); machine().bookkeeping().coin_counter_w(1, data & 0x20); @@ -532,7 +532,7 @@ void staraudi_state::staraudi_debug_outputs() // popmessage("L1: %04X L2: %04X CAM: %04X", m_lamps1, m_lamps2, m_cam); } -WRITE8_MEMBER(staraudi_state::lamps1_w) +void staraudi_state::lamps1_w(offs_t offset, uint8_t data, uint8_t mem_mask) { COMBINE_DATA(&m_lamps1); m_leds[0] = BIT(data, 0); // Lamp 1 | @@ -542,7 +542,7 @@ WRITE8_MEMBER(staraudi_state::lamps1_w) staraudi_debug_outputs(); } -WRITE8_MEMBER(staraudi_state::lamps2_w) +void staraudi_state::lamps2_w(offs_t offset, uint8_t data, uint8_t mem_mask) { COMBINE_DATA(&m_lamps2); // data & 0x20 ); // ? Always On @@ -551,7 +551,7 @@ WRITE8_MEMBER(staraudi_state::lamps2_w) staraudi_debug_outputs(); } -WRITE8_MEMBER(staraudi_state::camera_w) +void staraudi_state::camera_w(offs_t offset, uint8_t data, uint8_t mem_mask) { COMBINE_DATA(&m_cam); // data & 0x01 ); // ? Always On @@ -566,12 +566,12 @@ WRITE8_MEMBER(staraudi_state::camera_w) #define TILE0 (0x7c000) #define TILERAM(offset) ((uint16_t*)(memregion("sprites")->base() + TILE0 * 8*8 + (offset * 2 / 0x20000) * 2 + ((offset * 2) % 0x20000) / 2 * 8)) -READ16_MEMBER(staraudi_state::tileram_r) +uint16_t staraudi_state::tileram_r(offs_t offset) { return *TILERAM(offset); } -WRITE16_MEMBER(staraudi_state::tileram_w) +void staraudi_state::tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(TILERAM(offset)); int tile = TILE0 + ((offset * 2) % 0x20000) / (8*2); @@ -618,7 +618,7 @@ void staraudi_state::staraudi_map(address_map &map) TelePachi Fever Lion ***************************************************************************/ -WRITE8_MEMBER(seta2_state::telpacfl_lamp1_w) +void seta2_state::telpacfl_lamp1_w(uint8_t data) { for (int i = 0; i <= 7; i++) m_lamps[i] = BIT(data, i); @@ -626,7 +626,7 @@ WRITE8_MEMBER(seta2_state::telpacfl_lamp1_w) // popmessage("LAMP1 %04X", data); } -WRITE8_MEMBER(seta2_state::telpacfl_lamp2_w) +void seta2_state::telpacfl_lamp2_w(uint8_t data) { m_lamps[8] = BIT(data, 0); // on/off lamp (throughout) m_lamps[9] = BIT(data, 1); // bet lamp @@ -638,7 +638,7 @@ WRITE8_MEMBER(seta2_state::telpacfl_lamp2_w) // popmessage("LAMP2 %04X", data); } -WRITE8_MEMBER(seta2_state::telpacfl_lockout_w) +void seta2_state::telpacfl_lockout_w(uint8_t data) { machine().bookkeeping().coin_counter_w(1, data & 0x02); // 100yen in machine().bookkeeping().coin_lockout_w(0, ~data & 0x04); // coin blocker @@ -786,13 +786,13 @@ void funcube_touchscreen_device::tra_callback() // Bus conversion functions: // RAM shared with the sub CPU -READ32_MEMBER(funcube_state::nvram_r) +uint32_t funcube_state::nvram_r(offs_t offset) { uint16_t val = m_nvram[offset]; return ((val & 0xff00) << 8) | (val & 0x00ff); } -WRITE32_MEMBER(funcube_state::nvram_w) +void funcube_state::nvram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -807,7 +807,7 @@ WRITE32_MEMBER(funcube_state::nvram_w) // Main CPU -READ32_MEMBER(funcube_state::debug_r) +uint32_t funcube_state::debug_r() { uint32_t ret = ioport("DEBUG")->read(); @@ -875,7 +875,7 @@ void funcube_state::funcube_sub_map(address_map &map) #define FUNCUBE_SUB_CPU_CLOCK (XTAL(14'745'600)) -READ16_MEMBER(funcube_state::coins_r) +uint16_t funcube_state::coins_r() { uint8_t ret = ioport("SWITCH")->read(); uint8_t coin_bit0 = 1; // active low @@ -912,7 +912,7 @@ void funcube_state::funcube_debug_outputs() #endif } -WRITE16_MEMBER(funcube_state::leds_w) +void funcube_state::leds_w(uint16_t data) { *m_funcube_leds = data; @@ -928,13 +928,13 @@ WRITE16_MEMBER(funcube_state::leds_w) funcube_debug_outputs(); } -READ16_MEMBER(funcube_state::outputs_r) +uint16_t funcube_state::outputs_r() { // Bits 1,2,3 read return *m_outputs; } -WRITE16_MEMBER(funcube_state::outputs_w) +void funcube_state::outputs_w(uint16_t data) { *m_outputs = data; @@ -951,7 +951,7 @@ WRITE16_MEMBER(funcube_state::outputs_w) funcube_debug_outputs(); } -READ16_MEMBER(funcube_state::battery_r) +uint16_t funcube_state::battery_r() { return ioport("BATTERY")->read() ? 0x40 : 0x00; } diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index 9c696ec0f64..d024d389bf7 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -149,7 +149,7 @@ lev 7 : 0x7c : 0000 11d0 - just rte #include "speaker.h" -WRITE16_MEMBER(shadfrce_state::flip_screen) +void shadfrce_state::flip_screen(uint16_t data) { flip_screen_set(data & 0x01); } @@ -234,7 +234,7 @@ WRITE16_MEMBER(shadfrce_state::flip_screen) */ -READ16_MEMBER(shadfrce_state::input_ports_r) +uint16_t shadfrce_state::input_ports_r(offs_t offset) { uint16_t data = 0xffff; @@ -258,7 +258,7 @@ READ16_MEMBER(shadfrce_state::input_ports_r) } -WRITE8_MEMBER(shadfrce_state::screen_brt_w) +void shadfrce_state::screen_brt_w(uint8_t data) { double brt = (data & 0xff) / 255.0; @@ -266,12 +266,12 @@ WRITE8_MEMBER(shadfrce_state::screen_brt_w) m_palette->set_pen_contrast(i, brt); } -WRITE16_MEMBER(shadfrce_state::irq_ack_w) +void shadfrce_state::irq_ack_w(offs_t offset, uint16_t data) { m_maincpu->set_input_line(offset ^ 3, CLEAR_LINE); } -WRITE16_MEMBER(shadfrce_state::irq_w) +void shadfrce_state::irq_w(uint16_t data) { m_irqs_enable = data & 1; /* maybe, it's set/unset inside every trap instruction which is executed */ m_video_enable = data & 8; /* probably */ @@ -291,7 +291,7 @@ WRITE16_MEMBER(shadfrce_state::irq_w) m_prev_value = data; } -WRITE16_MEMBER(shadfrce_state::scanline_w) +void shadfrce_state::scanline_w(uint16_t data) { m_raster_scanline = data; /* guess, 0 is always written */ } @@ -382,7 +382,7 @@ void shadfrce_state::shadfrce_map(address_map &map) /* and the sound cpu */ -WRITE8_MEMBER(shadfrce_state::oki_bankswitch_w) +void shadfrce_state::oki_bankswitch_w(uint8_t data) { m_oki->set_rom_bank(data & 1); } diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index deea21e2e14..f69d5ca518e 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -64,7 +64,7 @@ write read 20 -> 8 40 -> 0 */ -READ16_MEMBER(shangha3_state::shangha3_prot_r) +uint16_t shangha3_state::shangha3_prot_r() { static const int result[] = { 0x0,0x1,0x3,0x7,0xf,0xe,0xc,0x8,0x0}; @@ -73,12 +73,12 @@ READ16_MEMBER(shangha3_state::shangha3_prot_r) return result[m_prot_count++ % 9]; } -WRITE16_MEMBER(shangha3_state::shangha3_prot_w) +void shangha3_state::shangha3_prot_w(uint16_t data) { logerror("PC %04x: write %02x to 20004e\n",m_maincpu->pc(),data); } -WRITE8_MEMBER(shangha3_state::shangha3_coinctrl_w) +void shangha3_state::shangha3_coinctrl_w(uint8_t data) { machine().bookkeeping().coin_lockout_w(0,~data & 0x04); machine().bookkeeping().coin_lockout_w(1,~data & 0x04); @@ -86,7 +86,7 @@ WRITE8_MEMBER(shangha3_state::shangha3_coinctrl_w) machine().bookkeeping().coin_counter_w(1,data & 0x02); } -WRITE8_MEMBER(shangha3_state::heberpop_coinctrl_w) +void shangha3_state::heberpop_coinctrl_w(uint8_t data) { /* the sound ROM bank is selected by the main CPU! */ m_oki->set_rom_bank((data >> 3) & 1); @@ -97,7 +97,7 @@ WRITE8_MEMBER(shangha3_state::heberpop_coinctrl_w) machine().bookkeeping().coin_counter_w(1,data & 0x02); } -WRITE8_MEMBER(shangha3_state::blocken_coinctrl_w) +void shangha3_state::blocken_coinctrl_w(uint8_t data) { /* the sound ROM bank is selected by the main CPU! */ m_okibank->set_entry((data >> 4) & 3); @@ -109,7 +109,7 @@ WRITE8_MEMBER(shangha3_state::blocken_coinctrl_w) } -WRITE16_MEMBER(shangha3_state::irq_ack_w) +void shangha3_state::irq_ack_w(uint16_t data) { m_maincpu->set_input_line(4, CLEAR_LINE); } diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 745f173c151..243889f988b 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -110,13 +110,13 @@ WRITE_LINE_MEMBER(shangkid_state::irq_2_w) m_bbx->set_input_line(0, ASSERT_LINE); } -WRITE8_MEMBER(shangkid_state::nmiq_1_w) +void shangkid_state::nmiq_1_w(uint8_t data) { if (m_nmi_enable[0]) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE8_MEMBER(shangkid_state::nmiq_2_w) +void shangkid_state::nmiq_2_w(uint8_t data) { if (m_nmi_enable[1]) m_bbx->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -155,7 +155,7 @@ void shangkid_state::ay8910_portb_w(uint8_t data) /***************************************************************************************/ -READ8_MEMBER(shangkid_state::soundlatch_r) +uint8_t shangkid_state::soundlatch_r() { return m_sound_latch; } diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index c63212e8104..5087af2b442 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -30,7 +30,7 @@ void shisen_state::shisen_map(address_map &map) } -WRITE8_MEMBER(shisen_state::coin_w) +void shisen_state::coin_w(uint8_t data) { if ((data & 0xf9) != 0x01) logerror("coin ctrl = %02x\n",data); diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index e9399add2e8..ad18084ea0a 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -58,13 +58,13 @@ void shootout_state::bankswitch_w(uint8_t data) membank("bank1")->set_entry(data & 0x0f); } -READ8_MEMBER(shootout_state::sound_cpu_command_r) +uint8_t shootout_state::sound_cpu_command_r() { m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); return m_soundlatch->read(); } -WRITE8_MEMBER(shootout_state::sound_cpu_command_w) +void shootout_state::sound_cpu_command_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -89,7 +89,7 @@ void shootout_state::flipscreen_w(uint8_t data) This should be an input for a BCD to 7-segment decoder (e.g. a 74LS47), but all the PCBs I've seen don't have 'onboard' display(s), so this was implemented as normal "coin counter" (after all, they both have the same goal: count credits ;)) */ -WRITE8_MEMBER(shootout_state::coincounter_w) +void shootout_state::coincounter_w(uint8_t data) { if (data != m_ccnt_old_val) { diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp index 110e80afee7..93ee80dc573 100644 --- a/src/mame/drivers/shuuz.cpp +++ b/src/mame/drivers/shuuz.cpp @@ -41,7 +41,7 @@ void shuuz_state::machine_start() * *************************************/ -WRITE16_MEMBER(shuuz_state::latch_w) +void shuuz_state::latch_w(uint16_t data) { } @@ -53,7 +53,7 @@ WRITE16_MEMBER(shuuz_state::latch_w) * *************************************/ -READ16_MEMBER(shuuz_state::leta_r) +uint16_t shuuz_state::leta_r(offs_t offset) { /* trackball -- rotated 45 degrees? */ int which = offset & 1; @@ -80,7 +80,7 @@ READ16_MEMBER(shuuz_state::leta_r) * *************************************/ -READ16_MEMBER(shuuz_state::special_port0_r) +uint16_t shuuz_state::special_port0_r() { int result = ioport("SYSTEM")->read(); diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp index 4d1e927074d..e38349fe57c 100644 --- a/src/mame/drivers/sidearms.cpp +++ b/src/mame/drivers/sidearms.cpp @@ -66,14 +66,14 @@ void sidearms_state::machine_start() membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x8000, 0x4000); } -WRITE8_MEMBER(sidearms_state::bankswitch_w) +void sidearms_state::bankswitch_w(uint8_t data) { membank("bank1")->set_entry(data & 0x07); } // Turtle Ship input ports are rotated 90 degrees -READ8_MEMBER(sidearms_state::turtship_ports_r) +uint8_t sidearms_state::turtship_ports_r(offs_t offset) { int res = 0; for (int i = 0; i < 5;i++) @@ -138,7 +138,7 @@ void sidearms_state::sidearms_sound_map(address_map &map) /* Whizz */ -WRITE8_MEMBER(sidearms_state::whizz_bankswitch_w) +void sidearms_state::whizz_bankswitch_w(uint8_t data) { int bank = 0; switch (data & 0xC0) diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp index 9e726a01777..9f039bfb50f 100644 --- a/src/mame/drivers/sidepckt.cpp +++ b/src/mame/drivers/sidepckt.cpp @@ -152,12 +152,12 @@ static const uint8_t sidepcktj_prot_table_2[0x10]={0x8e,0x42,0xb2,0x58,0xec,0x85 static const uint8_t sidepcktj_prot_table_3[0x10]={0xbd,0x71,0xc8,0xbd,0x71,0xef,0xbd,0x72,0x28,0x7e,0x70,0x9e,0xff,0xff,0xff,0xff}; -READ8_MEMBER(sidepckt_state::i8751_r) +uint8_t sidepckt_state::i8751_r() { return m_i8751_return; } -WRITE8_MEMBER(sidepckt_state::i8751_w) +void sidepckt_state::i8751_w(uint8_t data) { m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE); /* i8751 triggers FIRQ on main cpu */ diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index f050c3c146f..c5e631df318 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -132,21 +132,21 @@ ROM15.BIN MX29F1610, SOP44 Surface Mounted Mask ROM / */ -WRITE8_MEMBER(silkroad_state::okibank_w) +void silkroad_state::okibank_w(uint8_t data) { int bank = (data & 0x3); if(bank < 3) m_okibank->set_entry(bank); } -WRITE8_MEMBER(silkroad_state::coin_w) +void silkroad_state::coin_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x1); machine().bookkeeping().coin_counter_w(1, data & 0x8); } template<int Layer> -WRITE32_MEMBER(silkroad_state::vram_w) +void silkroad_state::vram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_vram[Layer][offset]); m_tilemap[Layer]->mark_tile_dirty(offset); diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp index 577cd2e4ce9..af884de3354 100644 --- a/src/mame/drivers/simpl156.cpp +++ b/src/mame/drivers/simpl156.cpp @@ -1046,7 +1046,7 @@ void simpl156_state::init_simpl156() } /* Everything seems more stable if we run the CPU speed x4 and use Idle skips.. maybe it has an internal multipler? */ -READ32_MEMBER(simpl156_state::joemacr_speedup_r) +u32 simpl156_state::joemacr_speedup_r() { if (m_maincpu->pc() == 0x284) m_maincpu->spin_until_time(attotime::from_usec(400)); @@ -1056,11 +1056,11 @@ READ32_MEMBER(simpl156_state::joemacr_speedup_r) void simpl156_state::init_joemacr() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201018, 0x020101b, read32_delegate(*this, FUNC(simpl156_state::joemacr_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201018, 0x020101b, read32smo_delegate(*this, FUNC(simpl156_state::joemacr_speedup_r))); init_simpl156(); } -READ32_MEMBER(simpl156_state::chainrec_speedup_r) +u32 simpl156_state::chainrec_speedup_r() { if (m_maincpu->pc() == 0x2d4) m_maincpu->spin_until_time(attotime::from_usec(400)); @@ -1069,11 +1069,11 @@ READ32_MEMBER(simpl156_state::chainrec_speedup_r) void simpl156_state::init_chainrec() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201018, 0x020101b, read32_delegate(*this, FUNC(simpl156_state::chainrec_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201018, 0x020101b, read32smo_delegate(*this, FUNC(simpl156_state::chainrec_speedup_r))); init_simpl156(); } -READ32_MEMBER(simpl156_state::prtytime_speedup_r) +u32 simpl156_state::prtytime_speedup_r() { if (m_maincpu->pc() == 0x4f0) m_maincpu->spin_until_time(attotime::from_usec(400)); @@ -1082,12 +1082,12 @@ READ32_MEMBER(simpl156_state::prtytime_speedup_r) void simpl156_state::init_prtytime() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201ae0, 0x0201ae3, read32_delegate(*this, FUNC(simpl156_state::prtytime_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201ae0, 0x0201ae3, read32smo_delegate(*this, FUNC(simpl156_state::prtytime_speedup_r))); init_simpl156(); } -READ32_MEMBER(simpl156_state::charlien_speedup_r) +u32 simpl156_state::charlien_speedup_r() { if (m_maincpu->pc() == 0xc8c8) m_maincpu->spin_until_time(attotime::from_usec(400)); @@ -1096,11 +1096,11 @@ READ32_MEMBER(simpl156_state::charlien_speedup_r) void simpl156_state::init_charlien() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201010, 0x0201013, read32_delegate(*this, FUNC(simpl156_state::charlien_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201010, 0x0201013, read32smo_delegate(*this, FUNC(simpl156_state::charlien_speedup_r))); init_simpl156(); } -READ32_MEMBER(simpl156_state::osman_speedup_r) +u32 simpl156_state::osman_speedup_r() { if (m_maincpu->pc() == 0x5974) m_maincpu->spin_until_time(attotime::from_usec(400)); @@ -1109,7 +1109,7 @@ READ32_MEMBER(simpl156_state::osman_speedup_r) void simpl156_state::init_osman() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201010, 0x0201013, read32_delegate(*this, FUNC(simpl156_state::osman_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0201010, 0x0201013, read32smo_delegate(*this, FUNC(simpl156_state::osman_speedup_r))); init_simpl156(); } diff --git a/src/mame/drivers/simple_st0016.cpp b/src/mame/drivers/simple_st0016.cpp index 02de036d62d..be869eb8107 100644 --- a/src/mame/drivers/simple_st0016.cpp +++ b/src/mame/drivers/simple_st0016.cpp @@ -54,7 +54,7 @@ void st0016_state::renju_mem(address_map &map) } -READ8_MEMBER(st0016_state::mux_r) +uint8_t st0016_state::mux_r() { /* 76543210 @@ -78,12 +78,12 @@ READ8_MEMBER(st0016_state::mux_r) return retval; } -WRITE8_MEMBER(st0016_state::mux_select_w) +void st0016_state::mux_select_w(uint8_t data) { mux_port=data; } -WRITE8_MEMBER(st0016_state::st0016_rom_bank_w) +void st0016_state::st0016_rom_bank_w(uint8_t data) { m_mainbank->set_entry(data); // st0016_rom_bank = data; @@ -111,14 +111,14 @@ void st0016_state::st0016_io(address_map &map) static uint32_t latches[8]; -READ32_MEMBER(st0016_state::latch32_r) +uint32_t st0016_state::latch32_r(offs_t offset) { if(!offset) latches[2]&=~2; return latches[offset]; } -WRITE32_MEMBER(st0016_state::latch32_w) +void st0016_state::latch32_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if(!offset) latches[2]|=1; @@ -126,14 +126,14 @@ WRITE32_MEMBER(st0016_state::latch32_w) machine().scheduler().synchronize(); } -READ8_MEMBER(st0016_state::latch8_r) +uint8_t st0016_state::latch8_r(offs_t offset) { if(!offset) latches[2]&=~1; return latches[offset]; } -WRITE8_MEMBER(st0016_state::latch8_w) +void st0016_state::latch8_w(offs_t offset, uint8_t data) { if(!offset) latches[2]|=2; diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp index 4bc6aebe80b..1af75d6c70f 100644 --- a/src/mame/drivers/simpsons.cpp +++ b/src/mame/drivers/simpsons.cpp @@ -152,7 +152,7 @@ void simpsons_state::bank2000_map(address_map &map) map(0x3000, 0x3fff).ram(); } -WRITE8_MEMBER(simpsons_state::z80_bankswitch_w) +void simpsons_state::z80_bankswitch_w(uint8_t data) { membank("bank2")->set_entry(data & 7); } @@ -175,7 +175,7 @@ void simpsons_state::device_timer(emu_timer &timer, device_timer_id id, int para } -WRITE8_MEMBER(simpsons_state::z80_arm_nmi_w) +void simpsons_state::z80_arm_nmi_w(uint8_t data) { m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); m_nmi_enabled = machine().time().as_ticks(m_audiocpu->clock()); diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp index cafe5f233d6..c7334cff9c9 100644 --- a/src/mame/drivers/skullxbo.cpp +++ b/src/mame/drivers/skullxbo.cpp @@ -72,7 +72,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(skullxbo_state::scanline_timer) } -WRITE16_MEMBER(skullxbo_state::skullxbo_halt_until_hblank_0_w) +void skullxbo_state::skullxbo_halt_until_hblank_0_w(uint16_t data) { halt_until_hblank_0(*m_maincpu, *m_screen); } @@ -95,7 +95,7 @@ void skullxbo_state::machine_start() * *************************************/ -WRITE16_MEMBER(skullxbo_state::skullxbo_mobwr_w) +void skullxbo_state::skullxbo_mobwr_w(offs_t offset, uint16_t data) { logerror("MOBWR[%02X] = %04X\n", offset, data); } diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp index ac12ffe7025..876b4f2c37c 100644 --- a/src/mame/drivers/skyfox.cpp +++ b/src/mame/drivers/skyfox.cpp @@ -37,7 +37,7 @@ Verified Dip locations and recommended settings with manual ***************************************************************************/ -WRITE8_MEMBER(skyfox_state::output_w) +void skyfox_state::output_w(offs_t offset, uint8_t data) { // TODO: untangle switch (offset) diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp index b3e4dc95c68..328095a3713 100644 --- a/src/mame/drivers/skykid.cpp +++ b/src/mame/drivers/skykid.cpp @@ -66,18 +66,18 @@ void skykid_state::skykid_led_w(uint8_t data) m_leds[1] = BIT(data, 4); } -WRITE8_MEMBER(skykid_state::skykid_subreset_w) +void skykid_state::skykid_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(skykid_state::skykid_bankswitch_w) +void skykid_state::skykid_bankswitch_w(offs_t offset, uint8_t data) { membank("bank1")->set_entry(!BIT(offset,11)); } -WRITE8_MEMBER(skykid_state::skykid_irq_1_ctrl_w) +void skykid_state::skykid_irq_1_ctrl_w(offs_t offset, uint8_t data) { int bit = !BIT(offset,11); m_main_irq_mask = bit; @@ -85,7 +85,7 @@ WRITE8_MEMBER(skykid_state::skykid_irq_1_ctrl_w) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(skykid_state::skykid_irq_2_ctrl_w) +void skykid_state::skykid_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/skyraid.cpp b/src/mame/drivers/skyraid.cpp index d04de7654ea..8c249df687c 100644 --- a/src/mame/drivers/skyraid.cpp +++ b/src/mame/drivers/skyraid.cpp @@ -43,7 +43,7 @@ void skyraid_state::skyraid_palette(palette_device &palette) const palette.set_pen_color(19, rgb_t(0xe0, 0xe0, 0xe0)); } -READ8_MEMBER(skyraid_state::skyraid_port_0_r) +uint8_t skyraid_state::skyraid_port_0_r() { uint8_t val = ioport("LANGUAGE")->read(); @@ -56,19 +56,19 @@ READ8_MEMBER(skyraid_state::skyraid_port_0_r) } -WRITE8_MEMBER(skyraid_state::skyraid_range_w) +void skyraid_state::skyraid_range_w(uint8_t data) { m_analog_range = data & 0x3f; } -WRITE8_MEMBER(skyraid_state::skyraid_offset_w) +void skyraid_state::skyraid_offset_w(uint8_t data) { m_analog_offset = data & 0x3f; } -WRITE8_MEMBER(skyraid_state::skyraid_scroll_w) +void skyraid_state::skyraid_scroll_w(uint8_t data) { m_scroll = data; } diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index 99205d866d1..bf91fc423e8 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -394,7 +394,7 @@ WRITE_LINE_MEMBER(slapfght_state::sound_reset_w) m_sound_nmi_enabled = false; } -READ8_MEMBER(slapfght_state::vblank_r) +uint8_t slapfght_state::vblank_r() { return m_screen->vblank() ? 1 : 0; } @@ -441,7 +441,7 @@ INTERRUPT_GEN_MEMBER(slapfght_state::sound_nmi) device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE8_MEMBER(slapfght_state::sound_nmi_enable_w) +void slapfght_state::sound_nmi_enable_w(offs_t offset, uint8_t data) { m_sound_nmi_enabled = offset ? false : true; } diff --git a/src/mame/drivers/smotor.cpp b/src/mame/drivers/smotor.cpp index 1995b8eeb0c..1bdf32b0a36 100644 --- a/src/mame/drivers/smotor.cpp +++ b/src/mame/drivers/smotor.cpp @@ -166,8 +166,8 @@ private: tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(cpu_io_videoreg_w); + void videoram_w(offs_t offset, uint8_t data); + void cpu_io_videoreg_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -186,7 +186,7 @@ private: * Video Hardware * *********************************************/ -WRITE8_MEMBER(smotor_state::videoram_w) +void smotor_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset/2); @@ -331,7 +331,7 @@ void smotor_state::smotor_cpu_io(address_map &map) } -WRITE8_MEMBER(smotor_state::cpu_io_videoreg_w) +void smotor_state::cpu_io_videoreg_w(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp index 1c3fdd580ae..edf57ffeaad 100644 --- a/src/mame/drivers/sms_bootleg.cpp +++ b/src/mame/drivers/sms_bootleg.cpp @@ -243,12 +243,12 @@ void smsbootleg_state::sms_supergame_map(address_map &map) // map(0xfffc, 0xffff).rw(FUNC(smsbootleg_state::sms_mapper_r), FUNC(smsbootleg_state::sms_mapper_w)); /* Bankswitch control */ } -WRITE8_MEMBER(smsbootleg_state::port08_w) +void smsbootleg_state::port08_w(uint8_t data) { // logerror("port08_w %02x\n", data); } -WRITE8_MEMBER(smsbootleg_state::port18_w) +void smsbootleg_state::port18_w(uint8_t data) { logerror("port18_w %02x\n", data); } diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index cdd717987b5..78135dc29bb 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -587,7 +587,7 @@ TODO: /*********************************************************************/ // Interrupt handlers common to all SNK triple Z80 games -READ8_MEMBER(snk_state::snk_cpuA_nmi_trigger_r) +uint8_t snk_state::snk_cpuA_nmi_trigger_r() { if(!machine().side_effects_disabled()) { @@ -596,12 +596,12 @@ READ8_MEMBER(snk_state::snk_cpuA_nmi_trigger_r) return 0xff; } -WRITE8_MEMBER(snk_state::snk_cpuA_nmi_ack_w) +void snk_state::snk_cpuA_nmi_ack_w(uint8_t data) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -READ8_MEMBER(snk_state::snk_cpuB_nmi_trigger_r) +uint8_t snk_state::snk_cpuB_nmi_trigger_r() { if(!machine().side_effects_disabled()) { @@ -610,7 +610,7 @@ READ8_MEMBER(snk_state::snk_cpuB_nmi_trigger_r) return 0xff; } -WRITE8_MEMBER(snk_state::snk_cpuB_nmi_ack_w) +void snk_state::snk_cpuB_nmi_ack_w(uint8_t data) { m_subcpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } @@ -630,7 +630,7 @@ enum /*********************************************************************/ -READ8_MEMBER(snk_state::marvins_sound_nmi_ack_r) +uint8_t snk_state::marvins_sound_nmi_ack_r() { m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); return 0xff; @@ -659,25 +659,25 @@ TIMER_CALLBACK_MEMBER(snk_state::sgladiat_sndirq_update_callback) } -WRITE8_MEMBER(snk_state::sgladiat_soundlatch_w) +void snk_state::sgladiat_soundlatch_w(uint8_t data) { m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sgladiat_sndirq_update_callback),this), CMDIRQ_BUSY_ASSERT); } -READ8_MEMBER(snk_state::sgladiat_soundlatch_r) +uint8_t snk_state::sgladiat_soundlatch_r() { machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sgladiat_sndirq_update_callback),this), BUSY_CLEAR); return m_soundlatch->read(); } -READ8_MEMBER(snk_state::sgladiat_sound_nmi_ack_r) +uint8_t snk_state::sgladiat_sound_nmi_ack_r() { machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sgladiat_sndirq_update_callback),this), CMDIRQ_CLEAR); return 0xff; } -READ8_MEMBER(snk_state::sgladiat_sound_irq_ack_r) +uint8_t snk_state::sgladiat_sound_irq_ack_r() { m_audiocpu->set_input_line(0, CLEAR_LINE); return 0xff; @@ -757,7 +757,7 @@ WRITE_LINE_MEMBER(snk_state::ymirq_callback_2) } -WRITE8_MEMBER(snk_state::snk_soundlatch_w) +void snk_state::snk_soundlatch_w(uint8_t data) { m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), CMDIRQ_BUSY_ASSERT); @@ -769,12 +769,12 @@ READ_LINE_MEMBER(snk_state::sound_busy_r) } -READ8_MEMBER(snk_state::snk_sound_status_r) +uint8_t snk_state::snk_sound_status_r() { return m_sound_status; } -WRITE8_MEMBER(snk_state::snk_sound_status_w) +void snk_state::snk_sound_status_w(uint8_t data) { if (~data & 0x10) // ack YM1 irq machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), YM1IRQ_CLEAR); @@ -790,19 +790,19 @@ WRITE8_MEMBER(snk_state::snk_sound_status_w) } -READ8_MEMBER(snk_state::tnk3_cmdirq_ack_r) +uint8_t snk_state::tnk3_cmdirq_ack_r() { machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), CMDIRQ_CLEAR); return 0xff; } -READ8_MEMBER(snk_state::tnk3_ymirq_ack_r) +uint8_t snk_state::tnk3_ymirq_ack_r() { machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), YM1IRQ_CLEAR); return 0xff; } -READ8_MEMBER(snk_state::tnk3_busy_clear_r) +uint8_t snk_state::tnk3_busy_clear_r() { // it's uncertain whether the latch should be cleared here or when it's read m_soundlatch->clear_w(); @@ -829,17 +829,17 @@ A trojan could be used on the board to verify the exact behaviour. *****************************************************************************/ -WRITE8_MEMBER(snk_state::hardflags_scrollx_w) +void snk_state::hardflags_scrollx_w(uint8_t data) { m_hf_posx = (m_hf_posx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::hardflags_scrolly_w) +void snk_state::hardflags_scrolly_w(uint8_t data) { m_hf_posy = (m_hf_posy & ~0xff) | data; } -WRITE8_MEMBER(snk_state::hardflags_scroll_msb_w) +void snk_state::hardflags_scroll_msb_w(uint8_t data) { m_hf_posx = (m_hf_posx & 0xff) | ((data & 0x80) << 1); m_hf_posy = (m_hf_posy & 0xff) | ((data & 0x40) << 2); @@ -875,13 +875,13 @@ int snk_state::hardflags_check8(int num) (hardflags_check(num + 7) << 7); } -READ8_MEMBER(snk_state::hardflags1_r){ return hardflags_check8(0*8); } -READ8_MEMBER(snk_state::hardflags2_r){ return hardflags_check8(1*8); } -READ8_MEMBER(snk_state::hardflags3_r){ return hardflags_check8(2*8); } -READ8_MEMBER(snk_state::hardflags4_r){ return hardflags_check8(3*8); } -READ8_MEMBER(snk_state::hardflags5_r){ return hardflags_check8(4*8); } -READ8_MEMBER(snk_state::hardflags6_r){ return hardflags_check8(5*8); } -READ8_MEMBER(snk_state::hardflags7_r) +uint8_t snk_state::hardflags1_r(){ return hardflags_check8(0*8); } +uint8_t snk_state::hardflags2_r(){ return hardflags_check8(1*8); } +uint8_t snk_state::hardflags3_r(){ return hardflags_check8(2*8); } +uint8_t snk_state::hardflags4_r(){ return hardflags_check8(3*8); } +uint8_t snk_state::hardflags5_r(){ return hardflags_check8(4*8); } +uint8_t snk_state::hardflags6_r(){ return hardflags_check8(5*8); } +uint8_t snk_state::hardflags7_r() { // apparently the startup tests use bits 0&1 while the game uses bits 4&5 return @@ -909,27 +909,27 @@ A trojan could be used on the board to verify the exact behaviour. *****************************************************************************/ -WRITE8_MEMBER(snk_state::turbocheck16_1_w) +void snk_state::turbocheck16_1_w(uint8_t data) { m_tc16_posy = (m_tc16_posy & ~0xff) | data; } -WRITE8_MEMBER(snk_state::turbocheck16_2_w) +void snk_state::turbocheck16_2_w(uint8_t data) { m_tc16_posx = (m_tc16_posx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::turbocheck32_1_w) +void snk_state::turbocheck32_1_w(uint8_t data) { m_tc32_posy = (m_tc32_posy & ~0xff) | data; } -WRITE8_MEMBER(snk_state::turbocheck32_2_w) +void snk_state::turbocheck32_2_w(uint8_t data) { m_tc32_posx = (m_tc32_posx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::turbocheck_msb_w) +void snk_state::turbocheck_msb_w(uint8_t data) { m_tc16_posx = (m_tc16_posx & 0xff) | ((data & 0x80) << 1); m_tc16_posy = (m_tc16_posy & 0xff) | ((data & 0x40) << 2); @@ -967,18 +967,18 @@ int snk_state::turbofront_check8(int small, int num) (turbofront_check(small, num + 7) << 7); } -READ8_MEMBER(snk_state::turbocheck16_1_r){ return turbofront_check8(1, 0*8); } -READ8_MEMBER(snk_state::turbocheck16_2_r){ return turbofront_check8(1, 1*8); } -READ8_MEMBER(snk_state::turbocheck16_3_r){ return turbofront_check8(1, 2*8); } -READ8_MEMBER(snk_state::turbocheck16_4_r){ return turbofront_check8(1, 3*8); } -READ8_MEMBER(snk_state::turbocheck16_5_r){ return turbofront_check8(1, 4*8); } -READ8_MEMBER(snk_state::turbocheck16_6_r){ return turbofront_check8(1, 5*8); } -READ8_MEMBER(snk_state::turbocheck16_7_r){ return turbofront_check8(1, 6*8); } -READ8_MEMBER(snk_state::turbocheck16_8_r){ return turbofront_check8(1, 7*8); } -READ8_MEMBER(snk_state::turbocheck32_1_r){ return turbofront_check8(0, 0*8); } -READ8_MEMBER(snk_state::turbocheck32_2_r){ return turbofront_check8(0, 1*8); } -READ8_MEMBER(snk_state::turbocheck32_3_r){ return turbofront_check8(0, 2*8); } -READ8_MEMBER(snk_state::turbocheck32_4_r){ return turbofront_check8(0, 3*8); } +uint8_t snk_state::turbocheck16_1_r(){ return turbofront_check8(1, 0*8); } +uint8_t snk_state::turbocheck16_2_r(){ return turbofront_check8(1, 1*8); } +uint8_t snk_state::turbocheck16_3_r(){ return turbofront_check8(1, 2*8); } +uint8_t snk_state::turbocheck16_4_r(){ return turbofront_check8(1, 3*8); } +uint8_t snk_state::turbocheck16_5_r(){ return turbofront_check8(1, 4*8); } +uint8_t snk_state::turbocheck16_6_r(){ return turbofront_check8(1, 5*8); } +uint8_t snk_state::turbocheck16_7_r(){ return turbofront_check8(1, 6*8); } +uint8_t snk_state::turbocheck16_8_r(){ return turbofront_check8(1, 7*8); } +uint8_t snk_state::turbocheck32_1_r(){ return turbofront_check8(0, 0*8); } +uint8_t snk_state::turbocheck32_2_r(){ return turbofront_check8(0, 1*8); } +uint8_t snk_state::turbocheck32_3_r(){ return turbofront_check8(0, 2*8); } +uint8_t snk_state::turbocheck32_4_r(){ return turbofront_check8(0, 3*8); } @@ -1030,13 +1030,13 @@ CUSTOM_INPUT_MEMBER(snk_state::gwarb_rotary) /************************************************************************/ -WRITE8_MEMBER(snk_state::athena_coin_counter_w) +void snk_state::athena_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, ~data & 2); machine().bookkeeping().coin_counter_w(1, ~data & 1); } -WRITE8_MEMBER(snk_state::ikari_coin_counter_w) +void snk_state::ikari_coin_counter_w(uint8_t data) { if (~data & 0x80) { @@ -1051,13 +1051,13 @@ WRITE8_MEMBER(snk_state::ikari_coin_counter_w) } } -WRITE8_MEMBER(snk_state::tdfever_coin_counter_w) +void snk_state::tdfever_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 1); machine().bookkeeping().coin_counter_w(1, data & 2); } -WRITE8_MEMBER(snk_state::countryc_trackball_w) +void snk_state::countryc_trackball_w(uint8_t data) { m_countryc_trackball = data & 1; } diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index c980c5f6494..35cf4a41e2d 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -54,7 +54,7 @@ Notes: /******************************************************************************/ -WRITE8_MEMBER(snk68_state::sound_w) +void snk68_state::sound_w(uint8_t data) { m_soundlatch->write(data); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // caused by 74123 @@ -88,17 +88,17 @@ void searchar_state::machine_start() save_item(NAME(m_invert_controls)); } -READ16_MEMBER(searchar_state::rotary_1_r) +uint16_t searchar_state::rotary_1_r() { return (( ~(1 << m_rotary_io[0]->read()) )<<8)&0xff00; } -READ16_MEMBER(searchar_state::rotary_2_r) +uint16_t searchar_state::rotary_2_r() { return (( ~(1 << m_rotary_io[1]->read()) )<<8)&0xff00; } -READ16_MEMBER(searchar_state::rotary_lsb_r) +uint16_t searchar_state::rotary_lsb_r() { return ((( ~(1 << m_rotary_io[1]->read()) ) <<4)&0xf000) + ((( ~(1 << m_rotary_io[0]->read()) ) )&0x0f00); @@ -141,7 +141,7 @@ void snk68_state::sound_map(address_map &map) map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w("soundlatch2", FUNC(generic_latch_8_device::write)); } -WRITE8_MEMBER(snk68_state::D7759_write_port_0_w) +void snk68_state::D7759_write_port_0_w(uint8_t data) { m_upd7759->port_w(data); m_upd7759->start_w(0); diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index b97bab7da6a..e06ec0bb416 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -633,7 +633,7 @@ * - Input Ports - * **********************/ -READ8_MEMBER(snookr10_state::dsw_port_1_r) +uint8_t snookr10_state::dsw_port_1_r() { /* -------------------------------- @@ -673,7 +673,7 @@ return ioport("SW1")->read(); STOP5 = bit4 */ -WRITE8_MEMBER(snookr10_state::output_port_0_w) +void snookr10_state::output_port_0_w(uint8_t data) { /* ---------------------------- @@ -714,7 +714,7 @@ WRITE8_MEMBER(snookr10_state::output_port_0_w) // popmessage("written : %02X", data); } -WRITE8_MEMBER(snookr10_state::output_port_1_w) +void snookr10_state::output_port_1_w(uint8_t data) { /* ---------------------------- @@ -749,7 +749,7 @@ WRITE8_MEMBER(snookr10_state::output_port_1_w) } -READ8_MEMBER(snookr10_state::port2000_8_r) +uint8_t snookr10_state::port2000_8_r() { /* Ports 2000-2008 expect data, otherwise the program trigger diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index b6a13ad32f6..a98279af55e 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -87,13 +87,13 @@ a joystick. This is not an emulation bug. #include "speaker.h" -WRITE8_MEMBER(snowbros_state::snowbros_flipscreen_w) +void snowbros_state::snowbros_flipscreen_w(uint8_t data) { m_pandora->flip_screen_set(!BIT(data, 7)); } -WRITE8_MEMBER(snowbros_state::bootleg_flipscreen_w) +void snowbros_state::bootleg_flipscreen_w(uint8_t data) { flip_screen_set(~data & 0x80); } @@ -119,17 +119,17 @@ WRITE_LINE_MEMBER(snowbros_state::screen_vblank_snowbros) -WRITE16_MEMBER(snowbros_state::snowbros_irq4_ack_w) +void snowbros_state::snowbros_irq4_ack_w(uint16_t data) { m_maincpu->set_input_line(4, CLEAR_LINE); } -WRITE16_MEMBER(snowbros_state::snowbros_irq3_ack_w) +void snowbros_state::snowbros_irq3_ack_w(uint16_t data) { m_maincpu->set_input_line(3, CLEAR_LINE); } -WRITE16_MEMBER(snowbros_state::snowbros_irq2_ack_w) +void snowbros_state::snowbros_irq2_ack_w(uint16_t data) { m_maincpu->set_input_line(2, CLEAR_LINE); } @@ -181,7 +181,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(snowbros_state::snowbros3_irq) } -READ16_MEMBER(snowbros_state::toto_read) +uint16_t snowbros_state::toto_read(offs_t offset, uint16_t mem_mask) { int pc = m_maincpu->pc(); if ((pc!= 0x3f010) && (pc!= 0x38008)) printf("toto prot %08x %04x\n", pc, mem_mask); @@ -322,7 +322,7 @@ void snowbros_state::twinadv_map(address_map &map) map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ } -WRITE8_MEMBER(snowbros_state::twinadv_oki_bank_w) +void snowbros_state::twinadv_oki_bank_w(uint8_t data) { int bank = (data &0x02)>>1; @@ -376,7 +376,7 @@ void snowbros_state::hyperpac_sound_map(address_map &map) /* Same volume used for all samples at the Moment, could be right, we have no way of knowing .. */ -READ16_MEMBER(snowbros_state::sb3_sound_r) +uint16_t snowbros_state::sb3_sound_r() { return 0x0003; } @@ -445,7 +445,7 @@ void snowbros_state::sb3_play_sound (int data) } -WRITE16_MEMBER(snowbros_state::sb3_sound_w) +void snowbros_state::sb3_sound_w(uint16_t data) { if (data == 0x00fe) { @@ -524,7 +524,7 @@ void snowbros_state::finalttr_map(address_map &map) // The sequence MEN is sent to the protection device, followed by the code request (4 bytes in all). // After each byte, a number of NOPs are executed to give the device time to catch up. // After the 4th byte, the code reads the device to get its response. -READ16_MEMBER(snowbros_state::yutnori_prot_r) +uint16_t snowbros_state::yutnori_prot_r() { switch(m_yutnori_prot_val) // the 4th byte { @@ -539,7 +539,7 @@ READ16_MEMBER(snowbros_state::yutnori_prot_r) return 0; } -WRITE16_MEMBER(snowbros_state::yutnori_prot_w) +void snowbros_state::yutnori_prot_w(uint16_t data) { m_yutnori_prot_val = data; } @@ -2787,7 +2787,7 @@ void snowbros_state::init_cookbib2() } -READ16_MEMBER(snowbros_state::_4in1_02_read) +uint16_t snowbros_state::_4in1_02_read() { return 0x0202; } @@ -2817,7 +2817,7 @@ void snowbros_state::init_4in1boot() buffer[i] = src[i^0x4000]; memcpy(src,&buffer[0],len); } - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(*this, FUNC(snowbros_state::_4in1_02_read))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::_4in1_02_read))); } void snowbros_state::init_snowbro3() @@ -2837,25 +2837,25 @@ void snowbros_state::init_snowbro3() save_item(NAME(m_sb3_music)); } -READ16_MEMBER(snowbros_state::_3in1_read) +uint16_t snowbros_state::_3in1_read() { return 0x000a; } void snowbros_state::init_3in1semi() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(*this, FUNC(snowbros_state::_3in1_read))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::_3in1_read))); } -READ16_MEMBER(snowbros_state::cookbib3_read) +uint16_t snowbros_state::cookbib3_read() { return 0x2a2a; } void snowbros_state::init_cookbib3() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(*this, FUNC(snowbros_state::cookbib3_read))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::cookbib3_read))); } void snowbros_state::init_pzlbreak() @@ -2893,7 +2893,7 @@ void snowbros_state::init_toto() } // protection? (just return 0x07) - m_maincpu->space(AS_PROGRAM).install_read_handler(0x500006, 0x500007, read16_delegate(*this, FUNC(snowbros_state::toto_read))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x500006, 0x500007, read16s_delegate(*this, FUNC(snowbros_state::toto_read))); } void snowbros_state::init_hyperpac() diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp index 55ce2429728..e6ea5bf8b55 100644 --- a/src/mame/drivers/solomon.cpp +++ b/src/mame/drivers/solomon.cpp @@ -17,7 +17,7 @@ driver by Mirko Buffoni #include "speaker.h" -WRITE8_MEMBER(solomon_state::solomon_sh_command_w) +void solomon_state::solomon_sh_command_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -27,7 +27,7 @@ WRITE8_MEMBER(solomon_state::solomon_sh_command_w) it could be a form of protection. the real board needs to be analysed to find out what really lives here */ -READ8_MEMBER(solomon_state::solomon_0xe603_r) +uint8_t solomon_state::solomon_0xe603_r() { if (m_maincpu->pc() == 0x161) // all the time .. return 0 to act as before for coin / startup etc. { @@ -44,7 +44,7 @@ READ8_MEMBER(solomon_state::solomon_0xe603_r) } } -WRITE8_MEMBER(solomon_state::nmi_mask_w) +void solomon_state::nmi_mask_w(uint8_t data) { m_nmi_mask = data & 1; } diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp index 4ec3050251c..073a26ca9fa 100644 --- a/src/mame/drivers/spacefb.cpp +++ b/src/mame/drivers/spacefb.cpp @@ -188,11 +188,10 @@ void spacefb_state::machine_start() void spacefb_state::machine_reset() { - address_space &space = m_maincpu->space(AS_IO); /* the 3 output ports are cleared on reset */ - port_0_w(space, 0, 0); - port_1_w(space, 0, 0); - port_2_w(space, 0, 0); + port_0_w(0); + port_1_w(0); + port_2_w(0); start_interrupt_timer(); } diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index 033a5f340e8..728bd03bae4 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -141,7 +141,7 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF #include "speaker.h" -WRITE16_MEMBER(spbactn_state::main_irq_ack_w) +void spbactn_state::main_irq_ack_w(uint16_t data) { m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); } diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp index 24c8055a7fe..b3f24e82b1f 100644 --- a/src/mame/drivers/spcforce.cpp +++ b/src/mame/drivers/spcforce.cpp @@ -102,12 +102,12 @@ READ_LINE_MEMBER(spcforce_state::t0_r) } -WRITE8_MEMBER(spcforce_state::soundtrigger_w) +void spcforce_state::soundtrigger_w(uint8_t data) { m_audiocpu->set_input_line(0, (~data & 0x08) ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER(spcforce_state::misc_outputs_w) +void spcforce_state::misc_outputs_w(uint8_t data) { m_lamps[0] = BIT(data, 0); // 1P start lamp machine().bookkeeping().coin_counter_w(0, BIT(data, 1)); diff --git a/src/mame/drivers/spdheat.cpp b/src/mame/drivers/spdheat.cpp index e6fa3a18ed9..024553dde16 100644 --- a/src/mame/drivers/spdheat.cpp +++ b/src/mame/drivers/spdheat.cpp @@ -72,7 +72,7 @@ void spdheat_state::video_start() *************************************/ template<int screen> -WRITE16_MEMBER(spdheat_state::text_w) +void spdheat_state::text_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_fg_ram[screen][offset]); m_fg_tilemap[screen]->mark_tile_dirty(offset); @@ -285,58 +285,58 @@ void spdheat_state::sub_io_map(address_map &map) * *************************************/ -READ16_MEMBER(spdheat_state::sound_status_r) +uint16_t spdheat_state::sound_status_r() { // 1s mean not busy? return m_sound_status; } template<int screen> -WRITE16_MEMBER(spdheat_state::sound_w) +void spdheat_state::sound_w(uint16_t data) { m_sound_data[screen] = data; m_sound_status &= ~(1 << screen); } -READ8_MEMBER(spdheat_state::sub_r) +uint8_t spdheat_state::sub_r() { return 0; // TODO } -WRITE8_MEMBER(spdheat_state::sub_dac_w) +void spdheat_state::sub_dac_w(uint8_t data) { m_dac->write(data); } -READ8_MEMBER(spdheat_state::soundstatus_r) +uint8_t spdheat_state::soundstatus_r() { return m_sound_status ^ 0xf; } template<int screen> -READ8_MEMBER(spdheat_state::sndcpu_sound_r) +uint8_t spdheat_state::sndcpu_sound_r() { m_sound_status |= 1 << screen; return m_sound_data[screen]; } -READ8_MEMBER(spdheat_state::sub_status_r) +uint8_t spdheat_state::sub_status_r() { return m_sub_status ? 0x80 : 0; } -READ8_MEMBER(spdheat_state::sub_snd_r) +uint8_t spdheat_state::sub_snd_r() { return m_sub_data; } -WRITE8_MEMBER(spdheat_state::sub_status_w) +void spdheat_state::sub_status_w(uint8_t data) { m_sub_status = 0; } // Write command to sub CPU -WRITE8_MEMBER(spdheat_state::sub_nmi_w) +void spdheat_state::sub_nmi_w(uint8_t data) { // Sub data is cleared by /NMI? m_sub_data = data; diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp index 76e99767c4a..c2af7ff0693 100644 --- a/src/mame/drivers/spdodgeb.cpp +++ b/src/mame/drivers/spdodgeb.cpp @@ -32,7 +32,7 @@ Notes: #include "speaker.h" -WRITE8_MEMBER(spdodgeb_state::spd_adpcm_w) +void spdodgeb_state::spd_adpcm_w(offs_t offset, uint8_t data) { int chip = offset & 1; msm5205_device *adpcm = chip ? m_msm2 : m_msm1; @@ -90,7 +90,7 @@ WRITE_LINE_MEMBER(spdodgeb_state::spd_adpcm_int_2) spd_adpcm_int(m_msm2, 1); } -READ8_MEMBER(spdodgeb_state::mcu63701_r) +uint8_t spdodgeb_state::mcu63701_r(offs_t offset) { // logerror("CPU #0 PC %04x: read from port %02x of 63701 data address 3801\n",m_maincpu->pc(),offset); diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index 8cbc4c3726a..1247e487ae3 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -165,7 +165,7 @@ resulting mess can be seen in the F4 viewer display. /****************************************************************************************************/ /* Spectrum 128 specific functions */ -READ8_MEMBER(spectrum_state::spectrum_128_pre_opcode_fetch_r) +uint8_t spectrum_state::spectrum_128_pre_opcode_fetch_r(offs_t offset) { /* this allows expansion devices to act upon opcode fetches from MEM addresses for example, interface1 detection fetches requires fetches at 0008 / 0708 to @@ -177,13 +177,13 @@ READ8_MEMBER(spectrum_state::spectrum_128_pre_opcode_fetch_r) return retval; } -WRITE8_MEMBER( spectrum_state::spectrum_128_bank1_w ) +void spectrum_state::spectrum_128_bank1_w(offs_t offset, uint8_t data) { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } -READ8_MEMBER( spectrum_state::spectrum_128_bank1_r ) +uint8_t spectrum_state::spectrum_128_bank1_r(offs_t offset) { uint8_t data; @@ -202,7 +202,7 @@ READ8_MEMBER( spectrum_state::spectrum_128_bank1_r ) return data; } -WRITE8_MEMBER(spectrum_state::spectrum_128_port_7ffd_w) +void spectrum_state::spectrum_128_port_7ffd_w(offs_t offset, uint8_t data) { /* D0-D2: RAM page located at 0x0c000-0x0ffff */ /* D3 - Screen select (screen 0 in ram page 5, screen 1 in ram page 7 */ @@ -240,7 +240,7 @@ void spectrum_state::spectrum_128_update_memory() m_screen_location = messram + (5<<14); } -READ8_MEMBER( spectrum_state::spectrum_128_ula_r ) +uint8_t spectrum_state::spectrum_128_ula_r() { int vpos = m_screen->vpos(); diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index e3e2b36a1a2..b7166642fab 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -291,7 +291,7 @@ SamRam /****************************************************************************************************/ /* Spectrum 48k functions */ -READ8_MEMBER(spectrum_state::pre_opcode_fetch_r) +uint8_t spectrum_state::pre_opcode_fetch_r(offs_t offset) { /* this allows expansion devices to act upon opcode fetches from MEM addresses for example, interface1 detection fetches requires fetches at 0008 / 0708 to @@ -303,7 +303,7 @@ READ8_MEMBER(spectrum_state::pre_opcode_fetch_r) return retval; } -READ8_MEMBER(spectrum_state::spectrum_data_r) +uint8_t spectrum_state::spectrum_data_r(offs_t offset) { m_exp->pre_data_fetch(offset); uint8_t retval = m_specmem->space(AS_PROGRAM).read_byte(offset); @@ -311,18 +311,18 @@ READ8_MEMBER(spectrum_state::spectrum_data_r) return retval; } -WRITE8_MEMBER(spectrum_state::spectrum_data_w) +void spectrum_state::spectrum_data_w(offs_t offset, uint8_t data) { m_specmem->space(AS_PROGRAM).write_byte(offset,data); } -WRITE8_MEMBER(spectrum_state::spectrum_rom_w) +void spectrum_state::spectrum_rom_w(offs_t offset, uint8_t data) { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } -READ8_MEMBER(spectrum_state::spectrum_rom_r) +uint8_t spectrum_state::spectrum_rom_r(offs_t offset) { uint8_t data; @@ -374,7 +374,7 @@ void spectrum_state::spectrum_port_fe_w(offs_t offset, uint8_t data) /* KT: more accurate keyboard reading */ /* DJR: Spectrum+ keys added */ -READ8_MEMBER(spectrum_state::spectrum_port_fe_r) +uint8_t spectrum_state::spectrum_port_fe_r(offs_t offset) { int lines = offset >> 8; int data = 0xff; @@ -449,7 +449,7 @@ READ8_MEMBER(spectrum_state::spectrum_port_fe_r) return data; } -READ8_MEMBER(spectrum_state::spectrum_port_ula_r) +uint8_t spectrum_state::spectrum_port_ula_r(offs_t offset) { // known ports used for reading floating bus are: // 0x28ff Arkanoid, Cobra, Renegade, Short Circuit, Terra Cresta @@ -477,7 +477,7 @@ READ8_MEMBER(spectrum_state::spectrum_port_ula_r) return floating_bus_r(); } -READ8_MEMBER(spectrum_state::spectrum_clone_port_ula_r) +uint8_t spectrum_state::spectrum_clone_port_ula_r() { int vpos = m_screen->vpos(); diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp index deded1bfee0..3c17d0d0313 100644 --- a/src/mame/drivers/speedatk.cpp +++ b/src/mame/drivers/speedatk.cpp @@ -117,7 +117,7 @@ uint8_t speedatk_state::iox_key_matrix_calc(uint8_t p_side) return 0; } -READ8_MEMBER(speedatk_state::key_matrix_r) +uint8_t speedatk_state::key_matrix_r() { if(m_coin_impulse > 0) { @@ -151,13 +151,13 @@ READ8_MEMBER(speedatk_state::key_matrix_r) return iox_key_matrix_calc((m_mux_data == 2) ? 0 : 2); } -WRITE8_MEMBER(speedatk_state::key_matrix_w) +void speedatk_state::key_matrix_w(uint8_t data) { m_mux_data = data; } /* Key matrix status,used for coin settings and I don't know what else... */ -READ8_MEMBER(speedatk_state::key_matrix_status_r) +uint8_t speedatk_state::key_matrix_status_r() { /* bit 0: busy flag,active low */ return (m_km_status & 0xfe) | 1; @@ -174,7 +174,7 @@ My guess is that the other commands configs the key matrix, it probably needs so 8x coinage setting command a1 */ -WRITE8_MEMBER(speedatk_state::key_matrix_status_w) +void speedatk_state::key_matrix_status_w(uint8_t data) { m_km_status = data; if((m_km_status & 0xf0) == 0x80) //coinage setting command diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index 9aeeef6d273..2c6f79c6df0 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -47,7 +47,7 @@ void speedbal_state::machine_start() save_item(NAME(m_leds_shiftreg)); } -WRITE8_MEMBER(speedbal_state::coincounter_w) +void speedbal_state::coincounter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x80); machine().bookkeeping().coin_counter_w(1, data & 0x40); @@ -66,9 +66,9 @@ void speedbal_state::main_cpu_map(address_map &map) map(0xff00, 0xffff).ram().share("spriteram"); } -WRITE8_MEMBER(speedbal_state::maincpu_50_w) +void speedbal_state::maincpu_50_w(uint8_t data) { - //logerror("%s: maincpu_50_w %02x\n", this->machine().describe_context(), data); + //logerror("%s: maincpu_50_w %02x\n", machine().describe_context(), data); } void speedbal_state::main_cpu_io_map(address_map &map) @@ -91,7 +91,7 @@ void speedbal_state::sound_cpu_map(address_map &map) -WRITE8_MEMBER(speedbal_state::leds_output_block) +void speedbal_state::leds_output_block(uint8_t data) { if (!m_leds_start) return; @@ -107,13 +107,13 @@ WRITE8_MEMBER(speedbal_state::leds_output_block) m_digits[10 * block + 2] = ~m_leds_shiftreg >> 16 & 0xff; } -WRITE8_MEMBER(speedbal_state::leds_start_block) +void speedbal_state::leds_start_block(uint8_t data) { m_leds_shiftreg = 0; m_leds_start = true; } -WRITE8_MEMBER(speedbal_state::leds_shift_bit) +void speedbal_state::leds_shift_bit(uint8_t data) { m_leds_shiftreg <<= 1; m_leds_shiftreg |= (data & 1); diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp index 2310135280a..b9f93e4f25a 100644 --- a/src/mame/drivers/speedspn.cpp +++ b/src/mame/drivers/speedspn.cpp @@ -59,14 +59,14 @@ TCH-SS9.u34 " / AB2Bh ******************************************************************************/ -READ8_MEMBER(speedspn_state::irq_ack_r) +uint8_t speedspn_state::irq_ack_r() { // I think this simply acknowledges the IRQ #0, it's read within the handler and the // value is discarded return 0; } -WRITE8_MEMBER(speedspn_state::rombank_w) +void speedspn_state::rombank_w(uint8_t data) { if (data > 8) { @@ -78,13 +78,13 @@ WRITE8_MEMBER(speedspn_state::rombank_w) /*** SOUND RELATED ***********************************************************/ -WRITE8_MEMBER(speedspn_state::sound_w) +void speedspn_state::sound_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(speedspn_state::okibank_w) +void speedspn_state::okibank_w(uint8_t data) { m_okibank->set_entry(data & 3); } diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 7d7b4e8b8ec..4e23648c097 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -91,12 +91,12 @@ void splash_state::splash_map(address_map &map) map(0xffc000, 0xffffff).ram(); /* Work RAM */ } -WRITE8_MEMBER(splash_state::splash_adpcm_data_w) +void splash_state::splash_adpcm_data_w(uint8_t data) { m_adpcm_data = data; } -WRITE8_MEMBER(splash_state::splash_adpcm_control_w) +void splash_state::splash_adpcm_control_w(uint8_t data) { m_msm->reset_w(!BIT(data, 0)); } @@ -120,13 +120,13 @@ void splash_state::splash_sound_map(address_map &map) /* Return of Lady Frog Maps */ /* note, sprite ram has moved, extra protection ram, and extra write for the pixel layer */ -READ16_MEMBER(splash_state::roldfrog_bombs_r) +uint16_t splash_state::roldfrog_bombs_r() { m_ret ^= 0x100; return m_ret; } -WRITE8_MEMBER(splash_state::sound_bank_w) +void splash_state::sound_bank_w(uint8_t data) { membank("sound_bank")->set_entry(data & 0xf); } @@ -138,7 +138,7 @@ void splash_state::roldfrog_update_irq( ) m_audiocpu->set_input_line_and_vector(0, irq ? ASSERT_LINE : CLEAR_LINE, 0xc7 | irq); // Z80 } -WRITE8_MEMBER(splash_state::roldfrog_vblank_ack_w) +void splash_state::roldfrog_vblank_ack_w(uint8_t data) { m_vblank_irq = 0; roldfrog_update_irq(); @@ -180,7 +180,7 @@ void splash_state::roldfrog_sound_map(address_map &map) map(0x8000, 0xffff).rom().bankr("sound_bank"); } -READ8_MEMBER(splash_state::roldfrog_unk_r) +uint8_t splash_state::roldfrog_unk_r() { // dragon punch leftovers return 0xff; @@ -198,18 +198,18 @@ void splash_state::roldfrog_sound_io_map(address_map &map) map(0x20, 0x23).r(FUNC(splash_state::roldfrog_unk_r)); } -READ16_MEMBER(funystrp_state::spr_read) +uint16_t funystrp_state::spr_read(offs_t offset) { return m_spriteram[offset]|0xff00; } -WRITE16_MEMBER(funystrp_state::spr_write) +void funystrp_state::spr_write(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spriteram[offset]); m_spriteram[offset]|=0xff00; /* 8 bit, expected 0xffnn when read as 16 bit */ } -WRITE8_MEMBER(funystrp_state::eeprom_w) +void funystrp_state::eeprom_w(uint8_t data) { m_eeprom->cs_write(BIT(data, 4)); m_eeprom->di_write(BIT(data, 6)); @@ -244,29 +244,29 @@ void splash_state::funystrp_sound_map(address_map &map) map(0x8000, 0xffff).rom().bankr("sound_bank"); } -READ8_MEMBER(funystrp_state::int_source_r) +uint8_t funystrp_state::int_source_r() { return ~m_msm_source; } -WRITE8_MEMBER(funystrp_state::msm1_data_w) +void funystrp_state::msm1_data_w(uint8_t data) { m_msm_data1=data; m_msm_source&=~1; m_msm_toggle1=0; } -WRITE8_MEMBER(funystrp_state::msm1_interrupt_w) +void funystrp_state::msm1_interrupt_w(uint8_t data) { m_snd_interrupt_enable1=~data; } -WRITE8_MEMBER(funystrp_state::msm2_interrupt_w) +void funystrp_state::msm2_interrupt_w(uint8_t data) { m_snd_interrupt_enable2=~data; } -WRITE8_MEMBER(funystrp_state::msm2_data_w) +void funystrp_state::msm2_data_w(uint8_t data) { m_msm_data2=data; m_msm_source&=~2; @@ -1116,7 +1116,7 @@ void splash_state::init_rebus() -READ16_MEMBER(funystrp_state::protection_r) +uint16_t funystrp_state::protection_r(offs_t offset) { int pc = m_maincpu->pc(); @@ -1397,7 +1397,7 @@ READ16_MEMBER(funystrp_state::protection_r) return 0; } -WRITE16_MEMBER(funystrp_state::protection_w) +void funystrp_state::protection_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int ofst = (0x100000/2)+offset; @@ -1436,8 +1436,8 @@ void funystrp_state::init_funystrp() membank("sound_bank")->configure_entries(0, 16, &ROM[0x00000], 0x8000); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x1fffff, write16_delegate(*this, FUNC(funystrp_state::protection_w))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x1fffff, read16_delegate(*this, FUNC(funystrp_state::protection_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x1fffff, write16s_delegate(*this, FUNC(funystrp_state::protection_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x1fffff, read16sm_delegate(*this, FUNC(funystrp_state::protection_r))); } GAME( 1992, splash, 0, splash, splash, splash_state, init_splash, ROT0, "Gaelco / OMK Software", "Splash! (Ver. 1.2 World)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index aecd99d4385..85bfeaae94a 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -118,19 +118,19 @@ INTERRUPT_GEN_MEMBER(sprint2_state::sprint2_irq) } -READ8_MEMBER(sprint2_state::sprint2_wram_r) +uint8_t sprint2_state::sprint2_wram_r(offs_t offset) { return m_video_ram[0x380 + offset % 0x80]; } -READ8_MEMBER(sprint2_state::sprint2_dip_r) +uint8_t sprint2_state::sprint2_dip_r(offs_t offset) { return (ioport("DSW")->read() << (2 * ((offset & 3) ^ 3))) & 0xc0; } -READ8_MEMBER(sprint2_state::sprint2_input_A_r) +uint8_t sprint2_state::sprint2_input_A_r(offs_t offset) { uint8_t val = ioport("INA")->read(); @@ -148,7 +148,7 @@ READ8_MEMBER(sprint2_state::sprint2_input_A_r) } -READ8_MEMBER(sprint2_state::sprint2_input_B_r) +uint8_t sprint2_state::sprint2_input_B_r(offs_t offset) { uint8_t val = ioport("INB")->read(); @@ -163,7 +163,7 @@ READ8_MEMBER(sprint2_state::sprint2_input_B_r) } -READ8_MEMBER(sprint2_state::sprint2_sync_r) +uint8_t sprint2_state::sprint2_sync_r() { uint8_t val = 0; @@ -183,39 +183,39 @@ READ8_MEMBER(sprint2_state::sprint2_sync_r) } -READ8_MEMBER(sprint2_state::sprint2_steering1_r) +uint8_t sprint2_state::sprint2_steering1_r() { return m_steering[0]; } -READ8_MEMBER(sprint2_state::sprint2_steering2_r) +uint8_t sprint2_state::sprint2_steering2_r() { return m_steering[1]; } -WRITE8_MEMBER(sprint2_state::sprint2_steering_reset1_w) +void sprint2_state::sprint2_steering_reset1_w(uint8_t data) { m_steering[0] |= 0x80; } -WRITE8_MEMBER(sprint2_state::sprint2_steering_reset2_w) +void sprint2_state::sprint2_steering_reset2_w(uint8_t data) { m_steering[1] |= 0x80; } -WRITE8_MEMBER(sprint2_state::sprint2_wram_w) +void sprint2_state::sprint2_wram_w(offs_t offset, uint8_t data) { m_video_ram[0x380 + offset % 0x80] = data; } -WRITE8_MEMBER(sprint2_state::output_latch_w) +void sprint2_state::output_latch_w(offs_t offset, uint8_t data) { m_outlatch->write_bit(offset >> 4, offset & 1); } -WRITE8_MEMBER(sprint2_state::sprint2_noise_reset_w) +void sprint2_state::sprint2_noise_reset_w(uint8_t data) { m_discrete->write(SPRINT2_NOISE_RESET, 0); } diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index 04199682982..2ac50455563 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -149,45 +149,45 @@ void sprint4_state::machine_reset() } -READ8_MEMBER(sprint4_state::wram_r) +uint8_t sprint4_state::wram_r(offs_t offset) { return m_videoram[0x380 + offset]; } -READ8_MEMBER(sprint4_state::analog_r) +uint8_t sprint4_state::analog_r(offs_t offset) { return (ioport("ANALOG")->read() << (~offset & 7)) & 0x80; } -READ8_MEMBER(sprint4_state::coin_r) +uint8_t sprint4_state::coin_r(offs_t offset) { return (ioport("COIN")->read() << (~offset & 7)) & 0x80; } -READ8_MEMBER(sprint4_state::collision_r) +uint8_t sprint4_state::collision_r(offs_t offset) { return (ioport("COLLISION")->read() << (~offset & 7)) & 0x80; } -READ8_MEMBER(sprint4_state::options_r) +uint8_t sprint4_state::options_r(offs_t offset) { return (ioport("DIP")->read() >> (2 * (offset & 3))) & 3; } -WRITE8_MEMBER(sprint4_state::wram_w) +void sprint4_state::wram_w(offs_t offset, uint8_t data) { m_videoram[0x380 + offset] = data; } -WRITE8_MEMBER(sprint4_state::collision_reset_w) +void sprint4_state::collision_reset_w(offs_t offset, uint8_t data) { m_collision[(offset >> 1) & 3] = 0; } -WRITE8_MEMBER(sprint4_state::da_latch_w) +void sprint4_state::da_latch_w(uint8_t data) { m_da_latch = data & 15; } @@ -195,20 +195,20 @@ WRITE8_MEMBER(sprint4_state::da_latch_w) #ifdef UNUSED_FUNCTION -WRITE8_MEMBER(sprint4_state::lockout_w) +void sprint4_state::lockout_w(offs_t offset, uint8_t data) { machine().bookkeeping().coin_lockout_global_w(~offset & 1); } #endif -WRITE8_MEMBER(sprint4_state::bang_w) +void sprint4_state::bang_w(uint8_t data) { m_discrete->write(SPRINT4_BANG_DATA, data & 0x0f); } -WRITE8_MEMBER(sprint4_state::attract_w) +void sprint4_state::attract_w(uint8_t data) { m_discrete->write(SPRINT4_ATTRACT_EN, data & 1); } diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp index c11afb6c1a7..ef9653f4886 100644 --- a/src/mame/drivers/sprint8.cpp +++ b/src/mame/drivers/sprint8.cpp @@ -66,13 +66,13 @@ void sprint8_state::machine_reset() } -READ8_MEMBER(sprint8_state::collision_r) +uint8_t sprint8_state::collision_r() { return m_collision_index; } -READ8_MEMBER(sprint8_state::input_r) +uint8_t sprint8_state::input_r(offs_t offset) { static const char *const portnames[] = { "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8" }; uint8_t val = ioport(portnames[offset])->read(); @@ -90,7 +90,7 @@ READ8_MEMBER(sprint8_state::input_r) } -WRITE8_MEMBER(sprint8_state::lockout_w) +void sprint8_state::lockout_w(offs_t offset, uint8_t data) { machine().bookkeeping().coin_lockout_w(offset, !(data & 1)); } diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp index 1b429af55a0..62fa497c1e6 100644 --- a/src/mame/drivers/spy.cpp +++ b/src/mame/drivers/spy.cpp @@ -31,7 +31,7 @@ #include "speaker.h" -READ8_MEMBER(spy_state::spy_bankedram1_r) +uint8_t spy_state::spy_bankedram1_r(offs_t offset) { if (m_rambank & 1) { @@ -54,7 +54,7 @@ READ8_MEMBER(spy_state::spy_bankedram1_r) return m_ram[offset]; } -WRITE8_MEMBER(spy_state::spy_bankedram1_w) +void spy_state::spy_bankedram1_w(offs_t offset, uint8_t data) { if (m_rambank & 1) { @@ -142,7 +142,7 @@ this is the data written to internal ram on startup: 3f: 5f 7e 00 ce 08 */ -WRITE8_MEMBER(spy_state::bankswitch_w) +void spy_state::bankswitch_w(uint8_t data) { int bank; @@ -241,7 +241,7 @@ void spy_state::spy_collision( ) } -WRITE8_MEMBER(spy_state::spy_3f90_w) +void spy_state::spy_3f90_w(uint8_t data) { /********************************************************************* * @@ -324,12 +324,12 @@ WRITE8_MEMBER(spy_state::spy_3f90_w) } -WRITE8_MEMBER(spy_state::spy_sh_irqtrigger_w) +void spy_state::spy_sh_irqtrigger_w(uint8_t data) { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -WRITE8_MEMBER(spy_state::sound_bank_w) +void spy_state::sound_bank_w(uint8_t data) { int bank_A, bank_B; @@ -343,7 +343,7 @@ WRITE8_MEMBER(spy_state::sound_bank_w) } -READ8_MEMBER(spy_state::k052109_051960_r) +uint8_t spy_state::k052109_051960_r(offs_t offset) { if (m_k052109->get_rmrd_line() == CLEAR_LINE) { @@ -358,7 +358,7 @@ READ8_MEMBER(spy_state::k052109_051960_r) return m_k052109->read(offset); } -WRITE8_MEMBER(spy_state::k052109_051960_w) +void spy_state::k052109_051960_w(offs_t offset, uint8_t data) { if (offset >= 0x3800 && offset < 0x3808) m_k051960->k051937_w(offset - 0x3800, data); diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index a9faae1d415..56bb30b4e79 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -160,7 +160,7 @@ MACHINE_START_MEMBER(srmp2_state,mjyuugi) ***************************************************************************/ -WRITE16_MEMBER(srmp2_state::srmp2_flags_w) +void srmp2_state::srmp2_flags_w(uint16_t data) { /* ---- ---x : Coin Counter @@ -177,7 +177,7 @@ WRITE16_MEMBER(srmp2_state::srmp2_flags_w) } -WRITE16_MEMBER(srmp2_state::mjyuugi_flags_w) +void srmp2_state::mjyuugi_flags_w(uint16_t data) { /* ---- ---x : Coin Counter @@ -189,7 +189,7 @@ WRITE16_MEMBER(srmp2_state::mjyuugi_flags_w) } -WRITE16_MEMBER(srmp2_state::mjyuugi_adpcm_bank_w) +void srmp2_state::mjyuugi_adpcm_bank_w(uint16_t data) { /* ---- xxxx : ADPCM Bank @@ -201,7 +201,7 @@ WRITE16_MEMBER(srmp2_state::mjyuugi_adpcm_bank_w) } -WRITE8_MEMBER(srmp2_state::adpcm_code_w) +void srmp2_state::adpcm_code_w(uint8_t data) { /* - Received data may be playing ADPCM number. @@ -256,7 +256,7 @@ WRITE_LINE_MEMBER(srmp2_state::adpcm_int) } } -READ8_MEMBER(srmp2_state::vox_status_r) +uint8_t srmp2_state::vox_status_r() { return 1; } @@ -283,7 +283,7 @@ uint8_t srmp2_state::iox_key_matrix_calc(uint8_t p_side) return 0; } -READ8_MEMBER(srmp2_state::iox_mux_r) +uint8_t srmp2_state::iox_mux_r() { /* first off check any pending protection value */ { @@ -326,12 +326,12 @@ READ8_MEMBER(srmp2_state::iox_mux_r) return ioport("SERVICE")->read() & 0xff; } -READ8_MEMBER(srmp2_state::iox_status_r) +uint8_t srmp2_state::iox_status_r() { return 1; } -WRITE8_MEMBER(srmp2_state::iox_command_w) +void srmp2_state::iox_command_w(uint8_t data) { /* bit wise command port apparently @@ -344,7 +344,7 @@ WRITE8_MEMBER(srmp2_state::iox_command_w) m_iox.ff = 0; // this also set flip flop back to 0 } -WRITE8_MEMBER(srmp2_state::iox_data_w) +void srmp2_state::iox_data_w(uint8_t data) { m_iox.data = data; @@ -358,7 +358,7 @@ WRITE8_MEMBER(srmp2_state::iox_data_w) m_iox.ff = 1; } -WRITE8_MEMBER(srmp2_state::srmp3_rombank_w) +void srmp2_state::srmp3_rombank_w(uint8_t data) { /* ---- xxxx : MAIN ROM bank @@ -376,12 +376,12 @@ WRITE8_MEMBER(srmp2_state::srmp3_rombank_w) **************************************************************************/ -WRITE8_MEMBER(srmp2_state::srmp2_irq2_ack_w) +void srmp2_state::srmp2_irq2_ack_w(uint8_t data) { m_maincpu->set_input_line(2, CLEAR_LINE); } -WRITE8_MEMBER(srmp2_state::srmp2_irq4_ack_w) +void srmp2_state::srmp2_irq4_ack_w(uint8_t data) { m_maincpu->set_input_line(4, CLEAR_LINE); } @@ -409,13 +409,13 @@ void srmp2_state::srmp2_map(address_map &map) map(0xf00000, 0xf00003).w("aysnd", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); } -READ8_MEMBER(srmp2_state::mjyuugi_irq2_ack_r) +uint8_t srmp2_state::mjyuugi_irq2_ack_r() { m_maincpu->set_input_line(2, CLEAR_LINE); return 0xff; // value returned doesn't matter } -READ8_MEMBER(srmp2_state::mjyuugi_irq4_ack_r) +uint8_t srmp2_state::mjyuugi_irq4_ack_r() { m_maincpu->set_input_line(4, CLEAR_LINE); return 0xff; // value returned doesn't matter @@ -449,7 +449,7 @@ void srmp2_state::mjyuugi_map(address_map &map) map(0xffc000, 0xffffff).ram().share("nvram"); } -WRITE8_MEMBER(srmp2_state::srmp3_flags_w) +void srmp2_state::srmp3_flags_w(uint8_t data) { /* ---- ---x : Coin Counter @@ -462,7 +462,7 @@ WRITE8_MEMBER(srmp2_state::srmp3_flags_w) m_gfx_bank = (data >> 6) & 0x03; } -WRITE8_MEMBER(srmp2_state::srmp3_irq_ack_w) +void srmp2_state::srmp3_irq_ack_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); } @@ -506,7 +506,7 @@ void srmp2_state::rmgoldyh_map(address_map &map) map(0xe000, 0xffff).ram().rw(m_seta001, FUNC(seta001_device::spritecodehigh_r8), FUNC(seta001_device::spritecodehigh_w8)); } -WRITE8_MEMBER(srmp2_state::rmgoldyh_rombank_w) +void srmp2_state::rmgoldyh_rombank_w(uint8_t data) { /* ---x xxxx : MAIN ROM bank diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp index 571bf7c52b6..d5744242b3a 100644 --- a/src/mame/drivers/sshangha.cpp +++ b/src/mame/drivers/sshangha.cpp @@ -97,7 +97,7 @@ HB-PCB-A5 M6100691A (distributed by Taito) -READ16_MEMBER(sshangha_state::sshanghab_protection16_r) // bootleg inputs +uint16_t sshangha_state::sshanghab_protection16_r(offs_t offset) // bootleg inputs { switch (offset) { @@ -113,7 +113,7 @@ READ16_MEMBER(sshangha_state::sshanghab_protection16_r) // bootleg inputs } /* Probably returns 0xffff when sprite DMA is complete, the game waits on it */ -READ16_MEMBER(sshangha_state::deco_71_r) +uint16_t sshangha_state::deco_71_r() { return 0xffff; } @@ -121,7 +121,7 @@ READ16_MEMBER(sshangha_state::deco_71_r) /******************************************************************************/ -READ16_MEMBER( sshangha_state::sshangha_protection_region_d_146_r ) +uint16_t sshangha_state::sshangha_protection_region_d_146_r(offs_t offset) { int real_address = 0x3f4000 + (offset *2); int deco146_addr = bitswap<32>(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff; @@ -130,7 +130,7 @@ READ16_MEMBER( sshangha_state::sshangha_protection_region_d_146_r ) return data; } -WRITE16_MEMBER( sshangha_state::sshangha_protection_region_d_146_w ) +void sshangha_state::sshangha_protection_region_d_146_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int real_address = 0x3f4000 + (offset *2); int deco146_addr = bitswap<32>(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff; @@ -138,7 +138,7 @@ WRITE16_MEMBER( sshangha_state::sshangha_protection_region_d_146_w ) m_deco146->write_data( deco146_addr, data, mem_mask, cs ); } -READ16_MEMBER( sshangha_state::sshangha_protection_region_8_146_r ) +uint16_t sshangha_state::sshangha_protection_region_8_146_r(offs_t offset) { int real_address = 0x3e0000 + (offset *2); int deco146_addr = bitswap<32>(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff; @@ -147,7 +147,7 @@ READ16_MEMBER( sshangha_state::sshangha_protection_region_8_146_r ) return data; } -WRITE16_MEMBER( sshangha_state::sshangha_protection_region_8_146_w ) +void sshangha_state::sshangha_protection_region_8_146_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int real_address = 0x3e0000 + (offset *2); int deco146_addr = bitswap<32>(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff; @@ -217,12 +217,12 @@ void sshangha_state::sshanghab_map(address_map &map) /* 8 "sound latches" shared between main and sound cpus. */ -READ8_MEMBER(sshangha_state::sound_shared_r) +uint8_t sshangha_state::sound_shared_r(offs_t offset) { return m_sound_shared_ram[offset] & 0xff; } -WRITE8_MEMBER(sshangha_state::sound_shared_w) +void sshangha_state::sound_shared_w(offs_t offset, uint8_t data) { m_sound_shared_ram[offset] = data & 0xff; } diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index b46e8499195..3b067bf0f97 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -292,7 +292,7 @@ void sslam_state::sslam_play(int track, int data) } } -WRITE8_MEMBER(sslam_state::sslam_snd_w) +void sslam_state::sslam_snd_w(uint8_t data) { logerror("%s Writing %04x to Sound CPU\n",machine().describe_context(),data); if (data >= 0x40) { @@ -364,7 +364,7 @@ WRITE8_MEMBER(sslam_state::sslam_snd_w) -WRITE16_MEMBER(powerbls_state::powerbls_sound_w) +void powerbls_state::powerbls_sound_w(uint16_t data) { m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(MCS51_INT1_LINE, HOLD_LINE); diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp index 2e56abaf3b9..3086dbf6485 100644 --- a/src/mame/drivers/ssozumo.cpp +++ b/src/mame/drivers/ssozumo.cpp @@ -48,7 +48,7 @@ void ssozumo_state::ssozumo_map(address_map &map) } -WRITE8_MEMBER(ssozumo_state::sound_nmi_mask_w) +void ssozumo_state::sound_nmi_mask_w(uint8_t data) { m_sound_nmi_mask = data & 1; } diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp index fdab0a73dfa..76f6f1ad271 100644 --- a/src/mame/drivers/sspeedr.cpp +++ b/src/mame/drivers/sspeedr.cpp @@ -37,13 +37,13 @@ void sspeedr_state::sspeedr_palette(palette_device &palette) const } -WRITE8_MEMBER(sspeedr_state::sspeedr_int_ack_w) +void sspeedr_state::sspeedr_int_ack_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(sspeedr_state::sspeedr_lamp_w) +void sspeedr_state::sspeedr_lamp_w(uint8_t data) { output().set_value("lampGO", BIT(data, 0)); output().set_value("lampEP", BIT(data, 1)); @@ -55,7 +55,7 @@ WRITE8_MEMBER(sspeedr_state::sspeedr_lamp_w) constexpr uint8_t ls48_map[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0x58,0x4c,0x62,0x69,0x78,0x00 }; -WRITE8_MEMBER(sspeedr_state::sspeedr_time_w) +void sspeedr_state::sspeedr_time_w(offs_t offset, uint8_t data) { data = data & 15; m_digits[24 + offset] = ls48_map[data]; @@ -63,7 +63,7 @@ WRITE8_MEMBER(sspeedr_state::sspeedr_time_w) } -WRITE8_MEMBER(sspeedr_state::sspeedr_score_w) +void sspeedr_state::sspeedr_score_w(offs_t offset, uint8_t data) { data = ~data & 15; m_digits[offset] = ls48_map[data]; @@ -71,7 +71,7 @@ WRITE8_MEMBER(sspeedr_state::sspeedr_score_w) } -WRITE8_MEMBER(sspeedr_state::sspeedr_sound_w) +void sspeedr_state::sspeedr_sound_w(uint8_t data) { /* not implemented */ } diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp index 2d02d25d5f1..c5f8ab10e67 100644 --- a/src/mame/drivers/ssrj.cpp +++ b/src/mame/drivers/ssrj.cpp @@ -52,7 +52,7 @@ void ssrj_state::machine_reset() m_oldport = 0x80; } -READ8_MEMBER(ssrj_state::wheel_r) +uint8_t ssrj_state::wheel_r() { int port = ioport("IN1")->read() - 0x80; int retval = port - m_oldport; diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index 970b12979a1..55c47d20f3f 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -199,7 +199,7 @@ IRQ_CALLBACK_MEMBER(ssv_state::irq_callback) return 0; } -WRITE16_MEMBER(ssv_state::irq_ack_w) +void ssv_state::irq_ack_w(offs_t offset, uint16_t data) { int level = ((offset * 2) & 0x70) >> 4; @@ -226,7 +226,7 @@ WRITE16_MEMBER(ssv_state::irq_ack_w) ultrax: 40,00 at the start then 42,4a twineag2: 40,00 at the start then 42,4a */ -WRITE16_MEMBER(ssv_state::irq_enable_w) +void ssv_state::irq_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_irq_enable); } @@ -292,7 +292,7 @@ WRITE_LINE_MEMBER(gdfs_state::adc_int_w) survarts: 83 sxyreact: 80 */ -WRITE16_MEMBER(ssv_state::lockout_w) +void ssv_state::lockout_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // popmessage("%02X",data & 0xff); if (ACCESSING_BITS_0_7) @@ -307,7 +307,7 @@ WRITE16_MEMBER(ssv_state::lockout_w) } /* Same as above but with inverted lockout lines */ -WRITE16_MEMBER(ssv_state::lockout_inv_w) +void ssv_state::lockout_inv_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // popmessage("%02X",data & 0xff); if (ACCESSING_BITS_0_7) @@ -345,17 +345,17 @@ void ssv_state::dsp_data_map(address_map &map) map(0x0000, 0x07ff).rom().region("dspdata", 0); } -READ16_MEMBER(ssv_state::dsp_dr_r) +uint16_t ssv_state::dsp_dr_r() { return m_dsp->snesdsp_read(true); } -WRITE16_MEMBER(ssv_state::dsp_dr_w) +void ssv_state::dsp_dr_w(uint16_t data) { m_dsp->snesdsp_write(true, data); } -READ16_MEMBER(ssv_state::dsp_r) +uint16_t ssv_state::dsp_r(offs_t offset) { uint16_t temp = m_dsp->dataram_r(offset/2); uint16_t res; @@ -372,7 +372,7 @@ READ16_MEMBER(ssv_state::dsp_r) return res; } -WRITE16_MEMBER(ssv_state::dsp_w) +void ssv_state::dsp_w(offs_t offset, uint16_t data) { uint16_t temp = m_dsp->dataram_r(offset/2); @@ -399,7 +399,7 @@ WRITE16_MEMBER(ssv_state::dsp_w) ***************************************************************************/ #ifdef UNUSED_FUNCTION -READ16_MEMBER(ssv_state::fake_r){ return ssv_scroll[offset]; } +uint16_t ssv_state::fake_r(offs_t offset){ return ssv_scroll[offset]; } #endif void ssv_state::ssv_map(address_map &map, u32 rom) @@ -428,7 +428,7 @@ void ssv_state::ssv_map(address_map &map, u32 rom) Drift Out '94 ***************************************************************************/ -READ16_MEMBER(ssv_state::drifto94_unknown_r) +uint16_t ssv_state::drifto94_unknown_r() { return machine().rand() & 0xffff; } @@ -452,12 +452,12 @@ void ssv_state::drifto94_map(address_map &map) Mobil Suit Gundam Final Shooting ***************************************************************************/ -READ16_MEMBER(gdfs_state::eeprom_r) +uint16_t gdfs_state::eeprom_r() { return m_adc->data_r() | (m_eeprom->do_read() << 8); } -WRITE16_MEMBER(gdfs_state::eeprom_w) +void gdfs_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (data & ~0x7b00) logerror("%s - Unknown EEPROM bit written %04X\n",machine().describe_context(),data); @@ -509,7 +509,7 @@ void gdfs_state::gdfs_map(address_map &map) ROM board, AFAIK) */ -READ16_MEMBER(ssv_state::hypreact_input_r) +uint16_t ssv_state::hypreact_input_r() { uint16_t input_sel = *m_input_sel; @@ -603,12 +603,12 @@ void ssv_state::meosism_map(address_map &map) /* Monster Slider needs the RAM mirrored for the gameplay logic to work correctly */ -READ16_MEMBER(ssv_state::mainram_r) +uint16_t ssv_state::mainram_r(offs_t offset) { return m_mainram[offset]; } -WRITE16_MEMBER(ssv_state::mainram_w) +void ssv_state::mainram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_mainram[offset]); } @@ -639,7 +639,7 @@ void ssv_state::ryorioh_map(address_map &map) Super Real Mahjong PIV ***************************************************************************/ -READ16_MEMBER(ssv_state::srmp4_input_r) +uint16_t ssv_state::srmp4_input_r() { uint16_t input_sel = *m_input_sel; @@ -670,12 +670,12 @@ void ssv_state::srmp4_map(address_map &map) Interrupts aren't supported by the chip emulator yet (lev 5 in this case, I guess) */ -READ16_MEMBER(ssv_state::srmp7_irqv_r) +uint16_t ssv_state::srmp7_irqv_r() { return 0x0080; } -WRITE16_MEMBER(ssv_state::srmp7_sound_bank_w) +void ssv_state::srmp7_sound_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -686,7 +686,7 @@ WRITE16_MEMBER(ssv_state::srmp7_sound_bank_w) // popmessage("%04X",data); } -READ16_MEMBER(ssv_state::srmp7_input_r) +uint16_t ssv_state::srmp7_input_r() { uint16_t input_sel = *m_input_sel; @@ -736,7 +736,7 @@ void ssv_state::survarts_map(address_map &map) ***************************************************************************/ -READ16_MEMBER(sxyreact_state::ballswitch_r) +uint16_t sxyreact_state::ballswitch_r() { return m_io_service->read(); } @@ -752,7 +752,7 @@ void sxyreact_state::dial_w(uint8_t data) m_sxyreact_adc->sck_w(BIT(data, 6)); } -WRITE16_MEMBER(sxyreact_state::motor_w) +void sxyreact_state::motor_w(uint16_t data) { // popmessage("%04X",data); // 8 = motor on; 0 = motor off } @@ -811,16 +811,16 @@ void ssv_state::ultrax_map(address_map &map) Joryuu Syougi Kyoushitsu ***************************************************************************/ -/* from st0016.c */ +/* from simple_st0016.cpp */ -READ32_MEMBER(ssv_state::latch32_r) +uint32_t ssv_state::latch32_r(offs_t offset) { if(!offset) m_latches[2]&=~2; return m_latches[offset]; } -WRITE32_MEMBER(ssv_state::latch32_w) +void ssv_state::latch32_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if(!offset) m_latches[2]|=1; @@ -828,14 +828,14 @@ WRITE32_MEMBER(ssv_state::latch32_w) machine().scheduler().synchronize(); } -READ16_MEMBER(ssv_state::latch16_r) +uint16_t ssv_state::latch16_r(offs_t offset) { if(!offset) m_latches[2]&=~1; return m_latches[offset]; } -WRITE16_MEMBER(ssv_state::latch16_w) +void ssv_state::latch16_w(offs_t offset, uint16_t data) { if(!offset) m_latches[2]|=2; diff --git a/src/mame/drivers/stactics.cpp b/src/mame/drivers/stactics.cpp index 9c2d6e8daac..0ae2791c439 100644 --- a/src/mame/drivers/stactics.cpp +++ b/src/mame/drivers/stactics.cpp @@ -69,13 +69,13 @@ READ_LINE_MEMBER(stactics_state::motor_not_ready_r) } -READ8_MEMBER(stactics_state::vert_pos_r) +uint8_t stactics_state::vert_pos_r() { return 0x70 - m_vert_pos; } -READ8_MEMBER(stactics_state::horiz_pos_r) +uint8_t stactics_state::horiz_pos_r() { return m_horiz_pos + 0x88; } diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 0c9bca18345..6927e2c6a00 100644 --- a/src/mame/drivers/stadhero.cpp +++ b/src/mame/drivers/stadhero.cpp @@ -103,7 +103,7 @@ /******************************************************************************/ -WRITE16_MEMBER(stadhero_state::int_ack_w) +void stadhero_state::int_ack_w(uint16_t data) { m_maincpu->set_input_line(M68K_IRQ_5, CLEAR_LINE); } diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp index cd7bc37214d..a6a9e35521b 100644 --- a/src/mame/drivers/starfire.cpp +++ b/src/mame/drivers/starfire.cpp @@ -60,7 +60,7 @@ starfira has one less rom in total than starfire but everything passes as * *************************************/ -WRITE8_MEMBER(starfire_state::starfire_scratch_w) +void starfire_state::starfire_scratch_w(offs_t offset, uint8_t data) { /* A12 and A3 select video control registers */ if ((offset & 0x1008) == 0x1000) @@ -69,7 +69,7 @@ WRITE8_MEMBER(starfire_state::starfire_scratch_w) { case 0: m_starfire_vidctrl = data; break; case 1: m_starfire_vidctrl1 = data; break; - case 2: m_io2_write(space, offset, data, 0xff); break; + case 2: m_io2_write(data); break; default: break; } } @@ -80,11 +80,11 @@ WRITE8_MEMBER(starfire_state::starfire_scratch_w) } -READ8_MEMBER(starfire_state::starfire_scratch_r) +uint8_t starfire_state::starfire_scratch_r(offs_t offset) { /* A11 selects input ports */ if (offset & 0x800) - return m_input_read(space, offset, 0xff); + return m_input_read(offset); /* convert to a videoram offset */ offset = (offset & 0x31f) | ((offset & 0xe0) << 5); @@ -99,7 +99,7 @@ READ8_MEMBER(starfire_state::starfire_scratch_r) * *************************************/ -WRITE8_MEMBER(starfire_state::starfire_sound_w) +void starfire_state::starfire_sound_w(uint8_t data) { // starfire sound samples (preliminary) uint8_t rise = data & ~m_prev_sound; @@ -127,14 +127,14 @@ WRITE8_MEMBER(starfire_state::starfire_sound_w) else if (rise & 0x10) m_samples->start(4, 4); } -WRITE8_MEMBER(starfire_state::fireone_sound_w) +void starfire_state::fireone_sound_w(uint8_t data) { // TODO: sound m_fireone_select = (data & 0x8) ? 0 : 1; } -READ8_MEMBER(starfire_state::starfire_input_r) +uint8_t starfire_state::starfire_input_r(offs_t offset) { switch (offset & 15) { @@ -155,7 +155,7 @@ READ8_MEMBER(starfire_state::starfire_input_r) } } -READ8_MEMBER(starfire_state::fireone_input_r) +uint8_t starfire_state::fireone_input_r(offs_t offset) { static const uint8_t fireone_paddle_map[64] = { @@ -450,8 +450,8 @@ ROM_END void starfire_state::init_starfire() { - m_input_read = read8_delegate(*this, FUNC(starfire_state::starfire_input_r)); - m_io2_write = write8_delegate(*this, FUNC(starfire_state::starfire_sound_w)); + m_input_read = read8sm_delegate(*this, FUNC(starfire_state::starfire_input_r)); + m_io2_write = write8smo_delegate(*this, FUNC(starfire_state::starfire_sound_w)); /* register for state saving */ save_item(NAME(m_prev_sound)); @@ -459,8 +459,8 @@ void starfire_state::init_starfire() void starfire_state::init_fireone() { - m_input_read = read8_delegate(*this, FUNC(starfire_state::fireone_input_r)); - m_io2_write = write8_delegate(*this, FUNC(starfire_state::fireone_sound_w)); + m_input_read = read8sm_delegate(*this, FUNC(starfire_state::fireone_input_r)); + m_io2_write = write8smo_delegate(*this, FUNC(starfire_state::fireone_sound_w)); /* register for state saving */ save_item(NAME(m_fireone_select)); diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp index 64bee936a86..8bc64a78072 100644 --- a/src/mame/drivers/starshp1.cpp +++ b/src/mame/drivers/starshp1.cpp @@ -42,7 +42,7 @@ WRITE_LINE_MEMBER(starshp1_state::phasor_w) } -WRITE8_MEMBER(starshp1_state::starshp1_collision_reset_w) +void starshp1_state::starshp1_collision_reset_w(uint8_t data) { m_collision_latch = 0; } @@ -78,13 +78,13 @@ CUSTOM_INPUT_MEMBER(starshp1_state::collision_latch_r) } -WRITE8_MEMBER(starshp1_state::starshp1_analog_in_w) +void starshp1_state::starshp1_analog_in_w(offs_t offset, uint8_t data) { m_analog_in_select = offset & 3; } -WRITE8_MEMBER(starshp1_state::starshp1_analog_out_w) +void starshp1_state::starshp1_analog_out_w(offs_t offset, uint8_t data) { switch (offset & 7) { diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp index f96d5d65c9d..a74fed670c0 100644 --- a/src/mame/drivers/starwars.cpp +++ b/src/mame/drivers/starwars.cpp @@ -41,7 +41,7 @@ #define CLOCK_3KHZ (MASTER_CLOCK / 4096) -WRITE8_MEMBER(starwars_state::quad_pokeyn_w) +void starwars_state::quad_pokeyn_w(offs_t offset, uint8_t data) { int pokey_num = (offset >> 3) & ~0x04; int control = (offset & 0x20) >> 2; @@ -79,7 +79,7 @@ void starwars_state::machine_reset() * *************************************/ -WRITE8_MEMBER(starwars_state::irq_ack_w) +void starwars_state::irq_ack_w(uint8_t data) { m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } @@ -105,7 +105,7 @@ void starwars_state::esb_slapstic_tweak(address_space &space, offs_t offset) } -READ8_MEMBER(starwars_state::esb_slapstic_r) +uint8_t starwars_state::esb_slapstic_r(address_space &space, offs_t offset) { int result = m_slapstic_base[offset]; esb_slapstic_tweak(space, offset); @@ -113,7 +113,7 @@ READ8_MEMBER(starwars_state::esb_slapstic_r) } -WRITE8_MEMBER(starwars_state::esb_slapstic_w) +void starwars_state::esb_slapstic_w(address_space &space, offs_t offset, uint8_t data) { esb_slapstic_tweak(space, offset); } diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp index 53be5c03c6f..9ddb0240cf8 100644 --- a/src/mame/drivers/stlforce.cpp +++ b/src/mame/drivers/stlforce.cpp @@ -73,14 +73,14 @@ TO DO : #include "includes/stlforce.h" -WRITE8_MEMBER(stlforce_state::eeprom_w) +void stlforce_state::eeprom_w(uint8_t data) { m_eeprom->di_write(data & 0x01); m_eeprom->cs_write((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); m_eeprom->clk_write((data & 0x04) ? ASSERT_LINE : CLEAR_LINE ); } -WRITE8_MEMBER(stlforce_state::oki_bank_w) +void stlforce_state::oki_bank_w(uint8_t data) { if (m_okibank.found()) { diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 63d55cfcf82..639aeaf3273 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -94,7 +94,7 @@ offsets: 0x001f PORT-AD (8ch, write: bits 0-2 - set channel, read: channel data with autoinc channel number) */ -READ8_MEMBER(stv_state::stv_ioga_r) +uint8_t stv_state::stv_ioga_r(offs_t offset) { const char *const portg[] = { "PORTG.0", "PORTG.1", "PORTG.2", "PORTG.3" }; @@ -130,7 +130,7 @@ READ8_MEMBER(stv_state::stv_ioga_r) return res; } -WRITE8_MEMBER(stv_state::stv_ioga_w) +void stv_state::stv_ioga_w(offs_t offset, uint8_t data) { if(offset & 0x10 && !machine().side_effects_disabled()) printf("Writing to mirror %08x %02x?\n",offset * 2 + 1,data); @@ -162,7 +162,7 @@ WRITE8_MEMBER(stv_state::stv_ioga_w) } } -READ8_MEMBER(stv_state::critcrsh_ioga_r) +uint8_t stv_state::critcrsh_ioga_r(offs_t offset) { uint8_t res; const char *const lgnames[] = { "LIGHTX", "LIGHTY" }; @@ -177,13 +177,13 @@ READ8_MEMBER(stv_state::critcrsh_ioga_r) res = bitswap<8>(res, 2, 3, 0, 1, 6, 7, 5, 4) & 0xf3; res |= (ioport("PORTC")->read() & 0x10) ? 0x0 : 0x4; // x/y hit latch actually break; - default: res = stv_ioga_r(space,offset); break; + default: res = stv_ioga_r(offset); break; } return res; } -READ8_MEMBER(stv_state::magzun_ioga_r) +uint8_t stv_state::magzun_ioga_r(offs_t offset) { uint8_t res; @@ -199,23 +199,23 @@ READ8_MEMBER(stv_state::magzun_ioga_r) case 0x19: res = 0; break; - default: res = stv_ioga_r(space,offset); break; + default: res = stv_ioga_r(offset); break; } return res; } -WRITE8_MEMBER(stv_state::magzun_ioga_w) +void stv_state::magzun_ioga_w(offs_t offset, uint8_t data) { switch(offset * 2 + 1) { case 0x13: m_serial_tx = (data << 8) | (m_serial_tx & 0xff); break; case 0x15: m_serial_tx = (data & 0xff) | (m_serial_tx & 0xff00); break; - default: stv_ioga_w(space,offset,data); break; + default: stv_ioga_w(offset,data); break; } } -READ8_MEMBER(stv_state::stvmp_ioga_r) +uint8_t stv_state::stvmp_ioga_r(offs_t offset) { const char *const mpnames[2][5] = { {"P1_KEY0", "P1_KEY1", "P1_KEY2", "P1_KEY3", "P1_KEY4"}, @@ -229,7 +229,7 @@ READ8_MEMBER(stv_state::stvmp_ioga_r) case 0x01: case 0x03: if(m_port_sel & 0x10) // joystick select <<< this is obviously wrong, this bit only select PORTE direction - res = stv_ioga_r(space,offset); + res = stv_ioga_r(offset); else // mahjong panel select { int i; @@ -241,27 +241,27 @@ READ8_MEMBER(stv_state::stvmp_ioga_r) } } break; - default: res = stv_ioga_r(space,offset); break; + default: res = stv_ioga_r(offset); break; } return res; } -WRITE8_MEMBER(stv_state::stvmp_ioga_w) +void stv_state::stvmp_ioga_w(offs_t offset, uint8_t data) { switch(offset * 2 + 1) { case 0x09: m_mux_data = data ^ 0xff; break; case 0x11: m_port_sel = data; break; - default: stv_ioga_w(space,offset,data); break; + default: stv_ioga_w(offset,data); break; } } -WRITE8_MEMBER(stv_state::hop_ioga_w) +void stv_state::hop_ioga_w(offs_t offset, uint8_t data) { if ((offset * 2 + 1) == 7) m_hopper->motor_w(data & 0x80); - stv_ioga_w(space, offset, data); + stv_ioga_w(offset, data); } /* @@ -332,7 +332,7 @@ void stv_state::init_stv() TODO: game doesn't work if not in debugger? */ -READ32_MEMBER(stv_state::magzun_hef_hack_r) +uint32 stv_state::magzun_hef_hack_r() { if(m_maincpu->pc()==0x604bf20) return 0x00000001; //HWEF @@ -341,7 +341,7 @@ READ32_MEMBER(stv_state::magzun_hef_hack_r) return m_workram_h[0x08e830/4]; } -READ32_MEMBER(stv_state::magzun_rx_hack_r) +uint32_t stv_state::magzun_rx_hack_r() { if(m_maincpu->pc()==0x604c006) return 0x40; @@ -356,8 +356,8 @@ void stv_state::init_magzun() init_stv(); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x608e830, 0x608e833, read32_delegate(*this, FUNC(stv_state::magzun_hef_hack_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x60ff3b4, 0x60ff3b7, read32_delegate(*this, FUNC(stv_state::magzun_rx_hack_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x608e830, 0x608e833, read32smo_delegate(*this, FUNC(stv_state::magzun_hef_hack_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x60ff3b4, 0x60ff3b7, read32smo_delegate(*this, FUNC(stv_state::magzun_rx_hack_r))); /* Program ROM patches, don't understand how to avoid these two checks ... */ { @@ -619,8 +619,8 @@ void stv_state::init_batmanfr() init_stv(); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x04800000, 0x04800003, write32_delegate(*this, FUNC(stv_state::batmanfr_sound_comms_w))); - m_slave->space(AS_PROGRAM).install_write_handler(0x04800000, 0x04800003, write32_delegate(*this, FUNC(stv_state::batmanfr_sound_comms_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x04800000, 0x04800003, write32s_delegate(*this, FUNC(stv_state::batmanfr_sound_comms_w))); + m_slave->space(AS_PROGRAM).install_write_handler(0x04800000, 0x04800003, write32s_delegate(*this, FUNC(stv_state::batmanfr_sound_comms_w))); m_minit_boost = m_sinit_boost = 0; m_minit_boost_timeslice = m_sinit_boost_timeslice = attotime::from_usec(50); @@ -815,7 +815,7 @@ void stv_state::init_ffreveng() } -READ32_MEMBER(stv_state::decathlt_prot_r) +uint32_t stv_state::decathlt_prot_r(offs_t offset, uint32_t mem_mask) { // needs to be a way to indicate if device is enabled and fall through to cartridge data if not? if (m_newprotection_element) @@ -830,7 +830,7 @@ READ32_MEMBER(stv_state::decathlt_prot_r) return ret; } -WRITE32_MEMBER(stv_state::decathlt_prot_srcaddr_w) +void stv_state::decathlt_prot_srcaddr_w(offs_t offset, uint32_t data, uint32_t mem_mask) { int offs = offset * 4; @@ -850,12 +850,12 @@ WRITE32_MEMBER(stv_state::decathlt_prot_srcaddr_w) void stv_state::init_decathlt() { - m_maincpu->space(AS_PROGRAM).install_write_handler(0x2000000, 0x37fffff, write32_delegate(*this, FUNC(stv_state::decathlt_prot_srcaddr_w))); // set compressed data source address, write data + m_maincpu->space(AS_PROGRAM).install_write_handler(0x2000000, 0x37fffff, write32s_delegate(*this, FUNC(stv_state::decathlt_prot_srcaddr_w))); // set compressed data source address, write data // really needs installing over the whole range, with fallbacks to read rom if device is disabled or isn't accessed on given address - m_maincpu->space(AS_PROGRAM).install_read_handler(0x27ffff8, 0x27ffffb, read32_delegate(*this, FUNC(stv_state::decathlt_prot_r))); // read decompressed data - m_maincpu->space(AS_PROGRAM).install_read_handler(0x2fffff8, 0x2fffffb, read32_delegate(*this, FUNC(stv_state::decathlt_prot_r))); // ^ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x37ffff8, 0x37ffffb, read32_delegate(*this, FUNC(stv_state::decathlt_prot_r))); // ^ + m_maincpu->space(AS_PROGRAM).install_read_handler(0x27ffff8, 0x27ffffb, read32s_delegate(*this, FUNC(stv_state::decathlt_prot_r))); // read decompressed data + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2fffff8, 0x2fffffb, read32s_delegate(*this, FUNC(stv_state::decathlt_prot_r))); // ^ + m_maincpu->space(AS_PROGRAM).install_read_handler(0x37ffff8, 0x37ffffb, read32s_delegate(*this, FUNC(stv_state::decathlt_prot_r))); // ^ m_protbank->configure_entry(0, memregion("cart")->base() + 0x0000000); m_protbank->configure_entry(1, memregion("cart")->base() + 0x0800000); @@ -1131,7 +1131,7 @@ void stv_state::stv_5838(machine_config &config) Similar if not the same as Magic the Gathering, probably needs merging. */ -WRITE32_MEMBER( stv_state::batmanfr_sound_comms_w ) +void stv_state::batmanfr_sound_comms_w(offs_t offset, uint32_t data, uint32_t mem_mask) { // FIXME if(ACCESSING_BITS_16_31) diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp index 1cfb53523a4..3e550dd7f32 100644 --- a/src/mame/drivers/sub.cpp +++ b/src/mame/drivers/sub.cpp @@ -144,7 +144,7 @@ void sub_state::subm_map(address_map &map) map(0xf060, 0xf060).portr("IN0"); } -WRITE8_MEMBER(sub_state::nmi_mask_w) +void sub_state::nmi_mask_w(uint8_t data) { m_nmi_en = data & 1; if (!m_nmi_en) diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 7a0254b5235..7bbb68afac5 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -45,7 +45,7 @@ Year + Game By Board Hardware ***************************************************************************/ -WRITE16_MEMBER(suna16_state::soundlatch_w) +void suna16_state::soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -55,7 +55,7 @@ WRITE16_MEMBER(suna16_state::soundlatch_w) } -WRITE16_MEMBER(suna16_state::bssoccer_leds_w) +void suna16_state::bssoccer_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -69,7 +69,7 @@ WRITE16_MEMBER(suna16_state::bssoccer_leds_w) } -WRITE16_MEMBER(suna16_state::uballoon_leds_w) +void suna16_state::uballoon_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -81,7 +81,7 @@ WRITE16_MEMBER(suna16_state::uballoon_leds_w) } -WRITE16_MEMBER(suna16_state::bestbest_coin_w) +void suna16_state::bestbest_coin_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -115,7 +115,7 @@ void suna16_state::bssoccer_map(address_map &map) Ultra Balloon ***************************************************************************/ -READ8_MEMBER(suna16_state::uballoon_prot_r) +uint8_t suna16_state::uballoon_prot_r(offs_t offset) { uint8_t ret = 0; @@ -138,7 +138,7 @@ READ8_MEMBER(suna16_state::uballoon_prot_r) return ret; } -WRITE8_MEMBER(suna16_state::uballoon_prot_w) +void suna16_state::uballoon_prot_w(offs_t offset, uint8_t data) { switch (offset) { @@ -192,12 +192,12 @@ void suna16_state::sunaq_map(address_map &map) Best Of Best ***************************************************************************/ -READ8_MEMBER(suna16_state::bestbest_prot_r) +uint8_t suna16_state::bestbest_prot_r() { return m_prot; } -WRITE8_MEMBER(suna16_state::bestbest_prot_w) +void suna16_state::bestbest_prot_w(uint8_t data) { switch (data) { @@ -317,14 +317,14 @@ MACHINE_START_MEMBER(suna16_state, bssoccer) /* Bank Switching */ -WRITE8_MEMBER(suna16_state::bssoccer_pcm_1_bankswitch_w) +void suna16_state::bssoccer_pcm_1_bankswitch_w(uint8_t data) { const int bank = data & 7; if (bank & ~7) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", m_pcm1->pc(), data); m_bank1->set_entry(bank); } -WRITE8_MEMBER(suna16_state::bssoccer_pcm_2_bankswitch_w) +void suna16_state::bssoccer_pcm_2_bankswitch_w(uint8_t data) { const int bank = data & 7; if (bank & ~7) logerror("CPU#3 PC %06X - ROM bank unknown bits: %02X\n", m_pcm2->pc(), data); @@ -374,7 +374,7 @@ void suna16_state::bssoccer_pcm_2_io_map(address_map &map) /* Bank Switching */ -WRITE8_MEMBER(suna16_state::uballoon_pcm_1_bankswitch_w) +void suna16_state::uballoon_pcm_1_bankswitch_w(uint8_t data) { const int bank = data & 1; if (bank & ~1) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", m_pcm1->pc(), data); @@ -409,8 +409,7 @@ MACHINE_START_MEMBER(suna16_state,uballoon) MACHINE_RESET_MEMBER(suna16_state,uballoon) { - address_space &space = m_maincpu->space(AS_PROGRAM); - uballoon_pcm_1_bankswitch_w(space, 0, 0); + uballoon_pcm_1_bankswitch_w(0); } diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index c95e0de37b1..61e0e1cbb55 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -477,7 +477,7 @@ void suna8_state::init_sparkman() Hard Head ***************************************************************************/ -READ8_MEMBER(suna8_state::hardhead_protection_r) +uint8_t suna8_state::hardhead_protection_r(offs_t offset) { uint8_t protection_val = m_protection_val; @@ -490,7 +490,7 @@ READ8_MEMBER(suna8_state::hardhead_protection_r) (((offset ^ protection_val) & 0x01) ? 0x84 : 0); } -WRITE8_MEMBER(suna8_state::hardhead_protection_w) +void suna8_state::hardhead_protection_w(offs_t offset, uint8_t data) { if (data & 0x80) m_protection_val = data; else m_protection_val = offset & 1; @@ -509,7 +509,7 @@ WRITE8_MEMBER(suna8_state::hardhead_protection_w) Hard Head ***************************************************************************/ -READ8_MEMBER(suna8_state::hardhead_ip_r) +uint8_t suna8_state::hardhead_ip_r() { switch (*m_hardhead_ip) { @@ -528,7 +528,7 @@ READ8_MEMBER(suna8_state::hardhead_ip_r) ---4 ---- ---- 3210 ROM Bank */ -WRITE8_MEMBER(suna8_state::hardhead_bankswitch_w) +void suna8_state::hardhead_bankswitch_w(uint8_t data) { int bank = data & 0x0f; @@ -543,7 +543,7 @@ WRITE8_MEMBER(suna8_state::hardhead_bankswitch_w) ---- -2-- Flip Screen ---- --10 */ -WRITE8_MEMBER(suna8_state::hardhead_flipscreen_w) +void suna8_state::hardhead_flipscreen_w(uint8_t data) { flip_screen_set(data & 0x04); machine().bookkeeping().coin_lockout_w(0, data & 0x08); @@ -584,7 +584,7 @@ void suna8_state::hardhead_io_map(address_map &map) ---- 3--- ---- -210 ROM Bank */ -WRITE8_MEMBER(suna8_state::rranger_bankswitch_w) +void suna8_state::rranger_bankswitch_w(uint8_t data) { int bank = data & 0x07; if ((~data & 0x10) && (bank >= 4)) bank += 4; @@ -606,13 +606,13 @@ WRITE8_MEMBER(suna8_state::rranger_bankswitch_w) ---- --1- 1 -> Interlude screens ---- ---0 */ -READ8_MEMBER(suna8_state::rranger_soundstatus_r) +uint8_t suna8_state::rranger_soundstatus_r() { m_soundlatch2->read(); return 0x02; } -WRITE8_MEMBER(suna8_state::sranger_prot_w) +void suna8_state::sranger_prot_w(uint8_t data) { /* check code at 0x2ce2 (in sranger), protection is so dire that I can't even exactly estabilish if what I'm doing can be considered or not a kludge... -AS */ @@ -655,7 +655,7 @@ void suna8_state::rranger_io_map(address_map &map) ---- --1- ---- ---0 Use Cheat 1 and 2 (driver config) */ -READ8_MEMBER(suna8_state::brickzn_cheats_r) +uint8_t suna8_state::brickzn_cheats_r() { static uint8_t bit2 = 0; bit2 = 1 - bit2; // see code at 2b48 @@ -670,7 +670,7 @@ READ8_MEMBER(suna8_state::brickzn_cheats_r) ---- --1- Sprite RAM Bank ---- ---0 Flip Screen */ -WRITE8_MEMBER(suna8_state::brickzn_sprbank_w) +void suna8_state::brickzn_sprbank_w(uint8_t data) { m_protection_val = data; @@ -686,7 +686,7 @@ WRITE8_MEMBER(suna8_state::brickzn_sprbank_w) C060: 7654 ---- ---- 3210 ROM Bank */ -WRITE8_MEMBER(suna8_state::brickzn_rombank_w) +void suna8_state::brickzn_rombank_w(uint8_t data) { int bank = data & 0x0f; @@ -706,7 +706,7 @@ WRITE8_MEMBER(suna8_state::brickzn_rombank_w) ---- --1- Start 2 Led ---- ---0 Start 1 Led */ -WRITE8_MEMBER(suna8_state::brickzn_leds_w) +void suna8_state::brickzn_leds_w(uint8_t data) { m_leds[0] = BIT(data, 0); m_leds[1] = BIT(data, 1); @@ -720,7 +720,7 @@ WRITE8_MEMBER(suna8_state::brickzn_leds_w) C0A0: 7654 321- ---- ---0 Palette RAM Bank */ -WRITE8_MEMBER(suna8_state::brickzn_palbank_w) +void suna8_state::brickzn_palbank_w(uint8_t data) { m_palettebank = data & 0x01; @@ -763,13 +763,13 @@ void suna8_state::brickzn11_map(address_map &map) C0A0: Leds */ -WRITE8_MEMBER(suna8_state::brickzn_multi_w) +void suna8_state::brickzn_multi_w(uint8_t data) { int protselect = m_protection_val & 0xfc; if ((protselect == 0x88) || (protselect == 0x8c)) { - brickzn_palbank_w(space, offset, data, mem_mask); + brickzn_palbank_w(data); } else if (protselect == 0x90) { @@ -790,7 +790,7 @@ WRITE8_MEMBER(suna8_state::brickzn_multi_w) } else if (protselect == 0x04) { - brickzn_leds_w(space, offset, data, mem_mask); + brickzn_leds_w(data); } else if (protselect == 0x80) { @@ -826,7 +826,7 @@ WRITE8_MEMBER(suna8_state::brickzn_multi_w) (newer sets only) C0C0: two protection values written in rapid succession */ -WRITE8_MEMBER(suna8_state::brickzn_prot2_w) +void suna8_state::brickzn_prot2_w(uint8_t data) { // Disable work RAM write, see code at 96a: if ((m_prot2 ^ data) == 0x24) @@ -848,11 +848,11 @@ WRITE8_MEMBER(suna8_state::brickzn_prot2_w) } // (newer sets only) Disable palette RAM writes, see code at 4990: -WRITE8_MEMBER(suna8_state::brickzn_enab_palram_w) +void suna8_state::brickzn_enab_palram_w(uint8_t data) { m_paletteram_enab = 1; } -WRITE8_MEMBER(suna8_state::brickzn_disab_palram_w) +void suna8_state::brickzn_disab_palram_w(uint8_t data) { m_paletteram_enab = 0; } @@ -904,7 +904,7 @@ void suna8_state::brickzn_io_map(address_map &map) ***************************************************************************/ /* Probably wrong: */ -WRITE8_MEMBER(suna8_state::hardhea2_nmi_w) +void suna8_state::hardhea2_nmi_w(uint8_t data) { m_nmi_enable = data & 0x01; // if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown nmi bits: %02X\n",m_maincpu->pc(),data); @@ -914,13 +914,13 @@ WRITE8_MEMBER(suna8_state::hardhea2_nmi_w) 7654 321- ---- ---0 Flip Screen */ -WRITE8_MEMBER(suna8_state::hardhea2_flipscreen_w) +void suna8_state::hardhea2_flipscreen_w(uint8_t data) { flip_screen_set(data & 0x01); if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown flipscreen bits: %02X\n",m_maincpu->pc(),data); } -WRITE8_MEMBER(suna8_state::hardhea2_leds_w) +void suna8_state::hardhea2_leds_w(uint8_t data) { m_leds[0] = BIT(data, 0); m_leds[1] = BIT(data, 1); @@ -933,7 +933,7 @@ WRITE8_MEMBER(suna8_state::hardhea2_leds_w) ---- --1- Sprite RAM Bank ---- ---0 Sprite RAM Bank? */ -WRITE8_MEMBER(suna8_state::hardhea2_spritebank_w) +void suna8_state::hardhea2_spritebank_w(uint8_t data) { m_spritebank = (data >> 1) & 1; if (data & ~0x02) logerror("CPU #0 - PC %04X: unknown spritebank bits: %02X\n",m_maincpu->pc(),data); @@ -943,7 +943,7 @@ WRITE8_MEMBER(suna8_state::hardhea2_spritebank_w) 7654 ---- ---- 3210 ROM Bank */ -WRITE8_MEMBER(suna8_state::hardhea2_rombank_w) +void suna8_state::hardhea2_rombank_w(uint8_t data) { int bank = data & 0x0f; @@ -954,21 +954,21 @@ WRITE8_MEMBER(suna8_state::hardhea2_rombank_w) m_rombank = data; } -WRITE8_MEMBER(suna8_state::hardhea2_spritebank_0_w) +void suna8_state::hardhea2_spritebank_0_w(uint8_t data) { m_spritebank = 0; } -WRITE8_MEMBER(suna8_state::hardhea2_spritebank_1_w) +void suna8_state::hardhea2_spritebank_1_w(uint8_t data) { m_spritebank = 1; } -WRITE8_MEMBER(suna8_state::hardhea2_rambank_0_w) +void suna8_state::hardhea2_rambank_0_w(uint8_t data) { membank("bank2")->set_entry(0); } -WRITE8_MEMBER(suna8_state::hardhea2_rambank_1_w) +void suna8_state::hardhea2_rambank_1_w(uint8_t data) { membank("bank2")->set_entry(1); } @@ -1039,7 +1039,7 @@ void suna8_state::hardhea2b_decrypted_opcodes_map(address_map &map) ---4 ---- ---- 3210 ROM Bank (Latched) */ -WRITE8_MEMBER(suna8_state::starfigh_rombank_latch_w) +void suna8_state::starfigh_rombank_latch_w(offs_t offset, uint8_t data) { logerror("CPU #0 - PC %04X: rom bank latch %04X = %02X\n",m_maincpu->pc(), 0xc280 + offset, data); m_rombank_latch = data; @@ -1048,7 +1048,7 @@ WRITE8_MEMBER(suna8_state::starfigh_rombank_latch_w) /* C500: Sound Latch */ -WRITE8_MEMBER(suna8_state::starfigh_sound_latch_w) +void suna8_state::starfigh_sound_latch_w(uint8_t data) { if ( !(m_rombank_latch & 0x20) ) m_soundlatch->write(data); @@ -1057,7 +1057,7 @@ WRITE8_MEMBER(suna8_state::starfigh_sound_latch_w) /* C080: */ -READ8_MEMBER(suna8_state::starfigh_cheats_r) +uint8_t suna8_state::starfigh_cheats_r() { return ioport("CHEATS")->read(); } @@ -1065,7 +1065,7 @@ READ8_MEMBER(suna8_state::starfigh_cheats_r) /* C380-C3FF: */ -WRITE8_MEMBER(suna8_state::starfigh_spritebank_latch_w) +void suna8_state::starfigh_spritebank_latch_w(uint8_t data) { // bit 1 = disable RAM writes. See code at 2696, 4e8f m_spritebank_latch = (data >> 2) & 1; @@ -1076,7 +1076,7 @@ WRITE8_MEMBER(suna8_state::starfigh_spritebank_latch_w) /* C200: */ -WRITE8_MEMBER(suna8_state::starfigh_spritebank_w) +void suna8_state::starfigh_spritebank_w(uint8_t data) { m_spritebank = m_spritebank_latch; } @@ -1090,7 +1090,7 @@ WRITE8_MEMBER(suna8_state::starfigh_spritebank_w) Writes to C400 also set ROM bank from latch */ -WRITE8_MEMBER(suna8_state::starfigh_leds_w) +void suna8_state::starfigh_leds_w(uint8_t data) { m_leds[0] = BIT(data, 0); m_leds[1] = BIT(data, 1); @@ -1143,7 +1143,7 @@ void suna8_state::starfigh_map(address_map &map) ------1- Sprite RAM Bank (Inverted by Sprite Bank Latch) -------0 Sprite "chip" "" */ -WRITE8_MEMBER(suna8_state::sparkman_spritebank_w) +void suna8_state::sparkman_spritebank_w(uint8_t data) { m_spritebank = ((data >> 1) & 0x01) | ((data << 1) & 0x02); if ((m_spritebank_latch >> 1) & 0x01) @@ -1158,7 +1158,7 @@ WRITE8_MEMBER(suna8_state::sparkman_spritebank_w) ---4 ---- ---- 3210 ROM Bank (Latched) */ -WRITE8_MEMBER(suna8_state::sparkman_rombank_latch_w) +void suna8_state::sparkman_rombank_latch_w(offs_t offset, uint8_t data) { m_rombank_latch = data; logerror("CPU #0 - PC %04X: rom bank latch %04X = %02X\n",m_maincpu->pc(), 0xc280 + offset, data); @@ -1171,7 +1171,7 @@ WRITE8_MEMBER(suna8_state::sparkman_rombank_latch_w) ---- 321- ---- ---0 Flip Screen */ -WRITE8_MEMBER(suna8_state::sparkman_spritebank_latch_w) +void suna8_state::sparkman_spritebank_latch_w(uint8_t data) { flip_screen_set(data & 0x01); m_spritebank_latch = (data >> 4) & 0x03; @@ -1184,7 +1184,7 @@ WRITE8_MEMBER(suna8_state::sparkman_spritebank_latch_w) ---4321- -------0 Work RAM Writes Disable */ -WRITE8_MEMBER(suna8_state::sparkman_write_disable_w) +void suna8_state::sparkman_write_disable_w(uint8_t data) { m_write_disable = (data >> 0) & 1; // bit 0 = disable RAM writes. See code at b48, d4d m_nmi_enable = (data >> 5) & 1; // see code at 66 @@ -1192,7 +1192,7 @@ WRITE8_MEMBER(suna8_state::sparkman_write_disable_w) } // RAM writes can be disabled -WRITE8_MEMBER(suna8_state::suna8_wram_w) +void suna8_state::suna8_wram_w(offs_t offset, uint8_t data) { if (!m_write_disable) m_wram[offset] = data; @@ -1205,7 +1205,7 @@ WRITE8_MEMBER(suna8_state::suna8_wram_w) Writes to C400 also set ROM bank from latch */ -WRITE8_MEMBER(suna8_state::sparkman_rombank_w) +void suna8_state::sparkman_rombank_w(uint8_t data) { m_leds[0] = BIT(data, 0); m_leds[1] = BIT(data, 1); @@ -1226,13 +1226,13 @@ WRITE8_MEMBER(suna8_state::sparkman_rombank_w) C480: 7654321- -------0 Coin Counter */ -WRITE8_MEMBER(suna8_state::sparkman_coin_counter_w) +void suna8_state::sparkman_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x01); } // To do: implement this, affects the duration of copyright screen -READ8_MEMBER(suna8_state::sparkman_c0a3_r) +uint8_t suna8_state::sparkman_c0a3_r() { return (m_screen->frame_number() & 1) ? 0x80 : 0; } @@ -2094,8 +2094,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(suna8_state::hardhea2_interrupt) MACHINE_RESET_MEMBER(suna8_state,hardhea2) { - address_space &space = m_maincpu->space(AS_PROGRAM); - hardhea2_rambank_0_w(space,0,0); + hardhea2_rambank_0_w(0); } void suna8_state::hardhea2(machine_config &config) diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index a6a6eba7c64..446ff5f6cc1 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -156,7 +156,7 @@ WRITE_LINE_MEMBER( supbtime_state::vblank_w ) m_maincpu->set_input_line(M68K_IRQ_6, ASSERT_LINE); } -READ16_MEMBER( supbtime_state::vblank_ack_r ) +uint16_t supbtime_state::vblank_ack_r() { m_maincpu->set_input_line(M68K_IRQ_6, CLEAR_LINE); return 0xffff; diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp index b566d1244fc..9da6037b864 100644 --- a/src/mame/drivers/superchs.cpp +++ b/src/mame/drivers/superchs.cpp @@ -532,7 +532,7 @@ ROM_END -READ32_MEMBER(superchs_state::main_cycle_r) +u32 superchs_state::main_cycle_r() { if (m_maincpu->pc() == 0x702) m_maincpu->spin_until_interrupt(); @@ -540,7 +540,7 @@ READ32_MEMBER(superchs_state::main_cycle_r) return m_ram[0]; } -READ16_MEMBER(superchs_state::sub_cycle_r) +u16 superchs_state::sub_cycle_r() { if (m_subcpu->pc() == 0x454) m_subcpu->spin_until_interrupt(); @@ -551,8 +551,8 @@ READ16_MEMBER(superchs_state::sub_cycle_r) void superchs_state::init_superchs() { /* Speedup handlers */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x100003, read32_delegate(*this, FUNC(superchs_state::main_cycle_r))); - m_subcpu->space(AS_PROGRAM).install_read_handler(0x80000a, 0x80000b, read16_delegate(*this, FUNC(superchs_state::sub_cycle_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x100003, read32smo_delegate(*this, FUNC(superchs_state::main_cycle_r))); + m_subcpu->space(AS_PROGRAM).install_read_handler(0x80000a, 0x80000b, read16smo_delegate(*this, FUNC(superchs_state::sub_cycle_r))); } GAMEL( 1992, superchs, 0, superchs, superchs, superchs_state, init_superchs, ROT0, "Taito Corporation Japan", "Super Chase - Criminal Termination (World)", 0, layout_superchs ) // 1993/02/16 11:39:36 SUPER CHASE VER 1.2O diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 1f98883121c..4485e8a11ad 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -229,7 +229,7 @@ void skns_state::hit_recalc() */ } -WRITE32_MEMBER(skns_state::hit_w) +void skns_state::hit_w(offs_t offset, uint32_t data) //void hit_w(uint32_t adr, uint32_t data, int type) { hit_t &hit = m_hit; @@ -294,7 +294,7 @@ WRITE32_MEMBER(skns_state::hit_w) hit_recalc(); } -WRITE32_MEMBER(skns_state::hit2_w) +void skns_state::hit2_w(uint32_t data) { hit_t &hit = m_hit; @@ -327,7 +327,7 @@ WRITE32_MEMBER(skns_state::hit2_w) } -READ32_MEMBER(skns_state::hit_r) +uint32_t skns_state::hit_r(offs_t offset) //uint32_t hit_r(uint32_t adr, int type) { hit_t &hit = m_hit; @@ -642,7 +642,7 @@ INPUT_PORTS_END -WRITE32_MEMBER(skns_state::io_w) +void skns_state::io_w(offs_t offset, uint32_t data, uint32_t mem_mask) { switch(offset) { case 2: @@ -705,7 +705,7 @@ WRITE32_MEMBER(skns_state::io_w) /* end old driver code */ -WRITE32_MEMBER(skns_state::v3t_w) +void skns_state::v3t_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_v3t_ram[offset]); @@ -868,7 +868,7 @@ void skns_state::sknsk(machine_config &config) /***** IDLE SKIPPING *****/ -READ32_MEMBER(skns_state::gutsn_speedup_r) +uint32_t skns_state::gutsn_speedup_r() { /* 0402206A: MOV.L @($8C,PC),R5 @@ -886,31 +886,31 @@ READ32_MEMBER(skns_state::gutsn_speedup_r) return m_main_ram[0x0c780/4]; } -READ32_MEMBER(skns_state::cyvern_speedup_r) +uint32_t skns_state::cyvern_speedup_r() { if (m_maincpu->pc()==0x402ebd2) m_maincpu->spin_until_interrupt(); return m_main_ram[0x4d3c8/4]; } -READ32_MEMBER(skns_state::puzzloopj_speedup_r) +uint32_t skns_state::puzzloopj_speedup_r() { if (m_maincpu->pc()==0x401dca0) m_maincpu->spin_until_interrupt(); return m_main_ram[0x86714/4]; } -READ32_MEMBER(skns_state::puzzloopa_speedup_r) +uint32_t skns_state::puzzloopa_speedup_r() { if (m_maincpu->pc()==0x401d9d4) m_maincpu->spin_until_interrupt(); return m_main_ram[0x85bcc/4]; } -READ32_MEMBER(skns_state::puzzloopu_speedup_r) +uint32_t skns_state::puzzloopu_speedup_r() { if (m_maincpu->pc()==0x401dab0) m_maincpu->spin_until_interrupt(); return m_main_ram[0x85cec/4]; } -READ32_MEMBER(skns_state::puzzloope_speedup_r) +uint32_t skns_state::puzzloope_speedup_r() { /* 0401DA12: MOV.L @($80,PC),R1 @@ -923,55 +923,55 @@ READ32_MEMBER(skns_state::puzzloope_speedup_r) return m_main_ram[0x81d38/4]; } -READ32_MEMBER(skns_state::senknow_speedup_r) +uint32_t skns_state::senknow_speedup_r() { if (m_maincpu->pc()==0x4017dce) m_maincpu->spin_until_interrupt(); return m_main_ram[0x0000dc/4]; } -READ32_MEMBER(skns_state::teljan_speedup_r) +uint32_t skns_state::teljan_speedup_r() { if (m_maincpu->pc()==0x401ba32) m_maincpu->spin_until_interrupt(); return m_main_ram[0x002fb4/4]; } -READ32_MEMBER(skns_state::jjparads_speedup_r) +uint32_t skns_state::jjparads_speedup_r() { if (m_maincpu->pc()==0x4015e84) m_maincpu->spin_until_interrupt(); return m_main_ram[0x000994/4]; } -READ32_MEMBER(skns_state::jjparad2_speedup_r) +uint32_t skns_state::jjparad2_speedup_r() { if (m_maincpu->pc()==0x401620a) m_maincpu->spin_until_interrupt(); return m_main_ram[0x000984/4]; } -READ32_MEMBER(skns_state::ryouran_speedup_r) +uint32_t skns_state::ryouran_speedup_r() { if (m_maincpu->pc()==0x40182ce) m_maincpu->spin_until_interrupt(); return m_main_ram[0x000a14/4]; } -READ32_MEMBER(skns_state::galpans2_speedup_r) +uint32_t skns_state::galpans2_speedup_r() { if (m_maincpu->pc()==0x4049ae2) m_maincpu->spin_until_interrupt(); return m_main_ram[0x0fb6bc/4]; } -READ32_MEMBER(skns_state::panicstr_speedup_r) +uint32_t skns_state::panicstr_speedup_r() { if (m_maincpu->pc()==0x404e68a) m_maincpu->spin_until_interrupt(); return m_main_ram[0x0f19e4/4]; } -READ32_MEMBER(skns_state::sengekis_speedup_r)// 60006ee 600308e +uint32_t skns_state::sengekis_speedup_r()// 60006ee 600308e { if (m_maincpu->pc()==0x60006ec) m_maincpu->spin_until_interrupt(); return m_main_ram[0xb74bc/4]; } -READ32_MEMBER(skns_state::sengekij_speedup_r)// 60006ee 600308e +uint32_t skns_state::sengekij_speedup_r()// 60006ee 600308e { if (m_maincpu->pc()==0x60006ec) m_maincpu->spin_until_interrupt(); return m_main_ram[0xb7380/4]; @@ -993,21 +993,21 @@ void skns_state::set_drc_pcflush(uint32_t addr) void skns_state::init_galpani4() { m_spritegen->skns_sprite_kludge(-5,-1); init_drc(); } void skns_state::init_galpanis() { m_spritegen->skns_sprite_kludge(-5,-1); init_drc(); } -void skns_state::init_cyvern() { m_spritegen->skns_sprite_kludge(+0,+2); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x604d3c8, 0x604d3cb, read32_delegate(*this, FUNC(skns_state::cyvern_speedup_r)) ); set_drc_pcflush(0x402ebd2); } -void skns_state::init_galpans2() { m_spritegen->skns_sprite_kludge(-1,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60fb6bc, 0x60fb6bf, read32_delegate(*this, FUNC(skns_state::galpans2_speedup_r)) ); set_drc_pcflush(0x4049ae2); } -void skns_state::init_gutsn() { m_spritegen->skns_sprite_kludge(+0,+0); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x600c780, 0x600c783, read32_delegate(*this, FUNC(skns_state::gutsn_speedup_r)) ); set_drc_pcflush(0x402206e); } -void skns_state::init_panicstr() { m_spritegen->skns_sprite_kludge(-1,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60f19e4, 0x60f19e7, read32_delegate(*this, FUNC(skns_state::panicstr_speedup_r)) ); set_drc_pcflush(0x404e68a); } -void skns_state::init_senknow() { m_spritegen->skns_sprite_kludge(+1,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60000dc, 0x60000df, read32_delegate(*this, FUNC(skns_state::senknow_speedup_r)) ); set_drc_pcflush(0x4017dce); } -void skns_state::init_puzzloope() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6081d38, 0x6081d3b, read32_delegate(*this, FUNC(skns_state::puzzloope_speedup_r)) ); set_drc_pcflush(0x401da14); } -void skns_state::init_puzzloopj() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6086714, 0x6086717, read32_delegate(*this, FUNC(skns_state::puzzloopj_speedup_r)) ); set_drc_pcflush(0x401dca0); } -void skns_state::init_puzzloopa() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6085bcc, 0x6085bcf, read32_delegate(*this, FUNC(skns_state::puzzloopa_speedup_r)) ); set_drc_pcflush(0x401d9d4); } -void skns_state::init_puzzloopu() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6085cec, 0x6085cef, read32_delegate(*this, FUNC(skns_state::puzzloopu_speedup_r)) ); set_drc_pcflush(0x401dab0); } -void skns_state::init_jjparads() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000994, 0x6000997, read32_delegate(*this, FUNC(skns_state::jjparads_speedup_r)) ); set_drc_pcflush(0x4015e84); } -void skns_state::init_jjparad2() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000984, 0x6000987, read32_delegate(*this, FUNC(skns_state::jjparad2_speedup_r)) ); set_drc_pcflush(0x401620a); } -void skns_state::init_ryouran() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000a14, 0x6000a17, read32_delegate(*this, FUNC(skns_state::ryouran_speedup_r)) ); set_drc_pcflush(0x40182ce); } -void skns_state::init_teljan() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6002fb4, 0x6002fb7, read32_delegate(*this, FUNC(skns_state::teljan_speedup_r)) ); set_drc_pcflush(0x401ba32); } -void skns_state::init_sengekis() { m_spritegen->skns_sprite_kludge(-192,-272); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60b74bc, 0x60b74bf, read32_delegate(*this, FUNC(skns_state::sengekis_speedup_r)) ); set_drc_pcflush(0x60006ec); } -void skns_state::init_sengekij() { m_spritegen->skns_sprite_kludge(-192,-272); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60b7380, 0x60b7383, read32_delegate(*this, FUNC(skns_state::sengekij_speedup_r)) ); set_drc_pcflush(0x60006ec); } +void skns_state::init_cyvern() { m_spritegen->skns_sprite_kludge(+0,+2); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x604d3c8, 0x604d3cb, read32smo_delegate(*this, FUNC(skns_state::cyvern_speedup_r)) ); set_drc_pcflush(0x402ebd2); } +void skns_state::init_galpans2() { m_spritegen->skns_sprite_kludge(-1,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60fb6bc, 0x60fb6bf, read32smo_delegate(*this, FUNC(skns_state::galpans2_speedup_r)) ); set_drc_pcflush(0x4049ae2); } +void skns_state::init_gutsn() { m_spritegen->skns_sprite_kludge(+0,+0); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x600c780, 0x600c783, read32smo_delegate(*this, FUNC(skns_state::gutsn_speedup_r)) ); set_drc_pcflush(0x402206e); } +void skns_state::init_panicstr() { m_spritegen->skns_sprite_kludge(-1,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60f19e4, 0x60f19e7, read32smo_delegate(*this, FUNC(skns_state::panicstr_speedup_r)) ); set_drc_pcflush(0x404e68a); } +void skns_state::init_senknow() { m_spritegen->skns_sprite_kludge(+1,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60000dc, 0x60000df, read32smo_delegate(*this, FUNC(skns_state::senknow_speedup_r)) ); set_drc_pcflush(0x4017dce); } +void skns_state::init_puzzloope() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6081d38, 0x6081d3b, read32smo_delegate(*this, FUNC(skns_state::puzzloope_speedup_r)) ); set_drc_pcflush(0x401da14); } +void skns_state::init_puzzloopj() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6086714, 0x6086717, read32smo_delegate(*this, FUNC(skns_state::puzzloopj_speedup_r)) ); set_drc_pcflush(0x401dca0); } +void skns_state::init_puzzloopa() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6085bcc, 0x6085bcf, read32smo_delegate(*this, FUNC(skns_state::puzzloopa_speedup_r)) ); set_drc_pcflush(0x401d9d4); } +void skns_state::init_puzzloopu() { m_spritegen->skns_sprite_kludge(-9,-1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6085cec, 0x6085cef, read32smo_delegate(*this, FUNC(skns_state::puzzloopu_speedup_r)) ); set_drc_pcflush(0x401dab0); } +void skns_state::init_jjparads() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000994, 0x6000997, read32smo_delegate(*this, FUNC(skns_state::jjparads_speedup_r)) ); set_drc_pcflush(0x4015e84); } +void skns_state::init_jjparad2() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000984, 0x6000987, read32smo_delegate(*this, FUNC(skns_state::jjparad2_speedup_r)) ); set_drc_pcflush(0x401620a); } +void skns_state::init_ryouran() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000a14, 0x6000a17, read32smo_delegate(*this, FUNC(skns_state::ryouran_speedup_r)) ); set_drc_pcflush(0x40182ce); } +void skns_state::init_teljan() { m_spritegen->skns_sprite_kludge(+5,+1); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x6002fb4, 0x6002fb7, read32smo_delegate(*this, FUNC(skns_state::teljan_speedup_r)) ); set_drc_pcflush(0x401ba32); } +void skns_state::init_sengekis() { m_spritegen->skns_sprite_kludge(-192,-272); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60b74bc, 0x60b74bf, read32smo_delegate(*this, FUNC(skns_state::sengekis_speedup_r)) ); set_drc_pcflush(0x60006ec); } +void skns_state::init_sengekij() { m_spritegen->skns_sprite_kludge(-192,-272); init_drc();m_maincpu->space(AS_PROGRAM).install_read_handler(0x60b7380, 0x60b7383, read32smo_delegate(*this, FUNC(skns_state::sengekij_speedup_r)) ); set_drc_pcflush(0x60006ec); } void skns_state::init_sarukani() { m_spritegen->skns_sprite_kludge(-1,-1); init_drc(); set_drc_pcflush(0x4013b42); } // Speedup is in io_w() void skns_state::init_galpans3() { m_spritegen->skns_sprite_kludge(-1,-1); init_drc(); } diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index f4d3aaf4895..4c301542686 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -109,7 +109,7 @@ void suprridr_state::machine_reset() * *************************************/ -WRITE8_MEMBER(suprridr_state::nmi_enable_w) +void suprridr_state::nmi_enable_w(uint8_t data) { m_nmi_enable = data; } @@ -129,7 +129,7 @@ INTERRUPT_GEN_MEMBER(suprridr_state::main_nmi_gen) * *************************************/ -WRITE8_MEMBER(suprridr_state::coin_lock_w) +void suprridr_state::coin_lock_w(uint8_t data) { /* cleared when 9 credits are hit, but never reset! */ /* machine().bookkeeping().coin_lockout_global_w(~data & 1); */ diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp index ccf9e54ca82..252b45eb695 100644 --- a/src/mame/drivers/suprslam.cpp +++ b/src/mame/drivers/suprslam.cpp @@ -95,7 +95,7 @@ EB26IC73.BIN 27C240 / Main Program /*** SOUND *******************************************************************/ -WRITE8_MEMBER(suprslam_state::suprslam_sh_bankswitch_w) +void suprslam_state::suprslam_sh_bankswitch_w(uint8_t data) { membank("bank1")->set_entry(data & 0x03); } diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index bb6bfbf4f30..f92ea976600 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -19,7 +19,7 @@ #include "speaker.h" -WRITE8_MEMBER(surpratk_state::surpratk_videobank_w) +void surpratk_state::surpratk_videobank_w(uint8_t data) { if (data & 0xf8) logerror("%s: videobank = %02x\n", machine().describe_context(), data); @@ -33,7 +33,7 @@ WRITE8_MEMBER(surpratk_state::surpratk_videobank_w) m_bank0000->set_bank(BIT(data, 0)); } -WRITE8_MEMBER(surpratk_state::surpratk_5fc0_w) +void surpratk_state::surpratk_5fc0_w(uint8_t data) { if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",m_maincpu->pc(),data); diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index 01f5989e428..6f852db02ab 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -76,7 +76,7 @@ TIMER_CALLBACK_MEMBER(svision_state::svision_timer) check_irq(); } -READ8_MEMBER(svision_state::svision_r) +uint8_t svision_state::svision_r(offs_t offset) { int data = m_reg[offset]; switch (offset) @@ -130,7 +130,7 @@ READ8_MEMBER(svision_state::svision_r) return data; } -WRITE8_MEMBER(svision_state::svision_w) +void svision_state::svision_w(offs_t offset, uint8_t data) { m_reg[offset] = data; @@ -180,7 +180,7 @@ WRITE8_MEMBER(svision_state::svision_w) } } -READ8_MEMBER(svision_state::tvlink_r) +uint8_t svision_state::tvlink_r(offs_t offset) { switch(offset) { @@ -188,16 +188,16 @@ READ8_MEMBER(svision_state::tvlink_r) if (offset >= 0x800 && offset < 0x840) { /* strange effects when modifying palette */ - return svision_r(space, offset); + return svision_r(offset); } else { - return svision_r(space, offset); + return svision_r(offset); } } } -WRITE8_MEMBER(svision_state::tvlink_w) +void svision_state::tvlink_w(offs_t offset, uint8_t data) { switch (offset) { @@ -222,7 +222,7 @@ WRITE8_MEMBER(svision_state::tvlink_w) } break; default: - svision_w(space, offset,data); + svision_w(offset,data); if (offset >= 0x800 && offset < 0x840) { if (offset == 0x803 && data == 0x07) diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 4f53fafc9eb..f30bc533ac1 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -489,7 +489,7 @@ void system1_state::dakkochn_custom_w(u8 data, u8 prevdata) * *************************************/ -READ8_MEMBER(system1_state::shtngmst_gunx_r) +u8 system1_state::shtngmst_gunx_r() { // x is slightly offset, and has a range of 00-fe u8 x = ioport("GUNX")->read() - 0x12; @@ -585,7 +585,7 @@ void system1_state::mcu_control_w(u8 data) } -WRITE8_MEMBER(system1_state::mcu_io_w) +void system1_state::mcu_io_w(offs_t offset, u8 data) { switch ((m_mcu_control >> 3) & 3) { @@ -605,7 +605,7 @@ WRITE8_MEMBER(system1_state::mcu_io_w) } -READ8_MEMBER(system1_state::mcu_io_r) +u8 system1_state::mcu_io_r(offs_t offset) { switch ((m_mcu_control >> 3) & 3) { @@ -684,13 +684,13 @@ void system1_state::nob_mcu_control_p2_w(u8 data) } -READ8_MEMBER(system1_state::nob_maincpu_latch_r) +u8 system1_state::nob_maincpu_latch_r() { return m_nob_maincpu_latch; } -WRITE8_MEMBER(system1_state::nob_maincpu_latch_w) +void system1_state::nob_maincpu_latch_w(u8 data) { m_nob_maincpu_latch = data; m_mcu->set_input_line(MCS51_INT0_LINE, ASSERT_LINE); @@ -698,7 +698,7 @@ WRITE8_MEMBER(system1_state::nob_maincpu_latch_w) } -READ8_MEMBER(system1_state::nob_mcu_status_r) +u8 system1_state::nob_mcu_status_r() { return m_nob_mcu_status; } @@ -710,25 +710,25 @@ READ8_MEMBER(system1_state::nob_mcu_status_r) * *************************************/ -READ8_MEMBER(system1_state::nobb_inport1c_r) +u8 system1_state::nobb_inport1c_r() { // logerror("IN $1c : pc = %04x - data = 0x80\n",m_maincpu->pc()); return(0x80); // infinite loop (at 0x0fb3) until bit 7 is set } -READ8_MEMBER(system1_state::nobb_inport22_r) +u8 system1_state::nobb_inport22_r() { // logerror("IN $22 : pc = %04x - data = %02x\n",m_maincpu->pc(),nobb_inport17_step); return(0);//nobb_inport17_step); } -READ8_MEMBER(system1_state::nobb_inport23_r) +u8 system1_state::nobb_inport23_r() { // logerror("IN $23 : pc = %04x - step = %02x\n",m_maincpu->pc(),m_nobb_inport23_step); return(m_nobb_inport23_step); } -WRITE8_MEMBER(system1_state::nobb_outport24_w) +void system1_state::nobb_outport24_w(u8 data) { // logerror("OUT $24 : pc = %04x - data = %02x\n",m_maincpu->pc(),data); m_nobb_inport23_step = data; @@ -5429,7 +5429,7 @@ void system1_state::init_dakkochn() -READ8_MEMBER(system1_state::nob_start_r) +u8 system1_state::nob_start_r() { /* in reality, it's likely some M1-dependent behavior */ return (m_maincpu->pc() <= 0x0003) ? 0x80 : m_maincpu_region->base()[1]; @@ -5445,11 +5445,11 @@ void system1_state::init_nob() /* hack to fix incorrect JMP at start, which should obviously be to $0080 */ /* patching the ROM causes errors in the self-test */ /* in real-life, it could be some behavior dependent upon M1 */ - space.install_read_handler(0x0001, 0x0001, read8_delegate(*this, FUNC(system1_state::nob_start_r))); + space.install_read_handler(0x0001, 0x0001, read8smo_delegate(*this, FUNC(system1_state::nob_start_r))); /* install MCU communications */ - iospace.install_readwrite_handler(0x18, 0x18, read8_delegate(*this, FUNC(system1_state::nob_maincpu_latch_r)), write8_delegate(*this, FUNC(system1_state::nob_maincpu_latch_w))); - iospace.install_read_handler(0x1c, 0x1c, read8_delegate(*this, FUNC(system1_state::nob_mcu_status_r))); + iospace.install_readwrite_handler(0x18, 0x18, read8smo_delegate(*this, FUNC(system1_state::nob_maincpu_latch_r)), write8smo_delegate(*this, FUNC(system1_state::nob_maincpu_latch_w))); + iospace.install_read_handler(0x1c, 0x1c, read8smo_delegate(*this, FUNC(system1_state::nob_mcu_status_r))); } void system1_state::init_nobb() @@ -5476,10 +5476,10 @@ void system1_state::init_nobb() init_bank44(); - iospace.install_read_handler(0x1c, 0x1c, read8_delegate(*this, FUNC(system1_state::nobb_inport1c_r))); - iospace.install_read_handler(0x02, 0x02, read8_delegate(*this, FUNC(system1_state::nobb_inport22_r))); - iospace.install_read_handler(0x03, 0x03, read8_delegate(*this, FUNC(system1_state::nobb_inport23_r))); - iospace.install_write_handler(0x04, 0x04, write8_delegate(*this, FUNC(system1_state::nobb_outport24_w))); + iospace.install_read_handler(0x1c, 0x1c, read8smo_delegate(*this, FUNC(system1_state::nobb_inport1c_r))); + iospace.install_read_handler(0x02, 0x02, read8smo_delegate(*this, FUNC(system1_state::nobb_inport22_r))); + iospace.install_read_handler(0x03, 0x03, read8smo_delegate(*this, FUNC(system1_state::nobb_inport23_r))); + iospace.install_write_handler(0x04, 0x04, write8smo_delegate(*this, FUNC(system1_state::nobb_outport24_w))); } @@ -5509,7 +5509,7 @@ void system1_state::init_shtngmst() address_space &iospace = m_maincpu->space(AS_IO); iospace.install_read_port(0x12, 0x12, "TRIGGER"); iospace.install_read_port(0x18, 0x18, 0x03, "18"); - iospace.install_read_handler(0x1c, 0x1c, 0, 0x02, 0, read8_delegate(*this, FUNC(system1_state::shtngmst_gunx_r))); + iospace.install_read_handler(0x1c, 0x1c, 0, 0x02, 0, read8smo_delegate(*this, FUNC(system1_state::shtngmst_gunx_r))); iospace.install_read_port(0x1d, 0x1d, 0x02, "GUNY"); init_bank0c(); } diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 9ed87ee9473..511d8e34003 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -107,7 +107,7 @@ /***************************************************************************/ -WRITE16_MEMBER(segas1x_bootleg_state::sound_command_nmi_w) +void segas1x_bootleg_state::sound_command_nmi_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -116,7 +116,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_nmi_w) } } -WRITE16_MEMBER(segas1x_bootleg_state::sound_command_irq_w) +void segas1x_bootleg_state::sound_command_irq_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -125,13 +125,13 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_irq_w) } } -READ8_MEMBER(segas1x_bootleg_state::sound_command_irq_r) +uint8_t segas1x_bootleg_state::sound_command_irq_r() { m_soundcpu->set_input_line(0, CLEAR_LINE); return m_soundlatch->read(); } -WRITE8_MEMBER(segas1x_bootleg_state::soundbank_msm_w) +void segas1x_bootleg_state::soundbank_msm_w(uint8_t data) { m_soundbank->set_entry((data & 7) ^ 6); // probably wrong m_msm->reset_w(BIT(data, 3)); @@ -168,7 +168,7 @@ void segas1x_bootleg_state::shinobib_map(address_map &map) /***************************************************************************/ -WRITE16_MEMBER(segas1x_bootleg_state::sys16_coinctrl_w) +void segas1x_bootleg_state::sys16_coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -213,7 +213,7 @@ void segas1x_bootleg_state::passshtb_map(address_map &map) /***************************************************************************/ -READ16_MEMBER(segas1x_bootleg_state::passht4b_service_r) +uint16_t segas1x_bootleg_state::passht4b_service_r() { uint16_t val = ioport("SERVICE")->read(); @@ -250,17 +250,17 @@ READ16_MEMBER(segas1x_bootleg_state::passht4b_service_r) return val; } -READ16_MEMBER(segas1x_bootleg_state::passht4b_io1_r) +uint16_t segas1x_bootleg_state::passht4b_io1_r() { return m_passht4b_io1_val; } -READ16_MEMBER(segas1x_bootleg_state::passht4b_io2_r) +uint16_t segas1x_bootleg_state::passht4b_io2_r() { return m_passht4b_io2_val; } -READ16_MEMBER(segas1x_bootleg_state::passht4b_io3_r) +uint16_t segas1x_bootleg_state::passht4b_io3_r() { return m_passht4b_io3_val; } @@ -297,7 +297,7 @@ void segas1x_bootleg_state::passht4b_map(address_map &map) /***************************************************************************/ -WRITE16_MEMBER(segas1x_bootleg_state::sys16_tilebank_w) +void segas1x_bootleg_state::sys16_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -390,7 +390,7 @@ void segas1x_bootleg_state::wb3bble_decrypted_opcodes_map(address_map &map) There seems to be more data in the high bits of the ROM bank control word which may be related. ***************************************************************************/ -WRITE8_MEMBER(segas1x_bootleg_state::tturfbl_msm5205_data_w) +void segas1x_bootleg_state::tturfbl_msm5205_data_w(uint8_t data) { m_sample_buffer = data; } @@ -405,14 +405,14 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::tturfbl_msm5205_callback) m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -READ8_MEMBER(segas1x_bootleg_state::tturfbl_soundbank_r) +uint8_t segas1x_bootleg_state::tturfbl_soundbank_r(offs_t offset) { if (m_soundbank_ptr) return m_soundbank_ptr[offset & 0x3fff]; return 0x80; } -WRITE8_MEMBER(segas1x_bootleg_state::tturfbl_soundbank_w) +void segas1x_bootleg_state::tturfbl_soundbank_w(uint8_t data) { uint8_t *mem = m_soundcpu_region->base(); @@ -512,7 +512,7 @@ void segas1x_bootleg_state::sound_7759_map(address_map &map) } -WRITE8_MEMBER(segas1x_bootleg_state::upd7759_bank_w)//* +void segas1x_bootleg_state::upd7759_bank_w(uint8_t data)//* { int offs, size = m_soundcpu_region->bytes() - 0x10000; @@ -560,17 +560,17 @@ void segas1x_bootleg_state::set_bg_page( int data ) /***************************************************************************/ -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_bgpage_w) +void segas1x_bootleg_state::s16bl_bgpage_w(uint16_t data) { set_bg_page(data); } -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgpage_w) +void segas1x_bootleg_state::s16bl_fgpage_w(uint16_t data) { set_fg_page(data); } -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgscrollx_bank_w) +void segas1x_bootleg_state::s16bl_fgscrollx_bank_w(uint16_t data) { int scroll = data & 0x1ff; int bank = (data & 0xc000) >> 14; @@ -582,7 +582,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgscrollx_bank_w) m_fg_scrollx = -scroll; } -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgscrollx_w) +void segas1x_bootleg_state::s16bl_fgscrollx_w(uint16_t data) { int scroll = data & 0x1ff; @@ -593,14 +593,14 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgscrollx_w) } -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgscrolly_w) +void segas1x_bootleg_state::s16bl_fgscrolly_w(uint16_t data) { int scroll = data & 0xff; m_fg_scrolly = scroll; } -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_bgscrollx_w) +void segas1x_bootleg_state::s16bl_bgscrollx_w(uint16_t data) { int scroll = data & 0x1ff; @@ -609,7 +609,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16bl_bgscrollx_w) m_bg_scrollx = -scroll; } -WRITE16_MEMBER(segas1x_bootleg_state::s16bl_bgscrolly_w) +void segas1x_bootleg_state::s16bl_bgscrolly_w(uint16_t data) { int scroll = data & 0xff; @@ -691,7 +691,7 @@ void segas1x_bootleg_state::datsu_set_pages( ) } template<int Page> -WRITE16_MEMBER(segas1x_bootleg_state::datsu_page_w) +void segas1x_bootleg_state::datsu_page_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_datsu_page[Page]); datsu_set_pages(); @@ -750,7 +750,7 @@ void segas1x_bootleg_state::dduxbl_map(address_map &map) map(0xffc000, 0xffffff).ram(); // work ram } -WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_fgscrollx_w) +void segas1x_bootleg_state::goldnaxeb2_fgscrollx_w(uint16_t data) { int scroll = data & 0x1ff; int bank = (data & 0xc000) >> 14; @@ -761,7 +761,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_fgscrollx_w) m_fg_scrollx = -scroll; } -WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgscrollx_w) +void segas1x_bootleg_state::goldnaxeb2_bgscrollx_w(uint16_t data) { int scroll = data & 0x1ff; @@ -771,7 +771,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgscrollx_w) } -WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_fgscrolly_w) +void segas1x_bootleg_state::goldnaxeb2_fgscrolly_w(uint16_t data) { int scroll = data & 0xff; @@ -779,7 +779,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_fgscrolly_w) m_fg_scrolly = scroll; } -WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgscrolly_w) +void segas1x_bootleg_state::goldnaxeb2_bgscrolly_w(uint16_t data) { int scroll = data & 0xff; @@ -787,7 +787,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgscrolly_w) m_bg_scrolly = scroll; } -WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_fgpage_w) +void segas1x_bootleg_state::goldnaxeb2_fgpage_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t page; @@ -802,7 +802,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_fgpage_w) } -WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgpage_w) +void segas1x_bootleg_state::goldnaxeb2_bgpage_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t page; @@ -845,7 +845,7 @@ void segas1x_bootleg_state::goldnaxeb2_map(address_map &map) /***************************************************************************/ -WRITE16_MEMBER(segas1x_bootleg_state::eswat_tilebank0_w) +void segas1x_bootleg_state::eswat_tilebank0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -940,7 +940,7 @@ void segas1x_bootleg_state::tetrisbl_map(address_map &map) } -READ16_MEMBER(segas1x_bootleg_state::beautyb_unkx_r) +uint16_t segas1x_bootleg_state::beautyb_unkx_r() { m_beautyb_unkx++; m_beautyb_unkx &= 0x7f; @@ -1013,7 +1013,7 @@ void segas1x_bootleg_state::tturfbl_map(address_map &map) /***************************************************************************/ -WRITE16_MEMBER(segas1x_bootleg_state::sys18_refreshenable_w) +void segas1x_bootleg_state::sys18_refreshenable_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -1021,7 +1021,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys18_refreshenable_w) } } -WRITE16_MEMBER(segas1x_bootleg_state::wb3bble_refreshenable_w) +void segas1x_bootleg_state::wb3bble_refreshenable_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -1029,7 +1029,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::wb3bble_refreshenable_w) } } -WRITE16_MEMBER(segas1x_bootleg_state::sys18_tilebank_w) +void segas1x_bootleg_state::sys18_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -1038,7 +1038,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys18_tilebank_w) } } -READ8_MEMBER(segas1x_bootleg_state::system18_bank_r) +uint8_t segas1x_bootleg_state::system18_bank_r(offs_t offset) { if (m_sound_bank != nullptr) return m_sound_bank[offset]; @@ -1056,7 +1056,7 @@ void segas1x_bootleg_state::sound_18_map(address_map &map) } -WRITE8_MEMBER(segas1x_bootleg_state::sys18_soundbank_w) +void segas1x_bootleg_state::sys18_soundbank_w(uint8_t data) { uint8_t *mem = m_soundcpu_region->base(); int rom = (data >> 6) & 3; @@ -1205,7 +1205,7 @@ void segas1x_bootleg_state::shdancbla_map(address_map &map) ***************************************************************************/ -WRITE8_MEMBER(segas1x_bootleg_state::shdancbl_msm5205_data_w) +void segas1x_bootleg_state::shdancbl_msm5205_data_w(uint8_t data) { m_sample_buffer = data; } @@ -1220,14 +1220,14 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::shdancbl_msm5205_callback) m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -READ8_MEMBER(segas1x_bootleg_state::shdancbl_soundbank_r) +uint8_t segas1x_bootleg_state::shdancbl_soundbank_r(offs_t offset) { if (m_soundbank_ptr) return m_soundbank_ptr[offset & 0x3fff]; return 0xff; } -WRITE8_MEMBER(segas1x_bootleg_state::shdancbl_bankctrl_w) +void segas1x_bootleg_state::shdancbl_bankctrl_w(uint8_t data) { uint8_t *mem = m_soundcpu_region->base(); @@ -1341,7 +1341,7 @@ void segas1x_bootleg_state::mwalkbl_map(address_map &map) ***************************************************************************/ -WRITE8_MEMBER(segas1x_bootleg_state::sys18bl_okibank_w) // TODO: verify correctness +void segas1x_bootleg_state::sys18bl_okibank_w(uint8_t data) // TODO: verify correctness { //popmessage("okibank: %02x\n", data); m_okibank->set_entry(data & 0x07); @@ -1398,7 +1398,7 @@ void segas1x_bootleg_state::sys18bl_oki_map(address_map &map) map(0x30000, 0x3ffff).bankr("okibank"); } -WRITE16_MEMBER(segas1x_bootleg_state::ddcrewbl_spritebank_w) +void segas1x_bootleg_state::ddcrewbl_spritebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // printf("banking write %08x: %04x (%04x %04x)\n", m_maincpu->pc(), offset<<1, data&mem_mask, mem_mask); @@ -4030,7 +4030,7 @@ void segas1x_bootleg_state::init_ddcrewbl() } -WRITE16_MEMBER(segas1x_bootleg_state::altbeastbl_gfx_w) +void segas1x_bootleg_state::altbeastbl_gfx_w(offs_t offset, uint16_t data) { switch (offset) { case 0x00: { @@ -4083,7 +4083,7 @@ void segas1x_bootleg_state::init_altbeastbl() { init_common(); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x418000, 0x418029, write16_delegate(*this, FUNC(segas1x_bootleg_state::altbeastbl_gfx_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x418000, 0x418029, write16sm_delegate(*this, FUNC(segas1x_bootleg_state::altbeastbl_gfx_w))); } /* Tetris-based */ diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h index 558847e87d6..6ed840a887f 100644 --- a/src/mame/includes/s11.h +++ b/src/mame/includes/s11.h @@ -57,13 +57,13 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); uint8_t sound_r(); - DECLARE_WRITE8_MEMBER(bank_w); + void bank_w(uint8_t data); void dig0_w(uint8_t data); void dig1_w(uint8_t data); void lamp0_w(uint8_t data); void lamp1_w(uint8_t data) { }; void sol2_w(uint8_t data) { }; // solenoids 8-15 - DECLARE_WRITE8_MEMBER(sol3_w); // solenoids 0-7 + void sol3_w(uint8_t data); // solenoids 0-7 void sound_w(uint8_t data); void pia2c_pa_w(uint8_t data); diff --git a/src/mame/includes/s11a.h b/src/mame/includes/s11a.h index e46fd0f8357..a00f0225ff2 100644 --- a/src/mame/includes/s11a.h +++ b/src/mame/includes/s11a.h @@ -22,7 +22,7 @@ public: void init_s11a(); - DECLARE_WRITE8_MEMBER(bgbank_w); + void bgbank_w(uint8_t data); void dig0_w(uint8_t data); private: diff --git a/src/mame/includes/s11b.h b/src/mame/includes/s11b.h index 0169223cb19..81973963902 100644 --- a/src/mame/includes/s11b.h +++ b/src/mame/includes/s11b.h @@ -29,8 +29,8 @@ public: void pia2c_pb_w(uint8_t data); void pia34_pa_w(uint8_t data); - DECLARE_WRITE8_MEMBER(bg_speech_clock_w); - DECLARE_WRITE8_MEMBER(bg_speech_digit_w); + void bg_speech_clock_w(uint8_t data); + void bg_speech_digit_w(uint8_t data); protected: void set_invert(bool inv) { m_invert = inv; } diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h index fe6d1a54e98..86696d48d79 100644 --- a/src/mame/includes/sage2.h +++ b/src/mame/includes/sage2.h @@ -55,7 +55,7 @@ public: private: void update_fdc_int(); - DECLARE_READ16_MEMBER(rom_r); + uint16_t rom_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER( br1_w ); DECLARE_WRITE_LINE_MEMBER( br2_w ); void ppi0_pc_w(uint8_t data); diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h index d467c7e8eee..319a8d1b41a 100644 --- a/src/mame/includes/samcoupe.h +++ b/src/mame/includes/samcoupe.h @@ -127,44 +127,44 @@ private: uint8_t m_mouse_data[9]; int m_mouse_x, m_mouse_y; uint8_t *m_videoram; - DECLARE_WRITE8_MEMBER(samcoupe_ext_mem_w); - DECLARE_READ8_MEMBER(samcoupe_disk_r); - DECLARE_WRITE8_MEMBER(samcoupe_disk_w); - DECLARE_READ8_MEMBER(samcoupe_pen_r); - DECLARE_WRITE8_MEMBER(samcoupe_clut_w); - DECLARE_READ8_MEMBER(samcoupe_status_r); - DECLARE_WRITE8_MEMBER(samcoupe_line_int_w); - DECLARE_READ8_MEMBER(samcoupe_lmpr_r); - DECLARE_WRITE8_MEMBER(samcoupe_lmpr_w); - DECLARE_READ8_MEMBER(samcoupe_hmpr_r); - DECLARE_WRITE8_MEMBER(samcoupe_hmpr_w); - DECLARE_READ8_MEMBER(samcoupe_vmpr_r); - DECLARE_WRITE8_MEMBER(samcoupe_vmpr_w); - DECLARE_READ8_MEMBER(samcoupe_midi_r); - DECLARE_WRITE8_MEMBER(samcoupe_midi_w); - DECLARE_READ8_MEMBER(samcoupe_keyboard_r); - DECLARE_WRITE8_MEMBER(samcoupe_border_w); - DECLARE_READ8_MEMBER(samcoupe_attributes_r); + void samcoupe_ext_mem_w(offs_t offset, uint8_t data); + uint8_t samcoupe_disk_r(offs_t offset); + void samcoupe_disk_w(offs_t offset, uint8_t data); + uint8_t samcoupe_pen_r(offs_t offset); + void samcoupe_clut_w(offs_t offset, uint8_t data); + uint8_t samcoupe_status_r(offs_t offset); + void samcoupe_line_int_w(uint8_t data); + uint8_t samcoupe_lmpr_r(); + void samcoupe_lmpr_w(uint8_t data); + uint8_t samcoupe_hmpr_r(); + void samcoupe_hmpr_w(uint8_t data); + uint8_t samcoupe_vmpr_r(); + void samcoupe_vmpr_w(uint8_t data); + uint8_t samcoupe_midi_r(); + void samcoupe_midi_w(uint8_t data); + uint8_t samcoupe_keyboard_r(offs_t offset); + void samcoupe_border_w(uint8_t data); + uint8_t samcoupe_attributes_r(); void samcoupe_palette(palette_device &palette) const; INTERRUPT_GEN_MEMBER(samcoupe_frame_interrupt); TIMER_CALLBACK_MEMBER(irq_off); TIMER_CALLBACK_MEMBER(samcoupe_mouse_reset); TIMER_CALLBACK_MEMBER(sam_video_update_callback); - DECLARE_READ8_MEMBER(samcoupe_lpt1_busy_r); - DECLARE_WRITE8_MEMBER(samcoupe_lpt1_strobe_w); - DECLARE_READ8_MEMBER(samcoupe_lpt2_busy_r); - DECLARE_WRITE8_MEMBER(samcoupe_lpt2_strobe_w); - DECLARE_READ8_MEMBER(samcoupe_rtc_r); - DECLARE_WRITE8_MEMBER(samcoupe_rtc_w); - - DECLARE_READ8_MEMBER(sam_bank1_r); - DECLARE_WRITE8_MEMBER(sam_bank1_w); - DECLARE_READ8_MEMBER(sam_bank2_r); - DECLARE_WRITE8_MEMBER(sam_bank2_w); - DECLARE_READ8_MEMBER(sam_bank3_r); - DECLARE_WRITE8_MEMBER(sam_bank3_w); - DECLARE_READ8_MEMBER(sam_bank4_r); - DECLARE_WRITE8_MEMBER(sam_bank4_w); + uint8_t samcoupe_lpt1_busy_r(); + void samcoupe_lpt1_strobe_w(uint8_t data); + uint8_t samcoupe_lpt2_busy_r(); + void samcoupe_lpt2_strobe_w(uint8_t data); + uint8_t samcoupe_rtc_r(offs_t offset); + void samcoupe_rtc_w(offs_t offset, uint8_t data); + + uint8_t sam_bank1_r(offs_t offset); + void sam_bank1_w(offs_t offset, uint8_t data); + uint8_t sam_bank2_r(offs_t offset); + void sam_bank2_w(offs_t offset, uint8_t data); + uint8_t sam_bank3_r(offs_t offset); + void sam_bank3_w(offs_t offset, uint8_t data); + uint8_t sam_bank4_r(offs_t offset); + void sam_bank4_w(offs_t offset, uint8_t data); uint8_t* sam_bank_read_ptr[4]; uint8_t* sam_bank_write_ptr[4]; diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index 5650bfdd80e..608c334ddb5 100644 --- a/src/mame/includes/saturn.h +++ b/src/mame/includes/saturn.h @@ -139,32 +139,32 @@ protected: TIMER_CALLBACK_MEMBER(vdp1_draw_end); - DECLARE_WRITE16_MEMBER(saturn_soundram_w); - DECLARE_READ16_MEMBER(saturn_soundram_r); - DECLARE_WRITE32_MEMBER(minit_w); - DECLARE_WRITE32_MEMBER(sinit_w); - DECLARE_WRITE32_MEMBER(saturn_minit_w); - DECLARE_WRITE32_MEMBER(saturn_sinit_w); - DECLARE_READ8_MEMBER(saturn_backupram_r); - DECLARE_WRITE8_MEMBER(saturn_backupram_w); + void saturn_soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t saturn_soundram_r(offs_t offset); + void minit_w(uint32_t data); + void sinit_w(uint32_t data); + void saturn_minit_w(uint32_t data); + void saturn_sinit_w(uint32_t data); + uint8_t saturn_backupram_r(offs_t offset); + void saturn_backupram_w(offs_t offset, uint8_t data); int m_scsp_last_line; - DECLARE_READ16_MEMBER ( saturn_vdp1_regs_r ); - DECLARE_READ32_MEMBER ( saturn_vdp1_vram_r ); - DECLARE_READ32_MEMBER ( saturn_vdp1_framebuffer0_r ); + uint16_t saturn_vdp1_regs_r(offs_t offset); + uint32_t saturn_vdp1_vram_r(offs_t offset); + uint32_t saturn_vdp1_framebuffer0_r(offs_t offset, uint32_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER ( saturn_vdp1_regs_w ); - DECLARE_WRITE32_MEMBER ( saturn_vdp1_vram_w ); - DECLARE_WRITE32_MEMBER ( saturn_vdp1_framebuffer0_w ); + void saturn_vdp1_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void saturn_vdp1_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void saturn_vdp1_framebuffer0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_READ32_MEMBER ( saturn_vdp2_vram_r ); - DECLARE_READ32_MEMBER ( saturn_vdp2_cram_r ); - DECLARE_READ16_MEMBER ( saturn_vdp2_regs_r ); + uint32_t saturn_vdp2_vram_r(offs_t offset); + uint32_t saturn_vdp2_cram_r(offs_t offset); + uint16_t saturn_vdp2_regs_r(offs_t offset); - DECLARE_WRITE32_MEMBER ( saturn_vdp2_vram_w ); - DECLARE_WRITE32_MEMBER ( saturn_vdp2_cram_w ); - DECLARE_WRITE16_MEMBER ( saturn_vdp2_regs_w ); + void saturn_vdp2_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void saturn_vdp2_cram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void saturn_vdp2_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); /* VDP1 */ @@ -439,8 +439,8 @@ protected: } stv_rbg_cache_data; // DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); -// DECLARE_READ16_MEMBER(scudsp_dma_r); -// DECLARE_WRITE16_MEMBER(scudsp_dma_w); +// uint16_t scudsp_dma_r(offs_t offset); +// void scudsp_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // void debug_scudma_command(int ref, const std::vector<std::string> ¶ms); // void debug_scuirq_command(int ref, const std::vector<std::string> ¶ms); diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index ace9c6679ce..6c13f8b95d1 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -64,19 +64,19 @@ private: DECLARE_WRITE_LINE_MEMBER(coin1_w); DECLARE_WRITE_LINE_MEMBER(coin2_w); DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(scroll_bg_w); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void scroll_bg_w(uint8_t data); // sauro specific - DECLARE_WRITE8_MEMBER(sauro_sound_command_w); - DECLARE_READ8_MEMBER(sauro_sound_command_r); + void sauro_sound_command_w(uint8_t data); + uint8_t sauro_sound_command_r(); DECLARE_WRITE_LINE_MEMBER(sauro_palette_bank0_w); DECLARE_WRITE_LINE_MEMBER(sauro_palette_bank1_w); - DECLARE_WRITE8_MEMBER(sauro_scroll_fg_w); - DECLARE_WRITE8_MEMBER(sauro_videoram2_w); - DECLARE_WRITE8_MEMBER(sauro_colorram2_w); - DECLARE_WRITE8_MEMBER(adpcm_w); + void sauro_scroll_fg_w(uint8_t data); + void sauro_videoram2_w(offs_t offset, uint8_t data); + void sauro_colorram2_w(offs_t offset, uint8_t data); + void adpcm_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info_bg); TILE_GET_INFO_MEMBER(get_tile_info_fg); diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index ac17b189226..bf534c6418b 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -64,18 +64,18 @@ private: bool m_spriteram_select; bool m_irq_mask; - DECLARE_WRITE8_MEMBER(sbasketb_sh_irqtrigger_w); + void sbasketb_sh_irqtrigger_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE8_MEMBER(sbasketb_videoram_w); - DECLARE_WRITE8_MEMBER(sbasketb_colorram_w); + void sbasketb_videoram_w(offs_t offset, uint8_t data); + void sbasketb_colorram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); DECLARE_WRITE_LINE_MEMBER(spriteram_select_w); uint8_t m_SN76496_latch; - DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; - DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(m_SN76496_latch); }; + void konami_SN76496_latch_w(uint8_t data) { m_SN76496_latch = data; }; + void konami_SN76496_w(uint8_t data) { m_sn->write(m_SN76496_latch); }; TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start() override; void sbasketb_palette(palette_device &palette) const; diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index b6eefaa585d..8d754ae1fa0 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -30,8 +30,8 @@ private: tilemap_t *m_tilemap; - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(videoram_attr_w); + void videoram_w(offs_t offset, uint8_t data); + void videoram_attr_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 37d54e82413..c1841c20a4e 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -45,12 +45,12 @@ private: int m_charbank; int m_palette_bank; - DECLARE_WRITE8_MEMBER(ctrl_w); - DECLARE_WRITE8_MEMBER(soundlatch_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(charbank_w); - DECLARE_WRITE8_MEMBER(palettebank_w); + void ctrl_w(uint8_t data); + void soundlatch_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void charbank_w(uint8_t data); + void palettebank_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 2f4c0b68adf..76a8b89df98 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -41,24 +41,24 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(darkplnt_dial_r); template <int Mask> DECLARE_READ_LINE_MEMBER(ckongs_coinage_r); - DECLARE_READ8_MEMBER(hncholms_prot_r); - DECLARE_READ8_MEMBER(scramble_soundram_r); - DECLARE_READ8_MEMBER(mars_ppi8255_0_r); - DECLARE_READ8_MEMBER(mars_ppi8255_1_r); - DECLARE_WRITE8_MEMBER(scramble_soundram_w); + uint8_t hncholms_prot_r(); + uint8_t scramble_soundram_r(offs_t offset); + uint8_t mars_ppi8255_0_r(offs_t offset); + uint8_t mars_ppi8255_1_r(offs_t offset); + void scramble_soundram_w(offs_t offset, uint8_t data); uint8_t scramble_portB_r(); uint8_t hustler_portB_r(); void hotshock_sh_irqtrigger_w(uint8_t data); uint8_t hotshock_soundlatch_r(); - DECLARE_WRITE8_MEMBER(mars_ppi8255_0_w); - DECLARE_WRITE8_MEMBER(mars_ppi8255_1_w); - DECLARE_WRITE8_MEMBER(ad2083_tms5110_ctrl_w); + void mars_ppi8255_0_w(offs_t offset, uint8_t data); + void mars_ppi8255_1_w(offs_t offset, uint8_t data); + void ad2083_tms5110_ctrl_w(uint8_t data); // harem - DECLARE_WRITE8_MEMBER(harem_decrypt_bit_w); - DECLARE_WRITE8_MEMBER(harem_decrypt_clk_w); - DECLARE_WRITE8_MEMBER(harem_decrypt_rst_w); - DECLARE_READ8_MEMBER(harem_digitalker_intr_r); + void harem_decrypt_bit_w(uint8_t data); + void harem_decrypt_clk_w(uint8_t data); + void harem_decrypt_rst_w(uint8_t data); + uint8_t harem_digitalker_intr_r(); void harem_digitalker_control_w(uint8_t data); void init_cavelon(); @@ -88,14 +88,14 @@ public: DECLARE_MACHINE_RESET(scramble); DECLARE_MACHINE_RESET(explorer); DECLARE_WRITE_LINE_MEMBER(scramble_sh_7474_q_callback); - DECLARE_READ8_MEMBER( mariner_protection_1_r ); - DECLARE_READ8_MEMBER( mariner_protection_2_r ); - DECLARE_READ8_MEMBER( triplep_pip_r ); - DECLARE_READ8_MEMBER( triplep_pap_r ); - DECLARE_READ8_MEMBER( cavelon_banksw_r ); - DECLARE_WRITE8_MEMBER( cavelon_banksw_w ); - DECLARE_READ8_MEMBER( hunchbks_mirror_r ); - DECLARE_WRITE8_MEMBER( hunchbks_mirror_w ); + uint8_t mariner_protection_1_r(); + uint8_t mariner_protection_2_r(); + uint8_t triplep_pip_r(); + uint8_t triplep_pap_r(); + uint8_t cavelon_banksw_r(offs_t offset); + void cavelon_banksw_w(offs_t offset, uint8_t data); + uint8_t hunchbks_mirror_r(address_space &space, offs_t offset); + void hunchbks_mirror_w(address_space &space, offs_t offset, uint8_t data); void scramble_sh_irqtrigger_w(uint8_t data); void mrkougar_sh_irqtrigger_w(uint8_t data); IRQ_CALLBACK_MEMBER( scramble_sh_irq_callback ); diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 2f072b31c73..151d4d861b4 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -31,18 +31,18 @@ public: void luckboom(machine_config &config); private: - DECLARE_READ16_MEMBER(sderby_input_r); - DECLARE_READ16_MEMBER(sderbya_input_r); - DECLARE_READ16_MEMBER(roulette_input_r); - DECLARE_READ16_MEMBER(rprot_r); - DECLARE_WRITE16_MEMBER(rprot_w); - DECLARE_WRITE16_MEMBER(sderby_out_w); - DECLARE_WRITE16_MEMBER(scmatto_out_w); - DECLARE_WRITE16_MEMBER(roulette_out_w); - DECLARE_WRITE16_MEMBER(sderby_videoram_w); - DECLARE_WRITE16_MEMBER(sderby_md_videoram_w); - DECLARE_WRITE16_MEMBER(sderby_fg_videoram_w); - DECLARE_WRITE16_MEMBER(sderby_scroll_w); + uint16_t sderby_input_r(offs_t offset); + uint16_t sderbya_input_r(offs_t offset); + uint16_t roulette_input_r(offs_t offset); + uint16_t rprot_r(); + void rprot_w(uint16_t data); + void sderby_out_w(uint16_t data); + void scmatto_out_w(uint16_t data); + void roulette_out_w(uint16_t data); + void sderby_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sderby_md_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sderby_fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sderby_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_sderby_tile_info); TILE_GET_INFO_MEMBER(get_sderby_md_tile_info); TILE_GET_INFO_MEMBER(get_sderby_fg_tile_info); diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 1954dbf080f..9e54a676882 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -125,35 +125,35 @@ private: uint16_t m_bg_scrolly; uint8_t m_pignewt_bg_color_offset; - DECLARE_READ8_MEMBER(g80r_opcode_r); - DECLARE_WRITE8_MEMBER(mainram_w); - DECLARE_WRITE8_MEMBER(vidram_w); - DECLARE_WRITE8_MEMBER(monsterb_vidram_w); - DECLARE_WRITE8_MEMBER(pignewt_vidram_w); - DECLARE_WRITE8_MEMBER(sindbadm_vidram_w); - DECLARE_READ8_MEMBER(mangled_ports_r); - DECLARE_READ8_MEMBER(spaceod_mangled_ports_r); - DECLARE_READ8_MEMBER(spaceod_port_fc_r); - DECLARE_WRITE8_MEMBER(coin_count_w); - DECLARE_WRITE8_MEMBER(segag80r_videoram_w); - DECLARE_READ8_MEMBER(segag80r_video_port_r); - DECLARE_WRITE8_MEMBER(segag80r_video_port_w); - DECLARE_READ8_MEMBER(spaceod_back_port_r); - DECLARE_WRITE8_MEMBER(spaceod_back_port_w); - DECLARE_WRITE8_MEMBER(monsterb_videoram_w); - DECLARE_WRITE8_MEMBER(monsterb_back_port_w); - DECLARE_WRITE8_MEMBER(pignewt_videoram_w); - DECLARE_WRITE8_MEMBER(pignewt_back_color_w); - DECLARE_WRITE8_MEMBER(pignewt_back_port_w); - DECLARE_WRITE8_MEMBER(sindbadm_videoram_w); - DECLARE_WRITE8_MEMBER(sindbadm_back_port_w); - DECLARE_WRITE8_MEMBER(astrob_sound_w); - DECLARE_WRITE8_MEMBER(spaceod_sound_w); - - DECLARE_WRITE8_MEMBER(usb_ram_w); + uint8_t g80r_opcode_r(offs_t offset); + void mainram_w(offs_t offset, uint8_t data); + void vidram_w(offs_t offset, uint8_t data); + void monsterb_vidram_w(offs_t offset, uint8_t data); + void pignewt_vidram_w(offs_t offset, uint8_t data); + void sindbadm_vidram_w(offs_t offset, uint8_t data); + uint8_t mangled_ports_r(offs_t offset); + uint8_t spaceod_mangled_ports_r(offs_t offset); + uint8_t spaceod_port_fc_r(); + void coin_count_w(uint8_t data); + void segag80r_videoram_w(offs_t offset, uint8_t data); + uint8_t segag80r_video_port_r(offs_t offset); + void segag80r_video_port_w(offs_t offset, uint8_t data); + uint8_t spaceod_back_port_r(offs_t offset); + void spaceod_back_port_w(offs_t offset, uint8_t data); + void monsterb_videoram_w(offs_t offset, uint8_t data); + void monsterb_back_port_w(offs_t offset, uint8_t data); + void pignewt_videoram_w(offs_t offset, uint8_t data); + void pignewt_back_color_w(offs_t offset, uint8_t data); + void pignewt_back_port_w(offs_t offset, uint8_t data); + void sindbadm_videoram_w(offs_t offset, uint8_t data); + void sindbadm_back_port_w(offs_t offset, uint8_t data); + void astrob_sound_w(offs_t offset, uint8_t data); + void spaceod_sound_w(offs_t offset, uint8_t data); + + void usb_ram_w(offs_t offset, uint8_t data); void sindbadm_misc_w(uint8_t data); - DECLARE_WRITE8_MEMBER(sindbadm_sn1_SN76496_w); - DECLARE_WRITE8_MEMBER(sindbadm_sn2_SN76496_w); + void sindbadm_sn1_SN76496_w(uint8_t data); + void sindbadm_sn2_SN76496_w(uint8_t data); TILE_GET_INFO_MEMBER(spaceod_get_tile_info); TILEMAP_MAPPER_MEMBER(spaceod_scan_rows); diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 39429e9dc07..dd247ac859c 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -69,26 +69,26 @@ private: segag80_decrypt_func m_decrypt; int m_min_x; int m_min_y; - DECLARE_READ8_MEMBER(g80v_opcode_r); - DECLARE_WRITE8_MEMBER(mainram_w); - DECLARE_WRITE8_MEMBER(vectorram_w); - DECLARE_READ8_MEMBER(mangled_ports_r); - DECLARE_WRITE8_MEMBER(spinner_select_w); - DECLARE_READ8_MEMBER(spinner_input_r); - DECLARE_READ8_MEMBER(elim4_input_r); - DECLARE_WRITE8_MEMBER(multiply_w); - DECLARE_READ8_MEMBER(multiply_r); - DECLARE_WRITE8_MEMBER(coin_count_w); - DECLARE_WRITE8_MEMBER(unknown_w); - - DECLARE_WRITE8_MEMBER(elim1_sh_w); - DECLARE_WRITE8_MEMBER(elim2_sh_w); - DECLARE_WRITE8_MEMBER(zektor1_sh_w); - DECLARE_WRITE8_MEMBER(zektor2_sh_w); - DECLARE_WRITE8_MEMBER(spacfury1_sh_w); - DECLARE_WRITE8_MEMBER(spacfury2_sh_w); - - DECLARE_WRITE8_MEMBER(usb_ram_w); + uint8_t g80v_opcode_r(offs_t offset); + void mainram_w(offs_t offset, uint8_t data); + void vectorram_w(offs_t offset, uint8_t data); + uint8_t mangled_ports_r(offs_t offset); + void spinner_select_w(uint8_t data); + uint8_t spinner_input_r(); + uint8_t elim4_input_r(); + void multiply_w(offs_t offset, uint8_t data); + uint8_t multiply_r(); + void coin_count_w(uint8_t data); + void unknown_w(uint8_t data); + + void elim1_sh_w(uint8_t data); + void elim2_sh_w(uint8_t data); + void zektor1_sh_w(uint8_t data); + void zektor2_sh_w(uint8_t data); + void spacfury1_sh_w(uint8_t data); + void spacfury2_sh_w(uint8_t data); + + void usb_ram_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h index 9b3c9ed1a1f..88841e5eea6 100644 --- a/src/mame/includes/segahang.h +++ b/src/mame/includes/segahang.h @@ -88,7 +88,7 @@ private: uint8_t analog_r(); // Z80 sound CPU read/write handlers - DECLARE_READ8_MEMBER( sound_data_r ); + uint8_t sound_data_r(); // I8751-related VBLANK interrupt handlers INTERRUPT_GEN_MEMBER( i8751_main_cpu_vblank ); diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h index e01f6947ecf..316569dfe7a 100644 --- a/src/mame/includes/segaorun.h +++ b/src/mame/includes/segaorun.h @@ -87,18 +87,18 @@ protected: void memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t index); // main CPU read/write handlers - DECLARE_READ16_MEMBER( misc_io_r ); - DECLARE_WRITE16_MEMBER( misc_io_w ); - DECLARE_WRITE16_MEMBER( nop_w ); + uint16_t misc_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void misc_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void nop_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // video updates uint32_t screen_update_outrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_shangon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_MEMBER( tileram_w ) { m_segaic16vid->tileram_w(space,offset,data,mem_mask); }; - DECLARE_WRITE16_MEMBER( textram_w ) { m_segaic16vid->textram_w(space,offset,data,mem_mask); }; - DECLARE_READ16_MEMBER( sega_road_control_0_r ) { return m_segaic16road->segaic16_road_control_0_r(); }; - DECLARE_WRITE16_MEMBER( sega_road_control_0_w ) { m_segaic16road->segaic16_road_control_0_w(offset,data,mem_mask); }; + void tileram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->tileram_w(offset,data,mem_mask); }; + void textram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->textram_w(offset,data,mem_mask); }; + uint16_t sega_road_control_0_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0) { return m_segaic16road->segaic16_road_control_0_r(); }; + void sega_road_control_0_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16road->segaic16_road_control_0_w(offset,data,mem_mask); }; TIMER_DEVICE_CALLBACK_MEMBER(bankmotor_update); @@ -126,10 +126,10 @@ protected: DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); // custom I/O - DECLARE_READ16_MEMBER( outrun_custom_io_r ); - DECLARE_WRITE16_MEMBER( outrun_custom_io_w ); - DECLARE_READ16_MEMBER( shangon_custom_io_r ); - DECLARE_WRITE16_MEMBER( shangon_custom_io_w ); + uint16_t outrun_custom_io_r(address_space &space, offs_t offset); + void outrun_custom_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t shangon_custom_io_r(address_space &space, offs_t offset); + void shangon_custom_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t analog_r(); // devices @@ -155,8 +155,8 @@ protected: required_shared_ptr<uint16_t> m_workram; // configuration - read16_delegate m_custom_io_r; - write16_delegate m_custom_io_w; + read16m_delegate m_custom_io_r; + write16s_delegate m_custom_io_w; const uint8_t * m_custom_map; bool m_shangon_video; diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h index f08cb58f7b2..a7c5c9c80e8 100644 --- a/src/mame/includes/segas16a.h +++ b/src/mame/includes/segas16a.h @@ -88,10 +88,10 @@ private: void tilemap_sound_w(uint8_t data); // main CPU read/write handlers - DECLARE_READ16_MEMBER( standard_io_r ); - DECLARE_WRITE16_MEMBER( standard_io_w ); - DECLARE_READ16_MEMBER( misc_io_r ); - DECLARE_WRITE16_MEMBER( misc_io_w ); + uint16_t standard_io_r(offs_t offset); + void standard_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t misc_io_r(offs_t offset); + void misc_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // Z80 sound CPU read/write handlers uint8_t sound_data_r(); @@ -144,12 +144,12 @@ private: void dumpmtmt_i8751_sim(); // custom I/O handlers - DECLARE_READ16_MEMBER( aceattaca_custom_io_r ); - DECLARE_WRITE16_MEMBER( aceattaca_custom_io_w ); - DECLARE_READ16_MEMBER( mjleague_custom_io_r ); - DECLARE_READ16_MEMBER( passsht16a_custom_io_r ); - DECLARE_READ16_MEMBER( sdi_custom_io_r ); - DECLARE_READ16_MEMBER( sjryuko_custom_io_r ); + uint16_t aceattaca_custom_io_r(offs_t offset); + void aceattaca_custom_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t mjleague_custom_io_r(offs_t offset); + uint16_t passsht16a_custom_io_r(offs_t offset); + uint16_t sdi_custom_io_r(offs_t offset); + uint16_t sjryuko_custom_io_r(offs_t offset); void sjryuko_lamp_changed_w(uint8_t changed, uint8_t newval); // devices @@ -173,8 +173,8 @@ private: optional_shared_ptr<uint8_t> m_sound_decrypted_opcodes; // configuration - read16_delegate m_custom_io_r; - write16_delegate m_custom_io_w; + read16sm_delegate m_custom_io_r; + write16s_delegate m_custom_io_w; i8751_sim_delegate m_i8751_vblank_hook; lamp_changed_delegate m_lamp_changed_w; diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index 5ae9e0a49d9..f9d9bbe49b3 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -137,22 +137,22 @@ protected: void memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t index); // main CPU read/write handlers - DECLARE_WRITE16_MEMBER( rom_5704_bank_w ); - DECLARE_READ16_MEMBER( rom_5797_bank_math_r ); - DECLARE_WRITE16_MEMBER( rom_5797_bank_math_w ); - DECLARE_READ16_MEMBER( unknown_rgn2_r ); - DECLARE_WRITE16_MEMBER( unknown_rgn2_w ); - DECLARE_READ16_MEMBER( standard_io_r ); - DECLARE_WRITE16_MEMBER( standard_io_w ); - DECLARE_WRITE16_MEMBER( atomicp_sound_w ); - - DECLARE_READ16_MEMBER( bootleg_custom_io_r ); - DECLARE_WRITE16_MEMBER( bootleg_custom_io_w ); + void rom_5704_bank_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t rom_5797_bank_math_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void rom_5797_bank_math_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t unknown_rgn2_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void unknown_rgn2_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t standard_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void standard_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void atomicp_sound_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + + uint16_t bootleg_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void bootleg_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // sound CPU read/write handlers void upd7759_control_w(uint8_t data); uint8_t upd7759_status_r(); - DECLARE_WRITE16_MEMBER( sound_w16 ); + void sound_w16(uint16_t data); // other callbacks DECLARE_WRITE_LINE_MEMBER(upd7759_generate_nmi); @@ -162,8 +162,8 @@ protected: // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_MEMBER( tileram_w ) { m_segaic16vid->tileram_w(space,offset,data,mem_mask); }; - DECLARE_WRITE16_MEMBER( textram_w ) { m_segaic16vid->textram_w(space,offset,data,mem_mask); }; + void tileram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->tileram_w(offset,data,mem_mask); }; + void textram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->textram_w(offset,data,mem_mask); }; // bootleg stuff void tilemap_16b_fpointbl_fill_latch(int i, uint16_t* latched_pageselect, uint16_t* latched_yscroll, uint16_t* latched_xscroll, uint16_t* textram); @@ -225,15 +225,15 @@ protected: void wb3_i8751_sim(); // custom I/O handlers - DECLARE_READ16_MEMBER( aceattac_custom_io_r ); - DECLARE_WRITE16_MEMBER( aceattac_custom_io_w ); - DECLARE_READ16_MEMBER( dunkshot_custom_io_r ); - DECLARE_READ16_MEMBER( hwchamp_custom_io_r ); - DECLARE_WRITE16_MEMBER( hwchamp_custom_io_w ); - DECLARE_READ16_MEMBER( passshtj_custom_io_r ); - DECLARE_READ16_MEMBER( sdi_custom_io_r ); - DECLARE_READ16_MEMBER( sjryuko_custom_io_r ); - DECLARE_WRITE16_MEMBER( sjryuko_custom_io_w ); + uint16_t aceattac_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void aceattac_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t dunkshot_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + uint16_t hwchamp_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void hwchamp_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t passshtj_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + uint16_t sdi_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + uint16_t sjryuko_custom_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void sjryuko_custom_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // devices optional_device<sega_315_5195_mapper_device> m_mapper; @@ -260,7 +260,7 @@ protected: // configuration segas16b_rom_board m_romboard; int m_tilemap_type; - read16_delegate m_custom_io_r; + read16_delegate m_custom_io_r; write16_delegate m_custom_io_w; bool m_disable_screen_blanking; const uint8_t * m_i8751_initial_config; @@ -369,19 +369,19 @@ public: private: // read/write handlers - DECLARE_WRITE16_MEMBER( cart_addr_high_w ); - DECLARE_WRITE16_MEMBER( cart_addr_low_w ); - DECLARE_READ16_MEMBER( cart_data_r ); - DECLARE_WRITE16_MEMBER( data_w ); - DECLARE_WRITE16_MEMBER( datatype_w ); - DECLARE_WRITE16_MEMBER( addr_high_w ); - DECLARE_WRITE16_MEMBER( addr_low_w ); - DECLARE_WRITE16_MEMBER( cart_security_high_w ); - DECLARE_WRITE16_MEMBER( cart_security_low_w ); - DECLARE_READ16_MEMBER( cart_security_low_r ); - DECLARE_READ16_MEMBER( cart_security_high_r ); - DECLARE_WRITE16_MEMBER( sound_reset_w ); - DECLARE_WRITE16_MEMBER( main_bank_change_w ); + void cart_addr_high_w(uint16_t data); + void cart_addr_low_w(uint16_t data); + uint16_t cart_data_r(); + void data_w(uint16_t data); + void datatype_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void addr_high_w(uint16_t data); + void addr_low_w(uint16_t data); + void cart_security_high_w(uint16_t data); + void cart_security_low_w(uint16_t data); + uint16_t cart_security_low_r(); + uint16_t cart_security_high_r(); + void sound_reset_w(uint16_t data); + void main_bank_change_w(uint16_t data); // security callbacks uint32_t shinfz_security(uint32_t input); diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index bd7af6db6f2..2474fa28b58 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -83,20 +83,20 @@ private: // read/write handlers void rom_5874_bank_w(uint8_t data); - DECLARE_WRITE16_MEMBER( rom_5987_bank_w ); - DECLARE_WRITE16_MEMBER( rom_837_7525_bank_w ); + void rom_5987_bank_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void rom_837_7525_bank_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void misc_outputs_w(uint8_t data); - DECLARE_READ16_MEMBER( misc_io_r ); - DECLARE_WRITE16_MEMBER( misc_io_w ); + uint16_t misc_io_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); + void misc_io_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void soundbank_w(uint8_t data); // custom I/O - DECLARE_READ16_MEMBER( ddcrew_custom_io_r ); - DECLARE_READ16_MEMBER( lghost_custom_io_r ); + uint16_t ddcrew_custom_io_r(offs_t offset); + uint16_t lghost_custom_io_r(offs_t offset); void lghost_gun_recoil_w(uint8_t data); - DECLARE_WRITE16_MEMBER( lghost_custom_io_w ); - DECLARE_READ16_MEMBER( wwally_custom_io_r ); - DECLARE_WRITE16_MEMBER( wwally_custom_io_w ); + void lghost_custom_io_w(offs_t offset, uint16_t data); + uint16_t wwally_custom_io_r(offs_t offset); + void wwally_custom_io_w(offs_t offset, uint16_t data); // video rendering uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -105,10 +105,10 @@ private: DECLARE_WRITE_LINE_MEMBER(vdp_lv6irqline_callback_s18); DECLARE_WRITE_LINE_MEMBER(vdp_lv4irqline_callback_s18); - DECLARE_READ16_MEMBER( genesis_vdp_r ) { return m_vdp->vdp_r(offset, mem_mask); } - DECLARE_WRITE16_MEMBER( genesis_vdp_w ) { m_vdp->vdp_w(offset, data, mem_mask); } - DECLARE_WRITE16_MEMBER( tileram_w ) { m_segaic16vid->tileram_w(space, offset, data, mem_mask); } - DECLARE_WRITE16_MEMBER( textram_w ) { m_segaic16vid->textram_w(space, offset, data, mem_mask); } + uint16_t genesis_vdp_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0) { return m_vdp->vdp_r(offset, mem_mask); } + void genesis_vdp_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_vdp->vdp_w(offset, data, mem_mask); } + void tileram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->tileram_w(offset, data, mem_mask); } + void textram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->textram_w(offset, data, mem_mask); } DECLARE_WRITE_LINE_MEMBER(set_grayscale); DECLARE_WRITE_LINE_MEMBER(set_vdp_enable); @@ -172,8 +172,8 @@ private: // configuration segas18_rom_board m_romboard; - read16_delegate m_custom_io_r; - write16_delegate m_custom_io_w; + read16sm_delegate m_custom_io_r; + write16sm_delegate m_custom_io_w; // internal state int m_grayscale_enable; diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 46c220dd5fa..8b9a0f41880 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -133,24 +133,24 @@ private: required_device<segas24_mixer_device> m_vmixer; DECLARE_WRITE_LINE_MEMBER(irq_ym); - DECLARE_READ16_MEMBER( paletteram_r ); - DECLARE_WRITE16_MEMBER( paletteram_w ); - DECLARE_READ16_MEMBER( irq_r ); - DECLARE_WRITE16_MEMBER( irq_w ); - DECLARE_READ16_MEMBER( fdc_r ); - DECLARE_WRITE16_MEMBER( fdc_w ); - DECLARE_READ16_MEMBER( fdc_status_r ); - DECLARE_WRITE16_MEMBER( fdc_ctrl_w ); - DECLARE_READ8_MEMBER( curbank_r ); - DECLARE_WRITE8_MEMBER( curbank_w ); - DECLARE_READ8_MEMBER( frc_mode_r ); - DECLARE_WRITE8_MEMBER( frc_mode_w ); - DECLARE_READ8_MEMBER( frc_r ); - DECLARE_WRITE8_MEMBER( frc_w ); - DECLARE_READ8_MEMBER( mlatch_r ); - DECLARE_WRITE8_MEMBER( mlatch_w ); - DECLARE_READ16_MEMBER( iod_r ); - DECLARE_WRITE16_MEMBER( iod_w ); + uint16_t paletteram_r(offs_t offset); + void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t irq_r(offs_t offset); + void irq_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t fdc_r(offs_t offset); + void fdc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t fdc_status_r(); + void fdc_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t curbank_r(); + void curbank_w(uint8_t data); + uint8_t frc_mode_r(); + void frc_mode_w(uint8_t data); + uint8_t frc_r(); + void frc_w(uint8_t data); + uint8_t mlatch_r(); + void mlatch_w(uint8_t data); + uint16_t iod_r(offs_t offset); + void iod_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t dcclub_p1_r(); uint8_t dcclub_p3_r(); diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 2c010f3907f..19063b122ec 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -93,42 +93,42 @@ protected: uint8_t bank = 0; }; - DECLARE_WRITE16_MEMBER(sonic_level_load_protection); - DECLARE_READ16_MEMBER(brival_protection_r); - DECLARE_WRITE16_MEMBER(brival_protection_w); - DECLARE_WRITE16_MEMBER(darkedge_protection_w); - DECLARE_READ16_MEMBER(darkedge_protection_r); - DECLARE_WRITE16_MEMBER(dbzvrvs_protection_w); - DECLARE_READ16_MEMBER(dbzvrvs_protection_r); - DECLARE_WRITE16_MEMBER(jleague_protection_w); - DECLARE_READ16_MEMBER(arescue_dsp_r); - DECLARE_WRITE16_MEMBER(arescue_dsp_w); - template<int Which> DECLARE_READ16_MEMBER(paletteram_r); - template<int Which> DECLARE_WRITE16_MEMBER(paletteram_w); - DECLARE_READ16_MEMBER(videoram_r); - DECLARE_WRITE16_MEMBER(videoram_w); - DECLARE_READ8_MEMBER(sprite_control_r); - DECLARE_WRITE8_MEMBER(sprite_control_w); - DECLARE_READ16_MEMBER(spriteram_r); - DECLARE_WRITE16_MEMBER(spriteram_w); - template<int Which> DECLARE_READ16_MEMBER(mixer_r); - template<int Which> DECLARE_WRITE16_MEMBER(mixer_w); - DECLARE_READ8_MEMBER(int_control_r); - DECLARE_WRITE8_MEMBER(int_control_w); - - DECLARE_WRITE16_MEMBER(random_number_w); - DECLARE_READ16_MEMBER(random_number_r); - DECLARE_READ8_MEMBER(shared_ram_r); - DECLARE_WRITE8_MEMBER(shared_ram_w); - DECLARE_WRITE8_MEMBER(sound_int_control_lo_w); - DECLARE_WRITE8_MEMBER(sound_int_control_hi_w); - DECLARE_WRITE8_MEMBER(sound_bank_lo_w); - DECLARE_WRITE8_MEMBER(sound_bank_hi_w); - DECLARE_READ8_MEMBER(sound_dummy_r); - DECLARE_WRITE8_MEMBER(sound_dummy_w); - - DECLARE_WRITE8_MEMBER(multipcm_bank_w); - DECLARE_WRITE8_MEMBER(scross_bank_w); + void sonic_level_load_protection(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t brival_protection_r(offs_t offset, uint16_t mem_mask = ~0); + void brival_protection_w(offs_t offset, uint16_t data); + void darkedge_protection_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t darkedge_protection_r(offs_t offset, uint16_t mem_mask = ~0); + void dbzvrvs_protection_w(address_space &space, uint16_t data); + uint16_t dbzvrvs_protection_r(); + void jleague_protection_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t arescue_dsp_r(offs_t offset); + void arescue_dsp_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + template<int Which> uint16_t paletteram_r(offs_t offset); + template<int Which> void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t videoram_r(offs_t offset); + void videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t sprite_control_r(offs_t offset); + void sprite_control_w(offs_t offset, uint8_t data); + uint16_t spriteram_r(offs_t offset); + void spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + template<int Which> uint16_t mixer_r(offs_t offset); + template<int Which> void mixer_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t int_control_r(offs_t offset); + void int_control_w(offs_t offset, uint8_t data); + + void random_number_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t random_number_r(); + uint8_t shared_ram_r(offs_t offset); + void shared_ram_w(offs_t offset, uint8_t data); + void sound_int_control_lo_w(offs_t offset, uint8_t data); + void sound_int_control_hi_w(offs_t offset, uint8_t data); + void sound_bank_lo_w(uint8_t data); + void sound_bank_hi_w(uint8_t data); + uint8_t sound_dummy_r(); + void sound_dummy_w(uint8_t data); + + void multipcm_bank_w(uint8_t data); + void scross_bank_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); @@ -361,7 +361,7 @@ public: ioport_value in2_analog_read(); ioport_value in3_analog_read(); - DECLARE_WRITE8_MEMBER(analog_bank_w); + void analog_bank_w(uint8_t data); void multi32_analog_map(address_map &map); protected: diff --git a/src/mame/includes/segasp.h b/src/mame/includes/segasp.h index 88ef71f4663..c1db362c005 100644 --- a/src/mame/includes/segasp.h +++ b/src/mame/includes/segasp.h @@ -23,14 +23,14 @@ public: private: required_device<eeprom_serial_93cxx_device> m_sp_eeprom; - DECLARE_READ64_MEMBER(sp_eeprom_r); - DECLARE_WRITE64_MEMBER(sp_eeprom_w); - DECLARE_READ64_MEMBER(sp_rombdflg_r); - DECLARE_READ64_MEMBER(sp_io_r); - DECLARE_READ64_MEMBER(sn_93c46a_r); - DECLARE_WRITE64_MEMBER(sn_93c46a_w); - DECLARE_READ64_MEMBER(sp_bank_r); - DECLARE_WRITE64_MEMBER(sp_bank_w); + uint64_t sp_eeprom_r(offs_t offset, uint64_t mem_mask = ~0); + void sp_eeprom_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t sp_rombdflg_r(); + uint64_t sp_io_r(offs_t offset, uint64_t mem_mask = ~0); + uint64_t sn_93c46a_r(); + void sn_93c46a_w(uint64_t data); + uint64_t sp_bank_r(offs_t offset, uint64_t mem_mask = ~0); + void sp_bank_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); uint16_t m_sp_bank; void onchip_port(address_map &map); diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index bf2ab9e0990..23fe42c982f 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -54,20 +54,20 @@ public: void lastsurv_muxer_w(uint8_t data); // game-specific main CPU read/write handlers - DECLARE_WRITE16_MEMBER(loffire_sync0_w); - DECLARE_READ16_MEMBER(smgp_excs_r); - DECLARE_WRITE16_MEMBER(smgp_excs_w); + void loffire_sync0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t smgp_excs_r(offs_t offset); + void smgp_excs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); protected: // main CPU read/write handlers uint8_t analog_r(); - DECLARE_WRITE16_MEMBER(iocontrol_w); + void iocontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); // palette helpers - DECLARE_WRITE16_MEMBER(paletteram_w); + void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void decrypted_opcodes_map(address_map &map); void main_map(address_map &map); @@ -234,9 +234,9 @@ protected: virtual void device_start() override; private: - DECLARE_READ8_MEMBER(commram_r); - DECLARE_WRITE8_MEMBER(commram_w); - DECLARE_WRITE8_MEMBER(commram_bank_w); + uint8_t commram_r(offs_t offset); + void commram_w(offs_t offset, uint8_t data); + void commram_bank_w(uint8_t data); void sub_map(address_map &map); void comm_map(address_map &map); diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h index d18aa509dfa..8e37ee9fa8d 100644 --- a/src/mame/includes/segaybd.h +++ b/src/mame/includes/segaybd.h @@ -67,9 +67,9 @@ private: // linked cabinet specific handlers DECLARE_WRITE_LINE_MEMBER(mb8421_intl); DECLARE_WRITE_LINE_MEMBER(mb8421_intr); - DECLARE_READ16_MEMBER(link_r); - DECLARE_READ16_MEMBER(link2_r); - DECLARE_WRITE16_MEMBER(link2_w); + uint16_t link_r(); + uint16_t link2_r(); + void link2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // uint8_t link_portc0_r(); // input helpers diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 3d31ba14f52..19c64116ba8 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -132,14 +132,14 @@ protected: void spi_layerbanks_eeprom_w(u8 data); void oki_bank_w(u8 data); - DECLARE_READ32_MEMBER(senkyu_speedup_r); - DECLARE_READ32_MEMBER(senkyua_speedup_r); - DECLARE_READ32_MEMBER(batlball_speedup_r); - DECLARE_READ32_MEMBER(rdft_speedup_r); - DECLARE_READ32_MEMBER(viprp1_speedup_r); - DECLARE_READ32_MEMBER(viprp1o_speedup_r); - DECLARE_READ32_MEMBER(rf2_speedup_r); - DECLARE_READ32_MEMBER(rfjet_speedup_r); + u32 senkyu_speedup_r(); + u32 senkyua_speedup_r(); + u32 batlball_speedup_r(); + u32 rdft_speedup_r(); + u32 viprp1_speedup_r(); + u32 viprp1o_speedup_r(); + u32 rf2_speedup_r(); + u32 rfjet_speedup_r(); DECLARE_WRITE_LINE_MEMBER(ymf_irqhandler); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index e617bf9915a..92f95b8fca5 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -57,8 +57,8 @@ private: tilemap_t *m_bg_tilemap; uint8_t m_irq_mask; - 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); uint8_t portB_r(); void portB_w(uint8_t data); @@ -76,7 +76,7 @@ private: void nvram_init(nvram_device &nvram, void *data, size_t size); - DECLARE_WRITE8_MEMBER(dac_w); + void dac_w(uint8_t data); void decrypted_opcodes_map(address_map &map); void main_map(address_map &map); diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index bdbeef36573..7573c6d7f9d 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -95,18 +95,18 @@ private: tilemap_t *m_bg2_tilemap; tilemap_t *m_bg3_tilemap; - DECLARE_WRITE8_MEMBER(flip_screen_w); - DECLARE_WRITE8_MEMBER(starforb_scrolly2); - DECLARE_WRITE8_MEMBER(starforb_scrollx2); - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(fgcolorram_w); - DECLARE_WRITE8_MEMBER(bg1videoram_w); - DECLARE_WRITE8_MEMBER(bg2videoram_w); - DECLARE_WRITE8_MEMBER(bg3videoram_w); - DECLARE_WRITE8_MEMBER(volume_w); + void flip_screen_w(uint8_t data); + void starforb_scrolly2(offs_t offset, uint8_t data); + void starforb_scrollx2(offs_t offset, uint8_t data); + void fgvideoram_w(offs_t offset, uint8_t data); + void fgcolorram_w(offs_t offset, uint8_t data); + void bg1videoram_w(offs_t offset, uint8_t data); + void bg2videoram_w(offs_t offset, uint8_t data); + void bg3videoram_w(offs_t offset, uint8_t data); + void volume_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(sound_line_clock); - DECLARE_WRITE8_MEMBER(sound_cmd_w); - DECLARE_WRITE8_MEMBER(irq_ctrl_w); + void sound_cmd_w(uint8_t data); + void irq_ctrl_w(uint8_t data); uint8_t pio_pa_r(); static rgb_t IIBBGGRR(uint32_t raw); diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 85880b3ca6c..524101f5618 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -187,7 +187,7 @@ protected: std::unique_ptr<u16[]> m_pairslove_protram_old; std::unique_ptr<u16[]> m_downtown_protection; - DECLARE_READ16_MEMBER(metafox_protection_r); + u16 metafox_protection_r(offs_t offset); void seta_coin_counter_w(u8 data); void seta_coin_lockout_w(u8 data); void seta_vregs_w(u8 data); @@ -216,12 +216,12 @@ protected: void calibr50_sub_bankswitch_w(u8 data); void calibr50_soundlatch2_w(u8 data); void twineagl_ctrl_w(u8 data); - DECLARE_READ16_MEMBER(twineagl_debug_r); - DECLARE_READ16_MEMBER(twineagl_200100_r); - DECLARE_WRITE16_MEMBER(twineagl_200100_w); - DECLARE_READ16_MEMBER(downtown_protection_r); - DECLARE_WRITE16_MEMBER(downtown_protection_w); - DECLARE_READ16_MEMBER(arbalest_debug_r); + u16 twineagl_debug_r(); + u16 twineagl_200100_r(offs_t offset); + void twineagl_200100_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 downtown_protection_r(offs_t offset); + void downtown_protection_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 arbalest_debug_r(); void magspeed_lights_w(offs_t offset, u16 data, u16 mem_mask = ~0); u8 dsw1_r(); u8 dsw2_r(); @@ -434,8 +434,8 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); private: - DECLARE_WRITE16_MEMBER(rtc_w); - DECLARE_READ16_MEMBER(rtc_r); + void rtc_w(u16 data); + u16 rtc_r(offs_t offset); u16 inputs_r(); void mux_w(u16 data); @@ -443,12 +443,12 @@ private: void pay_w(u8 data); void led_w(u8 data); - DECLARE_READ16_MEMBER(spritecode_r); - DECLARE_WRITE16_MEMBER(spritecode_w); + u16 spritecode_r(offs_t offset); + void spritecode_w(offs_t offset, u16 data); - DECLARE_WRITE16_MEMBER(spriteylow_w); + void spriteylow_w(offs_t offset, u16 data); - DECLARE_WRITE16_MEMBER(spritectrl_w); + void spritectrl_w(offs_t offset, u16 data); DECLARE_MACHINE_START(setaroul); DECLARE_MACHINE_RESET(setaroul); @@ -504,8 +504,8 @@ public: void init_inttoote(); private: - DECLARE_WRITE16_MEMBER(rtc_w); - DECLARE_READ16_MEMBER(rtc_r); + void rtc_w(u16 data); + u16 rtc_r(offs_t offset); u16 dsw_r(offs_t offset); u16 comm_r(); diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index cfc712d7a3b..b3276e93e25 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -63,30 +63,30 @@ protected: virtual void machine_start() override; virtual void video_start() override; - DECLARE_WRITE8_MEMBER(grdians_lockout_w); + void grdians_lockout_w(uint8_t data); - DECLARE_READ16_MEMBER(mj4simai_p1_r); - DECLARE_READ16_MEMBER(mj4simai_p2_r); + uint16_t mj4simai_p1_r(); + uint16_t mj4simai_p2_r(); - DECLARE_READ16_MEMBER(pzlbowl_protection_r); - DECLARE_READ8_MEMBER(pzlbowl_coins_r); - DECLARE_WRITE8_MEMBER(pzlbowl_coin_counter_w); + uint16_t pzlbowl_protection_r(address_space &space); + uint8_t pzlbowl_coins_r(); + void pzlbowl_coin_counter_w(uint8_t data); void reelquak_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE8_MEMBER(reelquak_coin_w); + void reelquak_coin_w(uint8_t data); - DECLARE_WRITE8_MEMBER(samshoot_coin_w); + void samshoot_coin_w(uint8_t data); - DECLARE_WRITE8_MEMBER(telpacfl_lamp1_w); - DECLARE_WRITE8_MEMBER(telpacfl_lamp2_w); - DECLARE_WRITE8_MEMBER(telpacfl_lockout_w); + void telpacfl_lamp1_w(uint8_t data); + void telpacfl_lamp2_w(uint8_t data); + void telpacfl_lockout_w(uint8_t data); uint16_t gundamex_eeprom_r(); void gundamex_eeprom_w(uint16_t data); - DECLARE_WRITE16_MEMBER(vregs_w); - DECLARE_READ16_MEMBER(spriteram_r); - DECLARE_WRITE16_MEMBER(spriteram_w); + void vregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t spriteram_r(offs_t offset); + void spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); int calculate_global_xoffset(int nozoom_fixedpalette_fixedposition); int calculate_global_yoffset(int nozoom_fixedpalette_fixedposition); @@ -96,7 +96,7 @@ protected: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); - DECLARE_WRITE8_MEMBER(sound_bank_w); + void sound_bank_w(offs_t offset, uint8_t data); INTERRUPT_GEN_MEMBER(seta2_interrupt); INTERRUPT_GEN_MEMBER(samshoot_interrupt); @@ -185,14 +185,14 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ32_MEMBER(nvram_r); - DECLARE_WRITE32_MEMBER(nvram_w); - DECLARE_READ32_MEMBER(debug_r); - DECLARE_READ16_MEMBER(coins_r); - DECLARE_WRITE16_MEMBER(leds_w); - DECLARE_READ16_MEMBER(outputs_r); - DECLARE_WRITE16_MEMBER(outputs_w); - DECLARE_READ16_MEMBER(battery_r); + uint32_t nvram_r(offs_t offset); + void nvram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t debug_r(); + uint16_t coins_r(); + void leds_w(uint16_t data); + uint16_t outputs_r(); + void outputs_w(uint16_t data); + uint16_t battery_r(); TIMER_DEVICE_CALLBACK_MEMBER(funcube_interrupt); @@ -225,11 +225,11 @@ public: void staraudi(machine_config &config); private: - DECLARE_WRITE8_MEMBER(camera_w); - DECLARE_WRITE8_MEMBER(lamps1_w); - DECLARE_WRITE8_MEMBER(lamps2_w); - DECLARE_READ16_MEMBER(tileram_r); - DECLARE_WRITE16_MEMBER(tileram_w); + void camera_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + void lamps1_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + void lamps2_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + uint16_t tileram_r(offs_t offset); + void tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint32_t staraudi_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index a4af2479394..cb5e9fb2119 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -77,20 +77,20 @@ private: int m_vblank; int m_prev_value; - DECLARE_WRITE16_MEMBER(flip_screen); - DECLARE_READ16_MEMBER(input_ports_r); - DECLARE_WRITE8_MEMBER(screen_brt_w); - DECLARE_WRITE16_MEMBER(irq_ack_w); - DECLARE_WRITE16_MEMBER(irq_w); - DECLARE_WRITE16_MEMBER(scanline_w); - DECLARE_WRITE16_MEMBER(fgvideoram_w); - DECLARE_WRITE16_MEMBER(bg0videoram_w); - DECLARE_WRITE16_MEMBER(bg1videoram_w); - DECLARE_WRITE16_MEMBER(bg0scrollx_w); - DECLARE_WRITE16_MEMBER(bg0scrolly_w); - DECLARE_WRITE16_MEMBER(bg1scrollx_w); - DECLARE_WRITE16_MEMBER(bg1scrolly_w); - DECLARE_WRITE8_MEMBER(oki_bankswitch_w); + void flip_screen(uint16_t data); + uint16_t input_ports_r(offs_t offset); + void screen_brt_w(uint8_t data); + void irq_ack_w(offs_t offset, uint16_t data); + void irq_w(uint16_t data); + void scanline_w(uint16_t data); + void fgvideoram_w(offs_t offset, uint16_t data); + void bg0videoram_w(offs_t offset, uint16_t data); + void bg1videoram_w(offs_t offset, uint16_t data); + void bg0scrollx_w(uint16_t data); + void bg0scrolly_w(uint16_t data); + void bg1scrollx_w(uint16_t data); + void bg1scrolly_w(uint16_t data); + void oki_bankswitch_w(uint8_t data); TILE_GET_INFO_MEMBER(get_fgtile_info); TILE_GET_INFO_MEMBER(get_bg0tile_info); diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index b18852a5cf0..c55bce73886 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -61,22 +61,22 @@ private: bitmap_ind16 m_rawbitmap; // common - DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_WRITE16_MEMBER(gfxlist_addr_w); - DECLARE_WRITE16_MEMBER(blitter_go_w); - DECLARE_WRITE16_MEMBER(irq_ack_w); + void flipscreen_w(uint8_t data); + void gfxlist_addr_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void blitter_go_w(uint16_t data); + void irq_ack_w(uint16_t data); uint8_t cgrom_r(offs_t offset); // shangha3 specific - DECLARE_READ16_MEMBER(shangha3_prot_r); - DECLARE_WRITE16_MEMBER(shangha3_prot_w); - DECLARE_WRITE8_MEMBER(shangha3_coinctrl_w); + uint16_t shangha3_prot_r(); + void shangha3_prot_w(uint16_t data); + void shangha3_coinctrl_w(uint8_t data); // heberpop specific - DECLARE_WRITE8_MEMBER(heberpop_coinctrl_w); + void heberpop_coinctrl_w(uint8_t data); // blocken specific - DECLARE_WRITE8_MEMBER(blocken_coinctrl_w); + void blocken_coinctrl_w(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index f237ac7cd4d..c4f7b50c013 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -59,12 +59,12 @@ private: DECLARE_WRITE_LINE_MEMBER(nmi_enable_2_w); DECLARE_WRITE_LINE_MEMBER(irq_1_w); DECLARE_WRITE_LINE_MEMBER(irq_2_w); - DECLARE_WRITE8_MEMBER(nmiq_1_w); - DECLARE_WRITE8_MEMBER(nmiq_2_w); + void nmiq_1_w(uint8_t data); + void nmiq_2_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_READ8_MEMBER(soundlatch_r); - DECLARE_WRITE8_MEMBER(videoram_w); + uint8_t soundlatch_r(); + void videoram_w(offs_t offset, uint8_t data); void ay8910_portb_w(uint8_t data); // game specific diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 3acd717905d..83b54218b98 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -37,11 +37,11 @@ private: tilemap_t *m_bg_tilemap; uint8_t m_nmi_enable; - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(palettebank_w); - DECLARE_WRITE8_MEMBER(scroll_w); - DECLARE_WRITE8_MEMBER(nmi_w); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void palettebank_w(uint8_t data); + void scroll_w(uint8_t data); + void nmi_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 3d40d800f85..8e1da120029 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -36,10 +36,10 @@ private: int m_gfxbank; tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(coin_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(paletteram_w); + void coin_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void bankswitch_w(uint8_t data); + void paletteram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index eb3eba877fa..8664c6bcfca 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -49,12 +49,12 @@ private: int m_ccnt_old_val; void bankswitch_w(uint8_t data); - DECLARE_READ8_MEMBER(sound_cpu_command_r); - DECLARE_WRITE8_MEMBER(sound_cpu_command_w); + uint8_t sound_cpu_command_r(); + void sound_cpu_command_w(uint8_t data); void flipscreen_w(uint8_t data); - DECLARE_WRITE8_MEMBER(coincounter_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(textram_w); + void coincounter_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void textram_w(offs_t offset, uint8_t data); virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index a598e12479b..f07487764ef 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -29,9 +29,9 @@ public: void shuuz(machine_config &config); private: - DECLARE_WRITE16_MEMBER(latch_w); - DECLARE_READ16_MEMBER(leta_r); - DECLARE_READ16_MEMBER(special_port0_r); + void latch_w(uint16_t data); + uint16_t leta_r(offs_t offset); + uint16_t special_port0_r(); virtual void machine_start() override; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 3e73728ba45..5ca6f2622cc 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -67,17 +67,17 @@ private: uint32_t m_vcount_191; uint32_t m_latch_374; - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(c804_w); - DECLARE_WRITE8_MEMBER(gfxctrl_w); - DECLARE_WRITE8_MEMBER(star_scrollx_w); - DECLARE_WRITE8_MEMBER(star_scrolly_w); + void bankswitch_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void c804_w(uint8_t data); + void gfxctrl_w(uint8_t data); + void star_scrollx_w(uint8_t data); + void star_scrolly_w(uint8_t data); - DECLARE_READ8_MEMBER(turtship_ports_r); + uint8_t turtship_ports_r(offs_t offset); - DECLARE_WRITE8_MEMBER(whizz_bankswitch_w); + void whizz_bankswitch_w(uint8_t data); virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 9106e341866..cedc1360a04 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -55,12 +55,12 @@ private: uint8_t m_math_param; uint8_t m_scroll_y; - DECLARE_READ8_MEMBER(i8751_r); - DECLARE_WRITE8_MEMBER(i8751_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_READ8_MEMBER(scroll_y_r); - DECLARE_WRITE8_MEMBER(scroll_y_w); + uint8_t i8751_r(); + void i8751_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + uint8_t scroll_y_r(); + void scroll_y_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 74b6b47614a..bbf7f80c6e3 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -42,9 +42,9 @@ private: tilemap_t *m_tilemap[3]; - DECLARE_WRITE8_MEMBER(coin_w); - template<int Layer> DECLARE_WRITE32_MEMBER(vram_w); - DECLARE_WRITE8_MEMBER(okibank_w); + void coin_w(uint8_t data); + template<int Layer> void vram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void okibank_w(uint8_t data); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index 7dc1e221d71..dd9829a801c 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -63,11 +63,11 @@ private: void mainram_w(offs_t offset, u32 data, u32 mem_mask); template<unsigned Layer> u32 rowscroll_r(offs_t offset); template<unsigned Layer> void rowscroll_w(offs_t offset, u32 data, u32 mem_mask); - DECLARE_READ32_MEMBER(joemacr_speedup_r); - DECLARE_READ32_MEMBER(chainrec_speedup_r); - DECLARE_READ32_MEMBER(prtytime_speedup_r); - DECLARE_READ32_MEMBER(charlien_speedup_r); - DECLARE_READ32_MEMBER(osman_speedup_r); + u32 joemacr_speedup_r(); + u32 chainrec_speedup_r(); + u32 prtytime_speedup_r(); + u32 charlien_speedup_r(); + u32 osman_speedup_r(); virtual void video_start() override; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h index 6fb2036dc40..d00acceee02 100644 --- a/src/mame/includes/simple_st0016.h +++ b/src/mame/includes/simple_st0016.h @@ -35,14 +35,14 @@ private: required_memory_bank m_mainbank; - DECLARE_READ8_MEMBER(mux_r); - DECLARE_WRITE8_MEMBER(mux_select_w); - DECLARE_READ32_MEMBER(latch32_r); - DECLARE_WRITE32_MEMBER(latch32_w); - DECLARE_READ8_MEMBER(latch8_r); - DECLARE_WRITE8_MEMBER(latch8_w); - - DECLARE_WRITE8_MEMBER(st0016_rom_bank_w); + uint8_t mux_r(); + void mux_select_w(uint8_t data); + uint32_t latch32_r(offs_t offset); + void latch32_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint8_t latch8_r(offs_t offset); + void latch8_w(offs_t offset, uint8_t data); + + void st0016_rom_bank_w(uint8_t data); virtual void machine_start() override; DECLARE_VIDEO_START(st0016); diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 21876cbb712..69a9dbfa98c 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -55,15 +55,15 @@ private: required_device<k052109_device> m_k052109; required_device<k053247_device> m_k053246; required_device<k053251_device> m_k053251; - DECLARE_WRITE8_MEMBER(z80_bankswitch_w); - DECLARE_WRITE8_MEMBER(z80_arm_nmi_w); - DECLARE_WRITE8_MEMBER(simpsons_eeprom_w); - DECLARE_WRITE8_MEMBER(simpsons_coin_counter_w); - DECLARE_READ8_MEMBER(simpsons_sound_interrupt_r); - DECLARE_READ8_MEMBER(simpsons_k052109_r); - DECLARE_WRITE8_MEMBER(simpsons_k052109_w); - DECLARE_READ8_MEMBER(simpsons_k053247_r); - DECLARE_WRITE8_MEMBER(simpsons_k053247_w); + void z80_bankswitch_w(uint8_t data); + void z80_arm_nmi_w(uint8_t data); + void simpsons_eeprom_w(uint8_t data); + void simpsons_coin_counter_w(uint8_t data); + uint8_t simpsons_sound_interrupt_r(); + uint8_t simpsons_k052109_r(offs_t offset); + void simpsons_k052109_w(offs_t offset, uint8_t data); + uint8_t simpsons_k053247_r(offs_t offset); + void simpsons_k053247_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_simpsons(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 1c2eafedb4c..8c9449edc24 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -39,21 +39,21 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE16_MEMBER(skullxbo_halt_until_hblank_0_w); - DECLARE_WRITE16_MEMBER(skullxbo_mobwr_w); + void skullxbo_halt_until_hblank_0_w(uint16_t data); + void skullxbo_mobwr_w(offs_t offset, uint16_t data); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); - WRITE16_MEMBER(playfield_latch_w); - WRITE16_MEMBER(playfield_latched_w); + void playfield_latch_w(uint16_t data); + void playfield_latched_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint32_t screen_update_skullxbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(scanline_interrupt); void scanline_int_ack_w(uint16_t data = 0); void video_int_ack_w(uint16_t data = 0); TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); void skullxbo_scanline_update(int scanline); - DECLARE_WRITE16_MEMBER( skullxbo_xscroll_w ); - DECLARE_WRITE16_MEMBER( skullxbo_yscroll_w ); - DECLARE_WRITE16_MEMBER( skullxbo_mobmsb_w ); + void skullxbo_xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void skullxbo_yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void skullxbo_mobmsb_w(offs_t offset, uint16_t data); void main_map(address_map &map); diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 61d20dedae1..90a7889e73f 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -56,9 +56,9 @@ public: private: DECLARE_WRITE_LINE_MEMBER(nmion_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_READ8_MEMBER(wram_r); - DECLARE_WRITE8_MEMBER(wram_w); + void videoram_w(offs_t offset, uint8_t data); + uint8_t wram_r(offs_t offset); + void wram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(width_w); DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); DECLARE_WRITE_LINE_MEMBER(start_lamp_1_w); @@ -71,7 +71,7 @@ private: DECLARE_WRITE_LINE_MEMBER(lamp_v_w); DECLARE_WRITE_LINE_MEMBER(lamp_e_w); DECLARE_WRITE_LINE_MEMBER(lamp_r_w); - DECLARE_WRITE8_MEMBER(latch3_watchdog_w); + void latch3_watchdog_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 1f93181d49d..e15bfdf21b3 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -48,7 +48,7 @@ private: int m_bg_ctrl; - DECLARE_WRITE8_MEMBER(output_w); + void output_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; void skyfox_palette(palette_device &palette) const; diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index ce22c2784ed..d1176940937 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -34,17 +34,17 @@ private: void inputport_select_w(uint8_t data); uint8_t inputport_r(); void skykid_led_w(uint8_t data); - DECLARE_WRITE8_MEMBER(skykid_subreset_w); - DECLARE_WRITE8_MEMBER(skykid_bankswitch_w); - DECLARE_WRITE8_MEMBER(skykid_irq_1_ctrl_w); - DECLARE_WRITE8_MEMBER(skykid_irq_2_ctrl_w); - DECLARE_READ8_MEMBER(skykid_videoram_r); - DECLARE_WRITE8_MEMBER(skykid_videoram_w); - DECLARE_READ8_MEMBER(skykid_textram_r); - DECLARE_WRITE8_MEMBER(skykid_textram_w); - DECLARE_WRITE8_MEMBER(skykid_scroll_x_w); - DECLARE_WRITE8_MEMBER(skykid_scroll_y_w); - DECLARE_WRITE8_MEMBER(skykid_flipscreen_priority_w); + void skykid_subreset_w(offs_t offset, uint8_t data); + void skykid_bankswitch_w(offs_t offset, uint8_t data); + void skykid_irq_1_ctrl_w(offs_t offset, uint8_t data); + void skykid_irq_2_ctrl_w(offs_t offset, uint8_t data); + uint8_t skykid_videoram_r(offs_t offset); + void skykid_videoram_w(offs_t offset, uint8_t data); + uint8_t skykid_textram_r(offs_t offset); + void skykid_textram_w(offs_t offset, uint8_t data); + void skykid_scroll_x_w(offs_t offset, uint8_t data); + void skykid_scroll_y_w(offs_t offset, uint8_t data); + void skykid_flipscreen_priority_w(offs_t offset, uint8_t data); TILEMAP_MAPPER_MEMBER(tx_tilemap_scan); TILE_GET_INFO_MEMBER(tx_get_tile_info); TILE_GET_INFO_MEMBER(bg_get_tile_info); diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index 11d4f484ee1..6b0600d8203 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -26,15 +26,15 @@ public: void skyraid(machine_config &config); private: - DECLARE_READ8_MEMBER(skyraid_port_0_r); - DECLARE_WRITE8_MEMBER(skyraid_range_w); - DECLARE_WRITE8_MEMBER(skyraid_offset_w); - DECLARE_WRITE8_MEMBER(skyraid_scroll_w); + uint8_t skyraid_port_0_r(); + void skyraid_range_w(uint8_t data); + void skyraid_offset_w(uint8_t data); + void skyraid_scroll_w(uint8_t data); virtual void machine_start() override; virtual void video_start() override; void skyraid_palette(palette_device &palette) const; uint32_t screen_update_skyraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(skyraid_sound_w); + void skyraid_sound_w(uint8_t data); void draw_text(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_terrain(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 7dac302b033..ff3aa5c0f3e 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -94,29 +94,29 @@ private: uint8_t m_gs_e; uint8_t m_tigerhb_cmd; - DECLARE_READ8_MEMBER(tigerh_mcu_status_r); + uint8_t tigerh_mcu_status_r(); DECLARE_WRITE_LINE_MEMBER(sound_reset_w); DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - DECLARE_READ8_MEMBER(vblank_r); - DECLARE_WRITE8_MEMBER(sound_nmi_enable_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(fixram_w); - DECLARE_WRITE8_MEMBER(fixcol_w); - DECLARE_WRITE8_MEMBER(scrollx_lo_w); - DECLARE_WRITE8_MEMBER(scrollx_hi_w); - DECLARE_WRITE8_MEMBER(scrolly_w); + uint8_t vblank_r(); + void sound_nmi_enable_w(offs_t offset, uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void fixram_w(offs_t offset, uint8_t data); + void fixcol_w(offs_t offset, uint8_t data); + void scrollx_lo_w(uint8_t data); + void scrollx_hi_w(uint8_t data); + void scrolly_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); DECLARE_WRITE_LINE_MEMBER(palette_bank_w); void scroll_from_mcu_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(getstar_mcusim_r); - DECLARE_WRITE8_MEMBER(getstar_mcusim_w); - DECLARE_READ8_MEMBER(getstar_mcusim_status_r); - DECLARE_READ8_MEMBER(getstarb1_prot_r); - DECLARE_READ8_MEMBER(tigerhb1_prot_r); - DECLARE_WRITE8_MEMBER(tigerhb1_prot_w); + uint8_t getstar_mcusim_r(); + void getstar_mcusim_w(uint8_t data); + uint8_t getstar_mcusim_status_r(); + uint8_t getstarb1_prot_r(); + uint8_t tigerhb1_prot_r(); + void tigerhb1_prot_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/sms_bootleg.h b/src/mame/includes/sms_bootleg.h index 693e993fd2d..71ccabf2c34 100644 --- a/src/mame/includes/sms_bootleg.h +++ b/src/mame/includes/sms_bootleg.h @@ -12,8 +12,8 @@ public: void init_sms_supergame(); private: - DECLARE_WRITE8_MEMBER(port08_w); - DECLARE_WRITE8_MEMBER(port18_w); + void port08_w(uint8_t data); + void port18_w(uint8_t data); void sms_supergame_io(address_map &map); void sms_supergame_map(address_map &map); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index b37f68e3810..21f76cd582c 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -123,84 +123,84 @@ private: int m_tc16_posx; int m_tc32_posy; int m_tc32_posx; - DECLARE_READ8_MEMBER(snk_cpuA_nmi_trigger_r); - DECLARE_WRITE8_MEMBER(snk_cpuA_nmi_ack_w); - DECLARE_READ8_MEMBER(snk_cpuB_nmi_trigger_r); - DECLARE_WRITE8_MEMBER(snk_cpuB_nmi_ack_w); - DECLARE_READ8_MEMBER(marvins_sound_nmi_ack_r); - DECLARE_WRITE8_MEMBER(sgladiat_soundlatch_w); - DECLARE_READ8_MEMBER(sgladiat_soundlatch_r); - DECLARE_READ8_MEMBER(sgladiat_sound_nmi_ack_r); - DECLARE_READ8_MEMBER(sgladiat_sound_irq_ack_r); - DECLARE_WRITE8_MEMBER(snk_soundlatch_w); - DECLARE_READ8_MEMBER(snk_sound_status_r); - DECLARE_WRITE8_MEMBER(snk_sound_status_w); - DECLARE_READ8_MEMBER(tnk3_cmdirq_ack_r); - DECLARE_READ8_MEMBER(tnk3_ymirq_ack_r); - DECLARE_READ8_MEMBER(tnk3_busy_clear_r); - DECLARE_WRITE8_MEMBER(hardflags_scrollx_w); - DECLARE_WRITE8_MEMBER(hardflags_scrolly_w); - DECLARE_WRITE8_MEMBER(hardflags_scroll_msb_w); - DECLARE_READ8_MEMBER(hardflags1_r); - DECLARE_READ8_MEMBER(hardflags2_r); - DECLARE_READ8_MEMBER(hardflags3_r); - DECLARE_READ8_MEMBER(hardflags4_r); - DECLARE_READ8_MEMBER(hardflags5_r); - DECLARE_READ8_MEMBER(hardflags6_r); - DECLARE_READ8_MEMBER(hardflags7_r); - DECLARE_WRITE8_MEMBER(turbocheck16_1_w); - DECLARE_WRITE8_MEMBER(turbocheck16_2_w); - DECLARE_WRITE8_MEMBER(turbocheck32_1_w); - DECLARE_WRITE8_MEMBER(turbocheck32_2_w); - DECLARE_WRITE8_MEMBER(turbocheck_msb_w); - DECLARE_READ8_MEMBER(turbocheck16_1_r); - DECLARE_READ8_MEMBER(turbocheck16_2_r); - DECLARE_READ8_MEMBER(turbocheck16_3_r); - DECLARE_READ8_MEMBER(turbocheck16_4_r); - DECLARE_READ8_MEMBER(turbocheck16_5_r); - DECLARE_READ8_MEMBER(turbocheck16_6_r); - DECLARE_READ8_MEMBER(turbocheck16_7_r); - DECLARE_READ8_MEMBER(turbocheck16_8_r); - DECLARE_READ8_MEMBER(turbocheck32_1_r); - DECLARE_READ8_MEMBER(turbocheck32_2_r); - DECLARE_READ8_MEMBER(turbocheck32_3_r); - DECLARE_READ8_MEMBER(turbocheck32_4_r); - DECLARE_WRITE8_MEMBER(athena_coin_counter_w); - DECLARE_WRITE8_MEMBER(ikari_coin_counter_w); - DECLARE_WRITE8_MEMBER(tdfever_coin_counter_w); - DECLARE_WRITE8_MEMBER(countryc_trackball_w); - DECLARE_WRITE8_MEMBER(snk_tx_videoram_w); - DECLARE_WRITE8_MEMBER(marvins_fg_videoram_w); - DECLARE_WRITE8_MEMBER(marvins_bg_videoram_w); - DECLARE_WRITE8_MEMBER(snk_bg_videoram_w); - DECLARE_WRITE8_MEMBER(snk_fg_scrollx_w); - DECLARE_WRITE8_MEMBER(snk_fg_scrolly_w); - DECLARE_WRITE8_MEMBER(snk_bg_scrollx_w); - DECLARE_WRITE8_MEMBER(snk_bg_scrolly_w); - DECLARE_WRITE8_MEMBER(snk_sp16_scrollx_w); - DECLARE_WRITE8_MEMBER(snk_sp16_scrolly_w); - DECLARE_WRITE8_MEMBER(snk_sp32_scrollx_w); - DECLARE_WRITE8_MEMBER(snk_sp32_scrolly_w); - DECLARE_WRITE8_MEMBER(snk_sprite_split_point_w); - DECLARE_WRITE8_MEMBER(marvins_palette_bank_w); - DECLARE_WRITE8_MEMBER(marvins_flipscreen_w); - DECLARE_WRITE8_MEMBER(sgladiat_flipscreen_w); - DECLARE_WRITE8_MEMBER(hal21_flipscreen_w); - DECLARE_WRITE8_MEMBER(marvins_scroll_msb_w); - DECLARE_WRITE8_MEMBER(jcross_scroll_msb_w); - DECLARE_WRITE8_MEMBER(sgladiat_scroll_msb_w); - DECLARE_WRITE8_MEMBER(aso_videoattrs_w); - DECLARE_WRITE8_MEMBER(tnk3_videoattrs_w); - DECLARE_WRITE8_MEMBER(aso_bg_bank_w); - DECLARE_WRITE8_MEMBER(ikari_bg_scroll_msb_w); - DECLARE_WRITE8_MEMBER(ikari_sp_scroll_msb_w); - DECLARE_WRITE8_MEMBER(ikari_unknown_video_w); - DECLARE_WRITE8_MEMBER(gwar_tx_bank_w); - DECLARE_WRITE8_MEMBER(gwar_videoattrs_w); - DECLARE_WRITE8_MEMBER(gwara_videoattrs_w); - DECLARE_WRITE8_MEMBER(gwara_sp_scroll_msb_w); - DECLARE_WRITE8_MEMBER(tdfever_sp_scroll_msb_w); - DECLARE_WRITE8_MEMBER(tdfever_spriteram_w); + uint8_t snk_cpuA_nmi_trigger_r(); + void snk_cpuA_nmi_ack_w(uint8_t data); + uint8_t snk_cpuB_nmi_trigger_r(); + void snk_cpuB_nmi_ack_w(uint8_t data); + uint8_t marvins_sound_nmi_ack_r(); + void sgladiat_soundlatch_w(uint8_t data); + uint8_t sgladiat_soundlatch_r(); + uint8_t sgladiat_sound_nmi_ack_r(); + uint8_t sgladiat_sound_irq_ack_r(); + void snk_soundlatch_w(uint8_t data); + uint8_t snk_sound_status_r(); + void snk_sound_status_w(uint8_t data); + uint8_t tnk3_cmdirq_ack_r(); + uint8_t tnk3_ymirq_ack_r(); + uint8_t tnk3_busy_clear_r(); + void hardflags_scrollx_w(uint8_t data); + void hardflags_scrolly_w(uint8_t data); + void hardflags_scroll_msb_w(uint8_t data); + uint8_t hardflags1_r(); + uint8_t hardflags2_r(); + uint8_t hardflags3_r(); + uint8_t hardflags4_r(); + uint8_t hardflags5_r(); + uint8_t hardflags6_r(); + uint8_t hardflags7_r(); + void turbocheck16_1_w(uint8_t data); + void turbocheck16_2_w(uint8_t data); + void turbocheck32_1_w(uint8_t data); + void turbocheck32_2_w(uint8_t data); + void turbocheck_msb_w(uint8_t data); + uint8_t turbocheck16_1_r(); + uint8_t turbocheck16_2_r(); + uint8_t turbocheck16_3_r(); + uint8_t turbocheck16_4_r(); + uint8_t turbocheck16_5_r(); + uint8_t turbocheck16_6_r(); + uint8_t turbocheck16_7_r(); + uint8_t turbocheck16_8_r(); + uint8_t turbocheck32_1_r(); + uint8_t turbocheck32_2_r(); + uint8_t turbocheck32_3_r(); + uint8_t turbocheck32_4_r(); + void athena_coin_counter_w(uint8_t data); + void ikari_coin_counter_w(uint8_t data); + void tdfever_coin_counter_w(uint8_t data); + void countryc_trackball_w(uint8_t data); + void snk_tx_videoram_w(offs_t offset, uint8_t data); + void marvins_fg_videoram_w(offs_t offset, uint8_t data); + void marvins_bg_videoram_w(offs_t offset, uint8_t data); + void snk_bg_videoram_w(offs_t offset, uint8_t data); + void snk_fg_scrollx_w(uint8_t data); + void snk_fg_scrolly_w(uint8_t data); + void snk_bg_scrollx_w(uint8_t data); + void snk_bg_scrolly_w(uint8_t data); + void snk_sp16_scrollx_w(uint8_t data); + void snk_sp16_scrolly_w(uint8_t data); + void snk_sp32_scrollx_w(uint8_t data); + void snk_sp32_scrolly_w(uint8_t data); + void snk_sprite_split_point_w(uint8_t data); + void marvins_palette_bank_w(uint8_t data); + void marvins_flipscreen_w(uint8_t data); + void sgladiat_flipscreen_w(uint8_t data); + void hal21_flipscreen_w(uint8_t data); + void marvins_scroll_msb_w(uint8_t data); + void jcross_scroll_msb_w(uint8_t data); + void sgladiat_scroll_msb_w(uint8_t data); + void aso_videoattrs_w(uint8_t data); + void tnk3_videoattrs_w(uint8_t data); + void aso_bg_bank_w(uint8_t data); + void ikari_bg_scroll_msb_w(uint8_t data); + void ikari_sp_scroll_msb_w(uint8_t data); + void ikari_unknown_video_w(uint8_t data); + void gwar_tx_bank_w(uint8_t data); + void gwar_videoattrs_w(uint8_t data); + void gwara_videoattrs_w(uint8_t data); + void gwara_sp_scroll_msb_w(uint8_t data); + void tdfever_sp_scroll_msb_w(uint8_t data); + void tdfever_spriteram_w(offs_t offset, uint8_t data); TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols); TILE_GET_INFO_MEMBER(marvins_get_tx_tile_info); diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index f5f800dd57a..612108cbff1 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -58,16 +58,16 @@ protected: uint8_t m_irq_mask; // common - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(videoram2_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(charram_w); + void videoram_w(offs_t offset, uint8_t data); + void videoram2_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void charram_w(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER(scrollx_w); - DECLARE_WRITE8_MEMBER(scrolly_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(satansat_b002_w); - DECLARE_WRITE8_MEMBER(satansat_backcolor_w); + void scrollx_w(uint8_t data); + void scrolly_w(uint8_t data); + void flipscreen_w(uint8_t data); + void satansat_b002_w(uint8_t data); + void satansat_backcolor_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -130,7 +130,7 @@ public: void pballoon(machine_config &config); private: - DECLARE_WRITE8_MEMBER(fantasy_flipscreen_w); + void fantasy_flipscreen_w(offs_t offset, uint8_t data); void fantasy_map(address_map &map); void pballoon_map(address_map &map); diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 0e6afb4a217..197524a8262 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -53,8 +53,8 @@ protected: tilemap_t *m_fg_tilemap; // common - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(D7759_write_port_0_w); + void sound_w(uint8_t data); + void D7759_write_port_0_w(uint8_t data); virtual void video_start() override; void common_video_start(); @@ -70,9 +70,9 @@ private: uint32_t m_fg_tile_offset; // pow and streetsm - DECLARE_READ16_MEMBER(fg_videoram_r); - DECLARE_WRITE16_MEMBER(fg_videoram_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); + uint16_t fg_videoram_r(offs_t offset); + void fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void flipscreen_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); @@ -102,11 +102,11 @@ private: uint8_t m_invert_controls; // searchar and ikari3 - DECLARE_WRITE16_MEMBER(fg_videoram_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_READ16_MEMBER(rotary_1_r); - DECLARE_READ16_MEMBER(rotary_2_r); - DECLARE_READ16_MEMBER(rotary_lsb_r); + void fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void flipscreen_w(uint8_t data); + uint16_t rotary_1_r(); + uint16_t rotary_2_r(); + uint16_t rotary_lsb_r(); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 23a5e302a56..d35809b73c7 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -26,12 +26,12 @@ public: void tenballs(machine_config &config); private: - DECLARE_READ8_MEMBER(dsw_port_1_r); - DECLARE_READ8_MEMBER(port2000_8_r); - DECLARE_WRITE8_MEMBER(output_port_0_w); - DECLARE_WRITE8_MEMBER(output_port_1_w); - DECLARE_WRITE8_MEMBER(snookr10_videoram_w); - DECLARE_WRITE8_MEMBER(snookr10_colorram_w); + uint8_t dsw_port_1_r(); + uint8_t port2000_8_r(); + void output_port_0_w(uint8_t data); + void output_port_1_w(uint8_t data); + void snookr10_videoram_w(offs_t offset, uint8_t data); + void snookr10_colorram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(apple10_get_bg_tile_info); TILE_GET_INFO_MEMBER(crystalc_get_bg_tile_info); diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index f25ea3aca99..dd7ded00b1c 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -69,23 +69,23 @@ private: uint8_t m_semicom_prot_offset; uint16_t m_yutnori_prot_val; - DECLARE_WRITE8_MEMBER(snowbros_flipscreen_w); - DECLARE_WRITE8_MEMBER(bootleg_flipscreen_w); - DECLARE_WRITE16_MEMBER(snowbros_irq4_ack_w); - DECLARE_WRITE16_MEMBER(snowbros_irq3_ack_w); - DECLARE_WRITE16_MEMBER(snowbros_irq2_ack_w); + void snowbros_flipscreen_w(uint8_t data); + void bootleg_flipscreen_w(uint8_t data); + void snowbros_irq4_ack_w(uint16_t data); + void snowbros_irq3_ack_w(uint16_t data); + void snowbros_irq2_ack_w(uint16_t data); void prot_p0_w(uint8_t data); void prot_p1_w(uint8_t data); void prot_p2_w(uint8_t data); - DECLARE_READ16_MEMBER(sb3_sound_r); - DECLARE_READ16_MEMBER(_4in1_02_read); - DECLARE_READ16_MEMBER(_3in1_read); - DECLARE_READ16_MEMBER(cookbib3_read); - DECLARE_WRITE8_MEMBER(twinadv_oki_bank_w); - DECLARE_WRITE16_MEMBER(sb3_sound_w); - DECLARE_READ16_MEMBER(toto_read); - DECLARE_WRITE16_MEMBER(yutnori_prot_w); - DECLARE_READ16_MEMBER(yutnori_prot_r); + uint16_t sb3_sound_r(); + uint16_t _4in1_02_read(); + uint16_t _3in1_read(); + uint16_t cookbib3_read(); + void twinadv_oki_bank_w(uint8_t data); + void sb3_sound_w(uint16_t data); + uint16_t toto_read(offs_t offset, uint16_t mem_mask = ~0); + void yutnori_prot_w(uint16_t data); + uint16_t yutnori_prot_r(); DECLARE_MACHINE_RESET(semiprot); DECLARE_MACHINE_RESET(finalttr); diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 297316277ff..8edd82f184d 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -42,14 +42,14 @@ private: tilemap_t *m_fg_tilemap; uint8_t m_nmi_mask; - DECLARE_WRITE8_MEMBER(solomon_sh_command_w); - DECLARE_READ8_MEMBER(solomon_0xe603_r); - DECLARE_WRITE8_MEMBER(nmi_mask_w); - DECLARE_WRITE8_MEMBER(solomon_videoram_w); - DECLARE_WRITE8_MEMBER(solomon_colorram_w); - DECLARE_WRITE8_MEMBER(solomon_videoram2_w); - DECLARE_WRITE8_MEMBER(solomon_colorram2_w); - DECLARE_WRITE8_MEMBER(solomon_flipscreen_w); + void solomon_sh_command_w(uint8_t data); + uint8_t solomon_0xe603_r(); + void nmi_mask_w(uint8_t data); + void solomon_videoram_w(offs_t offset, uint8_t data); + void solomon_colorram_w(offs_t offset, uint8_t data); + void solomon_videoram2_w(offs_t offset, uint8_t data); + void solomon_colorram2_w(offs_t offset, uint8_t data); + void solomon_flipscreen_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update_solomon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 10842adafef..82c9b8af606 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -43,9 +43,9 @@ private: DECLARE_WRITE_LINE_MEMBER(sh_irqtrigger_w); DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); - DECLARE_WRITE8_MEMBER(sonson_videoram_w); - DECLARE_WRITE8_MEMBER(sonson_colorram_w); - DECLARE_WRITE8_MEMBER(sonson_scrollx_w); + void sonson_videoram_w(offs_t offset, uint8_t data); + void sonson_colorram_w(offs_t offset, uint8_t data); + void sonson_scrollx_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start() override; diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 2f8e8a2d0c0..9c21e114baf 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -70,9 +70,9 @@ private: double m_color_weights_rg[3]; double m_color_weights_b[2]; - DECLARE_WRITE8_MEMBER(port_0_w); - DECLARE_WRITE8_MEMBER(port_1_w); - DECLARE_WRITE8_MEMBER(port_2_w); + void port_0_w(uint8_t data); + void port_1_w(uint8_t data); + void port_2_w(uint8_t data); uint8_t audio_p2_r(); DECLARE_READ_LINE_MEMBER(audio_t0_r); DECLARE_READ_LINE_MEMBER(audio_t1_r); diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 6106095d078..b8a02c0b2e1 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -56,27 +56,27 @@ private: tilemap_t *m_extra_tilemap; - DECLARE_WRITE16_MEMBER(main_irq_ack_w); + void main_irq_ack_w(uint16_t data); - DECLARE_WRITE16_MEMBER(bg_videoram_w); - DECLARE_WRITE16_MEMBER(fg_videoram_w); + void bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_WRITE8_MEMBER(extraram_w); + void extraram_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_extra_tile_info); bitmap_ind16 m_tile_bitmap_bg; bitmap_ind16 m_tile_bitmap_fg; bitmap_ind16 m_sprite_bitmap; - DECLARE_WRITE16_MEMBER(spbatnp_90006_w); - DECLARE_WRITE16_MEMBER(spbatnp_9000a_w); - DECLARE_WRITE16_MEMBER(spbatnp_9000c_w); - DECLARE_WRITE16_MEMBER(spbatnp_9000e_w); + void spbatnp_90006_w(uint16_t data); + void spbatnp_9000a_w(uint16_t data); + void spbatnp_9000c_w(uint16_t data); + void spbatnp_9000e_w(uint16_t data); - DECLARE_WRITE16_MEMBER(spbatnp_90124_w); - DECLARE_WRITE16_MEMBER(spbatnp_9012c_w); + void spbatnp_90124_w(uint16_t data); + void spbatnp_9012c_w(uint16_t data); DECLARE_VIDEO_START(spbactn); DECLARE_VIDEO_START(spbactnp); @@ -87,7 +87,7 @@ private: int draw_video(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bool alt_sprites); // temp hack - DECLARE_READ16_MEMBER(temp_read_handler_r) + uint16_t temp_read_handler_r() { return 0xffff; } diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 54ec889f22c..c4c3b2fabda 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -41,8 +41,8 @@ private: DECLARE_WRITE_LINE_MEMBER(write_sn2_ready); DECLARE_WRITE_LINE_MEMBER(write_sn3_ready); DECLARE_READ_LINE_MEMBER(t0_r); - DECLARE_WRITE8_MEMBER(soundtrigger_w); - DECLARE_WRITE8_MEMBER(misc_outputs_w); + void soundtrigger_w(uint8_t data); + void misc_outputs_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(irq_mask_w); DECLARE_WRITE_LINE_MEMBER(flip_screen_w); DECLARE_WRITE_LINE_MEMBER(unknown_w); diff --git a/src/mame/includes/spdheat.h b/src/mame/includes/spdheat.h index 4142839cc7f..cf2680a3175 100644 --- a/src/mame/includes/spdheat.h +++ b/src/mame/includes/spdheat.h @@ -75,17 +75,16 @@ private: void sub_io_map(address_map &map); void sound_map(address_map &map); - DECLARE_READ8_MEMBER(sub_r); - DECLARE_WRITE8_MEMBER(sub_dac_w); - DECLARE_WRITE8_MEMBER(sub_nmi_w); - DECLARE_WRITE8_MEMBER(sub_status_w); - DECLARE_READ8_MEMBER(sub_snd_r); - DECLARE_READ8_MEMBER(soundstatus_r); - template<int screen> DECLARE_READ8_MEMBER(soundcpu_r); - DECLARE_READ8_MEMBER(sub_status_r); - DECLARE_READ16_MEMBER(sound_status_r); - template<int screen> DECLARE_WRITE16_MEMBER(sound_w); - template<int screen> DECLARE_READ8_MEMBER(sndcpu_sound_r); + uint8_t sub_r(); + void sub_dac_w(uint8_t data); + void sub_nmi_w(uint8_t data); + void sub_status_w(uint8_t data); + uint8_t sub_snd_r(); + uint8_t soundstatus_r(); + uint8_t sub_status_r(); + uint16_t sound_status_r(); + template<int screen> void sound_w(uint16_t data); + template<int screen> uint8_t sndcpu_sound_r(); void ym1_port_a_w(uint8_t data); void ym1_port_b_w(uint8_t data); void ym2_port_a_w(uint8_t data); @@ -95,7 +94,7 @@ private: void ym4_port_a_w(uint8_t data); void ym4_port_b_w(uint8_t data); - template<int screen> DECLARE_WRITE16_MEMBER(text_w); + template<int screen> void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); template<int screen> TILE_GET_INFO_MEMBER(get_fg_tile_info); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t xo, uint32_t yo); template<int which> uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 7baa915329e..8de624f8cf4 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -70,15 +70,15 @@ private: tilemap_t *m_bg_tilemap; int m_lastscroll; - DECLARE_WRITE8_MEMBER(spd_adpcm_w); - DECLARE_READ8_MEMBER(mcu63701_r); + void spd_adpcm_w(offs_t offset, uint8_t data); + uint8_t mcu63701_r(offs_t offset); void mcu_data_w(offs_t offset, uint8_t data); void mcu_status_w(uint8_t data); void mcu_nmi_w(uint8_t data); - DECLARE_WRITE8_MEMBER(scrollx_lo_w); - DECLARE_WRITE8_MEMBER(ctrl_w); - DECLARE_WRITE8_MEMBER(videoram_w); + void scrollx_lo_w(uint8_t data); + void ctrl_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_1); DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_2); diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h index 26b9e206817..5506849858f 100644 --- a/src/mame/includes/special.h +++ b/src/mame/includes/special.h @@ -69,18 +69,18 @@ private: TIMER_PIT8253_GATES }; - DECLARE_WRITE8_MEMBER(specimx_select_bank); - DECLARE_WRITE8_MEMBER(video_memory_w); - DECLARE_WRITE8_MEMBER(specimx_video_color_w); - DECLARE_READ8_MEMBER(specimx_video_color_r); - DECLARE_READ8_MEMBER(specimx_disk_ctrl_r); - DECLARE_WRITE8_MEMBER(specimx_disk_ctrl_w); - DECLARE_READ8_MEMBER(erik_rr_reg_r); - DECLARE_WRITE8_MEMBER(erik_rr_reg_w); - DECLARE_READ8_MEMBER(erik_rc_reg_r); - DECLARE_WRITE8_MEMBER(erik_rc_reg_w); - DECLARE_READ8_MEMBER(erik_disk_reg_r); - DECLARE_WRITE8_MEMBER(erik_disk_reg_w); + void specimx_select_bank(offs_t offset, uint8_t data); + void video_memory_w(offs_t offset, uint8_t data); + void specimx_video_color_w(uint8_t data); + uint8_t specimx_video_color_r(); + uint8_t specimx_disk_ctrl_r(); + void specimx_disk_ctrl_w(offs_t offset, uint8_t data); + uint8_t erik_rr_reg_r(); + void erik_rr_reg_w(uint8_t data); + uint8_t erik_rc_reg_r(); + void erik_rc_reg_w(uint8_t data); + uint8_t erik_disk_reg_r(); + void erik_disk_reg_w(uint8_t data); uint8_t specialist_8255_porta_r(); uint8_t specialist_8255_portb_r(); uint8_t specimx_8255_portb_r(); diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index db0fbdd4e3c..c3db836461d 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -140,22 +140,22 @@ protected: uint8_t *m_ram_0000; uint8_t m_ram_disabled_by_beta; - DECLARE_READ8_MEMBER(pre_opcode_fetch_r); - DECLARE_WRITE8_MEMBER(spectrum_rom_w); - DECLARE_READ8_MEMBER(spectrum_rom_r); - DECLARE_READ8_MEMBER(spectrum_data_r); - DECLARE_WRITE8_MEMBER(spectrum_data_w); + uint8_t pre_opcode_fetch_r(offs_t offset); + void spectrum_rom_w(offs_t offset, uint8_t data); + uint8_t spectrum_rom_r(offs_t offset); + uint8_t spectrum_data_r(offs_t offset); + void spectrum_data_w(offs_t offset, uint8_t data); void spectrum_port_fe_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(spectrum_port_fe_r); - DECLARE_READ8_MEMBER(spectrum_port_ula_r); - DECLARE_READ8_MEMBER(spectrum_clone_port_ula_r); - - DECLARE_READ8_MEMBER(spectrum_128_pre_opcode_fetch_r); - DECLARE_WRITE8_MEMBER(spectrum_128_bank1_w); - DECLARE_READ8_MEMBER(spectrum_128_bank1_r); - DECLARE_WRITE8_MEMBER(spectrum_128_port_7ffd_w); - DECLARE_READ8_MEMBER(spectrum_128_ula_r); + uint8_t spectrum_port_fe_r(offs_t offset); + uint8_t spectrum_port_ula_r(offs_t offset); + uint8_t spectrum_clone_port_ula_r(); + + uint8_t spectrum_128_pre_opcode_fetch_r(offs_t offset); + void spectrum_128_bank1_w(offs_t offset, uint8_t data); + uint8_t spectrum_128_bank1_r(offs_t offset); + void spectrum_128_port_7ffd_w(offs_t offset, uint8_t data); + uint8_t spectrum_128_ula_r(); DECLARE_MACHINE_RESET(spectrum); DECLARE_VIDEO_START(spectrum); diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index 2a59319d419..87189613e55 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -40,11 +40,11 @@ private: uint8_t m_coin_settings; uint8_t m_coin_impulse; - DECLARE_READ8_MEMBER(key_matrix_r); - DECLARE_WRITE8_MEMBER(key_matrix_w); - DECLARE_READ8_MEMBER(key_matrix_status_r); - DECLARE_WRITE8_MEMBER(key_matrix_status_w); - DECLARE_WRITE8_MEMBER(m6845_w); + uint8_t key_matrix_r(); + void key_matrix_w(uint8_t data); + uint8_t key_matrix_status_r(); + void key_matrix_status_w(uint8_t data); + void m6845_w(offs_t offset, uint8_t data); void output_w(uint8_t data); virtual void machine_start() override; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index a1e6ff64ce5..e77c4c18cb2 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -46,13 +46,13 @@ private: tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; - DECLARE_WRITE8_MEMBER(coincounter_w); - DECLARE_WRITE8_MEMBER(foreground_videoram_w); - DECLARE_WRITE8_MEMBER(background_videoram_w); - DECLARE_WRITE8_MEMBER(maincpu_50_w); - DECLARE_WRITE8_MEMBER(leds_output_block); - DECLARE_WRITE8_MEMBER(leds_start_block); - DECLARE_WRITE8_MEMBER(leds_shift_bit); + void coincounter_w(uint8_t data); + void foreground_videoram_w(offs_t offset, uint8_t data); + void background_videoram_w(offs_t offset, uint8_t data); + void maincpu_50_w(uint8_t data); + void leds_output_block(uint8_t data); + void leds_start_block(uint8_t data); + void leds_shift_bit(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info_bg); TILE_GET_INFO_MEMBER(get_tile_info_fg); diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index be752bb5f20..68e5a2fa6ee 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -48,15 +48,15 @@ private: bool m_display_disable; uint32_t m_bank_vidram; std::vector<uint8_t> m_vidram; - DECLARE_READ8_MEMBER(irq_ack_r); - DECLARE_WRITE8_MEMBER(rombank_w); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(vidram_w); - DECLARE_WRITE8_MEMBER(attram_w); - DECLARE_READ8_MEMBER(vidram_r); - DECLARE_WRITE8_MEMBER(vidram_bank_w); - DECLARE_WRITE8_MEMBER(display_disable_w); - DECLARE_WRITE8_MEMBER(okibank_w); + uint8_t irq_ack_r(); + void rombank_w(uint8_t data); + void sound_w(uint8_t data); + void vidram_w(offs_t offset, uint8_t data); + void attram_w(offs_t offset, uint8_t data); + uint8_t vidram_r(offs_t offset); + void vidram_bank_w(uint8_t data); + void display_disable_w(uint8_t data); + void okibank_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index a6c24bf86e7..74655605cf6 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -71,7 +71,7 @@ protected: int m_sound_irq; // common - DECLARE_WRITE16_MEMBER(vram_w); + void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(coin1_lockout_w); DECLARE_WRITE_LINE_MEMBER(coin2_lockout_w); DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); @@ -79,17 +79,17 @@ protected: // splash specific DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int); - DECLARE_WRITE8_MEMBER(splash_adpcm_data_w); - DECLARE_WRITE8_MEMBER(splash_adpcm_control_w); + void splash_adpcm_data_w(uint8_t data); + void splash_adpcm_control_w(uint8_t data); // roldfrog specific - DECLARE_READ16_MEMBER(roldfrog_bombs_r); - DECLARE_WRITE8_MEMBER(roldfrog_vblank_ack_w); - DECLARE_READ8_MEMBER(roldfrog_unk_r); + uint16_t roldfrog_bombs_r(); + void roldfrog_vblank_ack_w(uint8_t data); + uint8_t roldfrog_unk_r(); DECLARE_WRITE_LINE_MEMBER(ym_irq); //roldfrog and funystrp specific - DECLARE_WRITE8_MEMBER(sound_bank_w); + void sound_bank_w(uint8_t data); virtual void video_start() override; DECLARE_MACHINE_START(splash); @@ -135,18 +135,18 @@ protected: virtual void machine_start() override; private: - DECLARE_READ16_MEMBER(spr_read); - DECLARE_WRITE16_MEMBER(spr_write); - DECLARE_READ8_MEMBER(int_source_r); - DECLARE_WRITE8_MEMBER(msm1_data_w); - DECLARE_WRITE8_MEMBER(msm1_interrupt_w); - DECLARE_WRITE8_MEMBER(msm2_interrupt_w); - DECLARE_WRITE8_MEMBER(msm2_data_w); + uint16_t spr_read(offs_t offset); + void spr_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t int_source_r(); + void msm1_data_w(uint8_t data); + void msm1_interrupt_w(uint8_t data); + void msm2_interrupt_w(uint8_t data); + void msm2_data_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(adpcm_int1); DECLARE_WRITE_LINE_MEMBER(adpcm_int2); - DECLARE_WRITE16_MEMBER(protection_w); - DECLARE_READ16_MEMBER(protection_r); - DECLARE_WRITE8_MEMBER(eeprom_w); + void protection_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t protection_r(offs_t offset); + void eeprom_w(uint8_t data); uint32_t screen_update_funystrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void funystrp_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 8845e09884a..2715ad5651c 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -66,23 +66,23 @@ private: tilemap_t* m_bg_tilemap; bitmap_ind16 m_helper; int m_collision[2]; - DECLARE_READ8_MEMBER(sprint2_wram_r); - DECLARE_READ8_MEMBER(sprint2_dip_r); - DECLARE_READ8_MEMBER(sprint2_input_A_r); - DECLARE_READ8_MEMBER(sprint2_input_B_r); - DECLARE_READ8_MEMBER(sprint2_sync_r); - DECLARE_READ8_MEMBER(sprint2_steering1_r); - DECLARE_READ8_MEMBER(sprint2_steering2_r); - DECLARE_WRITE8_MEMBER(sprint2_steering_reset1_w); - DECLARE_WRITE8_MEMBER(sprint2_steering_reset2_w); - DECLARE_WRITE8_MEMBER(sprint2_wram_w); - DECLARE_WRITE8_MEMBER(output_latch_w); - DECLARE_READ8_MEMBER(sprint2_collision1_r); - DECLARE_READ8_MEMBER(sprint2_collision2_r); - DECLARE_WRITE8_MEMBER(sprint2_collision_reset1_w); - DECLARE_WRITE8_MEMBER(sprint2_collision_reset2_w); - DECLARE_WRITE8_MEMBER(sprint2_video_ram_w); - DECLARE_WRITE8_MEMBER(sprint2_noise_reset_w); + uint8_t sprint2_wram_r(offs_t offset); + uint8_t sprint2_dip_r(offs_t offset); + uint8_t sprint2_input_A_r(offs_t offset); + uint8_t sprint2_input_B_r(offs_t offset); + uint8_t sprint2_sync_r(); + uint8_t sprint2_steering1_r(); + uint8_t sprint2_steering2_r(); + void sprint2_steering_reset1_w(uint8_t data); + void sprint2_steering_reset2_w(uint8_t data); + void sprint2_wram_w(offs_t offset, uint8_t data); + void output_latch_w(offs_t offset, uint8_t data); + uint8_t sprint2_collision1_r(); + uint8_t sprint2_collision2_r(); + void sprint2_collision_reset1_w(uint8_t data); + void sprint2_collision_reset2_w(uint8_t data); + void sprint2_video_ram_w(offs_t offset, uint8_t data); + void sprint2_noise_reset_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start() override; void sprint2_palette(palette_device &palette) const; diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index ee7aa3dbe44..6e79cc9b149 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -37,21 +37,17 @@ public: template <int N> DECLARE_READ_LINE_MEMBER(collision_flipflop_r); private: - DECLARE_READ8_MEMBER(wram_r); - DECLARE_READ8_MEMBER(analog_r); - DECLARE_READ8_MEMBER(coin_r); - DECLARE_READ8_MEMBER(collision_r); - DECLARE_READ8_MEMBER(options_r); - DECLARE_WRITE8_MEMBER(wram_w); - DECLARE_WRITE8_MEMBER(collision_reset_w); - DECLARE_WRITE8_MEMBER(da_latch_w); - DECLARE_WRITE8_MEMBER(video_ram_w); - DECLARE_WRITE8_MEMBER(screech_1_w); - DECLARE_WRITE8_MEMBER(screech_2_w); - DECLARE_WRITE8_MEMBER(screech_3_w); - DECLARE_WRITE8_MEMBER(screech_4_w); - DECLARE_WRITE8_MEMBER(bang_w); - DECLARE_WRITE8_MEMBER(attract_w); + uint8_t wram_r(offs_t offset); + uint8_t analog_r(offs_t offset); + uint8_t coin_r(offs_t offset); + uint8_t collision_r(offs_t offset); + uint8_t options_r(offs_t offset); + void wram_w(offs_t offset, uint8_t data); + void collision_reset_w(offs_t offset, uint8_t data); + void da_latch_w(uint8_t data); + void video_ram_w(offs_t offset, uint8_t data); + void bang_w(uint8_t data); + void attract_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 9c66c6cae20..060a77cc04d 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -31,12 +31,12 @@ public: void sprint8(machine_config &config); private: - DECLARE_READ8_MEMBER(collision_r); - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(lockout_w); + uint8_t collision_r(); + uint8_t input_r(offs_t offset); + void lockout_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(int_reset_w); DECLARE_WRITE_LINE_MEMBER(team_w); - DECLARE_WRITE8_MEMBER(video_ram_w); + void video_ram_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index cc6811db0e4..72e8ac6bed5 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -53,14 +53,14 @@ private: required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; required_device<palette_device> m_palette; - DECLARE_READ8_MEMBER(spy_bankedram1_r); - DECLARE_WRITE8_MEMBER(spy_bankedram1_w); - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(spy_3f90_w); - DECLARE_WRITE8_MEMBER(spy_sh_irqtrigger_w); - DECLARE_WRITE8_MEMBER(sound_bank_w); - DECLARE_READ8_MEMBER(k052109_051960_r); - DECLARE_WRITE8_MEMBER(k052109_051960_w); + uint8_t spy_bankedram1_r(offs_t offset); + void spy_bankedram1_w(offs_t offset, uint8_t data); + void bankswitch_w(uint8_t data); + void spy_3f90_w(uint8_t data); + void spy_sh_irqtrigger_w(uint8_t data); + void sound_bank_w(uint8_t data); + uint8_t k052109_051960_r(offs_t offset); + void k052109_051960_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_spy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 2b391e1d241..5b444abd146 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -50,32 +50,32 @@ private: iox_t m_iox; // common - DECLARE_READ8_MEMBER(vox_status_r); - DECLARE_READ8_MEMBER(iox_mux_r); - DECLARE_READ8_MEMBER(iox_status_r); - DECLARE_WRITE8_MEMBER(iox_command_w); - DECLARE_WRITE8_MEMBER(iox_data_w); + uint8_t vox_status_r(); + uint8_t iox_mux_r(); + uint8_t iox_status_r(); + void iox_command_w(uint8_t data); + void iox_data_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(adpcm_int); // mjuugi - DECLARE_WRITE16_MEMBER(mjyuugi_flags_w); - DECLARE_WRITE16_MEMBER(mjyuugi_adpcm_bank_w); - DECLARE_READ8_MEMBER(mjyuugi_irq2_ack_r); - DECLARE_READ8_MEMBER(mjyuugi_irq4_ack_r); + void mjyuugi_flags_w(uint16_t data); + void mjyuugi_adpcm_bank_w(uint16_t data); + uint8_t mjyuugi_irq2_ack_r(); + uint8_t mjyuugi_irq4_ack_r(); // rmgoldyh - DECLARE_WRITE8_MEMBER(rmgoldyh_rombank_w); + void rmgoldyh_rombank_w(uint8_t data); // srmp2 - DECLARE_WRITE8_MEMBER(srmp2_irq2_ack_w); - DECLARE_WRITE8_MEMBER(srmp2_irq4_ack_w); - DECLARE_WRITE16_MEMBER(srmp2_flags_w); - DECLARE_WRITE8_MEMBER(adpcm_code_w); + void srmp2_irq2_ack_w(uint8_t data); + void srmp2_irq4_ack_w(uint8_t data); + void srmp2_flags_w(uint16_t data); + void adpcm_code_w(uint8_t data); // srmp3 - DECLARE_WRITE8_MEMBER(srmp3_rombank_w); - DECLARE_WRITE8_MEMBER(srmp3_flags_w); - DECLARE_WRITE8_MEMBER(srmp3_irq_ack_w); + void srmp3_rombank_w(uint8_t data); + void srmp3_flags_w(uint8_t data); + void srmp3_irq_ack_w(uint8_t data); virtual void machine_start() override; DECLARE_MACHINE_START(srmp2); diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 941b7b4f635..fee94871f84 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -34,10 +34,10 @@ private: int m_scroll[4]; void bankswitch_w(uint8_t data); - DECLARE_WRITE8_MEMBER(foreground_w); - DECLARE_WRITE8_MEMBER(background_w); - DECLARE_WRITE8_MEMBER(_4009_w); - DECLARE_WRITE8_MEMBER(scroll_w); + void foreground_w(offs_t offset, uint8_t data); + void background_w(offs_t offset, uint8_t data); + void _4009_w(uint8_t data); + void scroll_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index a0408c59544..a1db6b36bfc 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -55,17 +55,17 @@ private: DECO16IC_BANK_CB_MEMBER(bank_callback); u16 mix_callback(u16 p, u16 p2); - DECLARE_READ16_MEMBER(sshangha_protection_region_8_146_r); - DECLARE_WRITE16_MEMBER(sshangha_protection_region_8_146_w); - DECLARE_READ16_MEMBER(sshangha_protection_region_d_146_r); - DECLARE_WRITE16_MEMBER(sshangha_protection_region_d_146_w); - DECLARE_READ16_MEMBER(deco_71_r); - DECLARE_READ16_MEMBER(sshanghab_protection16_r); + uint16_t sshangha_protection_region_8_146_r(offs_t offset); + void sshangha_protection_region_8_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t sshangha_protection_region_d_146_r(offs_t offset); + void sshangha_protection_region_d_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t deco_71_r(); + uint16_t sshanghab_protection16_r(offs_t offset); - DECLARE_READ8_MEMBER(sound_shared_r); - DECLARE_WRITE8_MEMBER(sound_shared_w); + uint8_t sound_shared_r(offs_t offset); + void sound_shared_w(offs_t offset, uint8_t data); - DECLARE_WRITE16_MEMBER(video_w); + void video_w(uint16_t data); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index fc1fc61d7a1..a3f5c5230be 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -70,10 +70,10 @@ protected: uint8_t playmark_snd_command_r(); void playmark_oki_w(uint8_t data); void playmark_snd_control_w(uint8_t data); - DECLARE_WRITE16_MEMBER(sslam_tx_tileram_w); - DECLARE_WRITE16_MEMBER(sslam_md_tileram_w); - DECLARE_WRITE16_MEMBER(sslam_bg_tileram_w); - DECLARE_WRITE8_MEMBER(sslam_snd_w); + void sslam_tx_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sslam_md_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sslam_bg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sslam_snd_w(uint8_t data); TILE_GET_INFO_MEMBER(get_sslam_tx_tile_info); TILE_GET_INFO_MEMBER(get_sslam_md_tile_info); @@ -109,8 +109,8 @@ protected: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_MEMBER(powerbls_sound_w); - DECLARE_WRITE16_MEMBER(powerbls_bg_tileram_w); + void powerbls_sound_w(uint16_t data); + void powerbls_bg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); }; #endif // MAME_INCLUDES_SSLAM_H diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 3ee36a6312c..8553ccaf0af 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -34,14 +34,14 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE8_MEMBER(sound_nmi_mask_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(videoram2_w); - DECLARE_WRITE8_MEMBER(colorram2_w); - DECLARE_WRITE8_MEMBER(paletteram_w); - DECLARE_WRITE8_MEMBER(scroll_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); + void sound_nmi_mask_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); + void videoram2_w(offs_t offset, uint8_t data); + void colorram2_w(offs_t offset, uint8_t data); + void paletteram_w(offs_t offset, uint8_t data); + void scroll_w(uint8_t data); + void flipscreen_w(uint8_t data); INTERRUPT_GEN_MEMBER(sound_timer_irq); diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 69544941039..c9e223643aa 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -21,23 +21,23 @@ public: void sspeedr(machine_config &config); private: - DECLARE_WRITE8_MEMBER(sspeedr_int_ack_w); - DECLARE_WRITE8_MEMBER(sspeedr_lamp_w); - DECLARE_WRITE8_MEMBER(sspeedr_time_w); - DECLARE_WRITE8_MEMBER(sspeedr_score_w); - DECLARE_WRITE8_MEMBER(sspeedr_sound_w); - DECLARE_WRITE8_MEMBER(sspeedr_driver_horz_w); - DECLARE_WRITE8_MEMBER(sspeedr_driver_horz_2_w); - DECLARE_WRITE8_MEMBER(sspeedr_driver_vert_w); - DECLARE_WRITE8_MEMBER(sspeedr_driver_pic_w); - DECLARE_WRITE8_MEMBER(sspeedr_drones_horz_w); - DECLARE_WRITE8_MEMBER(sspeedr_drones_horz_2_w); - DECLARE_WRITE8_MEMBER(sspeedr_drones_mask_w); - DECLARE_WRITE8_MEMBER(sspeedr_drones_vert_w); - DECLARE_WRITE8_MEMBER(sspeedr_track_horz_w); - DECLARE_WRITE8_MEMBER(sspeedr_track_horz_2_w); - DECLARE_WRITE8_MEMBER(sspeedr_track_vert_w); - DECLARE_WRITE8_MEMBER(sspeedr_track_ice_w); + void sspeedr_int_ack_w(uint8_t data); + void sspeedr_lamp_w(uint8_t data); + void sspeedr_time_w(offs_t offset, uint8_t data); + void sspeedr_score_w(offs_t offset, uint8_t data); + void sspeedr_sound_w(uint8_t data); + void sspeedr_driver_horz_w(uint8_t data); + void sspeedr_driver_horz_2_w(uint8_t data); + void sspeedr_driver_vert_w(uint8_t data); + void sspeedr_driver_pic_w(uint8_t data); + void sspeedr_drones_horz_w(uint8_t data); + void sspeedr_drones_horz_2_w(uint8_t data); + void sspeedr_drones_mask_w(uint8_t data); + void sspeedr_drones_vert_w(offs_t offset, uint8_t data); + void sspeedr_track_horz_w(uint8_t data); + void sspeedr_track_horz_2_w(uint8_t data); + void sspeedr_track_vert_w(offs_t offset, uint8_t data); + void sspeedr_track_ice_w(uint8_t data); void sspeedr_palette(palette_device &palette) const; uint32_t screen_update_sspeedr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_sspeedr); diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index ea8d658d8f8..1db4af57791 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -47,10 +47,10 @@ private: tilemap_t *m_tilemap4; std::unique_ptr<uint8_t[]> m_buffer_spriteram; - DECLARE_READ8_MEMBER(wheel_r); - DECLARE_WRITE8_MEMBER(vram1_w); - DECLARE_WRITE8_MEMBER(vram2_w); - DECLARE_WRITE8_MEMBER(vram4_w); + uint8_t wheel_r(); + void vram1_w(offs_t offset, uint8_t data); + void vram2_w(offs_t offset, uint8_t data); + void vram4_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 21e2fad64e5..02c592ac6af 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -85,28 +85,28 @@ protected: bool m_raster_interrupt_enabled; uint32_t m_latches[8]; - DECLARE_WRITE16_MEMBER(irq_ack_w); - DECLARE_WRITE16_MEMBER(irq_enable_w); - DECLARE_WRITE16_MEMBER(lockout_w); - DECLARE_WRITE16_MEMBER(lockout_inv_w); - DECLARE_READ16_MEMBER(dsp_dr_r); - DECLARE_WRITE16_MEMBER(dsp_dr_w); - DECLARE_READ16_MEMBER(dsp_r); - DECLARE_WRITE16_MEMBER(dsp_w); - DECLARE_READ16_MEMBER(drifto94_unknown_r); - DECLARE_READ16_MEMBER(hypreact_input_r); - DECLARE_READ16_MEMBER(mainram_r); - DECLARE_WRITE16_MEMBER(mainram_w); - DECLARE_READ16_MEMBER(srmp4_input_r); - DECLARE_READ16_MEMBER(srmp7_irqv_r); - DECLARE_WRITE16_MEMBER(srmp7_sound_bank_w); - DECLARE_READ16_MEMBER(srmp7_input_r); - DECLARE_READ32_MEMBER(latch32_r); - DECLARE_WRITE32_MEMBER(latch32_w); - DECLARE_READ16_MEMBER(latch16_r); - DECLARE_WRITE16_MEMBER(latch16_w); - DECLARE_READ16_MEMBER(vblank_r); - DECLARE_WRITE16_MEMBER(scroll_w); + void irq_ack_w(offs_t offset, uint16_t data); + void irq_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void lockout_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void lockout_inv_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t dsp_dr_r(); + void dsp_dr_w(uint16_t data); + uint16_t dsp_r(offs_t offset); + void dsp_w(offs_t offset, uint16_t data); + uint16_t drifto94_unknown_r(); + uint16_t hypreact_input_r(); + uint16_t mainram_r(offs_t offset); + void mainram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t srmp4_input_r(); + uint16_t srmp7_irqv_r(); + void srmp7_sound_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t srmp7_input_r(); + uint32_t latch32_r(offs_t offset); + void latch32_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint16_t latch16_r(offs_t offset); + void latch16_w(offs_t offset, uint16_t data); + uint16_t vblank_r(); + void scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); virtual void machine_reset() override; virtual void video_start() override; @@ -176,8 +176,8 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(adc_int_w); - DECLARE_READ16_MEMBER(eeprom_r); - DECLARE_WRITE16_MEMBER(eeprom_w); + uint16_t eeprom_r(); + void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void gdfs_map(address_map &map); @@ -239,10 +239,10 @@ public: void init_sexy(); private: - DECLARE_READ16_MEMBER(ballswitch_r); + uint16_t ballswitch_r(); uint8_t dial_r(); void dial_w(uint8_t data); - DECLARE_WRITE16_MEMBER(motor_w); + void motor_w(uint16_t data); void sxyreact_map(address_map &map); diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 021300e3936..8d74185d34f 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -50,15 +50,15 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(get_rng); private: - DECLARE_READ8_MEMBER(vert_pos_r); - DECLARE_READ8_MEMBER(horiz_pos_r); + uint8_t vert_pos_r(); + uint8_t horiz_pos_r(); DECLARE_WRITE_LINE_MEMBER(coin_lockout_1_w); DECLARE_WRITE_LINE_MEMBER(coin_lockout_2_w); DECLARE_WRITE_LINE_MEMBER(palette_bank_w); - DECLARE_WRITE8_MEMBER(scroll_ram_w); - DECLARE_WRITE8_MEMBER(speed_latch_w); - DECLARE_WRITE8_MEMBER(shot_trigger_w); - DECLARE_WRITE8_MEMBER(shot_flag_clear_w); + void scroll_ram_w(offs_t offset, uint8_t data); + void speed_latch_w(uint8_t data); + void shot_trigger_w(uint8_t data); + void shot_flag_clear_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(motor_w); INTERRUPT_GEN_MEMBER(interrupt); diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index 3531fd165a1..9482860ddf5 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -43,8 +43,8 @@ private: tilemap_t *m_pf1_tilemap; - DECLARE_WRITE16_MEMBER(int_ack_w); - DECLARE_WRITE16_MEMBER(pf1_data_w); + void int_ack_w(uint16_t data); + void pf1_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t mystery_r(); virtual void video_start() override; diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index 88a343f6023..1677d19d9e5 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -23,19 +23,19 @@ public: void starcrus(machine_config &config); private: - DECLARE_WRITE8_MEMBER(s1_x_w); - DECLARE_WRITE8_MEMBER(s1_y_w); - DECLARE_WRITE8_MEMBER(s2_x_w); - DECLARE_WRITE8_MEMBER(s2_y_w); - DECLARE_WRITE8_MEMBER(p1_x_w); - DECLARE_WRITE8_MEMBER(p1_y_w); - DECLARE_WRITE8_MEMBER(p2_x_w); - DECLARE_WRITE8_MEMBER(p2_y_w); - DECLARE_WRITE8_MEMBER(ship_parm_1_w); - DECLARE_WRITE8_MEMBER(ship_parm_2_w); - DECLARE_WRITE8_MEMBER(proj_parm_1_w); - DECLARE_WRITE8_MEMBER(proj_parm_2_w); - DECLARE_READ8_MEMBER(coll_det_r); + void s1_x_w(uint8_t data); + void s1_y_w(uint8_t data); + void s2_x_w(uint8_t data); + void s2_y_w(uint8_t data); + void p1_x_w(uint8_t data); + void p1_y_w(uint8_t data); + void p2_x_w(uint8_t data); + void p2_y_w(uint8_t data); + void ship_parm_1_w(uint8_t data); + void ship_parm_2_w(uint8_t data); + void proj_parm_1_w(uint8_t data); + void proj_parm_2_w(uint8_t data); + uint8_t coll_det_r(); virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 9220ca0d933..4801e839a95 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -61,8 +61,8 @@ private: uint8_t m_starfire_color; uint16_t m_starfire_colors[STARFIRE_NUM_PENS]; - read8_delegate m_input_read; - write8_delegate m_io2_write; + read8sm_delegate m_input_read; + write8smo_delegate m_io2_write; emu_timer* m_scanline_timer; bitmap_rgb32 m_starfire_screen; @@ -70,16 +70,16 @@ private: required_device<cpu_device> m_maincpu; required_device<screen_device> m_screen; - DECLARE_WRITE8_MEMBER(starfire_scratch_w); - DECLARE_READ8_MEMBER(starfire_scratch_r); - DECLARE_READ8_MEMBER(starfire_input_r); - DECLARE_READ8_MEMBER(fireone_input_r); - DECLARE_WRITE8_MEMBER(starfire_sound_w); - DECLARE_WRITE8_MEMBER(fireone_sound_w); - DECLARE_WRITE8_MEMBER(starfire_colorram_w); - DECLARE_READ8_MEMBER(starfire_colorram_r); - DECLARE_WRITE8_MEMBER(starfire_videoram_w); - DECLARE_READ8_MEMBER(starfire_videoram_r); + void starfire_scratch_w(offs_t offset, uint8_t data); + uint8_t starfire_scratch_r(offs_t offset); + uint8_t starfire_input_r(offs_t offset); + uint8_t fireone_input_r(offs_t offset); + void starfire_sound_w(uint8_t data); + void fireone_sound_w(uint8_t data); + void starfire_colorram_w(offs_t offset, uint8_t data); + uint8_t starfire_colorram_r(offs_t offset); + void starfire_videoram_w(offs_t offset, uint8_t data); + uint8_t starfire_videoram_r(offs_t offset); virtual void video_start() override; uint32_t screen_update_starfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(starfire_scanline_callback); diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 324dd17654c..8fca28dd6c5 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -71,8 +71,8 @@ public: private: virtual void machine_start() override; - DECLARE_WRITE8_MEMBER(starshp1_collision_reset_w); - DECLARE_WRITE8_MEMBER(starshp1_analog_in_w); + void starshp1_collision_reset_w(uint8_t data); + void starshp1_analog_in_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(ship_explode_w); DECLARE_WRITE_LINE_MEMBER(circle_mod_w); DECLARE_WRITE_LINE_MEMBER(circle_kill_w); @@ -80,13 +80,13 @@ private: DECLARE_WRITE_LINE_MEMBER(inverse_w); DECLARE_WRITE_LINE_MEMBER(mux_w); DECLARE_WRITE_LINE_MEMBER(led_w); - DECLARE_READ8_MEMBER(starshp1_rng_r); - DECLARE_WRITE8_MEMBER(starshp1_ssadd_w); - DECLARE_WRITE8_MEMBER(starshp1_sspic_w); - DECLARE_WRITE8_MEMBER(starshp1_playfield_w); + uint8_t starshp1_rng_r(); + void starshp1_ssadd_w(offs_t offset, uint8_t data); + void starshp1_sspic_w(uint8_t data); + void starshp1_playfield_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(attract_w); DECLARE_WRITE_LINE_MEMBER(phasor_w); - DECLARE_WRITE8_MEMBER(starshp1_analog_out_w); + void starshp1_analog_out_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start() override; void starshp1_palette(palette_device &palette) const; diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index 14113537f87..1af8a8b50a3 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -73,23 +73,23 @@ private: int16_t m_B; int16_t m_C; int32_t m_ACC; - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(esb_slapstic_r); - DECLARE_WRITE8_MEMBER(esb_slapstic_w); - DECLARE_WRITE8_MEMBER(starwars_nstore_w); + void irq_ack_w(uint8_t data); + uint8_t esb_slapstic_r(address_space &space, offs_t offset); + void esb_slapstic_w(address_space &space, offs_t offset, uint8_t data); + void starwars_nstore_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(recall_w); DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); - DECLARE_READ8_MEMBER(starwars_prng_r); + uint8_t starwars_prng_r(); DECLARE_WRITE_LINE_MEMBER(prng_reset_w); - DECLARE_READ8_MEMBER(starwars_div_reh_r); - DECLARE_READ8_MEMBER(starwars_div_rel_r); - DECLARE_WRITE8_MEMBER(starwars_math_w); + uint8_t starwars_div_reh_r(); + uint8_t starwars_div_rel_r(); + void starwars_math_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(starwars_main_ready_flag_r); + uint8_t starwars_main_ready_flag_r(); DECLARE_WRITE_LINE_MEMBER(boost_interleave_hack); - DECLARE_WRITE8_MEMBER(starwars_soundrst_w); - DECLARE_WRITE8_MEMBER(quad_pokeyn_w); + void starwars_soundrst_w(uint8_t data); + void quad_pokeyn_w(offs_t offset, uint8_t data); virtual void machine_reset() override; TIMER_CALLBACK_MEMBER(math_run_clear); uint8_t r6532_porta_r(); diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index ff0e02fc061..a2fb44092bc 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -57,15 +57,15 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int); - DECLARE_WRITE8_MEMBER(stfight_io_w); - DECLARE_READ8_MEMBER(stfight_coin_r); - DECLARE_WRITE8_MEMBER(stfight_coin_w); - DECLARE_WRITE8_MEMBER(stfight_fm_w); - DECLARE_WRITE8_MEMBER(stfight_mcu_w); + void stfight_io_w(uint8_t data); + uint8_t stfight_coin_r(); + void stfight_coin_w(uint8_t data); + void stfight_fm_w(uint8_t data); + void stfight_mcu_w(uint8_t data); - DECLARE_WRITE8_MEMBER(stfight_bank_w); + void stfight_bank_w(uint8_t data); - DECLARE_READ8_MEMBER(stfight_fm_r); + uint8_t stfight_fm_r(); INTERRUPT_GEN_MEMBER(stfight_vb_interrupt); diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index c117738a7da..155f65c62df 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -36,8 +36,8 @@ private: optional_memory_bank m_okibank; - DECLARE_WRITE8_MEMBER(eeprom_w); - DECLARE_WRITE8_MEMBER(oki_bank_w); + void eeprom_w(uint8_t data); + void oki_bank_w(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 9dbfdf695c8..48ccc7fe5f4 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -89,16 +89,16 @@ public: void init_mausuke(); private: - DECLARE_READ8_MEMBER(stv_ioga_r); - DECLARE_WRITE8_MEMBER(stv_ioga_w); - DECLARE_READ8_MEMBER(critcrsh_ioga_r); - DECLARE_READ8_MEMBER(magzun_ioga_r); - DECLARE_WRITE8_MEMBER(magzun_ioga_w); - DECLARE_READ8_MEMBER(stvmp_ioga_r); - DECLARE_WRITE8_MEMBER(stvmp_ioga_w); - DECLARE_READ32_MEMBER(magzun_hef_hack_r); - DECLARE_READ32_MEMBER(magzun_rx_hack_r); - DECLARE_WRITE8_MEMBER(hop_ioga_w); + uint8_t stv_ioga_r(offs_t offset); + void stv_ioga_w(offs_t offset, uint8_t data); + uint8_t critcrsh_ioga_r(offs_t offset); + uint8_t magzun_ioga_r(offs_t offset); + void magzun_ioga_w(offs_t offset, uint8_t data); + uint8_t stvmp_ioga_r(offs_t offset); + void stvmp_ioga_w(offs_t offset, uint8_t data); + uint32_t magzun_hef_hack_r(); + uint32_t magzun_rx_hack_r(); + void hop_ioga_w(offs_t offset, uint8_t data); image_init_result load_cart(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( stv_cart1 ) { return load_cart(image, m_cart1); } @@ -116,7 +116,7 @@ private: DECLARE_MACHINE_RESET(stv); DECLARE_MACHINE_RESET(batmanfr); - DECLARE_WRITE32_MEMBER(batmanfr_sound_comms_w); + void batmanfr_sound_comms_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); optional_device<acclaim_rax_device> m_rax; uint8_t m_port_sel,m_mux_data; @@ -125,21 +125,21 @@ private: uint8_t m_ioga_portg; uint16_t m_serial_tx; - // protection specific variables and functions (see machine/stvprot.c) + // protection specific variables and functions (see machine/stvprot.cpp) uint32_t m_abus_protenable; uint32_t m_abus_protkey; - READ32_MEMBER(decathlt_prot_r); + uint32_t decathlt_prot_r(offs_t offset, uint32_t mem_mask = ~0); void sega5838_map(address_map &map); optional_memory_bank m_protbank; bool m_newprotection_element; // debug helper only, doesn't need saving int m_protbankval; // debug helper only, doesn't need saving - WRITE32_MEMBER(decathlt_prot_srcaddr_w); + void decathlt_prot_srcaddr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t m_a_bus[4]; - DECLARE_READ32_MEMBER( common_prot_r ); - DECLARE_WRITE32_MEMBER( common_prot_w ); + uint32_t common_prot_r(offs_t offset); + void common_prot_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void install_common_protection(); void stv_register_protection_savestates(); diff --git a/src/mame/includes/sub.h b/src/mame/includes/sub.h index c61c3a9b270..2d06e88b5a7 100644 --- a/src/mame/includes/sub.h +++ b/src/mame/includes/sub.h @@ -47,13 +47,13 @@ private: DECLARE_WRITE_LINE_MEMBER(int_mask_w); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(nmi_mask_w); + void nmi_mask_w(uint8_t data); void sub_palette(palette_device &palette) const; TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_WRITE8_MEMBER(attr_w); - DECLARE_WRITE8_MEMBER(vram_w); - DECLARE_WRITE8_MEMBER(scrolly_w); + void attr_w(offs_t offset, uint8_t data); + void vram_w(offs_t offset, uint8_t data); + void scrolly_w(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(main_irq); diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index d0f5393547d..bd75b51f136 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -54,13 +54,13 @@ private: int m_last_val_1; int m_last_val_2; - DECLARE_WRITE8_MEMBER(steer_reset_w); - DECLARE_READ8_MEMBER(control_r); - DECLARE_READ8_MEMBER(coin_r); - DECLARE_READ8_MEMBER(options_r); + void steer_reset_w(uint8_t data); + uint8_t control_r(offs_t offset); + uint8_t coin_r(offs_t offset); + uint8_t options_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(invert1_w); DECLARE_WRITE_LINE_MEMBER(invert2_w); - DECLARE_WRITE8_MEMBER(noise_reset_w); + void noise_reset_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index efce2b74079..24a9e871b02 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -34,28 +34,28 @@ public: private: // common - DECLARE_WRITE16_MEMBER(soundlatch_w); - DECLARE_READ16_MEMBER(paletteram_r); - DECLARE_WRITE16_MEMBER(paletteram_w); - DECLARE_WRITE16_MEMBER(flipscreen_w); + void soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t paletteram_r(offs_t offset); + void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // bestbest specific - DECLARE_WRITE16_MEMBER(bestbest_flipscreen_w); - DECLARE_WRITE16_MEMBER(bestbest_coin_w); - DECLARE_READ8_MEMBER(bestbest_prot_r); - DECLARE_WRITE8_MEMBER(bestbest_prot_w); + void bestbest_flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bestbest_coin_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t bestbest_prot_r(); + void bestbest_prot_w(uint8_t data); void bestbest_ay8910_port_a_w(uint8_t data); // bssoccer specific - DECLARE_WRITE16_MEMBER(bssoccer_leds_w); - DECLARE_WRITE8_MEMBER(bssoccer_pcm_1_bankswitch_w); - DECLARE_WRITE8_MEMBER(bssoccer_pcm_2_bankswitch_w); + void bssoccer_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bssoccer_pcm_1_bankswitch_w(uint8_t data); + void bssoccer_pcm_2_bankswitch_w(uint8_t data); // uballoon specific - DECLARE_WRITE16_MEMBER(uballoon_leds_w); - DECLARE_WRITE8_MEMBER(uballoon_pcm_1_bankswitch_w); - DECLARE_READ8_MEMBER(uballoon_prot_r); - DECLARE_WRITE8_MEMBER(uballoon_prot_w); + void uballoon_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void uballoon_pcm_1_bankswitch_w(uint8_t data); + uint8_t uballoon_prot_r(offs_t offset); + void uballoon_prot_w(offs_t offset, uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(bssoccer_interrupt); diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 668af14b410..9d6a75a57e9 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -69,61 +69,61 @@ private: GFXBANK_TYPE_STARFIGH } m_gfxbank_type; - DECLARE_READ8_MEMBER(hardhead_protection_r); - DECLARE_WRITE8_MEMBER(hardhead_protection_w); - DECLARE_READ8_MEMBER(hardhead_ip_r); - DECLARE_WRITE8_MEMBER(hardhead_bankswitch_w); - DECLARE_WRITE8_MEMBER(hardhead_flipscreen_w); - DECLARE_WRITE8_MEMBER(rranger_bankswitch_w); - DECLARE_READ8_MEMBER(rranger_soundstatus_r); - DECLARE_WRITE8_MEMBER(sranger_prot_w); + uint8_t hardhead_protection_r(offs_t offset); + void hardhead_protection_w(offs_t offset, uint8_t data); + uint8_t hardhead_ip_r(); + void hardhead_bankswitch_w(uint8_t data); + void hardhead_flipscreen_w(uint8_t data); + void rranger_bankswitch_w(uint8_t data); + uint8_t rranger_soundstatus_r(); + void sranger_prot_w(uint8_t data); // brickzn - DECLARE_READ8_MEMBER(brickzn_cheats_r); - DECLARE_WRITE8_MEMBER(brickzn_leds_w); - DECLARE_WRITE8_MEMBER(brickzn_palbank_w); - DECLARE_WRITE8_MEMBER(brickzn_sprbank_w); - DECLARE_WRITE8_MEMBER(brickzn_rombank_w); - DECLARE_WRITE8_MEMBER(brickzn_banked_paletteram_w); + uint8_t brickzn_cheats_r(); + void brickzn_leds_w(uint8_t data); + void brickzn_palbank_w(uint8_t data); + void brickzn_sprbank_w(uint8_t data); + void brickzn_rombank_w(uint8_t data); + void brickzn_banked_paletteram_w(offs_t offset, uint8_t data); // brickzn (newer sets) - DECLARE_WRITE8_MEMBER(brickzn_prot2_w); - DECLARE_WRITE8_MEMBER(brickzn_multi_w); - DECLARE_WRITE8_MEMBER(brickzn_enab_palram_w); - DECLARE_WRITE8_MEMBER(brickzn_disab_palram_w); + void brickzn_prot2_w(uint8_t data); + void brickzn_multi_w(uint8_t data); + void brickzn_enab_palram_w(uint8_t data); + void brickzn_disab_palram_w(uint8_t data); // hardhea2 - DECLARE_WRITE8_MEMBER(hardhea2_nmi_w); - DECLARE_WRITE8_MEMBER(hardhea2_flipscreen_w); - DECLARE_WRITE8_MEMBER(hardhea2_leds_w); - DECLARE_WRITE8_MEMBER(hardhea2_spritebank_w); - DECLARE_WRITE8_MEMBER(hardhea2_rombank_w); - DECLARE_WRITE8_MEMBER(hardhea2_spritebank_0_w); - DECLARE_WRITE8_MEMBER(hardhea2_spritebank_1_w); - DECLARE_WRITE8_MEMBER(hardhea2_rambank_0_w); - DECLARE_WRITE8_MEMBER(hardhea2_rambank_1_w); + void hardhea2_nmi_w(uint8_t data); + void hardhea2_flipscreen_w(uint8_t data); + void hardhea2_leds_w(uint8_t data); + void hardhea2_spritebank_w(uint8_t data); + void hardhea2_rombank_w(uint8_t data); + void hardhea2_spritebank_0_w(uint8_t data); + void hardhea2_spritebank_1_w(uint8_t data); + void hardhea2_rambank_0_w(uint8_t data); + void hardhea2_rambank_1_w(uint8_t data); // starfigh - DECLARE_WRITE8_MEMBER(starfigh_rombank_latch_w); - DECLARE_WRITE8_MEMBER(starfigh_spritebank_latch_w); - DECLARE_WRITE8_MEMBER(starfigh_sound_latch_w); - DECLARE_WRITE8_MEMBER(starfigh_spritebank_w); - DECLARE_READ8_MEMBER(starfigh_cheats_r); - DECLARE_WRITE8_MEMBER(starfigh_leds_w); + void starfigh_rombank_latch_w(offs_t offset, uint8_t data); + void starfigh_spritebank_latch_w(uint8_t data); + void starfigh_sound_latch_w(uint8_t data); + void starfigh_spritebank_w(uint8_t data); + uint8_t starfigh_cheats_r(); + void starfigh_leds_w(uint8_t data); // sparkman - DECLARE_WRITE8_MEMBER(sparkman_rombank_latch_w); - DECLARE_WRITE8_MEMBER(sparkman_rombank_w); - DECLARE_WRITE8_MEMBER(sparkman_spritebank_latch_w); - DECLARE_WRITE8_MEMBER(sparkman_spritebank_w); - DECLARE_WRITE8_MEMBER(sparkman_write_disable_w); - DECLARE_WRITE8_MEMBER(suna8_wram_w); - DECLARE_WRITE8_MEMBER(sparkman_coin_counter_w); - DECLARE_READ8_MEMBER(sparkman_c0a3_r); - - DECLARE_READ8_MEMBER(banked_paletteram_r); - DECLARE_READ8_MEMBER(suna8_banked_spriteram_r); - DECLARE_WRITE8_MEMBER(suna8_spriteram_w); - DECLARE_WRITE8_MEMBER(suna8_banked_spriteram_w); + void sparkman_rombank_latch_w(offs_t offset, uint8_t data); + void sparkman_rombank_w(uint8_t data); + void sparkman_spritebank_latch_w(uint8_t data); + void sparkman_spritebank_w(uint8_t data); + void sparkman_write_disable_w(uint8_t data); + void suna8_wram_w(offs_t offset, uint8_t data); + void sparkman_coin_counter_w(uint8_t data); + uint8_t sparkman_c0a3_r(); + + uint8_t banked_paletteram_r(offs_t offset); + uint8_t suna8_banked_spriteram_r(offs_t offset); + void suna8_spriteram_w(offs_t offset, uint8_t data); + void suna8_banked_spriteram_w(offs_t offset, uint8_t data); void suna8_vh_start_common(bool has_text, GFXBANK_TYPE_T gfxbank_type); DECLARE_VIDEO_START(suna8_text); diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index 5887e7b35db..7e790319f92 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -41,7 +41,7 @@ public: private: DECLARE_WRITE_LINE_MEMBER(vblank_w); - DECLARE_READ16_MEMBER(vblank_ack_r); + uint16_t vblank_ack_r(); uint32_t screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, bool use_offsets); uint32_t screen_update_chinatwn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_supbtime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 5a243e53bd0..d6387b9fd77 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -57,8 +57,8 @@ private: void cpua_ctrl_w(offs_t offset, u32 data, u32 mem_mask = ~0); void coin_word_w(u8 data); u8 volume_r(); - DECLARE_READ32_MEMBER(main_cycle_r); - DECLARE_READ16_MEMBER(sub_cycle_r); + u32 main_cycle_r(); + u16 sub_cycle_r(); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const u32 *primasks, int x_offs, int y_offs); required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index c88a8c7eb23..fc8950bc980 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -39,8 +39,8 @@ private: tilemap_t *m_bg_tilemap; int m_control; - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(scrollram_w); + void videoram_w(offs_t offset, uint8_t data); + void scrollram_w(offs_t offset, uint8_t data); void control_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index a555e256be1..909dae1ffb3 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -136,32 +136,32 @@ private: uint8_t *m_btiles; uint8_t m_region; - DECLARE_WRITE32_MEMBER(hit_w); - DECLARE_WRITE32_MEMBER(hit2_w); - DECLARE_READ32_MEMBER(hit_r); - DECLARE_WRITE32_MEMBER(io_w); - DECLARE_WRITE32_MEMBER(v3t_w); - DECLARE_WRITE32_MEMBER(pal_regs_w); - DECLARE_WRITE32_MEMBER(palette_ram_w); - DECLARE_WRITE32_MEMBER(tilemapA_w); - DECLARE_WRITE32_MEMBER(tilemapB_w); - DECLARE_WRITE32_MEMBER(v3_regs_w); - - DECLARE_READ32_MEMBER(gutsn_speedup_r); - DECLARE_READ32_MEMBER(cyvern_speedup_r); - DECLARE_READ32_MEMBER(puzzloopj_speedup_r); - DECLARE_READ32_MEMBER(puzzloopa_speedup_r); - DECLARE_READ32_MEMBER(puzzloopu_speedup_r); - DECLARE_READ32_MEMBER(puzzloope_speedup_r); - DECLARE_READ32_MEMBER(senknow_speedup_r); - DECLARE_READ32_MEMBER(teljan_speedup_r); - DECLARE_READ32_MEMBER(jjparads_speedup_r); - DECLARE_READ32_MEMBER(jjparad2_speedup_r); - DECLARE_READ32_MEMBER(ryouran_speedup_r); - DECLARE_READ32_MEMBER(galpans2_speedup_r); - DECLARE_READ32_MEMBER(panicstr_speedup_r); - DECLARE_READ32_MEMBER(sengekis_speedup_r); - DECLARE_READ32_MEMBER(sengekij_speedup_r); + void hit_w(offs_t offset, uint32_t data); + void hit2_w(uint32_t data); + uint32_t hit_r(offs_t offset); + void io_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void v3t_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void pal_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void palette_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void tilemapA_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void tilemapB_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void v3_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + + uint32_t gutsn_speedup_r(); + uint32_t cyvern_speedup_r(); + uint32_t puzzloopj_speedup_r(); + uint32_t puzzloopa_speedup_r(); + uint32_t puzzloopu_speedup_r(); + uint32_t puzzloope_speedup_r(); + uint32_t senknow_speedup_r(); + uint32_t teljan_speedup_r(); + uint32_t jjparads_speedup_r(); + uint32_t jjparad2_speedup_r(); + uint32_t ryouran_speedup_r(); + uint32_t galpans2_speedup_r(); + uint32_t panicstr_speedup_r(); + uint32_t sengekis_speedup_r(); + uint32_t sengekij_speedup_r(); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 215c7a177c6..0b8855f433d 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -56,15 +56,15 @@ private: uint8_t m_flipx; uint8_t m_flipy; - DECLARE_WRITE8_MEMBER(nmi_enable_w); - DECLARE_WRITE8_MEMBER(coin_lock_w); - DECLARE_WRITE8_MEMBER(flipx_w); - DECLARE_WRITE8_MEMBER(flipy_w); - DECLARE_WRITE8_MEMBER(fgdisable_w); - DECLARE_WRITE8_MEMBER(fgscrolly_w); - DECLARE_WRITE8_MEMBER(bgscrolly_w); - DECLARE_WRITE8_MEMBER(bgram_w); - DECLARE_WRITE8_MEMBER(fgram_w); + void nmi_enable_w(uint8_t data); + void coin_lock_w(uint8_t data); + void flipx_w(uint8_t data); + void flipy_w(uint8_t data); + void fgdisable_w(uint8_t data); + void fgscrolly_w(uint8_t data); + void bgscrolly_w(uint8_t data); + void bgram_w(offs_t offset, uint8_t data); + void fgram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info2); diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index f77aa482dd7..c030b169daf 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -66,10 +66,10 @@ private: required_device<gfxdecode_device> m_gfxdecode; required_device<generic_latch_8_device> m_soundlatch; - DECLARE_WRITE8_MEMBER(suprslam_sh_bankswitch_w); - DECLARE_WRITE16_MEMBER(suprslam_screen_videoram_w); - DECLARE_WRITE16_MEMBER(suprslam_bg_videoram_w); - DECLARE_WRITE16_MEMBER(suprslam_bank_w); + void suprslam_sh_bankswitch_w(uint8_t data); + void suprslam_screen_videoram_w(offs_t offset, uint16_t data); + void suprslam_bg_videoram_w(offs_t offset, uint16_t data); + void suprslam_bank_w(uint16_t data); void spr_ctrl_w(uint8_t data); TILE_GET_INFO_MEMBER(get_suprslam_tile_info); TILE_GET_INFO_MEMBER(get_suprslam_bg_tile_info); diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 1a2b8ad6193..c654193f770 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -47,8 +47,8 @@ private: required_device<k053251_device> m_k053251; required_device<palette_device> m_palette; - DECLARE_WRITE8_MEMBER(surpratk_videobank_w); - DECLARE_WRITE8_MEMBER(surpratk_5fc0_w); + void surpratk_videobank_w(uint8_t data); + void surpratk_5fc0_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_surpratk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h index 3138e1d14b0..74f0e2c5e30 100644 --- a/src/mame/includes/svision.h +++ b/src/mame/includes/svision.h @@ -72,10 +72,10 @@ private: }; DECLARE_WRITE_LINE_MEMBER(sound_irq_w); - DECLARE_READ8_MEMBER(svision_r); - DECLARE_WRITE8_MEMBER(svision_w); - DECLARE_READ8_MEMBER(tvlink_r); - DECLARE_WRITE8_MEMBER(tvlink_w); + uint8_t svision_r(offs_t offset); + void svision_w(offs_t offset, uint8_t data); + uint8_t tvlink_r(offs_t offset); + void tvlink_w(offs_t offset, uint8_t data); uint32_t screen_update_svision(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tvlink(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h index e83749130c9..c7bda684966 100644 --- a/src/mame/includes/swtpc09.h +++ b/src/mame/includes/swtpc09.h @@ -97,40 +97,39 @@ private: TIMER_CALLBACK_MEMBER(floppy_motor_callback); - DECLARE_READ8_MEMBER( dmaf2_fdc_r ); - DECLARE_WRITE8_MEMBER( dmaf2_fdc_w ); - DECLARE_READ8_MEMBER ( dmaf2_dma_address_reg_r ); - DECLARE_WRITE8_MEMBER ( dmaf2_dma_address_reg_w ); - DECLARE_READ8_MEMBER ( dmaf2_control_reg_r ); - DECLARE_WRITE8_MEMBER ( dmaf2_control_reg_w ); - - DECLARE_READ8_MEMBER( dmaf3_fdc_r ); - DECLARE_WRITE8_MEMBER( dmaf3_fdc_w ); - DECLARE_READ8_MEMBER ( dmaf3_dma_address_reg_r ); - DECLARE_WRITE8_MEMBER ( dmaf3_dma_address_reg_w ); - DECLARE_READ8_MEMBER ( dmaf3_control_reg_r ); - DECLARE_WRITE8_MEMBER ( dmaf3_control_reg_w ); + uint8_t dmaf2_fdc_r(offs_t offset); + void dmaf2_fdc_w(offs_t offset, uint8_t data); + uint8_t dmaf2_dma_address_reg_r(); + void dmaf2_dma_address_reg_w(uint8_t data); + uint8_t dmaf2_control_reg_r(); + void dmaf2_control_reg_w(uint8_t data); + + uint8_t dmaf3_fdc_r(offs_t offset); + void dmaf3_fdc_w(offs_t offset, uint8_t data); + uint8_t dmaf3_dma_address_reg_r(); + void dmaf3_dma_address_reg_w(uint8_t data); + uint8_t dmaf3_control_reg_r(); + void dmaf3_control_reg_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(dmaf3_hdc_intrq_w); DECLARE_WRITE_LINE_MEMBER( dmaf3_hdc_drq_w ); - DECLARE_READ8_MEMBER( dmaf3_hdc_control_r ); - DECLARE_WRITE8_MEMBER( dmaf3_hdc_control_w ); - DECLARE_READ8_MEMBER( dmaf3_hdc_reset_r ); - DECLARE_WRITE8_MEMBER( dmaf3_hdc_reset_w ); - DECLARE_READ8_MEMBER( dmaf3_archive_reset_r ); - DECLARE_WRITE8_MEMBER( dmaf3_archive_reset_w ); - DECLARE_READ8_MEMBER( dmaf3_archive_clear_r ); - DECLARE_WRITE8_MEMBER( dmaf3_archive_clear_w ); - - DECLARE_WRITE8_MEMBER(dat_w); - DECLARE_READ8_MEMBER(main_r); - DECLARE_WRITE8_MEMBER(main_w); - - DECLARE_READ8_MEMBER ( m6844_r ); - DECLARE_WRITE8_MEMBER ( m6844_w ); - - DECLARE_READ8_MEMBER ( unmapped_r ); - DECLARE_WRITE8_MEMBER ( unmapped_w ); + uint8_t dmaf3_hdc_control_r(); + void dmaf3_hdc_control_w(uint8_t data); + uint8_t dmaf3_hdc_reset_r(); + void dmaf3_hdc_reset_w(uint8_t data); + uint8_t dmaf3_archive_reset_r(); + void dmaf3_archive_reset_w(uint8_t data); + uint8_t dmaf3_archive_clear_r(); + void dmaf3_archive_clear_w(uint8_t data); + + uint8_t main_r(offs_t offset); + void main_w(offs_t offset, uint8_t data); + + uint8_t m6844_r(offs_t offset); + void m6844_w(offs_t offset, uint8_t data); + + uint8_t unmapped_r(offs_t offset); + void unmapped_w(offs_t offset, uint8_t data); void flex_dc5_piaide_mem(address_map &map); void flex_dmaf2_mem(address_map &map); diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index f602194b96d..e8f1d5f6174 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -145,15 +145,15 @@ private: void common_videomode_w(u8 data); void videomode_w(u8 data); void videoram_bank_w(u8 data); - DECLARE_READ8_MEMBER(mixer_collision_r); - DECLARE_WRITE8_MEMBER(mixer_collision_w); - DECLARE_WRITE8_MEMBER(mixer_collision_reset_w); - DECLARE_READ8_MEMBER(sprite_collision_r); - DECLARE_WRITE8_MEMBER(sprite_collision_w); - DECLARE_WRITE8_MEMBER(sprite_collision_reset_w); - DECLARE_READ8_MEMBER(videoram_r); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(paletteram_w); + u8 mixer_collision_r(offs_t offset); + void mixer_collision_w(offs_t offset, u8 data); + void mixer_collision_reset_w(u8 data); + u8 sprite_collision_r(offs_t offset); + void sprite_collision_w(offs_t offset, u8 data); + void sprite_collision_reset_w(u8 data); + u8 videoram_r(offs_t offset); + void videoram_w(offs_t offset, u8 data); + void paletteram_w(offs_t offset, u8 data); // sound handlers u8 sound_data_r(); @@ -162,21 +162,21 @@ private: // misc handlers void mcu_control_w(u8 data); - DECLARE_READ8_MEMBER(mcu_io_r); - DECLARE_WRITE8_MEMBER(mcu_io_w); + u8 mcu_io_r(offs_t offset); + void mcu_io_w(offs_t offset, u8 data); u8 nob_mcu_latch_r(); void nob_mcu_latch_w(u8 data); void nob_mcu_status_w(u8 data); void nob_mcu_control_p2_w(u8 data); - DECLARE_READ8_MEMBER(nob_maincpu_latch_r); - DECLARE_WRITE8_MEMBER(nob_maincpu_latch_w); - DECLARE_READ8_MEMBER(nob_mcu_status_r); - DECLARE_READ8_MEMBER(nobb_inport1c_r); - DECLARE_READ8_MEMBER(nobb_inport22_r); - DECLARE_READ8_MEMBER(nobb_inport23_r); - DECLARE_WRITE8_MEMBER(nobb_outport24_w); - DECLARE_READ8_MEMBER(nob_start_r); - DECLARE_READ8_MEMBER(shtngmst_gunx_r); + u8 nob_maincpu_latch_r(); + void nob_maincpu_latch_w(u8 data); + u8 nob_mcu_status_r(); + u8 nobb_inport1c_r(); + u8 nobb_inport22_r(); + u8 nobb_inport23_r(); + void nobb_outport24_w(u8 data); + u8 nob_start_r(); + u8 shtngmst_gunx_r(); // video functions TILE_GET_INFO_MEMBER(tile_get_info); diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 665cfeee563..7ca624e289e 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -94,54 +94,54 @@ public: void init_common(); private: - DECLARE_WRITE16_MEMBER(sound_command_nmi_w); - DECLARE_WRITE16_MEMBER(sound_command_irq_w); - DECLARE_READ8_MEMBER(sound_command_irq_r); - DECLARE_WRITE8_MEMBER(soundbank_msm_w); - DECLARE_WRITE16_MEMBER(sys16_coinctrl_w); - DECLARE_READ16_MEMBER(passht4b_service_r); - DECLARE_READ16_MEMBER(passht4b_io1_r); - DECLARE_READ16_MEMBER(passht4b_io2_r); - DECLARE_READ16_MEMBER(passht4b_io3_r); - DECLARE_WRITE16_MEMBER(sys16_tilebank_w); - DECLARE_WRITE16_MEMBER(ddcrewbl_spritebank_w); - DECLARE_WRITE8_MEMBER(tturfbl_msm5205_data_w); - DECLARE_READ8_MEMBER(tturfbl_soundbank_r); - DECLARE_WRITE8_MEMBER(tturfbl_soundbank_w); - DECLARE_WRITE16_MEMBER(s16bl_bgpage_w); - DECLARE_WRITE16_MEMBER(s16bl_fgpage_w); - DECLARE_WRITE16_MEMBER(s16bl_fgscrollx_bank_w); - DECLARE_WRITE16_MEMBER(s16bl_fgscrollx_w); - DECLARE_WRITE16_MEMBER(s16bl_fgscrolly_w); - DECLARE_WRITE16_MEMBER(s16bl_bgscrollx_w); - DECLARE_WRITE16_MEMBER(s16bl_bgscrolly_w); - template<int Page> DECLARE_WRITE16_MEMBER(datsu_page_w); - DECLARE_WRITE16_MEMBER(goldnaxeb2_fgscrollx_w); - DECLARE_WRITE16_MEMBER(goldnaxeb2_bgscrollx_w); - DECLARE_WRITE16_MEMBER(goldnaxeb2_fgscrolly_w); - DECLARE_WRITE16_MEMBER(goldnaxeb2_bgscrolly_w); - DECLARE_WRITE16_MEMBER(goldnaxeb2_fgpage_w); - DECLARE_WRITE16_MEMBER(goldnaxeb2_bgpage_w); - DECLARE_WRITE16_MEMBER(eswat_tilebank0_w); - DECLARE_WRITE16_MEMBER(altbeastbl_gfx_w); - DECLARE_READ16_MEMBER(beautyb_unkx_r); - DECLARE_WRITE16_MEMBER(wb3bble_refreshenable_w); - DECLARE_WRITE16_MEMBER(sys18_refreshenable_w); - DECLARE_WRITE16_MEMBER(sys18_tilebank_w); - DECLARE_READ8_MEMBER(system18_bank_r); - DECLARE_WRITE8_MEMBER(sys18_soundbank_w); - DECLARE_WRITE8_MEMBER(shdancbl_msm5205_data_w); - DECLARE_READ8_MEMBER(shdancbl_soundbank_r); - DECLARE_WRITE8_MEMBER(shdancbl_bankctrl_w); - DECLARE_WRITE8_MEMBER(sys18bl_okibank_w); - DECLARE_WRITE16_MEMBER(sys16_tileram_w); - DECLARE_WRITE16_MEMBER(sys16_textram_w); - DECLARE_WRITE16_MEMBER(s16a_bootleg_bgscrolly_w); - DECLARE_WRITE16_MEMBER(s16a_bootleg_bgscrollx_w); - DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrolly_w); - DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrollx_w); - DECLARE_WRITE16_MEMBER(s16a_bootleg_tilemapselect_w); - DECLARE_WRITE8_MEMBER(upd7759_bank_w); + void sound_command_nmi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sound_command_irq_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t sound_command_irq_r(); + void soundbank_msm_w(uint8_t data); + void sys16_coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t passht4b_service_r(); + uint16_t passht4b_io1_r(); + uint16_t passht4b_io2_r(); + uint16_t passht4b_io3_r(); + void sys16_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void ddcrewbl_spritebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tturfbl_msm5205_data_w(uint8_t data); + uint8_t tturfbl_soundbank_r(offs_t offset); + void tturfbl_soundbank_w(uint8_t data); + void s16bl_bgpage_w(uint16_t data); + void s16bl_fgpage_w(uint16_t data); + void s16bl_fgscrollx_bank_w(uint16_t data); + void s16bl_fgscrollx_w(uint16_t data); + void s16bl_fgscrolly_w(uint16_t data); + void s16bl_bgscrollx_w(uint16_t data); + void s16bl_bgscrolly_w(uint16_t data); + template<int Page> void datsu_page_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void goldnaxeb2_fgscrollx_w(uint16_t data); + void goldnaxeb2_bgscrollx_w(uint16_t data); + void goldnaxeb2_fgscrolly_w(uint16_t data); + void goldnaxeb2_bgscrolly_w(uint16_t data); + void goldnaxeb2_fgpage_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void goldnaxeb2_bgpage_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void eswat_tilebank0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void altbeastbl_gfx_w(offs_t offset, uint16_t data); + uint16_t beautyb_unkx_r(); + void wb3bble_refreshenable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sys18_refreshenable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sys18_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t system18_bank_r(offs_t offset); + void sys18_soundbank_w(uint8_t data); + void shdancbl_msm5205_data_w(uint8_t data); + uint8_t shdancbl_soundbank_r(offs_t offset); + void shdancbl_bankctrl_w(uint8_t data); + void sys18bl_okibank_w(uint8_t data); + void sys16_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sys16_textram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void s16a_bootleg_bgscrolly_w(uint16_t data); + void s16a_bootleg_bgscrollx_w(uint16_t data); + void s16a_bootleg_fgscrolly_w(uint16_t data); + void s16a_bootleg_fgscrollx_w(uint16_t data); + void s16a_bootleg_tilemapselect_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void upd7759_bank_w(uint8_t data); DECLARE_MACHINE_RESET(ddcrewbl); TILEMAP_MAPPER_MEMBER(sys16_bg_map); diff --git a/src/mame/machine/samcoupe.cpp b/src/mame/machine/samcoupe.cpp index 24ccaae77ea..fee115b6e3d 100644 --- a/src/mame/machine/samcoupe.cpp +++ b/src/mame/machine/samcoupe.cpp @@ -22,7 +22,7 @@ MEMORY BANKING ***************************************************************************/ -READ8_MEMBER(samcoupe_state::sam_bank1_r) +uint8_t samcoupe_state::sam_bank1_r(offs_t offset) { if (sam_bank_read_ptr[0]) return sam_bank_read_ptr[0][offset]; @@ -30,14 +30,14 @@ READ8_MEMBER(samcoupe_state::sam_bank1_r) return 0xff; } -WRITE8_MEMBER(samcoupe_state::sam_bank1_w) +void samcoupe_state::sam_bank1_w(offs_t offset, uint8_t data) { if (sam_bank_write_ptr[0]) sam_bank_write_ptr[0][offset] = data; } -READ8_MEMBER(samcoupe_state::sam_bank2_r) +uint8_t samcoupe_state::sam_bank2_r(offs_t offset) { if (sam_bank_read_ptr[1]) return sam_bank_read_ptr[1][offset]; @@ -45,14 +45,14 @@ READ8_MEMBER(samcoupe_state::sam_bank2_r) return 0xff; } -WRITE8_MEMBER(samcoupe_state::sam_bank2_w) +void samcoupe_state::sam_bank2_w(offs_t offset, uint8_t data) { if (sam_bank_write_ptr[1]) sam_bank_write_ptr[1][offset] = data; } -READ8_MEMBER(samcoupe_state::sam_bank3_r) +uint8_t samcoupe_state::sam_bank3_r(offs_t offset) { if (sam_bank_read_ptr[2]) return sam_bank_read_ptr[2][offset]; @@ -60,14 +60,14 @@ READ8_MEMBER(samcoupe_state::sam_bank3_r) return 0xff; } -WRITE8_MEMBER(samcoupe_state::sam_bank3_w) +void samcoupe_state::sam_bank3_w(offs_t offset, uint8_t data) { if (sam_bank_write_ptr[2]) sam_bank_write_ptr[2][offset] = data; } -READ8_MEMBER(samcoupe_state::sam_bank4_r) +uint8_t samcoupe_state::sam_bank4_r(offs_t offset) { if (sam_bank_read_ptr[3]) return sam_bank_read_ptr[3][offset]; @@ -75,7 +75,7 @@ READ8_MEMBER(samcoupe_state::sam_bank4_r) return 0xff; } -WRITE8_MEMBER(samcoupe_state::sam_bank4_w) +void samcoupe_state::sam_bank4_w(offs_t offset, uint8_t data) { if (sam_bank_write_ptr[3]) sam_bank_write_ptr[3][offset] = data; @@ -202,7 +202,7 @@ void samcoupe_state::samcoupe_update_memory(address_space &space) } -WRITE8_MEMBER(samcoupe_state::samcoupe_ext_mem_w) +void samcoupe_state::samcoupe_ext_mem_w(offs_t offset, uint8_t data) { address_space &space_program = m_maincpu->space(AS_PROGRAM); @@ -223,13 +223,13 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_ext_mem_w) REAL TIME CLOCK ***************************************************************************/ -READ8_MEMBER(samcoupe_state::samcoupe_rtc_r) +uint8_t samcoupe_state::samcoupe_rtc_r(offs_t offset) { return m_rtc->read(offset >> 12); } -WRITE8_MEMBER(samcoupe_state::samcoupe_rtc_w) +void samcoupe_state::samcoupe_rtc_w(offs_t offset, uint8_t data) { m_rtc->write(offset >> 12, data); } @@ -321,7 +321,7 @@ void samcoupe_state::machine_reset() if (m_config->read() & 0x01) { /* install RTC */ - spaceio.install_readwrite_handler(0xef, 0xef, 0, 0, 0xff00, read8_delegate(*this, FUNC(samcoupe_state::samcoupe_rtc_r)), write8_delegate(*this, FUNC(samcoupe_state::samcoupe_rtc_w))); + spaceio.install_readwrite_handler(0xef, 0xef, 0, 0, 0xff00, read8sm_delegate(*this, FUNC(samcoupe_state::samcoupe_rtc_r)), write8sm_delegate(*this, FUNC(samcoupe_state::samcoupe_rtc_w))); } else { diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp index 26ea96aa990..1de768692e6 100644 --- a/src/mame/machine/saturn.cpp +++ b/src/mame/machine/saturn.cpp @@ -58,14 +58,14 @@ /**************************************************************************************/ -WRITE16_MEMBER(saturn_state::saturn_soundram_w) +void saturn_state::saturn_soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //machine().scheduler().synchronize(); // force resync COMBINE_DATA(&m_sound_ram[offset]); } -READ16_MEMBER(saturn_state::saturn_soundram_r) +uint16_t saturn_state::saturn_soundram_r(offs_t offset) { //machine().scheduler().synchronize(); // force resync @@ -73,7 +73,7 @@ READ16_MEMBER(saturn_state::saturn_soundram_r) } /* communication,SLAVE CPU acquires data from the MASTER CPU and triggers an irq. */ -WRITE32_MEMBER(saturn_state::minit_w) +void saturn_state::minit_w(uint32_t data) { //logerror("%s MINIT write = %08x\n", machine().describe_context(),data); machine().scheduler().boost_interleave(m_minit_boost_timeslice, attotime::from_usec(m_minit_boost)); @@ -82,7 +82,7 @@ WRITE32_MEMBER(saturn_state::minit_w) m_slave->pulse_frt_input(); } -WRITE32_MEMBER(saturn_state::sinit_w) +void saturn_state::sinit_w(uint32_t data) { //logerror("%s SINIT write = %08x\n", machine().describe_context(),data); machine().scheduler().boost_interleave(m_sinit_boost_timeslice, attotime::from_usec(m_sinit_boost)); @@ -109,7 +109,7 @@ Shinrei Jusatsushi Taromaru (options menu) */ -WRITE32_MEMBER(saturn_state::saturn_minit_w) +void saturn_state::saturn_minit_w(uint32_t data) { //logerror("%s MINIT write = %08x\n", machine().describe_context(),data); if(m_fake_comms->read() & 1) @@ -123,7 +123,7 @@ WRITE32_MEMBER(saturn_state::saturn_minit_w) m_slave->pulse_frt_input(); } -WRITE32_MEMBER(saturn_state::saturn_sinit_w) +void saturn_state::saturn_sinit_w(uint32_t data) { //logerror("%s SINIT write = %08x\n", machine().describe_context(),data); if(m_fake_comms->read() & 1) @@ -135,7 +135,7 @@ WRITE32_MEMBER(saturn_state::saturn_sinit_w) } -READ8_MEMBER(saturn_state::saturn_backupram_r) +uint8_t saturn_state::saturn_backupram_r(offs_t offset) { if(!(offset & 1)) return 0; // yes, it makes sure the "holes" are there. @@ -143,7 +143,7 @@ READ8_MEMBER(saturn_state::saturn_backupram_r) return m_backupram[offset >> 1] & 0xff; } -WRITE8_MEMBER(saturn_state::saturn_backupram_w) +void saturn_state::saturn_backupram_w(offs_t offset, uint8_t data) { if(!(offset & 1)) return; diff --git a/src/mame/machine/scramble.cpp b/src/mame/machine/scramble.cpp index 6e44ec76828..2584ed3bae5 100644 --- a/src/mame/machine/scramble.cpp +++ b/src/mame/machine/scramble.cpp @@ -50,18 +50,18 @@ CUSTOM_INPUT_MEMBER(scramble_state::darkplnt_dial_r) /* state of the security PAL (6J) */ -READ8_MEMBER(scramble_state::mariner_protection_1_r ) +uint8_t scramble_state::mariner_protection_1_r() { return 7; } -READ8_MEMBER(scramble_state::mariner_protection_2_r ) +uint8_t scramble_state::mariner_protection_2_r() { return 3; } -READ8_MEMBER(scramble_state::triplep_pip_r ) +uint8_t scramble_state::triplep_pip_r() { logerror("PC %04x: triplep read port 2\n",m_maincpu->pc()); if (m_maincpu->pc() == 0x015a) return 0xff; @@ -69,7 +69,7 @@ READ8_MEMBER(scramble_state::triplep_pip_r ) else return 0; } -READ8_MEMBER(scramble_state::triplep_pap_r ) +uint8_t scramble_state::triplep_pap_r() { logerror("PC %04x: triplep read port 3\n",m_maincpu->pc()); if (m_maincpu->pc() == 0x015d) return 0x04; @@ -88,7 +88,7 @@ void scramble_state::cavelon_banksw() membank("bank1")->set_entry(m_cavelon_bank); } -READ8_MEMBER(scramble_state::cavelon_banksw_r ) +uint8_t scramble_state::cavelon_banksw_r(offs_t offset) { cavelon_banksw(); @@ -100,7 +100,7 @@ READ8_MEMBER(scramble_state::cavelon_banksw_r ) return 0xff; } -WRITE8_MEMBER(scramble_state::cavelon_banksw_w ) +void scramble_state::cavelon_banksw_w(offs_t offset, uint8_t data) { cavelon_banksw(); @@ -111,12 +111,12 @@ WRITE8_MEMBER(scramble_state::cavelon_banksw_w ) } -READ8_MEMBER(scramble_state::hunchbks_mirror_r ) +uint8_t scramble_state::hunchbks_mirror_r(address_space &space, offs_t offset) { return space.read_byte(0x1000+offset); } -WRITE8_MEMBER(scramble_state::hunchbks_mirror_w ) +void scramble_state::hunchbks_mirror_w(address_space &space, offs_t offset, uint8_t data) { space.write_byte(0x1000+offset,data); } @@ -182,8 +182,8 @@ void scramble_state::init_mariner() m_maincpu->space(AS_PROGRAM).unmap_write(0x5800, 0x67ff); membank("bank1")->set_base(memregion("maincpu")->base() + 0x5800); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x9008, 0x9008, read8_delegate(*this, FUNC(scramble_state::mariner_protection_2_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0xb401, 0xb401, read8_delegate(*this, FUNC(scramble_state::mariner_protection_1_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x9008, 0x9008, read8smo_delegate(*this, FUNC(scramble_state::mariner_protection_2_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xb401, 0xb401, read8smo_delegate(*this, FUNC(scramble_state::mariner_protection_1_r))); /* ??? (it's NOT a background enable) */ /*m_maincpu->space(AS_PROGRAM).nop_write(0x6803, 0x6803);*/ @@ -259,7 +259,7 @@ void scramble_state::init_cavelon() cavelon_banksw(); /* A15 switches memory banks */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xffff, read8_delegate(*this, FUNC(scramble_state::cavelon_banksw_r)), write8_delegate(*this, FUNC(scramble_state::cavelon_banksw_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xffff, read8sm_delegate(*this, FUNC(scramble_state::cavelon_banksw_r)), write8sm_delegate(*this, FUNC(scramble_state::cavelon_banksw_w))); m_maincpu->space(AS_PROGRAM).nop_write(0x2000, 0x2000); /* ??? */ m_maincpu->space(AS_PROGRAM).nop_write(0x3800, 0x3801); /* looks suspicously like @@ -540,12 +540,12 @@ void scramble_state::init_ad2083() Harem run-time decryption *************************************************************/ -WRITE8_MEMBER(scramble_state::harem_decrypt_bit_w) +void scramble_state::harem_decrypt_bit_w(uint8_t data) { m_harem_decrypt_bit = data; } -WRITE8_MEMBER(scramble_state::harem_decrypt_clk_w) +void scramble_state::harem_decrypt_clk_w(uint8_t data) { if ((data & 1) && !(m_harem_decrypt_clk & 1)) { @@ -580,7 +580,7 @@ WRITE8_MEMBER(scramble_state::harem_decrypt_clk_w) } } -WRITE8_MEMBER(scramble_state::harem_decrypt_rst_w) +void scramble_state::harem_decrypt_rst_w(uint8_t data) { m_harem_decrypt_mode = 0; m_harem_decrypt_count = 0; @@ -638,6 +638,6 @@ void scramble_state::init_newsin7a() // ROM[0x0067] ^= 0x22; /* rst $00 - should be push hl - the NMI routine is corrupt in this set, but the IRQ routine bypasses it? intentional? */ // attempts to access port at c20x instead of 820x in one location, mirror or bitrot? - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc200, 0xc20f, read8_delegate(*this, FUNC(scramble_state::mars_ppi8255_1_r)), write8_delegate(*this, FUNC(scramble_state::mars_ppi8255_1_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc200, 0xc20f, read8sm_delegate(*this, FUNC(scramble_state::mars_ppi8255_1_r)), write8sm_delegate(*this, FUNC(scramble_state::mars_ppi8255_1_w))); } diff --git a/src/mame/machine/segas32.cpp b/src/mame/machine/segas32.cpp index 008b0f29609..adbe1d39ea2 100644 --- a/src/mame/machine/segas32.cpp +++ b/src/mame/machine/segas32.cpp @@ -51,7 +51,7 @@ void segas32_v25_state::decrypt_protrom() #if 0 // simulation -READ16_MEMBER(segas32_state::ga2_sprite_protection_r) +uint16_t segas32_state::ga2_sprite_protection_r(offs_t offset) { static const uint16_t prot[16] = { @@ -68,7 +68,7 @@ READ16_MEMBER(segas32_state::ga2_sprite_protection_r) return prot[offset]; } -READ16_MEMBER(segas32_state::ga2_wakeup_protection_r) +uint16_t segas32_state::ga2_wakeup_protection_r(offs_t offset) { static const char prot[] = "wake up! GOLDEN AXE The Revenge of Death-Adder! "; @@ -90,7 +90,7 @@ READ16_MEMBER(segas32_state::ga2_wakeup_protection_r) #define CURRENT_LEVEL_STATUS 0xF0BC #define LEVEL_ORDER_ARRAY 0x263A -WRITE16_MEMBER(segas32_state::sonic_level_load_protection) +void segas32_state::sonic_level_load_protection(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t level; //Perform write @@ -124,7 +124,7 @@ WRITE16_MEMBER(segas32_state::sonic_level_load_protection) // the protection board on many system32 games has full dma/bus access // and can write things into work RAM. we simulate that here for burning rival. -READ16_MEMBER(segas32_state::brival_protection_r) +uint16_t segas32_state::brival_protection_r(offs_t offset, uint16_t mem_mask) { if (mem_mask == 0xffff) // only trap on word-wide reads { @@ -140,7 +140,7 @@ READ16_MEMBER(segas32_state::brival_protection_r) return m_system32_workram[0xba00/2 + offset]; } -WRITE16_MEMBER(segas32_state::brival_protection_w) +void segas32_state::brival_protection_w(offs_t offset, uint16_t data) { static const int protAddress[6][2] = { @@ -211,14 +211,14 @@ void segas32_state::darkedge_fd1149_vblank() } } -WRITE16_MEMBER(segas32_state::darkedge_protection_w) +void segas32_state::darkedge_protection_w(offs_t offset, uint16_t data, uint16_t mem_mask) { logerror("%s:darkedge_prot_w(%06X) = %04X & %04X\n", machine().describe_context(), 0xa00000 + 2*offset, data, mem_mask); } -READ16_MEMBER(segas32_state::darkedge_protection_r) +uint16_t segas32_state::darkedge_protection_r(offs_t offset, uint16_t mem_mask) { logerror("%s:darkedge_prot_r(%06X) & %04X\n", machine().describe_context(), 0xa00000 + 2*offset, mem_mask); @@ -251,13 +251,13 @@ void segas32_state::f1lap_fd1149_vblank() ****************************************************************************** ******************************************************************************/ -WRITE16_MEMBER(segas32_state::dbzvrvs_protection_w) +void segas32_state::dbzvrvs_protection_w(address_space &space, uint16_t data) { space.write_word( 0x2080c8, space.read_word( 0x200044 ) ); } -READ16_MEMBER(segas32_state::dbzvrvs_protection_r) +uint16_t segas32_state::dbzvrvs_protection_r() { return 0xffff; } @@ -294,7 +294,7 @@ const uint8_t segas32_v25_state::arf_opcode_table[256] = { #undef xxxx #if 0 // old simulation -READ16_MEMBER(segas32_state::arabfgt_protection_r) +uint16_t segas32_state::arabfgt_protection_r() { int PC = m_maincpu->pc(); int cmpVal; @@ -314,11 +314,11 @@ READ16_MEMBER(segas32_state::arabfgt_protection_r) return 0; } -WRITE16_MEMBER(segas32_state::arabfgt_protection_w) +void segas32_state::arabfgt_protection_w(uint16_t data) { } -READ16_MEMBER(segas32_state::arf_wakeup_protection_r) +uint16_t segas32_state::arf_wakeup_protection_r(offs_t offset) { static const char prot[] = "wake up! ARF! "; @@ -331,7 +331,7 @@ READ16_MEMBER(segas32_state::arf_wakeup_protection_r) The J.League 1994 (Japan) ****************************************************************************** ******************************************************************************/ -WRITE16_MEMBER(segas32_state::jleague_protection_w) +void segas32_state::jleague_protection_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA( &m_system32_workram[0xf700/2 + offset ] ); @@ -374,7 +374,7 @@ WRITE16_MEMBER(segas32_state::jleague_protection_w) maybe the standalone board was for dev only? nop the 3 bytes at 0x06023A for standalone. (centred intro text) */ -READ16_MEMBER(segas32_state::arescue_dsp_r) +uint16_t segas32_state::arescue_dsp_r(offs_t offset) { if( offset == 4/2 ) { @@ -403,7 +403,7 @@ READ16_MEMBER(segas32_state::arescue_dsp_r) return m_arescue_dsp_io[offset]; } -WRITE16_MEMBER(segas32_state::arescue_dsp_w) +void segas32_state::arescue_dsp_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_arescue_dsp_io[offset]); } diff --git a/src/mame/machine/seibucop.cpp b/src/mame/machine/seibucop.cpp index 366ac23f489..1d546c9a746 100644 --- a/src/mame/machine/seibucop.cpp +++ b/src/mame/machine/seibucop.cpp @@ -320,7 +320,7 @@ void raiden2cop_device::cop_write_byte(int address, uint8_t data) -WRITE16_MEMBER(raiden2cop_device::cop_pgm_data_w) +void raiden2cop_device::cop_pgm_data_w(offs_t offset, uint16_t data, uint16_t mem_mask) { assert(ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15); cop_program[cop_latch_addr] = data; @@ -437,26 +437,26 @@ void raiden2cop_device::dump_table() } -WRITE16_MEMBER(raiden2cop_device::cop_pgm_addr_w) +void raiden2cop_device::cop_pgm_addr_w(offs_t offset, uint16_t data, uint16_t mem_mask) { assert(ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15); assert(data < 0x100); cop_latch_addr = data; } -WRITE16_MEMBER(raiden2cop_device::cop_pgm_value_w) +void raiden2cop_device::cop_pgm_value_w(offs_t offset, uint16_t data, uint16_t mem_mask) { assert(ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15); cop_latch_value = data; } -WRITE16_MEMBER(raiden2cop_device::cop_pgm_mask_w) +void raiden2cop_device::cop_pgm_mask_w(offs_t offset, uint16_t data, uint16_t mem_mask) { assert(ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15); cop_latch_mask = data; } -WRITE16_MEMBER(raiden2cop_device::cop_pgm_trigger_w) +void raiden2cop_device::cop_pgm_trigger_w(offs_t offset, uint16_t data, uint16_t mem_mask) { assert(ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15); cop_latch_trigger = data; @@ -684,52 +684,52 @@ int raiden2cop_device::check_command_matches(int command, uint16_t seq0, uint16_ /*** Regular DMA ***/ -WRITE16_MEMBER(raiden2cop_device::cop_dma_adr_rel_w) +void raiden2cop_device::cop_dma_adr_rel_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_adr_rel); } -WRITE16_MEMBER(raiden2cop_device::cop_dma_v1_w) +void raiden2cop_device::cop_dma_v1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_v1); } -WRITE16_MEMBER(raiden2cop_device::cop_dma_v2_w) +void raiden2cop_device::cop_dma_v2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_v2); } -WRITE16_MEMBER(raiden2cop_device::cop_dma_dst_w) +void raiden2cop_device::cop_dma_dst_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_dst[cop_dma_mode]); } -READ16_MEMBER(raiden2cop_device::cop_dma_mode_r) +uint16_t raiden2cop_device::cop_dma_mode_r() { return cop_dma_mode; } -WRITE16_MEMBER(raiden2cop_device::cop_dma_mode_w) +void raiden2cop_device::cop_dma_mode_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_mode); } -WRITE16_MEMBER(raiden2cop_device::cop_dma_src_w) +void raiden2cop_device::cop_dma_src_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_src[cop_dma_mode]); } -WRITE16_MEMBER(raiden2cop_device::cop_dma_size_w) +void raiden2cop_device::cop_dma_size_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_dma_size[cop_dma_mode]); } -WRITE16_MEMBER(raiden2cop_device::cop_pal_brightness_val_w) +void raiden2cop_device::cop_pal_brightness_val_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&pal_brightness_val); } -WRITE16_MEMBER(raiden2cop_device::cop_pal_brightness_mode_w) +void raiden2cop_device::cop_pal_brightness_mode_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&pal_brightness_mode); } @@ -743,7 +743,7 @@ uint8_t raiden2cop_device::fade_table(int v) return (low * (high | (high >> 5)) + 0x210) >> 10; } -WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) +void raiden2cop_device::cop_dma_trigger_w(uint16_t data) { #if 0 if (cop_dma_mode != 0x14 && cop_dma_mode != 0x15) @@ -888,14 +888,14 @@ void raiden2cop_device::bcd_update() cop_itoa_digits[9] = 0; } -WRITE16_MEMBER(raiden2cop_device::cop_itoa_low_w) +void raiden2cop_device::cop_itoa_low_w(offs_t offset, uint16_t data, uint16_t mem_mask) { cop_itoa = (cop_itoa & ~uint32_t(mem_mask)) | (data & mem_mask); bcd_update(); } -WRITE16_MEMBER(raiden2cop_device::cop_itoa_high_w) +void raiden2cop_device::cop_itoa_high_w(offs_t offset, uint16_t data, uint16_t mem_mask) { cop_itoa = (cop_itoa & ~(mem_mask << 16)) | ((data & mem_mask) << 16); @@ -903,7 +903,7 @@ WRITE16_MEMBER(raiden2cop_device::cop_itoa_high_w) bcd_update(); } -WRITE16_MEMBER(raiden2cop_device::cop_itoa_mode_w) +void raiden2cop_device::cop_itoa_mode_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // BCD / Number conversion related parameter // The former working hypothesis that this value is some sort of digit count is almost certainly incorrect @@ -913,63 +913,63 @@ WRITE16_MEMBER(raiden2cop_device::cop_itoa_mode_w) COMBINE_DATA(&cop_itoa_mode); } -READ16_MEMBER(raiden2cop_device::cop_itoa_digits_r) +uint16_t raiden2cop_device::cop_itoa_digits_r(offs_t offset) { return cop_itoa_digits[offset*2] | (cop_itoa_digits[offset*2+1] << 8); } -READ16_MEMBER( raiden2cop_device::cop_status_r) +uint16_t raiden2cop_device::cop_status_r() { return cop_status; } -READ16_MEMBER( raiden2cop_device::cop_angle_r) +uint16_t raiden2cop_device::cop_angle_r() { return cop_angle; } -READ16_MEMBER( raiden2cop_device::cop_dist_r) +uint16_t raiden2cop_device::cop_dist_r() { return cop_dist; } -WRITE16_MEMBER( raiden2cop_device::cop_scale_w) +void raiden2cop_device::cop_scale_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_scale); cop_scale &= 3; } -WRITE16_MEMBER( raiden2cop_device::cop_angle_target_w) +void raiden2cop_device::cop_angle_target_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_angle_target); } -WRITE16_MEMBER( raiden2cop_device::cop_angle_step_w) +void raiden2cop_device::cop_angle_step_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_angle_step); } -READ16_MEMBER( raiden2cop_device::cop_reg_high_r) +uint16_t raiden2cop_device::cop_reg_high_r(offs_t offset) { return cop_regs[offset] >> 16; } -WRITE16_MEMBER( raiden2cop_device::cop_reg_high_w) +void raiden2cop_device::cop_reg_high_w(offs_t offset, uint16_t data, uint16_t mem_mask) { cop_regs[offset] = (cop_regs[offset] & ~(mem_mask << 16)) | ((data & mem_mask) << 16); } -READ16_MEMBER( raiden2cop_device::cop_reg_low_r) +uint16_t raiden2cop_device::cop_reg_low_r(offs_t offset) { return cop_regs[offset]; } -WRITE16_MEMBER( raiden2cop_device::cop_reg_low_w) +void raiden2cop_device::cop_reg_low_w(offs_t offset, uint16_t data, uint16_t mem_mask) { cop_regs[offset] = (cop_regs[offset] & ~uint32_t(mem_mask)) | (data & mem_mask); } -WRITE16_MEMBER( raiden2cop_device::cop_hitbox_baseadr_w) +void raiden2cop_device::cop_hitbox_baseadr_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&cop_hit_baseadr); } @@ -1071,7 +1071,7 @@ void raiden2cop_device::cop_collision_update_hitbox(uint16_t data, int slot, ui } -WRITE16_MEMBER( raiden2cop_device::cop_cmd_w) +void raiden2cop_device::cop_cmd_w(offs_t offset, uint16_t data) { find_trigger_match(data, 0xf800); @@ -1188,100 +1188,100 @@ WRITE16_MEMBER( raiden2cop_device::cop_cmd_w) } } -READ16_MEMBER( raiden2cop_device::cop_collision_status_r) +uint16_t raiden2cop_device::cop_collision_status_r() { return cop_hit_status; } -READ16_MEMBER( raiden2cop_device::cop_collision_status_val_r) +uint16_t raiden2cop_device::cop_collision_status_val_r(offs_t offset) { return cop_hit_val[offset]; } -READ16_MEMBER( raiden2cop_device::cop_collision_status_stat_r) +uint16_t raiden2cop_device::cop_collision_status_stat_r() { return cop_hit_val_stat; } -WRITE16_MEMBER( raiden2cop_device::cop_sort_lookup_hi_w) +void raiden2cop_device::cop_sort_lookup_hi_w(uint16_t data) { cop_sort_lookup = (cop_sort_lookup&0x0000ffff)|(data<<16); } -WRITE16_MEMBER( raiden2cop_device::cop_sort_lookup_lo_w) +void raiden2cop_device::cop_sort_lookup_lo_w(uint16_t data) { cop_sort_lookup = (cop_sort_lookup&0xffff0000)|(data&0xffff); } -WRITE16_MEMBER( raiden2cop_device::cop_sort_ram_addr_hi_w) +void raiden2cop_device::cop_sort_ram_addr_hi_w(uint16_t data) { cop_sort_ram_addr = (cop_sort_ram_addr&0x0000ffff)|(data<<16); } -WRITE16_MEMBER( raiden2cop_device::cop_sort_ram_addr_lo_w) +void raiden2cop_device::cop_sort_ram_addr_lo_w(uint16_t data) { cop_sort_ram_addr = (cop_sort_ram_addr&0xffff0000)|(data&0xffff); } -WRITE16_MEMBER( raiden2cop_device::cop_sort_param_w) +void raiden2cop_device::cop_sort_param_w(uint16_t data) { cop_sort_param = data; } // TODO: trampoline -WRITE16_MEMBER( raiden2cop_device::cop_sort_dma_trig_w) +void raiden2cop_device::cop_sort_dma_trig_w(uint16_t data) { dma_zsorting(data); } /* Random number generators (only verified on 68k games) */ -READ16_MEMBER(raiden2cop_device::cop_prng_r) +uint16_t raiden2cop_device::cop_prng_r() { return m_host_cpu->total_cycles() % (m_cop_rng_max_value + 1); } /* max possible value returned by the RNG at 0x5a*, trusted */ -WRITE16_MEMBER(raiden2cop_device::cop_prng_maxvalue_w) +void raiden2cop_device::cop_prng_maxvalue_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cop_rng_max_value); } -READ16_MEMBER(raiden2cop_device::cop_prng_maxvalue_r) +uint16_t raiden2cop_device::cop_prng_maxvalue_r() { return m_cop_rng_max_value; } // misc used by 68k games (mostly grainbow?) -WRITE16_MEMBER( raiden2cop_device::cop_sprite_dma_param_hi_w) +void raiden2cop_device::cop_sprite_dma_param_hi_w(uint16_t data) { m_cop_sprite_dma_param = (m_cop_sprite_dma_param&0x0000ffff)|(data<<16); } -WRITE16_MEMBER( raiden2cop_device::cop_sprite_dma_param_lo_w) +void raiden2cop_device::cop_sprite_dma_param_lo_w(uint16_t data) { m_cop_sprite_dma_param = (m_cop_sprite_dma_param&0xffff0000)|(data&0xffff); } -WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_size_w) +void raiden2cop_device::cop_sprite_dma_size_w(uint16_t data) { m_cop_sprite_dma_size = data; } -WRITE16_MEMBER( raiden2cop_device::cop_sprite_dma_src_hi_w) +void raiden2cop_device::cop_sprite_dma_src_hi_w(uint16_t data) { m_cop_sprite_dma_src = (m_cop_sprite_dma_src&0x0000ffff)|(data<<16); } -WRITE16_MEMBER( raiden2cop_device::cop_sprite_dma_src_lo_w) +void raiden2cop_device::cop_sprite_dma_src_lo_w(uint16_t data) { m_cop_sprite_dma_src = (m_cop_sprite_dma_src&0xffff0000)|(data&0xffff); } -WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_inc_w) +void raiden2cop_device::cop_sprite_dma_inc_w(uint16_t data) { if (data) printf("Warning: COP RAM 0x410 used with %04x\n", data); @@ -1307,41 +1307,41 @@ WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_inc_w) // Involved with 0x9100/0x9180 and 0x9900/0x9980 // Some angle results seem to be stored here as well; legionna writes here when 0x138e raises the divide by zero flag -WRITE16_MEMBER( raiden2cop_device::cop_unk_param_a_w) +void raiden2cop_device::cop_unk_param_a_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cop_unk_param_a); } // Involved with 0x9100/0x9180 and 0x9900/0x9980 -WRITE16_MEMBER( raiden2cop_device::cop_unk_param_b_w) +void raiden2cop_device::cop_unk_param_b_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cop_unk_param_b); } // cupsoc always writes 0xF before commands 0x5105, 0x5905, 0xD104 and 0xF105 and 0xE before 0xDDE5, then resets this to zero // zeroteam writes 0xE here before 0xEDE5, then resets it to zero -WRITE16_MEMBER( raiden2cop_device::cop_precmd_w) +void raiden2cop_device::cop_precmd_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cop_precmd); } // cupsoc writes a longword before 0x5105 or 0xF105 (always 0xC000 for the latter) -WRITE16_MEMBER( raiden2cop_device::cop_rom_addr_lo_w) +void raiden2cop_device::cop_rom_addr_lo_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cop_rom_addr_lo); } -WRITE16_MEMBER( raiden2cop_device::cop_rom_addr_hi_w) +void raiden2cop_device::cop_rom_addr_hi_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cop_rom_addr_hi); } -WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_abs_y_w) +void raiden2cop_device::cop_sprite_dma_abs_y_w(uint16_t data) { m_cop_sprite_dma_abs_y = data; } -WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_abs_x_w) +void raiden2cop_device::cop_sprite_dma_abs_x_w(uint16_t data) { m_cop_sprite_dma_abs_x = data; } @@ -1359,7 +1359,7 @@ WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_abs_x_w) -WRITE16_MEMBER(raiden2cop_device::LEGACY_cop_cmd_w) +void raiden2cop_device::LEGACY_cop_cmd_w(offs_t offset, uint16_t data) { int command; diff --git a/src/mame/machine/seibucop.h b/src/mame/machine/seibucop.h index ff95ba29c8c..302bb8804e5 100644 --- a/src/mame/machine/seibucop.h +++ b/src/mame/machine/seibucop.h @@ -25,11 +25,11 @@ public: uint16_t cop_program[0x100]; /* program "code" */ uint16_t cop_latch_addr, cop_latch_trigger, cop_latch_value, cop_latch_mask; - DECLARE_WRITE16_MEMBER( cop_pgm_data_w ); - DECLARE_WRITE16_MEMBER( cop_pgm_addr_w ); - DECLARE_WRITE16_MEMBER( cop_pgm_value_w ); - DECLARE_WRITE16_MEMBER( cop_pgm_mask_w ); - DECLARE_WRITE16_MEMBER( cop_pgm_trigger_w ); + void cop_pgm_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_pgm_addr_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_pgm_value_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_pgm_mask_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_pgm_trigger_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // these are used by legionna.c to find the command based on trigger value // legionna/seicop implementation then looks up the command based on hardcoded sequences in the driver rather than actually using the trigger value (should be changed) @@ -46,20 +46,20 @@ public: uint16_t pal_brightness_val; uint16_t pal_brightness_mode; - DECLARE_WRITE16_MEMBER( cop_dma_v1_w ); - DECLARE_WRITE16_MEMBER( cop_dma_v2_w ); + void cop_dma_v1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_dma_v2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER( cop_dma_adr_rel_w ); - DECLARE_WRITE16_MEMBER( cop_dma_src_w ); - DECLARE_WRITE16_MEMBER( cop_dma_size_w ); - DECLARE_WRITE16_MEMBER( cop_dma_dst_w ); - DECLARE_READ16_MEMBER( cop_dma_mode_r ); - DECLARE_WRITE16_MEMBER( cop_dma_mode_w ); + void cop_dma_adr_rel_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_dma_src_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_dma_size_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_dma_dst_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cop_dma_mode_r(); + void cop_dma_mode_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER( cop_pal_brightness_val_w ); - DECLARE_WRITE16_MEMBER( cop_pal_brightness_mode_w ); + void cop_pal_brightness_val_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_pal_brightness_mode_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER ( cop_dma_trigger_w ); + void cop_dma_trigger_w(uint16_t data); uint8_t fade_table(int v); @@ -69,10 +69,10 @@ public: // Number Conversion - DECLARE_WRITE16_MEMBER( cop_itoa_low_w ); - DECLARE_WRITE16_MEMBER( cop_itoa_high_w ); - DECLARE_WRITE16_MEMBER( cop_itoa_mode_w ); - DECLARE_READ16_MEMBER ( cop_itoa_digits_r ); + void cop_itoa_low_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_itoa_high_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_itoa_mode_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cop_itoa_digits_r(offs_t offset); uint32_t cop_itoa; uint16_t cop_itoa_mode; @@ -80,25 +80,25 @@ public: // Main COP functionality - DECLARE_WRITE16_MEMBER( cop_scale_w ); - DECLARE_WRITE16_MEMBER( cop_angle_target_w ); - DECLARE_WRITE16_MEMBER( cop_angle_step_w ); + void cop_scale_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_angle_target_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_angle_step_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER ( cop_reg_high_r ); - DECLARE_WRITE16_MEMBER( cop_reg_high_w ); - DECLARE_READ16_MEMBER ( cop_reg_low_r ); - DECLARE_WRITE16_MEMBER( cop_reg_low_w ); + uint16_t cop_reg_high_r(offs_t offset); + void cop_reg_high_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cop_reg_low_r(offs_t offset); + void cop_reg_low_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER( cop_cmd_w ); - DECLARE_READ16_MEMBER ( cop_collision_status_r ); - DECLARE_READ16_MEMBER (cop_collision_status_val_r); - DECLARE_READ16_MEMBER (cop_collision_status_stat_r); + void cop_cmd_w(offs_t offset, uint16_t data); + uint16_t cop_collision_status_r(); + uint16_t cop_collision_status_val_r(offs_t offset); + uint16_t cop_collision_status_stat_r(); - DECLARE_READ16_MEMBER ( cop_status_r ); - DECLARE_READ16_MEMBER ( cop_dist_r ); - DECLARE_READ16_MEMBER ( cop_angle_r ); + uint16_t cop_status_r(); + uint16_t cop_dist_r(); + uint16_t cop_angle_r(); - DECLARE_WRITE16_MEMBER(cop_hitbox_baseadr_w); + void cop_hitbox_baseadr_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint32_t cop_regs[8]; @@ -146,50 +146,50 @@ public: uint32_t cop_sort_ram_addr, cop_sort_lookup; uint16_t cop_sort_param; - DECLARE_WRITE16_MEMBER(cop_sort_lookup_hi_w); - DECLARE_WRITE16_MEMBER(cop_sort_lookup_lo_w); - DECLARE_WRITE16_MEMBER(cop_sort_ram_addr_hi_w); - DECLARE_WRITE16_MEMBER(cop_sort_ram_addr_lo_w); - DECLARE_WRITE16_MEMBER(cop_sort_param_w); - DECLARE_WRITE16_MEMBER(cop_sort_dma_trig_w); + void cop_sort_lookup_hi_w(uint16_t data); + void cop_sort_lookup_lo_w(uint16_t data); + void cop_sort_ram_addr_hi_w(uint16_t data); + void cop_sort_ram_addr_lo_w(uint16_t data); + void cop_sort_param_w(uint16_t data); + void cop_sort_dma_trig_w(uint16_t data); // RNG (cupsoc) uint16_t m_cop_rng_max_value; - DECLARE_READ16_MEMBER(cop_prng_r); - DECLARE_WRITE16_MEMBER(cop_prng_maxvalue_w); - DECLARE_READ16_MEMBER(cop_prng_maxvalue_r); + uint16_t cop_prng_r(); + void cop_prng_maxvalue_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cop_prng_maxvalue_r(); // misc 68k (grainbow) uint32_t m_cop_sprite_dma_param; uint32_t m_cop_sprite_dma_src; - DECLARE_WRITE16_MEMBER(cop_sprite_dma_param_hi_w); - DECLARE_WRITE16_MEMBER(cop_sprite_dma_param_lo_w); - DECLARE_WRITE16_MEMBER(cop_sprite_dma_size_w); - DECLARE_WRITE16_MEMBER(cop_sprite_dma_src_hi_w); - DECLARE_WRITE16_MEMBER(cop_sprite_dma_src_lo_w); - DECLARE_WRITE16_MEMBER(cop_sprite_dma_inc_w); + void cop_sprite_dma_param_hi_w(uint16_t data); + void cop_sprite_dma_param_lo_w(uint16_t data); + void cop_sprite_dma_size_w(uint16_t data); + void cop_sprite_dma_src_hi_w(uint16_t data); + void cop_sprite_dma_src_lo_w(uint16_t data); + void cop_sprite_dma_inc_w(uint16_t data); int m_cop_sprite_dma_size; // misc 68k uint16_t m_cop_unk_param_a,m_cop_unk_param_b; - DECLARE_WRITE16_MEMBER(cop_unk_param_a_w); - DECLARE_WRITE16_MEMBER(cop_unk_param_b_w); + void cop_unk_param_a_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_unk_param_b_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t m_cop_rom_addr_lo,m_cop_rom_addr_hi,m_cop_precmd; - DECLARE_WRITE16_MEMBER(cop_precmd_w); - DECLARE_WRITE16_MEMBER(cop_rom_addr_lo_w); - DECLARE_WRITE16_MEMBER(cop_rom_addr_hi_w); + void cop_precmd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_rom_addr_lo_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cop_rom_addr_hi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); int m_cop_sprite_dma_abs_x,m_cop_sprite_dma_abs_y; int m_sprite_dma_rel_x, m_sprite_dma_rel_y; int m_sprite_dma_x_clip; - DECLARE_WRITE16_MEMBER(cop_sprite_dma_abs_y_w); - DECLARE_WRITE16_MEMBER(cop_sprite_dma_abs_x_w); + void cop_sprite_dma_abs_y_w(uint16_t data); + void cop_sprite_dma_abs_x_w(uint16_t data); // legacy code, to be removed / refactored into above int m_LEGACY_r0, m_LEGACY_r1; - DECLARE_WRITE16_MEMBER(LEGACY_cop_cmd_w); + void LEGACY_cop_cmd_w(offs_t offset, uint16_t data); // DEBUG void dump_table(); diff --git a/src/mame/machine/seicopbl.cpp b/src/mame/machine/seicopbl.cpp index b36f8130c90..58ee8a54d25 100644 --- a/src/mame/machine/seicopbl.cpp +++ b/src/mame/machine/seicopbl.cpp @@ -19,27 +19,27 @@ DEFINE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device, "seibu_cop_boot", "Seibu COP (bootleg)") -READ16_MEMBER(seibu_cop_bootleg_device::reg_lo_addr_r) +uint16_t seibu_cop_bootleg_device::reg_lo_addr_r(offs_t offset) { return m_reg[offset] & 0xffff; } -READ16_MEMBER(seibu_cop_bootleg_device::reg_hi_addr_r) +uint16_t seibu_cop_bootleg_device::reg_hi_addr_r(offs_t offset) { return m_reg[offset] >> 16; } -WRITE16_MEMBER(seibu_cop_bootleg_device::reg_lo_addr_w) +void seibu_cop_bootleg_device::reg_lo_addr_w(offs_t offset, uint16_t data) { m_reg[offset] = (m_reg[offset] & 0xffff0000) | (data & 0xffff); } -WRITE16_MEMBER(seibu_cop_bootleg_device::reg_hi_addr_w) +void seibu_cop_bootleg_device::reg_hi_addr_w(offs_t offset, uint16_t data) { m_reg[offset] = (m_reg[offset] & 0xffff) | (data << 16); } -WRITE16_MEMBER(seibu_cop_bootleg_device::cmd_trigger_w) +void seibu_cop_bootleg_device::cmd_trigger_w(offs_t offset, uint16_t data) { //printf("%04x %08x %08x\n",data,m_reg[0],m_reg[1]); uint8_t offs; @@ -324,27 +324,27 @@ WRITE16_MEMBER(seibu_cop_bootleg_device::cmd_trigger_w) } -READ16_MEMBER(seibu_cop_bootleg_device::status_r) +uint16_t seibu_cop_bootleg_device::status_r() { return m_status; } -READ16_MEMBER(seibu_cop_bootleg_device::dist_r) +uint16_t seibu_cop_bootleg_device::dist_r() { return m_dist; } -READ16_MEMBER(seibu_cop_bootleg_device::angle_r) +uint16_t seibu_cop_bootleg_device::angle_r() { return m_angle; } -READ16_MEMBER(seibu_cop_bootleg_device::d104_move_r) +uint16_t seibu_cop_bootleg_device::d104_move_r(offs_t offset) { return m_d104_move_offset >> offset*16; } -WRITE16_MEMBER(seibu_cop_bootleg_device::d104_move_w) +void seibu_cop_bootleg_device::d104_move_w(offs_t offset, uint16_t data) { if(offset == 1) m_d104_move_offset = (m_d104_move_offset & 0xffff0000) | (data & 0xffff); @@ -352,27 +352,27 @@ WRITE16_MEMBER(seibu_cop_bootleg_device::d104_move_w) m_d104_move_offset = (m_d104_move_offset & 0xffff) | (data << 16); } -READ16_MEMBER(seibu_cop_bootleg_device::prng_max_r) +uint16_t seibu_cop_bootleg_device::prng_max_r() { return m_prng_max; } -WRITE16_MEMBER(seibu_cop_bootleg_device::prng_max_w) +void seibu_cop_bootleg_device::prng_max_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_prng_max); } -READ16_MEMBER(seibu_cop_bootleg_device::prng_r) +uint16_t seibu_cop_bootleg_device::prng_r() { return m_host_cpu->total_cycles() % (m_prng_max + 1); } -READ16_MEMBER(seibu_cop_bootleg_device::scale_r) +uint16_t seibu_cop_bootleg_device::scale_r() { return m_scale; } -WRITE16_MEMBER(seibu_cop_bootleg_device::scale_w) +void seibu_cop_bootleg_device::scale_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scale); m_scale &= 3; @@ -457,12 +457,12 @@ inline void seibu_cop_bootleg_device::write_word(offs_t address, uint16_t data) space().write_word(address << 1, data); } -READ16_MEMBER( seibu_cop_bootleg_device::read ) +uint16_t seibu_cop_bootleg_device::read(offs_t offset) { return read_word(offset); } -WRITE16_MEMBER( seibu_cop_bootleg_device::write ) +void seibu_cop_bootleg_device::write(offs_t offset, uint16_t data) { write_word(offset,data); } diff --git a/src/mame/machine/seicopbl.h b/src/mame/machine/seicopbl.h index fe1f3192903..9d3b407abbc 100644 --- a/src/mame/machine/seicopbl.h +++ b/src/mame/machine/seicopbl.h @@ -19,24 +19,24 @@ public: seibu_cop_bootleg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ16_MEMBER( read ); - DECLARE_WRITE16_MEMBER( write ); + uint16_t read(offs_t offset); + void write(offs_t offset, uint16_t data); - DECLARE_READ16_MEMBER( reg_lo_addr_r ); - DECLARE_READ16_MEMBER( reg_hi_addr_r ); - DECLARE_READ16_MEMBER( status_r ); - DECLARE_READ16_MEMBER( dist_r ); - DECLARE_READ16_MEMBER( angle_r ); - DECLARE_WRITE16_MEMBER( reg_lo_addr_w ); - DECLARE_WRITE16_MEMBER( reg_hi_addr_w ); - DECLARE_WRITE16_MEMBER( cmd_trigger_w ); - DECLARE_READ16_MEMBER( d104_move_r ); - DECLARE_WRITE16_MEMBER( d104_move_w ); - DECLARE_READ16_MEMBER( prng_max_r ); - DECLARE_WRITE16_MEMBER( prng_max_w ); - DECLARE_READ16_MEMBER( prng_r ); - DECLARE_READ16_MEMBER( scale_r ); - DECLARE_WRITE16_MEMBER( scale_w ); + uint16_t reg_lo_addr_r(offs_t offset); + uint16_t reg_hi_addr_r(offs_t offset); + uint16_t status_r(); + uint16_t dist_r(); + uint16_t angle_r(); + void reg_lo_addr_w(offs_t offset, uint16_t data); + void reg_hi_addr_w(offs_t offset, uint16_t data); + void cmd_trigger_w(offs_t offset, uint16_t data); + uint16_t d104_move_r(offs_t offset); + void d104_move_w(offs_t offset, uint16_t data); + uint16_t prng_max_r(); + void prng_max_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t prng_r(); + uint16_t scale_r(); + void scale_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void seibucopbl_map(address_map &map); protected: diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp index f1fe3f20a21..2abbec6849d 100644 --- a/src/mame/machine/sgi.cpp +++ b/src/mame/machine/sgi.cpp @@ -311,7 +311,7 @@ void sgi_mc_device::dma_immediate() } } -READ32_MEMBER(sgi_mc_device::read) +uint32_t sgi_mc_device::read(offs_t offset, uint32_t mem_mask) { switch (offset & ~1) { @@ -487,7 +487,7 @@ READ32_MEMBER(sgi_mc_device::read) return 0; } -WRITE32_MEMBER( sgi_mc_device::write ) +void sgi_mc_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) { switch (offset & ~1) { diff --git a/src/mame/machine/sgi.h b/src/mame/machine/sgi.h index f637e2b326e..3e4ae444707 100644 --- a/src/mame/machine/sgi.h +++ b/src/mame/machine/sgi.h @@ -30,8 +30,8 @@ public: auto int_dma_done_cb() { return m_int_dma_done_cb.bind(); } auto eisa_present() { return m_eisa_present.bind(); } - DECLARE_READ32_MEMBER(read); - DECLARE_WRITE32_MEMBER(write); + uint32_t read(offs_t offset, uint32_t mem_mask = ~0); + void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void set_cpu_buserr(uint32_t address, uint64_t mem_mask); uint32_t get_mem_config(int channel) const { return m_mem_config[channel]; } diff --git a/src/mame/machine/simpsons.cpp b/src/mame/machine/simpsons.cpp index 5606f44b376..9d6610a0b6d 100644 --- a/src/mame/machine/simpsons.cpp +++ b/src/mame/machine/simpsons.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ -WRITE8_MEMBER(simpsons_state::simpsons_eeprom_w) +void simpsons_state::simpsons_eeprom_w(uint8_t data) { if (data == 0xff) return; @@ -32,7 +32,7 @@ WRITE8_MEMBER(simpsons_state::simpsons_eeprom_w) ***************************************************************************/ -WRITE8_MEMBER(simpsons_state::simpsons_coin_counter_w) +void simpsons_state::simpsons_coin_counter_w(uint8_t data) { /* bit 0,1 coin counters */ machine().bookkeeping().coin_counter_w(0, data & 0x01); @@ -45,7 +45,7 @@ WRITE8_MEMBER(simpsons_state::simpsons_coin_counter_w) m_k053246->k053246_set_objcha_line((~data & 0x20) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER(simpsons_state::simpsons_sound_interrupt_r) +uint8_t simpsons_state::simpsons_sound_interrupt_r() { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff ); // Z80 return 0x00; diff --git a/src/mame/machine/slapfght.cpp b/src/mame/machine/slapfght.cpp index efdd07536b0..061594a801c 100644 --- a/src/mame/machine/slapfght.cpp +++ b/src/mame/machine/slapfght.cpp @@ -14,7 +14,7 @@ /**************************************************************************/ -READ8_MEMBER(slapfght_state::tigerh_mcu_status_r) +uint8_t slapfght_state::tigerh_mcu_status_r() { return (m_screen->vblank() ? 0x01 : 0x00) | @@ -37,7 +37,7 @@ void slapfght_state::scroll_from_mcu_w(offs_t offset, uint8_t data) ***************************************************************************/ -READ8_MEMBER(slapfght_state::getstar_mcusim_status_r) +uint8_t slapfght_state::getstar_mcusim_status_r() { static const int states[3]={ 0xc7, 0x55, 0x00 }; @@ -49,7 +49,7 @@ READ8_MEMBER(slapfght_state::getstar_mcusim_status_r) return m_getstar_status; } -READ8_MEMBER(slapfght_state::getstar_mcusim_r) +uint8_t slapfght_state::getstar_mcusim_r() { uint8_t getstar_val = 0; uint8_t lives_lookup_table[] = {0x03, 0x05, 0x01, 0x02}; /* table at 0x0e62 in 'getstarb1' */ @@ -85,7 +85,7 @@ READ8_MEMBER(slapfght_state::getstar_mcusim_r) return getstar_val; } -WRITE8_MEMBER(slapfght_state::getstar_mcusim_w) +void slapfght_state::getstar_mcusim_w(uint8_t data) { /* due to code at 0x108d (GUARDIAN) or 0x1152 (GETSTARJ), register C is a unaltered copy of register A */ #define GS_SAVE_REGS m_gs_a = m_maincpu->state_int(Z80_BC) >> 0; \ @@ -188,7 +188,7 @@ WRITE8_MEMBER(slapfght_state::getstar_mcusim_w) ***************************************************************************/ -READ8_MEMBER(slapfght_state::tigerhb1_prot_r) +uint8_t slapfght_state::tigerhb1_prot_r() { uint8_t tigerhb_val = 0; switch (m_tigerhb_cmd) @@ -203,7 +203,7 @@ READ8_MEMBER(slapfght_state::tigerhb1_prot_r) return tigerhb_val; } -WRITE8_MEMBER(slapfght_state::tigerhb1_prot_w) +void slapfght_state::tigerhb1_prot_w(uint8_t data) { switch (data) { @@ -221,7 +221,7 @@ WRITE8_MEMBER(slapfght_state::tigerhb1_prot_w) /**************************************************************************/ -READ8_MEMBER(slapfght_state::getstarb1_prot_r) +uint8_t slapfght_state::getstarb1_prot_r() { /* The bootleg has it's own 'protection' on startup ? 6D1A: 06 04 ld b,$04 diff --git a/src/mame/machine/special.cpp b/src/mame/machine/special.cpp index fa2fa90499e..5796136db8f 100644 --- a/src/mame/machine/special.cpp +++ b/src/mame/machine/special.cpp @@ -140,18 +140,18 @@ void special_state::device_timer(emu_timer &timer, device_timer_id id, int param /* Specialist MX */ -WRITE8_MEMBER( special_state::video_memory_w ) +void special_state::video_memory_w(offs_t offset, uint8_t data) { m_ram->pointer()[0x9000 + offset] = data; m_specimx_colorram[offset] = m_specimx_color; } -WRITE8_MEMBER( special_state::specimx_video_color_w ) +void special_state::specimx_video_color_w(uint8_t data) { m_specimx_color = data; } -READ8_MEMBER( special_state::specimx_video_color_r ) +uint8_t special_state::specimx_video_color_r() { return m_specimx_color; } @@ -168,7 +168,7 @@ void special_state::specimx_set_bank(offs_t i, uint8_t data) { case 0 : space.install_write_bank(0x0000, 0x8fff, "bank1"); - space.install_write_handler(0x9000, 0xbfff, write8_delegate(*this, FUNC(special_state::video_memory_w))); + space.install_write_handler(0x9000, 0xbfff, write8sm_delegate(*this, FUNC(special_state::video_memory_w))); m_bank1->set_base(ram); m_bank2->set_base(ram + 0x9000); @@ -198,7 +198,7 @@ void special_state::specimx_set_bank(offs_t i, uint8_t data) } } -WRITE8_MEMBER( special_state::specimx_select_bank ) +void special_state::specimx_select_bank(offs_t offset, uint8_t data) { specimx_set_bank(offset, data); } @@ -214,7 +214,7 @@ MACHINE_RESET_MEMBER(special_state,specimx) timer_set(attotime::zero, TIMER_PIT8253_GATES); } -READ8_MEMBER( special_state::specimx_disk_ctrl_r ) +uint8_t special_state::specimx_disk_ctrl_r() { return 0xff; } @@ -227,7 +227,7 @@ WRITE_LINE_MEMBER( special_state::fdc_drq ) } } -WRITE8_MEMBER( special_state::specimx_disk_ctrl_w ) +void special_state::specimx_disk_ctrl_w(offs_t offset, uint8_t data) { floppy_image_device *floppy = nullptr; floppy_connector *con = m_fdd[m_drive & 1].target(); @@ -341,23 +341,23 @@ MACHINE_RESET_MEMBER(special_state,erik) erik_set_bank(); } -READ8_MEMBER( special_state::erik_rr_reg_r ) +uint8_t special_state::erik_rr_reg_r() { return m_RR_register; } -WRITE8_MEMBER( special_state::erik_rr_reg_w ) +void special_state::erik_rr_reg_w(uint8_t data) { m_RR_register = data; erik_set_bank(); } -READ8_MEMBER( special_state::erik_rc_reg_r ) +uint8_t special_state::erik_rc_reg_r() { return m_RC_register; } -WRITE8_MEMBER( special_state::erik_rc_reg_w ) +void special_state::erik_rc_reg_w(uint8_t data) { m_RC_register = data; m_erik_color_1 = m_RC_register & 7; @@ -365,12 +365,12 @@ WRITE8_MEMBER( special_state::erik_rc_reg_w ) m_erik_background = BIT(m_RC_register, 6) + BIT(m_RC_register, 7) * 4; } -READ8_MEMBER( special_state::erik_disk_reg_r ) +uint8_t special_state::erik_disk_reg_r() { return 0xff; } -WRITE8_MEMBER( special_state::erik_disk_reg_w ) +void special_state::erik_disk_reg_w(uint8_t data) { /* wd17xx_set_side (m_fdc,data & 1); diff --git a/src/mame/machine/starwars.cpp b/src/mame/machine/starwars.cpp index e5bae0674ea..dcaf2205f3a 100644 --- a/src/mame/machine/starwars.cpp +++ b/src/mame/machine/starwars.cpp @@ -42,7 +42,7 @@ TIMER_CALLBACK_MEMBER(starwars_state::math_run_clear) * *************************************/ -WRITE8_MEMBER(starwars_state::starwars_nstore_w) +void starwars_state::starwars_nstore_w(uint8_t data) { m_novram->store(0); m_novram->store(1); @@ -302,7 +302,7 @@ void starwars_state::run_mproc() * *************************************/ -READ8_MEMBER(starwars_state::starwars_prng_r) +uint8_t starwars_state::starwars_prng_r() { /* * The PRNG is a modified 23 bit LFSR. Taps are at 4 and 22 so the @@ -332,19 +332,19 @@ WRITE_LINE_MEMBER(starwars_state::prng_reset_w) * *************************************/ -READ8_MEMBER(starwars_state::starwars_div_reh_r) +uint8_t starwars_state::starwars_div_reh_r() { return (m_quotient_shift & 0xff00) >> 8; } -READ8_MEMBER(starwars_state::starwars_div_rel_r) +uint8_t starwars_state::starwars_div_rel_r() { return m_quotient_shift & 0x00ff; } -WRITE8_MEMBER(starwars_state::starwars_math_w) +void starwars_state::starwars_math_w(offs_t offset, uint8_t data) { int i; diff --git a/src/mame/machine/stfight.cpp b/src/mame/machine/stfight.cpp index f79776e7b73..9869440ff42 100644 --- a/src/mame/machine/stfight.cpp +++ b/src/mame/machine/stfight.cpp @@ -107,7 +107,7 @@ void stfight_state::machine_reset() // It's entirely possible that this bank is never switched out // - in fact I don't even know how/where it's switched in! -WRITE8_MEMBER(stfight_state::stfight_bank_w) +void stfight_state::stfight_bank_w(uint8_t data) { m_main_bank->set_entry(bitswap(data, 7, 2)); } @@ -140,19 +140,19 @@ INTERRUPT_GEN_MEMBER(stfight_state::stfight_vb_interrupt) * Hardware handlers */ -WRITE8_MEMBER(stfight_state::stfight_io_w) +void stfight_state::stfight_io_w(uint8_t data) { // TODO: What is bit 4? machine().bookkeeping().coin_counter_w(0, data & 1); machine().bookkeeping().coin_counter_w(1, data & 2); } -READ8_MEMBER(stfight_state::stfight_coin_r) +uint8_t stfight_state::stfight_coin_r() { return m_coin_state; } -WRITE8_MEMBER(stfight_state::stfight_coin_w) +void stfight_state::stfight_coin_w(uint8_t data) { // Acknowledge coin signals (active low) if (!BIT(data, 0)) @@ -192,13 +192,13 @@ WRITE_LINE_MEMBER(stfight_state::stfight_adpcm_int) * Machine hardware for YM2303 FM sound control */ -WRITE8_MEMBER(stfight_state::stfight_fm_w) +void stfight_state::stfight_fm_w(uint8_t data) { // The sound cpu ignores any FM data without bit 7 set m_fm_data = 0x80 | data; } -READ8_MEMBER(stfight_state::stfight_fm_r) +uint8_t stfight_state::stfight_fm_r() { uint8_t const data = m_fm_data; @@ -214,7 +214,7 @@ READ8_MEMBER(stfight_state::stfight_fm_r) * MCU communications */ -WRITE8_MEMBER(stfight_state::stfight_mcu_w) +void stfight_state::stfight_mcu_w(uint8_t data) { m_cpu_to_mcu_data = data & 0x0f; m_cpu_to_mcu_empty = false; diff --git a/src/mame/machine/stvprot.cpp b/src/mame/machine/stvprot.cpp index 4344696389a..91906ff28ff 100644 --- a/src/mame/machine/stvprot.cpp +++ b/src/mame/machine/stvprot.cpp @@ -28,7 +28,7 @@ * *************************************/ -READ32_MEMBER( stv_state::common_prot_r ) +uint32_t stv_state::common_prot_r(offs_t offset) { uint32_t *ROM = (uint32_t *)machine().root_device().memregion("abus")->base(); @@ -60,7 +60,7 @@ uint16_t stv_state::crypt_read_callback(uint32_t addr) return ((dat&0xff00)>>8)|((dat&0x00ff)<<8); } -WRITE32_MEMBER ( stv_state::common_prot_w ) +void stv_state::common_prot_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_a_bus[offset]); @@ -84,7 +84,8 @@ WRITE32_MEMBER ( stv_state::common_prot_w ) void stv_state::install_common_protection() { - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4fffff0, 0x4ffffff, read32_delegate(*this, FUNC(stv_state::common_prot_r)), write32_delegate(*this, FUNC(stv_state::common_prot_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4fffff0, 0x4ffffff, read32sm_delegate(*this, FUNC(stv_state::common_prot_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x4fffff0, 0x4ffffff, write32s_delegate(*this, FUNC(stv_state::common_prot_w))); } void stv_state::stv_register_protection_savestates() diff --git a/src/mame/machine/subs.cpp b/src/mame/machine/subs.cpp index b12e8cabbe5..6c2d9e41dde 100644 --- a/src/mame/machine/subs.cpp +++ b/src/mame/machine/subs.cpp @@ -108,7 +108,7 @@ int subs_state::steering_2() /*************************************************************************** steer_reset ***************************************************************************/ -WRITE8_MEMBER(subs_state::steer_reset_w) +void subs_state::steer_reset_w(uint8_t data) { m_steering_val1 = 0x00; m_steering_val2 = 0x00; @@ -117,7 +117,7 @@ WRITE8_MEMBER(subs_state::steer_reset_w) /*************************************************************************** control_r ***************************************************************************/ -READ8_MEMBER(subs_state::control_r) +uint8_t subs_state::control_r(offs_t offset) { int inport = ioport("IN0")->read(); @@ -139,7 +139,7 @@ READ8_MEMBER(subs_state::control_r) /*************************************************************************** coin_r ***************************************************************************/ -READ8_MEMBER(subs_state::coin_r) +uint8_t subs_state::coin_r(offs_t offset) { int inport = ioport("IN1")->read(); @@ -161,7 +161,7 @@ READ8_MEMBER(subs_state::coin_r) /*************************************************************************** options_r ***************************************************************************/ -READ8_MEMBER(subs_state::options_r) +uint8_t subs_state::options_r(offs_t offset) { int opts = ioport("DSW")->read(); diff --git a/src/mame/machine/swtpc09.cpp b/src/mame/machine/swtpc09.cpp index 34da9f40b7e..c8fba859dc7 100644 --- a/src/mame/machine/swtpc09.cpp +++ b/src/mame/machine/swtpc09.cpp @@ -23,7 +23,7 @@ #define OS9_DC5 5 -READ8_MEMBER(swtpc09_state::unmapped_r) +uint8_t swtpc09_state::unmapped_r(offs_t offset) { if (!machine().side_effects_disabled()) { logerror("%s Unmapped read from addr %04x\n", machine().describe_context(), offset); @@ -31,7 +31,7 @@ READ8_MEMBER(swtpc09_state::unmapped_r) return 0; } -WRITE8_MEMBER(swtpc09_state::unmapped_w) +void swtpc09_state::unmapped_w(offs_t offset, uint8_t data) { logerror("%s Unmapped write to addr %04x with data %02x\n", machine().describe_context(), offset, data); } @@ -229,7 +229,7 @@ uint8_t swtpc09_state::validate_fdc_sector_size(uint8_t cmd) /* DMAF2 Floppy Controller Board */ /*********************************************************************/ -READ8_MEMBER( swtpc09_state::dmaf2_fdc_r ) +uint8_t swtpc09_state::dmaf2_fdc_r(offs_t offset) { // TODO Does access to the dmaf2 fdc also trigger the motor timer? if (!machine().side_effects_disabled()) @@ -237,7 +237,7 @@ READ8_MEMBER( swtpc09_state::dmaf2_fdc_r ) return m_fdc->fd1797_device::read(offset); } -WRITE8_MEMBER ( swtpc09_state::dmaf2_fdc_w ) +void swtpc09_state::dmaf2_fdc_w(offs_t offset, uint8_t data) { // TODO Does access to the dmaf2 fdc also trigger the motor timer. floppy_motor_trigger(); @@ -253,14 +253,14 @@ WRITE8_MEMBER ( swtpc09_state::dmaf2_fdc_w ) /* DMAF2 dma extended address register latch. */ -READ8_MEMBER ( swtpc09_state::dmaf2_dma_address_reg_r ) +uint8_t swtpc09_state::dmaf2_dma_address_reg_r() { // This does not appear to be readable. logerror("%s Unexpected read of DMAF2 DMA address reg\n", machine().describe_context()); return 0x00; } -WRITE8_MEMBER ( swtpc09_state::dmaf2_dma_address_reg_w ) +void swtpc09_state::dmaf2_dma_address_reg_w(uint8_t data) { // This latch appears to be write-only, there is no reader function. // The DMAF2 has a single latch for the high address bits, so it would @@ -278,14 +278,14 @@ WRITE8_MEMBER ( swtpc09_state::dmaf2_dma_address_reg_w ) } /* DMAF2 fdc control register */ -READ8_MEMBER ( swtpc09_state::dmaf2_control_reg_r ) +uint8_t swtpc09_state::dmaf2_control_reg_r() { // TODO is this readable? logerror("%s Unexpected read from DMAF2 control reg\n", machine().describe_context()); return m_fdc_status; } -WRITE8_MEMBER ( swtpc09_state::dmaf2_control_reg_w ) +void swtpc09_state::dmaf2_control_reg_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -412,7 +412,7 @@ WRITE_LINE_MEMBER( swtpc09_state::fdc_sso_w ) /* DMAF3 Board */ /*********************************************************************/ -READ8_MEMBER( swtpc09_state::dmaf3_fdc_r ) +uint8_t swtpc09_state::dmaf3_fdc_r(offs_t offset) { // TODO Does access to the fdc also trigger the motor timer. if (!machine().side_effects_disabled()) @@ -420,7 +420,7 @@ READ8_MEMBER( swtpc09_state::dmaf3_fdc_r ) return m_fdc->fd1797_device::read(offset); } -WRITE8_MEMBER ( swtpc09_state::dmaf3_fdc_w ) +void swtpc09_state::dmaf3_fdc_w(offs_t offset, uint8_t data) { // TODO Does access to the fdc also trigger the motor timer. floppy_motor_trigger(); @@ -482,14 +482,14 @@ WRITE_LINE_MEMBER( swtpc09_state::dmaf3_via_irq ) } /* DMAF3 dma extended address register */ -READ8_MEMBER ( swtpc09_state::dmaf3_dma_address_reg_r ) +uint8_t swtpc09_state::dmaf3_dma_address_reg_r() { // TODO is this readable? logerror("%s Unexpected read of DMAF3 DMA address reg\n", machine().describe_context()); return 0x00; } -WRITE8_MEMBER ( swtpc09_state::dmaf3_dma_address_reg_w ) +void swtpc09_state::dmaf3_dma_address_reg_w(uint8_t data) { // Based on source code comments it appears that there are four high // address latches, one for each DMA channel. TODO check hardware or a @@ -502,14 +502,14 @@ WRITE8_MEMBER ( swtpc09_state::dmaf3_dma_address_reg_w ) } /* DMAF3 fdc control register */ -READ8_MEMBER ( swtpc09_state::dmaf3_control_reg_r ) +uint8_t swtpc09_state::dmaf3_control_reg_r() { // TODO is this readable? logerror("%s Unexpected read from DMAF3 control reg\n", machine().describe_context()); return m_fdc_status; } -WRITE8_MEMBER ( swtpc09_state::dmaf3_control_reg_w ) +void swtpc09_state::dmaf3_control_reg_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -564,46 +564,46 @@ WRITE_LINE_MEMBER( swtpc09_state::dmaf3_hdc_drq_w ) m6844_hdc_dma_transfer(1); } -READ8_MEMBER( swtpc09_state::dmaf3_hdc_control_r ) +uint8_t swtpc09_state::dmaf3_hdc_control_r() { // TODO head load toggle? return 0; } -WRITE8_MEMBER ( swtpc09_state::dmaf3_hdc_control_w ) +void swtpc09_state::dmaf3_hdc_control_w(uint8_t data) { // TODO head load toggle? } -READ8_MEMBER( swtpc09_state::dmaf3_hdc_reset_r ) +uint8_t swtpc09_state::dmaf3_hdc_reset_r() { // TODO reset? return 0; } -WRITE8_MEMBER ( swtpc09_state::dmaf3_hdc_reset_w ) +void swtpc09_state::dmaf3_hdc_reset_w(uint8_t data) { // TODO reset } -READ8_MEMBER( swtpc09_state::dmaf3_archive_reset_r ) +uint8_t swtpc09_state::dmaf3_archive_reset_r() { // TODO return 0; } -WRITE8_MEMBER ( swtpc09_state::dmaf3_archive_reset_w ) +void swtpc09_state::dmaf3_archive_reset_w(uint8_t data) { // TODO } -READ8_MEMBER( swtpc09_state::dmaf3_archive_clear_r ) +uint8_t swtpc09_state::dmaf3_archive_clear_r() { // TODO return 0; } -WRITE8_MEMBER ( swtpc09_state::dmaf3_archive_clear_w ) +void swtpc09_state::dmaf3_archive_clear_w(uint8_t data) { // TODO } @@ -620,7 +620,7 @@ offs_t swtpc09_state::dat_translate(offs_t offset) const return offs_t(m_dat[offset >> 12] ^ 0x0f) << 12 | (offset & 0x0fff); } -READ8_MEMBER(swtpc09_state::main_r) +uint8_t swtpc09_state::main_r(offs_t offset) { if (offset < 0xff00) return m_banked_space->read_byte(dat_translate(offset)); @@ -630,7 +630,7 @@ READ8_MEMBER(swtpc09_state::main_r) return m_banked_space->read_byte(offset | 0xfff00); } -WRITE8_MEMBER(swtpc09_state::main_w) +void swtpc09_state::main_w(offs_t offset, uint8_t data) { if (offset < 0xff00) m_banked_space->write_byte(dat_translate(offset), data); @@ -745,7 +745,7 @@ void swtpc09_state::m6844_hdc_dma_transfer(uint8_t channel) } } -READ8_MEMBER( swtpc09_state::m6844_r ) +uint8_t swtpc09_state::m6844_r(offs_t offset) { uint8_t result = 0; @@ -828,7 +828,7 @@ READ8_MEMBER( swtpc09_state::m6844_r ) } -WRITE8_MEMBER( swtpc09_state::m6844_w ) +void swtpc09_state::m6844_w(offs_t offset, uint8_t data) { int i; diff --git a/src/mame/video/sauro.cpp b/src/mame/video/sauro.cpp index 3d42be72193..cd228c55fa6 100644 --- a/src/mame/video/sauro.cpp +++ b/src/mame/video/sauro.cpp @@ -2,7 +2,7 @@ // copyright-holders:Zsolt Vasvari /*************************************************************************** - sauro.c + sauro.cpp Functions to emulate the video hardware of the machine. @@ -13,31 +13,31 @@ /* General */ -WRITE8_MEMBER(sauro_state::videoram_w) +void sauro_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sauro_state::colorram_w) +void sauro_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sauro_state::sauro_videoram2_w) +void sauro_state::sauro_videoram2_w(offs_t offset, uint8_t data) { m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sauro_state::sauro_colorram2_w) +void sauro_state::sauro_colorram2_w(offs_t offset, uint8_t data) { m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sauro_state::scroll_bg_w) +void sauro_state::scroll_bg_w(uint8_t data) { m_bg_tilemap->set_scrollx(0, data); } @@ -83,7 +83,7 @@ WRITE_LINE_MEMBER(sauro_state::sauro_palette_bank1_w) machine().tilemap().mark_all_dirty(); } -WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w) +void sauro_state::sauro_scroll_fg_w(uint8_t data) { const int *map = (flip_screen() ? scroll2_map_flip : scroll2_map); int scroll = (data & 0xf8) | map[data & 7]; diff --git a/src/mame/video/sbasketb.cpp b/src/mame/video/sbasketb.cpp index 73de0999b10..ce3d3628d41 100644 --- a/src/mame/video/sbasketb.cpp +++ b/src/mame/video/sbasketb.cpp @@ -90,13 +90,13 @@ void sbasketb_state::sbasketb_palette(palette_device &palette) const } } -WRITE8_MEMBER(sbasketb_state::sbasketb_videoram_w) +void sbasketb_state::sbasketb_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sbasketb_state::sbasketb_colorram_w) +void sbasketb_state::sbasketb_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/sbugger.cpp b/src/mame/video/sbugger.cpp index 4464d7f6936..fb32c49b745 100644 --- a/src/mame/video/sbugger.cpp +++ b/src/mame/video/sbugger.cpp @@ -15,13 +15,13 @@ TILE_GET_INFO_MEMBER(sbugger_state::get_tile_info) tileinfo.set(0,tileno,color,0); } -WRITE8_MEMBER(sbugger_state::videoram_w) +void sbugger_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sbugger_state::videoram_attr_w) +void sbugger_state::videoram_attr_w(offs_t offset, uint8_t data) { m_videoram_attr[offset] = data; m_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/scotrsht.cpp b/src/mame/video/scotrsht.cpp index 5614231e09d..dc8083fe519 100644 --- a/src/mame/video/scotrsht.cpp +++ b/src/mame/video/scotrsht.cpp @@ -33,19 +33,19 @@ void scotrsht_state::scotrsht_palette(palette_device &palette) const } } -WRITE8_MEMBER(scotrsht_state::videoram_w) +void scotrsht_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(scotrsht_state::colorram_w) +void scotrsht_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(scotrsht_state::charbank_w) +void scotrsht_state::charbank_w(uint8_t data) { if (m_charbank != (data & 0x01)) { @@ -56,7 +56,7 @@ WRITE8_MEMBER(scotrsht_state::charbank_w) // other bits unknown } -WRITE8_MEMBER(scotrsht_state::palettebank_w) +void scotrsht_state::palettebank_w(uint8_t data) { if (m_palette_bank != ((data & 0x70) >> 4)) { diff --git a/src/mame/video/sderby.cpp b/src/mame/video/sderby.cpp index d04126fec94..150cea7a7cf 100644 --- a/src/mame/video/sderby.cpp +++ b/src/mame/video/sderby.cpp @@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_tile_info) tileinfo.set(1,tileno,colour,0); } -WRITE16_MEMBER(sderby_state::sderby_videoram_w) +void sderby_state::sderby_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[offset]); m_tilemap->mark_tile_dirty(offset/2); @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_md_tile_info) tileinfo.set(1,tileno,colour+16,0); } -WRITE16_MEMBER(sderby_state::sderby_md_videoram_w) +void sderby_state::sderby_md_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_md_videoram[offset]); m_md_tilemap->mark_tile_dirty(offset/2); @@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_fg_tile_info) tileinfo.set(0,tileno,colour+32,0); } -WRITE16_MEMBER(sderby_state::sderby_fg_videoram_w) +void sderby_state::sderby_fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_fg_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset/2); @@ -117,7 +117,7 @@ uint32_t sderby_state::screen_update_pmroulet(screen_device &screen, bitmap_ind1 } -WRITE16_MEMBER(sderby_state::sderby_scroll_w) +void sderby_state::sderby_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data = COMBINE_DATA(&m_scroll[offset]); diff --git a/src/mame/video/sega16sp.cpp b/src/mame/video/sega16sp.cpp index 970f1a40b90..3eed24e8e7b 100644 --- a/src/mame/video/sega16sp.cpp +++ b/src/mame/video/sega16sp.cpp @@ -65,7 +65,7 @@ void sega_16bit_sprite_device::device_start() // draw_write -- trigger a buffer flip //------------------------------------------------- -WRITE16_MEMBER( sega_16bit_sprite_device::draw_write ) +void sega_16bit_sprite_device::draw_write(uint16_t data) { uint32_t *src = reinterpret_cast<uint32_t *>(spriteram()); uint32_t *dst = reinterpret_cast<uint32_t *>(buffer()); diff --git a/src/mame/video/sega16sp.h b/src/mame/video/sega16sp.h index fd40bc2cc75..739865a8f4c 100644 --- a/src/mame/video/sega16sp.h +++ b/src/mame/video/sega16sp.h @@ -60,7 +60,7 @@ public: }; // write trigger memory handler - DECLARE_WRITE16_MEMBER( draw_write ); + void draw_write(uint16_t data); protected: // device-level overrides diff --git a/src/mame/video/segag80r.cpp b/src/mame/video/segag80r.cpp index 5e3b87ebea1..b3bc8eae218 100644 --- a/src/mame/video/segag80r.cpp +++ b/src/mame/video/segag80r.cpp @@ -262,9 +262,8 @@ void segag80r_state::video_start() * *************************************/ -WRITE8_MEMBER(segag80r_state::segag80r_videoram_w) +void segag80r_state::segag80r_videoram_w(offs_t offset, uint8_t data) { - uint8_t *videoram = m_videoram; /* accesses to the upper half of VRAM go to paletteram if selected */ if ((offset & 0x1000) && (m_video_control & 0x02)) { @@ -275,7 +274,7 @@ WRITE8_MEMBER(segag80r_state::segag80r_videoram_w) } /* all other accesses go to videoram */ - videoram[offset] = data; + m_videoram[offset] = data; /* track which characters are dirty */ if (offset & 0x800) @@ -290,7 +289,7 @@ WRITE8_MEMBER(segag80r_state::segag80r_videoram_w) * *************************************/ -READ8_MEMBER(segag80r_state::segag80r_video_port_r) +uint8_t segag80r_state::segag80r_video_port_r(offs_t offset) { if (offset == 0) { @@ -310,7 +309,7 @@ READ8_MEMBER(segag80r_state::segag80r_video_port_r) } -WRITE8_MEMBER(segag80r_state::segag80r_video_port_w) +void segag80r_state::segag80r_video_port_w(offs_t offset, uint8_t data) { if (offset == 0) { @@ -338,7 +337,7 @@ WRITE8_MEMBER(segag80r_state::segag80r_video_port_w) * *************************************/ -READ8_MEMBER(segag80r_state::spaceod_back_port_r) +uint8_t segag80r_state::spaceod_back_port_r(offs_t offset) { /* force an update to get the current detection value */ m_screen->update_partial(m_screen->vpos()); @@ -346,7 +345,7 @@ READ8_MEMBER(segag80r_state::spaceod_back_port_r) } -WRITE8_MEMBER(segag80r_state::spaceod_back_port_w) +void segag80r_state::spaceod_back_port_w(offs_t offset, uint8_t data) { switch (offset & 7) { @@ -426,7 +425,7 @@ WRITE8_MEMBER(segag80r_state::spaceod_back_port_w) * *************************************/ -WRITE8_MEMBER(segag80r_state::monsterb_videoram_w) +void segag80r_state::monsterb_videoram_w(offs_t offset, uint8_t data) { /* accesses to the area $f040-$f07f go to background palette if */ /* the palette access enable bit is set */ @@ -440,11 +439,11 @@ WRITE8_MEMBER(segag80r_state::monsterb_videoram_w) } /* handle everything else */ - segag80r_videoram_w(space, offset, data); + segag80r_videoram_w(offset, data); } -WRITE8_MEMBER(segag80r_state::monsterb_back_port_w) +void segag80r_state::monsterb_back_port_w(offs_t offset, uint8_t data) { switch (offset & 7) { @@ -496,7 +495,7 @@ WRITE8_MEMBER(segag80r_state::monsterb_back_port_w) * *************************************/ -WRITE8_MEMBER(segag80r_state::pignewt_videoram_w) +void segag80r_state::pignewt_videoram_w(offs_t offset, uint8_t data) { /* accesses to the area $f040-$f07f go to background palette if */ /* the palette access enable bit is set */ @@ -509,11 +508,11 @@ WRITE8_MEMBER(segag80r_state::pignewt_videoram_w) } /* handle everything else */ - segag80r_videoram_w(space, offset, data); + segag80r_videoram_w(offset, data); } -WRITE8_MEMBER(segag80r_state::pignewt_back_color_w) +void segag80r_state::pignewt_back_color_w(offs_t offset, uint8_t data) { /* it is not really known what this does */ if (offset == 0) @@ -523,7 +522,7 @@ WRITE8_MEMBER(segag80r_state::pignewt_back_color_w) } -WRITE8_MEMBER(segag80r_state::pignewt_back_port_w) +void segag80r_state::pignewt_back_port_w(offs_t offset, uint8_t data) { switch (offset & 7) { @@ -579,7 +578,7 @@ WRITE8_MEMBER(segag80r_state::pignewt_back_port_w) * *************************************/ -WRITE8_MEMBER(segag80r_state::sindbadm_videoram_w) +void segag80r_state::sindbadm_videoram_w(offs_t offset, uint8_t data) { /* accesses to the area $f000-$f03f go to background palette if */ /* the palette access enable bit is set */ @@ -592,11 +591,11 @@ WRITE8_MEMBER(segag80r_state::sindbadm_videoram_w) } /* handle everything else */ - segag80r_videoram_w(space, offset, data); + segag80r_videoram_w(offset, data); } -WRITE8_MEMBER(segag80r_state::sindbadm_back_port_w) +void segag80r_state::sindbadm_back_port_w(offs_t offset, uint8_t data) { switch (offset & 3) { diff --git a/src/mame/video/segaic16.cpp b/src/mame/video/segaic16.cpp index 35c8abae679..8577151a4b5 100644 --- a/src/mame/video/segaic16.cpp +++ b/src/mame/video/segaic16.cpp @@ -450,7 +450,7 @@ void sega_16bit_common_base::palette_init() // paletteram_w - handle writes to palette RAM //------------------------------------------------- -WRITE16_MEMBER( sega_16bit_common_base::paletteram_w ) +void sega_16bit_common_base::paletteram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { // compute the number of entries if (m_palette_entries == 0) @@ -476,7 +476,7 @@ WRITE16_MEMBER( sega_16bit_common_base::paletteram_w ) m_palette->set_pen_color(offset + 1 * m_palette_entries, effects); } -WRITE16_MEMBER( sega_16bit_common_base::hangon_paletteram_w ) +void sega_16bit_common_base::hangon_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // compute the number of entries if (m_palette_entries == 0) @@ -500,7 +500,7 @@ WRITE16_MEMBER( sega_16bit_common_base::hangon_paletteram_w ) m_palette->set_pen_color(offset + 2 * m_palette_entries, m_palette_hilight[r], m_palette_hilight[g], m_palette_hilight[b]); } -WRITE16_MEMBER( sega_16bit_common_base::philko_paletteram_w ) +void sega_16bit_common_base::philko_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // compute the number of entries if (m_palette_entries == 0) @@ -1442,26 +1442,26 @@ void segaic16_video_device::tilemap_set_colscroll(int which, int enable) * *************************************/ -READ16_MEMBER( segaic16_video_device::tileram_r ) +uint16_t segaic16_video_device::tileram_r(offs_t offset) { return m_tileram[offset]; } -WRITE16_MEMBER( segaic16_video_device::tileram_w ) +void segaic16_video_device::tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_tileram[offset]); m_bg_tilemap[0].tilemaps[offset / (64*32)]->mark_tile_dirty(offset % (64*32)); } -READ16_MEMBER( segaic16_video_device::textram_r ) +uint16_t segaic16_video_device::textram_r(offs_t offset) { return m_textram[offset]; } -WRITE16_MEMBER( segaic16_video_device::textram_w ) +void segaic16_video_device::textram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* certain ranges need immediate updates */ if (offset >= 0xe80/2) @@ -1593,7 +1593,7 @@ void segaic16_video_device::rotate_draw(int which, bitmap_ind16 &bitmap, const r * *************************************/ -READ16_MEMBER( segaic16_video_device::rotate_control_r ) +uint16_t segaic16_video_device::rotate_control_r() { struct rotate_info *info = &m_rotate[0]; diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h index e563a354d2d..5022f3efe02 100644 --- a/src/mame/video/segaic16.h +++ b/src/mame/video/segaic16.h @@ -27,9 +27,9 @@ class sega_16bit_common_base : public driver_device { public: // palette helpers - DECLARE_WRITE16_MEMBER( paletteram_w ); - DECLARE_WRITE16_MEMBER( hangon_paletteram_w ); - DECLARE_WRITE16_MEMBER( philko_paletteram_w ); + void paletteram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void hangon_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void philko_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); protected: // construction/destruction @@ -158,14 +158,14 @@ public: void tilemap_init(int which, int type, int colorbase, int xoffs, int numbanks); void rotate_init(int which, int type, int colorbase); - DECLARE_READ16_MEMBER( tileram_r ); - DECLARE_READ16_MEMBER( textram_r ); - DECLARE_WRITE16_MEMBER( tileram_w ); - DECLARE_WRITE16_MEMBER( textram_w ); + uint16_t tileram_r(offs_t offset); + uint16_t textram_r(offs_t offset); + void tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void textram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void rotate_draw(int which, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, bitmap_ind16 &srcbitmap); - DECLARE_READ16_MEMBER( rotate_control_r ); + uint16_t rotate_control_r(); TILE_GET_INFO_MEMBER( tilemap_16b_tile_info ); TILE_GET_INFO_MEMBER( tilemap_16b_text_info ); diff --git a/src/mame/video/segaic24.cpp b/src/mame/video/segaic24.cpp index 477d85f3040..08a3113e008 100644 --- a/src/mame/video/segaic24.cpp +++ b/src/mame/video/segaic24.cpp @@ -528,24 +528,24 @@ void segas24_tile_device::draw(screen_device &screen, bitmap_ind16 &bitmap, cons void segas24_tile_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int lpri, int flags) { draw_common(screen, bitmap, cliprect, layer, lpri, flags); } -READ16_MEMBER(segas24_tile_device::tile_r) +uint16_t segas24_tile_device::tile_r(offs_t offset) { return tile_ram[offset]; } -READ16_MEMBER(segas24_tile_device::char_r) +uint16_t segas24_tile_device::char_r(offs_t offset) { return char_ram[offset]; } -WRITE16_MEMBER(segas24_tile_device::tile_w) +void segas24_tile_device::tile_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(tile_ram.get() + offset); if(offset < 0x4000) tile_layer[offset >> 12]->mark_tile_dirty(offset & 0xfff); } -WRITE16_MEMBER(segas24_tile_device::char_w) +void segas24_tile_device::char_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t old = char_ram[offset]; COMBINE_DATA(char_ram.get() + offset); @@ -553,12 +553,12 @@ WRITE16_MEMBER(segas24_tile_device::char_w) gfx(char_gfx_index)->mark_dirty(offset / 16); } -WRITE16_MEMBER(segas24_tile_device::xhout_w) +void segas24_tile_device::xhout_w(uint16_t data) { m_xhout_write_cb(data); } -WRITE16_MEMBER(segas24_tile_device::xvout_w) +void segas24_tile_device::xvout_w(uint16_t data) { m_xvout_write_cb(data); } @@ -802,12 +802,12 @@ void segas24_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &cliprect } -WRITE16_MEMBER(segas24_sprite_device::write) +void segas24_sprite_device::write(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(sprite_ram.get() + offset); } -READ16_MEMBER(segas24_sprite_device::read) +uint16_t segas24_sprite_device::read(offs_t offset) { return sprite_ram[offset]; } @@ -824,12 +824,12 @@ void segas24_mixer_device::device_start() save_item(NAME(mixer_reg)); } -WRITE16_MEMBER(segas24_mixer_device::write) +void segas24_mixer_device::write(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(mixer_reg + offset); } -READ16_MEMBER(segas24_mixer_device::read) +uint16_t segas24_mixer_device::read(offs_t offset) { return mixer_reg[offset]; } diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h index 096b5572740..320c00b28de 100644 --- a/src/mame/video/segaic24.h +++ b/src/mame/video/segaic24.h @@ -29,12 +29,12 @@ public: // configuration void set_tile_mask(uint16_t _tile_mask) { tile_mask = _tile_mask; } - DECLARE_READ16_MEMBER(tile_r); - DECLARE_WRITE16_MEMBER(tile_w); - DECLARE_READ16_MEMBER(char_r); - DECLARE_WRITE16_MEMBER(char_w); - DECLARE_WRITE16_MEMBER(xhout_w); - DECLARE_WRITE16_MEMBER(xvout_w); + uint16_t tile_r(offs_t offset); + void tile_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t char_r(offs_t offset); + void char_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void xhout_w(uint16_t data); + void xvout_w(uint16_t data); void draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int pri, int flags); void draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int pri, int flags); @@ -83,8 +83,8 @@ class segas24_sprite_device : public device_t public: segas24_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ16_MEMBER(read); - DECLARE_WRITE16_MEMBER(write); + uint16_t read(offs_t offset); + void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void draw(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, const int *spri); @@ -103,8 +103,8 @@ class segas24_mixer_device : public device_t public: segas24_mixer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ16_MEMBER(read); - DECLARE_WRITE16_MEMBER(write); + uint16_t read(offs_t offset); + void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t get_reg(int reg); diff --git a/src/mame/video/segas32.cpp b/src/mame/video/segas32.cpp index 6c0be3cfd89..e4bc5bb8928 100644 --- a/src/mame/video/segas32.cpp +++ b/src/mame/video/segas32.cpp @@ -330,13 +330,13 @@ void segas32_state::system32_set_vblank(int state) * *************************************/ -READ16_MEMBER(segas32_state::videoram_r) +uint16_t segas32_state::videoram_r(offs_t offset) { return m_videoram[offset]; } -WRITE16_MEMBER(segas32_state::videoram_w) +void segas32_state::videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[offset]); @@ -361,7 +361,7 @@ WRITE16_MEMBER(segas32_state::videoram_w) * *************************************/ -READ8_MEMBER(segas32_state::sprite_control_r) +uint8_t segas32_state::sprite_control_r(offs_t offset) { switch (offset) { @@ -419,7 +419,7 @@ READ8_MEMBER(segas32_state::sprite_control_r) } -WRITE8_MEMBER(segas32_state::sprite_control_w) +void segas32_state::sprite_control_w(offs_t offset, uint8_t data) { m_sprite_control[offset & 7] = data; } @@ -431,13 +431,13 @@ WRITE8_MEMBER(segas32_state::sprite_control_w) * *************************************/ -READ16_MEMBER(segas32_state::spriteram_r) +uint16_t segas32_state::spriteram_r(offs_t offset) { return m_spriteram[offset]; } -WRITE16_MEMBER(segas32_state::spriteram_w) +void segas32_state::spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spriteram[offset]); m_spriteram_32bit[offset>>1] = diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp index cdc3c2f8b32..530ccef08df 100644 --- a/src/mame/video/seibu_crtc.cpp +++ b/src/mame/video/seibu_crtc.cpp @@ -243,38 +243,38 @@ void seibu_crtc_device::seibu_crtc_vregs(address_map &map) map(0x002c, 0x003b).w(FUNC(seibu_crtc_device::layer_scroll_base_w)); } -WRITE16_MEMBER(seibu_crtc_device::decrypt_key_w) +void seibu_crtc_device::decrypt_key_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (!m_decrypt_key_cb.isnull()) m_decrypt_key_cb(0, data, mem_mask); } -WRITE16_MEMBER( seibu_crtc_device::layer_en_w) +void seibu_crtc_device::layer_en_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (!m_layer_en_cb.isnull()) m_layer_en_cb(0,data,mem_mask); } -WRITE16_MEMBER( seibu_crtc_device::layer_scroll_w) +void seibu_crtc_device::layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (!m_layer_scroll_cb.isnull()) m_layer_scroll_cb(offset,data,mem_mask); } -READ16_MEMBER(seibu_crtc_device::reg_1a_r) +uint16_t seibu_crtc_device::reg_1a_r() { // SPI needs read/write access to this return m_reg_1a; } -WRITE16_MEMBER( seibu_crtc_device::reg_1a_w) +void seibu_crtc_device::reg_1a_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_reg_1a); if (!m_reg_1a_cb.isnull()) m_reg_1a_cb(offset,data,mem_mask); } -WRITE16_MEMBER( seibu_crtc_device::layer_scroll_base_w) +void seibu_crtc_device::layer_scroll_base_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (!m_layer_scroll_base_cb.isnull()) m_layer_scroll_base_cb(offset,data,mem_mask); @@ -376,23 +376,23 @@ inline void seibu_crtc_device::write_word(offs_t address, uint16_t data) // READ/WRITE HANDLERS //************************************************************************** -READ16_MEMBER( seibu_crtc_device::read ) +uint16_t seibu_crtc_device::read(offs_t offset) { return read_word(offset); } -WRITE16_MEMBER( seibu_crtc_device::write ) +void seibu_crtc_device::write(offs_t offset, uint16_t data) { write_word(offset,data); } /* Sky Smasher / Raiden DX swaps registers [0x10] with [0x20] */ -READ16_MEMBER( seibu_crtc_device::read_alt ) +uint16_t seibu_crtc_device::read_alt(offs_t offset) { return read_word(bitswap<16>(offset,15,14,13,12,11,10,9,8,7,6,5,3,4,2,1,0)); } -WRITE16_MEMBER( seibu_crtc_device::write_alt ) +void seibu_crtc_device::write_alt(offs_t offset, uint16_t data) { write_word(bitswap<16>(offset,15,14,13,12,11,10,9,8,7,6,5,3,4,2,1,0),data); } diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h index 3e2cb876775..b3ded496959 100644 --- a/src/mame/video/seibu_crtc.h +++ b/src/mame/video/seibu_crtc.h @@ -33,16 +33,16 @@ public: auto layer_scroll_base_callback() { return m_layer_scroll_base_cb.bind(); } // I/O operations - DECLARE_WRITE16_MEMBER( write ); - DECLARE_WRITE16_MEMBER( write_alt ); - DECLARE_READ16_MEMBER( read ); - DECLARE_READ16_MEMBER( read_alt ); - DECLARE_WRITE16_MEMBER(decrypt_key_w); - DECLARE_WRITE16_MEMBER(layer_en_w); - DECLARE_READ16_MEMBER(reg_1a_r); - DECLARE_WRITE16_MEMBER(reg_1a_w); - DECLARE_WRITE16_MEMBER(layer_scroll_w); - DECLARE_WRITE16_MEMBER(layer_scroll_base_w); + void write(offs_t offset, uint16_t data); + void write_alt(offs_t offset, uint16_t data); + uint16_t read(offs_t offset); + uint16_t read_alt(offs_t offset); + void decrypt_key_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void layer_en_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t reg_1a_r(); + void reg_1a_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void layer_scroll_base_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void seibu_crtc_vregs(address_map &map); protected: diff --git a/src/mame/video/seicross.cpp b/src/mame/video/seicross.cpp index 046fe91be3b..54f9b4ce7a2 100644 --- a/src/mame/video/seicross.cpp +++ b/src/mame/video/seicross.cpp @@ -54,13 +54,13 @@ void seicross_state::seicross_palette(palette_device &palette) const } } -WRITE8_MEMBER(seicross_state::videoram_w) +void seicross_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(seicross_state::colorram_w) +void seicross_state::colorram_w(offs_t offset, uint8_t data) { /* bit 5 of the address is not used for color memory. There is just */ /* 512k of memory; every two consecutive rows share the same memory */ diff --git a/src/mame/video/senjyo.cpp b/src/mame/video/senjyo.cpp index e8d7b0d28a3..c52e56294ea 100644 --- a/src/mame/video/senjyo.cpp +++ b/src/mame/video/senjyo.cpp @@ -130,27 +130,27 @@ void senjyo_state::radar_palette(palette_device &palette) const ***************************************************************************/ -WRITE8_MEMBER(senjyo_state::fgvideoram_w) +void senjyo_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(senjyo_state::fgcolorram_w) +void senjyo_state::fgcolorram_w(offs_t offset, uint8_t data) { m_fgcolorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(senjyo_state::bg1videoram_w) +void senjyo_state::bg1videoram_w(offs_t offset, uint8_t data) { m_bg1videoram[offset] = data; m_bg1_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(senjyo_state::bg2videoram_w) +void senjyo_state::bg2videoram_w(offs_t offset, uint8_t data) { m_bg2videoram[offset] = data; m_bg2_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(senjyo_state::bg3videoram_w) +void senjyo_state::bg3videoram_w(offs_t offset, uint8_t data) { m_bg3videoram[offset] = data; m_bg3_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/seta2.cpp b/src/mame/video/seta2.cpp index 0151dc27abf..f3e7fa9e123 100644 --- a/src/mame/video/seta2.cpp +++ b/src/mame/video/seta2.cpp @@ -149,7 +149,7 @@ ***************************************************************************/ -WRITE16_MEMBER(seta2_state::vregs_w) +void seta2_state::vregs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* 02/04 = horizontal display start/end mj4simai = 0065/01E5 (0180 visible area) @@ -272,12 +272,12 @@ WRITE16_MEMBER(seta2_state::vregs_w) } } -READ16_MEMBER(seta2_state::spriteram_r) +uint16_t seta2_state::spriteram_r(offs_t offset) { return m_spriteram[offset]; } -WRITE16_MEMBER(seta2_state::spriteram_w) +void seta2_state::spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spriteram[offset]); } diff --git a/src/mame/video/shadfrce.cpp b/src/mame/video/shadfrce.cpp index a5023eaadbc..d8973a8b78f 100644 --- a/src/mame/video/shadfrce.cpp +++ b/src/mame/video/shadfrce.cpp @@ -14,7 +14,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_fgtile_info) tileinfo.set(0,tileno,colour*4,0); } -WRITE16_MEMBER(shadfrce_state::fgvideoram_w) +void shadfrce_state::fgvideoram_w(offs_t offset, uint16_t data) { m_fgvideoram[offset] = data; m_fgtilemap->mark_tile_dirty(offset/2); @@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_bg0tile_info) tileinfo.set(2,tileno,colour,TILE_FLIPYX(fyx)); } -WRITE16_MEMBER(shadfrce_state::bg0videoram_w) +void shadfrce_state::bg0videoram_w(offs_t offset, uint16_t data) { m_bg0videoram[offset] = data; m_bg0tilemap->mark_tile_dirty(offset/2); @@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_bg1tile_info) tileinfo.set(2,tileno,colour+64,0); } -WRITE16_MEMBER(shadfrce_state::bg1videoram_w) +void shadfrce_state::bg1videoram_w(offs_t offset, uint16_t data) { m_bg1videoram[offset] = data; m_bg1tilemap->mark_tile_dirty(offset); @@ -78,22 +78,22 @@ void shadfrce_state::video_start() save_item(NAME(m_prev_value)); } -WRITE16_MEMBER(shadfrce_state::bg0scrollx_w) +void shadfrce_state::bg0scrollx_w(uint16_t data) { m_bg0tilemap->set_scrollx(0, data & 0x1ff ); } -WRITE16_MEMBER(shadfrce_state::bg0scrolly_w) +void shadfrce_state::bg0scrolly_w(uint16_t data) { m_bg0tilemap->set_scrolly(0, data & 0x1ff ); } -WRITE16_MEMBER(shadfrce_state::bg1scrollx_w) +void shadfrce_state::bg1scrollx_w(uint16_t data) { m_bg1tilemap->set_scrollx(0, data & 0x1ff ); } -WRITE16_MEMBER(shadfrce_state::bg1scrolly_w) +void shadfrce_state::bg1scrolly_w(uint16_t data) { m_bg1tilemap->set_scrolly(0, data & 0x1ff ); } diff --git a/src/mame/video/shangha3.cpp b/src/mame/video/shangha3.cpp index bea7ff21452..727fd823260 100644 --- a/src/mame/video/shangha3.cpp +++ b/src/mame/video/shangha3.cpp @@ -89,7 +89,7 @@ void shangha3_state::video_start() -WRITE8_MEMBER(shangha3_state::flipscreen_w) +void shangha3_state::flipscreen_w(uint8_t data) { /* bit 7 flips screen, the rest seems to always be set to 0x7e */ flip_screen_set(data & 0x80); @@ -97,13 +97,13 @@ WRITE8_MEMBER(shangha3_state::flipscreen_w) if ((data & 0x7f) != 0x7e) popmessage("flipscreen_w %02x",data); } -WRITE16_MEMBER(shangha3_state::gfxlist_addr_w) +void shangha3_state::gfxlist_addr_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_gfxlist_addr); } -WRITE16_MEMBER(shangha3_state::blitter_go_w) +void shangha3_state::blitter_go_w(uint16_t data) { uint16_t *shangha3_ram = m_ram; bitmap_ind16 &rawbitmap = m_rawbitmap; diff --git a/src/mame/video/shangkid.cpp b/src/mame/video/shangkid.cpp index ebb86364d45..02ab6742f17 100644 --- a/src/mame/video/shangkid.cpp +++ b/src/mame/video/shangkid.cpp @@ -49,7 +49,7 @@ VIDEO_START_MEMBER(shangkid_state,shangkid) m_background = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(shangkid_state::get_bg_tile_info)), TILEMAP_SCAN_ROWS, 8,8, 64,32); } -WRITE8_MEMBER(shangkid_state::videoram_w) +void shangkid_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_background->mark_tile_dirty(offset&0x7ff ); diff --git a/src/mame/video/shaolins.cpp b/src/mame/video/shaolins.cpp index a0b1e117778..b8c6d9d663e 100644 --- a/src/mame/video/shaolins.cpp +++ b/src/mame/video/shaolins.cpp @@ -83,19 +83,19 @@ void shaolins_state::shaolins_palette(palette_device &palette) const } } -WRITE8_MEMBER(shaolins_state::videoram_w) +void shaolins_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(shaolins_state::colorram_w) +void shaolins_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(shaolins_state::palettebank_w) +void shaolins_state::palettebank_w(uint8_t data) { if (m_palettebank != (data & 0x07)) { @@ -104,13 +104,13 @@ WRITE8_MEMBER(shaolins_state::palettebank_w) } } -WRITE8_MEMBER(shaolins_state::scroll_w) +void shaolins_state::scroll_w(uint8_t data) { for (int col = 4; col < 32; col++) m_bg_tilemap->set_scrolly(col, data + 1); } -WRITE8_MEMBER(shaolins_state::nmi_w) +void shaolins_state::nmi_w(uint8_t data) { m_nmi_enable = data; diff --git a/src/mame/video/shisen.cpp b/src/mame/video/shisen.cpp index 44863969db8..f5bfca49097 100644 --- a/src/mame/video/shisen.cpp +++ b/src/mame/video/shisen.cpp @@ -3,13 +3,13 @@ #include "emu.h" #include "includes/shisen.h" -WRITE8_MEMBER(shisen_state::videoram_w) +void shisen_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } -WRITE8_MEMBER(shisen_state::bankswitch_w) +void shisen_state::bankswitch_w(uint8_t data) { if (data & 0xc0) logerror("bank switch %02x\n",data); @@ -28,7 +28,7 @@ WRITE8_MEMBER(shisen_state::bankswitch_w) /* bits 6-7 unknown */ } -WRITE8_MEMBER(shisen_state::paletteram_w) +void shisen_state::paletteram_w(offs_t offset, uint8_t data) { m_paletteram[offset] = data; diff --git a/src/mame/video/shootout.cpp b/src/mame/video/shootout.cpp index 846f1018026..d5b671b1e49 100644 --- a/src/mame/video/shootout.cpp +++ b/src/mame/video/shootout.cpp @@ -64,13 +64,13 @@ TILE_GET_INFO_MEMBER(shootout_state::get_fg_tile_info) 0); } -WRITE8_MEMBER(shootout_state::videoram_w) +void shootout_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_background->mark_tile_dirty(offset&0x3ff ); } -WRITE8_MEMBER(shootout_state::textram_w) +void shootout_state::textram_w(offs_t offset, uint8_t data) { m_textram[offset] = data; m_foreground->mark_tile_dirty(offset&0x3ff ); diff --git a/src/mame/video/sidearms.cpp b/src/mame/video/sidearms.cpp index d8d31692e1c..20fef5fa3b4 100644 --- a/src/mame/video/sidearms.cpp +++ b/src/mame/video/sidearms.cpp @@ -2,7 +2,7 @@ // copyright-holders:Paul Leaman, Curt Coder /*************************************************************************** - sidearms.c + sidearms.cpp Functions to emulate the video hardware of the machine. @@ -11,19 +11,19 @@ #include "emu.h" #include "includes/sidearms.h" -WRITE8_MEMBER(sidearms_state::videoram_w) +void sidearms_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sidearms_state::colorram_w) +void sidearms_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sidearms_state::c804_w) +void sidearms_state::c804_w(uint8_t data) { /* bits 0 and 1 are coin counters */ machine().bookkeeping().coin_counter_w(0, data & 0x01); @@ -67,13 +67,13 @@ WRITE8_MEMBER(sidearms_state::c804_w) } } -WRITE8_MEMBER(sidearms_state::gfxctrl_w) +void sidearms_state::gfxctrl_w(uint8_t data) { m_objon = data & 0x01; m_bgon = data & 0x02; } -WRITE8_MEMBER(sidearms_state::star_scrollx_w) +void sidearms_state::star_scrollx_w(uint8_t data) { uint32_t last_state = m_hcount_191; @@ -85,7 +85,7 @@ WRITE8_MEMBER(sidearms_state::star_scrollx_w) m_hflop_74a_n ^= 1; } -WRITE8_MEMBER(sidearms_state::star_scrolly_w) +void sidearms_state::star_scrolly_w(uint8_t data) { m_vcount_191++; m_vcount_191 &= 0xff; diff --git a/src/mame/video/sidepckt.cpp b/src/mame/video/sidepckt.cpp index 5512383a5bb..e57b3a86ba0 100644 --- a/src/mame/video/sidepckt.cpp +++ b/src/mame/video/sidepckt.cpp @@ -87,24 +87,24 @@ void sidepckt_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(sidepckt_state::videoram_w) +void sidepckt_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sidepckt_state::colorram_w) +void sidepckt_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -READ8_MEMBER(sidepckt_state::scroll_y_r) +uint8_t sidepckt_state::scroll_y_r() { return (m_scroll_y); } -WRITE8_MEMBER(sidepckt_state::scroll_y_w) +void sidepckt_state::scroll_y_w(uint8_t data) { // Bits 0-5: Scroll y m_scroll_y = data & 0x3F; diff --git a/src/mame/video/simpsons.cpp b/src/mame/video/simpsons.cpp index 2e343b3fe7c..2caafb9bac0 100644 --- a/src/mame/video/simpsons.cpp +++ b/src/mame/video/simpsons.cpp @@ -45,17 +45,17 @@ K053246_CB_MEMBER(simpsons_state::sprite_callback) ***************************************************************************/ -READ8_MEMBER(simpsons_state::simpsons_k052109_r) +uint8_t simpsons_state::simpsons_k052109_r(offs_t offset) { return m_k052109->read(offset + 0x2000); } -WRITE8_MEMBER(simpsons_state::simpsons_k052109_w) +void simpsons_state::simpsons_k052109_w(offs_t offset, uint8_t data) { m_k052109->write(offset + 0x2000, data); } -READ8_MEMBER(simpsons_state::simpsons_k053247_r) +uint8_t simpsons_state::simpsons_k053247_r(offs_t offset) { int offs = offset >> 1; @@ -65,7 +65,7 @@ READ8_MEMBER(simpsons_state::simpsons_k053247_r) return(m_spriteram[offs] >> 8); } -WRITE8_MEMBER(simpsons_state::simpsons_k053247_w) +void simpsons_state::simpsons_k053247_w(offs_t offset, uint8_t data) { int offs = offset >> 1; diff --git a/src/mame/video/skullxbo.cpp b/src/mame/video/skullxbo.cpp index 84432d4ffb7..757b920645b 100644 --- a/src/mame/video/skullxbo.cpp +++ b/src/mame/video/skullxbo.cpp @@ -86,7 +86,7 @@ const atari_motion_objects_config skullxbo_state::s_mob_config = * *************************************/ -WRITE16_MEMBER( skullxbo_state::skullxbo_xscroll_w ) +void skullxbo_state::skullxbo_xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* combine data */ uint16_t oldscroll = *m_xscroll; @@ -106,7 +106,7 @@ WRITE16_MEMBER( skullxbo_state::skullxbo_xscroll_w ) } -WRITE16_MEMBER( skullxbo_state::skullxbo_yscroll_w ) +void skullxbo_state::skullxbo_yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* combine data */ int scanline = m_screen->vpos(); @@ -140,7 +140,7 @@ WRITE16_MEMBER( skullxbo_state::skullxbo_yscroll_w ) * *************************************/ -WRITE16_MEMBER( skullxbo_state::skullxbo_mobmsb_w ) +void skullxbo_state::skullxbo_mobmsb_w(offs_t offset, uint16_t data) { m_screen->update_partial(m_screen->vpos()); m_mob->set_bank((offset >> 9) & 1); @@ -154,12 +154,12 @@ WRITE16_MEMBER( skullxbo_state::skullxbo_mobmsb_w ) * *************************************/ -WRITE16_MEMBER( skullxbo_state::playfield_latch_w ) +void skullxbo_state::playfield_latch_w(uint16_t data) { m_playfield_latch = data; } -WRITE16_MEMBER(skullxbo_state::playfield_latched_w) +void skullxbo_state::playfield_latched_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_playfield_tilemap->write16(offset, data, mem_mask); if (m_playfield_latch != -1) diff --git a/src/mame/video/skydiver.cpp b/src/mame/video/skydiver.cpp index 436e6bbf6b1..7b4256333b6 100644 --- a/src/mame/video/skydiver.cpp +++ b/src/mame/video/skydiver.cpp @@ -61,19 +61,19 @@ void skydiver_state::video_start() * *************************************/ -WRITE8_MEMBER(skydiver_state::videoram_w) +void skydiver_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -READ8_MEMBER(skydiver_state::wram_r) +uint8_t skydiver_state::wram_r(offs_t offset) { return m_videoram[offset | 0x380]; } -WRITE8_MEMBER(skydiver_state::wram_w) +void skydiver_state::wram_w(offs_t offset, uint8_t data) { m_videoram[offset | 0x0380] = data; } @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(skydiver_state::lamp_r_w) m_lamp_r = state; } -WRITE8_MEMBER(skydiver_state::latch3_watchdog_w) +void skydiver_state::latch3_watchdog_w(offs_t offset, uint8_t data) { m_watchdog->watchdog_reset(); m_latch3->write_a0(offset); diff --git a/src/mame/video/skykid.cpp b/src/mame/video/skykid.cpp index 08bd606a0dc..60c0c307f8c 100644 --- a/src/mame/video/skykid.cpp +++ b/src/mame/video/skykid.cpp @@ -125,39 +125,39 @@ void skykid_state::video_start() ***************************************************************************/ -READ8_MEMBER(skykid_state::skykid_videoram_r) +uint8_t skykid_state::skykid_videoram_r(offs_t offset) { return m_videoram[offset]; } -WRITE8_MEMBER(skykid_state::skykid_videoram_w) +void skykid_state::skykid_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } -READ8_MEMBER(skykid_state::skykid_textram_r) +uint8_t skykid_state::skykid_textram_r(offs_t offset) { return m_textram[offset]; } -WRITE8_MEMBER(skykid_state::skykid_textram_w) +void skykid_state::skykid_textram_w(offs_t offset, uint8_t data) { m_textram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(skykid_state::skykid_scroll_x_w) +void skykid_state::skykid_scroll_x_w(offs_t offset, uint8_t data) { m_scroll_x = offset; } -WRITE8_MEMBER(skykid_state::skykid_scroll_y_w) +void skykid_state::skykid_scroll_y_w(offs_t offset, uint8_t data) { m_scroll_y = offset; } -WRITE8_MEMBER(skykid_state::skykid_flipscreen_priority_w) +void skykid_state::skykid_flipscreen_priority_w(offs_t offset, uint8_t data) { m_priority = data; flip_screen_set(offset & 1); diff --git a/src/mame/video/slapfght.cpp b/src/mame/video/slapfght.cpp index 7a0bb4632ff..eef63a3d517 100644 --- a/src/mame/video/slapfght.cpp +++ b/src/mame/video/slapfght.cpp @@ -77,41 +77,41 @@ VIDEO_START_MEMBER(slapfght_state, slapfight) ***************************************************************************/ -WRITE8_MEMBER(slapfght_state::videoram_w) +void slapfght_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_pf1_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(slapfght_state::colorram_w) +void slapfght_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_pf1_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(slapfght_state::fixram_w) +void slapfght_state::fixram_w(offs_t offset, uint8_t data) { m_fixvideoram[offset] = data; m_fix_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(slapfght_state::fixcol_w) +void slapfght_state::fixcol_w(offs_t offset, uint8_t data) { m_fixcolorram[offset] = data; m_fix_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(slapfght_state::scrollx_lo_w) +void slapfght_state::scrollx_lo_w(uint8_t data) { m_scrollx_lo = data; } -WRITE8_MEMBER(slapfght_state::scrollx_hi_w) +void slapfght_state::scrollx_hi_w(uint8_t data) { m_scrollx_hi = data; } -WRITE8_MEMBER(slapfght_state::scrolly_w) +void slapfght_state::scrolly_w(uint8_t data) { m_scrolly = data; } diff --git a/src/mame/video/snk.cpp b/src/mame/video/snk.cpp index bfa8bbec500..a41026b6cb8 100644 --- a/src/mame/video/snk.cpp +++ b/src/mame/video/snk.cpp @@ -371,91 +371,91 @@ VIDEO_START_MEMBER(snk_state,tdfever) /**************************************************************************************/ -WRITE8_MEMBER(snk_state::snk_tx_videoram_w) +void snk_state::snk_tx_videoram_w(offs_t offset, uint8_t data) { m_tx_videoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snk_state::marvins_fg_videoram_w) +void snk_state::marvins_fg_videoram_w(offs_t offset, uint8_t data) { m_fg_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snk_state::marvins_bg_videoram_w) +void snk_state::marvins_bg_videoram_w(offs_t offset, uint8_t data) { m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snk_state::snk_bg_videoram_w) +void snk_state::snk_bg_videoram_w(offs_t offset, uint8_t data) { m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset >> 1); } -WRITE8_MEMBER(snk_state::snk_fg_scrollx_w) +void snk_state::snk_fg_scrollx_w(uint8_t data) { m_fg_scrollx = (m_fg_scrollx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_fg_scrolly_w) +void snk_state::snk_fg_scrolly_w(uint8_t data) { m_fg_scrolly = (m_fg_scrolly & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_bg_scrollx_w) +void snk_state::snk_bg_scrollx_w(uint8_t data) { m_bg_scrollx = (m_bg_scrollx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_bg_scrolly_w) +void snk_state::snk_bg_scrolly_w(uint8_t data) { m_bg_scrolly = (m_bg_scrolly & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_sp16_scrollx_w) +void snk_state::snk_sp16_scrollx_w(uint8_t data) { m_sp16_scrollx = (m_sp16_scrollx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_sp16_scrolly_w) +void snk_state::snk_sp16_scrolly_w(uint8_t data) { m_sp16_scrolly = (m_sp16_scrolly & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_sp32_scrollx_w) +void snk_state::snk_sp32_scrollx_w(uint8_t data) { m_sp32_scrollx = (m_sp32_scrollx & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_sp32_scrolly_w) +void snk_state::snk_sp32_scrolly_w(uint8_t data) { m_sp32_scrolly = (m_sp32_scrolly & ~0xff) | data; } -WRITE8_MEMBER(snk_state::snk_sprite_split_point_w) +void snk_state::snk_sprite_split_point_w(uint8_t data) { m_sprite_split_point = data; } -WRITE8_MEMBER(snk_state::marvins_palette_bank_w) +void snk_state::marvins_palette_bank_w(uint8_t data) { m_bg_tilemap->set_palette_offset(data & 0x70); m_fg_tilemap->set_palette_offset((data & 0x07) << 4); } -WRITE8_MEMBER(snk_state::marvins_flipscreen_w) +void snk_state::marvins_flipscreen_w(uint8_t data) { flip_screen_set(data & 0x80); // other bits unknown } -WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w) +void snk_state::sgladiat_flipscreen_w(uint8_t data) { flip_screen_set(data & 0x80); @@ -464,7 +464,7 @@ WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w) // other bits unknown } -WRITE8_MEMBER(snk_state::hal21_flipscreen_w) +void snk_state::hal21_flipscreen_w(uint8_t data) { flip_screen_set(data & 0x80); @@ -478,14 +478,14 @@ WRITE8_MEMBER(snk_state::hal21_flipscreen_w) // other bits unknown } -WRITE8_MEMBER(snk_state::marvins_scroll_msb_w) +void snk_state::marvins_scroll_msb_w(uint8_t data) { m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x04) << 6); m_fg_scrollx = (m_fg_scrollx & 0xff) | ((data & 0x02) << 7); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::jcross_scroll_msb_w) +void snk_state::jcross_scroll_msb_w(uint8_t data) { m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x10) << 4); m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x08) << 5); @@ -493,13 +493,13 @@ WRITE8_MEMBER(snk_state::jcross_scroll_msb_w) m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::sgladiat_scroll_msb_w) +void snk_state::sgladiat_scroll_msb_w(uint8_t data) { m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::aso_videoattrs_w) +void snk_state::aso_videoattrs_w(uint8_t data) { /* video attributes: @@ -522,7 +522,7 @@ WRITE8_MEMBER(snk_state::aso_videoattrs_w) m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::tnk3_videoattrs_w) +void snk_state::tnk3_videoattrs_w(uint8_t data) { /* video attributes: @@ -551,7 +551,7 @@ WRITE8_MEMBER(snk_state::tnk3_videoattrs_w) m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::aso_bg_bank_w) +void snk_state::aso_bg_bank_w(uint8_t data) { m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); if (m_bg_tile_offset != ((data & 0x30) << 4)) @@ -561,13 +561,13 @@ WRITE8_MEMBER(snk_state::aso_bg_bank_w) } } -WRITE8_MEMBER(snk_state::ikari_bg_scroll_msb_w) +void snk_state::ikari_bg_scroll_msb_w(uint8_t data) { m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7); m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::ikari_sp_scroll_msb_w) +void snk_state::ikari_sp_scroll_msb_w(uint8_t data) { m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x20) << 3); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x10) << 4); @@ -575,7 +575,7 @@ WRITE8_MEMBER(snk_state::ikari_sp_scroll_msb_w) m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x04) << 6); } -WRITE8_MEMBER(snk_state::ikari_unknown_video_w) +void snk_state::ikari_unknown_video_w(uint8_t data) { /* meaning of 0xc980 uncertain. Normally 0x20, ikaria/ikarijp sets it to 0x31 during test mode. @@ -597,7 +597,7 @@ WRITE8_MEMBER(snk_state::ikari_unknown_video_w) } } -WRITE8_MEMBER(snk_state::gwar_tx_bank_w) +void snk_state::gwar_tx_bank_w(uint8_t data) { m_tx_tilemap->set_palette_offset((data & 0xf) << 4); if (m_tx_tile_offset != ((data & 0x30) << 4)) @@ -610,7 +610,7 @@ WRITE8_MEMBER(snk_state::gwar_tx_bank_w) m_bg_tilemap->set_palette_offset((data & 0x80)); } -WRITE8_MEMBER(snk_state::gwar_videoattrs_w) +void snk_state::gwar_videoattrs_w(uint8_t data) { flip_screen_set(data & 0x04); @@ -622,7 +622,7 @@ WRITE8_MEMBER(snk_state::gwar_videoattrs_w) m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::gwara_videoattrs_w) +void snk_state::gwara_videoattrs_w(uint8_t data) { flip_screen_set(data & 0x10); @@ -630,7 +630,7 @@ WRITE8_MEMBER(snk_state::gwara_videoattrs_w) m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8); } -WRITE8_MEMBER(snk_state::gwara_sp_scroll_msb_w) +void snk_state::gwara_sp_scroll_msb_w(uint8_t data) { m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x20) << 3); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x10) << 4); @@ -638,13 +638,13 @@ WRITE8_MEMBER(snk_state::gwara_sp_scroll_msb_w) m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x04) << 6); } -WRITE8_MEMBER(snk_state::tdfever_sp_scroll_msb_w) +void snk_state::tdfever_sp_scroll_msb_w(uint8_t data) { m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x80) << 1); m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x40) << 2); } -WRITE8_MEMBER(snk_state::tdfever_spriteram_w) +void snk_state::tdfever_spriteram_w(offs_t offset, uint8_t data) { /* partial updates avoid flickers in the fsoccer radar. */ if (offset < 0x80 && m_spriteram[offset] != data) diff --git a/src/mame/video/snk6502.cpp b/src/mame/video/snk6502.cpp index 4f45a44dda6..f679f34d6c9 100644 --- a/src/mame/video/snk6502.cpp +++ b/src/mame/video/snk6502.cpp @@ -70,26 +70,26 @@ void snk6502_state::snk6502_palette(palette_device &palette) } } -WRITE8_MEMBER(snk6502_state::videoram_w) +void snk6502_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snk6502_state::videoram2_w) +void snk6502_state::videoram2_w(offs_t offset, uint8_t data) { m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snk6502_state::colorram_w) +void snk6502_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snk6502_state::charram_w) +void snk6502_state::charram_w(offs_t offset, uint8_t data) { if (m_charram[offset] != data) { @@ -99,7 +99,7 @@ WRITE8_MEMBER(snk6502_state::charram_w) } -WRITE8_MEMBER(snk6502_state::flipscreen_w) +void snk6502_state::flipscreen_w(uint8_t data) { /* bits 0-2 select background color */ @@ -130,18 +130,18 @@ WRITE8_MEMBER(snk6502_state::flipscreen_w) } } -WRITE8_MEMBER(fantasy_state::fantasy_flipscreen_w) +void fantasy_state::fantasy_flipscreen_w(offs_t offset, uint8_t data) { m_sound->sound_w(offset | 0x03, data); - flipscreen_w(space, offset, data, mem_mask); + flipscreen_w(data); } -WRITE8_MEMBER(snk6502_state::scrollx_w) +void snk6502_state::scrollx_w(uint8_t data) { m_bg_tilemap->set_scrollx(0, data); } -WRITE8_MEMBER(snk6502_state::scrolly_w) +void snk6502_state::scrolly_w(uint8_t data) { m_bg_tilemap->set_scrolly(0, data); } @@ -242,7 +242,7 @@ void snk6502_state::satansat_palette(palette_device &palette) } } -WRITE8_MEMBER(snk6502_state::satansat_b002_w) +void snk6502_state::satansat_b002_w(uint8_t data) { /* bit 0 flips screen */ @@ -258,7 +258,7 @@ WRITE8_MEMBER(snk6502_state::satansat_b002_w) /* other bits unused */ } -WRITE8_MEMBER(snk6502_state::satansat_backcolor_w) +void snk6502_state::satansat_backcolor_w(uint8_t data) { /* bits 0-1 select background color. Other bits unused. */ diff --git a/src/mame/video/snk68.cpp b/src/mame/video/snk68.cpp index 52be80b15ed..01493476c0c 100644 --- a/src/mame/video/snk68.cpp +++ b/src/mame/video/snk68.cpp @@ -79,27 +79,27 @@ void searchar_state::video_start() ***************************************************************************/ -READ16_MEMBER(snk68_state::fg_videoram_r) +uint16_t snk68_state::fg_videoram_r(offs_t offset) { // RAM is only 8-bit return m_fg_videoram[offset] | 0xff00; } -WRITE16_MEMBER(snk68_state::fg_videoram_w) +void snk68_state::fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data |= 0xff00; COMBINE_DATA(&m_fg_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset >> 1); } -WRITE16_MEMBER(searchar_state::fg_videoram_w) +void searchar_state::fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // RAM is full 16-bit, though only half of it is used by the hardware COMBINE_DATA(&m_fg_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset >> 1); } -WRITE8_MEMBER(snk68_state::flipscreen_w) +void snk68_state::flipscreen_w(uint8_t data) { flip_screen_set(BIT(data, 3)); m_sprites->set_flip(BIT(data, 3)); @@ -112,7 +112,7 @@ WRITE8_MEMBER(snk68_state::flipscreen_w) } } -WRITE8_MEMBER(searchar_state::flipscreen_w) +void searchar_state::flipscreen_w(uint8_t data) { flip_screen_set(BIT(data, 3)); m_sprites->set_flip(BIT(data, 3)); diff --git a/src/mame/video/snk68_spr.cpp b/src/mame/video/snk68_spr.cpp index 7115713669b..a6b12e256db 100644 --- a/src/mame/video/snk68_spr.cpp +++ b/src/mame/video/snk68_spr.cpp @@ -74,7 +74,7 @@ void snk68_spr_device::device_reset() { } -READ16_MEMBER(snk68_spr_device::spriteram_r) +u16 snk68_spr_device::spriteram_r(offs_t offset) { // streetsj expects the MSB of every 32-bit word to be FF. Presumably RAM // exists only for 3 bytes out of 4 and the fourth is unmapped. @@ -84,7 +84,7 @@ READ16_MEMBER(snk68_spr_device::spriteram_r) return m_spriteram[offset]; } -WRITE16_MEMBER(snk68_spr_device::spriteram_w) +void snk68_spr_device::spriteram_w(offs_t offset, u16 data, u16 mem_mask) { uint16_t newword = m_spriteram[offset]; diff --git a/src/mame/video/snk68_spr.h b/src/mame/video/snk68_spr.h index e74a8edc71c..3b2beed4f6e 100644 --- a/src/mame/video/snk68_spr.h +++ b/src/mame/video/snk68_spr.h @@ -22,8 +22,8 @@ public: void set_xpos_shift(u8 data) { m_xpos_shift = data; } void set_color_entry_mask(u16 data) { m_color_entry_mask = data; } - DECLARE_READ16_MEMBER(spriteram_r); - DECLARE_WRITE16_MEMBER(spriteram_w); + u16 spriteram_r(offs_t offset); + void spriteram_w(offs_t offset, u16 data, u16 mem_mask = ~0); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int group, u16 start_offset, u16 end_offset); void draw_sprites_all(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites_alt(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/video/snookr10.cpp b/src/mame/video/snookr10.cpp index e8a8f6690e0..572ff966a30 100644 --- a/src/mame/video/snookr10.cpp +++ b/src/mame/video/snookr10.cpp @@ -33,13 +33,13 @@ #include "includes/snookr10.h" -WRITE8_MEMBER(snookr10_state::snookr10_videoram_w) +void snookr10_state::snookr10_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(snookr10_state::snookr10_colorram_w) +void snookr10_state::snookr10_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/solomon.cpp b/src/mame/video/solomon.cpp index 49f2d8af33f..1464e569183 100644 --- a/src/mame/video/solomon.cpp +++ b/src/mame/video/solomon.cpp @@ -3,31 +3,31 @@ #include "emu.h" #include "includes/solomon.h" -WRITE8_MEMBER(solomon_state::solomon_videoram_w) +void solomon_state::solomon_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(solomon_state::solomon_colorram_w) +void solomon_state::solomon_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(solomon_state::solomon_videoram2_w) +void solomon_state::solomon_videoram2_w(offs_t offset, uint8_t data) { m_videoram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(solomon_state::solomon_colorram2_w) +void solomon_state::solomon_colorram2_w(offs_t offset, uint8_t data) { m_colorram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(solomon_state::solomon_flipscreen_w) +void solomon_state::solomon_flipscreen_w(uint8_t data) { if (flip_screen() != (data & 0x01)) { diff --git a/src/mame/video/sonson.cpp b/src/mame/video/sonson.cpp index e84519c6874..95e0e161555 100644 --- a/src/mame/video/sonson.cpp +++ b/src/mame/video/sonson.cpp @@ -92,23 +92,21 @@ void sonson_state::sonson_palette(palette_device &palette) const } } -WRITE8_MEMBER(sonson_state::sonson_videoram_w) +void sonson_state::sonson_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sonson_state::sonson_colorram_w) +void sonson_state::sonson_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(sonson_state::sonson_scrollx_w) +void sonson_state::sonson_scrollx_w(uint8_t data) { - int row; - - for (row = 5; row < 32; row++) + for (int row = 5; row < 32; row++) m_bg_tilemap->set_scrollx(row, data); } diff --git a/src/mame/video/spacefb.cpp b/src/mame/video/spacefb.cpp index 8556da42b7a..aee54f523b3 100644 --- a/src/mame/video/spacefb.cpp +++ b/src/mame/video/spacefb.cpp @@ -17,7 +17,7 @@ * *************************************/ -WRITE8_MEMBER(spacefb_state::port_0_w) +void spacefb_state::port_0_w(uint8_t data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); @@ -25,7 +25,7 @@ WRITE8_MEMBER(spacefb_state::port_0_w) } -WRITE8_MEMBER(spacefb_state::port_2_w) +void spacefb_state::port_2_w(uint8_t data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); diff --git a/src/mame/video/spbactn.cpp b/src/mame/video/spbactn.cpp index 7fd78701b5d..f6d8e698f9a 100644 --- a/src/mame/video/spbactn.cpp +++ b/src/mame/video/spbactn.cpp @@ -6,7 +6,7 @@ -WRITE16_MEMBER(spbactn_state::bg_videoram_w) +void spbactn_state::bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bgvideoram[offset]); m_bg_tilemap->mark_tile_dirty(offset&0x1fff); @@ -20,7 +20,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_bg_tile_info) } -WRITE16_MEMBER(spbactn_state::fg_videoram_w) +void spbactn_state::fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_fgvideoram[offset]); m_fg_tilemap->mark_tile_dirty(offset&0x1fff); @@ -62,42 +62,42 @@ VIDEO_START_MEMBER(spbactn_state,spbactnp) m_extra_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(spbactn_state::get_extra_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 16, 16); } -WRITE16_MEMBER( spbactn_state::spbatnp_90006_w ) +void spbactn_state::spbatnp_90006_w(uint16_t data) { //printf("spbatnp_90006_w %04x\n",data); } -WRITE16_MEMBER( spbactn_state::spbatnp_9000c_w ) +void spbactn_state::spbatnp_9000c_w(uint16_t data) { //printf("spbatnp_9000c_w %04x\n",data); } -WRITE16_MEMBER( spbactn_state::spbatnp_9000e_w ) +void spbactn_state::spbatnp_9000e_w(uint16_t data) { //printf("spbatnp_9000e_w %04x\n",data); } -WRITE16_MEMBER( spbactn_state::spbatnp_9000a_w ) +void spbactn_state::spbatnp_9000a_w(uint16_t data) { //printf("spbatnp_9000a_w %04x\n",data); } -WRITE16_MEMBER( spbactn_state::spbatnp_90124_w ) +void spbactn_state::spbatnp_90124_w(uint16_t data) { //printf("spbatnp_90124_w %04x\n",data); m_bg_tilemap->set_scrolly(0, data); } -WRITE16_MEMBER( spbactn_state::spbatnp_9012c_w ) +void spbactn_state::spbatnp_9012c_w(uint16_t data) { //printf("spbatnp_9012c_w %04x\n",data); m_bg_tilemap->set_scrollx(0, data); } -WRITE8_MEMBER(spbactn_state::extraram_w) +void spbactn_state::extraram_w(offs_t offset, uint8_t data, uint8_t mem_mask) { COMBINE_DATA(&m_extraram[offset]); m_extra_tilemap->mark_tile_dirty(offset/2); diff --git a/src/mame/video/spdodgeb.cpp b/src/mame/video/spdodgeb.cpp index d834e8645b9..45f4bf7bc26 100644 --- a/src/mame/video/spdodgeb.cpp +++ b/src/mame/video/spdodgeb.cpp @@ -104,12 +104,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(spdodgeb_state::interrupt) } } -WRITE8_MEMBER(spdodgeb_state::scrollx_lo_w) +void spdodgeb_state::scrollx_lo_w(uint8_t data) { m_lastscroll = (m_lastscroll & 0x100) | data; } -WRITE8_MEMBER(spdodgeb_state::ctrl_w) +void spdodgeb_state::ctrl_w(uint8_t data) { /* bit 0 = flip screen */ flip_screen_set(data & 0x01); @@ -131,7 +131,7 @@ WRITE8_MEMBER(spdodgeb_state::ctrl_w) m_sprite_palbank = (data & 0xc0) >> 6; } -WRITE8_MEMBER(spdodgeb_state::videoram_w) +void spdodgeb_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); diff --git a/src/mame/video/speedatk.cpp b/src/mame/video/speedatk.cpp index 0779661d6b2..055ded3f227 100644 --- a/src/mame/video/speedatk.cpp +++ b/src/mame/video/speedatk.cpp @@ -56,7 +56,7 @@ void speedatk_state::video_start() save_item(NAME(m_flip_scr)); } -WRITE8_MEMBER(speedatk_state::m6845_w) +void speedatk_state::m6845_w(offs_t offset, uint8_t data) { if(offset == 0) { diff --git a/src/mame/video/speedbal.cpp b/src/mame/video/speedbal.cpp index 3bbd6bfecc0..962760f2972 100644 --- a/src/mame/video/speedbal.cpp +++ b/src/mame/video/speedbal.cpp @@ -56,7 +56,7 @@ void speedbal_state::video_start() * * *************************************/ -WRITE8_MEMBER(speedbal_state::foreground_videoram_w) +void speedbal_state::foreground_videoram_w(offs_t offset, uint8_t data) { m_foreground_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset>>1); @@ -68,7 +68,7 @@ WRITE8_MEMBER(speedbal_state::foreground_videoram_w) * * *************************************/ -WRITE8_MEMBER(speedbal_state::background_videoram_w) +void speedbal_state::background_videoram_w(offs_t offset, uint8_t data) { m_background_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset>>1); diff --git a/src/mame/video/speedspn.cpp b/src/mame/video/speedspn.cpp index 4fcb756fa25..6c42525f2d6 100644 --- a/src/mame/video/speedspn.cpp +++ b/src/mame/video/speedspn.cpp @@ -27,7 +27,7 @@ void speedspn_state::video_start() save_item(NAME(m_vidram)); } -WRITE8_MEMBER(speedspn_state::vidram_w) +void speedspn_state::vidram_w(offs_t offset, uint8_t data) { m_vidram[offset + m_bank_vidram] = data; @@ -35,26 +35,26 @@ WRITE8_MEMBER(speedspn_state::vidram_w) m_tilemap->mark_tile_dirty(offset/2); } -WRITE8_MEMBER(speedspn_state::attram_w) +void speedspn_state::attram_w(offs_t offset, uint8_t data) { m_attram[offset] = data; m_tilemap->mark_tile_dirty(offset^0x400); } -READ8_MEMBER(speedspn_state::vidram_r) +uint8_t speedspn_state::vidram_r(offs_t offset) { return m_vidram[offset + m_bank_vidram]; } -WRITE8_MEMBER(speedspn_state::vidram_bank_w) +void speedspn_state::vidram_bank_w(uint8_t data) { // logerror("VidRam Bank: %04x\n", data); m_bank_vidram = data & 1; m_bank_vidram *= 0x1000; } -WRITE8_MEMBER(speedspn_state::display_disable_w) +void speedspn_state::display_disable_w(uint8_t data) { // logerror("Global display: %u\n", data); m_display_disable = data & 1; diff --git a/src/mame/video/splash.cpp b/src/mame/video/splash.cpp index b65f24a5e06..b2f3417cd00 100644 --- a/src/mame/video/splash.cpp +++ b/src/mame/video/splash.cpp @@ -70,7 +70,7 @@ TILE_GET_INFO_MEMBER(splash_state::get_tile_info_tilemap1) ***************************************************************************/ -WRITE16_MEMBER(splash_state::vram_w) +void splash_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[offset]); m_bg_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 1); diff --git a/src/mame/video/sprint2.cpp b/src/mame/video/sprint2.cpp index 9270826f96d..40b713ac18b 100644 --- a/src/mame/video/sprint2.cpp +++ b/src/mame/video/sprint2.cpp @@ -49,27 +49,27 @@ void sprint2_state::video_start() } -READ8_MEMBER(sprint2_state::sprint2_collision1_r) +uint8_t sprint2_state::sprint2_collision1_r() { return m_collision[0]; } -READ8_MEMBER(sprint2_state::sprint2_collision2_r) +uint8_t sprint2_state::sprint2_collision2_r() { return m_collision[1]; } -WRITE8_MEMBER(sprint2_state::sprint2_collision_reset1_w) +void sprint2_state::sprint2_collision_reset1_w(uint8_t data) { m_collision[0] = 0; } -WRITE8_MEMBER(sprint2_state::sprint2_collision_reset2_w) +void sprint2_state::sprint2_collision_reset2_w(uint8_t data) { m_collision[1] = 0; } -WRITE8_MEMBER(sprint2_state::sprint2_video_ram_w) +void sprint2_state::sprint2_video_ram_w(offs_t offset, uint8_t data) { m_video_ram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/sprint4.cpp b/src/mame/video/sprint4.cpp index 4d920f85cb4..183a91fd058 100644 --- a/src/mame/video/sprint4.cpp +++ b/src/mame/video/sprint4.cpp @@ -131,7 +131,7 @@ WRITE_LINE_MEMBER(sprint4_state::screen_vblank) } -WRITE8_MEMBER(sprint4_state::video_ram_w) +void sprint4_state::video_ram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_playfield->mark_tile_dirty(offset); diff --git a/src/mame/video/sprint8.cpp b/src/mame/video/sprint8.cpp index 5ab35afe829..7b3db9843fc 100644 --- a/src/mame/video/sprint8.cpp +++ b/src/mame/video/sprint8.cpp @@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(sprint8_state::get_tile_info2) } -WRITE8_MEMBER(sprint8_state::video_ram_w) +void sprint8_state::video_ram_w(offs_t offset, uint8_t data) { m_video_ram[offset] = data; m_tilemap1->mark_tile_dirty(offset); diff --git a/src/mame/video/srumbler.cpp b/src/mame/video/srumbler.cpp index f718a0f72cb..727977ef8f4 100644 --- a/src/mame/video/srumbler.cpp +++ b/src/mame/video/srumbler.cpp @@ -66,20 +66,20 @@ void srumbler_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(srumbler_state::foreground_w) +void srumbler_state::foreground_w(offs_t offset, uint8_t data) { m_foregroundram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset/2); } -WRITE8_MEMBER(srumbler_state::background_w) +void srumbler_state::background_w(offs_t offset, uint8_t data) { m_backgroundram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset/2); } -WRITE8_MEMBER(srumbler_state::_4009_w) +void srumbler_state::_4009_w(uint8_t data) { /* bit 0 flips screen */ flip_screen_set(data & 1); @@ -92,7 +92,7 @@ WRITE8_MEMBER(srumbler_state::_4009_w) } -WRITE8_MEMBER(srumbler_state::scroll_w) +void srumbler_state::scroll_w(offs_t offset, uint8_t data) { m_scroll[offset] = data; diff --git a/src/mame/video/sshangha.cpp b/src/mame/video/sshangha.cpp index 7d0fe0d43ad..4756a469625 100644 --- a/src/mame/video/sshangha.cpp +++ b/src/mame/video/sshangha.cpp @@ -13,7 +13,7 @@ /******************************************************************************/ -WRITE16_MEMBER(sshangha_state::video_w) +void sshangha_state::video_w(uint16_t data) { /* 0x4: Special video mode, other bits unknown */ m_video_control = data; diff --git a/src/mame/video/sslam.cpp b/src/mame/video/sslam.cpp index 4ddd4e3d692..e2def7b5bf1 100644 --- a/src/mame/video/sslam.cpp +++ b/src/mame/video/sslam.cpp @@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_tx_tile_info) tileinfo.set(3,code+0xc000 ,colr >> 12,0); } -WRITE16_MEMBER(sslam_state::sslam_tx_tileram_w) +void sslam_state::sslam_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); @@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_md_tile_info) tileinfo.set(2,code+0x2000 ,colr >> 12,0); } -WRITE16_MEMBER(sslam_state::sslam_md_tileram_w) +void sslam_state::sslam_md_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_md_tileram[offset]); m_md_tilemap->mark_tile_dirty(offset); @@ -114,7 +114,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_bg_tile_info) tileinfo.set(1,code ,colr >> 13,0); } -WRITE16_MEMBER(sslam_state::sslam_bg_tileram_w) +void sslam_state::sslam_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); @@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(powerbls_state::get_powerbls_bg_tile_info) tileinfo.set(1,code,colr,0); } -WRITE16_MEMBER(powerbls_state::powerbls_bg_tileram_w) +void powerbls_state::powerbls_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>>1); diff --git a/src/mame/video/ssozumo.cpp b/src/mame/video/ssozumo.cpp index c4493b82dd0..5c8d72fc6c8 100644 --- a/src/mame/video/ssozumo.cpp +++ b/src/mame/video/ssozumo.cpp @@ -45,31 +45,31 @@ void ssozumo_state::ssozumo_palette(palette_device &palette) const } } -WRITE8_MEMBER(ssozumo_state::videoram_w) +void ssozumo_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(ssozumo_state::colorram_w) +void ssozumo_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(ssozumo_state::videoram2_w) +void ssozumo_state::videoram2_w(offs_t offset, uint8_t data) { m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(ssozumo_state::colorram2_w) +void ssozumo_state::colorram2_w(offs_t offset, uint8_t data) { m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(ssozumo_state::paletteram_w) +void ssozumo_state::paletteram_w(offs_t offset, uint8_t data) { int bit0, bit1, bit2, bit3, val; int r, g, b; @@ -102,12 +102,12 @@ WRITE8_MEMBER(ssozumo_state::paletteram_w) m_palette->set_pen_color(offs2 + 64, rgb_t(r, g, b)); } -WRITE8_MEMBER(ssozumo_state::scroll_w) +void ssozumo_state::scroll_w(uint8_t data) { m_bg_tilemap->set_scrolly(0, data); } -WRITE8_MEMBER(ssozumo_state::flipscreen_w) +void ssozumo_state::flipscreen_w(uint8_t data) { flip_screen_set(data & 0x80); m_color_bank = data & 3; diff --git a/src/mame/video/sspeedr.cpp b/src/mame/video/sspeedr.cpp index 3c9f6096a1f..43918614bb5 100644 --- a/src/mame/video/sspeedr.cpp +++ b/src/mame/video/sspeedr.cpp @@ -10,73 +10,73 @@ Taito Super Speed Race video emulation #include "includes/sspeedr.h" -WRITE8_MEMBER(sspeedr_state::sspeedr_driver_horz_w) +void sspeedr_state::sspeedr_driver_horz_w(uint8_t data) { m_driver_horz = (m_driver_horz & 0x100) | data; } -WRITE8_MEMBER(sspeedr_state::sspeedr_driver_horz_2_w) +void sspeedr_state::sspeedr_driver_horz_2_w(uint8_t data) { m_driver_horz = (m_driver_horz & 0xff) | ((data & 1) << 8); } -WRITE8_MEMBER(sspeedr_state::sspeedr_driver_vert_w) +void sspeedr_state::sspeedr_driver_vert_w(uint8_t data) { m_driver_vert = data; } -WRITE8_MEMBER(sspeedr_state::sspeedr_driver_pic_w) +void sspeedr_state::sspeedr_driver_pic_w(uint8_t data) { m_driver_pic = data & 0x1f; } -WRITE8_MEMBER(sspeedr_state::sspeedr_drones_horz_w) +void sspeedr_state::sspeedr_drones_horz_w(uint8_t data) { m_drones_horz = (m_drones_horz & 0x100) | data; } -WRITE8_MEMBER(sspeedr_state::sspeedr_drones_horz_2_w) +void sspeedr_state::sspeedr_drones_horz_2_w(uint8_t data) { m_drones_horz = (m_drones_horz & 0xff) | ((data & 1) << 8); } -WRITE8_MEMBER(sspeedr_state::sspeedr_drones_mask_w) +void sspeedr_state::sspeedr_drones_mask_w(uint8_t data) { m_drones_mask = data & 0x3f; } -WRITE8_MEMBER(sspeedr_state::sspeedr_drones_vert_w) +void sspeedr_state::sspeedr_drones_vert_w(offs_t offset, uint8_t data) { m_drones_vert[offset] = data; } -WRITE8_MEMBER(sspeedr_state::sspeedr_track_horz_w) +void sspeedr_state::sspeedr_track_horz_w(uint8_t data) { m_track_horz = (m_track_horz & 0x100) | data; } -WRITE8_MEMBER(sspeedr_state::sspeedr_track_horz_2_w) +void sspeedr_state::sspeedr_track_horz_2_w(uint8_t data) { m_track_horz = (m_track_horz & 0xff) | ((data & 1) << 8); } -WRITE8_MEMBER(sspeedr_state::sspeedr_track_vert_w) +void sspeedr_state::sspeedr_track_vert_w(offs_t offset, uint8_t data) { m_track_vert[offset] = data & 0x7f; } -WRITE8_MEMBER(sspeedr_state::sspeedr_track_ice_w) +void sspeedr_state::sspeedr_track_ice_w(uint8_t data) { m_track_ice = data & 0x07; } diff --git a/src/mame/video/ssrj.cpp b/src/mame/video/ssrj.cpp index e6b4119da58..22cc70efa3f 100644 --- a/src/mame/video/ssrj.cpp +++ b/src/mame/video/ssrj.cpp @@ -5,7 +5,7 @@ /* tilemap 1 */ -WRITE8_MEMBER(ssrj_state::vram1_w) +void ssrj_state::vram1_w(offs_t offset, uint8_t data) { m_vram1[offset] = data; m_tilemap1->mark_tile_dirty(offset>>1); @@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info1) /* tilemap 2 */ -WRITE8_MEMBER(ssrj_state::vram2_w) +void ssrj_state::vram2_w(offs_t offset, uint8_t data) { m_vram2[offset] = data; m_tilemap2->mark_tile_dirty(offset>>1); @@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info2) /* tilemap 4 */ -WRITE8_MEMBER(ssrj_state::vram4_w) +void ssrj_state::vram4_w(offs_t offset, uint8_t data) { m_vram4[offset] = data; m_tilemap4->mark_tile_dirty(offset>>1); diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp index b1cd23169d3..4b65573544c 100644 --- a/src/mame/video/ssv.cpp +++ b/src/mame/video/ssv.cpp @@ -384,7 +384,7 @@ void gdfs_state::video_start() ***************************************************************************/ -READ16_MEMBER(ssv_state::vblank_r) +uint16_t ssv_state::vblank_r() { // maybe reads scanline counter? pastelis reads this on the 'for use in Japan' screen + end credits // and adjusts y position to do a polled raster effect by changing scroll values midscreen @@ -399,7 +399,7 @@ READ16_MEMBER(ssv_state::vblank_r) return ret; } -WRITE16_MEMBER(ssv_state::scroll_w) +void ssv_state::scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_screen->update_partial(m_screen->vpos() - 1); // pastelis FOR USE IN JAPAN screen polls the vblank / hblank to do a raster effect COMBINE_DATA(m_scroll + offset); diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp index 779d3704194..6702174635a 100644 --- a/src/mame/video/st0020.cpp +++ b/src/mame/video/st0020.cpp @@ -90,7 +90,7 @@ void st0020_device::device_start() // Gfx ram -READ16_MEMBER(st0020_device::gfxram_r) +uint16_t st0020_device::gfxram_r(offs_t offset, uint16_t mem_mask) { ST0020_ST0032_BYTESWAP_MEM_MASK(); @@ -100,7 +100,7 @@ READ16_MEMBER(st0020_device::gfxram_r) return data; } -WRITE16_MEMBER(st0020_device::gfxram_w) +void st0020_device::gfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { ST0020_ST0032_BYTESWAP_MEM_MASK(); ST0020_ST0032_BYTESWAP_DATA(); @@ -110,7 +110,7 @@ WRITE16_MEMBER(st0020_device::gfxram_w) gfx(0)->mark_dirty(offset / (16*8/2)); } -WRITE16_MEMBER(st0020_device::gfxram_bank_w) +void st0020_device::gfxram_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data = COMBINE_DATA(&m_regs[offset]); @@ -178,12 +178,12 @@ TILEMAP_MAPPER_MEMBER(st0020_device::scan_16x16) } // Sprite RAM -READ16_MEMBER(st0020_device::sprram_r) +uint16_t st0020_device::sprram_r(offs_t offset) { return m_spriteram[offset]; } -WRITE16_MEMBER(st0020_device::sprram_w) +void st0020_device::sprram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spriteram[offset]); @@ -201,7 +201,7 @@ WRITE16_MEMBER(st0020_device::sprram_w) } // Blitter -WRITE16_MEMBER(st0020_device::do_blit_w) +void st0020_device::do_blit_w(uint16_t data) { uint32_t src = (m_regs[0xc0/2] + (m_regs[0xc2/2] << 16)) << 1; uint32_t dst = (m_regs[0xc4/2] + (m_regs[0xc6/2] << 16)) << 4; @@ -256,7 +256,7 @@ WRITE16_MEMBER(st0020_device::do_blit_w) ***************************************************************************/ -WRITE16_MEMBER(st0020_device::tmap_st0020_w) +void st0020_device::tmap_st0020_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t old = m_regs[offset]; data = COMBINE_DATA(&m_regs[offset]); @@ -285,7 +285,7 @@ WRITE16_MEMBER(st0020_device::tmap_st0020_w) } } -WRITE16_MEMBER(st0020_device::tmap_st0032_w) +void st0020_device::tmap_st0032_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t old = m_regs[offset]; data = COMBINE_DATA(&m_regs[offset]); @@ -309,7 +309,7 @@ WRITE16_MEMBER(st0020_device::tmap_st0032_w) } -READ16_MEMBER(st0020_device::regs_r) +uint16_t st0020_device::regs_r(offs_t offset) { if (m_is_st0032) { @@ -332,11 +332,11 @@ READ16_MEMBER(st0020_device::regs_r) } -WRITE16_MEMBER(st0020_device::regs_st0020_w) +void st0020_device::regs_st0020_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (offset < 0x20/2) { - tmap_st0020_w(space, offset, data, mem_mask); + tmap_st0020_w(offset, data, mem_mask); return; } @@ -362,7 +362,7 @@ WRITE16_MEMBER(st0020_device::regs_st0020_w) // case 0x86/2: double buffering? case 0x8a/2: - gfxram_bank_w(space, offset, data, mem_mask); + gfxram_bank_w(offset, data, mem_mask); break; // blitter @@ -374,7 +374,7 @@ WRITE16_MEMBER(st0020_device::regs_st0020_w) break; case 0xca/2: // start - do_blit_w(space, offset, data, mem_mask); + do_blit_w(data); break; default: @@ -382,11 +382,11 @@ WRITE16_MEMBER(st0020_device::regs_st0020_w) } } -WRITE16_MEMBER(st0020_device::regs_st0032_w) +void st0020_device::regs_st0032_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (offset >= 0x20/2 && offset < 0x60/2) { - tmap_st0032_w(space, offset, data, mem_mask); + tmap_st0032_w(offset, data, mem_mask); return; } @@ -401,7 +401,7 @@ WRITE16_MEMBER(st0020_device::regs_st0032_w) // case 0x82/2: double buffering? case 0x86/2: - gfxram_bank_w(space, offset, data, mem_mask); + gfxram_bank_w(offset, data, mem_mask); break; // blitter @@ -413,7 +413,7 @@ WRITE16_MEMBER(st0020_device::regs_st0032_w) break; case 0xca/2: // start - do_blit_w(space, offset, data, mem_mask); + do_blit_w(data); break; default: @@ -421,12 +421,12 @@ WRITE16_MEMBER(st0020_device::regs_st0032_w) } } -WRITE16_MEMBER(st0020_device::regs_w) +void st0020_device::regs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (m_is_st0032) - regs_st0032_w(space, offset, data, mem_mask); + regs_st0032_w(offset, data, mem_mask); else - regs_st0020_w(space, offset, data, mem_mask); + regs_st0020_w(offset, data, mem_mask); } /*************************************************************************** diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h index 851c8d79a91..0ed6e9d4fdd 100644 --- a/src/mame/video/st0020.h +++ b/src/mame/video/st0020.h @@ -19,14 +19,14 @@ public: void update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, bool update_visible_area); - DECLARE_READ16_MEMBER(gfxram_r); - DECLARE_WRITE16_MEMBER(gfxram_w); + uint16_t gfxram_r(offs_t offset, uint16_t mem_mask = ~0); + void gfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER(regs_r); - DECLARE_WRITE16_MEMBER(regs_w); + uint16_t regs_r(offs_t offset); + void regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER(sprram_r); - DECLARE_WRITE16_MEMBER(sprram_w); + uint16_t sprram_r(offs_t offset); + void sprram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); protected: virtual void device_start() override; @@ -44,15 +44,15 @@ private: std::unique_ptr<uint16_t[]> m_spriteram; std::unique_ptr<uint16_t[]> m_regs; - DECLARE_WRITE16_MEMBER(regs_st0020_w); - DECLARE_WRITE16_MEMBER(regs_st0032_w); + void regs_st0020_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void regs_st0032_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); int m_gfxram_bank; - DECLARE_WRITE16_MEMBER(gfxram_bank_w); + void gfxram_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // blitter optional_region_ptr<uint8_t> m_rom_ptr; - DECLARE_WRITE16_MEMBER(do_blit_w); + void do_blit_w(uint16_t data); // tilemaps tilemap_t *m_tmap[4]; @@ -63,8 +63,8 @@ private: int tmap_offset(int i); int tmap_priority(int i); int tmap_is_enabled(int i); - DECLARE_WRITE16_MEMBER(tmap_st0020_w); - DECLARE_WRITE16_MEMBER(tmap_st0032_w); + void tmap_st0020_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tmap_st0032_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // sprites void draw_zooming_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority); diff --git a/src/mame/video/stactics.cpp b/src/mame/video/stactics.cpp index 185f4657d30..ee3e0fd724e 100644 --- a/src/mame/video/stactics.cpp +++ b/src/mame/video/stactics.cpp @@ -98,7 +98,7 @@ WRITE_LINE_MEMBER(stactics_state::palette_bank_w) * *************************************/ -WRITE8_MEMBER(stactics_state::scroll_ram_w) +void stactics_state::scroll_ram_w(offs_t offset, uint8_t data) { if (data & 0x01) { @@ -132,7 +132,7 @@ READ_LINE_MEMBER(stactics_state::frame_count_d3_r) * *************************************/ -WRITE8_MEMBER(stactics_state::speed_latch_w) +void stactics_state::speed_latch_w(uint8_t data) { /* This writes to a shift register which is clocked by */ /* a 555 oscillator. This value determines the speed of */ @@ -157,13 +157,13 @@ WRITE8_MEMBER(stactics_state::speed_latch_w) } -WRITE8_MEMBER(stactics_state::shot_trigger_w) +void stactics_state::shot_trigger_w(uint8_t data) { m_shot_standby = 0; } -WRITE8_MEMBER(stactics_state::shot_flag_clear_w) +void stactics_state::shot_flag_clear_w(uint8_t data) { m_shot_arrive = 0; } diff --git a/src/mame/video/stadhero.cpp b/src/mame/video/stadhero.cpp index 564a8b5eac2..bdf8c3d8c61 100644 --- a/src/mame/video/stadhero.cpp +++ b/src/mame/video/stadhero.cpp @@ -35,7 +35,7 @@ uint32_t stadhero_state::screen_update(screen_device &screen, bitmap_ind16 &bitm /******************************************************************************/ -WRITE16_MEMBER(stadhero_state::pf1_data_w) +void stadhero_state::pf1_data_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pf1_data[offset]); m_pf1_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/starcrus.cpp b/src/mame/video/starcrus.cpp index 9a3c647371f..c4ef6b3a566 100644 --- a/src/mame/video/starcrus.cpp +++ b/src/mame/video/starcrus.cpp @@ -11,14 +11,14 @@ /* The collision detection techniques use in this driver are well explained in the comments in the sprint2 driver */ -WRITE8_MEMBER(starcrus_state::s1_x_w){ m_s1_x = data^0xff; } -WRITE8_MEMBER(starcrus_state::s1_y_w){ m_s1_y = data^0xff; } -WRITE8_MEMBER(starcrus_state::s2_x_w){ m_s2_x = data^0xff; } -WRITE8_MEMBER(starcrus_state::s2_y_w){ m_s2_y = data^0xff; } -WRITE8_MEMBER(starcrus_state::p1_x_w){ m_p1_x = data^0xff; } -WRITE8_MEMBER(starcrus_state::p1_y_w){ m_p1_y = data^0xff; } -WRITE8_MEMBER(starcrus_state::p2_x_w){ m_p2_x = data^0xff; } -WRITE8_MEMBER(starcrus_state::p2_y_w){ m_p2_y = data^0xff; } +void starcrus_state::s1_x_w(uint8_t data){ m_s1_x = data^0xff; } +void starcrus_state::s1_y_w(uint8_t data){ m_s1_y = data^0xff; } +void starcrus_state::s2_x_w(uint8_t data){ m_s2_x = data^0xff; } +void starcrus_state::s2_y_w(uint8_t data){ m_s2_y = data^0xff; } +void starcrus_state::p1_x_w(uint8_t data){ m_p1_x = data^0xff; } +void starcrus_state::p1_y_w(uint8_t data){ m_p1_y = data^0xff; } +void starcrus_state::p2_x_w(uint8_t data){ m_p2_x = data^0xff; } +void starcrus_state::p2_y_w(uint8_t data){ m_p2_y = data^0xff; } void starcrus_state::video_start() { @@ -53,7 +53,7 @@ void starcrus_state::video_start() save_item(NAME(m_launch2_sound_playing)); } -WRITE8_MEMBER(starcrus_state::ship_parm_1_w) +void starcrus_state::ship_parm_1_w(uint8_t data) { m_s1_sprite = data&0x1f; m_engine1_on = ((data&0x20)>>5)^0x01; @@ -76,7 +76,7 @@ WRITE8_MEMBER(starcrus_state::ship_parm_1_w) } } -WRITE8_MEMBER(starcrus_state::ship_parm_2_w) +void starcrus_state::ship_parm_2_w(uint8_t data) { m_s2_sprite = data & 0x1f; m_led = !BIT(data, 7); /* game over lamp */ @@ -102,7 +102,7 @@ WRITE8_MEMBER(starcrus_state::ship_parm_2_w) } -WRITE8_MEMBER(starcrus_state::proj_parm_1_w) +void starcrus_state::proj_parm_1_w(uint8_t data) { m_p1_sprite = data & 0x0f; m_launch1_on = ((data & 0x20) >> 5) ^ 0x01; @@ -139,7 +139,7 @@ WRITE8_MEMBER(starcrus_state::proj_parm_1_w) } } -WRITE8_MEMBER(starcrus_state::proj_parm_2_w) +void starcrus_state::proj_parm_2_w(uint8_t data) { m_p2_sprite = data & 0x0f; m_launch2_on = ((data & 0x20) >> 5) ^ 0x01; @@ -475,7 +475,7 @@ uint32_t starcrus_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -READ8_MEMBER(starcrus_state::coll_det_r) +uint8_t starcrus_state::coll_det_r() { return m_collision_reg ^ 0xff; } diff --git a/src/mame/video/starfire.cpp b/src/mame/video/starfire.cpp index f0f3eb1bb1a..a659cbcf572 100644 --- a/src/mame/video/starfire.cpp +++ b/src/mame/video/starfire.cpp @@ -37,7 +37,7 @@ void starfire_state::video_start() * *************************************/ -WRITE8_MEMBER(starfire_state::starfire_colorram_w) +void starfire_state::starfire_colorram_w(offs_t offset, uint8_t data) { /* handle writes to the pseudo-color RAM */ if ((offset & 0xe0) == 0) @@ -70,7 +70,7 @@ WRITE8_MEMBER(starfire_state::starfire_colorram_w) } } -READ8_MEMBER(starfire_state::starfire_colorram_r) +uint8_t starfire_state::starfire_colorram_r(offs_t offset) { /* handle writes to the pseudo-color RAM, which also happen on reads */ if ((offset & 0xe0) == 0) @@ -97,7 +97,7 @@ READ8_MEMBER(starfire_state::starfire_colorram_r) * *************************************/ -WRITE8_MEMBER(starfire_state::starfire_videoram_w) +void starfire_state::starfire_videoram_w(offs_t offset, uint8_t data) { int sh, lr, dm, ds, mask, d0, dalu; int offset1 = offset & 0x1fff; @@ -177,7 +177,7 @@ WRITE8_MEMBER(starfire_state::starfire_videoram_w) } } -READ8_MEMBER(starfire_state::starfire_videoram_r) +uint8_t starfire_state::starfire_videoram_r(offs_t offset) { int sh, mask, d0; int offset1 = offset & 0x1fff; diff --git a/src/mame/video/starshp1.cpp b/src/mame/video/starshp1.cpp index 617ca771142..4ea20f955cf 100644 --- a/src/mame/video/starshp1.cpp +++ b/src/mame/video/starshp1.cpp @@ -80,7 +80,7 @@ void starshp1_state::video_start() } -READ8_MEMBER(starshp1_state::starshp1_rng_r) +uint8_t starshp1_state::starshp1_rng_r() { int width = m_screen->width(); int height = m_screen->height(); @@ -98,7 +98,7 @@ READ8_MEMBER(starshp1_state::starshp1_rng_r) } -WRITE8_MEMBER(starshp1_state::starshp1_ssadd_w) +void starshp1_state::starshp1_ssadd_w(offs_t offset, uint8_t data) { /* * The range of sprite position values doesn't suffice to @@ -114,7 +114,7 @@ WRITE8_MEMBER(starshp1_state::starshp1_ssadd_w) } -WRITE8_MEMBER(starshp1_state::starshp1_sspic_w) +void starshp1_state::starshp1_sspic_w(uint8_t data) { /* * Some mysterious game code at address $2CCE is causes @@ -127,7 +127,7 @@ WRITE8_MEMBER(starshp1_state::starshp1_sspic_w) } -WRITE8_MEMBER(starshp1_state::starshp1_playfield_w) +void starshp1_state::starshp1_playfield_w(offs_t offset, uint8_t data) { if (m_mux != 0) { diff --git a/src/mame/video/sub.cpp b/src/mame/video/sub.cpp index babdb1b72bf..920947e4a33 100644 --- a/src/mame/video/sub.cpp +++ b/src/mame/video/sub.cpp @@ -39,19 +39,19 @@ TILE_GET_INFO_MEMBER(sub_state::get_tile_info) tileinfo.set(0, code, color, 0); } -WRITE8_MEMBER(sub_state::vram_w) +void sub_state::vram_w(offs_t offset, uint8_t data) { m_vram[offset] = data; m_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(sub_state::attr_w) +void sub_state::attr_w(offs_t offset, uint8_t data) { m_attr[offset] = data; m_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(sub_state::scrolly_w) +void sub_state::scrolly_w(offs_t offset, uint8_t data) { m_scrolly[offset] = data; m_tilemap->set_scrolly(offset,m_scrolly[offset]); diff --git a/src/mame/video/suna16.cpp b/src/mame/video/suna16.cpp index 3665dc2087d..85ecabc78b1 100644 --- a/src/mame/video/suna16.cpp +++ b/src/mame/video/suna16.cpp @@ -62,7 +62,7 @@ #include "emu.h" #include "includes/suna16.h" -WRITE16_MEMBER(suna16_state::flipscreen_w) +void suna16_state::flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -72,7 +72,7 @@ WRITE16_MEMBER(suna16_state::flipscreen_w) if (data & ~(1|4)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", m_maincpu->pc(), data); } -WRITE16_MEMBER(suna16_state::bestbest_flipscreen_w) +void suna16_state::bestbest_flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -98,12 +98,12 @@ void suna16_state::video_start() save_item(NAME(m_color_bank)); } -READ16_MEMBER(suna16_state::paletteram_r) +uint16_t suna16_state::paletteram_r(offs_t offset) { return m_paletteram[offset + m_color_bank * 256]; } -WRITE16_MEMBER(suna16_state::paletteram_w) +void suna16_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { offset += m_color_bank * 256; data = COMBINE_DATA(&m_paletteram[offset]); diff --git a/src/mame/video/suna8.cpp b/src/mame/video/suna8.cpp index c50647e3069..edb3b1e9f62 100644 --- a/src/mame/video/suna8.cpp +++ b/src/mame/video/suna8.cpp @@ -58,19 +58,19 @@ TILE_GET_INFO_MEMBER(suna8_state::get_tile_info) #endif -READ8_MEMBER( suna8_state::banked_paletteram_r ) +uint8_t suna8_state::banked_paletteram_r(offs_t offset) { offset += m_palettebank * 0x200; return m_banked_paletteram[offset]; } -READ8_MEMBER(suna8_state::suna8_banked_spriteram_r) +uint8_t suna8_state::suna8_banked_spriteram_r(offs_t offset) { offset += m_spritebank * 0x2000; return m_spriteram[offset]; } -WRITE8_MEMBER(suna8_state::suna8_spriteram_w) +void suna8_state::suna8_spriteram_w(offs_t offset, uint8_t data) { m_spriteram[offset] = data; #if TILEMAPS @@ -78,7 +78,7 @@ WRITE8_MEMBER(suna8_state::suna8_spriteram_w) #endif } -WRITE8_MEMBER(suna8_state::suna8_banked_spriteram_w) +void suna8_state::suna8_banked_spriteram_w(offs_t offset, uint8_t data) { offset += m_spritebank * 0x2000; m_spriteram[offset] = data; @@ -90,7 +90,7 @@ WRITE8_MEMBER(suna8_state::suna8_banked_spriteram_w) /* Banked Palette RAM. The data is scrambled */ -WRITE8_MEMBER( suna8_state::brickzn_banked_paletteram_w ) +void suna8_state::brickzn_banked_paletteram_w(offs_t offset, uint8_t data) { if (!m_paletteram_enab) return; diff --git a/src/mame/video/suprloco.cpp b/src/mame/video/suprloco.cpp index 4f8796c4a32..49b76042936 100644 --- a/src/mame/video/suprloco.cpp +++ b/src/mame/video/suprloco.cpp @@ -105,13 +105,13 @@ void suprloco_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(suprloco_state::videoram_w) +void suprloco_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset/2); } -WRITE8_MEMBER(suprloco_state::scrollram_w) +void suprloco_state::scrollram_w(offs_t offset, uint8_t data) { int adj = flip_screen() ? -8 : 8; diff --git a/src/mame/video/suprnova.cpp b/src/mame/video/suprnova.cpp index ea2e606edb1..802c622ab41 100644 --- a/src/mame/video/suprnova.cpp +++ b/src/mame/video/suprnova.cpp @@ -89,7 +89,7 @@ void skns_state::draw_roz(bitmap_ind16 &bitmap, bitmap_ind8& bitmapflags, const } -WRITE32_MEMBER(skns_state::pal_regs_w) +void skns_state::pal_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_pal_regs[offset]); m_palette_updated =1; @@ -176,7 +176,7 @@ WRITE32_MEMBER(skns_state::pal_regs_w) } -WRITE32_MEMBER(skns_state::palette_ram_w) +void skns_state::palette_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { int r,g,b; int brightness_r, brightness_g, brightness_b/*, alpha*/; @@ -291,7 +291,7 @@ TILE_GET_INFO_MEMBER(skns_state::get_tilemap_A_tile_info) //if (pri) popmessage("pri A!! %02x\n", pri); } -WRITE32_MEMBER(skns_state::tilemapA_w) +void skns_state::tilemapA_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_tilemapA_ram[offset]); m_tilemap_A->mark_tile_dirty(offset); @@ -317,13 +317,13 @@ TILE_GET_INFO_MEMBER(skns_state::get_tilemap_B_tile_info) //if (pri) popmessage("pri B!! %02x\n", pri); // 02 on cyvern } -WRITE32_MEMBER(skns_state::tilemapB_w) +void skns_state::tilemapB_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_tilemapB_ram[offset]); m_tilemap_B->mark_tile_dirty(offset); } -WRITE32_MEMBER(skns_state::v3_regs_w) +void skns_state::v3_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_v3_regs[offset]); diff --git a/src/mame/video/suprridr.cpp b/src/mame/video/suprridr.cpp index cc8af83b0db..535eae562d0 100644 --- a/src/mame/video/suprridr.cpp +++ b/src/mame/video/suprridr.cpp @@ -94,33 +94,33 @@ void suprridr_state::suprridr_palette(palette_device &palette) const * *************************************/ -WRITE8_MEMBER(suprridr_state::flipx_w) +void suprridr_state::flipx_w(uint8_t data) { m_flipx = data & 1; machine().tilemap().set_flip_all((m_flipx ? TILEMAP_FLIPX : 0) | (m_flipy ? TILEMAP_FLIPY : 0)); } -WRITE8_MEMBER(suprridr_state::flipy_w) +void suprridr_state::flipy_w(uint8_t data) { m_flipy = data & 1; machine().tilemap().set_flip_all((m_flipx ? TILEMAP_FLIPX : 0) | (m_flipy ? TILEMAP_FLIPY : 0)); } -WRITE8_MEMBER(suprridr_state::fgdisable_w) +void suprridr_state::fgdisable_w(uint8_t data) { m_fg_tilemap->enable(~data & 1); } -WRITE8_MEMBER(suprridr_state::fgscrolly_w) +void suprridr_state::fgscrolly_w(uint8_t data) { m_fg_tilemap->set_scrolly(0, data); } -WRITE8_MEMBER(suprridr_state::bgscrolly_w) +void suprridr_state::bgscrolly_w(uint8_t data) { m_bg_tilemap->set_scrolly(0, data); } @@ -139,7 +139,7 @@ int suprridr_state::is_screen_flipped() * *************************************/ -WRITE8_MEMBER(suprridr_state::bgram_w) +void suprridr_state::bgram_w(offs_t offset, uint8_t data) { m_bgram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); @@ -147,7 +147,7 @@ WRITE8_MEMBER(suprridr_state::bgram_w) } -WRITE8_MEMBER(suprridr_state::fgram_w) +void suprridr_state::fgram_w(offs_t offset, uint8_t data) { m_fgram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/suprslam.cpp b/src/mame/video/suprslam.cpp index 0c23367ea33..bf9cdeec981 100644 --- a/src/mame/video/suprslam.cpp +++ b/src/mame/video/suprslam.cpp @@ -9,7 +9,7 @@ /* FG 'SCREEN' LAYER */ -WRITE16_MEMBER(suprslam_state::suprslam_screen_videoram_w) +void suprslam_state::suprslam_screen_videoram_w(offs_t offset, uint16_t data) { m_screen_videoram[offset] = data; m_screen_tilemap->mark_tile_dirty(offset); @@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(suprslam_state::get_suprslam_tile_info) /* BG LAYER */ -WRITE16_MEMBER(suprslam_state::suprslam_bg_videoram_w) +void suprslam_state::suprslam_bg_videoram_w(offs_t offset, uint16_t data) { m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); @@ -83,7 +83,7 @@ uint32_t suprslam_state::screen_update_suprslam(screen_device &screen, bitmap_in return 0; } -WRITE16_MEMBER(suprslam_state::suprslam_bank_w) +void suprslam_state::suprslam_bank_w(uint16_t data) { uint16_t old_screen_bank, old_bg_bank; old_screen_bank = m_screen_bank; diff --git a/src/mame/video/system1.cpp b/src/mame/video/system1.cpp index 132ba534db9..c02ccd4fa27 100644 --- a/src/mame/video/system1.cpp +++ b/src/mame/video/system1.cpp @@ -262,21 +262,21 @@ void system1_state::common_videomode_w(u8 data) * *************************************/ -READ8_MEMBER(system1_state::mixer_collision_r) +u8 system1_state::mixer_collision_r(offs_t offset) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); return m_mix_collide[offset & 0x3f] | 0x7e | (m_mix_collide_summary << 7); } -WRITE8_MEMBER(system1_state::mixer_collision_w) +void system1_state::mixer_collision_w(offs_t offset, u8 data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); m_mix_collide[offset & 0x3f] = 0; } -WRITE8_MEMBER(system1_state::mixer_collision_reset_w) +void system1_state::mixer_collision_reset_w(u8 data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); @@ -290,21 +290,21 @@ WRITE8_MEMBER(system1_state::mixer_collision_reset_w) * *************************************/ -READ8_MEMBER(system1_state::sprite_collision_r) +u8 system1_state::sprite_collision_r(offs_t offset) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); return m_sprite_collide[offset & 0x3ff] | 0x7e | (m_sprite_collide_summary << 7); } -WRITE8_MEMBER(system1_state::sprite_collision_w) +void system1_state::sprite_collision_w(offs_t offset, u8 data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); m_sprite_collide[offset & 0x3ff] = 0; } -WRITE8_MEMBER(system1_state::sprite_collision_reset_w) +void system1_state::sprite_collision_reset_w(u8 data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); @@ -333,14 +333,14 @@ inline void system1_state::videoram_wait_states(cpu_device *cpu) cpu->adjust_icount(-cycles_until_next_fixst); } -READ8_MEMBER(system1_state::videoram_r) +u8 system1_state::videoram_r(offs_t offset) { videoram_wait_states(m_maincpu); offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2)); return m_videoram[offset]; } -WRITE8_MEMBER(system1_state::videoram_w) +void system1_state::videoram_w(offs_t offset, u8 data) { videoram_wait_states(m_maincpu); offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2)); @@ -368,7 +368,7 @@ void system1_state::videoram_bank_w(u8 data) * *************************************/ -WRITE8_MEMBER(system1_state::paletteram_w) +void system1_state::paletteram_w(offs_t offset, u8 data) { m_paletteram[offset] = data; m_palette->set_pen_indirect(offset, m_paletteram[offset]); diff --git a/src/mame/video/system16.cpp b/src/mame/video/system16.cpp index d392ef61e65..be48ba70e81 100644 --- a/src/mame/video/system16.cpp +++ b/src/mame/video/system16.cpp @@ -102,7 +102,7 @@ static const int resistances_normal[6] = {3900, 2000, 1000, 1000/2, 1000/4, 0}; static const int resistances_sh[6] = {3900, 2000, 1000, 1000/2, 1000/4, 470}; #ifdef UNUSED_CODE -WRITE16_MEMBER(segas1x_bootleg_state::sys16_paletteram_w) +void segas1x_bootleg_state::sys16_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t newword; @@ -274,7 +274,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg2_tile_info) 0); } -WRITE16_MEMBER(segas1x_bootleg_state::sys16_tileram_w) +void segas1x_bootleg_state::sys16_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t oldword = m_tileram[offset]; @@ -339,7 +339,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_text_tile_info) tileinfo.category = 0; } -WRITE16_MEMBER(segas1x_bootleg_state::sys16_textram_w) +void segas1x_bootleg_state::sys16_textram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_textram[offset]); m_text_layer->mark_tile_dirty(offset); @@ -511,27 +511,27 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_info1) 0); } -WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w) +void segas1x_bootleg_state::s16a_bootleg_bgscrolly_w(uint16_t data) { m_bg_scrolly = data; } -WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w) +void segas1x_bootleg_state::s16a_bootleg_bgscrollx_w(uint16_t data) { m_bg_scrollx = data; } -WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w) +void segas1x_bootleg_state::s16a_bootleg_fgscrolly_w(uint16_t data) { m_fg_scrolly = data; } -WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w) +void segas1x_bootleg_state::s16a_bootleg_fgscrollx_w(uint16_t data) { m_fg_scrollx = data; } -WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w) +void segas1x_bootleg_state::s16a_bootleg_tilemapselect_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_tilemapselect); //printf("system16 bootleg tilemapselect %04x\n", m_tilemapselect); |