diff options
347 files changed, 3003 insertions, 3024 deletions
diff --git a/src/mame/audio/tranqgun.cpp b/src/mame/audio/tranqgun.cpp index c63845f5097..afa28fe3591 100644 --- a/src/mame/audio/tranqgun.cpp +++ b/src/mame/audio/tranqgun.cpp @@ -52,7 +52,7 @@ enum }; -WRITE8_MEMBER( vicdual_state::tranqgun_audio_w ) +void vicdual_state::tranqgun_audio_w(uint8_t data) { int bitsChanged; int bitsGoneHigh; diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp index 34b0866399e..397c27c55e1 100644 --- a/src/mame/audio/turrett.cpp +++ b/src/mame/audio/turrett.cpp @@ -128,7 +128,7 @@ void turrett_device::sound_stream_update(sound_stream &stream, stream_sample_t * // read - host CPU read access //------------------------------------------------- -READ32_MEMBER( turrett_device::read ) +uint32_t turrett_device::read(offs_t offset) { m_stream->update(); @@ -142,7 +142,7 @@ READ32_MEMBER( turrett_device::read ) // write - host CPU write access //------------------------------------------------- -WRITE32_MEMBER( turrett_device::write ) +void turrett_device::write(offs_t offset, uint32_t data) { m_stream->update(); diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp index 2cdd596a8cf..e415fb54669 100644 --- a/src/mame/audio/tx1.cpp +++ b/src/mame/audio/tx1.cpp @@ -131,23 +131,23 @@ void tx1_sound_device::device_reset() } /* Main CPU and Z80 synchronisation */ -WRITE16_MEMBER( tx1_sound_device::z80_busreq_w ) +void tx1_sound_device::z80_busreq_w(uint16_t data) { m_audiocpu->set_input_line(INPUT_LINE_HALT, (data & 1) ? CLEAR_LINE : ASSERT_LINE); } /* Z80 can trigger its own interrupts */ -WRITE8_MEMBER( tx1_sound_device::z80_intreq_w ) +void tx1_sound_device::z80_intreq_w(uint8_t data) { m_audiocpu->set_input_line(0, HOLD_LINE); } -READ16_MEMBER( tx1_sound_device::z80_shared_r ) +uint16_t tx1_sound_device::z80_shared_r(offs_t offset) { return m_audiocpu->space(AS_PROGRAM).read_byte(offset); } -WRITE16_MEMBER( tx1_sound_device::z80_shared_w ) +void tx1_sound_device::z80_shared_w(offs_t offset, uint16_t data) { m_audiocpu->space(AS_PROGRAM).write_byte(offset, data & 0xff); } @@ -156,13 +156,13 @@ WRITE16_MEMBER( tx1_sound_device::z80_shared_w ) (TODO) TS: Connected in place of dipswitch A bit 0 Accessed on startup as some sort of acknowledgement */ -WRITE8_MEMBER( tx1_sound_device::ts_w ) +void tx1_sound_device::ts_w(offs_t offset, uint8_t data) { // TS = 1; m_z80_ram[offset] = data; } -READ8_MEMBER( tx1_sound_device::ts_r ) +uint8_t tx1_sound_device::ts_r(offs_t offset) { // TS = 1; return m_z80_ram[offset]; @@ -177,13 +177,13 @@ static uint8_t bit_reverse8(uint8_t val) return val; } -READ16_MEMBER( tx1_sound_device::dipswitches_r ) +uint16_t tx1_sound_device::dipswitches_r() { return (m_dsw->read() & 0xfffe) | m_ts; } // Tazmi TZ2103 custom 4-channel A/D converter @ 7.5 MHz -READ8_MEMBER( buggyboy_sound_device::bb_analog_r ) +uint8_t buggyboy_sound_device::bb_analog_r(offs_t offset) { if (offset == 0) return bit_reverse8(((m_accelerator->read() & 0xf) << 4) | m_steering->read()); @@ -191,7 +191,7 @@ READ8_MEMBER( buggyboy_sound_device::bb_analog_r ) return bit_reverse8((m_brake->read() & 0xf) << 4); } -READ8_MEMBER( buggyboyjr_sound_device::bbjr_analog_r ) +uint8_t buggyboyjr_sound_device::bbjr_analog_r(offs_t offset) { if (offset == 0) return ((m_accelerator->read() & 0xf) << 4) | m_steering->read(); @@ -229,7 +229,7 @@ uint8_t tx1_sound_device::tx1_ppi_portb_r() return m_ppi_portd->read() | m_ppi_latch_b; } -WRITE8_MEMBER( tx1_sound_device::pit8253_w ) +void tx1_sound_device::pit8253_w(offs_t offset, uint8_t data) { m_stream->update(); @@ -261,7 +261,7 @@ WRITE8_MEMBER( tx1_sound_device::pit8253_w ) } } -READ8_MEMBER( tx1_sound_device::pit8253_r ) +uint8_t tx1_sound_device::pit8253_r(offs_t offset) { osd_printf_debug("PIT R: %x", offset); return 0; diff --git a/src/mame/audio/tx1.h b/src/mame/audio/tx1.h index bf3e2505167..f212121ae9f 100644 --- a/src/mame/audio/tx1.h +++ b/src/mame/audio/tx1.h @@ -19,18 +19,18 @@ class tx1_sound_device : public device_t, public device_sound_interface public: tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE16_MEMBER( z80_busreq_w ); - DECLARE_READ16_MEMBER( dipswitches_r ); - DECLARE_READ16_MEMBER( z80_shared_r ); - DECLARE_WRITE16_MEMBER( z80_shared_w ); + void z80_busreq_w(uint16_t data); + uint16_t dipswitches_r(); + uint16_t z80_shared_r(offs_t offset); + void z80_shared_w(offs_t offset, uint16_t data); - DECLARE_WRITE8_MEMBER( z80_intreq_w ); + void z80_intreq_w(uint8_t data); - DECLARE_WRITE8_MEMBER( ts_w ); - DECLARE_READ8_MEMBER( ts_r ); + void ts_w(offs_t offset, uint8_t data); + uint8_t ts_r(offs_t offset); - DECLARE_READ8_MEMBER( pit8253_r ); - DECLARE_WRITE8_MEMBER( pit8253_w ); + uint8_t pit8253_r(offs_t offset); + void pit8253_w(offs_t offset, uint8_t data); INTERRUPT_GEN_MEMBER( z80_irq ); @@ -159,7 +159,7 @@ protected: void ym1_a_w(uint8_t data); - DECLARE_READ8_MEMBER( bb_analog_r ); + uint8_t bb_analog_r(offs_t offset); void bb_coin_cnt_w(uint8_t data); virtual bool has_coin_counters() { return false; } @@ -180,7 +180,7 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_READ8_MEMBER( bbjr_analog_r ); + uint8_t bbjr_analog_r(offs_t offset); virtual bool has_coin_counters() override { return true; } diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index 8a21e9fd788..b3bd59c288f 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -137,7 +137,7 @@ MACHINE_START_MEMBER(vicdual_state,frogs_audio) } -WRITE8_MEMBER( vicdual_state::frogs_audio_w ) +void vicdual_state::frogs_audio_w(uint8_t data) { static int last_croak = 0; static int last_buzzz = 0; @@ -451,7 +451,7 @@ void vicdual_state::headon_audio(machine_config &config) m_discrete->add_route(ALL_OUTPUTS, "mono", 1.0); } -WRITE8_MEMBER( vicdual_state::headon_audio_w ) +void vicdual_state::headon_audio_w(uint8_t data) { if (m_discrete == nullptr) return; @@ -465,7 +465,7 @@ WRITE8_MEMBER( vicdual_state::headon_audio_w ) } -WRITE8_MEMBER( vicdual_state::invho2_audio_w ) +void vicdual_state::invho2_audio_w(uint8_t data) { if (m_discrete == nullptr) return; @@ -599,7 +599,7 @@ void vicdual_state::brdrline_audio(machine_config &config) m_samples->add_route(ALL_OUTPUTS, "mono", 0.35); } -WRITE8_MEMBER( vicdual_state::brdrline_audio_w ) +void vicdual_state::brdrline_audio_w(uint8_t data) { uint8_t res = data ^ 0xff; @@ -623,7 +623,7 @@ WRITE8_MEMBER( vicdual_state::brdrline_audio_w ) //printf("%02x\n",res); } -WRITE8_MEMBER( vicdual_state::brdrline_audio_aux_w ) +void vicdual_state::brdrline_audio_aux_w(uint8_t data) { if(data & 0xfc) // coin, unknown which is the trigger m_samples->start(1, 1); diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index 7f12fcee83f..e6835d5eb75 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -3478,8 +3478,8 @@ void xevious_state::init_xevios() void battles_state::driver_init() { /* replace the Namco I/O handlers with interface to the 4th CPU */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x7000, 0x700f, read8_delegate(*this, FUNC(battles_state::customio_data0_r)), write8_delegate(*this, FUNC(battles_state::customio_data0_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x7100, 0x7100, read8_delegate(*this, FUNC(battles_state::customio0_r)), write8_delegate(*this, FUNC(battles_state::customio0_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x7000, 0x700f, read8sm_delegate(*this, FUNC(battles_state::customio_data0_r)), write8sm_delegate(*this, FUNC(battles_state::customio_data0_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x7100, 0x7100, read8smo_delegate(*this, FUNC(battles_state::customio0_r)), write8smo_delegate(*this, FUNC(battles_state::customio0_w))); init_xevious(); } diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp index 5f707810bfc..995dbf54b9b 100644 --- a/src/mame/drivers/tagteam.cpp +++ b/src/mame/drivers/tagteam.cpp @@ -42,7 +42,7 @@ void tagteam_state::machine_start() save_item(NAME(m_sound_nmi_mask)); } -WRITE8_MEMBER(tagteam_state::irq_clear_w) +void tagteam_state::irq_clear_w(uint8_t data) { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); } @@ -61,7 +61,7 @@ void tagteam_state::main_map(address_map &map) map(0x8000, 0xffff).rom(); } -WRITE8_MEMBER(tagteam_state::sound_nmi_mask_w) +void tagteam_state::sound_nmi_mask_w(uint8_t data) { m_sound_nmi_mask = data & 1; } diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp index 763633bafe7..b4a0918706d 100644 --- a/src/mame/drivers/tail2nos.cpp +++ b/src/mame/drivers/tail2nos.cpp @@ -25,7 +25,7 @@ #include "speaker.h" -READ8_MEMBER(tail2nos_state::sound_semaphore_r) +uint8_t tail2nos_state::sound_semaphore_r() { return m_soundlatch->pending_r(); } diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 886d5ab84cb..ce56e0e0f22 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -193,31 +193,31 @@ TODO! #include "speaker.h" -WRITE8_MEMBER(taitob_state::bankswitch_w) +void taitob_state::bankswitch_w(uint8_t data) { m_audiobank->set_entry(data & 3); } template<int Player> -READ16_MEMBER(taitob_state::tracky_hi_r) +uint16_t taitob_state::tracky_hi_r() { return m_trackx_io[Player]->read(); } template<int Player> -READ16_MEMBER(taitob_state::tracky_lo_r) +uint16_t taitob_state::tracky_lo_r() { return (m_trackx_io[Player]->read() & 0xff) << 8; } template<int Player> -READ16_MEMBER(taitob_state::trackx_hi_r) +uint16_t taitob_state::trackx_hi_r() { return m_tracky_io[Player]->read(); } template<int Player> -READ16_MEMBER(taitob_state::trackx_lo_r) +uint16_t taitob_state::trackx_lo_r() { return (m_tracky_io[Player]->read() & 0xff) << 8; } @@ -233,12 +233,12 @@ INPUT_CHANGED_MEMBER(taitob_c_state::realpunc_sensor) ***************************************************************************/ -READ16_MEMBER(taitob_state::eep_latch_r) +uint16_t taitob_state::eep_latch_r() { return m_eep_latch; } -WRITE16_MEMBER(taitob_state::eeprom_w) +void taitob_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_eep_latch); @@ -275,12 +275,12 @@ void taitob_state::player_12_coin_ctrl_w(uint8_t data) machine().bookkeeping().coin_counter_w(1, data & 0x08); } -READ16_MEMBER(taitob_state::player_34_coin_ctrl_r) +uint16_t taitob_state::player_34_coin_ctrl_r() { return m_coin_word; } -WRITE16_MEMBER(taitob_state::player_34_coin_ctrl_w) +void taitob_state::player_34_coin_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_coin_word); @@ -291,7 +291,7 @@ WRITE16_MEMBER(taitob_state::player_34_coin_ctrl_w) machine().bookkeeping().coin_counter_w(3, data & 0x0800); } -WRITE16_MEMBER(taitob_state::spacedxo_tc0220ioc_w) +void taitob_state::spacedxo_tc0220ioc_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) m_tc0220ioc->write(offset, data & 0xff); @@ -302,7 +302,7 @@ WRITE16_MEMBER(taitob_state::spacedxo_tc0220ioc_w) } } -WRITE16_MEMBER(taitob_c_state::realpunc_output_w) +void taitob_c_state::realpunc_output_w(uint16_t data) { /* 15 = Camera Enable? diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp index 17d2313a543..612e74eb9e9 100644 --- a/src/mame/drivers/taito_h.cpp +++ b/src/mame/drivers/taito_h.cpp @@ -161,7 +161,7 @@ some kind of zoom table? ***************************************************************************/ -READ8_MEMBER(taitoh_state::syvalion_input_bypass_r) +u8 taitoh_state::syvalion_input_bypass_r() { /* Bypass TC0040IOC controller for analog input */ diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 10cbfac8221..b91ac388579 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -191,7 +191,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(taitol_state::vbl_interrupt) } } -WRITE8_MEMBER(taitol_state::irq_enable_w) +void taitol_state::irq_enable_w(u8 data) { //logerror("irq_enable = %02x\n",data); m_vdp->irq_enable_w(data); @@ -202,7 +202,7 @@ WRITE8_MEMBER(taitol_state::irq_enable_w) } -WRITE8_MEMBER(taitol_state::rombankswitch_w) +void taitol_state::rombankswitch_w(u8 data) { if (m_vdp->rom_bank_r() != data) { @@ -217,7 +217,7 @@ WRITE8_MEMBER(taitol_state::rombankswitch_w) } } -WRITE8_MEMBER(fhawk_state::slave_rombank_w) +void fhawk_state::slave_rombank_w(u8 data) { data &= 0xf; @@ -236,7 +236,7 @@ WRITE8_MEMBER(fhawk_state::slave_rombank_w) } } -READ8_MEMBER(fhawk_state::slave_rombank_r) +u8 fhawk_state::slave_rombank_r() { return m_slave_rombank; } @@ -249,19 +249,19 @@ void taitol_state::coin_control_w(u8 data) machine().bookkeeping().coin_counter_w(1, data & 0x08); } -READ8_MEMBER(taitol_1cpu_state::extport_select_and_ym2203_r) +u8 taitol_1cpu_state::extport_select_and_ym2203_r(offs_t offset) { for (auto &mux : m_mux) mux->select_w((offset >> 1) & 1); return m_ymsnd->read(offset & 1); } -WRITE8_MEMBER(taitol_state::mcu_control_w) +void taitol_state::mcu_control_w(u8 data) { // logerror("mcu control %02x (%04x)\n", data, m_main_cpu->pc()); } -READ8_MEMBER(taitol_state::mcu_control_r) +u8 taitol_state::mcu_control_r() { // logerror("mcu control read (%04x)\n", m_main_cpu->pc()); return 0x1; @@ -282,22 +282,22 @@ WRITE_LINE_MEMBER(champwr_state::msm5205_vck) } } -WRITE8_MEMBER(champwr_state::msm5205_lo_w) +void champwr_state::msm5205_lo_w(u8 data) { m_adpcm_pos = (m_adpcm_pos & 0xff00ff) | (data << 8); } -WRITE8_MEMBER(champwr_state::msm5205_hi_w) +void champwr_state::msm5205_hi_w(u8 data) { m_adpcm_pos = ((m_adpcm_pos & 0x00ffff) | (data << 16)) & 0x1ffff; } -WRITE8_MEMBER(champwr_state::msm5205_start_w) +void champwr_state::msm5205_start_w(u8 data) { m_msm->reset_w(0); } -WRITE8_MEMBER(champwr_state::msm5205_stop_w) +void champwr_state::msm5205_stop_w(u8 data) { m_msm->reset_w(1); m_adpcm_pos &= 0x1ff00; @@ -366,7 +366,7 @@ void taitol_2cpu_state::raimais_2_map(address_map &map) } -WRITE8_MEMBER(taitol_2cpu_state::sound_bankswitch_w) +void taitol_2cpu_state::sound_bankswitch_w(u8 data) { m_audio_bnk->set_entry(data & 0x03); } diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index 41b754e6782..163365ca89f 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -1369,7 +1369,7 @@ static const u16 spacegun_default_eeprom[64]= #if 0 -READ16_MEMBER(taitoz_state::eep_latch_r) +u16 taitoz_state::eep_latch_r() { return m_eep_latch; } diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp index f9d14be6eee..9843cb5ad0e 100644 --- a/src/mame/drivers/taitoair.cpp +++ b/src/mame/drivers/taitoair.cpp @@ -295,7 +295,7 @@ void taitoair_state::gradram_w(offs_t offset, u16 data, u16 mem_mask) INPUTS ***********************************************************/ -READ16_MEMBER(taitoair_state::stick_input_r) +u16 taitoair_state::stick_input_r(offs_t offset) { switch (offset) { @@ -315,7 +315,7 @@ READ16_MEMBER(taitoair_state::stick_input_r) return 0; } -READ16_MEMBER(taitoair_state::stick2_input_r) +u16 taitoair_state::stick2_input_r(offs_t offset) { switch (offset) { diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp index b89a9fac04d..e8b01aba025 100644 --- a/src/mame/drivers/taitojc.cpp +++ b/src/mame/drivers/taitojc.cpp @@ -474,7 +474,7 @@ void taitojc_state::coin_control_w(uint8_t data) ***************************************************************************/ // dsp common ram has similar interrupt capability as MB8421 -WRITE16_MEMBER(taitojc_state::dsp_to_main_7fe_w) +void taitojc_state::dsp_to_main_7fe_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_dsp_shared_ram[0x7fe]); @@ -483,7 +483,7 @@ WRITE16_MEMBER(taitojc_state::dsp_to_main_7fe_w) m_maincpu->set_input_line(6, ASSERT_LINE); } -READ16_MEMBER(taitojc_state::dsp_to_main_7fe_r) +uint16_t taitojc_state::dsp_to_main_7fe_r(offs_t offset, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) m_maincpu->set_input_line(6, CLEAR_LINE); @@ -491,7 +491,7 @@ READ16_MEMBER(taitojc_state::dsp_to_main_7fe_r) return m_dsp_shared_ram[0x7fe]; } -WRITE16_MEMBER(taitojc_state::main_to_dsp_7ff_w) +void taitojc_state::main_to_dsp_7ff_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_dsp_shared_ram[0x7ff]); @@ -536,7 +536,7 @@ INTERRUPT_GEN_MEMBER(taitojc_state::taitojc_vblank) device.execute().set_input_line(2, HOLD_LINE); // where does it come from? } -WRITE8_MEMBER(taitojc_state::jc_irq_unk_w) +void taitojc_state::jc_irq_unk_w(uint8_t data) { // gets written to at the end of irq6 routine // writes $02 or $06, depending on a value in DSP RAM, what does it mean? @@ -549,18 +549,18 @@ WRITE8_MEMBER(taitojc_state::jc_irq_unk_w) ***************************************************************************/ -READ16_MEMBER(taitojc_state::dsp_shared_r) +uint16_t taitojc_state::dsp_shared_r(offs_t offset) { return m_dsp_shared_ram[offset]; } -WRITE16_MEMBER(taitojc_state::dsp_shared_w) +void taitojc_state::dsp_shared_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_dsp_shared_ram[offset]); } -READ8_MEMBER(taitojc_state::mcu_comm_r) +uint8_t taitojc_state::mcu_comm_r(offs_t offset) { switch (offset) { @@ -578,7 +578,7 @@ READ8_MEMBER(taitojc_state::mcu_comm_r) return 0; } -WRITE8_MEMBER(taitojc_state::mcu_comm_w) +void taitojc_state::mcu_comm_w(offs_t offset, uint8_t data) { switch (offset) { @@ -598,7 +598,7 @@ WRITE8_MEMBER(taitojc_state::mcu_comm_w) } -READ8_MEMBER(taitojc_state::jc_pcbid_r) +uint8_t taitojc_state::jc_pcbid_r(offs_t offset) { static const char pcb_id[0x40] = { "DEV=TC0870HVP SYS=CG VER=1.0"}; @@ -618,12 +618,12 @@ Not emulated yet... */ -READ8_MEMBER(taitojc_state::jc_lan_r) +uint8_t taitojc_state::jc_lan_r() { return 0xff; } -WRITE8_MEMBER(taitojc_state::jc_lan_w) +void taitojc_state::jc_lan_w(uint8_t data) { } @@ -660,7 +660,7 @@ The OKI is used for seat vibration effects. */ -WRITE8_MEMBER(taitojc_state::dendego_speedmeter_w) +void taitojc_state::dendego_speedmeter_w(uint8_t data) { if (m_speed_meter != dendego_odometer_table[data]) { @@ -670,7 +670,7 @@ WRITE8_MEMBER(taitojc_state::dendego_speedmeter_w) } } -WRITE8_MEMBER(taitojc_state::dendego_brakemeter_w) +void taitojc_state::dendego_brakemeter_w(uint8_t data) { if (m_brake_meter != dendego_pressure_table[data]) { @@ -786,37 +786,37 @@ void taitojc_state::hc11_pgm_map(address_map &map) 0x703b: Unknown read/write */ -WRITE16_MEMBER(taitojc_state::dsp_math_projection_w) +void taitojc_state::dsp_math_projection_w(offs_t offset, uint16_t data) { m_projection_data[offset] = data; } -WRITE16_MEMBER(taitojc_state::dsp_math_viewport_w) +void taitojc_state::dsp_math_viewport_w(offs_t offset, uint16_t data) { m_viewport_data[offset] = data; } -READ16_MEMBER(taitojc_state::dsp_math_projection_y_r) +uint16_t taitojc_state::dsp_math_projection_y_r() { return (m_projection_data[2] != 0) ? (m_projection_data[0] * m_viewport_data[0]) / m_projection_data[2] : 0; } -READ16_MEMBER(taitojc_state::dsp_math_projection_x_r) +uint16_t taitojc_state::dsp_math_projection_x_r() { return (m_projection_data[2] != 0) ? (m_projection_data[1] * m_viewport_data[1]) / m_projection_data[2] : 0; } -WRITE16_MEMBER(taitojc_state::dsp_math_intersection_w) +void taitojc_state::dsp_math_intersection_w(offs_t offset, uint16_t data) { m_intersection_data[offset] = data; } -READ16_MEMBER(taitojc_state::dsp_math_intersection_r) +uint16_t taitojc_state::dsp_math_intersection_r() { return (m_intersection_data[2] != 0) ? (m_intersection_data[0] * m_intersection_data[1]) / m_intersection_data[2] : 0; } -READ16_MEMBER(taitojc_state::dsp_math_unk_r) +uint16_t taitojc_state::dsp_math_unk_r() { return 0x7fff; } @@ -824,13 +824,13 @@ READ16_MEMBER(taitojc_state::dsp_math_unk_r) /**************************************************************************/ -READ16_MEMBER(taitojc_state::dsp_rom_r) +uint16_t taitojc_state::dsp_rom_r() { assert (m_dsp_rom_pos < 0x800000); // never happens return m_dspgfx[machine().side_effects_disabled() ? m_dsp_rom_pos : m_dsp_rom_pos++]; } -WRITE16_MEMBER(taitojc_state::dsp_rom_w) +void taitojc_state::dsp_rom_w(offs_t offset, uint16_t data) { if (offset == 0) { @@ -1154,7 +1154,7 @@ void taitojc_state::dendego(machine_config &config) ***************************************************************************/ -READ16_MEMBER(taitojc_state::taitojc_dsp_idle_skip_r) +uint16_t taitojc_state::taitojc_dsp_idle_skip_r() { if (m_dsp->pc() == 0x404c) m_dsp->spin_until_time(attotime::from_usec(500)); @@ -1162,7 +1162,7 @@ READ16_MEMBER(taitojc_state::taitojc_dsp_idle_skip_r) return m_dsp_shared_ram[0x7f0]; } -READ16_MEMBER(taitojc_state::dendego2_dsp_idle_skip_r) +uint16_t taitojc_state::dendego2_dsp_idle_skip_r() { if (m_dsp->pc() == 0x402e) m_dsp->spin_until_time(attotime::from_usec(500)); @@ -1176,7 +1176,7 @@ void taitojc_state::init_taitojc() m_has_dsp_hack = 1; if (DSP_IDLESKIP) - m_dsp->space(AS_DATA).install_read_handler(0x7ff0, 0x7ff0, read16_delegate(*this, FUNC(taitojc_state::taitojc_dsp_idle_skip_r))); + m_dsp->space(AS_DATA).install_read_handler(0x7ff0, 0x7ff0, read16smo_delegate(*this, FUNC(taitojc_state::taitojc_dsp_idle_skip_r))); } void taitojc_state::init_dendego2() @@ -1184,7 +1184,7 @@ void taitojc_state::init_dendego2() init_taitojc(); if (DSP_IDLESKIP) - m_dsp->space(AS_DATA).install_read_handler(0x7ff0, 0x7ff0, read16_delegate(*this, FUNC(taitojc_state::dendego2_dsp_idle_skip_r))); + m_dsp->space(AS_DATA).install_read_handler(0x7ff0, 0x7ff0, read16smo_delegate(*this, FUNC(taitojc_state::dendego2_dsp_idle_skip_r))); } void taitojc_state::init_dangcurv() diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index 90af0b7e1ca..a9743f63004 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -179,7 +179,7 @@ void taitosj_state::taitosj_sndnmi_msk_w(uint8_t data) m_soundnmi->in_w<0>((~data)&1); } -WRITE8_MEMBER(taitosj_state::soundlatch_w) +void taitosj_state::soundlatch_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(taitosj_state::soundlatch_w_cb), this), data); } @@ -191,7 +191,7 @@ void taitosj_state::input_port_4_f0_w(uint8_t data) } // EPORT2 -WRITE8_MEMBER(taitosj_state::sound_semaphore2_w) +void taitosj_state::sound_semaphore2_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(taitosj_state::sound_semaphore2_w_cb), this), data); } @@ -341,7 +341,7 @@ TIMER_CALLBACK_MEMBER(taitosj_state::sound_semaphore2_clear_w_cb) } // RD5000 -READ8_MEMBER(taitosj_state::soundlatch_r) +uint8_t taitosj_state::soundlatch_r() { if (!machine().side_effects_disabled()) { @@ -352,19 +352,19 @@ READ8_MEMBER(taitosj_state::soundlatch_r) } // RD5001 -READ8_MEMBER(taitosj_state::soundlatch_flags_r) +uint8_t taitosj_state::soundlatch_flags_r() { return (m_soundlatch_flag?8:0) | (m_sound_semaphore2?4:0) | 3; } // WR5000 -WRITE8_MEMBER(taitosj_state::soundlatch_clear7_w) +void taitosj_state::soundlatch_clear7_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(taitosj_state::soundlatch_clear7_w_cb), this), data); } // WR5001 -WRITE8_MEMBER(taitosj_state::sound_semaphore2_clear_w) +void taitosj_state::sound_semaphore2_clear_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(taitosj_state::sound_semaphore2_clear_w_cb), this), data); } @@ -2851,7 +2851,7 @@ void taitosj_state::init_spacecr() init_common(); /* install protection handler */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0xd48b, 0xd48b, read8_delegate(*this, FUNC(taitosj_state::spacecr_prot_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xd48b, 0xd48b, read8smo_delegate(*this, FUNC(taitosj_state::spacecr_prot_r))); } void taitosj_state::init_alpine() @@ -2859,8 +2859,8 @@ void taitosj_state::init_alpine() init_common(); /* install protection handlers */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0xd40b, 0xd40b, read8_delegate(*this, FUNC(taitosj_state::alpine_port_2_r))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd50f, 0xd50f, write8_delegate(*this, FUNC(taitosj_state::alpine_protection_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xd40b, 0xd40b, read8smo_delegate(*this, FUNC(taitosj_state::alpine_port_2_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd50f, 0xd50f, write8smo_delegate(*this, FUNC(taitosj_state::alpine_protection_w))); } void taitosj_state::init_alpinea() @@ -2868,8 +2868,8 @@ void taitosj_state::init_alpinea() init_common(); /* install protection handlers */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0xd40b, 0xd40b, read8_delegate(*this, FUNC(taitosj_state::alpine_port_2_r))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd50e, 0xd50e, write8_delegate(*this, FUNC(taitosj_state::alpinea_bankswitch_w))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xd40b, 0xd40b, read8smo_delegate(*this, FUNC(taitosj_state::alpine_port_2_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd50e, 0xd50e, write8smo_delegate(*this, FUNC(taitosj_state::alpinea_bankswitch_w))); } void taitosj_state::init_junglhbr() @@ -2877,7 +2877,7 @@ void taitosj_state::init_junglhbr() init_common(); /* inverter on bits 0 and 1 */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x9000, 0xbfff, write8_delegate(*this, FUNC(taitosj_state::junglhbr_characterram_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x9000, 0xbfff, write8sm_delegate(*this, FUNC(taitosj_state::junglhbr_characterram_w))); } GAME( 1981, spaceskr, 0, nomcu, spaceskr, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Space Seeker", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index ef3e8869002..69b7ba9e13a 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -68,17 +68,17 @@ void tandy2k_state::speaker_update() m_speaker->level_w(level); } -READ8_MEMBER( tandy2k_state::char_ram_r ) +uint8_t tandy2k_state::char_ram_r(offs_t offset) { return m_char_ram[offset]; } -WRITE8_MEMBER( tandy2k_state::char_ram_w ) +void tandy2k_state::char_ram_w(offs_t offset, uint8_t data) { m_char_ram[offset] = data; } -READ8_MEMBER( tandy2k_state::videoram_r ) +uint8_t tandy2k_state::videoram_r(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); @@ -94,7 +94,7 @@ READ8_MEMBER( tandy2k_state::videoram_r ) return data & 0xff; } -READ8_MEMBER( tandy2k_state::enable_r ) +uint8_t tandy2k_state::enable_r() { /* @@ -119,7 +119,7 @@ READ8_MEMBER( tandy2k_state::enable_r ) return data; } -WRITE8_MEMBER( tandy2k_state::enable_w ) +void tandy2k_state::enable_w(uint8_t data) { /* @@ -169,7 +169,7 @@ WRITE8_MEMBER( tandy2k_state::enable_w ) m_maincpu->tmrin1_w(BIT(data, 7)); } -WRITE8_MEMBER( tandy2k_state::dma_mux_w ) +void tandy2k_state::dma_mux_w(uint8_t data) { /* @@ -206,7 +206,7 @@ WRITE8_MEMBER( tandy2k_state::dma_mux_w ) update_drq(); } -READ8_MEMBER( tandy2k_state::kbint_clr_r ) +uint8_t tandy2k_state::kbint_clr_r() { if (m_pb_sel == KBDINEN) { @@ -219,7 +219,7 @@ READ8_MEMBER( tandy2k_state::kbint_clr_r ) return 0xff; } -READ8_MEMBER( tandy2k_state::clkmouse_r ) +uint8_t tandy2k_state::clkmouse_r(offs_t offset) { uint8_t ret = 0; switch (offset) @@ -241,7 +241,7 @@ READ8_MEMBER( tandy2k_state::clkmouse_r ) return ret; } -WRITE8_MEMBER( tandy2k_state::clkmouse_w ) +void tandy2k_state::clkmouse_w(offs_t offset, uint8_t data) { switch (offset) { @@ -290,22 +290,22 @@ WRITE8_MEMBER( tandy2k_state::clkmouse_w ) } } -READ8_MEMBER( tandy2k_state::fldtc_r ) +uint8_t tandy2k_state::fldtc_r() { if (LOG) logerror("FLDTC\n"); - fldtc_w(space, 0, 0); + fldtc_w(0); return 0; } -WRITE8_MEMBER( tandy2k_state::fldtc_w ) +void tandy2k_state::fldtc_w(uint8_t data) { m_fdc->tc_w(1); m_fdc->tc_w(false); } -WRITE8_MEMBER( tandy2k_state::addr_ctrl_w ) +void tandy2k_state::addr_ctrl_w(uint8_t data) { /* @@ -567,7 +567,7 @@ WRITE_LINE_MEMBER( tandy2k_state::vpac_sld_w ) m_vac->sld_w(state); } -WRITE8_MEMBER( tandy2k_state::hires_plane_w ) +void tandy2k_state::hires_plane_w(uint8_t data) { int bank = 3; if (((data & 1) + ((data >> 1) & 1) + ((data >> 2) & 1)) == 1) @@ -579,7 +579,7 @@ WRITE8_MEMBER( tandy2k_state::hires_plane_w ) // bit 0 - 0 = hires board installed // bit 1 - 0 = 1 plane, 1 = 3 planes // bit 2-4 - board rev -READ8_MEMBER( tandy2k_state::hires_status_r ) +uint8_t tandy2k_state::hires_status_r() { return 2; } diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp index 63a6f3da119..16db51c93d1 100644 --- a/src/mame/drivers/tank8.cpp +++ b/src/mame/drivers/tank8.cpp @@ -29,40 +29,40 @@ void tank8_state::machine_reset() } -READ8_MEMBER(tank8_state::collision_r) +uint8_t tank8_state::collision_r() { return m_collision_index; } -WRITE8_MEMBER(tank8_state::lockout_w) +void tank8_state::lockout_w(offs_t offset, uint8_t data) { machine().bookkeeping().coin_lockout_w(offset, ~data & 1); } -WRITE8_MEMBER(tank8_state::int_reset_w) +void tank8_state::int_reset_w(uint8_t data) { m_collision_index &= ~0x3f; m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(tank8_state::crash_w) +void tank8_state::crash_w(uint8_t data) { m_discrete->write(TANK8_CRASH_EN, data); } -WRITE8_MEMBER(tank8_state::explosion_w) +void tank8_state::explosion_w(uint8_t data) { m_discrete->write(TANK8_EXPLOSION_EN, data); } -WRITE8_MEMBER(tank8_state::bugle_w) +void tank8_state::bugle_w(uint8_t data) { m_discrete->write(TANK8_BUGLE_EN, data); } -WRITE8_MEMBER(tank8_state::bug_w) +void tank8_state::bug_w(uint8_t data) { /* D0 and D1 determine the on/off time off the square wave */ switch(data & 3) { @@ -86,12 +86,12 @@ WRITE8_MEMBER(tank8_state::bug_w) } -WRITE8_MEMBER(tank8_state::attract_w) +void tank8_state::attract_w(uint8_t data) { m_discrete->write(TANK8_ATTRACT_EN, data); } -WRITE8_MEMBER(tank8_state::motor_w) +void tank8_state::motor_w(offs_t offset, uint8_t data) { m_discrete->write(NODE_RELATIVE(TANK8_MOTOR1_EN, offset), data); } diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp index 44ffc6cece5..39264cb98dd 100644 --- a/src/mame/drivers/tankbatt.cpp +++ b/src/mame/drivers/tankbatt.cpp @@ -74,7 +74,7 @@ void tankbatt_state::machine_start() save_item(NAME(m_sound_enable)); } -READ8_MEMBER(tankbatt_state::in0_r) +uint8_t tankbatt_state::in0_r(offs_t offset) { int val; @@ -82,7 +82,7 @@ READ8_MEMBER(tankbatt_state::in0_r) return ((val << (7 - offset)) & 0x80); } -READ8_MEMBER(tankbatt_state::in1_r) +uint8_t tankbatt_state::in1_r(offs_t offset) { int val; @@ -90,7 +90,7 @@ READ8_MEMBER(tankbatt_state::in1_r) return ((val << (7 - offset)) & 0x80); } -READ8_MEMBER(tankbatt_state::dsw_r) +uint8_t tankbatt_state::dsw_r(offs_t offset) { int val; @@ -140,7 +140,7 @@ WRITE_LINE_MEMBER(tankbatt_state::sh_fire_w) } } -WRITE8_MEMBER(tankbatt_state::irq_ack_w) +void tankbatt_state::irq_ack_w(uint8_t data) { /* 0x6e written at the end of the irq routine, could be either irq ack or a coin sample */ m_maincpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp index 5fa36b04bde..0e0a743b3da 100644 --- a/src/mame/drivers/tankbust.cpp +++ b/src/mame/drivers/tankbust.cpp @@ -46,7 +46,7 @@ TIMER_CALLBACK_MEMBER(tankbust_state::soundlatch_callback) m_latch = param; } -WRITE8_MEMBER(tankbust_state::soundlatch_w) +void tankbust_state::soundlatch_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(tankbust_state::soundlatch_callback),this), data); } @@ -76,7 +76,7 @@ TIMER_CALLBACK_MEMBER(tankbust_state::soundirqline_callback) -WRITE8_MEMBER(tankbust_state::e0xx_w) +void tankbust_state::e0xx_w(offs_t offset, uint8_t data) { m_e0xx_data[offset] = data; @@ -120,7 +120,7 @@ WRITE8_MEMBER(tankbust_state::e0xx_w) } } -READ8_MEMBER(tankbust_state::debug_output_area_r) +uint8_t tankbust_state::debug_output_area_r(offs_t offset) { return m_e0xx_data[offset]; } @@ -175,13 +175,13 @@ void tankbust_state::tankbust_palette(palette_device &palette) const } #if 0 -READ8_MEMBER(tankbust_state::read_from_unmapped_memory) +uint8_t tankbust_state::read_from_unmapped_memory() { return 0xff; } #endif -READ8_MEMBER(tankbust_state::some_changing_input) +uint8_t tankbust_state::some_changing_input() { m_variable_data += 8; return m_variable_data; diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp index 74bef03ac7e..0dc5e540e24 100644 --- a/src/mame/drivers/taotaido.cpp +++ b/src/mame/drivers/taotaido.cpp @@ -84,7 +84,7 @@ void taotaido_state::machine_start() } -READ16_MEMBER(taotaido_state::pending_command_r) +uint16_t taotaido_state::pending_command_r() { /* Only bit 0 is tested */ return m_soundlatch->pending_r(); @@ -119,7 +119,7 @@ void taotaido_state::main_map(address_map &map) /* sound cpu - same as aerofgt */ -WRITE8_MEMBER(taotaido_state::sh_bankswitch_w) +void taotaido_state::sh_bankswitch_w(uint8_t data) { m_soundbank->set_entry(data & 0x03); } diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index 7a5857d8e0e..072079fc2c1 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -103,12 +103,12 @@ TIMER_CALLBACK_MEMBER(targeth_state::gun2_irq) m_gun_irq_timer[1]->adjust( m_screen->time_until_pos(160, 0 ) ); } -WRITE8_MEMBER(targeth_state::oki_bankswitch_w) +void targeth_state::oki_bankswitch_w(uint8_t data) { m_okibank->set_entry(data & 0x0f); } -WRITE16_MEMBER(targeth_state::output_latch_w) +void targeth_state::output_latch_w(offs_t offset, uint16_t data) { m_outlatch->write_bit(offset >> 3, BIT(data, 0)); } @@ -123,13 +123,13 @@ WRITE_LINE_MEMBER(targeth_state::coin2_counter_w) machine().bookkeeping().coin_counter_w(1, state); } -WRITE8_MEMBER(targeth_state::shareram_w) +void targeth_state::shareram_w(offs_t offset, uint8_t data) { // why isn't there address map functionality for this? reinterpret_cast<u8 *>(m_shareram.target())[BYTE_XOR_BE(offset)] = data; } -READ8_MEMBER(targeth_state::shareram_r) +uint8_t targeth_state::shareram_r(offs_t offset) { // why isn't there address map functionality for this? return reinterpret_cast<u8 const *>(m_shareram.target())[BYTE_XOR_BE(offset)]; diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 2061844ab26..63628d16ee9 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -173,43 +173,43 @@ /***************************************************************************/ -WRITE8_MEMBER(cyclwarr_state::cyclwarr_sound_w) +void cyclwarr_state::cyclwarr_sound_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -READ16_MEMBER(cyclwarr_state::cyclwarr_sprite_r) +uint16_t cyclwarr_state::cyclwarr_sprite_r(offs_t offset) { return m_spriteram[offset]; } -WRITE16_MEMBER(cyclwarr_state::cyclwarr_sprite_w) +void cyclwarr_state::cyclwarr_sprite_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spriteram[offset]); } -WRITE16_MEMBER(cyclwarr_state::bigfight_a40000_w) +void cyclwarr_state::bigfight_a40000_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bigfight_a40000[offset]); } template<int Bank> -READ16_MEMBER(cyclwarr_state::cyclwarr_videoram_r) +uint16_t cyclwarr_state::cyclwarr_videoram_r(offs_t offset) { return m_cyclwarr_videoram[Bank][offset]; } template<int Bank> -WRITE16_MEMBER(cyclwarr_state::cyclwarr_videoram_w) +void cyclwarr_state::cyclwarr_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cyclwarr_videoram[Bank][offset]); m_layer[(Bank<<1)|0]->mark_tile_dirty(offset); m_layer[(Bank<<1)|1]->mark_tile_dirty(offset); } -WRITE16_MEMBER(cyclwarr_state::output_w) +void cyclwarr_state::output_w(offs_t offset, uint16_t data, uint16_t mem_mask) { machine().bookkeeping().coin_counter_w(0, data & 1); machine().bookkeeping().coin_counter_w(1, data & 2); diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index f1eb041866a..55d1c880abf 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -25,7 +25,7 @@ Might be some priority glitches #include "speaker.h" -WRITE8_MEMBER(tbowl_state::coincounter_w) +void tbowl_state::coincounter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 1); } @@ -36,12 +36,12 @@ note: check this, its borrowed from tecmo.cpp / wc90.cpp at the moment and could ***/ -WRITE8_MEMBER(tbowl_state::boardb_bankswitch_w) +void tbowl_state::boardb_bankswitch_w(uint8_t data) { membank("mainbank")->set_entry(data >> 3); } -WRITE8_MEMBER(tbowl_state::boardc_bankswitch_w) +void tbowl_state::boardc_bankswitch_w(uint8_t data) { membank("subbank")->set_entry(data >> 3); } @@ -93,7 +93,7 @@ void tbowl_state::_6206B_map(address_map &map) } /* Board C */ -WRITE8_MEMBER(tbowl_state::trigger_nmi) +void tbowl_state::trigger_nmi(uint8_t data) { /* trigger NMI on 6206B's Cpu? (guess but seems to work..) */ m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -116,19 +116,19 @@ void tbowl_state::_6206C_map(address_map &map) /* Board A */ -WRITE8_MEMBER(tbowl_state::adpcm_start_w) +void tbowl_state::adpcm_start_w(offs_t offset, uint8_t data) { msm5205_device *adpcm = (offset & 1) ? m_msm2 : m_msm1; m_adpcm_pos[offset & 1] = data << 8; adpcm->reset_w(0); } -WRITE8_MEMBER(tbowl_state::adpcm_end_w) +void tbowl_state::adpcm_end_w(offs_t offset, uint8_t data) { m_adpcm_end[offset & 1] = (data + 1) << 8; } -WRITE8_MEMBER(tbowl_state::adpcm_vol_w) +void tbowl_state::adpcm_vol_w(offs_t offset, uint8_t data) { msm5205_device *adpcm = (offset & 1) ? m_msm2 : m_msm1; adpcm->set_output_gain(ALL_OUTPUTS, (data & 127) / 127.0); diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp index 212f9a15a45..2254880d9b7 100644 --- a/src/mame/drivers/tceptor.cpp +++ b/src/mame/drivers/tceptor.cpp @@ -27,12 +27,12 @@ /*******************************************************************/ -READ8_MEMBER(tceptor_state::m68k_shared_r) +uint8_t tceptor_state::m68k_shared_r(offs_t offset) { return m_m68k_shared_ram[offset]; } -WRITE8_MEMBER(tceptor_state::m68k_shared_w) +void tceptor_state::m68k_shared_w(offs_t offset, uint8_t data) { m_m68k_shared_ram[offset] = data; } @@ -40,29 +40,29 @@ WRITE8_MEMBER(tceptor_state::m68k_shared_w) /*******************************************************************/ -WRITE8_MEMBER(tceptor_state::m6809_irq_enable_w) +void tceptor_state::m6809_irq_enable_w(uint8_t data) { m_m6809_irq_enable = 1; } -WRITE8_MEMBER(tceptor_state::m6809_irq_disable_w) +void tceptor_state::m6809_irq_disable_w(uint8_t data) { m_m6809_irq_enable = 0; } -WRITE16_MEMBER(tceptor_state::m68k_irq_enable_w) +void tceptor_state::m68k_irq_enable_w(uint16_t data) { m_m68k_irq_enable = data; } -WRITE8_MEMBER(tceptor_state::mcu_irq_enable_w) +void tceptor_state::mcu_irq_enable_w(uint8_t data) { m_mcu_irq_enable = 1; } -WRITE8_MEMBER(tceptor_state::mcu_irq_disable_w) +void tceptor_state::mcu_irq_disable_w(uint8_t data) { m_mcu_irq_enable = 0; } @@ -101,22 +101,22 @@ uint8_t tceptor_state::fix_input1(uint8_t in1, uint8_t in2) return r; } -READ8_MEMBER(tceptor_state::dsw0_r) +uint8_t tceptor_state::dsw0_r() { return fix_input0(ioport("DSW1")->read(), ioport("DSW2")->read()); } -READ8_MEMBER(tceptor_state::dsw1_r) +uint8_t tceptor_state::dsw1_r() { return fix_input1(ioport("DSW1")->read(), ioport("DSW2")->read()); } -READ8_MEMBER(tceptor_state::input0_r) +uint8_t tceptor_state::input0_r() { return fix_input0(ioport("BUTTONS")->read(), ioport("SERVICE")->read()); } -READ8_MEMBER(tceptor_state::input1_r) +uint8_t tceptor_state::input1_r() { return fix_input1(ioport("BUTTONS")->read(), ioport("SERVICE")->read()); } diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index a57544fdd68..d6862e336ed 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -108,18 +108,18 @@ #include "softlist.h" -READ8_MEMBER( tdv2324_state::tdv2324_main_io_30 ) +uint8_t tdv2324_state::tdv2324_main_io_30() { return 0xff; } // Not sure what this is for, i/o read at 0xE6 on maincpu, post fails if it does not return bit 4 set -READ8_MEMBER( tdv2324_state::tdv2324_main_io_e6 ) +uint8_t tdv2324_state::tdv2324_main_io_e6() { return 0x10; // TODO: this should actually return something meaningful, for now is enough to pass early boot test } -WRITE8_MEMBER( tdv2324_state::tdv2324_main_io_e2 ) +void tdv2324_state::tdv2324_main_io_e2(uint8_t data) { printf("%c\n", data); } diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index 9c8029bdc27..ea82c85c471 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -67,23 +67,23 @@ f80b ???? #include "speaker.h" -WRITE8_MEMBER(tecmo_state::bankswitch_w) +void tecmo_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data >> 3); } -WRITE8_MEMBER(tecmo_state::adpcm_start_w) +void tecmo_state::adpcm_start_w(uint8_t data) { m_adpcm_pos = data << 8; m_msm->reset_w(0); } -WRITE8_MEMBER(tecmo_state::adpcm_end_w) +void tecmo_state::adpcm_end_w(uint8_t data) { m_adpcm_end = (data + 1) << 8; } -WRITE8_MEMBER(tecmo_state::adpcm_vol_w) +void tecmo_state::adpcm_vol_w(uint8_t data) { m_msm->set_output_gain(ALL_OUTPUTS, (data & 15) / 15.0); } @@ -106,28 +106,28 @@ WRITE_LINE_MEMBER(tecmo_state::adpcm_int) } /* the 8-bit dipswitches are split across addresses */ -READ8_MEMBER(tecmo_state::dswa_l_r) +uint8_t tecmo_state::dswa_l_r() { uint8_t port = ioport("DSWA")->read(); port &= 0x0f; return port; } -READ8_MEMBER(tecmo_state::dswa_h_r) +uint8_t tecmo_state::dswa_h_r() { uint8_t port = ioport("DSWA")->read(); port &= 0xf0; return port>>4; } -READ8_MEMBER(tecmo_state::dswb_l_r) +uint8_t tecmo_state::dswb_l_r() { uint8_t port = ioport("DSWB")->read(); port &= 0x0f; return port; } -READ8_MEMBER(tecmo_state::dswb_h_r) +uint8_t tecmo_state::dswb_h_r() { uint8_t port = ioport("DSWB")->read(); port &= 0xf0; diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp index d11f8d0590b..58442dc95d2 100644 --- a/src/mame/drivers/tecmosys.cpp +++ b/src/mame/drivers/tecmosys.cpp @@ -197,12 +197,12 @@ ae500w07.ad1 - M6295 Samples (23c4001) #include "speaker.h" -READ8_MEMBER(tecmosys_state::sound_command_pending_r) +u8 tecmosys_state::sound_command_pending_r() { return m_soundlatch->pending_r(); } -WRITE8_MEMBER(tecmosys_state::sound_nmi_disable_w) +void tecmosys_state::sound_nmi_disable_w(u8 data) { // 00 and FF are the only values written here; the latter value is set during initialization and NMI processing m_soundnmi->in_w<1>(data == 0); @@ -217,7 +217,7 @@ WRITE8_MEMBER(tecmosys_state::sound_nmi_disable_w) - 880000 & 03, crash */ -WRITE16_MEMBER(tecmosys_state::unk880000_w) +void tecmosys_state::unk880000_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_880000regs[offset]); @@ -244,7 +244,7 @@ WRITE16_MEMBER(tecmosys_state::unk880000_w) } } -READ16_MEMBER(tecmosys_state::unk880000_r) +u16 tecmosys_state::unk880000_r(offs_t offset) { //u16 ret = m_880000regs[offset]; @@ -262,12 +262,12 @@ READ16_MEMBER(tecmosys_state::unk880000_r) } } -READ16_MEMBER(tecmosys_state::eeprom_r) +u16 tecmosys_state::eeprom_r() { return ((m_eeprom->do_read() & 0x01) << 11); } -WRITE16_MEMBER(tecmosys_state::eeprom_w) +void tecmosys_state::eeprom_w(offs_t offset, u16 data, u16 mem_mask) { if ( ACCESSING_BITS_8_15 ) { @@ -278,14 +278,14 @@ WRITE16_MEMBER(tecmosys_state::eeprom_w) } template<int Layer> -WRITE16_MEMBER(tecmosys_state::vram_w) +void tecmosys_state::vram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vram[Layer][offset]); m_tilemap[Layer]->mark_tile_dirty(offset/2); } template<int Layer> -WRITE16_MEMBER(tecmosys_state::lineram_w) +void tecmosys_state::lineram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_lineram[Layer][offset]); if (data!=0x0000) popmessage("non 0 write to bg%01x lineram %04x %04x",Layer,offset,data); @@ -332,12 +332,12 @@ void tecmosys_state::main_map(address_map &map) } -WRITE8_MEMBER(tecmosys_state::z80_bank_w) +void tecmosys_state::z80_bank_w(u8 data) { m_audiobank->set_entry(data); } -WRITE8_MEMBER(tecmosys_state::oki_bank_w) +void tecmosys_state::oki_bank_w(u8 data) { m_okibank[0]->set_entry((data & 0x03) >> 0); m_okibank[1]->set_entry((data & 0x30) >> 4); diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index 2968742ee75..ec2bfcd8f34 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -112,7 +112,7 @@ void tehkanwc_state::machine_start() m_digits.resolve(); } -WRITE8_MEMBER(tehkanwc_state::sub_cpu_halt_w) +void tehkanwc_state::sub_cpu_halt_w(uint8_t data) { if (data) m_subcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); @@ -121,7 +121,7 @@ WRITE8_MEMBER(tehkanwc_state::sub_cpu_halt_w) } -READ8_MEMBER(tehkanwc_state::track_0_r) +uint8_t tehkanwc_state::track_0_r(offs_t offset) { int joy; @@ -131,7 +131,7 @@ READ8_MEMBER(tehkanwc_state::track_0_r) return ioport(offset ? "P1Y" : "P1X")->read() - m_track0[offset]; } -READ8_MEMBER(tehkanwc_state::track_1_r) +uint8_t tehkanwc_state::track_1_r(offs_t offset) { int joy; @@ -141,13 +141,13 @@ READ8_MEMBER(tehkanwc_state::track_1_r) return ioport(offset ? "P2Y" : "P2X")->read() - m_track1[offset]; } -WRITE8_MEMBER(tehkanwc_state::track_0_reset_w) +void tehkanwc_state::track_0_reset_w(offs_t offset, uint8_t data) { /* reset the trackball counters */ m_track0[offset] = ioport(offset ? "P1Y" : "P1X")->read() + data; } -WRITE8_MEMBER(tehkanwc_state::track_1_reset_w) +void tehkanwc_state::track_1_reset_w(offs_t offset, uint8_t data) { /* reset the trackball counters */ m_track1[offset] = ioport(offset ? "P2Y" : "P2X")->read() + data; @@ -155,7 +155,7 @@ WRITE8_MEMBER(tehkanwc_state::track_1_reset_w) -WRITE8_MEMBER(tehkanwc_state::sound_command_w) +void tehkanwc_state::sound_command_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -173,7 +173,7 @@ void tehkanwc_state::device_timer(emu_timer &timer, device_timer_id id, int para } } -WRITE8_MEMBER(tehkanwc_state::sound_answer_w) +void tehkanwc_state::sound_answer_w(uint8_t data) { m_soundlatch2->write(data); diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index f823c04a8ce..9d2d3f6d87e 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -93,12 +93,12 @@ AT-2 #include "speaker.h" -WRITE16_MEMBER(terracre_state::amazon_sound_w) +void terracre_state::amazon_sound_w(uint16_t data) { m_soundlatch->write(((data & 0x7f) << 1) | 1); } -READ8_MEMBER(terracre_state::soundlatch_clear_r) +uint8_t terracre_state::soundlatch_clear_r() { m_soundlatch->clear_w(); return 0; diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index be4ccfe5765..73cf88abcb7 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -73,7 +73,7 @@ stepstag: ***************************************************************************/ -WRITE16_MEMBER(tetrisp2_state::tetrisp2_systemregs_w) +void tetrisp2_state::tetrisp2_systemregs_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { @@ -83,7 +83,7 @@ WRITE16_MEMBER(tetrisp2_state::tetrisp2_systemregs_w) #define ROCKN_TIMER_BASE attotime::from_nsec(500000) -WRITE16_MEMBER(tetrisp2_state::rockn_systemregs_w) +void tetrisp2_state::rockn_systemregs_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { @@ -97,7 +97,7 @@ WRITE16_MEMBER(tetrisp2_state::rockn_systemregs_w) } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub_systemregs_w) +void tetrisp2_state::rocknms_sub_systemregs_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { @@ -119,12 +119,12 @@ WRITE16_MEMBER(tetrisp2_state::rocknms_sub_systemregs_w) ***************************************************************************/ -READ16_MEMBER(tetrisp2_state::rockn_adpcmbank_r) +u16 tetrisp2_state::rockn_adpcmbank_r() { return ((m_rockn_adpcmbank & 0xf0ff) | (m_rockn_protectdata << 8)); } -WRITE16_MEMBER(tetrisp2_state::rockn_adpcmbank_w) +void tetrisp2_state::rockn_adpcmbank_w(u16 data) { u8 *SNDROM = memregion("ymz")->base(); int bank; @@ -141,7 +141,7 @@ WRITE16_MEMBER(tetrisp2_state::rockn_adpcmbank_w) memcpy(&SNDROM[0x0400000], &SNDROM[0x1000000 + (0x0c00000 * bank)], 0x0c00000); } -WRITE16_MEMBER(tetrisp2_state::rockn2_adpcmbank_w) +void tetrisp2_state::rockn2_adpcmbank_w(u16 data) { u8 *SNDROM = memregion("ymz")->base(); int bank; @@ -174,18 +174,18 @@ WRITE16_MEMBER(tetrisp2_state::rockn2_adpcmbank_w) } -READ16_MEMBER(tetrisp2_state::rockn_soundvolume_r) +u16 tetrisp2_state::rockn_soundvolume_r() { return 0xffff; } -WRITE16_MEMBER(tetrisp2_state::rockn_soundvolume_w) +void tetrisp2_state::rockn_soundvolume_w(u16 data) { m_rockn_soundvolume = data; } -WRITE16_MEMBER(tetrisp2_state::nndmseal_sound_bank_w) +void tetrisp2_state::nndmseal_sound_bank_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { @@ -218,7 +218,7 @@ WRITE16_MEMBER(tetrisp2_state::nndmseal_sound_bank_w) ***************************************************************************/ -READ16_MEMBER(tetrisp2_state::tetrisp2_ip_1_word_r) +u16 tetrisp2_state::tetrisp2_ip_1_word_r() { return ( ioport("SYSTEM")->read() & 0xfcff ) | ( machine().rand() & ~0xfcff ) | @@ -237,18 +237,18 @@ READ16_MEMBER(tetrisp2_state::tetrisp2_ip_1_word_r) /* The game only ever writes even bytes and reads odd bytes */ -READ16_MEMBER(tetrisp2_state::tetrisp2_nvram_r) +u16 tetrisp2_state::tetrisp2_nvram_r(offs_t offset) { return ( (m_nvram[offset] >> 8) & 0x00ff ) | ( (m_nvram[offset] << 8) & 0xff00 ) ; } -WRITE16_MEMBER(tetrisp2_state::tetrisp2_nvram_w) +void tetrisp2_state::tetrisp2_nvram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_nvram[offset]); } -READ16_MEMBER(tetrisp2_state::rockn_nvram_r) +u16 tetrisp2_state::rockn_nvram_r(offs_t offset) { return m_nvram[offset]; } @@ -263,12 +263,12 @@ READ16_MEMBER(tetrisp2_state::rockn_nvram_r) ***************************************************************************/ -READ16_MEMBER(tetrisp2_state::rocknms_main2sub_r) +u16 tetrisp2_state::rocknms_main2sub_r() { return m_rocknms_main2sub; } -WRITE16_MEMBER(tetrisp2_state::rocknms_main2sub_w) +void tetrisp2_state::rocknms_main2sub_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) m_rocknms_main2sub = (data ^ 0xffff); @@ -279,14 +279,14 @@ CUSTOM_INPUT_MEMBER(tetrisp2_state::rocknms_main2sub_status_r) return m_rocknms_sub2main & 0x0003; } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub2main_w) +void tetrisp2_state::rocknms_sub2main_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) m_rocknms_sub2main = (data ^ 0xffff); } -WRITE16_MEMBER(tetrisp2_state::tetrisp2_coincounter_w) +void tetrisp2_state::tetrisp2_coincounter_w(u16 data) { machine().bookkeeping().coin_counter_w(0, (data & 0x0001)); } @@ -333,7 +333,7 @@ void tetrisp2_state::tetrisp2_map(address_map &map) } -WRITE16_MEMBER(tetrisp2_state::nndmseal_coincounter_w) +void tetrisp2_state::nndmseal_coincounter_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { @@ -351,7 +351,7 @@ WRITE16_MEMBER(tetrisp2_state::nndmseal_coincounter_w) // popmessage("%04x",data); } -WRITE16_MEMBER(tetrisp2_state::nndmseal_b20000_w) +void tetrisp2_state::nndmseal_b20000_w(u16 data) { // leds? // popmessage("%04x",data); @@ -538,14 +538,14 @@ void tetrisp2_state::rocknms_sub_map(address_map &map) ***************************************************************************/ -READ16_MEMBER(stepstag_state::stepstag_coins_r) +u16 stepstag_state::stepstag_coins_r() { // bits 8 & 9? return ( ioport("COINS")->read() & 0xfcff ) | ( vj_upload_fini ? 0x300 : 0x100 ); } -WRITE16_MEMBER( stepstag_state::stepstag_b20000_w ) +void stepstag_state::stepstag_b20000_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) vj_upload_idx++; @@ -554,33 +554,33 @@ WRITE16_MEMBER( stepstag_state::stepstag_b20000_w ) vj_upload_fini = true; } -WRITE16_MEMBER( stepstag_state::stepstag_b00000_w ) +void stepstag_state::stepstag_b00000_w(u16 data) { vj_upload_idx = 0; vj_upload_fini = false; } -WRITE16_MEMBER( stepstag_state::stepstag_main2pc_w ) +void stepstag_state::stepstag_main2pc_w(u16 data) { popmessage("cmd @ pc: 0x%x\n", data); } -READ16_MEMBER(stepstag_state::unknown_read_0xc00000) +u16 stepstag_state::unknown_read_0xc00000() { return machine().rand(); // 3 } -READ16_MEMBER(stepstag_state::unknown_read_0xffff00) +u16 stepstag_state::unknown_read_0xffff00() { return machine().rand(); } -READ16_MEMBER(stepstag_state::stepstag_pc2main_r) +u16 stepstag_state::stepstag_pc2main_r() { return ioport("DEBUG_DSW")->read(); } -WRITE16_MEMBER(stepstag_state::stepstag_soundlatch_word_w) +void stepstag_state::stepstag_soundlatch_word_w(u16 data) { m_soundlatch->write(data); @@ -590,7 +590,7 @@ WRITE16_MEMBER(stepstag_state::stepstag_soundlatch_word_w) } -WRITE16_MEMBER(stepstag_state::stepstag_neon_w) +void stepstag_state::stepstag_neon_w(offs_t offset, u16 data, u16 mem_mask) { // 1f60, 1c60, 0790, 0490, 0b60, 0860, 1390, 1090, 1f60, 1c60, 1390, 1090, 0b60, 0860, 0790, 0490, ... if (ACCESSING_BITS_0_7) @@ -612,7 +612,7 @@ WRITE16_MEMBER(stepstag_state::stepstag_neon_w) } } -WRITE16_MEMBER(stepstag_state::stepstag_step_leds_w) +void stepstag_state::stepstag_step_leds_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { @@ -635,7 +635,7 @@ WRITE16_MEMBER(stepstag_state::stepstag_step_leds_w) } } -WRITE16_MEMBER(stepstag_state::stepstag_button_leds_w) +void stepstag_state::stepstag_button_leds_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_8_15) { diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp index e0fcb7c29cb..3888f73b184 100644 --- a/src/mame/drivers/thedeep.cpp +++ b/src/mame/drivers/thedeep.cpp @@ -50,7 +50,7 @@ NOTE: There is manual for Run Deep which is (c) 1988 by World Games. Is Cream Co ***************************************************************************/ -WRITE8_MEMBER(thedeep_state::nmi_w) +void thedeep_state::nmi_w(uint8_t data) { m_nmi_enable = data; if (!m_nmi_enable) @@ -69,19 +69,19 @@ void thedeep_state::machine_start() save_item(NAME(m_coin_result)); } -READ8_MEMBER(thedeep_state::protection_r) +uint8_t thedeep_state::protection_r() { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); return m_mcu_to_maincpu; } -WRITE8_MEMBER(thedeep_state::protection_w) +void thedeep_state::protection_w(uint8_t data) { m_maincpu_to_mcu = data; m_mcu->set_input_line(MCS51_INT0_LINE, ASSERT_LINE); } -READ8_MEMBER(thedeep_state::e004_r) +uint8_t thedeep_state::e004_r() { // 7654321- unused? // -------0 coin status from mcu ready @@ -93,7 +93,7 @@ READ8_MEMBER(thedeep_state::e004_r) return data; } -WRITE8_MEMBER(thedeep_state::e100_w) +void thedeep_state::e100_w(uint8_t data) { if (data != 1) logerror("pc %04x: e100 = %02x\n", m_maincpu->pc(),data); diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp index 22feb9f7572..bd32f1f54df 100644 --- a/src/mame/drivers/thepit.cpp +++ b/src/mame/drivers/thepit.cpp @@ -182,7 +182,7 @@ void thepit_state::machine_start() save_item(NAME(m_nmi_mask)); } -READ8_MEMBER(thepit_state::intrepid_colorram_mirror_r) +uint8_t thepit_state::intrepid_colorram_mirror_r(offs_t offset) { return m_colorram[offset]; } @@ -1323,7 +1323,7 @@ ROM_END */ -READ8_MEMBER(thepit_state::rtriv_question_r) +uint8_t thepit_state::rtriv_question_r(offs_t offset) { // Set-up the remap table for every 16 bytes if((offset & 0xc00) == 0x800) @@ -1353,7 +1353,7 @@ READ8_MEMBER(thepit_state::rtriv_question_r) void thepit_state::init_rtriv() { // Set-up the weirdest questions read ever done - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x4fff, read8_delegate(*this, FUNC(thepit_state::rtriv_question_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x4fff, read8sm_delegate(*this, FUNC(thepit_state::rtriv_question_r))); save_item(NAME(m_question_address)); save_item(NAME(m_question_rom)); diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index d1f840327a3..5f31406d781 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -78,7 +78,7 @@ void thoop2_state::machine_start() m_okibank->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } -WRITE8_MEMBER(thoop2_state::oki_bankswitch_w) +void thoop2_state::oki_bankswitch_w(uint8_t data) { m_okibank->set_entry(data & 0x0f); } @@ -103,13 +103,13 @@ WRITE_LINE_MEMBER(thoop2_state::coin2_counter_w) machine().bookkeeping().coin_counter_w(1, state); } -WRITE8_MEMBER(thoop2_state::shareram_w) +void thoop2_state::shareram_w(offs_t offset, uint8_t data) { // why isn't there address map functionality for this? reinterpret_cast<u8 *>(m_shareram.target())[BYTE_XOR_BE(offset)] = data; } -READ8_MEMBER(thoop2_state::shareram_r) +uint8_t thoop2_state::shareram_r(offs_t offset) { // why isn't there address map functionality for this? return reinterpret_cast<u8 const *>(m_shareram.target())[BYTE_XOR_BE(offset)]; diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp index c5b3bc292f4..e82d772a168 100644 --- a/src/mame/drivers/thunderj.cpp +++ b/src/mame/drivers/thunderj.cpp @@ -72,7 +72,7 @@ void thunderj_state::machine_start() * *************************************/ -READ16_MEMBER(thunderj_state::special_port2_r) +uint16_t thunderj_state::special_port2_r() { int result = ioport("260012")->read(); result ^= 0x0010; @@ -80,7 +80,7 @@ READ16_MEMBER(thunderj_state::special_port2_r) } -WRITE16_MEMBER(thunderj_state::latch_w) +void thunderj_state::latch_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* reset extra CPU */ if (ACCESSING_BITS_0_7) diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp index 1e4a6c3bd20..700e3b978f1 100644 --- a/src/mame/drivers/ti89.cpp +++ b/src/mame/drivers/ti89.cpp @@ -49,7 +49,7 @@ uint8_t ti68k_state::keypad_r() } -WRITE16_MEMBER ( ti68k_state::ti68k_io_w ) +void ti68k_state::ti68k_io_w(offs_t offset, uint16_t data) { switch(offset & 0x0f) { @@ -92,7 +92,7 @@ WRITE16_MEMBER ( ti68k_state::ti68k_io_w ) } -READ16_MEMBER ( ti68k_state::ti68k_io_r ) +uint16_t ti68k_state::ti68k_io_r(offs_t offset) { uint16_t data; @@ -114,7 +114,7 @@ READ16_MEMBER ( ti68k_state::ti68k_io_r ) } -WRITE16_MEMBER ( ti68k_state::ti68k_io2_w ) +void ti68k_state::ti68k_io2_w(offs_t offset, uint16_t data) { switch(offset & 0x7f) { @@ -130,7 +130,7 @@ WRITE16_MEMBER ( ti68k_state::ti68k_io2_w ) } -READ16_MEMBER ( ti68k_state::ti68k_io2_r ) +uint16_t ti68k_state::ti68k_io2_r(offs_t offset) { uint16_t data; @@ -143,7 +143,7 @@ READ16_MEMBER ( ti68k_state::ti68k_io2_r ) } -READ16_MEMBER ( ti68k_state::rom_r ) +uint16_t ti68k_state::rom_r(offs_t offset) { return m_rom_base[offset]; } @@ -464,11 +464,11 @@ void ti68k_state::machine_start() if (initial_pc > 0x400000) { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x400000, 0x5fffff, read16_delegate(*this, FUNC(ti68k_state::rom_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x400000, 0x5fffff, read16sm_delegate(*this, FUNC(ti68k_state::rom_r))); } else { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x3fffff, read16_delegate(*this, FUNC(ti68k_state::rom_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x3fffff, read16sm_delegate(*this, FUNC(ti68k_state::rom_r))); } } diff --git a/src/mame/drivers/ti990_10.cpp b/src/mame/drivers/ti990_10.cpp index 3004c668f73..9caa53f84cb 100644 --- a/src/mame/drivers/ti990_10.cpp +++ b/src/mame/drivers/ti990_10.cpp @@ -101,8 +101,8 @@ private: WRITE_LINE_MEMBER( tape_interrupt ); WRITE_LINE_MEMBER(ti990_set_int13); WRITE_LINE_MEMBER(ti990_ckon_ckof_callback); - READ8_MEMBER( ti990_panel_read ); - WRITE8_MEMBER( ti990_panel_write ); + uint8_t ti990_panel_read(offs_t offset); + void ti990_panel_write(uint8_t data); TIMER_CALLBACK_MEMBER(clear_load); @@ -230,7 +230,7 @@ WRITE_LINE_MEMBER(ti990_10_state::ti990_ckon_ckof_callback) F: flag (according to 990 handbook) */ -READ8_MEMBER( ti990_10_state::ti990_panel_read ) +uint8_t ti990_10_state::ti990_panel_read(offs_t offset) { if (offset == 1) return 0x48; @@ -238,7 +238,7 @@ READ8_MEMBER( ti990_10_state::ti990_panel_read ) return 0; } -WRITE8_MEMBER( ti990_10_state::ti990_panel_write ) +void ti990_10_state::ti990_panel_write(uint8_t data) { } diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index 3ef5c87a85e..aac302ba266 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -135,8 +135,7 @@ void tiamc1_state::machine_reset() { - address_space &space = m_maincpu->space(AS_PROGRAM); - tiamc1_bankswitch_w(space, 0, 0); + tiamc1_bankswitch_w(0); } void tiamc1_state::tiamc1_control_w(uint8_t data) diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index ef14b999775..428da5cfd63 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -58,14 +58,14 @@ single plane board. -WRITE16_MEMBER(tigeroad_state::tigeroad_soundcmd_w) +void tigeroad_state::tigeroad_soundcmd_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_8_15) m_soundlatch->write(data >> 8); } -WRITE8_MEMBER(tigeroad_state::msm5205_w) +void tigeroad_state::msm5205_w(uint8_t data) { m_msm->reset_w(BIT(data, 7)); m_msm->data_w(data); @@ -92,7 +92,7 @@ void f1dream_state::out3_w(uint8_t data) m_old_p3 = data; } -WRITE16_MEMBER(f1dream_state::blktiger_to_mcu_w) +void f1dream_state::blktiger_to_mcu_w(uint16_t data) { m_mcu->set_input_line(MCS51_INT0_LINE, HOLD_LINE); @@ -123,13 +123,13 @@ void tigeroad_state::main_map(address_map &map) } -READ8_MEMBER(f1dream_state::mcu_shared_r) +uint8_t f1dream_state::mcu_shared_r(offs_t offset) { uint8_t ret = m_ram16[(0x3fe0 / 2) + offset]; return ret; } -WRITE8_MEMBER(f1dream_state::mcu_shared_w) +void f1dream_state::mcu_shared_w(offs_t offset, uint8_t data) { m_ram16[(0x3fe0 / 2) + offset] = (m_ram16[(0x3fe0 / 2) + offset] & 0xff00) | data; } diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index 122063589ed..9ddd46b6df3 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -92,14 +92,14 @@ void tiki100_state::mrq_w(offs_t offset, uint8_t data) m_exp->mrq_w(offset, data); } -READ8_MEMBER( tiki100_state::iorq_r ) +uint8_t tiki100_state::iorq_r(offs_t offset) { uint8_t data = m_exp->iorq_r(offset, 0xff); switch ((offset & 0xff) >> 2) { case 0x00: // KEYS - data = keyboard_r(space, 0); + data = keyboard_r(); break; case 0x01: // SERS @@ -131,14 +131,14 @@ READ8_MEMBER( tiki100_state::iorq_r ) return data; } -WRITE8_MEMBER( tiki100_state::iorq_w ) +void tiki100_state::iorq_w(offs_t offset, uint8_t data) { m_exp->iorq_w(offset, data); switch ((offset & 0xff) >> 2) { case 0x00: // KEYS - keyboard_w(space, 0, data); + keyboard_w(data); break; case 0x01: // SERS @@ -150,7 +150,7 @@ WRITE8_MEMBER( tiki100_state::iorq_w ) break; case 0x03: // VIPB - video_mode_w(space, 0, data); + video_mode_w(data); break; case 0x04: // FLOP @@ -161,7 +161,7 @@ WRITE8_MEMBER( tiki100_state::iorq_w ) switch (offset & 0x03) { case 0: case 1: - palette_w(space, 0, data); + palette_w(data); break; case 2: @@ -179,14 +179,14 @@ WRITE8_MEMBER( tiki100_state::iorq_w ) break; case 0x07: // SYL - system_w(space, 0, data); + system_w(data); break; } } /* Read/Write Handlers */ -READ8_MEMBER( tiki100_state::keyboard_r ) +uint8_t tiki100_state::keyboard_r() { uint8_t data = 0xff; @@ -201,12 +201,12 @@ READ8_MEMBER( tiki100_state::keyboard_r ) return data; } -WRITE8_MEMBER( tiki100_state::keyboard_w ) +void tiki100_state::keyboard_w(uint8_t data) { m_keylatch = 0; } -WRITE8_MEMBER( tiki100_state::video_mode_w ) +void tiki100_state::video_mode_w(uint8_t data) { /* @@ -226,7 +226,7 @@ WRITE8_MEMBER( tiki100_state::video_mode_w ) m_mode = data; } -WRITE8_MEMBER( tiki100_state::palette_w ) +void tiki100_state::palette_w(uint8_t data) { /* @@ -246,7 +246,7 @@ WRITE8_MEMBER( tiki100_state::palette_w ) m_palette_val = data; } -WRITE8_MEMBER( tiki100_state::system_w ) +void tiki100_state::system_w(uint8_t data) { /* @@ -699,9 +699,7 @@ void tiki100_state::machine_start() void tiki100_state::machine_reset() { - address_space &space = m_maincpu->space(AS_PROGRAM); - - system_w(space, 0, 0); + system_w(0); m_st = m_st_io->read(); } diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index 2a9e3ef9709..ffc5ac5a2b8 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -96,7 +96,7 @@ WRITE_LINE_MEMBER(timeplt_state::coin_counter_2_w) machine().bookkeeping().coin_counter_w(1, state); } -READ8_MEMBER(timeplt_state::psurge_protection_r) +uint8_t timeplt_state::psurge_protection_r() { return 0x80; } diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index 23d02d5059f..5c6c94d7344 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -165,23 +165,23 @@ http://www.z88forever.org.uk/zxplus3e/ /* TS2048 specific functions */ -READ8_MEMBER( timex_state::ts2068_port_f4_r ) +uint8_t timex_state::ts2068_port_f4_r() { return m_port_f4_data; } -WRITE8_MEMBER( timex_state::ts2068_port_f4_w ) +void timex_state::ts2068_port_f4_w(uint8_t data) { m_port_f4_data = data; ts2068_update_memory(); } -READ8_MEMBER( timex_state::ts2068_port_ff_r ) +uint8_t timex_state::ts2068_port_ff_r() { return m_port_ff_data; } -WRITE8_MEMBER( timex_state::ts2068_port_ff_w ) +void timex_state::ts2068_port_ff_w(offs_t offset, uint8_t data) { /* Bits 0-2 Video Mode Select Bits 3-5 64 column mode ink/paper selection @@ -565,7 +565,7 @@ MACHINE_RESET_MEMBER(timex_state,ts2068) /* TC2048 specific functions */ -WRITE8_MEMBER( timex_state::tc2048_port_ff_w ) +void timex_state::tc2048_port_ff_w(offs_t offset, uint8_t data) { m_port_ff_data = data; logerror("Port %04x write %02x\n", offset, data); diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index 4272e2372c6..ed0209da6e6 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -187,17 +187,17 @@ Demo tape contents: /* Read/Write Handlers */ -WRITE8_MEMBER( tmc1800_state::keylatch_w ) +void tmc1800_state::keylatch_w(uint8_t data) { m_keylatch = data; } -WRITE8_MEMBER( osc1000b_state::keylatch_w ) +void osc1000b_state::keylatch_w(uint8_t data) { m_keylatch = data; } -WRITE8_MEMBER( tmc2000_state::keylatch_w ) +void tmc2000_state::keylatch_w(uint8_t data) { /* @@ -217,7 +217,7 @@ WRITE8_MEMBER( tmc2000_state::keylatch_w ) m_keylatch = data & 0x3f; } -WRITE8_MEMBER( nano_state::keylatch_w ) +void nano_state::keylatch_w(uint8_t data) { /* @@ -280,7 +280,7 @@ void tmc2000_state::bankswitch() } } -WRITE8_MEMBER( tmc2000_state::bankswitch_w ) +void tmc2000_state::bankswitch_w(uint8_t data) { m_roc = 0; m_rac = BIT(data, 0); @@ -289,7 +289,7 @@ WRITE8_MEMBER( tmc2000_state::bankswitch_w ) m_cti->tone_latch_w(data); } -WRITE8_MEMBER( nano_state::bankswitch_w ) +void nano_state::bankswitch_w(uint8_t data) { /* enable RAM */ address_space &program = m_maincpu->space(AS_PROGRAM); @@ -300,7 +300,7 @@ WRITE8_MEMBER( nano_state::bankswitch_w ) m_cti->tone_latch_w(data); } -READ8_MEMBER( tmc1800_state::dispon_r ) +uint8_t tmc1800_state::dispon_r() { m_vdc->disp_on_w(1); m_vdc->disp_on_w(0); @@ -308,7 +308,7 @@ READ8_MEMBER( tmc1800_state::dispon_r ) return 0xff; } -WRITE8_MEMBER( tmc1800_state::dispoff_w ) +void tmc1800_state::dispoff_w(uint8_t data) { m_vdc->disp_off_w(1); m_vdc->disp_off_w(0); diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp index eb728f9b7c0..3cf5ea4cb9f 100644 --- a/src/mame/drivers/tmc2000e.cpp +++ b/src/mame/drivers/tmc2000e.cpp @@ -40,43 +40,43 @@ /* Read/Write Handlers */ -READ8_MEMBER( tmc2000e_state::vismac_r ) +uint8_t tmc2000e_state::vismac_r() { return 0; } -WRITE8_MEMBER( tmc2000e_state::vismac_w ) +void tmc2000e_state::vismac_w(uint8_t data) { } -READ8_MEMBER( tmc2000e_state::floppy_r ) +uint8_t tmc2000e_state::floppy_r() { return 0; } -WRITE8_MEMBER( tmc2000e_state::floppy_w ) +void tmc2000e_state::floppy_w(uint8_t data) { } -READ8_MEMBER( tmc2000e_state::ascii_keyboard_r ) +uint8_t tmc2000e_state::ascii_keyboard_r() { return 0; } -READ8_MEMBER( tmc2000e_state::io_r ) +uint8_t tmc2000e_state::io_r() { return 0; } -WRITE8_MEMBER( tmc2000e_state::io_w ) +void tmc2000e_state::io_w(uint8_t data) { } -WRITE8_MEMBER( tmc2000e_state::io_select_w ) +void tmc2000e_state::io_select_w(uint8_t data) { } -WRITE8_MEMBER( tmc2000e_state::keyboard_latch_w ) +void tmc2000e_state::keyboard_latch_w(uint8_t data) { m_keylatch = data; } diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp index 791203fbb6f..26d727321e7 100644 --- a/src/mame/drivers/tmc600.cpp +++ b/src/mame/drivers/tmc600.cpp @@ -97,7 +97,7 @@ Notes: #include "emu.h" #include "includes/tmc600.h" -READ8_MEMBER( tmc600_state::rtc_r ) +uint8_t tmc600_state::rtc_r() { m_rtc_int = m_vismac_reg_latch >> 3; diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index b788d31fd47..af60fb44859 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -76,7 +76,7 @@ Updates: #include "speaker.h" -READ16_MEMBER(tmnt_state::k052109_word_noA12_r) +uint16_t tmnt_state::k052109_word_noA12_r(offs_t offset) { /* some games have the A12 line not connected, so the chip spans */ /* twice the memory range, with mirroring */ @@ -84,7 +84,7 @@ READ16_MEMBER(tmnt_state::k052109_word_noA12_r) return m_k052109->word_r(offset); } -WRITE16_MEMBER(tmnt_state::k052109_word_noA12_w) +void tmnt_state::k052109_word_noA12_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* some games have the A12 line not connected, so the chip spans */ /* twice the memory range, with mirroring */ @@ -92,7 +92,7 @@ WRITE16_MEMBER(tmnt_state::k052109_word_noA12_w) m_k052109->word_w(offset, data, mem_mask); } -WRITE16_MEMBER(tmnt_state::punkshot_k052109_word_w) +void tmnt_state::punkshot_k052109_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* it seems that a word write is supposed to affect only the MSB. The */ /* "ROUND 1" text in punkshtj goes lost otherwise. */ @@ -102,19 +102,19 @@ WRITE16_MEMBER(tmnt_state::punkshot_k052109_word_w) m_k052109->write(offset + 0x2000, data & 0xff); } -WRITE16_MEMBER(tmnt_state::punkshot_k052109_word_noA12_w) +void tmnt_state::punkshot_k052109_word_noA12_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* some games have the A12 line not connected, so the chip spans */ /* twice the memory range, with mirroring */ offset = ((offset & 0x3000) >> 1) | (offset & 0x07ff); - punkshot_k052109_word_w(space, offset, data, mem_mask); + punkshot_k052109_word_w(offset, data, mem_mask); } /* the interface with the 053245 is weird. The chip can address only 0x800 bytes */ /* of RAM, but they put 0x4000 there. The CPU can access them all. Address lines */ /* A1, A5 and A6 don't go to the 053245. */ -READ16_MEMBER(tmnt_state::k053245_scattered_word_r) +uint16_t tmnt_state::k053245_scattered_word_r(offs_t offset) { if (offset & 0x0031) return m_spriteram[offset]; @@ -125,7 +125,7 @@ READ16_MEMBER(tmnt_state::k053245_scattered_word_r) } } -WRITE16_MEMBER(tmnt_state::k053245_scattered_word_w) +void tmnt_state::k053245_scattered_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(m_spriteram + offset); @@ -136,14 +136,14 @@ WRITE16_MEMBER(tmnt_state::k053245_scattered_word_w) } } -READ16_MEMBER(tmnt_state::k053244_word_noA1_r) +uint16_t tmnt_state::k053244_word_noA1_r(offs_t offset) { offset &= ~1; /* handle mirror address */ return m_k053245->k053244_r(offset + 1) | (m_k053245->k053244_r(offset) << 8); } -WRITE16_MEMBER(tmnt_state::k053244_word_noA1_w) +void tmnt_state::k053244_word_noA1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { offset &= ~1; /* handle mirror address */ @@ -174,7 +174,7 @@ INTERRUPT_GEN_MEMBER(tmnt_state::lgtnfght_interrupt) device.execute().set_input_line(M68K_IRQ_5, HOLD_LINE); } -WRITE8_MEMBER(glfgreat_state::glfgreat_sound_w) +void glfgreat_state::glfgreat_sound_w(offs_t offset, uint8_t data) { m_k053260->main_write(offset, data); @@ -183,23 +183,23 @@ WRITE8_MEMBER(glfgreat_state::glfgreat_sound_w) } -WRITE16_MEMBER(prmrsocr_state::prmrsocr_sound_irq_w) +void prmrsocr_state::prmrsocr_sound_irq_w(uint16_t data) { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -WRITE8_MEMBER(prmrsocr_state::prmrsocr_audio_bankswitch_w) +void prmrsocr_state::prmrsocr_audio_bankswitch_w(uint8_t data) { membank("bank1")->set_entry(data & 7); } -READ8_MEMBER(tmnt_state::tmnt_sres_r) +uint8_t tmnt_state::tmnt_sres_r() { return m_tmnt_soundlatch; } -WRITE8_MEMBER(tmnt_state::tmnt_sres_w) +void tmnt_state::tmnt_sres_w(uint8_t data) { /* bit 1 resets the UPD7795C sound chip */ m_upd7759->reset_w(data & 2); @@ -215,12 +215,12 @@ WRITE8_MEMBER(tmnt_state::tmnt_sres_w) m_tmnt_soundlatch = data; } -WRITE8_MEMBER(tmnt_state::tmnt_upd_start_w) +void tmnt_state::tmnt_upd_start_w(uint8_t data) { m_upd7759->start_w(data & 1); } -READ8_MEMBER(tmnt_state::tmnt_upd_busy_r) +uint8_t tmnt_state::tmnt_upd_busy_r() { return m_upd7759->busy_r() ? 1 : 0; } @@ -277,7 +277,7 @@ void tmnt_state::device_timer(emu_timer &timer, device_timer_id id, int param, v } } -WRITE8_MEMBER(tmnt_state::sound_arm_nmi_w) +void tmnt_state::sound_arm_nmi_w(uint8_t data) { // sound_nmi_enabled = 1; m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); @@ -285,7 +285,7 @@ WRITE8_MEMBER(tmnt_state::sound_arm_nmi_w) } -READ16_MEMBER(tmnt_state::punkshot_kludge_r) +uint16_t tmnt_state::punkshot_kludge_r() { /* I don't know what's going on here; at one point, the code reads location */ /* 0xffffff, and returning 0 causes the game to mess up - locking up in a */ @@ -296,7 +296,7 @@ READ16_MEMBER(tmnt_state::punkshot_kludge_r) /* protection simulation derived from a bootleg */ -READ16_MEMBER(tmnt_state::ssriders_protection_r) +uint16_t tmnt_state::ssriders_protection_r(address_space &space) { int data = space.read_word(0x105a0a); int cmd = space.read_word(0x1058fc); @@ -339,7 +339,7 @@ READ16_MEMBER(tmnt_state::ssriders_protection_r) } } -WRITE16_MEMBER(tmnt_state::ssriders_protection_w) +void tmnt_state::ssriders_protection_w(address_space &space, offs_t offset, uint16_t data) { if (offset == 1) { @@ -371,7 +371,7 @@ WRITE16_MEMBER(tmnt_state::ssriders_protection_w) ***************************************************************************/ -READ16_MEMBER(tmnt_state::blswhstl_coin_r) +uint16_t tmnt_state::blswhstl_coin_r() { int res; @@ -383,7 +383,7 @@ READ16_MEMBER(tmnt_state::blswhstl_coin_r) return res ^ m_toggle; } -READ16_MEMBER(tmnt_state::ssriders_eeprom_r) +uint16_t tmnt_state::ssriders_eeprom_r() { int res; @@ -397,7 +397,7 @@ READ16_MEMBER(tmnt_state::ssriders_eeprom_r) return res ^ m_toggle; } -READ16_MEMBER(tmnt_state::sunsetbl_eeprom_r) +uint16_t tmnt_state::sunsetbl_eeprom_r() { int res; @@ -411,7 +411,7 @@ READ16_MEMBER(tmnt_state::sunsetbl_eeprom_r) return res ^ m_toggle; } -WRITE16_MEMBER(tmnt_state::blswhstl_eeprom_w) +void tmnt_state::blswhstl_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -422,7 +422,7 @@ WRITE16_MEMBER(tmnt_state::blswhstl_eeprom_w) } } -READ16_MEMBER(tmnt_state::thndrx2_eeprom_r) +uint16_t tmnt_state::thndrx2_eeprom_r() { int res; @@ -435,7 +435,7 @@ READ16_MEMBER(tmnt_state::thndrx2_eeprom_r) return (res ^ m_toggle); } -WRITE16_MEMBER(tmnt_state::thndrx2_eeprom_w) +void tmnt_state::thndrx2_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -454,11 +454,11 @@ WRITE16_MEMBER(tmnt_state::thndrx2_eeprom_w) } } -WRITE16_MEMBER(prmrsocr_state::prmrsocr_eeprom_w) +void prmrsocr_state::prmrsocr_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { - prmrsocr_122000_w(space, offset, data, mem_mask); + prmrsocr_122000_w(offset, data, mem_mask); } if (ACCESSING_BITS_8_15) @@ -470,7 +470,7 @@ WRITE16_MEMBER(prmrsocr_state::prmrsocr_eeprom_w) } } -WRITE8_MEMBER(tmnt_state::cuebrick_nvbank_w) +void tmnt_state::cuebrick_nvbank_w(uint8_t data) { membank("nvrambank")->set_entry(data); } @@ -580,7 +580,7 @@ void tmnt_state::lgtnfght_main_map(address_map &map) map(0x100000, 0x107fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); } -WRITE16_MEMBER(tmnt_state::ssriders_soundkludge_w) +void tmnt_state::ssriders_soundkludge_w(uint16_t dat) { /* I think this is more than just a trigger */ m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 @@ -607,17 +607,15 @@ void tmnt_state::blswhstl_main_map(address_map &map) map(0x780700, 0x78071f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff); } -WRITE16_MEMBER(glfgreat_state::k053251_glfgreat_w) +void glfgreat_state::k053251_glfgreat_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - int i; - if (ACCESSING_BITS_8_15) { m_k053251->write(offset, (data >> 8) & 0xff); /* FIXME: in the old code k052109 tilemaps were tilemaps 2,3,4 for k053251 and got marked as dirty in the write above... how was the original hardware working?!? */ - for (i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) { if (m_k053251->get_tmap_dirty(2 + i)) { @@ -691,7 +689,7 @@ inline uint32_t tmnt_state::tmnt2_get_word( uint32_t addr ) return 0; } -void tmnt_state::tmnt2_put_word( address_space &space, uint32_t addr, uint16_t data ) +void tmnt_state::tmnt2_put_word( uint32_t addr, uint16_t data ) { uint32_t offs; if (addr >= 0x180000 / 2 && addr <= 0x183fff / 2) @@ -708,7 +706,7 @@ void tmnt_state::tmnt2_put_word( address_space &space, uint32_t addr, uint16_t d m_sunset_104000[addr - 0x104000 / 2] = data; } -WRITE16_MEMBER(tmnt_state::tmnt2_1c0800_w) +void tmnt_state::tmnt2_1c0800_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint32_t src_addr, dst_addr, mod_addr, attr1, code, attr2, cbase, cmod, color; int xoffs, yoffs, xmod, ymod, zmod, xzoom, yzoom, i; @@ -821,14 +819,14 @@ WRITE16_MEMBER(tmnt_state::tmnt2_1c0800_w) xoffs += xmod; yoffs += ymod; - tmnt2_put_word(space, dst_addr + 0, attr1); - tmnt2_put_word(space, dst_addr + 2, code); - tmnt2_put_word(space, dst_addr + 4, (uint32_t)yoffs); - tmnt2_put_word(space, dst_addr + 6, (uint32_t)xoffs); - tmnt2_put_word(space, dst_addr + 12, attr2 | color); + tmnt2_put_word(dst_addr + 0, attr1); + tmnt2_put_word(dst_addr + 2, code); + tmnt2_put_word(dst_addr + 4, (uint32_t)yoffs); + tmnt2_put_word(dst_addr + 6, (uint32_t)xoffs); + tmnt2_put_word(dst_addr + 12, attr2 | color); } #else // for reference; do not remove -WRITE16_MEMBER(tmnt_state::tmnt2_1c0800_w) +void tmnt_state::tmnt2_1c0800_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(m_tmnt2_1c0800 + offset); if (offset == 0x0008 && (m_tmnt2_1c0800[0x8] & 0xff00) == 0x8200) diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 4e5aea77002..02a99b40ae4 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -103,13 +103,13 @@ Notes: #include "speaker.h" -WRITE16_MEMBER(toki_state::tokib_soundcommand_w) +void toki_state::tokib_soundcommand_w(uint16_t data) { m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } -READ16_MEMBER(toki_state::pip_r) +uint16_t toki_state::pip_r() { return ~0; } @@ -126,7 +126,7 @@ WRITE_LINE_MEMBER(toki_state::tokib_adpcm_int) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE8_MEMBER(toki_state::tokib_adpcm_control_w) +void toki_state::tokib_adpcm_control_w(uint8_t data) { /* the code writes either 2 or 3 in the bottom two bits */ membank("bank1")->set_entry(data & 1); @@ -134,7 +134,7 @@ WRITE8_MEMBER(toki_state::tokib_adpcm_control_w) m_msm->reset_w(data & 0x08); } -WRITE8_MEMBER(toki_state::tokib_adpcm_data_w) +void toki_state::tokib_adpcm_data_w(uint8_t data) { m_msm5205next = data; } @@ -234,7 +234,7 @@ void toki_state::jujuba_audio_opcodes_map(address_map &map) map(0x8000, 0xffff).bankr("seibu_bank1"); } -READ8_MEMBER(toki_state::jujuba_z80_data_decrypt) +uint8_t toki_state::jujuba_z80_data_decrypt(offs_t offset) { return m_audiocpu_rom[offset] ^ 0x55; } diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp index e1792e893d1..811b038cc11 100644 --- a/src/mame/drivers/toobin.cpp +++ b/src/mame/drivers/toobin.cpp @@ -59,7 +59,7 @@ void toobin_state::machine_start() * *************************************/ -WRITE16_MEMBER(toobin_state::interrupt_scan_w) +void toobin_state::interrupt_scan_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int oldword = m_interrupt_scan[offset]; int newword = oldword; diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp index 11ee5986988..c5f775d47eb 100644 --- a/src/mame/drivers/tp84.cpp +++ b/src/mame/drivers/tp84.cpp @@ -127,7 +127,7 @@ WRITE_LINE_MEMBER(tp84_state::flip_screen_y_w) } -READ8_MEMBER(tp84_state::tp84_sh_timer_r) +uint8_t tp84_state::tp84_sh_timer_r() { /* main xtal 14.318MHz, divided by 4 to get the CPU clock, further */ /* divided by 2048 to get this timer */ @@ -137,7 +137,7 @@ READ8_MEMBER(tp84_state::tp84_sh_timer_r) } -WRITE8_MEMBER(tp84_state::tp84_filter_w) +void tp84_state::tp84_filter_w(offs_t offset, uint8_t data) { int C; @@ -164,7 +164,7 @@ WRITE8_MEMBER(tp84_state::tp84_filter_w) m_filter[2]->filter_rc_set_RC(filter_rc_device::LOWPASS,1000,2200,1000,CAP_P(C)); } -WRITE8_MEMBER(tp84_state::tp84_sh_irqtrigger_w) +void tp84_state::tp84_sh_irqtrigger_w(uint8_t data) { m_audiocpu->set_input_line_and_vector(0,HOLD_LINE,0xff); // Z80 } @@ -214,7 +214,7 @@ void tp84_state::tp84b_cpu1_map(address_map &map) } -WRITE8_MEMBER(tp84_state::sub_irq_mask_w) +void tp84_state::sub_irq_mask_w(uint8_t data) { m_sub_irq_mask = data & 1; if (!m_sub_irq_mask) diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index 8823e73dde7..4fdb8089b13 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -210,7 +210,7 @@ WRITE_LINE_MEMBER(trackfld_state::coin_counter_2_w) machine().bookkeeping().coin_counter_w(1, state); } -WRITE8_MEMBER(trackfld_state::questions_bank_w) +void trackfld_state::questions_bank_w(uint8_t data) { for (int i = 0; i < 8; i++) { @@ -259,7 +259,7 @@ WRITE_LINE_MEMBER(trackfld_state::nmi_mask_w) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -READ8_MEMBER(trackfld_state::trackfld_speech_r) +uint8_t trackfld_state::trackfld_speech_r() { if (m_vlm->bsy()) return 1; @@ -267,7 +267,7 @@ READ8_MEMBER(trackfld_state::trackfld_speech_r) return 0; } -WRITE8_MEMBER(trackfld_state::trackfld_VLM5030_control_w) +void trackfld_state::trackfld_VLM5030_control_w(uint8_t data) { /* bit 0 is latch direction */ m_vlm->st((data >> 1) & 1); @@ -387,9 +387,9 @@ void trackfld_state::wizzquiz_map(address_map &map) } -READ8_MEMBER(trackfld_state::trackfld_SN76496_r) +uint8_t trackfld_state::trackfld_SN76496_r() { - konami_SN76496_w(space, 0, 0); + konami_SN76496_w(0); return 0xff; // ? } @@ -1657,7 +1657,7 @@ void trackfld_state::init_atlantol() downcast<konami1_device &>(*m_maincpu).set_encryption_boundary(0x6000); - space.install_write_handler(0x0800, 0x0800, write8_delegate(*this, FUNC(trackfld_state::atlantol_gfxbank_w))); + space.install_write_handler(0x0800, 0x0800, write8smo_delegate(*this, FUNC(trackfld_state::atlantol_gfxbank_w))); space.nop_write(0x1000, 0x1000); /* unmapped areas read as ROM */ diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp index fff5add9418..4b41aa7feb9 100644 --- a/src/mame/drivers/travrusa.cpp +++ b/src/mame/drivers/travrusa.cpp @@ -598,7 +598,7 @@ void travrusa_state::init_shtridra() rom[A] = bitswap<8>(rom[A],7,5,6,3,4,2,1,0); } -READ8_MEMBER(travrusa_state::shtridrb_port11_r) +uint8_t travrusa_state::shtridrb_port11_r() { printf("shtridrb_port11_r %04x\n", m_maincpu->pc()); // reads, masks with 0xa8, checks for 0x88, resets game if not happy with value? @@ -608,7 +608,7 @@ READ8_MEMBER(travrusa_state::shtridrb_port11_r) void travrusa_state::init_shtridrb() { - m_maincpu->space(AS_IO).install_read_handler(0x11, 0x11, 0, 0xff00, 0, read8_delegate(*this, FUNC(travrusa_state::shtridrb_port11_r))); + m_maincpu->space(AS_IO).install_read_handler(0x11, 0x11, 0, 0xff00, 0, read8smo_delegate(*this, FUNC(travrusa_state::shtridrb_port11_r))); } diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp index 2c89a9eddc1..e3762400373 100644 --- a/src/mame/drivers/triplhnt.cpp +++ b/src/mame/drivers/triplhnt.cpp @@ -54,7 +54,7 @@ WRITE_LINE_MEMBER(triplhnt_state::tape_control_w) } -READ8_MEMBER(triplhnt_state::cmos_r) +uint8_t triplhnt_state::cmos_r(offs_t offset) { m_cmos_latch = offset; @@ -62,21 +62,21 @@ READ8_MEMBER(triplhnt_state::cmos_r) } -READ8_MEMBER(triplhnt_state::input_port_4_r) +uint8_t triplhnt_state::input_port_4_r() { m_watchdog->watchdog_reset(); return ioport("0C0B")->read(); } -READ8_MEMBER(triplhnt_state::misc_r) +uint8_t triplhnt_state::misc_r(offs_t offset) { m_latch->write_a0(offset); return ioport("VBLANK")->read() | m_hit_code; } -READ8_MEMBER(triplhnt_state::da_latch_r) +uint8_t triplhnt_state::da_latch_r(offs_t offset) { int cross_x = ioport("STICKX")->read(); int cross_y = ioport("STICKY")->read(); diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index abb82e29851..2a249824e59 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -98,7 +98,7 @@ void trs80m2_state::write(offs_t offset, uint8_t data) } } -WRITE8_MEMBER( trs80m2_state::rom_enable_w ) +void trs80m2_state::rom_enable_w(uint8_t data) { /* @@ -118,7 +118,7 @@ WRITE8_MEMBER( trs80m2_state::rom_enable_w ) m_boot_rom = BIT(data, 0); } -WRITE8_MEMBER( trs80m2_state::drvslt_w ) +void trs80m2_state::drvslt_w(uint8_t data) { /* @@ -155,7 +155,7 @@ WRITE8_MEMBER( trs80m2_state::drvslt_w ) m_fdc->dden_w(!BIT(data, 7)); } -READ8_MEMBER( trs80m2_state::keyboard_r ) +uint8_t trs80m2_state::keyboard_r() { // clear keyboard interrupt if (!m_kbirq) @@ -170,7 +170,7 @@ READ8_MEMBER( trs80m2_state::keyboard_r ) return m_key_data; } -READ8_MEMBER( trs80m2_state::rtc_r ) +uint8_t trs80m2_state::rtc_r() { // clear RTC interrupt m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); @@ -178,7 +178,7 @@ READ8_MEMBER( trs80m2_state::rtc_r ) return 0; } -READ8_MEMBER( trs80m2_state::nmi_r ) +uint8_t trs80m2_state::nmi_r() { /* @@ -212,7 +212,7 @@ READ8_MEMBER( trs80m2_state::nmi_r ) return data; } -WRITE8_MEMBER( trs80m2_state::nmi_w ) +void trs80m2_state::nmi_w(uint8_t data) { /* @@ -252,17 +252,17 @@ WRITE8_MEMBER( trs80m2_state::nmi_w ) m_msel = BIT(data, 7); } -READ8_MEMBER( trs80m2_state::fdc_r ) +uint8_t trs80m2_state::fdc_r(offs_t offset) { return m_fdc->read(offset) ^ 0xff; } -WRITE8_MEMBER( trs80m2_state::fdc_w ) +void trs80m2_state::fdc_w(offs_t offset, uint8_t data) { m_fdc->write(offset, data ^ 0xff); } -WRITE8_MEMBER( trs80m16_state::tcl_w ) +void trs80m16_state::tcl_w(uint8_t data) { /* @@ -289,7 +289,7 @@ WRITE8_MEMBER( trs80m16_state::tcl_w ) m_ual = (m_ual & 0x1fe) | BIT(data, 7); } -WRITE8_MEMBER( trs80m16_state::ual_w ) +void trs80m16_state::ual_w(uint8_t data) { /* diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp index b41f03821a4..84d31497c62 100644 --- a/src/mame/drivers/trucocl.cpp +++ b/src/mame/drivers/trucocl.cpp @@ -45,7 +45,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets. // TODO: doesn't seem suited to neither irq nor nmi -WRITE8_MEMBER(trucocl_state::irq_enable_w) +void trucocl_state::irq_enable_w(uint8_t data) { m_irq_mask = (data & 1) ^ 1; } @@ -64,7 +64,7 @@ void trucocl_state::device_timer(emu_timer &timer, device_timer_id id, int param } -WRITE8_MEMBER(trucocl_state::audio_dac_w) +void trucocl_state::audio_dac_w(uint8_t data) { uint8_t *rom = memregion("maincpu")->base(); int dac_address = ( data & 0xf0 ) << 8; diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp index 99b6ba0e83d..25167d031ac 100644 --- a/src/mame/drivers/tryout.cpp +++ b/src/mame/drivers/tryout.cpp @@ -28,12 +28,12 @@ $208 strikes count #include "speaker.h" -WRITE8_MEMBER(tryout_state::nmi_ack_w) +void tryout_state::nmi_ack_w(uint8_t data) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE ); } -WRITE8_MEMBER(tryout_state::sound_w) +void tryout_state::sound_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); @@ -41,7 +41,7 @@ WRITE8_MEMBER(tryout_state::sound_w) /*this is actually irq/nmi mask, polls only four values at start up (81->01->81->01) and then stays on this state.*/ -WRITE8_MEMBER(tryout_state::sound_irq_ack_w) +void tryout_state::sound_irq_ack_w(uint8_t data) { // m_audiocpu->set_input_line(0, CLEAR_LINE); } @@ -51,7 +51,7 @@ void tryout_state::machine_start() membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x2000); } -WRITE8_MEMBER(tryout_state::bankswitch_w) +void tryout_state::bankswitch_w(uint8_t data) { membank("bank1")->set_entry(data & 0x01); } diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 2e1438a8a70..b2e29a74abe 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -85,44 +85,44 @@ WRITE_LINE_MEMBER(tsamurai_state::vblank_irq) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -READ8_MEMBER(tsamurai_state::tsamurai_unknown_d803_r) +uint8_t tsamurai_state::tsamurai_unknown_d803_r() { return 0x6b; } -READ8_MEMBER(tsamurai_state::m660_unknown_d803_r) +uint8_t tsamurai_state::m660_unknown_d803_r() { return 0x53; // this is what the bootleg patches in. } -READ8_MEMBER(tsamurai_state::unknown_d806_r) +uint8_t tsamurai_state::unknown_d806_r() { return 0x40; } -READ8_MEMBER(tsamurai_state::unknown_d900_r) +uint8_t tsamurai_state::unknown_d900_r() { return 0x6a; } -READ8_MEMBER(tsamurai_state::unknown_d938_r) +uint8_t tsamurai_state::unknown_d938_r() { return 0xfb; } -WRITE8_MEMBER(tsamurai_state::sound_command1_w) +void tsamurai_state::sound_command1_w(uint8_t data) { m_sound_command1 = data; m_audiocpu->set_input_line(0, HOLD_LINE ); } -WRITE8_MEMBER(tsamurai_state::sound_command2_w) +void tsamurai_state::sound_command2_w(uint8_t data) { m_sound_command2 = data; m_audio2->set_input_line(0, HOLD_LINE ); } -WRITE8_MEMBER(tsamurai_state::m660_sound_command3_w) +void tsamurai_state::m660_sound_command3_w(uint8_t data) { m_sound_command3 = data; m_audio3->set_input_line(0, HOLD_LINE ); @@ -227,17 +227,17 @@ void tsamurai_state::vsgongf_audio_io_map(address_map &map) map(0x00, 0x01).w("aysnd", FUNC(ay8910_device::address_data_w)); } -READ8_MEMBER(tsamurai_state::sound_command1_r) +uint8_t tsamurai_state::sound_command1_r() { return m_sound_command1; } -READ8_MEMBER(tsamurai_state::sound_command2_r) +uint8_t tsamurai_state::sound_command2_r() { return m_sound_command2; } -READ8_MEMBER(tsamurai_state::m660_sound_command3_r) +uint8_t tsamurai_state::m660_sound_command3_r() { return m_sound_command3; } @@ -304,7 +304,7 @@ void tsamurai_state::sound3_m660_io_map(address_map &map) /*******************************************************************************/ -WRITE8_MEMBER(tsamurai_state::vsgongf_sound_nmi_enable_w) +void tsamurai_state::vsgongf_sound_nmi_enable_w(uint8_t data) { m_vsgongf_sound_nmi_enabled = data; } @@ -317,7 +317,7 @@ INTERRUPT_GEN_MEMBER(tsamurai_state::vsgongf_sound_interrupt) /* what are these, protection of some kind? */ -READ8_MEMBER(tsamurai_state::vsgongf_a006_r) +uint8_t tsamurai_state::vsgongf_a006_r() { /* sound CPU busy? */ if (!strcmp(machine().system().name,"vsgongf")) return 0x80; @@ -328,7 +328,7 @@ READ8_MEMBER(tsamurai_state::vsgongf_a006_r) return 0x00; } -READ8_MEMBER(tsamurai_state::vsgongf_a100_r) +uint8_t tsamurai_state::vsgongf_a100_r() { /* protection? */ if (!strcmp(machine().system().name,"vsgongf")) return 0xaa; @@ -339,7 +339,7 @@ READ8_MEMBER(tsamurai_state::vsgongf_a100_r) return 0x00; } -WRITE8_MEMBER(tsamurai_state::vsgongf_sound_command_w) +void tsamurai_state::vsgongf_sound_command_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -1395,7 +1395,7 @@ ROM_END void tsamurai_state::init_the26thz() { m_maincpu->space(AS_PROGRAM).unmap_read(0xd803, 0xd803); - m_maincpu->space(AS_PROGRAM).install_read_handler(0xd803, 0xd803, read8_delegate(*this, FUNC(tsamurai_state::tsamurai_unknown_d803_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xd803, 0xd803, read8smo_delegate(*this, FUNC(tsamurai_state::tsamurai_unknown_d803_r))); } GAME( 1984, vsgongf, 0, vsgongf, vsgongf, tsamurai_state, empty_init, ROT90, "Kaneko", "VS Gong Fight", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp index 02384fd3bfe..3266dc4b0e2 100644 --- a/src/mame/drivers/tsispch.cpp +++ b/src/mame/drivers/tsispch.cpp @@ -152,7 +152,7 @@ WRITE_LINE_MEMBER(tsispch_state::i8251_txrdy_int) /***************************************************************************** LED/dipswitch stuff *****************************************************************************/ -READ8_MEMBER( tsispch_state::dsw_r ) +uint8_t tsispch_state::dsw_r() { /* the only dipswitch I'm really sure about is s4-7 which enables the test mode * The switches are, for normal operation on my unit (and the older unit as well): @@ -164,7 +164,7 @@ READ8_MEMBER( tsispch_state::dsw_r ) return ioport("s4")->read(); } -WRITE8_MEMBER( tsispch_state::peripheral_w ) +void tsispch_state::peripheral_w(uint8_t data) { /* This controls the four LEDS, the RESET line for the upd77p20, and (probably) the p0-to-ir0 masking of the upd77p20; there are two @@ -183,7 +183,7 @@ WRITE8_MEMBER( tsispch_state::peripheral_w ) /***************************************************************************** UPD77P20 stuff *****************************************************************************/ -READ16_MEMBER( tsispch_state::dsp_data_r ) +uint16_t tsispch_state::dsp_data_r() { #ifdef DEBUG_DSP uint8_t temp = m_dsp->snesdsp_read(true); @@ -194,7 +194,7 @@ READ16_MEMBER( tsispch_state::dsp_data_r ) #endif } -WRITE16_MEMBER( tsispch_state::dsp_data_w ) +void tsispch_state::dsp_data_w(uint16_t data) { #ifdef DEBUG_DSP_W fprintf(stderr, "dsp data write: %02x\n", data); @@ -202,7 +202,7 @@ WRITE16_MEMBER( tsispch_state::dsp_data_w ) m_dsp->snesdsp_write(true, data); } -READ16_MEMBER( tsispch_state::dsp_status_r ) +uint16_t tsispch_state::dsp_status_r() { #ifdef DEBUG_DSP uint8_t temp = m_dsp->snesdsp_read(false); @@ -213,7 +213,7 @@ READ16_MEMBER( tsispch_state::dsp_status_r ) #endif } -WRITE16_MEMBER( tsispch_state::dsp_status_w ) +void tsispch_state::dsp_status_w(uint16_t data) { fprintf(stderr, "warning: upd772x status register should never be written to!\n"); m_dsp->snesdsp_write(false, data); diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index 59378d006d5..75c2fd7d8cb 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -146,7 +146,7 @@ void tubep_state::tubep_main_map(address_map &map) } -WRITE8_MEMBER(tubep_state::main_cpu_irq_line_clear_w) +void tubep_state::main_cpu_irq_line_clear_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); LOGIRQ("CPU#0 VBLANK int clear at scanline=%3i\n", m_curr_scanline); @@ -178,7 +178,7 @@ void tubep_state::tubep_main_portmap(address_map &map) * *************************************/ -WRITE8_MEMBER(tubep_state::second_cpu_irq_line_clear_w) +void tubep_state::second_cpu_irq_line_clear_w(uint8_t data) { m_slave->set_input_line(0, CLEAR_LINE); LOGIRQ("CPU#1 VBLANK int clear at scanline=%3i\n", m_curr_scanline); @@ -206,12 +206,12 @@ void tubep_state::tubep_second_portmap(address_map &map) } -READ8_MEMBER(tubep_state::tubep_soundlatch_r) +uint8_t tubep_state::tubep_soundlatch_r() { return (m_soundlatch->pending_r() << 7) | (m_soundlatch->read() & 0x7f); } -READ8_MEMBER(tubep_state::tubep_sound_irq_ack) +uint8_t tubep_state::tubep_sound_irq_ack() { m_soundcpu->set_input_line(0, CLEAR_LINE); return 0; @@ -499,7 +499,7 @@ MACHINE_RESET_MEMBER(tubep_state,rjammer) * *************************************/ -WRITE8_MEMBER(tubep_state::rjammer_voice_startstop_w) +void tubep_state::rjammer_voice_startstop_w(uint8_t data) { /* bit 0 of data selects voice start/stop (reset pin on MSM5205)*/ // 0 -stop; 1-start @@ -509,7 +509,7 @@ WRITE8_MEMBER(tubep_state::rjammer_voice_startstop_w) } -WRITE8_MEMBER(tubep_state::rjammer_voice_frequency_select_w) +void tubep_state::rjammer_voice_frequency_select_w(uint8_t data) { /* bit 0 of data selects voice frequency on MSM5205 */ // 0 -4 KHz; 1- 8KHz @@ -537,7 +537,7 @@ WRITE_LINE_MEMBER(tubep_state::rjammer_adpcm_vck) } -WRITE8_MEMBER(tubep_state::rjammer_voice_input_w) +void tubep_state::rjammer_voice_input_w(uint8_t data) { /* 8 bits of adpcm data for MSM5205 */ /* need to buffer the data, and switch two nibbles on two following interrupts*/ @@ -554,7 +554,7 @@ WRITE8_MEMBER(tubep_state::rjammer_voice_input_w) } -WRITE8_MEMBER(tubep_state::rjammer_voice_intensity_control_w) +void tubep_state::rjammer_voice_intensity_control_w(uint8_t data) { /* 4 LSB bits select the intensity (analog circuit that alters the output from MSM5205) */ /* need to buffer the data */ diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index 04bc2354cd6..e1046c28b64 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -319,7 +319,7 @@ Stephh's notes (based on the games M68000 code and some tests) : /******************************************************************************/ -WRITE16_MEMBER(tumbleb_state::tumblepb_oki_w) +void tumbleb_state::tumblepb_oki_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (mem_mask == 0xffff) { @@ -334,14 +334,14 @@ WRITE16_MEMBER(tumbleb_state::tumblepb_oki_w) /* STUFF IN OTHER BYTE TOO..*/ } -READ16_MEMBER(tumbleb_state::tumblepb_prot_r) +uint16_t tumbleb_state::tumblepb_prot_r() { return ~0; } /******************************************************************************/ -READ16_MEMBER(tumbleb_state::tumblepopb_controls_r) +uint16_t tumbleb_state::tumblepopb_controls_r(offs_t offset) { switch (offset << 1) { @@ -607,7 +607,7 @@ void tumbleb_state::process_tumbleb2_music_command( okim6295_device *oki, int da } -WRITE16_MEMBER(tumbleb_state::tumbleb2_soundmcu_w) +void tumbleb_state::tumbleb2_soundmcu_w(uint16_t data) { int sound = tumbleb_sound_lookup[data & 0xff]; @@ -730,7 +730,7 @@ void tumbleb_state::magipur_main_map(address_map &map) } -READ16_MEMBER(tumbleb_state::semibase_unknown_r) +uint16_t tumbleb_state::semibase_unknown_r() { return machine().rand(); } @@ -756,7 +756,7 @@ void tumbleb_state::htchctch_main_map(address_map &map) -WRITE16_MEMBER(tumbleb_state::jumpkids_sound_w) +void tumbleb_state::jumpkids_sound_w(uint16_t data) { m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); @@ -838,7 +838,7 @@ void tumbleb_pic_state::driver_start() /******************************************************************************/ -WRITE16_MEMBER(tumbleb_state::semicom_soundcmd_w) +void tumbleb_state::semicom_soundcmd_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -3703,7 +3703,7 @@ void tumbleb_state::init_tumbleb2() #if TUMBLEP_HACK tumblepb_patch_code(0x000132); #endif - m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16_delegate(*this, FUNC(tumbleb_state::tumbleb2_soundmcu_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16smo_delegate(*this, FUNC(tumbleb_state::tumbleb2_soundmcu_w))); } @@ -3737,7 +3737,7 @@ void tumbleb_state::init_magipur() } -READ16_MEMBER(tumbleb_state::bcstory_1a0_read) +uint16_t tumbleb_state::bcstory_1a0_read() { //osd_printf_debug("bcstory_io %06x\n",m_maincpu->pc()); @@ -3748,7 +3748,7 @@ READ16_MEMBER(tumbleb_state::bcstory_1a0_read) void tumbleb_state::init_bcstory() { tumblepb_gfx_rearrange(1); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x180008, 0x180009, read16_delegate(*this, FUNC(tumbleb_state::bcstory_1a0_read))); // io should be here?? + m_maincpu->space(AS_PROGRAM).install_read_handler(0x180008, 0x180009, read16smo_delegate(*this, FUNC(tumbleb_state::bcstory_1a0_read))); // io should be here?? } @@ -3816,7 +3816,7 @@ void tumbleb_state::init_chokchok() m_maincpu->space(AS_PROGRAM).install_write_handler(0x140000, 0x140fff, write16s_delegate(*m_palette, FUNC(palette_device::write16))); // slightly different banking - m_maincpu->space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16_delegate(*this, FUNC(tumbleb_state::chokchok_tilebank_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16s_delegate(*this, FUNC(tumbleb_state::chokchok_tilebank_w))); } void tumbleb_state::init_carket() @@ -3824,7 +3824,7 @@ void tumbleb_state::init_carket() init_htchctch(); // slightly different banking - m_maincpu->space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16_delegate(*this, FUNC(tumbleb_state::chokchok_tilebank_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16s_delegate(*this, FUNC(tumbleb_state::chokchok_tilebank_w))); } void tumbleb_state::init_wlstar() @@ -3832,7 +3832,7 @@ void tumbleb_state::init_wlstar() tumblepb_gfx_rearrange(1); // slightly different banking - m_maincpu->space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16_delegate(*this, FUNC(tumbleb_state::wlstar_tilebank_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16smo_delegate(*this, FUNC(tumbleb_state::wlstar_tilebank_w))); m_protbase = 0x0000; } diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp index abb5de31b6b..6a9c9d31694 100644 --- a/src/mame/drivers/turbo.cpp +++ b/src/mame/drivers/turbo.cpp @@ -473,20 +473,20 @@ TIMER_CALLBACK_MEMBER(turbo_state::delayed_i8255_w) } -WRITE8_MEMBER(turbo_state::buckrog_i8255_0_w) +void turbo_state::buckrog_i8255_0_w(offs_t offset, uint8_t data) { /* the port C handshaking signals control the sub CPU IRQ, */ /* so we have to sync whenever we access this PPI */ machine().scheduler().synchronize(timer_expired_delegate(FUNC(turbo_state::delayed_i8255_w),this), ((offset & 3) << 8) | (data & 0xff)); } -READ8_MEMBER(turbo_state::spriteram_r) +uint8_t turbo_state::spriteram_r(offs_t offset) { offset = (offset & 0x07) | ((offset & 0xf0) >> 1); return m_alt_spriteram[offset]; } -WRITE8_MEMBER(turbo_state::spriteram_w) +void turbo_state::spriteram_w(offs_t offset, uint8_t data) { offset = (offset & 0x07) | ((offset & 0xf0) >> 1); m_alt_spriteram[offset] = data; diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp index 087e946aacb..3e299e6ecd1 100644 --- a/src/mame/drivers/turrett.cpp +++ b/src/mame/drivers/turrett.cpp @@ -169,13 +169,13 @@ READ_LINE_MEMBER( turrett_state::sbrc3_r ) } -READ32_MEMBER( turrett_state::int_r ) +uint32_t turrett_state::int_r() { return update_inputs() << 24; } -WRITE32_MEMBER( turrett_state::int_w ) +void turrett_state::int_w(uint32_t data) { // TODO logerror("Output write: %08x\n", data); diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp index cfde6c90b61..5485d85a965 100644 --- a/src/mame/drivers/tutankhm.cpp +++ b/src/mame/drivers/tutankhm.cpp @@ -127,7 +127,7 @@ WRITE_LINE_MEMBER(tutankhm_state::irq_enable_w) * *************************************/ -WRITE8_MEMBER(tutankhm_state::tutankhm_bankselect_w) +void tutankhm_state::tutankhm_bankselect_w(uint8_t data) { membank("bank1")->set_entry(data & 0x0f); } @@ -151,7 +151,7 @@ WRITE_LINE_MEMBER(tutankhm_state::coin_counter_2_w) } -WRITE8_MEMBER(tutankhm_state::sound_on_w) +void tutankhm_state::sound_on_w(uint8_t data) { m_timeplt_audio->sh_irqtrigger_w(0); m_timeplt_audio->sh_irqtrigger_w(1); diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index 9ac145cb775..5644a0883b9 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -69,7 +69,7 @@ int twin16_state::spriteram_process_enable() /* Read/Write Handlers */ -WRITE16_MEMBER(twin16_state::CPUA_register_w) +void twin16_state::CPUA_register_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* 7 6 5 4 3 2 1 0 @@ -102,7 +102,7 @@ WRITE16_MEMBER(twin16_state::CPUA_register_w) } } -WRITE16_MEMBER(twin16_state::CPUB_register_w) +void twin16_state::CPUB_register_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* 7 6 5 4 3 2 1 0 @@ -123,7 +123,7 @@ WRITE16_MEMBER(twin16_state::CPUB_register_w) } } -WRITE16_MEMBER(fround_state::fround_CPU_register_w) +void fround_state::fround_CPU_register_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* 7 6 5 4 3 2 1 0 @@ -143,17 +143,17 @@ WRITE16_MEMBER(fround_state::fround_CPU_register_w) } } -READ8_MEMBER(twin16_state::upd_busy_r) +uint8_t twin16_state::upd_busy_r() { return m_upd7759->busy_r(); } -WRITE8_MEMBER(twin16_state::upd_reset_w) +void twin16_state::upd_reset_w(uint8_t data) { m_upd7759->reset_w(data & 2); } -WRITE8_MEMBER(twin16_state::upd_start_w) +void twin16_state::upd_start_w(uint8_t data) { m_upd7759->start_w(data & 1); } @@ -1243,7 +1243,7 @@ void fround_state::init_fround() m_is_fround = true; } -WRITE8_MEMBER(cuebrickj_state::nvram_bank_w) +void cuebrickj_state::nvram_bank_w(uint8_t data) { membank("nvrambank")->set_entry(data); } @@ -1255,7 +1255,7 @@ void cuebrickj_state::init_cuebrickj() address_space &space = m_maincpu->space(AS_PROGRAM); space.install_readwrite_bank(0x0b0000, 0x0b03ff, "nvrambank"); - space.install_write_handler( 0x0b0400, 0x0b0401, write8_delegate(*this, FUNC(cuebrickj_state::nvram_bank_w)), 0xff00); + space.install_write_handler( 0x0b0400, 0x0b0401, write8smo_delegate(*this, FUNC(cuebrickj_state::nvram_bank_w)), 0xff00); membank("nvrambank")->configure_entries(0, 0x20, m_nvram, 0x400); diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index ff74f761652..4f013057a31 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -61,12 +61,12 @@ * *************************************/ -WRITE16_MEMBER(tx1_state::resume_math_w) +void tx1_state::resume_math_w(uint16_t data) { m_mathcpu->set_input_line(INPUT_LINE_TEST, ASSERT_LINE); } -WRITE16_MEMBER(tx1_state::halt_math_w) +void tx1_state::halt_math_w(uint16_t data) { m_mathcpu->set_input_line(INPUT_LINE_TEST, CLEAR_LINE); } diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp index 29e35c0df30..4c3aa68f10f 100644 --- a/src/mame/drivers/ultraman.cpp +++ b/src/mame/drivers/ultraman.cpp @@ -23,7 +23,7 @@ #include "speaker.h" -WRITE8_MEMBER(ultraman_state::sound_nmi_enable_w) +void ultraman_state::sound_nmi_enable_w(uint8_t data) { m_soundnmi->in_w<1>(BIT(data, 0)); } diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index d3cf768e5b0..86e7adb4e29 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -94,45 +94,45 @@ void ultratnk_state::machine_reset() } -READ8_MEMBER(ultratnk_state::wram_r) +uint8_t ultratnk_state::wram_r(offs_t offset) { return m_videoram[0x380 + offset]; } -READ8_MEMBER(ultratnk_state::analog_r) +uint8_t ultratnk_state::analog_r(offs_t offset) { return (ioport("ANALOG")->read() << (~offset & 7)) & 0x80; } -READ8_MEMBER(ultratnk_state::coin_r) +uint8_t ultratnk_state::coin_r(offs_t offset) { return (ioport("COIN")->read() << (~offset & 7)) & 0x80; } -READ8_MEMBER(ultratnk_state::collision_r) +uint8_t ultratnk_state::collision_r(offs_t offset) { return (ioport("COLLISION")->read() << (~offset & 7)) & 0x80; } -READ8_MEMBER(ultratnk_state::options_r) +uint8_t ultratnk_state::options_r(offs_t offset) { return (ioport("DIP")->read() >> (2 * (offset & 3))) & 3; } -WRITE8_MEMBER(ultratnk_state::wram_w) +void ultratnk_state::wram_w(offs_t offset, uint8_t data) { m_videoram[0x380 + offset] = data; } -WRITE8_MEMBER(ultratnk_state::collision_reset_w) +void ultratnk_state::collision_reset_w(offs_t offset, uint8_t data) { m_collision[(offset >> 1) & 3] = 0; } -WRITE8_MEMBER(ultratnk_state::da_latch_w) +void ultratnk_state::da_latch_w(uint8_t data) { m_da_latch = data & 15; } @@ -144,11 +144,11 @@ WRITE_LINE_MEMBER(ultratnk_state::lockout_w) } -WRITE8_MEMBER(ultratnk_state::attract_w) +void ultratnk_state::attract_w(uint8_t data) { m_discrete->write(ULTRATNK_ATTRACT_EN, data & 1); } -WRITE8_MEMBER(ultratnk_state::explosion_w) +void ultratnk_state::explosion_w(uint8_t data) { m_discrete->write(ULTRATNK_EXPLOSION_DATA, data & 15); } diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index 133a6909ed3..12625029b70 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -47,7 +47,7 @@ Year + Game PCB Notes Burglar X ***************************************************************************/ -WRITE8_MEMBER(unico_state::burglarx_okibank_w) +void unico_state::burglarx_okibank_w(uint8_t data) { m_oki->set_rom_bank(data & 1); } @@ -79,7 +79,7 @@ void unico_state::burglarx_map(address_map &map) Zero Point ***************************************************************************/ -WRITE8_MEMBER(zeropnt_state::zeropnt_okibank_leds_w) +void zeropnt_state::zeropnt_okibank_leds_w(uint8_t data) { /* Banked sound samples. The 3rd quarter of the ROM contains garbage. Indeed, only banks 0&1 are used */ @@ -92,7 +92,7 @@ WRITE8_MEMBER(zeropnt_state::zeropnt_okibank_leds_w) } /* Light Gun - need to wiggle the input slightly otherwise fire doesn't work */ -READ16_MEMBER(zeropnt_state::gunx_0_msb_r) +uint16_t zeropnt_state::gunx_0_msb_r() { int x=m_gun_axes[X0]->read(); @@ -103,7 +103,7 @@ READ16_MEMBER(zeropnt_state::gunx_0_msb_r) return ((x&0xff) ^ (m_screen->frame_number()&1))<<8; } -READ16_MEMBER(zeropnt_state::guny_0_msb_r) +uint16_t zeropnt_state::guny_0_msb_r() { int y=m_gun_axes[Y0]->read(); @@ -112,7 +112,7 @@ READ16_MEMBER(zeropnt_state::guny_0_msb_r) return ((y&0xff) ^ (m_screen->frame_number()&1))<<8; } -READ16_MEMBER(zeropnt_state::gunx_1_msb_r) +uint16_t zeropnt_state::gunx_1_msb_r() { int x=m_gun_axes[X1]->read(); @@ -123,7 +123,7 @@ READ16_MEMBER(zeropnt_state::gunx_1_msb_r) return ((x&0xff) ^ (m_screen->frame_number()&1))<<8; } -READ16_MEMBER(zeropnt_state::guny_1_msb_r) +uint16_t zeropnt_state::guny_1_msb_r() { int y=m_gun_axes[Y1]->read(); @@ -167,24 +167,24 @@ void zeropnt_state::zeropnt_oki_map(address_map &map) Zero Point 2 ***************************************************************************/ -READ32_MEMBER(zeropnt2_state::zeropnt2_gunx_0_msb_r) { return (gunx_0_msb_r(space,0,0xffff)-0x0800) << 16; } -READ32_MEMBER(zeropnt2_state::zeropnt2_guny_0_msb_r) { return (guny_0_msb_r(space,0,0xffff)+0x0800) << 16; } -READ32_MEMBER(zeropnt2_state::zeropnt2_gunx_1_msb_r) { return (gunx_1_msb_r(space,0,0xffff)-0x0800) << 16; } -READ32_MEMBER(zeropnt2_state::zeropnt2_guny_1_msb_r) { return (guny_1_msb_r(space,0,0xffff)+0x0800) << 16; } +uint32_t zeropnt2_state::zeropnt2_gunx_0_msb_r() { return (gunx_0_msb_r()-0x0800) << 16; } +uint32_t zeropnt2_state::zeropnt2_guny_0_msb_r() { return (guny_0_msb_r()+0x0800) << 16; } +uint32_t zeropnt2_state::zeropnt2_gunx_1_msb_r() { return (gunx_1_msb_r()-0x0800) << 16; } +uint32_t zeropnt2_state::zeropnt2_guny_1_msb_r() { return (guny_1_msb_r()+0x0800) << 16; } -WRITE8_MEMBER(zeropnt2_state::zeropnt2_okibank) +void zeropnt2_state::zeropnt2_okibank(uint8_t data) { m_okibank->set_entry((data & 3) % 4); } -WRITE8_MEMBER(zeropnt2_state::leds_w) +void zeropnt2_state::leds_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0,data & 0x01); m_leds[0] = BIT(data, 7); // Start 1 m_leds[1] = BIT(data, 6); // Start 2 } -WRITE32_MEMBER(zeropnt2_state::eeprom_w) +void zeropnt2_state::eeprom_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (data & ~0xfe00000) logerror("%s - Unknown EEPROM bit written %04X\n",machine().describe_context(),data); diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp index e2e25062703..8a7296a5f18 100644 --- a/src/mame/drivers/usgames.cpp +++ b/src/mame/drivers/usgames.cpp @@ -43,12 +43,12 @@ void usgames_state::machine_start() membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x4000); } -WRITE8_MEMBER(usgames_state::rombank_w) +void usgames_state::rombank_w(uint8_t data) { membank("bank1")->set_entry(data); } -WRITE8_MEMBER(usgames_state::lamps1_w) +void usgames_state::lamps1_w(uint8_t data) { /* button lamps */ for (int i = 0; i < 4; i++) @@ -57,7 +57,7 @@ WRITE8_MEMBER(usgames_state::lamps1_w) /* bit 5 toggles all the time - extra lamp? */ } -WRITE8_MEMBER(usgames_state::lamps2_w) +void usgames_state::lamps2_w(uint8_t data) { /* bit 5 toggles all the time - extra lamp? */ } diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index a5676b5beaa..7467a589257 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -326,7 +326,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(v1050_state::v1050_keyboard_tick) scan_keyboard(); } -READ8_MEMBER( v1050_state::kb_data_r ) +uint8_t v1050_state::kb_data_r() { m_keyavail = 0; @@ -335,7 +335,7 @@ READ8_MEMBER( v1050_state::kb_data_r ) return m_keydata; } -READ8_MEMBER( v1050_state::kb_status_r ) +uint8_t v1050_state::kb_status_r() { uint8_t val = m_uart_kb->status_r(); @@ -344,37 +344,37 @@ READ8_MEMBER( v1050_state::kb_status_r ) // Z80 Read/Write Handlers -WRITE8_MEMBER( v1050_state::v1050_i8214_w ) +void v1050_state::v1050_i8214_w(uint8_t data) { m_pic->b_w((data >> 1) & 0x07); m_pic->sgs_w(BIT(data, 4)); } -READ8_MEMBER( v1050_state::vint_clr_r ) +uint8_t v1050_state::vint_clr_r() { set_interrupt(INT_VSYNC, 0); return 0xff; } -WRITE8_MEMBER( v1050_state::vint_clr_w ) +void v1050_state::vint_clr_w(uint8_t data) { set_interrupt(INT_VSYNC, 0); } -READ8_MEMBER( v1050_state::dint_clr_r ) +uint8_t v1050_state::dint_clr_r() { set_interrupt(INT_DISPLAY, 0); return 0xff; } -WRITE8_MEMBER( v1050_state::dint_clr_w ) +void v1050_state::dint_clr_w(uint8_t data) { set_interrupt(INT_DISPLAY, 0); } -WRITE8_MEMBER( v1050_state::bank_w ) +void v1050_state::bank_w(uint8_t data) { m_bank = data; @@ -383,17 +383,17 @@ WRITE8_MEMBER( v1050_state::bank_w ) // SY6502A Read/Write Handlers -WRITE8_MEMBER( v1050_state::dint_w ) +void v1050_state::dint_w(uint8_t data) { set_interrupt(INT_DISPLAY, 1); } -WRITE8_MEMBER( v1050_state::dvint_clr_w ) +void v1050_state::dvint_clr_w(uint8_t data) { m_subcpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE8_MEMBER( v1050_state::sasi_data_w ) +void v1050_state::sasi_data_w(uint8_t data) { m_sasi_data = data; @@ -429,7 +429,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(v1050_state::sasi_rst_tick) m_sasibus->write_rst(0); } -WRITE8_MEMBER( v1050_state::sasi_ctrl_w ) +void v1050_state::sasi_ctrl_w(uint8_t data) { /* diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index 80881936c23..de8ed58c73b 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -29,14 +29,14 @@ /******************************************************************************/ -READ8_MEMBER(vaportra_state::irq6_ack_r) +uint8_t vaportra_state::irq6_ack_r() { m_maincpu->set_input_line(M68K_IRQ_6, CLEAR_LINE); return (0); } -WRITE8_MEMBER(vaportra_state::irq6_ack_w) +void vaportra_state::irq6_ack_w(uint8_t data) { m_maincpu->set_input_line(M68K_IRQ_6, CLEAR_LINE); } diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp index d625035ecd2..defe6397da1 100644 --- a/src/mame/drivers/vball.cpp +++ b/src/mame/drivers/vball.cpp @@ -139,7 +139,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(vball_state::vball_scanline) } } -WRITE8_MEMBER(vball_state::irq_ack_w) +void vball_state::irq_ack_w(offs_t offset, uint8_t data) { if (offset == 0) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); @@ -158,7 +158,7 @@ WRITE8_MEMBER(vball_state::irq_ack_w) bit 6 = scroll y hi bit 7 = ? */ -WRITE8_MEMBER(vball_state::bankswitch_w) +void vball_state::bankswitch_w(uint8_t data) { membank("mainbank")->set_entry(data & 1); @@ -180,7 +180,7 @@ WRITE8_MEMBER(vball_state::bankswitch_w) bit 6 = sp prom bank bit 7 = sp prom bank */ -WRITE8_MEMBER(vball_state::scrollx_hi_w) +void vball_state::scrollx_hi_w(uint8_t data) { flip_screen_set(~data&1); m_scrollx_hi = (data & 0x02) << 7; @@ -189,7 +189,7 @@ WRITE8_MEMBER(vball_state::scrollx_hi_w) //logerror("%04x: scrollx_hi = %d\n", m_maincpu->pcbase(), m_scrollx_hi); } -WRITE8_MEMBER(vball_state::scrollx_lo_w) +void vball_state::scrollx_lo_w(uint8_t data) { m_scrollx_lo = data; //logerror("%04x: scrollx_lo =%d\n", m_maincpu->pcbase(), m_scrollx_lo); diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index 82b7eda570b..b3c8427ed8d 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -137,7 +137,7 @@ Q-0900^76203F0161063005080E492DCD4890597877103F020E75105A0A0C1E89F4101879 #include "speaker.h" -READ8_MEMBER( vc4000_state::vc4000_key_r ) +uint8_t vc4000_state::vc4000_key_r(offs_t offset) { uint8_t data=0; switch(offset & 0x0f) @@ -167,19 +167,19 @@ READ8_MEMBER( vc4000_state::vc4000_key_r ) return data; } -WRITE8_MEMBER( vc4000_state::vc4000_sound_ctl ) +void vc4000_state::vc4000_sound_ctl(offs_t offset, uint8_t data) { logerror("Write to sound control register offset= %d value= %d\n", offset, data); } // Write cassette - Address 0x1DFF -WRITE8_MEMBER( vc4000_state::elektor_cass_w ) +void vc4000_state::elektor_cass_w(uint8_t data) { m_cassette->output(BIT(data, 7) ? -1.0 : +1.0); } // Read cassette - Address 0x1DBF -READ8_MEMBER( vc4000_state::elektor_cass_r ) +uint8_t vc4000_state::elektor_cass_r() { return (m_cassette->input() > 0.03) ? 0xff : 0x7f; } @@ -502,7 +502,7 @@ QUICKLOAD_LOAD_MEMBER(vc4000_state::quickload_cb) read_ = quick_length; if (quick_length > 0x1FC0) for (i = 0x1F50; i < read_; i++) - vc4000_video_w(space, i-0x1f00, quick_data[i]); + vc4000_video_w(i-0x1f00, quick_data[i]); /* display a message about the loaded quickload */ image.message(" Quickload: size=%04X : exec=%04X",quick_length,exec_addr); diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index 54a6d2cb308..2b53766ad76 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -105,7 +105,7 @@ ***************************************************************************/ -WRITE8_MEMBER(vendetta_state::eeprom_w) +void vendetta_state::eeprom_w(uint8_t data) { /* bit 0 - VOC0 - Video banking related */ /* bit 1 - VOC1 - Video banking related */ @@ -131,12 +131,12 @@ WRITE8_MEMBER(vendetta_state::eeprom_w) /********************************************/ -READ8_MEMBER(vendetta_state::K052109_r) +uint8_t vendetta_state::K052109_r(offs_t offset) { return m_k052109->read(offset + 0x2000); } -WRITE8_MEMBER(vendetta_state::K052109_w) +void vendetta_state::K052109_w(offs_t offset, uint8_t data) { // ************************************************************************************* // * Escape Kids uses 052109's mirrored Tilemap ROM bank selector, but only during * @@ -148,7 +148,7 @@ WRITE8_MEMBER(vendetta_state::K052109_w) } -WRITE8_MEMBER(vendetta_state::_5fe0_w) +void vendetta_state::_5fe0_w(uint8_t data) { /* bit 0,1 coin counters */ machine().bookkeeping().coin_counter_w(0, data & 0x01); @@ -177,19 +177,19 @@ void vendetta_state::device_timer(emu_timer &timer, device_timer_id id, int para } } -WRITE8_MEMBER(vendetta_state::z80_arm_nmi_w) +void vendetta_state::z80_arm_nmi_w(uint8_t data) { m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); timer_set(attotime::from_usec(25), TIMER_Z80_NMI); } -WRITE8_MEMBER(vendetta_state::z80_irq_w) +void vendetta_state::z80_irq_w(uint8_t data) { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -READ8_MEMBER(vendetta_state::z80_irq_r) +uint8_t vendetta_state::z80_irq_r() { m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 return 0x00; diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index f66dfe8c582..67d786dc0b6 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -226,7 +226,7 @@ int vicdual_state::is_cabinet_color() *************************************/ -WRITE8_MEMBER(vicdual_state::videoram_w) +void vicdual_state::videoram_w(offs_t offset, uint8_t data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); @@ -234,7 +234,7 @@ WRITE8_MEMBER(vicdual_state::videoram_w) } -WRITE8_MEMBER(vicdual_state::characterram_w) +void vicdual_state::characterram_w(offs_t offset, uint8_t data) { // m_screen->update_now(); m_screen->update_partial(m_screen->vpos()); @@ -294,7 +294,7 @@ void vicdual_state::vicdual_root(machine_config &config) * *************************************/ -READ8_MEMBER(vicdual_state::depthch_io_r) +uint8_t vicdual_state::depthch_io_r(offs_t offset) { uint8_t ret = 0; @@ -305,7 +305,7 @@ READ8_MEMBER(vicdual_state::depthch_io_r) } -WRITE8_MEMBER(vicdual_state::depthch_io_w) +void vicdual_state::depthch_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); if (offset & 0x04) depthch_audio_w(data); @@ -378,7 +378,7 @@ void vicdual_state::depthch(machine_config &config) * *************************************/ -READ8_MEMBER(vicdual_state::safari_io_r) +uint8_t vicdual_state::safari_io_r(offs_t offset) { uint8_t ret = 0; @@ -389,7 +389,7 @@ READ8_MEMBER(vicdual_state::safari_io_r) } -WRITE8_MEMBER(vicdual_state::safari_io_w) +void vicdual_state::safari_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); if (offset & 0x02) { /* safari_audio_w(0, data) */ } @@ -463,7 +463,7 @@ void vicdual_state::safari(machine_config &config) * *************************************/ -READ8_MEMBER(vicdual_state::frogs_io_r) +uint8_t vicdual_state::frogs_io_r(offs_t offset) { uint8_t ret = 0; @@ -474,10 +474,10 @@ READ8_MEMBER(vicdual_state::frogs_io_r) } -WRITE8_MEMBER(vicdual_state::frogs_io_w) +void vicdual_state::frogs_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); - if (offset & 0x02) frogs_audio_w(space, 0, data); + if (offset & 0x02) frogs_audio_w(data); } @@ -576,7 +576,7 @@ void vicdual_state::frogs(machine_config &config) * *************************************/ -READ8_MEMBER(vicdual_state::headon_io_r) +uint8_t vicdual_state::headon_io_r(offs_t offset) { uint8_t ret = 0; @@ -587,7 +587,7 @@ READ8_MEMBER(vicdual_state::headon_io_r) } -READ8_MEMBER(vicdual_state::sspaceat_io_r) +uint8_t vicdual_state::sspaceat_io_r(offs_t offset) { uint8_t ret = 0; @@ -599,11 +599,11 @@ READ8_MEMBER(vicdual_state::sspaceat_io_r) } -WRITE8_MEMBER(vicdual_state::headon_io_w) +void vicdual_state::headon_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); - if (offset & 0x02) headon_audio_w(space, 0, data); - if (offset & 0x04) { /* palette_bank_w(0, data) */ } /* not written to */ + if (offset & 0x02) headon_audio_w(data); + if (offset & 0x04) { /* palette_bank_w(data) */ } /* not written to */ } @@ -866,7 +866,7 @@ void vicdual_state::sspaceat(machine_config &config) * *************************************/ -READ8_MEMBER( vicdual_state::headon2_io_r ) +uint8_t vicdual_state::headon2_io_r(offs_t offset) { uint8_t data = 0xff; @@ -878,20 +878,20 @@ READ8_MEMBER( vicdual_state::headon2_io_r ) return data; } -WRITE8_MEMBER(vicdual_state::headon2_io_w) +void vicdual_state::headon2_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); - if (offset & 0x02) headon_audio_w(space, 0, data); + if (offset & 0x02) headon_audio_w(data); } -WRITE8_MEMBER(vicdual_state::digger_io_w) +void vicdual_state::digger_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); if (offset & 0x02) { /* digger_audio_1_w(0, data) */ } if (offset & 0x04) { - palette_bank_w(space, 0, data & 0x03); + palette_bank_w(data & 0x03); /* digger_audio_2_w(0, data & 0xfc); */ } @@ -1105,89 +1105,89 @@ void vicdual_state::digger(machine_config &config) * *************************************/ -WRITE8_MEMBER(vicdual_state::invho2_io_w) +void vicdual_state::invho2_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) invho2_audio_w(space, 0, data); + if (offset & 0x01) invho2_audio_w(data); if (offset & 0x02) invinco_audio_w(data); if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::invds_io_w) +void vicdual_state::invds_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) invinco_audio_w(data); if (offset & 0x02) { /* deepscan_audio_w(0, data) */ } if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::carhntds_io_w) +void vicdual_state::carhntds_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) { /* invinco_audio_w(data); */ } if (offset & 0x02) { /* deepscan_audio_w(0, data) */ } if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::sspacaho_io_w) +void vicdual_state::sspacaho_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) invho2_audio_w(space, 0, data); - if (offset & 0x02) { /* sspaceatt_audio_w(space, 0, data) */ } + if (offset & 0x01) invho2_audio_w(data); + if (offset & 0x02) { /* sspaceatt_audio_w(data) */ } if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::tranqgun_io_w) +void vicdual_state::tranqgun_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) tranqgun_audio_w(space, 0, data); - if (offset & 0x02) palette_bank_w(space, 0, data); + if (offset & 0x01) tranqgun_audio_w(data); + if (offset & 0x02) palette_bank_w(data); if (offset & 0x08) assert_coin_status(); } -WRITE8_MEMBER(vicdual_state::spacetrk_io_w) +void vicdual_state::spacetrk_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) { /* spacetrk_audio_w(space, 0, data) */ } - if (offset & 0x02) { /* spacetrk_audio_w(space, 0, data) */ } + if (offset & 0x01) { /* spacetrk_audio_w(data) */ } + if (offset & 0x02) { /* spacetrk_audio_w(data) */ } if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(carnival_state::carnival_io_w) +void carnival_state::carnival_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) carnival_audio_1_w(data); if (offset & 0x02) carnival_audio_2_w(data); if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::brdrline_io_w) +void vicdual_state::brdrline_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) brdrline_audio_w(space, 0, data); + if (offset & 0x01) brdrline_audio_w(data); if (offset & 0x02) { - palette_bank_w(space, 0, data); - brdrline_audio_aux_w(space,0, data); + palette_bank_w(data); + brdrline_audio_aux_w(data); } if (offset & 0x08) assert_coin_status(); } -WRITE8_MEMBER(vicdual_state::pulsar_io_w) +void vicdual_state::pulsar_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) pulsar_audio_1_w(data); if (offset & 0x02) pulsar_audio_2_w(data); if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::heiankyo_io_w) +void vicdual_state::heiankyo_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) { /* heiankyo_audio_1_w(0, data) */ } if (offset & 0x02) { /* heiankyo_audio_2_w(0, data) */ } @@ -1195,25 +1195,25 @@ WRITE8_MEMBER(vicdual_state::heiankyo_io_w) } -WRITE8_MEMBER(vicdual_state::alphaho_io_w) +void vicdual_state::alphaho_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) { /* headon_audio_w(0, data) */ } if (offset & 0x02) { /* alphaf_audio_w(0, data) */ } if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } -WRITE8_MEMBER(vicdual_state::headonn_io_w) +void vicdual_state::headonn_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) invho2_audio_w(space, 0, data); + if (offset & 0x01) invho2_audio_w(data); if (offset & 0x02) { // 7654---- unused? // ----32-- always 1 // ------10 palette bank (bit 0 inverted) - palette_bank_w(space, 0, (data & 3) ^ 1); + palette_bank_w((data & 3) ^ 1); } if (offset & 0x08) assert_coin_status(); } @@ -2333,7 +2333,7 @@ void vicdual_state::headonn(machine_config &config) * *************************************/ -WRITE8_MEMBER(vicdual_state::samurai_protection_w) +void vicdual_state::samurai_protection_w(uint8_t data) { m_samurai_protection_data = data; } @@ -2353,11 +2353,11 @@ READ_LINE_MEMBER(vicdual_state::samurai_protection_r) } -WRITE8_MEMBER(vicdual_state::samurai_io_w) +void vicdual_state::samurai_io_w(offs_t offset, uint8_t data) { if (offset & 0x02) { /* samurai_audio_w(0, data) */ } if (offset & 0x08) assert_coin_status(); - if (offset & 0x40) palette_bank_w(space, 0, data); + if (offset & 0x40) palette_bank_w(data); } @@ -2467,7 +2467,7 @@ void vicdual_state::samurai(machine_config &config) * *************************************/ -READ8_MEMBER(nsub_state::nsub_io_r) +uint8_t nsub_state::nsub_io_r(offs_t offset) { uint8_t ret = 0; @@ -2478,7 +2478,7 @@ READ8_MEMBER(nsub_state::nsub_io_r) } -WRITE8_MEMBER(nsub_state::nsub_io_w) +void nsub_state::nsub_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); if (offset & 0x02) @@ -2487,7 +2487,7 @@ WRITE8_MEMBER(nsub_state::nsub_io_w) } if (offset & 0x04) { - palette_bank_w(space, 0, data); + palette_bank_w(data); m_s97269pb->palette_bank_w(data); } } @@ -2664,7 +2664,7 @@ void nsub_state::nsub(machine_config &config) * *************************************/ -READ8_MEMBER(vicdual_state::invinco_io_r) +uint8_t vicdual_state::invinco_io_r(offs_t offset) { uint8_t ret = 0; @@ -2676,11 +2676,11 @@ READ8_MEMBER(vicdual_state::invinco_io_r) } -WRITE8_MEMBER(vicdual_state::invinco_io_w) +void vicdual_state::invinco_io_w(offs_t offset, uint8_t data) { if (offset & 0x01) assert_coin_status(); if (offset & 0x02) invinco_audio_w(data); - if (offset & 0x04) palette_bank_w(space, 0, data); + if (offset & 0x04) palette_bank_w(data); } diff --git a/src/mame/drivers/victory.cpp b/src/mame/drivers/victory.cpp index ed44226b932..63bce95b124 100644 --- a/src/mame/drivers/victory.cpp +++ b/src/mame/drivers/victory.cpp @@ -110,7 +110,7 @@ * *************************************/ -WRITE8_MEMBER(victory_state::lamp_control_w) +void victory_state::lamp_control_w(uint8_t data) { m_lamps[0] = BIT(data, 7); m_lamps[1] = BIT(data, 6); diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp index 449d6829905..1bc42153e12 100644 --- a/src/mame/drivers/vidbrain.cpp +++ b/src/mame/drivers/vidbrain.cpp @@ -63,7 +63,7 @@ // keyboard_w - keyboard column write //------------------------------------------------- -WRITE8_MEMBER( vidbrain_state::keyboard_w ) +void vidbrain_state::keyboard_w(uint8_t data) { /* @@ -90,7 +90,7 @@ WRITE8_MEMBER( vidbrain_state::keyboard_w ) // keyboard_r - keyboard row read //------------------------------------------------- -READ8_MEMBER( vidbrain_state::keyboard_r ) +uint8_t vidbrain_state::keyboard_r() { /* @@ -124,7 +124,7 @@ READ8_MEMBER( vidbrain_state::keyboard_r ) // sound_w - sound clock write //------------------------------------------------- -WRITE8_MEMBER( vidbrain_state::sound_w ) +void vidbrain_state::sound_w(uint8_t data) { /* diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 803e7b6ce9d..3eda7e50b21 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -40,7 +40,7 @@ void vigilant_state::machine_start() membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000); } -WRITE8_MEMBER(vigilant_state::bank_select_w) +void vigilant_state::bank_select_w(uint8_t data) { membank("bank1")->set_entry(data & 0x07); } @@ -48,7 +48,7 @@ WRITE8_MEMBER(vigilant_state::bank_select_w) /*************************************************************************** vigilant_out2_w **************************************************************************/ -WRITE8_MEMBER(vigilant_state::vigilant_out2_w) +void vigilant_state::vigilant_out2_w(uint8_t data) { /* D0 = FILP = Flip screen? */ /* D1 = COA1 = Coin Counter A? */ @@ -61,7 +61,7 @@ WRITE8_MEMBER(vigilant_state::vigilant_out2_w) // data & 0x01 cocktail mode } -WRITE8_MEMBER(vigilant_state::kikcubic_coin_w) +void vigilant_state::kikcubic_coin_w(uint8_t data) { /* bits 0 is flip screen */ diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp index b5e4e2fbd7d..2a1e31d56cb 100644 --- a/src/mame/drivers/vindictr.cpp +++ b/src/mame/drivers/vindictr.cpp @@ -59,7 +59,7 @@ void vindictr_state::machine_reset() * *************************************/ -READ16_MEMBER(vindictr_state::port1_r) +uint16_t vindictr_state::port1_r() { int result = ioport("260010")->read(); result ^= 0x0010; diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index 421035b3807..f5a51d5ccb2 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -279,7 +279,7 @@ void vip_state::update_interrupts() // read - //------------------------------------------------- -READ8_MEMBER(vip_state::read) +uint8_t vip_state::read(offs_t offset) { int cs = BIT(offset, 15) || m_8000; int cdef = !((offset >= 0xc00) && (offset < 0x1000)); @@ -304,7 +304,7 @@ READ8_MEMBER(vip_state::read) // write - //------------------------------------------------- -WRITE8_MEMBER(vip_state::write) +void vip_state::write(offs_t offset, uint8_t data) { int cs = BIT(offset, 15) || m_8000; int cdef = !((offset >= 0xc00) && (offset < 0x1000)); @@ -323,7 +323,7 @@ WRITE8_MEMBER(vip_state::write) // io_r - //------------------------------------------------- -READ8_MEMBER(vip_state::io_r) +uint8_t vip_state::io_r(offs_t offset) { uint8_t data = m_exp->io_r(offset); @@ -352,7 +352,7 @@ READ8_MEMBER(vip_state::io_r) // io_w - //------------------------------------------------- -WRITE8_MEMBER(vip_state::io_w) +void vip_state::io_w(offs_t offset, uint8_t data) { m_exp->io_w(offset, data); diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index bcc08415b15..b30a882147b 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -73,21 +73,21 @@ void vixen_state::update_interrupt() } -READ8_MEMBER( vixen_state::opram_r ) +uint8_t vixen_state::opram_r(offs_t offset) { if (!machine().side_effects_disabled()) membank("bank3")->set_entry(0); // read videoram return m_program->read_byte(offset); } -READ8_MEMBER( vixen_state::oprom_r ) +uint8_t vixen_state::oprom_r(offs_t offset) { if (!machine().side_effects_disabled()) membank("bank3")->set_entry(1); // read rom return m_rom[offset]; } -READ8_MEMBER( vixen_state::status_r ) +uint8_t vixen_state::status_r() { /* @@ -118,7 +118,7 @@ READ8_MEMBER( vixen_state::status_r ) return data; } -WRITE8_MEMBER( vixen_state::cmd_w ) +void vixen_state::cmd_w(uint8_t data) { /* @@ -152,7 +152,7 @@ WRITE8_MEMBER( vixen_state::cmd_w ) update_interrupt(); } -READ8_MEMBER( vixen_state::ieee488_r ) +uint8_t vixen_state::ieee488_r() { /* @@ -203,7 +203,7 @@ READ8_MEMBER( vixen_state::ieee488_r ) // port3_r - serial status read //------------------------------------------------- -READ8_MEMBER( vixen_state::port3_r ) +uint8_t vixen_state::port3_r() { /* diff --git a/src/mame/drivers/vp415.cpp b/src/mame/drivers/vp415.cpp index 3cda464b158..155360b95c2 100644 --- a/src/mame/drivers/vp415.cpp +++ b/src/mame/drivers/vp415.cpp @@ -132,7 +132,7 @@ WRITE_LINE_MEMBER(vp415_state::cpu_int1_w) set_int_line(0, state); } -WRITE8_MEMBER(vp415_state::sel34_w) +void vp415_state::sel34_w(uint8_t data) { logerror("%s: sel34: /INTR=%d, RES=%d, ERD=%d, ENW=%d\n", machine().describe_context(), BIT(data, SEL34_INTR_N_BIT), BIT(data, SEL34_RES_BIT), BIT(data, SEL34_ERD_BIT), BIT(data, SEL34_ENW_BIT)); m_sel34 = data; @@ -144,7 +144,7 @@ WRITE8_MEMBER(vp415_state::sel34_w) } } -READ8_MEMBER(vp415_state::sel37_r) +uint8_t vp415_state::sel37_r() { logerror("%s: sel37: ID0=%d, ID1=%d\n", machine().describe_context(), BIT(m_sel37, SEL37_ID0_BIT), BIT(m_sel37, SEL37_ID1_BIT)); return m_sel37; @@ -211,7 +211,7 @@ void vp415_state::datamcu_program_map(address_map &map) // Control Module (S) -WRITE8_MEMBER(vp415_state::ctrl_regs_w) +void vp415_state::ctrl_regs_w(offs_t offset, uint8_t data) { const uint8_t handler_index = (offset & 0x0c00) >> 10; switch (handler_index) @@ -233,7 +233,7 @@ WRITE8_MEMBER(vp415_state::ctrl_regs_w) } } -READ8_MEMBER(vp415_state::ctrl_regs_r) +uint8_t vp415_state::ctrl_regs_r(offs_t offset) { const uint8_t handler_index = (offset & 0x0c00) >> 10; uint8_t value = 0; diff --git a/src/mame/drivers/vsmile.cpp b/src/mame/drivers/vsmile.cpp index a62a4a5e489..723bb22e32a 100644 --- a/src/mame/drivers/vsmile.cpp +++ b/src/mame/drivers/vsmile.cpp @@ -45,7 +45,7 @@ void vsmile_base_state::chip_sel_w(uint8_t data) m_maincpu->invalidate_cache(); } -READ16_MEMBER(vsmile_base_state::bank3_r) +uint16_t vsmile_base_state::bank3_r(offs_t offset) { return ((uint16_t*)m_system_region->base())[offset]; } diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index e324e0cf148..834f3acf3e6 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -151,19 +151,19 @@ Changes: /******************************************************************************/ -WRITE8_MEMBER(vsnes_state::sprite_dma_0_w) +void vsnes_state::sprite_dma_0_w(address_space &space, uint8_t data) { int source = ( data & 7 ); m_ppu1->spriteram_dma( space, source ); } -WRITE8_MEMBER(vsnes_state::sprite_dma_1_w) +void vsnes_state::sprite_dma_1_w(address_space &space, uint8_t data) { int source = ( data & 7 ); m_ppu2->spriteram_dma( space, source ); } -WRITE8_MEMBER(vsnes_state::vsnes_coin_counter_w) +void vsnes_state::vsnes_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x01 ); m_coin = data; @@ -175,13 +175,13 @@ WRITE8_MEMBER(vsnes_state::vsnes_coin_counter_w) } } -READ8_MEMBER(vsnes_state::vsnes_coin_counter_r) +uint8_t vsnes_state::vsnes_coin_counter_r() { //only for platoon return m_coin; } -WRITE8_MEMBER(vsnes_state::vsnes_coin_counter_1_w) +void vsnes_state::vsnes_coin_counter_1_w(uint8_t data) { machine().bookkeeping().coin_counter_w(1, data & 0x01 ); if( data & 0xfe ) //vsbball service mode @@ -221,7 +221,7 @@ void vsnes_state::vsnes_cpu2_map(address_map &map) -READ8_MEMBER(vsnes_state::vsnes_bootleg_z80_address_r) +uint8_t vsnes_state::vsnes_bootleg_z80_address_r() { // NMI routine uses the value read here as the low part of an offset from 0x2000 to store a value read at 0x4000 // before reading 0x6000 and returning @@ -233,14 +233,14 @@ READ8_MEMBER(vsnes_state::vsnes_bootleg_z80_address_r) return m_bootleg_sound_offset; } -WRITE8_MEMBER(vsnes_state::bootleg_sound_write) +void vsnes_state::bootleg_sound_write(offs_t offset, uint8_t data) { m_bootleg_sound_offset = offset & 0xf; m_bootleg_sound_data = data; m_subcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -READ8_MEMBER(vsnes_state::vsnes_bootleg_z80_data_r) +uint8_t vsnes_state::vsnes_bootleg_z80_data_r() { //printf("Z80 read data %02x\n", m_bootleg_sound_data); m_subcpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); @@ -248,7 +248,7 @@ READ8_MEMBER(vsnes_state::vsnes_bootleg_z80_data_r) } // A0 = SN #1 enable, A1 = SN #2 enable, A2 = SN write enables (both) on edge -WRITE8_MEMBER(vsnes_state::vssmbbl_sn_w) +void vsnes_state::vssmbbl_sn_w(offs_t offset, uint8_t data) { // printf("sn_w: ofs %x\n", offset & 7); if (!(offset & 4)) @@ -280,7 +280,7 @@ void vsnes_state::vsnes_cpu1_bootleg_map(address_map &map) map(0x8000, 0xffff).rom(); } -READ8_MEMBER( vsnes_state::vsnes_bootleg_z80_latch_r ) +uint8_t vsnes_state::vsnes_bootleg_z80_latch_r() { return 0x00; } diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index fed5d69fdab..0688f5b4505 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -160,7 +160,7 @@ WRITE_LINE_MEMBER(warpwarp_state::vblank_irq) } /* B&W Games I/O */ -READ8_MEMBER(warpwarp_state::geebee_in_r) +uint8_t warpwarp_state::geebee_in_r(offs_t offset) { int res; @@ -180,7 +180,7 @@ READ8_MEMBER(warpwarp_state::geebee_in_r) return res; } -WRITE8_MEMBER(warpwarp_state::geebee_out6_w) +void warpwarp_state::geebee_out6_w(offs_t offset, uint8_t data) { switch (offset & 3) { @@ -231,19 +231,19 @@ WRITE_LINE_MEMBER(warpwarp_state::inv_w) /* Color Games I/O */ /* Read Switch Inputs */ -READ8_MEMBER(warpwarp_state::warpwarp_sw_r) +uint8_t warpwarp_state::warpwarp_sw_r(offs_t offset) { return (m_in0->read() >> (offset & 7)) & 1; } /* Read Dipswitches */ -READ8_MEMBER(warpwarp_state::warpwarp_dsw1_r) +uint8_t warpwarp_state::warpwarp_dsw1_r(offs_t offset) { return (m_dsw1->read() >> (offset & 7)) & 1; } /* Read mux Controller Inputs */ -READ8_MEMBER(warpwarp_state::warpwarp_vol_r) +uint8_t warpwarp_state::warpwarp_vol_r() { int res; @@ -259,7 +259,7 @@ READ8_MEMBER(warpwarp_state::warpwarp_vol_r) return res; } -WRITE8_MEMBER(warpwarp_state::warpwarp_out0_w) +void warpwarp_state::warpwarp_out0_w(offs_t offset, uint8_t data) { switch (offset & 3) { diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp index 9e91def8fb5..9b2659ee1c2 100644 --- a/src/mame/drivers/wc90.cpp +++ b/src/mame/drivers/wc90.cpp @@ -63,12 +63,12 @@ Press one of the start buttons to exit. #include "speaker.h" -WRITE8_MEMBER(wc90_state::bankswitch_w) +void wc90_state::bankswitch_w(uint8_t data) { m_mainbank->set_entry(data >> 3); } -WRITE8_MEMBER(wc90_state::bankswitch1_w) +void wc90_state::bankswitch1_w(uint8_t data) { m_subbank->set_entry(data >> 3); } diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index 02b698a8284..138b5f23042 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -101,40 +101,40 @@ Noted added by ClawGrip 28-Mar-2008: #define MSM5205_CLOCK XTAL(384'000) -WRITE8_MEMBER(wc90b_state::bankswitch_w) +void wc90b_state::bankswitch_w(uint8_t data) { membank("mainbank")->set_entry(data >> 3); } -WRITE8_MEMBER(wc90b_state::bankswitch1_w) +void wc90b_state::bankswitch1_w(uint8_t data) { membank("subbank")->set_entry(data >> 3); } -WRITE8_MEMBER(wc90b_state::sound_command_w) +void wc90b_state::sound_command_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(wc90b_state::adpcm_control_w) +void wc90b_state::adpcm_control_w(uint8_t data) { membank("audiobank")->set_entry(data & 0x01); m_msm->reset_w(data & 0x08); } -WRITE8_MEMBER(wc90b_state::adpcm_data_w) +void wc90b_state::adpcm_data_w(uint8_t data) { m_msm5205next = data; } -READ8_MEMBER(wc90b_state::master_irq_ack_r) +uint8_t wc90b_state::master_irq_ack_r() { m_maincpu->set_input_line(0,CLEAR_LINE); return 0xff; } -WRITE8_MEMBER(wc90b_state::slave_irq_ack_w) +void wc90b_state::slave_irq_ack_w(uint8_t data) { m_subcpu->set_input_line(0,CLEAR_LINE); } @@ -190,7 +190,7 @@ void wc90b_state::sound_cpu(address_map &map) } -WRITE8_MEMBER(eurogael_state::master_irq_ack_w) +void eurogael_state::master_irq_ack_w(uint8_t data) { // this seems to be write based instead of read based m_maincpu->set_input_line(0,CLEAR_LINE); diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 3b14850648f..363cd1dcd13 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -288,7 +288,7 @@ TODO: Common Routines ***************************************************************************/ -READ16_MEMBER(wecleman_state::wecleman_protection_r) +uint16_t wecleman_state::wecleman_protection_r() { int blend, data0, data1, r0, g0, b0, r1, g1, b1; @@ -314,7 +314,7 @@ READ16_MEMBER(wecleman_state::wecleman_protection_r) return(r0); } -WRITE16_MEMBER(wecleman_state::wecleman_protection_w) +void wecleman_state::wecleman_protection_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (offset == 2) m_prot_state = data & 0x2000; if (!m_prot_state) COMBINE_DATA(m_protection_ram + offset); @@ -341,7 +341,7 @@ WRITE16_MEMBER(wecleman_state::wecleman_protection_w) Schems: SUBRESET does a RST+HALT Sub CPU IRQ 4 generated by SUBINT, no other IRQs */ -WRITE16_MEMBER(wecleman_state::irqctrl_w) +void wecleman_state::irqctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -386,7 +386,7 @@ WRITE16_MEMBER(wecleman_state::irqctrl_w) ------10 ? out 1/2 */ -WRITE16_MEMBER(wecleman_state::selected_ip_w) +void wecleman_state::selected_ip_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) m_selected_ip = data & 0xff; // latch the value } @@ -439,7 +439,7 @@ uint8_t wecleman_state::selected_ip_r() The color code in the original sprite encoding has special meanings on the other hand. I'll take a shortcut by manually copying list[0] and list[1] to sprite RAM for further process. */ -WRITE16_MEMBER(wecleman_state::blitter_w) +void wecleman_state::blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_blitter_regs[offset]); @@ -609,12 +609,12 @@ void wecleman_state::hotchase_sub_map(address_map &map) ***************************************************************************/ /* Protection - an external multiplier connected to the sound CPU */ -READ8_MEMBER(wecleman_state::multiply_r) +uint8_t wecleman_state::multiply_r() { return (m_multiply_reg[0] * m_multiply_reg[1]) & 0xFF; } -WRITE8_MEMBER(wecleman_state::multiply_w) +void wecleman_state::multiply_w(offs_t offset, uint8_t data) { m_multiply_reg[offset] = data; } @@ -641,7 +641,7 @@ void wecleman_state::wecleman_volume_callback(uint8_t data) m_k007232[0]->set_volume(1, 0, (data & 0x0f) * 0x11); } -WRITE8_MEMBER(wecleman_state::wecleman_K00723216_bank_w) +void wecleman_state::wecleman_K00723216_bank_w(uint8_t data) { m_k007232[0]->set_bank(0, ~data&1 ); //* (wecleman062gre) } @@ -665,7 +665,7 @@ void wecleman_state::wecleman_sound_map(address_map &map) Hot Chase Sound CPU Handlers ***************************************************************************/ -WRITE8_MEMBER(wecleman_state::hotchase_sound_control_w) +void wecleman_state::hotchase_sound_control_w(offs_t offset, uint8_t data) { // int reg[8]; @@ -712,7 +712,7 @@ WRITE8_MEMBER(wecleman_state::hotchase_sound_control_w) } } -WRITE8_MEMBER(wecleman_state::hotchase_sound_hs_w) +void wecleman_state::hotchase_sound_hs_w(uint8_t data) { m_hotchase_sound_hs = true; } @@ -720,13 +720,13 @@ WRITE8_MEMBER(wecleman_state::hotchase_sound_hs_w) /* Read and write handlers for one K007232 chip: even and odd register are mapped swapped */ template<int Chip> -READ8_MEMBER(wecleman_state::hotchase_k007232_r) +uint8_t wecleman_state::hotchase_k007232_r(offs_t offset) { return m_k007232[Chip]->read(offset ^ 1); } template<int Chip> -WRITE8_MEMBER(wecleman_state::hotchase_k007232_w) +void wecleman_state::hotchase_k007232_w(offs_t offset, uint8_t data) { m_k007232[Chip]->write(offset ^ 1, data); } diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index b62ff069796..3b8234ba440 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -327,7 +327,7 @@ TODO: #define WELLTRIS_4P_HACK 0 -WRITE8_MEMBER(welltris_state::sound_bankswitch_w) +void welltris_state::sound_bankswitch_w(uint8_t data) { membank("soundbank")->set_entry(data & 0x03); } diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp index 6c2d86abade..193e1240d9f 100644 --- a/src/mame/drivers/wiping.cpp +++ b/src/mame/drivers/wiping.cpp @@ -54,7 +54,7 @@ void wiping_state::machine_start() } /* input ports are rotated 90 degrees */ -READ8_MEMBER(wiping_state::ports_r) +uint8_t wiping_state::ports_r(offs_t offset) { int i,res; static const char *const portnames[] = { "P1", "P2", "IN2", "IN3", "IN4", "IN5", "SYSTEM", "DSW" }; diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index 35922066615..9e927d4c57c 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -357,13 +357,13 @@ uint32_t witch_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -WRITE8_MEMBER(witch_state::gfx0_vram_w) +void witch_state::gfx0_vram_w(offs_t offset, uint8_t data) { m_gfx0_vram[offset] = data; m_gfx0_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(witch_state::gfx0_cram_w) +void witch_state::gfx0_cram_w(offs_t offset, uint8_t data) { m_gfx0_cram[offset] = data; m_gfx0_tilemap->mark_tile_dirty(offset); @@ -372,26 +372,26 @@ WRITE8_MEMBER(witch_state::gfx0_cram_w) #define FIX_OFFSET() do { \ offset=(((offset + ((m_scrolly & 0xf8) << 2) ) & 0x3e0)+((offset + (m_scrollx >> 3) ) & 0x1f)+32)&0x3ff; } while(0) -WRITE8_MEMBER(witch_state::gfx1_vram_w) +void witch_state::gfx1_vram_w(offs_t offset, uint8_t data) { FIX_OFFSET(); m_gfx1_vram[offset] = data; m_gfx1_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(witch_state::gfx1_cram_w) +void witch_state::gfx1_cram_w(offs_t offset, uint8_t data) { FIX_OFFSET(); m_gfx1_cram[offset] = data; m_gfx1_tilemap->mark_tile_dirty(offset); } -READ8_MEMBER(witch_state::gfx1_vram_r) +uint8_t witch_state::gfx1_vram_r(offs_t offset) { FIX_OFFSET(); return m_gfx1_vram[offset]; } -READ8_MEMBER(witch_state::gfx1_cram_r) +uint8_t witch_state::gfx1_cram_r(offs_t offset) { FIX_OFFSET(); return m_gfx1_cram[offset]; @@ -451,17 +451,17 @@ void witch_state::write_a006(uint8_t data) machine().bookkeeping().coin_counter_w(0, !BIT(data, 6)); // coin in counter } -WRITE8_MEMBER(witch_state::main_write_a008) +void witch_state::main_write_a008(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(witch_state::sub_write_a008) +void witch_state::sub_write_a008(uint8_t data) { m_subcpu->set_input_line(0, CLEAR_LINE); } -READ8_MEMBER(witch_state::prot_read_700x) +uint8_t witch_state::prot_read_700x(offs_t offset) { /* Code @$21a looks like simple protection check. @@ -500,7 +500,7 @@ void witch_state::yscroll_w(uint8_t data) m_scrolly = data; } -WRITE8_MEMBER(keirinou_state::palette_w) +void keirinou_state::palette_w(offs_t offset, uint8_t data) { int r,g,b; @@ -1136,7 +1136,7 @@ void witch_state::init_witch() m_mainbank->configure_entries(0, 4, memregion("maincpu")->base() + UNBANKED_SIZE, 0x8000); m_mainbank->set_entry(0); - m_subcpu->space(AS_PROGRAM).install_read_handler(0x7000, 0x700f, read8_delegate(*this, FUNC(witch_state::prot_read_700x))); + m_subcpu->space(AS_PROGRAM).install_read_handler(0x7000, 0x700f, read8sm_delegate(*this, FUNC(witch_state::prot_read_700x))); } GAME( 1987, keirinou, 0, keirinou, keirinou, keirinou_state, empty_init, ROT0, "Excellent System", "Keirin Ou", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index 81f118d0062..f7c68980bef 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -264,14 +264,14 @@ static DISCRETE_SOUND_START(stinger_discrete) DISCRETE_SOUND_END -WRITE8_MEMBER(wiz_state::stinger_explosion_w) +void wiz_state::stinger_explosion_w(uint8_t data) { // explosion sound trigger(analog?) m_discrete->write(STINGER_BOOM_EN1, m_dsc1); m_discrete->write(STINGER_BOOM_EN2, m_dsc1^=1); } -WRITE8_MEMBER(wiz_state::stinger_shot_w) +void wiz_state::stinger_shot_w(uint8_t data) { // player shot sound trigger(analog?) m_discrete->write(STINGER_SHOT_EN1, m_dsc0); @@ -286,7 +286,7 @@ WRITE8_MEMBER(wiz_state::stinger_shot_w) ***************************************************************************/ -READ8_MEMBER(wiz_state::wiz_protection_r) +uint8_t wiz_state::wiz_protection_r() { switch (m_colorram2[0]) { @@ -298,12 +298,12 @@ READ8_MEMBER(wiz_state::wiz_protection_r) return m_colorram2[0]; } -WRITE8_MEMBER(wiz_state::wiz_coin_counter_w) +void wiz_state::wiz_coin_counter_w(offs_t offset, uint8_t data) { machine().bookkeeping().coin_counter_w(offset, data & 1); } -WRITE8_MEMBER(wiz_state::wiz_main_nmi_mask_w) +void wiz_state::wiz_main_nmi_mask_w(uint8_t data) { m_main_nmi_mask = data & 1; } @@ -359,7 +359,7 @@ void wiz_state::stinger_main_map(address_map &map) /**************************************************************************/ -WRITE8_MEMBER(wiz_state::wiz_sound_nmi_mask_w) +void wiz_state::wiz_sound_nmi_mask_w(uint8_t data) { m_sound_nmi_mask = data & 1; } diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index 426c730ae63..8f91c08a839 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -60,7 +60,7 @@ READ_LINE_MEMBER(wolfpack_state::dial_r) } -READ8_MEMBER(wolfpack_state::misc_r) +uint8_t wolfpack_state::misc_r() { uint8_t val = 0; @@ -86,43 +86,43 @@ READ8_MEMBER(wolfpack_state::misc_r) } -WRITE8_MEMBER(wolfpack_state::high_explo_w){ } -WRITE8_MEMBER(wolfpack_state::sonar_ping_w){} -WRITE8_MEMBER(wolfpack_state::sirlat_w){} -WRITE8_MEMBER(wolfpack_state::pt_sound_w){} -WRITE8_MEMBER(wolfpack_state::launch_torpedo_w){} -WRITE8_MEMBER(wolfpack_state::low_explo_w){} -WRITE8_MEMBER(wolfpack_state::screw_cont_w){} -WRITE8_MEMBER(wolfpack_state::lamp_flash_w){} -WRITE8_MEMBER(wolfpack_state::warning_light_w){} -WRITE8_MEMBER(wolfpack_state::audamp_w){} +void wolfpack_state::high_explo_w(uint8_t data){ } +void wolfpack_state::sonar_ping_w(uint8_t data){} +void wolfpack_state::sirlat_w(uint8_t data){} +void wolfpack_state::pt_sound_w(uint8_t data){} +void wolfpack_state::launch_torpedo_w(uint8_t data){} +void wolfpack_state::low_explo_w(uint8_t data){} +void wolfpack_state::screw_cont_w(uint8_t data){} +void wolfpack_state::lamp_flash_w(uint8_t data){} +void wolfpack_state::warning_light_w(uint8_t data){} +void wolfpack_state::audamp_w(uint8_t data){} -WRITE8_MEMBER(wolfpack_state::word_w) +void wolfpack_state::word_w(uint8_t data) { /* latch word from bus into temp register, and place on s14001a input bus */ /* there is no real need for a temp register at all, since the bus 'register' acts as one */ m_s14001a->data_w(data & 0x1f); /* SA0 (IN5) is pulled low according to the schematic, so its 0x1f and not 0x3f as one would expect */ } -WRITE8_MEMBER(wolfpack_state::start_speech_w) +void wolfpack_state::start_speech_w(uint8_t data) { m_s14001a->start_w(data&1); } -WRITE8_MEMBER(wolfpack_state::attract_w) +void wolfpack_state::attract_w(uint8_t data) { machine().bookkeeping().coin_lockout_global_w(!(data & 1)); } -WRITE8_MEMBER(wolfpack_state::credit_w) +void wolfpack_state::credit_w(uint8_t data) { m_led = BIT(~data, 0); } -WRITE8_MEMBER(wolfpack_state::coldetres_w) +void wolfpack_state::coldetres_w(uint8_t data) { m_collision = 0; } diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index aae24a9ba7b..8dc47fb4784 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -193,12 +193,12 @@ void wpc_dot_state::init_wpc_dot() save_pointer(m_dmdram,"DMD RAM",0x2000); } -READ8_MEMBER(wpc_dot_state::ram_r) +uint8_t wpc_dot_state::ram_r(offs_t offset) { return m_ram[offset]; } -WRITE8_MEMBER(wpc_dot_state::ram_w) +void wpc_dot_state::ram_w(offs_t offset, uint8_t data) { if((!m_wpc->memprotect_active()) || ((offset & m_wpc->get_memprotect_mask()) != m_wpc->get_memprotect_mask())) m_ram[offset] = data; diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index fc4c87dc1cf..9c922e97687 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -209,7 +209,7 @@ void wwfsstar_state::sound_map(address_map &map) as used by the above memory map *******************************************************************************/ -WRITE16_MEMBER(wwfsstar_state::scroll_w) +void wwfsstar_state::scroll_w(offs_t offset, uint16_t data) { switch (offset) { @@ -222,12 +222,12 @@ WRITE16_MEMBER(wwfsstar_state::scroll_w) } } -WRITE16_MEMBER(wwfsstar_state::flipscreen_w) +void wwfsstar_state::flipscreen_w(uint16_t data) { flip_screen_set(data & 1); } -WRITE16_MEMBER(wwfsstar_state::irqack_w) +void wwfsstar_state::irqack_w(offs_t offset, uint16_t data) { if (offset == 0) m_maincpu->set_input_line(6, CLEAR_LINE); diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index cd10fe813e0..9a0948aa6db 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1108,7 +1108,7 @@ uint32_t x07_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c Machine ***************************************************************************/ -READ8_MEMBER( x07_state::x07_io_r ) +uint8_t x07_state::x07_io_r(offs_t offset) { uint8_t data = 0xff; @@ -1158,7 +1158,7 @@ READ8_MEMBER( x07_state::x07_io_r ) } -WRITE8_MEMBER( x07_state::x07_io_w ) +void x07_state::x07_io_w(offs_t offset, uint8_t data) { switch(offset) { diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index 04a77ff8a7b..7b822545fe4 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -443,7 +443,7 @@ uint8_t x1_state::get_game_key(uint8_t port) return ret; } -READ8_MEMBER( x1_state::x1_sub_io_r ) +uint8_t x1_state::x1_sub_io_r() { uint8_t ret,bus_res; @@ -565,7 +565,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(x1_state::x1_cmt_wind_timer) } } -WRITE8_MEMBER( x1_state::x1_sub_io_w ) +void x1_state::x1_sub_io_w(uint8_t data) { /* sub-routine at $10e sends to these sub-routines when a keyboard input is triggered: $17a -> floppy @@ -695,7 +695,7 @@ WRITE8_MEMBER( x1_state::x1_sub_io_w ) *************************************/ -READ8_MEMBER( x1_state::x1_rom_r ) +uint8_t x1_state::x1_rom_r() { // logerror("%06x\n",m_rom_index[0]<<16|m_rom_index[1]<<8|m_rom_index[2]<<0); if (m_cart->exists()) @@ -704,17 +704,17 @@ READ8_MEMBER( x1_state::x1_rom_r ) return 0; } -WRITE8_MEMBER( x1_state::x1_rom_w ) +void x1_state::x1_rom_w(offs_t offset, uint8_t data) { m_rom_index[offset] = data; } -WRITE8_MEMBER( x1_state::x1_rom_bank_0_w ) +void x1_state::x1_rom_bank_0_w(uint8_t data) { m_ram_bank = 0x10; } -WRITE8_MEMBER( x1_state::x1_rom_bank_1_w ) +void x1_state::x1_rom_bank_1_w(uint8_t data) { m_ram_bank = 0x00; } @@ -725,7 +725,7 @@ WRITE8_MEMBER( x1_state::x1_rom_bank_1_w ) * *************************************/ -READ8_MEMBER( x1_state::x1_fdc_r ) +uint8_t x1_state::x1_fdc_r(offs_t offset) { //uint8_t ret = 0; @@ -756,7 +756,7 @@ READ8_MEMBER( x1_state::x1_fdc_r ) return 0x00; } -WRITE8_MEMBER( x1_state::x1_fdc_w ) +void x1_state::x1_fdc_w(offs_t offset, uint8_t data) { floppy_image_device *floppy = nullptr; @@ -844,7 +844,7 @@ uint16_t x1_state::get_pcg_addr( uint16_t width, uint8_t y_char_size ) return pcg_offset; } -READ8_MEMBER( x1_state::x1_pcg_r ) +uint8_t x1_state::x1_pcg_r(offs_t offset) { int addr; int pcg_offset; @@ -880,7 +880,7 @@ READ8_MEMBER( x1_state::x1_pcg_r ) return res; } -WRITE8_MEMBER( x1_state::x1_pcg_w ) +void x1_state::x1_pcg_w(offs_t offset, uint8_t data) { int addr,pcg_offset; @@ -951,25 +951,25 @@ void x1_state::set_current_palette() /* Note: docs claims that reading the palette ports makes the value to change somehow in X1 mode ... In 4096 color mode, it's used for reading the value back. */ -WRITE8_MEMBER( x1_state::x1_pal_r_w ) +void x1_state::x1_pal_r_w(uint8_t data) { m_x_r = data; set_current_palette(); } -WRITE8_MEMBER( x1_state::x1_pal_g_w ) +void x1_state::x1_pal_g_w(uint8_t data) { m_x_g = data; set_current_palette(); } -WRITE8_MEMBER( x1_state::x1_pal_b_w ) +void x1_state::x1_pal_b_w(uint8_t data) { m_x_b = data; set_current_palette(); } -WRITE8_MEMBER( x1_state::x1turboz_4096_palette_w ) +void x1_state::x1turboz_4096_palette_w(offs_t offset, uint8_t data) { if (m_turbo_reg.pal & 0x80) // AEN bit, Turbo Z { @@ -1005,19 +1005,19 @@ WRITE8_MEMBER( x1_state::x1turboz_4096_palette_w ) switch (offset & 0x0300) { case 0x0000: - x1_pal_b_w(space, offset & 0x00ff, data); + x1_pal_b_w(data); break; case 0x0100: - x1_pal_r_w(space, offset & 0x00ff, data); + x1_pal_r_w(data); break; case 0x0200: - x1_pal_g_w(space, offset & 0x00ff, data); + x1_pal_g_w(data); break; } } } -READ8_MEMBER( x1_state::x1_ex_gfxram_r ) +uint8_t x1_state::x1_ex_gfxram_r(offs_t offset) { if (!machine().side_effects_disabled()) { @@ -1030,7 +1030,7 @@ READ8_MEMBER( x1_state::x1_ex_gfxram_r ) } } -WRITE8_MEMBER( x1_state::x1_ex_gfxram_w ) +void x1_state::x1_ex_gfxram_w(offs_t offset, uint8_t data) { uint8_t ex_mask; @@ -1057,7 +1057,7 @@ WRITE8_MEMBER( x1_state::x1_ex_gfxram_w ) d6(40) = 0:8-raster graphics 1:16-raster graphics d7(80) = 0:don't display 1:display <- underline (when 1, graphics are not displayed) */ -WRITE8_MEMBER( x1_state::x1_scrn_w ) +void x1_state::x1_scrn_w(uint8_t data) { m_scrn_reg.pcg_mode = BIT(data, 5); m_bitmapbank->set_entry(BIT(data, 4)); @@ -1071,13 +1071,13 @@ WRITE8_MEMBER( x1_state::x1_scrn_w ) logerror("SCRN sets true 400 lines mode\n"); } -WRITE8_MEMBER( x1_state::x1_pri_w ) +void x1_state::x1_pri_w(uint8_t data) { m_scrn_reg.pri = data; // logerror("PRI = %02x\n",data); } -WRITE8_MEMBER( x1_state::x1_6845_w ) +void x1_state::x1_6845_w(offs_t offset, uint8_t data) { if(offset == 0) { @@ -1091,13 +1091,13 @@ WRITE8_MEMBER( x1_state::x1_6845_w ) } } -READ8_MEMBER( x1_state::x1turboz_blackclip_r ) +uint8_t x1_state::x1turboz_blackclip_r() { /* TODO: this returns only on x1turboz */ return m_scrn_reg.blackclip; } -WRITE8_MEMBER( x1_state::x1turbo_blackclip_w ) +void x1_state::x1turbo_blackclip_w(uint8_t data) { /* -x-- ---- replace blanking duration with black @@ -1111,33 +1111,33 @@ WRITE8_MEMBER( x1_state::x1turbo_blackclip_w ) logerror("Blackclip data access %02x\n",data); } -READ8_MEMBER( x1_state::x1turbo_pal_r ) +uint8_t x1_state::x1turbo_pal_r() { return m_turbo_reg.pal; } -READ8_MEMBER( x1_state::x1turbo_txpal_r ) +uint8_t x1_state::x1turbo_txpal_r(offs_t offset) { return m_turbo_reg.txt_pal[offset]; } -READ8_MEMBER( x1_state::x1turbo_txdisp_r ) +uint8_t x1_state::x1turbo_txdisp_r() { return m_turbo_reg.txt_disp; } -READ8_MEMBER( x1_state::x1turbo_gfxpal_r ) +uint8_t x1_state::x1turbo_gfxpal_r() { return m_turbo_reg.gfx_pal; } -WRITE8_MEMBER( x1_state::x1turbo_pal_w ) +void x1_state::x1turbo_pal_w(uint8_t data) { logerror("TURBO PAL %02x\n",data); m_turbo_reg.pal = data; } -WRITE8_MEMBER( x1_state::x1turbo_txpal_w ) +void x1_state::x1turbo_txpal_w(offs_t offset, uint8_t data) { int r,g,b; @@ -1154,13 +1154,13 @@ WRITE8_MEMBER( x1_state::x1turbo_txpal_w ) } } -WRITE8_MEMBER( x1_state::x1turbo_txdisp_w ) +void x1_state::x1turbo_txdisp_w(uint8_t data) { logerror("TURBO TEXT DISPLAY %02x\n",data); m_turbo_reg.txt_disp = data; } -WRITE8_MEMBER( x1_state::x1turbo_gfxpal_w ) +void x1_state::x1turbo_gfxpal_w(uint8_t data) { logerror("TURBO GFX PAL %02x\n",data); m_turbo_reg.gfx_pal = data; @@ -1186,7 +1186,7 @@ uint16_t x1_state::jis_convert(int kanji_addr) return 0x0000; } -READ8_MEMBER( x1_state::x1_kanji_r ) +uint8_t x1_state::x1_kanji_r(offs_t offset) { uint8_t res; @@ -1198,7 +1198,7 @@ READ8_MEMBER( x1_state::x1_kanji_r ) return res; } -WRITE8_MEMBER( x1_state::x1_kanji_w ) +void x1_state::x1_kanji_w(offs_t offset, uint8_t data) { // if(offset < 2) @@ -1228,7 +1228,7 @@ WRITE8_MEMBER( x1_state::x1_kanji_w ) } } -READ8_MEMBER( x1_state::x1_emm_r ) +uint8_t x1_state::x1_emm_r(offs_t offset) { uint8_t res; @@ -1252,7 +1252,7 @@ READ8_MEMBER( x1_state::x1_emm_r ) return res; } -WRITE8_MEMBER( x1_state::x1_emm_w ) +void x1_state::x1_emm_w(offs_t offset, uint8_t data) { if(offset & ~3) { @@ -1275,13 +1275,13 @@ WRITE8_MEMBER( x1_state::x1_emm_w ) /* CZ-141SF, CZ-127MF, X1turboZII, X1turboZ3 boards */ -READ8_MEMBER( x1_state::x1turbo_bank_r ) +uint8_t x1_state::x1turbo_bank_r() { // logerror("BANK access read\n"); return m_ex_bank & 0x3f; } -WRITE8_MEMBER( x1_state::x1turbo_bank_w ) +void x1_state::x1turbo_bank_w(uint8_t data) { //uint8_t *RAM = memregion("x1_cpu")->base(); /* @@ -1295,7 +1295,7 @@ WRITE8_MEMBER( x1_state::x1turbo_bank_w ) } /* TODO: waitstate penalties */ -READ8_MEMBER( x1_state::x1_mem_r ) +uint8_t x1_state::x1_mem_r(offs_t offset) { if((offset & 0x8000) == 0 && (m_ram_bank == 0)) { @@ -1305,25 +1305,25 @@ READ8_MEMBER( x1_state::x1_mem_r ) return m_work_ram[offset]; //RAM } -WRITE8_MEMBER( x1_state::x1_mem_w ) +void x1_state::x1_mem_w(offs_t offset, uint8_t data) { m_work_ram[offset] = data; //RAM } -READ8_MEMBER( x1_state::x1turbo_mem_r ) +uint8_t x1_state::x1turbo_mem_r(offs_t offset) { if((m_ex_bank & 0x10) == 0) return m_work_ram[offset+((m_ex_bank & 0xf)*0x10000)]; - return x1_mem_r(space,offset); + return x1_mem_r(offset); } -WRITE8_MEMBER( x1_state::x1turbo_mem_w ) +void x1_state::x1turbo_mem_w(offs_t offset, uint8_t data) { if((m_ex_bank & 0x10) == 0) m_work_ram[offset+((m_ex_bank & 0xf)*0x10000)] = data; //RAM else - x1_mem_w(space,offset,data); + x1_mem_w(offset,data); } /************************************* @@ -1558,7 +1558,7 @@ void x1_state::io_write_byte(offs_t offset, uint8_t data) return prog_space.write_byte(offset, data); } -READ8_MEMBER(x1_state::ym_r) +uint8_t x1_state::ym_r(offs_t offset) { uint8_t result = m_ym->read(offset); if (!BIT(offset, 0)) @@ -1572,99 +1572,99 @@ READ8_MEMBER(x1_state::ym_r) * *************************************/ -READ8_MEMBER(x1_state::color_board_r) +uint8_t x1_state::color_board_r(address_space &space) { logerror("Color image board read\n"); return space.unmap(); } -WRITE8_MEMBER(x1_state::color_board_w) +void x1_state::color_board_w(uint8_t data) { logerror("Color image board write %02x\n", data); } -READ8_MEMBER(x1_state::color_board_2_r) +uint8_t x1_state::color_board_2_r(address_space &space) { logerror("Color image board 2 read\n"); return space.unmap(); } -WRITE8_MEMBER(x1_state::color_board_2_w) +void x1_state::color_board_2_w(uint8_t data) { logerror("Color image board 2 write %02x\n", data); } -READ8_MEMBER(x1_state::stereo_board_r) +uint8_t x1_state::stereo_board_r(address_space &space, offs_t offset) { logerror("Stereoscopic board read %04x\n", offset); return space.unmap(); } -WRITE8_MEMBER(x1_state::stereo_board_w) +void x1_state::stereo_board_w(offs_t offset, uint8_t data) { logerror("Stereoscopic board write %04x %02x\n", offset, data); } -READ8_MEMBER(x1_state::rs232_r) +uint8_t x1_state::rs232_r(offs_t offset) { logerror("RS-232C read %04x\n", offset); return 0; } -WRITE8_MEMBER(x1_state::rs232_w) +void x1_state::rs232_w(offs_t offset, uint8_t data) { logerror("RS-232C write %04x %02x\n", offset, data); } -READ8_MEMBER(x1_state::sasi_r) +uint8_t x1_state::sasi_r(address_space &space, offs_t offset) { //logerror("SASI HDD read %04x\n",offset); return space.unmap(); } -WRITE8_MEMBER(x1_state::sasi_w) +void x1_state::sasi_w(offs_t offset, uint8_t data) { logerror("SASI HDD write %04x %02x\n", offset, data); } -READ8_MEMBER(x1_state::fdd8_r) +uint8_t x1_state::fdd8_r(address_space &space, offs_t offset) { logerror("8-inch FD read %04x\n", offset); return space.unmap(); } -WRITE8_MEMBER(x1_state::fdd8_w) +void x1_state::fdd8_w(offs_t offset, uint8_t data) { logerror("8-inch FD write %04x %02x\n", offset, data); } -READ8_MEMBER(x1_state::ext_sio_ctc_r) +uint8_t x1_state::ext_sio_ctc_r(address_space &space, offs_t offset) { logerror("Extended SIO/CTC read %04x\n", offset); return space.unmap(); } -WRITE8_MEMBER(x1_state::ext_sio_ctc_w) +void x1_state::ext_sio_ctc_w(offs_t offset, uint8_t data) { logerror("Extended SIO/CTC write %04x %02x\n", offset, data); } -WRITE8_MEMBER(x1_state::z_img_cap_w) +void x1_state::z_img_cap_w(uint8_t data) { logerror("Z image capturing access %02x\n", data); } -WRITE8_MEMBER(x1_state::z_mosaic_w) +void x1_state::z_mosaic_w(uint8_t data) { logerror("Z mosaic effect access %02x\n", data); } -WRITE8_MEMBER(x1_state::z_chroma_key_w) +void x1_state::z_chroma_key_w(uint8_t data) { logerror("Z Chroma key access %02x\n", data); } -WRITE8_MEMBER(x1_state::z_extra_scroll_w) +void x1_state::z_extra_scroll_w(uint8_t data) { logerror("Z Extra scroll config access %02x\n", data); } @@ -2049,7 +2049,6 @@ IRQ_CALLBACK_MEMBER(x1_state::x1_irq_callback) TIMER_DEVICE_CALLBACK_MEMBER(x1_state::x1_keyboard_callback) { - address_space &space = m_maincpu->space(AS_PROGRAM); uint32_t key1 = ioport("key1")->read(); uint32_t key2 = ioport("key2")->read(); uint32_t key3 = ioport("key3")->read(); @@ -2064,7 +2063,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(x1_state::x1_keyboard_callback) if((key1 != m_old_key1) || (key2 != m_old_key2) || (key3 != m_old_key3) || (key4 != m_old_key4) || (f_key != m_old_fkey)) { // generate keyboard IRQ - x1_sub_io_w(space,0,0xe6); + x1_sub_io_w(0xe6); m_irq_vector = m_key_irq_vector; m_key_irq_flag = 1; m_maincpu->set_input_line(0,ASSERT_LINE); diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 2004230c84f..a2eca47417d 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -243,7 +243,7 @@ int x68k_state::read_mouse() 0xe98005 - Z8530 command port A 0xe98007 - Z8530 data port A (RS232) */ -READ16_MEMBER(x68k_state::scc_r ) +uint16_t x68k_state::scc_r(offs_t offset) { offset %= 4; switch(offset) @@ -261,7 +261,7 @@ READ16_MEMBER(x68k_state::scc_r ) } } -WRITE16_MEMBER(x68k_state::scc_w ) +void x68k_state::scc_w(offs_t offset, uint16_t data) { offset %= 4; @@ -595,7 +595,7 @@ void x68k_state::ppi_port_c_w(uint8_t data) // NEC uPD72065 at 0xe94000 -WRITE16_MEMBER(x68k_state::fdc_w) +void x68k_state::fdc_w(offs_t offset, uint16_t data) { unsigned int drive, x; switch(offset) @@ -639,7 +639,7 @@ WRITE16_MEMBER(x68k_state::fdc_w) } } -READ16_MEMBER(x68k_state::fdc_r) +uint16_t x68k_state::fdc_r(offs_t offset) { unsigned int ret; int x; @@ -719,7 +719,7 @@ void x68k_state::ct_w(uint8_t data) - bits 7-2 = vector - bits 1,0 = device (00 = FDC, 01 = FDD, 10 = HDD, 11 = Printer) */ -WRITE16_MEMBER(x68k_state::ioc_w) +void x68k_state::ioc_w(offs_t offset, uint16_t data) { switch(offset) { @@ -751,7 +751,7 @@ WRITE16_MEMBER(x68k_state::ioc_w) } } -READ16_MEMBER(x68k_state::ioc_r) +uint16_t x68k_state::ioc_r(offs_t offset) { switch(offset) { @@ -783,7 +783,7 @@ READ16_MEMBER(x68k_state::ioc_r) Any other value, then SRAM is read only. Port 8 (0xe8e00f) - Power off control - write 0x00, 0x0f, 0x0f sequentially to switch power off. */ -WRITE16_MEMBER(x68k_state::sysport_w) +void x68k_state::sysport_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch(offset) { @@ -806,7 +806,7 @@ WRITE16_MEMBER(x68k_state::sysport_w) } } -READ16_MEMBER(x68k_state::sysport_r) +uint16_t x68k_state::sysport_r(offs_t offset) { int ret = 0; switch(offset) @@ -826,18 +826,18 @@ READ16_MEMBER(x68k_state::sysport_r) } } -WRITE16_MEMBER(x68k_state::ppi_w) +void x68k_state::ppi_w(offs_t offset, uint16_t data) { m_ppi->write(offset & 0x03,data); } -READ16_MEMBER(x68k_state::ppi_r) +uint16_t x68k_state::ppi_r(offs_t offset) { return m_ppi->read(offset & 0x03); } -WRITE16_MEMBER(x68k_state::sram_w) +void x68k_state::sram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(m_sysport.sram_writeprotect == 0x31) { @@ -845,7 +845,7 @@ WRITE16_MEMBER(x68k_state::sram_w) } } -READ16_MEMBER(x68k_state::sram_r) +uint16_t x68k_state::sram_r(offs_t offset) { // HACKS! // if(offset == 0x5a/2) // 0x5a should be 0 if no SASI HDs are present. @@ -855,7 +855,7 @@ READ16_MEMBER(x68k_state::sram_r) return m_nvram[offset]; } -WRITE16_MEMBER(x68k_state::vid_w) +void x68k_state::vid_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch(offset) { @@ -892,7 +892,7 @@ WRITE16_MEMBER(x68k_state::vid_w) } } -READ16_MEMBER(x68k_state::vid_r) +uint16_t x68k_state::vid_r(offs_t offset) { switch(offset) { @@ -909,19 +909,19 @@ READ16_MEMBER(x68k_state::vid_r) return 0xff; } -READ16_MEMBER(x68k_state::areaset_r) +uint16_t x68k_state::areaset_r() { // register is write-only return 0xffff; } -WRITE16_MEMBER(x68k_state::areaset_w) +void x68k_state::areaset_w(uint16_t data) { // TODO LOGMASKED(LOG_SYS, "SYS: Supervisor area set: 0x%02x\n",data & 0xff); } -WRITE16_MEMBER(x68k_state::enh_areaset_w ) +void x68k_state::enh_areaset_w(offs_t offset, uint16_t data) { // TODO LOGMASKED(LOG_SYS, "SYS: Enhanced Supervisor area set (from %iMB): 0x%02x\n",(offset + 1) * 2,data & 0xff); @@ -946,7 +946,7 @@ void x68k_state::set_bus_error(uint32_t address, bool rw, uint16_t mem_mask) LOGMASKED(LOG_SYS, "%s: Bus error: Unused RAM access [%08x]\n", machine().describe_context(), address); } -READ16_MEMBER(x68k_state::rom0_r) +uint16_t x68k_state::rom0_r(offs_t offset, uint16_t mem_mask) { /* this location contains the address of some expansion device ROM, if no ROM exists, then access causes a bus error */ @@ -955,7 +955,7 @@ READ16_MEMBER(x68k_state::rom0_r) return 0xff; } -WRITE16_MEMBER(x68k_state::rom0_w) +void x68k_state::rom0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* this location contains the address of some expansion device ROM, if no ROM exists, then access causes a bus error */ @@ -963,7 +963,7 @@ WRITE16_MEMBER(x68k_state::rom0_w) set_bus_error((offset << 1) + 0xbffffc, false, mem_mask); } -READ16_MEMBER(x68k_state::emptyram_r) +uint16_t x68k_state::emptyram_r(offs_t offset, uint16_t mem_mask) { /* this location is unused RAM, access here causes a bus error Often a method for detecting amount of installed RAM, is to read or write at 1MB intervals, until a bus error occurs */ @@ -972,7 +972,7 @@ READ16_MEMBER(x68k_state::emptyram_r) return 0xff; } -WRITE16_MEMBER(x68k_state::emptyram_w) +void x68k_state::emptyram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* this location is unused RAM, access here causes a bus error Often a method for detecting amount of installed RAM, is to read or write at 1MB intervals, until a bus error occurs */ @@ -980,7 +980,7 @@ WRITE16_MEMBER(x68k_state::emptyram_w) set_bus_error((offset << 1), 1, mem_mask); } -READ16_MEMBER(x68k_state::exp_r) +uint16_t x68k_state::exp_r(offs_t offset, uint16_t mem_mask) { /* These are expansion devices, if not present, they cause a bus error */ if((m_options->read() & 0x02) && !machine().side_effects_disabled()) @@ -988,7 +988,7 @@ READ16_MEMBER(x68k_state::exp_r) return 0xff; } -WRITE16_MEMBER(x68k_state::exp_w) +void x68k_state::exp_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* These are expansion devices, if not present, they cause a bus error */ if((m_options->read() & 0x02) && !machine().side_effects_disabled()) @@ -1021,7 +1021,7 @@ WRITE_LINE_MEMBER(x68k_state::fm_irq) } } -WRITE8_MEMBER(x68k_state::adpcm_w) +void x68k_state::adpcm_w(offs_t offset, uint8_t data) { switch(offset) { diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp index 8e569c4801d..7d11474eeb3 100644 --- a/src/mame/drivers/xain.cpp +++ b/src/mame/drivers/xain.cpp @@ -205,18 +205,18 @@ TIMER_DEVICE_CALLBACK_MEMBER(xain_state::scanline) m_vblank = 0; } -WRITE8_MEMBER(xain_state::cpuA_bankswitch_w) +void xain_state::cpuA_bankswitch_w(uint8_t data) { m_pri = data & 0x7; m_rom_banks[0]->set_entry((data >> 3) & 1); } -WRITE8_MEMBER(xain_state::cpuB_bankswitch_w) +void xain_state::cpuB_bankswitch_w(uint8_t data) { m_rom_banks[1]->set_entry(data & 1); } -WRITE8_MEMBER(xain_state::main_irq_w) +void xain_state::main_irq_w(offs_t offset, uint8_t data) { switch (offset) { @@ -235,12 +235,12 @@ WRITE8_MEMBER(xain_state::main_irq_w) } } -WRITE8_MEMBER(xain_state::irqA_assert_w) +void xain_state::irqA_assert_w(uint8_t data) { m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } -WRITE8_MEMBER(xain_state::irqB_clear_w) +void xain_state::irqB_clear_w(uint8_t data) { m_subcpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } @@ -265,7 +265,7 @@ CUSTOM_INPUT_MEMBER(xain_state::mcu_status_r) ((m_mcu && (CLEAR_LINE != m_mcu->host_semaphore_r())) ? 0x00 : 0x02); } -READ8_MEMBER(xain_state::mcu_comm_reset_r) +uint8_t xain_state::mcu_comm_reset_r() { if (m_mcu.found() && !machine().side_effects_disabled()) { @@ -282,19 +282,19 @@ READ8_MEMBER(xain_state::mcu_comm_reset_r) ***************************************************************************/ -template <unsigned N> WRITE8_MEMBER(xain_state::bgram_w) +template <unsigned N> void xain_state::bgram_w(offs_t offset, uint8_t data) { m_bgram[N][offset] = data; m_bg_tilemaps[N]->mark_tile_dirty(offset & 0x3ff); } -template <unsigned N> WRITE8_MEMBER(xain_state::scrollx_w) +template <unsigned N> void xain_state::scrollx_w(offs_t offset, uint8_t data) { m_scrollx[N][offset] = data; m_bg_tilemaps[N]->set_scrollx(0, m_scrollx[N][0] | (m_scrollx[N][1] << 8)); } -template <unsigned N> WRITE8_MEMBER(xain_state::scrolly_w) +template <unsigned N> void xain_state::scrolly_w(offs_t offset, uint8_t data) { m_scrolly[N][offset] = data; m_bg_tilemaps[N]->set_scrolly(0, m_scrolly[N][0] | (m_scrolly[N][1] << 8)); diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index f6dfe656f73..64bd8293172 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -103,23 +103,23 @@ void xerox820ii_state::bankswitch(int bank) } } -READ8_MEMBER( xerox820_state::fdc_r ) +uint8_t xerox820_state::fdc_r(offs_t offset) { return m_fdc->read(offset) ^ 0xff; } -WRITE8_MEMBER( xerox820_state::fdc_w ) +void xerox820_state::fdc_w(offs_t offset, uint8_t data) { m_fdc->write(offset, data ^ 0xff); } -WRITE8_MEMBER( xerox820_state::scroll_w ) +void xerox820_state::scroll_w(offs_t offset, uint8_t data) { m_scroll = (offset >> 8) & 0x1f; } #ifdef UNUSED_CODE -WRITE8_MEMBER( xerox820_state::x120_system_w ) +void xerox820_state::x120_system_w(uint8_t data) { /* @@ -138,27 +138,27 @@ WRITE8_MEMBER( xerox820_state::x120_system_w ) } #endif -WRITE8_MEMBER( xerox820ii_state::bell_w ) +void xerox820ii_state::bell_w(offs_t offset, uint8_t data) { m_speaker->level_w(offset); } -WRITE8_MEMBER( xerox820ii_state::slden_w ) +void xerox820ii_state::slden_w(offs_t offset, uint8_t data) { m_fdc->dden_w(offset); } -WRITE8_MEMBER( xerox820ii_state::chrom_w ) +void xerox820ii_state::chrom_w(offs_t offset, uint8_t data) { m_chrom = offset; } -WRITE8_MEMBER( xerox820ii_state::lowlite_w ) +void xerox820ii_state::lowlite_w(uint8_t data) { m_lowlite = data; } -WRITE8_MEMBER( xerox820ii_state::sync_w ) +void xerox820ii_state::sync_w(offs_t offset, uint8_t data) { if (offset) { diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 8c72bbf94f3..2f9013f0c05 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -158,7 +158,7 @@ reference(xexexj) : https://www.youtube.com/watch?v=TegjBEvvGxI /* the interface with the 053247 is weird. The chip can address only 0x1000 bytes */ /* of RAM, but they put 0x8000 there. The CPU can access them all. Address lines */ /* A1, A5 and A6 don't go to the 053247. */ -READ16_MEMBER(xexex_state::k053247_scattered_word_r) +uint16_t xexex_state::k053247_scattered_word_r(offs_t offset, uint16_t mem_mask) { if (offset & 0x0031) return m_spriteram[offset]; @@ -169,7 +169,7 @@ READ16_MEMBER(xexex_state::k053247_scattered_word_r) } } -WRITE16_MEMBER(xexex_state::k053247_scattered_word_w) +void xexex_state::k053247_scattered_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (offset & 0x0031) COMBINE_DATA(m_spriteram + offset); @@ -216,17 +216,17 @@ void xexex_state::xexex_objdma( int limiter ) if (num_inactive) do { *dst = 0; dst += 8; } while (--num_inactive); } -READ16_MEMBER(xexex_state::spriteram_mirror_r) +uint16_t xexex_state::spriteram_mirror_r(offs_t offset) { return m_spriteram[offset]; } -WRITE16_MEMBER(xexex_state::spriteram_mirror_w) +void xexex_state::spriteram_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(m_spriteram + offset); } -READ16_MEMBER(xexex_state::xexex_waitskip_r) +uint16_t xexex_state::xexex_waitskip_r() { if (m_maincpu->pc() == 0x1158) { @@ -255,23 +255,23 @@ void xexex_state::parse_control2( ) m_cur_alpha = !(m_cur_control2 & 0x200); } -READ16_MEMBER(xexex_state::control2_r) +uint16_t xexex_state::control2_r() { return m_cur_control2; } -WRITE16_MEMBER(xexex_state::control2_w) +void xexex_state::control2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_cur_control2); parse_control2(); } -WRITE16_MEMBER(xexex_state::sound_irq_w) +void xexex_state::sound_irq_w(uint16_t data) { m_audiocpu->set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(xexex_state::sound_bankswitch_w) +void xexex_state::sound_bankswitch_w(uint8_t data) { m_z80bank->set_entry(data & 0x07); } diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index 4525e8e1896..ef456350671 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -35,7 +35,7 @@ likewise a 2 screen game ***************************************************************************/ -WRITE16_MEMBER(xmen_state::eeprom_w) +void xmen_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { logerror("%06x: write %04x to 108000\n", m_maincpu->pc(),data); if (ACCESSING_BITS_0_7) @@ -63,7 +63,7 @@ WRITE16_MEMBER(xmen_state::eeprom_w) } } -WRITE16_MEMBER(xmen_state::xmen_18fa00_w) +void xmen_state::xmen_18fa00_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(ACCESSING_BITS_0_7) { @@ -72,7 +72,7 @@ WRITE16_MEMBER(xmen_state::xmen_18fa00_w) } } -WRITE8_MEMBER(xmen_state::sound_bankswitch_w) +void xmen_state::sound_bankswitch_w(uint8_t data) { m_z80bank->set_entry(data & 0x07); } diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp index b18e9b1b73c..ce02a984266 100644 --- a/src/mame/drivers/xor100.cpp +++ b/src/mame/drivers/xor100.cpp @@ -117,7 +117,7 @@ void xor100_state::bankswitch() } } -WRITE8_MEMBER( xor100_state::mmu_w ) +void xor100_state::mmu_w(uint8_t data) { /* @@ -139,7 +139,7 @@ WRITE8_MEMBER( xor100_state::mmu_w ) bankswitch(); } -WRITE8_MEMBER( xor100_state::prom_toggle_w ) +void xor100_state::prom_toggle_w(uint8_t data) { switch (m_mode) { @@ -150,7 +150,7 @@ WRITE8_MEMBER( xor100_state::prom_toggle_w ) bankswitch(); } -READ8_MEMBER( xor100_state::prom_disable_r ) +uint8_t xor100_state::prom_disable_r() { m_mode = EPROM_F800; @@ -159,7 +159,7 @@ READ8_MEMBER( xor100_state::prom_disable_r ) return 0xff; } -READ8_MEMBER( xor100_state::fdc_wait_r ) +uint8_t xor100_state::fdc_wait_r() { /* @@ -187,7 +187,7 @@ READ8_MEMBER( xor100_state::fdc_wait_r ) return m_fdc_irq ? 0x7f : 0xff; } -WRITE8_MEMBER( xor100_state::fdc_dcont_w ) +void xor100_state::fdc_dcont_w(uint8_t data) { /* @@ -217,7 +217,7 @@ WRITE8_MEMBER( xor100_state::fdc_dcont_w ) if (floppy) floppy->mon_w(0); } -WRITE8_MEMBER( xor100_state::fdc_dsel_w ) +void xor100_state::fdc_dsel_w(uint8_t data) { /* diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp index f55a213efa8..84efdb18c68 100644 --- a/src/mame/drivers/xxmissio.cpp +++ b/src/mame/drivers/xxmissio.cpp @@ -19,7 +19,7 @@ XX Mission (c) 1986 UPL #include "speaker.h" -WRITE8_MEMBER(xxmissio_state::bank_sel_w) +void xxmissio_state::bank_sel_w(uint8_t data) { membank("bank1")->set_entry(data & 7); } @@ -30,7 +30,7 @@ READ_LINE_MEMBER(xxmissio_state::status_r) return (m_status & Mask) ? 1 : 0; } -WRITE8_MEMBER(xxmissio_state::status_m_w) +void xxmissio_state::status_m_w(uint8_t data) { switch (data) { @@ -49,7 +49,7 @@ WRITE8_MEMBER(xxmissio_state::status_m_w) } } -WRITE8_MEMBER(xxmissio_state::status_s_w) +void xxmissio_state::status_s_w(uint8_t data) { switch (data) { diff --git a/src/mame/etc/template_device.cpp b/src/mame/etc/template_device.cpp index 21226b79b1b..0f6615c3611 100644 --- a/src/mame/etc/template_device.cpp +++ b/src/mame/etc/template_device.cpp @@ -68,11 +68,11 @@ void xxx_device::device_reset() // READ/WRITE HANDLERS //************************************************************************** -READ8_MEMBER( xxx_device::read ) +uint8_t xxx_device::read(address_space &space, offs_t offset, uint8_t mem_mask = ~0) { return 0; } -WRITE8_MEMBER( xxx_device::write ) +void xxx_device::write(address_space &space, offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { } diff --git a/src/mame/etc/template_device.h b/src/mame/etc/template_device.h index 1a2c7bdfb04..c98aab13888 100644 --- a/src/mame/etc/template_device.h +++ b/src/mame/etc/template_device.h @@ -32,8 +32,8 @@ public: xxx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // I/O operations - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( read ); + void write(address_space &space, offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + uint8_t read(address_space &space, offs_t offset, uint8_t mem_mask = ~0); protected: // device-level overrides diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index dff31f7d55c..6afdca4ba08 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -45,16 +45,16 @@ private: tilemap_t *m_bg_tilemap; uint8_t m_sound_nmi_mask; - DECLARE_WRITE8_MEMBER(irq_clear_w); - DECLARE_WRITE8_MEMBER(sound_nmi_mask_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_READ8_MEMBER(mirrorvideoram_r); - DECLARE_READ8_MEMBER(mirrorcolorram_r); - DECLARE_WRITE8_MEMBER(mirrorvideoram_w); - DECLARE_WRITE8_MEMBER(mirrorcolorram_w); - DECLARE_WRITE8_MEMBER(control_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); + void irq_clear_w(uint8_t data); + 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); + uint8_t mirrorvideoram_r(offs_t offset); + uint8_t mirrorcolorram_r(offs_t offset); + void mirrorvideoram_w(offs_t offset, uint8_t data); + void mirrorcolorram_w(offs_t offset, uint8_t data); + void control_w(uint8_t data); + void flipscreen_w(uint8_t data); INTERRUPT_GEN_MEMBER(sound_timer_irq); diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index 89498baf419..9256a15a1a1 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -66,11 +66,11 @@ private: required_device<acia6850_device> m_acia; required_ioport_array<2> m_analog; - DECLARE_WRITE16_MEMBER(tail2nos_txvideoram_w); - DECLARE_WRITE16_MEMBER(tail2nos_zoomdata_w); - DECLARE_WRITE8_MEMBER(tail2nos_gfxbank_w); + void tail2nos_txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tail2nos_zoomdata_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tail2nos_gfxbank_w(uint8_t data); void sound_bankswitch_w(uint8_t data); - DECLARE_READ8_MEMBER(sound_semaphore_r); + uint8_t sound_semaphore_r(); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update_tail2nos(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tail2nos_postload(); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 9800d813b5f..36b9726f9a0 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -59,16 +59,16 @@ protected: void sound_map(address_map &map); - DECLARE_WRITE8_MEMBER(bankswitch_w); - template<int Player> DECLARE_READ16_MEMBER(tracky_hi_r); - template<int Player> DECLARE_READ16_MEMBER(tracky_lo_r); - template<int Player> DECLARE_READ16_MEMBER(trackx_hi_r); - template<int Player> DECLARE_READ16_MEMBER(trackx_lo_r); - DECLARE_READ16_MEMBER(eep_latch_r); - DECLARE_WRITE16_MEMBER(eeprom_w); - DECLARE_READ16_MEMBER(player_34_coin_ctrl_r); - DECLARE_WRITE16_MEMBER(player_34_coin_ctrl_w); - DECLARE_WRITE16_MEMBER(spacedxo_tc0220ioc_w); + void bankswitch_w(uint8_t data); + template<int Player> uint16_t tracky_hi_r(); + template<int Player> uint16_t tracky_lo_r(); + template<int Player> uint16_t trackx_hi_r(); + template<int Player> uint16_t trackx_lo_r(); + uint16_t eep_latch_r(); + void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t player_34_coin_ctrl_r(); + void player_34_coin_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void spacedxo_tc0220ioc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void mb87078_gain_changed(offs_t offset, uint8_t data); virtual void video_start() override; uint32_t screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -134,8 +134,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor); protected: - DECLARE_WRITE16_MEMBER(realpunc_output_w); - DECLARE_WRITE16_MEMBER(realpunc_video_ctrl_w); + void realpunc_output_w(uint16_t data); + void realpunc_video_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void realpunc_map(address_map &map); void realpunc_hd63484_map(address_map &map); @@ -163,8 +163,8 @@ protected: virtual void video_reset() override; private: - DECLARE_WRITE16_MEMBER(pixelram_w); - DECLARE_WRITE16_MEMBER(pixel_scroll_w); + void pixelram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void pixel_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void hitice_map(address_map &map); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index d14d86199d0..78e1b9e9cef 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -57,7 +57,7 @@ private: optional_ioport m_io_p2y; void coin_control_w(u8 data); - DECLARE_READ8_MEMBER(syvalion_input_bypass_r); + u8 syvalion_input_bypass_r(); void sound_bankswitch_w(u8 data); u32 screen_update_syvalion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_recordbr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index a1246fdba9a..83f853c74d5 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -39,11 +39,11 @@ protected: int m_last_irq_level; int m_main_high; - DECLARE_WRITE8_MEMBER(irq_enable_w); - DECLARE_WRITE8_MEMBER(rombankswitch_w); + void irq_enable_w(u8 data); + void rombankswitch_w(u8 data); - DECLARE_WRITE8_MEMBER(mcu_control_w); - DECLARE_READ8_MEMBER(mcu_control_r); + void mcu_control_w(u8 data); + u8 mcu_control_r(); DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitol); TIMER_DEVICE_CALLBACK_MEMBER(vbl_interrupt); @@ -72,7 +72,7 @@ public: { } - DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + void sound_bankswitch_w(u8 data); void kurikint(machine_config &config); void evilston(machine_config &config); @@ -108,8 +108,8 @@ public: { } - DECLARE_WRITE8_MEMBER(slave_rombank_w); - DECLARE_READ8_MEMBER(slave_rombank_r); + void slave_rombank_w(u8 data); + u8 slave_rombank_r(); void portA_w(u8 data); void fhawk(machine_config &config); @@ -144,10 +144,10 @@ public: DECLARE_WRITE_LINE_MEMBER(msm5205_vck); - DECLARE_WRITE8_MEMBER(msm5205_lo_w); - DECLARE_WRITE8_MEMBER(msm5205_hi_w); - DECLARE_WRITE8_MEMBER(msm5205_start_w); - DECLARE_WRITE8_MEMBER(msm5205_stop_w); + void msm5205_lo_w(u8 data); + void msm5205_hi_w(u8 data); + void msm5205_start_w(u8 data); + void msm5205_stop_w(u8 data); void msm5205_volume_w(u8 data); void champwr(machine_config &config); @@ -178,7 +178,7 @@ public: { } - DECLARE_READ8_MEMBER(extport_select_and_ym2203_r); + u8 extport_select_and_ym2203_r(offs_t offset); void init_plottinga(); @@ -227,7 +227,7 @@ protected: private: void horshoes_tile_cb(u32 &code); - DECLARE_WRITE8_MEMBER(bankg_w); + void bankg_w(u8 data); int m_horshoes_gfxbank; void horshoes_map(address_map &map); diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index e284251c5e8..ce38ccb856c 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -126,8 +126,8 @@ private: void dsp_HOLDA_signal_w(offs_t offset, u16 data); void paletteram_w(offs_t offset, u16 data, u16 mem_mask = ~0); void gradram_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_READ16_MEMBER(stick_input_r); - DECLARE_READ16_MEMBER(stick2_input_r); + u16 stick_input_r(offs_t offset); + u16 stick2_input_r(offs_t offset); void coin_control_w(u8 data); void sound_bankswitch_w(u8 data); void dsp_flags_w(offs_t offset, u16 data); diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 5652813cb16..54455ce958b 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -93,14 +93,14 @@ private: void coin_control_w(uint8_t data); - DECLARE_READ8_MEMBER(mcu_comm_r); - DECLARE_WRITE8_MEMBER(mcu_comm_w); - DECLARE_READ8_MEMBER(jc_pcbid_r); - DECLARE_READ8_MEMBER(jc_lan_r); - DECLARE_WRITE8_MEMBER(jc_lan_w); - DECLARE_WRITE8_MEMBER(jc_irq_unk_w); - DECLARE_WRITE8_MEMBER(dendego_speedmeter_w); - DECLARE_WRITE8_MEMBER(dendego_brakemeter_w); + uint8_t mcu_comm_r(offs_t offset); + void mcu_comm_w(offs_t offset, uint8_t data); + uint8_t jc_pcbid_r(offs_t offset); + uint8_t jc_lan_r(); + void jc_lan_w(uint8_t data); + void jc_irq_unk_w(uint8_t data); + void dendego_speedmeter_w(uint8_t data); + void dendego_brakemeter_w(uint8_t data); uint8_t hc11_comm_r(); void hc11_comm_w(uint8_t data); @@ -109,32 +109,32 @@ private: void hc11_data_w(uint8_t data); template <int Ch> uint8_t hc11_analog_r(); - DECLARE_READ16_MEMBER(dsp_shared_r); - DECLARE_WRITE16_MEMBER(dsp_shared_w); - DECLARE_READ16_MEMBER(dsp_to_main_7fe_r); - DECLARE_WRITE16_MEMBER(dsp_to_main_7fe_w); - DECLARE_WRITE16_MEMBER(main_to_dsp_7ff_w); - - DECLARE_READ16_MEMBER(dsp_rom_r); - DECLARE_WRITE16_MEMBER(dsp_rom_w); - - DECLARE_WRITE16_MEMBER(dsp_math_viewport_w); - DECLARE_WRITE16_MEMBER(dsp_math_projection_w); - DECLARE_READ16_MEMBER(dsp_math_projection_y_r); - DECLARE_READ16_MEMBER(dsp_math_projection_x_r); - DECLARE_WRITE16_MEMBER(dsp_math_intersection_w); - DECLARE_READ16_MEMBER(dsp_math_intersection_r); - DECLARE_READ16_MEMBER(dsp_math_unk_r); - - DECLARE_READ16_MEMBER(taitojc_dsp_idle_skip_r); - DECLARE_READ16_MEMBER(dendego2_dsp_idle_skip_r); - - DECLARE_READ32_MEMBER(taitojc_palette_r); - DECLARE_WRITE32_MEMBER(taitojc_palette_w); - DECLARE_READ32_MEMBER(taitojc_tile_r); - DECLARE_READ32_MEMBER(taitojc_char_r); - DECLARE_WRITE32_MEMBER(taitojc_tile_w); - DECLARE_WRITE32_MEMBER(taitojc_char_w); + uint16_t dsp_shared_r(offs_t offset); + void dsp_shared_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t dsp_to_main_7fe_r(offs_t offset, uint16_t mem_mask = ~0); + void dsp_to_main_7fe_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void main_to_dsp_7ff_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + + uint16_t dsp_rom_r(); + void dsp_rom_w(offs_t offset, uint16_t data); + + void dsp_math_viewport_w(offs_t offset, uint16_t data); + void dsp_math_projection_w(offs_t offset, uint16_t data); + uint16_t dsp_math_projection_y_r(); + uint16_t dsp_math_projection_x_r(); + void dsp_math_intersection_w(offs_t offset, uint16_t data); + uint16_t dsp_math_intersection_r(); + uint16_t dsp_math_unk_r(); + + uint16_t taitojc_dsp_idle_skip_r(); + uint16_t dendego2_dsp_idle_skip_r(); + + uint32_t taitojc_palette_r(offs_t offset); + void taitojc_palette_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t taitojc_tile_r(offs_t offset); + uint32_t taitojc_char_r(offs_t offset); + void taitojc_tile_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void taitojc_char_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); TILE_GET_INFO_MEMBER(taitojc_tile_info); virtual void machine_reset() override; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 385bb7e811c..e64c4dc7d08 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -108,32 +108,32 @@ private: bitmap_ind16 m_sprite_layer_collbitmap1; bitmap_ind16 m_sprite_layer_collbitmap2[3]; int m_draw_order[32][4]; - DECLARE_WRITE8_MEMBER(soundlatch_w); - DECLARE_WRITE8_MEMBER(sound_semaphore2_w); + void soundlatch_w(uint8_t data); + void sound_semaphore2_w(uint8_t data); TIMER_CALLBACK_MEMBER(soundlatch_w_cb); TIMER_CALLBACK_MEMBER(soundlatch_clear7_w_cb); TIMER_CALLBACK_MEMBER(sound_semaphore2_w_cb); TIMER_CALLBACK_MEMBER(sound_semaphore2_clear_w_cb); - DECLARE_READ8_MEMBER(soundlatch_r); - DECLARE_WRITE8_MEMBER(soundlatch_clear7_w); - DECLARE_READ8_MEMBER(soundlatch_flags_r); - DECLARE_WRITE8_MEMBER(sound_semaphore2_clear_w); - DECLARE_WRITE8_MEMBER(taitosj_bankswitch_w); - DECLARE_READ8_MEMBER(taitosj_fake_data_r); - DECLARE_WRITE8_MEMBER(taitosj_fake_data_w); - DECLARE_READ8_MEMBER(taitosj_fake_status_r); + uint8_t soundlatch_r(); + void soundlatch_clear7_w(uint8_t data); + uint8_t soundlatch_flags_r(); + void sound_semaphore2_clear_w(uint8_t data); + void taitosj_bankswitch_w(uint8_t data); + uint8_t taitosj_fake_data_r(); + void taitosj_fake_data_w(uint8_t data); + uint8_t taitosj_fake_status_r(); uint8_t mcu_mem_r(offs_t offset); void mcu_mem_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(mcu_intrq_w); DECLARE_WRITE_LINE_MEMBER(mcu_busrq_w); - DECLARE_READ8_MEMBER(spacecr_prot_r); - DECLARE_WRITE8_MEMBER(alpine_protection_w); - DECLARE_WRITE8_MEMBER(alpinea_bankswitch_w); - DECLARE_READ8_MEMBER(alpine_port_2_r); - DECLARE_READ8_MEMBER(taitosj_gfxrom_r); - DECLARE_WRITE8_MEMBER(taitosj_characterram_w); - DECLARE_WRITE8_MEMBER(junglhbr_characterram_w); - DECLARE_WRITE8_MEMBER(taitosj_collision_reg_clear_w); + uint8_t spacecr_prot_r(); + void alpine_protection_w(uint8_t data); + void alpinea_bankswitch_w(uint8_t data); + uint8_t alpine_port_2_r(); + uint8_t taitosj_gfxrom_r(); + void taitosj_characterram_w(offs_t offset, uint8_t data); + void junglhbr_characterram_w(offs_t offset, uint8_t data); + void taitosj_collision_reg_clear_w(uint8_t data); void taitosj_sndnmi_msk_w(uint8_t data); void input_port_4_f0_w(uint8_t data); diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h index e9f7478d361..f1aca034a7d 100644 --- a/src/mame/includes/tandy2k.h +++ b/src/mame/includes/tandy2k.h @@ -152,16 +152,16 @@ private: void dma_request(int line, int state); void speaker_update(); - DECLARE_READ8_MEMBER( char_ram_r ); - DECLARE_WRITE8_MEMBER( char_ram_w ); - DECLARE_READ8_MEMBER( videoram_r ); - DECLARE_READ8_MEMBER( enable_r ); - DECLARE_WRITE8_MEMBER( enable_w ); - DECLARE_WRITE8_MEMBER( dma_mux_w ); - DECLARE_READ8_MEMBER( kbint_clr_r ); - DECLARE_READ8_MEMBER( fldtc_r ); - DECLARE_WRITE8_MEMBER( fldtc_w ); - DECLARE_WRITE8_MEMBER( addr_ctrl_w ); + uint8_t char_ram_r(offs_t offset); + void char_ram_w(offs_t offset, uint8_t data); + uint8_t videoram_r(offs_t offset); + uint8_t enable_r(); + void enable_w(uint8_t data); + void dma_mux_w(uint8_t data); + uint8_t kbint_clr_r(); + uint8_t fldtc_r(); + void fldtc_w(uint8_t data); + void addr_ctrl_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( rxrdy_w ); DECLARE_WRITE_LINE_MEMBER( txrdy_w ); DECLARE_WRITE_LINE_MEMBER( outspkr_w ); @@ -175,15 +175,14 @@ private: DECLARE_WRITE_LINE_MEMBER( vpac_cblank_w ); DECLARE_WRITE_LINE_MEMBER( vpac_slg_w ); DECLARE_WRITE_LINE_MEMBER( vpac_sld_w ); - DECLARE_READ8_MEMBER( hires_status_r ); - DECLARE_WRITE8_MEMBER( hires_plane_w ); - DECLARE_WRITE8_MEMBER( hires_palette_w ); + uint8_t hires_status_r(); + void hires_plane_w(uint8_t data); void vidla_w(uint8_t data); void drb_attr_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( kbdclk_w ); DECLARE_WRITE_LINE_MEMBER( kbddat_w ); - DECLARE_READ8_MEMBER( clkmouse_r ); - DECLARE_WRITE8_MEMBER( clkmouse_w ); + uint8_t clkmouse_r(offs_t offset); + void clkmouse_w(offs_t offset, uint8_t data); uint8_t irq_callback(offs_t offset); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_hdl_w ); diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 952954ae1f0..4ea239b148f 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -59,16 +59,16 @@ private: TIMER_COLLISION }; - DECLARE_READ8_MEMBER(collision_r); - DECLARE_WRITE8_MEMBER(lockout_w); - DECLARE_WRITE8_MEMBER(int_reset_w); - DECLARE_WRITE8_MEMBER(video_ram_w); - DECLARE_WRITE8_MEMBER(crash_w); - DECLARE_WRITE8_MEMBER(explosion_w); - DECLARE_WRITE8_MEMBER(bugle_w); - DECLARE_WRITE8_MEMBER(bug_w); - DECLARE_WRITE8_MEMBER(attract_w); - DECLARE_WRITE8_MEMBER(motor_w); + uint8_t collision_r(); + void lockout_w(offs_t offset, uint8_t data); + void int_reset_w(uint8_t data); + void video_ram_w(offs_t offset, uint8_t data); + void crash_w(uint8_t data); + void explosion_w(uint8_t data); + void bugle_w(uint8_t data); + void bug_w(uint8_t data); + void attract_w(uint8_t data); + void motor_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 199c6cff39a..2dcb5d2b8f6 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -39,18 +39,18 @@ private: int m_sound_enable; tilemap_t *m_bg_tilemap; - DECLARE_READ8_MEMBER(in0_r); - DECLARE_READ8_MEMBER(in1_r); - DECLARE_READ8_MEMBER(dsw_r); + uint8_t in0_r(offs_t offset); + uint8_t in1_r(offs_t offset); + uint8_t dsw_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(interrupt_enable_w); DECLARE_WRITE_LINE_MEMBER(demo_interrupt_enable_w); DECLARE_WRITE_LINE_MEMBER(sh_expl_w); DECLARE_WRITE_LINE_MEMBER(sh_engine_w); DECLARE_WRITE_LINE_MEMBER(sh_fire_w); - DECLARE_WRITE8_MEMBER(irq_ack_w); + void irq_ack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coincounter_w); DECLARE_WRITE_LINE_MEMBER(coinlockout_w); - DECLARE_WRITE8_MEMBER(videoram_w); + void videoram_w(offs_t offset, uint8_t data); INTERRUPT_GEN_MEMBER(interrupt); diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 6a571c82c58..ea13697dc32 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -51,15 +51,15 @@ private: uint8_t m_yscroll[2]; uint8_t m_irq_mask; - DECLARE_WRITE8_MEMBER(soundlatch_w); - DECLARE_WRITE8_MEMBER(e0xx_w); - DECLARE_READ8_MEMBER(debug_output_area_r); - DECLARE_READ8_MEMBER(some_changing_input); - DECLARE_WRITE8_MEMBER(background_videoram_w); - DECLARE_WRITE8_MEMBER(background_colorram_w); - DECLARE_WRITE8_MEMBER(txtram_w); - DECLARE_WRITE8_MEMBER(xscroll_w); - DECLARE_WRITE8_MEMBER(yscroll_w); + void soundlatch_w(uint8_t data); + void e0xx_w(offs_t offset, uint8_t data); + uint8_t debug_output_area_r(offs_t offset); + uint8_t some_changing_input(); + void background_videoram_w(offs_t offset, uint8_t data); + void background_colorram_w(offs_t offset, uint8_t data); + void txtram_w(offs_t offset, uint8_t data); + void xscroll_w(offs_t offset, uint8_t data); + void yscroll_w(offs_t offset, uint8_t data); uint8_t soundlatch_r(); uint8_t soundtimer_r(); diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 9852cc87ce6..d72920236d8 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -59,12 +59,12 @@ private: std::unique_ptr<uint16_t[]> m_spriteram2_old; std::unique_ptr<uint16_t[]> m_spriteram2_older; - DECLARE_READ16_MEMBER(pending_command_r); + uint16_t pending_command_r(); void unknown_output_w(uint8_t data); - DECLARE_WRITE8_MEMBER(sh_bankswitch_w); - DECLARE_WRITE8_MEMBER(spritebank_w); - DECLARE_WRITE16_MEMBER(tileregs_w); - DECLARE_WRITE16_MEMBER(bgvideoram_w); + void sh_bankswitch_w(uint8_t data); + void spritebank_w(offs_t offset, uint8_t data); + void tileregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(bg_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_rows); diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 3cc08ead1da..ccc5e22363c 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -30,14 +30,14 @@ public: void targeth(machine_config &config); private: - DECLARE_WRITE8_MEMBER(oki_bankswitch_w); - DECLARE_WRITE16_MEMBER(output_latch_w); + void oki_bankswitch_w(uint8_t data); + void output_latch_w(offs_t offset, uint16_t data); DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); - DECLARE_WRITE8_MEMBER(shareram_w); - DECLARE_READ8_MEMBER(shareram_r); + void shareram_w(offs_t offset, uint8_t data); + uint8_t shareram_r(offs_t offset); - DECLARE_WRITE16_MEMBER(vram_w); + void vram_w(offs_t offset, uint16_t data); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index 69ccaed72e0..021fa988e58 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -33,7 +33,7 @@ public: , m_subregion(*this, "slave_rom") { } - DECLARE_WRITE8_MEMBER(hd6445_crt_w); + void hd6445_crt_w(offs_t offset, uint8_t data); INTERRUPT_GEN_MEMBER(v30_interrupt); TILE_GET_INFO_MEMBER(get_text_tile_info); @@ -60,13 +60,13 @@ protected: tilemap_t *m_tx_layer; bitmap_rgb32 m_temp_bitmap; std::unique_ptr<uint8_t[]> m_shadow_pen_array; - DECLARE_WRITE16_MEMBER(text_w); - DECLARE_READ16_MEMBER(tatsumi_v30_68000_r); - DECLARE_WRITE16_MEMBER(tatsumi_v30_68000_w); - DECLARE_READ16_MEMBER(tatsumi_sprite_control_r); - DECLARE_WRITE16_MEMBER(tatsumi_sprite_control_w); + void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t tatsumi_v30_68000_r(offs_t offset); + void tatsumi_v30_68000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t tatsumi_sprite_control_r(offs_t offset); + void tatsumi_sprite_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ8_MEMBER(tatsumi_hack_ym2151_r); + uint8_t tatsumi_hack_ym2151_r(); void tatsumi_reset(); template<class _BitmapClass> void draw_sprites(_BitmapClass &bitmap, const rectangle &cliprect, int write_priority_only, int rambank); @@ -99,17 +99,17 @@ public: void init_apache3(); private: - DECLARE_READ16_MEMBER(apache3_bank_r); - DECLARE_WRITE16_MEMBER(apache3_bank_w); - DECLARE_WRITE16_MEMBER(apache3_z80_ctrl_w); - DECLARE_READ16_MEMBER(apache3_v30_v20_r); - DECLARE_WRITE16_MEMBER(apache3_v30_v20_w); - DECLARE_READ16_MEMBER(apache3_z80_r); - DECLARE_WRITE16_MEMBER(apache3_z80_w); + uint16_t apache3_bank_r(); + void apache3_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void apache3_z80_ctrl_w(uint16_t data); + uint16_t apache3_v30_v20_r(offs_t offset); + void apache3_v30_v20_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t apache3_z80_r(offs_t offset); + void apache3_z80_w(offs_t offset, uint16_t data); uint8_t apache3_vr1_r(); - DECLARE_WRITE16_MEMBER(apache3_rotate_w); - DECLARE_WRITE16_MEMBER(apache3_road_z_w); - DECLARE_WRITE8_MEMBER(apache3_road_x_w); + void apache3_rotate_w(uint16_t data); + void apache3_road_z_w(uint16_t data); + void apache3_road_x_w(offs_t offset, uint8_t data); DECLARE_MACHINE_RESET(apache3); DECLARE_VIDEO_START(apache3); @@ -159,12 +159,12 @@ public: void init_roundup5(); private: - DECLARE_READ16_MEMBER(roundup_v30_z80_r); - DECLARE_WRITE16_MEMBER(roundup_v30_z80_w); - DECLARE_WRITE16_MEMBER(roundup5_control_w); - DECLARE_WRITE16_MEMBER(road_vregs_w); - DECLARE_READ8_MEMBER(gfxdata_r); - DECLARE_WRITE8_MEMBER(gfxdata_w); + uint16_t roundup_v30_z80_r(offs_t offset); + void roundup_v30_z80_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void roundup5_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void road_vregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t gfxdata_r(offs_t offset); + void gfxdata_w(offs_t offset, uint8_t data); void output_w(uint8_t data); DECLARE_VIDEO_START(roundup5); @@ -214,18 +214,18 @@ protected: virtual void machine_reset() override; private: - DECLARE_READ16_MEMBER(cyclwarr_sprite_r); - DECLARE_WRITE16_MEMBER(cyclwarr_sprite_w); - DECLARE_WRITE16_MEMBER(video_config_w); - DECLARE_WRITE16_MEMBER(bigfight_a40000_w); - DECLARE_WRITE16_MEMBER(mixing_control_w); + uint16_t cyclwarr_sprite_r(offs_t offset); + void cyclwarr_sprite_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void video_config_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bigfight_a40000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void mixing_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void cyclwarr_control_w(uint8_t data); - DECLARE_WRITE8_MEMBER(cyclwarr_sound_w); - DECLARE_WRITE16_MEMBER(output_w); - DECLARE_READ8_MEMBER(oki_status_xor_r); + void cyclwarr_sound_w(uint8_t data); + void output_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t oki_status_xor_r(); - template<int Bank> DECLARE_READ16_MEMBER(cyclwarr_videoram_r); - template<int Bank> DECLARE_WRITE16_MEMBER(cyclwarr_videoram_w); + template<int Bank> uint16_t cyclwarr_videoram_r(offs_t offset); + template<int Bank> void cyclwarr_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); template<int Bank> TILE_GET_INFO_MEMBER(get_tile_info_bigfight); template<int Bank> TILE_GET_INFO_MEMBER(get_tile_info_cyclwarr_road); diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 8eb7ce5f151..7f10d2f9f09 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -63,24 +63,24 @@ private: int m_adpcm_end[2]; int m_adpcm_data[2]; - DECLARE_WRITE8_MEMBER(coincounter_w); - DECLARE_WRITE8_MEMBER(boardb_bankswitch_w); - DECLARE_WRITE8_MEMBER(boardc_bankswitch_w); - DECLARE_WRITE8_MEMBER(trigger_nmi); - DECLARE_WRITE8_MEMBER(adpcm_start_w); - DECLARE_WRITE8_MEMBER(adpcm_end_w); - DECLARE_WRITE8_MEMBER(adpcm_vol_w); - DECLARE_WRITE8_MEMBER(txvideoram_w); - DECLARE_WRITE8_MEMBER(bg2videoram_w); - DECLARE_WRITE8_MEMBER(bgxscroll_lo); - DECLARE_WRITE8_MEMBER(bgxscroll_hi); - DECLARE_WRITE8_MEMBER(bgyscroll_lo); - DECLARE_WRITE8_MEMBER(bgyscroll_hi); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(bg2xscroll_lo); - DECLARE_WRITE8_MEMBER(bg2xscroll_hi); - DECLARE_WRITE8_MEMBER(bg2yscroll_lo); - DECLARE_WRITE8_MEMBER(bg2yscroll_hi); + void coincounter_w(uint8_t data); + void boardb_bankswitch_w(uint8_t data); + void boardc_bankswitch_w(uint8_t data); + void trigger_nmi(uint8_t data); + void adpcm_start_w(offs_t offset, uint8_t data); + void adpcm_end_w(offs_t offset, uint8_t data); + void adpcm_vol_w(offs_t offset, uint8_t data); + void txvideoram_w(offs_t offset, uint8_t data); + void bg2videoram_w(offs_t offset, uint8_t data); + void bgxscroll_lo(uint8_t data); + void bgxscroll_hi(uint8_t data); + void bgyscroll_lo(uint8_t data); + void bgyscroll_hi(uint8_t data); + void bgvideoram_w(offs_t offset, uint8_t data); + void bg2xscroll_lo(uint8_t data); + void bg2xscroll_hi(uint8_t data); + void bg2yscroll_lo(uint8_t data); + void bg2yscroll_hi(uint8_t data); TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 7b56d27d468..c018da7d105 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -62,22 +62,22 @@ private: std::unique_ptr<uint8_t[]> m_decoded_16; std::unique_ptr<uint8_t[]> m_decoded_32; int m_is_mask_spr[1024/16]; - DECLARE_READ8_MEMBER(m68k_shared_r); - DECLARE_WRITE8_MEMBER(m68k_shared_w); - DECLARE_WRITE8_MEMBER(m6809_irq_enable_w); - DECLARE_WRITE8_MEMBER(m6809_irq_disable_w); - DECLARE_WRITE16_MEMBER(m68k_irq_enable_w); - DECLARE_WRITE8_MEMBER(mcu_irq_enable_w); - DECLARE_WRITE8_MEMBER(mcu_irq_disable_w); - DECLARE_READ8_MEMBER(dsw0_r); - DECLARE_READ8_MEMBER(dsw1_r); - DECLARE_READ8_MEMBER(input0_r); - DECLARE_READ8_MEMBER(input1_r); - DECLARE_WRITE8_MEMBER(tceptor_tile_ram_w); - DECLARE_WRITE8_MEMBER(tceptor_tile_attr_w); - DECLARE_WRITE8_MEMBER(tceptor_bg_ram_w); - DECLARE_WRITE8_MEMBER(tceptor_bg_scroll_w); - DECLARE_WRITE8_MEMBER(tceptor2_shutter_w); + uint8_t m68k_shared_r(offs_t offset); + void m68k_shared_w(offs_t offset, uint8_t data); + void m6809_irq_enable_w(uint8_t data); + void m6809_irq_disable_w(uint8_t data); + void m68k_irq_enable_w(uint16_t data); + void mcu_irq_enable_w(uint8_t data); + void mcu_irq_disable_w(uint8_t data); + uint8_t dsw0_r(); + uint8_t dsw1_r(); + uint8_t input0_r(); + uint8_t input1_r(); + void tceptor_tile_ram_w(offs_t offset, uint8_t data); + void tceptor_tile_attr_w(offs_t offset, uint8_t data); + void tceptor_bg_ram_w(offs_t offset, uint8_t data); + void tceptor_bg_scroll_w(offs_t offset, uint8_t data); + void tceptor2_shutter_w(uint8_t data); void tile_mark_dirty(int offset); required_device<namco_c45_road_device> m_c45_road; diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h index f111e2db1c6..9b8164c92cb 100644 --- a/src/mame/includes/tdv2324.h +++ b/src/mame/includes/tdv2324.h @@ -75,9 +75,9 @@ private: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( tdv2324_main_io_30 ); - DECLARE_READ8_MEMBER( tdv2324_main_io_e6 ); - DECLARE_WRITE8_MEMBER( tdv2324_main_io_e2 ); + uint8_t tdv2324_main_io_30(); + uint8_t tdv2324_main_io_e6(); + void tdv2324_main_io_e2(uint8_t data); // video state required_shared_ptr<uint8_t> m_video_ram; diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index f73fa14731b..4c8d591fbaf 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -76,20 +76,20 @@ private: int m_adpcm_data; int m_video_type; - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(adpcm_end_w); - DECLARE_READ8_MEMBER(dswa_l_r); - DECLARE_READ8_MEMBER(dswa_h_r); - DECLARE_READ8_MEMBER(dswb_l_r); - DECLARE_READ8_MEMBER(dswb_h_r); - DECLARE_WRITE8_MEMBER(txvideoram_w); - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(fgscroll_w); - DECLARE_WRITE8_MEMBER(bgscroll_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(adpcm_start_w); - DECLARE_WRITE8_MEMBER(adpcm_vol_w); + void bankswitch_w(uint8_t data); + void adpcm_end_w(uint8_t data); + uint8_t dswa_l_r(); + uint8_t dswa_h_r(); + uint8_t dswb_l_r(); + uint8_t dswb_h_r(); + void txvideoram_w(offs_t offset, uint8_t data); + void fgvideoram_w(offs_t offset, uint8_t data); + void bgvideoram_w(offs_t offset, uint8_t data); + void fgscroll_w(offs_t offset, uint8_t data); + void bgscroll_w(offs_t offset, uint8_t data); + void flipscreen_w(uint8_t data); + void adpcm_start_w(uint8_t data); + void adpcm_vol_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(adpcm_int); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index aa924f59b8a..bddd55d8f96 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -68,18 +68,18 @@ private: uint16_t m_scroll_char_x_w; uint16_t m_scroll_char_y_w; - DECLARE_WRITE16_MEMBER(videoram_w); - DECLARE_WRITE16_MEMBER(colorram_w); - DECLARE_WRITE16_MEMBER(videoram2_w); - DECLARE_WRITE16_MEMBER(colorram2_w); - DECLARE_WRITE16_MEMBER(charram_w); - DECLARE_WRITE16_MEMBER(flipscreen_w); - DECLARE_WRITE16_MEMBER(scroll_x_w); - DECLARE_WRITE16_MEMBER(scroll_y_w); - DECLARE_WRITE16_MEMBER(scroll2_x_w); - DECLARE_WRITE16_MEMBER(scroll2_y_w); - DECLARE_WRITE16_MEMBER(scroll_char_x_w); - DECLARE_WRITE16_MEMBER(scroll_char_y_w); + void videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void colorram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void colorram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void charram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void flipscreen_w(uint16_t data); + void scroll_x_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scroll_y_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scroll2_x_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scroll2_y_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scroll_char_x_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scroll_char_y_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(fg_get_tile_info); TILE_GET_INFO_MEMBER(bg_get_tile_info); diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 54014ee8645..5560d0e0fc7 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -89,21 +89,21 @@ private: const struct prot_data* m_device_data; u8 m_device_value; - DECLARE_READ8_MEMBER(sound_command_pending_r); - DECLARE_WRITE8_MEMBER(sound_nmi_disable_w); - DECLARE_WRITE16_MEMBER(unk880000_w); - DECLARE_READ16_MEMBER(unk880000_r); - DECLARE_WRITE8_MEMBER(z80_bank_w); - DECLARE_WRITE8_MEMBER(oki_bank_w); - DECLARE_READ16_MEMBER(prot_status_r); - DECLARE_WRITE16_MEMBER(prot_status_w); - DECLARE_READ16_MEMBER(prot_data_r); - DECLARE_WRITE16_MEMBER(prot_data_w); - template<int Layer> DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_WRITE16_MEMBER(tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w); - template<int Layer> DECLARE_WRITE16_MEMBER(lineram_w); - DECLARE_READ16_MEMBER(eeprom_r); - DECLARE_WRITE16_MEMBER(eeprom_w); + u8 sound_command_pending_r(); + void sound_nmi_disable_w(u8 data); + void unk880000_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 unk880000_r(offs_t offset); + void z80_bank_w(u8 data); + void oki_bank_w(u8 data); + u16 prot_status_r(offs_t offset, u16 mem_mask = ~0); + void prot_status_w(u16 data); + u16 prot_data_r(); + void prot_data_w(u16 data); + template<int Layer> void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w(offs_t offset, u16 data, u16 mem_mask = ~0); + template<int Layer> void lineram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 eeprom_r(); + void eeprom_w(offs_t offset, u16 data, u16 mem_mask = ~0); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index cc10d80b7b9..b2687200539 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -74,22 +74,22 @@ private: tilemap_t *m_fg_tilemap; emu_timer *m_reset_timer; - DECLARE_WRITE8_MEMBER(sub_cpu_halt_w); - DECLARE_READ8_MEMBER(track_0_r); - DECLARE_READ8_MEMBER(track_1_r); - DECLARE_WRITE8_MEMBER(track_0_reset_w); - DECLARE_WRITE8_MEMBER(track_1_reset_w); - DECLARE_WRITE8_MEMBER(sound_command_w); - DECLARE_WRITE8_MEMBER(sound_answer_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); - DECLARE_WRITE8_MEMBER(videoram2_w); - DECLARE_WRITE8_MEMBER(scroll_x_w); - DECLARE_WRITE8_MEMBER(scroll_y_w); - DECLARE_WRITE8_MEMBER(flipscreen_x_w); - DECLARE_WRITE8_MEMBER(flipscreen_y_w); - DECLARE_WRITE8_MEMBER(gridiron_led0_w); - DECLARE_WRITE8_MEMBER(gridiron_led1_w); + void sub_cpu_halt_w(uint8_t data); + uint8_t track_0_r(offs_t offset); + uint8_t track_1_r(offs_t offset); + void track_0_reset_w(offs_t offset, uint8_t data); + void track_1_reset_w(offs_t offset, uint8_t data); + void sound_command_w(uint8_t data); + void sound_answer_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 scroll_x_w(offs_t offset, uint8_t data); + void scroll_y_w(uint8_t data); + void flipscreen_x_w(uint8_t data); + void flipscreen_y_w(uint8_t data); + void gridiron_led0_w(uint8_t data); + void gridiron_led1_w(uint8_t data); uint8_t portA_r(); uint8_t portB_r(); void portA_w(uint8_t data); diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 04634a678a2..d8dc382b101 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -47,13 +47,13 @@ private: uint16_t m_yscroll; tilemap_t *m_background; tilemap_t *m_foreground; - DECLARE_WRITE16_MEMBER(amazon_sound_w); - DECLARE_READ8_MEMBER(soundlatch_clear_r); - DECLARE_WRITE16_MEMBER(amazon_background_w); - DECLARE_WRITE16_MEMBER(amazon_foreground_w); - DECLARE_WRITE16_MEMBER(amazon_flipscreen_w); - DECLARE_WRITE16_MEMBER(amazon_scrolly_w); - DECLARE_WRITE16_MEMBER(amazon_scrollx_w); + void amazon_sound_w(uint16_t data); + uint8_t soundlatch_clear_r(); + void amazon_background_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void amazon_foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void amazon_flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void amazon_scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void amazon_scrollx_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); virtual void video_start() override; diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index c69db37bad7..79eebe99f69 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -59,36 +59,36 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_rot); protected: - DECLARE_WRITE16_MEMBER(rockn_systemregs_w); - DECLARE_WRITE16_MEMBER(rocknms_sub_systemregs_w); - DECLARE_READ16_MEMBER(rockn_adpcmbank_r); - DECLARE_WRITE16_MEMBER(rockn_adpcmbank_w); - DECLARE_WRITE16_MEMBER(rockn2_adpcmbank_w); - DECLARE_READ16_MEMBER(rockn_soundvolume_r); - DECLARE_WRITE16_MEMBER(rockn_soundvolume_w); - DECLARE_WRITE16_MEMBER(nndmseal_sound_bank_w); - DECLARE_READ16_MEMBER(tetrisp2_ip_1_word_r); - DECLARE_READ16_MEMBER(rockn_nvram_r); - DECLARE_READ16_MEMBER(rocknms_main2sub_r); - DECLARE_WRITE16_MEMBER(rocknms_main2sub_w); - DECLARE_WRITE16_MEMBER(rocknms_sub2main_w); - DECLARE_WRITE16_MEMBER(tetrisp2_coincounter_w); - DECLARE_WRITE16_MEMBER(nndmseal_coincounter_w); - DECLARE_WRITE16_MEMBER(nndmseal_b20000_w); - DECLARE_WRITE16_MEMBER(tetrisp2_systemregs_w); - DECLARE_READ16_MEMBER(tetrisp2_nvram_r); - DECLARE_WRITE16_MEMBER(tetrisp2_nvram_w); - DECLARE_WRITE16_MEMBER(tetrisp2_palette_w); - DECLARE_WRITE16_MEMBER(rocknms_sub_palette_w); - DECLARE_WRITE16_MEMBER(tetrisp2_priority_w); - DECLARE_WRITE16_MEMBER(rocknms_sub_priority_w); - DECLARE_READ16_MEMBER(tetrisp2_priority_r); - DECLARE_WRITE16_MEMBER(tetrisp2_vram_bg_w); - DECLARE_WRITE16_MEMBER(tetrisp2_vram_fg_w); - DECLARE_WRITE16_MEMBER(tetrisp2_vram_rot_w); - DECLARE_WRITE16_MEMBER(rocknms_sub_vram_bg_w); - DECLARE_WRITE16_MEMBER(rocknms_sub_vram_fg_w); - DECLARE_WRITE16_MEMBER(rocknms_sub_vram_rot_w); + void rockn_systemregs_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub_systemregs_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 rockn_adpcmbank_r(); + void rockn_adpcmbank_w(u16 data); + void rockn2_adpcmbank_w(u16 data); + u16 rockn_soundvolume_r(); + void rockn_soundvolume_w(u16 data); + void nndmseal_sound_bank_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 tetrisp2_ip_1_word_r(); + u16 rockn_nvram_r(offs_t offset); + u16 rocknms_main2sub_r(); + void rocknms_main2sub_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub2main_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void tetrisp2_coincounter_w(u16 data); + void nndmseal_coincounter_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void nndmseal_b20000_w(u16 data); + void tetrisp2_systemregs_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 tetrisp2_nvram_r(offs_t offset); + void tetrisp2_nvram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void tetrisp2_palette_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub_palette_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void tetrisp2_priority_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub_priority_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 tetrisp2_priority_r(offs_t offset); + void tetrisp2_vram_bg_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void tetrisp2_vram_fg_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void tetrisp2_vram_rot_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub_vram_bg_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub_vram_fg_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void rocknms_sub_vram_rot_w(offs_t offset, u16 data, u16 mem_mask = ~0); TILE_GET_INFO_MEMBER(get_tile_info_fg); @@ -200,22 +200,22 @@ public: DECLARE_VIDEO_START(stepstag); private: - DECLARE_READ16_MEMBER(stepstag_coins_r); + u16 stepstag_coins_r(); u16 vj_upload_idx; bool vj_upload_fini; - DECLARE_WRITE16_MEMBER(stepstag_b00000_w); - DECLARE_WRITE16_MEMBER(stepstag_b20000_w); - DECLARE_WRITE16_MEMBER(stepstag_main2pc_w); - DECLARE_READ16_MEMBER(unknown_read_0xc00000); - DECLARE_READ16_MEMBER(unknown_read_0xffff00); - DECLARE_READ16_MEMBER(stepstag_pc2main_r); - DECLARE_WRITE16_MEMBER(stepstag_soundlatch_word_w); - DECLARE_WRITE16_MEMBER(stepstag_neon_w); - DECLARE_WRITE16_MEMBER(stepstag_step_leds_w); - DECLARE_WRITE16_MEMBER(stepstag_button_leds_w); - DECLARE_WRITE16_MEMBER( stepstag_palette_left_w ); - DECLARE_WRITE16_MEMBER( stepstag_palette_mid_w ); - DECLARE_WRITE16_MEMBER( stepstag_palette_right_w ); + void stepstag_b00000_w(u16 data); + void stepstag_b20000_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void stepstag_main2pc_w(u16 data); + u16 unknown_read_0xc00000(); + u16 unknown_read_0xffff00(); + u16 stepstag_pc2main_r(); + void stepstag_soundlatch_word_w(u16 data); + void stepstag_neon_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void stepstag_step_leds_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void stepstag_button_leds_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void stepstag_palette_left_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void stepstag_palette_mid_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void stepstag_palette_right_w(offs_t offset, u16 data, u16 mem_mask = ~0); u32 screen_update_stepstag_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); u32 screen_update_stepstag_mid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 787f1980e74..890f9c1ac84 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -68,13 +68,13 @@ private: uint8_t m_mcu_p3; int m_coin_result; - DECLARE_READ8_MEMBER(protection_r); - DECLARE_WRITE8_MEMBER(protection_w); - DECLARE_READ8_MEMBER(e004_r); - DECLARE_WRITE8_MEMBER(nmi_w); - DECLARE_WRITE8_MEMBER(e100_w); + uint8_t protection_r(); + void protection_w(uint8_t data); + uint8_t e004_r(); + void nmi_w(uint8_t data); + void e100_w(uint8_t data); - DECLARE_WRITE8_MEMBER(textram_w); + void textram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 08a41e664f3..838f0f311ed 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -63,16 +63,16 @@ private: DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); DECLARE_WRITE_LINE_MEMBER(sound_enable_w); DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); - DECLARE_READ8_MEMBER(input_port_0_r); + uint8_t input_port_0_r(); - DECLARE_READ8_MEMBER(intrepid_colorram_mirror_r); + uint8_t intrepid_colorram_mirror_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(intrepid_graphics_bank_w); - DECLARE_READ8_MEMBER(rtriv_question_r); + uint8_t rtriv_question_r(offs_t offset); TILE_GET_INFO_MEMBER(solid_get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 2ec835888cf..94ca9754e4b 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -40,17 +40,17 @@ private: coprocessor_t m_coprocessor; void thief_input_select_w(uint8_t data); uint8_t thief_io_r(); - DECLARE_READ8_MEMBER(thief_context_ram_r); - DECLARE_WRITE8_MEMBER(thief_context_ram_w); - DECLARE_WRITE8_MEMBER(thief_context_bank_w); - DECLARE_WRITE8_MEMBER(thief_video_control_w); - DECLARE_WRITE8_MEMBER(thief_color_map_w); - DECLARE_WRITE8_MEMBER(thief_color_plane_w); - DECLARE_READ8_MEMBER(thief_videoram_r); - DECLARE_WRITE8_MEMBER(thief_videoram_w); - DECLARE_WRITE8_MEMBER(thief_blit_w); - DECLARE_READ8_MEMBER(thief_coprocessor_r); - DECLARE_WRITE8_MEMBER(thief_coprocessor_w); + uint8_t thief_context_ram_r(offs_t offset); + void thief_context_ram_w(offs_t offset, uint8_t data); + void thief_context_bank_w(uint8_t data); + void thief_video_control_w(uint8_t data); + void thief_color_map_w(offs_t offset, uint8_t data); + void thief_color_plane_w(uint8_t data); + uint8_t thief_videoram_r(offs_t offset); + void thief_videoram_w(offs_t offset, uint8_t data); + void thief_blit_w(uint8_t data); + uint8_t thief_coprocessor_r(offs_t offset); + void thief_coprocessor_w(offs_t offset, uint8_t data); void tape_control_w(uint8_t data); virtual void video_start() override; uint32_t screen_update_thief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index c452eb2e86b..430d6ea6f43 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -211,8 +211,8 @@ private: DECLARE_WRITE_LINE_MEMBER( to7_set_cassette_motor ); DECLARE_WRITE_LINE_MEMBER( mo5_set_cassette_motor ); DECLARE_WRITE_LINE_MEMBER( thom_dev_irq_0 ); - DECLARE_WRITE8_MEMBER( to7_cartridge_w ); - DECLARE_READ8_MEMBER( to7_cartridge_r ); + void to7_cartridge_w(offs_t offset, uint8_t data); + uint8_t to7_cartridge_r(offs_t offset); void to7_timer_port_out(uint8_t data); uint8_t to7_timer_port_in(); DECLARE_WRITE_LINE_MEMBER( to7_set_cassette ); @@ -221,17 +221,17 @@ private: uint8_t to7_sys_porta_in(); uint8_t to7_sys_portb_in(); DECLARE_WRITE_LINE_MEMBER( to7_modem_cb ); - DECLARE_WRITE_LINE_MEMBER( to7_modem_tx_w ); + DECLARE_WRITE_LINE_MEMBER( to7_modem_tx_w); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); - DECLARE_READ8_MEMBER( to7_modem_mea8000_r ); - DECLARE_WRITE8_MEMBER( to7_modem_mea8000_w ); + uint8_t to7_modem_mea8000_r(offs_t offset); + void to7_modem_mea8000_w(offs_t offset, uint8_t data); uint8_t to7_game_porta_in(); uint8_t to7_game_portb_in(); void to7_game_portb_out(uint8_t data); DECLARE_WRITE_LINE_MEMBER( to7_game_cb2_out ); TIMER_CALLBACK_MEMBER( to7_game_update_cb ); - DECLARE_READ8_MEMBER( to7_midi_r ); - DECLARE_WRITE8_MEMBER( to7_midi_w ); + uint8_t to7_midi_r(); + void to7_midi_w(uint8_t data); DECLARE_MACHINE_RESET( to7 ); DECLARE_MACHINE_START( to7 ); DECLARE_WRITE_LINE_MEMBER( to770_sys_cb2_out ); @@ -240,8 +240,8 @@ private: void to770_update_ram_bank_postload(); void to770_sys_portb_out(uint8_t data); void to770_timer_port_out(uint8_t data); - DECLARE_READ8_MEMBER( to770_gatearray_r ); - DECLARE_WRITE8_MEMBER( to770_gatearray_w ); + uint8_t to770_gatearray_r(offs_t offset); + void to770_gatearray_w(offs_t offset, uint8_t data); DECLARE_MACHINE_RESET( to770 ); DECLARE_MACHINE_START( to770 ); void to7_lightpen_cb( int step ); @@ -250,26 +250,26 @@ private: void mo5_sys_porta_out(uint8_t data); uint8_t mo5_sys_porta_in(); uint8_t mo5_sys_portb_in(); - DECLARE_READ8_MEMBER( mo5_gatearray_r ); - DECLARE_WRITE8_MEMBER( mo5_gatearray_w ); + uint8_t mo5_gatearray_r(offs_t offset); + void mo5_gatearray_w(offs_t offset, uint8_t data); void mo5_update_cart_bank_postload(); - DECLARE_WRITE8_MEMBER( mo5_cartridge_w ); - DECLARE_READ8_MEMBER( mo5_cartridge_r ); - DECLARE_WRITE8_MEMBER( mo5_ext_w ); + void mo5_cartridge_w(offs_t offset, uint8_t data); + uint8_t mo5_cartridge_r(offs_t offset); + void mo5_ext_w(uint8_t data); DECLARE_MACHINE_RESET( mo5 ); DECLARE_MACHINE_START( mo5 ); - DECLARE_WRITE8_MEMBER( to9_ieee_w ); - DECLARE_READ8_MEMBER( to9_ieee_r ); - DECLARE_READ8_MEMBER( to9_gatearray_r ); - DECLARE_WRITE8_MEMBER( to9_gatearray_w ); - DECLARE_READ8_MEMBER( to9_vreg_r ); - DECLARE_WRITE8_MEMBER( to9_vreg_w ); + void to9_ieee_w(offs_t offset, uint8_t data); + uint8_t to9_ieee_r(offs_t offset); + uint8_t to9_gatearray_r(offs_t offset); + void to9_gatearray_w(offs_t offset, uint8_t data); + uint8_t to9_vreg_r(offs_t offset); + void to9_vreg_w(offs_t offset, uint8_t data); void to9_update_cart_bank_postload(); - DECLARE_WRITE8_MEMBER( to9_cartridge_w ); - DECLARE_READ8_MEMBER( to9_cartridge_r ); + void to9_cartridge_w(offs_t offset, uint8_t data); + uint8_t to9_cartridge_r(offs_t offset); void to9_update_ram_bank_postload(); - DECLARE_READ8_MEMBER( to9_kbd_r ); - DECLARE_WRITE8_MEMBER( to9_kbd_w ); + uint8_t to9_kbd_r(offs_t offset); + void to9_kbd_w(offs_t offset, uint8_t data); TIMER_CALLBACK_MEMBER( to9_kbd_timer_cb ); uint8_t to9_sys_porta_in(); void to9_sys_porta_out(uint8_t data); @@ -281,14 +281,14 @@ private: void to8_update_floppy_bank_postload(); void to8_update_ram_bank_postload(); void to8_update_cart_bank_postload(); - DECLARE_WRITE8_MEMBER( to8_cartridge_w ); - DECLARE_READ8_MEMBER( to8_cartridge_r ); - DECLARE_READ8_MEMBER( to8_floppy_r ); - DECLARE_WRITE8_MEMBER( to8_floppy_w ); - DECLARE_READ8_MEMBER( to8_gatearray_r ); - DECLARE_WRITE8_MEMBER( to8_gatearray_w ); - DECLARE_READ8_MEMBER( to8_vreg_r ); - DECLARE_WRITE8_MEMBER( to8_vreg_w ); + void to8_cartridge_w(offs_t offset, uint8_t data); + uint8_t to8_cartridge_r(offs_t offset); + uint8_t to8_floppy_r(offs_t offset); + void to8_floppy_w(offs_t offset, uint8_t data); + uint8_t to8_gatearray_r(offs_t offset); + void to8_gatearray_w(offs_t offset, uint8_t data); + uint8_t to8_vreg_r(offs_t offset); + void to8_vreg_w(offs_t offset, uint8_t data); uint8_t to8_sys_porta_in(); void to8_sys_portb_out(uint8_t data); uint8_t to8_timer_port_in(); @@ -303,9 +303,9 @@ private: DECLARE_MACHINE_START( to9p ); void mo6_update_ram_bank_postload(); void mo6_update_cart_bank_postload(); - DECLARE_WRITE8_MEMBER( mo6_cartridge_w ); - DECLARE_READ8_MEMBER( mo6_cartridge_r ); - DECLARE_WRITE8_MEMBER( mo6_ext_w ); + void mo6_cartridge_w(offs_t offset, uint8_t data); + uint8_t mo6_cartridge_r(offs_t offset); + void mo6_ext_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( mo6_centronics_busy ); void mo6_game_porta_out(uint8_t data); DECLARE_WRITE_LINE_MEMBER( mo6_game_cb2_out ); @@ -314,16 +314,16 @@ private: uint8_t mo6_sys_portb_in(); void mo6_sys_porta_out(uint8_t data); DECLARE_WRITE_LINE_MEMBER( mo6_sys_cb2_out ); - DECLARE_READ8_MEMBER( mo6_gatearray_r ); - DECLARE_WRITE8_MEMBER( mo6_gatearray_w ); - DECLARE_READ8_MEMBER( mo6_vreg_r ); - DECLARE_WRITE8_MEMBER( mo6_vreg_w ); + uint8_t mo6_gatearray_r(offs_t offset); + void mo6_gatearray_w(offs_t offset, uint8_t data); + uint8_t mo6_vreg_r(offs_t offset); + void mo6_vreg_w(offs_t offset, uint8_t data); DECLARE_MACHINE_RESET( mo6 ); DECLARE_MACHINE_START( mo6 ); - DECLARE_READ8_MEMBER( mo5nr_net_r ); - DECLARE_WRITE8_MEMBER( mo5nr_net_w ); - DECLARE_READ8_MEMBER( mo5nr_prn_r ); - DECLARE_WRITE8_MEMBER( mo5nr_prn_w ); + uint8_t mo5nr_net_r(offs_t offset); + void mo5nr_net_w(offs_t offset, uint8_t data); + uint8_t mo5nr_prn_r(); + void mo5nr_prn_w(uint8_t data); uint8_t mo5nr_sys_portb_in(); void mo5nr_sys_porta_out(uint8_t data); DECLARE_MACHINE_RESET( mo5nr ); @@ -332,15 +332,15 @@ private: TIMER_CALLBACK_MEMBER( thom_lightpen_step ); TIMER_CALLBACK_MEMBER( thom_scanline_start ); uint32_t screen_update_thom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER( to7_vram_w ); - DECLARE_WRITE8_MEMBER( to770_vram_w ); - DECLARE_WRITE8_MEMBER( to8_sys_lo_w ); - DECLARE_WRITE8_MEMBER( to8_sys_hi_w ); - DECLARE_WRITE8_MEMBER( to8_data_lo_w ); - DECLARE_WRITE8_MEMBER( to8_data_hi_w ); - DECLARE_WRITE8_MEMBER( to8_vcart_w ); - DECLARE_WRITE8_MEMBER( mo6_vcart_lo_w ); - DECLARE_WRITE8_MEMBER( mo6_vcart_hi_w ); + void to7_vram_w(offs_t offset, uint8_t data); + void to770_vram_w(offs_t offset, uint8_t data); + void to8_sys_lo_w(offs_t offset, uint8_t data); + void to8_sys_hi_w(offs_t offset, uint8_t data); + void to8_data_lo_w(offs_t offset, uint8_t data); + void to8_data_hi_w(offs_t offset, uint8_t data); + void to8_vcart_w(offs_t offset, uint8_t data); + void mo6_vcart_lo_w(offs_t offset, uint8_t data); + void mo6_vcart_hi_w(offs_t offset, uint8_t data); TIMER_CALLBACK_MEMBER( thom_set_init ); DECLARE_WRITE_LINE_MEMBER(thom_vblank); @@ -360,10 +360,10 @@ private: void to7_floppy_w(offs_t offset, uint8_t data); uint8_t to9_floppy_r(offs_t offset); void to9_floppy_w(offs_t offset, uint8_t data); - WRITE_LINE_MEMBER( fdc_index_0_w ); - WRITE_LINE_MEMBER( fdc_index_1_w ); - WRITE_LINE_MEMBER( fdc_index_2_w ); - WRITE_LINE_MEMBER( fdc_index_3_w ); + WRITE_LINE_MEMBER( fdc_index_0_w); + WRITE_LINE_MEMBER( fdc_index_1_w); + WRITE_LINE_MEMBER( fdc_index_2_w); + WRITE_LINE_MEMBER( fdc_index_3_w); void thomson_index_callback(int index, int state); void thom_palette(palette_device &palette); void mo5_palette(palette_device &palette); diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index e3e98bdc7d8..7437665859c 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -29,15 +29,15 @@ public: void thoop2(machine_config &config); private: - DECLARE_WRITE8_MEMBER(oki_bankswitch_w); + void oki_bankswitch_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin1_lockout_w); DECLARE_WRITE_LINE_MEMBER(coin2_lockout_w); DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); - DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_WRITE8_MEMBER(shareram_w); - DECLARE_READ8_MEMBER(shareram_r); + void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void shareram_w(offs_t offset, uint8_t data); + uint8_t shareram_r(offs_t offset); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index dea00caf7b6..d7a04b93174 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -35,8 +35,8 @@ public: private: virtual void machine_start() override; DECLARE_WRITE_LINE_MEMBER(scanline_int_write_line); - DECLARE_READ16_MEMBER(special_port2_r); - DECLARE_WRITE16_MEMBER(latch_w); + uint16_t special_port2_r(); + void latch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(get_playfield2_tile_info); diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index a2555c44840..7c5016dce03 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -124,59 +124,59 @@ private: emu_timer *m_ti85_timer; emu_timer *m_ti83_1st_timer; emu_timer *m_ti83_2nd_timer; - DECLARE_READ8_MEMBER(ti85_port_0000_r); - DECLARE_READ8_MEMBER(ti8x_keypad_r); - DECLARE_READ8_MEMBER(ti85_port_0006_r); - DECLARE_READ8_MEMBER(ti8x_serial_r); - DECLARE_READ8_MEMBER(ti86_port_0005_r); - DECLARE_READ8_MEMBER(ti83_port_0000_r); - DECLARE_READ8_MEMBER(ti8x_plus_serial_r); - DECLARE_WRITE8_MEMBER(ti81_port_0007_w); - DECLARE_WRITE8_MEMBER(ti85_port_0000_w); - DECLARE_WRITE8_MEMBER(ti8x_keypad_w); - DECLARE_WRITE8_MEMBER(ti85_port_0002_w); - DECLARE_WRITE8_MEMBER(ti85_port_0003_w); - DECLARE_WRITE8_MEMBER(ti85_port_0004_w); - DECLARE_WRITE8_MEMBER(ti85_port_0005_w); - DECLARE_WRITE8_MEMBER(ti85_port_0006_w); - DECLARE_WRITE8_MEMBER(ti8x_serial_w); - DECLARE_WRITE8_MEMBER(ti86_port_0005_w); - DECLARE_WRITE8_MEMBER(ti86_port_0006_w); - DECLARE_WRITE8_MEMBER(ti82_port_0002_w); - DECLARE_WRITE8_MEMBER(ti83_port_0000_w); - DECLARE_WRITE8_MEMBER(ti83_port_0002_w); - DECLARE_WRITE8_MEMBER(ti83_port_0003_w); - DECLARE_WRITE8_MEMBER(ti8x_plus_serial_w); - DECLARE_WRITE8_MEMBER(ti83p_int_mask_w); - DECLARE_WRITE8_MEMBER(ti83p_port_0004_w); - DECLARE_WRITE8_MEMBER(ti83p_port_0006_w); - DECLARE_WRITE8_MEMBER(ti83p_port_0007_w); - DECLARE_WRITE8_MEMBER(ti83pse_int_ack_w); - DECLARE_WRITE8_MEMBER(ti83pse_port_0004_w); - DECLARE_WRITE8_MEMBER(ti83pse_port_0005_w); - DECLARE_WRITE8_MEMBER(ti83pse_port_0006_w); - DECLARE_WRITE8_MEMBER(ti83pse_port_0007_w); - DECLARE_WRITE8_MEMBER(ti83p_port_0014_w); - DECLARE_WRITE8_MEMBER(ti83pse_port_0020_w); - DECLARE_WRITE8_MEMBER(ti83pse_port_0021_w); - DECLARE_READ8_MEMBER(ti85_port_0002_r); - DECLARE_READ8_MEMBER(ti85_port_0003_r); - DECLARE_READ8_MEMBER(ti85_port_0004_r); - DECLARE_READ8_MEMBER(ti85_port_0005_r); - DECLARE_READ8_MEMBER(ti86_port_0006_r); - DECLARE_READ8_MEMBER(ti82_port_0002_r); - DECLARE_READ8_MEMBER(ti83_port_0002_r); - DECLARE_READ8_MEMBER(ti83_port_0003_r); - DECLARE_READ8_MEMBER(ti83p_port_0002_r); - DECLARE_READ8_MEMBER(ti83p_port_0004_r); - DECLARE_READ8_MEMBER(ti83pse_port_0002_r); - DECLARE_READ8_MEMBER(ti83pse_port_0005_r); - DECLARE_READ8_MEMBER(ti83pse_port_0009_r); - DECLARE_READ8_MEMBER(ti83pse_port_0015_r); - DECLARE_READ8_MEMBER(ti83pse_port_0020_r); - DECLARE_READ8_MEMBER(ti83pse_port_0021_r); - DECLARE_READ8_MEMBER(ti84pse_port_0055_r); - DECLARE_READ8_MEMBER(ti84pse_port_0056_r); + uint8_t ti85_port_0000_r(); + uint8_t ti8x_keypad_r(); + uint8_t ti85_port_0006_r(); + uint8_t ti8x_serial_r(); + uint8_t ti86_port_0005_r(); + uint8_t ti83_port_0000_r(); + uint8_t ti8x_plus_serial_r(); + void ti81_port_0007_w(uint8_t data); + void ti85_port_0000_w(uint8_t data); + void ti8x_keypad_w(uint8_t data); + void ti85_port_0002_w(uint8_t data); + void ti85_port_0003_w(uint8_t data); + void ti85_port_0004_w(uint8_t data); + void ti85_port_0005_w(uint8_t data); + void ti85_port_0006_w(uint8_t data); + void ti8x_serial_w(uint8_t data); + void ti86_port_0005_w(uint8_t data); + void ti86_port_0006_w(uint8_t data); + void ti82_port_0002_w(uint8_t data); + void ti83_port_0000_w(uint8_t data); + void ti83_port_0002_w(uint8_t data); + void ti83_port_0003_w(uint8_t data); + void ti8x_plus_serial_w(uint8_t data); + void ti83p_int_mask_w(uint8_t data); + void ti83p_port_0004_w(uint8_t data); + void ti83p_port_0006_w(uint8_t data); + void ti83p_port_0007_w(uint8_t data); + void ti83pse_int_ack_w(uint8_t data); + void ti83pse_port_0004_w(uint8_t data); + void ti83pse_port_0005_w(uint8_t data); + void ti83pse_port_0006_w(uint8_t data); + void ti83pse_port_0007_w(uint8_t data); + void ti83p_port_0014_w(uint8_t data); + void ti83pse_port_0020_w(uint8_t data); + void ti83pse_port_0021_w(uint8_t data); + uint8_t ti85_port_0002_r(); + uint8_t ti85_port_0003_r(); + uint8_t ti85_port_0004_r(); + uint8_t ti85_port_0005_r(); + uint8_t ti86_port_0006_r(); + uint8_t ti82_port_0002_r(); + uint8_t ti83_port_0002_r(); + uint8_t ti83_port_0003_r(); + uint8_t ti83p_port_0002_r(); + uint8_t ti83p_port_0004_r(); + uint8_t ti83pse_port_0002_r(); + uint8_t ti83pse_port_0005_r(); + uint8_t ti83pse_port_0009_r(); + uint8_t ti83pse_port_0015_r(); + uint8_t ti83pse_port_0020_r(); + uint8_t ti83pse_port_0021_r(); + uint8_t ti84pse_port_0055_r(); + uint8_t ti84pse_port_0056_r(); virtual void machine_start() override; virtual void video_start() override; void ti85_palette(palette_device &palette); @@ -202,24 +202,24 @@ private: emu_timer *m_crystal_timer1; emu_timer *m_crystal_timer2; emu_timer *m_crystal_timer3; - DECLARE_READ8_MEMBER(ti83pse_ctimer1_setup_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer1_setup_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer1_loop_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer1_loop_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer1_count_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer1_count_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer2_setup_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer2_setup_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer2_loop_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer2_loop_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer2_count_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer2_count_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer3_setup_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer3_setup_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer3_loop_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer3_loop_w); - DECLARE_READ8_MEMBER(ti83pse_ctimer3_count_r); - DECLARE_WRITE8_MEMBER(ti83pse_ctimer3_count_w); + uint8_t ti83pse_ctimer1_setup_r(); + void ti83pse_ctimer1_setup_w(uint8_t data); + uint8_t ti83pse_ctimer1_loop_r(); + void ti83pse_ctimer1_loop_w(uint8_t data); + uint8_t ti83pse_ctimer1_count_r(); + void ti83pse_ctimer1_count_w(uint8_t data); + uint8_t ti83pse_ctimer2_setup_r(); + void ti83pse_ctimer2_setup_w(uint8_t data); + uint8_t ti83pse_ctimer2_loop_r(); + void ti83pse_ctimer2_loop_w(uint8_t data); + uint8_t ti83pse_ctimer2_count_r(); + void ti83pse_ctimer2_count_w(uint8_t data); + uint8_t ti83pse_ctimer3_setup_r(); + void ti83pse_ctimer3_setup_w(uint8_t data); + uint8_t ti83pse_ctimer3_loop_r(); + void ti83pse_ctimer3_loop_w(uint8_t data); + uint8_t ti83pse_ctimer3_count_r(); + void ti83pse_ctimer3_count_w(uint8_t data); uint8_t ti83p_membank2_r(offs_t offset); uint8_t ti83p_membank3_r(offs_t offset); diff --git a/src/mame/includes/ti89.h b/src/mame/includes/ti89.h index 67bb638fbf2..9193feaf67a 100644 --- a/src/mame/includes/ti89.h +++ b/src/mame/includes/ti89.h @@ -90,11 +90,11 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint8_t keypad_r(); - DECLARE_WRITE16_MEMBER( ti68k_io_w ); - DECLARE_READ16_MEMBER( ti68k_io_r ); - DECLARE_WRITE16_MEMBER( ti68k_io2_w ); - DECLARE_READ16_MEMBER( ti68k_io2_r ); - DECLARE_READ16_MEMBER( rom_r ); + void ti68k_io_w(offs_t offset, uint16_t data); + uint16_t ti68k_io_r(offs_t offset); + void ti68k_io2_w(offs_t offset, uint16_t data); + uint16_t ti68k_io2_r(offs_t offset); + uint16_t rom_r(offs_t offset); uint16_t reset_overlay_r(offs_t offset); void ti68k_palette(palette_device &palette) const; diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index afb1a575d23..6cf46869505 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -45,18 +45,18 @@ private: tilemap_t *m_bg_tilemap2; std::unique_ptr<rgb_t[]> m_palette_ptr; void tiamc1_control_w(uint8_t data); - DECLARE_WRITE8_MEMBER(tiamc1_videoram_w); - DECLARE_WRITE8_MEMBER(tiamc1_bankswitch_w); - DECLARE_WRITE8_MEMBER(tiamc1_sprite_x_w); - DECLARE_WRITE8_MEMBER(tiamc1_sprite_y_w); - DECLARE_WRITE8_MEMBER(tiamc1_sprite_a_w); - DECLARE_WRITE8_MEMBER(tiamc1_sprite_n_w); - DECLARE_WRITE8_MEMBER(tiamc1_bg_vshift_w); - DECLARE_WRITE8_MEMBER(tiamc1_bg_hshift_w); - DECLARE_WRITE8_MEMBER(tiamc1_bg_bplctrl_w); - DECLARE_WRITE8_MEMBER(tiamc1_palette_w); - DECLARE_WRITE8_MEMBER(kot_bankswitch_w); - DECLARE_WRITE8_MEMBER(kot_videoram_w); + void tiamc1_videoram_w(offs_t offset, uint8_t data); + void tiamc1_bankswitch_w(uint8_t data); + void tiamc1_sprite_x_w(offs_t offset, uint8_t data); + void tiamc1_sprite_y_w(offs_t offset, uint8_t data); + void tiamc1_sprite_a_w(offs_t offset, uint8_t data); + void tiamc1_sprite_n_w(offs_t offset, uint8_t data); + void tiamc1_bg_vshift_w(uint8_t data); + void tiamc1_bg_hshift_w(uint8_t data); + void tiamc1_bg_bplctrl_w(uint8_t data); + void tiamc1_palette_w(offs_t offset, uint8_t data); + void kot_bankswitch_w(uint8_t data); + void kot_videoram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(pit8253_2_w); TILE_GET_INFO_MEMBER(get_bg1_tile_info); diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 5d4d9ce4eef..e81d8620b25 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -48,11 +48,11 @@ protected: int m_bgcharbank; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; - DECLARE_WRITE16_MEMBER(tigeroad_soundcmd_w); - DECLARE_WRITE16_MEMBER(tigeroad_videoram_w); - DECLARE_WRITE16_MEMBER(tigeroad_videoctrl_w); - DECLARE_WRITE16_MEMBER(tigeroad_scroll_w); - DECLARE_WRITE8_MEMBER(msm5205_w); + void tigeroad_soundcmd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tigeroad_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tigeroad_videoctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tigeroad_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void msm5205_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILEMAP_MAPPER_MEMBER(tigeroad_tilemap_scan); @@ -98,9 +98,9 @@ public: void bballs(machine_config &config); private: - DECLARE_READ16_MEMBER(mcu_comm_r); - DECLARE_WRITE16_MEMBER(pushman_mcu_comm_w); - DECLARE_WRITE16_MEMBER(bballs_mcu_comm_w); + uint16_t mcu_comm_r(offs_t offset, uint16_t mem_mask = ~0); + void pushman_mcu_comm_w(offs_t offset, uint16_t data); + void bballs_mcu_comm_w(uint16_t data); void mcu_pa_w(uint8_t data); void mcu_pb_w(uint8_t data); @@ -137,10 +137,10 @@ private: void out3_w(uint8_t data); - DECLARE_READ8_MEMBER(mcu_shared_r); - DECLARE_WRITE8_MEMBER(mcu_shared_w); + uint8_t mcu_shared_r(offs_t offset); + void mcu_shared_w(offs_t offset, uint8_t data); - DECLARE_WRITE16_MEMBER(blktiger_to_mcu_w); + void blktiger_to_mcu_w(uint16_t data); required_device<i8751_device> m_mcu; uint8_t m_old_p3; diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h index 9a6f350a0b9..f9fe9555224 100644 --- a/src/mame/includes/tiki100.h +++ b/src/mame/includes/tiki100.h @@ -77,14 +77,14 @@ private: uint8_t mrq_r(offs_t offset); void mrq_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( iorq_r ); - DECLARE_WRITE8_MEMBER( iorq_w ); - - DECLARE_READ8_MEMBER( keyboard_r ); - DECLARE_WRITE8_MEMBER( keyboard_w ); - DECLARE_WRITE8_MEMBER( video_mode_w ); - DECLARE_WRITE8_MEMBER( palette_w ); - DECLARE_WRITE8_MEMBER( system_w ); + uint8_t iorq_r(offs_t offset); + void iorq_w(offs_t offset, uint8_t data); + + uint8_t keyboard_r(); + void keyboard_w(uint8_t data); + void video_mode_w(uint8_t data); + void palette_w(uint8_t data); + void system_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( bar0_w ); DECLARE_WRITE_LINE_MEMBER( bar2_w ); void video_scroll_w(uint8_t data); diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index b7b4f6552eb..414c6ef9cde 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -46,11 +46,11 @@ protected: DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(bg_videoram_w); - DECLARE_WRITE8_MEMBER(scroll_x_lsb_w); - DECLARE_WRITE8_MEMBER(scroll_x_msb_w); - DECLARE_WRITE8_MEMBER(scroll_y_w); + void videoram_w(offs_t offset, uint8_t data); + void bg_videoram_w(offs_t offset, uint8_t data); + void scroll_x_lsb_w(uint8_t data); + void scroll_x_msb_w(uint8_t data); + void scroll_y_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index c93643c36ee..c7daa3b4f0e 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -62,20 +62,19 @@ private: bool m_video_enable; /* common */ - DECLARE_WRITE8_MEMBER(mainlatch_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_READ8_MEMBER(scanline_r); + uint8_t scanline_r(); /* all but psurge */ DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); DECLARE_WRITE_LINE_MEMBER(video_enable_w); /* psurge */ - DECLARE_READ8_MEMBER(psurge_protection_r); + uint8_t psurge_protection_r(); /* chkun */ void chkun_sound_w(uint8_t data); diff --git a/src/mame/includes/timex.h b/src/mame/includes/timex.h index f1a51eb7425..e07fc02cc79 100644 --- a/src/mame/includes/timex.h +++ b/src/mame/includes/timex.h @@ -49,11 +49,11 @@ public: void tc2048(machine_config &config); private: - DECLARE_READ8_MEMBER(ts2068_port_f4_r); - DECLARE_WRITE8_MEMBER(ts2068_port_f4_w); - DECLARE_READ8_MEMBER(ts2068_port_ff_r); - DECLARE_WRITE8_MEMBER(ts2068_port_ff_w); - DECLARE_WRITE8_MEMBER(tc2048_port_ff_w); + uint8_t ts2068_port_f4_r(); + void ts2068_port_f4_w(uint8_t data); + uint8_t ts2068_port_ff_r(); + void ts2068_port_ff_w(offs_t offset, uint8_t data); + void tc2048_port_ff_w(offs_t offset, uint8_t data); DECLARE_MACHINE_RESET(tc2048); DECLARE_MACHINE_RESET(ts2068); diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h index 0dde1fbaab8..e8f6bb53e0a 100644 --- a/src/mame/includes/tmc1800.h +++ b/src/mame/includes/tmc1800.h @@ -59,9 +59,9 @@ public: , m_vdc(*this, CDP1861_TAG) { } - DECLARE_WRITE8_MEMBER( keylatch_w ); - DECLARE_READ8_MEMBER( dispon_r ); - DECLARE_WRITE8_MEMBER( dispoff_w ); + void keylatch_w(uint8_t data); + uint8_t dispon_r(); + void dispoff_w(uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef3_r ); @@ -94,7 +94,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER( keylatch_w ); + void keylatch_w(uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef3_r ); @@ -124,8 +124,8 @@ public: , m_led(*this, "led1") { } - DECLARE_WRITE8_MEMBER( keylatch_w ); - DECLARE_WRITE8_MEMBER( bankswitch_w ); + void keylatch_w(uint8_t data); + void bankswitch_w(uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef3_r ); @@ -180,8 +180,8 @@ public: TIMER_ID_EF4 }; - DECLARE_WRITE8_MEMBER( keylatch_w ); - DECLARE_WRITE8_MEMBER( bankswitch_w ); + void keylatch_w(uint8_t data); + void bankswitch_w(uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef3_r ); diff --git a/src/mame/includes/tmc2000e.h b/src/mame/includes/tmc2000e.h index ae723c78833..91b9ecc7695 100644 --- a/src/mame/includes/tmc2000e.h +++ b/src/mame/includes/tmc2000e.h @@ -35,15 +35,15 @@ public: void tmc2000e(machine_config &config); private: - DECLARE_READ8_MEMBER( vismac_r ); - DECLARE_WRITE8_MEMBER( vismac_w ); - DECLARE_READ8_MEMBER( floppy_r ); - DECLARE_WRITE8_MEMBER( floppy_w ); - DECLARE_READ8_MEMBER( ascii_keyboard_r ); - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); - DECLARE_WRITE8_MEMBER( io_select_w ); - DECLARE_WRITE8_MEMBER( keyboard_latch_w ); + uint8_t vismac_r(); + void vismac_w(uint8_t data); + uint8_t floppy_r(); + void floppy_w(uint8_t data); + uint8_t ascii_keyboard_r(); + uint8_t io_r(); + void io_w(uint8_t data); + void io_select_w(uint8_t data); + void keyboard_latch_w(uint8_t data); DECLARE_READ_LINE_MEMBER( rdata_r ); DECLARE_READ_LINE_MEMBER( bdata_r ); DECLARE_READ_LINE_MEMBER( gdata_r ); diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h index 9eda7629c63..53641a92fc2 100644 --- a/src/mame/includes/tmc600.h +++ b/src/mame/includes/tmc600.h @@ -65,11 +65,11 @@ private: virtual void video_start() override; - DECLARE_READ8_MEMBER( rtc_r ); + uint8_t rtc_r(); void printer_w(uint8_t data); - DECLARE_WRITE8_MEMBER( vismac_register_w ); - DECLARE_WRITE8_MEMBER( vismac_data_w ); - DECLARE_WRITE8_MEMBER( page_ram_w ); + void vismac_register_w(uint8_t data); + void vismac_data_w(uint8_t data); + void page_ram_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef3_r ); diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index b3e8cdaafd3..95baf1e8cba 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -117,38 +117,38 @@ protected: int16_t m_sampledata[0x40000]; uint8_t m_irq5_mask; - DECLARE_READ16_MEMBER(k052109_word_noA12_r); - DECLARE_WRITE16_MEMBER(k052109_word_noA12_w); - DECLARE_WRITE16_MEMBER(punkshot_k052109_word_w); - DECLARE_WRITE16_MEMBER(punkshot_k052109_word_noA12_w); - DECLARE_READ16_MEMBER(k053245_scattered_word_r); - DECLARE_WRITE16_MEMBER(k053245_scattered_word_w); - DECLARE_READ16_MEMBER(k053244_word_noA1_r); - DECLARE_WRITE16_MEMBER(k053244_word_noA1_w); - DECLARE_READ8_MEMBER(tmnt_sres_r); - DECLARE_WRITE8_MEMBER(tmnt_sres_w); - DECLARE_WRITE8_MEMBER(sound_arm_nmi_w); - DECLARE_READ16_MEMBER(punkshot_kludge_r); - DECLARE_READ16_MEMBER(ssriders_protection_r); - DECLARE_WRITE16_MEMBER(ssriders_protection_w); - DECLARE_READ16_MEMBER(blswhstl_coin_r); - DECLARE_READ16_MEMBER(ssriders_eeprom_r); - DECLARE_READ16_MEMBER(sunsetbl_eeprom_r); - DECLARE_WRITE16_MEMBER(blswhstl_eeprom_w); - DECLARE_READ16_MEMBER(thndrx2_eeprom_r); - DECLARE_WRITE16_MEMBER(thndrx2_eeprom_w); - DECLARE_WRITE8_MEMBER(cuebrick_nvbank_w); - DECLARE_WRITE16_MEMBER(ssriders_soundkludge_w); - DECLARE_WRITE16_MEMBER(tmnt2_1c0800_w); - DECLARE_WRITE16_MEMBER(tmnt_0a0000_w); - DECLARE_WRITE16_MEMBER(punkshot_0a0020_w); - DECLARE_WRITE16_MEMBER(lgtnfght_0a0018_w); - DECLARE_WRITE16_MEMBER(blswhstl_700300_w); - DECLARE_WRITE16_MEMBER(ssriders_eeprom_w); - DECLARE_WRITE16_MEMBER(ssriders_1c0300_w); - DECLARE_WRITE16_MEMBER(tmnt_priority_w); - DECLARE_WRITE8_MEMBER(tmnt_upd_start_w); - DECLARE_READ8_MEMBER(tmnt_upd_busy_r); + uint16_t k052109_word_noA12_r(offs_t offset); + void k052109_word_noA12_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void punkshot_k052109_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void punkshot_k052109_word_noA12_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t k053245_scattered_word_r(offs_t offset); + void k053245_scattered_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t k053244_word_noA1_r(offs_t offset); + void k053244_word_noA1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t tmnt_sres_r(); + void tmnt_sres_w(uint8_t data); + void sound_arm_nmi_w(uint8_t data); + uint16_t punkshot_kludge_r(); + uint16_t ssriders_protection_r(address_space &space); + void ssriders_protection_w(address_space &space, offs_t offset, uint16_t data); + uint16_t blswhstl_coin_r(); + uint16_t ssriders_eeprom_r(); + uint16_t sunsetbl_eeprom_r(); + void blswhstl_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t thndrx2_eeprom_r(); + void thndrx2_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cuebrick_nvbank_w(uint8_t data); + void ssriders_soundkludge_w(uint16_t data); + void tmnt2_1c0800_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tmnt_0a0000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void punkshot_0a0020_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void lgtnfght_0a0018_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void blswhstl_700300_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void ssriders_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void ssriders_1c0300_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tmnt_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tmnt_upd_start_w(uint8_t data); + uint8_t tmnt_upd_busy_r(); DECLARE_MACHINE_RESET(common); DECLARE_VIDEO_START(cuebrick); @@ -169,7 +169,7 @@ protected: INTERRUPT_GEN_MEMBER(punkshot_interrupt); INTERRUPT_GEN_MEMBER(lgtnfght_interrupt); inline uint32_t tmnt2_get_word( uint32_t addr ); - void tmnt2_put_word( address_space &space, uint32_t addr, uint16_t data ); + void tmnt2_put_word( uint32_t addr, uint16_t data ); void volume_callback(uint8_t data); K051960_CB_MEMBER(mia_sprite_callback); K051960_CB_MEMBER(tmnt_sprite_callback); @@ -215,12 +215,12 @@ public: void glfgreat(machine_config &config); private: - DECLARE_WRITE16_MEMBER(k053251_glfgreat_w); + void k053251_glfgreat_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t controller_r(); - DECLARE_READ16_MEMBER(glfgreat_rom_r); - DECLARE_WRITE16_MEMBER(glfgreat_122000_w); - DECLARE_READ16_MEMBER(glfgreat_ball_r); - DECLARE_WRITE8_MEMBER(glfgreat_sound_w); + uint16_t glfgreat_rom_r(offs_t offset); + void glfgreat_122000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t glfgreat_ball_r(); + void glfgreat_sound_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(glfgreat_get_roz_tile_info); DECLARE_VIDEO_START(glfgreat); @@ -249,11 +249,11 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE16_MEMBER(prmrsocr_sound_irq_w); - DECLARE_WRITE8_MEMBER(prmrsocr_audio_bankswitch_w); - DECLARE_WRITE16_MEMBER(prmrsocr_eeprom_w); - DECLARE_WRITE16_MEMBER(prmrsocr_122000_w); - DECLARE_READ16_MEMBER(prmrsocr_rom_r); + void prmrsocr_sound_irq_w(uint16_t data); + void prmrsocr_audio_bankswitch_w(uint8_t data); + void prmrsocr_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void prmrsocr_122000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t prmrsocr_rom_r(offs_t offset); TILE_GET_INFO_MEMBER(prmrsocr_get_roz_tile_info); DECLARE_VIDEO_START(prmrsocr); diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 842ba2caf11..a988c8efe9e 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -37,9 +37,9 @@ public: protected: virtual void machine_start() override; - virtual DECLARE_WRITE8_MEMBER(bankswitch1_w); + virtual void bankswitch1_w(uint8_t data); - DECLARE_WRITE8_MEMBER(ramrom_bankswitch_w); + void ramrom_bankswitch_w(uint8_t data); void prompalette(palette_device &palette) const; uint32_t screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -80,12 +80,12 @@ public: void tnzs(machine_config &config); protected: - virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + virtual void bankswitch1_w(uint8_t data) override; uint8_t mcu_port1_r(); void mcu_port2_w(uint8_t data); - DECLARE_READ8_MEMBER(mcu_r); - DECLARE_WRITE8_MEMBER(mcu_w); + uint8_t mcu_r(offs_t offset); + void mcu_w(offs_t offset, uint8_t data); uint8_t analog_r(offs_t offset); @@ -141,10 +141,10 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + virtual void bankswitch1_w(uint8_t data) override; - DECLARE_READ8_MEMBER(mcu_r); - DECLARE_WRITE8_MEMBER(mcu_w); + uint8_t mcu_r(offs_t offset); + void mcu_w(offs_t offset, uint8_t data); INTERRUPT_GEN_MEMBER(mcu_interrupt); void arknoid2_sub_map(address_map &map); @@ -193,7 +193,7 @@ protected: private: static constexpr unsigned MAX_SAMPLES = 0x2f; - virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + virtual void bankswitch1_w(uint8_t data) override; uint8_t csport_r(); void csport_w(uint8_t data); @@ -230,7 +230,7 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE8_MEMBER(subbankswitch_w); + void subbankswitch_w(uint8_t data); void jpopnics_main_map(address_map &map); void jpopnics_sub_map(address_map &map); @@ -247,7 +247,7 @@ public: void insectx(machine_config &config); private: - virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + virtual void bankswitch1_w(uint8_t data) override; void insectx_sub_map(address_map &map); }; @@ -265,9 +265,9 @@ public: protected: DECLARE_WRITE_LINE_MEMBER(ym2203_irqhandler); - DECLARE_WRITE8_MEMBER(sound_command_w); + void sound_command_w(uint8_t data); - virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + virtual void bankswitch1_w(uint8_t data) override; void tnzsb_base_sub_map(address_map &map); void tnzsb_cpu2_map(address_map &map); diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index b84e1929948..1fd19c1e5ef 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -97,7 +97,7 @@ protected: void coin_w(u8 data); u16 frame_done_r(); - DECLARE_WRITE16_MEMBER(tile_offsets_w); + void tile_offsets_w(offs_t offset, u16 data, u16 mem_mask = ~0); void bcu_flipscreen_w(u8 data); void fcu_flipscreen_w(u8 data); u16 spriteram_offs_r(); diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index db207df1546..a1feb033c4a 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -66,17 +66,17 @@ private: tilemap_t *m_foreground_layer; tilemap_t *m_text_layer; - DECLARE_WRITE16_MEMBER(tokib_soundcommand_w); - DECLARE_READ16_MEMBER(pip_r); - DECLARE_WRITE16_MEMBER(toki_control_w); - DECLARE_WRITE16_MEMBER(foreground_videoram_w); - DECLARE_WRITE16_MEMBER(background1_videoram_w); - DECLARE_WRITE16_MEMBER(background2_videoram_w); - DECLARE_WRITE8_MEMBER(tokib_adpcm_control_w); - DECLARE_WRITE8_MEMBER(tokib_adpcm_data_w); + void tokib_soundcommand_w(uint16_t data); + uint16_t pip_r(); + void toki_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void foreground_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void background1_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void background2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tokib_adpcm_control_w(uint8_t data); + void tokib_adpcm_data_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(tokib_adpcm_int); - DECLARE_READ8_MEMBER(jujuba_z80_data_decrypt); + uint8_t jujuba_z80_data_decrypt(offs_t offset); TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_back_tile_info); diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index d7e46b68c6c..b8fb0bdcaac 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -44,12 +44,12 @@ private: TIMER_CALLBACK_MEMBER(scanline_interrupt); void scanline_int_ack_w(uint16_t data); - DECLARE_WRITE16_MEMBER(interrupt_scan_w); - DECLARE_WRITE16_MEMBER(paletteram_w); - DECLARE_WRITE16_MEMBER(intensity_w); - DECLARE_WRITE16_MEMBER(xscroll_w); - DECLARE_WRITE16_MEMBER(yscroll_w); - DECLARE_WRITE16_MEMBER(slip_w); + void interrupt_scan_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void intensity_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void slip_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); diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 8fc1bdfa6e8..e24c101b29f 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -64,12 +64,12 @@ private: DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); - DECLARE_READ8_MEMBER(tp84_sh_timer_r); - DECLARE_WRITE8_MEMBER(tp84_filter_w); - DECLARE_WRITE8_MEMBER(tp84_sh_irqtrigger_w); - DECLARE_WRITE8_MEMBER(sub_irq_mask_w); - DECLARE_WRITE8_MEMBER(tp84_spriteram_w); - DECLARE_READ8_MEMBER(tp84_scanline_r); + uint8_t tp84_sh_timer_r(); + void tp84_filter_w(offs_t offset, uint8_t data); + void tp84_sh_irqtrigger_w(uint8_t data); + void sub_irq_mask_w(uint8_t data); + void tp84_spriteram_w(offs_t offset, uint8_t data); + uint8_t tp84_scanline_r(); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_start() override; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 00a9396ffc2..e3091ab2aad 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -59,15 +59,15 @@ public: void init_trackfldnz(); private: - DECLARE_WRITE8_MEMBER(questions_bank_w); - DECLARE_WRITE8_MEMBER(trackfld_videoram_w); - DECLARE_WRITE8_MEMBER(trackfld_colorram_w); - DECLARE_WRITE8_MEMBER(atlantol_gfxbank_w); - DECLARE_READ8_MEMBER(trackfld_SN76496_r); - DECLARE_READ8_MEMBER(trackfld_speech_r); - DECLARE_WRITE8_MEMBER(trackfld_VLM5030_control_w); - DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; - DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(m_SN76496_latch); }; + void questions_bank_w(uint8_t data); + void trackfld_videoram_w(offs_t offset, uint8_t data); + void trackfld_colorram_w(offs_t offset, uint8_t data); + void atlantol_gfxbank_w(uint8_t data); + uint8_t trackfld_SN76496_r(); + uint8_t trackfld_speech_r(); + void trackfld_VLM5030_control_w(uint8_t data); + 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); }; void hyprolyb_sound_map(address_map &map); void main_map(address_map &map); diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index a4016f324f4..ff3f494ab0c 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -37,11 +37,11 @@ private: /* video-related */ tilemap_t* m_bg_tilemap; int m_scrollx[2]; - DECLARE_WRITE8_MEMBER(travrusa_videoram_w); - DECLARE_WRITE8_MEMBER(travrusa_scroll_x_low_w); - DECLARE_WRITE8_MEMBER(travrusa_scroll_x_high_w); - DECLARE_WRITE8_MEMBER(travrusa_flipscreen_w); - DECLARE_READ8_MEMBER(shtridrb_port11_r); + void travrusa_videoram_w(offs_t offset, uint8_t data); + void travrusa_scroll_x_low_w(uint8_t data); + void travrusa_scroll_x_high_w(uint8_t data); + void travrusa_flipscreen_w(uint8_t data); + uint8_t shtridrb_port11_r(); TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index d0d6011e20a..67a7093cdb1 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -61,10 +61,10 @@ private: DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); DECLARE_WRITE_LINE_MEMBER(tape_control_w); - DECLARE_READ8_MEMBER(cmos_r); - DECLARE_READ8_MEMBER(input_port_4_r); - DECLARE_READ8_MEMBER(misc_r); - DECLARE_READ8_MEMBER(da_latch_r); + uint8_t cmos_r(offs_t offset); + uint8_t input_port_4_r(); + uint8_t misc_r(offs_t offset); + uint8_t da_latch_r(offs_t offset); TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start() override; diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 3b6d5249863..4640bea16aa 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -71,24 +71,24 @@ protected: private: DECLARE_FLOPPY_FORMATS(floppy_formats); - DECLARE_WRITE8_MEMBER(port_ff_w); - DECLARE_WRITE8_MEMBER(lnw80_fe_w); - DECLARE_WRITE8_MEMBER(sys80_fe_w); - DECLARE_WRITE8_MEMBER(sys80_f8_w); - DECLARE_WRITE8_MEMBER(port_ea_w); - DECLARE_WRITE8_MEMBER(port_e8_w); - DECLARE_READ8_MEMBER(lnw80_fe_r); - DECLARE_READ8_MEMBER(port_ff_r); - DECLARE_READ8_MEMBER(sys80_f9_r); - DECLARE_READ8_MEMBER(port_ea_r); - DECLARE_READ8_MEMBER(port_e8_r); - DECLARE_READ8_MEMBER(irq_status_r); - DECLARE_READ8_MEMBER(printer_r); - DECLARE_WRITE8_MEMBER(printer_w); - DECLARE_WRITE8_MEMBER(cassunit_w); - DECLARE_WRITE8_MEMBER(motor_w); - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_READ8_MEMBER(wd179x_r); + void port_ff_w(uint8_t data); + void lnw80_fe_w(uint8_t data); + void sys80_fe_w(uint8_t data); + void sys80_f8_w(uint8_t data); + void port_ea_w(uint8_t data); + void port_e8_w(uint8_t data); + uint8_t lnw80_fe_r(); + uint8_t port_ff_r(); + uint8_t sys80_f9_r(); + uint8_t port_ea_r(); + uint8_t port_e8_r(); + uint8_t irq_status_r(); + uint8_t printer_r(); + void printer_w(uint8_t data); + void cassunit_w(uint8_t data); + void motor_w(uint8_t data); + uint8_t keyboard_r(offs_t offset); + uint8_t wd179x_r(); INTERRUPT_GEN_MEMBER(rtc_interrupt); INTERRUPT_GEN_MEMBER(fdc_interrupt); diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h index 588e7447f05..f8ad4daf51a 100644 --- a/src/mame/includes/trs80m2.h +++ b/src/mame/includes/trs80m2.h @@ -68,14 +68,14 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER( drvslt_w ); - DECLARE_WRITE8_MEMBER( rom_enable_w ); - DECLARE_READ8_MEMBER( keyboard_r ); - DECLARE_READ8_MEMBER( rtc_r ); - DECLARE_READ8_MEMBER( nmi_r ); - DECLARE_WRITE8_MEMBER( nmi_w ); - DECLARE_READ8_MEMBER( fdc_r ); - DECLARE_WRITE8_MEMBER( fdc_w ); + void drvslt_w(uint8_t data); + void rom_enable_w(uint8_t data); + uint8_t keyboard_r(); + uint8_t rtc_r(); + uint8_t nmi_r(); + void nmi_w(uint8_t data); + uint8_t fdc_r(offs_t offset); + void fdc_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( de_w ); DECLARE_WRITE_LINE_MEMBER( vsync_w ); uint8_t pio_pa_r(); @@ -157,8 +157,8 @@ public: { } - DECLARE_WRITE8_MEMBER( ual_w ); - DECLARE_WRITE8_MEMBER( tcl_w ); + void ual_w(uint8_t data); + void tcl_w(uint8_t data); void trs80m16(machine_config &config); void m16_z80_io(address_map &map); diff --git a/src/mame/includes/trs80m3.h b/src/mame/includes/trs80m3.h index 5c982e73ff1..fca3f9c1812 100644 --- a/src/mame/includes/trs80m3.h +++ b/src/mame/includes/trs80m3.h @@ -70,28 +70,28 @@ protected: private: DECLARE_FLOPPY_FORMATS(floppy_formats); - DECLARE_WRITE8_MEMBER(port_ff_w); - DECLARE_WRITE8_MEMBER(port_f4_w); - DECLARE_WRITE8_MEMBER(port_ec_w); - DECLARE_WRITE8_MEMBER(port_ea_w); - DECLARE_WRITE8_MEMBER(port_e8_w); - DECLARE_WRITE8_MEMBER(port_e4_w); - DECLARE_WRITE8_MEMBER(port_e0_w); - DECLARE_WRITE8_MEMBER(port_9c_w); - DECLARE_WRITE8_MEMBER(port_90_w); - DECLARE_WRITE8_MEMBER(port_88_w); - DECLARE_WRITE8_MEMBER(port_84_w); - DECLARE_READ8_MEMBER(port_ff_r); - DECLARE_READ8_MEMBER(port_ec_r); - DECLARE_READ8_MEMBER(port_ea_r); - DECLARE_READ8_MEMBER(port_e8_r); - DECLARE_READ8_MEMBER(port_e4_r); - DECLARE_READ8_MEMBER(port_e0_r); - DECLARE_READ8_MEMBER(printer_r); - DECLARE_WRITE8_MEMBER(printer_w); - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_READ8_MEMBER(wd179x_r); - DECLARE_READ8_MEMBER(cp500_port_f4_r); + void port_ff_w(uint8_t data); + void port_f4_w(uint8_t data); + void port_ec_w(uint8_t data); + void port_ea_w(uint8_t data); + void port_e8_w(uint8_t data); + void port_e4_w(uint8_t data); + void port_e0_w(uint8_t data); + void port_9c_w(uint8_t data); + void port_90_w(uint8_t data); + void port_88_w(offs_t offset, uint8_t data); + void port_84_w(uint8_t data); + uint8_t port_ff_r(); + uint8_t port_ec_r(); + uint8_t port_ea_r(); + uint8_t port_e8_r(); + uint8_t port_e4_r(); + uint8_t port_e0_r(); + uint8_t printer_r(); + void printer_w(uint8_t data); + uint8_t keyboard_r(offs_t offset); + uint8_t wd179x_r(); + uint8_t cp500_port_f4_r(); INTERRUPT_GEN_MEMBER(rtc_interrupt); INTERRUPT_GEN_MEMBER(fdc_interrupt); diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index e59c14931a6..879984fd705 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -45,10 +45,10 @@ private: uint8_t m_irq_mask; emu_timer *m_dac_irq_timer; - DECLARE_WRITE8_MEMBER(irq_enable_w); - DECLARE_WRITE8_MEMBER(trucocl_videoram_w); - DECLARE_WRITE8_MEMBER(trucocl_colorram_w); - DECLARE_WRITE8_MEMBER(audio_dac_w); + void irq_enable_w(uint8_t data); + void trucocl_videoram_w(offs_t offset, uint8_t data); + void trucocl_colorram_w(offs_t offset, uint8_t data); + void audio_dac_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); void trucocl_palette(palette_device &palette) const; uint32_t screen_update_trucocl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index fa1d39b39f4..bb4d942b117 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -47,15 +47,15 @@ private: std::unique_ptr<uint8_t[]> m_vram; std::unique_ptr<uint8_t[]> m_vram_gfx; - DECLARE_WRITE8_MEMBER(nmi_ack_w); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(sound_irq_ack_w); - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_READ8_MEMBER(vram_r); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(vram_w); - DECLARE_WRITE8_MEMBER(vram_bankswitch_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); + void nmi_ack_w(uint8_t data); + void sound_w(uint8_t data); + void sound_irq_ack_w(uint8_t data); + void bankswitch_w(uint8_t data); + uint8_t vram_r(offs_t offset); + void videoram_w(offs_t offset, uint8_t data); + void vram_w(offs_t offset, uint8_t data); + void vram_bankswitch_w(uint8_t data); + void flipscreen_w(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/tsamurai.h b/src/mame/includes/tsamurai.h index 6dee7b81c5c..44aeae901d2 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -39,38 +39,38 @@ private: DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); DECLARE_WRITE_LINE_MEMBER(textbank1_w); - DECLARE_WRITE8_MEMBER(fg_videoram_w); + void fg_videoram_w(offs_t offset, uint8_t data); // tsamurai and m660 specific - DECLARE_WRITE8_MEMBER(bg_videoram_w); - DECLARE_WRITE8_MEMBER(fg_colorram_w); + void bg_videoram_w(offs_t offset, uint8_t data); + void fg_colorram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE8_MEMBER(scrolly_w); - DECLARE_WRITE8_MEMBER(scrollx_w); - DECLARE_WRITE8_MEMBER(bgcolor_w); - DECLARE_READ8_MEMBER(unknown_d806_r); - DECLARE_READ8_MEMBER(unknown_d900_r); - DECLARE_READ8_MEMBER(unknown_d938_r); - DECLARE_WRITE8_MEMBER(sound_command1_w); - DECLARE_WRITE8_MEMBER(sound_command2_w); - DECLARE_READ8_MEMBER(sound_command1_r); - DECLARE_READ8_MEMBER(sound_command2_r); + void scrolly_w(uint8_t data); + void scrollx_w(uint8_t data); + void bgcolor_w(uint8_t data); + uint8_t unknown_d806_r(); + uint8_t unknown_d900_r(); + uint8_t unknown_d938_r(); + void sound_command1_w(uint8_t data); + void sound_command2_w(uint8_t data); + uint8_t sound_command1_r(); + uint8_t sound_command2_r(); // tsamurai specific - DECLARE_READ8_MEMBER(tsamurai_unknown_d803_r); + uint8_t tsamurai_unknown_d803_r(); // m660 specific DECLARE_WRITE_LINE_MEMBER(textbank2_w); - DECLARE_READ8_MEMBER(m660_unknown_d803_r); - DECLARE_WRITE8_MEMBER(m660_sound_command3_w); - DECLARE_READ8_MEMBER(m660_sound_command3_r); + uint8_t m660_unknown_d803_r(); + void m660_sound_command3_w(uint8_t data); + uint8_t m660_sound_command3_r(); // vsgongf specific - DECLARE_WRITE8_MEMBER(vsgongf_color_w); - DECLARE_WRITE8_MEMBER(vsgongf_sound_nmi_enable_w); - DECLARE_READ8_MEMBER(vsgongf_a006_r); - DECLARE_READ8_MEMBER(vsgongf_a100_r); - DECLARE_WRITE8_MEMBER(vsgongf_sound_command_w); + void vsgongf_color_w(uint8_t data); + void vsgongf_sound_nmi_enable_w(uint8_t data); + uint8_t vsgongf_a006_r(); + uint8_t vsgongf_a100_r(); + void vsgongf_sound_command_w(uint8_t data); DECLARE_MACHINE_START(m660); DECLARE_MACHINE_START(tsamurai); diff --git a/src/mame/includes/tsispch.h b/src/mame/includes/tsispch.h index 3128cb89c42..37f23d63634 100644 --- a/src/mame/includes/tsispch.h +++ b/src/mame/includes/tsispch.h @@ -30,12 +30,12 @@ public: void init_prose2k(); private: - DECLARE_READ8_MEMBER(dsw_r); - DECLARE_WRITE8_MEMBER(peripheral_w); - DECLARE_READ16_MEMBER(dsp_data_r); - DECLARE_WRITE16_MEMBER(dsp_data_w); - DECLARE_READ16_MEMBER(dsp_status_r); - DECLARE_WRITE16_MEMBER(dsp_status_w); + uint8_t dsw_r(); + void peripheral_w(uint8_t data); + uint16_t dsp_data_r(); + void dsp_data_w(uint16_t data); + uint16_t dsp_status_r(); + void dsp_status_w(uint16_t data); DECLARE_WRITE_LINE_MEMBER(i8251_rxrdy_int); DECLARE_WRITE_LINE_MEMBER(i8251_txempty_int); DECLARE_WRITE_LINE_MEMBER(i8251_txrdy_int); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 3211a7695f1..397d9be8907 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -83,23 +83,23 @@ private: uint32_t m_page; DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); - DECLARE_WRITE8_MEMBER(main_cpu_irq_line_clear_w); - DECLARE_WRITE8_MEMBER(second_cpu_irq_line_clear_w); - DECLARE_READ8_MEMBER(tubep_soundlatch_r); - DECLARE_READ8_MEMBER(tubep_sound_irq_ack); - DECLARE_WRITE8_MEMBER(rjammer_voice_input_w); - DECLARE_WRITE8_MEMBER(rjammer_voice_intensity_control_w); - DECLARE_WRITE8_MEMBER(tubep_textram_w); + void main_cpu_irq_line_clear_w(uint8_t data); + void second_cpu_irq_line_clear_w(uint8_t data); + uint8_t tubep_soundlatch_r(); + uint8_t tubep_sound_irq_ack(); + void rjammer_voice_input_w(uint8_t data); + void rjammer_voice_intensity_control_w(uint8_t data); + void tubep_textram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(screen_flip_w); DECLARE_WRITE_LINE_MEMBER(background_romselect_w); DECLARE_WRITE_LINE_MEMBER(colorproms_A4_line_w); - DECLARE_WRITE8_MEMBER(tubep_background_a000_w); - DECLARE_WRITE8_MEMBER(tubep_background_c000_w); - DECLARE_WRITE8_MEMBER(tubep_sprite_control_w); - DECLARE_WRITE8_MEMBER(rjammer_background_LS377_w); - DECLARE_WRITE8_MEMBER(rjammer_background_page_w); - DECLARE_WRITE8_MEMBER(rjammer_voice_startstop_w); - DECLARE_WRITE8_MEMBER(rjammer_voice_frequency_select_w); + void tubep_background_a000_w(uint8_t data); + void tubep_background_c000_w(uint8_t data); + void tubep_sprite_control_w(offs_t offset, uint8_t data); + void rjammer_background_LS377_w(uint8_t data); + void rjammer_background_page_w(uint8_t data); + void rjammer_voice_startstop_w(uint8_t data); + void rjammer_voice_frequency_select_w(uint8_t data); void ay8910_portA_0_w(uint8_t data); void ay8910_portB_0_w(uint8_t data); void ay8910_portA_1_w(uint8_t data); diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index e95c575e11b..c5a6aa66099 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -98,30 +98,30 @@ protected: uint8_t m_semicom_prot_offset; uint16_t m_protbase; - DECLARE_WRITE16_MEMBER(tumblepb_oki_w); - DECLARE_READ16_MEMBER(tumblepb_prot_r); - DECLARE_READ16_MEMBER(tumblepopb_controls_r); - DECLARE_READ16_MEMBER(semibase_unknown_r); - DECLARE_WRITE16_MEMBER(jumpkids_sound_w); - DECLARE_WRITE16_MEMBER(semicom_soundcmd_w); + void tumblepb_oki_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t tumblepb_prot_r(); + uint16_t tumblepopb_controls_r(offs_t offset); + uint16_t semibase_unknown_r(); + void jumpkids_sound_w(uint16_t data); + void semicom_soundcmd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void oki_sound_bank_w(uint8_t data); void jumpkids_oki_bank_w(uint8_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(bcstory_1a0_read); - DECLARE_WRITE16_MEMBER(bcstory_tilebank_w); - DECLARE_WRITE16_MEMBER(chokchok_tilebank_w); - DECLARE_WRITE16_MEMBER(wlstar_tilebank_w); - DECLARE_WRITE16_MEMBER(suprtrio_tilebank_w); - DECLARE_WRITE16_MEMBER(tumblepb_pf1_data_w); - DECLARE_WRITE16_MEMBER(tumblepb_pf2_data_w); - DECLARE_WRITE16_MEMBER(fncywld_pf1_data_w); - DECLARE_WRITE16_MEMBER(fncywld_pf2_data_w); - DECLARE_WRITE16_MEMBER(tumblepb_control_0_w); - DECLARE_WRITE16_MEMBER(pangpang_pf1_data_w); - DECLARE_WRITE16_MEMBER(pangpang_pf2_data_w); - DECLARE_WRITE16_MEMBER(tumbleb2_soundmcu_w); + uint16_t bcstory_1a0_read(); + void bcstory_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void chokchok_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wlstar_tilebank_w(uint16_t data); + void suprtrio_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tumblepb_pf1_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tumblepb_pf2_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void fncywld_pf1_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void fncywld_pf2_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tumblepb_control_0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void pangpang_pf1_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void pangpang_pf2_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void tumbleb2_soundmcu_w(uint16_t data); TILEMAP_MAPPER_MEMBER(tumblep_scan); TILE_GET_INFO_MEMBER(get_bg1_tile_info); diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 777e4ea856f..052ccb19d45 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -160,8 +160,8 @@ private: uint8_t buckrog_cpu2_command_r(); uint8_t buckrog_port_2_r(); uint8_t buckrog_port_3_r(); - DECLARE_WRITE8_MEMBER(turbo_videoram_w); - DECLARE_WRITE8_MEMBER(buckrog_bitmap_w); + void turbo_videoram_w(offs_t offset, uint8_t data); + void buckrog_bitmap_w(offs_t offset, uint8_t data); void turbo_ppi0a_w(uint8_t data); void turbo_ppi0b_w(uint8_t data); void turbo_ppi0c_w(uint8_t data); @@ -177,9 +177,9 @@ private: void buckrog_ppi0c_w(uint8_t data); void buckrog_ppi1c_w(uint8_t data); uint8_t turbo_analog_r(); - DECLARE_WRITE8_MEMBER(buckrog_i8255_0_w); - DECLARE_READ8_MEMBER(spriteram_r); - DECLARE_WRITE8_MEMBER(spriteram_w); + void buckrog_i8255_0_w(offs_t offset, uint8_t data); + uint8_t spriteram_r(offs_t offset); + void spriteram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_fg_tile_info); DECLARE_VIDEO_START(turbo); diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index 62df61202eb..c77c26f70c7 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -50,11 +50,11 @@ private: required_device<screen_device> m_screen; // handlers - DECLARE_WRITE32_MEMBER(dma_w); - DECLARE_READ32_MEMBER(video_r); - DECLARE_WRITE32_MEMBER(video_w); - DECLARE_READ32_MEMBER(int_r); - DECLARE_WRITE32_MEMBER(int_w); + void dma_w(offs_t offset, uint32_t data); + uint32_t video_r(offs_t offset, uint32_t mem_mask = ~0); + void video_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t int_r(); + void int_w(uint32_t data); DECLARE_READ_LINE_MEMBER(sbrc2_r); DECLARE_READ_LINE_MEMBER(sbrc3_r); @@ -112,8 +112,8 @@ public: // construction/destruction turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ32_MEMBER(read); - DECLARE_WRITE32_MEMBER(write); + uint32_t read(offs_t offset); + void write(offs_t offset, uint32_t data); protected: // device-level overrides diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 8313000d18c..8673678a2c8 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -43,10 +43,10 @@ public: protected: DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - DECLARE_WRITE8_MEMBER(tutankhm_bankselect_w); + void tutankhm_bankselect_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE8_MEMBER(sound_on_w); + void sound_on_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); virtual void machine_start() override; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 4a89518f755..349bceaf284 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -74,19 +74,19 @@ protected: tilemap_t *m_fixed_tmap; tilemap_t *m_scroll_tmap[2]; - DECLARE_WRITE16_MEMBER(CPUA_register_w); - DECLARE_WRITE16_MEMBER(CPUB_register_w); + void CPUA_register_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void CPUB_register_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER(sprite_status_r); - DECLARE_WRITE16_MEMBER(video_register_w); - DECLARE_WRITE16_MEMBER(fixram_w); - DECLARE_WRITE16_MEMBER(videoram0_w); - DECLARE_WRITE16_MEMBER(videoram1_w); - DECLARE_WRITE16_MEMBER(zipram_w); + uint16_t sprite_status_r(); + void video_register_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void fixram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void videoram0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void zipram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ8_MEMBER(upd_busy_r); - DECLARE_WRITE8_MEMBER(upd_reset_w); - DECLARE_WRITE8_MEMBER(upd_start_w); + uint8_t upd_busy_r(); + void upd_reset_w(uint8_t data); + void upd_start_w(uint8_t data); TILE_GET_INFO_MEMBER(fix_tile_info); TILE_GET_INFO_MEMBER(layer0_tile_info); @@ -123,8 +123,8 @@ public: void init_fround(); private: - DECLARE_WRITE16_MEMBER(fround_CPU_register_w); - DECLARE_WRITE16_MEMBER(gfx_bank_w); + void fround_CPU_register_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void gfx_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void fround_map(address_map &map); @@ -146,7 +146,7 @@ public: void init_cuebrickj(); private: - DECLARE_WRITE8_MEMBER(nvram_bank_w); + void nvram_bank_w(uint8_t data); uint16_t m_nvram[0x400 * 0x20 / 2]; }; diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index da5040522e3..83bb6594333 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -174,29 +174,29 @@ private: void tx1_update_state(); void buggyboy_update_state(); - DECLARE_READ16_MEMBER(tx1_math_r); - DECLARE_WRITE16_MEMBER(tx1_math_w); - DECLARE_READ16_MEMBER(tx1_spcs_rom_r); - DECLARE_READ16_MEMBER(tx1_spcs_ram_r); - DECLARE_WRITE16_MEMBER(tx1_spcs_ram_w); - DECLARE_READ16_MEMBER(buggyboy_math_r); - DECLARE_WRITE16_MEMBER(buggyboy_math_w); - DECLARE_READ16_MEMBER(buggyboy_spcs_rom_r); - DECLARE_WRITE16_MEMBER(buggyboy_spcs_ram_w); - DECLARE_READ16_MEMBER(buggyboy_spcs_ram_r); - DECLARE_READ16_MEMBER(tx1_crtc_r); - DECLARE_WRITE16_MEMBER(tx1_crtc_w); - DECLARE_WRITE16_MEMBER(tx1_bankcs_w); - DECLARE_WRITE16_MEMBER(tx1_slincs_w); - DECLARE_WRITE16_MEMBER(tx1_slock_w); - DECLARE_WRITE16_MEMBER(tx1_scolst_w); - DECLARE_WRITE16_MEMBER(tx1_flgcs_w); - DECLARE_WRITE16_MEMBER(buggyboy_gas_w); - DECLARE_WRITE16_MEMBER(buggyboy_sky_w); - DECLARE_WRITE16_MEMBER(buggyboy_scolst_w); - DECLARE_WRITE16_MEMBER(resume_math_w); - DECLARE_WRITE16_MEMBER(halt_math_w); - DECLARE_READ16_MEMBER(dipswitches_r); + uint16_t tx1_math_r(offs_t offset); + void tx1_math_w(offs_t offset, uint16_t data); + uint16_t tx1_spcs_rom_r(offs_t offset); + uint16_t tx1_spcs_ram_r(offs_t offset); + void tx1_spcs_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t buggyboy_math_r(offs_t offset); + void buggyboy_math_w(offs_t offset, uint16_t data); + uint16_t buggyboy_spcs_rom_r(offs_t offset); + void buggyboy_spcs_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t buggyboy_spcs_ram_r(offs_t offset); + uint16_t tx1_crtc_r(); + void tx1_crtc_w(offs_t offset, uint16_t data); + void tx1_bankcs_w(offs_t offset, uint16_t data); + void tx1_slincs_w(offs_t offset, uint16_t data); + void tx1_slock_w(uint16_t data); + void tx1_scolst_w(uint16_t data); + void tx1_flgcs_w(uint16_t data); + void buggyboy_gas_w(offs_t offset, uint16_t data); + void buggyboy_sky_w(uint16_t data); + void buggyboy_scolst_w(uint16_t data); + void resume_math_w(uint16_t data); + void halt_math_w(uint16_t data); + u16 dipswitches_r(); DECLARE_MACHINE_RESET(tx1); DECLARE_VIDEO_START(tx1); void tx1_palette(palette_device &palette) const; diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index fac565f6997..70c2de1c629 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -43,8 +43,8 @@ private: required_device<generic_latch_8_device> m_soundlatch; required_device<input_merger_device> m_soundnmi; - DECLARE_WRITE8_MEMBER(sound_nmi_enable_w); - DECLARE_WRITE16_MEMBER(ultraman_gfxctrl_w); + void sound_nmi_enable_w(uint8_t data); + void ultraman_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_ultraman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index 49078cba7ad..de0c5823f23 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -41,18 +41,18 @@ protected: TIMER_NMI }; - 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); + 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); DECLARE_WRITE_LINE_MEMBER(lockout_w); - DECLARE_WRITE8_MEMBER(video_ram_w); - DECLARE_WRITE8_MEMBER(attract_w); - DECLARE_WRITE8_MEMBER(explosion_w); + void video_ram_w(offs_t offset, uint8_t data); + void attract_w(uint8_t data); + void explosion_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index d81341eae1e..bb78d4d7a31 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -30,14 +30,14 @@ public: protected: static rgb_t unico_R6G6B6X(uint32_t raw); - DECLARE_READ16_MEMBER(vram_r); - DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_READ16_MEMBER(scroll_r); - DECLARE_WRITE16_MEMBER(scroll_w); - DECLARE_READ16_MEMBER(spriteram_r); - DECLARE_WRITE16_MEMBER(spriteram_w); - - DECLARE_WRITE8_MEMBER(burglarx_okibank_w); + uint16_t vram_r(offs_t offset); + void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t scroll_r(offs_t offset); + void scroll_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); + + void burglarx_okibank_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_start() override; virtual void video_start() override; @@ -76,11 +76,11 @@ public: protected: virtual void machine_start() override; - DECLARE_WRITE8_MEMBER(zeropnt_okibank_leds_w); - DECLARE_READ16_MEMBER(gunx_0_msb_r); - DECLARE_READ16_MEMBER(guny_0_msb_r); - DECLARE_READ16_MEMBER(gunx_1_msb_r); - DECLARE_READ16_MEMBER(guny_1_msb_r); + void zeropnt_okibank_leds_w(uint8_t data); + uint16_t gunx_0_msb_r(); + uint16_t guny_0_msb_r(); + uint16_t gunx_1_msb_r(); + uint16_t guny_1_msb_r(); required_memory_bank m_okibank; @@ -108,14 +108,14 @@ public: protected: virtual void machine_start() override; - DECLARE_READ32_MEMBER(zeropnt2_gunx_0_msb_r); - DECLARE_READ32_MEMBER(zeropnt2_guny_0_msb_r); - DECLARE_READ32_MEMBER(zeropnt2_gunx_1_msb_r); - DECLARE_READ32_MEMBER(zeropnt2_guny_1_msb_r); - DECLARE_WRITE8_MEMBER(zeropnt2_okibank); - DECLARE_WRITE8_MEMBER(leds_w); + uint32_t zeropnt2_gunx_0_msb_r(); + uint32_t zeropnt2_guny_0_msb_r(); + uint32_t zeropnt2_gunx_1_msb_r(); + uint32_t zeropnt2_guny_1_msb_r(); + void zeropnt2_okibank(uint8_t data); + void leds_w(uint8_t data); - DECLARE_WRITE32_MEMBER(eeprom_w); + void eeprom_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void zeropnt2_map(address_map &map); diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 16314eff5ef..1f6c697d5ac 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -38,10 +38,10 @@ private: output_finder<5> m_leds; required_device<palette_device> m_palette; - DECLARE_WRITE8_MEMBER(rombank_w); - DECLARE_WRITE8_MEMBER(lamps1_w); - DECLARE_WRITE8_MEMBER(lamps2_w); - DECLARE_WRITE8_MEMBER(charram_w); + void rombank_w(uint8_t data); + void lamps1_w(uint8_t data); + void lamps2_w(uint8_t data); + void charram_w(offs_t offset, uint8_t data); void usgames_palette(palette_device &palette) const; diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h index ad1b571680d..d2eb44e27c2 100644 --- a/src/mame/includes/ut88.h +++ b/src/mame/includes/ut88.h @@ -31,7 +31,7 @@ public: } protected: - DECLARE_READ8_MEMBER(tape_r); + uint8_t tape_r(); required_device<cassette_image_device> m_cassette; required_memory_region m_region_maincpu; @@ -73,9 +73,9 @@ private: TIMER_UPDATE_DISPLAY }; - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_WRITE8_MEMBER(keyboard_w); - DECLARE_WRITE8_MEMBER(sound_w); + uint8_t keyboard_r(offs_t offset); + void keyboard_w(offs_t offset, uint8_t data); + void sound_w(uint8_t data); uint8_t ppi_portb_r(); uint8_t ppi_portc_r(); void ppi_porta_w(uint8_t data); @@ -126,8 +126,8 @@ private: TIMER_UPDATE_DISPLAY }; - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_WRITE8_MEMBER(led_w); + uint8_t keyboard_r(); + void led_w(offs_t offset, uint8_t data); required_memory_region m_region_proms; diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h index f2d0c30ea99..c21e80ae691 100644 --- a/src/mame/includes/v1050.h +++ b/src/mame/includes/v1050.h @@ -103,16 +103,16 @@ public: void v1050_video(machine_config &config); private: - DECLARE_READ8_MEMBER( kb_data_r ); - DECLARE_READ8_MEMBER( kb_status_r ); - DECLARE_WRITE8_MEMBER( v1050_i8214_w ); - DECLARE_READ8_MEMBER( vint_clr_r ); - DECLARE_WRITE8_MEMBER( vint_clr_w ); - DECLARE_READ8_MEMBER( dint_clr_r ); - DECLARE_WRITE8_MEMBER( dint_clr_w ); - DECLARE_WRITE8_MEMBER( bank_w ); - DECLARE_WRITE8_MEMBER( dint_w ); - DECLARE_WRITE8_MEMBER( dvint_clr_w ); + uint8_t kb_data_r(); + uint8_t kb_status_r(); + void v1050_i8214_w(uint8_t data); + uint8_t vint_clr_r(); + void vint_clr_w(uint8_t data); + uint8_t dint_clr_r(); + void dint_clr_w(uint8_t data); + void bank_w(uint8_t data); + void dint_w(uint8_t data); + void dvint_clr_w(uint8_t data); void misc_ppi_pa_w(uint8_t data); void misc_ppi_pc_w(uint8_t data); uint8_t rtc_ppi_pa_r(); @@ -125,14 +125,14 @@ private: DECLARE_WRITE_LINE_MEMBER( sio_txrdy_w ); DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_READ8_MEMBER( attr_r ); - DECLARE_WRITE8_MEMBER( attr_w ); - DECLARE_READ8_MEMBER( videoram_r ); - DECLARE_WRITE8_MEMBER( videoram_w ); + uint8_t attr_r(); + void attr_w(uint8_t data); + uint8_t videoram_r(offs_t offset); + void videoram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( crtc_vs_w ); - DECLARE_WRITE8_MEMBER(sasi_data_w); + void sasi_data_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(write_sasi_io); - DECLARE_WRITE8_MEMBER( sasi_ctrl_w ); + void sasi_ctrl_w(uint8_t data); WRITE_LINE_MEMBER( rtc_ppi_pa_0_w ){ m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 0)) | ((state & 1) << 0); } WRITE_LINE_MEMBER( rtc_ppi_pa_1_w ){ m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 1)) | ((state & 1) << 1); } diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 728d1e2ecf3..b2d59b5e0e4 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -55,11 +55,11 @@ private: /* misc */ uint16_t m_priority[2]; - DECLARE_READ8_MEMBER(irq6_ack_r); - DECLARE_WRITE8_MEMBER(irq6_ack_w); - DECLARE_WRITE16_MEMBER(priority_w); - DECLARE_WRITE16_MEMBER(palette_w); - DECLARE_WRITE16_MEMBER(palette_ext_w); + uint8_t irq6_ack_r(); + void irq6_ack_w(uint8_t data); + void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);; + void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void palette_ext_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index c02a3941b0d..9337a88577e 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -79,9 +79,9 @@ private: tilemap_t *m_bg2_tilemap; DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(bg1videoram_w); - DECLARE_WRITE8_MEMBER(bg2videoram_w); + void fgvideoram_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); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 3bc2a5a62ca..6a2fc09412c 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -47,12 +47,12 @@ private: int m_spprombank; tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(scrollx_hi_w); - DECLARE_WRITE8_MEMBER(scrollx_lo_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(attrib_w); + void irq_ack_w(offs_t offset, uint8_t data); + void bankswitch_w(uint8_t data); + void scrollx_hi_w(uint8_t data); + void scrollx_lo_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void attrib_w(offs_t offset, uint8_t data); TILEMAP_MAPPER_MEMBER(background_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index 5aff5a91ec6..9a7807bd924 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -113,13 +113,13 @@ private: } reg; } ; - DECLARE_WRITE8_MEMBER(vc4000_sound_ctl); - DECLARE_READ8_MEMBER(vc4000_key_r); - DECLARE_READ8_MEMBER(vc4000_video_r); - DECLARE_WRITE8_MEMBER(vc4000_video_w); + void vc4000_sound_ctl(offs_t offset, uint8_t data); + uint8_t vc4000_key_r(offs_t offset); + uint8_t vc4000_video_r(offs_t offset); + void vc4000_video_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER(vc4000_vsync_r); - DECLARE_READ8_MEMBER(elektor_cass_r); - DECLARE_WRITE8_MEMBER(elektor_cass_w); + uint8_t elektor_cass_r(); + void elektor_cass_w(uint8_t data); vc4000_video_t m_video; uint8_t m_sprite_collision[0x20]; uint8_t m_background_collision[0x20]; diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h index 36fa3dd322c..492fd032680 100644 --- a/src/mame/includes/vector06.h +++ b/src/mame/includes/vector06.h @@ -65,14 +65,14 @@ private: uint8_t vector06_8255_portc_r(); void vector06_8255_porta_w(uint8_t data); void vector06_8255_portb_w(uint8_t data); - DECLARE_WRITE8_MEMBER(vector06_color_set); + void vector06_color_set(uint8_t data); uint8_t vector06_romdisk_portb_r(); void vector06_romdisk_portb_w(uint8_t data); void vector06_romdisk_porta_w(uint8_t data); void vector06_romdisk_portc_w(uint8_t data); - DECLARE_WRITE8_MEMBER(vector06_disc_w); + void vector06_disc_w(uint8_t data); void vector06_status_callback(uint8_t data); - DECLARE_WRITE8_MEMBER(vector06_ramdisk_w); + void vector06_ramdisk_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(speaker_w); void vector06_set_video_mode(int width); virtual void machine_start() override; diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 880a3fcb28f..df5b1ee404a 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -58,8 +58,8 @@ protected: { } void vectrex_psg_port_w(uint8_t data); - DECLARE_READ8_MEMBER(vectrex_via_r); - DECLARE_WRITE8_MEMBER(vectrex_via_w); + uint8_t vectrex_via_r(offs_t offset); + void vectrex_via_w(offs_t offset, uint8_t data); virtual void driver_start() override; virtual void video_start() override; uint32_t screen_update_vectrex(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -183,7 +183,7 @@ public: void raaspec(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(raaspec_led_w); + void raaspec_led_w(uint8_t data); uint8_t vectrex_s1_via_pb_r(); void raaspec_map(address_map &map); diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index cb1c77bec61..37769235820 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -67,13 +67,13 @@ private: required_device<address_map_bank_device> m_videobank0; required_device<address_map_bank_device> m_videobank1; - DECLARE_WRITE8_MEMBER(eeprom_w); - DECLARE_READ8_MEMBER(K052109_r); - DECLARE_WRITE8_MEMBER(K052109_w); - DECLARE_WRITE8_MEMBER(_5fe0_w); - DECLARE_WRITE8_MEMBER(z80_arm_nmi_w); - DECLARE_WRITE8_MEMBER(z80_irq_w); - DECLARE_READ8_MEMBER(z80_irq_r); + void eeprom_w(uint8_t data); + uint8_t K052109_r(offs_t offset); + void K052109_w(offs_t offset, uint8_t data); + void _5fe0_w(uint8_t data); + void z80_arm_nmi_w(uint8_t data); + void z80_irq_w(uint8_t data); + uint8_t z80_irq_r(); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index ab6c37ef362..01e50a8b905 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -41,12 +41,12 @@ public: private: DECLARE_WRITE_LINE_MEMBER(adc_eoc_w); - DECLARE_READ16_MEMBER(vertigo_io_convert); - DECLARE_READ16_MEMBER(vertigo_coin_r); - DECLARE_WRITE16_MEMBER(vertigo_wsot_w); - DECLARE_WRITE16_MEMBER(vertigo_audio_w); - DECLARE_READ16_MEMBER(vertigo_sio_r); - DECLARE_WRITE16_MEMBER(vertigo_motor_w); + uint16_t vertigo_io_convert(offs_t offset); + uint16_t vertigo_coin_r(); + void vertigo_wsot_w(uint16_t data); + void vertigo_audio_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t vertigo_sio_r(); + void vertigo_motor_w(uint16_t data); INTERRUPT_GEN_MEMBER(vertigo_interrupt); TIMER_CALLBACK_MEMBER(sound_command_w); DECLARE_WRITE_LINE_MEMBER(v_irq4_w); diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index c952d56afb7..cb887834a8d 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -111,46 +111,46 @@ protected: void assert_coin_status(); // common - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(characterram_w); - DECLARE_WRITE8_MEMBER(palette_bank_w); + void videoram_w(offs_t offset, uint8_t data); + void characterram_w(offs_t offset, uint8_t data); + void palette_bank_w(uint8_t data); // game specific - DECLARE_READ8_MEMBER(depthch_io_r); - DECLARE_WRITE8_MEMBER(depthch_io_w); - DECLARE_READ8_MEMBER(safari_io_r); - DECLARE_WRITE8_MEMBER(safari_io_w); - DECLARE_READ8_MEMBER(frogs_io_r); - DECLARE_WRITE8_MEMBER(frogs_io_w); - DECLARE_READ8_MEMBER(headon_io_r); - DECLARE_READ8_MEMBER(sspaceat_io_r); - DECLARE_WRITE8_MEMBER(headon_io_w); + uint8_t depthch_io_r(offs_t offset); + void depthch_io_w(offs_t offset, uint8_t data); + uint8_t safari_io_r(offs_t offset); + void safari_io_w(offs_t offset, uint8_t data); + uint8_t frogs_io_r(offs_t offset); + void frogs_io_w(offs_t offset, uint8_t data); + uint8_t headon_io_r(offs_t offset); + uint8_t sspaceat_io_r(offs_t offset); + void headon_io_w(offs_t offset, uint8_t data); DECLARE_MACHINE_RESET(headon2); - DECLARE_READ8_MEMBER(headon2_io_r); - DECLARE_WRITE8_MEMBER(headon2_io_w); - DECLARE_WRITE8_MEMBER(digger_io_w); - DECLARE_WRITE8_MEMBER(invho2_io_w); - DECLARE_WRITE8_MEMBER(invds_io_w); - DECLARE_WRITE8_MEMBER(carhntds_io_w); - DECLARE_WRITE8_MEMBER(sspacaho_io_w); - DECLARE_WRITE8_MEMBER(headonn_io_w); - DECLARE_WRITE8_MEMBER(tranqgun_io_w); - DECLARE_WRITE8_MEMBER(spacetrk_io_w); - DECLARE_WRITE8_MEMBER(brdrline_io_w); - DECLARE_WRITE8_MEMBER(pulsar_io_w); - DECLARE_WRITE8_MEMBER(heiankyo_io_w); - DECLARE_WRITE8_MEMBER(alphaho_io_w); - DECLARE_WRITE8_MEMBER(samurai_protection_w); - DECLARE_WRITE8_MEMBER(samurai_io_w); - DECLARE_READ8_MEMBER(invinco_io_r); - DECLARE_WRITE8_MEMBER(invinco_io_w); + uint8_t headon2_io_r(offs_t offset); + void headon2_io_w(offs_t offset, uint8_t data); + void digger_io_w(offs_t offset, uint8_t data); + void invho2_io_w(offs_t offset, uint8_t data); + void invds_io_w(offs_t offset, uint8_t data); + void carhntds_io_w(offs_t offset, uint8_t data); + void sspacaho_io_w(offs_t offset, uint8_t data); + void headonn_io_w(offs_t offset, uint8_t data); + void tranqgun_io_w(offs_t offset, uint8_t data); + void spacetrk_io_w(offs_t offset, uint8_t data); + void brdrline_io_w(offs_t offset, uint8_t data); + void pulsar_io_w(offs_t offset, uint8_t data); + void heiankyo_io_w(offs_t offset, uint8_t data); + void alphaho_io_w(offs_t offset, uint8_t data); + void samurai_protection_w(uint8_t data); + void samurai_io_w(offs_t offset, uint8_t data); + uint8_t invinco_io_r(offs_t offset); + void invinco_io_w(offs_t offset, uint8_t data); /*----------- defined in audio/vicdual.cpp -----------*/ - DECLARE_WRITE8_MEMBER( frogs_audio_w ); - DECLARE_WRITE8_MEMBER( headon_audio_w ); - DECLARE_WRITE8_MEMBER( invho2_audio_w ); - DECLARE_WRITE8_MEMBER( brdrline_audio_w ); - DECLARE_WRITE8_MEMBER( brdrline_audio_aux_w ); + void frogs_audio_w(uint8_t data); + void headon_audio_w(uint8_t data); + void invho2_audio_w(uint8_t data); + void brdrline_audio_w(uint8_t data); + void brdrline_audio_aux_w(uint8_t data); TIMER_CALLBACK_MEMBER( frogs_croak_callback ); /*----------- defined in audio/depthch.cpp -----------*/ @@ -164,7 +164,7 @@ protected: void pulsar_audio_2_w(uint8_t data); /*----------- defined in audio/tranqgun.cpp -----------*/ - DECLARE_WRITE8_MEMBER( tranqgun_audio_w ); + void tranqgun_audio_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(clear_coin_status); @@ -231,8 +231,8 @@ private: int m_nsub_coin_counter; int m_nsub_play_counter; - DECLARE_READ8_MEMBER(nsub_io_r); - DECLARE_WRITE8_MEMBER(nsub_io_w); + uint8_t nsub_io_r(offs_t offset); + void nsub_io_w(offs_t offset, uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(nsub_coin_pulse); @@ -278,7 +278,7 @@ protected: int m_musicData; int m_musicBus; - DECLARE_WRITE8_MEMBER(carnival_io_w); + void carnival_io_w(offs_t offset, uint8_t data); /*----------- defined in audio/carnival.cpp -----------*/ void carnival_audio_1_w(uint8_t data); diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 95c177baec3..75dc09f1072 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -41,10 +41,10 @@ public: void victory(machine_config &config); private: - DECLARE_WRITE8_MEMBER(lamp_control_w); - DECLARE_WRITE8_MEMBER(paletteram_w); - DECLARE_READ8_MEMBER(video_control_r); - DECLARE_WRITE8_MEMBER(video_control_w); + void lamp_control_w(uint8_t data); + void paletteram_w(offs_t offset, uint8_t data); + uint8_t video_control_r(offs_t offset); + void video_control_w(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h index fdcbc0ac4c3..520fc1dee66 100644 --- a/src/mame/includes/vidbrain.h +++ b/src/mame/includes/vidbrain.h @@ -73,9 +73,9 @@ private: TIMER_JOYSTICK }; - DECLARE_WRITE8_MEMBER( keyboard_w ); - DECLARE_READ8_MEMBER( keyboard_r ); - DECLARE_WRITE8_MEMBER( sound_w ); + void keyboard_w(uint8_t data); + uint8_t keyboard_r(); + void sound_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( ext_int_w ); DECLARE_WRITE_LINE_MEMBER( hblank_w ); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index b3739180da6..7f7ac6cc8cf 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -46,17 +46,17 @@ private: std::unique_ptr<bitmap_ind16> m_bg_bitmap; // common - DECLARE_WRITE8_MEMBER(bank_select_w); - DECLARE_WRITE8_MEMBER(paletteram_w); + void bank_select_w(uint8_t data); + void paletteram_w(offs_t offset, uint8_t data); // vigilant and buccanrs - DECLARE_WRITE8_MEMBER(vigilant_out2_w); - DECLARE_WRITE8_MEMBER(vigilant_horiz_scroll_w); - DECLARE_WRITE8_MEMBER(vigilant_rear_horiz_scroll_w); - DECLARE_WRITE8_MEMBER(vigilant_rear_color_w); + void vigilant_out2_w(uint8_t data); + void vigilant_horiz_scroll_w(offs_t offset, uint8_t data); + void vigilant_rear_horiz_scroll_w(offs_t offset, uint8_t data); + void vigilant_rear_color_w(uint8_t data); // kikcubic - DECLARE_WRITE8_MEMBER(kikcubic_coin_w); + void kikcubic_coin_w(uint8_t data); virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 7954befa188..9394d879403 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -43,11 +43,11 @@ private: void scanline_interrupt(); void scanline_int_ack_w(uint16_t data); TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); - DECLARE_READ16_MEMBER(port1_r); + uint16_t port1_r(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); uint32_t screen_update_vindictr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_MEMBER( vindictr_paletteram_w ); + void vindictr_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); static const atari_motion_objects_config s_mob_config; void main_map(address_map &map); diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h index 87721cb623c..785df2b45ba 100644 --- a/src/mame/includes/vip.h +++ b/src/mame/includes/vip.h @@ -64,10 +64,10 @@ private: void update_interrupts(); - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); - DECLARE_READ8_MEMBER(io_r); - DECLARE_WRITE8_MEMBER(io_w); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER(clear_r); DECLARE_READ_LINE_MEMBER(ef1_r); diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h index ecf9802da1d..0e244ad9d6c 100644 --- a/src/mame/includes/vixen.h +++ b/src/mame/includes/vixen.h @@ -61,10 +61,10 @@ public: void init_vixen(); private: - DECLARE_READ8_MEMBER( status_r ); - DECLARE_WRITE8_MEMBER( cmd_w ); - DECLARE_READ8_MEMBER( ieee488_r ); - DECLARE_READ8_MEMBER( port3_r ); + uint8_t status_r(); + void cmd_w(uint8_t data); + uint8_t ieee488_r(); + uint8_t port3_r(); uint8_t i8155_pa_r(); void i8155_pb_w(uint8_t data); void i8155_pc_w(uint8_t data); @@ -78,8 +78,8 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); TIMER_DEVICE_CALLBACK_MEMBER(vsync_tick); IRQ_CALLBACK_MEMBER(vixen_int_ack); - DECLARE_READ8_MEMBER(opram_r); - DECLARE_READ8_MEMBER(oprom_r); + uint8_t opram_r(offs_t offset); + uint8_t oprom_r(offs_t offset); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void bios_mem(address_map &map); diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 3daf9aca094..edae8435869 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -41,11 +41,11 @@ protected: virtual void video_start() override; private: - DECLARE_READ16_MEMBER(video_ram_r); - DECLARE_WRITE16_MEMBER(video_ram_w); - DECLARE_WRITE16_MEMBER(video_ctrl_w); - DECLARE_READ16_MEMBER(video_ctrl_r); - DECLARE_WRITE16_MEMBER(video_mask_w); + uint16_t video_ram_r(offs_t offset); + void video_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);; + void video_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);; + uint16_t video_ctrl_r(); + void video_mask_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);; void counters_w(uint8_t data); void volfied_colpri_cb(u32 &sprite_colbank, u32 &pri_mask, u16 sprite_ctrl); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/vp415.h b/src/mame/includes/vp415.h index b6613822139..86f3a88687b 100644 --- a/src/mame/includes/vp415.h +++ b/src/mame/includes/vp415.h @@ -83,8 +83,8 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(sel34_w); - DECLARE_READ8_MEMBER(sel37_r); + void sel34_w(uint8_t data); + uint8_t sel37_r(); DECLARE_WRITE_LINE_MEMBER(cpu_int1_w); @@ -93,8 +93,8 @@ private: void data_mcu_port2_w(uint8_t data); uint8_t data_mcu_port2_r(); - DECLARE_WRITE8_MEMBER(ctrl_regs_w); - DECLARE_READ8_MEMBER(ctrl_regs_r); + void ctrl_regs_w(offs_t offset, uint8_t data); + uint8_t ctrl_regs_r(offs_t offset); void ctrl_cpu_port1_w(uint8_t data); uint8_t ctrl_cpu_port1_r(); void ctrl_cpu_port3_w(uint8_t data); diff --git a/src/mame/includes/vsmile.h b/src/mame/includes/vsmile.h index 62628efcbf8..f1a6ff0c253 100644 --- a/src/mame/includes/vsmile.h +++ b/src/mame/includes/vsmile.h @@ -52,7 +52,7 @@ protected: void chip_sel_w(uint8_t data); - DECLARE_READ16_MEMBER(bank3_r); + uint16_t bank3_r(offs_t offset); required_device<spg2xx_device> m_maincpu; required_device<screen_device> m_screen; diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index 44bde9cb048..195a7b77684 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -58,41 +58,41 @@ private: optional_memory_region m_gfx1_rom; - DECLARE_WRITE8_MEMBER(sprite_dma_0_w); - DECLARE_WRITE8_MEMBER(sprite_dma_1_w); - DECLARE_WRITE8_MEMBER(vsnes_coin_counter_w); - DECLARE_READ8_MEMBER(vsnes_coin_counter_r); - DECLARE_WRITE8_MEMBER(vsnes_coin_counter_1_w); - DECLARE_WRITE8_MEMBER(vsnes_in0_w); - DECLARE_READ8_MEMBER(vsnes_in0_r); - DECLARE_READ8_MEMBER(vsnes_in1_r); - DECLARE_WRITE8_MEMBER(vsnes_in0_1_w); - DECLARE_READ8_MEMBER(vsnes_in0_1_r); - DECLARE_READ8_MEMBER(vsnes_in1_1_r); - DECLARE_READ8_MEMBER(gun_in0_r); - DECLARE_WRITE8_MEMBER(vsnes_nt0_w); - DECLARE_WRITE8_MEMBER(vsnes_nt1_w); - DECLARE_READ8_MEMBER(vsnes_nt0_r); - DECLARE_READ8_MEMBER(vsnes_nt1_r); - DECLARE_WRITE8_MEMBER(vsnormal_vrom_banking); - DECLARE_WRITE8_MEMBER(gun_in0_w); - DECLARE_WRITE8_MEMBER(vskonami_rom_banking); - DECLARE_WRITE8_MEMBER(vsgshoe_gun_in0_w); - DECLARE_WRITE8_MEMBER(drmario_rom_banking); - DECLARE_WRITE8_MEMBER(vsvram_rom_banking); - DECLARE_WRITE8_MEMBER(mapper4_w); - DECLARE_READ8_MEMBER(rbi_hack_r); - DECLARE_READ8_MEMBER(supxevs_read_prot_1_r); - DECLARE_READ8_MEMBER(supxevs_read_prot_2_r); - DECLARE_READ8_MEMBER(supxevs_read_prot_3_r); - DECLARE_READ8_MEMBER(supxevs_read_prot_4_r); - DECLARE_READ8_MEMBER(tko_security_r); - DECLARE_WRITE8_MEMBER(mapper68_rom_banking); - DECLARE_WRITE8_MEMBER(set_bnglngby_irq_w); - DECLARE_READ8_MEMBER(set_bnglngby_irq_r); - DECLARE_WRITE8_MEMBER(vsdual_vrom_banking_main); - DECLARE_WRITE8_MEMBER(vsdual_vrom_banking_sub); - DECLARE_WRITE8_MEMBER(vssmbbl_sn_w); + void sprite_dma_0_w(address_space &space, uint8_t data); + void sprite_dma_1_w(address_space &space, uint8_t data); + void vsnes_coin_counter_w(uint8_t data); + uint8_t vsnes_coin_counter_r(); + void vsnes_coin_counter_1_w(uint8_t data); + void vsnes_in0_w(uint8_t data); + uint8_t vsnes_in0_r(); + uint8_t vsnes_in1_r(); + void vsnes_in0_1_w(uint8_t data); + uint8_t vsnes_in0_1_r(); + uint8_t vsnes_in1_1_r(); + uint8_t gun_in0_r(); + void vsnes_nt0_w(offs_t offset, uint8_t data); + void vsnes_nt1_w(offs_t offset, uint8_t data); + uint8_t vsnes_nt0_r(offs_t offset); + uint8_t vsnes_nt1_r(offs_t offset); + void vsnormal_vrom_banking(uint8_t data); + void gun_in0_w(uint8_t data); + void vskonami_rom_banking(offs_t offset, uint8_t data); + void vsgshoe_gun_in0_w(uint8_t data); + void drmario_rom_banking(offs_t offset, uint8_t data); + void vsvram_rom_banking(uint8_t data); + void mapper4_w(offs_t offset, uint8_t data); + uint8_t rbi_hack_r(offs_t offset); + uint8_t supxevs_read_prot_1_r(); + uint8_t supxevs_read_prot_2_r(); + uint8_t supxevs_read_prot_3_r(); + uint8_t supxevs_read_prot_4_r(); + uint8_t tko_security_r(offs_t offset); + void mapper68_rom_banking(offs_t offset, uint8_t data); + void set_bnglngby_irq_w(uint8_t data); + uint8_t set_bnglngby_irq_r(); + void vsdual_vrom_banking_main(uint8_t data); + void vsdual_vrom_banking_sub(uint8_t data); + void vssmbbl_sn_w(offs_t offset, uint8_t data); void v_set_mirroring(int ppu, int mirroring); DECLARE_MACHINE_START(vsnes); @@ -104,10 +104,10 @@ private: void mapper4_set_chr( ); void mapper4_irq( int scanline, int vblank, int blanked ); - DECLARE_READ8_MEMBER( vsnes_bootleg_z80_latch_r ); - DECLARE_WRITE8_MEMBER(bootleg_sound_write); - DECLARE_READ8_MEMBER(vsnes_bootleg_z80_data_r); - DECLARE_READ8_MEMBER(vsnes_bootleg_z80_address_r); + uint8_t vsnes_bootleg_z80_latch_r(); + void bootleg_sound_write(offs_t offset, uint8_t data); + uint8_t vsnes_bootleg_z80_data_r(); + uint8_t vsnes_bootleg_z80_address_r(); void vsnes_bootleg_z80_map(address_map &map); void vsnes_cpu1_bootleg_map(address_map &map); diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h index 8c221b4be9c..ef67efaa51a 100644 --- a/src/mame/includes/vtech2.h +++ b/src/mame/includes/vtech2.h @@ -54,17 +54,16 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE8_MEMBER(laser_bank_select_w); - DECLARE_WRITE8_MEMBER(laser_fdc_w); - DECLARE_WRITE8_MEMBER(laser_bg_mode_w); - DECLARE_WRITE8_MEMBER(laser_two_color_w); - DECLARE_READ8_MEMBER(laser_fdc_r); + void laser_fdc_w(offs_t offset, uint8_t data); + void laser_bg_mode_w(uint8_t data); + void laser_two_color_w(uint8_t data); + uint8_t laser_fdc_r(offs_t offset); void vtech2_palette(palette_device &palette) const; uint32_t screen_update_laser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vtech2_interrupt); - DECLARE_WRITE8_MEMBER(mmio_w); - DECLARE_READ8_MEMBER(mmio_r); - DECLARE_READ8_MEMBER(cart_r); + void mmio_w(uint8_t data); + uint8_t mmio_r(offs_t offset); + uint8_t cart_r(offs_t offset); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); void laser_get_track(); diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index f12d0b09c38..edb42b07c87 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -47,10 +47,10 @@ private: tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(c804_w); - DECLARE_WRITE8_MEMBER(palette_bank_w); + void fgvideoram_w(offs_t offset, uint8_t data); + void bgvideoram_w(offs_t offset, uint8_t data); + void c804_w(uint8_t data); + void palette_bank_w(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/warpwarp.h b/src/mame/includes/warpwarp.h index db9839e27c7..f575aac48b0 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -82,22 +82,21 @@ private: tilemap_t *m_bg_tilemap; // warpwarp and bombbee - DECLARE_READ8_MEMBER(warpwarp_sw_r); - DECLARE_WRITE8_MEMBER(warpwarp_out0_w); - DECLARE_WRITE8_MEMBER(warpwarp_out3_w); - DECLARE_WRITE8_MEMBER(warpwarp_videoram_w); - DECLARE_READ8_MEMBER(warpwarp_dsw1_r); - DECLARE_READ8_MEMBER(warpwarp_vol_r); + uint8_t warpwarp_sw_r(offs_t offset); + void warpwarp_out0_w(offs_t offset, uint8_t data); + void warpwarp_videoram_w(offs_t offset, uint8_t data); + uint8_t warpwarp_dsw1_r(offs_t offset); + uint8_t warpwarp_vol_r(); //geebee and navarone - DECLARE_READ8_MEMBER(geebee_in_r); - DECLARE_WRITE8_MEMBER(geebee_out6_w); + uint8_t geebee_in_r(offs_t offset); + void geebee_out6_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(counter_w); DECLARE_WRITE_LINE_MEMBER(lock_out_w); DECLARE_WRITE_LINE_MEMBER(geebee_bgw_w); DECLARE_WRITE_LINE_MEMBER(ball_on_w); DECLARE_WRITE_LINE_MEMBER(inv_w); - DECLARE_WRITE8_MEMBER(geebee_videoram_w); + void geebee_videoram_w(offs_t offset, uint8_t data); virtual void machine_start() override; DECLARE_MACHINE_RESET(kaitei); diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 7417271b442..2e1278f60da 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -81,11 +81,11 @@ private: tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(bankswitch1_w); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(txvideoram_w); + void bankswitch_w(uint8_t data); + void bankswitch1_w(uint8_t data); + void bgvideoram_w(offs_t offset, uint8_t data); + void fgvideoram_w(offs_t offset, uint8_t data); + void txvideoram_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/wc90b.h b/src/mame/includes/wc90b.h index 3466f647871..90dcd6d63e2 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -38,11 +38,11 @@ public: void init_wc90b(); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(txvideoram_w); - DECLARE_WRITE8_MEMBER(bankswitch_w); - DECLARE_WRITE8_MEMBER(sound_command_w); + void bgvideoram_w(offs_t offset, uint8_t data); + void fgvideoram_w(offs_t offset, uint8_t data); + void txvideoram_w(offs_t offset, uint8_t data); + void bankswitch_w(uint8_t data); + void sound_command_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(adpcm_int); void sound_cpu(address_map &map); @@ -85,11 +85,11 @@ private: int m_msm5205next; int m_toggle; - DECLARE_WRITE8_MEMBER(bankswitch1_w); - DECLARE_WRITE8_MEMBER(adpcm_data_w); - DECLARE_WRITE8_MEMBER(adpcm_control_w); - DECLARE_READ8_MEMBER(master_irq_ack_r); - DECLARE_WRITE8_MEMBER(slave_irq_ack_w); + void bankswitch1_w(uint8_t data); + void adpcm_data_w(uint8_t data); + void adpcm_control_w(uint8_t data); + uint8_t master_irq_ack_r(); + void slave_irq_ack_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -112,7 +112,7 @@ protected: virtual void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ) override; private: - DECLARE_WRITE8_MEMBER(master_irq_ack_w); + void master_irq_ack_w(uint8_t data); required_shared_ptr<uint8_t> m_bgscroll; void map1(address_map &map); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 98e411d077e..e8ddb1ecf76 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -89,24 +89,24 @@ private: bool m_hotchase_sound_hs; pen_t m_black_pen; - DECLARE_READ16_MEMBER(wecleman_protection_r); - DECLARE_WRITE16_MEMBER(wecleman_protection_w); - DECLARE_WRITE16_MEMBER(irqctrl_w); - DECLARE_WRITE16_MEMBER(selected_ip_w); + uint16_t wecleman_protection_r(); + void wecleman_protection_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void irqctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void selected_ip_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t selected_ip_r(); - DECLARE_WRITE16_MEMBER(blitter_w); - DECLARE_READ8_MEMBER(multiply_r); - DECLARE_WRITE8_MEMBER(multiply_w); - DECLARE_WRITE8_MEMBER(hotchase_sound_control_w); - DECLARE_WRITE16_MEMBER(wecleman_txtram_w); - DECLARE_WRITE16_MEMBER(wecleman_pageram_w); - DECLARE_WRITE16_MEMBER(wecleman_videostatus_w); - DECLARE_WRITE16_MEMBER(hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w); - DECLARE_WRITE16_MEMBER(wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w); - DECLARE_WRITE8_MEMBER(wecleman_K00723216_bank_w); + void blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t multiply_r(); + void multiply_w(offs_t offset, uint8_t data); + void hotchase_sound_control_w(offs_t offset, uint8_t data); + void wecleman_txtram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wecleman_pageram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wecleman_videostatus_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wecleman_K00723216_bank_w(uint8_t data); void wecleman_volume_callback(uint8_t data); - template<int Chip> DECLARE_READ8_MEMBER(hotchase_k007232_r); - template<int Chip> DECLARE_WRITE8_MEMBER(hotchase_k007232_w); + template<int Chip> uint8_t hotchase_k007232_r(offs_t offset); + template<int Chip> void hotchase_k007232_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(wecleman_get_txt_tile_info); TILE_GET_INFO_MEMBER(wecleman_get_bg_tile_info); @@ -136,7 +136,7 @@ private: K051316_CB_MEMBER(hotchase_zoom_callback_1); K051316_CB_MEMBER(hotchase_zoom_callback_2); - DECLARE_WRITE8_MEMBER(hotchase_sound_hs_w); + void hotchase_sound_hs_w(uint8_t data); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 1d6ea72da81..bf67257c54c 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -56,11 +56,11 @@ private: int m_scrollx; int m_scrolly; - DECLARE_WRITE8_MEMBER(sound_bankswitch_w); - DECLARE_WRITE16_MEMBER(palette_bank_w); - DECLARE_WRITE16_MEMBER(gfxbank_w); - DECLARE_WRITE16_MEMBER(scrollreg_w); - DECLARE_WRITE16_MEMBER(charvideoram_w); + void sound_bankswitch_w(uint8_t data); + void palette_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scrollreg_w(offs_t offset, uint16_t data); + void charvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index c36e13a040c..bc910e8be0e 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -51,7 +51,7 @@ public: u8 port_0_49way_r(); virtual u8 video_counter_r(); - virtual DECLARE_WRITE8_MEMBER(watchdog_reset_w); + virtual void watchdog_reset_w(u8 data); virtual TIMER_DEVICE_CALLBACK_MEMBER(va11_callback); TIMER_DEVICE_CALLBACK_MEMBER(count240_callback); @@ -92,7 +92,7 @@ protected: virtual void vram_select_w(u8 data); virtual void cmos_w(offs_t offset, u8 data); void sinistar_vram_select_w(u8 data); - DECLARE_WRITE8_MEMBER(blitter_w); + void blitter_w(address_space &space, offs_t offset, u8 data); TIMER_CALLBACK_MEMBER(deferred_snd_cmd_w); @@ -349,7 +349,7 @@ protected: virtual TILE_GET_INFO_MEMBER(get_tile_info); void bank_select_w(u8 data); - virtual DECLARE_WRITE8_MEMBER(watchdog_reset_w) override; + virtual void watchdog_reset_w(u8 data) override; void segments_w(u8 data); rgb_t calc_col(uint16_t lo, uint16_t hi); diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 94449b8cb54..7fcf3d3884b 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -38,7 +38,7 @@ private: uint8_t m_main_irq_mask; uint8_t m_sound_irq_mask; - DECLARE_READ8_MEMBER(ports_r); + uint8_t ports_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(main_irq_mask_w); DECLARE_WRITE_LINE_MEMBER(sound_irq_mask_w); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); diff --git a/src/mame/includes/witch.h b/src/mame/includes/witch.h index e2ebb68bb56..8f30d578876 100644 --- a/src/mame/includes/witch.h +++ b/src/mame/includes/witch.h @@ -56,18 +56,18 @@ public: void init_witch(); - DECLARE_WRITE8_MEMBER(gfx0_vram_w); - DECLARE_WRITE8_MEMBER(gfx0_cram_w); - DECLARE_WRITE8_MEMBER(gfx1_vram_w); - DECLARE_WRITE8_MEMBER(gfx1_cram_w); - DECLARE_READ8_MEMBER(gfx1_vram_r); - DECLARE_READ8_MEMBER(gfx1_cram_r); + void gfx0_vram_w(offs_t offset, uint8_t data); + void gfx0_cram_w(offs_t offset, uint8_t data); + void gfx1_vram_w(offs_t offset, uint8_t data); + void gfx1_cram_w(offs_t offset, uint8_t data); + uint8_t gfx1_vram_r(offs_t offset); + uint8_t gfx1_cram_r(offs_t offset); uint8_t read_a000(); void write_a002(uint8_t data); void write_a006(uint8_t data); - DECLARE_WRITE8_MEMBER(main_write_a008); - DECLARE_WRITE8_MEMBER(sub_write_a008); - DECLARE_READ8_MEMBER(prot_read_700x); + void main_write_a008(uint8_t data); + void sub_write_a008(uint8_t data); + uint8_t prot_read_700x(offs_t offset); void xscroll_w(uint8_t data); void yscroll_w(uint8_t data); @@ -130,7 +130,7 @@ private: void keirinou_sub_map(address_map &map); void write_keirinou_a002(uint8_t data); - DECLARE_WRITE8_MEMBER(palette_w); + void palette_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_keirinou_gfx1_tile_info); virtual void video_start() override; diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 7380cf28d61..7aae8bb07a2 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -70,18 +70,18 @@ private: int m_dsc0; int m_dsc1; - DECLARE_READ8_MEMBER(wiz_protection_r); - DECLARE_WRITE8_MEMBER(wiz_coin_counter_w); - DECLARE_WRITE8_MEMBER(wiz_main_nmi_mask_w); - DECLARE_WRITE8_MEMBER(wiz_sound_nmi_mask_w); - DECLARE_WRITE8_MEMBER(wiz_palette_bank_w); - DECLARE_WRITE8_MEMBER(wiz_sprite_bank_w); - DECLARE_WRITE8_MEMBER(wiz_bgcolor_w); - DECLARE_WRITE8_MEMBER(wiz_char_bank_w); - DECLARE_WRITE8_MEMBER(wiz_flipx_w); - DECLARE_WRITE8_MEMBER(wiz_flipy_w); - DECLARE_WRITE8_MEMBER(stinger_explosion_w); - DECLARE_WRITE8_MEMBER(stinger_shot_w); + uint8_t wiz_protection_r(); + void wiz_coin_counter_w(offs_t offset, uint8_t data); + void wiz_main_nmi_mask_w(uint8_t data); + void wiz_sound_nmi_mask_w(uint8_t data); + void wiz_palette_bank_w(offs_t offset, uint8_t data); + void wiz_sprite_bank_w(uint8_t data); + void wiz_bgcolor_w(uint8_t data); + void wiz_char_bank_w(offs_t offset, uint8_t data); + void wiz_flipx_w(uint8_t data); + void wiz_flipy_w(uint8_t data); + void stinger_explosion_w(uint8_t data); + void stinger_shot_w(uint8_t data); virtual void machine_reset() override; virtual void machine_start() override; diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 52d09e7e6e7..f616e7cb7d3 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -38,34 +38,34 @@ private: TIMER_PERIODIC }; - DECLARE_READ8_MEMBER(misc_r); - DECLARE_WRITE8_MEMBER(high_explo_w); - DECLARE_WRITE8_MEMBER(sonar_ping_w); - DECLARE_WRITE8_MEMBER(sirlat_w); - DECLARE_WRITE8_MEMBER(pt_sound_w); - DECLARE_WRITE8_MEMBER(launch_torpedo_w); - DECLARE_WRITE8_MEMBER(low_explo_w); - DECLARE_WRITE8_MEMBER(screw_cont_w); - DECLARE_WRITE8_MEMBER(lamp_flash_w); - DECLARE_WRITE8_MEMBER(warning_light_w); - DECLARE_WRITE8_MEMBER(audamp_w); - DECLARE_WRITE8_MEMBER(attract_w); - DECLARE_WRITE8_MEMBER(credit_w); - DECLARE_WRITE8_MEMBER(coldetres_w); - DECLARE_WRITE8_MEMBER(ship_size_w); - DECLARE_WRITE8_MEMBER(video_invert_w); - DECLARE_WRITE8_MEMBER(ship_reflect_w); - DECLARE_WRITE8_MEMBER(pt_pos_select_w); - DECLARE_WRITE8_MEMBER(pt_horz_w); - DECLARE_WRITE8_MEMBER(pt_pic_w); - DECLARE_WRITE8_MEMBER(ship_h_w); - DECLARE_WRITE8_MEMBER(torpedo_pic_w); - DECLARE_WRITE8_MEMBER(ship_h_precess_w); - DECLARE_WRITE8_MEMBER(ship_pic_w); - DECLARE_WRITE8_MEMBER(torpedo_h_w); - DECLARE_WRITE8_MEMBER(torpedo_v_w); - DECLARE_WRITE8_MEMBER(word_w); - DECLARE_WRITE8_MEMBER(start_speech_w); + uint8_t misc_r(); + void high_explo_w(uint8_t data); + void sonar_ping_w(uint8_t data); + void sirlat_w(uint8_t data); + void pt_sound_w(uint8_t data); + void launch_torpedo_w(uint8_t data); + void low_explo_w(uint8_t data); + void screw_cont_w(uint8_t data); + void lamp_flash_w(uint8_t data); + void warning_light_w(uint8_t data); + void audamp_w(uint8_t data); + void attract_w(uint8_t data); + void credit_w(uint8_t data); + void coldetres_w(uint8_t data); + void ship_size_w(uint8_t data); + void video_invert_w(uint8_t data); + void ship_reflect_w(uint8_t data); + void pt_pos_select_w(uint8_t data); + void pt_horz_w(uint8_t data); + void pt_pic_w(uint8_t data); + void ship_h_w(uint8_t data); + void torpedo_pic_w(uint8_t data); + void ship_h_precess_w(uint8_t data); + void ship_pic_w(uint8_t data); + void torpedo_h_w(uint8_t data); + void torpedo_v_w(uint8_t data); + void word_w(uint8_t data); + void start_speech_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h index c34dcdb36e7..910fbe82ad6 100644 --- a/src/mame/includes/wpc_dot.h +++ b/src/mame/includes/wpc_dot.h @@ -50,8 +50,8 @@ protected: static const device_timer_id TIMER_VBLANK = 0; static const device_timer_id TIMER_IRQ = 1; - DECLARE_READ8_MEMBER(ram_r); - DECLARE_WRITE8_MEMBER(ram_w); + uint8_t ram_r(offs_t offset); + void ram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(wpcsnd_reply_w); DECLARE_WRITE_LINE_MEMBER(wpc_irq_w); DECLARE_WRITE_LINE_MEMBER(wpc_firq_w); diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 7449bcc51d4..3fab591885b 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -32,11 +32,11 @@ public: void wrally(machine_config &config); private: - DECLARE_READ8_MEMBER(shareram_r); - DECLARE_WRITE8_MEMBER(shareram_w); - DECLARE_WRITE16_MEMBER(vram_w); + uint8_t shareram_r(offs_t offset); + void shareram_w(offs_t offset, uint8_t data); + void vram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(okim6295_bankswitch_w); + void okim6295_bankswitch_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); DECLARE_WRITE_LINE_MEMBER(coin1_lockout_w); diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 94c813f0bf1..7db07c98ab7 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -52,11 +52,11 @@ private: tilemap_t *m_fg0_tilemap; tilemap_t *m_bg0_tilemap; - DECLARE_WRITE16_MEMBER(scroll_w); - DECLARE_WRITE16_MEMBER(flipscreen_w); - DECLARE_WRITE16_MEMBER(irqack_w); - DECLARE_WRITE16_MEMBER(fg0_videoram_w); - DECLARE_WRITE16_MEMBER(bg0_videoram_w); + void scroll_w(offs_t offset, uint16_t data); + void flipscreen_w(uint16_t data); + void irqack_w(offs_t offset, uint16_t data); + void fg0_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bg0_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TIMER_DEVICE_CALLBACK_MEMBER(scanline); diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h index 58f7377b010..d4faa709d1f 100644 --- a/src/mame/includes/x07.h +++ b/src/mame/includes/x07.h @@ -198,8 +198,8 @@ private: void machine_start() override; void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( x07_io_r ); - DECLARE_WRITE8_MEMBER( x07_io_w ); + uint8_t x07_io_r(offs_t offset); + void x07_io_w(offs_t offset, uint8_t data); void nvram_init(nvram_device &nvram, void *data, size_t size); diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index 47d05b9985c..d787fe67bb7 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -88,45 +88,45 @@ public: required_device<mc6845_device> m_crtc; required_device<screen_device> m_screen; - DECLARE_READ8_MEMBER(x1_mem_r); - DECLARE_WRITE8_MEMBER(x1_mem_w); - DECLARE_READ8_MEMBER(x1_sub_io_r); - DECLARE_WRITE8_MEMBER(x1_sub_io_w); - DECLARE_READ8_MEMBER(x1_rom_r); - DECLARE_WRITE8_MEMBER(x1_rom_w); - DECLARE_WRITE8_MEMBER(x1_rom_bank_0_w); - DECLARE_WRITE8_MEMBER(x1_rom_bank_1_w); - DECLARE_READ8_MEMBER(x1_fdc_r); - DECLARE_WRITE8_MEMBER(x1_fdc_w); - DECLARE_READ8_MEMBER(x1_pcg_r); - DECLARE_WRITE8_MEMBER(x1_pcg_w); - DECLARE_WRITE8_MEMBER(x1_pal_r_w); - DECLARE_WRITE8_MEMBER(x1_pal_g_w); - DECLARE_WRITE8_MEMBER(x1_pal_b_w); - DECLARE_READ8_MEMBER(x1_ex_gfxram_r); - DECLARE_WRITE8_MEMBER(x1_ex_gfxram_w); - DECLARE_WRITE8_MEMBER(x1_scrn_w); - DECLARE_WRITE8_MEMBER(x1_pri_w); - DECLARE_WRITE8_MEMBER(x1_6845_w); - DECLARE_READ8_MEMBER(x1_kanji_r); - DECLARE_WRITE8_MEMBER(x1_kanji_w); - DECLARE_READ8_MEMBER(x1_emm_r); - DECLARE_WRITE8_MEMBER(x1_emm_w); - DECLARE_READ8_MEMBER(x1turbo_pal_r); - DECLARE_READ8_MEMBER(x1turbo_txpal_r); - DECLARE_READ8_MEMBER(x1turbo_txdisp_r); - DECLARE_READ8_MEMBER(x1turbo_gfxpal_r); - DECLARE_WRITE8_MEMBER(x1turbo_pal_w); - DECLARE_WRITE8_MEMBER(x1turbo_txpal_w); - DECLARE_WRITE8_MEMBER(x1turbo_txdisp_w); - DECLARE_WRITE8_MEMBER(x1turbo_gfxpal_w); - DECLARE_WRITE8_MEMBER(x1turbo_blackclip_w); - DECLARE_READ8_MEMBER(x1turbo_mem_r); - DECLARE_WRITE8_MEMBER(x1turbo_mem_w); - DECLARE_WRITE8_MEMBER(x1turboz_4096_palette_w); - DECLARE_READ8_MEMBER(x1turboz_blackclip_r); - DECLARE_READ8_MEMBER(x1turbo_bank_r); - DECLARE_WRITE8_MEMBER(x1turbo_bank_w); + uint8_t x1_mem_r(offs_t offset); + void x1_mem_w(offs_t offset, uint8_t data); + uint8_t x1_sub_io_r(); + void x1_sub_io_w(uint8_t data); + uint8_t x1_rom_r(); + void x1_rom_w(offs_t offset, uint8_t data); + void x1_rom_bank_0_w(uint8_t data); + void x1_rom_bank_1_w(uint8_t data); + uint8_t x1_fdc_r(offs_t offset); + void x1_fdc_w(offs_t offset, uint8_t data); + uint8_t x1_pcg_r(offs_t offset); + void x1_pcg_w(offs_t offset, uint8_t data); + void x1_pal_r_w(uint8_t data); + void x1_pal_g_w(uint8_t data); + void x1_pal_b_w(uint8_t data); + uint8_t x1_ex_gfxram_r(offs_t offset); + void x1_ex_gfxram_w(offs_t offset, uint8_t data); + void x1_scrn_w(uint8_t data); + void x1_pri_w(uint8_t data); + void x1_6845_w(offs_t offset, uint8_t data); + uint8_t x1_kanji_r(offs_t offset); + void x1_kanji_w(offs_t offset, uint8_t data); + uint8_t x1_emm_r(offs_t offset); + void x1_emm_w(offs_t offset, uint8_t data); + uint8_t x1turbo_pal_r(); + uint8_t x1turbo_txpal_r(offs_t offset); + uint8_t x1turbo_txdisp_r(); + uint8_t x1turbo_gfxpal_r(); + void x1turbo_pal_w(uint8_t data); + void x1turbo_txpal_w(offs_t offset, uint8_t data); + void x1turbo_txdisp_w(uint8_t data); + void x1turbo_gfxpal_w(uint8_t data); + void x1turbo_blackclip_w(uint8_t data); + uint8_t x1turbo_mem_r(offs_t offset); + void x1turbo_mem_w(offs_t offset, uint8_t data); + void x1turboz_4096_palette_w(offs_t offset, uint8_t data); + uint8_t x1turboz_blackclip_r(); + uint8_t x1turbo_bank_r(); + void x1turbo_bank_w(uint8_t data); uint8_t x1_porta_r(); uint8_t x1_portb_r(); uint8_t x1_portc_r(); @@ -157,25 +157,25 @@ public: void x1turbo(machine_config &config); void x1(machine_config &config); - DECLARE_READ8_MEMBER(ym_r); - DECLARE_READ8_MEMBER(color_board_r); - DECLARE_WRITE8_MEMBER(color_board_w); - DECLARE_READ8_MEMBER(color_board_2_r); - DECLARE_WRITE8_MEMBER(color_board_2_w); - DECLARE_READ8_MEMBER(stereo_board_r); - DECLARE_WRITE8_MEMBER(stereo_board_w); - DECLARE_READ8_MEMBER(rs232_r); - DECLARE_WRITE8_MEMBER(rs232_w); - DECLARE_READ8_MEMBER(sasi_r); - DECLARE_WRITE8_MEMBER(sasi_w); - DECLARE_READ8_MEMBER(fdd8_r); - DECLARE_WRITE8_MEMBER(fdd8_w); - DECLARE_READ8_MEMBER(ext_sio_ctc_r); - DECLARE_WRITE8_MEMBER(ext_sio_ctc_w); - DECLARE_WRITE8_MEMBER(z_img_cap_w); - DECLARE_WRITE8_MEMBER(z_mosaic_w); - DECLARE_WRITE8_MEMBER(z_chroma_key_w); - DECLARE_WRITE8_MEMBER(z_extra_scroll_w); + uint8_t ym_r(offs_t offset); + uint8_t color_board_r(address_space &space); + void color_board_w(uint8_t data); + uint8_t color_board_2_r(address_space &space); + void color_board_2_w(uint8_t data); + uint8_t stereo_board_r(address_space &space, offs_t offset); + void stereo_board_w(offs_t offset, uint8_t data); + uint8_t rs232_r(offs_t offset); + void rs232_w(offs_t offset, uint8_t data); + uint8_t sasi_r(address_space &space, offs_t offset); + void sasi_w(offs_t offset, uint8_t data); + uint8_t fdd8_r(address_space &space, offs_t offset); + void fdd8_w(offs_t offset, uint8_t data); + uint8_t ext_sio_ctc_r(address_space &space, offs_t offset); + void ext_sio_ctc_w(offs_t offset, uint8_t data); + void z_img_cap_w(uint8_t data); + void z_mosaic_w(uint8_t data); + void z_chroma_key_w(uint8_t data); + void z_extra_scroll_w(uint8_t data); uint8_t m_key_irq_flag; /**< Keyboard IRQ pending. */ uint8_t m_key_irq_vector; /**< Keyboard IRQ vector. */ diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 7bc1deee1dc..0e2a16d5cdc 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -268,7 +268,7 @@ protected: void ppi_port_c_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(fdc_irq); void ct_w(uint8_t data); - DECLARE_WRITE8_MEMBER(adpcm_w); + void adpcm_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(mfp_irq_callback); //dmac @@ -287,34 +287,34 @@ protected: template <int N> DECLARE_WRITE_LINE_MEMBER(irq4_line); template <int N> DECLARE_WRITE_LINE_MEMBER(nmi_line); - DECLARE_WRITE16_MEMBER(scc_w); - DECLARE_READ16_MEMBER(scc_r); - DECLARE_WRITE16_MEMBER(fdc_w); - DECLARE_READ16_MEMBER(fdc_r); - DECLARE_WRITE16_MEMBER(ioc_w); - DECLARE_READ16_MEMBER(ioc_r); - DECLARE_WRITE16_MEMBER(sysport_w); - DECLARE_READ16_MEMBER(sysport_r); - DECLARE_WRITE16_MEMBER(ppi_w); - DECLARE_READ16_MEMBER(ppi_r); - DECLARE_WRITE16_MEMBER(sram_w); - DECLARE_READ16_MEMBER(sram_r); - DECLARE_WRITE16_MEMBER(vid_w); - DECLARE_READ16_MEMBER(vid_r); - DECLARE_READ16_MEMBER(areaset_r); - DECLARE_WRITE16_MEMBER(areaset_w); - DECLARE_WRITE16_MEMBER(enh_areaset_w); - DECLARE_READ16_MEMBER(rom0_r); - DECLARE_WRITE16_MEMBER(rom0_w); - DECLARE_READ16_MEMBER(emptyram_r); - DECLARE_WRITE16_MEMBER(emptyram_w); - DECLARE_READ16_MEMBER(exp_r); - DECLARE_WRITE16_MEMBER(exp_w); - - DECLARE_READ16_MEMBER(spritereg_r); - DECLARE_WRITE16_MEMBER(spritereg_w); - DECLARE_READ16_MEMBER(spriteram_r); - DECLARE_WRITE16_MEMBER(spriteram_w); + void scc_w(offs_t offset, uint16_t data); + uint16_t scc_r(offs_t offset); + void fdc_w(offs_t offset, uint16_t data); + uint16_t fdc_r(offs_t offset); + void ioc_w(offs_t offset, uint16_t data); + uint16_t ioc_r(offs_t offset); + void sysport_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t sysport_r(offs_t offset); + void ppi_w(offs_t offset, uint16_t data); + uint16_t ppi_r(offs_t offset); + void sram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t sram_r(offs_t offset); + void vid_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t vid_r(offs_t offset); + uint16_t areaset_r(); + void areaset_w(uint16_t data); + void enh_areaset_w(offs_t offset, uint16_t data); + uint16_t rom0_r(offs_t offset, uint16_t mem_mask = ~0); + void rom0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t emptyram_r(offs_t offset, uint16_t mem_mask = ~0); + void emptyram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t exp_r(offs_t offset, uint16_t mem_mask = ~0); + void exp_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + + uint16_t spritereg_r(offs_t offset); + void spritereg_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); uint16_t tvram_read(offs_t offset); void tvram_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t gvram_read(offs_t offset); diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index 0e87f3701d2..3951f0e2990 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -46,17 +46,17 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE8_MEMBER(cpuA_bankswitch_w); - DECLARE_WRITE8_MEMBER(cpuB_bankswitch_w); - DECLARE_WRITE8_MEMBER(main_irq_w); - DECLARE_WRITE8_MEMBER(irqA_assert_w); - DECLARE_WRITE8_MEMBER(irqB_clear_w); - DECLARE_READ8_MEMBER(mcu_comm_reset_r); - template <unsigned N> DECLARE_WRITE8_MEMBER(bgram_w); - DECLARE_WRITE8_MEMBER(charram_w); - template <unsigned N> DECLARE_WRITE8_MEMBER(scrollx_w); - template <unsigned N> DECLARE_WRITE8_MEMBER(scrolly_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); + void cpuA_bankswitch_w(uint8_t data); + void cpuB_bankswitch_w(uint8_t data); + void main_irq_w(offs_t offset, uint8_t data); + void irqA_assert_w(uint8_t data); + void irqB_clear_w(uint8_t data); + uint8_t mcu_comm_reset_r(); + template <unsigned N> void bgram_w(offs_t offset, uint8_t data); + void charram_w(offs_t offset, uint8_t data); + template <unsigned N> void scrollx_w(offs_t offset, uint8_t data); + template <unsigned N> void scrolly_w(offs_t offset, uint8_t data); + void flipscreen_w(uint8_t data); TILEMAP_MAPPER_MEMBER(back_scan); template <unsigned N> TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h index 97530e920e9..0aa37c1513a 100644 --- a/src/mame/includes/xbox.h +++ b/src/mame/includes/xbox.h @@ -82,10 +82,10 @@ public: virtual void map_extra(address_space *memory_space, address_space *io_space) override; virtual void set_host(int index, lpcbus_host_interface *host) override; - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); - DECLARE_READ8_MEMBER(read_rs232); - DECLARE_WRITE8_MEMBER(write_rs232); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t read_rs232(offs_t offset); + void write_rs232(offs_t offset, uint8_t data); protected: virtual void device_start() override; diff --git a/src/mame/includes/xbox_nv2a.h b/src/mame/includes/xbox_nv2a.h index a64863e603c..1e60ba6fc4d 100644 --- a/src/mame/includes/xbox_nv2a.h +++ b/src/mame/includes/xbox_nv2a.h @@ -650,8 +650,8 @@ public: persistvertexattr.attribute[n].fv[3] = 1; } running_machine &machine() { return mach; } - DECLARE_READ32_MEMBER(geforce_r); - DECLARE_WRITE32_MEMBER(geforce_w); + uint32_t geforce_r(offs_t offset, uint32_t mem_mask = ~0); + void geforce_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(vblank_callback); uint32_t screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); bool update_interrupts(); diff --git a/src/mame/includes/xbox_pci.h b/src/mame/includes/xbox_pci.h index 85c1785e85a..05829c6028e 100644 --- a/src/mame/includes/xbox_pci.h +++ b/src/mame/includes/xbox_pci.h @@ -58,8 +58,8 @@ public: protected: virtual void device_start() override; - DECLARE_READ32_MEMBER(config_register_r); - DECLARE_WRITE32_MEMBER(config_register_w); + uint32_t config_register_r(); + void config_register_w(uint32_t data); private: int ram_size; @@ -99,9 +99,9 @@ public: virtual void set_virtual_line(int line, int state) override; virtual void remap() override; - DECLARE_READ32_MEMBER(acpi_r); - DECLARE_WRITE32_MEMBER(acpi_w); - DECLARE_WRITE8_MEMBER(boot_state_w); + uint32_t acpi_r(offs_t offset, uint32_t mem_mask = ~0); + void acpi_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void boot_state_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(irq1); DECLARE_WRITE_LINE_MEMBER(irq3); @@ -129,8 +129,8 @@ private: void update_smi_line(); void speaker_set_spkrdata(uint8_t data); - DECLARE_READ8_MEMBER(portb_r); - DECLARE_WRITE8_MEMBER(portb_w); + uint8_t portb_r(); + void portb_w(uint8_t data); devcb_write_line m_smi_callback; devcb_write_line m_interrupt_output; @@ -173,10 +173,10 @@ public: auto interrupt_handler() { return m_interrupt_handler.bind(); } - DECLARE_READ32_MEMBER(smbus0_r); - DECLARE_WRITE32_MEMBER(smbus0_w); - DECLARE_READ32_MEMBER(smbus1_r); - DECLARE_WRITE32_MEMBER(smbus1_w); + uint32_t smbus0_r(offs_t offset, uint32_t mem_mask = ~0); + void smbus0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t smbus1_r(offs_t offset, uint32_t mem_mask = ~0); + void smbus1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); protected: virtual void device_start() override; @@ -215,8 +215,8 @@ public: auto interrupt_handler() { return m_interrupt_handler.bind(); } - DECLARE_READ32_MEMBER(ohci_r); - DECLARE_WRITE32_MEMBER(ohci_w); + uint32_t ohci_r(offs_t offset); + void ohci_w(offs_t offset, uint32_t data); protected: virtual void device_start() override; @@ -248,10 +248,10 @@ class mcpx_eth_device : public pci_device { public: mcpx_eth_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ32_MEMBER(eth_r); - DECLARE_WRITE32_MEMBER(eth_w); - DECLARE_READ32_MEMBER(eth_io_r); - DECLARE_WRITE32_MEMBER(eth_io_w); + uint32_t eth_r(); + void eth_w(uint32_t data); + uint32_t eth_io_r(); + void eth_io_w(uint32_t data); protected: virtual void device_start() override; @@ -279,8 +279,8 @@ public: mcpx_apu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); template <typename T> void set_cpu_tag(T &&cpu_tag) { cpu.set_tag(std::forward<T>(cpu_tag)); } - DECLARE_READ32_MEMBER(apu_r); - DECLARE_WRITE32_MEMBER(apu_w); + uint32_t apu_r(offs_t offset, uint32_t mem_mask = ~0); + void apu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); protected: virtual void device_start() override; @@ -324,12 +324,12 @@ class mcpx_ac97_audio_device : public pci_device { public: mcpx_ac97_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ32_MEMBER(ac97_audio_r); - DECLARE_WRITE32_MEMBER(ac97_audio_w); - DECLARE_READ32_MEMBER(ac97_audio_io0_r); - DECLARE_WRITE32_MEMBER(ac97_audio_io0_w); - DECLARE_READ32_MEMBER(ac97_audio_io1_r); - DECLARE_WRITE32_MEMBER(ac97_audio_io1_w); + uint32_t ac97_audio_r(offs_t offset, uint32_t mem_mask = ~0); + void ac97_audio_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t ac97_audio_io0_r(); + void ac97_audio_io0_w(uint32_t data); + uint32_t ac97_audio_io1_r(); + void ac97_audio_io1_w(uint32_t data); protected: virtual void device_start() override; @@ -371,11 +371,11 @@ public: virtual void config_map(address_map &map) override; - DECLARE_WRITE32_MEMBER(class_rev_w); - DECLARE_READ8_MEMBER(pri_read_cs1_r); - DECLARE_WRITE8_MEMBER(pri_write_cs1_w); - DECLARE_READ8_MEMBER(sec_read_cs1_r); - DECLARE_WRITE8_MEMBER(sec_write_cs1_w); + void class_rev_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint8_t pri_read_cs1_r(); + void pri_write_cs1_w(uint8_t data); + uint8_t sec_read_cs1_r(); + void sec_write_cs1_w(uint8_t data); protected: virtual void device_start() override; @@ -416,8 +416,8 @@ public: void config_map(address_map& map) override; - DECLARE_READ32_MEMBER(unknown_r); - DECLARE_WRITE32_MEMBER(unknown_w); + uint32_t unknown_r(offs_t offset, uint32_t mem_mask = ~0); + void unknown_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); protected: virtual void device_start() override; @@ -444,10 +444,10 @@ public: auto interrupt_handler() { return m_interrupt_handler.bind(); } - DECLARE_READ32_MEMBER(geforce_r); - DECLARE_WRITE32_MEMBER(geforce_w); - DECLARE_READ32_MEMBER(nv2a_mirror_r); - DECLARE_WRITE32_MEMBER(nv2a_mirror_w); + uint32_t geforce_r(offs_t offset, uint32_t mem_mask = ~0); + void geforce_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t nv2a_mirror_r(offs_t offset, uint32_t mem_mask = ~0); + void nv2a_mirror_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); protected: virtual void device_start() override; diff --git a/src/mame/includes/xbox_usb.h b/src/mame/includes/xbox_usb.h index 35f0d7782e7..641d7afb848 100644 --- a/src/mame/includes/xbox_usb.h +++ b/src/mame/includes/xbox_usb.h @@ -361,8 +361,8 @@ public: void reset(); void timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - DECLARE_READ32_MEMBER(read); - DECLARE_WRITE32_MEMBER(write); + uint32_t read(offs_t offset); + void write(offs_t offset, uint32_t data); private: void usb_ohci_interrupts(); diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index 00ac1d1d5da..86f436f6432 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -75,10 +75,10 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); - DECLARE_READ8_MEMBER( fdc_r ); - DECLARE_WRITE8_MEMBER( fdc_w ); - DECLARE_WRITE8_MEMBER( scroll_w ); - //DECLARE_WRITE8_MEMBER( x120_system_w ); + uint8_t fdc_r(offs_t offset); + void fdc_w(offs_t offset, uint8_t data); + void scroll_w(offs_t offset, uint8_t data); + //void x120_system_w(uint8_t data); uint8_t kbpio_pa_r(); void kbpio_pa_w(uint8_t data); uint8_t kbpio_pb_r(); @@ -161,11 +161,11 @@ public: { } - DECLARE_WRITE8_MEMBER( bell_w ); - DECLARE_WRITE8_MEMBER( slden_w ); - DECLARE_WRITE8_MEMBER( chrom_w ); - DECLARE_WRITE8_MEMBER( lowlite_w ); - DECLARE_WRITE8_MEMBER( sync_w ); + void bell_w(offs_t offset, uint8_t data); + void slden_w(offs_t offset, uint8_t data); + void chrom_w(offs_t offset, uint8_t data); + void lowlite_w(uint8_t data); + void sync_w(offs_t offset, uint8_t data); void rdpio_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( rdpio_pardy_w ); diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h index 34d8e820fa5..43ca36e9570 100644 --- a/src/mame/includes/xevious.h +++ b/src/mame/includes/xevious.h @@ -49,13 +49,13 @@ protected: DECLARE_MACHINE_RESET(xevios); uint32_t screen_update_xevious(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); - DECLARE_WRITE8_MEMBER( xevious_fg_videoram_w ); - DECLARE_WRITE8_MEMBER( xevious_fg_colorram_w ); - DECLARE_WRITE8_MEMBER( xevious_bg_videoram_w ); - DECLARE_WRITE8_MEMBER( xevious_bg_colorram_w ); - DECLARE_WRITE8_MEMBER( xevious_vh_latch_w ); - DECLARE_WRITE8_MEMBER( xevious_bs_w ); - DECLARE_READ8_MEMBER( xevious_bb_r ); + void xevious_fg_videoram_w(offs_t offset, uint8_t data); + void xevious_fg_colorram_w(offs_t offset, uint8_t data); + void xevious_bg_videoram_w(offs_t offset, uint8_t data); + void xevious_bg_colorram_w(offs_t offset, uint8_t data); + void xevious_vh_latch_w(offs_t offset, uint8_t data); + void xevious_bs_w(offs_t offset, uint8_t data); + uint8_t xevious_bb_r(offs_t offset); optional_device<cpu_device> m_subcpu3; @@ -84,18 +84,18 @@ protected: void battles_mem4(address_map &map); // Custom I/O - DECLARE_READ8_MEMBER( customio0_r ); - DECLARE_READ8_MEMBER( customio_data0_r ); - DECLARE_READ8_MEMBER( customio3_r ); - DECLARE_READ8_MEMBER( customio_data3_r ); - DECLARE_READ8_MEMBER( input_port_r ); - - DECLARE_WRITE8_MEMBER( customio0_w ); - DECLARE_WRITE8_MEMBER( customio_data0_w ); - DECLARE_WRITE8_MEMBER( customio3_w ); - DECLARE_WRITE8_MEMBER( customio_data3_w ); - DECLARE_WRITE8_MEMBER( cpu4_coin_w ); - DECLARE_WRITE8_MEMBER( noise_sound_w ); + uint8_t customio0_r(); + uint8_t customio_data0_r(offs_t offset); + uint8_t customio3_r(); + uint8_t customio_data3_r(offs_t offset); + uint8_t input_port_r(offs_t offset); + + void customio0_w(uint8_t data); + void customio_data0_w(offs_t offset, uint8_t data); + void customio3_w(uint8_t data); + void customio_data3_w(offs_t offset, uint8_t data); + void cpu4_coin_w(uint8_t data); + void noise_sound_w(offs_t offset, uint8_t data); required_device<timer_device> m_nmi_timer; diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index ef47f49b492..c03ba14450d 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -91,13 +91,13 @@ private: required_device<screen_device> m_screen; required_device<k054321_device> m_k054321; - DECLARE_READ16_MEMBER(spriteram_mirror_r); - DECLARE_WRITE16_MEMBER(spriteram_mirror_w); - DECLARE_READ16_MEMBER(xexex_waitskip_r); - DECLARE_READ16_MEMBER(control2_r); - DECLARE_WRITE16_MEMBER(control2_w); - DECLARE_WRITE16_MEMBER(sound_irq_w); - DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + uint16_t spriteram_mirror_r(offs_t offset); + void spriteram_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t xexex_waitskip_r(); + uint16_t control2_r(); + void control2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sound_irq_w(uint16_t data); + void sound_bankswitch_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index 1f7529c0c0d..5dae79fdebd 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -69,9 +69,9 @@ private: required_device<k054321_device> m_k054321; required_memory_bank m_z80bank; - DECLARE_WRITE16_MEMBER(eeprom_w); - DECLARE_WRITE16_MEMBER(xmen_18fa00_w); - DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void xmen_18fa00_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sound_bankswitch_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h index 2663f0731f0..25bb81e399e 100644 --- a/src/mame/includes/xor100.h +++ b/src/mame/includes/xor100.h @@ -52,12 +52,12 @@ public: void xor100(machine_config &config); private: - DECLARE_WRITE8_MEMBER( mmu_w ); - DECLARE_WRITE8_MEMBER( prom_toggle_w ); - DECLARE_READ8_MEMBER( prom_disable_r ); - DECLARE_READ8_MEMBER( fdc_wait_r ); - DECLARE_WRITE8_MEMBER( fdc_dcont_w ); - DECLARE_WRITE8_MEMBER( fdc_dsel_w ); + void mmu_w(uint8_t data); + void prom_toggle_w(uint8_t data); + uint8_t prom_disable_r(); + uint8_t fdc_wait_r(); + void fdc_dcont_w(uint8_t data); + void fdc_dsel_w(uint8_t data); void fdc_intrq_w(bool state); void fdc_drq_w(bool state); diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index c8e6e310589..d5e9287d60c 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -47,12 +47,12 @@ private: uint8_t m_yscroll; uint8_t m_flipscreen; - DECLARE_WRITE8_MEMBER(bank_sel_w); - DECLARE_WRITE8_MEMBER(status_m_w); - DECLARE_WRITE8_MEMBER(status_s_w); - DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(bgram_w); - DECLARE_READ8_MEMBER(bgram_r); + void bank_sel_w(uint8_t data); + void status_m_w(uint8_t data); + void status_s_w(uint8_t data); + void flipscreen_w(uint8_t data); + void bgram_w(offs_t offset, uint8_t data); + uint8_t bgram_r(offs_t offset); void scroll_x_w(uint8_t data); void scroll_y_w(uint8_t data); diff --git a/src/mame/machine/taitosj.cpp b/src/mame/machine/taitosj.cpp index 2db0ee0bc8f..70f6a35a75f 100644 --- a/src/mame/machine/taitosj.cpp +++ b/src/mame/machine/taitosj.cpp @@ -29,16 +29,15 @@ void taitosj_state::machine_start() void taitosj_state::machine_reset() { - address_space &space = m_maincpu->space(AS_PROGRAM); /* set the default ROM bank (many games only have one bank and */ /* never write to the bank selector register) */ - taitosj_bankswitch_w(space, 0, 0); + taitosj_bankswitch_w(0); m_spacecr_prot_value = 0; } -WRITE8_MEMBER(taitosj_state::taitosj_bankswitch_w) +void taitosj_state::taitosj_bankswitch_w(uint8_t data) { machine().bookkeeping().coin_lockout_global_w(~data & 1); @@ -74,18 +73,18 @@ WRITE8_MEMBER(taitosj_state::taitosj_bankswitch_w) direct access to the Z80 memory space. It can also trigger IRQs on the Z80. ***************************************************************************/ -READ8_MEMBER(taitosj_state::taitosj_fake_data_r) +uint8_t taitosj_state::taitosj_fake_data_r() { LOG(("%04x: protection read\n",m_maincpu->pc())); return 0; } -WRITE8_MEMBER(taitosj_state::taitosj_fake_data_w) +void taitosj_state::taitosj_fake_data_w(uint8_t data) { LOG(("%04x: protection write %02x\n",m_maincpu->pc(),data)); } -READ8_MEMBER(taitosj_state::taitosj_fake_status_r) +uint8_t taitosj_state::taitosj_fake_status_r() { LOG(("%04x: protection status read\n",m_maincpu->pc())); return 0xff; @@ -119,7 +118,7 @@ WRITE_LINE_MEMBER(taitosj_state::mcu_busrq_w) /* Space Cruiser protection (otherwise the game resets on the asteroids level) */ -READ8_MEMBER(taitosj_state::spacecr_prot_r) +uint8_t taitosj_state::spacecr_prot_r() { int pc = m_maincpu->pc(); @@ -134,7 +133,7 @@ READ8_MEMBER(taitosj_state::spacecr_prot_r) /* Alpine Ski protection crack routines */ -WRITE8_MEMBER(taitosj_state::alpine_protection_w) +void taitosj_state::alpine_protection_w(uint8_t data) { switch (data) { @@ -158,13 +157,13 @@ WRITE8_MEMBER(taitosj_state::alpine_protection_w) } } -WRITE8_MEMBER(taitosj_state::alpinea_bankswitch_w) +void taitosj_state::alpinea_bankswitch_w(uint8_t data) { - taitosj_bankswitch_w(space, offset, data); + taitosj_bankswitch_w(data); m_protection_value = data >> 2; } -READ8_MEMBER(taitosj_state::alpine_port_2_r) +uint8_t taitosj_state::alpine_port_2_r() { return ioport("IN2")->read() | m_protection_value; } diff --git a/src/mame/machine/tatsumi.cpp b/src/mame/machine/tatsumi.cpp index 44867fc93ea..c358a5bbbfb 100644 --- a/src/mame/machine/tatsumi.cpp +++ b/src/mame/machine/tatsumi.cpp @@ -18,12 +18,12 @@ void tatsumi_state::tatsumi_reset() /******************************************************************************/ -READ16_MEMBER(apache3_state::apache3_bank_r) +uint16_t apache3_state::apache3_bank_r() { return m_control_word; } -WRITE16_MEMBER(apache3_state::apache3_bank_w) +void apache3_state::apache3_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* 0x8000 - Set when accessing palette ram (not implemented, perhaps blank screen?) @@ -56,12 +56,12 @@ WRITE16_MEMBER(apache3_state::apache3_bank_w) // D1 = /ZBREQ - Z80 bus request // D0 = /GRDACC - Allow 68000 access to road pattern RAM -WRITE16_MEMBER(apache3_state::apache3_z80_ctrl_w) +void apache3_state::apache3_z80_ctrl_w(uint16_t data) { m_subcpu2->set_input_line(INPUT_LINE_HALT, data & 2 ? ASSERT_LINE : CLEAR_LINE); } -READ16_MEMBER(apache3_state::apache3_v30_v20_r) +uint16_t apache3_state::apache3_v30_v20_r(offs_t offset) { address_space &targetspace = m_audiocpu->space(AS_PROGRAM); @@ -77,7 +77,7 @@ READ16_MEMBER(apache3_state::apache3_v30_v20_r) return 0xff00 | targetspace.read_byte(offset); } -WRITE16_MEMBER(apache3_state::apache3_v30_v20_w) +void apache3_state::apache3_v30_v20_w(offs_t offset, uint16_t data, uint16_t mem_mask) { address_space &targetspace = m_audiocpu->space(AS_PROGRAM); @@ -91,12 +91,12 @@ WRITE16_MEMBER(apache3_state::apache3_v30_v20_w) } } -READ16_MEMBER(apache3_state::apache3_z80_r) +uint16_t apache3_state::apache3_z80_r(offs_t offset) { return m_apache3_z80_ram[offset]; } -WRITE16_MEMBER(apache3_state::apache3_z80_w) +void apache3_state::apache3_z80_w(offs_t offset, uint16_t data) { m_apache3_z80_ram[offset] = data & 0xff; } @@ -112,7 +112,7 @@ uint8_t apache3_state::apache3_vr1_r() * presumably loaded into the 8 TZ2213 custom * accumulators and counters. */ -WRITE16_MEMBER(apache3_state::apache3_rotate_w) +void apache3_state::apache3_rotate_w(uint16_t data) { m_apache3_rotate_ctrl[m_apache3_rot_idx] = data; m_apache3_rot_idx = (m_apache3_rot_idx + 1) % 12; @@ -120,7 +120,7 @@ WRITE16_MEMBER(apache3_state::apache3_rotate_w) /******************************************************************************/ -READ16_MEMBER(roundup5_state::roundup_v30_z80_r) +uint16_t roundup5_state::roundup_v30_z80_r(offs_t offset) { address_space &targetspace = m_audiocpu->space(AS_PROGRAM); @@ -131,7 +131,7 @@ READ16_MEMBER(roundup5_state::roundup_v30_z80_r) return 0xff00 | targetspace.read_byte(offset); } -WRITE16_MEMBER(roundup5_state::roundup_v30_z80_w) +void roundup5_state::roundup_v30_z80_w(offs_t offset, uint16_t data, uint16_t mem_mask) { address_space &targetspace = m_audiocpu->space(AS_PROGRAM); @@ -146,7 +146,7 @@ WRITE16_MEMBER(roundup5_state::roundup_v30_z80_w) } -WRITE16_MEMBER(roundup5_state::roundup5_control_w) +void roundup5_state::roundup5_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_control_word); @@ -207,7 +207,7 @@ WRITE16_MEMBER(roundup5_state::roundup5_control_w) m_last_control = m_control_word; } -WRITE16_MEMBER(roundup5_state::road_vregs_w) +void roundup5_state::road_vregs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* ---- ---x ---- ---- enabled when there's a road slope of any kind, unknown purpose @@ -258,7 +258,7 @@ void cyclwarr_state::cyclwarr_control_w(uint8_t data) /******************************************************************************/ -READ16_MEMBER(tatsumi_state::tatsumi_v30_68000_r) +uint16_t tatsumi_state::tatsumi_v30_68000_r(offs_t offset) { const uint16_t* rom=(uint16_t*)m_subregion->base(); @@ -293,7 +293,7 @@ READ16_MEMBER(tatsumi_state::tatsumi_v30_68000_r) return rom[offset]; } -WRITE16_MEMBER(tatsumi_state::tatsumi_v30_68000_w) +void tatsumi_state::tatsumi_v30_68000_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if ((m_control_word&0x1f)!=0x18) logerror("68k write in bank %05x\n",m_control_word); @@ -305,7 +305,7 @@ WRITE16_MEMBER(tatsumi_state::tatsumi_v30_68000_w) // Todo: Current YM2151 doesn't seem to raise the busy flag quickly enough for the // self-test in Tatsumi games. Needs fixed, but hack it here for now. -READ8_MEMBER(tatsumi_state::tatsumi_hack_ym2151_r) +uint8_t tatsumi_state::tatsumi_hack_ym2151_r() { int r=m_ym2151->status_r(); @@ -316,7 +316,7 @@ READ8_MEMBER(tatsumi_state::tatsumi_hack_ym2151_r) return r; } -READ8_MEMBER(cyclwarr_state::oki_status_xor_r) +uint8_t cyclwarr_state::oki_status_xor_r() { int r = m_oki->read(); diff --git a/src/mame/machine/tecmosys.cpp b/src/mame/machine/tecmosys.cpp index 05fec044a02..e824495d846 100644 --- a/src/mame/machine/tecmosys.cpp +++ b/src/mame/machine/tecmosys.cpp @@ -124,7 +124,7 @@ void tecmosys_state::prot_init(int which) machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(&tecmosys_state::prot_reset,this)); } -READ16_MEMBER(tecmosys_state::prot_status_r) +u16 tecmosys_state::prot_status_r(offs_t offset, u16 mem_mask) { if (ACCESSING_BITS_8_15) { @@ -136,13 +136,13 @@ READ16_MEMBER(tecmosys_state::prot_status_r) return 0xc0; // simulation is always ready } -WRITE16_MEMBER(tecmosys_state::prot_status_w) +void tecmosys_state::prot_status_w(u16 data) { // deroon clears the status in one place. } -READ16_MEMBER(tecmosys_state::prot_data_r) +u16 tecmosys_state::prot_data_r() { // prot appears to be read-ready for two consecutive reads // but returns 0xff for subsequent reads. @@ -153,7 +153,7 @@ READ16_MEMBER(tecmosys_state::prot_data_r) } -WRITE16_MEMBER(tecmosys_state::prot_data_w) +void tecmosys_state::prot_data_w(u16 data) { // Only LSB data >>= 8; diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 521ba65129d..ee2fd34b6fe 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -338,7 +338,7 @@ void thomson_state::to7_update_cart_bank() bank = m_thom_cart_bank % m_thom_cart_nb_banks; if ( bank != m_old_cart_bank && m_old_cart_bank < 0 ) { - space.install_read_handler(0x0000, 0x0003, read8_delegate(*this, FUNC(thomson_state::to7_cartridge_r)) ); + space.install_read_handler(0x0000, 0x0003, read8sm_delegate(*this, FUNC(thomson_state::to7_cartridge_r)) ); } } if ( bank != m_old_cart_bank ) @@ -359,7 +359,7 @@ void thomson_state::to7_update_cart_bank_postload() /* write signal to 0000-1fff generates a bank switch */ -WRITE8_MEMBER( thomson_state::to7_cartridge_w ) +void thomson_state::to7_cartridge_w(offs_t offset, uint8_t data) { if ( offset >= 0x2000 ) return; @@ -371,7 +371,7 @@ WRITE8_MEMBER( thomson_state::to7_cartridge_w ) /* read signal to 0000-0003 generates a bank switch */ -READ8_MEMBER( thomson_state::to7_cartridge_r ) +uint8_t thomson_state::to7_cartridge_r(offs_t offset) { uint8_t data = m_cart_rom[offset + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; if ( !machine().side_effects_disabled() ) @@ -666,7 +666,7 @@ void thomson_state::to7_modem_init() /* ------------ dispatch MODEM / speech extension ------------ */ -READ8_MEMBER( thomson_state::to7_modem_mea8000_r ) +uint8_t thomson_state::to7_modem_mea8000_r(offs_t offset) { if ( machine().side_effects_disabled() ) { @@ -693,7 +693,7 @@ READ8_MEMBER( thomson_state::to7_modem_mea8000_r ) -WRITE8_MEMBER( thomson_state::to7_modem_mea8000_w ) +void thomson_state::to7_modem_mea8000_w(offs_t offset, uint8_t data) { if ( m_io_mconfig->read() & 1 ) { @@ -922,7 +922,7 @@ void thomson_state::to7_game_reset() */ -READ8_MEMBER( thomson_state::to7_midi_r ) +uint8_t thomson_state::to7_midi_r() { logerror( "to7_midi_r: not implemented\n" ); return 0; @@ -930,7 +930,7 @@ READ8_MEMBER( thomson_state::to7_midi_r ) -WRITE8_MEMBER( thomson_state::to7_midi_w ) +void thomson_state::to7_midi_w(uint8_t data) { logerror( "to7_midi_w: not implemented\n" ); } @@ -1141,7 +1141,7 @@ void thomson_state::to770_timer_port_out(uint8_t data) -READ8_MEMBER( thomson_state::to770_gatearray_r ) +uint8_t thomson_state::to770_gatearray_r(offs_t offset) { struct thom_vsignal v = thom_get_vsignal(); struct thom_vsignal l = thom_get_lightpen_vsignal( TO7_LIGHTPEN_DECAL, m_to7_lightpen_step - 1, 0 ); @@ -1165,7 +1165,7 @@ READ8_MEMBER( thomson_state::to770_gatearray_r ) -WRITE8_MEMBER( thomson_state::to770_gatearray_w ) +void thomson_state::to770_gatearray_w(offs_t offset, uint8_t data) { if ( ! offset ) m_to7_lightpen = data & 1; @@ -1333,7 +1333,7 @@ uint8_t thomson_state::mo5_sys_portb_in() -READ8_MEMBER( thomson_state::mo5_gatearray_r ) +uint8_t thomson_state::mo5_gatearray_r(offs_t offset) { struct thom_vsignal v = thom_get_vsignal(); struct thom_vsignal l = thom_get_lightpen_vsignal( MO5_LIGHTPEN_DECAL, m_to7_lightpen_step - 1, 0 ); @@ -1356,7 +1356,7 @@ READ8_MEMBER( thomson_state::mo5_gatearray_r ) -WRITE8_MEMBER( thomson_state::mo5_gatearray_w ) +void thomson_state::mo5_gatearray_w(offs_t offset, uint8_t data) { if ( ! offset ) m_to7_lightpen = data & 1; @@ -1484,8 +1484,8 @@ void thomson_state::mo5_update_cart_bank() if ( m_old_cart_bank < 0 ) { space.install_read_bank( 0xb000, 0xefff, m_cartbank); - space.install_write_handler( 0xb000, 0xefff, write8_delegate(*this, FUNC(thomson_state::mo5_cartridge_w)) ); - space.install_read_handler( 0xbffc, 0xbfff, read8_delegate(*this, FUNC(thomson_state::mo5_cartridge_r)) ); + space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(thomson_state::mo5_cartridge_w)) ); + space.install_read_handler( 0xbffc, 0xbfff, read8sm_delegate(*this, FUNC(thomson_state::mo5_cartridge_r)) ); } LOG_BANK(( "mo5_update_cart_bank: CART is cartridge bank %i\n", bank )); } @@ -1496,7 +1496,7 @@ void thomson_state::mo5_update_cart_bank() if ( m_old_cart_bank != 0 ) { space.install_read_bank( 0xb000, 0xefff, m_cartbank); - space.install_write_handler( 0xb000, 0xefff, write8_delegate(*this, FUNC(thomson_state::mo5_cartridge_w)) ); + space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(thomson_state::mo5_cartridge_w)) ); LOG_BANK(( "mo5_update_cart_bank: CART is internal\n")); } } @@ -1518,7 +1518,7 @@ void thomson_state::mo5_update_cart_bank_postload() /* write signal to b000-cfff generates a bank switch */ -WRITE8_MEMBER( thomson_state::mo5_cartridge_w ) +void thomson_state::mo5_cartridge_w(offs_t offset, uint8_t data) { if ( offset >= 0x2000 ) return; @@ -1530,7 +1530,7 @@ WRITE8_MEMBER( thomson_state::mo5_cartridge_w ) /* read signal to bffc-bfff generates a bank switch */ -READ8_MEMBER( thomson_state::mo5_cartridge_r ) +uint8_t thomson_state::mo5_cartridge_r(offs_t offset) { uint8_t data = m_cart_rom[offset + 0x3ffc + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; if ( !machine().side_effects_disabled() ) @@ -1544,7 +1544,7 @@ READ8_MEMBER( thomson_state::mo5_cartridge_r ) /* 0xa7cb bank-switch register */ -WRITE8_MEMBER( thomson_state::mo5_ext_w ) +void thomson_state::mo5_ext_w(uint8_t data) { m_mo5_reg_cart = data; mo5_update_cart_bank(); @@ -1640,14 +1640,14 @@ MACHINE_START_MEMBER( thomson_state, mo5 ) -WRITE8_MEMBER( thomson_state::to9_ieee_w ) +void thomson_state::to9_ieee_w(offs_t offset, uint8_t data) { logerror( "$%04x %f to9_ieee_w: unhandled write $%02X to register %i\n", m_maincpu->pc(), machine().time().as_double(), data, offset ); } -READ8_MEMBER( thomson_state::to9_ieee_r ) +uint8_t thomson_state::to9_ieee_r(offs_t offset) { logerror( "$%04x %f to9_ieee_r: unhandled read from register %i\n", m_maincpu->pc(), machine().time().as_double(), offset ); return 0; @@ -1663,7 +1663,7 @@ READ8_MEMBER( thomson_state::to9_ieee_r ) -READ8_MEMBER( thomson_state::to9_gatearray_r ) +uint8_t thomson_state::to9_gatearray_r(offs_t offset) { struct thom_vsignal v = thom_get_vsignal(); struct thom_vsignal l = thom_get_lightpen_vsignal( TO9_LIGHTPEN_DECAL, m_to7_lightpen_step - 1, 0 ); @@ -1687,7 +1687,7 @@ READ8_MEMBER( thomson_state::to9_gatearray_r ) -WRITE8_MEMBER( thomson_state::to9_gatearray_w ) +void thomson_state::to9_gatearray_w(offs_t offset, uint8_t data) { if ( ! offset ) m_to7_lightpen = data & 1; @@ -1753,7 +1753,7 @@ void thomson_state::to9_set_video_mode( uint8_t data, int style ) -READ8_MEMBER( thomson_state::to9_vreg_r ) +uint8_t thomson_state::to9_vreg_r(offs_t offset) { switch ( offset ) { @@ -1782,7 +1782,7 @@ READ8_MEMBER( thomson_state::to9_vreg_r ) -WRITE8_MEMBER( thomson_state::to9_vreg_w ) +void thomson_state::to9_vreg_w(offs_t offset, uint8_t data) { LOG_VIDEO(( "$%04x %f to9_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), offset, 0xe7da + offset, data )); @@ -1886,8 +1886,8 @@ void thomson_state::to9_update_cart_bank() if ( m_old_cart_bank < 0 || m_old_cart_bank > 3 ) { space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); - space.install_write_handler( 0x0000, 0x3fff, write8_delegate(*this, FUNC(thomson_state::to9_cartridge_w)) ); - space.install_read_handler( 0x0000, 0x0003, read8_delegate(*this, FUNC(thomson_state::to9_cartridge_r)) ); + space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(thomson_state::to9_cartridge_w)) ); + space.install_read_handler( 0x0000, 0x0003, read8sm_delegate(*this, FUNC(thomson_state::to9_cartridge_r)) ); } LOG_BANK(( "to9_update_cart_bank: CART is cartridge bank %i\n", m_thom_cart_bank )); } @@ -1919,7 +1919,7 @@ void thomson_state::to9_update_cart_bank_postload() /* write signal to 0000-1fff generates a bank switch */ -WRITE8_MEMBER( thomson_state::to9_cartridge_w ) +void thomson_state::to9_cartridge_w(offs_t offset, uint8_t data) { int slot = ( m_mc6846->get_output_port() >> 4 ) & 3; /* bits 4-5: ROM bank */ @@ -1936,7 +1936,7 @@ WRITE8_MEMBER( thomson_state::to9_cartridge_w ) /* read signal to 0000-0003 generates a bank switch */ -READ8_MEMBER( thomson_state::to9_cartridge_r ) +uint8_t thomson_state::to9_cartridge_r(offs_t offset) { uint8_t data = m_cart_rom[offset + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; if ( !machine().side_effects_disabled() ) @@ -2067,7 +2067,7 @@ void thomson_state::to9_kbd_update_irq() -READ8_MEMBER( thomson_state::to9_kbd_r ) +uint8_t thomson_state::to9_kbd_r(offs_t offset) { /* ACIA 6850 registers */ @@ -2114,7 +2114,7 @@ READ8_MEMBER( thomson_state::to9_kbd_r ) -WRITE8_MEMBER( thomson_state::to9_kbd_w ) +void thomson_state::to9_kbd_w(offs_t offset, uint8_t data) { /* ACIA 6850 registers */ @@ -3005,7 +3005,7 @@ void thomson_state::to8_update_cart_bank() } else { - space.install_write_handler( 0x0000, 0x3fff, write8_delegate(*this, FUNC(thomson_state::to8_vcart_w))); + space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(thomson_state::to8_vcart_w))); } } } @@ -3047,7 +3047,7 @@ void thomson_state::to8_update_cart_bank() { if (m_to8_cart_vpage < 4) { - space.install_write_handler( 0x0000, 0x3fff, write8_delegate(*this, FUNC(thomson_state::to8_vcart_w))); + space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(thomson_state::to8_vcart_w))); } else { @@ -3072,7 +3072,7 @@ void thomson_state::to8_update_cart_bank() if ( m_old_cart_bank < 4 || m_old_cart_bank > 7 ) { space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); - space.install_write_handler( 0x0000, 0x3fff, write8_delegate(*this, FUNC(thomson_state::to8_cartridge_w)) ); + space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(thomson_state::to8_cartridge_w)) ); } LOG_BANK(( "to8_update_cart_bank: CART is internal bank %i\n", m_to8_soft_bank )); } @@ -3088,8 +3088,8 @@ void thomson_state::to8_update_cart_bank() if ( m_old_cart_bank < 0 || m_old_cart_bank > 3 ) { space.install_read_bank( 0x0000, 0x3fff, m_cartbank ); - space.install_write_handler( 0x0000, 0x3fff, write8_delegate(*this, FUNC(thomson_state::to8_cartridge_w)) ); - space.install_read_handler( 0x0000, 0x0003, read8_delegate(*this, FUNC(thomson_state::to8_cartridge_r)) ); + space.install_write_handler( 0x0000, 0x3fff, write8sm_delegate(*this, FUNC(thomson_state::to8_cartridge_w)) ); + space.install_read_handler( 0x0000, 0x0003, read8sm_delegate(*this, FUNC(thomson_state::to8_cartridge_r)) ); } LOG_BANK(( "to8_update_cart_bank: CART is external cartridge bank %i\n", bank )); } @@ -3121,7 +3121,7 @@ void thomson_state::to8_update_cart_bank_postload() /* ROM bank switch */ -WRITE8_MEMBER( thomson_state::to8_cartridge_w ) +void thomson_state::to8_cartridge_w(offs_t offset, uint8_t data) { if ( offset >= 0x2000 ) return; @@ -3137,7 +3137,7 @@ WRITE8_MEMBER( thomson_state::to8_cartridge_w ) /* read signal to 0000-0003 generates a bank switch */ -READ8_MEMBER( thomson_state::to8_cartridge_r ) +uint8_t thomson_state::to8_cartridge_r(offs_t offset) { uint8_t data = m_cart_rom[offset + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; if ( !machine().side_effects_disabled() ) @@ -3171,7 +3171,7 @@ void thomson_state::to8_floppy_reset() -READ8_MEMBER( thomson_state::to8_floppy_r ) +uint8_t thomson_state::to8_floppy_r(offs_t offset) { if ( machine().side_effects_disabled() ) return 0; @@ -3189,7 +3189,7 @@ READ8_MEMBER( thomson_state::to8_floppy_r ) -WRITE8_MEMBER( thomson_state::to8_floppy_w ) +void thomson_state::to8_floppy_w(offs_t offset, uint8_t data) { if ( (m_to8_reg_sys1 & 0x80) && THOM_FLOPPY_EXT ) /* external controller */ @@ -3209,7 +3209,7 @@ WRITE8_MEMBER( thomson_state::to8_floppy_w ) -READ8_MEMBER( thomson_state::to8_gatearray_r ) +uint8_t thomson_state::to8_gatearray_r(offs_t offset) { struct thom_vsignal v = thom_get_vsignal(); struct thom_vsignal l = thom_get_lightpen_vsignal( TO8_LIGHTPEN_DECAL, m_to7_lightpen_step - 1, 6 ); @@ -3268,7 +3268,7 @@ READ8_MEMBER( thomson_state::to8_gatearray_r ) -WRITE8_MEMBER( thomson_state::to8_gatearray_w ) +void thomson_state::to8_gatearray_w(offs_t offset, uint8_t data) { LOG_VIDEO(( "$%04x %f to8_gatearray_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), @@ -3312,7 +3312,7 @@ WRITE8_MEMBER( thomson_state::to8_gatearray_w ) -READ8_MEMBER( thomson_state::to8_vreg_r ) +uint8_t thomson_state::to8_vreg_r(offs_t offset) { /* 0xe7dc from external floppy drive aliases the video gate-array */ if ( ( offset == 3 ) && ( m_to8_reg_ram & 0x80 ) && ( m_to8_reg_sys1 & 0x80 ) ) @@ -3353,7 +3353,7 @@ READ8_MEMBER( thomson_state::to8_vreg_r ) -WRITE8_MEMBER( thomson_state::to8_vreg_w ) +void thomson_state::to8_vreg_w(offs_t offset, uint8_t data) { LOG_VIDEO(( "$%04x %f to8_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), @@ -3813,8 +3813,8 @@ void thomson_state::mo6_update_cart_bank() } else { - space.install_write_handler( 0xb000, 0xbfff, write8_delegate(*this, FUNC(thomson_state::mo6_vcart_lo_w))); - space.install_write_handler( 0xc000, 0xefff, write8_delegate(*this, FUNC(thomson_state::mo6_vcart_hi_w))); + space.install_write_handler( 0xb000, 0xbfff, write8sm_delegate(*this, FUNC(thomson_state::mo6_vcart_lo_w))); + space.install_write_handler( 0xc000, 0xefff, write8sm_delegate(*this, FUNC(thomson_state::mo6_vcart_hi_w))); } } } @@ -3849,8 +3849,8 @@ void thomson_state::mo6_update_cart_bank() { if (m_to8_cart_vpage < 4) { - space.install_write_handler( 0xb000, 0xbfff, write8_delegate(*this, FUNC(thomson_state::mo6_vcart_lo_w))); - space.install_write_handler( 0xc000, 0xefff, write8_delegate(*this, FUNC(thomson_state::mo6_vcart_hi_w))); + space.install_write_handler( 0xb000, 0xbfff, write8sm_delegate(*this, FUNC(thomson_state::mo6_vcart_lo_w))); + space.install_write_handler( 0xc000, 0xefff, write8sm_delegate(*this, FUNC(thomson_state::mo6_vcart_hi_w))); } else { @@ -3945,7 +3945,7 @@ void thomson_state::mo6_update_cart_bank() { space.install_read_bank( 0xb000, 0xbfff, m_cartlobank ); space.install_read_bank( 0xc000, 0xefff, m_carthibank ); - space.install_write_handler( 0xb000, 0xefff, write8_delegate(*this, FUNC(thomson_state::mo6_cartridge_w)) ); + space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(thomson_state::mo6_cartridge_w)) ); } LOG_BANK(( "mo6_update_cart_bank: CART is internal ROM bank %i\n", b )); } @@ -3962,8 +3962,8 @@ void thomson_state::mo6_update_cart_bank() { space.install_read_bank( 0xb000, 0xbfff, m_cartlobank ); space.install_read_bank( 0xc000, 0xefff, m_carthibank ); - space.install_write_handler( 0xb000, 0xefff, write8_delegate(*this, FUNC(thomson_state::mo6_cartridge_w)) ); - space.install_read_handler( 0xbffc, 0xbfff, read8_delegate(*this, FUNC(thomson_state::mo6_cartridge_r)) ); + space.install_write_handler( 0xb000, 0xefff, write8sm_delegate(*this, FUNC(thomson_state::mo6_cartridge_w)) ); + space.install_read_handler( 0xbffc, 0xbfff, read8sm_delegate(*this, FUNC(thomson_state::mo6_cartridge_r)) ); } LOG_BANK(( "mo6_update_cart_bank: CART is external cartridge bank %i\n", bank )); } @@ -3997,7 +3997,7 @@ void thomson_state::mo6_update_cart_bank_postload() /* write signal generates a bank switch */ -WRITE8_MEMBER( thomson_state::mo6_cartridge_w ) +void thomson_state::mo6_cartridge_w(offs_t offset, uint8_t data) { if ( offset >= 0x2000 ) return; @@ -4009,7 +4009,7 @@ WRITE8_MEMBER( thomson_state::mo6_cartridge_w ) /* read signal generates a bank switch */ -READ8_MEMBER( thomson_state::mo6_cartridge_r ) +uint8_t thomson_state::mo6_cartridge_r(offs_t offset) { uint8_t data = m_cart_rom[offset + 0x3ffc + (m_thom_cart_bank % m_thom_cart_nb_banks) * 0x4000]; if ( !machine().side_effects_disabled() ) @@ -4022,7 +4022,7 @@ READ8_MEMBER( thomson_state::mo6_cartridge_r ) -WRITE8_MEMBER( thomson_state::mo6_ext_w ) +void thomson_state::mo6_ext_w(uint8_t data) { /* MO5 network extension compatible */ m_mo5_reg_cart = data; @@ -4163,7 +4163,7 @@ WRITE_LINE_MEMBER( thomson_state::mo6_sys_cb2_out ) -READ8_MEMBER( thomson_state::mo6_gatearray_r ) +uint8_t thomson_state::mo6_gatearray_r(offs_t offset) { struct thom_vsignal v = thom_get_vsignal(); struct thom_vsignal l = thom_get_lightpen_vsignal( MO6_LIGHTPEN_DECAL, m_to7_lightpen_step - 1, 6 ); @@ -4222,7 +4222,7 @@ READ8_MEMBER( thomson_state::mo6_gatearray_r ) -WRITE8_MEMBER( thomson_state::mo6_gatearray_w ) +void thomson_state::mo6_gatearray_w(offs_t offset, uint8_t data) { LOG_VIDEO(( "$%04x %f mo6_gatearray_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), @@ -4263,7 +4263,7 @@ WRITE8_MEMBER( thomson_state::mo6_gatearray_w ) -READ8_MEMBER( thomson_state::mo6_vreg_r ) +uint8_t thomson_state::mo6_vreg_r(offs_t offset) { /* 0xa7dc from external floppy drive aliases the video gate-array */ if ( ( offset == 3 ) && ( m_to8_reg_ram & 0x80 ) ) @@ -4276,7 +4276,7 @@ READ8_MEMBER( thomson_state::mo6_vreg_r ) { case 0: /* palette data */ case 1: /* palette address */ - return to8_vreg_r( space, offset ); + return to8_vreg_r( offset ); case 2: case 3: @@ -4290,7 +4290,7 @@ READ8_MEMBER( thomson_state::mo6_vreg_r ) -WRITE8_MEMBER( thomson_state::mo6_vreg_w ) +void thomson_state::mo6_vreg_w(offs_t offset, uint8_t data) { LOG_VIDEO(( "$%04x %f mo6_vreg_w: off=%i ($%04X) data=$%02X\n", m_maincpu->pc(), machine().time().as_double(), @@ -4300,7 +4300,7 @@ WRITE8_MEMBER( thomson_state::mo6_vreg_w ) { case 0: /* palette data */ case 1: /* palette address */ - to8_vreg_w( space, offset, data ); + to8_vreg_w( offset, data ); return; case 2: /* display / external floppy register */ @@ -4447,7 +4447,7 @@ MACHINE_START_MEMBER( thomson_state, mo6 ) -READ8_MEMBER( thomson_state::mo5nr_net_r ) +uint8_t thomson_state::mo5nr_net_r(offs_t offset) { if ( machine().side_effects_disabled() ) return 0; @@ -4462,7 +4462,7 @@ READ8_MEMBER( thomson_state::mo5nr_net_r ) -WRITE8_MEMBER( thomson_state::mo5nr_net_w ) +void thomson_state::mo5nr_net_w(offs_t offset, uint8_t data) { if ( m_to7_controller_type ) to7_floppy_w ( offset, data ); @@ -4479,7 +4479,7 @@ WRITE8_MEMBER( thomson_state::mo5nr_net_w ) */ -READ8_MEMBER( thomson_state::mo5nr_prn_r ) +uint8_t thomson_state::mo5nr_prn_r() { uint8_t result = 0; @@ -4489,7 +4489,7 @@ READ8_MEMBER( thomson_state::mo5nr_prn_r ) } -WRITE8_MEMBER( thomson_state::mo5nr_prn_w ) +void thomson_state::mo5nr_prn_w(uint8_t data) { /* TODO: understand other bits */ m_centronics->write_strobe(BIT(data, 3)); diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp index 4af87659194..d6dac529553 100644 --- a/src/mame/machine/ti85.cpp +++ b/src/mame/machine/ti85.cpp @@ -479,12 +479,12 @@ MACHINE_START_MEMBER(ti85_state,ti86) /* I/O ports handlers */ -READ8_MEMBER(ti85_state::ti85_port_0000_r) +uint8_t ti85_state::ti85_port_0000_r() { return 0xff; } -READ8_MEMBER(ti85_state::ti8x_keypad_r) +uint8_t ti85_state::ti8x_keypad_r() { int data = 0xff; int port; @@ -506,12 +506,12 @@ READ8_MEMBER(ti85_state::ti8x_keypad_r) return data; } - READ8_MEMBER(ti85_state::ti85_port_0002_r ) + uint8_t ti85_state::ti85_port_0002_r() { return 0xff; } - READ8_MEMBER(ti85_state::ti85_port_0003_r ) + uint8_t ti85_state::ti85_port_0003_r() { int data = 0; @@ -528,22 +528,22 @@ READ8_MEMBER(ti85_state::ti8x_keypad_r) return data; } - READ8_MEMBER(ti85_state::ti85_port_0004_r ) + uint8_t ti85_state::ti85_port_0004_r() { return 0xff; } - READ8_MEMBER(ti85_state::ti85_port_0005_r ) + uint8_t ti85_state::ti85_port_0005_r() { return m_ti8x_memory_page_1; } -READ8_MEMBER(ti85_state::ti85_port_0006_r) +uint8_t ti85_state::ti85_port_0006_r() { return m_power_mode; } -READ8_MEMBER(ti85_state::ti8x_serial_r) +uint8_t ti85_state::ti8x_serial_r() { // 7: unknown (ROM always sets to 1) // 6: unknown (ROM always sets to 1) @@ -560,37 +560,37 @@ READ8_MEMBER(ti85_state::ti8x_serial_r) return (~((m_PCR >> 2) & (m_PCR >> 4)) & tip_in & ring_in) | (m_PCR & 0xfc); } -READ8_MEMBER(ti85_state::ti82_port_0002_r ) +uint8_t ti85_state::ti82_port_0002_r() { return m_ti8x_port2; } -READ8_MEMBER(ti85_state::ti86_port_0005_r) +uint8_t ti85_state::ti86_port_0005_r() { return m_ti8x_memory_page_1; } -READ8_MEMBER(ti85_state::ti86_port_0006_r ) +uint8_t ti85_state::ti86_port_0006_r() { return m_ti8x_memory_page_2; } -READ8_MEMBER(ti85_state::ti83pse_port_0005_r ) +uint8_t ti85_state::ti83pse_port_0005_r() { return m_ti8x_memory_page_3; } -READ8_MEMBER(ti85_state::ti83_port_0000_r) +uint8_t ti85_state::ti83_port_0000_r() { return ((m_ti8x_memory_page_1 & 0x08) << 1) | 0x0C; } -READ8_MEMBER(ti85_state::ti83_port_0002_r ) +uint8_t ti85_state::ti83_port_0002_r() { return m_ti8x_port2; } -READ8_MEMBER(ti85_state::ti83_port_0003_r ) +uint8_t ti85_state::ti83_port_0003_r() { int data = 0; @@ -604,7 +604,7 @@ READ8_MEMBER(ti85_state::ti83_port_0003_r ) return data; } -READ8_MEMBER(ti85_state::ti8x_plus_serial_r) +uint8_t ti85_state::ti8x_plus_serial_r() { // 7: unknown // 6: byte receive in progress (TI-83+ only) @@ -621,12 +621,12 @@ READ8_MEMBER(ti85_state::ti8x_plus_serial_r) return (~(m_PCR >> 4) & tip_in & ring_in) | (m_PCR & 0xfc); } -READ8_MEMBER(ti85_state::ti83p_port_0002_r ) +uint8_t ti85_state::ti83p_port_0002_r() { return m_ti8x_port2|3; } -READ8_MEMBER(ti85_state::ti83p_port_0004_r ) +uint8_t ti85_state::ti83p_port_0004_r() { int data = 0; @@ -654,43 +654,43 @@ READ8_MEMBER(ti85_state::ti83p_port_0004_r ) // bit 6 - Indicates if Link Assist is available // bit 7 - SE or Basic -READ8_MEMBER(ti85_state::ti83pse_port_0002_r ) +uint8_t ti85_state::ti83pse_port_0002_r() { return 0xC3 | (m_flash_unlocked << 2); } -READ8_MEMBER(ti85_state::ti83pse_port_0009_r ) +uint8_t ti85_state::ti83pse_port_0009_r() { return 0; } -READ8_MEMBER(ti85_state::ti83pse_port_0015_r ) +uint8_t ti85_state::ti83pse_port_0015_r() { return 0x33; } -WRITE8_MEMBER(ti85_state::ti81_port_0007_w) +void ti85_state::ti81_port_0007_w(uint8_t data) { m_ti81_port_7_data = data; } -WRITE8_MEMBER(ti85_state::ti85_port_0000_w) +void ti85_state::ti85_port_0000_w(uint8_t data) { m_LCD_memory_base = data; } -WRITE8_MEMBER(ti85_state::ti8x_keypad_w) +void ti85_state::ti8x_keypad_w(uint8_t data) { m_keypad_mask = data&0x7f; } -WRITE8_MEMBER(ti85_state::ti85_port_0002_w) +void ti85_state::ti85_port_0002_w(uint8_t data) { m_LCD_contrast = data&0x1f; } -WRITE8_MEMBER(ti85_state::ti85_port_0003_w) +void ti85_state::ti85_port_0003_w(uint8_t data) { if (m_LCD_status && !(data&0x08)) m_timer_interrupt_mask = 0; m_ON_interrupt_mask = data&0x01; @@ -699,25 +699,25 @@ WRITE8_MEMBER(ti85_state::ti85_port_0003_w) m_LCD_status = data&0x08; } -WRITE8_MEMBER(ti85_state::ti85_port_0004_w) +void ti85_state::ti85_port_0004_w(uint8_t data) { m_video_buffer_width = (data>>3)&0x03; m_interrupt_speed = (data>>1)&0x03; m_port4_bit0 = data&0x01; } -WRITE8_MEMBER(ti85_state::ti85_port_0005_w) +void ti85_state::ti85_port_0005_w(uint8_t data) { m_ti8x_memory_page_1 = data; update_ti85_memory(); } -WRITE8_MEMBER(ti85_state::ti85_port_0006_w) +void ti85_state::ti85_port_0006_w(uint8_t data) { m_power_mode = data; } -WRITE8_MEMBER(ti85_state::ti8x_serial_w) +void ti85_state::ti8x_serial_w(uint8_t data) { // 7: unknown (ROM always sets to 1) // 6: unknown (ROM always sets to 1) @@ -738,39 +738,39 @@ WRITE8_MEMBER(ti85_state::ti8x_serial_w) } } -WRITE8_MEMBER(ti85_state::ti86_port_0005_w) +void ti85_state::ti86_port_0005_w(uint8_t data) { m_ti8x_memory_page_1 = data&((data&0x40)?0x47:0x4f); update_ti86_memory(); } -WRITE8_MEMBER(ti85_state::ti86_port_0006_w) +void ti85_state::ti86_port_0006_w(uint8_t data) { m_ti8x_memory_page_2 = data&((data&0x40)?0x47:0x4f); update_ti86_memory(); } -WRITE8_MEMBER(ti85_state::ti82_port_0002_w) +void ti85_state::ti82_port_0002_w(uint8_t data) { m_ti8x_memory_page_1 = (data & 0x07); update_ti85_memory(); m_ti8x_port2 = data; } -WRITE8_MEMBER(ti85_state::ti83_port_0000_w) +void ti85_state::ti83_port_0000_w(uint8_t data) { m_ti8x_memory_page_1 = (m_ti8x_memory_page_1 & 7) | ((data & 16) >> 1); update_ti85_memory(); } -WRITE8_MEMBER(ti85_state::ti83_port_0002_w) +void ti85_state::ti83_port_0002_w(uint8_t data) { m_ti8x_memory_page_1 = (m_ti8x_memory_page_1 & 8) | (data & 7); update_ti85_memory(); m_ti8x_port2 = data; } -WRITE8_MEMBER(ti85_state::ti83_port_0003_w) +void ti85_state::ti83_port_0003_w(uint8_t data) { if (m_LCD_status && !(data&0x08)) m_timer_interrupt_mask = 0; m_ON_interrupt_mask = data&0x01; @@ -779,7 +779,7 @@ WRITE8_MEMBER(ti85_state::ti83_port_0003_w) m_LCD_status = data&0x08; } -WRITE8_MEMBER(ti85_state::ti8x_plus_serial_w) +void ti85_state::ti8x_plus_serial_w(uint8_t data) { // 7: unknown // 6: unknown @@ -799,14 +799,14 @@ WRITE8_MEMBER(ti85_state::ti8x_plus_serial_w) } } -WRITE8_MEMBER(ti85_state::ti83pse_int_ack_w) +void ti85_state::ti83pse_int_ack_w(uint8_t data) { //Lets ignore this for now, I think it'll be fine. m_ON_interrupt_status = data & 1; m_timer_interrupt_status = data & 0x06; } -WRITE8_MEMBER(ti85_state::ti83p_int_mask_w) +void ti85_state::ti83p_int_mask_w(uint8_t data) { //m_LCD_mask = (data&0x08) >> 2; m_ON_interrupt_mask = data & 0x01; @@ -817,37 +817,37 @@ WRITE8_MEMBER(ti85_state::ti83p_int_mask_w) m_timer_interrupt_status &= m_timer_interrupt_mask; } -WRITE8_MEMBER(ti85_state::ti83p_port_0004_w) +void ti85_state::ti83p_port_0004_w(uint8_t data) { m_ti83p_port4 = data | 0xe0; update_ti83p_memory(); } -WRITE8_MEMBER(ti85_state::ti83p_port_0006_w) +void ti85_state::ti83p_port_0006_w(uint8_t data) { m_ti8x_memory_page_1 = data & ((data&0x40) ? 0x41 : 0x5f); update_ti83p_memory(); } -WRITE8_MEMBER(ti85_state::ti83p_port_0007_w) +void ti85_state::ti83p_port_0007_w(uint8_t data) { m_ti8x_memory_page_2 = data & ((data&0x40) ? 0x41 : 0x5f); update_ti83p_memory(); } -WRITE8_MEMBER(ti85_state::ti83pse_port_0004_w) +void ti85_state::ti83pse_port_0004_w(uint8_t data) { m_ti83p_port4 = data; update_ti83pse_memory(); } -WRITE8_MEMBER(ti85_state::ti83pse_port_0005_w) +void ti85_state::ti83pse_port_0005_w(uint8_t data) { m_ti8x_memory_page_3 = data & 0x07; update_ti83pse_memory(); } -WRITE8_MEMBER(ti85_state::ti83pse_port_0006_w) +void ti85_state::ti83pse_port_0006_w(uint8_t data) { if ((m_model == TI84P) && (data < 0x80)) { @@ -860,7 +860,7 @@ WRITE8_MEMBER(ti85_state::ti83pse_port_0006_w) update_ti83pse_memory(); } -WRITE8_MEMBER(ti85_state::ti83pse_port_0007_w) +void ti85_state::ti83pse_port_0007_w(uint8_t data) { if ((m_model == TI84P) && (data < 0x80)) { @@ -873,13 +873,13 @@ WRITE8_MEMBER(ti85_state::ti83pse_port_0007_w) update_ti83pse_memory(); } -WRITE8_MEMBER(ti85_state::ti83p_port_0014_w) +void ti85_state::ti83p_port_0014_w(uint8_t data) { m_flash_unlocked = data; update_ti83pse_memory(); } -WRITE8_MEMBER(ti85_state::ti83pse_port_0020_w) +void ti85_state::ti83pse_port_0020_w(uint8_t data) { m_cpu_speed = data; if(data) @@ -892,27 +892,27 @@ WRITE8_MEMBER(ti85_state::ti83pse_port_0020_w) } } -READ8_MEMBER(ti85_state::ti83pse_port_0020_r) +uint8_t ti85_state::ti83pse_port_0020_r() { return m_cpu_speed; } -WRITE8_MEMBER(ti85_state::ti83pse_port_0021_w) +void ti85_state::ti83pse_port_0021_w(uint8_t data) { m_ti83pse_port21 = data & 0x0f; } -READ8_MEMBER(ti85_state::ti83pse_port_0021_r) +uint8_t ti85_state::ti83pse_port_0021_r() { return m_ti83pse_port21; } -READ8_MEMBER(ti85_state::ti84pse_port_0055_r) +uint8_t ti85_state::ti84pse_port_0055_r() { return 0x1f; } -READ8_MEMBER(ti85_state::ti84pse_port_0056_r) +uint8_t ti85_state::ti84pse_port_0056_r() { return 0; } @@ -972,34 +972,34 @@ void ti85_state::ti83pse_count( uint8_t timer, uint8_t data) } -READ8_MEMBER(ti85_state::ti83pse_ctimer1_setup_r) +uint8_t ti85_state::ti83pse_ctimer1_setup_r() { return m_ctimer[CRYSTAL_TIMER1].setup; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer1_setup_w) +void ti85_state::ti83pse_ctimer1_setup_w(uint8_t data) { m_crystal_timer1->enable(false); m_ctimer[CRYSTAL_TIMER1].setup = data; } -READ8_MEMBER(ti85_state::ti83pse_ctimer1_loop_r) +uint8_t ti85_state::ti83pse_ctimer1_loop_r() { return m_ctimer[CRYSTAL_TIMER1].loop; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer1_loop_w) +void ti85_state::ti83pse_ctimer1_loop_w(uint8_t data) { m_ctimer[CRYSTAL_TIMER1].loop = data & 0x03; m_ctimer_interrupt_status = 0; } -READ8_MEMBER(ti85_state::ti83pse_ctimer1_count_r) +uint8_t ti85_state::ti83pse_ctimer1_count_r() { return m_ctimer[CRYSTAL_TIMER1].count; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer1_count_w) +void ti85_state::ti83pse_ctimer1_count_w(uint8_t data) { ti83pse_count(CRYSTAL_TIMER1, data); @@ -1007,34 +1007,34 @@ WRITE8_MEMBER(ti85_state::ti83pse_ctimer1_count_w) // -READ8_MEMBER(ti85_state::ti83pse_ctimer2_setup_r) +uint8_t ti85_state::ti83pse_ctimer2_setup_r() { return m_ctimer[CRYSTAL_TIMER2].setup; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer2_setup_w) +void ti85_state::ti83pse_ctimer2_setup_w(uint8_t data) { m_crystal_timer2->enable(false); m_ctimer[CRYSTAL_TIMER2].setup = data; } -READ8_MEMBER(ti85_state::ti83pse_ctimer2_loop_r) +uint8_t ti85_state::ti83pse_ctimer2_loop_r() { return m_ctimer[CRYSTAL_TIMER2].loop; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer2_loop_w) +void ti85_state::ti83pse_ctimer2_loop_w(uint8_t data) { m_ctimer[CRYSTAL_TIMER2].loop = data & 0x03; m_ctimer_interrupt_status = 0; } -READ8_MEMBER(ti85_state::ti83pse_ctimer2_count_r) +uint8_t ti85_state::ti83pse_ctimer2_count_r() { return m_ctimer[CRYSTAL_TIMER2].count; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer2_count_w) +void ti85_state::ti83pse_ctimer2_count_w(uint8_t data) { ti83pse_count(CRYSTAL_TIMER2, data); @@ -1042,34 +1042,34 @@ WRITE8_MEMBER(ti85_state::ti83pse_ctimer2_count_w) // -READ8_MEMBER(ti85_state::ti83pse_ctimer3_setup_r) +uint8_t ti85_state::ti83pse_ctimer3_setup_r() { return m_ctimer[CRYSTAL_TIMER3].setup; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer3_setup_w) +void ti85_state::ti83pse_ctimer3_setup_w(uint8_t data) { m_crystal_timer3->enable(false); m_ctimer[CRYSTAL_TIMER3].setup = data; } -READ8_MEMBER(ti85_state::ti83pse_ctimer3_loop_r) +uint8_t ti85_state::ti83pse_ctimer3_loop_r() { return m_ctimer[CRYSTAL_TIMER3].loop; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer3_loop_w) +void ti85_state::ti83pse_ctimer3_loop_w(uint8_t data) { m_ctimer[CRYSTAL_TIMER3].loop = data & 0x03; m_ctimer_interrupt_status = 0; } -READ8_MEMBER(ti85_state::ti83pse_ctimer3_count_r) +uint8_t ti85_state::ti83pse_ctimer3_count_r() { return m_ctimer[CRYSTAL_TIMER3].count; } -WRITE8_MEMBER(ti85_state::ti83pse_ctimer3_count_w) +void ti85_state::ti83pse_ctimer3_count_w(uint8_t data) { ti83pse_count(CRYSTAL_TIMER3, data); diff --git a/src/mame/machine/tigeroad.cpp b/src/mame/machine/tigeroad.cpp index 5690504a996..3a25afcd373 100644 --- a/src/mame/machine/tigeroad.cpp +++ b/src/mame/machine/tigeroad.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "includes/tigeroad.h" -READ16_MEMBER(pushman_state::mcu_comm_r) +uint16_t pushman_state::mcu_comm_r(offs_t offset, uint16_t mem_mask) { switch (offset & 0x03) { @@ -20,7 +20,7 @@ READ16_MEMBER(pushman_state::mcu_comm_r) return 0xffff; } -WRITE16_MEMBER(pushman_state::pushman_mcu_comm_w) +void pushman_state::pushman_mcu_comm_w(offs_t offset, uint16_t data) { switch (offset & 0x01) { @@ -35,7 +35,7 @@ WRITE16_MEMBER(pushman_state::pushman_mcu_comm_w) } } -WRITE16_MEMBER(pushman_state::bballs_mcu_comm_w) +void pushman_state::bballs_mcu_comm_w(uint16_t data) { m_host_latch = data; m_host_semaphore = true; diff --git a/src/mame/machine/tnzs.cpp b/src/mame/machine/tnzs.cpp index 7ecbed32a91..af3eb6ed3e8 100644 --- a/src/mame/machine/tnzs.cpp +++ b/src/mame/machine/tnzs.cpp @@ -18,7 +18,7 @@ #include "cpu/mcs48/mcs48.h" #include "includes/tnzs.h" -READ8_MEMBER(tnzs_mcu_state::mcu_r) +uint8_t tnzs_mcu_state::mcu_r(offs_t offset) { uint8_t data = m_mcu->upi41_master_r(offset & 1); m_subcpu->yield(); @@ -28,7 +28,7 @@ READ8_MEMBER(tnzs_mcu_state::mcu_r) return data; } -WRITE8_MEMBER(tnzs_mcu_state::mcu_w) +void tnzs_mcu_state::mcu_w(offs_t offset, uint8_t data) { // logerror("%s: write %02x to mcu $c00%01x\n", m_maincpu->pcbase(), data, offset); @@ -207,13 +207,13 @@ TIMER_CALLBACK_MEMBER(tnzs_base_state::kludge_callback) tnzs_sharedram[0x0f10] = param; } -WRITE8_MEMBER(tnzs_base_state::tnzs_sync_kludge_w) +void tnzs_base_state::tnzs_sync_kludge_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(tnzs_base_state::kludge_callback),this), data); } */ -READ8_MEMBER(arknoid2_state::mcu_r) +uint8_t arknoid2_state::mcu_r(offs_t offset) { static const char mcu_startup[] = "\x55\xaa\x5a"; @@ -274,7 +274,7 @@ READ8_MEMBER(arknoid2_state::mcu_r) } } -WRITE8_MEMBER(arknoid2_state::mcu_w) +void arknoid2_state::mcu_w(offs_t offset, uint8_t data) { if (offset == 0) { @@ -389,7 +389,7 @@ void kabukiz_state::machine_start() m_audiobank->configure_entries(0, 8, &sound[0x00000], 0x4000); } -WRITE8_MEMBER(tnzs_base_state::ramrom_bankswitch_w) +void tnzs_base_state::ramrom_bankswitch_w(uint8_t data) { // logerror("%s: writing %02x to bankswitch\n", m_maincpu->pc(),data); @@ -403,9 +403,9 @@ WRITE8_MEMBER(tnzs_base_state::ramrom_bankswitch_w) m_mainbank->set_bank(data & 0x07); } -WRITE8_MEMBER(arknoid2_state::bankswitch1_w) +void arknoid2_state::bankswitch1_w(uint8_t data) { - tnzs_base_state::bankswitch1_w(space, offset, data, mem_mask); + tnzs_base_state::bankswitch1_w(data); if (data & 0x04) mcu_reset(); @@ -414,35 +414,35 @@ WRITE8_MEMBER(arknoid2_state::bankswitch1_w) m_upd4701->resety_w(BIT(data, 5)); } -WRITE8_MEMBER(insectx_state::bankswitch1_w) +void insectx_state::bankswitch1_w(uint8_t data) { - tnzs_base_state::bankswitch1_w(space, offset, data, mem_mask); + tnzs_base_state::bankswitch1_w(data); machine().bookkeeping().coin_lockout_w(0, (~data & 0x04)); machine().bookkeeping().coin_lockout_w(1, (~data & 0x08)); machine().bookkeeping().coin_counter_w(0, (data & 0x10)); machine().bookkeeping().coin_counter_w(1, (data & 0x20)); } -WRITE8_MEMBER(tnzsb_state::bankswitch1_w) // kabukiz_state +void tnzsb_state::bankswitch1_w(uint8_t data) // kabukiz_state { - tnzs_base_state::bankswitch1_w(space, offset, data, mem_mask); + tnzs_base_state::bankswitch1_w(data); machine().bookkeeping().coin_lockout_w(0, (~data & 0x10)); machine().bookkeeping().coin_lockout_w(1, (~data & 0x20)); machine().bookkeeping().coin_counter_w(0, (data & 0x04)); machine().bookkeeping().coin_counter_w(1, (data & 0x08)); } -WRITE8_MEMBER(kageki_state::bankswitch1_w) +void kageki_state::bankswitch1_w(uint8_t data) { - tnzs_base_state::bankswitch1_w(space, offset, data, mem_mask); + tnzs_base_state::bankswitch1_w(data); machine().bookkeeping().coin_lockout_global_w((~data & 0x20)); machine().bookkeeping().coin_counter_w(0, (data & 0x04)); machine().bookkeeping().coin_counter_w(1, (data & 0x08)); } -WRITE8_MEMBER(tnzs_mcu_state::bankswitch1_w) +void tnzs_mcu_state::bankswitch1_w(uint8_t data) { - tnzs_base_state::bankswitch1_w(space, offset, data, mem_mask); + tnzs_base_state::bankswitch1_w(data); if ((data & 0x04) != 0 && m_mcu != nullptr) m_mcu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); @@ -454,7 +454,7 @@ WRITE8_MEMBER(tnzs_mcu_state::bankswitch1_w) } } -WRITE8_MEMBER(tnzs_base_state::bankswitch1_w) +void tnzs_base_state::bankswitch1_w(uint8_t data) { // logerror("%s: writing %02x to bankswitch 1\n", m_maincpu->pc(),data); @@ -468,7 +468,7 @@ void jpopnics_state::machine_reset() tnzs_base_state::machine_reset(); } -WRITE8_MEMBER(jpopnics_state::subbankswitch_w) +void jpopnics_state::subbankswitch_w(uint8_t data) { // bits 0-1 select ROM bank m_subbank->set_entry(data & 0x03); @@ -478,7 +478,7 @@ WRITE8_MEMBER(jpopnics_state::subbankswitch_w) m_upd4701->resety_w(BIT(data, 5)); } -WRITE8_MEMBER(tnzsb_state::sound_command_w) +void tnzsb_state::sound_command_w(uint8_t data) { m_soundlatch->write(data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index b2454d9f9d1..99deddaafb4 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -32,7 +32,7 @@ TIMER_CALLBACK_MEMBER(trs80_state::cassette_data_callback) *************************************/ -READ8_MEMBER( trs80_state::port_e8_r ) +uint8_t trs80_state::port_e8_r() { /* not emulated d7 Clear-to-Send (CTS), Pin 5 @@ -45,7 +45,7 @@ READ8_MEMBER( trs80_state::port_e8_r ) return 0; } -READ8_MEMBER( trs80_state::port_ea_r ) +uint8_t trs80_state::port_ea_r() { /* UART Status Register d7 Data Received ('1'=condition true) @@ -67,12 +67,12 @@ READ8_MEMBER( trs80_state::port_ea_r ) return data; } -WRITE8_MEMBER( trs80_state::port_e8_w ) +void trs80_state::port_e8_w(uint8_t data) { m_reg_load = BIT(data, 1); } -WRITE8_MEMBER( trs80_state::port_ea_w ) +void trs80_state::port_ea_w(uint8_t data) { if (m_reg_load) @@ -112,7 +112,7 @@ WRITE8_MEMBER( trs80_state::port_ea_w ) } -READ8_MEMBER( trs80_state::sys80_f9_r ) +uint8_t trs80_state::sys80_f9_r() { /* UART Status Register - d6..d4 not emulated d7 Transmit buffer empty (inverted) @@ -136,12 +136,12 @@ READ8_MEMBER( trs80_state::sys80_f9_r ) return data; } -READ8_MEMBER( trs80_state::lnw80_fe_r ) +uint8_t trs80_state::lnw80_fe_r() { return m_lnw_mode; } -READ8_MEMBER( trs80_state::port_ff_r ) +uint8_t trs80_state::port_ff_r() { /* ModeSel and cassette data d7 cassette data from tape @@ -150,7 +150,7 @@ READ8_MEMBER( trs80_state::port_ff_r ) return (BIT(m_mode, 0) ? 0 : 0x40) | (m_cassette_data ? 0x80 : 0) | 0x3f; } -WRITE8_MEMBER( trs80_state::sys80_f8_w ) +void trs80_state::sys80_f8_w(uint8_t data) { /* not emulated d2 reset UART (XR pin) @@ -158,7 +158,7 @@ WRITE8_MEMBER( trs80_state::sys80_f8_w ) d0 RTS */ } -WRITE8_MEMBER( trs80_state::sys80_fe_w ) +void trs80_state::sys80_fe_w(uint8_t data) { /* not emulated d4 select internal or external cassette player */ @@ -167,7 +167,7 @@ WRITE8_MEMBER( trs80_state::sys80_fe_w ) } /* lnw80 can switch out all the devices, roms and video ram to be replaced by graphics ram. */ -WRITE8_MEMBER( trs80_state::lnw80_fe_w ) +void trs80_state::lnw80_fe_w(uint8_t data) { /* lnw80 video options d3 bankswitch lower 16k between roms and hires ram (1=hires) @@ -180,7 +180,7 @@ WRITE8_MEMBER( trs80_state::lnw80_fe_w ) m_lnw_bank->set_bank(BIT(data, 3)); } -WRITE8_MEMBER( trs80_state::port_ff_w ) +void trs80_state::port_ff_w(uint8_t data) { /* Standard output port of Model I d3 ModeSel bit @@ -252,7 +252,7 @@ WRITE_LINE_MEMBER(trs80_state::intrq_w) * * *************************************/ -READ8_MEMBER( trs80_state::wd179x_r ) +uint8_t trs80_state::wd179x_r() { uint8_t data = 0xff; if (BIT(m_io_config->read(), 7)) @@ -261,19 +261,19 @@ READ8_MEMBER( trs80_state::wd179x_r ) return data; } -READ8_MEMBER( trs80_state::printer_r ) +uint8_t trs80_state::printer_r() { return m_cent_status_in->read(); } -WRITE8_MEMBER( trs80_state::printer_w ) +void trs80_state::printer_w(uint8_t data) { m_cent_data_out->write(data); m_centronics->write_strobe(0); m_centronics->write_strobe(1); } -WRITE8_MEMBER( trs80_state::cassunit_w ) +void trs80_state::cassunit_w(uint8_t data) { /* not emulated 01 for unit 1 (default) @@ -282,7 +282,7 @@ WRITE8_MEMBER( trs80_state::cassunit_w ) m_tape_unit = data; } -READ8_MEMBER( trs80_state::irq_status_r ) +uint8_t trs80_state::irq_status_r() { /* (trs80l2) Whenever an interrupt occurs, 37E0 is read to see what devices require service. d7 = RTC @@ -298,7 +298,7 @@ READ8_MEMBER( trs80_state::irq_status_r ) } -WRITE8_MEMBER( trs80_state::motor_w ) +void trs80_state::motor_w(uint8_t data) { m_floppy = nullptr; @@ -323,7 +323,7 @@ WRITE8_MEMBER( trs80_state::motor_w ) /************************************* * Keyboard * *************************************/ -READ8_MEMBER( trs80_state::keyboard_r ) +uint8_t trs80_state::keyboard_r(offs_t offset) { u8 i, result = 0; @@ -375,10 +375,9 @@ void trs80_state::machine_reset() MACHINE_RESET_MEMBER(trs80_state,lnw80) { machine_reset(); - address_space &space = m_maincpu->space(AS_IO); m_reg_load = 1; m_lnw_mode = 0; - lnw80_fe_w(space, 0, 0); + lnw80_fe_w(0); } diff --git a/src/mame/machine/trs80m3.cpp b/src/mame/machine/trs80m3.cpp index b22b09a3db1..c99304dd7e1 100644 --- a/src/mame/machine/trs80m3.cpp +++ b/src/mame/machine/trs80m3.cpp @@ -52,7 +52,7 @@ TIMER_CALLBACK_MEMBER(trs80m3_state::cassette_data_callback) *************************************/ -READ8_MEMBER( trs80m3_state::port_e0_r ) +uint8_t trs80m3_state::port_e0_r() { /* Indicates which devices are interrupting - d6..d3 not emulated. Whenever an interrupt occurs, this port is immediately read @@ -72,7 +72,7 @@ READ8_MEMBER( trs80m3_state::port_e0_r ) return ~(m_mask & m_irq); } -READ8_MEMBER( trs80m3_state::port_e4_r ) +uint8_t trs80m3_state::port_e4_r() { /* Indicates which devices are interrupting - d6..d5 not emulated. Whenever an NMI occurs, this port is immediately read @@ -91,7 +91,7 @@ READ8_MEMBER( trs80m3_state::port_e4_r ) return ~(m_nmi_mask & data); } -READ8_MEMBER( trs80m3_state::port_e8_r ) +uint8_t trs80m3_state::port_e8_r() { /* not emulated d7 Clear-to-Send (CTS), Pin 5 @@ -104,7 +104,7 @@ READ8_MEMBER( trs80m3_state::port_e8_r ) return 0; } -READ8_MEMBER( trs80m3_state::port_ea_r ) +uint8_t trs80m3_state::port_ea_r() { /* UART Status Register d7 Data Received ('1'=condition true) @@ -126,14 +126,14 @@ READ8_MEMBER( trs80m3_state::port_ea_r ) return data; } -READ8_MEMBER( trs80m3_state::port_ec_r ) +uint8_t trs80m3_state::port_ec_r() { /* Reset the RTC interrupt */ m_irq &= ~IRQ_M4_RTC; return 0; } -READ8_MEMBER( trs80m3_state::port_ff_r ) +uint8_t trs80m3_state::port_ff_r() { /* Return of cassette data stream from tape d7 Low-speed data @@ -145,7 +145,7 @@ READ8_MEMBER( trs80m3_state::port_ff_r ) return m_port_ec | m_cassette_data; } -READ8_MEMBER( trs80m3_state::cp500_port_f4_r ) +uint8_t trs80m3_state::cp500_port_f4_r() { /* The A11 flipflop is used for enabling access to the system monitor code at the EPROM address range 3800-3fff */ @@ -161,7 +161,7 @@ READ8_MEMBER( trs80m3_state::cp500_port_f4_r ) } -WRITE8_MEMBER( trs80m3_state::port_84_w ) // Model 4 & 4P only +void trs80m3_state::port_84_w(uint8_t data) // Model 4 & 4P only { /* Memory banking control, video mode control d7 Video Page Control @@ -229,12 +229,12 @@ WRITE8_MEMBER( trs80m3_state::port_84_w ) // Model 4 & 4P only } } -WRITE8_MEMBER( trs80m3_state::port_90_w ) +void trs80m3_state::port_90_w(uint8_t data) { m_speaker->level_w(!(BIT(data, 0))); } -WRITE8_MEMBER( trs80m3_state::port_9c_w ) /* model 4P only - swaps the ROM with read-only RAM */ +void trs80m3_state::port_9c_w(uint8_t data) /* model 4P only - swaps the ROM with read-only RAM */ { /* Meaning of model4 variable: d5..d4 memory mode (as described in section above) @@ -272,7 +272,7 @@ WRITE8_MEMBER( trs80m3_state::port_9c_w ) /* model 4P only - swaps the ROM w } } -WRITE8_MEMBER( trs80m3_state::port_e0_w ) +void trs80m3_state::port_e0_w(uint8_t data) { /* Interrupt settings - which devices are allowed to interrupt - bits align with read of E0 d6 Enable Rec Err @@ -286,7 +286,7 @@ WRITE8_MEMBER( trs80m3_state::port_e0_w ) m_mask = data; } -WRITE8_MEMBER( trs80m3_state::port_e4_w ) +void trs80m3_state::port_e4_w(uint8_t data) { /* Disk to NMI interface d7 1=enable disk INTRQ to generate NMI @@ -295,14 +295,14 @@ WRITE8_MEMBER( trs80m3_state::port_e4_w ) m_nmi_mask = data; } -WRITE8_MEMBER( trs80m3_state::port_e8_w ) +void trs80m3_state::port_e8_w(uint8_t data) { /* d1 when '1' enables control register load (see below) */ m_reg_load = BIT(data, 1); } -WRITE8_MEMBER( trs80m3_state::port_ea_w ) +void trs80m3_state::port_ea_w(uint8_t data) { if (m_reg_load) @@ -341,7 +341,7 @@ WRITE8_MEMBER( trs80m3_state::port_ea_w ) } } -WRITE8_MEMBER( trs80m3_state::port_ec_w ) +void trs80m3_state::port_ec_w(uint8_t data) { /* Hardware settings - d5..d4 not emulated d6 CPU fast (1=4MHz, 0=2MHz) @@ -371,7 +371,7 @@ WRITE8_MEMBER( trs80m3_state::port_ec_w ) d2 1=select drive 2 d1 1=select drive 1 d0 1=select drive 0 */ -WRITE8_MEMBER( trs80m3_state::port_f4_w ) +void trs80m3_state::port_f4_w(uint8_t data) { if (BIT(data, 6)) { @@ -404,7 +404,7 @@ WRITE8_MEMBER( trs80m3_state::port_f4_w ) m_fdc->dden_w(!BIT(data, 7)); } -WRITE8_MEMBER( trs80m3_state::port_ff_w ) +void trs80m3_state::port_ff_w(uint8_t data) { /* Cassette port d1, d0 Cassette output */ @@ -489,7 +489,7 @@ WRITE_LINE_MEMBER(trs80m3_state::drq_w) * * *************************************/ -READ8_MEMBER( trs80m3_state::wd179x_r ) +uint8_t trs80m3_state::wd179x_r() { uint8_t data = 0xff; if (BIT(m_io_config->read(), 7)) @@ -498,12 +498,12 @@ READ8_MEMBER( trs80m3_state::wd179x_r ) return data; } -READ8_MEMBER( trs80m3_state::printer_r ) +uint8_t trs80m3_state::printer_r() { return m_cent_status_in->read(); } -WRITE8_MEMBER( trs80m3_state::printer_w ) +void trs80m3_state::printer_w(uint8_t data) { m_cent_data_out->write(data); m_centronics->write_strobe(0); @@ -513,7 +513,7 @@ WRITE8_MEMBER( trs80m3_state::printer_w ) /************************************* * Keyboard * *************************************/ -READ8_MEMBER( trs80m3_state::keyboard_r ) +uint8_t trs80m3_state::keyboard_r(offs_t offset) { u8 i, result = 0; @@ -607,12 +607,11 @@ void trs80m3_state::machine_reset() m_size_store = 0xff; m_drq_off = true; m_intrq_off = true; - address_space &mem = m_maincpu->space(AS_PROGRAM); if (m_model4 & 4) - port_9c_w(mem, 0, 1); // 4P - enable rom + port_9c_w(1); // 4P - enable rom if (m_model4 & 6) - port_84_w(mem, 0, 0); // 4 & 4P - switch in devices + port_84_w(0); // 4 & 4P - switch in devices } diff --git a/src/mame/machine/tx1.cpp b/src/mame/machine/tx1.cpp index 959d4a47a1e..52bb4d0561b 100644 --- a/src/mame/machine/tx1.cpp +++ b/src/mame/machine/tx1.cpp @@ -546,7 +546,7 @@ void tx1_state::tx1_update_state() } } -READ16_MEMBER(tx1_state::tx1_math_r) +uint16_t tx1_state::tx1_math_r(offs_t offset) { offset = offset << 1; @@ -661,7 +661,7 @@ READ16_MEMBER(tx1_state::tx1_math_r) return m_math.retval; } -WRITE16_MEMBER(tx1_state::tx1_math_w) +void tx1_state::tx1_math_w(offs_t offset, uint16_t data) { m_math.cpulatch = data; offset <<= 1; @@ -747,7 +747,7 @@ WRITE16_MEMBER(tx1_state::tx1_math_w) } } -READ16_MEMBER(tx1_state::tx1_spcs_rom_r) +uint16_t tx1_state::tx1_spcs_rom_r(offs_t offset) { m_math.cpulatch = *(uint16_t*)((uint8_t*)memregion("math_cpu")->base() + 0x04000 + 0x1000 + offset*2); @@ -809,7 +809,7 @@ READ16_MEMBER(tx1_state::tx1_spcs_rom_r) } -READ16_MEMBER(tx1_state::tx1_spcs_ram_r) +uint16_t tx1_state::tx1_spcs_ram_r(offs_t offset) { m_math.cpulatch = m_math_ram[offset]; @@ -871,7 +871,7 @@ READ16_MEMBER(tx1_state::tx1_spcs_ram_r) } /* Should never occur */ -WRITE16_MEMBER(tx1_state::tx1_spcs_ram_w) +void tx1_state::tx1_spcs_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { osd_printf_debug("Write to /SPCS RAM?"); COMBINE_DATA(&m_math_ram[offset]); @@ -1034,7 +1034,7 @@ void tx1_state::buggyboy_update_state() } } -READ16_MEMBER(tx1_state::buggyboy_math_r) +uint16_t tx1_state::buggyboy_math_r(offs_t offset) { offset = offset << 1; @@ -1110,7 +1110,7 @@ READ16_MEMBER(tx1_state::buggyboy_math_r) return m_math.retval; } -WRITE16_MEMBER(tx1_state::buggyboy_math_w) +void tx1_state::buggyboy_math_w(offs_t offset, uint16_t data) { m_math.cpulatch = data; @@ -1197,7 +1197,7 @@ WRITE16_MEMBER(tx1_state::buggyboy_math_w) /* This is for ROM range 0x5000-0x7fff */ -READ16_MEMBER(tx1_state::buggyboy_spcs_rom_r) +uint16_t tx1_state::buggyboy_spcs_rom_r(offs_t offset) { m_math.cpulatch = *(uint16_t*)((uint8_t*)memregion("math_cpu")->base() + 0x04000 + 0x1000 + offset*2); @@ -1258,12 +1258,12 @@ READ16_MEMBER(tx1_state::buggyboy_spcs_rom_r) return m_math.cpulatch; } -WRITE16_MEMBER(tx1_state::buggyboy_spcs_ram_w) +void tx1_state::buggyboy_spcs_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_math_ram[offset]); } -READ16_MEMBER(tx1_state::buggyboy_spcs_ram_r) +uint16_t tx1_state::buggyboy_spcs_ram_r(offs_t offset) { m_math.cpulatch = m_math_ram[offset]; diff --git a/src/mame/machine/ut88.cpp b/src/mame/machine/ut88.cpp index 8f9478185c5..edcd5dfcea3 100644 --- a/src/mame/machine/ut88.cpp +++ b/src/mame/machine/ut88.cpp @@ -95,31 +95,31 @@ void ut88_state::machine_reset() } -READ8_MEMBER( ut88_state::keyboard_r ) +uint8_t ut88_state::keyboard_r(offs_t offset) { return m_ppi->read(offset ^ 0x03); } -WRITE8_MEMBER( ut88_state::keyboard_w ) +void ut88_state::keyboard_w(offs_t offset, uint8_t data) { m_ppi->write(offset ^ 0x03, data); } -WRITE8_MEMBER( ut88_state::sound_w ) +void ut88_state::sound_w(uint8_t data) { m_dac->write(BIT(data, 0)); m_cassette->output(BIT(data, 0) ? 1 : -1); } -READ8_MEMBER( ut88_base_state::tape_r ) +uint8_t ut88_base_state::tape_r() { double level = m_cassette->input(); return (level < 0) ? 0 : 0xff; } -READ8_MEMBER( ut88mini_state::keyboard_r ) +uint8_t ut88mini_state::keyboard_r() { // This is real keyboard implementation uint8_t *keyrom1 = m_region_proms->base(); @@ -145,7 +145,7 @@ READ8_MEMBER( ut88mini_state::keyboard_r ) } -WRITE8_MEMBER( ut88mini_state::led_w ) +void ut88mini_state::led_w(offs_t offset, uint8_t data) { switch(offset) { diff --git a/src/mame/machine/vector06.cpp b/src/mame/machine/vector06.cpp index b44e0a01eb2..9d29160cb6d 100644 --- a/src/mame/machine/vector06.cpp +++ b/src/mame/machine/vector06.cpp @@ -59,7 +59,7 @@ void vector06_state::vector06_8255_portb_w(uint8_t data) } } -WRITE8_MEMBER( vector06_state::vector06_color_set ) +void vector06_state::vector06_color_set(uint8_t data) { uint8_t r = (data & 7) << 5; uint8_t g = ((data >> 3) & 7) << 5; @@ -124,7 +124,7 @@ TIMER_CALLBACK_MEMBER(vector06_state::reset_check_callback) } } -WRITE8_MEMBER( vector06_state::vector06_disc_w ) +void vector06_state::vector06_disc_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -165,7 +165,7 @@ void vector06_state::update_mem() } } -WRITE8_MEMBER(vector06_state::vector06_ramdisk_w) +void vector06_state::vector06_ramdisk_w(uint8_t data) { const uint8_t oldbank = m_rambank; m_rambank = data; diff --git a/src/mame/machine/vertigo.cpp b/src/mame/machine/vertigo.cpp index cb864343a73..3b6fa3a0b8a 100644 --- a/src/mame/machine/vertigo.cpp +++ b/src/mame/machine/vertigo.cpp @@ -67,14 +67,14 @@ WRITE_LINE_MEMBER( vertigo_state::adc_eoc_w ) } -READ16_MEMBER(vertigo_state::vertigo_io_convert) +uint16_t vertigo_state::vertigo_io_convert(offs_t offset) { m_adc->address_offset_start_w(offset, 0); return 0; } -READ16_MEMBER(vertigo_state::vertigo_coin_r) +uint16_t vertigo_state::vertigo_coin_r() { update_irq_encoder(INPUT_LINE_IRQ6, CLEAR_LINE); return (ioport("COIN")->read()); @@ -96,7 +96,7 @@ INTERRUPT_GEN_MEMBER(vertigo_state::vertigo_interrupt) * *************************************/ -WRITE16_MEMBER(vertigo_state::vertigo_wsot_w) +void vertigo_state::vertigo_wsot_w(uint16_t data) { /* Reset sound cpu */ if ((data & 2) == 0) @@ -118,14 +118,14 @@ TIMER_CALLBACK_MEMBER(vertigo_state::sound_command_w) } -WRITE16_MEMBER(vertigo_state::vertigo_audio_w) +void vertigo_state::vertigo_audio_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) machine().scheduler().synchronize(timer_expired_delegate(FUNC(vertigo_state::sound_command_w),this), data & 0xff); } -READ16_MEMBER(vertigo_state::vertigo_sio_r) +uint16_t vertigo_state::vertigo_sio_r() { return m_custom->exidy440_sound_command_ack() ? 0xfc : 0xfd; } @@ -170,7 +170,7 @@ void vertigo_state::machine_reset() * *************************************/ -WRITE16_MEMBER(vertigo_state::vertigo_motor_w) +void vertigo_state::vertigo_motor_w(uint16_t data) { /* Motor controller interface. Not emulated. */ } diff --git a/src/mame/machine/vino.cpp b/src/mame/machine/vino.cpp index 5e7280bb881..4d4085ebd8e 100644 --- a/src/mame/machine/vino.cpp +++ b/src/mame/machine/vino.cpp @@ -152,7 +152,7 @@ void vino_device::device_timer(emu_timer &timer, device_timer_id id, int param, fetch_pixel((int)id); } -READ32_MEMBER(vino_device::read) +uint32_t vino_device::read(offs_t offset, uint32_t mem_mask) { switch (offset & ~1) { @@ -297,7 +297,7 @@ READ32_MEMBER(vino_device::read) return 0; } -WRITE32_MEMBER(vino_device::write) +void vino_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) { switch (offset & ~1) { diff --git a/src/mame/machine/vino.h b/src/mame/machine/vino.h index 2de5da5996c..b1f0d2e0cd7 100644 --- a/src/mame/machine/vino.h +++ b/src/mame/machine/vino.h @@ -22,8 +22,8 @@ class vino_device : public device_t public: vino_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); - 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); auto i2c_data_out() { return m_i2c_data_out.bind(); } auto i2c_data_in() { return m_i2c_data_in.bind(); } diff --git a/src/mame/machine/vsnes.cpp b/src/mame/machine/vsnes.cpp index b3fa0904d2b..c794e45767f 100644 --- a/src/mame/machine/vsnes.cpp +++ b/src/mame/machine/vsnes.cpp @@ -35,7 +35,7 @@ static const char * const chr_banknames[] = { "bank2", "bank3", "bank4", "bank5" * *************************************/ -WRITE8_MEMBER(vsnes_state::vsnes_in0_w) +void vsnes_state::vsnes_in0_w(uint8_t data) { /* Toggling bit 0 high then low resets both controllers */ if (data & 1) @@ -46,7 +46,7 @@ WRITE8_MEMBER(vsnes_state::vsnes_in0_w) } } -READ8_MEMBER(vsnes_state::gun_in0_r) +uint8_t vsnes_state::gun_in0_r() { int ret = (m_input_latch[0]) & 1; @@ -70,7 +70,7 @@ READ8_MEMBER(vsnes_state::gun_in0_r) } -READ8_MEMBER(vsnes_state::vsnes_in0_r) +uint8_t vsnes_state::vsnes_in0_r() { int ret = (m_input_latch[0]) & 1; @@ -84,7 +84,7 @@ READ8_MEMBER(vsnes_state::vsnes_in0_r) } -READ8_MEMBER(vsnes_state::vsnes_in1_r) +uint8_t vsnes_state::vsnes_in1_r() { int ret = (m_input_latch[1]) & 1; @@ -96,7 +96,7 @@ READ8_MEMBER(vsnes_state::vsnes_in1_r) return ret; } -WRITE8_MEMBER(vsnes_state::vsnes_in0_1_w) +void vsnes_state::vsnes_in0_1_w(uint8_t data) { /* Toggling bit 0 high then low resets both controllers */ if (data & 1) @@ -107,7 +107,7 @@ WRITE8_MEMBER(vsnes_state::vsnes_in0_1_w) } } -READ8_MEMBER(vsnes_state::vsnes_in0_1_r) +uint8_t vsnes_state::vsnes_in0_1_r() { int ret = (m_input_latch[2]) & 1; @@ -119,7 +119,7 @@ READ8_MEMBER(vsnes_state::vsnes_in0_1_r) return ret; } -READ8_MEMBER(vsnes_state::vsnes_in1_1_r) +uint8_t vsnes_state::vsnes_in1_1_r() { int ret = (m_input_latch[3]) & 1; @@ -196,7 +196,7 @@ MACHINE_START_MEMBER(vsnes_state,vsnes) m_nt_page[0][2] = m_nt_ram[0].get() + 0x800; m_nt_page[0][3] = m_nt_ram[0].get() + 0xc00; - ppu1_space.install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(vsnes_state::vsnes_nt0_r)), write8_delegate(*this, FUNC(vsnes_state::vsnes_nt0_w))); + ppu1_space.install_readwrite_handler(0x2000, 0x3eff, read8sm_delegate(*this, FUNC(vsnes_state::vsnes_nt0_r)), write8sm_delegate(*this, FUNC(vsnes_state::vsnes_nt0_w))); if (m_gfx1_rom != nullptr) { @@ -249,8 +249,8 @@ MACHINE_START_MEMBER(vsnes_state,vsdual) m_nt_page[1][2] = m_nt_ram[1].get() + 0x800; m_nt_page[1][3] = m_nt_ram[1].get() + 0xc00; - m_ppu1->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(vsnes_state::vsnes_nt0_r)), write8_delegate(*this, FUNC(vsnes_state::vsnes_nt0_w))); - m_ppu2->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(vsnes_state::vsnes_nt1_r)), write8_delegate(*this, FUNC(vsnes_state::vsnes_nt1_w))); + m_ppu1->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8sm_delegate(*this, FUNC(vsnes_state::vsnes_nt0_r)), write8sm_delegate(*this, FUNC(vsnes_state::vsnes_nt0_w))); + m_ppu2->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8sm_delegate(*this, FUNC(vsnes_state::vsnes_nt1_r)), write8sm_delegate(*this, FUNC(vsnes_state::vsnes_nt1_w))); // read only! m_ppu1->space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank2"); // read only! @@ -267,25 +267,25 @@ MACHINE_START_MEMBER(vsnes_state,vsdual) * *************************************/ -WRITE8_MEMBER(vsnes_state::vsnes_nt0_w) +void vsnes_state::vsnes_nt0_w(offs_t offset, uint8_t data) { int page = ((offset & 0xc00) >> 10); m_nt_page[0][page][offset & 0x3ff] = data; } -WRITE8_MEMBER(vsnes_state::vsnes_nt1_w) +void vsnes_state::vsnes_nt1_w(offs_t offset, uint8_t data) { int page = ((offset & 0xc00) >> 10); m_nt_page[1][page][offset & 0x3ff] = data; } -READ8_MEMBER(vsnes_state::vsnes_nt0_r) +uint8_t vsnes_state::vsnes_nt0_r(offs_t offset) { int page = ((offset&0xc00) >> 10); return m_nt_page[0][page][offset & 0x3ff]; } -READ8_MEMBER(vsnes_state::vsnes_nt1_r) +uint8_t vsnes_state::vsnes_nt1_r(offs_t offset) { int page = ((offset & 0xc00) >> 10); return m_nt_page[1][page][offset & 0x3ff]; @@ -333,7 +333,7 @@ void vsnes_state::v_set_mirroring(int ppu, int mirroring) /**********************************************************************************/ /* Most games: VROM Banking in controller 0 write */ -WRITE8_MEMBER(vsnes_state::vsnormal_vrom_banking) +void vsnes_state::vsnormal_vrom_banking(uint8_t data) { /* switch vrom */ v_set_videorom_bank(0, 8, (data & 4) ? 8 : 0); @@ -341,19 +341,19 @@ WRITE8_MEMBER(vsnes_state::vsnormal_vrom_banking) /* bit 1 ( data & 2 ) enables writes to extra ram, we ignore it */ /* move along */ - vsnes_in0_w(space, offset, data); + vsnes_in0_w(data); } void vsnes_state::init_vsnormal() { /* vrom switching is enabled with bit 2 of $4016 */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8_delegate(*this, FUNC(vsnes_state::vsnormal_vrom_banking))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8smo_delegate(*this, FUNC(vsnes_state::vsnormal_vrom_banking))); } /**********************************************************************************/ /* Gun games: VROM Banking in controller 0 write */ -WRITE8_MEMBER(vsnes_state::gun_in0_w) +void vsnes_state::gun_in0_w(uint8_t data) { if (m_do_vrom_bank) { @@ -430,14 +430,14 @@ WRITE8_MEMBER(vsnes_state::gun_in0_w) void vsnes_state::init_vsgun() { /* VROM switching is enabled with bit 2 of $4016 */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8_delegate(*this, FUNC(vsnes_state::gun_in0_r)), write8_delegate(*this, FUNC(vsnes_state::gun_in0_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8smo_delegate(*this, FUNC(vsnes_state::gun_in0_r)), write8smo_delegate(*this, FUNC(vsnes_state::gun_in0_w))); m_do_vrom_bank = 1; } /**********************************************************************************/ /* Konami games: ROMs bankings at $8000-$ffff */ -WRITE8_MEMBER(vsnes_state::vskonami_rom_banking) +void vsnes_state::vskonami_rom_banking(offs_t offset, uint8_t data) { int reg = (offset >> 12) & 0x07; int bankoffset = (data & 7) * 0x2000 + 0x10000; @@ -471,13 +471,13 @@ void vsnes_state::init_vskonami() memcpy(&prg[0x08000], &prg[0x18000], 0x8000); /* banking is done with writes to the $8000-$ffff area */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(vsnes_state::vskonami_rom_banking))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(vsnes_state::vskonami_rom_banking))); } /***********************************************************************/ /* Vs. Gumshoe */ -WRITE8_MEMBER(vsnes_state::vsgshoe_gun_in0_w) +void vsnes_state::vsgshoe_gun_in0_w(uint8_t data) { int addr; if((data & 0x04) != m_old_bank) @@ -488,7 +488,7 @@ WRITE8_MEMBER(vsnes_state::vsgshoe_gun_in0_w) memcpy(&prg[0x08000], &prg[addr], 0x2000); } - gun_in0_w(space, offset, data); + gun_in0_w(data); } void vsnes_state::init_vsgshoe() @@ -498,7 +498,7 @@ void vsnes_state::init_vsgshoe() memcpy (&prg[0x08000], &prg[0x12000], 0x2000); /* vrom switching is enabled with bit 2 of $4016 */ - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8_delegate(*this, FUNC(vsnes_state::gun_in0_r)), write8_delegate(*this, FUNC(vsnes_state::vsgshoe_gun_in0_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8smo_delegate(*this, FUNC(vsnes_state::gun_in0_r)), write8smo_delegate(*this, FUNC(vsnes_state::vsgshoe_gun_in0_w))); m_do_vrom_bank = 1; } @@ -507,7 +507,7 @@ void vsnes_state::init_vsgshoe() /* Dr Mario: ROMs bankings at $8000-$ffff */ -WRITE8_MEMBER(vsnes_state::drmario_rom_banking) +void vsnes_state::drmario_rom_banking(offs_t offset, uint8_t data) { /* basically, a MMC1 mapper from the nes */ @@ -627,7 +627,7 @@ void vsnes_state::init_drmario() memcpy(&prg[0x0c000], &prg[0x1c000], 0x4000); /* MMC1 mapper at writes to $8000-$ffff */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(vsnes_state::drmario_rom_banking))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(vsnes_state::drmario_rom_banking))); m_drmario_shiftreg = 0; m_drmario_shiftcount = 0; @@ -636,7 +636,7 @@ void vsnes_state::init_drmario() /**********************************************************************************/ /* Games with VRAM instead of graphics ROMs: ROMs bankings at $8000-$ffff */ -WRITE8_MEMBER(vsnes_state::vsvram_rom_banking) +void vsnes_state::vsvram_rom_banking(uint8_t data) { int rombank = 0x10000 + (data & 7) * 0x4000; uint8_t *prg = memregion("maincpu")->base(); @@ -651,7 +651,7 @@ void vsnes_state::init_vsvram() memcpy(&prg[0x08000], &prg[0x28000], 0x8000); /* banking is done with writes to the $8000-$ffff area */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(vsnes_state::vsvram_rom_banking))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8smo_delegate(*this, FUNC(vsnes_state::vsvram_rom_banking))); /* allocate m_vram */ m_vram = std::make_unique<uint8_t[]>(0x2000); @@ -705,7 +705,7 @@ void vsnes_state::mapper4_irq( int scanline, int vblank, int blanked ) } } -WRITE8_MEMBER(vsnes_state::mapper4_w) +void vsnes_state::mapper4_w(offs_t offset, uint8_t data) { uint8_t MMC3_helper, cmd; @@ -802,7 +802,7 @@ void vsnes_state::init_MMC3() memcpy(&prg[0xe000], &prg[(MMC3_prg_chunks - 1) * 0x4000 + 0x12000], 0x2000); /* MMC3 mapper at writes to $8000-$ffff */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(vsnes_state::mapper4_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(vsnes_state::mapper4_w))); /* extra ram at $6000-$7fff */ m_maincpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff); @@ -810,7 +810,7 @@ void vsnes_state::init_MMC3() /* Vs. RBI Baseball */ -READ8_MEMBER(vsnes_state::rbi_hack_r) +uint8_t vsnes_state::rbi_hack_r(offs_t offset) { /* Supplied by Ben Parnell <xodnizel@home.com> of FCE Ultra fame */ @@ -842,18 +842,18 @@ void vsnes_state::init_rbibb() init_MMC3(); /* RBI Base ball hack */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x5e00, 0x5e01, read8_delegate(*this, FUNC(vsnes_state::rbi_hack_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x5e00, 0x5e01, read8sm_delegate(*this, FUNC(vsnes_state::rbi_hack_r))); } /* Vs. Super Xevious */ -READ8_MEMBER(vsnes_state::supxevs_read_prot_1_r) +uint8_t vsnes_state::supxevs_read_prot_1_r() { return 0x05; } -READ8_MEMBER(vsnes_state::supxevs_read_prot_2_r) +uint8_t vsnes_state::supxevs_read_prot_2_r() { if (m_supxevs_prot_index) return 0; @@ -861,7 +861,7 @@ READ8_MEMBER(vsnes_state::supxevs_read_prot_2_r) return 0x01; } -READ8_MEMBER(vsnes_state::supxevs_read_prot_3_r) +uint8_t vsnes_state::supxevs_read_prot_3_r() { if (m_supxevs_prot_index) return 0xd1; @@ -869,7 +869,7 @@ READ8_MEMBER(vsnes_state::supxevs_read_prot_3_r) return 0x89; } -READ8_MEMBER(vsnes_state::supxevs_read_prot_4_r) +uint8_t vsnes_state::supxevs_read_prot_4_r() { if (m_supxevs_prot_index) { @@ -889,15 +889,15 @@ void vsnes_state::init_supxevs() init_MMC3(); /* Vs. Super Xevious Protection */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x54ff, 0x54ff, read8_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_1_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x5678, 0x5678, read8_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_2_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x578f, 0x578f, read8_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_3_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x5567, 0x5567, read8_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_4_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x54ff, 0x54ff, read8smo_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_1_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x5678, 0x5678, read8smo_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_2_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x578f, 0x578f, read8smo_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_3_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x5567, 0x5567, read8smo_delegate(*this, FUNC(vsnes_state::supxevs_read_prot_4_r))); } /* Vs. TKO Boxing */ -READ8_MEMBER(vsnes_state::tko_security_r) +uint8_t vsnes_state::tko_security_r(offs_t offset) { static const uint8_t security_data[] = { 0xff, 0xbf, 0xb7, 0x97, 0x97, 0x17, 0x57, 0x4f, @@ -921,7 +921,7 @@ void vsnes_state::init_tkoboxng() init_MMC3(); /* security device at $5e00-$5e01 */ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x5e00, 0x5e01, read8_delegate(*this, FUNC(vsnes_state::tko_security_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x5e00, 0x5e01, read8sm_delegate(*this, FUNC(vsnes_state::tko_security_r))); } /* Vs. Freedom Force */ @@ -930,7 +930,7 @@ void vsnes_state::init_vsfdf() { init_MMC3(); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8_delegate(*this, FUNC(vsnes_state::gun_in0_r)), write8_delegate(*this, FUNC(vsnes_state::gun_in0_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8smo_delegate(*this, FUNC(vsnes_state::gun_in0_r)), write8smo_delegate(*this, FUNC(vsnes_state::gun_in0_w))); m_do_vrom_bank = 0; } @@ -938,7 +938,7 @@ void vsnes_state::init_vsfdf() /**********************************************************************************/ /* Platoon rom banking */ -WRITE8_MEMBER(vsnes_state::mapper68_rom_banking) +void vsnes_state::mapper68_rom_banking(offs_t offset, uint8_t data) { switch (offset & 0x7000) { @@ -979,13 +979,13 @@ void vsnes_state::init_platoon() memcpy(&prg[0x08000], &prg[0x10000], 0x4000); memcpy(&prg[0x0c000], &prg[0x2c000], 0x4000); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(*this, FUNC(vsnes_state::mapper68_rom_banking))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8sm_delegate(*this, FUNC(vsnes_state::mapper68_rom_banking))); } /**********************************************************************************/ /* Vs. Raid on Bungeling Bay (Japan) */ -WRITE8_MEMBER(vsnes_state::set_bnglngby_irq_w) +void vsnes_state::set_bnglngby_irq_w(uint8_t data) { m_ret = data; m_maincpu->set_input_line(0, (data & 2) ? ASSERT_LINE : CLEAR_LINE); @@ -993,14 +993,14 @@ WRITE8_MEMBER(vsnes_state::set_bnglngby_irq_w) /* 0, 4, 84 */ } -READ8_MEMBER(vsnes_state::set_bnglngby_irq_r) +uint8_t vsnes_state::set_bnglngby_irq_r() { return m_ret; } void vsnes_state::init_bnglngby() { - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0231, 0x0231, read8_delegate(*this, FUNC(vsnes_state::set_bnglngby_irq_r)), write8_delegate(*this, FUNC(vsnes_state::set_bnglngby_irq_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0231, 0x0231, read8smo_delegate(*this, FUNC(vsnes_state::set_bnglngby_irq_r)), write8smo_delegate(*this, FUNC(vsnes_state::set_bnglngby_irq_w))); /* extra ram */ m_maincpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff); @@ -1014,7 +1014,7 @@ void vsnes_state::init_bnglngby() /**********************************************************************************/ /* VS Dualsystem */ -WRITE8_MEMBER(vsnes_state::vsdual_vrom_banking_main) +void vsnes_state::vsdual_vrom_banking_main(uint8_t data) { /* switch vrom */ membank("bank2")->set_entry(BIT(data, 2)); @@ -1023,10 +1023,10 @@ WRITE8_MEMBER(vsnes_state::vsdual_vrom_banking_main) m_subcpu->set_input_line(0, (data & 2) ? CLEAR_LINE : ASSERT_LINE); /* move along */ - vsnes_in0_w(space, offset, data); + vsnes_in0_w(data); } -WRITE8_MEMBER(vsnes_state::vsdual_vrom_banking_sub) +void vsnes_state::vsdual_vrom_banking_sub(uint8_t data) { /* switch vrom */ membank("bank3")->set_entry(BIT(data, 2)); @@ -1035,7 +1035,7 @@ WRITE8_MEMBER(vsnes_state::vsdual_vrom_banking_sub) m_maincpu->set_input_line(0, (data & 2) ? CLEAR_LINE : ASSERT_LINE); /* move along */ - vsnes_in0_1_w(space, offset, data); + vsnes_in0_1_w(data); } void vsnes_state::init_vsdual() @@ -1043,8 +1043,8 @@ void vsnes_state::init_vsdual() uint8_t *prg = memregion("maincpu")->base(); /* vrom switching is enabled with bit 2 of $4016 */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8_delegate(*this, FUNC(vsnes_state::vsdual_vrom_banking_main))); - m_subcpu->space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8_delegate(*this, FUNC(vsnes_state::vsdual_vrom_banking_sub))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8smo_delegate(*this, FUNC(vsnes_state::vsdual_vrom_banking_main))); + m_subcpu->space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8smo_delegate(*this, FUNC(vsnes_state::vsdual_vrom_banking_sub))); /* shared ram at $6000 */ m_maincpu->space(AS_PROGRAM).install_ram(0x6000, 0x7fff, &prg[0x6000]); diff --git a/src/mame/machine/vt1682_alu.cpp b/src/mame/machine/vt1682_alu.cpp index 3dfb7635d50..f782a51f89e 100644 --- a/src/mame/machine/vt1682_alu.cpp +++ b/src/mame/machine/vt1682_alu.cpp @@ -70,14 +70,14 @@ void vrt_vt1682_alu_device::device_reset() 0x01 - ALU Output 1 */ -READ8_MEMBER(vrt_vt1682_alu_device::alu_out_1_r) +uint8_t vrt_vt1682_alu_device::alu_out_1_r() { uint8_t ret = m_alu_out[0]; if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_out_1_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_1_w) +void vrt_vt1682_alu_device::alu_oprand_1_w(uint8_t data) { if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_oprand_1_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand[0] = data; @@ -107,14 +107,14 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_1_w) 0x01 - ALU Output 2 */ -READ8_MEMBER(vrt_vt1682_alu_device::alu_out_2_r) +uint8_t vrt_vt1682_alu_device::alu_out_2_r() { uint8_t ret = m_alu_out[1]; if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_out_2_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_2_w) +void vrt_vt1682_alu_device::alu_oprand_2_w(uint8_t data) { if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_oprand_2_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand[1] = data; @@ -144,14 +144,14 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_2_w) 0x01 - ALU Output 3 */ -READ8_MEMBER(vrt_vt1682_alu_device::alu_out_3_r) +uint8_t vrt_vt1682_alu_device::alu_out_3_r() { uint8_t ret = m_alu_out[2]; if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_out_3_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_3_w) +void vrt_vt1682_alu_device::alu_oprand_3_w(uint8_t data) { if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_oprand_3_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand[2] = data; @@ -182,7 +182,7 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_3_w) 0x01 - ALU Output 4 */ -READ8_MEMBER(vrt_vt1682_alu_device::alu_out_4_r) +uint8_t vrt_vt1682_alu_device::alu_out_4_r() { uint8_t ret = m_alu_out[3]; if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_out_4_r returning: %02x\n", machine().describe_context(), ret); @@ -190,7 +190,7 @@ READ8_MEMBER(vrt_vt1682_alu_device::alu_out_4_r) } -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_4_w) +void vrt_vt1682_alu_device::alu_oprand_4_w(uint8_t data) { if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_oprand_4_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand[3] = data; @@ -220,7 +220,7 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_4_w) 0x01 - ALU Output 5 */ -READ8_MEMBER(vrt_vt1682_alu_device::alu_out_5_r) +uint8_t vrt_vt1682_alu_device::alu_out_5_r() { uint8_t ret = m_alu_out[4]; if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_out_5_r returning: %02x\n", machine().describe_context(), ret); @@ -228,7 +228,7 @@ READ8_MEMBER(vrt_vt1682_alu_device::alu_out_5_r) } -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_5_mult_w) +void vrt_vt1682_alu_device::alu_oprand_5_mult_w(uint8_t data) { if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_oprand_5_mult_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand_mult[0] = data; @@ -259,14 +259,14 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_5_mult_w) 0x01 - ALU Output 6 */ -READ8_MEMBER(vrt_vt1682_alu_device::alu_out_6_r) +uint8_t vrt_vt1682_alu_device::alu_out_6_r() { uint8_t ret = m_alu_out[5]; if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_out_6_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_6_mult_w) +void vrt_vt1682_alu_device::alu_oprand_6_mult_w(uint8_t data) { // used one of the 32in1 menus @@ -302,7 +302,7 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_6_mult_w) */ -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_5_div_w) +void vrt_vt1682_alu_device::alu_oprand_5_div_w(uint8_t data) { if (!m_is_sound_alu) LOGMASKED(LOG_ALU, "%s: alu_oprand_5_div_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand_div[0] = data; @@ -321,7 +321,7 @@ WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_5_div_w) 0x01 - ALU Div Oprand 6 */ -WRITE8_MEMBER(vrt_vt1682_alu_device::alu_oprand_6_div_w) +void vrt_vt1682_alu_device::alu_oprand_6_div_w(uint8_t data) { //LOGMASKED(LOG_ALU, "%s: alu_oprand_6_div_w writing: %02x\n", machine().describe_context(), data); m_alu_oprand_div[1] = data; diff --git a/src/mame/machine/vt1682_alu.h b/src/mame/machine/vt1682_alu.h index 46987f5d9e9..2ce10af3309 100644 --- a/src/mame/machine/vt1682_alu.h +++ b/src/mame/machine/vt1682_alu.h @@ -17,21 +17,21 @@ public: // so that we can filter logging, sound ALU gets used hundreds of times a frame, so logging it is unwise void set_sound_alu() { m_is_sound_alu = true; } - DECLARE_READ8_MEMBER(alu_out_1_r); - DECLARE_READ8_MEMBER(alu_out_2_r); - DECLARE_READ8_MEMBER(alu_out_3_r); - DECLARE_READ8_MEMBER(alu_out_4_r); - DECLARE_READ8_MEMBER(alu_out_5_r); - DECLARE_READ8_MEMBER(alu_out_6_r); - - DECLARE_WRITE8_MEMBER(alu_oprand_1_w); - DECLARE_WRITE8_MEMBER(alu_oprand_2_w); - DECLARE_WRITE8_MEMBER(alu_oprand_3_w); - DECLARE_WRITE8_MEMBER(alu_oprand_4_w); - DECLARE_WRITE8_MEMBER(alu_oprand_5_mult_w); - DECLARE_WRITE8_MEMBER(alu_oprand_6_mult_w); - DECLARE_WRITE8_MEMBER(alu_oprand_5_div_w); - DECLARE_WRITE8_MEMBER(alu_oprand_6_div_w); + uint8_t alu_out_1_r(); + uint8_t alu_out_2_r(); + uint8_t alu_out_3_r(); + uint8_t alu_out_4_r(); + uint8_t alu_out_5_r(); + uint8_t alu_out_6_r(); + + void alu_oprand_1_w(uint8_t data); + void alu_oprand_2_w(uint8_t data); + void alu_oprand_3_w(uint8_t data); + void alu_oprand_4_w(uint8_t data); + void alu_oprand_5_mult_w(uint8_t data); + void alu_oprand_6_mult_w(uint8_t data); + void alu_oprand_5_div_w(uint8_t data); + void alu_oprand_6_div_w(uint8_t data); protected: diff --git a/src/mame/machine/vt1682_io.cpp b/src/mame/machine/vt1682_io.cpp index 5a08ea3c920..0e06a82f959 100644 --- a/src/mame/machine/vt1682_io.cpp +++ b/src/mame/machine/vt1682_io.cpp @@ -60,14 +60,14 @@ void vrt_vt1682_io_device::device_reset() 0x01 - IOA OE */ -READ8_MEMBER(vrt_vt1682_io_device::vt1682_210d_ioconfig_r) +uint8_t vrt_vt1682_io_device::vt1682_210d_ioconfig_r() { uint8_t ret = m_210d_ioconfig; LOGMASKED(LOG_IO, "%s: vt1682_210d_ioconfig_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_io_device::vt1682_210d_ioconfig_w) +void vrt_vt1682_io_device::vt1682_210d_ioconfig_w(uint8_t data) { LOGMASKED(LOG_IO, "%s: vt1682_210d_ioconfig_w writing: %02x ( IOD_ENB:%1x IOD_OE:%1x | IOC_ENB:%1x IOC_OE:%1x | IOB_ENB:%1x IOB_OE:%1x | IOA_ENB:%1x IOA_OE:%1x )\n", machine().describe_context(), data, (data & 0x80) ? 1 : 0, @@ -95,14 +95,14 @@ WRITE8_MEMBER(vrt_vt1682_io_device::vt1682_210d_ioconfig_w) 0x01 - IOA:0 */ -READ8_MEMBER(vrt_vt1682_io_device::vt1682_210e_io_ab_r) +uint8_t vrt_vt1682_io_device::vt1682_210e_io_ab_r() { uint8_t ret = (m_porta_in(0, 0x0f) & 0x0f) | ((m_portb_in(0, 0x0f) & 0x0f)<<4); LOGMASKED(LOG_IO, "%s: vt1682_210e_io_ab_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_io_device::vt1682_210e_io_ab_w) +void vrt_vt1682_io_device::vt1682_210e_io_ab_w(uint8_t data) { LOGMASKED(LOG_IO, "%s: vt1682_210e_io_ab_w writing: %02x (portb: %1x porta: %1x)\n", machine().describe_context(), data, (data & 0xf0) >> 4, data & 0x0f); m_porta_out(0, (data & 0x0f), 0x0f); @@ -122,14 +122,14 @@ WRITE8_MEMBER(vrt_vt1682_io_device::vt1682_210e_io_ab_w) 0x01 - IOC:0 */ -READ8_MEMBER(vrt_vt1682_io_device::vt1682_210f_io_cd_r) +uint8_t vrt_vt1682_io_device::vt1682_210f_io_cd_r() { uint8_t ret = (m_portc_in(0, 0x0f) & 0x0f) | ((m_portd_in(0, 0x0f) & 0x0f)<<4); LOGMASKED(LOG_IO, "%s: vt1682_210f_io_cd_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vrt_vt1682_io_device::vt1682_210f_io_cd_w) +void vrt_vt1682_io_device::vt1682_210f_io_cd_w(uint8_t data) { LOGMASKED(LOG_IO, "%s: vt1682_210f_io_cd_w writing: %02x (portd: %1x portc: %1x)\n", machine().describe_context(), data, (data & 0xf0) >> 4, data & 0x0f); m_portc_out(0, (data & 0x0f), 0x0f); diff --git a/src/mame/machine/vt1682_io.h b/src/mame/machine/vt1682_io.h index f4e955f9f68..678124cb627 100644 --- a/src/mame/machine/vt1682_io.h +++ b/src/mame/machine/vt1682_io.h @@ -24,14 +24,14 @@ public: auto portd_in() { return m_portd_in.bind(); } - DECLARE_READ8_MEMBER(vt1682_210e_io_ab_r); - DECLARE_READ8_MEMBER(vt1682_210f_io_cd_r); + uint8_t vt1682_210e_io_ab_r(); + uint8_t vt1682_210f_io_cd_r(); - DECLARE_WRITE8_MEMBER(vt1682_210e_io_ab_w); - DECLARE_WRITE8_MEMBER(vt1682_210f_io_cd_w); + void vt1682_210e_io_ab_w(uint8_t data); + void vt1682_210f_io_cd_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_210d_ioconfig_r); - DECLARE_WRITE8_MEMBER(vt1682_210d_ioconfig_w); + uint8_t vt1682_210d_ioconfig_r(); + void vt1682_210d_ioconfig_w(uint8_t data); protected: diff --git a/src/mame/machine/vtech2.cpp b/src/mame/machine/vtech2.cpp index 0c576b19a2e..c83711b0f88 100644 --- a/src/mame/machine/vtech2.cpp +++ b/src/mame/machine/vtech2.cpp @@ -69,7 +69,7 @@ void vtech2_state::machine_reset() } -READ8_MEMBER( vtech2_state::cart_r ) +uint8_t vtech2_state::cart_r(offs_t offset) { if (offset >= m_cart_size) return 0xff; @@ -89,7 +89,7 @@ READ8_MEMBER( vtech2_state::cart_r ) * 1 column 1 * 0 column 0 ************************************************/ -READ8_MEMBER( vtech2_state::mmio_r ) +uint8_t vtech2_state::mmio_r(offs_t offset) { u8 data = 0x7f; @@ -121,7 +121,7 @@ READ8_MEMBER( vtech2_state::mmio_r ) * 1 cassette out (LSB) * 0 speaker A ************************************************/ -WRITE8_MEMBER( vtech2_state::mmio_w ) +void vtech2_state::mmio_w(uint8_t data) { m_speaker->level_w(data & 1); m_laser_latch = data; @@ -165,7 +165,7 @@ void vtech2_state::laser_put_track() #define PHI2(n) (((n)>>2)&1) #define PHI3(n) (((n)>>3)&1) -READ8_MEMBER(vtech2_state::laser_fdc_r) +uint8_t vtech2_state::laser_fdc_r(offs_t offset) { int data = 0xff; switch( offset ) @@ -209,7 +209,7 @@ READ8_MEMBER(vtech2_state::laser_fdc_r) return data; } -WRITE8_MEMBER(vtech2_state::laser_fdc_w) +void vtech2_state::laser_fdc_w(offs_t offset, uint8_t data) { int drive; diff --git a/src/mame/machine/williams.cpp b/src/mame/machine/williams.cpp index fa29150dc37..feff3b4b2bc 100644 --- a/src/mame/machine/williams.cpp +++ b/src/mame/machine/williams.cpp @@ -242,7 +242,7 @@ void bubbles_state::cmos_w(offs_t offset, u8 data) * *************************************/ -WRITE8_MEMBER(williams_state::watchdog_reset_w) +void williams_state::watchdog_reset_w(u8 data) { /* yes, the data bits are checked for this specific value */ if (data == 0x39) @@ -250,7 +250,7 @@ WRITE8_MEMBER(williams_state::watchdog_reset_w) } -WRITE8_MEMBER(williams2_state::watchdog_reset_w) +void williams2_state::watchdog_reset_w(u8 data) { /* yes, the data bits are checked for this specific value */ if ((data & 0x3f) == 0x14) diff --git a/src/mame/machine/wrally.cpp b/src/mame/machine/wrally.cpp index ead13574cde..792febe7424 100644 --- a/src/mame/machine/wrally.cpp +++ b/src/mame/machine/wrally.cpp @@ -26,19 +26,19 @@ void wrally_state::machine_start() ***************************************************************************/ -WRITE8_MEMBER(wrally_state::shareram_w) +void wrally_state::shareram_w(offs_t offset, uint8_t data) { // why isn't there address map functionality for this? reinterpret_cast<u8 *>(m_shareram.target())[BYTE_XOR_BE(offset)] = data; } -READ8_MEMBER(wrally_state::shareram_r) +uint8_t wrally_state::shareram_r(offs_t offset) { // why isn't there address map functionality for this? return reinterpret_cast<u8 const *>(m_shareram.target())[BYTE_XOR_BE(offset)]; } -WRITE16_MEMBER(wrally_state::vram_w) +void wrally_state::vram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { data = gaelco_decrypt(space, offset, data, 0x1f, 0x522a); COMBINE_DATA(&m_videoram[offset]); @@ -51,7 +51,7 @@ WRITE_LINE_MEMBER(wrally_state::flipscreen_w) flip_screen_set(state); } -WRITE8_MEMBER(wrally_state::okim6295_bankswitch_w) +void wrally_state::okim6295_bankswitch_w(uint8_t data) { m_okibank->set_entry(data & 0x0f); } diff --git a/src/mame/machine/xavix2002_io.cpp b/src/mame/machine/xavix2002_io.cpp index 37128ccdf2b..c193aabb02c 100644 --- a/src/mame/machine/xavix2002_io.cpp +++ b/src/mame/machine/xavix2002_io.cpp @@ -45,19 +45,19 @@ void xavix2002_io_device::device_reset() } } -WRITE8_MEMBER(xavix2002_io_device::pio_dir_w) +void xavix2002_io_device::pio_dir_w(offs_t offset, uint8_t data) { LOG("%s: superxavix pio_dir_w (port %d) %02x\n", machine().describe_context(), offset, data); if (offset < 3) { m_sx_pio_dir[offset] = data; - pio_out_w(space,offset, m_sx_pio_out[offset]); + pio_out_w(offset, m_sx_pio_out[offset]); // update port? } } -READ8_MEMBER(xavix2002_io_device::pio_dir_r) +uint8_t xavix2002_io_device::pio_dir_r(offs_t offset) { LOG("%s: superxavix pio_dir_r (port %d)\n", machine().describe_context(), offset); uint8_t ret = 0x00; @@ -70,7 +70,7 @@ READ8_MEMBER(xavix2002_io_device::pio_dir_r) return ret; } -WRITE8_MEMBER(xavix2002_io_device::pio_out_w) +void xavix2002_io_device::pio_out_w(offs_t offset, uint8_t data) { LOG("%s: superxavix pio_out_w (port %d) %02x\n", machine().describe_context(), offset, data); @@ -92,7 +92,7 @@ WRITE8_MEMBER(xavix2002_io_device::pio_out_w) } } -READ8_MEMBER(xavix2002_io_device::pio_out_r) +uint8_t xavix2002_io_device::pio_out_r(offs_t offset) { // what does this actually read? @@ -107,7 +107,7 @@ READ8_MEMBER(xavix2002_io_device::pio_out_r) } -READ8_MEMBER(xavix2002_io_device::pio_in_r) +uint8_t xavix2002_io_device::pio_in_r(offs_t offset) { LOG("%s: superxavix pio_in_r (port %d)\n", machine().describe_context(), offset); diff --git a/src/mame/machine/xavix2002_io.h b/src/mame/machine/xavix2002_io.h index c67adf98ce5..97af1cee883 100644 --- a/src/mame/machine/xavix2002_io.h +++ b/src/mame/machine/xavix2002_io.h @@ -18,13 +18,13 @@ public: auto write_1_callback() { return m_out1_cb.bind(); } auto write_2_callback() { return m_out2_cb.bind(); } - DECLARE_WRITE8_MEMBER(pio_dir_w); - DECLARE_READ8_MEMBER(pio_dir_r); + void pio_dir_w(offs_t offset, uint8_t data); + uint8_t pio_dir_r(offs_t offset); - DECLARE_WRITE8_MEMBER(pio_out_w); - DECLARE_READ8_MEMBER(pio_out_r); + void pio_out_w(offs_t offset, uint8_t data); + uint8_t pio_out_r(offs_t offset); - DECLARE_READ8_MEMBER(pio_in_r); + uint8_t pio_in_r(offs_t offset); protected: // device-level overrides diff --git a/src/mame/machine/xavix_adc.cpp b/src/mame/machine/xavix_adc.cpp index 6d171c8018d..527f6d542e2 100644 --- a/src/mame/machine/xavix_adc.cpp +++ b/src/mame/machine/xavix_adc.cpp @@ -52,19 +52,19 @@ void xavix_adc_device::device_reset() } -READ8_MEMBER(xavix_adc_device::adc_7b80_r) +uint8_t xavix_adc_device::adc_7b80_r() { LOG("%s: adc_7b80_r\n", machine().describe_context()); return m_adc_inlatch; } -WRITE8_MEMBER(xavix_adc_device::adc_7b80_w) +void xavix_adc_device::adc_7b80_w(uint8_t data) { // is the latch writeable? LOG("%s: adc_7b80_w %02x\n", machine().describe_context(), data); } -WRITE8_MEMBER(xavix_adc_device::adc_7b81_w) +void xavix_adc_device::adc_7b81_w(uint8_t data) { // m_irqsource &= ~0x04; // update_irqs(); @@ -91,7 +91,7 @@ WRITE8_MEMBER(xavix_adc_device::adc_7b81_w) // m_adc_timer->adjust(attotime::from_usec(200)); } -READ8_MEMBER(xavix_adc_device::adc_7b81_r) +uint8_t xavix_adc_device::adc_7b81_r() { // has_wamg polls this if interrupt is enabled return machine().rand(); diff --git a/src/mame/machine/xavix_adc.h b/src/mame/machine/xavix_adc.h index 5bf524eb9d8..53aac3ea934 100644 --- a/src/mame/machine/xavix_adc.h +++ b/src/mame/machine/xavix_adc.h @@ -18,10 +18,10 @@ public: auto read_6_callback() { return m_in6_cb.bind(); } auto read_7_callback() { return m_in7_cb.bind(); } - DECLARE_READ8_MEMBER(adc_7b80_r); - DECLARE_WRITE8_MEMBER(adc_7b80_w); - DECLARE_READ8_MEMBER(adc_7b81_r); - DECLARE_WRITE8_MEMBER(adc_7b81_w); + uint8_t adc_7b80_r(); + void adc_7b80_w(uint8_t data); + uint8_t adc_7b81_r(); + void adc_7b81_w(uint8_t data); protected: // device-level overrides diff --git a/src/mame/machine/xavix_anport.cpp b/src/mame/machine/xavix_anport.cpp index 502dfc6adee..7f5356d570a 100644 --- a/src/mame/machine/xavix_anport.cpp +++ b/src/mame/machine/xavix_anport.cpp @@ -33,47 +33,47 @@ void xavix_anport_device::device_reset() } -READ8_MEMBER(xavix_anport_device::mouse_7b00_r) +uint8_t xavix_anport_device::mouse_7b00_r() { LOG("%s: mouse_7b00_r\n", machine().describe_context()); return m_in0_cb(); } -READ8_MEMBER(xavix_anport_device::mouse_7b01_r) +uint8_t xavix_anport_device::mouse_7b01_r() { LOG("%s: mouse_7b01_r\n", machine().describe_context()); return m_in1_cb(); } -READ8_MEMBER(xavix_anport_device::mouse_7b10_r) +uint8_t xavix_anport_device::mouse_7b10_r() { LOG("%s: mouse_7b10_r\n", machine().describe_context()); return m_in2_cb(); } -READ8_MEMBER(xavix_anport_device::mouse_7b11_r) +uint8_t xavix_anport_device::mouse_7b11_r() { LOG("%s: mouse_7b11_r\n", machine().describe_context()); return m_in3_cb(); } -WRITE8_MEMBER(xavix_anport_device::mouse_7b00_w) +void xavix_anport_device::mouse_7b00_w(uint8_t data) { LOG("%s: mouse_7b00_w %02x\n", machine().describe_context(), data); } -WRITE8_MEMBER(xavix_anport_device::mouse_7b01_w) +void xavix_anport_device::mouse_7b01_w(uint8_t data) { LOG("%s: mouse_7b01_w %02x\n", machine().describe_context(), data); } -WRITE8_MEMBER(xavix_anport_device::mouse_7b10_w) +void xavix_anport_device::mouse_7b10_w(uint8_t data) { LOG("%s: mouse_7b10_w %02x\n", machine().describe_context(), data); } -WRITE8_MEMBER(xavix_anport_device::mouse_7b11_w) +void xavix_anport_device::mouse_7b11_w(uint8_t data) { LOG("%s: mouse_7b11_w %02x\n", machine().describe_context(), data); } diff --git a/src/mame/machine/xavix_anport.h b/src/mame/machine/xavix_anport.h index b826d718d2f..ae4972ea081 100644 --- a/src/mame/machine/xavix_anport.h +++ b/src/mame/machine/xavix_anport.h @@ -14,15 +14,15 @@ public: auto read_2_callback() { return m_in2_cb.bind(); } auto read_3_callback() { return m_in3_cb.bind(); } - DECLARE_READ8_MEMBER(mouse_7b00_r); - DECLARE_READ8_MEMBER(mouse_7b01_r); - DECLARE_READ8_MEMBER(mouse_7b10_r); - DECLARE_READ8_MEMBER(mouse_7b11_r); - - DECLARE_WRITE8_MEMBER(mouse_7b00_w); - DECLARE_WRITE8_MEMBER(mouse_7b01_w); - DECLARE_WRITE8_MEMBER(mouse_7b10_w); - DECLARE_WRITE8_MEMBER(mouse_7b11_w); + uint8_t mouse_7b00_r(); + uint8_t mouse_7b01_r(); + uint8_t mouse_7b10_r(); + uint8_t mouse_7b11_r(); + + void mouse_7b00_w(uint8_t data); + void mouse_7b01_w(uint8_t data); + void mouse_7b10_w(uint8_t data); + void mouse_7b11_w(uint8_t data); protected: // device-level overrides diff --git a/src/mame/machine/xavix_io.cpp b/src/mame/machine/xavix_io.cpp index 403fe24751c..ec44213ccff 100644 --- a/src/mame/machine/xavix_io.cpp +++ b/src/mame/machine/xavix_io.cpp @@ -44,19 +44,19 @@ void xavix_io_device::device_reset() // direction: 1 is out, 0 is in -WRITE8_MEMBER(xavix_io_device::xav_7a0x_dir_w) +void xavix_io_device::xav_7a0x_dir_w(offs_t offset, uint8_t data) { LOG("%s: xavix IO xav_7a0x_dir_w (port %d) %02x\n", machine().describe_context(), offset, data); if (offset < 2) { m_dir[offset] = data; // write back to the port - xav_7a0x_dat_w(space,offset,m_dat[offset]); + xav_7a0x_dat_w(offset,m_dat[offset]); } } -WRITE8_MEMBER(xavix_io_device::xav_7a0x_dat_w) +void xavix_io_device::xav_7a0x_dat_w(offs_t offset, uint8_t data) { LOG("%s: xavix IO xav_7a0x_dat_w (port %d) %02x\n", machine().describe_context(), offset, data); if (offset < 2) @@ -73,7 +73,7 @@ WRITE8_MEMBER(xavix_io_device::xav_7a0x_dat_w) } } -READ8_MEMBER(xavix_io_device::xav_7a0x_dir_r) +uint8_t xavix_io_device::xav_7a0x_dir_r(offs_t offset) { uint8_t ret = 0x00; LOG("%s: xavix IO xav_7a0x_dir_r (port %d)\n", machine().describe_context(), offset); @@ -84,7 +84,7 @@ READ8_MEMBER(xavix_io_device::xav_7a0x_dir_r) return ret; } -READ8_MEMBER(xavix_io_device::xav_7a0x_dat_r) +uint8_t xavix_io_device::xav_7a0x_dat_r(offs_t offset) { uint8_t ret = 0x00; LOG("%s: xavix IO xav_7a0x_dat_r (port %d)\n", machine().describe_context(), offset); diff --git a/src/mame/machine/xavix_io.h b/src/mame/machine/xavix_io.h index 31bb695d3f5..fe9b46fdd8e 100644 --- a/src/mame/machine/xavix_io.h +++ b/src/mame/machine/xavix_io.h @@ -15,11 +15,11 @@ public: auto write_0_callback() { return m_out0_cb.bind(); } auto write_1_callback() { return m_out1_cb.bind(); } - DECLARE_WRITE8_MEMBER(xav_7a0x_dir_w); - DECLARE_WRITE8_MEMBER(xav_7a0x_dat_w); + void xav_7a0x_dir_w(offs_t offset, uint8_t data); + void xav_7a0x_dat_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(xav_7a0x_dir_r); - DECLARE_READ8_MEMBER(xav_7a0x_dat_r); + uint8_t xav_7a0x_dir_r(offs_t offset); + uint8_t xav_7a0x_dat_r(offs_t offset); protected: // device-level overrides diff --git a/src/mame/machine/xavix_math.cpp b/src/mame/machine/xavix_math.cpp index 3e180e4d4e2..b41883a98c1 100644 --- a/src/mame/machine/xavix_math.cpp +++ b/src/mame/machine/xavix_math.cpp @@ -32,7 +32,7 @@ void xavix_math_device::device_reset() // epo_guru uses this for ground movement in 3d stages (and other places) -READ8_MEMBER(xavix_math_device::barrel_r) +uint8_t xavix_math_device::barrel_r(offs_t offset) { if (offset == 0) { @@ -50,7 +50,7 @@ READ8_MEMBER(xavix_math_device::barrel_r) // epo_guru 3d stages still flicker a lot with this, but it seems unrelated to the calculations here, possibly a raster timing issue // the pickup animations however don't seem to play, which indicates this could still be wrong. -WRITE8_MEMBER(xavix_math_device::barrel_w) +void xavix_math_device::barrel_w(offs_t offset, uint8_t data) { LOG("%s: barrel_w %02x\n", machine().describe_context(), data); @@ -104,23 +104,23 @@ WRITE8_MEMBER(xavix_math_device::barrel_w) -READ8_MEMBER(xavix_math_device::mult_r) +uint8_t xavix_math_device::mult_r(offs_t offset) { return m_multresults[offset]; } -WRITE8_MEMBER(xavix_math_device::mult_w) +void xavix_math_device::mult_w(offs_t offset, uint8_t data) { // rad_madf writes here to set the base value which the multiplication result gets added to m_multresults[offset] = data; } -READ8_MEMBER(xavix_math_device::mult_param_r) +uint8_t xavix_math_device::mult_param_r(offs_t offset) { return m_multparams[offset]; } -WRITE8_MEMBER(xavix_math_device::mult_param_w) +void xavix_math_device::mult_param_w(offs_t offset, uint8_t data, uint8_t mem_mask) { COMBINE_DATA(&m_multparams[offset]); // there are NOPs after one of the writes, so presumably the operation is write triggerd and not intstant diff --git a/src/mame/machine/xavix_math.h b/src/mame/machine/xavix_math.h index d0bdeb6bf1f..0ca20d8e156 100644 --- a/src/mame/machine/xavix_math.h +++ b/src/mame/machine/xavix_math.h @@ -9,13 +9,13 @@ class xavix_math_device : public device_t public: xavix_math_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(mult_r); - DECLARE_WRITE8_MEMBER(mult_w); - DECLARE_READ8_MEMBER(mult_param_r); - DECLARE_WRITE8_MEMBER(mult_param_w); + uint8_t mult_r(offs_t offset); + void mult_w(offs_t offset, uint8_t data); + uint8_t mult_param_r(offs_t offset); + void mult_param_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); - DECLARE_READ8_MEMBER(barrel_r); - DECLARE_WRITE8_MEMBER(barrel_w); + uint8_t barrel_r(offs_t offset); + void barrel_w(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index 2e84803167e..99270ddf038 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -829,7 +829,7 @@ void xbox_superio_device::device_start() registers[0][0x26] = 0x2e; // Configuration port address byte 0 } -READ8_MEMBER(xbox_superio_device::read) +uint8_t xbox_superio_device::read(offs_t offset) { if (configuration_mode == false) return 0; @@ -845,7 +845,7 @@ READ8_MEMBER(xbox_superio_device::read) return 0; } -WRITE8_MEMBER(xbox_superio_device::write) +void xbox_superio_device::write(offs_t offset, uint8_t data) { if (configuration_mode == false) { @@ -882,14 +882,14 @@ WRITE8_MEMBER(xbox_superio_device::write) } } -READ8_MEMBER(xbox_superio_device::read_rs232) +uint8_t xbox_superio_device::read_rs232(offs_t offset) { if (offset == 5) return 0x20; return 0; } -WRITE8_MEMBER(xbox_superio_device::write_rs232) +void xbox_superio_device::write_rs232(offs_t offset, uint8_t data) { if (offset == 0) { diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index 24be86943f1..3093bc72d2f 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -76,12 +76,12 @@ void nv2a_ram_device::device_start() ram.resize(ram_size * 1024 * 1024 / 4); } -READ32_MEMBER(nv2a_ram_device::config_register_r) +uint32_t nv2a_ram_device::config_register_r() { return 0x08800044; } -WRITE32_MEMBER(nv2a_ram_device::config_register_w) +void nv2a_ram_device::config_register_w(uint32_t data) { } @@ -236,7 +236,7 @@ void mcpx_isalpc_device::update_smi_line() m_smi_callback(0); } -READ32_MEMBER(mcpx_isalpc_device::acpi_r) +uint32_t mcpx_isalpc_device::acpi_r(offs_t offset, uint32_t mem_mask) { logerror("Acpi read from %04X mask %08X\n", (bank_infos[0].adr & 0xfffffffe) + offset * 4, mem_mask); if ((offset == 0xa) && ACCESSING_BITS_0_15) @@ -246,7 +246,7 @@ READ32_MEMBER(mcpx_isalpc_device::acpi_r) return 0; } -WRITE32_MEMBER(mcpx_isalpc_device::acpi_w) +void mcpx_isalpc_device::acpi_w(offs_t offset, uint32_t data, uint32_t mem_mask) { logerror("Acpi write %08X to %04X mask %08X\n", data, (bank_infos[0].adr & 0xfffffffe) + offset * 4, mem_mask); // Seen using word registers at offsets @@ -302,7 +302,7 @@ WRITE32_MEMBER(mcpx_isalpc_device::acpi_w) logerror("Acpi write not recognized\n"); } -WRITE8_MEMBER(mcpx_isalpc_device::boot_state_w) +void mcpx_isalpc_device::boot_state_w(uint8_t data) { if (m_boot_state_hook) m_boot_state_hook((offs_t)0, data); @@ -367,7 +367,7 @@ WRITE_LINE_MEMBER(mcpx_isalpc_device::irq15) pic8259_2->ir7_w(state); } -READ8_MEMBER(mcpx_isalpc_device::portb_r) +uint8_t mcpx_isalpc_device::portb_r() { uint8_t data = m_speaker; @@ -382,7 +382,7 @@ READ8_MEMBER(mcpx_isalpc_device::portb_r) return data; } -WRITE8_MEMBER(mcpx_isalpc_device::portb_w) +void mcpx_isalpc_device::portb_w(uint8_t data) { m_speaker = data; pit8254->write_gate2(BIT(data, 0)); @@ -628,22 +628,22 @@ void mcpx_smbus_device::smbus_write(int bus, offs_t offset, uint32_t data, uint3 smbusst[bus].command = data; } -READ32_MEMBER(mcpx_smbus_device::smbus0_r) +uint32_t mcpx_smbus_device::smbus0_r(offs_t offset, uint32_t mem_mask) { return smbus_read(0, offset, mem_mask); } -WRITE32_MEMBER(mcpx_smbus_device::smbus0_w) +void mcpx_smbus_device::smbus0_w(offs_t offset, uint32_t data, uint32_t mem_mask) { smbus_write(0, offset, data, mem_mask); } -READ32_MEMBER(mcpx_smbus_device::smbus1_r) +uint32_t mcpx_smbus_device::smbus1_r(offs_t offset, uint32_t mem_mask) { return smbus_read(1, offset, mem_mask); } -WRITE32_MEMBER(mcpx_smbus_device::smbus1_w) +void mcpx_smbus_device::smbus1_w(offs_t offset, uint32_t data, uint32_t mem_mask) { smbus_write(1, offset, data, mem_mask); } @@ -733,7 +733,7 @@ void mcpx_ohci_device::device_timer(emu_timer &timer, device_timer_id id, int pa ohci_usb->timer(timer, id, param, ptr); } -READ32_MEMBER(mcpx_ohci_device::ohci_r) +uint32_t mcpx_ohci_device::ohci_r(offs_t offset) { if (!ohci_usb) return 0; @@ -741,13 +741,13 @@ READ32_MEMBER(mcpx_ohci_device::ohci_r) { hack_callback(); } - return ohci_usb->read(space, offset, mem_mask); + return ohci_usb->read(offset); } -WRITE32_MEMBER(mcpx_ohci_device::ohci_w) +void mcpx_ohci_device::ohci_w(offs_t offset, uint32_t data) { if (ohci_usb) - ohci_usb->write(space, offset, data, mem_mask); + ohci_usb->write(offset, data); } /* @@ -786,21 +786,21 @@ void mcpx_eth_device::device_reset() pci_device::device_reset(); } -READ32_MEMBER(mcpx_eth_device::eth_r) +uint32_t mcpx_eth_device::eth_r() { return 0; } -WRITE32_MEMBER(mcpx_eth_device::eth_w) +void mcpx_eth_device::eth_w(uint32_t data) { } -READ32_MEMBER(mcpx_eth_device::eth_io_r) +uint32_t mcpx_eth_device::eth_io_r() { return 0; } -WRITE32_MEMBER(mcpx_eth_device::eth_io_w) +void mcpx_eth_device::eth_io_w(uint32_t data) { } @@ -876,7 +876,7 @@ void mcpx_apu_device::device_timer(emu_timer &timer, device_timer_id id, int par } } -READ32_MEMBER(mcpx_apu_device::apu_r) +uint32_t mcpx_apu_device::apu_r(offs_t offset, uint32_t mem_mask) { #ifdef LOG_AUDIO logerror("Audio_APU: read from %08X mask %08X\n", 0xfe800000 + offset * 4, mem_mask); @@ -886,7 +886,7 @@ READ32_MEMBER(mcpx_apu_device::apu_r) return apust.memory[offset]; } -WRITE32_MEMBER(mcpx_apu_device::apu_w) +void mcpx_apu_device::apu_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t v; @@ -1040,7 +1040,7 @@ void mcpx_ac97_audio_device::device_reset() pci_device::device_reset(); } -READ32_MEMBER(mcpx_ac97_audio_device::ac97_audio_r) +uint32_t mcpx_ac97_audio_device::ac97_audio_r(offs_t offset, uint32_t mem_mask) { uint32_t ret = 0; @@ -1071,7 +1071,7 @@ READ32_MEMBER(mcpx_ac97_audio_device::ac97_audio_r) return ret; } -WRITE32_MEMBER(mcpx_ac97_audio_device::ac97_audio_w) +void mcpx_ac97_audio_device::ac97_audio_w(offs_t offset, uint32_t data, uint32_t mem_mask) { #ifdef LOG_AUDIO logerror("Audio_AC3: write at %08X mask %08X value %08X\n", 0xfec00000 + offset * 4, mem_mask, data); @@ -1087,21 +1087,21 @@ WRITE32_MEMBER(mcpx_ac97_audio_device::ac97_audio_w) } } -READ32_MEMBER(mcpx_ac97_audio_device::ac97_audio_io0_r) +uint32_t mcpx_ac97_audio_device::ac97_audio_io0_r() { return 0; } -WRITE32_MEMBER(mcpx_ac97_audio_device::ac97_audio_io0_w) +void mcpx_ac97_audio_device::ac97_audio_io0_w(uint32_t data) { } -READ32_MEMBER(mcpx_ac97_audio_device::ac97_audio_io1_r) +uint32_t mcpx_ac97_audio_device::ac97_audio_io1_r() { return 0; } -WRITE32_MEMBER(mcpx_ac97_audio_device::ac97_audio_io1_w) +void mcpx_ac97_audio_device::ac97_audio_io1_w(uint32_t data) { } @@ -1219,7 +1219,7 @@ void mcpx_ide_device::map_extra(uint64_t memory_window_start, uint64_t memory_wi } } -WRITE32_MEMBER(mcpx_ide_device::class_rev_w) +void mcpx_ide_device::class_rev_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_8_15) { @@ -1254,22 +1254,22 @@ WRITE32_MEMBER(mcpx_ide_device::class_rev_w) } } -READ8_MEMBER(mcpx_ide_device::pri_read_cs1_r) +uint8_t mcpx_ide_device::pri_read_cs1_r() { return m_pri->read_cs1(1, 0xff0000) >> 16; } -WRITE8_MEMBER(mcpx_ide_device::pri_write_cs1_w) +void mcpx_ide_device::pri_write_cs1_w(uint8_t data) { m_pri->write_cs1(1, data << 16, 0xff0000); } -READ8_MEMBER(mcpx_ide_device::sec_read_cs1_r) +uint8_t mcpx_ide_device::sec_read_cs1_r() { return m_sec->read_cs1(1, 0xff0000) >> 16; } -WRITE8_MEMBER(mcpx_ide_device::sec_write_cs1_w) +void mcpx_ide_device::sec_write_cs1_w(uint8_t data) { m_sec->write_cs1(1, data << 16, 0xff0000); } @@ -1311,7 +1311,7 @@ void nv2a_agp_device::device_reset() agp_bridge_device::device_reset(); } -READ32_MEMBER(nv2a_agp_device::unknown_r) +uint32_t nv2a_agp_device::unknown_r(offs_t offset, uint32_t mem_mask) { // 4c 8 or 32 // 44 8 @@ -1324,7 +1324,7 @@ READ32_MEMBER(nv2a_agp_device::unknown_r) return 0; } -WRITE32_MEMBER(nv2a_agp_device::unknown_w) +void nv2a_agp_device::unknown_w(offs_t offset, uint32_t data, uint32_t mem_mask) { //printf("W %08X %08X %08X\n", 0x40+offset*4, mem_mask, data); } @@ -1381,22 +1381,22 @@ void nv2a_gpu_device::device_reset() nvidia_nv2a->set_ram_base(m_program->get_read_ptr(0)); } -READ32_MEMBER(nv2a_gpu_device::geforce_r) +uint32_t nv2a_gpu_device::geforce_r(offs_t offset, uint32_t mem_mask) { - return nvidia_nv2a->geforce_r(space, offset, mem_mask); + return nvidia_nv2a->geforce_r(offset, mem_mask); } -WRITE32_MEMBER(nv2a_gpu_device::geforce_w) +void nv2a_gpu_device::geforce_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask) { nvidia_nv2a->geforce_w(space, offset, data, mem_mask); } -READ32_MEMBER(nv2a_gpu_device::nv2a_mirror_r) +uint32_t nv2a_gpu_device::nv2a_mirror_r(offs_t offset, uint32_t mem_mask) { return m_program->read_dword(offset << 2); } -WRITE32_MEMBER(nv2a_gpu_device::nv2a_mirror_w) +void nv2a_gpu_device::nv2a_mirror_w(offs_t offset, uint32_t data, uint32_t mem_mask) { m_program->write_dword(offset << 2, data, mem_mask); } diff --git a/src/mame/machine/xbox_usb.cpp b/src/mame/machine/xbox_usb.cpp index c272b3ded71..59883d2ca0b 100644 --- a/src/mame/machine/xbox_usb.cpp +++ b/src/mame/machine/xbox_usb.cpp @@ -70,7 +70,7 @@ void ohci_usb_controller::reset() { } -READ32_MEMBER(ohci_usb_controller::read) +uint32_t ohci_usb_controller::read(offs_t offset) { uint32_t ret; @@ -84,7 +84,7 @@ READ32_MEMBER(ohci_usb_controller::read) return ret; } -WRITE32_MEMBER(ohci_usb_controller::write) +void ohci_usb_controller::write(offs_t offset, uint32_t data) { uint32_t old = ohcist.hc_regs[offset]; diff --git a/src/mame/machine/xevious.cpp b/src/mame/machine/xevious.cpp index 9fd3a52e510..ea662444e5b 100644 --- a/src/mame/machine/xevious.cpp +++ b/src/mame/machine/xevious.cpp @@ -45,13 +45,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(battles_state::nmi_generate) } -READ8_MEMBER( battles_state::customio0_r ) +uint8_t battles_state::customio0_r() { logerror("%s: custom I/O Read = %02x\n", machine().describe_context(), m_customio_command); return m_customio_command; } -READ8_MEMBER( battles_state::customio3_r ) +uint8_t battles_state::customio3_r() { int return_data; @@ -71,7 +71,7 @@ READ8_MEMBER( battles_state::customio3_r ) } -WRITE8_MEMBER( battles_state::customio0_w ) +void battles_state::customio0_w(uint8_t data) { logerror("%s: custom I/O Write = %02x\n", machine().describe_context(), data); @@ -88,7 +88,7 @@ WRITE8_MEMBER( battles_state::customio0_w ) } -WRITE8_MEMBER( battles_state::customio3_w ) +void battles_state::customio3_w(uint8_t data) { logerror("%s: custom I/O Write = %02x\n", machine().describe_context(), data); @@ -97,34 +97,34 @@ WRITE8_MEMBER( battles_state::customio3_w ) -READ8_MEMBER( battles_state::customio_data0_r ) +uint8_t battles_state::customio_data0_r(offs_t offset) { logerror("%s: custom I/O parameter %02x Read = %02x\n", machine().describe_context(), offset, m_customio_data); return m_customio_data; } -READ8_MEMBER( battles_state::customio_data3_r ) +uint8_t battles_state::customio_data3_r(offs_t offset) { logerror("%s: custom I/O parameter %02x Read = %02x\n", machine().describe_context(), offset, m_customio_data); return m_customio_data; } -WRITE8_MEMBER( battles_state::customio_data0_w ) +void battles_state::customio_data0_w(offs_t offset, uint8_t data) { logerror("%s: custom I/O parameter %02x Write = %02x\n", machine().describe_context(), offset, data); m_customio_data = data; } -WRITE8_MEMBER( battles_state::customio_data3_w ) +void battles_state::customio_data3_w(offs_t offset, uint8_t data) { logerror("%s: custom I/O parameter %02x Write = %02x\n", machine().describe_context(), offset, data); m_customio_data = data; } -WRITE8_MEMBER( battles_state::cpu4_coin_w ) +void battles_state::cpu4_coin_w(uint8_t data) { m_leds[0] = BIT(data, 1); // Start 1 m_leds[1] = BIT(data, 0); // Start 2 @@ -135,7 +135,7 @@ WRITE8_MEMBER( battles_state::cpu4_coin_w ) } -WRITE8_MEMBER( battles_state::noise_sound_w ) +void battles_state::noise_sound_w(offs_t offset, uint8_t data) { logerror("%s: 50%02x Write = %02x\n", machine().describe_context(), offset, data); if( (m_sound_played == 0) && (data == 0xFF) ){ @@ -150,7 +150,7 @@ WRITE8_MEMBER( battles_state::noise_sound_w ) } -READ8_MEMBER( battles_state::input_port_r ) +uint8_t battles_state::input_port_r(offs_t offset) { switch ( offset ) { diff --git a/src/mame/video/tagteam.cpp b/src/mame/video/tagteam.cpp index 437f38eba89..aa763708efa 100644 --- a/src/mame/video/tagteam.cpp +++ b/src/mame/video/tagteam.cpp @@ -44,19 +44,19 @@ void tagteam_state::tagteam_palette(palette_device &palette) const } -WRITE8_MEMBER(tagteam_state::videoram_w) +void tagteam_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(tagteam_state::colorram_w) +void tagteam_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -READ8_MEMBER(tagteam_state::mirrorvideoram_r) +uint8_t tagteam_state::mirrorvideoram_r(offs_t offset) { int x,y; @@ -68,7 +68,7 @@ READ8_MEMBER(tagteam_state::mirrorvideoram_r) return m_videoram[offset]; } -READ8_MEMBER(tagteam_state::mirrorcolorram_r) +uint8_t tagteam_state::mirrorcolorram_r(offs_t offset) { int x,y; @@ -80,7 +80,7 @@ READ8_MEMBER(tagteam_state::mirrorcolorram_r) return m_colorram[offset]; } -WRITE8_MEMBER(tagteam_state::mirrorvideoram_w) +void tagteam_state::mirrorvideoram_w(offs_t offset, uint8_t data) { int x,y; @@ -89,10 +89,10 @@ WRITE8_MEMBER(tagteam_state::mirrorvideoram_w) y = offset % 32; offset = 32 * y + x; - videoram_w(space,offset,data); + videoram_w(offset,data); } -WRITE8_MEMBER(tagteam_state::mirrorcolorram_w) +void tagteam_state::mirrorcolorram_w(offs_t offset, uint8_t data) { int x,y; @@ -101,10 +101,10 @@ WRITE8_MEMBER(tagteam_state::mirrorcolorram_w) y = offset % 32; offset = 32 * y + x; - colorram_w(space,offset,data); + colorram_w(offset,data); } -WRITE8_MEMBER(tagteam_state::control_w) +void tagteam_state::control_w(uint8_t data) { // d0-3: color for blank screen, applies to h/v borders too // (not implemented yet, and tagteam doesn't have a global screen on/off bit) @@ -113,7 +113,7 @@ WRITE8_MEMBER(tagteam_state::control_w) m_palettebank = (data & 0x80) >> 7; } -WRITE8_MEMBER(tagteam_state::flipscreen_w) +void tagteam_state::flipscreen_w(uint8_t data) { // d0: flip screen if (flip_screen() != (data &0x01)) diff --git a/src/mame/video/tail2nos.cpp b/src/mame/video/tail2nos.cpp index 101a91bd1b6..da07206b9d5 100644 --- a/src/mame/video/tail2nos.cpp +++ b/src/mame/video/tail2nos.cpp @@ -64,13 +64,13 @@ void tail2nos_state::video_start() ***************************************************************************/ -WRITE16_MEMBER(tail2nos_state::tail2nos_txvideoram_w) +void tail2nos_state::tail2nos_txvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_txvideoram[offset]); m_tx_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tail2nos_state::tail2nos_zoomdata_w) +void tail2nos_state::tail2nos_zoomdata_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int oldword = m_zoomram[offset]; COMBINE_DATA(&m_zoomram[offset]); @@ -79,7 +79,7 @@ WRITE16_MEMBER(tail2nos_state::tail2nos_zoomdata_w) m_k051316->mark_gfx_dirty(offset * 2); } -WRITE8_MEMBER(tail2nos_state::tail2nos_gfxbank_w) +void tail2nos_state::tail2nos_gfxbank_w(uint8_t data) { // -------- --pe-b-b // p = palette bank diff --git a/src/mame/video/taito_b.cpp b/src/mame/video/taito_b.cpp index d1abda0de38..f401f246a71 100644 --- a/src/mame/video/taito_b.cpp +++ b/src/mame/video/taito_b.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "includes/taito_b.h" -WRITE16_MEMBER(hitice_state::pixelram_w) +void hitice_state::pixelram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int sy = offset >> 9; int sx = offset & 0x1ff; @@ -18,21 +18,18 @@ WRITE16_MEMBER(hitice_state::pixelram_w) } } -WRITE16_MEMBER(hitice_state::pixel_scroll_w) +void hitice_state::pixel_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pixel_scroll[offset]); } void hitice_state::clear_pixel_bitmap() { - int i; - address_space &space = m_maincpu->space(AS_PROGRAM); - - for (i = 0; i < 0x40000; i++) - pixelram_w(space, i, 0, 0xffff); + for (int i = 0; i < 0x40000; i++) + pixelram_w(i, 0, 0xffff); } -WRITE16_MEMBER(taitob_c_state::realpunc_video_ctrl_w) +void taitob_c_state::realpunc_video_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_realpunc_video_ctrl); } diff --git a/src/mame/video/taito_l.cpp b/src/mame/video/taito_l.cpp index 6ba1524b464..785698175fa 100644 --- a/src/mame/video/taito_l.cpp +++ b/src/mame/video/taito_l.cpp @@ -17,7 +17,7 @@ void horshoes_state::horshoes_tile_cb(u32 &code) code |= m_horshoes_gfxbank << 12; } -WRITE8_MEMBER(horshoes_state::bankg_w) +void horshoes_state::bankg_w(u8 data) { if (m_horshoes_gfxbank != data) { diff --git a/src/mame/video/taitojc.cpp b/src/mame/video/taitojc.cpp index ebdbee5dd6f..382d5cfe2bf 100644 --- a/src/mame/video/taitojc.cpp +++ b/src/mame/video/taitojc.cpp @@ -31,12 +31,12 @@ TILE_GET_INFO_MEMBER(taitojc_state::taitojc_tile_info) tileinfo.set(m_gfx_index, tile, color, 0); } -READ32_MEMBER(taitojc_state::taitojc_palette_r) +uint32_t taitojc_state::taitojc_palette_r(offs_t offset) { return m_palette_ram[offset]; } -WRITE32_MEMBER(taitojc_state::taitojc_palette_w) +void taitojc_state::taitojc_palette_w(offs_t offset, uint32_t data, uint32_t mem_mask) { int r, g, b; uint32_t color; @@ -51,23 +51,23 @@ WRITE32_MEMBER(taitojc_state::taitojc_palette_w) m_palette->set_pen_color(offset, rgb_t(r, g, b)); } -READ32_MEMBER(taitojc_state::taitojc_tile_r) +uint32_t taitojc_state::taitojc_tile_r(offs_t offset) { return m_tile_ram[offset]; } -READ32_MEMBER(taitojc_state::taitojc_char_r) +uint32_t taitojc_state::taitojc_char_r(offs_t offset) { return m_char_ram[offset]; } -WRITE32_MEMBER(taitojc_state::taitojc_tile_w) +void taitojc_state::taitojc_tile_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(m_tile_ram.get() + offset); m_tilemap->mark_tile_dirty(offset); } -WRITE32_MEMBER(taitojc_state::taitojc_char_w) +void taitojc_state::taitojc_char_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(m_char_ram.get() + offset); m_gfxdecode->gfx(m_gfx_index)->mark_dirty(offset/32); diff --git a/src/mame/video/taitosj.cpp b/src/mame/video/taitosj.cpp index 4a4366eb79c..dd453d64d44 100644 --- a/src/mame/video/taitosj.cpp +++ b/src/mame/video/taitosj.cpp @@ -193,7 +193,7 @@ void taitosj_state::video_start() -READ8_MEMBER(taitosj_state::taitosj_gfxrom_r) +uint8_t taitosj_state::taitosj_gfxrom_r() { uint8_t ret; @@ -214,7 +214,7 @@ READ8_MEMBER(taitosj_state::taitosj_gfxrom_r) -WRITE8_MEMBER(taitosj_state::taitosj_characterram_w) +void taitosj_state::taitosj_characterram_w(offs_t offset, uint8_t data) { if (m_characterram[offset] != data) { @@ -233,13 +233,13 @@ WRITE8_MEMBER(taitosj_state::taitosj_characterram_w) } } -WRITE8_MEMBER(taitosj_state::junglhbr_characterram_w) +void taitosj_state::junglhbr_characterram_w(offs_t offset, uint8_t data) { - taitosj_characterram_w(space, offset, data ^ 0xfc); + taitosj_characterram_w(offset, data ^ 0xfc); } -WRITE8_MEMBER(taitosj_state::taitosj_collision_reg_clear_w) +void taitosj_state::taitosj_collision_reg_clear_w(uint8_t data) { m_collision_reg[0] = 0; m_collision_reg[1] = 0; diff --git a/src/mame/video/tank8.cpp b/src/mame/video/tank8.cpp index b6eba3a709b..1f1aae3220d 100644 --- a/src/mame/video/tank8.cpp +++ b/src/mame/video/tank8.cpp @@ -58,7 +58,7 @@ void tank8_state::set_pens() } -WRITE8_MEMBER(tank8_state::video_ram_w) +void tank8_state::video_ram_w(offs_t offset, uint8_t data) { m_video_ram[offset] = data; m_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/tankbatt.cpp b/src/mame/video/tankbatt.cpp index 6447897617a..ad9e370c256 100644 --- a/src/mame/video/tankbatt.cpp +++ b/src/mame/video/tankbatt.cpp @@ -51,7 +51,7 @@ void tankbatt_state::tankbatt_palette(palette_device &palette) const } } -WRITE8_MEMBER(tankbatt_state::videoram_w) +void tankbatt_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/tankbust.cpp b/src/mame/video/tankbust.cpp index 9440d3d0c9a..daf488a15d9 100644 --- a/src/mame/video/tankbust.cpp +++ b/src/mame/video/tankbust.cpp @@ -97,25 +97,25 @@ void tankbust_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(tankbust_state::background_videoram_w) +void tankbust_state::background_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(tankbust_state::background_colorram_w) +void tankbust_state::background_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(tankbust_state::txtram_w) +void tankbust_state::txtram_w(offs_t offset, uint8_t data) { m_txtram[offset] = data; m_txt_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(tankbust_state::xscroll_w) +void tankbust_state::xscroll_w(offs_t offset, uint8_t data) { if( m_xscroll[offset] != data ) { @@ -131,7 +131,7 @@ WRITE8_MEMBER(tankbust_state::xscroll_w) } -WRITE8_MEMBER(tankbust_state::yscroll_w) +void tankbust_state::yscroll_w(offs_t offset, uint8_t data) { if( m_yscroll[offset] != data ) { diff --git a/src/mame/video/taotaido.cpp b/src/mame/video/taotaido.cpp index 95e1a89fe2a..30e98049483 100644 --- a/src/mame/video/taotaido.cpp +++ b/src/mame/video/taotaido.cpp @@ -15,7 +15,7 @@ zooming might be wrong (only used on title logo?) #include "screen.h" /* sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers */ -WRITE8_MEMBER(taotaido_state::spritebank_w) +void taotaido_state::spritebank_w(offs_t offset, uint8_t data) { m_spritebank[offset] = data; } @@ -26,7 +26,7 @@ WRITE8_MEMBER(taotaido_state::spritebank_w) /* the tilemap */ -WRITE16_MEMBER(taotaido_state::tileregs_w) +void taotaido_state::tileregs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch (offset) { @@ -51,7 +51,7 @@ WRITE16_MEMBER(taotaido_state::tileregs_w) } } -WRITE16_MEMBER(taotaido_state::bgvideoram_w) +void taotaido_state::bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bgram[offset]); m_bg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/targeth.cpp b/src/mame/video/targeth.cpp index 2f7cf54e35e..d86ddbee927 100644 --- a/src/mame/video/targeth.cpp +++ b/src/mame/video/targeth.cpp @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(targeth_state::get_tile_info) ***************************************************************************/ -WRITE16_MEMBER(targeth_state::vram_w) +void targeth_state::vram_w(offs_t offset, uint16_t data) { m_videoram[offset] = data; m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index a21c678b492..f3354dc2355 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -12,7 +12,7 @@ *********************************/ // TODO: move into device -WRITE8_MEMBER(tatsumi_state::hd6445_crt_w) +void tatsumi_state::hd6445_crt_w(offs_t offset, uint8_t data) { if (offset==0) m_hd6445_address = data & 0x3f; @@ -41,12 +41,12 @@ WRITE8_MEMBER(tatsumi_state::hd6445_crt_w) } } -READ16_MEMBER(tatsumi_state::tatsumi_sprite_control_r) +uint16_t tatsumi_state::tatsumi_sprite_control_r(offs_t offset) { return m_sprite_control_ram[offset]; } -WRITE16_MEMBER(tatsumi_state::tatsumi_sprite_control_w) +void tatsumi_state::tatsumi_sprite_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_sprite_control_ram[offset]); @@ -76,10 +76,9 @@ void tatsumi_state::apply_shadow_bitmap(bitmap_rgb32 &bitmap, const rectangle &c } } -WRITE16_MEMBER(tatsumi_state::text_w) +void tatsumi_state::text_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t *videoram = m_videoram; - COMBINE_DATA(&videoram[offset]); + COMBINE_DATA(&m_videoram[offset]); m_tx_layer->mark_tile_dirty(offset); } @@ -586,12 +585,12 @@ void tatsumi_state::update_cluts(int fake_palette_offset, int object_base, int l * *********************************/ -WRITE16_MEMBER(apache3_state::apache3_road_z_w) +void apache3_state::apache3_road_z_w(uint16_t data) { m_apache3_road_z = data & 0xff; } -WRITE8_MEMBER(apache3_state::apache3_road_x_w) +void apache3_state::apache3_road_x_w(offs_t offset, uint8_t data) { // Note: Double buffered. Yes, this is correct :) m_apache3_road_x_ram[data] = offset; @@ -718,7 +717,7 @@ uint32_t apache3_state::screen_update_apache3(screen_device &screen, bitmap_rgb3 * *********************************/ -READ8_MEMBER(roundup5_state::gfxdata_r) +uint8_t roundup5_state::gfxdata_r(offs_t offset) { if((m_control_word & 0x200) == 0x200) { @@ -731,7 +730,7 @@ READ8_MEMBER(roundup5_state::gfxdata_r) return m_tx_gfxram[offset]; } -WRITE8_MEMBER(roundup5_state::gfxdata_w) +void roundup5_state::gfxdata_w(offs_t offset, uint8_t data) { if((m_control_word & 0x200) == 0x200) { @@ -1077,7 +1076,7 @@ uint32_t roundup5_state::screen_update_roundup5(screen_device &screen, bitmap_rg * ---x ---- ---- x--- one these might be color bank * */ -WRITE16_MEMBER(cyclwarr_state::video_config_w) +void cyclwarr_state::video_config_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_video_config[offset]); } @@ -1086,7 +1085,7 @@ WRITE16_MEMBER(cyclwarr_state::video_config_w) // --x- ---- enabled in Big Fight, disabled in Cycle Warriors (unknown purpose) // ---- -x-- enable shadow mixing // ---- ---x if 1 invert shadows, i.e. shadows are drawn with original pen while non shadows are halved (Chen stage in Big Fight) -WRITE16_MEMBER(cyclwarr_state::mixing_control_w) +void cyclwarr_state::mixing_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_mixing_control); } diff --git a/src/mame/video/tbowl.cpp b/src/mame/video/tbowl.cpp index 014cf0d3f9c..9bb287ae1fa 100644 --- a/src/mame/video/tbowl.cpp +++ b/src/mame/video/tbowl.cpp @@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_tx_tile_info) tileinfo.set(0,tileno,col,0); } -WRITE8_MEMBER(tbowl_state::txvideoram_w) +void tbowl_state::txvideoram_w(offs_t offset, uint8_t data) { m_txvideoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); @@ -40,28 +40,28 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_bg_tile_info) tileinfo.set(1,tileno,col,0); } -WRITE8_MEMBER(tbowl_state::bg2videoram_w) +void tbowl_state::bg2videoram_w(offs_t offset, uint8_t data) { m_bg2videoram[offset] = data; m_bg2_tilemap->mark_tile_dirty(offset & 0xfff); } -WRITE8_MEMBER(tbowl_state::bgxscroll_lo) +void tbowl_state::bgxscroll_lo(uint8_t data) { m_xscroll = (m_xscroll & 0xff00) | data; } -WRITE8_MEMBER(tbowl_state::bgxscroll_hi) +void tbowl_state::bgxscroll_hi(uint8_t data) { m_xscroll = (m_xscroll & 0x00ff) | (data << 8); } -WRITE8_MEMBER(tbowl_state::bgyscroll_lo) +void tbowl_state::bgyscroll_lo(uint8_t data) { m_yscroll = (m_yscroll & 0xff00) | data; } -WRITE8_MEMBER(tbowl_state::bgyscroll_hi) +void tbowl_state::bgyscroll_hi(uint8_t data) { m_yscroll = (m_yscroll & 0x00ff) | (data << 8); } @@ -80,28 +80,28 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_bg2_tile_info) tileinfo.set(2,tileno,col,0); } -WRITE8_MEMBER(tbowl_state::bgvideoram_w) +void tbowl_state::bgvideoram_w(offs_t offset, uint8_t data) { m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0xfff); } -WRITE8_MEMBER(tbowl_state::bg2xscroll_lo) +void tbowl_state::bg2xscroll_lo(uint8_t data) { m_bg2xscroll = (m_bg2xscroll & 0xff00) | data; } -WRITE8_MEMBER(tbowl_state::bg2xscroll_hi) +void tbowl_state::bg2xscroll_hi(uint8_t data) { m_bg2xscroll = (m_bg2xscroll & 0x00ff) | (data << 8); } -WRITE8_MEMBER(tbowl_state::bg2yscroll_lo) +void tbowl_state::bg2yscroll_lo(uint8_t data) { m_bg2yscroll = (m_bg2yscroll & 0xff00) | data; } -WRITE8_MEMBER(tbowl_state::bg2yscroll_hi) +void tbowl_state::bg2yscroll_hi(uint8_t data) { m_bg2yscroll = (m_bg2yscroll & 0x00ff) | (data << 8); } diff --git a/src/mame/video/tc0150rod.cpp b/src/mame/video/tc0150rod.cpp index 6d7ac458576..bb65c4ae8ec 100644 --- a/src/mame/video/tc0150rod.cpp +++ b/src/mame/video/tc0150rod.cpp @@ -36,12 +36,12 @@ void tc0150rod_device::device_start() DEVICE HANDLERS *****************************************************************************/ -READ16_MEMBER( tc0150rod_device::word_r ) +uint16_t tc0150rod_device::word_r(offs_t offset) { return m_ram[offset]; } -WRITE16_MEMBER( tc0150rod_device::word_w ) +void tc0150rod_device::word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_ram[offset]); } diff --git a/src/mame/video/tc0150rod.h b/src/mame/video/tc0150rod.h index 01dae809bda..2b396e67ddd 100644 --- a/src/mame/video/tc0150rod.h +++ b/src/mame/video/tc0150rod.h @@ -10,8 +10,8 @@ class tc0150rod_device : public device_t public: tc0150rod_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - DECLARE_READ16_MEMBER( word_r ); - DECLARE_WRITE16_MEMBER( word_w ); + uint16_t word_r(offs_t offset); + void word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void draw(bitmap_ind16 &bitmap, const rectangle &cliprect, int y_offs, int palette_offs, int type, int road_trans, bitmap_ind8 &priority_bitmap, u8 low_priority, u8 high_priority, u8 pmask = 0xff); protected: diff --git a/src/mame/video/tc0180vcu.cpp b/src/mame/video/tc0180vcu.cpp index 51f79c715f8..fb3df9474de 100644 --- a/src/mame/video/tc0180vcu.cpp +++ b/src/mame/video/tc0180vcu.cpp @@ -240,7 +240,7 @@ void tc0180vcu_device::video_control( uint8_t data ) machine().tilemap().set_flip_all((m_video_control & 0x10) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0 ); } -WRITE16_MEMBER( tc0180vcu_device::ctrl_w ) +void tc0180vcu_device::ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t oldword = m_ctrl[offset]; @@ -280,7 +280,7 @@ WRITE16_MEMBER( tc0180vcu_device::ctrl_w ) } } -READ16_MEMBER(tc0180vcu_device::framebuffer_word_r) +uint16_t tc0180vcu_device::framebuffer_word_r(offs_t offset) { int sy = offset >> 8; int sx = 2 * (offset & 0xff); @@ -288,7 +288,7 @@ READ16_MEMBER(tc0180vcu_device::framebuffer_word_r) return (m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 0) << 8) | m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 1); } -WRITE16_MEMBER(tc0180vcu_device::framebuffer_word_w) +void tc0180vcu_device::framebuffer_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int sy = offset >> 8; int sx = 2 * (offset & 0xff); @@ -329,7 +329,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_tx_tile_info) 0); } -WRITE16_MEMBER( tc0180vcu_device::word_w ) +void tc0180vcu_device::word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram[offset]); diff --git a/src/mame/video/tc0180vcu.h b/src/mame/video/tc0180vcu.h index 857575a24e4..1a973315035 100644 --- a/src/mame/video/tc0180vcu.h +++ b/src/mame/video/tc0180vcu.h @@ -22,10 +22,10 @@ public: auto intl_callback() { return m_intl_callback.bind(); } uint8_t get_videoctrl() { return m_video_control; } - DECLARE_WRITE16_MEMBER( ctrl_w ); - DECLARE_WRITE16_MEMBER( word_w ); - DECLARE_READ16_MEMBER( framebuffer_word_r ); - DECLARE_WRITE16_MEMBER( framebuffer_word_w ); + void ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t framebuffer_word_r(offs_t offset); + void framebuffer_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void tilemap_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int tmap_num, int plane); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_framebuffer( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp index e2ddf4804f4..046a03f8750 100644 --- a/src/mame/video/tc0780fpa.cpp +++ b/src/mame/video/tc0780fpa.cpp @@ -440,12 +440,12 @@ void tc0780fpa_device::device_stop() DEVICE HANDLERS *****************************************************************************/ -READ16_MEMBER(tc0780fpa_device::tex_addr_r) +uint16_t tc0780fpa_device::tex_addr_r() { return m_tex_address; } -WRITE16_MEMBER(tc0780fpa_device::tex_addr_w) +void tc0780fpa_device::tex_addr_w(uint16_t data) { m_tex_address = data; @@ -455,7 +455,7 @@ WRITE16_MEMBER(tc0780fpa_device::tex_addr_w) m_tex_offset = 0; } -WRITE16_MEMBER(tc0780fpa_device::tex_w) +void tc0780fpa_device::tex_w(uint16_t data) { int x = ((m_tex_offset >> 0) & 0x1f) | ((m_tex_offset >> 5) & 0x20); int y = ((m_tex_offset >> 5) & 0x1f) | ((m_tex_offset >> 6) & 0x20); @@ -466,7 +466,7 @@ WRITE16_MEMBER(tc0780fpa_device::tex_w) m_tex_offset++; } -WRITE16_MEMBER(tc0780fpa_device::poly_fifo_w) +void tc0780fpa_device::poly_fifo_w(uint16_t data) { assert (m_poly_fifo_ptr < POLY_FIFO_SIZE); // never happens m_poly_fifo[m_poly_fifo_ptr++] = data; @@ -482,7 +482,7 @@ WRITE16_MEMBER(tc0780fpa_device::poly_fifo_w) } -WRITE16_MEMBER(tc0780fpa_device::render_w) +void tc0780fpa_device::render_w(uint16_t data) { } diff --git a/src/mame/video/tc0780fpa.h b/src/mame/video/tc0780fpa.h index a7d383434db..5c1c55f01b8 100644 --- a/src/mame/video/tc0780fpa.h +++ b/src/mame/video/tc0780fpa.h @@ -49,11 +49,11 @@ public: void draw(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ16_MEMBER(tex_addr_r); - DECLARE_WRITE16_MEMBER(tex_addr_w); - DECLARE_WRITE16_MEMBER(tex_w); - DECLARE_WRITE16_MEMBER(poly_fifo_w); - DECLARE_WRITE16_MEMBER(render_w); + uint16_t tex_addr_r(); + void tex_addr_w(uint16_t data); + void tex_w(uint16_t data); + void poly_fifo_w(uint16_t data); + void render_w(uint16_t data); protected: // device-level overrides diff --git a/src/mame/video/tceptor.cpp b/src/mame/video/tceptor.cpp index bb0036bcef5..063d0f09a12 100644 --- a/src/mame/video/tceptor.cpp +++ b/src/mame/video/tceptor.cpp @@ -141,7 +141,7 @@ void tceptor_state::tile_mark_dirty(int offset) } -WRITE8_MEMBER(tceptor_state::tceptor_tile_ram_w) +void tceptor_state::tceptor_tile_ram_w(offs_t offset, uint8_t data) { if (m_tile_ram[offset] != data) { @@ -150,7 +150,7 @@ WRITE8_MEMBER(tceptor_state::tceptor_tile_ram_w) } } -WRITE8_MEMBER(tceptor_state::tceptor_tile_attr_w) +void tceptor_state::tceptor_tile_attr_w(offs_t offset, uint8_t data) { if (m_tile_attr[offset] != data) { @@ -180,14 +180,14 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_bg2_tile_info) tileinfo.set(m_bg, code, color, 0); } -WRITE8_MEMBER(tceptor_state::tceptor_bg_ram_w) +void tceptor_state::tceptor_bg_ram_w(offs_t offset, uint8_t data) { m_bg_ram[offset] = data; m_bg_tilemap[offset >> 12]->mark_tile_dirty((offset & 0xfff) >> 1); } -WRITE8_MEMBER(tceptor_state::tceptor_bg_scroll_w) +void tceptor_state::tceptor_bg_scroll_w(offs_t offset, uint8_t data) { switch (offset) { @@ -549,7 +549,7 @@ WRITE_LINE_MEMBER(tceptor_state::screen_vblank_tceptor) } } -WRITE8_MEMBER(tceptor_state::tceptor2_shutter_w) +void tceptor_state::tceptor2_shutter_w(uint8_t data) { // 3D scope shutter control m_shutter = BIT(data, 0); diff --git a/src/mame/video/tecmo.cpp b/src/mame/video/tecmo.cpp index 5a49dc66afe..988467225b0 100644 --- a/src/mame/video/tecmo.cpp +++ b/src/mame/video/tecmo.cpp @@ -106,25 +106,25 @@ void tecmo_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(tecmo_state::txvideoram_w) +void tecmo_state::txvideoram_w(offs_t offset, uint8_t data) { m_txvideoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(tecmo_state::fgvideoram_w) +void tecmo_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x1ff); } -WRITE8_MEMBER(tecmo_state::bgvideoram_w) +void tecmo_state::bgvideoram_w(offs_t offset, uint8_t data) { m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x1ff); } -WRITE8_MEMBER(tecmo_state::fgscroll_w) +void tecmo_state::fgscroll_w(offs_t offset, uint8_t data) { m_fgscroll[offset] = data; @@ -133,7 +133,7 @@ WRITE8_MEMBER(tecmo_state::fgscroll_w) m_screen->update_partial(m_screen->vpos()); } -WRITE8_MEMBER(tecmo_state::bgscroll_w) +void tecmo_state::bgscroll_w(offs_t offset, uint8_t data) { m_bgscroll[offset] = data; @@ -142,7 +142,7 @@ WRITE8_MEMBER(tecmo_state::bgscroll_w) m_screen->update_partial(m_screen->vpos()); } -WRITE8_MEMBER(tecmo_state::flipscreen_w) +void tecmo_state::flipscreen_w(uint8_t data) { flip_screen_set(data & 1); } diff --git a/src/mame/video/tecmo16.cpp b/src/mame/video/tecmo16.cpp index a8b4170f84f..fc4e4aa4960 100644 --- a/src/mame/video/tecmo16.cpp +++ b/src/mame/video/tecmo16.cpp @@ -138,38 +138,38 @@ VIDEO_START_MEMBER(tecmo16_state,riot) /******************************************************************************/ -WRITE16_MEMBER(tecmo16_state::videoram_w) +void tecmo16_state::videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tecmo16_state::colorram_w) +void tecmo16_state::colorram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_colorram[offset]); m_fg_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tecmo16_state::videoram2_w) +void tecmo16_state::videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram2[offset]); m_bg_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tecmo16_state::colorram2_w) +void tecmo16_state::colorram2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_colorram2[offset]); m_bg_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tecmo16_state::charram_w) +void tecmo16_state::charram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_charram[offset]); m_tx_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tecmo16_state::flipscreen_w) +void tecmo16_state::flipscreen_w(uint16_t data) { m_flipscreen = data & 0x01; flip_screen_set(m_flipscreen); @@ -177,37 +177,37 @@ WRITE16_MEMBER(tecmo16_state::flipscreen_w) /******************************************************************************/ -WRITE16_MEMBER(tecmo16_state::scroll_x_w) +void tecmo16_state::scroll_x_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll_x_w); m_fg_tilemap->set_scrollx(0,m_scroll_x_w); } -WRITE16_MEMBER(tecmo16_state::scroll_y_w) +void tecmo16_state::scroll_y_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll_y_w); m_fg_tilemap->set_scrolly(0,m_scroll_y_w); } -WRITE16_MEMBER(tecmo16_state::scroll2_x_w) +void tecmo16_state::scroll2_x_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll2_x_w); m_bg_tilemap->set_scrollx(0,m_scroll2_x_w); } -WRITE16_MEMBER(tecmo16_state::scroll2_y_w) +void tecmo16_state::scroll2_y_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll2_y_w); m_bg_tilemap->set_scrolly(0,m_scroll2_y_w); } -WRITE16_MEMBER(tecmo16_state::scroll_char_x_w) +void tecmo16_state::scroll_char_x_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll_char_x_w); m_tx_tilemap->set_scrollx(0,m_scroll_char_x_w); } -WRITE16_MEMBER(tecmo16_state::scroll_char_y_w) +void tecmo16_state::scroll_char_y_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll_char_y_w); m_tx_tilemap->set_scrolly(0,m_scroll_char_y_w-16); diff --git a/src/mame/video/tecmosys.cpp b/src/mame/video/tecmosys.cpp index eae5ad419f9..b2ef9b96da4 100644 --- a/src/mame/video/tecmosys.cpp +++ b/src/mame/video/tecmosys.cpp @@ -25,7 +25,7 @@ inline void tecmosys_state::set_color_555(pen_t color, int rshift, int gshift, i m_palette->set_pen_color(color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift)); } -WRITE16_MEMBER(tecmosys_state::tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w) +void tecmosys_state::tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_tilemap_paletteram16[offset]); set_color_555(offset+0x4000, 5, 10, 0, m_tilemap_paletteram16[offset]); diff --git a/src/mame/video/tehkanwc.cpp b/src/mame/video/tehkanwc.cpp index 107cd6182f7..975adf76023 100644 --- a/src/mame/video/tehkanwc.cpp +++ b/src/mame/video/tehkanwc.cpp @@ -17,49 +17,49 @@ robbiex@rocketmail.com #include "includes/tehkanwc.h" -WRITE8_MEMBER(tehkanwc_state::videoram_w) +void tehkanwc_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(tehkanwc_state::colorram_w) +void tehkanwc_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(tehkanwc_state::videoram2_w) +void tehkanwc_state::videoram2_w(offs_t offset, uint8_t data) { m_videoram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } -WRITE8_MEMBER(tehkanwc_state::scroll_x_w) +void tehkanwc_state::scroll_x_w(offs_t offset, uint8_t data) { m_scroll_x[offset] = data; } -WRITE8_MEMBER(tehkanwc_state::scroll_y_w) +void tehkanwc_state::scroll_y_w(uint8_t data) { m_bg_tilemap->set_scrolly(0, data); } -WRITE8_MEMBER(tehkanwc_state::flipscreen_x_w) +void tehkanwc_state::flipscreen_x_w(uint8_t data) { flip_screen_x_set(data & 0x40); } -WRITE8_MEMBER(tehkanwc_state::flipscreen_y_w) +void tehkanwc_state::flipscreen_y_w(uint8_t data) { flip_screen_y_set(data & 0x40); } -WRITE8_MEMBER(tehkanwc_state::gridiron_led0_w) +void tehkanwc_state::gridiron_led0_w(uint8_t data) { m_led0 = data; } -WRITE8_MEMBER(tehkanwc_state::gridiron_led1_w) +void tehkanwc_state::gridiron_led1_w(uint8_t data) { m_led1 = data; } diff --git a/src/mame/video/terracre.cpp b/src/mame/video/terracre.cpp index d3b17d58bf8..d5fee609c50 100644 --- a/src/mame/video/terracre.cpp +++ b/src/mame/video/terracre.cpp @@ -133,19 +133,19 @@ void terracre_state::terracre_palette(palette_device &palette) const } } -WRITE16_MEMBER(terracre_state::amazon_background_w) +void terracre_state::amazon_background_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bg_videoram[offset]); m_background->mark_tile_dirty(offset); } -WRITE16_MEMBER(terracre_state::amazon_foreground_w) +void terracre_state::amazon_foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_fg_videoram[offset]); m_foreground->mark_tile_dirty(offset); } -WRITE16_MEMBER(terracre_state::amazon_flipscreen_w) +void terracre_state::amazon_flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if( ACCESSING_BITS_0_7 ) { @@ -155,13 +155,13 @@ WRITE16_MEMBER(terracre_state::amazon_flipscreen_w) } } -WRITE16_MEMBER(terracre_state::amazon_scrolly_w) +void terracre_state::amazon_scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_yscroll); m_background->set_scrolly(0,m_yscroll); } -WRITE16_MEMBER(terracre_state::amazon_scrollx_w) +void terracre_state::amazon_scrollx_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_xscroll); m_background->set_scrollx(0,m_xscroll); diff --git a/src/mame/video/tetrisp2.cpp b/src/mame/video/tetrisp2.cpp index fe46a151cc1..5270589b8eb 100644 --- a/src/mame/video/tetrisp2.cpp +++ b/src/mame/video/tetrisp2.cpp @@ -47,14 +47,14 @@ To Do: ***************************************************************************/ /* BBBBBGGGGGRRRRRx xxxxxxxxxxxxxxxx */ -WRITE16_MEMBER(tetrisp2_state::tetrisp2_palette_w) +void tetrisp2_state::tetrisp2_palette_w(offs_t offset, u16 data, u16 mem_mask) { data = COMBINE_DATA(&m_paletteram[offset]); if ((offset & 1) == 0) m_palette->set_pen_color(offset/2,pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11)); } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub_palette_w) +void tetrisp2_state::rocknms_sub_palette_w(offs_t offset, u16 data, u16 mem_mask) { data = COMBINE_DATA(&m_sub_paletteram[offset]); if ((offset & 1) == 0) @@ -71,7 +71,7 @@ WRITE16_MEMBER(tetrisp2_state::rocknms_sub_palette_w) ***************************************************************************/ -WRITE16_MEMBER(tetrisp2_state::tetrisp2_priority_w) +void tetrisp2_state::tetrisp2_priority_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) m_priority[offset] = data; @@ -79,12 +79,12 @@ WRITE16_MEMBER(tetrisp2_state::tetrisp2_priority_w) m_priority[offset] = data >> 8; } -READ16_MEMBER(tetrisp2_state::tetrisp2_priority_r) +u16 tetrisp2_state::tetrisp2_priority_r(offs_t offset) { return m_priority[offset] | 0xff00; } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub_priority_w) +void tetrisp2_state::rocknms_sub_priority_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) m_rocknms_sub_priority[offset] = data; @@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_bg) 0); } -WRITE16_MEMBER(tetrisp2_state::tetrisp2_vram_bg_w) +void tetrisp2_state::tetrisp2_vram_bg_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vram_bg[offset]); m_tilemap_bg->mark_tile_dirty(offset/2); @@ -142,7 +142,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_fg) 0); } -WRITE16_MEMBER(tetrisp2_state::tetrisp2_vram_fg_w) +void tetrisp2_state::tetrisp2_vram_fg_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vram_fg[offset]); m_tilemap_fg->mark_tile_dirty(offset/2); @@ -159,7 +159,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rot) 0); } -WRITE16_MEMBER(tetrisp2_state::tetrisp2_vram_rot_w) +void tetrisp2_state::tetrisp2_vram_rot_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vram_rot[offset]); m_tilemap_rot->mark_tile_dirty(offset/2); @@ -175,7 +175,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rocknms_sub_bg) 0); } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_bg_w) +void tetrisp2_state::rocknms_sub_vram_bg_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_rocknms_sub_vram_bg[offset]); m_tilemap_sub_bg->mark_tile_dirty(offset/2); @@ -192,7 +192,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rocknms_sub_fg) 0); } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_fg_w) +void tetrisp2_state::rocknms_sub_vram_fg_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_rocknms_sub_vram_fg[offset]); m_tilemap_sub_fg->mark_tile_dirty(offset/2); @@ -209,7 +209,7 @@ TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_rocknms_sub_rot) 0); } -WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_rot_w) +void tetrisp2_state::rocknms_sub_vram_rot_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_rocknms_sub_vram_rot[offset]); m_tilemap_sub_rot->mark_tile_dirty(offset/2); @@ -843,19 +843,19 @@ void stepstag_state::convert_yuv422_to_rgb888(palette_device *paldev, u16 *palra paldev->set_pen_color(offset/4, r, g, b); } -WRITE16_MEMBER(stepstag_state::stepstag_palette_left_w) +void stepstag_state::stepstag_palette_left_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vj_paletteram_l[offset]); convert_yuv422_to_rgb888(m_vj_palette_l,m_vj_paletteram_l,offset); } -WRITE16_MEMBER(stepstag_state::stepstag_palette_mid_w) +void stepstag_state::stepstag_palette_mid_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vj_paletteram_m[offset]); convert_yuv422_to_rgb888(m_vj_palette_m,m_vj_paletteram_m,offset); } -WRITE16_MEMBER(stepstag_state::stepstag_palette_right_w) +void stepstag_state::stepstag_palette_right_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vj_paletteram_r[offset]); convert_yuv422_to_rgb888(m_vj_palette_r,m_vj_paletteram_r,offset); diff --git a/src/mame/video/thedeep.cpp b/src/mame/video/thedeep.cpp index 9e9734c5dbc..8d3f04a4028 100644 --- a/src/mame/video/thedeep.cpp +++ b/src/mame/video/thedeep.cpp @@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(thedeep_state::get_tile_info) 0); } -WRITE8_MEMBER(thedeep_state::textram_w) +void thedeep_state::textram_w(offs_t offset, uint8_t data) { m_textram[offset] = data; m_text_tilemap->mark_tile_dirty(offset / 2); diff --git a/src/mame/video/thepit.cpp b/src/mame/video/thepit.cpp index a731096e9d3..bbd5150914c 100644 --- a/src/mame/video/thepit.cpp +++ b/src/mame/video/thepit.cpp @@ -150,14 +150,14 @@ void thepit_state::video_start() * *************************************/ -WRITE8_MEMBER(thepit_state::videoram_w) +void thepit_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(thepit_state::colorram_w) +void thepit_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_tilemap->mark_tile_dirty(offset); @@ -201,7 +201,7 @@ WRITE_LINE_MEMBER(thepit_state::intrepid_graphics_bank_w) } -READ8_MEMBER(thepit_state::input_port_0_r) +uint8_t thepit_state::input_port_0_r() { /* Read either the real or the fake input ports depending on the horizontal flip switch. (This is how the real PCB does it) */ diff --git a/src/mame/video/thief.cpp b/src/mame/video/thief.cpp index 8862a4aa275..25fdb7e1e71 100644 --- a/src/mame/video/thief.cpp +++ b/src/mame/video/thief.cpp @@ -22,21 +22,21 @@ enum { /***************************************************************************/ -READ8_MEMBER(thief_state::thief_context_ram_r){ +uint8_t thief_state::thief_context_ram_r(offs_t offset){ return m_coprocessor.context_ram[0x40*m_coprocessor.bank+offset]; } -WRITE8_MEMBER(thief_state::thief_context_ram_w){ +void thief_state::thief_context_ram_w(offs_t offset, uint8_t data){ m_coprocessor.context_ram[0x40*m_coprocessor.bank+offset] = data; } -WRITE8_MEMBER(thief_state::thief_context_bank_w){ +void thief_state::thief_context_bank_w(uint8_t data){ m_coprocessor.bank = data&0xf; } /***************************************************************************/ -WRITE8_MEMBER(thief_state::thief_video_control_w){ +void thief_state::thief_video_control_w(uint8_t data){ m_video_control = data; /* bit 0: screen flip @@ -47,7 +47,7 @@ WRITE8_MEMBER(thief_state::thief_video_control_w){ */ } -WRITE8_MEMBER(thief_state::thief_color_map_w){ +void thief_state::thief_color_map_w(offs_t offset, uint8_t data){ /* --xx---- blue ----xx-- green @@ -62,7 +62,7 @@ WRITE8_MEMBER(thief_state::thief_color_map_w){ /***************************************************************************/ -WRITE8_MEMBER(thief_state::thief_color_plane_w){ +void thief_state::thief_color_plane_w(uint8_t data){ /* --xx---- selects bitplane to read from (0..3) ----xxxx selects bitplane(s) to write to (0x0 = none, 0xf = all) @@ -71,14 +71,14 @@ WRITE8_MEMBER(thief_state::thief_color_plane_w){ m_read_mask = (data>>4)&3; } -READ8_MEMBER(thief_state::thief_videoram_r){ +uint8_t thief_state::thief_videoram_r(offs_t offset){ uint8_t *videoram = m_videoram.get(); uint8_t *source = &videoram[offset]; if( m_video_control&0x02 ) source+=0x2000*4; /* foreground/background */ return source[m_read_mask*0x2000]; } -WRITE8_MEMBER(thief_state::thief_videoram_w){ +void thief_state::thief_videoram_w(offs_t offset, uint8_t data){ uint8_t *videoram = m_videoram.get(); uint8_t *dest = &videoram[offset]; if( m_video_control&0x02 ) @@ -158,7 +158,7 @@ uint16_t thief_state::fetch_image_addr( coprocessor_t &thief_coprocessor ) return addr; } -WRITE8_MEMBER(thief_state::thief_blit_w){ +void thief_state::thief_blit_w(uint8_t data){ coprocessor_t &thief_coprocessor = m_coprocessor; int i, offs, xoffset, dy; uint8_t *gfx_rom = memregion( "gfx1" )->base(); @@ -195,22 +195,22 @@ WRITE8_MEMBER(thief_state::thief_blit_w){ if( addr<0x2000*3 ) data = gfx_rom[addr]; } offs = (y*32+x/8+i)&0x1fff; - old_data = thief_videoram_r(space,offs ); + old_data = thief_videoram_r(offs); if( xor_blit ){ - thief_videoram_w(space,offs, old_data^(data>>xoffset) ); + thief_videoram_w(offs, old_data^(data>>xoffset)); } else { - thief_videoram_w(space,offs, + thief_videoram_w(offs, (old_data&(0xff00>>xoffset)) | (data>>xoffset) ); } offs = (offs+1)&0x1fff; - old_data = thief_videoram_r(space,offs ); + old_data = thief_videoram_r(offs); if( xor_blit ){ - thief_videoram_w(space,offs, old_data^((data<<(8-xoffset))&0xff) ); + thief_videoram_w(offs, old_data^((data<<(8-xoffset))&0xff)); } else { - thief_videoram_w(space,offs, + thief_videoram_w(offs, (old_data&(0xff>>xoffset)) | ((data<<(8-xoffset))&0xff) ); } @@ -219,7 +219,7 @@ WRITE8_MEMBER(thief_state::thief_blit_w){ } } -READ8_MEMBER(thief_state::thief_coprocessor_r){ +uint8_t thief_state::thief_coprocessor_r(offs_t offset){ coprocessor_t &thief_coprocessor = m_coprocessor; switch( offset ){ case SCREEN_XPOS: /* xpos */ @@ -261,7 +261,7 @@ READ8_MEMBER(thief_state::thief_coprocessor_r){ return thief_coprocessor.param[offset]; } -WRITE8_MEMBER(thief_state::thief_coprocessor_w){ +void thief_state::thief_coprocessor_w(offs_t offset, uint8_t data){ coprocessor_t &thief_coprocessor = m_coprocessor; switch( offset ){ case GFX_PORT: diff --git a/src/mame/video/thomson.cpp b/src/mame/video/thomson.cpp index d4f9acbe778..2af06012b67 100644 --- a/src/mame/video/thomson.cpp +++ b/src/mame/video/thomson.cpp @@ -1269,7 +1269,7 @@ void thomson_state::mo5_palette(palette_device &palette) /* write to video memory through addresses 0x4000-0x5fff */ -WRITE8_MEMBER( thomson_state::to7_vram_w ) +void thomson_state::to7_vram_w(offs_t offset, uint8_t data) { assert( offset < 0x2000 ); /* force two topmost color bits to 1 */ @@ -1308,7 +1308,7 @@ unsigned thomson_state::to7_lightpen_gpl ( int decx, int decy ) /* write to video memory through addresses 0x4000-0x5fff (TO) or 0x0000-0x1fff (MO) */ -WRITE8_MEMBER( thomson_state::to770_vram_w ) +void thomson_state::to770_vram_w(offs_t offset, uint8_t data) { assert( offset < 0x2000 ); if ( m_thom_vram[ offset + m_thom_mode_point ] == data ) @@ -1327,7 +1327,7 @@ WRITE8_MEMBER( thomson_state::to770_vram_w ) /* write to video memory through system space (always page 1) */ -WRITE8_MEMBER( thomson_state::to8_sys_lo_w ) +void thomson_state::to8_sys_lo_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + offset + 0x6000; assert( offset < 0x2000 ); @@ -1340,7 +1340,7 @@ WRITE8_MEMBER( thomson_state::to8_sys_lo_w ) -WRITE8_MEMBER( thomson_state::to8_sys_hi_w ) +void thomson_state::to8_sys_hi_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + offset + 0x4000; assert( offset < 0x2000 ); @@ -1354,7 +1354,7 @@ WRITE8_MEMBER( thomson_state::to8_sys_hi_w ) /* write to video memory through data space */ -WRITE8_MEMBER( thomson_state::to8_data_lo_w ) +void thomson_state::to8_data_lo_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + ( ( offset + 0x4000 * m_to8_data_vpage + 0x2000 ) & m_ram->mask() ); assert( offset < 0x2000 ); @@ -1369,7 +1369,7 @@ WRITE8_MEMBER( thomson_state::to8_data_lo_w ) -WRITE8_MEMBER( thomson_state::to8_data_hi_w ) +void thomson_state::to8_data_hi_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + ( ( offset + 0x4000 * m_to8_data_vpage ) & m_ram->mask() ); assert( offset < 0x2000 ); @@ -1385,7 +1385,7 @@ WRITE8_MEMBER( thomson_state::to8_data_hi_w ) /* write to video memory page through cartridge addresses space */ -WRITE8_MEMBER( thomson_state::to8_vcart_w ) +void thomson_state::to8_vcart_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + ( ( offset + 0x4000 * m_to8_cart_vpage ) & m_ram->mask() ); assert( offset < 0x4000 ); @@ -1398,7 +1398,7 @@ WRITE8_MEMBER( thomson_state::to8_vcart_w ) m_thom_vmem_dirty[ (offset & 0x1fff) / 40 ] = 1; } -WRITE8_MEMBER( thomson_state::mo6_vcart_lo_w ) +void thomson_state::mo6_vcart_lo_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + ( ( offset + 0x3000 + 0x4000 * m_to8_cart_vpage ) & m_ram->mask() ); assert( offset < 0x1000 ); @@ -1411,7 +1411,7 @@ WRITE8_MEMBER( thomson_state::mo6_vcart_lo_w ) m_thom_vmem_dirty[ (offset & 0x1fff) / 40 ] = 1; } -WRITE8_MEMBER( thomson_state::mo6_vcart_hi_w ) +void thomson_state::mo6_vcart_hi_w(offs_t offset, uint8_t data) { uint8_t* dst = m_thom_vram + ( ( offset + 0x4000 * m_to8_cart_vpage ) & m_ram->mask() ); assert( offset < 0x3000 ); diff --git a/src/mame/video/thoop2.cpp b/src/mame/video/thoop2.cpp index 0cd08a2ee1f..3e70a6e1243 100644 --- a/src/mame/video/thoop2.cpp +++ b/src/mame/video/thoop2.cpp @@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(thoop2_state::get_tile_info) ***************************************************************************/ -WRITE16_MEMBER(thoop2_state::vram_w) +void thoop2_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[offset]); m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2); diff --git a/src/mame/video/tiamc1.cpp b/src/mame/video/tiamc1.cpp index cd1ab77c006..e7765351be9 100644 --- a/src/mame/video/tiamc1.cpp +++ b/src/mame/video/tiamc1.cpp @@ -13,7 +13,7 @@ #include "includes/tiamc1.h" -WRITE8_MEMBER(tiamc1_state::tiamc1_videoram_w) +void tiamc1_state::tiamc1_videoram_w(offs_t offset, uint8_t data) { if(!(m_layers_ctrl & 2)) m_charram[offset + 0x0000] = data; @@ -36,7 +36,7 @@ WRITE8_MEMBER(tiamc1_state::tiamc1_videoram_w) } } -WRITE8_MEMBER(tiamc1_state::kot_videoram_w) +void tiamc1_state::kot_videoram_w(offs_t offset, uint8_t data) { if ((m_layers_ctrl & 1) == 0) { @@ -45,7 +45,7 @@ WRITE8_MEMBER(tiamc1_state::kot_videoram_w) } } -WRITE8_MEMBER(tiamc1_state::tiamc1_bankswitch_w) +void tiamc1_state::tiamc1_bankswitch_w(uint8_t data) { if ((data & 128) != (m_layers_ctrl & 128)) machine().tilemap().mark_all_dirty(); @@ -53,49 +53,49 @@ WRITE8_MEMBER(tiamc1_state::tiamc1_bankswitch_w) m_layers_ctrl = data; } -WRITE8_MEMBER(tiamc1_state::kot_bankswitch_w) +void tiamc1_state::kot_bankswitch_w(uint8_t data) { m_gfxdecode->gfx(0)->set_source(m_charram + (data >> 1) * 0x100); m_layers_ctrl = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_x_w) +void tiamc1_state::tiamc1_sprite_x_w(offs_t offset, uint8_t data) { m_spriteram_x[offset] = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_y_w) +void tiamc1_state::tiamc1_sprite_y_w(offs_t offset, uint8_t data) { m_spriteram_y[offset] = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_a_w) +void tiamc1_state::tiamc1_sprite_a_w(offs_t offset, uint8_t data) { m_spriteram_a[offset] = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_n_w) +void tiamc1_state::tiamc1_sprite_n_w(offs_t offset, uint8_t data) { m_spriteram_n[offset] = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_bg_vshift_w) +void tiamc1_state::tiamc1_bg_vshift_w(uint8_t data) { m_bg_vshift = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_bg_hshift_w) +void tiamc1_state::tiamc1_bg_hshift_w(uint8_t data) { m_bg_hshift = data; } -WRITE8_MEMBER(tiamc1_state::tiamc1_bg_bplctrl_w) +void tiamc1_state::tiamc1_bg_bplctrl_w(uint8_t data) { m_bg_bplctrl = data; update_bg_palette(); } -WRITE8_MEMBER(tiamc1_state::tiamc1_palette_w) +void tiamc1_state::tiamc1_palette_w(offs_t offset, uint8_t data) { m_paletteram[offset] = data; m_palette->set_pen_color(offset, m_palette_ptr[data]); diff --git a/src/mame/video/tigeroad.cpp b/src/mame/video/tigeroad.cpp index 34be4d4a040..ec39168588c 100644 --- a/src/mame/video/tigeroad.cpp +++ b/src/mame/video/tigeroad.cpp @@ -4,14 +4,13 @@ #include "includes/tigeroad.h" -WRITE16_MEMBER(tigeroad_state::tigeroad_videoram_w) +void tigeroad_state::tigeroad_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t *videoram = m_videoram; - COMBINE_DATA(&videoram[offset]); + COMBINE_DATA(&m_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tigeroad_state::tigeroad_videoctrl_w) +void tigeroad_state::tigeroad_videoctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int bank; @@ -51,7 +50,7 @@ WRITE16_MEMBER(tigeroad_state::tigeroad_videoctrl_w) } } -WRITE16_MEMBER(tigeroad_state::tigeroad_scroll_w) +void tigeroad_state::tigeroad_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int scroll = 0; diff --git a/src/mame/video/timelimt.cpp b/src/mame/video/timelimt.cpp index d63d8a987a4..d0b03177d55 100644 --- a/src/mame/video/timelimt.cpp +++ b/src/mame/video/timelimt.cpp @@ -93,31 +93,31 @@ void timelimt_state::video_start() /***************************************************************************/ -WRITE8_MEMBER(timelimt_state::videoram_w) +void timelimt_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(timelimt_state::bg_videoram_w) +void timelimt_state::bg_videoram_w(offs_t offset, uint8_t data) { m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(timelimt_state::scroll_x_lsb_w) +void timelimt_state::scroll_x_lsb_w(uint8_t data) { m_scrollx &= 0x100; m_scrollx |= data & 0xff; } -WRITE8_MEMBER(timelimt_state::scroll_x_msb_w) +void timelimt_state::scroll_x_msb_w(uint8_t data) { m_scrollx &= 0xff; m_scrollx |= ( data & 1 ) << 8; } -WRITE8_MEMBER(timelimt_state::scroll_y_w) +void timelimt_state::scroll_y_w(uint8_t data) { m_scrolly = data; } diff --git a/src/mame/video/timeplt.cpp b/src/mame/video/timeplt.cpp index 884cd33d967..e993d3c8434 100644 --- a/src/mame/video/timeplt.cpp +++ b/src/mame/video/timeplt.cpp @@ -151,14 +151,14 @@ VIDEO_START_MEMBER(timeplt_state,chkun) * *************************************/ -WRITE8_MEMBER(timeplt_state::videoram_w) +void timeplt_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(timeplt_state::colorram_w) +void timeplt_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); @@ -175,7 +175,7 @@ WRITE_LINE_MEMBER(timeplt_state::video_enable_w) m_video_enable = state; } -READ8_MEMBER(timeplt_state::scanline_r) +uint8_t timeplt_state::scanline_r() { return m_screen->vpos(); } diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index a2b79602b95..c87fee27b5f 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -3,12 +3,12 @@ #include "emu.h" #include "includes/tmc600.h" -WRITE8_MEMBER( tmc600_state::vismac_register_w ) +void tmc600_state::vismac_register_w(uint8_t data) { m_vismac_reg_latch = data >> 4; } -WRITE8_MEMBER( tmc600_state::vismac_data_w ) +void tmc600_state::vismac_data_w(uint8_t data) { uint16_t ma = m_maincpu->get_memory_address(); @@ -36,7 +36,7 @@ uint8_t tmc600_state::get_color(uint16_t pma) return color; } -WRITE8_MEMBER( tmc600_state::page_ram_w ) +void tmc600_state::page_ram_w(offs_t offset, uint8_t data) { m_page_ram[offset] = data; m_color_ram[offset] = m_vismac_color_latch; diff --git a/src/mame/video/tmnt.cpp b/src/mame/video/tmnt.cpp index b4aed25dc74..64a297f9de4 100644 --- a/src/mame/video/tmnt.cpp +++ b/src/mame/video/tmnt.cpp @@ -291,7 +291,7 @@ VIDEO_START_MEMBER(tmnt_state,blswhstl) ***************************************************************************/ -WRITE16_MEMBER(tmnt_state::tmnt_0a0000_w) +void tmnt_state::tmnt_0a0000_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -315,7 +315,7 @@ WRITE16_MEMBER(tmnt_state::tmnt_0a0000_w) } } -WRITE16_MEMBER(tmnt_state::punkshot_0a0020_w) +void tmnt_state::punkshot_0a0020_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -333,7 +333,7 @@ WRITE16_MEMBER(tmnt_state::punkshot_0a0020_w) } } -WRITE16_MEMBER(tmnt_state::lgtnfght_0a0018_w) +void tmnt_state::lgtnfght_0a0018_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -352,7 +352,7 @@ WRITE16_MEMBER(tmnt_state::lgtnfght_0a0018_w) } } -WRITE16_MEMBER(tmnt_state::blswhstl_700300_w) +void tmnt_state::blswhstl_700300_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -375,7 +375,7 @@ WRITE16_MEMBER(tmnt_state::blswhstl_700300_w) } -READ16_MEMBER(glfgreat_state::glfgreat_rom_r) +uint16_t glfgreat_state::glfgreat_rom_r(offs_t offset) { if (m_roz_rom_mode) return memregion("zoom")->base()[m_roz_char_bank * 0x80000 + offset]; @@ -388,7 +388,7 @@ READ16_MEMBER(glfgreat_state::glfgreat_rom_r) return memregion("user1")->base()[((offset & 0x3ffff) >> 2) + 0x100000 + m_roz_rom_bank * 0x10000]; } -WRITE16_MEMBER(glfgreat_state::glfgreat_122000_w) +void glfgreat_state::glfgreat_122000_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -419,7 +419,7 @@ WRITE16_MEMBER(glfgreat_state::glfgreat_122000_w) } -WRITE16_MEMBER(tmnt_state::ssriders_eeprom_w) +void tmnt_state::ssriders_eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -438,7 +438,7 @@ WRITE16_MEMBER(tmnt_state::ssriders_eeprom_w) } } -WRITE16_MEMBER(tmnt_state::ssriders_1c0300_w) +void tmnt_state::ssriders_1c0300_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -454,7 +454,7 @@ WRITE16_MEMBER(tmnt_state::ssriders_1c0300_w) } } -WRITE16_MEMBER(prmrsocr_state::prmrsocr_122000_w) +void prmrsocr_state::prmrsocr_122000_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -476,7 +476,7 @@ WRITE16_MEMBER(prmrsocr_state::prmrsocr_122000_w) } } -READ16_MEMBER(prmrsocr_state::prmrsocr_rom_r) +uint16_t prmrsocr_state::prmrsocr_rom_r(offs_t offset) { if(m_roz_char_bank) return memregion("zoom")->base()[offset]; @@ -487,7 +487,7 @@ READ16_MEMBER(prmrsocr_state::prmrsocr_rom_r) } } -WRITE16_MEMBER(tmnt_state::tmnt_priority_w) +void tmnt_state::tmnt_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -608,7 +608,7 @@ uint32_t tmnt_state::screen_update_lgtnfght(screen_device &screen, bitmap_ind16 } -READ16_MEMBER(glfgreat_state::glfgreat_ball_r) +uint16_t glfgreat_state::glfgreat_ball_r() { #ifdef MAME_DEBUG popmessage("%04x", m_glfgreat_pixel); diff --git a/src/mame/video/toaplan1.cpp b/src/mame/video/toaplan1.cpp index ba0e53b1ec1..369c5bd0486 100644 --- a/src/mame/video/toaplan1.cpp +++ b/src/mame/video/toaplan1.cpp @@ -285,7 +285,7 @@ u16 toaplan1_state::frame_done_r() return m_screen->vblank(); } -WRITE16_MEMBER(toaplan1_state::tile_offsets_w) +void toaplan1_state::tile_offsets_w(offs_t offset, u16 data, u16 mem_mask) { if (offset == 0) { diff --git a/src/mame/video/toki.cpp b/src/mame/video/toki.cpp index e4a0c2e0d2e..2454ca2e3c1 100644 --- a/src/mame/video/toki.cpp +++ b/src/mame/video/toki.cpp @@ -28,7 +28,7 @@ remove all the code writing the $a0000 area.) *************************************************************************/ -WRITE16_MEMBER(toki_state::toki_control_w) +void toki_state::toki_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_screen->update_partial(m_screen->vpos() - 1); COMBINE_DATA(&m_scrollram[offset]); @@ -94,20 +94,19 @@ void toki_state::video_start() /*************************************/ -WRITE16_MEMBER(toki_state::foreground_videoram_w) +void toki_state::foreground_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - uint16_t *videoram = m_videoram; - COMBINE_DATA(&videoram[offset]); + COMBINE_DATA(&m_videoram[offset]); m_text_layer->mark_tile_dirty(offset); } -WRITE16_MEMBER(toki_state::background1_videoram_w) +void toki_state::background1_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_background1_videoram[offset]); m_background_layer->mark_tile_dirty(offset); } -WRITE16_MEMBER(toki_state::background2_videoram_w) +void toki_state::background2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_background2_videoram[offset]); m_foreground_layer->mark_tile_dirty(offset); diff --git a/src/mame/video/toobin.cpp b/src/mame/video/toobin.cpp index abc514bb21d..707fde4245c 100644 --- a/src/mame/video/toobin.cpp +++ b/src/mame/video/toobin.cpp @@ -94,7 +94,7 @@ void toobin_state::video_start() * *************************************/ -WRITE16_MEMBER( toobin_state::paletteram_w ) +void toobin_state::paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_paletteram[offset]); uint16_t newword = m_paletteram[offset]; @@ -117,15 +117,13 @@ WRITE16_MEMBER( toobin_state::paletteram_w ) } -WRITE16_MEMBER( toobin_state::intensity_w ) +void toobin_state::intensity_w(offs_t offset, uint16_t data, uint16_t mem_mask) { - int i; - if (ACCESSING_BITS_0_7) { m_brightness = (double)(~data & 0x1f) / 31.0; - for (i = 0; i < 0x400; i++) + for (int i = 0; i < 0x400; i++) if (!BIT(m_paletteram[i], 15)) m_palette->set_pen_contrast(i, m_brightness); } @@ -139,7 +137,7 @@ WRITE16_MEMBER( toobin_state::intensity_w ) * *************************************/ -WRITE16_MEMBER( toobin_state::xscroll_w ) +void toobin_state::xscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t oldscroll = *m_xscroll; uint16_t newscroll = oldscroll; @@ -158,7 +156,7 @@ WRITE16_MEMBER( toobin_state::xscroll_w ) } -WRITE16_MEMBER( toobin_state::yscroll_w ) +void toobin_state::yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t oldscroll = *m_yscroll; uint16_t newscroll = oldscroll; @@ -184,7 +182,7 @@ WRITE16_MEMBER( toobin_state::yscroll_w ) * *************************************/ -WRITE16_MEMBER( toobin_state::slip_w ) +void toobin_state::slip_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t oldslip = m_mob->slipram(offset); uint16_t newslip = oldslip; diff --git a/src/mame/video/tp84.cpp b/src/mame/video/tp84.cpp index 4c01482f6ff..24996f784f4 100644 --- a/src/mame/video/tp84.cpp +++ b/src/mame/video/tp84.cpp @@ -99,7 +99,7 @@ void tp84_state::tp84_palette(palette_device &palette) const } -WRITE8_MEMBER(tp84_state::tp84_spriteram_w) +void tp84_state::tp84_spriteram_w(offs_t offset, uint8_t data) { /* the game multiplexes the sprites, so update now */ // m_screen->update_now(); @@ -108,7 +108,7 @@ WRITE8_MEMBER(tp84_state::tp84_spriteram_w) } -READ8_MEMBER(tp84_state::tp84_scanline_r) +uint8_t tp84_state::tp84_scanline_r() { /* reads 1V - 128V */ return m_screen->vpos(); diff --git a/src/mame/video/trackfld.cpp b/src/mame/video/trackfld.cpp index db90a6c9790..bf5fb6510ed 100644 --- a/src/mame/video/trackfld.cpp +++ b/src/mame/video/trackfld.cpp @@ -87,13 +87,13 @@ void trackfld_state::trackfld_palette(palette_device &palette) const } } -WRITE8_MEMBER(trackfld_state::trackfld_videoram_w) +void trackfld_state::trackfld_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(trackfld_state::trackfld_colorram_w) +void trackfld_state::trackfld_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); @@ -105,7 +105,7 @@ WRITE_LINE_MEMBER(trackfld_state::flipscreen_w) machine().tilemap().mark_all_dirty(); } -WRITE8_MEMBER(trackfld_state::atlantol_gfxbank_w) +void trackfld_state::atlantol_gfxbank_w(uint8_t data) { if (data & 1) { diff --git a/src/mame/video/travrusa.cpp b/src/mame/video/travrusa.cpp index 6cf0d181cd3..5498ffc7f3c 100644 --- a/src/mame/video/travrusa.cpp +++ b/src/mame/video/travrusa.cpp @@ -229,7 +229,7 @@ void travrusa_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(travrusa_state::travrusa_videoram_w) +void travrusa_state::travrusa_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); @@ -246,20 +246,20 @@ void travrusa_state::set_scroll( ) m_bg_tilemap->set_scrollx(3, 0); } -WRITE8_MEMBER(travrusa_state::travrusa_scroll_x_low_w) +void travrusa_state::travrusa_scroll_x_low_w(uint8_t data) { m_scrollx[0] = data; set_scroll(); } -WRITE8_MEMBER(travrusa_state::travrusa_scroll_x_high_w) +void travrusa_state::travrusa_scroll_x_high_w(uint8_t data) { m_scrollx[1] = data; set_scroll(); } -WRITE8_MEMBER(travrusa_state::travrusa_flipscreen_w) +void travrusa_state::travrusa_flipscreen_w(uint8_t data) { /* screen flip is handled both by software and hardware */ data ^= ~ioport("DSW2")->read() & 1; diff --git a/src/mame/video/trs80m3.cpp b/src/mame/video/trs80m3.cpp index 37b10716ee3..28fc64012dc 100644 --- a/src/mame/video/trs80m3.cpp +++ b/src/mame/video/trs80m3.cpp @@ -13,7 +13,7 @@ d2 80/40 or 64/32 characters per line (1=80) d0 80/64 or 40/32 characters per line (1=32) */ -WRITE8_MEMBER( trs80m3_state::port_88_w ) +void trs80m3_state::port_88_w(offs_t offset, uint8_t data) { /* This is for the programming of the CRTC registers. However this CRTC is mask-programmed, and only the diff --git a/src/mame/video/trucocl.cpp b/src/mame/video/trucocl.cpp index 8defb59b3df..d61d25133de 100644 --- a/src/mame/video/trucocl.cpp +++ b/src/mame/video/trucocl.cpp @@ -46,13 +46,13 @@ void trucocl_state::trucocl_palette(palette_device &palette) const palette.set_pen_color(i, pal4bit(color_prom[i] >> 0), pal4bit(color_prom[i + 32] >> 0), pal4bit(color_prom[i + 32] >> 4)); } -WRITE8_MEMBER(trucocl_state::trucocl_videoram_w) +void trucocl_state::trucocl_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(trucocl_state::trucocl_colorram_w) +void trucocl_state::trucocl_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/tryout.cpp b/src/mame/video/tryout.cpp index da42c882ec8..3de6c8064ed 100644 --- a/src/mame/video/tryout.cpp +++ b/src/mame/video/tryout.cpp @@ -54,18 +54,18 @@ TILE_GET_INFO_MEMBER(tryout_state::get_bg_tile_info) tileinfo.set(2, m_vram[tile_index] & 0x7f, 2, 0); } -READ8_MEMBER(tryout_state::vram_r) +uint8_t tryout_state::vram_r(offs_t offset) { return m_vram[offset]; // debug only } -WRITE8_MEMBER(tryout_state::videoram_w) +void tryout_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(tryout_state::vram_w) +void tryout_state::vram_w(offs_t offset, uint8_t data) { /* There are eight banks of vram - in bank 0 the first 0x400 bytes is reserved for the tilemap. In banks 2, 4 and 6 the game never @@ -133,12 +133,12 @@ WRITE8_MEMBER(tryout_state::vram_w) m_gfxdecode->gfx(2)->mark_dirty((offset-0x400/64)&0x7f); } -WRITE8_MEMBER(tryout_state::vram_bankswitch_w) +void tryout_state::vram_bankswitch_w(uint8_t data) { m_vram_bank = data; } -WRITE8_MEMBER(tryout_state::flipscreen_w) +void tryout_state::flipscreen_w(uint8_t data) { flip_screen_set(data & 1); } diff --git a/src/mame/video/tsamurai.cpp b/src/mame/video/tsamurai.cpp index 6798d36b390..2a43152cd2f 100644 --- a/src/mame/video/tsamurai.cpp +++ b/src/mame/video/tsamurai.cpp @@ -76,17 +76,17 @@ VIDEO_START_MEMBER(tsamurai_state, m660) ***************************************************************************/ -WRITE8_MEMBER(tsamurai_state::scrolly_w) +void tsamurai_state::scrolly_w(uint8_t data) { m_background->set_scrolly(0, data ); } -WRITE8_MEMBER(tsamurai_state::scrollx_w) +void tsamurai_state::scrollx_w(uint8_t data) { m_background->set_scrollx(0, data ); } -WRITE8_MEMBER(tsamurai_state::bgcolor_w) +void tsamurai_state::bgcolor_w(uint8_t data) { m_bgcolor = data; } @@ -103,18 +103,18 @@ WRITE_LINE_MEMBER(tsamurai_state::textbank2_w) m_foreground->mark_all_dirty(); } -WRITE8_MEMBER(tsamurai_state::bg_videoram_w) +void tsamurai_state::bg_videoram_w(offs_t offset, uint8_t data) { m_bg_videoram[offset]=data; offset = offset/2; m_background->mark_tile_dirty(offset); } -WRITE8_MEMBER(tsamurai_state::fg_videoram_w) +void tsamurai_state::fg_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset]=data; m_foreground->mark_tile_dirty(offset); } -WRITE8_MEMBER(tsamurai_state::fg_colorram_w) +void tsamurai_state::fg_colorram_w(offs_t offset, uint8_t data) { if( m_colorram[offset]!=data ) { @@ -228,7 +228,7 @@ VS Gong Fight runs on older hardware ***************************************************************************/ -WRITE8_MEMBER(tsamurai_state::vsgongf_color_w) +void tsamurai_state::vsgongf_color_w(uint8_t data) { if( m_vsgongf_color != data ) { diff --git a/src/mame/video/tubep.cpp b/src/mame/video/tubep.cpp index 1ff4b1e4506..af4b49d0e76 100644 --- a/src/mame/video/tubep.cpp +++ b/src/mame/video/tubep.cpp @@ -383,7 +383,7 @@ void tubep_state::video_reset() } -WRITE8_MEMBER(tubep_state::tubep_textram_w) +void tubep_state::tubep_textram_w(offs_t offset, uint8_t data) { m_textram[offset] = data; } @@ -409,13 +409,13 @@ WRITE_LINE_MEMBER(tubep_state::colorproms_A4_line_w) } -WRITE8_MEMBER(tubep_state::tubep_background_a000_w) +void tubep_state::tubep_background_a000_w(uint8_t data) { m_ls175_b7 = ((data & 0x0f) ^ 0x0f) | 0xf0; } -WRITE8_MEMBER(tubep_state::tubep_background_c000_w) +void tubep_state::tubep_background_c000_w(uint8_t data) { m_ls175_e8 = ((data & 0x0f) ^ 0x0f); } @@ -490,7 +490,7 @@ void tubep_state::draw_sprite() } -WRITE8_MEMBER(tubep_state::tubep_sprite_control_w) +void tubep_state::tubep_sprite_control_w(offs_t offset, uint8_t data) { if (offset < 10) { @@ -728,13 +728,13 @@ void tubep_state::rjammer_palette(palette_device &palette) const } -WRITE8_MEMBER(tubep_state::rjammer_background_LS377_w) +void tubep_state::rjammer_background_LS377_w(uint8_t data) { m_ls377_data = data & 0xff; } -WRITE8_MEMBER(tubep_state::rjammer_background_page_w) +void tubep_state::rjammer_background_page_w(uint8_t data) { m_page = (data & 1) * 0x200; } diff --git a/src/mame/video/tumbleb.cpp b/src/mame/video/tumbleb.cpp index f222b590c9a..b22a788f28c 100644 --- a/src/mame/video/tumbleb.cpp +++ b/src/mame/video/tumbleb.cpp @@ -24,7 +24,7 @@ to switch between 8*8 tiles and 16*16 tiles. /******************************************************************************/ -WRITE16_MEMBER(tumbleb_state::bcstory_tilebank_w) +void tumbleb_state::bcstory_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data &= mem_mask; @@ -34,7 +34,7 @@ WRITE16_MEMBER(tumbleb_state::bcstory_tilebank_w) m_pf2_tilemap->mark_all_dirty(); } -WRITE16_MEMBER(tumbleb_state::chokchok_tilebank_w) +void tumbleb_state::chokchok_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data &= mem_mask; @@ -44,7 +44,7 @@ WRITE16_MEMBER(tumbleb_state::chokchok_tilebank_w) m_pf2_tilemap->mark_all_dirty(); } -WRITE16_MEMBER(tumbleb_state::wlstar_tilebank_w) +void tumbleb_state::wlstar_tilebank_w(uint16_t data) { /* it just writes 0000 or ffff */ m_tilebank = data & 0x4000; @@ -54,7 +54,7 @@ WRITE16_MEMBER(tumbleb_state::wlstar_tilebank_w) } -WRITE16_MEMBER(tumbleb_state::suprtrio_tilebank_w) +void tumbleb_state::suprtrio_tilebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { data &= mem_mask; @@ -65,14 +65,14 @@ WRITE16_MEMBER(tumbleb_state::suprtrio_tilebank_w) } -WRITE16_MEMBER(tumbleb_state::tumblepb_pf1_data_w) +void tumbleb_state::tumblepb_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); m_pf1_alt_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tumbleb_state::tumblepb_pf2_data_w) +void tumbleb_state::tumblepb_pf2_data_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset); @@ -81,33 +81,33 @@ WRITE16_MEMBER(tumbleb_state::tumblepb_pf2_data_w) m_pf2_alt_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(tumbleb_state::fncywld_pf1_data_w) +void tumbleb_state::fncywld_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 / 2); m_pf1_alt_tilemap->mark_tile_dirty(offset / 2); } -WRITE16_MEMBER(tumbleb_state::fncywld_pf2_data_w) +void tumbleb_state::fncywld_pf2_data_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset / 2); } -WRITE16_MEMBER(tumbleb_state::tumblepb_control_0_w) +void tumbleb_state::tumblepb_control_0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_control_0[offset]); } -WRITE16_MEMBER(tumbleb_state::pangpang_pf1_data_w) +void tumbleb_state::pangpang_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 / 2); m_pf1_alt_tilemap->mark_tile_dirty(offset / 2); } -WRITE16_MEMBER(tumbleb_state::pangpang_pf2_data_w) +void tumbleb_state::pangpang_pf2_data_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset / 2); diff --git a/src/mame/video/turbo.cpp b/src/mame/video/turbo.cpp index 20f000a585a..d52f2d9fdfa 100644 --- a/src/mame/video/turbo.cpp +++ b/src/mame/video/turbo.cpp @@ -150,7 +150,7 @@ VIDEO_START_MEMBER(turbo_state,buckrog) * *************************************/ -WRITE8_MEMBER(turbo_state::turbo_videoram_w) +void turbo_state::turbo_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; if (offset < 0x400) @@ -161,7 +161,7 @@ WRITE8_MEMBER(turbo_state::turbo_videoram_w) } -WRITE8_MEMBER(turbo_state::buckrog_bitmap_w) +void turbo_state::buckrog_bitmap_w(offs_t offset, uint8_t data) { m_buckrog_bitmap_ram[offset] = data & 1; } diff --git a/src/mame/video/turrett.cpp b/src/mame/video/turrett.cpp index 377830b7f15..c03e5ec440b 100644 --- a/src/mame/video/turrett.cpp +++ b/src/mame/video/turrett.cpp @@ -190,7 +190,7 @@ void turrett_state::update_video_addr(void) } -READ32_MEMBER( turrett_state::video_r ) +uint32_t turrett_state::video_r(offs_t offset, uint32_t mem_mask) { uint32_t ret = 0; @@ -208,7 +208,7 @@ READ32_MEMBER( turrett_state::video_r ) } -WRITE32_MEMBER( turrett_state::video_w ) +void turrett_state::video_w(offs_t offset, uint32_t data, uint32_t mem_mask) { switch (offset) { @@ -291,7 +291,7 @@ TIMER_CALLBACK_MEMBER( turrett_state::dma_complete ) } -WRITE32_MEMBER( turrett_state::dma_w ) +void turrett_state::dma_w(offs_t offset, uint32_t data) { int bank = ((offset & 2) >> 1) ^ 1; diff --git a/src/mame/video/twin16.cpp b/src/mame/video/twin16.cpp index 708feae1986..a85a9e018b0 100644 --- a/src/mame/video/twin16.cpp +++ b/src/mame/video/twin16.cpp @@ -38,25 +38,25 @@ enum }; -WRITE16_MEMBER(twin16_state::fixram_w) +void twin16_state::fixram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_fixram[offset]); m_fixed_tmap->mark_tile_dirty(offset); } -WRITE16_MEMBER(twin16_state::videoram0_w) +void twin16_state::videoram0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[0][offset]); m_scroll_tmap[0]->mark_tile_dirty(offset); } -WRITE16_MEMBER(twin16_state::videoram1_w) +void twin16_state::videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_videoram[1][offset]); m_scroll_tmap[1]->mark_tile_dirty(offset); } -WRITE16_MEMBER(twin16_state::zipram_w) +void twin16_state::zipram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t old = m_zipram[offset]; COMBINE_DATA(&m_zipram[offset]); @@ -69,7 +69,7 @@ void twin16_state::twin16_postload() m_gfxdecode->gfx(1)->mark_all_dirty(); } -WRITE16_MEMBER(fround_state::gfx_bank_w) +void fround_state::gfx_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int changed = 0; @@ -96,7 +96,7 @@ WRITE16_MEMBER(fround_state::gfx_bank_w) } } -WRITE16_MEMBER(twin16_state::video_register_w) +void twin16_state::video_register_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch (offset) { @@ -189,7 +189,7 @@ WRITE16_MEMBER(twin16_state::video_register_w) * 3 | ------------xxxx | color */ -READ16_MEMBER(twin16_state::sprite_status_r) +uint16_t twin16_state::sprite_status_r() { // bit 0: busy, other bits: dunno return m_sprite_busy; diff --git a/src/mame/video/tx1.cpp b/src/mame/video/tx1.cpp index 9f1e4a3e327..e11b7bb806d 100644 --- a/src/mame/video/tx1.cpp +++ b/src/mame/video/tx1.cpp @@ -42,12 +42,12 @@ TIMER_CALLBACK_MEMBER(tx1_state::interrupt_callback) } -READ16_MEMBER(tx1_state::tx1_crtc_r) +uint16_t tx1_state::tx1_crtc_r() { return 0xffff; } -WRITE16_MEMBER(tx1_state::tx1_crtc_w) +void tx1_state::tx1_crtc_w(offs_t offset, uint16_t data) { if (PRINT_CRTC_DATA) { @@ -143,7 +143,7 @@ void tx1_state::tx1_palette(palette_device &palette) const * *************************************/ -WRITE16_MEMBER(tx1_state::tx1_bankcs_w) +void tx1_state::tx1_bankcs_w(offs_t offset, uint16_t data) { vregs_t &tx1_vregs = m_vregs; @@ -196,7 +196,7 @@ WRITE16_MEMBER(tx1_state::tx1_bankcs_w) } } -WRITE16_MEMBER(tx1_state::tx1_slincs_w) +void tx1_state::tx1_slincs_w(offs_t offset, uint16_t data) { if (offset == 1) m_vregs.slin_inc = data; @@ -204,17 +204,17 @@ WRITE16_MEMBER(tx1_state::tx1_slincs_w) m_vregs.slin_inc = m_vregs.slin_val = 0; } -WRITE16_MEMBER(tx1_state::tx1_slock_w) +void tx1_state::tx1_slock_w(uint16_t data) { m_vregs.slock = data & 1; } -WRITE16_MEMBER(tx1_state::tx1_scolst_w) +void tx1_state::tx1_scolst_w(uint16_t data) { m_vregs.scol = data & 0x0707; } -WRITE16_MEMBER(tx1_state::tx1_flgcs_w) +void tx1_state::tx1_flgcs_w(uint16_t data) { m_vregs.flags = data & 0xff; } @@ -2826,7 +2826,7 @@ void tx1_state::buggyboy_draw_objs(uint8_t *bitmap, bool wide) /WASET = 24A0-F, 24B0-F /FLAGS = 24E0-F, 24F0-F */ -WRITE16_MEMBER(tx1_state::buggyboy_gas_w) +void tx1_state::buggyboy_gas_w(offs_t offset, uint16_t data) { vregs_t &vregs = m_vregs; offset <<= 1; @@ -2899,12 +2899,12 @@ WRITE16_MEMBER(tx1_state::buggyboy_gas_w) vregs.gas = data; } -WRITE16_MEMBER(tx1_state::buggyboy_sky_w) +void tx1_state::buggyboy_sky_w(uint16_t data) { m_vregs.sky = data; } -WRITE16_MEMBER(tx1_state::buggyboy_scolst_w) +void tx1_state::buggyboy_scolst_w(uint16_t data) { m_vregs.scol = data; } diff --git a/src/mame/video/ultraman.cpp b/src/mame/video/ultraman.cpp index d6fca6ffb25..9475b6d3029 100644 --- a/src/mame/video/ultraman.cpp +++ b/src/mame/video/ultraman.cpp @@ -58,7 +58,7 @@ K051316_CB_MEMBER(ultraman_state::zoom_callback_3) ***************************************************************************/ -WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w) +void ultraman_state::ultraman_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { diff --git a/src/mame/video/ultratnk.cpp b/src/mame/video/ultratnk.cpp index 668e7c46398..b6bd759460c 100644 --- a/src/mame/video/ultratnk.cpp +++ b/src/mame/video/ultratnk.cpp @@ -133,7 +133,7 @@ WRITE_LINE_MEMBER(ultratnk_state::screen_vblank) } -WRITE8_MEMBER(ultratnk_state::video_ram_w) +void ultratnk_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/unico.cpp b/src/mame/video/unico.cpp index 9653ae20d15..f20aa408943 100644 --- a/src/mame/video/unico.cpp +++ b/src/mame/video/unico.cpp @@ -85,9 +85,9 @@ TILE_GET_INFO_MEMBER(unico_state::get_tile_info) tileinfo.set(1, code, attr & 0x1f, TILE_FLIPYX( attr >> 5 )); } -READ16_MEMBER(unico_state::vram_r) { return m_vram[offset]; } +uint16_t unico_state::vram_r(offs_t offset) { return m_vram[offset]; } -WRITE16_MEMBER(unico_state::vram_w) +void unico_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int tile = ((offset / 0x2000) + 1) % 3; COMBINE_DATA(&m_vram[offset]); @@ -95,10 +95,10 @@ WRITE16_MEMBER(unico_state::vram_w) } -READ16_MEMBER(unico_state::scroll_r) { return m_scroll[offset]; } -WRITE16_MEMBER(unico_state::scroll_w) { COMBINE_DATA(&m_scroll[offset]); } -READ16_MEMBER(unico_state::spriteram_r) { return m_spriteram[offset]; } -WRITE16_MEMBER(unico_state::spriteram_w) { COMBINE_DATA(&m_spriteram[offset]); } +uint16_t unico_state::scroll_r(offs_t offset) { return m_scroll[offset]; } +void unico_state::scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scroll[offset]); } +uint16_t unico_state::spriteram_r(offs_t offset) { return m_spriteram[offset]; } +void unico_state::spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spriteram[offset]); } /*************************************************************************** diff --git a/src/mame/video/usgames.cpp b/src/mame/video/usgames.cpp index 20db490c16e..b9c65025012 100644 --- a/src/mame/video/usgames.cpp +++ b/src/mame/video/usgames.cpp @@ -26,7 +26,7 @@ void usgames_state::video_start() m_gfxdecode->gfx(0)->set_source(m_charram); } -WRITE8_MEMBER(usgames_state::charram_w) +void usgames_state::charram_w(offs_t offset, uint8_t data) { m_charram[offset] = data; m_gfxdecode->gfx(0)->mark_dirty(offset/8); diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index 0c61c38780b..d2f5096562f 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -23,17 +23,17 @@ /* Video RAM Access */ -READ8_MEMBER( v1050_state::attr_r ) +uint8_t v1050_state::attr_r() { return m_attr; } -WRITE8_MEMBER( v1050_state::attr_w ) +void v1050_state::attr_w(uint8_t data) { m_attr = data; } -READ8_MEMBER( v1050_state::videoram_r ) +uint8_t v1050_state::videoram_r(offs_t offset) { if (offset >= 0x2000) { @@ -43,7 +43,7 @@ READ8_MEMBER( v1050_state::videoram_r ) return m_video_ram[offset]; } -WRITE8_MEMBER( v1050_state::videoram_w ) +void v1050_state::videoram_w(offs_t offset, uint8_t data) { m_video_ram[offset] = data; diff --git a/src/mame/video/vaportra.cpp b/src/mame/video/vaportra.cpp index c48c16424ea..222458c7168 100644 --- a/src/mame/video/vaportra.cpp +++ b/src/mame/video/vaportra.cpp @@ -16,7 +16,7 @@ /******************************************************************************/ -WRITE16_MEMBER(vaportra_state::priority_w) +void vaportra_state::priority_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_priority[offset]); } @@ -36,13 +36,13 @@ void vaportra_state::update_palette( int offset ) m_palette->set_pen_color(offset, rgb_t(r,g,b)); } -WRITE16_MEMBER(vaportra_state::palette_w) +void vaportra_state::palette_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_paletteram[offset]); update_palette(offset); } -WRITE16_MEMBER(vaportra_state::palette_ext_w) +void vaportra_state::palette_ext_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_paletteram_ext[offset]); update_palette(offset); diff --git a/src/mame/video/vastar.cpp b/src/mame/video/vastar.cpp index ff837a267bb..a3173aea438 100644 --- a/src/mame/video/vastar.cpp +++ b/src/mame/video/vastar.cpp @@ -79,19 +79,19 @@ void vastar_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(vastar_state::fgvideoram_w) +void vastar_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(vastar_state::bg1videoram_w) +void vastar_state::bg1videoram_w(offs_t offset, uint8_t data) { m_bg1videoram[offset] = data; m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(vastar_state::bg2videoram_w) +void vastar_state::bg2videoram_w(offs_t offset, uint8_t data) { m_bg2videoram[offset] = data; m_bg2_tilemap->mark_tile_dirty(offset & 0x3ff); diff --git a/src/mame/video/vball.cpp b/src/mame/video/vball.cpp index dd3d41f262f..779124b8b2a 100644 --- a/src/mame/video/vball.cpp +++ b/src/mame/video/vball.cpp @@ -56,13 +56,13 @@ void vball_state::video_start() save_item(NAME(m_spprombank)); } -WRITE8_MEMBER(vball_state::videoram_w) +void vball_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(vball_state::attrib_w) +void vball_state::attrib_w(offs_t offset, uint8_t data) { m_attribram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/vc4000.cpp b/src/mame/video/vc4000.cpp index 49723216c22..5d4c1325266 100644 --- a/src/mame/video/vc4000.cpp +++ b/src/mame/video/vc4000.cpp @@ -77,7 +77,7 @@ inline uint8_t vc4000_state::vc4000_joystick_return_to_centre(uint8_t joy) return data; } -READ8_MEMBER( vc4000_state::vc4000_video_r ) +uint8_t vc4000_state::vc4000_video_r(offs_t offset) { uint8_t data=0; if (offset > 0xcf) offset &= 0xcf; // c0-cf is mirrored at d0-df, e0-ef, f0-ff @@ -289,7 +289,7 @@ READ8_MEMBER( vc4000_state::vc4000_video_r ) return data; } -WRITE8_MEMBER( vc4000_state::vc4000_video_w ) +void vc4000_state::vc4000_video_w(offs_t offset, uint8_t data) { // m_video.reg.data[offset]=data; if (offset > 0xcf) offset &= 0xcf; // c0-cf is mirrored at d0-df, e0-ef, f0-ff diff --git a/src/mame/video/vectrex.cpp b/src/mame/video/vectrex.cpp index 55e00e5b90f..72a88ddb466 100644 --- a/src/mame/video/vectrex.cpp +++ b/src/mame/video/vectrex.cpp @@ -73,12 +73,12 @@ TIMER_CALLBACK_MEMBER(vectrex_base_state::lightpen_trigger) *********************************************************************/ -READ8_MEMBER(vectrex_base_state::vectrex_via_r) +uint8_t vectrex_base_state::vectrex_via_r(offs_t offset) { return m_via6522_0->read(offset); } -WRITE8_MEMBER(vectrex_base_state::vectrex_via_w) +void vectrex_base_state::vectrex_via_w(offs_t offset, uint8_t data) { attotime period; @@ -411,7 +411,7 @@ WRITE_LINE_MEMBER(vectrex_base_state::v_via_cb2_w) *****************************************************************/ -WRITE8_MEMBER(raaspec_state::raaspec_led_w) +void raaspec_state::raaspec_led_w(uint8_t data) { logerror("Spectrum I+ LED: %i%i%i%i%i%i%i%i\n", (data>>7)&0x1, (data>>6)&0x1, (data>>5)&0x1, (data>>4)&0x1, diff --git a/src/mame/video/vicdual.cpp b/src/mame/video/vicdual.cpp index b3c80d2d677..bbf4c0636cb 100644 --- a/src/mame/video/vicdual.cpp +++ b/src/mame/video/vicdual.cpp @@ -23,7 +23,7 @@ static const pen_t pens_from_color_prom[] = }; -WRITE8_MEMBER(vicdual_state::palette_bank_w) +void vicdual_state::palette_bank_w(uint8_t data) { m_screen->update_partial(m_screen->vpos()); m_palette_bank = data & 3; diff --git a/src/mame/video/victory.cpp b/src/mame/video/victory.cpp index 4e6287caaf1..68545d6016d 100644 --- a/src/mame/video/victory.cpp +++ b/src/mame/video/victory.cpp @@ -110,7 +110,7 @@ INTERRUPT_GEN_MEMBER(victory_state::vblank_interrupt) * *************************************/ -WRITE8_MEMBER(victory_state::paletteram_w) +void victory_state::paletteram_w(offs_t offset, uint8_t data) { m_paletteram[offset & 0x3f] = ((offset & 0x80) << 1) | data; } @@ -136,7 +136,7 @@ void victory_state::set_palette() * *************************************/ -READ8_MEMBER(victory_state::video_control_r) +uint8_t victory_state::video_control_r(offs_t offset) { int result = 0; @@ -202,7 +202,7 @@ READ8_MEMBER(victory_state::video_control_r) * *************************************/ -WRITE8_MEMBER(victory_state::video_control_w) +void victory_state::video_control_w(offs_t offset, uint8_t data) { struct micro_t µ = m_micro; switch (offset) diff --git a/src/mame/video/vigilant.cpp b/src/mame/video/vigilant.cpp index e61cce74f79..53fcfc60a8e 100644 --- a/src/mame/video/vigilant.cpp +++ b/src/mame/video/vigilant.cpp @@ -98,7 +98,7 @@ void vigilant_state::update_background() These are used to index a color triplet of RGB. The triplet is read from RAM, and output to R0-R4, G0-G4, and B0-B4. **************************************************************************/ -WRITE8_MEMBER(vigilant_state::paletteram_w) +void vigilant_state::paletteram_w(offs_t offset, uint8_t data) { int bank,r,g,b; @@ -123,7 +123,7 @@ WRITE8_MEMBER(vigilant_state::paletteram_w) horiz_scroll_low = HSPL, an 8-bit register horiz_scroll_high = HSPH, a 1-bit register **************************************************************************/ -WRITE8_MEMBER(vigilant_state::vigilant_horiz_scroll_w) +void vigilant_state::vigilant_horiz_scroll_w(offs_t offset, uint8_t data) { if (offset==0) m_horiz_scroll_low = data; @@ -137,7 +137,7 @@ WRITE8_MEMBER(vigilant_state::vigilant_horiz_scroll_w) rear_horiz_scroll_low = RHSPL, an 8-bit register rear_horiz_scroll_high = RHSPH, an 8-bit register but only 3 bits are saved ***************************************************************************/ -WRITE8_MEMBER(vigilant_state::vigilant_rear_horiz_scroll_w) +void vigilant_state::vigilant_rear_horiz_scroll_w(offs_t offset, uint8_t data) { if (offset==0) m_rear_horiz_scroll_low = data; @@ -160,7 +160,7 @@ WRITE8_MEMBER(vigilant_state::vigilant_rear_horiz_scroll_w) palette. However, the top four bits of the palette inputs are labelled: "RCC3", "RCC2", "V256E", "RCC0". Methinks there's a typo. **************************************************************************/ -WRITE8_MEMBER(vigilant_state::vigilant_rear_color_w) +void vigilant_state::vigilant_rear_color_w(uint8_t data) { m_rear_disable = data & 0x40; m_rear_color = (data & 0x0d); diff --git a/src/mame/video/vindictr.cpp b/src/mame/video/vindictr.cpp index ed507364814..dae56f5d4cd 100644 --- a/src/mame/video/vindictr.cpp +++ b/src/mame/video/vindictr.cpp @@ -93,7 +93,7 @@ void vindictr_state::video_start() * *************************************/ -WRITE16_MEMBER( vindictr_state::vindictr_paletteram_w ) +void vindictr_state::vindictr_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { static const int ztable[16] = { 0x0, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11 }; diff --git a/src/mame/video/volfied.cpp b/src/mame/video/volfied.cpp index f0fa5c001fa..dcee9a9142d 100644 --- a/src/mame/video/volfied.cpp +++ b/src/mame/video/volfied.cpp @@ -24,24 +24,24 @@ void volfied_state::video_start() READ AND WRITE HANDLERS *******************************************************/ -READ16_MEMBER(volfied_state::video_ram_r) +uint16_t volfied_state::video_ram_r(offs_t offset) { return m_video_ram[offset]; } -WRITE16_MEMBER(volfied_state::video_ram_w) +void volfied_state::video_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { mem_mask &= m_video_mask; COMBINE_DATA(&m_video_ram[offset]); } -WRITE16_MEMBER(volfied_state::video_ctrl_w) +void volfied_state::video_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_video_ctrl); } -READ16_MEMBER(volfied_state::video_ctrl_r) +uint16_t volfied_state::video_ctrl_r() { /* Could this be some kind of hardware collision detection? If bit 6 is set the game will check for collisions with the large enemy, whereas @@ -52,7 +52,7 @@ READ16_MEMBER(volfied_state::video_ctrl_r) return 0x60; } -WRITE16_MEMBER(volfied_state::video_mask_w) +void volfied_state::video_mask_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_video_mask); } diff --git a/src/mame/video/vs920a.cpp b/src/mame/video/vs920a.cpp index 27c07e60fae..d3f5e476ac1 100644 --- a/src/mame/video/vs920a.cpp +++ b/src/mame/video/vs920a.cpp @@ -74,14 +74,14 @@ TILE_GET_INFO_MEMBER(vs920a_text_tilemap_device::get_tile_info) tileinfo.set(m_gfx_region, tileno, m_pal_base + pal, 0); } -WRITE16_MEMBER(vs920a_text_tilemap_device::vram_w) +void vs920a_text_tilemap_device::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram[offset]); m_tmap->mark_tile_dirty(offset); } -READ16_MEMBER(vs920a_text_tilemap_device::vram_r) +uint16_t vs920a_text_tilemap_device::vram_r(offs_t offset) { return m_vram[offset]; } diff --git a/src/mame/video/vs920a.h b/src/mame/video/vs920a.h index 2d1241040fe..0bcb60d75f7 100644 --- a/src/mame/video/vs920a.h +++ b/src/mame/video/vs920a.h @@ -20,8 +20,8 @@ public: void set_transparent_pen(pen_t pen) { m_tmap->set_transparent_pen(pen); } void draw(screen_device &screen, bitmap_ind16& bitmap, const rectangle &cliprect, int priority); - DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_READ16_MEMBER(vram_r); + void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t vram_r(offs_t offset); protected: virtual void device_start() override; diff --git a/src/mame/video/vtech2.cpp b/src/mame/video/vtech2.cpp index 9c24b9b13bc..c4328050b32 100644 --- a/src/mame/video/vtech2.cpp +++ b/src/mame/video/vtech2.cpp @@ -296,7 +296,7 @@ uint32_t vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 & return 0; } -WRITE8_MEMBER(vtech2_state::laser_bg_mode_w) +void vtech2_state::laser_bg_mode_w(uint8_t data) { if (m_laser_bg_mode != data) { @@ -305,7 +305,7 @@ WRITE8_MEMBER(vtech2_state::laser_bg_mode_w) } } -WRITE8_MEMBER(vtech2_state::laser_two_color_w) +void vtech2_state::laser_two_color_w(uint8_t data) { if (m_laser_two_color != data) { diff --git a/src/mame/video/vulgus.cpp b/src/mame/video/vulgus.cpp index 5cc872e0a79..e94e0254abd 100644 --- a/src/mame/video/vulgus.cpp +++ b/src/mame/video/vulgus.cpp @@ -124,20 +124,20 @@ void vulgus_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(vulgus_state::fgvideoram_w) +void vulgus_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(vulgus_state::bgvideoram_w) +void vulgus_state::bgvideoram_w(offs_t offset, uint8_t data) { m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(vulgus_state::c804_w) +void vulgus_state::c804_w(uint8_t data) { /* bits 0 and 1 are coin counters */ machine().bookkeeping().coin_counter_w(0, data & 0x01); @@ -148,7 +148,7 @@ WRITE8_MEMBER(vulgus_state::c804_w) } -WRITE8_MEMBER(vulgus_state::palette_bank_w) +void vulgus_state::palette_bank_w(uint8_t data) { if (m_palette_bank != (data & 3)) { diff --git a/src/mame/video/warpwarp.cpp b/src/mame/video/warpwarp.cpp index 01e78b0ae65..53685316957 100644 --- a/src/mame/video/warpwarp.cpp +++ b/src/mame/video/warpwarp.cpp @@ -222,13 +222,13 @@ VIDEO_START_MEMBER(warpwarp_state,warpwarp) ***************************************************************************/ -WRITE8_MEMBER(warpwarp_state::geebee_videoram_w) +void warpwarp_state::geebee_videoram_w(offs_t offset, uint8_t data) { m_geebee_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(warpwarp_state::warpwarp_videoram_w) +void warpwarp_state::warpwarp_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); diff --git a/src/mame/video/wc90.cpp b/src/mame/video/wc90.cpp index c5c8b37adf6..9bc686069f7 100644 --- a/src/mame/video/wc90.cpp +++ b/src/mame/video/wc90.cpp @@ -96,19 +96,19 @@ VIDEO_START_MEMBER(wc90_state,wc90t) ***************************************************************************/ -WRITE8_MEMBER(wc90_state::bgvideoram_w) +void wc90_state::bgvideoram_w(offs_t offset, uint8_t data) { m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } -WRITE8_MEMBER(wc90_state::fgvideoram_w) +void wc90_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } -WRITE8_MEMBER(wc90_state::txvideoram_w) +void wc90_state::txvideoram_w(offs_t offset, uint8_t data) { m_txvideoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); diff --git a/src/mame/video/wc90b.cpp b/src/mame/video/wc90b.cpp index 5792355a949..21650a16cce 100644 --- a/src/mame/video/wc90b.cpp +++ b/src/mame/video/wc90b.cpp @@ -64,19 +64,19 @@ void wc90b_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(wc90b_state::bgvideoram_w) +void wc90b_state::bgvideoram_w(offs_t offset, uint8_t data) { m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } -WRITE8_MEMBER(wc90b_state::fgvideoram_w) +void wc90b_state::fgvideoram_w(offs_t offset, uint8_t data) { m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } -WRITE8_MEMBER(wc90b_state::txvideoram_w) +void wc90b_state::txvideoram_w(offs_t offset, uint8_t data) { m_txvideoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); diff --git a/src/mame/video/wecleman.cpp b/src/mame/video/wecleman.cpp index 71a8bffcd38..c76dfa8d6a7 100644 --- a/src/mame/video/wecleman.cpp +++ b/src/mame/video/wecleman.cpp @@ -406,7 +406,7 @@ TILE_GET_INFO_MEMBER(wecleman_state::wecleman_get_txt_tile_info) tileinfo.set(PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0); } -WRITE16_MEMBER(wecleman_state::wecleman_txtram_w) +void wecleman_state::wecleman_txtram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t old_data = m_txtram[offset]; uint16_t new_data = COMBINE_DATA(&m_txtram[offset]); @@ -472,7 +472,7 @@ TILE_GET_INFO_MEMBER(wecleman_state::wecleman_get_fg_tile_info) ------------------------------------------------------------------------*/ /* Pages that compose both the background and the foreground */ -WRITE16_MEMBER(wecleman_state::wecleman_pageram_w) +void wecleman_state::wecleman_pageram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pageram[offset]); @@ -810,7 +810,7 @@ void wecleman_state::hotchase_draw_road(bitmap_ind16 &bitmap, const rectangle &c // new video and palette code // TODO: remove me. -WRITE16_MEMBER(wecleman_state::wecleman_videostatus_w) +void wecleman_state::wecleman_videostatus_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(m_videostatus); @@ -830,7 +830,7 @@ WRITE16_MEMBER(wecleman_state::wecleman_videostatus_w) } } -WRITE16_MEMBER(wecleman_state::hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w) +void wecleman_state::hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int newword, r, g, b; @@ -845,7 +845,7 @@ WRITE16_MEMBER(wecleman_state::hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w) m_palette->set_pen_color(offset+0x800, pal5bit(r)/2, pal5bit(g)/2, pal5bit(b)/2); } -WRITE16_MEMBER(wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) +void wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int newword = COMBINE_DATA(&m_generic_paletteram_16[offset]); diff --git a/src/mame/video/welltris.cpp b/src/mame/video/welltris.cpp index 2b1d58a0112..3e1c60d8234 100644 --- a/src/mame/video/welltris.cpp +++ b/src/mame/video/welltris.cpp @@ -18,7 +18,7 @@ void welltris_state::setbank(int num, int bank) /* Not really enough evidence here */ -WRITE16_MEMBER(welltris_state::palette_bank_w) +void welltris_state::palette_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -35,7 +35,7 @@ WRITE16_MEMBER(welltris_state::palette_bank_w) } } -WRITE16_MEMBER(welltris_state::gfxbank_w) +void welltris_state::gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -44,7 +44,7 @@ WRITE16_MEMBER(welltris_state::gfxbank_w) } } -WRITE16_MEMBER(welltris_state::scrollreg_w) +void welltris_state::scrollreg_w(offs_t offset, uint16_t data) { switch (offset) { case 0: m_scrollx = data - 14; break; @@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(welltris_state::get_tile_info) 0); } -WRITE16_MEMBER(welltris_state::charvideoram_w) +void welltris_state::charvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_charvideoram[offset]); m_char_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/williams.cpp b/src/mame/video/williams.cpp index c846df713f1..ec10b269a3e 100644 --- a/src/mame/video/williams.cpp +++ b/src/mame/video/williams.cpp @@ -687,7 +687,7 @@ void williams_state::blitter_init(int blitter_config, const uint8_t *remap_prom) } -WRITE8_MEMBER(williams_state::blitter_w) +void williams_state::blitter_w(address_space &space, offs_t offset, u8 data) { /* store the data */ m_blitterram[offset] = data; diff --git a/src/mame/video/wiz.cpp b/src/mame/video/wiz.cpp index 381862a1532..94135c9cafd 100644 --- a/src/mame/video/wiz.cpp +++ b/src/mame/video/wiz.cpp @@ -78,32 +78,32 @@ void wiz_state::wiz_palette(palette_device &palette) const ***************************************************************************/ -WRITE8_MEMBER(wiz_state::wiz_palette_bank_w) +void wiz_state::wiz_palette_bank_w(offs_t offset, uint8_t data) { m_palbank[offset] = data & 1; } -WRITE8_MEMBER(wiz_state::wiz_char_bank_w) +void wiz_state::wiz_char_bank_w(offs_t offset, uint8_t data) { m_charbank[offset] = data & 1; } -WRITE8_MEMBER(wiz_state::wiz_sprite_bank_w) +void wiz_state::wiz_sprite_bank_w(uint8_t data) { m_sprite_bank = data & 1; } -WRITE8_MEMBER(wiz_state::wiz_bgcolor_w) +void wiz_state::wiz_bgcolor_w(uint8_t data) { m_bgcolor = data; } -WRITE8_MEMBER(wiz_state::wiz_flipx_w) +void wiz_state::wiz_flipx_w(uint8_t data) { m_flipx = data & 1; } -WRITE8_MEMBER(wiz_state::wiz_flipy_w) +void wiz_state::wiz_flipy_w(uint8_t data) { m_flipy = data & 1; } diff --git a/src/mame/video/wolfpack.cpp b/src/mame/video/wolfpack.cpp index e384d7ee2a0..276f053dca5 100644 --- a/src/mame/video/wolfpack.cpp +++ b/src/mame/video/wolfpack.cpp @@ -43,51 +43,51 @@ void wolfpack_state::wolfpack_palette(palette_device &palette) const } -WRITE8_MEMBER(wolfpack_state::ship_size_w) +void wolfpack_state::ship_size_w(uint8_t data) { m_ship_size = data; } -WRITE8_MEMBER(wolfpack_state::video_invert_w) +void wolfpack_state::video_invert_w(uint8_t data) { m_video_invert = data & 1; } -WRITE8_MEMBER(wolfpack_state::ship_reflect_w) +void wolfpack_state::ship_reflect_w(uint8_t data) { m_ship_reflect = data & 1; } -WRITE8_MEMBER(wolfpack_state::pt_pos_select_w) +void wolfpack_state::pt_pos_select_w(uint8_t data) { m_pt_pos_select = data & 1; } -WRITE8_MEMBER(wolfpack_state::pt_horz_w) +void wolfpack_state::pt_horz_w(uint8_t data) { m_pt_horz = data; } -WRITE8_MEMBER(wolfpack_state::pt_pic_w) +void wolfpack_state::pt_pic_w(uint8_t data) { m_pt_pic = data & 0x3f; } -WRITE8_MEMBER(wolfpack_state::ship_h_w) +void wolfpack_state::ship_h_w(uint8_t data) { m_ship_h = data; } -WRITE8_MEMBER(wolfpack_state::torpedo_pic_w) +void wolfpack_state::torpedo_pic_w(uint8_t data) { m_torpedo_pic = data; } -WRITE8_MEMBER(wolfpack_state::ship_h_precess_w) +void wolfpack_state::ship_h_precess_w(uint8_t data) { m_ship_h_precess = data & 0x3f; } -WRITE8_MEMBER(wolfpack_state::ship_pic_w) +void wolfpack_state::ship_pic_w(uint8_t data) { m_ship_pic = data & 0x0f; } -WRITE8_MEMBER(wolfpack_state::torpedo_h_w) +void wolfpack_state::torpedo_h_w(uint8_t data) { m_torpedo_h = data; } -WRITE8_MEMBER(wolfpack_state::torpedo_v_w) +void wolfpack_state::torpedo_v_w(uint8_t data) { m_torpedo_v = data; } diff --git a/src/mame/video/wwfsstar.cpp b/src/mame/video/wwfsstar.cpp index a3bff29c829..63463a75eca 100644 --- a/src/mame/video/wwfsstar.cpp +++ b/src/mame/video/wwfsstar.cpp @@ -17,13 +17,13 @@ for writes to Video Ram *******************************************************************************/ -WRITE16_MEMBER(wwfsstar_state::fg0_videoram_w) +void wwfsstar_state::fg0_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_fg0_videoram[offset]); m_fg0_tilemap->mark_tile_dirty(offset/2); } -WRITE16_MEMBER(wwfsstar_state::bg0_videoram_w) +void wwfsstar_state::bg0_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bg0_videoram[offset]); m_bg0_tilemap->mark_tile_dirty(offset/2); diff --git a/src/mame/video/x68k.cpp b/src/mame/video/x68k.cpp index a00b4886299..170ba8f38da 100644 --- a/src/mame/video/x68k.cpp +++ b/src/mame/video/x68k.cpp @@ -113,7 +113,7 @@ void x68k_state::gvram_write(offs_t offset, uint16_t data, uint16_t mem_mask) COMBINE_DATA(&m_gvram[offset]); } -WRITE16_MEMBER(x68k_state::spritereg_w ) +void x68k_state::spritereg_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_spritereg[offset]); switch(offset) @@ -161,14 +161,14 @@ WRITE16_MEMBER(x68k_state::spritereg_w ) } } -READ16_MEMBER(x68k_state::spritereg_r ) +uint16_t x68k_state::spritereg_r(offs_t offset) { if(offset >= 0x400 && offset < 0x404) return m_spritereg[offset] & 0x3ff; return m_spritereg[offset]; } -WRITE16_MEMBER(x68k_state::spriteram_w ) +void x68k_state::spriteram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(m_spriteram+offset); m_video.tile8_dirty[offset / 16] = 1; @@ -192,7 +192,7 @@ WRITE16_MEMBER(x68k_state::spriteram_w ) } } -READ16_MEMBER(x68k_state::spriteram_r ) +uint16_t x68k_state::spriteram_r(offs_t offset) { return m_spriteram[offset]; } diff --git a/src/mame/video/x68k_crtc.cpp b/src/mame/video/x68k_crtc.cpp index a05082b2377..70453f92b53 100644 --- a/src/mame/video/x68k_crtc.cpp +++ b/src/mame/video/x68k_crtc.cpp @@ -387,7 +387,7 @@ TIMER_CALLBACK_MEMBER(x68k_crtc_device::vblank_irq) * Operation Port bits are cleared automatically when the requested * operation is completed. */ -WRITE16_MEMBER(x68k_crtc_device::crtc_w) +void x68k_crtc_device::crtc_w(offs_t offset, u16 data, u16 mem_mask) { if (offset < 0x24) COMBINE_DATA(&m_reg[offset]); @@ -472,7 +472,7 @@ WRITE16_MEMBER(x68k_crtc_device::crtc_w) // LOG("%s CRTC: Wrote %04x to CRTC register %i\n",machine().describe_context(), data, offset); } -READ16_MEMBER(x68k_crtc_device::crtc_r) +u16 x68k_crtc_device::crtc_r(offs_t offset) { if (offset < 24) { @@ -503,7 +503,7 @@ READ16_MEMBER(x68k_crtc_device::crtc_r) return 0xffff; } -WRITE16_MEMBER(x68k_crtc_device::gvram_w) +void x68k_crtc_device::gvram_w(offs_t offset, u16 data, u16 mem_mask) { // int xloc,yloc,pageoffset; /* @@ -569,7 +569,7 @@ WRITE16_MEMBER(x68k_crtc_device::gvram_w) } } -WRITE16_MEMBER(x68k_crtc_device::tvram_w) +void x68k_crtc_device::tvram_w(offs_t offset, u16 data, u16 mem_mask) { u16 text_mask = ~(m_reg[23]) & mem_mask; @@ -597,7 +597,7 @@ WRITE16_MEMBER(x68k_crtc_device::tvram_w) } } -READ16_MEMBER(x68k_crtc_device::gvram_r) +u16 x68k_crtc_device::gvram_r(offs_t offset) { u16 ret = 0; @@ -638,7 +638,7 @@ READ16_MEMBER(x68k_crtc_device::gvram_r) return ret; } -READ16_MEMBER(x68k_crtc_device::tvram_r) +u16 x68k_crtc_device::tvram_r(offs_t offset) { - return m_tvram_read_callback(offset, mem_mask); + return m_tvram_read_callback(offset); } diff --git a/src/mame/video/x68k_crtc.h b/src/mame/video/x68k_crtc.h index 233646d05ba..d7b90e4b3ff 100644 --- a/src/mame/video/x68k_crtc.h +++ b/src/mame/video/x68k_crtc.h @@ -25,12 +25,12 @@ public: u32 clock_69m() const { return m_clock_69m; } u32 clock_50m() const { return m_clock_50m; } - DECLARE_WRITE16_MEMBER(crtc_w); - DECLARE_READ16_MEMBER(crtc_r); - DECLARE_WRITE16_MEMBER(gvram_w); - DECLARE_READ16_MEMBER(gvram_r); - DECLARE_WRITE16_MEMBER(tvram_w); - DECLARE_READ16_MEMBER(tvram_r); + void crtc_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 crtc_r(offs_t offset); + void gvram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 gvram_r(offs_t offset); + void tvram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 tvram_r(offs_t offset); // getters u16 xscr_text() const { return m_reg[10]; } diff --git a/src/mame/video/xain.cpp b/src/mame/video/xain.cpp index a59f2a02e75..1aa9283a2d0 100644 --- a/src/mame/video/xain.cpp +++ b/src/mame/video/xain.cpp @@ -98,14 +98,14 @@ void xain_state::video_start() ***************************************************************************/ -WRITE8_MEMBER(xain_state::charram_w) +void xain_state::charram_w(offs_t offset, uint8_t data) { m_charram[offset] = data; m_char_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(xain_state::flipscreen_w) +void xain_state::flipscreen_w(uint8_t data) { flip_screen_set(data & 1); } diff --git a/src/mame/video/xbox_nv2a.cpp b/src/mame/video/xbox_nv2a.cpp index ea45ff84953..8a769cfa392 100644 --- a/src/mame/video/xbox_nv2a.cpp +++ b/src/mame/video/xbox_nv2a.cpp @@ -4907,7 +4907,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work) } } -READ32_MEMBER(nv2a_renderer::geforce_r) +uint32_t nv2a_renderer::geforce_r(offs_t offset, uint32_t mem_mask) { static int x, ret; @@ -4964,7 +4964,7 @@ READ32_MEMBER(nv2a_renderer::geforce_r) return ret; } -WRITE32_MEMBER(nv2a_renderer::geforce_w) +void nv2a_renderer::geforce_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t old; bool update_int; diff --git a/src/mame/video/xevious.cpp b/src/mame/video/xevious.cpp index 2296403695b..4f1abe9ea6e 100644 --- a/src/mame/video/xevious.cpp +++ b/src/mame/video/xevious.cpp @@ -164,31 +164,31 @@ VIDEO_START_MEMBER(xevious_state,xevious) ***************************************************************************/ -WRITE8_MEMBER( xevious_state::xevious_fg_videoram_w ) +void xevious_state::xevious_fg_videoram_w(offs_t offset, uint8_t data) { m_xevious_fg_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER( xevious_state::xevious_fg_colorram_w ) +void xevious_state::xevious_fg_colorram_w(offs_t offset, uint8_t data) { m_xevious_fg_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER( xevious_state::xevious_bg_videoram_w ) +void xevious_state::xevious_bg_videoram_w(offs_t offset, uint8_t data) { m_xevious_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER( xevious_state::xevious_bg_colorram_w ) +void xevious_state::xevious_bg_colorram_w(offs_t offset, uint8_t data) { m_xevious_bg_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER( xevious_state::xevious_vh_latch_w ) +void xevious_state::xevious_vh_latch_w(offs_t offset, uint8_t data) { int reg; int scroll = data + ((offset&0x01)<<8); /* A0 -> D8 */ @@ -220,12 +220,12 @@ WRITE8_MEMBER( xevious_state::xevious_vh_latch_w ) /* emulation for schematic 9B */ -WRITE8_MEMBER( xevious_state::xevious_bs_w ) +void xevious_state::xevious_bs_w(offs_t offset, uint8_t data) { m_xevious_bs[offset & 1] = data; } -READ8_MEMBER( xevious_state::xevious_bb_r ) +uint8_t xevious_state::xevious_bb_r(offs_t offset) { uint8_t *rom2a = memregion("gfx4")->base(); uint8_t *rom2b = rom2a+0x1000; diff --git a/src/mame/video/xxmissio.cpp b/src/mame/video/xxmissio.cpp index 836d18efe2b..d348a927dae 100644 --- a/src/mame/video/xxmissio.cpp +++ b/src/mame/video/xxmissio.cpp @@ -23,19 +23,19 @@ void xxmissio_state::scroll_y_w(uint8_t data) m_yscroll = data; } -WRITE8_MEMBER(xxmissio_state::flipscreen_w) +void xxmissio_state::flipscreen_w(uint8_t data) { m_flipscreen = data & 0x01; } -WRITE8_MEMBER(xxmissio_state::bgram_w) +void xxmissio_state::bgram_w(offs_t offset, uint8_t data) { int x = (offset + (m_xscroll >> 3)) & 0x1f; offset = (offset & 0x7e0) | x; m_bgram[offset] = data; } -READ8_MEMBER(xxmissio_state::bgram_r) +uint8_t xxmissio_state::bgram_r(offs_t offset) { int x = (offset + (m_xscroll >> 3)) & 0x1f; offset = (offset & 0x7e0) | x; |