diff options
Diffstat (limited to 'src')
42 files changed, 267 insertions, 274 deletions
diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp index d83b665955f..a08d5d76473 100644 --- a/src/mame/audio/targ.cpp +++ b/src/mame/audio/targ.cpp @@ -55,7 +55,7 @@ void exidy_state::adjust_sample(uint8_t freq) } -WRITE8_MEMBER( exidy_state::targ_audio_1_w ) +void exidy_state::targ_audio_1_w(uint8_t data) { /* CPU music */ if (BIT(m_port_1_last ^ data, 0)) @@ -104,7 +104,7 @@ WRITE8_MEMBER( exidy_state::targ_audio_1_w ) } -WRITE8_MEMBER( exidy_state::targ_audio_2_w ) +void exidy_state::targ_audio_2_w(uint8_t data) { if ((data & 0x01) && !(m_port_2_last & 0x01)) { @@ -119,7 +119,7 @@ WRITE8_MEMBER( exidy_state::targ_audio_2_w ) } -WRITE8_MEMBER( exidy_state::spectar_audio_2_w ) +void exidy_state::spectar_audio_2_w(uint8_t data) { adjust_sample(data); } diff --git a/src/mame/drivers/efdt.cpp b/src/mame/drivers/efdt.cpp index 234e879f5ef..2da74a9f3ce 100644 --- a/src/mame/drivers/efdt.cpp +++ b/src/mame/drivers/efdt.cpp @@ -431,12 +431,12 @@ void efdt_state::machine_reset() * Sound Latches * *********************************************/ -READ8_MEMBER(efdt_state::main_soundlatch_r) +uint8_t efdt_state::main_soundlatch_r(offs_t offset) { return m_soundlatch[offset]; } -WRITE8_MEMBER(efdt_state::main_soundlatch_w) +void efdt_state::main_soundlatch_w(offs_t offset, uint8_t data) { m_soundlatch[offset] = data; switch (offset) diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index 201f2c182ea..217a754324c 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -34,7 +34,7 @@ /* Read/Write Handlers */ -READ8_MEMBER( elf2_state::dispon_r ) +uint8_t elf2_state::dispon_r() { m_vdc->disp_on_w(1); m_vdc->disp_on_w(0); @@ -42,18 +42,18 @@ READ8_MEMBER( elf2_state::dispon_r ) return 0xff; } -READ8_MEMBER( elf2_state::data_r ) +uint8_t elf2_state::data_r() { return m_data; } -WRITE8_MEMBER( elf2_state::data_w ) +void elf2_state::data_w(uint8_t data) { m_led_l->a_w(data & 0x0f); m_led_h->a_w(data >> 4); } -WRITE8_MEMBER( elf2_state::memory_w ) +void elf2_state::memory_w(offs_t offset, uint8_t data) { if (LOAD) { @@ -213,7 +213,7 @@ void elf2_state::machine_start() /* setup memory banking */ program.install_read_bank(0x0000, 0x00ff, "bank1"); - program.install_write_handler(0x0000, 0x00ff, write8_delegate(*this, FUNC(elf2_state::memory_w))); + program.install_write_handler(0x0000, 0x00ff, write8sm_delegate(*this, FUNC(elf2_state::memory_w))); membank("bank1")->configure_entry(0, m_ram->pointer()); membank("bank1")->set_entry(0); diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index e0ef66bc3af..bc9bb16dfb1 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -121,7 +121,7 @@ void eolith_state::machine_start() m_led.resolve(); } -READ32_MEMBER(eolith_state::eolith_custom_r) +uint32_t eolith_state::eolith_custom_r() { /* bit 3 = eeprom bit @@ -136,7 +136,7 @@ READ32_MEMBER(eolith_state::eolith_custom_r) return (m_in0->read() & ~0x300) | (machine().rand() & 0x300); } -WRITE32_MEMBER(eolith_state::systemcontrol_w) +void eolith_state::systemcontrol_w(uint32_t data) { m_buffer = (data & 0x80) >> 7; machine().bookkeeping().coin_counter_w(0, data & m_coin_counter_bit); @@ -148,7 +148,7 @@ WRITE32_MEMBER(eolith_state::systemcontrol_w) } template<int Player> -READ32_MEMBER(eolith_state::hidctch3_pen_r) +uint32_t eolith_state::hidctch3_pen_r() { //320 x 240 int xpos = m_penxport[Player]->read(); diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp index 8d127828aa2..077668be60f 100644 --- a/src/mame/drivers/epos.cpp +++ b/src/mame/drivers/epos.cpp @@ -49,7 +49,7 @@ #include "speaker.h" -WRITE8_MEMBER(epos_state::dealer_decrypt_rom) +void epos_state::dealer_decrypt_rom(offs_t offset, uint8_t data) { if (offset & 0x04) m_counter = (m_counter + 1) & 0x03; diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index f5bd2ae8c6e..4521a775625 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -113,7 +113,7 @@ void eprom_state::eprom_latch_w(uint8_t data) * *************************************/ -template<bool maincpu> WRITE16_MEMBER(eprom_state::sync_w) +template<bool maincpu> void eprom_state::sync_w(offs_t offset, uint16_t data, uint16_t mem_mask) { u16 oldword = m_share1[0xcc00/2]; COMBINE_DATA(&m_share1[0xcc00/2]); diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index c9e0f1bd8bf..84154c68c9e 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -412,14 +412,14 @@ READ_LINE_MEMBER(gekisou_state::gekisou_unknown_bit_r) return m_gekisou_unknown_bit; } -WRITE16_MEMBER(gekisou_state::gekisou_unknown_bit_w) +void gekisou_state::gekisou_unknown_bit_w(offs_t offset, uint16_t data) { // data bit is A17 (offset) m_gekisou_unknown_bit = (offset == 0) ? 0 : 1;; } -READ16_MEMBER(equites_state::equites_spriteram_kludge_r) +uint16_t equites_state::equites_spriteram_kludge_r() { if (m_spriteram[0] == 0x5555) return 0; diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp index f520ad8f89f..f4c1614f66e 100644 --- a/src/mame/drivers/espial.cpp +++ b/src/mame/drivers/espial.cpp @@ -64,13 +64,13 @@ void espial_state::machine_start() } -WRITE8_MEMBER(espial_state::espial_master_interrupt_mask_w) +void espial_state::espial_master_interrupt_mask_w(uint8_t data) { m_main_nmi_enabled = ~(data & 1); } -WRITE8_MEMBER(espial_state::espial_sound_nmi_mask_w) +void espial_state::espial_sound_nmi_mask_w(uint8_t data) { m_sound_nmi_enabled = data & 1; } @@ -94,7 +94,7 @@ INTERRUPT_GEN_MEMBER(espial_state::espial_sound_nmi_gen) } -WRITE8_MEMBER(espial_state::espial_master_soundlatch_w) +void espial_state::espial_master_soundlatch_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp index f76fb63281b..609d207bbc7 100644 --- a/src/mame/drivers/esripsys.cpp +++ b/src/mame/drivers/esripsys.cpp @@ -55,13 +55,13 @@ WRITE_LINE_MEMBER(esripsys_state::ptm_irq) *************************************/ /* Note: Game CPU /FIRQ is connected to RXRDY */ -WRITE8_MEMBER(esripsys_state::uart_w) +void esripsys_state::uart_w(offs_t offset, uint8_t data) { if ((offset & 1) == 0) osd_printf_debug("%c",data); } -READ8_MEMBER(esripsys_state::uart_r) +uint8_t esripsys_state::uart_r() { return 0; } @@ -86,7 +86,7 @@ READ8_MEMBER(esripsys_state::uart_r) 7: Frame CPU /NMI 7: /VBLANK */ -READ8_MEMBER(esripsys_state::g_status_r) +uint8_t esripsys_state::g_status_r() { int bank4 = BIT(m_videocpu->get_rip_status(), 2); int vblank = m_screen->vblank(); @@ -94,7 +94,7 @@ READ8_MEMBER(esripsys_state::g_status_r) return (!vblank << 7) | (bank4 << 6) | (m_f_status & 0x2f); } -WRITE8_MEMBER(esripsys_state::g_status_w) +void esripsys_state::g_status_w(uint8_t data) { int bankaddress; uint8_t *rom = memregion("game_cpu")->base(); @@ -134,7 +134,7 @@ WRITE8_MEMBER(esripsys_state::g_status_w) 7: /FRDONE 7: /VBLANK */ -READ8_MEMBER(esripsys_state::f_status_r) +uint8_t esripsys_state::f_status_r() { int vblank = m_screen->vblank(); uint8_t rip_status = m_videocpu->get_rip_status(); @@ -144,7 +144,7 @@ READ8_MEMBER(esripsys_state::f_status_r) return (!vblank << 7) | (m_fbsel << 6) | (m_frame_vbl << 5) | rip_status; } -WRITE8_MEMBER(esripsys_state::f_status_w) +void esripsys_state::f_status_w(uint8_t data) { m_f_status = data; } @@ -162,13 +162,13 @@ TIMER_CALLBACK_MEMBER(esripsys_state::delayed_bank_swap) m_fbsel ^= 1; } -WRITE8_MEMBER(esripsys_state::frame_w) +void esripsys_state::frame_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(esripsys_state::delayed_bank_swap),this)); m_frame_vbl = 1; } -READ8_MEMBER(esripsys_state::fdt_r) +uint8_t esripsys_state::fdt_r(offs_t offset) { if (!m_fasel) return m_fdt_b[offset]; @@ -176,7 +176,7 @@ READ8_MEMBER(esripsys_state::fdt_r) return m_fdt_a[offset]; } -WRITE8_MEMBER(esripsys_state::fdt_w) +void esripsys_state::fdt_w(offs_t offset, uint8_t data) { if (!m_fasel) m_fdt_b[offset] = data; @@ -248,12 +248,12 @@ uint8_t esripsys_state::rip_status_in() * *************************************/ -WRITE8_MEMBER(esripsys_state::g_iobus_w) +void esripsys_state::g_iobus_w(uint8_t data) { m_g_iodata = data; } -READ8_MEMBER(esripsys_state::g_iobus_r) +uint8_t esripsys_state::g_iobus_r() { switch (m_g_ioaddr & 0x7f) { @@ -320,7 +320,7 @@ READ8_MEMBER(esripsys_state::g_iobus_r) } } -WRITE8_MEMBER(esripsys_state::g_ioadd_w) +void esripsys_state::g_ioadd_w(uint8_t data) { m_g_ioaddr = data; @@ -468,17 +468,17 @@ INPUT_PORTS_END *************************************/ /* Game/Sound CPU communications */ -READ8_MEMBER(esripsys_state::s_200e_r) +uint8_t esripsys_state::s_200e_r() { return m_g_to_s_latch1; } -WRITE8_MEMBER(esripsys_state::s_200e_w) +void esripsys_state::s_200e_w(uint8_t data) { m_s_to_g_latch1 = data; } -WRITE8_MEMBER(esripsys_state::s_200f_w) +void esripsys_state::s_200f_w(uint8_t data) { uint8_t *rom = memregion("sound_data")->base(); int rombank = data & 0x20 ? 0x2000 : 0; @@ -502,12 +502,12 @@ WRITE8_MEMBER(esripsys_state::s_200f_w) m_s_to_g_latch2 = data; } -READ8_MEMBER(esripsys_state::s_200f_r) +uint8_t esripsys_state::s_200f_r() { return (m_g_to_s_latch2 & 0xfc) | (m_u56b << 1) | m_u56a; } -READ8_MEMBER(esripsys_state::tms5220_r) +uint8_t esripsys_state::tms5220_r(offs_t offset) { if (offset == 0) { @@ -522,7 +522,7 @@ READ8_MEMBER(esripsys_state::tms5220_r) } /* TODO: Implement correctly using the state PROM */ -WRITE8_MEMBER(esripsys_state::tms5220_w) +void esripsys_state::tms5220_w(offs_t offset, uint8_t data) { if (offset == 0) { @@ -532,20 +532,20 @@ WRITE8_MEMBER(esripsys_state::tms5220_w) #if 0 if (offset == 1) { - m_tms->data_w(space, 0, m_tms_data); + m_tms->data_w(m_tms_data); } #endif } /* Not used in later revisions */ -WRITE8_MEMBER(esripsys_state::control_w) +void esripsys_state::control_w(uint8_t data) { logerror("Sound control write: %.2x (PC:0x%.4x)\n", data, m_soundcpu->pcbase()); } /* 10-bit MC3410CL DAC */ -WRITE8_MEMBER(esripsys_state::esripsys_dac_w) +void esripsys_state::esripsys_dac_w(offs_t offset, uint8_t data) { if (offset == 0) { diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index 53f9074b89d..97cb1e9594e 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -44,14 +44,14 @@ /* Read/Write Handlers */ // Schematic is wrong, PCB layout is correct: D0-7 swapped around on PIA. // There's still a bug in the PIA: if ca2 is instructed to go low, nothing happens. -READ8_MEMBER( eti660_state::pia_r ) +uint8_t eti660_state::pia_r() { uint8_t pia_offset = m_maincpu->get_memory_address() & 0x03; return bitswap<8>(m_pia->read(pia_offset), 0,1,2,3,4,5,6,7); } -WRITE8_MEMBER( eti660_state::pia_w ) +void eti660_state::pia_w(uint8_t data) { uint8_t pia_offset = m_maincpu->get_memory_address() & 0x03; data = bitswap<8>(data,0,1,2,3,4,5,6,7); @@ -68,7 +68,7 @@ WRITE_LINE_MEMBER( eti660_state::ca2_w ) // test with Wipeout game - it should s m_cti->con_w(state); } -WRITE8_MEMBER( eti660_state::colorram_w ) + void eti660_state::colorram_w(offs_t offset, uint8_t data) { offset = m_maincpu->get_memory_address() - 0xc80; diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp index 5a171f8e87c..27a150ebe74 100644 --- a/src/mame/drivers/exidy.cpp +++ b/src/mame/drivers/exidy.cpp @@ -189,7 +189,7 @@ CUSTOM_INPUT_MEMBER(exidy_state::teetert_input_r) * *************************************/ -WRITE8_MEMBER(exidy_state::fax_bank_select_w) +void exidy_state::fax_bank_select_w(uint8_t data) { membank("bank1")->set_entry(data & 0x1f); @@ -198,7 +198,7 @@ WRITE8_MEMBER(exidy_state::fax_bank_select_w) } -WRITE8_MEMBER(exidy_state::mtrap_ocl_w) // Mouse Trap (possibly others) set P1 and P2 leds value at 5101, too. +void exidy_state::mtrap_ocl_w(uint8_t data) // Mouse Trap (possibly others) set P1 and P2 leds value at 5101, too. { *m_sprite_enable = data; diff --git a/src/mame/drivers/exidy440.cpp b/src/mame/drivers/exidy440.cpp index 8f1d112b104..d7ae59f1a2f 100644 --- a/src/mame/drivers/exidy440.cpp +++ b/src/mame/drivers/exidy440.cpp @@ -304,7 +304,7 @@ void exidy440_state::exidy440_bank_select(uint8_t bank) if (m_showdown_bank_data[0] != nullptr) { if (bank == 0 && m_bank != 0) - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(*this, FUNC(exidy440_state::showdown_bank0_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8sm_delegate(*this, FUNC(exidy440_state::showdown_bank0_r))); else if (bank != 0 && m_bank == 0) m_maincpu->space(AS_PROGRAM).install_read_bank(0x4000, 0x7fff, "bank1"); } @@ -315,7 +315,7 @@ void exidy440_state::exidy440_bank_select(uint8_t bank) } -WRITE8_MEMBER(exidy440_state::bankram_w) +void exidy440_state::bankram_w(offs_t offset, uint8_t data) { /* EEROM lives in the upper 8k of bank 15 */ if (m_bank == 15 && offset >= 0x2000) @@ -335,7 +335,7 @@ WRITE8_MEMBER(exidy440_state::bankram_w) * *************************************/ -READ8_MEMBER(exidy440_state::exidy440_input_port_3_r) +uint8_t exidy440_state::exidy440_input_port_3_r() { /* I/O1 accesses clear the CIRQ flip/flop */ m_maincpu->set_input_line(0, CLEAR_LINE); @@ -343,7 +343,7 @@ READ8_MEMBER(exidy440_state::exidy440_input_port_3_r) } -READ8_MEMBER(exidy440_state::sound_command_ack_r) +uint8_t exidy440_state::sound_command_ack_r() { /* sound command acknowledgements come on bit 3 here */ return m_custom->exidy440_sound_command_ack() ? 0xf7 : 0xff; @@ -363,20 +363,20 @@ TIMER_CALLBACK_MEMBER(exidy440_state::delayed_sound_command_w) } -WRITE8_MEMBER(exidy440_state::sound_command_w) +void exidy440_state::sound_command_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(exidy440_state::delayed_sound_command_w), this), data); } -WRITE8_MEMBER(exidy440_state::exidy440_input_port_3_w) +void exidy440_state::exidy440_input_port_3_w(uint8_t data) { /* I/O1 accesses clear the CIRQ flip/flop */ m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(exidy440_state::exidy440_coin_counter_w) +void exidy440_state::exidy440_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 1); } @@ -389,7 +389,7 @@ WRITE8_MEMBER(exidy440_state::exidy440_coin_counter_w) * *************************************/ -READ8_MEMBER(exidy440_state::showdown_bank0_r) +uint8_t exidy440_state::showdown_bank0_r(offs_t offset) { /* showdown relies on different values from different memory locations */ /* yukon relies on multiple reads from the same location returning different values */ @@ -418,19 +418,19 @@ READ8_MEMBER(exidy440_state::showdown_bank0_r) } -READ8_MEMBER(exidy440_state::claypign_protection_r) +uint8_t exidy440_state::claypign_protection_r() { return 0x76; } -READ8_MEMBER(topsecex_state::topsecex_input_port_5_r) +uint8_t topsecex_state::topsecex_input_port_5_r() { return (ioport("AN1")->read() & 1) ? 0x01 : 0x02; } -WRITE8_MEMBER(topsecex_state::topsecex_yscroll_w) +void topsecex_state::topsecex_yscroll_w(uint8_t data) { m_topsecex_yscroll = data; } @@ -2074,7 +2074,7 @@ void exidy440_state::init_exidy440() void exidy440_state::init_claypign() { init_exidy440(); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x2ec0, 0x2ec3, read8_delegate(*this, FUNC(exidy440_state::claypign_protection_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2ec0, 0x2ec3, read8smo_delegate(*this, FUNC(exidy440_state::claypign_protection_r))); } @@ -2083,11 +2083,11 @@ void topsecex_state::init_topsecex() init_exidy440(); /* extra input ports and scrolling */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x2ec5, 0x2ec5, read8_delegate(*this, FUNC(topsecex_state::topsecex_input_port_5_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2ec5, 0x2ec5, read8smo_delegate(*this, FUNC(topsecex_state::topsecex_input_port_5_r))); m_maincpu->space(AS_PROGRAM).install_read_port(0x2ec6, 0x2ec6, "AN0"); m_maincpu->space(AS_PROGRAM).install_read_port(0x2ec7, 0x2ec7, "IN4"); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x2ec1, 0x2ec1, write8_delegate(*this, FUNC(topsecex_state::topsecex_yscroll_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x2ec1, 0x2ec1, write8smo_delegate(*this, FUNC(topsecex_state::topsecex_yscroll_w))); } diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index 6ac13718199..6767f6454c7 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -280,8 +280,8 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(scanline); // comad - READ16_MEMBER(comad_timer_r); - READ8_MEMBER(comad_okim6295_r); + uint16_t comad_timer_r(); + uint8_t comad_okim6295_r(); void comad_map(address_map &map); void expro02_map(address_map &map); void expro02_video_base_map(address_map &map); @@ -879,13 +879,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(expro02_state::scanline) * *************************************/ -READ16_MEMBER(expro02_state::comad_timer_r) +uint16_t expro02_state::comad_timer_r() { return (m_screen->vpos() & 0x07) << 8; } /* a kludge! */ -READ8_MEMBER(expro02_state::comad_okim6295_r) +uint8_t expro02_state::comad_okim6295_r() { uint16_t retvalue; // retvalue = m_oki->read_status(); // doesn't work, causes lockups when girls change.. diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp index 8468609fae9..b6694a936ca 100644 --- a/src/mame/drivers/exprraid.cpp +++ b/src/mame/drivers/exprraid.cpp @@ -221,12 +221,12 @@ Stephh's notes (based on the games M6502 code and some tests) : /* Emulate DECO 291 protection (for original express raider, code is cracked on the bootleg)*/ /*****************************************************************************************/ -READ8_MEMBER(exprraid_state::exprraid_prot_data_r) +uint8_t exprraid_state::exprraid_prot_data_r() { return m_prot_value; } -READ8_MEMBER(exprraid_state::exprraid_prot_status_r) +uint8_t exprraid_state::exprraid_prot_status_r() { /* 76543210 @@ -238,7 +238,7 @@ READ8_MEMBER(exprraid_state::exprraid_prot_status_r) return 0x02; } -WRITE8_MEMBER(exprraid_state::exprraid_prot_data_w) +void exprraid_state::exprraid_prot_data_w(uint8_t data) { switch (data) { @@ -263,12 +263,12 @@ WRITE8_MEMBER(exprraid_state::exprraid_prot_data_w) } } -WRITE8_MEMBER(exprraid_state::exprraid_int_clear_w) +void exprraid_state::exprraid_int_clear_w(uint8_t data) { m_maincpu->set_input_line(DECO16_IRQ_LINE, CLEAR_LINE); } -READ8_MEMBER(exprraid_state::vblank_r) +uint8_t exprraid_state::vblank_r() { return ioport("IN0")->read(); } @@ -846,13 +846,13 @@ void exprraid_state::init_exprraid() void exprraid_state::init_wexpressb2() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x3800, 0x3800, read8_delegate(*this, FUNC(exprraid_state::vblank_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x3800, 0x3800, read8smo_delegate(*this, FUNC(exprraid_state::vblank_r))); exprraid_gfx_expand(); } void exprraid_state::init_wexpressb3() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0xffc0, 0xffc0, read8_delegate(*this, FUNC(exprraid_state::vblank_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xffc0, 0xffc0, read8smo_delegate(*this, FUNC(exprraid_state::vblank_r))); exprraid_gfx_expand(); } diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index 8087f879b44..fd1020d4374 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -90,13 +90,13 @@ void exterm_state::machine_start() * *************************************/ -WRITE16_MEMBER(exterm_state::host_data_w) +void exterm_state::host_data_w(offs_t offset, uint16_t data) { m_slave->host_w(offset / 0x0010000, data); } -READ16_MEMBER(exterm_state::host_data_r) +uint16_t exterm_state::host_data_r(offs_t offset) { return m_slave->host_r(offset / 0x0010000); } @@ -110,7 +110,7 @@ READ16_MEMBER(exterm_state::host_data_r) *************************************/ template<uint8_t Which> -READ16_MEMBER(exterm_state::trackball_port_r) +uint16_t exterm_state::trackball_port_r() { uint16_t port; @@ -143,7 +143,7 @@ READ16_MEMBER(exterm_state::trackball_port_r) * *************************************/ -WRITE16_MEMBER(exterm_state::output_port_0_w) +void exterm_state::output_port_0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* All the outputs are activated on the rising edge */ @@ -171,7 +171,7 @@ WRITE16_MEMBER(exterm_state::output_port_0_w) } -WRITE8_MEMBER(exterm_state::sound_latch_w) +void exterm_state::sound_latch_w(uint8_t data) { // data is latched independently for both sound CPUs m_soundlatch[0]->write(data); @@ -194,14 +194,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(exterm_state::master_sound_nmi_callback) } -WRITE8_MEMBER(exterm_state::ym2151_data_latch_w) +void exterm_state::ym2151_data_latch_w(uint8_t data) { /* bit 7 of the sound control selects which port */ m_ym2151->write(m_sound_control >> 7, data); } -WRITE8_MEMBER(exterm_state::sound_nmi_rate_w) +void exterm_state::sound_nmi_rate_w(uint8_t data) { /* rate is controlled by the value written here */ /* this value is latched into up-counters, which are clocked at the */ @@ -211,7 +211,7 @@ WRITE8_MEMBER(exterm_state::sound_nmi_rate_w) } -READ8_MEMBER(exterm_state::sound_nmi_to_slave_r) +uint8_t exterm_state::sound_nmi_to_slave_r() { /* a read from here triggers an NMI pulse to the slave */ m_audioslave->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -219,7 +219,7 @@ READ8_MEMBER(exterm_state::sound_nmi_to_slave_r) } -WRITE8_MEMBER(exterm_state::sound_control_w) +void exterm_state::sound_control_w(uint8_t data) { /* D7 = to S4-15 diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index 6863903338e..f10e74c66ff 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -52,19 +52,19 @@ TODO: ***************************************************************************/ -WRITE8_MEMBER(exzisus_state::cpua_bankswitch_w) +void exzisus_state::cpua_bankswitch_w(uint8_t data) { membank("cpuabank")->set_entry(data & 0x0f); flip_screen_set(data & 0x40); } -WRITE8_MEMBER(exzisus_state::cpub_bankswitch_w) +void exzisus_state::cpub_bankswitch_w(uint8_t data) { membank("cpubbank")->set_entry(data & 0x0f); flip_screen_set(data & 0x40); } -WRITE8_MEMBER(exzisus_state::coincounter_w) +void exzisus_state::coincounter_w(uint8_t data) { machine().bookkeeping().coin_lockout_w(0,~data & 0x01); machine().bookkeeping().coin_lockout_w(1,~data & 0x02); @@ -73,7 +73,7 @@ WRITE8_MEMBER(exzisus_state::coincounter_w) } // is it ok that cpub_reset refers to cpuc? -WRITE8_MEMBER(exzisus_state::cpub_reset_w) +void exzisus_state::cpub_reset_w(uint8_t data) { m_cpuc->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } diff --git a/src/mame/includes/efdt.h b/src/mame/includes/efdt.h index 50e444fb09f..e6c87da496c 100644 --- a/src/mame/includes/efdt.h +++ b/src/mame/includes/efdt.h @@ -48,10 +48,6 @@ private: tilemap_t *m_tilemap[2]; int m_tilebank; - DECLARE_WRITE8_MEMBER(efdt_videoram_w); - DECLARE_WRITE8_MEMBER(efdt_vregs1_w); - DECLARE_WRITE8_MEMBER(efdt_vregs2_w); - TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); @@ -60,8 +56,8 @@ private: DECLARE_WRITE_LINE_MEMBER(vblank_nmi_w); DECLARE_WRITE_LINE_MEMBER(nmi_clear_w); - DECLARE_READ8_MEMBER(main_soundlatch_r); - DECLARE_WRITE8_MEMBER(main_soundlatch_w); + uint8_t main_soundlatch_r(offs_t offset); + void main_soundlatch_w(offs_t offset, uint8_t data); uint8_t soundlatch_0_r(); uint8_t soundlatch_1_r(); diff --git a/src/mame/includes/electron.h b/src/mame/includes/electron.h index 1bf29e0440c..14474357f1d 100644 --- a/src/mame/includes/electron.h +++ b/src/mame/includes/electron.h @@ -72,19 +72,19 @@ protected: int m_map4[256]; int m_map16[256]; emu_timer *m_scanline_timer; - DECLARE_READ8_MEMBER(electron64_fetch_r); - DECLARE_READ8_MEMBER(electron_mem_r); - DECLARE_WRITE8_MEMBER(electron_mem_w); - virtual DECLARE_READ8_MEMBER(electron_paged_r); - virtual DECLARE_WRITE8_MEMBER(electron_paged_w); - DECLARE_READ8_MEMBER(electron_mos_r); - DECLARE_WRITE8_MEMBER(electron_mos_w); - virtual DECLARE_READ8_MEMBER(electron_fred_r); - virtual DECLARE_WRITE8_MEMBER(electron_fred_w); - DECLARE_READ8_MEMBER(electron_jim_r); - DECLARE_WRITE8_MEMBER(electron_jim_w); - DECLARE_READ8_MEMBER(electron_sheila_r); - DECLARE_WRITE8_MEMBER(electron_sheila_w); + uint8_t electron64_fetch_r(offs_t offset); + uint8_t electron_mem_r(offs_t offset); + void electron_mem_w(offs_t offset, uint8_t data); + virtual uint8_t electron_paged_r(offs_t offset); + virtual void electron_paged_w(offs_t offset, uint8_t data); + uint8_t electron_mos_r(offs_t offset); + void electron_mos_w(offs_t offset, uint8_t data); + virtual uint8_t electron_fred_r(offs_t offset); + virtual void electron_fred_w(offs_t offset, uint8_t data); + uint8_t electron_jim_r(offs_t offset); + void electron_jim_w(offs_t offset, uint8_t data); + uint8_t electron_sheila_r(offs_t offset); + void electron_sheila_w(offs_t offset, uint8_t data); void electron_colours(palette_device &palette) const; uint32_t screen_update_electron(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -170,10 +170,10 @@ public: void electronsp(machine_config &config); protected: - virtual DECLARE_READ8_MEMBER(electron_paged_r) override; - virtual DECLARE_WRITE8_MEMBER(electron_paged_w) override; - virtual DECLARE_READ8_MEMBER(electron_fred_r) override; - virtual DECLARE_WRITE8_MEMBER(electron_fred_w) override; + virtual uint8_t electron_paged_r(offs_t offset) override; + virtual void electron_paged_w(offs_t offset, uint8_t data) override; + virtual uint8_t electron_fred_r(offs_t offset) override; + virtual void electron_fred_w(offs_t offset, uint8_t data) override; virtual void machine_start() override; diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h index 18a23c9135e..0e2d02b4a20 100644 --- a/src/mame/includes/elf.h +++ b/src/mame/includes/elf.h @@ -44,10 +44,10 @@ public: DECLARE_INPUT_CHANGED_MEMBER( input_w ); private: - DECLARE_READ8_MEMBER( dispon_r ); - DECLARE_READ8_MEMBER( data_r ); - DECLARE_WRITE8_MEMBER( data_w ); - DECLARE_WRITE8_MEMBER( memory_w ); + uint8_t dispon_r(); + uint8_t data_r(); + void data_w(uint8_t data); + void memory_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER( wait_r ); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef4_r ); diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index ce03a2c6913..5a7a8cd8ad9 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -55,11 +55,11 @@ protected: private: - DECLARE_READ32_MEMBER(eolith_custom_r); - DECLARE_WRITE32_MEMBER(systemcontrol_w); - template<int Player> DECLARE_READ32_MEMBER(hidctch3_pen_r); - DECLARE_WRITE16_MEMBER(eolith_vram_w); - DECLARE_READ16_MEMBER(eolith_vram_r); + uint32_t eolith_custom_r(); + void systemcontrol_w(uint32_t data); + template<int Player> uint32_t hidctch3_pen_r(); + void eolith_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t eolith_vram_r(offs_t offset); void sound_p1_w(uint8_t data); uint8_t qs1000_p1_r(); void qs1000_p1_w(uint8_t data); diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 8bdc5481bc5..21c76698d99 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -34,13 +34,13 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE8_MEMBER(dealer_decrypt_rom); - DECLARE_WRITE8_MEMBER(port_1_w); + void dealer_decrypt_rom(offs_t offset, uint8_t data); + void port_1_w(uint8_t data); uint8_t i8255_porta_r(); void i8255_portc_w(uint8_t data); uint8_t ay_porta_mpx_r(); void flip_screen_w(uint8_t data); - DECLARE_WRITE8_MEMBER(dealer_pal_w); + void dealer_pal_w(offs_t offset, uint8_t data); DECLARE_MACHINE_START(epos); DECLARE_MACHINE_START(dealer); void epos_palette(palette_device &palette) const; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 4ea1c1c087e..6ac451644c2 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -49,7 +49,7 @@ protected: TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); uint8_t adc_r(offs_t offset); void eprom_latch_w(uint8_t data); - template<bool maincpu> DECLARE_WRITE16_MEMBER(sync_w); + template<bool maincpu> void sync_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(guts_get_playfield_tile_info); diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 83cc06c641a..9aa233912e6 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -53,13 +53,12 @@ public: required_device<alpha_8201_device> m_alpha_8201; required_device<ls259_device> m_mainlatch; - DECLARE_READ16_MEMBER(equites_spriteram_kludge_r); - DECLARE_WRITE8_MEMBER(mainlatch_w); - DECLARE_READ8_MEMBER(equites_fg_videoram_r); - DECLARE_WRITE8_MEMBER(equites_fg_videoram_w); - DECLARE_WRITE16_MEMBER(equites_bg_videoram_w); - DECLARE_WRITE8_MEMBER(equites_bgcolor_w); - DECLARE_WRITE16_MEMBER(equites_scrollreg_w); + uint16_t equites_spriteram_kludge_r(); + uint8_t equites_fg_videoram_r(offs_t offset); + void equites_fg_videoram_w(offs_t offset, uint8_t data); + void equites_bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void equites_bgcolor_w(offs_t offset, uint8_t data); + void equites_scrollreg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(flip_screen_w); void init_equites(); TILE_GET_INFO_MEMBER(equites_fg_info); @@ -92,7 +91,7 @@ public: protected: virtual void machine_start() override; void gekisou_map(address_map &map); - DECLARE_WRITE16_MEMBER(gekisou_unknown_bit_w); + void gekisou_unknown_bit_w(offs_t offset, uint16_t data); private: int m_gekisou_unknown_bit; @@ -110,8 +109,8 @@ protected: virtual void machine_start() override; void splndrbt_map(address_map &map); DECLARE_WRITE_LINE_MEMBER(splndrbt_selchar_w); - DECLARE_WRITE16_MEMBER(splndrbt_bg_scrollx_w); - DECLARE_WRITE16_MEMBER(splndrbt_bg_scrolly_w); + void splndrbt_bg_scrollx_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void splndrbt_bg_scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(splndrbt_fg_info); TILE_GET_INFO_MEMBER(splndrbt_bg_info); DECLARE_VIDEO_START(splndrbt); diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index e6cefe3b371..76d1780953a 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -63,14 +63,14 @@ private: required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; - DECLARE_WRITE8_MEMBER(espial_master_interrupt_mask_w); - DECLARE_WRITE8_MEMBER(espial_master_soundlatch_w); - DECLARE_WRITE8_MEMBER(espial_sound_nmi_mask_w); - DECLARE_WRITE8_MEMBER(espial_videoram_w); - DECLARE_WRITE8_MEMBER(espial_colorram_w); - DECLARE_WRITE8_MEMBER(espial_attributeram_w); - DECLARE_WRITE8_MEMBER(espial_scrollram_w); - DECLARE_WRITE8_MEMBER(espial_flipscreen_w); + void espial_master_interrupt_mask_w(uint8_t data); + void espial_master_soundlatch_w(uint8_t data); + void espial_sound_nmi_mask_w(uint8_t data); + void espial_videoram_w(offs_t offset, uint8_t data); + void espial_colorram_w(offs_t offset, uint8_t data); + void espial_attributeram_w(offs_t offset, uint8_t data); + void espial_scrollram_w(offs_t offset, uint8_t data); + void espial_flipscreen_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index e73856de2bf..6544fd599b5 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -97,31 +97,31 @@ private: std::unique_ptr<uint8_t[]> m_scale_table; int m_video_firq; uint8_t m_bg_intensity; - DECLARE_WRITE8_MEMBER(uart_w); - DECLARE_READ8_MEMBER(uart_r); - DECLARE_READ8_MEMBER(g_status_r); - DECLARE_WRITE8_MEMBER(g_status_w); - DECLARE_READ8_MEMBER(f_status_r); - DECLARE_WRITE8_MEMBER(f_status_w); - DECLARE_WRITE8_MEMBER(frame_w); - DECLARE_READ8_MEMBER(fdt_r); - DECLARE_WRITE8_MEMBER(fdt_w); + void uart_w(offs_t offset, uint8_t data); + uint8_t uart_r(); + uint8_t g_status_r(); + void g_status_w(uint8_t data); + uint8_t f_status_r(); + void f_status_w(uint8_t data); + void frame_w(uint8_t data); + uint8_t fdt_r(offs_t offset); + void fdt_w(offs_t offset, uint8_t data); uint16_t fdt_rip_r(offs_t offset); void fdt_rip_w(offs_t offset, uint16_t data); uint8_t rip_status_in(); - DECLARE_WRITE8_MEMBER(g_iobus_w); - DECLARE_READ8_MEMBER(g_iobus_r); - DECLARE_WRITE8_MEMBER(g_ioadd_w); - DECLARE_READ8_MEMBER(s_200e_r); - DECLARE_WRITE8_MEMBER(s_200e_w); - DECLARE_WRITE8_MEMBER(s_200f_w); - DECLARE_READ8_MEMBER(s_200f_r); - DECLARE_READ8_MEMBER(tms5220_r); - DECLARE_WRITE8_MEMBER(tms5220_w); - DECLARE_WRITE8_MEMBER(control_w); - DECLARE_WRITE8_MEMBER(esripsys_bg_intensity_w); + void g_iobus_w(uint8_t data); + uint8_t g_iobus_r(); + void g_ioadd_w(uint8_t data); + uint8_t s_200e_r(); + void s_200e_w(uint8_t data); + void s_200f_w(uint8_t data); + uint8_t s_200f_r(); + uint8_t tms5220_r(offs_t offset); + void tms5220_w(offs_t offset, uint8_t data); + void control_w(uint8_t data); + void esripsys_bg_intensity_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(ptm_irq); - DECLARE_WRITE8_MEMBER(esripsys_dac_w); + void esripsys_dac_w(offs_t offset, uint8_t data); virtual void video_start() override; uint32_t screen_update_esripsys(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(esripsys_vblank_irq); diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h index 5abfa527595..ad1ccba2e58 100644 --- a/src/mame/includes/eti660.h +++ b/src/mame/includes/eti660.h @@ -42,9 +42,9 @@ public: void eti660(machine_config &config); private: - DECLARE_READ8_MEMBER( pia_r ); - DECLARE_WRITE8_MEMBER( pia_w ); - DECLARE_WRITE8_MEMBER( colorram_w ); + uint8_t pia_r(); + void pia_w(uint8_t data); + void colorram_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef4_r ); diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index edc900fabfe..4d9bb15dde8 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -77,9 +77,9 @@ private: required_device<palette_device> m_palette; uint8_t exerion_protection_r(offs_t offset); - DECLARE_WRITE8_MEMBER(exerion_videoreg_w); - DECLARE_WRITE8_MEMBER(exerion_video_latch_w); - DECLARE_READ8_MEMBER(exerion_video_timing_r); + void exerion_videoreg_w(uint8_t data); + void exerion_video_latch_w(offs_t offset, uint8_t data); + uint8_t exerion_video_timing_r(); uint8_t exerion_porta_r(); void exerion_portb_w(uint8_t data); virtual void machine_start() override; diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 99e37d35994..93257d9f082 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -106,9 +106,9 @@ private: bitmap_ind16 m_motion_object_2_vid; bitmap_ind16 m_motion_object_2_clip; - DECLARE_WRITE8_MEMBER(fax_bank_select_w); - DECLARE_READ8_MEMBER(exidy_interrupt_r); - DECLARE_WRITE8_MEMBER(mtrap_ocl_w); + void fax_bank_select_w(uint8_t data); + uint8_t exidy_interrupt_r(); + void mtrap_ocl_w(uint8_t data); virtual void video_start() override; DECLARE_MACHINE_START(teetert); @@ -133,9 +133,9 @@ private: uint8_t m_tone_freq; uint8_t m_tone_active; uint8_t m_tone_pointer; - DECLARE_WRITE8_MEMBER(targ_audio_1_w); - DECLARE_WRITE8_MEMBER(targ_audio_2_w); - DECLARE_WRITE8_MEMBER(spectar_audio_2_w); + void targ_audio_1_w(uint8_t data); + void targ_audio_2_w(uint8_t data); + void spectar_audio_2_w(uint8_t data); void adjust_sample(uint8_t freq); void common_audio_start(int freq); SAMPLES_START_CB_MEMBER(spectar_audio_start); diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index af383dedcc5..7272d977d1f 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -42,23 +42,23 @@ public: void exidy440(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(bankram_w); - DECLARE_READ8_MEMBER(exidy440_input_port_3_r); - DECLARE_READ8_MEMBER(sound_command_ack_r); - DECLARE_WRITE8_MEMBER(sound_command_w); - DECLARE_WRITE8_MEMBER(exidy440_input_port_3_w); - DECLARE_WRITE8_MEMBER(exidy440_coin_counter_w); - DECLARE_READ8_MEMBER(showdown_bank0_r); - DECLARE_READ8_MEMBER(claypign_protection_r); - DECLARE_READ8_MEMBER(exidy440_videoram_r); - DECLARE_WRITE8_MEMBER(exidy440_videoram_w); - DECLARE_READ8_MEMBER(exidy440_paletteram_r); - DECLARE_WRITE8_MEMBER(exidy440_paletteram_w); - DECLARE_READ8_MEMBER(exidy440_horizontal_pos_r); - DECLARE_READ8_MEMBER(exidy440_vertical_pos_r); - DECLARE_WRITE8_MEMBER(exidy440_spriteram_w); - DECLARE_WRITE8_MEMBER(exidy440_control_w); - DECLARE_WRITE8_MEMBER(exidy440_interrupt_clear_w); + void bankram_w(offs_t offset, uint8_t data); + uint8_t exidy440_input_port_3_r(); + uint8_t sound_command_ack_r(); + void sound_command_w(uint8_t data); + void exidy440_input_port_3_w(uint8_t data); + void exidy440_coin_counter_w(uint8_t data); + uint8_t showdown_bank0_r(offs_t offset); + uint8_t claypign_protection_r(); + uint8_t exidy440_videoram_r(offs_t offset); + void exidy440_videoram_w(offs_t offset, uint8_t data); + uint8_t exidy440_paletteram_r(offs_t offset); + void exidy440_paletteram_w(offs_t offset, uint8_t data); + uint8_t exidy440_horizontal_pos_r(); + uint8_t exidy440_vertical_pos_r(); + void exidy440_spriteram_w(offs_t offset, uint8_t data); + void exidy440_control_w(offs_t offset, uint8_t data); + void exidy440_interrupt_clear_w(uint8_t data); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision); void update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision); uint32_t screen_update_exidy440(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -113,8 +113,8 @@ public: protected: void topsecex_video(machine_config &config); - DECLARE_READ8_MEMBER(topsecex_input_port_5_r); - DECLARE_WRITE8_MEMBER(topsecex_yscroll_w); + uint8_t topsecex_input_port_5_r(); + void topsecex_yscroll_w(uint8_t data); uint32_t screen_update_topsecex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void video_start() override; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 2f2740b4072..46a0b297eeb 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -63,17 +63,17 @@ private: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_WRITE8_MEMBER(exprraid_int_clear_w); - DECLARE_READ8_MEMBER(exprraid_prot_status_r); - DECLARE_READ8_MEMBER(exprraid_prot_data_r); - DECLARE_WRITE8_MEMBER(exprraid_prot_data_w); - DECLARE_READ8_MEMBER(vblank_r); - DECLARE_WRITE8_MEMBER(exprraid_videoram_w); - DECLARE_WRITE8_MEMBER(exprraid_colorram_w); - DECLARE_WRITE8_MEMBER(exprraid_flipscreen_w); - DECLARE_WRITE8_MEMBER(exprraid_bgselect_w); - DECLARE_WRITE8_MEMBER(exprraid_scrollx_w); - DECLARE_WRITE8_MEMBER(exprraid_scrolly_w); + void exprraid_int_clear_w(uint8_t data); + uint8_t exprraid_prot_status_r(); + uint8_t exprraid_prot_data_r(); + void exprraid_prot_data_w(uint8_t data); + uint8_t vblank_r(); + void exprraid_videoram_w(offs_t offset, uint8_t data); + void exprraid_colorram_w(offs_t offset, uint8_t data); + void exprraid_flipscreen_w(uint8_t data); + void exprraid_bgselect_w(offs_t offset, uint8_t data); + void exprraid_scrollx_w(offs_t offset, uint8_t data); + void exprraid_scrolly_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 15e736edc50..647262638af 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -59,15 +59,15 @@ private: uint8_t m_sound_control; uint16_t m_last; - DECLARE_WRITE16_MEMBER(host_data_w); - DECLARE_READ16_MEMBER(host_data_r); - template<uint8_t Which> DECLARE_READ16_MEMBER(trackball_port_r); - DECLARE_WRITE16_MEMBER(output_port_0_w); - DECLARE_WRITE8_MEMBER(sound_latch_w); - DECLARE_WRITE8_MEMBER(sound_nmi_rate_w); - DECLARE_READ8_MEMBER(sound_nmi_to_slave_r); - DECLARE_WRITE8_MEMBER(sound_control_w); - DECLARE_WRITE8_MEMBER(ym2151_data_latch_w); + void host_data_w(offs_t offset, uint16_t data); + uint16_t host_data_r(offs_t offset); + template<uint8_t Which> uint16_t trackball_port_r(); + void output_port_0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sound_latch_w(uint8_t data); + void sound_nmi_rate_w(uint8_t data); + uint8_t sound_nmi_to_slave_r(); + void sound_control_w(uint8_t data); + void ym2151_data_latch_w(uint8_t data); void exterm_palette(palette_device &palette) const; TIMER_DEVICE_CALLBACK_MEMBER(master_sound_nmi_callback); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 7c4a879b67b..ee3275c2fea 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -37,10 +37,10 @@ private: required_shared_ptr<uint8_t> m_objectram0; required_shared_ptr<uint8_t> m_videoram0; - DECLARE_WRITE8_MEMBER(cpua_bankswitch_w); - DECLARE_WRITE8_MEMBER(cpub_bankswitch_w); - DECLARE_WRITE8_MEMBER(coincounter_w); - DECLARE_WRITE8_MEMBER(cpub_reset_w); + void cpua_bankswitch_w(uint8_t data); + void cpub_bankswitch_w(uint8_t data); + void coincounter_w(uint8_t data); + void cpub_reset_w(uint8_t data); virtual void machine_start() override; diff --git a/src/mame/machine/electron.cpp b/src/mame/machine/electron.cpp index ce62fe7aad3..2b6ad342ad7 100644 --- a/src/mame/machine/electron.cpp +++ b/src/mame/machine/electron.cpp @@ -142,14 +142,14 @@ TIMER_CALLBACK_MEMBER(electron_state::electron_tape_timer_handler) } } -READ8_MEMBER(electron_state::electron64_fetch_r) +uint8_t electron_state::electron64_fetch_r(offs_t offset) { m_vdu_drivers = (offset & 0xe000) == 0xc000 ? true : false; return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -READ8_MEMBER(electron_state::electron_mem_r) +uint8_t electron_state::electron_mem_r(offs_t offset) { switch (m_mrb.read_safe(0)) { @@ -170,7 +170,7 @@ READ8_MEMBER(electron_state::electron_mem_r) return m_ram->read(offset); } -WRITE8_MEMBER(electron_state::electron_mem_w) +void electron_state::electron_mem_w(offs_t offset, uint8_t data) { switch (m_mrb.read_safe(0)) { @@ -191,7 +191,7 @@ WRITE8_MEMBER(electron_state::electron_mem_w) m_ram->write(offset, data); } -READ8_MEMBER(electron_state::electron_paged_r) +uint8_t electron_state::electron_paged_r(offs_t offset) { /* 0 Second external socket on the expansion module (SK2) */ /* 1 Second external socket on the expansion module (SK2) */ @@ -243,7 +243,7 @@ READ8_MEMBER(electron_state::electron_paged_r) return data; } -WRITE8_MEMBER(electron_state::electron_paged_w) +void electron_state::electron_paged_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -251,7 +251,7 @@ WRITE8_MEMBER(electron_state::electron_paged_w) m_exp->expbus_w(0x8000 + offset, data); } -READ8_MEMBER(electronsp_state::electron_paged_r) +uint8_t electronsp_state::electron_paged_r(offs_t offset) { uint8_t data = 0; @@ -279,14 +279,14 @@ READ8_MEMBER(electronsp_state::electron_paged_r) break; default: - data = electron_state::electron_paged_r(space, offset, mem_mask); + data = electron_state::electron_paged_r(offset); break; } } return data; } -WRITE8_MEMBER(electronsp_state::electron_paged_w) +void electronsp_state::electron_paged_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -308,13 +308,13 @@ WRITE8_MEMBER(electronsp_state::electron_paged_w) break; default: - electronsp_state::electron_paged_w(space, offset, data, mem_mask); + electronsp_state::electron_paged_w(offset, data); break; } } } -READ8_MEMBER(electron_state::electron_mos_r) +uint8_t electron_state::electron_mos_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -322,7 +322,7 @@ READ8_MEMBER(electron_state::electron_mos_r) return m_region_mos->base()[offset & 0x3fff]; } -WRITE8_MEMBER(electron_state::electron_mos_w) +void electron_state::electron_mos_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -331,7 +331,7 @@ WRITE8_MEMBER(electron_state::electron_mos_w) m_exp->expbus_w(0xc000 + offset, data); } -READ8_MEMBER(electron_state::electron_fred_r) +uint8_t electron_state::electron_fred_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -341,7 +341,7 @@ READ8_MEMBER(electron_state::electron_fred_r) return m_exp->expbus_r(0xfc00 + offset); } -WRITE8_MEMBER(electron_state::electron_fred_w) +void electron_state::electron_fred_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -353,7 +353,7 @@ WRITE8_MEMBER(electron_state::electron_fred_w) m_exp->expbus_w(0xfc00 + offset, data); } -READ8_MEMBER(electronsp_state::electron_fred_r) +uint8_t electronsp_state::electron_fred_r(offs_t offset) { uint8_t data = 0; @@ -366,17 +366,17 @@ READ8_MEMBER(electronsp_state::electron_fred_r) } else { - data = electron_state::electron_fred_r(space, offset, mem_mask); + data = electron_state::electron_fred_r(offset); } return data;; } -WRITE8_MEMBER(electronsp_state::electron_fred_w) +void electronsp_state::electron_fred_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); - electron_state::electron_fred_w(space, offset, data, mem_mask); + electron_state::electron_fred_w(offset, data); if ((offset & 0xf0) == 0xb0) { @@ -388,7 +388,7 @@ WRITE8_MEMBER(electronsp_state::electron_fred_w) } } -READ8_MEMBER(electron_state::electron_jim_r) +uint8_t electron_state::electron_jim_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -398,7 +398,7 @@ READ8_MEMBER(electron_state::electron_jim_r) return m_exp->expbus_r(0xfd00 + offset); } -WRITE8_MEMBER(electron_state::electron_jim_w) +void electron_state::electron_jim_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -407,7 +407,7 @@ WRITE8_MEMBER(electron_state::electron_jim_w) m_exp->expbus_w(0xfd00 + offset, data); } -READ8_MEMBER(electron_state::electron_sheila_r) +uint8_t electron_state::electron_sheila_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); @@ -436,7 +436,7 @@ static const int electron_palette_offset[4] = { 0, 4, 5, 1 }; static const uint16_t electron_screen_base[8] = { 0x3000, 0x3000, 0x3000, 0x4000, 0x5800, 0x5800, 0x6000, 0x6000 }; static const int electron_mode_end[8] = { 255, 255, 255 ,249 ,255, 255, 249, 249 }; -WRITE8_MEMBER(electron_state::electron_sheila_w) +void electron_state::electron_sheila_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ m_maincpu->set_clock_scale(1.0f); diff --git a/src/mame/video/eolith.cpp b/src/mame/video/eolith.cpp index a1d4cc94fc0..c31fea64fc2 100644 --- a/src/mame/video/eolith.cpp +++ b/src/mame/video/eolith.cpp @@ -4,7 +4,7 @@ #include "includes/eolith.h" -WRITE16_MEMBER(eolith_state::eolith_vram_w) +void eolith_state::eolith_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if ((mem_mask == 0xffff) && (~data & 0x8000)) { @@ -16,7 +16,7 @@ WRITE16_MEMBER(eolith_state::eolith_vram_w) } -READ16_MEMBER(eolith_state::eolith_vram_r) +uint16_t eolith_state::eolith_vram_r(offs_t offset) { return m_vram[offset+(0x40000/2)*m_buffer]; } diff --git a/src/mame/video/epos.cpp b/src/mame/video/epos.cpp index 731f22ac437..91a0b77299f 100644 --- a/src/mame/video/epos.cpp +++ b/src/mame/video/epos.cpp @@ -55,12 +55,12 @@ void epos_state::set_pal_color(palette_device &palette, uint8_t offset, uint8_t } // later (tristar 9000) games uses a dynamic palette instead of prom -WRITE8_MEMBER(epos_state::dealer_pal_w) +void epos_state::dealer_pal_w(offs_t offset, uint8_t data) { set_pal_color(*m_palette, offset, data); } -WRITE8_MEMBER(epos_state::port_1_w) +void epos_state::port_1_w(uint8_t data) { /* D0 - start light #1 D1 - start light #2 diff --git a/src/mame/video/equites.cpp b/src/mame/video/equites.cpp index e14c89ea534..26f64b55e9b 100644 --- a/src/mame/video/equites.cpp +++ b/src/mame/video/equites.cpp @@ -151,32 +151,32 @@ VIDEO_START_MEMBER(splndrbt_state,splndrbt) * *************************************/ -READ8_MEMBER(equites_state::equites_fg_videoram_r) +uint8_t equites_state::equites_fg_videoram_r(offs_t offset) { // 8-bit return m_fg_videoram[offset]; } -WRITE8_MEMBER(equites_state::equites_fg_videoram_w) +void equites_state::equites_fg_videoram_w(offs_t offset, uint8_t data) { m_fg_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset >> 1); } -WRITE16_MEMBER(equites_state::equites_bg_videoram_w) +void equites_state::equites_bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(m_bg_videoram + offset); m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(equites_state::equites_bgcolor_w) +void equites_state::equites_bgcolor_w(offs_t offset, uint8_t data) { // bg color register if (offset == 0) m_bgcolor = data; } -WRITE16_MEMBER(equites_state::equites_scrollreg_w) +void equites_state::equites_scrollreg_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) m_bg_tilemap->set_scrolly(0, data & 0xff); @@ -197,12 +197,12 @@ WRITE_LINE_MEMBER(equites_state::flip_screen_w) flip_screen_set(state); } -WRITE16_MEMBER(splndrbt_state::splndrbt_bg_scrollx_w) +void splndrbt_state::splndrbt_bg_scrollx_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_splndrbt_bg_scrollx); } -WRITE16_MEMBER(splndrbt_state::splndrbt_bg_scrolly_w) +void splndrbt_state::splndrbt_bg_scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_splndrbt_bg_scrolly); } diff --git a/src/mame/video/espial.cpp b/src/mame/video/espial.cpp index b40f577c6e1..3a29447a029 100644 --- a/src/mame/video/espial.cpp +++ b/src/mame/video/espial.cpp @@ -112,35 +112,35 @@ VIDEO_START_MEMBER(espial_state,netwars) * *************************************/ -WRITE8_MEMBER(espial_state::espial_videoram_w) +void espial_state::espial_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(espial_state::espial_colorram_w) +void espial_state::espial_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(espial_state::espial_attributeram_w) +void espial_state::espial_attributeram_w(offs_t offset, uint8_t data) { m_attributeram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(espial_state::espial_scrollram_w) +void espial_state::espial_scrollram_w(offs_t offset, uint8_t data) { m_scrollram[offset] = data; m_bg_tilemap->set_scrolly(offset, data); } -WRITE8_MEMBER(espial_state::espial_flipscreen_w) +void espial_state::espial_flipscreen_w(uint8_t data) { m_flipscreen = data; m_bg_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); diff --git a/src/mame/video/esripsys.cpp b/src/mame/video/esripsys.cpp index b6b786aa084..9db24deaa78 100644 --- a/src/mame/video/esripsys.cpp +++ b/src/mame/video/esripsys.cpp @@ -182,7 +182,7 @@ uint32_t esripsys_state::screen_update_esripsys(screen_device &screen, bitmap_rg return 0; } -WRITE8_MEMBER(esripsys_state::esripsys_bg_intensity_w) +void esripsys_state::esripsys_bg_intensity_w(uint8_t data) { m_bg_intensity = data & 0xf; } diff --git a/src/mame/video/exerion.cpp b/src/mame/video/exerion.cpp index 459824cb202..9d2de3e7fdf 100644 --- a/src/mame/video/exerion.cpp +++ b/src/mame/video/exerion.cpp @@ -182,7 +182,7 @@ void exerion_state::video_start() * *************************************/ -WRITE8_MEMBER(exerion_state::exerion_videoreg_w) +void exerion_state::exerion_videoreg_w(uint8_t data) { /* bit 0 = flip screen and joystick input multiplexer */ m_cocktail_flip = data & 1; @@ -200,7 +200,7 @@ WRITE8_MEMBER(exerion_state::exerion_videoreg_w) } -WRITE8_MEMBER(exerion_state::exerion_video_latch_w) +void exerion_state::exerion_video_latch_w(offs_t offset, uint8_t data) { int scanline = m_screen->vpos(); if (scanline > 0) @@ -209,7 +209,7 @@ WRITE8_MEMBER(exerion_state::exerion_video_latch_w) } -READ8_MEMBER(exerion_state::exerion_video_timing_r) +uint8_t exerion_state::exerion_video_timing_r() { /* bit 0 is the SNMI signal, which is the negated value of H6, if H7=1 & H8=1 & VBLANK=0, otherwise 1 */ /* bit 1 is VBLANK */ diff --git a/src/mame/video/exidy.cpp b/src/mame/video/exidy.cpp index 1b68ef99838..8c7146a847d 100644 --- a/src/mame/video/exidy.cpp +++ b/src/mame/video/exidy.cpp @@ -76,7 +76,7 @@ INTERRUPT_GEN_MEMBER(exidy_state::exidy_vblank_interrupt) -READ8_MEMBER(exidy_state::exidy_interrupt_r) +uint8_t exidy_state::exidy_interrupt_r() { /* clear any interrupts */ m_maincpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/video/exidy440.cpp b/src/mame/video/exidy440.cpp index f1173334a47..11c83976dfa 100644 --- a/src/mame/video/exidy440.cpp +++ b/src/mame/video/exidy440.cpp @@ -72,7 +72,7 @@ void topsecex_state::video_start() * *************************************/ -READ8_MEMBER(exidy440_state::exidy440_videoram_r) +uint8_t exidy440_state::exidy440_videoram_r(offs_t offset) { uint8_t *base = &m_local_videoram[(*m_scanline * 256 + offset) * 2]; @@ -81,7 +81,7 @@ READ8_MEMBER(exidy440_state::exidy440_videoram_r) } -WRITE8_MEMBER(exidy440_state::exidy440_videoram_w) +void exidy440_state::exidy440_videoram_w(offs_t offset, uint8_t data) { uint8_t *base = &m_local_videoram[(*m_scanline * 256 + offset) * 2]; @@ -98,13 +98,13 @@ WRITE8_MEMBER(exidy440_state::exidy440_videoram_w) * *************************************/ -READ8_MEMBER(exidy440_state::exidy440_paletteram_r) +uint8_t exidy440_state::exidy440_paletteram_r(offs_t offset) { return m_local_paletteram[m_palettebank_io * 512 + offset]; } -WRITE8_MEMBER(exidy440_state::exidy440_paletteram_w) +void exidy440_state::exidy440_paletteram_w(offs_t offset, uint8_t data) { /* update palette ram in the I/O bank */ m_local_paletteram[m_palettebank_io * 512 + offset] = data; @@ -131,7 +131,7 @@ WRITE8_MEMBER(exidy440_state::exidy440_paletteram_w) * *************************************/ -READ8_MEMBER(exidy440_state::exidy440_horizontal_pos_r) +uint8_t exidy440_state::exidy440_horizontal_pos_r() { /* clear the FIRQ on a read here */ m_firq_beam = 0; @@ -143,15 +143,13 @@ READ8_MEMBER(exidy440_state::exidy440_horizontal_pos_r) } -READ8_MEMBER(exidy440_state::exidy440_vertical_pos_r) +uint8_t exidy440_state::exidy440_vertical_pos_r() { - int result; - /* according to the schems, this value is latched on any FIRQ * caused by collision or beam, ORed together with CHRCLK, * which probably goes off once per scanline; for now, we just * always return the current scanline */ - result = m_screen->vpos(); + int result = m_screen->vpos(); return (result < 255) ? result : 255; } @@ -163,7 +161,7 @@ READ8_MEMBER(exidy440_state::exidy440_vertical_pos_r) * *************************************/ -WRITE8_MEMBER(exidy440_state::exidy440_spriteram_w) +void exidy440_state::exidy440_spriteram_w(offs_t offset, uint8_t data) { m_screen->update_partial(m_screen->vpos()); m_spriteram[offset] = data; @@ -177,7 +175,7 @@ WRITE8_MEMBER(exidy440_state::exidy440_spriteram_w) * *************************************/ -WRITE8_MEMBER(exidy440_state::exidy440_control_w) +void exidy440_state::exidy440_control_w(offs_t offset, uint8_t data) { int oldvis = m_palettebank_vis; @@ -208,7 +206,7 @@ WRITE8_MEMBER(exidy440_state::exidy440_control_w) } -WRITE8_MEMBER(exidy440_state::exidy440_interrupt_clear_w) +void exidy440_state::exidy440_interrupt_clear_w(uint8_t data) { /* clear the VBLANK FIRQ on a write here */ m_firq_vblank = 0; diff --git a/src/mame/video/exprraid.cpp b/src/mame/video/exprraid.cpp index d833ef70c0f..166d42f01fe 100644 --- a/src/mame/video/exprraid.cpp +++ b/src/mame/video/exprraid.cpp @@ -4,19 +4,19 @@ #include "includes/exprraid.h" -WRITE8_MEMBER(exprraid_state::exprraid_videoram_w) +void exprraid_state::exprraid_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(exprraid_state::exprraid_colorram_w) +void exprraid_state::exprraid_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(exprraid_state::exprraid_flipscreen_w) +void exprraid_state::exprraid_flipscreen_w(uint8_t data) { if (flip_screen() != (data & 0x01)) { @@ -25,7 +25,7 @@ WRITE8_MEMBER(exprraid_state::exprraid_flipscreen_w) } } -WRITE8_MEMBER(exprraid_state::exprraid_bgselect_w) +void exprraid_state::exprraid_bgselect_w(offs_t offset, uint8_t data) { if (m_bg_index[offset] != data) { @@ -34,12 +34,12 @@ WRITE8_MEMBER(exprraid_state::exprraid_bgselect_w) } } -WRITE8_MEMBER(exprraid_state::exprraid_scrollx_w) +void exprraid_state::exprraid_scrollx_w(offs_t offset, uint8_t data) { m_bg_tilemap->set_scrollx(offset, data); } -WRITE8_MEMBER(exprraid_state::exprraid_scrolly_w) +void exprraid_state::exprraid_scrolly_w(offs_t offset, uint8_t data) { m_bg_tilemap->set_scrolly(0, data); } |