diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-04 18:17:25 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-04 18:17:25 +0200 |
commit | d5a6bcf1dd870ef856d9d372ee68a3a177a0d7c7 (patch) | |
tree | 1159f1c87f80c2b186ed11c9c20fc647dc19ac56 /src/mame/drivers | |
parent | 5e158b19cda1794317dc1915f2ebf06efc4da879 (diff) |
drivers starting with t, u, v, w, x: more macro removal + some others (nw)
Diffstat (limited to 'src/mame/drivers')
112 files changed, 2165 insertions, 2186 deletions
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index 7a281cfcbc1..162bf98d927 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -740,7 +740,7 @@ public: void main_comram_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); uint64_t main_fifo_r(offs_t offset, uint64_t mem_mask = ~0); void main_fifo_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); - DECLARE_WRITE32_MEMBER(main_cpu_dc_store); + void main_cpu_dc_store(offs_t offset, uint32_t data); uint32_t sub_comram_r(offs_t offset); void sub_comram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); @@ -759,7 +759,7 @@ public: uint32_t sub_psac2_r(); void sub_psac2_w(uint32_t data); void sub_psac_palette_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE32_MEMBER(sub_sound_dma_w); + void sub_sound_dma_w(offs_t offset, uint32_t data); void gfx_fifo0_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); void gfx_fifo1_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); @@ -769,9 +769,9 @@ public: void gfx_unk1_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); uint64_t gfx_fifo_r(offs_t offset, uint64_t mem_mask = ~0); void gfx_buf_w(uint64_t data); - DECLARE_WRITE32_MEMBER(gfx_cpu_dc_store); + void gfx_cpu_dc_store(offs_t offset, uint32_t data); - DECLARE_WRITE8_MEMBER(sub_jvs_w); + void sub_jvs_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(ide_interrupt); @@ -1678,7 +1678,7 @@ void cobra_state::main_comram_w(offs_t offset, uint64_t data, uint64_t mem_mask) m_comram[page][(offset << 1) + 1] = (w2 & ~m2) | (d2 & m2); } -WRITE32_MEMBER(cobra_state::main_cpu_dc_store) +void cobra_state::main_cpu_dc_store(offs_t offset, uint32_t data) { if ((offset & 0xf0000000) == 0xc0000000) { @@ -1966,7 +1966,7 @@ void cobra_state::sub_psac2_w(uint32_t data) { } -WRITE32_MEMBER(cobra_state::sub_sound_dma_w) +void cobra_state::sub_sound_dma_w(offs_t offset, uint32_t data) { //printf("DMA write to unknown: size %d, data %08X\n", address, data); @@ -1997,7 +1997,7 @@ WRITE32_MEMBER(cobra_state::sub_sound_dma_w) } } -WRITE8_MEMBER(cobra_state::sub_jvs_w) +void cobra_state::sub_jvs_w(uint8_t data) { #if LOG_JVS printf("sub_jvs_w: %02X\n", data); @@ -3074,7 +3074,7 @@ void cobra_state::gfx_buf_w(uint64_t data) } } -WRITE32_MEMBER(cobra_state::gfx_cpu_dc_store) +void cobra_state::gfx_cpu_dc_store(offs_t offset, uint32_t data) { uint32_t addr = offset >> 24; if (addr == 0x10 || addr == 0x18 || addr == 0x1e) @@ -3364,12 +3364,12 @@ void cobra_state::init_cobra() cobra_fifo::event_delegate(&cobra_state::s2mfifo_event_callback, this)) ); - m_maincpu->ppc_set_dcstore_callback(write32_delegate(*this, FUNC(cobra_state::main_cpu_dc_store))); + m_maincpu->ppc_set_dcstore_callback(write32sm_delegate(*this, FUNC(cobra_state::main_cpu_dc_store))); - m_gfxcpu->ppc_set_dcstore_callback(write32_delegate(*this, FUNC(cobra_state::gfx_cpu_dc_store))); + m_gfxcpu->ppc_set_dcstore_callback(write32sm_delegate(*this, FUNC(cobra_state::gfx_cpu_dc_store))); - m_subcpu->ppc4xx_set_dma_write_handler(0, write32_delegate(*this, FUNC(cobra_state::sub_sound_dma_w)), 44100); - m_subcpu->ppc4xx_spu_set_tx_handler(write8_delegate(*this, FUNC(cobra_state::sub_jvs_w))); + m_subcpu->ppc4xx_set_dma_write_handler(0, write32sm_delegate(*this, FUNC(cobra_state::sub_sound_dma_w)), 44100); + m_subcpu->ppc4xx_spu_set_tx_handler(write8smo_delegate(*this, FUNC(cobra_state::sub_jvs_w))); m_comram[0] = std::make_unique<uint32_t[]>(0x40000/4); diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index d9c89e8ea23..49301e2df9c 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -261,7 +261,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(spu_timer_callback); void set_ibutton(uint8_t *data); int ibutton_w(uint8_t data); - DECLARE_WRITE8_MEMBER(security_w); + void security_w(uint8_t data); void init_lights(write32s_delegate out1, write32s_delegate out2, write32s_delegate out3); void init_firebeat(); void init_keyboard(); @@ -1363,7 +1363,7 @@ int firebeat_state::ibutton_w(uint8_t data) return r; } -WRITE8_MEMBER(firebeat_state::security_w) +void firebeat_state::security_w(uint8_t data) { int r = ibutton_w(data); if (r >= 0) @@ -1395,7 +1395,7 @@ void firebeat_state::init_firebeat() m_cur_cab_data = cab_data; - m_maincpu->ppc4xx_spu_set_tx_handler(write8_delegate(*this, FUNC(firebeat_state::security_w))); + m_maincpu->ppc4xx_spu_set_tx_handler(write8smo_delegate(*this, FUNC(firebeat_state::security_w))); set_ibutton(rom); diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index ef8b97282a5..ad12ded3aa4 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -470,7 +470,7 @@ private: void soundtimer_en_w(uint16_t data); void soundtimer_count_w(uint16_t data); double adc12138_input_callback(uint8_t input); - DECLARE_WRITE8_MEMBER(jamma_jvs_w); + void jamma_jvs_w(uint8_t data); uint8_t comm_eeprom_r(); void comm_eeprom_w(uint8_t data); @@ -1282,7 +1282,7 @@ void hornet_state::sscope2(machine_config &config) /*****************************************************************************/ -WRITE8_MEMBER(hornet_state::jamma_jvs_w) +void hornet_state::jamma_jvs_w(uint8_t data) { if (m_jvs_sdata_ptr == 0 && data != 0xe0) return; @@ -1425,7 +1425,7 @@ void hornet_state::init_hornet() m_konppc->set_cgboard_texture_bank(0, "bank5", memregion("user5")->base()); m_led_reg0 = m_led_reg1 = 0x7f; - m_maincpu->ppc4xx_spu_set_tx_handler(write8_delegate(*this, FUNC(hornet_state::jamma_jvs_w))); + m_maincpu->ppc4xx_spu_set_tx_handler(write8smo_delegate(*this, FUNC(hornet_state::jamma_jvs_w))); } void hornet_state::init_gradius4() @@ -1452,7 +1452,7 @@ void hornet_state::init_sscope() m_konppc->set_cgboard_texture_bank(1, "bank6", memregion("user5")->base()); m_led_reg0 = m_led_reg1 = 0x7f; - m_maincpu->ppc4xx_spu_set_tx_handler(write8_delegate(*this, FUNC(hornet_state::jamma_jvs_w))); + m_maincpu->ppc4xx_spu_set_tx_handler(write8smo_delegate(*this, FUNC(hornet_state::jamma_jvs_w))); } void hornet_state::init_sscope2() //fixme: eventually set sscope2 to load gfx roms from the comm board @@ -1461,7 +1461,7 @@ void hornet_state::init_sscope2() //fixme: eventually set sscope2 to load gfx ro m_konppc->set_cgboard_texture_bank(1, "bank6", memregion("user5")->base()); m_led_reg0 = m_led_reg1 = 0x7f; - m_maincpu->ppc4xx_spu_set_tx_handler(write8_delegate(*this, FUNC(hornet_state::jamma_jvs_w))); + m_maincpu->ppc4xx_spu_set_tx_handler(write8smo_delegate(*this, FUNC(hornet_state::jamma_jvs_w))); } /*****************************************************************************/ diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp index 1bd115ffa9f..4cf61ca3e01 100644 --- a/src/mame/drivers/leapster.cpp +++ b/src/mame/drivers/leapster.cpp @@ -239,7 +239,7 @@ private: return machine().rand() | (machine().rand()<<16); // there is a loop checking that this is above a certain value } - DECLARE_WRITE32_MEMBER(leapster_aux004b_w) + void leapster_aux004b_w(uint32_t data) { printf("leapster_aux004b_w %04x\n", data); } diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index 258dd8c8fd4..f50350bf31f 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -587,7 +587,7 @@ protected: virtual void output_strobe(uint8_t bits, uint8_t data) { } virtual void set_outputs() { } - virtual DECLARE_WRITE8_MEMBER(io_control_w) override; + virtual void io_control_w(offs_t offset, uint8_t data) override; private: uint8_t m_output_data; @@ -922,7 +922,7 @@ CUSTOM_INPUT_MEMBER(ngarcade_base_state::startsel_edge_joy_r) return ret; } -WRITE8_MEMBER(neogeo_base_state::io_control_w) +void neogeo_base_state::io_control_w(offs_t offset, uint8_t data) { if ((offset & 0x38) == 0x00) // TODO: the mask is supposedly less restrictive on AES? { @@ -936,12 +936,12 @@ WRITE8_MEMBER(neogeo_base_state::io_control_w) } } -WRITE8_MEMBER(ngarcade_base_state::io_control_w) +void ngarcade_base_state::io_control_w(offs_t offset, uint8_t data) { switch (offset & 0x78) { case 0x00: - neogeo_base_state::io_control_w(space, offset, data, mem_mask); + neogeo_base_state::io_control_w(offset, data); break; case 0x28: @@ -963,7 +963,7 @@ WRITE8_MEMBER(ngarcade_base_state::io_control_w) } } -WRITE8_MEMBER(mvs_state::io_control_w) +void mvs_state::io_control_w(offs_t offset, uint8_t data) { switch (offset & 0x78) { @@ -984,7 +984,7 @@ WRITE8_MEMBER(mvs_state::io_control_w) break; default: - ngarcade_base_state::io_control_w(space, offset, data, mem_mask); + ngarcade_base_state::io_control_w(offset, data); } } diff --git a/src/mame/drivers/nes_clone.cpp b/src/mame/drivers/nes_clone.cpp index d13a9463a8e..555b5456ba1 100644 --- a/src/mame/drivers/nes_clone.cpp +++ b/src/mame/drivers/nes_clone.cpp @@ -34,11 +34,11 @@ protected: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_WRITE8_MEMBER(sprite_dma_w); + void sprite_dma_w(address_space &space, uint8_t data); - virtual DECLARE_READ8_MEMBER(in0_r); - virtual DECLARE_READ8_MEMBER(in1_r); - virtual DECLARE_WRITE8_MEMBER(in0_w); + virtual uint8_t in0_r(); + virtual uint8_t in1_r(); + virtual void in0_w(uint8_t data); void nes_clone_basemap(address_map &map); @@ -70,20 +70,20 @@ private: void nes_clone_dnce2000_map(address_map& map); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(rom_r); - DECLARE_WRITE8_MEMBER(bank_w); + uint8_t rom_r(offs_t offset); + void bank_w(uint8_t data); int m_rombase; }; -WRITE8_MEMBER(nes_clone_state::sprite_dma_w) +void nes_clone_state::sprite_dma_w(address_space &space, uint8_t data) { int source = (data & 7); m_ppu->spriteram_dma(space, source); } // Standard NES style inputs (not using bus device as there are no real NES controller ports etc. these are all-in-one units and can be custom -READ8_MEMBER(nes_clone_state::in0_r) +uint8_t nes_clone_state::in0_r() { //logerror("%s: in0_r\n", machine().describe_context()); uint8_t ret = 0x40; @@ -92,7 +92,7 @@ READ8_MEMBER(nes_clone_state::in0_r) return ret; } -READ8_MEMBER(nes_clone_state::in1_r) +uint8_t nes_clone_state::in1_r() { //logerror("%s: in1_r\n", machine().describe_context()); uint8_t ret = 0x40; @@ -101,7 +101,7 @@ READ8_MEMBER(nes_clone_state::in1_r) return ret; } -WRITE8_MEMBER(nes_clone_state::in0_w) +void nes_clone_state::in0_w(uint8_t data) { //logerror("%s: in0_w %02x\n", machine().describe_context(), data); if (data & 0x01) @@ -270,12 +270,12 @@ void nes_clone_dnce2000_state::machine_start() save_item(NAME(m_rombase)); } -READ8_MEMBER(nes_clone_dnce2000_state::rom_r) +uint8_t nes_clone_dnce2000_state::rom_r(offs_t offset) { return m_mainrom[(offset + (m_rombase * 0x8000)) & (m_mainromsize - 1)]; } -WRITE8_MEMBER(nes_clone_dnce2000_state::bank_w) +void nes_clone_dnce2000_state::bank_w(uint8_t data) { m_rombase = data; } diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp index e8fa4fdf646..2c9ffdda35d 100644 --- a/src/mame/drivers/nes_sh6578.cpp +++ b/src/mame/drivers/nes_sh6578.cpp @@ -53,7 +53,7 @@ protected: virtual void machine_reset() override; virtual void video_start() override; - WRITE8_MEMBER(sprite_dma_w); + void sprite_dma_w(address_space &space, uint8_t data); private: required_device<cpu_device> m_maincpu; @@ -64,52 +64,52 @@ private: required_device<nesapu_device> m_apu; required_device<timer_device> m_timer; - DECLARE_READ8_MEMBER(bankswitch_r); - DECLARE_WRITE8_MEMBER(bankswitch_w); + uint8_t bankswitch_r(offs_t offset); + void bankswitch_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(dma_r); - DECLARE_WRITE8_MEMBER(dma_w); + uint8_t dma_r(offs_t offset); + void dma_w(offs_t offset, uint8_t data); uint8_t bank_r(int bank, uint16_t offset); void bank_w(int bank, uint16_t offset, uint8_t data); - DECLARE_READ8_MEMBER(bank0_r) { return bank_r(0, offset); } - DECLARE_WRITE8_MEMBER(bank0_w) { bank_w(0, offset, data); } - DECLARE_READ8_MEMBER(bank1_r) { return bank_r(1, offset); } - DECLARE_WRITE8_MEMBER(bank1_w) { bank_w(1, offset, data); } - DECLARE_READ8_MEMBER(bank2_r) { return bank_r(2, offset); } - DECLARE_WRITE8_MEMBER(bank2_w) { bank_w(2, offset, data); } - DECLARE_READ8_MEMBER(bank3_r) { return bank_r(3, offset); } - DECLARE_WRITE8_MEMBER(bank3_w) { bank_w(3, offset, data); } - DECLARE_READ8_MEMBER(bank4_r) { return bank_r(4, offset); } - DECLARE_WRITE8_MEMBER(bank4_w) { bank_w(4, offset, data); } - DECLARE_READ8_MEMBER(bank5_r) { return bank_r(5, offset); } - DECLARE_WRITE8_MEMBER(bank5_w) { bank_w(5, offset, data); } - DECLARE_READ8_MEMBER(bank6_r) { return bank_r(6, offset); } - DECLARE_WRITE8_MEMBER(bank6_w) { bank_w(6, offset, data); } - DECLARE_READ8_MEMBER(bank7_r) { return bank_r(7, offset); } - DECLARE_WRITE8_MEMBER(bank7_w) { bank_w(7, offset, data); } - - DECLARE_WRITE8_MEMBER(timing_setting_control_w); - DECLARE_WRITE8_MEMBER(initial_startup_w); - DECLARE_READ8_MEMBER(irq_status_r); - DECLARE_WRITE8_MEMBER(irq_mask_w); - DECLARE_WRITE8_MEMBER(timer_config_w); - DECLARE_WRITE8_MEMBER(timer_value_w); - - DECLARE_READ8_MEMBER(io0_r); - DECLARE_READ8_MEMBER(io1_r); - DECLARE_WRITE8_MEMBER(io_w); - - DECLARE_READ8_MEMBER(psg1_4014_r); - DECLARE_READ8_MEMBER(psg1_4015_r); - DECLARE_WRITE8_MEMBER(psg1_4015_w); - DECLARE_WRITE8_MEMBER(psg1_4017_w); + uint8_t bank0_r(offs_t offset) { return bank_r(0, offset); } + void bank0_w(offs_t offset, uint8_t data) { bank_w(0, offset, data); } + uint8_t bank1_r(offs_t offset) { return bank_r(1, offset); } + void bank1_w(offs_t offset, uint8_t data) { bank_w(1, offset, data); } + uint8_t bank2_r(offs_t offset) { return bank_r(2, offset); } + void bank2_w(offs_t offset, uint8_t data) { bank_w(2, offset, data); } + uint8_t bank3_r(offs_t offset) { return bank_r(3, offset); } + void bank3_w(offs_t offset, uint8_t data) { bank_w(3, offset, data); } + uint8_t bank4_r(offs_t offset) { return bank_r(4, offset); } + void bank4_w(offs_t offset, uint8_t data) { bank_w(4, offset, data); } + uint8_t bank5_r(offs_t offset) { return bank_r(5, offset); } + void bank5_w(offs_t offset, uint8_t data) { bank_w(5, offset, data); } + uint8_t bank6_r(offs_t offset) { return bank_r(6, offset); } + void bank6_w(offs_t offset, uint8_t data) { bank_w(6, offset, data); } + uint8_t bank7_r(offs_t offset) { return bank_r(7, offset); } + void bank7_w(offs_t offset, uint8_t data) { bank_w(7, offset, data); } + + void timing_setting_control_w(uint8_t data); + void initial_startup_w(uint8_t data); + uint8_t irq_status_r(); + void irq_mask_w(uint8_t data); + void timer_config_w(uint8_t data); + void timer_value_w(uint8_t data); + + uint8_t io0_r(); + uint8_t io1_r(); + void io_w(uint8_t data); + + uint8_t psg1_4014_r(); + uint8_t psg1_4015_r(); + void psg1_4015_w(uint8_t data); + void psg1_4017_w(uint8_t data); uint8_t apu_read_mem(offs_t offset); DECLARE_WRITE_LINE_MEMBER(apu_irq); - int m_iniital_startup_state; + int m_initial_startup_state; uint8_t m_bankswitch[8]; @@ -158,22 +158,22 @@ void nes_sh6578_state::bank_w(int bank, uint16_t offset, uint8_t data) m_fullrom->write8(address, data); } -WRITE8_MEMBER(nes_sh6578_state::sprite_dma_w) +void nes_sh6578_state::sprite_dma_w(address_space &space, uint8_t data) { m_ppu->spriteram_dma(space, data); } -READ8_MEMBER(nes_sh6578_state::bankswitch_r) +uint8_t nes_sh6578_state::bankswitch_r(offs_t offset) { return m_bankswitch[offset]; } -WRITE8_MEMBER(nes_sh6578_state::bankswitch_w) +void nes_sh6578_state::bankswitch_w(offs_t offset, uint8_t data) { m_bankswitch[offset] = data; } -READ8_MEMBER(nes_sh6578_state::dma_r) +uint8_t nes_sh6578_state::dma_r(offs_t offset) { switch (offset) { @@ -240,7 +240,7 @@ void nes_sh6578_state::do_dma() //m_dma_length[1] = 0; } -WRITE8_MEMBER(nes_sh6578_state::dma_w) +void nes_sh6578_state::dma_w(offs_t offset, uint8_t data) { switch (offset) { @@ -288,53 +288,53 @@ WRITE8_MEMBER(nes_sh6578_state::dma_w) } -WRITE8_MEMBER(nes_sh6578_state::initial_startup_w) +void nes_sh6578_state::initial_startup_w(uint8_t data) { // there is also a timeframe in which this must happen // if the writes are not correct the system does not operate - if (m_iniital_startup_state == 0) + if (m_initial_startup_state == 0) { if (data == 0x65) { logerror("initial_startup_w VALID first write (0x65)\n"); - m_iniital_startup_state = 1; + m_initial_startup_state = 1; } else { logerror("initial_startup_w invalid first write (not 0x65)\n"); - m_iniital_startup_state = -1; + m_initial_startup_state = -1; } } - else if (m_iniital_startup_state == 1) + else if (m_initial_startup_state == 1) { if (data == 0x76) { logerror("initial_startup_w VALID second write (0x76)\n"); - m_iniital_startup_state = 2; + m_initial_startup_state = 2; } else { logerror("initial_startup_w invalid second write (not 0x76)\n"); - m_iniital_startup_state = -1; + m_initial_startup_state = -1; } } - else if (m_iniital_startup_state == 2) + else if (m_initial_startup_state == 2) { logerror("initial_startup_w invalid write (already passed) (%02x)\n", data); } - else if (m_iniital_startup_state == -1) + else if (m_initial_startup_state == -1) { logerror("initial_startup_w invalid write (already failed) (%02x)\n", data); } } -READ8_MEMBER(nes_sh6578_state::irq_status_r) +uint8_t nes_sh6578_state::irq_status_r() { logerror("%s: nes_sh6578_state::irq_status_r\n", machine().describe_context()); return machine().rand(); } -WRITE8_MEMBER(nes_sh6578_state::irq_mask_w) +void nes_sh6578_state::irq_mask_w(uint8_t data) { m_irqmask = data; @@ -342,7 +342,7 @@ WRITE8_MEMBER(nes_sh6578_state::irq_mask_w) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE8_MEMBER(nes_sh6578_state::timer_config_w) +void nes_sh6578_state::timer_config_w(uint8_t data) { logerror("%s: nes_sh6578_state::timer_config_w : %02x (at pos y: %d x: %d )\n", machine().describe_context(), data, m_screen->vpos(), m_screen->hpos() ); @@ -356,34 +356,34 @@ WRITE8_MEMBER(nes_sh6578_state::timer_config_w) } } -WRITE8_MEMBER(nes_sh6578_state::timer_value_w) +void nes_sh6578_state::timer_value_w(uint8_t data) { logerror("%s: nes_sh6578_state::timer_value_w : %02x\n", machine().describe_context(), data); m_timerval = data; } -WRITE8_MEMBER(nes_sh6578_state::timing_setting_control_w) +void nes_sh6578_state::timing_setting_control_w(uint8_t data) { logerror("%s: nes_sh6578_state::timing_setting_control_w : %02x\n", machine().describe_context(), data); } -READ8_MEMBER(nes_sh6578_state::io0_r) +uint8_t nes_sh6578_state::io0_r() { uint8_t ret = m_iolatch[0] & 0x01; m_iolatch[0] >>= 1; return ret; } -READ8_MEMBER(nes_sh6578_state::io1_r) +uint8_t nes_sh6578_state::io1_r() { uint8_t ret = m_iolatch[1] & 0x01; m_iolatch[1] >>= 1; return ret; } -WRITE8_MEMBER(nes_sh6578_state::io_w) +void nes_sh6578_state::io_w(uint8_t data) { if ((data != 0x00) && (data != 0x01) && (data != 0x02) && (data != 0x03)) logerror("%s: io_w : unexpected value : %02x\n", machine().describe_context(), data); @@ -407,22 +407,22 @@ WRITE8_MEMBER(nes_sh6578_state::io_w) } -READ8_MEMBER(nes_sh6578_state::psg1_4014_r) +uint8_t nes_sh6578_state::psg1_4014_r() { return m_apu->read(0x14); } -READ8_MEMBER(nes_sh6578_state::psg1_4015_r) +uint8_t nes_sh6578_state::psg1_4015_r() { return m_apu->read(0x15); } -WRITE8_MEMBER(nes_sh6578_state::psg1_4015_w) +void nes_sh6578_state::psg1_4015_w(uint8_t data) { m_apu->write(0x15, data); } -WRITE8_MEMBER(nes_sh6578_state::psg1_4017_w) +void nes_sh6578_state::psg1_4017_w(uint8_t data) { m_apu->write(0x17, data); } @@ -503,7 +503,7 @@ void nes_sh6578_state::machine_reset() for (int i = 0; i < 8; i++) m_bankswitch[i] = i; - m_iniital_startup_state = 0; + m_initial_startup_state = 0; m_bank->set_entry(0); m_irqmask = 0xff; diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index ea7ac7398c6..82502629b32 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -67,8 +67,8 @@ protected: required_region_ptr<uint8_t> m_prgrom; - DECLARE_READ8_MEMBER(vt_rom_r); - DECLARE_WRITE8_MEMBER(vtspace_w); + uint8_t vt_rom_r(offs_t offset); + void vtspace_w(offs_t offset, uint8_t data); void configure_soc(nes_vt_soc_device* soc); @@ -123,7 +123,7 @@ public: protected: required_device<nes_vt_soc_device> m_soc; - DECLARE_WRITE8_MEMBER(vt03_8000_mapper_w) { m_soc->vt03_8000_mapper_w(space, offset, data); } + void vt03_8000_mapper_w(offs_t offset, uint8_t data) { m_soc->vt03_8000_mapper_w(offset, data); } }; @@ -242,7 +242,7 @@ private: void bittboy_412c_w(uint8_t data); - DECLARE_READ8_MEMBER(vt_rom_banked_r); + uint8_t vt_rom_banked_r(offs_t offset); }; class nes_vt_cy_lexibook_state : public nes_vt_cy_state @@ -284,7 +284,7 @@ public: protected: private: - READ8_MEMBER(vt_rom_banked_r); + uint8_t vt_rom_banked_r(offs_t offset); void vt_external_space_map_fapocket_4x16mbyte(address_map& map); void nes_vt_dg_map(address_map& map); @@ -338,7 +338,7 @@ public: void nes_vt_fp_pal_32mb(machine_config& config); private: - DECLARE_READ8_MEMBER(vt_rom_banked_r); + uint8_t vt_rom_banked_r(offs_t offset); void vt_external_space_map_fp_2x32mbyte(address_map& map); void nes_vt_fp_map(address_map& map); @@ -400,12 +400,12 @@ public: void nes_vt_vg_1mb_majgnc(machine_config& config); }; -READ8_MEMBER(nes_vt_base_state::vt_rom_r) +uint8_t nes_vt_base_state::vt_rom_r(offs_t offset) { return m_prgrom[offset]; } -WRITE8_MEMBER(nes_vt_base_state::vtspace_w) +void nes_vt_base_state::vtspace_w(offs_t offset, uint8_t data) { logerror("%s: vtspace_w %08x : %02x", machine().describe_context(), offset, data); } @@ -455,7 +455,7 @@ void nes_vt_swap_op_d5_d6_state::vt_external_space_map_senwld_512kbyte(address_m } // bitboy is 2 16Mbyte banks -READ8_MEMBER(nes_vt_cy_state::vt_rom_banked_r) +uint8_t nes_vt_cy_state::vt_rom_banked_r(offs_t offset) { return m_prgrom[m_ahigh | offset]; } @@ -466,7 +466,7 @@ void nes_vt_cy_state::vt_external_space_map_bitboy_2x16mbyte(address_map &map) } // fapocket is 4 16Mbyte banks -READ8_MEMBER(nes_vt_dg_state::vt_rom_banked_r) +uint8_t nes_vt_dg_state::vt_rom_banked_r(offs_t offset) { return m_prgrom[m_ahigh | offset]; } @@ -476,7 +476,7 @@ void nes_vt_dg_state::vt_external_space_map_fapocket_4x16mbyte(address_map &map) map(0x0000000, 0x0ffffff).mirror(0x1000000).rw(FUNC(nes_vt_dg_state::vt_rom_banked_r), FUNC(nes_vt_dg_state::vt03_8000_mapper_w)); } -READ8_MEMBER(nes_vt_hh_state::vt_rom_banked_r) +uint8_t nes_vt_hh_state::vt_rom_banked_r(offs_t offset) { return m_prgrom[m_ahigh | offset]; } diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index a390aa4999b..a0c7f3e1359 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -589,8 +589,8 @@ protected: DECLARE_FLOPPY_FORMATS(floppy_formats); UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); - DECLARE_READ16_MEMBER(vram_r); - DECLARE_WRITE16_MEMBER(vram_w); + uint16_t vram_r(offs_t offset); + void vram_w(offs_t offset, uint16_t data); DECLARE_WRITE_LINE_MEMBER(GDC_vblank_irq); void rainbowz80_io(address_map &map); @@ -2839,7 +2839,7 @@ WRITE_LINE_MEMBER(rainbow_modelb_state::irq_hi_w) // NOTE: "More than one plane at a time can be enabled for a write operation; however, // only one plane can be enabled for a read operation at anyone time." -READ16_MEMBER(rainbow_base_state::vram_r) +uint16_t rainbow_base_state::vram_r(offs_t offset) { if ((!(m_gdc_mode_register & GDC_MODE_VECTOR)) || machine().side_effects_disabled()) // (NOT VECTOR MODE) { @@ -2860,7 +2860,7 @@ READ16_MEMBER(rainbow_base_state::vram_r) } // NOTE: Rainbow has separate registers for fore and background. -WRITE16_MEMBER(rainbow_base_state::vram_w) +void rainbow_base_state::vram_w(offs_t offset, uint16_t data) { if (m_gdc_mode_register & GDC_MODE_HIGHRES) offset = (m_gdc_scroll_buffer[(offset & 0x3FC0) >> 6] << 6) | (offset & 0x3F); diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp index 851a73bc3e4..c079dcfbb61 100644 --- a/src/mame/drivers/snes.cpp +++ b/src/mame/drivers/snes.cpp @@ -53,42 +53,42 @@ public: void snes(machine_config &config); private: - DECLARE_READ8_MEMBER( snes20_hi_r ); - DECLARE_WRITE8_MEMBER( snes20_hi_w ); - DECLARE_READ8_MEMBER( snes20_lo_r ); - DECLARE_WRITE8_MEMBER( snes20_lo_w ); - DECLARE_READ8_MEMBER( snes21_lo_r ); - DECLARE_WRITE8_MEMBER( snes21_lo_w ); - DECLARE_READ8_MEMBER( snes21_hi_r ); - DECLARE_WRITE8_MEMBER( snes21_hi_w ); - DECLARE_READ8_MEMBER( snessfx_hi_r ); - DECLARE_READ8_MEMBER( snessfx_lo_r ); - DECLARE_WRITE8_MEMBER( snessfx_hi_w ); - DECLARE_WRITE8_MEMBER( snessfx_lo_w ); - DECLARE_READ8_MEMBER( snessa1_hi_r ); - DECLARE_READ8_MEMBER( snessa1_lo_r ); - DECLARE_WRITE8_MEMBER( snessa1_hi_w ); - DECLARE_WRITE8_MEMBER( snessa1_lo_w ); - DECLARE_READ8_MEMBER( snes7110_hi_r ); - DECLARE_READ8_MEMBER( snes7110_lo_r ); - DECLARE_WRITE8_MEMBER( snes7110_hi_w ); - DECLARE_WRITE8_MEMBER( snes7110_lo_w ); - DECLARE_READ8_MEMBER( snessdd1_lo_r ); - DECLARE_WRITE8_MEMBER( snessdd1_lo_w ); - DECLARE_READ8_MEMBER( snessdd1_hi_r ); - DECLARE_WRITE8_MEMBER( snessdd1_hi_w ); - DECLARE_READ8_MEMBER( snesbsx_hi_r ); - DECLARE_WRITE8_MEMBER( snesbsx_hi_w ); - DECLARE_READ8_MEMBER( snesbsx_lo_r ); - DECLARE_WRITE8_MEMBER( snesbsx_lo_w ); - DECLARE_READ8_MEMBER( snessgb_hi_r ); - DECLARE_READ8_MEMBER( snessgb_lo_r ); - DECLARE_WRITE8_MEMBER( snessgb_hi_w ); - DECLARE_WRITE8_MEMBER( snessgb_lo_w ); - DECLARE_READ8_MEMBER( pfest94_hi_r ); - DECLARE_WRITE8_MEMBER( pfest94_hi_w ); - DECLARE_READ8_MEMBER( pfest94_lo_r ); - DECLARE_WRITE8_MEMBER( pfest94_lo_w ); + uint8_t snes20_hi_r(address_space &space, offs_t offset); + void snes20_hi_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snes20_lo_r(address_space &space, offs_t offset); + void snes20_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snes21_lo_r(address_space &space, offs_t offset); + void snes21_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snes21_hi_r(address_space &space, offs_t offset); + void snes21_hi_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snessfx_hi_r(address_space &space, offs_t offset); + uint8_t snessfx_lo_r(address_space &space, offs_t offset); + void snessfx_hi_w(address_space &space, offs_t offset, uint8_t data); + void snessfx_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snessa1_hi_r(address_space &space, offs_t offset); + uint8_t snessa1_lo_r(address_space &space, offs_t offset); + void snessa1_hi_w(address_space &space, offs_t offset, uint8_t data); + void snessa1_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snes7110_hi_r(address_space &space, offs_t offset); + uint8_t snes7110_lo_r(address_space &space, offs_t offset); + void snes7110_hi_w(address_space &space, offs_t offset, uint8_t data); + void snes7110_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snessdd1_lo_r(address_space &space, offs_t offset); + void snessdd1_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snessdd1_hi_r(address_space &space, offs_t offset); + void snessdd1_hi_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snesbsx_hi_r(address_space &space, offs_t offset); + void snesbsx_hi_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snesbsx_lo_r(address_space &space, offs_t offset); + void snesbsx_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t snessgb_hi_r(address_space &space, offs_t offset); + uint8_t snessgb_lo_r(address_space &space, offs_t offset); + void snessgb_hi_w(address_space &space, offs_t offset, uint8_t data); + void snessgb_lo_w(address_space &space, offs_t offset, uint8_t data); + uint8_t pfest94_hi_r(address_space &space, offs_t offset); + void pfest94_hi_w(address_space &space, offs_t offset, uint8_t data); + uint8_t pfest94_lo_r(address_space &space, offs_t offset); + void pfest94_lo_w(address_space &space, offs_t offset, uint8_t data); // input related SNESCTRL_ONSCREEN_CB(onscreen_cb); @@ -130,7 +130,7 @@ private: // Also we have here LoROM + CX4, until the Hitachi CPU is emulated, // and the LoROM + Seta DSP, because their chip_read/chip_write need global offset -READ8_MEMBER( snes_console_state::snes20_hi_r ) +uint8_t snes_console_state::snes20_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -150,7 +150,7 @@ READ8_MEMBER( snes_console_state::snes20_hi_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else if (address < 0x8000) return snes_open_bus_r(); else @@ -187,7 +187,7 @@ READ8_MEMBER( snes_console_state::snes20_hi_r ) } } -WRITE8_MEMBER( snes_console_state::snes20_hi_w ) +void snes_console_state::snes20_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; @@ -225,7 +225,7 @@ WRITE8_MEMBER( snes_console_state::snes20_hi_w ) } } -READ8_MEMBER( snes_console_state::snes20_lo_r ) +uint8_t snes_console_state::snes20_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -245,7 +245,7 @@ READ8_MEMBER( snes_console_state::snes20_lo_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else if (address < 0x8000) return snes_open_bus_r(); else @@ -282,14 +282,14 @@ READ8_MEMBER( snes_console_state::snes20_lo_r ) } } -WRITE8_MEMBER( snes_console_state::snes20_lo_w ) +void snes_console_state::snes20_lo_w(address_space &space, offs_t offset, uint8_t data) { if (m_type == SNES_SUFAMITURBO && (offset & 0xffff) >= 0x8000 && ((offset >= 0x600000 && offset < 0x640000) || (offset >= 0x700000 && offset < 0x740000))) { m_cartslot->write_l(offset, data); return; } // other add-on writes matches the hi handler - snes20_hi_w(space, offset, data, 0xff); + snes20_hi_w(space, offset, data); } @@ -297,7 +297,7 @@ WRITE8_MEMBER( snes_console_state::snes20_lo_w ) // HiROM & HiROM + BSX slot //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snes21_lo_r ) +uint8_t snes_console_state::snes21_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -306,7 +306,7 @@ READ8_MEMBER( snes_console_state::snes21_lo_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else { if (m_type == SNES_BSXHI && m_cartslot->m_cart->get_nvram_size() && offset >= 0x200000) @@ -331,7 +331,7 @@ READ8_MEMBER( snes_console_state::snes21_lo_r ) return m_cartslot->read_l(offset); } -WRITE8_MEMBER( snes_console_state::snes21_lo_w ) +void snes_console_state::snes21_lo_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000 && address < 0x8000) @@ -359,7 +359,7 @@ WRITE8_MEMBER( snes_console_state::snes21_lo_w ) } } -READ8_MEMBER( snes_console_state::snes21_hi_r ) +uint8_t snes_console_state::snes21_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -368,7 +368,7 @@ READ8_MEMBER( snes_console_state::snes21_hi_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else { if (m_type == SNES_BSXHI && m_cartslot->m_cart->get_nvram_size() && offset >= 0x200000) @@ -393,7 +393,7 @@ READ8_MEMBER( snes_console_state::snes21_hi_r ) return m_cartslot->read_h(offset); } -WRITE8_MEMBER( snes_console_state::snes21_hi_w ) +void snes_console_state::snes21_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000 && address < 0x8000) @@ -425,7 +425,7 @@ WRITE8_MEMBER( snes_console_state::snes21_hi_w ) // LoROM + SuperFX / GSU //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snessfx_hi_r ) +uint8_t snes_console_state::snessfx_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -438,7 +438,7 @@ READ8_MEMBER( snes_console_state::snessfx_hi_r ) if (address >= 0x3000 && address < 0x3300) return m_cartslot->chip_read(offset); else - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) return m_cartslot->read_ram(offset & 0x1fff); @@ -451,7 +451,7 @@ READ8_MEMBER( snes_console_state::snessfx_hi_r ) return m_cartslot->read_ram(offset); } -READ8_MEMBER( snes_console_state::snessfx_lo_r ) +uint8_t snes_console_state::snessfx_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -464,7 +464,7 @@ READ8_MEMBER( snes_console_state::snessfx_lo_r ) if (address >= 0x3000 && address < 0x3300) return m_cartslot->chip_read(offset); else - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) return m_cartslot->read_ram(offset & 0x1fff); @@ -477,7 +477,7 @@ READ8_MEMBER( snes_console_state::snessfx_lo_r ) return m_cartslot->read_ram(offset); } -WRITE8_MEMBER( snes_console_state::snessfx_hi_w ) +void snes_console_state::snessfx_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -498,16 +498,16 @@ WRITE8_MEMBER( snes_console_state::snessfx_hi_w ) m_cartslot->write_ram(offset, data); } -WRITE8_MEMBER( snes_console_state::snessfx_lo_w ) +void snes_console_state::snessfx_lo_w(address_space &space, offs_t offset, uint8_t data) { - snessfx_hi_w(space, offset, data, 0xff); + snessfx_hi_w(space, offset, data); } //--------------------------------------------------------------------------------- // LoROM + SA-1 //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snessa1_hi_r ) +uint8_t snes_console_state::snessa1_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -522,7 +522,7 @@ READ8_MEMBER( snes_console_state::snessa1_hi_r ) else if (address >= 0x3000 && address < 0x3800) return m_cartslot->chip_read(offset); // Internal SA-1 RAM (2K) else - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) return m_cartslot->chip_read(offset); // SA-1 BWRAM @@ -533,7 +533,7 @@ READ8_MEMBER( snes_console_state::snessa1_hi_r ) return m_cartslot->read_h(offset); } -READ8_MEMBER( snes_console_state::snessa1_lo_r ) +uint8_t snes_console_state::snessa1_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -548,7 +548,7 @@ READ8_MEMBER( snes_console_state::snessa1_lo_r ) else if (address >= 0x3000 && address < 0x3800) return m_cartslot->chip_read(offset); // Internal SA-1 RAM (2K) else - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) return m_cartslot->chip_read(offset); // SA-1 BWRAM @@ -558,10 +558,10 @@ READ8_MEMBER( snes_console_state::snessa1_lo_r ) else if (offset < 0x500000) return m_cartslot->chip_read(offset); // SA-1 BWRAM (not mirrored above!) else - return snes_r_io(space, address); // nothing mapped here! + return snes_r_io(address); // nothing mapped here! } -WRITE8_MEMBER( snes_console_state::snessa1_hi_w ) +void snes_console_state::snessa1_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -582,19 +582,19 @@ WRITE8_MEMBER( snes_console_state::snessa1_hi_w ) } } -WRITE8_MEMBER( snes_console_state::snessa1_lo_w ) +void snes_console_state::snessa1_lo_w(address_space &space, offs_t offset, uint8_t data) { if (offset >= 0x400000 && offset < 0x500000) m_cartslot->chip_write(offset, data); // SA-1 BWRAM (not mirrored above!) else - snessa1_hi_w(space, offset, data, 0xff); + snessa1_hi_w(space, offset, data); } //--------------------------------------------------------------------------------- // HiROM + SPC-7110 //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snes7110_hi_r ) +uint8_t snes_console_state::snes7110_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -608,7 +608,7 @@ READ8_MEMBER( snes_console_state::snes7110_hi_r ) if (address >= 0x4800 && address < limit) return m_cartslot->chip_read(address); - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) { @@ -623,7 +623,7 @@ READ8_MEMBER( snes_console_state::snes7110_hi_r ) return m_cartslot->read_h(offset); } -READ8_MEMBER( snes_console_state::snes7110_lo_r ) +uint8_t snes_console_state::snes7110_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -637,7 +637,7 @@ READ8_MEMBER( snes_console_state::snes7110_lo_r ) if (address >= 0x4800 && address < limit) return m_cartslot->chip_read(address); - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) { @@ -655,12 +655,12 @@ READ8_MEMBER( snes_console_state::snes7110_lo_r ) return snes_open_bus_r(); } -WRITE8_MEMBER( snes_console_state::snes7110_hi_w ) +void snes_console_state::snes7110_hi_w(address_space &space, offs_t offset, uint8_t data) { - snes7110_lo_w(space, offset, data, 0xff); + snes7110_lo_w(space, offset, data); } -WRITE8_MEMBER( snes_console_state::snes7110_lo_w ) +void snes_console_state::snes7110_lo_w (address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -692,7 +692,7 @@ WRITE8_MEMBER( snes_console_state::snes7110_lo_w ) // LoROM + S-DD1 //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snessdd1_lo_r ) +uint8_t snes_console_state::snessdd1_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -705,7 +705,7 @@ READ8_MEMBER( snes_console_state::snessdd1_lo_r ) if (address >= 0x4800 && address < 0x4808) return m_cartslot->chip_read(address); - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) return snes_open_bus_r(); @@ -718,20 +718,20 @@ READ8_MEMBER( snes_console_state::snessdd1_lo_r ) return m_cartslot->read_l(offset); } -READ8_MEMBER( snes_console_state::snessdd1_hi_r ) +uint8_t snes_console_state::snessdd1_hi_r(address_space &space, offs_t offset) { if (offset >= 0x400000) return m_cartslot->read_h(offset); else - return snessdd1_lo_r(space, offset, 0xff); + return snessdd1_lo_r(space, offset); } -WRITE8_MEMBER( snes_console_state::snessdd1_lo_w ) +void snes_console_state::snessdd1_lo_w(address_space &space, offs_t offset, uint8_t data) { - snessdd1_hi_w(space, offset, data, 0xff); + snessdd1_hi_w(space, offset, data); } -WRITE8_MEMBER( snes_console_state::snessdd1_hi_w ) +void snes_console_state::snessdd1_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -762,7 +762,7 @@ WRITE8_MEMBER( snes_console_state::snessdd1_hi_w ) // LoROM + BS-X (Base unit) //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snesbsx_hi_r ) +uint8_t snes_console_state::snesbsx_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -776,7 +776,7 @@ READ8_MEMBER( snes_console_state::snesbsx_hi_r ) return m_cartslot->chip_read(offset); if (address >= 0x5000) return m_cartslot->chip_read(offset); - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) { @@ -791,7 +791,7 @@ READ8_MEMBER( snes_console_state::snesbsx_hi_r ) return m_cartslot->read_h(offset); } -WRITE8_MEMBER( snes_console_state::snesbsx_hi_w ) +void snes_console_state::snesbsx_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -823,7 +823,7 @@ WRITE8_MEMBER( snes_console_state::snesbsx_hi_w ) return m_cartslot->write_l(offset, data); } -READ8_MEMBER( snes_console_state::snesbsx_lo_r ) +uint8_t snes_console_state::snesbsx_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -837,7 +837,7 @@ READ8_MEMBER( snes_console_state::snesbsx_lo_r ) return m_cartslot->chip_read(offset); if (address >= 0x5000) return m_cartslot->chip_read(offset); - return snes_r_io(space, address); + return snes_r_io(address); } else if (address < 0x8000) { @@ -852,9 +852,9 @@ READ8_MEMBER( snes_console_state::snesbsx_lo_r ) return m_cartslot->read_l(offset); } -WRITE8_MEMBER( snes_console_state::snesbsx_lo_w ) +void snes_console_state::snesbsx_lo_w(address_space &space, offs_t offset, uint8_t data) { - snesbsx_hi_w(space, offset, data, 0xff); + snesbsx_hi_w(space, offset, data); } @@ -862,7 +862,7 @@ WRITE8_MEMBER( snes_console_state::snesbsx_lo_w ) // LoROM + SuperGB //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::snessgb_hi_r ) +uint8_t snes_console_state::snessgb_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -871,7 +871,7 @@ READ8_MEMBER( snes_console_state::snessgb_hi_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else if (address < 0x8000) return m_cartslot->chip_read(offset); else @@ -883,12 +883,12 @@ READ8_MEMBER( snes_console_state::snessgb_hi_r ) return snes_open_bus_r(); } -READ8_MEMBER( snes_console_state::snessgb_lo_r ) +uint8_t snes_console_state::snessgb_lo_r(address_space &space, offs_t offset) { - return snessgb_hi_r(space, offset, 0xff); + return snessgb_hi_r(space, offset); } -WRITE8_MEMBER( snes_console_state::snessgb_hi_w ) +void snes_console_state::snessgb_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -902,16 +902,16 @@ WRITE8_MEMBER( snes_console_state::snessgb_hi_w ) } } -WRITE8_MEMBER( snes_console_state::snessgb_lo_w ) +void snes_console_state::snessgb_lo_w(address_space &space, offs_t offset, uint8_t data) { - snessgb_hi_w(space, offset, data, 0xff); + snessgb_hi_w(space, offset, data); } //--------------------------------------------------------------------------------- // Powerfest '94 event cart //--------------------------------------------------------------------------------- -READ8_MEMBER( snes_console_state::pfest94_hi_r ) +uint8_t snes_console_state::pfest94_hi_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -920,7 +920,7 @@ READ8_MEMBER( snes_console_state::pfest94_hi_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else if (address < 0x8000) { if (offset < 0x100000) // DSP access @@ -938,7 +938,7 @@ READ8_MEMBER( snes_console_state::pfest94_hi_r ) return m_cartslot->read_h(offset); } -WRITE8_MEMBER( snes_console_state::pfest94_hi_w ) +void snes_console_state::pfest94_hi_w(address_space &space, offs_t offset, uint8_t data) { uint16_t address = offset & 0xffff; if (offset < 0x400000) @@ -959,7 +959,7 @@ WRITE8_MEMBER( snes_console_state::pfest94_hi_w ) } } -READ8_MEMBER( snes_console_state::pfest94_lo_r ) +uint8_t snes_console_state::pfest94_lo_r(address_space &space, offs_t offset) { uint16_t address = offset & 0xffff; @@ -968,7 +968,7 @@ READ8_MEMBER( snes_console_state::pfest94_lo_r ) if (address < 0x2000) return m_wram[address]; else if (address < 0x6000) - return snes_r_io(space, address); + return snes_r_io(address); else if (address < 0x8000) { if (offset < 0x100000) // DSP access @@ -986,9 +986,9 @@ READ8_MEMBER( snes_console_state::pfest94_lo_r ) return 0xff; // or open_bus? } -WRITE8_MEMBER( snes_console_state::pfest94_lo_w ) +void snes_console_state::pfest94_lo_w(address_space &space, offs_t offset, uint8_t data) { - pfest94_hi_w(space, offset, data, 0xff); + pfest94_hi_w(space, offset, data); } @@ -1185,8 +1185,8 @@ void snes_console_state::machine_start() if (m_cartslot && m_cartslot->exists()) { - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snes20_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snes20_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snes20_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snes20_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snes20_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snes20_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snes20_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snes20_hi_w))); m_maincpu->set_5a22_map(); m_type = m_cartslot->get_type(); @@ -1203,13 +1203,13 @@ void snes_console_state::machine_start() case SNES_ST018: // still unemulated break; case SNES_Z80GB: // skeleton support - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snessgb_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snessgb_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snessgb_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snessgb_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snessgb_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snessgb_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snessgb_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snessgb_hi_w))); m_maincpu->set_5a22_map(); break; case SNES_SA1: // skeleton support - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snessa1_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snessa1_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snessa1_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snessa1_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snessa1_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snessa1_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snessa1_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snessa1_hi_w))); m_maincpu->set_5a22_map(); break; case SNES_DSP: @@ -1230,50 +1230,50 @@ void snes_console_state::machine_start() break; case SNES_GSU1: case SNES_GSU2: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snessfx_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snessfx_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snessfx_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snessfx_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snessfx_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snessfx_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snessfx_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snessfx_hi_w))); m_maincpu->set_5a22_map(); break; case SNES_SDD1: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snessdd1_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snessdd1_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snessdd1_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snessdd1_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snessdd1_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snessdd1_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snessdd1_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snessdd1_hi_w))); m_maincpu->set_5a22_map(); break; case SNES_BSX: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snesbsx_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snesbsx_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snesbsx_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snesbsx_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snesbsx_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snesbsx_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snesbsx_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snesbsx_hi_w))); m_maincpu->set_5a22_map(); break; // HiROM & HiROM + addons case SNES_MODE21: case SNES_BSXHI: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snes21_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snes21_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snes21_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snes21_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snes21_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snes21_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snes21_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snes21_hi_w))); m_maincpu->set_5a22_map(); break; case SNES_DSP_MODE21: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snes21_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snes21_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snes21_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snes21_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snes21_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snes21_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snes21_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snes21_hi_w))); m_maincpu->space(AS_PROGRAM).install_read_handler(0x006000, 0x007fff, 0, 0x9f0000, 0, read8sm_delegate(*m_cartslot, FUNC(base_sns_cart_slot_device::chip_read))); m_maincpu->space(AS_PROGRAM).install_write_handler(0x006000, 0x007fff, 0, 0x9f0000, 0, write8sm_delegate(*m_cartslot, FUNC(base_sns_cart_slot_device::chip_write))); m_maincpu->set_5a22_map(); break; case SNES_SRTC: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snes21_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snes21_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snes21_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snes21_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snes21_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snes21_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snes21_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snes21_hi_w))); m_maincpu->space(AS_PROGRAM).install_read_handler(0x002800, 0x002800, 0, 0xbf0000, 0, read8sm_delegate(*m_cartslot, FUNC(base_sns_cart_slot_device::chip_read))); m_maincpu->space(AS_PROGRAM).install_write_handler(0x002801, 0x002801, 0, 0xbf0000, 0, write8sm_delegate(*m_cartslot, FUNC(base_sns_cart_slot_device::chip_write))); m_maincpu->set_5a22_map(); break; case SNES_SPC7110: case SNES_SPC7110_RTC: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::snes7110_lo_r)), write8_delegate(*this, FUNC(snes_console_state::snes7110_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::snes7110_hi_r)), write8_delegate(*this, FUNC(snes_console_state::snes7110_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::snes7110_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::snes7110_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::snes7110_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::snes7110_hi_w))); m_maincpu->set_5a22_map(); break; case SNES_PFEST94: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(*this, FUNC(snes_console_state::pfest94_lo_r)), write8_delegate(*this, FUNC(snes_console_state::pfest94_lo_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(*this, FUNC(snes_console_state::pfest94_hi_r)), write8_delegate(*this, FUNC(snes_console_state::pfest94_hi_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8m_delegate(*this, FUNC(snes_console_state::pfest94_lo_r)), write8m_delegate(*this, FUNC(snes_console_state::pfest94_lo_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8m_delegate(*this, FUNC(snes_console_state::pfest94_hi_r)), write8m_delegate(*this, FUNC(snes_console_state::pfest94_hi_w))); m_maincpu->set_5a22_map(); break; // pirate 'mappers' diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index 2a0f76ab20b..5b0d4264e84 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -80,8 +80,8 @@ public: void init_taito(); private: - DECLARE_READ8_MEMBER(io_r); - DECLARE_WRITE8_MEMBER(io_w); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); uint8_t pia_pb_r(); void pia_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); @@ -287,12 +287,12 @@ static INPUT_PORTS_START( taito ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) INPUT_PORTS_END -READ8_MEMBER( taito_state::io_r ) +uint8_t taito_state::io_r(offs_t offset) { return m_io[offset]; } -WRITE8_MEMBER( taito_state::io_w ) +void taito_state::io_w(offs_t offset, uint8_t data) { m_io[offset] = data; diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp index 99e14c48e4c..8f39e83094f 100644 --- a/src/mame/drivers/taitogn.cpp +++ b/src/mame/drivers/taitogn.cpp @@ -368,17 +368,17 @@ public: void coh3002t_t1(machine_config &config); private: - DECLARE_READ8_MEMBER(control_r); - DECLARE_WRITE8_MEMBER(control_w); - DECLARE_WRITE16_MEMBER(control2_w); - DECLARE_READ8_MEMBER(control3_r); - DECLARE_WRITE8_MEMBER(control3_w); - DECLARE_READ16_MEMBER(gn_1fb70000_r); - DECLARE_WRITE16_MEMBER(gn_1fb70000_w); - DECLARE_READ16_MEMBER(hack1_r); - DECLARE_WRITE8_MEMBER(coin_w); - DECLARE_READ8_MEMBER(coin_r); - DECLARE_READ8_MEMBER(gnet_mahjong_panel_r); + uint8_t control_r(); + void control_w(uint8_t data); + void control2_w(uint16_t data); + uint8_t control3_r(); + void control3_w(uint8_t data); + uint16_t gn_1fb70000_r(); + void gn_1fb70000_w(uint16_t data); + uint16_t hack1_r(offs_t offset); + void coin_w(uint8_t data); + uint8_t coin_r(); + uint8_t gnet_mahjong_panel_r(); uint32_t zsg2_ext_r(offs_t offset); void flashbank_map(address_map &map); @@ -408,12 +408,12 @@ private: // Misc. controls -READ8_MEMBER(taitogn_state::control_r) +uint8_t taitogn_state::control_r() { return m_control; } -WRITE8_MEMBER(taitogn_state::control_w) +void taitogn_state::control_w(uint8_t data) { // 20 = watchdog m_mb3773->write_line_ck((data & 0x20) >> 5); @@ -445,22 +445,22 @@ WRITE8_MEMBER(taitogn_state::control_w) m_control = data; } -WRITE16_MEMBER(taitogn_state::control2_w) +void taitogn_state::control2_w(uint16_t data) { m_control2 = data; } -READ8_MEMBER(taitogn_state::control3_r) +uint8_t taitogn_state::control3_r() { return m_control3; } -WRITE8_MEMBER(taitogn_state::control3_w) +void taitogn_state::control3_w(uint8_t data) { m_control3 = data; } -READ16_MEMBER(taitogn_state::gn_1fb70000_r) +uint16_t taitogn_state::gn_1fb70000_r() { // (1328) 1348 tests mask 0002, 8 times. // Called by 1434, exit at 143c @@ -472,13 +472,13 @@ READ16_MEMBER(taitogn_state::gn_1fb70000_r) return 2; } -WRITE16_MEMBER(taitogn_state::gn_1fb70000_w) +void taitogn_state::gn_1fb70000_w(uint16_t data) { - // Writes 0 or 1 all the time, it *may* have somthing to do with + // Writes 0 or 1 all the time, it *may* have something to do with // i/o port width, but then maybe not } -READ16_MEMBER(taitogn_state::hack1_r) +uint16_t taitogn_state::hack1_r(offs_t offset) { switch (offset) { @@ -497,7 +497,7 @@ READ16_MEMBER(taitogn_state::hack1_r) -WRITE8_MEMBER(taitogn_state::coin_w) +void taitogn_state::coin_w(uint8_t data) { /* 0x01=counter 0x02=coin lock 1 @@ -511,13 +511,13 @@ WRITE8_MEMBER(taitogn_state::coin_w) m_coin_info = data; } -READ8_MEMBER(taitogn_state::coin_r) +uint8_t taitogn_state::coin_r() { return m_coin_info; } /* mahjong panel handler (for Usagi & Mahjong Oh) */ -READ8_MEMBER(taitogn_state::gnet_mahjong_panel_r) +uint8_t taitogn_state::gnet_mahjong_panel_r() { switch (m_coin_info & 0xcc) { diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp index c1d5586d5b9..8044e565339 100644 --- a/src/mame/drivers/taitopjc.cpp +++ b/src/mame/drivers/taitopjc.cpp @@ -126,22 +126,22 @@ private: required_memory_region m_polyrom; required_device<gfxdecode_device> m_gfxdecode; - DECLARE_READ64_MEMBER(video_r); - DECLARE_WRITE64_MEMBER(video_w); - DECLARE_READ64_MEMBER(ppc_common_r); - DECLARE_WRITE64_MEMBER(ppc_common_w); - DECLARE_READ64_MEMBER(dsp_r); - DECLARE_WRITE64_MEMBER(dsp_w); - DECLARE_READ8_MEMBER(tlcs_common_r); - DECLARE_WRITE8_MEMBER(tlcs_common_w); - DECLARE_READ8_MEMBER(tlcs_sound_r); - DECLARE_WRITE8_MEMBER(tlcs_sound_w); - DECLARE_WRITE16_MEMBER(tlcs_unk_w); - DECLARE_READ16_MEMBER(tms_dspshare_r); - DECLARE_WRITE16_MEMBER(tms_dspshare_w); - DECLARE_READ16_MEMBER(dsp_rom_r); - DECLARE_WRITE16_MEMBER(dsp_roml_w); - DECLARE_WRITE16_MEMBER(dsp_romh_w); + uint64_t video_r(offs_t offset, uint64_t mem_mask = ~0); + void video_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t ppc_common_r(offs_t offset, uint64_t mem_mask = ~0); + void ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t dsp_r(offs_t offset, uint64_t mem_mask = ~0); + void dsp_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint8_t tlcs_common_r(offs_t offset); + void tlcs_common_w(offs_t offset, uint8_t data); + uint8_t tlcs_sound_r(offs_t offset); + void tlcs_sound_w(offs_t offset, uint8_t data); + void tlcs_unk_w(offs_t offset, uint16_t data); + uint16_t tms_dspshare_r(offs_t offset); + void tms_dspshare_w(offs_t offset, uint16_t data); + uint16_t dsp_rom_r(); + void dsp_roml_w(uint16_t data); + void dsp_romh_w(uint16_t data); virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_taitopjc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -310,7 +310,7 @@ void taitopjc_state::videochip_w(offs_t address, uint32_t data) } } -READ64_MEMBER(taitopjc_state::video_r) +uint64_t taitopjc_state::video_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -325,7 +325,7 @@ READ64_MEMBER(taitopjc_state::video_r) return r; } -WRITE64_MEMBER(taitopjc_state::video_w) +void taitopjc_state::video_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (offset == 0) { @@ -344,7 +344,7 @@ WRITE64_MEMBER(taitopjc_state::video_w) } } -READ64_MEMBER(taitopjc_state::ppc_common_r) +uint64_t taitopjc_state::ppc_common_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; uint32_t address; @@ -365,7 +365,7 @@ READ64_MEMBER(taitopjc_state::ppc_common_r) return r; } -WRITE64_MEMBER(taitopjc_state::ppc_common_w) +void taitopjc_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask) { uint32_t address = offset * 2; @@ -394,7 +394,7 @@ WRITE64_MEMBER(taitopjc_state::ppc_common_w) } } -READ64_MEMBER(taitopjc_state::dsp_r) +uint64_t taitopjc_state::dsp_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -485,7 +485,7 @@ void taitopjc_state::print_display_list() } } -WRITE64_MEMBER(taitopjc_state::dsp_w) +void taitopjc_state::dsp_w(offs_t offset, uint64_t data, uint64_t mem_mask) { //logerror("dsp_w: %08X, %08X%08X, %08X%08X at %08X\n", offset, (uint32_t)(data >> 32), (uint32_t)(data), (uint32_t)(mem_mask >> 32), (uint32_t)(mem_mask), m_maincpu->pc()); @@ -544,7 +544,7 @@ void taitopjc_state::ppc603e_mem(address_map &map) -READ8_MEMBER(taitopjc_state::tlcs_common_r) +uint8_t taitopjc_state::tlcs_common_r(offs_t offset) { if (offset & 1) { @@ -556,7 +556,7 @@ READ8_MEMBER(taitopjc_state::tlcs_common_r) } } -WRITE8_MEMBER(taitopjc_state::tlcs_common_w) +void taitopjc_state::tlcs_common_w(offs_t offset, uint8_t data) { if (offset & 1) { @@ -590,7 +590,7 @@ WRITE8_MEMBER(taitopjc_state::tlcs_common_w) } } -READ8_MEMBER(taitopjc_state::tlcs_sound_r) +uint8_t taitopjc_state::tlcs_sound_r(offs_t offset) { if (offset == 0x17) { @@ -600,12 +600,12 @@ READ8_MEMBER(taitopjc_state::tlcs_sound_r) return 0; } -WRITE8_MEMBER(taitopjc_state::tlcs_sound_w) +void taitopjc_state::tlcs_sound_w(offs_t offset, uint8_t data) { // printf("tlcs_sound_w: %08X, %02X\n", offset, data); } -WRITE16_MEMBER(taitopjc_state::tlcs_unk_w) +void taitopjc_state::tlcs_unk_w(offs_t offset, uint16_t data) { if (offset == 0xc/2) { @@ -648,12 +648,12 @@ void taitopjc_state::mn10200_map(address_map &map) -READ16_MEMBER(taitopjc_state::tms_dspshare_r) +uint16_t taitopjc_state::tms_dspshare_r(offs_t offset) { return m_dsp_ram[offset]; } -WRITE16_MEMBER(taitopjc_state::tms_dspshare_w) +void taitopjc_state::tms_dspshare_w(offs_t offset, uint16_t data) { if (offset == 0xffc) { @@ -662,7 +662,7 @@ WRITE16_MEMBER(taitopjc_state::tms_dspshare_w) m_dsp_ram[offset] = data; } -READ16_MEMBER(taitopjc_state::dsp_rom_r) +uint16_t taitopjc_state::dsp_rom_r() { assert(m_dsp_rom_address < 0x800000); @@ -671,13 +671,13 @@ READ16_MEMBER(taitopjc_state::dsp_rom_r) return data; } -WRITE16_MEMBER(taitopjc_state::dsp_roml_w) +void taitopjc_state::dsp_roml_w(uint16_t data) { m_dsp_rom_address &= 0xffff0000; m_dsp_rom_address |= data; } -WRITE16_MEMBER(taitopjc_state::dsp_romh_w) +void taitopjc_state::dsp_romh_w(uint16_t data) { m_dsp_rom_address &= 0xffff; m_dsp_rom_address |= (uint32_t)(data) << 16; diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp index 1cb8b3a9d85..1ebcf69aea0 100644 --- a/src/mame/drivers/taitotz.cpp +++ b/src/mame/drivers/taitotz.cpp @@ -572,14 +572,14 @@ private: required_shared_ptr<uint16_t> m_mbox_ram; required_device<ata_interface_device> m_ata; - DECLARE_READ64_MEMBER(ppc_common_r); - DECLARE_WRITE64_MEMBER(ppc_common_w); - DECLARE_READ64_MEMBER(ieee1394_r); - DECLARE_WRITE64_MEMBER(ieee1394_w); - DECLARE_READ64_MEMBER(video_chip_r); - DECLARE_WRITE64_MEMBER(video_chip_w); - DECLARE_READ64_MEMBER(video_fifo_r); - DECLARE_WRITE64_MEMBER(video_fifo_w); + uint64_t ppc_common_r(offs_t offset, uint64_t mem_mask = ~0); + void ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t ieee1394_r(offs_t offset, uint64_t mem_mask = ~0); + void ieee1394_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t video_chip_r(offs_t offset, uint64_t mem_mask = ~0); + void video_chip_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t video_fifo_r(offs_t offset, uint64_t mem_mask = ~0); + void video_fifo_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); std::unique_ptr<uint32_t[]> m_screen_ram; std::unique_ptr<uint32_t[]> m_frame_ram; @@ -597,10 +597,10 @@ private: const char *m_hdd_serial_number; - DECLARE_READ8_MEMBER(tlcs_common_r); - DECLARE_WRITE8_MEMBER(tlcs_common_w); - DECLARE_READ8_MEMBER(tlcs_rtc_r); - DECLARE_WRITE8_MEMBER(tlcs_rtc_w); + uint8_t tlcs_common_r(offs_t offset); + void tlcs_common_w(offs_t offset, uint8_t data); + uint8_t tlcs_rtc_r(offs_t offset); + void tlcs_rtc_w(offs_t offset, uint8_t data); uint8_t m_rtcdata[8]; @@ -614,8 +614,8 @@ private: virtual void video_start() override; uint32_t screen_update_taitotz(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(taitotz_vbi); - DECLARE_READ16_MEMBER(tlcs_ide0_r); - DECLARE_READ16_MEMBER(tlcs_ide1_r); + uint16_t tlcs_ide0_r(offs_t offset, uint16_t mem_mask = ~0); + uint16_t tlcs_ide1_r(offs_t offset, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(ide_interrupt); void draw_tile(uint32_t pos, uint32_t tile); uint32_t video_mem_r(uint32_t address); @@ -1649,7 +1649,7 @@ void taitotz_state::video_reg_w(uint32_t reg, uint32_t data) } } -READ64_MEMBER(taitotz_state::video_chip_r) +uint64_t taitotz_state::video_chip_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; uint32_t reg = offset * 8; @@ -1698,7 +1698,7 @@ READ64_MEMBER(taitotz_state::video_chip_r) return r; } -WRITE64_MEMBER(taitotz_state::video_chip_w) +void taitotz_state::video_chip_w(offs_t offset, uint64_t data, uint64_t mem_mask) { uint32_t reg = offset * 8; uint32_t regdata; @@ -1773,7 +1773,7 @@ WRITE64_MEMBER(taitotz_state::video_chip_w) } } -READ64_MEMBER(taitotz_state::video_fifo_r) +uint64_t taitotz_state::video_fifo_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; if (ACCESSING_BITS_32_63) @@ -1790,7 +1790,7 @@ READ64_MEMBER(taitotz_state::video_fifo_r) return r; } -WRITE64_MEMBER(taitotz_state::video_fifo_w) +void taitotz_state::video_fifo_w(offs_t offset, uint64_t data, uint64_t mem_mask) { int command = (m_video_reg >> 28) & 0xf; if (command == 0xb) @@ -1883,7 +1883,7 @@ WRITE64_MEMBER(taitotz_state::video_fifo_w) //COMBINE_DATA(m_video_fifo_mem + offset); } -READ64_MEMBER(taitotz_state::ieee1394_r) +uint64_t taitotz_state::ieee1394_r(offs_t offset, uint64_t mem_mask) { if (offset == 4) { @@ -1894,7 +1894,7 @@ READ64_MEMBER(taitotz_state::ieee1394_r) return 0; } -WRITE64_MEMBER(taitotz_state::ieee1394_w) +void taitotz_state::ieee1394_w(offs_t offset, uint64_t data, uint64_t mem_mask) { //logerror("ieee1394_w: %08X, %08X%08X, %08X%08X\n", offset, (uint32_t)(data >> 32), (uint32_t)(data), (uint32_t)(mem_mask >> 32), (uint32_t)(mem_mask)); if (ACCESSING_BITS_32_63) @@ -1905,7 +1905,7 @@ WRITE64_MEMBER(taitotz_state::ieee1394_w) } } -READ64_MEMBER(taitotz_state::ppc_common_r) +uint64_t taitotz_state::ppc_common_r(offs_t offset, uint64_t mem_mask) { uint64_t res = 0; @@ -1921,7 +1921,7 @@ READ64_MEMBER(taitotz_state::ppc_common_r) return res; } -WRITE64_MEMBER(taitotz_state::ppc_common_w) +void taitotz_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_0_15) { @@ -2081,7 +2081,7 @@ void taitotz_state::ppc603e_mem(address_map &map) -READ8_MEMBER(taitotz_state::tlcs_common_r) +uint8_t taitotz_state::tlcs_common_r(offs_t offset) { if (offset & 1) { @@ -2093,7 +2093,7 @@ READ8_MEMBER(taitotz_state::tlcs_common_r) } } -WRITE8_MEMBER(taitotz_state::tlcs_common_w) +void taitotz_state::tlcs_common_w(offs_t offset, uint8_t data) { if (offset & 1) { @@ -2140,8 +2140,8 @@ WRITE8_MEMBER(taitotz_state::tlcs_common_w) } } -// RTC could be Epson RTC-64613, same as taitopjc.c -READ8_MEMBER(taitotz_state::tlcs_rtc_r) +// RTC could be Epson RTC-64613, same as taitopjc.cpp +uint8_t taitotz_state::tlcs_rtc_r(offs_t offset) { switch (offset) { @@ -2165,7 +2165,7 @@ READ8_MEMBER(taitotz_state::tlcs_rtc_r) return 0; } -WRITE8_MEMBER(taitotz_state::tlcs_rtc_w) +void taitotz_state::tlcs_rtc_w(offs_t offset, uint8_t data) { switch (offset) { @@ -2186,7 +2186,7 @@ WRITE8_MEMBER(taitotz_state::tlcs_rtc_w) } } -READ16_MEMBER(taitotz_state::tlcs_ide0_r) +uint16_t taitotz_state::tlcs_ide0_r(offs_t offset, uint16_t mem_mask) { uint16_t d = m_ata->cs0_r(offset, mem_mask); if (offset == 7) @@ -2195,7 +2195,7 @@ READ16_MEMBER(taitotz_state::tlcs_ide0_r) return d; } -READ16_MEMBER(taitotz_state::tlcs_ide1_r) +uint16_t taitotz_state::tlcs_ide1_r(offs_t offset, uint16_t mem_mask) { uint16_t d = m_ata->cs1_r(offset, mem_mask); if (offset == 6) diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index 1340146b2ac..dbb8b478a47 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -83,9 +83,9 @@ private: required_region_ptr<uint8_t> m_bootscreen_rom; required_memory_bank m_bank1; optional_device<palette_device> m_palette; - DECLARE_WRITE32_MEMBER(pnp_config_w); - DECLARE_WRITE32_MEMBER(pnp_data_w); - DECLARE_WRITE32_MEMBER(bios_ram_w); + void pnp_config_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void pnp_data_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void bios_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); #if !TAITOWLF_ENABLE_VGA void taitowlf_palette(palette_device &palette) const; @@ -261,7 +261,7 @@ void taitowlf_state::intel82371ab_pci_w(int function, int reg, uint32_t data, ui } // ISA Plug-n-Play -WRITE32_MEMBER(taitowlf_state::pnp_config_w) +void taitowlf_state::pnp_config_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_8_15) { @@ -269,7 +269,7 @@ WRITE32_MEMBER(taitowlf_state::pnp_config_w) } } -WRITE32_MEMBER(taitowlf_state::pnp_data_w) +void taitowlf_state::pnp_data_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_8_15) { @@ -279,7 +279,7 @@ WRITE32_MEMBER(taitowlf_state::pnp_data_w) -WRITE32_MEMBER(taitowlf_state::bios_ram_w) +void taitowlf_state::bios_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_mtxc_config_reg[0x59] & 0x20) // write to RAM if this region is write-enabled { diff --git a/src/mame/drivers/talkingbb.cpp b/src/mame/drivers/talkingbb.cpp index 8f8a8a62209..ad30b938380 100644 --- a/src/mame/drivers/talkingbb.cpp +++ b/src/mame/drivers/talkingbb.cpp @@ -147,9 +147,9 @@ private: // I/O handlers void bank_w(u8 data); - DECLARE_READ8_MEMBER(bank_r); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); + u8 bank_r(offs_t offset); + void input_w(u8 data); + u8 input_r(); u8 switch_r(); }; @@ -178,7 +178,7 @@ void talkingbb_state::bank_w(u8 data) m_bank = data; } -READ8_MEMBER(talkingbb_state::bank_r) +u8 talkingbb_state::bank_r(offs_t offset) { u32 hi = (~m_bank & 3) << 15; u8 data = (m_bank & 4) ? 0xff : m_rom[offset | hi]; @@ -188,7 +188,7 @@ READ8_MEMBER(talkingbb_state::bank_r) return data; } -WRITE8_MEMBER(talkingbb_state::input_w) +void talkingbb_state::input_w(u8 data) { // no effect if P30 is low (never happens though) if (~m_bank & 1) @@ -200,7 +200,7 @@ WRITE8_MEMBER(talkingbb_state::input_w) m_display->matrix(m_inp_mux, ~data & 7); } -READ8_MEMBER(talkingbb_state::input_r) +u8 talkingbb_state::input_r() { // open bus if P30 is low (never happens though) if (~m_bank & 1) diff --git a/src/mame/drivers/talkingfb.cpp b/src/mame/drivers/talkingfb.cpp index 98335b3f60e..38ed67a317b 100644 --- a/src/mame/drivers/talkingfb.cpp +++ b/src/mame/drivers/talkingfb.cpp @@ -65,9 +65,9 @@ private: // I/O handlers void bank_w(u8 data); - template<int Psen> DECLARE_READ8_MEMBER(bank_r); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); + template<int Psen> u8 bank_r(offs_t offset); + void input_w(u8 data); + u8 input_r(); }; void talkingfb_state::machine_start() @@ -96,7 +96,7 @@ void talkingfb_state::bank_w(u8 data) } template<int Psen> -READ8_MEMBER(talkingfb_state::bank_r) +u8 talkingfb_state::bank_r(offs_t offset) { u32 hi = (m_bank & 7) << 15; u8 data = (m_bank & 0x20) ? 0xff : m_rom[offset | hi]; @@ -107,13 +107,13 @@ READ8_MEMBER(talkingfb_state::bank_r) return data; } -WRITE8_MEMBER(talkingfb_state::input_w) +void talkingfb_state::input_w(u8 data) { // d3-d7: input mux m_inp_mux = data >> 3; } -READ8_MEMBER(talkingfb_state::input_r) +u8 talkingfb_state::input_r() { u8 data = 0; diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index a443e38a893..45a4da80bcf 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -107,19 +107,19 @@ private: required_device<pcvideo_t1000_device> m_video; required_device<ram_device> m_ram; - DECLARE_WRITE8_MEMBER ( pc_t1t_p37x_w ); - DECLARE_READ8_MEMBER ( pc_t1t_p37x_r ); - - DECLARE_WRITE8_MEMBER ( tandy1000_pio_w ); - DECLARE_READ8_MEMBER(tandy1000_pio_r); - DECLARE_READ8_MEMBER( tandy1000_bank_r ); - DECLARE_WRITE8_MEMBER( tandy1000_bank_w ); - DECLARE_WRITE8_MEMBER( nmi_vram_bank_w ); - DECLARE_WRITE8_MEMBER( vram_bank_w ); - DECLARE_READ8_MEMBER( vram_r ); - DECLARE_WRITE8_MEMBER( vram_w ); - DECLARE_WRITE8_MEMBER( devctrl_w ); - DECLARE_READ8_MEMBER( unk_r ); + void pc_t1t_p37x_w(offs_t offset, uint8_t data); + uint8_t pc_t1t_p37x_r(offs_t offset); + + void tandy1000_pio_w(offs_t offset, uint8_t data); + uint8_t tandy1000_pio_r(offs_t offset); + uint8_t tandy1000_bank_r(offs_t offset); + void tandy1000_bank_w(offs_t offset, uint8_t data); + void nmi_vram_bank_w(uint8_t data); + void vram_bank_w(uint8_t data); + uint8_t vram_r(offs_t offset); + void vram_w(offs_t offset, uint8_t data); + void devctrl_w(uint8_t data); + uint8_t unk_r(); int tandy1000_read_eeprom(); void tandy1000_write_eeprom(uint8_t data); @@ -279,7 +279,7 @@ void tandy1000_state::tandy1000_write_eeprom(uint8_t data) m_eeprom_clock=data&4; } -WRITE8_MEMBER( tandy1000_state::pc_t1t_p37x_w ) +void tandy1000_state::pc_t1t_p37x_w(offs_t offset, uint8_t data) { // DBG_LOG(2,"T1T_p37x_w",("%.5x #%d $%02x\n", m_maincpu->pc( ),offset, data)); if (offset!=4) @@ -293,7 +293,7 @@ WRITE8_MEMBER( tandy1000_state::pc_t1t_p37x_w ) } } -READ8_MEMBER( tandy1000_state::pc_t1t_p37x_r ) +uint8_t tandy1000_state::pc_t1t_p37x_r(offs_t offset) { int data = m_tandy_data[offset]; // DBG_LOG(1,"T1T_p37x_r",("%.5x #%d $%02x\n", m_maincpu->pc( ), offset, data)); @@ -309,7 +309,7 @@ READ8_MEMBER( tandy1000_state::pc_t1t_p37x_r ) bit 3 output turbo mode */ -WRITE8_MEMBER( tandy1000_state::tandy1000_pio_w ) +void tandy1000_state::tandy1000_pio_w(offs_t offset, uint8_t data) { switch (offset) { @@ -335,7 +335,7 @@ WRITE8_MEMBER( tandy1000_state::tandy1000_pio_w ) } } -READ8_MEMBER(tandy1000_state::tandy1000_pio_r) +uint8_t tandy1000_state::tandy1000_pio_r(offs_t offset) { int data=0xff; switch (offset) @@ -361,29 +361,29 @@ READ8_MEMBER(tandy1000_state::tandy1000_pio_r) return data; } -WRITE8_MEMBER( tandy1000_state::nmi_vram_bank_w ) +void tandy1000_state::nmi_vram_bank_w(uint8_t data) { m_mb->nmi_enable_w(data & 0x80); - vram_bank_w(space, 0, data & 0x1e); + vram_bank_w(data & 0x1e); m_video->disable_w((data & 1) ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER( tandy1000_state::vram_bank_w ) +void tandy1000_state::vram_bank_w(uint8_t data) { m_vram_bank = (data >> 1) & 7; } -WRITE8_MEMBER( tandy1000_state::devctrl_w ) +void tandy1000_state::devctrl_w(uint8_t data) { m_video->disable_w((data & 4) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( tandy1000_state::unk_r ) +uint8_t tandy1000_state::unk_r() { return 0; // status port? } -READ8_MEMBER( tandy1000_state::vram_r ) +uint8_t tandy1000_state::vram_r(offs_t offset) { uint8_t vram_base = (m_ram->size() >> 17) - 1; if((m_vram_bank - vram_base) == (offset >> 17)) @@ -391,7 +391,7 @@ READ8_MEMBER( tandy1000_state::vram_r ) return 0xff; } -WRITE8_MEMBER( tandy1000_state::vram_w ) +void tandy1000_state::vram_w(offs_t offset, uint8_t data) { uint8_t vram_base = (m_ram->size() >> 17) - 1; if((m_vram_bank - vram_base) == (offset >> 17)) @@ -432,14 +432,14 @@ void tandy1000_state::machine_start() m_maincpu->space(AS_PROGRAM).install_ram(0, m_ram->size() - (128*1024) - 1, &m_ram->pointer()[128*1024]); if(m_maincpu->space(AS_PROGRAM).data_width() == 8) m_maincpu->space(AS_PROGRAM).install_readwrite_handler(m_ram->size() - (128*1024), 640*1024 - 1, - read8_delegate(*this, FUNC(tandy1000_state::vram_r)), write8_delegate(*this, FUNC(tandy1000_state::vram_w))); + read8sm_delegate(*this, FUNC(tandy1000_state::vram_r)), write8sm_delegate(*this, FUNC(tandy1000_state::vram_w))); else m_maincpu->space(AS_PROGRAM).install_readwrite_handler(m_ram->size() - (128*1024), 640*1024 - 1, - read8_delegate(*this, FUNC(tandy1000_state::vram_r)), write8_delegate(*this, FUNC(tandy1000_state::vram_w)), 0xffff); + read8sm_delegate(*this, FUNC(tandy1000_state::vram_r)), write8sm_delegate(*this, FUNC(tandy1000_state::vram_w)), 0xffff); subdevice<nvram_device>("nvram")->set_base(m_eeprom_ee, sizeof(m_eeprom_ee)); } -READ8_MEMBER( tandy1000_state::tandy1000_bank_r ) +uint8_t tandy1000_state::tandy1000_bank_r(offs_t offset) { uint8_t data = 0xFF; @@ -456,7 +456,7 @@ READ8_MEMBER( tandy1000_state::tandy1000_bank_r ) } -WRITE8_MEMBER( tandy1000_state::tandy1000_bank_w ) +void tandy1000_state::tandy1000_bank_w(offs_t offset, uint8_t data) { logerror( "%s: tandy1000_bank_w: offset = %x, data = %02x\n", machine().describe_context(), offset, data ); diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp index 97af2505ce2..e98f02f8b83 100644 --- a/src/mame/drivers/tapatune.cpp +++ b/src/mame/drivers/tapatune.cpp @@ -94,23 +94,23 @@ private: DECLARE_WRITE_LINE_MEMBER(crtc_vsync); - DECLARE_WRITE16_MEMBER(palette_w); - DECLARE_READ16_MEMBER(read_from_z80); - DECLARE_WRITE16_MEMBER(write_to_z80); - - DECLARE_READ8_MEMBER(sound_irq_clear); - DECLARE_WRITE8_MEMBER(controls_mux); - DECLARE_READ8_MEMBER(controls_r); - DECLARE_WRITE8_MEMBER(write_index_to_68k); - DECLARE_WRITE8_MEMBER(write_data_to_68k); - DECLARE_READ8_MEMBER(read_index_from_68k); - DECLARE_READ8_MEMBER(read_data_from_68k); - DECLARE_WRITE8_MEMBER(lamps_w); - DECLARE_READ8_MEMBER(status_r); - DECLARE_WRITE8_MEMBER(bsmt_data_lo_w); - DECLARE_WRITE8_MEMBER(bsmt_data_hi_w); - DECLARE_WRITE8_MEMBER(bsmt_reg_w); - DECLARE_READ8_MEMBER(special_r); + void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t read_from_z80(); + void write_to_z80(uint16_t data); + + uint8_t sound_irq_clear(); + void controls_mux(uint8_t data); + uint8_t controls_r(); + void write_index_to_68k(uint8_t data); + void write_data_to_68k(uint8_t data); + uint8_t read_index_from_68k(); + uint8_t read_data_from_68k(); + void lamps_w(uint8_t data); + uint8_t status_r(); + void bsmt_data_lo_w(uint8_t data); + void bsmt_data_hi_w(uint8_t data); + void bsmt_reg_w(uint8_t data); + uint8_t special_r(); MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); @@ -194,7 +194,7 @@ MC6845_UPDATE_ROW( tapatune_state::crtc_update_row ) } -WRITE16_MEMBER(tapatune_state::palette_w) +void tapatune_state::palette_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //logerror("Palette write: offset = %02x, data = %04x, mask = %04x\n", offset, data, mem_mask ); switch(offset) @@ -223,14 +223,14 @@ WRITE_LINE_MEMBER(tapatune_state::crtc_vsync) * *************************************/ -READ16_MEMBER(tapatune_state::read_from_z80) +uint16_t tapatune_state::read_from_z80() { m_z80_data_available = 0; return ((uint16_t)m_z80_to_68k_data << 8) | (m_z80_to_68k_index); } -WRITE16_MEMBER(tapatune_state::write_to_z80) +void tapatune_state::write_to_z80(uint16_t data) { m_68k_to_z80_index = data & 0xff; m_68k_to_z80_data = (data >> 8) & 0xff; @@ -249,13 +249,13 @@ WRITE16_MEMBER(tapatune_state::write_to_z80) * *************************************/ -WRITE8_MEMBER(tapatune_state::write_index_to_68k) +void tapatune_state::write_index_to_68k(uint8_t data) { m_z80_to_68k_index = data; } -WRITE8_MEMBER(tapatune_state::write_data_to_68k) +void tapatune_state::write_data_to_68k(uint8_t data) { // todo, use callback as this will hook up elsewhere on non-video games if (m_videocpu) @@ -267,13 +267,13 @@ WRITE8_MEMBER(tapatune_state::write_data_to_68k) } -READ8_MEMBER(tapatune_state::read_index_from_68k) +uint8_t tapatune_state::read_index_from_68k() { return m_68k_to_z80_index; } -READ8_MEMBER(tapatune_state::read_data_from_68k) +uint8_t tapatune_state::read_data_from_68k() { m_68k_data_available = 0; @@ -333,14 +333,14 @@ void tapatune_state::maincpu_io_map(address_map &map) * *************************************/ -READ8_MEMBER(tapatune_state::sound_irq_clear) +uint8_t tapatune_state::sound_irq_clear() { m_maincpu->set_input_line(0, CLEAR_LINE); return 0; } -WRITE8_MEMBER(tapatune_state::controls_mux) +void tapatune_state::controls_mux(uint8_t data) { /* Input multiplexer select and outputs: @@ -360,7 +360,7 @@ WRITE8_MEMBER(tapatune_state::controls_mux) } -READ8_MEMBER(tapatune_state::controls_r) +uint8_t tapatune_state::controls_r() { switch (m_controls_mux & 0xf) { @@ -373,7 +373,7 @@ READ8_MEMBER(tapatune_state::controls_r) } -READ8_MEMBER(tapatune_state::special_r) +uint8_t tapatune_state::special_r() { // Not sure if this is actually correct if (m_z80_data_available) @@ -383,7 +383,7 @@ READ8_MEMBER(tapatune_state::special_r) } -WRITE8_MEMBER(tapatune_state::lamps_w) +void tapatune_state::lamps_w(uint8_t data) { /* Button Lamps: @@ -407,19 +407,19 @@ WRITE8_MEMBER(tapatune_state::lamps_w) * *************************************/ -READ8_MEMBER(tapatune_state::status_r) +uint8_t tapatune_state::status_r() { return !m_bsmt->read_status() << 7; } -WRITE8_MEMBER(tapatune_state::bsmt_data_lo_w) +void tapatune_state::bsmt_data_lo_w(uint8_t data) { m_bsmt_data_l = data; } -WRITE8_MEMBER(tapatune_state::bsmt_data_hi_w) +void tapatune_state::bsmt_data_hi_w(uint8_t data) { m_bsmt_data_h = data; @@ -431,7 +431,7 @@ WRITE8_MEMBER(tapatune_state::bsmt_data_hi_w) } -WRITE8_MEMBER(tapatune_state::bsmt_reg_w) +void tapatune_state::bsmt_reg_w(uint8_t data) { m_bsmt->write_reg(data); m_bsmt->write_data((m_bsmt_data_h << 8) | m_bsmt_data_l); diff --git a/src/mame/drivers/tasc.cpp b/src/mame/drivers/tasc.cpp index 5a10cc99e5d..e3b59c87f24 100644 --- a/src/mame/drivers/tasc.cpp +++ b/src/mame/drivers/tasc.cpp @@ -96,9 +96,9 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(disable_bootrom) { m_bootrom_enabled = false; } // I/O handlers - DECLARE_READ32_MEMBER(bootrom_r); - DECLARE_READ32_MEMBER(p1000_r); - DECLARE_WRITE32_MEMBER(p1000_w); + uint32_t bootrom_r(offs_t offset); + uint32_t p1000_r(); + void p1000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); }; void tasc_state::machine_start() @@ -120,12 +120,12 @@ void tasc_state::machine_reset() I/O ******************************************************************************/ -READ32_MEMBER(tasc_state::bootrom_r) +uint32_t tasc_state::bootrom_r(offs_t offset) { return (m_bootrom_enabled) ? m_rom[offset] : m_mainram[offset]; } -READ32_MEMBER(tasc_state::p1000_r) +uint32_t tasc_state::p1000_r() { // disconnect bootrom from the bus after next opcode if (m_bootrom_enabled && !m_disable_bootrom->enabled() && !machine().side_effects_disabled()) @@ -142,7 +142,7 @@ READ32_MEMBER(tasc_state::p1000_r) return data; } -WRITE32_MEMBER(tasc_state::p1000_w) +void tasc_state::p1000_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_24_31) { diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index f4c8466dc08..9b0632b6e3a 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -70,11 +70,11 @@ private: required_device<palette_device> m_palette; optional_shared_ptr<uint32_t> m_vram; - DECLARE_READ32_MEMBER(eeprom_r); - DECLARE_WRITE8_MEMBER(eeprom_w); - DECLARE_WRITE8_MEMBER(kongambl_ff_w); - DECLARE_READ32_MEMBER(test_r); - // DECLARE_READ32_MEMBER(rng_r); + uint32_t eeprom_r(offs_t offset, uint32_t mem_mask = ~0); + void eeprom_w(offs_t offset, uint8_t data); + void kongambl_ff_w(uint8_t data); + uint32_t test_r(); + // uint32_t rng_r(); DECLARE_VIDEO_START(kongambl); uint8_t m_irq_mask; @@ -154,7 +154,7 @@ uint32_t kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_in return 0; } -READ32_MEMBER(kongambl_state::eeprom_r) +uint32_t kongambl_state::eeprom_r(offs_t offset, uint32_t mem_mask) { //return machine().rand(); uint32_t retval = 0; @@ -176,7 +176,7 @@ READ32_MEMBER(kongambl_state::eeprom_r) return retval; } -WRITE8_MEMBER(kongambl_state::eeprom_w) +void kongambl_state::eeprom_w(offs_t offset, uint8_t data) { // offset == 3 seems mux writes (active low) @@ -193,19 +193,19 @@ WRITE8_MEMBER(kongambl_state::eeprom_w) m_irq_mask = data; } -READ32_MEMBER(kongambl_state::test_r) +uint32_t kongambl_state::test_r() { return -1;//machine().rand(); } /* - READ32_MEMBER(kongambl_state::rng_r) + uint32_t kongambl_state::rng_r() { return machine().rand(); } */ -WRITE8_MEMBER(kongambl_state::kongambl_ff_w) +void kongambl_state::kongambl_ff_w(uint8_t data) { /* enables thru 0->1 */ /* ---- x--- (related to OBJ ROM) */ diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp index 19ef5a6ba35..5d1b56b7910 100644 --- a/src/mame/drivers/tattack.cpp +++ b/src/mame/drivers/tattack.cpp @@ -78,10 +78,10 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE8_MEMBER(paddle_w); - DECLARE_WRITE8_MEMBER(ball_w); - DECLARE_WRITE8_MEMBER(brick_dma_w); - DECLARE_WRITE8_MEMBER(sound_w); + void paddle_w(uint8_t data); + void ball_w(offs_t offset, uint8_t data); + void brick_dma_w(uint8_t data); + void sound_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void tattack_palette(palette_device &palette) const; @@ -233,17 +233,17 @@ void tattack_state::video_start() m_tmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(tattack_state::get_tile_info)), TILEMAP_SCAN_ROWS, 8,8, 32,32); } -WRITE8_MEMBER(tattack_state::paddle_w) +void tattack_state::paddle_w(uint8_t data) { m_paddle_reg = data; } -WRITE8_MEMBER(tattack_state::ball_w) +void tattack_state::ball_w(offs_t offset, uint8_t data) { m_ball_regs[offset] = data; } -WRITE8_MEMBER(tattack_state::brick_dma_w) +void tattack_state::brick_dma_w(uint8_t data) { // bit 7: 0->1 transfers from RAM to internal video buffer // bit 6: bricks color bank @@ -257,7 +257,7 @@ WRITE8_MEMBER(tattack_state::brick_dma_w) // popmessage("%02x",data&0x7f); } -WRITE8_MEMBER(tattack_state::sound_w) +void tattack_state::sound_w(uint8_t data) { // bit 4 enabled on coin insertion (coin counter?) // bit 3-0 samples enable, @see tattack_sample_names diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp index 067f6841418..865cae3fb11 100644 --- a/src/mame/drivers/tec1.cpp +++ b/src/mame/drivers/tec1.cpp @@ -111,11 +111,11 @@ private: required_ioport m_io_shift; required_device<pwm_display_device> m_display; - DECLARE_READ8_MEMBER(kbd_r); - DECLARE_READ8_MEMBER(latch_r); - DECLARE_WRITE8_MEMBER(tec1_digit_w); - DECLARE_WRITE8_MEMBER(tecjmon_digit_w); - DECLARE_WRITE8_MEMBER(segment_w); + uint8_t kbd_r(); + uint8_t latch_r(); + void tec1_digit_w(uint8_t data); + void tecjmon_digit_w(uint8_t data); + void segment_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(da_w); uint8_t m_seg; uint8_t m_digit; @@ -135,7 +135,7 @@ private: ***************************************************************************/ -WRITE8_MEMBER( tec1_state::segment_w ) +void tec1_state::segment_w(uint8_t data) { /* d7 segment d d6 segment e @@ -150,7 +150,7 @@ WRITE8_MEMBER( tec1_state::segment_w ) m_display->matrix(m_digit, m_seg); } -WRITE8_MEMBER( tec1_state::tec1_digit_w ) +void tec1_state::tec1_digit_w(uint8_t data) { /* d7 speaker d6 not used @@ -167,7 +167,7 @@ WRITE8_MEMBER( tec1_state::tec1_digit_w ) m_display->matrix(m_digit, m_seg); } -WRITE8_MEMBER( tec1_state::tecjmon_digit_w ) +void tec1_state::tecjmon_digit_w(uint8_t data) { /* d7 speaker & cassout d6 not used @@ -191,7 +191,7 @@ WRITE8_MEMBER( tec1_state::tecjmon_digit_w ) ***************************************************************************/ -READ8_MEMBER( tec1_state::latch_r ) +uint8_t tec1_state::latch_r() { // bit 7 - cass in ; bit 6 low = key pressed uint8_t data = (m_key_pressed) ? 0 : 0x40; @@ -203,7 +203,7 @@ READ8_MEMBER( tec1_state::latch_r ) } -READ8_MEMBER( tec1_state::kbd_r ) +uint8_t tec1_state::kbd_r() { return m_kb->read() | m_io_shift->read(); } diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp index 13cb69af6ec..252a30c25d6 100644 --- a/src/mame/drivers/techno.cpp +++ b/src/mame/drivers/techno.cpp @@ -39,20 +39,20 @@ private: IRQ_ADVANCE_TIMER }; - DECLARE_READ16_MEMBER(key_r); - DECLARE_READ16_MEMBER(rtrg_r); - DECLARE_READ16_MEMBER(sound_r); - DECLARE_WRITE16_MEMBER(disp1_w); - DECLARE_WRITE16_MEMBER(disp2_w); - DECLARE_WRITE16_MEMBER(lamp1_w); - DECLARE_WRITE16_MEMBER(lamp2_w); - DECLARE_WRITE16_MEMBER(setout_w); - DECLARE_WRITE16_MEMBER(sol1_w); - DECLARE_WRITE16_MEMBER(sol2_w); - DECLARE_WRITE16_MEMBER(sound_w); - - DECLARE_READ8_MEMBER(rd_r) { return 0; } - DECLARE_WRITE8_MEMBER(wr_w) {} + uint16_t key_r(); + uint16_t rtrg_r(); + uint16_t sound_r(); + void disp1_w(uint16_t data); + void disp2_w(uint16_t data); + void lamp1_w(uint16_t data); + void lamp2_w(uint16_t data); + void setout_w(uint16_t data); + void sol1_w(uint16_t data); + void sol2_w(uint16_t data); + void sound_w(uint16_t data); + + uint8_t rd_r() { return 0; } + void wr_w(uint8_t data) {} void techno_map(address_map &map); void techno_sub_map(address_map &map); @@ -100,17 +100,17 @@ void techno_state::techno_sub_map(address_map &map) map(0xc000, 0xffff).rom(); // another 16k ROM } -WRITE16_MEMBER( techno_state::disp1_w ) +void techno_state::disp1_w(uint16_t data) { m_digits[m_digit] = bitswap<16>(data, 12, 10, 8, 14, 13, 9, 11, 15, 7, 6, 5, 4, 3, 2, 1, 0); } -WRITE16_MEMBER( techno_state::disp2_w ) +void techno_state::disp2_w(uint16_t data) { m_digits[m_digit+30] = bitswap<16>(data, 12, 10, 8, 14, 13, 9, 11, 15, 7, 6, 5, 4, 3, 2, 1, 0); } -WRITE16_MEMBER( techno_state::sound_w ) +void techno_state::sound_w(uint16_t data) { /* d0..d7 : to sound board @@ -132,7 +132,7 @@ d11-d15: AUX outputs } // lamps & keymatrix -WRITE16_MEMBER( techno_state::lamp1_w ) +void techno_state::lamp1_w(uint16_t data) { // Work out key row for (int i = 8; i < 16; i++) @@ -141,39 +141,39 @@ WRITE16_MEMBER( techno_state::lamp1_w ) } // more lamps -WRITE16_MEMBER( techno_state::lamp2_w ) +void techno_state::lamp2_w(uint16_t data) { } // solenoids -WRITE16_MEMBER( techno_state::sol1_w ) +void techno_state::sol1_w(uint16_t data) { } // more solenoids -WRITE16_MEMBER( techno_state::sol2_w ) +void techno_state::sol2_w(uint16_t data) { } // unknown -WRITE16_MEMBER( techno_state::setout_w ) +void techno_state::setout_w(uint16_t data) { } // inputs -READ16_MEMBER( techno_state::key_r ) +uint16_t techno_state::key_r() { return m_switch[m_keyrow]->read(); } // unknown -READ16_MEMBER( techno_state::rtrg_r ) +uint16_t techno_state::rtrg_r() { return 0xffff; } // feedback from sound board, and some AUX inputs -READ16_MEMBER( techno_state::sound_r ) +uint16_t techno_state::sound_r() { return 0; } diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp index a7c1dbb964b..a20fa5332a3 100644 --- a/src/mame/drivers/tecnbras.cpp +++ b/src/mame/drivers/tecnbras.cpp @@ -42,11 +42,11 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER(set_x_position_w); - DECLARE_WRITE8_MEMBER(print_column_w); + void set_x_position_w(offs_t offset, uint8_t data); + void print_column_w(offs_t offset, uint8_t data); - //DECLARE_WRITE8_MEMBER(tecnbras_io_w); - //DECLARE_READ8_MEMBER(tecnbras_io_r); + //void tecnbras_io_w(uint8_t data); + //uint8_t tecnbras_io_r(); void i80c31_io(address_map &map); void i80c31_prg(address_map &map); @@ -70,12 +70,12 @@ void tecnbras_state::i80c31_io(address_map &map) map(0x06B8, 0x06BC).w(FUNC(tecnbras_state::print_column_w)); } -WRITE8_MEMBER(tecnbras_state::set_x_position_w) +void tecnbras_state::set_x_position_w(offs_t offset, uint8_t data) { m_xcoord = offset; } -WRITE8_MEMBER(tecnbras_state::print_column_w) +void tecnbras_state::print_column_w(offs_t offset, uint8_t data) { int const x = m_xcoord + offset; int const ch = x / 5; diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp index b44f2e12f1c..52e999c1798 100644 --- a/src/mame/drivers/tempest.cpp +++ b/src/mame/drivers/tempest.cpp @@ -323,17 +323,17 @@ public: DECLARE_READ_LINE_MEMBER(clock_r); protected: - DECLARE_WRITE8_MEMBER(wdclr_w); - DECLARE_WRITE8_MEMBER(tempest_led_w); - DECLARE_WRITE8_MEMBER(tempest_coin_w); + void wdclr_w(uint8_t data); + void tempest_led_w(uint8_t data); + void tempest_coin_w(uint8_t data); uint8_t input_port_1_bit_r(offs_t offset); uint8_t input_port_2_bit_r(offs_t offset); - DECLARE_READ8_MEMBER(earom_read); - DECLARE_WRITE8_MEMBER(earom_write); - DECLARE_WRITE8_MEMBER(earom_control_w); + uint8_t earom_read(); + void earom_write(offs_t offset, uint8_t data); + void earom_control_w(uint8_t data); - DECLARE_READ8_MEMBER(rom_ae1f_r); + uint8_t rom_ae1f_r(); virtual void machine_start() override; void main_map(address_map &map); @@ -369,7 +369,7 @@ void tempest_state::machine_start() * *************************************/ -WRITE8_MEMBER(tempest_state::wdclr_w) +void tempest_state::wdclr_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); m_watchdog->watchdog_reset(); @@ -418,7 +418,7 @@ uint8_t tempest_state::input_port_2_bit_r(offs_t offset) * *************************************/ -WRITE8_MEMBER(tempest_state::tempest_led_w) +void tempest_state::tempest_led_w(uint8_t data) { m_leds[0] = BIT(~data, 1); m_leds[1] = BIT(~data, 0); @@ -427,7 +427,7 @@ WRITE8_MEMBER(tempest_state::tempest_led_w) } -WRITE8_MEMBER(tempest_state::tempest_coin_w) +void tempest_state::tempest_coin_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, (data & 0x01)); machine().bookkeeping().coin_counter_w(1, (data & 0x02)); @@ -444,18 +444,18 @@ WRITE8_MEMBER(tempest_state::tempest_coin_w) * *************************************/ -READ8_MEMBER(tempest_state::earom_read) +uint8_t tempest_state::earom_read() { return m_earom->data(); } -WRITE8_MEMBER(tempest_state::earom_write) +void tempest_state::earom_write(offs_t offset, uint8_t data) { m_earom->set_address(offset & 0x3f); m_earom->set_data(data); } -WRITE8_MEMBER(tempest_state::earom_control_w) +void tempest_state::earom_control_w(uint8_t data) { // CK = EDB0, C1 = /EDB2, C2 = EDB1, CS1 = EDB3, /CS2 = GND m_earom->set_control(BIT(data, 3), 1, !BIT(data, 2), BIT(data, 1)); @@ -470,7 +470,7 @@ WRITE8_MEMBER(tempest_state::earom_control_w) * *************************************/ -READ8_MEMBER(tempest_state::rom_ae1f_r) +uint8_t tempest_state::rom_ae1f_r() { // This is needed to ensure that the routine starting at ae1c passes checks and does not corrupt data; // config.m_perfect_cpu_quantum = subtag("maincpu"); would be very taxing on this driver. diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp index 032ed1a0443..d2b7d53141c 100644 --- a/src/mame/drivers/terak.cpp +++ b/src/mame/drivers/terak.cpp @@ -28,10 +28,10 @@ public: void terak(machine_config &config); private: - DECLARE_READ16_MEMBER(terak_fdc_status_r); - DECLARE_WRITE16_MEMBER(terak_fdc_command_w); - DECLARE_READ16_MEMBER(terak_fdc_data_r); - DECLARE_WRITE16_MEMBER(terak_fdc_data_w); + uint16_t terak_fdc_status_r(); + void terak_fdc_command_w(uint16_t data); + uint16_t terak_fdc_data_r(); + void terak_fdc_data_w(uint16_t data); uint32_t screen_update_terak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void mem_map(address_map &map); @@ -43,7 +43,7 @@ private: required_device<t11_device> m_maincpu; }; -READ16_MEMBER( terak_state::terak_fdc_status_r ) +uint16_t terak_state::terak_fdc_status_r() { logerror("terak_fdc_status_r\n"); if (m_cmd==3) @@ -54,20 +54,20 @@ READ16_MEMBER( terak_state::terak_fdc_status_r ) return 0; } -WRITE16_MEMBER( terak_state::terak_fdc_command_w ) +void terak_state::terak_fdc_command_w(uint16_t data) { m_unit = (data >> 8) & 0x03; m_cmd = (data >> 1) & 0x07; logerror("terak_fdc_command_w %04x [%d %d]\n",data,m_unit,m_cmd); } -READ16_MEMBER( terak_state::terak_fdc_data_r ) +uint16_t terak_state::terak_fdc_data_r() { logerror("terak_fdc_data_r\n"); return 0; } -WRITE16_MEMBER( terak_state::terak_fdc_data_w ) +void terak_state::terak_fdc_data_w(uint16_t data) { logerror("terak_fdc_data_w %04x\n",data); } diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp index faeffcb562e..1077dbb4251 100644 --- a/src/mame/drivers/tgtpanic.cpp +++ b/src/mame/drivers/tgtpanic.cpp @@ -35,7 +35,7 @@ private: uint8_t m_color; - DECLARE_WRITE8_MEMBER(color_w); + void color_w(uint8_t data); virtual void machine_start() override; @@ -91,7 +91,7 @@ uint32_t tgtpanic_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm return 0; } -WRITE8_MEMBER(tgtpanic_state::color_w) +void tgtpanic_state::color_w(uint8_t data) { m_screen->update_partial(m_screen->vpos()); m_color = data; diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index 1b780bd057e..77ba8526a6d 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -80,29 +80,29 @@ private: int m_cart_present; int m_pr7820_enter; struct ssi263_t m_ssi263; - DECLARE_WRITE8_MEMBER(intrq_w); - DECLARE_READ8_MEMBER(irqstate_r); - DECLARE_WRITE8_MEMBER(timer_int_ack_w); - DECLARE_WRITE8_MEMBER(data_rdy_int_ack_w); + void intrq_w(uint8_t data); + uint8_t irqstate_r(); + void timer_int_ack_w(uint8_t data); + void data_rdy_int_ack_w(uint8_t data); void cop_d_w(uint8_t data); - DECLARE_READ8_MEMBER(cop_data_r); - DECLARE_WRITE8_MEMBER(cop_data_w); + uint8_t cop_data_r(); + void cop_data_w(uint8_t data); uint8_t cop_l_r(); void cop_l_w(uint8_t data); uint8_t cop_g_r(); - DECLARE_WRITE8_MEMBER(control_w); + void control_w(uint8_t data); void cop_g_w(uint8_t data); DECLARE_READ_LINE_MEMBER(kbdata_r); DECLARE_WRITE_LINE_MEMBER(kbclk_w); - DECLARE_WRITE8_MEMBER(control2_w); - DECLARE_READ8_MEMBER(dsw_b_r); - DECLARE_READ8_MEMBER(laserdsc_data_r); - DECLARE_WRITE8_MEMBER(laserdsc_data_w); - DECLARE_WRITE8_MEMBER(laserdsc_control_w); - DECLARE_WRITE8_MEMBER(den1_w); - DECLARE_WRITE8_MEMBER(den2_w); - DECLARE_WRITE8_MEMBER(ssi263_register_w); - DECLARE_READ8_MEMBER(ssi263_register_r); + void control2_w(uint8_t data); + uint8_t dsw_b_r(); + uint8_t laserdsc_data_r(); + void laserdsc_data_w(uint8_t data); + void laserdsc_control_w(uint8_t data); + void den1_w(uint8_t data); + void den2_w(uint8_t data); + void ssi263_register_w(offs_t offset, uint8_t data); + uint8_t ssi263_register_r(); virtual void machine_start() override; virtual void machine_reset() override; @@ -149,7 +149,7 @@ void thayers_state::check_interrupt() } } -WRITE8_MEMBER(thayers_state::intrq_w) +void thayers_state::intrq_w(uint8_t data) { // T = 1.1 * R30 * C53 = 1.1 * 750K * 0.01uF = 8.25 ms @@ -158,7 +158,7 @@ WRITE8_MEMBER(thayers_state::intrq_w) timer_set(attotime::from_usec(8250), TIMER_INTRQ_TICK); } -READ8_MEMBER(thayers_state::irqstate_r) +uint8_t thayers_state::irqstate_r() { /* @@ -178,7 +178,7 @@ READ8_MEMBER(thayers_state::irqstate_r) return m_cart_present << 6 | (m_data_rdy_int << 5) | (m_timer_int << 4) | 0x08 | (m_ssi_data_request << 2); } -WRITE8_MEMBER(thayers_state::timer_int_ack_w) +void thayers_state::timer_int_ack_w(uint8_t data) { if (LOG) logerror("%s %s TIMER INT ACK\n", machine().time().as_string(), machine().describe_context()); @@ -187,7 +187,7 @@ WRITE8_MEMBER(thayers_state::timer_int_ack_w) check_interrupt(); } -WRITE8_MEMBER(thayers_state::data_rdy_int_ack_w) +void thayers_state::data_rdy_int_ack_w(uint8_t data) { if (LOG) logerror("%s %s DATA RDY INT ACK\n", machine().time().as_string(), machine().describe_context()); @@ -226,7 +226,7 @@ void thayers_state::cop_d_w(uint8_t data) /* COP Communication */ -READ8_MEMBER(thayers_state::cop_data_r) +uint8_t thayers_state::cop_data_r() { if (!m_cop_data_latch_enable) { @@ -238,7 +238,7 @@ READ8_MEMBER(thayers_state::cop_data_r) } } -WRITE8_MEMBER(thayers_state::cop_data_w) +void thayers_state::cop_data_w(uint8_t data) { m_cop_data_latch = data; if (LOG) logerror("COP DATA %02x\n", m_cop_data_latch); @@ -278,7 +278,7 @@ uint8_t thayers_state::cop_g_r() return m_cop_cmd_latch; } -WRITE8_MEMBER(thayers_state::control_w) +void thayers_state::control_w(uint8_t data) { /* @@ -377,7 +377,7 @@ WRITE_LINE_MEMBER(thayers_state::kbclk_w) /* I/O Board */ -WRITE8_MEMBER(thayers_state::control2_w) +void thayers_state::control2_w(uint8_t data) { /* @@ -400,24 +400,24 @@ WRITE8_MEMBER(thayers_state::control2_w) } } -READ8_MEMBER(thayers_state::dsw_b_r) +uint8_t thayers_state::dsw_b_r() { return (ioport("COIN")->read() & 0xf0) | (ioport("DSWB")->read() & 0x0f); } -READ8_MEMBER(thayers_state::laserdsc_data_r) +uint8_t thayers_state::laserdsc_data_r() { if (m_ldv1000 != nullptr) return m_ldv1000->status_r(); if (m_pr7820 != nullptr) return m_pr7820->data_r(); return 0; } -WRITE8_MEMBER(thayers_state::laserdsc_data_w) +void thayers_state::laserdsc_data_w(uint8_t data) { m_laserdisc_data = data; } -WRITE8_MEMBER(thayers_state::laserdsc_control_w) +void thayers_state::laserdsc_control_w(uint8_t data) { /* @@ -453,7 +453,7 @@ WRITE8_MEMBER(thayers_state::laserdsc_control_w) } } -WRITE8_MEMBER(thayers_state::den1_w) +void thayers_state::den1_w(uint8_t data) { /* @@ -473,7 +473,7 @@ WRITE8_MEMBER(thayers_state::den1_w) m_digits[data >> 4] = led_map[data & 0x0f]; } -WRITE8_MEMBER(thayers_state::den2_w) +void thayers_state::den2_w(uint8_t data) { /* @@ -511,7 +511,7 @@ static const char SSI263_PHONEMES[0x40][5] = "L", "L1", "LF", "W", "B", "D", "KV", "P", "T", "K", "HV", "HVC", "HF", "HFC", "HN", "Z", "S", "J", "SCH", "V", "F", "THV", "TH", "M", "N", "NG", ":A", ":OH", ":U", ":UH", "E2", "LB" }; -WRITE8_MEMBER(thayers_state::ssi263_register_w) +void thayers_state::ssi263_register_w(offs_t offset, uint8_t data) { struct ssi263_t &ssi263 = m_ssi263; switch (offset) @@ -614,7 +614,7 @@ WRITE8_MEMBER(thayers_state::ssi263_register_w) } } -READ8_MEMBER(thayers_state::ssi263_register_r) +uint8_t thayers_state::ssi263_register_r() { // D7 becomes an output, as the inverted state of A/_R. The register address bits are ignored. diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index 2519435c9fd..f84827ab4de 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -57,15 +57,15 @@ public: private: // IOX - DECLARE_READ8_MEMBER(iox_r); - DECLARE_WRITE8_MEMBER(iox_w); - DECLARE_READ8_MEMBER(iox_status_r); + uint8_t iox_r(); + void iox_w(uint8_t data); + uint8_t iox_status_r(); uint8_t m_iox_cmd, m_iox_ret, m_iox_status, m_iox_leds, m_iox_coins; void iox_reset(); // memory map - DECLARE_READ8_MEMBER(irq_ack_r); - DECLARE_WRITE8_MEMBER(unk_w); + uint8_t irq_ack_r(); + void unk_w(uint8_t data); // machine TIMER_DEVICE_CALLBACK_MEMBER(thedealr_interrupt); @@ -150,7 +150,7 @@ void thedealr_state::machine_reset() } // 3400 -READ8_MEMBER(thedealr_state::iox_r) +uint8_t thedealr_state::iox_r() { uint8_t ret = m_iox_ret; m_iox_status &= ~IOX_OUT_FULL; @@ -158,7 +158,7 @@ READ8_MEMBER(thedealr_state::iox_r) logerror("%s: IOX read %02X\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(thedealr_state::iox_w) +void thedealr_state::iox_w(uint8_t data) { if (m_iox_status & IOX_WAITDATA) { @@ -253,7 +253,7 @@ WRITE8_MEMBER(thedealr_state::iox_w) } // 3401 -READ8_MEMBER(thedealr_state::iox_status_r) +uint8_t thedealr_state::iox_status_r() { // bit 0 - Out buff full? // bit 1 - In buff full? @@ -267,13 +267,13 @@ READ8_MEMBER(thedealr_state::iox_status_r) ***************************************************************************/ -READ8_MEMBER(thedealr_state::irq_ack_r) +uint8_t thedealr_state::irq_ack_r() { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); return 0; } -WRITE8_MEMBER(thedealr_state::unk_w) +void thedealr_state::unk_w(uint8_t data) { // bit 1 - ? 1 during game // bit 2 - ? 0 during game diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp index b51fe1edf50..ffa4c58fe4b 100644 --- a/src/mame/drivers/ti990_4.cpp +++ b/src/mame/drivers/ti990_4.cpp @@ -62,8 +62,8 @@ public: void init_ti990_4v(); private: - DECLARE_READ8_MEMBER( panel_read ); - DECLARE_WRITE8_MEMBER( panel_write ); + uint8_t panel_read(offs_t offset); + void panel_write(offs_t offset, uint8_t data); void external_operation(offs_t offset, uint8_t data); uint8_t interrupt_level(); DECLARE_WRITE_LINE_MEMBER( fd_interrupt ); @@ -113,7 +113,7 @@ void ti990_4_state::device_timer(emu_timer &timer, device_timer_id id, int param logerror("ti990_4: Released LOAD interrupt\n"); } -READ8_MEMBER( ti990_4_state::panel_read ) +uint8_t ti990_4_state::panel_read(offs_t offset) { if (offset == 11 || offset == 14) return 1; @@ -121,7 +121,7 @@ READ8_MEMBER( ti990_4_state::panel_read ) return 0; } -WRITE8_MEMBER( ti990_4_state::panel_write ) +void ti990_4_state::panel_write(offs_t offset, uint8_t data) { logerror("ti990_4: writing to panel @CRU %04x: %02x\n", offset<<1, data); } diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index 3fcd0dc9e38..ebbefc6d042 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -209,7 +209,7 @@ public: void driver_reset() override; private: - DECLARE_WRITE8_MEMBER(intflag_write); + void intflag_write(offs_t offset, uint8_t data); uint8_t mem_read(offs_t offset); void mem_write(offs_t offset, uint8_t data); @@ -288,7 +288,7 @@ void ti99_2_state::crumap(address_map &map) These CRU addresses are actually inside the 9995 CPU, but they are propagated to the outside world, so we can watch the changes. */ -WRITE8_MEMBER(ti99_2_state::intflag_write) +void ti99_2_state::intflag_write(offs_t offset, uint8_t data) { int addr = 0x1ee0 | (offset<<1); switch (addr) diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index 94a9543181b..076043c17f6 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -75,16 +75,16 @@ private: uint8_t m_gunx[2]; void get_crosshair_xy(int player, int &x, int &y); - DECLARE_WRITE16_MEMBER(rapidfir_transparent_w); - DECLARE_READ16_MEMBER(rapidfir_transparent_r); - DECLARE_WRITE16_MEMBER(tickee_control_w); - DECLARE_READ16_MEMBER(ffff_r); - DECLARE_READ16_MEMBER(rapidfir_gun1_r); - DECLARE_READ16_MEMBER(rapidfir_gun2_r); - DECLARE_READ16_MEMBER(ff7f_r); - DECLARE_WRITE16_MEMBER(ff7f_w); - DECLARE_WRITE16_MEMBER(rapidfir_control_w); - DECLARE_WRITE16_MEMBER(sound_bank_w); + void rapidfir_transparent_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t rapidfir_transparent_r(offs_t offset); + void tickee_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t ffff_r(); + uint16_t rapidfir_gun1_r(); + uint16_t rapidfir_gun2_r(); + uint16_t ff7f_r(); + void ff7f_w(uint16_t data); + void rapidfir_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void sound_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_MACHINE_RESET(tickee); DECLARE_VIDEO_START(tickee); DECLARE_MACHINE_RESET(rapidfir); @@ -298,7 +298,7 @@ MACHINE_RESET_MEMBER(tickee_state,rapidfir) * *************************************/ -WRITE16_MEMBER(tickee_state::rapidfir_transparent_w) +void tickee_state::rapidfir_transparent_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (!(data & 0xff00)) mem_mask &= 0x00ff; if (!(data & 0x00ff)) mem_mask &= 0xff00; @@ -306,7 +306,7 @@ WRITE16_MEMBER(tickee_state::rapidfir_transparent_w) } -READ16_MEMBER(tickee_state::rapidfir_transparent_r) +uint16_t tickee_state::rapidfir_transparent_r(offs_t offset) { return m_vram[offset]; } @@ -333,7 +333,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(tickee_state::rapidfir_from_shiftreg) * *************************************/ -WRITE16_MEMBER(tickee_state::tickee_control_w) +void tickee_state::tickee_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t olddata = m_control[offset]; @@ -364,36 +364,36 @@ WRITE16_MEMBER(tickee_state::tickee_control_w) * *************************************/ -READ16_MEMBER(tickee_state::ffff_r) +uint16_t tickee_state::ffff_r() { return 0xffff; } -READ16_MEMBER(tickee_state::rapidfir_gun1_r) +uint16_t tickee_state::rapidfir_gun1_r() { return m_gunx[0]; } -READ16_MEMBER(tickee_state::rapidfir_gun2_r) +uint16_t tickee_state::rapidfir_gun2_r() { return m_gunx[1]; } -READ16_MEMBER(tickee_state::ff7f_r) +uint16_t tickee_state::ff7f_r() { /* Ticket dispenser status? */ return 0xff7f; } -WRITE16_MEMBER(tickee_state::ff7f_w) +void tickee_state::ff7f_w(uint16_t data) { /* Ticket dispenser output? */ } -WRITE16_MEMBER(tickee_state::rapidfir_control_w) +void tickee_state::rapidfir_control_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* other bits like control on tickee? */ if (ACCESSING_BITS_0_7) @@ -408,7 +408,7 @@ WRITE16_MEMBER(tickee_state::rapidfir_control_w) * *************************************/ -WRITE16_MEMBER(tickee_state::sound_bank_w) +void tickee_state::sound_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { switch (data & 0xff) { diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp index d24b12c2b40..3f44222ce2c 100644 --- a/src/mame/drivers/tim011.cpp +++ b/src/mame/drivers/tim011.cpp @@ -36,11 +36,11 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_tim011(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(print_w); - DECLARE_WRITE8_MEMBER(scroll_w); - DECLARE_WRITE8_MEMBER(fdc_dma_w); - DECLARE_READ8_MEMBER(print_r); - DECLARE_READ8_MEMBER(scroll_r); + void print_w(uint8_t data); + void scroll_w(uint8_t data); + void fdc_dma_w(uint8_t data); + uint8_t print_r(); + uint8_t scroll_r(); uint8_t m_scroll; required_device<cpu_device> m_maincpu; @@ -94,28 +94,28 @@ uint32_t tim011_state::screen_update_tim011(screen_device &screen, bitmap_ind16 return 0; } -WRITE8_MEMBER(tim011_state::fdc_dma_w) +void tim011_state::fdc_dma_w(uint8_t data) { printf("fdc_dma_w :%02x\n",data); } -WRITE8_MEMBER(tim011_state::print_w) +void tim011_state::print_w(uint8_t data) { //printf("print_w :%02x\n",data); } -READ8_MEMBER(tim011_state::print_r) +uint8_t tim011_state::print_r() { //printf("print_r\n"); return 0; } -WRITE8_MEMBER(tim011_state::scroll_w) +void tim011_state::scroll_w(uint8_t data) { m_scroll = data; } -READ8_MEMBER(tim011_state::scroll_r) +uint8_t tim011_state::scroll_r() { return m_scroll; } diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp index 28dd24614e4..41afcce9597 100644 --- a/src/mame/drivers/tk80.cpp +++ b/src/mame/drivers/tk80.cpp @@ -78,8 +78,8 @@ private: uint8_t serial_r(); void serial_w(uint8_t data); void mikrolab_serial_w(uint8_t data); - DECLARE_READ8_MEMBER(display_r); - DECLARE_WRITE8_MEMBER(display_w); + uint8_t display_r(offs_t offset); + void display_w(offs_t offset, uint8_t data); void ics8080_mem(address_map &map); void mikrolab_io(address_map &map); @@ -111,12 +111,12 @@ void tk80_state::machine_start() save_item(NAME(m_ppi_portc)); } -READ8_MEMBER( tk80_state::display_r ) +uint8_t tk80_state::display_r(offs_t offset) { return m_digit[offset & 0x7]; } -WRITE8_MEMBER( tk80_state::display_w ) +void tk80_state::display_w(offs_t offset, uint8_t data) { m_digit[offset & 0x7] = data; } diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index 7303370e7b4..c5d4b5e01a3 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -101,10 +101,10 @@ public: DECLARE_INPUT_CHANGED_MEMBER( load_interrupt ); private: - DECLARE_READ8_MEMBER(video_vdp_r); - DECLARE_WRITE8_MEMBER(video_vdp_w); - DECLARE_READ8_MEMBER(video_joy_r); - DECLARE_WRITE8_MEMBER(video_joy_w); + uint8_t video_vdp_r(offs_t offset); + void video_vdp_w(offs_t offset, uint8_t data); + uint8_t video_joy_r(); + void video_joy_w(uint8_t data); void external_operation(offs_t offset, uint8_t data); @@ -587,7 +587,7 @@ void tm990189_state::external_operation(offs_t offset, uint8_t data) Video Board handling */ -READ8_MEMBER( tm990189_state::video_vdp_r ) +uint8_t tm990189_state::video_vdp_r(offs_t offset) { int reply = 0; @@ -618,7 +618,7 @@ READ8_MEMBER( tm990189_state::video_vdp_r ) return reply; } -WRITE8_MEMBER( tm990189_state::video_vdp_w ) +void tm990189_state::video_vdp_w(offs_t offset, uint8_t data) { if (offset & 1) { @@ -629,7 +629,7 @@ WRITE8_MEMBER( tm990189_state::video_vdp_w ) } } -READ8_MEMBER( tm990189_state::video_joy_r ) +uint8_t tm990189_state::video_joy_r() { uint8_t data = ioport("BUTTONS")->read(); @@ -648,7 +648,7 @@ READ8_MEMBER( tm990189_state::video_joy_r ) return data; } -WRITE8_MEMBER( tm990189_state::video_joy_w ) +void tm990189_state::video_joy_w(uint8_t data) { m_joy1x_timer->reset(attotime::from_usec(ioport("JOY1_X")->read()*28+28)); m_joy1y_timer->reset(attotime::from_usec(ioport("JOY1_Y")->read()*28+28)); diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp index 0c84029c299..7e4445a9e98 100644 --- a/src/mame/drivers/tmaster.cpp +++ b/src/mame/drivers/tmaster.cpp @@ -140,8 +140,8 @@ private: DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - DECLARE_READ16_MEMBER(rtc_r); - DECLARE_WRITE16_MEMBER(rtc_w); + uint16_t rtc_r(offs_t offset); + void rtc_w(offs_t offset, uint16_t data); void tmaster_map(address_map &map); void cpu_space_map(address_map &map); @@ -232,7 +232,7 @@ uint8_t binary_to_bcd(uint8_t data) return ((data / 10) << 4) | (data % 10); } -READ16_MEMBER(tmaster_state::rtc_r) +uint16_t tmaster_state::rtc_r(offs_t offset) { system_time systime; @@ -248,7 +248,7 @@ READ16_MEMBER(tmaster_state::rtc_r) return m_rtc_ram[offset]; } -WRITE16_MEMBER(tmaster_state::rtc_w) +void tmaster_state::rtc_w(offs_t offset, uint16_t data) { if ( offset == 0 ) { diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index 16a39d24ac1..4315b0c991c 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -95,15 +95,15 @@ private: emu_timer *m_blit_done_timer; #endif - template<uint8_t Tilemap> DECLARE_WRITE32_MEMBER(tilemap_w); - template<uint8_t Tilemap> DECLARE_READ32_MEMBER(tilemap_r); - DECLARE_READ32_MEMBER(randomtmmjprds); - DECLARE_READ32_MEMBER(mux_r); - template<uint8_t Number> DECLARE_WRITE32_MEMBER(brt_w); - DECLARE_WRITE32_MEMBER(eeprom_write); + template<uint8_t Tilemap> void tilemap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + template<uint8_t Tilemap> uint32_t tilemap_r(offs_t offset); + uint32_t randomtmmjprds(); + uint32_t mux_r(); + template<uint8_t Number> void brt_w(uint32_t data); + void eeprom_write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); #if EMULATE_BLITTER - DECLARE_WRITE32_MEMBER(blitter_w); + void blitter_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void do_blit(); #endif @@ -124,7 +124,7 @@ private: }; template<uint8_t Tilemap> -WRITE32_MEMBER(tmmjprd_state::tilemap_w) +void tmmjprd_state::tilemap_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_tilemap_ram[Tilemap][offset]); } @@ -382,12 +382,12 @@ void tmmjprd_state::video_start() } template<uint8_t Tilemap> -READ32_MEMBER(tmmjprd_state::tilemap_r) +uint32_t tmmjprd_state::tilemap_r(offs_t offset) { return m_tilemap_ram[Tilemap][offset]; } -READ32_MEMBER(tmmjprd_state::randomtmmjprds) +uint32_t tmmjprd_state::randomtmmjprds() { return 0x0000;//machine().rand(); } @@ -497,7 +497,7 @@ void tmmjprd_state::do_blit() -WRITE32_MEMBER(tmmjprd_state::blitter_w) +void tmmjprd_state::blitter_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_blitterregs[offset]); @@ -518,7 +518,7 @@ void tmmjprd_state::machine_start() save_item(NAME(m_system_in)); } -WRITE32_MEMBER(tmmjprd_state::eeprom_write) +void tmmjprd_state::eeprom_write(offs_t offset, uint32_t data, uint32_t mem_mask) { // don't disturb the EEPROM if we're not actually writing to it // (in particular, data & 0x100 here with mask = ffff00ff looks to be the watchdog) @@ -538,7 +538,7 @@ WRITE32_MEMBER(tmmjprd_state::eeprom_write) } } -READ32_MEMBER(tmmjprd_state::mux_r) +uint32_t tmmjprd_state::mux_r() { m_system_in = m_system->read(); @@ -646,7 +646,7 @@ INPUT_PORTS_END /* notice that data & 0x4 is always cleared on brt_1 and set on brt_2. * * My wild guess is that bits 0,1 and 2 controls what palette entries to dim. */ template<uint8_t Number> -WRITE32_MEMBER(tmmjprd_state::brt_w) +void tmmjprd_state::brt_w(uint32_t data) { data>>=24; double brt = ((data & 0x78)>>3) / 15.0; diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp index 861b5d2fdba..a6f2efe0fb6 100644 --- a/src/mame/drivers/tmspoker.cpp +++ b/src/mame/drivers/tmspoker.cpp @@ -247,8 +247,8 @@ private: required_device_array<ls259_device, 4> m_outlatch; required_ioport_array<3> m_inputs; - DECLARE_WRITE8_MEMBER(tmspoker_videoram_w); - //DECLARE_WRITE8_MEMBER(debug_w); + void tmspoker_videoram_w(offs_t offset, uint8_t data); + //void debug_w(uint8_t data); uint8_t inputs_r(offs_t offset); TILE_GET_INFO_MEMBER(get_bg_tile_info); void tmspoker_palette(palette_device &palette) const; @@ -264,7 +264,7 @@ private: * Video Hardware * *************************/ -WRITE8_MEMBER(tmspoker_state::tmspoker_videoram_w) +void tmspoker_state::tmspoker_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); @@ -304,7 +304,7 @@ void tmspoker_state::tmspoker_palette(palette_device &palette) const * Read / Write Handlers * **************************/ -//WRITE8_MEMBER(tmspoker_state::debug_w) +//void tmspoker_state::debug_w(uint8_t data) //{ // popmessage("written : %02X", data); //} diff --git a/src/mame/drivers/toki_ms.cpp b/src/mame/drivers/toki_ms.cpp index 947f69fc1c5..1794603f2b7 100644 --- a/src/mame/drivers/toki_ms.cpp +++ b/src/mame/drivers/toki_ms.cpp @@ -313,15 +313,15 @@ private: TILE_GET_INFO_MEMBER(get_bk2_info); TILE_GET_INFO_MEMBER(get_tile_info); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); - DECLARE_WRITE16_MEMBER(bk1vram_w); - DECLARE_WRITE16_MEMBER(bk2vram_w); - DECLARE_WRITE16_MEMBER(vram_w); + void bk1vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void bk2vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); tilemap_t *m_bk1_tilemap; tilemap_t *m_bk2_tilemap; tilemap_t *m_tx_tilemap; - DECLARE_READ8_MEMBER(palette_r); - DECLARE_WRITE8_MEMBER(palette_w); + u8 palette_r(offs_t offset); + void palette_w(offs_t offset, u8 data); std::unique_ptr<u8 []> m_paletteram; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -329,9 +329,9 @@ private: void tokims_map(address_map &map); void audio_map(address_map &map); - DECLARE_READ8_MEMBER(sound_status_r); - DECLARE_WRITE8_MEMBER(sound_command_w); - DECLARE_WRITE8_MEMBER(adpcm_w); + u8 sound_status_r(); + void sound_command_w(u8 data); + void adpcm_w(u8 data); DECLARE_WRITE_LINE_MEMBER(adpcm_int); u8 m_adpcm_data; }; @@ -457,30 +457,30 @@ uint32_t toki_ms_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -WRITE16_MEMBER(toki_ms_state::bk1vram_w) +void toki_ms_state::bk1vram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_bk1vram[offset]); m_bk1_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(toki_ms_state::bk2vram_w) +void toki_ms_state::bk2vram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_bk2vram[offset]); m_bk2_tilemap->mark_tile_dirty(offset); } -WRITE16_MEMBER(toki_ms_state::vram_w) +void toki_ms_state::vram_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_vram[offset]); m_tx_tilemap->mark_tile_dirty(offset); } -READ8_MEMBER(toki_ms_state::palette_r) +u8 toki_ms_state::palette_r(offs_t offset) { return m_paletteram[offset]; } -WRITE8_MEMBER(toki_ms_state::palette_w) +void toki_ms_state::palette_w(offs_t offset, u8 data) { m_paletteram[offset] = data; // xBGR444 over an 8-bit bus @@ -493,7 +493,7 @@ WRITE8_MEMBER(toki_ms_state::palette_w) m_palette->set_pen_color(pal_entry, pal4bit(r),pal4bit(g),pal4bit(b)); } -READ8_MEMBER(toki_ms_state::sound_status_r) +u8 toki_ms_state::sound_status_r() { // if non-zero skips new command, either soundlatch readback or audiocpu handshake return 0; @@ -501,7 +501,7 @@ READ8_MEMBER(toki_ms_state::sound_status_r) // TODO: remove this trampoline after confirming it just writes to the sound latch // (definitely it isn't tied to irq 0) -WRITE8_MEMBER(toki_ms_state::sound_command_w) +void toki_ms_state::sound_command_w(u8 data) { m_soundlatch->write(data & 0xff); } @@ -524,7 +524,7 @@ void toki_ms_state::tokims_map(address_map &map) map(0x0c000e, 0x0c000f).rw(FUNC(toki_ms_state::sound_status_r), FUNC(toki_ms_state::sound_command_w)).umask16(0x00ff); } -WRITE8_MEMBER(toki_ms_state::adpcm_w) +void toki_ms_state::adpcm_w(u8 data) { // membank("sound_bank")->set_entry(((data & 0x10) >> 4) ^ 1); m_msm->reset_w(BIT(data, 4)); @@ -811,13 +811,13 @@ ROM_END void toki_ms_state::init_tokims() { // copied verbatim from toki.cpp - uint8_t temp[0x20000]; + u8 temp[0x20000]; int len = memregion("gfx3")->bytes(); - uint8_t *rom = memregion("gfx3")->base(); + u8 *rom = memregion("gfx3")->base(); for (int offs = 0; offs < len; offs += 0x20000) { - uint8_t *base = &rom[offs]; + u8 *base = &rom[offs]; memcpy (&temp[0], base, 65536 * 2); for (int i = 0; i < 16; i++) { @@ -832,7 +832,7 @@ void toki_ms_state::init_tokims() rom = memregion("gfx4")->base(); for (int offs = 0; offs < len; offs += 0x20000) { - uint8_t *base = &rom[offs]; + u8 *base = &rom[offs]; memcpy (&temp[0], base, 65536 * 2); for (int i = 0; i < 16; i++) { diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index c8b1e3503d5..169698b6da5 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -60,22 +60,22 @@ public: void tomcat(machine_config &config); private: - DECLARE_WRITE8_MEMBER(adcon_w); - DECLARE_READ16_MEMBER(tomcat_inputs_r); - DECLARE_WRITE16_MEMBER(main_latch_w); + void adcon_w(uint8_t data); + uint16_t tomcat_inputs_r(offs_t offset, uint16_t mem_mask = ~0); + void main_latch_w(offs_t offset, uint16_t data); DECLARE_WRITE_LINE_MEMBER(lnkmode_w); DECLARE_WRITE_LINE_MEMBER(err_w); DECLARE_WRITE_LINE_MEMBER(ack_w); DECLARE_WRITE_LINE_MEMBER(txbuff_w); DECLARE_WRITE_LINE_MEMBER(sndres_w); DECLARE_WRITE_LINE_MEMBER(mres_w); - DECLARE_WRITE16_MEMBER(tomcat_irqclr_w); - DECLARE_READ16_MEMBER(tomcat_inputs2_r); - DECLARE_READ16_MEMBER(tomcat_320bio_r); - DECLARE_READ8_MEMBER(tomcat_nvram_r); - DECLARE_WRITE8_MEMBER(tomcat_nvram_w); + void tomcat_irqclr_w(uint16_t data); + uint16_t tomcat_inputs2_r(); + uint16_t tomcat_320bio_r(); + uint8_t tomcat_nvram_r(offs_t offset); + void tomcat_nvram_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER(dsp_bio_r); - DECLARE_WRITE8_MEMBER(soundlatches_w); + void soundlatches_w(offs_t offset, uint8_t data); virtual void machine_start() override; void dsp_map(address_map &map); void sound_map(address_map &map); @@ -95,13 +95,13 @@ private: -WRITE8_MEMBER(tomcat_state::adcon_w) +void tomcat_state::adcon_w(uint8_t data) { m_adc->address_w(data & 7); m_adc->start_w(BIT(data, 3)); } -READ16_MEMBER(tomcat_state::tomcat_inputs_r) +uint16_t tomcat_state::tomcat_inputs_r(offs_t offset, uint16_t mem_mask) { uint16_t result = 0; if (ACCESSING_BITS_8_15) @@ -110,7 +110,7 @@ READ16_MEMBER(tomcat_state::tomcat_inputs_r) return result; } -WRITE16_MEMBER(tomcat_state::main_latch_w) +void tomcat_state::main_latch_w(offs_t offset, uint16_t data) { // A1-A3 = address, A4 = data m_mainlatch->write_bit(offset & 7, BIT(offset, 3)); @@ -155,13 +155,13 @@ WRITE_LINE_MEMBER(tomcat_state::mres_w) m_dsp->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); } -WRITE16_MEMBER(tomcat_state::tomcat_irqclr_w) +void tomcat_state::tomcat_irqclr_w(uint16_t data) { // Clear IRQ Latch (Address Strobe) m_maincpu->set_input_line(1, CLEAR_LINE); } -READ16_MEMBER(tomcat_state::tomcat_inputs2_r) +uint16_t tomcat_state::tomcat_inputs2_r() { /* * D15 LNKFLAG (Game Link) @@ -176,7 +176,7 @@ READ16_MEMBER(tomcat_state::tomcat_inputs2_r) return m_dsp_idle ? 0 : (1 << 9); } -READ16_MEMBER(tomcat_state::tomcat_320bio_r) +uint16_t tomcat_state::tomcat_320bio_r() { m_dsp_bio = 1; m_maincpu->suspend(SUSPEND_REASON_SPIN, 1); @@ -215,12 +215,12 @@ READ_LINE_MEMBER(tomcat_state::dsp_bio_r) } } -READ8_MEMBER(tomcat_state::tomcat_nvram_r) +uint8_t tomcat_state::tomcat_nvram_r(offs_t offset) { return m_nvram[offset]; } -WRITE8_MEMBER(tomcat_state::tomcat_nvram_w) +void tomcat_state::tomcat_nvram_w(offs_t offset, uint8_t data) { m_nvram[offset] = data; } @@ -247,7 +247,7 @@ void tomcat_state::dsp_map(address_map &map) } -WRITE8_MEMBER(tomcat_state::soundlatches_w) +void tomcat_state::soundlatches_w(offs_t offset, uint8_t data) { switch(offset) { diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index 639f8ad548e..805860a038f 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -80,9 +80,9 @@ private: required_device<pia6821_device> m_pia_u1; required_device<pia6821_device> m_pia_u2; required_device<pia6821_device> m_pia_u3; - DECLARE_WRITE8_MEMBER(clear_tv_w); - DECLARE_READ8_MEMBER(timer_r); - DECLARE_WRITE8_MEMBER(clear_timer_w); + void clear_tv_w(uint8_t data); + uint8_t timer_r(); + void clear_timer_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(cb2_u2_w); void port_b_u1_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(main_cpu_irq); @@ -151,7 +151,7 @@ uint32_t toratora_state::screen_update_toratora(screen_device &screen, bitmap_rg } -WRITE8_MEMBER(toratora_state::clear_tv_w) +void toratora_state::clear_tv_w(uint8_t data) { m_clear_tv = 1; } @@ -206,12 +206,12 @@ INTERRUPT_GEN_MEMBER(toratora_state::toratora_timer) m_pia_u1->ca2_w(ioport("INPUT")->read() & 0x20); } -READ8_MEMBER(toratora_state::timer_r) +uint8_t toratora_state::timer_r() { return m_timer; } -WRITE8_MEMBER(toratora_state::clear_timer_w) +void toratora_state::clear_timer_w(uint8_t data) { m_timer = 0; m_maincpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp index 5b8c4ff2d35..692f2b979f2 100644 --- a/src/mame/drivers/tosh1000.cpp +++ b/src/mame/drivers/tosh1000.cpp @@ -78,11 +78,10 @@ public: private: DECLARE_MACHINE_RESET(tosh1000); - DECLARE_WRITE8_MEMBER(romdos_bank_w); - DECLARE_READ8_MEMBER(romdos_bank_r); + void romdos_bank_w(uint8_t data); - DECLARE_WRITE8_MEMBER(bram_w); - DECLARE_READ8_MEMBER(bram_r); + void bram_w(offs_t offset, uint8_t data); + uint8_t bram_r(offs_t offset); static void cfg_fdc_35(device_t *device); void tosh1000_io(address_map &map); @@ -116,7 +115,7 @@ MACHINE_RESET_MEMBER(tosh1000_state, tosh1000) } -WRITE8_MEMBER(tosh1000_state::romdos_bank_w) +void tosh1000_state::romdos_bank_w(uint8_t data) { LOGDBG("ROM-DOS <- %02x (%s, accessing bank %d)\n", data, BIT(data, 7)?"enable":"disable", data&7); @@ -130,7 +129,7 @@ WRITE8_MEMBER(tosh1000_state::romdos_bank_w) } } -WRITE8_MEMBER(tosh1000_state::bram_w) +void tosh1000_state::bram_w(offs_t offset, uint8_t data) { LOGDBG("BRAM %02x <- %02x\n", 0xc0 + offset, data); @@ -177,7 +176,7 @@ WRITE8_MEMBER(tosh1000_state::bram_w) } } -READ8_MEMBER(tosh1000_state::bram_r) +uint8_t tosh1000_state::bram_r(offs_t offset) { uint8_t data = 0; diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp index 88a0e828317..b257d003dd1 100644 --- a/src/mame/drivers/toypop.cpp +++ b/src/mame/drivers/toypop.cpp @@ -88,25 +88,25 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(master_scanline); DECLARE_WRITE_LINE_MEMBER(slave_vblank_irq); - DECLARE_READ8_MEMBER(irq_enable_r); - DECLARE_WRITE8_MEMBER(irq_disable_w); - DECLARE_WRITE8_MEMBER(irq_ctrl_w); + uint8_t irq_enable_r(); + void irq_disable_w(uint8_t data); + void irq_ctrl_w(offs_t offset, uint8_t data); void toypop_palette(palette_device &palette) const; uint8_t dipA_l(); uint8_t dipA_h(); uint8_t dipB_l(); uint8_t dipB_h(); - //DECLARE_WRITE8_MEMBER(out_coin0); - //DECLARE_WRITE8_MEMBER(out_coin1); - DECLARE_WRITE8_MEMBER(pal_bank_w); + //void out_coin0(uint8_t data); + //void out_coin1(uint8_t data); + void pal_bank_w(offs_t offset, uint8_t data); void flip(uint8_t data); - DECLARE_WRITE8_MEMBER(slave_halt_ctrl_w); - DECLARE_READ8_MEMBER(slave_shared_r); - DECLARE_WRITE8_MEMBER(slave_shared_w); - DECLARE_WRITE16_MEMBER(slave_irq_enable_w); - DECLARE_WRITE8_MEMBER(sound_halt_ctrl_w); - DECLARE_READ8_MEMBER(bg_rmw_r); - DECLARE_WRITE8_MEMBER(bg_rmw_w); + void slave_halt_ctrl_w(offs_t offset, uint8_t data); + uint8_t slave_shared_r(offs_t offset); + void slave_shared_w(offs_t offset, uint8_t data); + void slave_irq_enable_w(offs_t offset, uint16_t data); + void sound_halt_ctrl_w(offs_t offset, uint8_t data); + uint8_t bg_rmw_r(offs_t offset); + void bg_rmw_w(offs_t offset, uint8_t data); void master_liblrabl_map(address_map &map); void master_toypop_map(address_map &map); @@ -311,49 +311,49 @@ uint32_t namcos16_state::screen_update( screen_device &screen, bitmap_ind16 &bit return 0; } -READ8_MEMBER(namcos16_state::irq_enable_r) +uint8_t namcos16_state::irq_enable_r() { m_master_irq_enable = true; return 0; } -WRITE8_MEMBER(namcos16_state::irq_disable_w) +void namcos16_state::irq_disable_w(uint8_t data) { m_master_irq_enable = false; } -WRITE8_MEMBER(namcos16_state::irq_ctrl_w) +void namcos16_state::irq_ctrl_w(offs_t offset, uint8_t data) { m_master_irq_enable = (offset & 0x0800) ? false : true; } -WRITE8_MEMBER(namcos16_state::slave_halt_ctrl_w) +void namcos16_state::slave_halt_ctrl_w(offs_t offset, uint8_t data) { m_slave_cpu->set_input_line(INPUT_LINE_RESET,offset & 0x800 ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER(namcos16_state::sound_halt_ctrl_w) +void namcos16_state::sound_halt_ctrl_w(offs_t offset, uint8_t data) { m_sound_cpu->set_input_line(INPUT_LINE_RESET,offset & 0x800 ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER(namcos16_state::slave_shared_r) +uint8_t namcos16_state::slave_shared_r(offs_t offset) { return m_slave_sharedram[offset]; } -WRITE8_MEMBER(namcos16_state::slave_shared_w) +void namcos16_state::slave_shared_w(offs_t offset, uint8_t data) { m_slave_sharedram[offset] = data; } -WRITE16_MEMBER(namcos16_state::slave_irq_enable_w) +void namcos16_state::slave_irq_enable_w(offs_t offset, uint16_t data) { m_slave_irq_enable = (offset & 0x40000) ? false : true; } -READ8_MEMBER(namcos16_state::bg_rmw_r) +uint8_t namcos16_state::bg_rmw_r(offs_t offset) { uint8_t res; @@ -364,7 +364,7 @@ READ8_MEMBER(namcos16_state::bg_rmw_r) return res; } -WRITE8_MEMBER(namcos16_state::bg_rmw_w) +void namcos16_state::bg_rmw_w(offs_t offset, uint8_t data) { // note: following offset is written as offset * 2 m_bgvram[offset] = (data & 0xf) | ((data & 0xf0) << 4); @@ -380,7 +380,7 @@ void namcos16_state::flip(uint8_t data) flip_screen_set(data & 1); } -WRITE8_MEMBER(namcos16_state::pal_bank_w) +void namcos16_state::pal_bank_w(offs_t offset, uint8_t data) { m_pal_bank = offset & 1; } diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp index 0a9084740db..ad5865652c1 100644 --- a/src/mame/drivers/tr175.cpp +++ b/src/mame/drivers/tr175.cpp @@ -24,9 +24,9 @@ public: void tr175(machine_config &config); private: - DECLARE_WRITE8_MEMBER(ffec01_w); - DECLARE_WRITE8_MEMBER(fff000_w); - DECLARE_READ8_MEMBER(fff400_r); + void ffec01_w(uint8_t data); + void fff000_w(uint8_t data); + uint8_t fff400_r(); SCN2674_DRAW_CHARACTER_MEMBER(draw_character); void mem_map(address_map &map); @@ -36,17 +36,17 @@ private: required_device<cpu_device> m_maincpu; }; -WRITE8_MEMBER(tr175_state::ffec01_w) +void tr175_state::ffec01_w(uint8_t data) { logerror("%s: Writing %02X to FFEC01\n", machine().describe_context(), data); } -WRITE8_MEMBER(tr175_state::fff000_w) +void tr175_state::fff000_w(uint8_t data) { logerror("%s: Writing %02X to FFF000\n", machine().describe_context(), data); } -READ8_MEMBER(tr175_state::fff400_r) +uint8_t tr175_state::fff400_r() { return 0; } diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp index e945f2efda6..cfc1f76b91b 100644 --- a/src/mame/drivers/triforce.cpp +++ b/src/mame/drivers/triforce.cpp @@ -473,10 +473,10 @@ public: void triforce_base(machine_config &config); private: - DECLARE_READ64_MEMBER(gc_pi_r); - DECLARE_WRITE64_MEMBER(gc_pi_w); - DECLARE_READ64_MEMBER(gc_exi_r); - DECLARE_WRITE64_MEMBER(gc_exi_w); + uint64_t gc_pi_r(); + void gc_pi_w(uint64_t data); + uint64_t gc_exi_r(); + void gc_exi_w(uint64_t data); virtual void machine_start() override; virtual void video_start() override; uint32_t screen_update_triforce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -484,21 +484,21 @@ private: void gc_map(address_map &map); }; -READ64_MEMBER(triforce_state::gc_pi_r) +uint64_t triforce_state::gc_pi_r() { return 0; } -WRITE64_MEMBER(triforce_state::gc_pi_w) +void triforce_state::gc_pi_w(uint64_t data) { } -READ64_MEMBER(triforce_state::gc_exi_r) +uint64_t triforce_state::gc_exi_r() { return 0; } -WRITE64_MEMBER(triforce_state::gc_exi_w) +void triforce_state::gc_exi_w(uint64_t data) { } diff --git a/src/mame/drivers/trivrus.cpp b/src/mame/drivers/trivrus.cpp index 3fba94cdb98..8bfc64685dc 100644 --- a/src/mame/drivers/trivrus.cpp +++ b/src/mame/drivers/trivrus.cpp @@ -60,50 +60,50 @@ private: uint32_t m_Bank; uint32_t m_maxbank; - DECLARE_READ32_MEMBER(FlashCmd_r); - DECLARE_WRITE32_MEMBER(FlashCmd_w); - DECLARE_WRITE32_MEMBER(Banksw_w); + uint32_t FlashCmd_r(); + void FlashCmd_w(uint32_t data); + void Banksw_w(uint32_t data); virtual void machine_start() override; virtual void machine_reset() override; void trivrus_mem(address_map &map); // PIO - DECLARE_READ32_MEMBER(PIOldat_r); + uint32_t PIOldat_r(); uint32_t m_PIO; - DECLARE_WRITE32_MEMBER(PIOldat_w); - DECLARE_READ32_MEMBER(PIOedat_r); + void PIOldat_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t PIOedat_r(); - DECLARE_READ8_MEMBER(trivrus_input_r); - DECLARE_WRITE8_MEMBER(trivrus_input_w); + uint8_t trivrus_input_r(); + void trivrus_input_w(uint8_t data); uint8_t m_trivrus_input; }; -WRITE32_MEMBER(trivrus_state::FlashCmd_w) +void trivrus_state::FlashCmd_w(uint32_t data) { m_FlashCmd = data; } -READ32_MEMBER(trivrus_state::PIOedat_r) +uint32_t trivrus_state::PIOedat_r() { return 0; } -READ32_MEMBER(trivrus_state::PIOldat_r) +uint32_t trivrus_state::PIOldat_r() { // ... return m_PIO; } // PIO Latched output DATa Register -WRITE32_MEMBER(trivrus_state::PIOldat_w) +void trivrus_state::PIOldat_w(offs_t offset, uint32_t data, uint32_t mem_mask) { // ... COMBINE_DATA(&m_PIO); } -READ8_MEMBER(trivrus_state::trivrus_input_r) +uint8_t trivrus_state::trivrus_input_r() { switch (m_trivrus_input) { @@ -118,12 +118,12 @@ READ8_MEMBER(trivrus_state::trivrus_input_r) return 0xff; } -WRITE8_MEMBER(trivrus_state::trivrus_input_w) +void trivrus_state::trivrus_input_w(uint8_t data) { m_trivrus_input = data & 0xff; } -READ32_MEMBER(trivrus_state::FlashCmd_r) +uint32_t trivrus_state::FlashCmd_r() { if ((m_FlashCmd & 0xff) == 0xff) { @@ -146,7 +146,7 @@ READ32_MEMBER(trivrus_state::FlashCmd_r) } -WRITE32_MEMBER(trivrus_state::Banksw_w) +void trivrus_state::Banksw_w(uint32_t data) { m_Bank = (data >> 1) & 7; m_mainbank->set_entry(m_Bank); diff --git a/src/mame/drivers/trkfldch.cpp b/src/mame/drivers/trkfldch.cpp index f5b771af04e..47a93279f04 100644 --- a/src/mame/drivers/trkfldch.cpp +++ b/src/mame/drivers/trkfldch.cpp @@ -82,7 +82,7 @@ private: uint32_t screen_update_trkfldch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void trkfldch_map(address_map &map); - DECLARE_READ8_MEMBER(read_vector); + uint8_t read_vector(offs_t offset); TIMER_DEVICE_CALLBACK_MEMBER(scanline); @@ -90,38 +90,38 @@ private: uint8_t tilemap_scroll_window_r(int which, uint8_t reg, uint16_t real_base); - DECLARE_READ8_MEMBER(tmap0_scroll_window_r); - DECLARE_READ8_MEMBER(tmap1_scroll_window_r); + uint8_t tmap0_scroll_window_r(offs_t offset); + uint8_t tmap1_scroll_window_r(offs_t offset); void tilemap_scroll_window_w(int which, uint8_t reg, uint8_t data, uint16_t real_base); - DECLARE_WRITE8_MEMBER(tmap0_scroll_window_w); - DECLARE_WRITE8_MEMBER(tmap1_scroll_window_w); + void tmap0_scroll_window_w(offs_t offset, uint8_t data); + void tmap1_scroll_window_w(offs_t offset, uint8_t data); uint8_t m_dmaregs[0xe]; - DECLARE_READ8_MEMBER(dmaregs_r); - DECLARE_WRITE8_MEMBER(dmaregs_w); + uint8_t dmaregs_r(offs_t offset); + void dmaregs_w(offs_t offset, uint8_t data); uint8_t m_modebank[0xb]; - DECLARE_READ8_MEMBER(modebankregs_r); - DECLARE_WRITE8_MEMBER(modebankregs_w); + uint8_t modebankregs_r(offs_t offset); + void modebankregs_w(offs_t offset, uint8_t data); uint8_t m_tilemapbase[0x3]; - DECLARE_READ8_MEMBER(tilemapbase_r); - DECLARE_WRITE8_MEMBER(tilemapbase_w); + uint8_t tilemapbase_r(offs_t offset); + void tilemapbase_w(offs_t offset, uint8_t data); uint8_t m_sysregs[0x10]; - DECLARE_READ8_MEMBER(sysregs_r); - DECLARE_WRITE8_MEMBER(sysregs_w); + uint8_t sysregs_r(offs_t offset); + void sysregs_w(offs_t offset, uint8_t data); uint8_t m_unkregs[0x90]; - DECLARE_READ8_MEMBER(unkregs_r); - DECLARE_WRITE8_MEMBER(unkregs_w); + uint8_t unkregs_r(offs_t offset); + void unkregs_w(offs_t offset, uint8_t data); uint8_t m_tmapscroll_window[2][0x12]; @@ -426,13 +426,13 @@ uint8_t trkfldch_state::tilemap_scroll_window_r(int which, uint8_t reg, uint16_t return ret; } -READ8_MEMBER(trkfldch_state::tmap0_scroll_window_r) +uint8_t trkfldch_state::tmap0_scroll_window_r(offs_t offset) { uint8_t ret = tilemap_scroll_window_r(0, offset, 0x7820); return ret; } -READ8_MEMBER(trkfldch_state::tmap1_scroll_window_r) +uint8_t trkfldch_state::tmap1_scroll_window_r(offs_t offset) { uint8_t ret = tilemap_scroll_window_r(1, offset, 0x7832); return ret; @@ -522,12 +522,12 @@ void trkfldch_state::tilemap_scroll_window_w(int which, uint8_t reg, uint8_t dat } } -WRITE8_MEMBER(trkfldch_state::tmap0_scroll_window_w) +void trkfldch_state::tmap0_scroll_window_w(offs_t offset, uint8_t data) { tilemap_scroll_window_w(0, offset, data, 0x7820); } -WRITE8_MEMBER(trkfldch_state::tmap1_scroll_window_w) +void trkfldch_state::tmap1_scroll_window_w(offs_t offset, uint8_t data) { tilemap_scroll_window_w(1, offset, data, 0x7832); } @@ -535,7 +535,7 @@ WRITE8_MEMBER(trkfldch_state::tmap1_scroll_window_w) -READ8_MEMBER(trkfldch_state::dmaregs_r) +uint8_t trkfldch_state::dmaregs_r(offs_t offset) { uint8_t ret = m_dmaregs[offset]; @@ -554,7 +554,7 @@ READ8_MEMBER(trkfldch_state::dmaregs_r) return ret; } -WRITE8_MEMBER(trkfldch_state::dmaregs_w) +void trkfldch_state::dmaregs_w(offs_t offset, uint8_t data) { m_dmaregs[offset] = data; @@ -669,14 +669,14 @@ WRITE8_MEMBER(trkfldch_state::dmaregs_w) } -READ8_MEMBER(trkfldch_state::modebankregs_r) +uint8_t trkfldch_state::modebankregs_r(offs_t offset) { uint8_t ret = m_modebank[offset]; logerror("%s: modebankregs_r %04x (returning %02x)\n", machine().describe_context(), offset, ret); return ret; } -WRITE8_MEMBER(trkfldch_state::modebankregs_w) +void trkfldch_state::modebankregs_w(offs_t offset, uint8_t data) { m_modebank[offset] = data; @@ -729,14 +729,14 @@ WRITE8_MEMBER(trkfldch_state::modebankregs_w) } -READ8_MEMBER(trkfldch_state::tilemapbase_r) +uint8_t trkfldch_state::tilemapbase_r(offs_t offset) { uint8_t ret = m_tilemapbase[offset]; logerror("%s: tilemapbase_r %04x (returning %02x)\n", machine().describe_context(), offset, ret); return ret; } -WRITE8_MEMBER(trkfldch_state::tilemapbase_w) +void trkfldch_state::tilemapbase_w(offs_t offset, uint8_t data) { m_tilemapbase[offset] = data; logerror("%s: tilemapbase_w %04x %02x (tilebase %d)\n", machine().describe_context(), offset, data, offset); @@ -775,11 +775,11 @@ void trkfldch_state::vectors_map(address_map &map) map(0x00, 0x1f).r(FUNC(trkfldch_state::read_vector)); } -READ8_MEMBER(trkfldch_state::read_vector) +uint8_t trkfldch_state::read_vector(offs_t offset) { uint8_t *rom = memregion("maincpu")->base(); - /* what appears to be a table of vectors apepars at the START of ROM, maybe this gets copied to RAM, maybe used directly? + /* what appears to be a table of vectors appears at the START of ROM, maybe this gets copied to RAM, maybe used directly? 00 : (invalid) 02 : (invalid) 04 : 0xA2C6 (dummy) @@ -1108,7 +1108,7 @@ GFXDECODE_END */ -READ8_MEMBER(trkfldch_state::sysregs_r) +uint8_t trkfldch_state::sysregs_r(offs_t offset) { uint8_t ret = m_sysregs[offset]; @@ -1152,7 +1152,7 @@ READ8_MEMBER(trkfldch_state::sysregs_r) } -WRITE8_MEMBER(trkfldch_state::sysregs_w) +void trkfldch_state::sysregs_w(offs_t offset, uint8_t data) { m_sysregs[offset] = data; @@ -1191,7 +1191,7 @@ WRITE8_MEMBER(trkfldch_state::sysregs_w) -READ8_MEMBER(trkfldch_state::unkregs_r) +uint8_t trkfldch_state::unkregs_r(offs_t offset) { uint8_t ret = m_unkregs[offset]; @@ -1266,7 +1266,7 @@ READ8_MEMBER(trkfldch_state::unkregs_r) -WRITE8_MEMBER(trkfldch_state::unkregs_w) +void trkfldch_state::unkregs_w(offs_t offset, uint8_t data) { m_unkregs[offset] = data; diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index 8fd8e941ee1..83d71e22838 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -48,14 +48,14 @@ protected: virtual void machine_reset() override; private: - DECLARE_READ8_MEMBER(port00_r) { return 0x80; }; - DECLARE_READ8_MEMBER(port0c_r) { return 1; }; - DECLARE_READ8_MEMBER(port0e_r) { return 0; }; - DECLARE_READ8_MEMBER(port0f_r) { return (m_term_data) ? 5 : 4; }; - DECLARE_READ8_MEMBER(port0d_r); - DECLARE_WRITE8_MEMBER(port04_w); - DECLARE_WRITE8_MEMBER(port18_w); - DECLARE_WRITE8_MEMBER(port80_w); + uint8_t port00_r() { return 0x80; }; + uint8_t port0c_r() { return 1; }; + uint8_t port0e_r() { return 0; }; + uint8_t port0f_r() { return (m_term_data) ? 5 : 4; }; + uint8_t port0d_r(); + void port04_w(uint8_t data); + void port18_w(uint8_t data); + void port80_w(uint8_t data); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); @@ -111,16 +111,16 @@ void ts802_state::ts802_io(address_map &map) static INPUT_PORTS_START( ts802 ) INPUT_PORTS_END -WRITE8_MEMBER( ts802_state::port04_w ) +void ts802_state::port04_w(uint8_t data) { membank("bankr0")->set_entry(1); } -WRITE8_MEMBER( ts802_state::port18_w ) +void ts802_state::port18_w(uint8_t data) { } -WRITE8_MEMBER( ts802_state::port80_w ) +void ts802_state::port80_w(uint8_t data) { } @@ -155,7 +155,7 @@ void ts802_state::machine_reset() membank("bankw0")->set_entry(0); // always write to ram } -READ8_MEMBER( ts802_state::port0d_r ) +uint8_t ts802_state::port0d_r() { uint8_t ret = m_term_data; m_term_data = 0; diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 40689e4d067..3559ba27028 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -79,15 +79,15 @@ public: void init_ts803(); private: - DECLARE_READ8_MEMBER(port10_r); - DECLARE_WRITE8_MEMBER(port10_w); - DECLARE_READ8_MEMBER(porta0_r); - DECLARE_WRITE8_MEMBER(porta0_w); - DECLARE_WRITE8_MEMBER(disk_0_control_w); - DECLARE_READ8_MEMBER(disk_0_control_r); + uint8_t port10_r(offs_t offset); + void port10_w(offs_t offset, uint8_t data); + uint8_t porta0_r(offs_t offset); + void porta0_w(offs_t offset, uint8_t data); + void disk_0_control_w(uint8_t data); + uint8_t disk_0_control_r(); MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); - DECLARE_WRITE8_MEMBER( crtc_controlreg_w ); + void crtc_controlreg_w(uint8_t data); uint32_t screen_update_ts803(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ts803_io(address_map &map); @@ -193,7 +193,7 @@ static void ts803_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_DD); } -WRITE8_MEMBER( ts803_state::disk_0_control_w ) +void ts803_state::disk_0_control_w(uint8_t data) { /* d0 ready @@ -223,13 +223,13 @@ d7 Drive select 3 (active low) m_fdc->dden_w(BIT(data, 3)); } -READ8_MEMBER( ts803_state::disk_0_control_r ) +uint8_t ts803_state::disk_0_control_r() { printf("Disk0 control register read\n"); return 0xff; } -READ8_MEMBER( ts803_state::porta0_r) +uint8_t ts803_state::porta0_r(offs_t offset) { offset += 0xa0; switch(offset) @@ -259,7 +259,7 @@ READ8_MEMBER( ts803_state::porta0_r) return 0x00; } -WRITE8_MEMBER( ts803_state::porta0_w ) +void ts803_state::porta0_w(offs_t offset, uint8_t data) { offset += 0xa0; switch (offset) @@ -273,7 +273,7 @@ WRITE8_MEMBER( ts803_state::porta0_w ) } } -READ8_MEMBER( ts803_state::port10_r ) +uint8_t ts803_state::port10_r(offs_t offset) { offset += 0x10; printf("Port read [%x]\n",offset); @@ -281,7 +281,7 @@ READ8_MEMBER( ts803_state::port10_r ) return 0xff; } -WRITE8_MEMBER( ts803_state::port10_w ) +void ts803_state::port10_w(offs_t offset, uint8_t data) { offset += 0x10; switch (offset) @@ -360,7 +360,7 @@ MC6845_UPDATE_ROW( ts803_state::crtc_update_row ) } } -WRITE8_MEMBER( ts803_state::crtc_controlreg_w ) +void ts803_state::crtc_controlreg_w(uint8_t data) { /* Bit 0 = 0 alpha mode diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp index 4af788de994..ff2ac8ee0b5 100644 --- a/src/mame/drivers/ts816.cpp +++ b/src/mame/drivers/ts816.cpp @@ -41,12 +41,12 @@ public: private: void kbd_put(u8 data); - DECLARE_READ8_MEMBER(keyin_r); - DECLARE_READ8_MEMBER(status_r); - DECLARE_WRITE8_MEMBER(port68_w); - DECLARE_WRITE8_MEMBER(port78_w); - DECLARE_WRITE8_MEMBER(porte0_w); - DECLARE_WRITE8_MEMBER(portf0_w); + uint8_t keyin_r(); + uint8_t status_r(); + void port68_w(uint8_t data); + void port78_w(uint8_t data); + void porte0_w(uint8_t data); + void portf0_w(uint8_t data); void ts816_io(address_map &map); void ts816_mem(address_map &map); @@ -124,14 +124,14 @@ static INPUT_PORTS_START( ts816 ) INPUT_PORTS_END -READ8_MEMBER( ts816_state::keyin_r ) +uint8_t ts816_state::keyin_r() { uint8_t ret = m_term_data; m_term_data = 0; return ret; } -READ8_MEMBER( ts816_state::status_r ) +uint8_t ts816_state::status_r() { if (m_status) { @@ -142,25 +142,25 @@ READ8_MEMBER( ts816_state::status_r ) return 4; } -WRITE8_MEMBER( ts816_state::port68_w ) +void ts816_state::port68_w(uint8_t data) { m_2ndbank = 1; set_banks(); } -WRITE8_MEMBER( ts816_state::port78_w ) +void ts816_state::port78_w(uint8_t data) { m_2ndbank = 0; set_banks(); } -WRITE8_MEMBER( ts816_state::porte0_w ) +void ts816_state::porte0_w(uint8_t data) { m_endram = 1; set_banks(); } -WRITE8_MEMBER( ts816_state::portf0_w ) +void ts816_state::portf0_w(uint8_t data) { m_endram = 0; set_banks(); diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp index 270f1984a0e..41a8430f9ac 100644 --- a/src/mame/drivers/ttchamp.cpp +++ b/src/mame/drivers/ttchamp.cpp @@ -121,23 +121,23 @@ private: uint16_t* m_rom16; uint8_t* m_rom8; - DECLARE_WRITE16_MEMBER(paloff_w); - DECLARE_WRITE16_MEMBER(paldat_w); + void paloff_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void paldat_w(uint16_t data); - DECLARE_WRITE16_MEMBER(port10_w); + void port10_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER(port20_w); - DECLARE_WRITE16_MEMBER(port62_w); + void port20_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void port62_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER(port1e_r); + uint16_t port1e_r(); - DECLARE_READ16_MEMBER(pic_r); - DECLARE_WRITE16_MEMBER(pic_w); + uint16_t pic_r(offs_t offset, uint16_t mem_mask = ~0); + void pic_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER(blit_start_r); + uint16_t blit_start_r(); - DECLARE_READ16_MEMBER(mem_r); - DECLARE_WRITE16_MEMBER(mem_w); + uint16_t mem_r(offs_t offset); + void mem_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); virtual void machine_start() override; virtual void video_start() override; @@ -271,19 +271,19 @@ uint32_t ttchamp_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -WRITE16_MEMBER(ttchamp_state::paloff_w) +void ttchamp_state::paloff_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_paloff); } -WRITE16_MEMBER(ttchamp_state::paldat_w) +void ttchamp_state::paldat_w(uint16_t data) { // 0x8000 of offset is sometimes set m_palette->set_pen_color(m_paloff & 0x3ff,pal5bit(data>>0),pal5bit(data>>5),pal5bit(data>>10)); } -READ16_MEMBER(ttchamp_state::pic_r) +uint16_t ttchamp_state::pic_r(offs_t offset, uint16_t mem_mask) { // printf("%06x: read from PIC (%04x)\n", m_maincpu->pc(),mem_mask); if (m_picmodex == picmode::SET_READLATCH) @@ -298,7 +298,7 @@ READ16_MEMBER(ttchamp_state::pic_r) } -WRITE16_MEMBER(ttchamp_state::pic_w) +void ttchamp_state::pic_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // printf("%06x: write to PIC %04x (%04x) (%d)\n", m_maincpu->pc(),data,mem_mask, m_picmodex); if (m_picmodex == picmode::IDLE) @@ -357,7 +357,7 @@ WRITE16_MEMBER(ttchamp_state::pic_w) } -READ16_MEMBER(ttchamp_state::mem_r) +uint16_t ttchamp_state::mem_r(offs_t offset) { // bits 0xf0 are used too, so this is likely wrong. @@ -389,7 +389,7 @@ READ16_MEMBER(ttchamp_state::mem_r) } } -WRITE16_MEMBER(ttchamp_state::mem_w) +void ttchamp_state::mem_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // this is very strange, we use the offset (address bits) not data bits to set values.. // I get the impression this might actually overlay the entire address range, including RAM and regular VRAM? @@ -511,20 +511,20 @@ void ttchamp_state::ttchamp_map(address_map &map) } /* Re-use same parameters as before (one-shot) */ -READ16_MEMBER(ttchamp_state::port1e_r) +uint16_t ttchamp_state::port1e_r() { m_spritesinit = 3; return 0xff; } -READ16_MEMBER(ttchamp_state::blit_start_r) +uint16_t ttchamp_state::blit_start_r() { m_spritesinit = 1; return 0xff; } /* blitter mode select */ -WRITE16_MEMBER(ttchamp_state::port10_w) +void ttchamp_state::port10_w(offs_t offset, uint16_t data, uint16_t mem_mask) { /* --xx ---- fill enable @@ -535,14 +535,14 @@ WRITE16_MEMBER(ttchamp_state::port10_w) } /* selects upper bank for the blitter */ -WRITE16_MEMBER(ttchamp_state::port20_w) +void ttchamp_state::port20_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //printf("%06x: port20_w %04x %04x\n", m_maincpu->pc(), data, mem_mask); m_rombank = 1; } /* selects lower bank for the blitter */ -WRITE16_MEMBER(ttchamp_state::port62_w) +void ttchamp_state::port62_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //printf("%06x: port62_w %04x %04x\n", m_maincpu->pc(), data, mem_mask); m_rombank = 0; diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index f92a10796be..2ecdc48590f 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -75,9 +75,9 @@ private: int m_ctrl; emu_timer *m_interrupt_timer; - DECLARE_WRITE8_MEMBER(hd46505_0_w); - DECLARE_WRITE8_MEMBER(hd46505_1_w); - DECLARE_WRITE8_MEMBER(score_w); + void hd46505_0_w(offs_t offset, uint8_t data); + void hd46505_1_w(offs_t offset, uint8_t data); + void score_w(offs_t offset, uint8_t data); uint8_t input_r(); void ctrl_w(uint8_t data); @@ -125,21 +125,21 @@ void tugboat_state::tugboat_palette(palette_device &palette) const -/* see mc6845.c. That file is only a placeholder, I process the writes here +/* see mc6845.cpp. That file is only a placeholder, I process the writes here because I need the start_addr register to handle scrolling */ -WRITE8_MEMBER(tugboat_state::hd46505_0_w) +void tugboat_state::hd46505_0_w(offs_t offset, uint8_t data) { if (offset == 0) m_reg0 = data & 0x0f; else if (m_reg0 < 18) m_hd46505_0_reg[m_reg0] = data; } -WRITE8_MEMBER(tugboat_state::hd46505_1_w) +void tugboat_state::hd46505_1_w(offs_t offset, uint8_t data) { if (offset == 0) m_reg1 = data & 0x0f; else if (m_reg1 < 18) m_hd46505_1_reg[m_reg1] = data; } -WRITE8_MEMBER(tugboat_state::score_w) +void tugboat_state::score_w(offs_t offset, uint8_t data) { if (offset>=0x8) m_ram[0x291d + 32*offset + 32*(1-8)] = data ^ 0x0f; if (offset<0x8 ) m_ram[0x291d + 32*offset + 32*9] = data ^ 0x0f; diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index 6f0b572e615..5ffa51a24d3 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -213,15 +213,15 @@ private: memory_region *m_cart_rom; int m_bank1_switching; - DECLARE_READ8_MEMBER(key_r); - DECLARE_READ8_MEMBER(tutor_mapper_r); - DECLARE_WRITE8_MEMBER(tutor_mapper_w); - DECLARE_READ8_MEMBER(tutor_cassette_r); - DECLARE_WRITE8_MEMBER(tutor_cassette_w); - DECLARE_READ8_MEMBER(tutor_printer_r); - DECLARE_WRITE8_MEMBER(tutor_printer_w); - - DECLARE_READ8_MEMBER(tutor_highmem_r); + uint8_t key_r(offs_t offset); + uint8_t tutor_mapper_r(offs_t offset); + void tutor_mapper_w(offs_t offset, uint8_t data); + uint8_t tutor_cassette_r(); + void tutor_cassette_w(offs_t offset, uint8_t data); + uint8_t tutor_printer_r(offs_t offset); + void tutor_printer_w(offs_t offset, uint8_t data); + + uint8_t tutor_highmem_r(offs_t offset); int m_tape_interrupt_enable; emu_timer *m_tape_interrupt_timer; virtual void machine_start() override; @@ -291,7 +291,7 @@ void tutor_state::machine_reset() mapped to both a keyboard key and a joystick switch. */ -READ8_MEMBER( tutor_state::key_r ) +uint8_t tutor_state::key_r(offs_t offset) { char port[12]; uint8_t value; @@ -324,7 +324,7 @@ READ8_MEMBER( tutor_state::key_r ) Cartridge may also define a boot ROM at base >0000 (see below). */ -READ8_MEMBER( tutor_state::tutor_mapper_r ) +uint8_t tutor_state::tutor_mapper_r(offs_t offset) { int reply; @@ -344,7 +344,7 @@ READ8_MEMBER( tutor_state::tutor_mapper_r ) return reply; } -WRITE8_MEMBER( tutor_state::tutor_mapper_w ) +void tutor_state::tutor_mapper_w(offs_t offset, uint8_t data) { switch (offset) { @@ -379,7 +379,7 @@ WRITE8_MEMBER( tutor_state::tutor_mapper_w ) This is only called from the debugger; the on-chip memory is handled within the CPU itself. */ -READ8_MEMBER( tutor_state::tutor_highmem_r ) +uint8_t tutor_state::tutor_highmem_r(offs_t offset) { if (m_maincpu->is_onchip(offset | 0xf000)) return m_maincpu->debug_read_onchip_memory(offset&0xff); return 0; @@ -411,13 +411,13 @@ TIMER_CALLBACK_MEMBER(tutor_state::tape_interrupt_handler) } /* CRU handler */ -READ8_MEMBER( tutor_state::tutor_cassette_r ) +uint8_t tutor_state::tutor_cassette_r() { return (m_cass->input() > 0.0) ? 1 : 0; } /* memory handler */ -WRITE8_MEMBER( tutor_state::tutor_cassette_w ) +void tutor_state::tutor_cassette_w(offs_t offset, uint8_t data) { if (offset & /*0x1f*/0x1e) logerror("unknown port in %s %d\n", __FILE__, __LINE__); @@ -465,7 +465,7 @@ WRITE_LINE_MEMBER( tutor_state::write_centronics_busy ) } /* memory handlers */ -READ8_MEMBER( tutor_state::tutor_printer_r ) +uint8_t tutor_state::tutor_printer_r(offs_t offset) { int reply; @@ -486,7 +486,7 @@ READ8_MEMBER( tutor_state::tutor_printer_r ) return reply; } -WRITE8_MEMBER( tutor_state::tutor_printer_w ) +void tutor_state::tutor_printer_w(offs_t offset, uint8_t data) { switch (offset) { @@ -541,7 +541,7 @@ WRITE8_MEMBER( tutor_state::tutor_printer_w ) */ #ifdef UNUSED_FUNCTION -WRITE8_MEMBER( tutor_state::test_w ) +void tutor_state::test_w(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp index 22684b39810..ee6de0a9b73 100644 --- a/src/mame/drivers/tv912.cpp +++ b/src/mame/drivers/tv912.cpp @@ -104,11 +104,11 @@ private: void p1_w(u8 data); u8 p2_r(); void p2_w(u8 data); - DECLARE_READ8_MEMBER(crtc_r); - DECLARE_WRITE8_MEMBER(crtc_w); - DECLARE_READ8_MEMBER(uart_status_r); - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_WRITE8_MEMBER(output_40c); + u8 crtc_r(offs_t offset); + void crtc_w(offs_t offset, u8 data); + u8 uart_status_r(offs_t offset); + u8 keyboard_r(offs_t offset); + void output_40c(u8 data); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -188,17 +188,17 @@ void tv912_state::p2_w(u8 data) m_4hz_flasher = BIT(data, 4); } -READ8_MEMBER(tv912_state::crtc_r) +u8 tv912_state::crtc_r(offs_t offset) { return m_crtc->read(bitswap<4>(offset, 5, 4, 1, 0)); } -WRITE8_MEMBER(tv912_state::crtc_w) +void tv912_state::crtc_w(offs_t offset, u8 data) { m_crtc->write(bitswap<4>(offset, 5, 4, 1, 0), data); } -READ8_MEMBER(tv912_state::keyboard_r) +u8 tv912_state::keyboard_r(offs_t offset) { u8 result = m_modifiers->read(); @@ -209,7 +209,7 @@ READ8_MEMBER(tv912_state::keyboard_r) return result; } -READ8_MEMBER(tv912_state::uart_status_r) +u8 tv912_state::uart_status_r(offs_t offset) { m_uart->write_swe(0); u8 status = m_uart->dav_r() << 0; @@ -222,7 +222,7 @@ READ8_MEMBER(tv912_state::uart_status_r) return status; } -WRITE8_MEMBER(tv912_state::output_40c) +void tv912_state::output_40c(u8 data) { // DB6: -PRTOL diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp index d1497e3c044..4b46e96315b 100644 --- a/src/mame/drivers/tv950.cpp +++ b/src/mame/drivers/tv950.cpp @@ -77,7 +77,7 @@ private: MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); - DECLARE_WRITE8_MEMBER(row_addr_w); + void row_addr_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(via_crtc_reset_w); void tv950_mem(address_map &map); @@ -222,7 +222,7 @@ WRITE_LINE_MEMBER(tv950_state::via_crtc_reset_w) } } -WRITE8_MEMBER(tv950_state::row_addr_w) +void tv950_state::row_addr_w(uint8_t data) { m_row_addr = data; } diff --git a/src/mame/drivers/tv965.cpp b/src/mame/drivers/tv965.cpp index 35feda20d5c..343e56ed58d 100644 --- a/src/mame/drivers/tv965.cpp +++ b/src/mame/drivers/tv965.cpp @@ -29,7 +29,7 @@ public: private: SCN2672_DRAW_CHARACTER_MEMBER(draw_character); - DECLARE_READ8_MEMBER(ga_hack_r); + u8 ga_hack_r(); void mem_map(address_map &map); void program_map(address_map &map); @@ -42,7 +42,7 @@ SCN2672_DRAW_CHARACTER_MEMBER(tv965_state::draw_character) { } -READ8_MEMBER(tv965_state::ga_hack_r) +u8 tv965_state::ga_hack_r() { return 0x08; } diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index f0f85f6230c..38de5f3b54a 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -83,10 +83,10 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ16_MEMBER(tvi1111_r); - DECLARE_WRITE16_MEMBER(tvi1111_w); - DECLARE_READ8_MEMBER(kbdc_r); - DECLARE_WRITE8_MEMBER(kbdc_w); + uint16_t tvi1111_r(offs_t offset); + void tvi1111_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t kbdc_r(offs_t offset); + void kbdc_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(uart0_irq); DECLARE_WRITE_LINE_MEMBER(uart1_irq); @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(tv990_state::lpt_irq) m_maincpu->set_input_line(M68K_IRQ_3, state); } -READ16_MEMBER(tv990_state::tvi1111_r) +uint16_t tv990_state::tvi1111_r(offs_t offset) { if (offset == (0x32/2)) { @@ -156,7 +156,7 @@ READ16_MEMBER(tv990_state::tvi1111_r) return tvi1111_regs[offset]; } -WRITE16_MEMBER(tv990_state::tvi1111_w) +void tv990_state::tvi1111_w(offs_t offset, uint16_t data, uint16_t mem_mask) { #if 0 //if ((offset != 0x50) && (offset != 0x68) && (offset != 0x1d) && (offset != 0x1e) && (offset != 0x17) && (offset != 0x1c)) @@ -300,7 +300,7 @@ uint32_t tv990_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, return 0; } -READ8_MEMBER(tv990_state::kbdc_r) +uint8_t tv990_state::kbdc_r(offs_t offset) { if(offset) return m_kbdc->data_r(4); @@ -308,7 +308,7 @@ READ8_MEMBER(tv990_state::kbdc_r) return m_kbdc->data_r(0); } -WRITE8_MEMBER(tv990_state::kbdc_w) +void tv990_state::kbdc_w(offs_t offset, uint8_t data) { if(offset) m_kbdc->data_w(4, data); diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index 30f917b65cf..1e2178c42fd 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -287,20 +287,19 @@ public: private: virtual void machine_start() override; - DECLARE_WRITE8_MEMBER(twinkle_io_w); - DECLARE_READ8_MEMBER(twinkle_io_r); - DECLARE_WRITE16_MEMBER(twinkle_output_w); - DECLARE_WRITE16_MEMBER(led_w); - DECLARE_WRITE16_MEMBER(key_led_w); - DECLARE_WRITE16_MEMBER(serial_w); - DECLARE_WRITE16_MEMBER(twinkle_spu_ctrl_w); - DECLARE_WRITE16_MEMBER(spu_ata_dma_low_w); - DECLARE_WRITE16_MEMBER(spu_ata_dma_high_w); - DECLARE_READ16_MEMBER(twinkle_waveram_r); - DECLARE_WRITE16_MEMBER(twinkle_waveram_w); - DECLARE_WRITE16_MEMBER(spu_led_w); - DECLARE_WRITE16_MEMBER(spu_wavebank_w); - DECLARE_READ16_MEMBER(unk_68k_r); + void twinkle_io_w(offs_t offset, uint8_t data); + uint8_t twinkle_io_r(offs_t offset); + void twinkle_output_w(offs_t offset, uint16_t data); + void led_w(uint16_t data); + void key_led_w(uint16_t data); + void serial_w(uint16_t data); + void twinkle_spu_ctrl_w(uint16_t data); + void spu_ata_dma_low_w(uint16_t data); + void spu_ata_dma_high_w(uint16_t data); + uint16_t twinkle_waveram_r(offs_t offset); + void twinkle_waveram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void spu_led_w(uint16_t data); + void spu_wavebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(spu_ata_irq); DECLARE_WRITE_LINE_MEMBER(spu_ata_dmarq); void scsi_dma_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); @@ -537,7 +536,7 @@ void twinkle_state::machine_start() save_item(NAME(m_output_clock)); } -WRITE8_MEMBER(twinkle_state::twinkle_io_w) +void twinkle_state::twinkle_io_w(offs_t offset, uint8_t data) { switch( offset ) { @@ -621,7 +620,7 @@ WRITE8_MEMBER(twinkle_state::twinkle_io_w) } } -READ8_MEMBER(twinkle_state::twinkle_io_r) +uint8_t twinkle_state::twinkle_io_r(offs_t offset) { uint8_t data = 0; @@ -668,7 +667,7 @@ READ8_MEMBER(twinkle_state::twinkle_io_r) return data; } -WRITE16_MEMBER(twinkle_state::twinkle_output_w) +void twinkle_state::twinkle_output_w(offs_t offset, uint16_t data) { switch( offset ) { @@ -726,7 +725,7 @@ WRITE16_MEMBER(twinkle_state::twinkle_output_w) } } -WRITE16_MEMBER(twinkle_state::led_w) +void twinkle_state::led_w(uint16_t data) { m_main_leds[0] = BIT(~data, 0); m_main_leds[1] = BIT(~data, 1); @@ -744,7 +743,7 @@ WRITE16_MEMBER(twinkle_state::led_w) } } -WRITE16_MEMBER(twinkle_state::key_led_w) +void twinkle_state::key_led_w(uint16_t data) { // words are written using a byte write m_key_leds[0][0] = BIT(data, 0); @@ -765,7 +764,7 @@ WRITE16_MEMBER(twinkle_state::key_led_w) output().set_value("unknown4", (data >> 15) & 1); } -WRITE16_MEMBER(twinkle_state::serial_w) +void twinkle_state::serial_w(uint16_t data) { int _do = ( data >> 4 ) & 1; int clock = ( data >> 5 ) & 1; @@ -836,7 +835,7 @@ WRITE_LINE_MEMBER(twinkle_state::spu_ata_irq) Other bits unknown. */ -WRITE16_MEMBER(twinkle_state::twinkle_spu_ctrl_w) +void twinkle_state::twinkle_spu_ctrl_w(uint16_t data) { if ((!(data & 0x0080)) && (m_spu_ctrl & 0x0080)) { @@ -858,12 +857,12 @@ WRITE16_MEMBER(twinkle_state::twinkle_spu_ctrl_w) m_spu_ctrl = data; } -WRITE16_MEMBER(twinkle_state::spu_ata_dma_low_w) +void twinkle_state::spu_ata_dma_low_w(uint16_t data) { m_spu_ata_dma = (m_spu_ata_dma & ~0xffff) | data; } -WRITE16_MEMBER(twinkle_state::spu_ata_dma_high_w) +void twinkle_state::spu_ata_dma_high_w(uint16_t data) { m_spu_ata_dma = (m_spu_ata_dma & 0xffff) | ((uint32_t)data << 16); //printf("DMA now %x\n", m_spu_ata_dma); @@ -894,7 +893,7 @@ WRITE_LINE_MEMBER(twinkle_state::spu_ata_dmarq) } } -WRITE16_MEMBER(twinkle_state::spu_wavebank_w) +void twinkle_state::spu_wavebank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //printf("%x to wavebank_w, mask %04x\n", data, mem_mask); @@ -906,19 +905,19 @@ WRITE16_MEMBER(twinkle_state::spu_wavebank_w) m_wave_bank = data * (4*1024*1024); } -READ16_MEMBER(twinkle_state::twinkle_waveram_r) +uint16_t twinkle_state::twinkle_waveram_r(offs_t offset) { return m_waveram[offset+m_wave_bank]; } -WRITE16_MEMBER(twinkle_state::twinkle_waveram_w) +void twinkle_state::twinkle_waveram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_waveram[offset+m_wave_bank]); } -WRITE16_MEMBER(twinkle_state::spu_led_w) +void twinkle_state::spu_led_w(uint16_t data) { - // upper 8 bits are occassionally written as all zeros + // upper 8 bits are occasionally written as all zeros m_spu_leds[0] = BIT(~data, 0); m_spu_leds[1] = BIT(~data, 1); m_spu_leds[2] = BIT(~data, 2); diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index af05dddcc2b..787cfc93da5 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -144,8 +144,8 @@ protected: void twins_map(address_map &map); uint32_t screen_update_twins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ16_MEMBER(eeprom_r); - DECLARE_WRITE16_MEMBER(eeprom_w); + uint16_t eeprom_r(offs_t offset, uint16_t mem_mask = ~0); + void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void video_start() override; @@ -153,13 +153,13 @@ protected: static constexpr u32 ram_size = 0x10000/2; inline u16* get_vram_base(); - DECLARE_READ16_MEMBER(vram_r); - DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_WRITE16_MEMBER(vram_rmw_w); + uint16_t vram_r(offs_t offset); + void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void vram_rmw_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); private: - DECLARE_WRITE16_MEMBER(access_w); - DECLARE_READ16_MEMBER(access_r); + void access_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t access_r(offs_t offset, uint16_t mem_mask = ~0); virtual void machine_start() override; @@ -178,8 +178,8 @@ public: private: void twinsed1_io(address_map &map); - DECLARE_WRITE16_MEMBER(porte_paloff0_w); - DECLARE_WRITE16_MEMBER(twins_pal_w); + void porte_paloff0_w(uint8_t data); + void twins_pal_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); }; class spider_state : public twins_state @@ -197,12 +197,12 @@ private: void draw_foreground(bitmap_ind16 &bitmap, const rectangle &cliprect); void spider_io(address_map &map); - DECLARE_WRITE16_MEMBER(spider_paloff0_w); - DECLARE_READ16_MEMBER(spider_port_18_r); - DECLARE_READ16_MEMBER(spider_port_1e_r); - DECLARE_WRITE16_MEMBER(spider_port_1a_w); - DECLARE_WRITE16_MEMBER(spider_port_1c_w); - DECLARE_WRITE16_MEMBER(spider_pal_w); + void spider_paloff0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t spider_port_18_r(); + uint16_t spider_port_1e_r(); + void spider_port_1a_w(uint16_t data); + void spider_port_1c_w(uint16_t data); + void spider_pal_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); }; void twins_state::video_start() @@ -278,7 +278,7 @@ void twins_state::machine_start() m_rom8 = memregion("ipl")->base(); } -READ16_MEMBER(twins_state::eeprom_r) +uint16_t twins_state::eeprom_r(offs_t offset, uint16_t mem_mask) { // printf("%08x: eeprom_r %04x\n", m_maincpu->pc(), mem_mask); // return m_i2cmem->read_sda();// | 0xfffe; @@ -287,7 +287,7 @@ READ16_MEMBER(twins_state::eeprom_r) return m_i2cmem->read_sda(); } -WRITE16_MEMBER(twins_state::eeprom_w) +void twins_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // printf("%08x: eeprom_w %04x %04x\n", m_maincpu->pc(), data, mem_mask); int i2c_clk = BIT(data, 1); @@ -296,7 +296,7 @@ WRITE16_MEMBER(twins_state::eeprom_w) m_i2cmem->write_sda(i2c_mem); } -WRITE16_MEMBER(twinsed1_state::twins_pal_w) +void twinsed1_state::twins_pal_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_paletteram[m_paloff]); @@ -320,7 +320,7 @@ WRITE16_MEMBER(twinsed1_state::twins_pal_w) } /* ??? weird ..*/ -WRITE16_MEMBER(twinsed1_state::porte_paloff0_w) +void twinsed1_state::porte_paloff0_w(uint8_t data) { // printf("porte_paloff0_w %04x\n", data); m_paloff = 0; @@ -331,20 +331,20 @@ inline u16 *twins_state::get_vram_base() return (m_videorambank & 1) ? m_fgvram.get() : m_bgvram.get(); } -READ16_MEMBER(twins_state::vram_r) +uint16_t twins_state::vram_r(offs_t offset) { u16 *vram = get_vram_base(); return vram[offset]; } -WRITE16_MEMBER(twins_state::vram_w) +void twins_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { u16 *vram = get_vram_base(); COMBINE_DATA(&vram[offset]); } // TODO: confirm this area being present on twins versions -WRITE16_MEMBER(twins_state::vram_rmw_w) +void twins_state::vram_rmw_w(offs_t offset, uint16_t data, uint16_t mem_mask) { u16 *vram = get_vram_base(); @@ -371,12 +371,12 @@ WRITE16_MEMBER(twins_state::vram_rmw_w) } } -READ16_MEMBER(twins_state::access_r) +uint16_t twins_state::access_r(offs_t offset, uint16_t mem_mask) { return m_overlay->read16(offset, mem_mask); } -WRITE16_MEMBER(twins_state::access_w) +void twins_state::access_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // this is very strange, we use the offset (address bits) not data bits to set values.. // I get the impression this might actually overlay the entire address range, including RAM and regular VRAM? @@ -401,7 +401,7 @@ WRITE16_MEMBER(twins_state::access_w) m_overlay->write16(offset, data, mem_mask); } -WRITE16_MEMBER(spider_state::spider_pal_w) +void spider_state::spider_pal_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // ths first write doesn't appear to be a palette value if (m_paloff!=0) @@ -427,19 +427,19 @@ WRITE16_MEMBER(spider_state::spider_pal_w) } -WRITE16_MEMBER(spider_state::spider_paloff0_w) +void spider_state::spider_paloff0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // this seems to be video ram banking COMBINE_DATA(&m_videorambank); } -WRITE16_MEMBER(spider_state::spider_port_1a_w) +void spider_state::spider_port_1a_w(uint16_t data) { // writes 1 } -WRITE16_MEMBER(spider_state::spider_port_1c_w) +void spider_state::spider_port_1c_w(uint16_t data) { // done before the 'sprite' read / writes // might clear a buffer? @@ -454,7 +454,7 @@ WRITE16_MEMBER(spider_state::spider_port_1c_w) } -READ16_MEMBER(spider_state::spider_port_18_r) +uint16_t spider_state::spider_port_18_r() { // read before each blitter command // seems to put the bus in a state where the next 2 bus access offsets (anywhere) are the blitter params @@ -463,7 +463,7 @@ READ16_MEMBER(spider_state::spider_port_18_r) return 0xff; } -READ16_MEMBER(spider_state::spider_port_1e_r) +uint16_t spider_state::spider_port_1e_r() { // done before each sprite pixel 'write' // the data read is the data written, but only reads one pixel?? diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index e12a0f34254..9016b99689c 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -134,9 +134,9 @@ public: private: uint8_t m_jamma_if_control_latch; - DECLARE_WRITE8_MEMBER(jamma_if_control_latch_w); - DECLARE_READ8_MEMBER(jamma_if_control_latch_r); - DECLARE_READ8_MEMBER(jamma_if_read_dsw); + void jamma_if_control_latch_w(uint8_t data); + uint8_t jamma_if_control_latch_r(); + uint8_t jamma_if_read_dsw(offs_t offset); virtual uint8_t joy_read() override; virtual void machine_reset() override; required_device<discrete_device> m_discrete; @@ -156,7 +156,7 @@ static DISCRETE_SOUND_START(uapce_discrete) DISCRETE_SOUND_END -WRITE8_MEMBER(uapce_state::jamma_if_control_latch_w) +void uapce_state::jamma_if_control_latch_w(uint8_t data) { uint8_t diff = data ^ m_jamma_if_control_latch; m_jamma_if_control_latch = data; @@ -199,12 +199,12 @@ WRITE8_MEMBER(uapce_state::jamma_if_control_latch_w) /* D0 : Not latched. */ } -READ8_MEMBER(uapce_state::jamma_if_control_latch_r) +uint8_t uapce_state::jamma_if_control_latch_r() { return m_jamma_if_control_latch & 0x08; } -READ8_MEMBER(uapce_state::jamma_if_read_dsw) +uint8_t uapce_state::jamma_if_read_dsw(offs_t offset) { uint8_t dsw_val; diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 96bd58b8fb3..d3f096f4f95 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -50,19 +50,19 @@ public: void umipoker(machine_config &config); protected: - DECLARE_READ8_MEMBER(z80_rom_readback_r); - DECLARE_READ8_MEMBER(z80_shared_ram_r); - DECLARE_WRITE8_MEMBER(z80_shared_ram_w); - DECLARE_WRITE16_MEMBER(umipoker_irq_ack_w); - DECLARE_WRITE16_MEMBER(umipoker_scrolly_0_w); - DECLARE_WRITE16_MEMBER(umipoker_scrolly_1_w); - DECLARE_WRITE16_MEMBER(umipoker_scrolly_2_w); - DECLARE_WRITE16_MEMBER(umipoker_scrolly_3_w); - DECLARE_WRITE16_MEMBER(umipoker_vram_0_w); - DECLARE_WRITE16_MEMBER(umipoker_vram_1_w); - DECLARE_WRITE16_MEMBER(umipoker_vram_2_w); - DECLARE_WRITE16_MEMBER(umipoker_vram_3_w); - DECLARE_WRITE16_MEMBER(umi_counters_w); + uint8_t z80_rom_readback_r(offs_t offset); + uint8_t z80_shared_ram_r(offs_t offset); + void z80_shared_ram_w(offs_t offset, uint8_t data); + void umipoker_irq_ack_w(uint16_t data); + void umipoker_scrolly_0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_scrolly_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_scrolly_2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_scrolly_3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_vram_0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_vram_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_vram_2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umipoker_vram_3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void umi_counters_w(uint16_t data); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); @@ -105,8 +105,8 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE16_MEMBER(lamps_w); - DECLARE_WRITE16_MEMBER(saiyu_counters_w); + void lamps_w(uint16_t data); + void saiyu_counters_w(uint16_t data); void saiyukip_map(address_map &map); @@ -188,28 +188,28 @@ uint32_t umipoker_state::screen_update_umipoker(screen_device &screen, bitmap_in return 0; } -READ8_MEMBER(umipoker_state::z80_rom_readback_r) +uint8_t umipoker_state::z80_rom_readback_r(offs_t offset) { uint8_t *ROM = memregion("audiocpu")->base(); return ROM[offset]; } -READ8_MEMBER(umipoker_state::z80_shared_ram_r) +uint8_t umipoker_state::z80_shared_ram_r(offs_t offset) { machine().scheduler().synchronize(); // force resync return m_z80_wram[offset]; } -WRITE8_MEMBER(umipoker_state::z80_shared_ram_w) +void umipoker_state::z80_shared_ram_w(offs_t offset, uint8_t data) { machine().scheduler().synchronize(); // force resync m_z80_wram[offset] = data; } -WRITE16_MEMBER(umipoker_state::umipoker_irq_ack_w) +void umipoker_state::umipoker_irq_ack_w(uint16_t data) { m_maincpu->set_input_line(6, CLEAR_LINE); @@ -218,37 +218,37 @@ WRITE16_MEMBER(umipoker_state::umipoker_irq_ack_w) popmessage("%04x IRQ ACK, contact MAMEdev",data); } -WRITE16_MEMBER(umipoker_state::umipoker_scrolly_0_w){ COMBINE_DATA(&m_umipoker_scrolly[0]); } -WRITE16_MEMBER(umipoker_state::umipoker_scrolly_1_w){ COMBINE_DATA(&m_umipoker_scrolly[1]); } -WRITE16_MEMBER(umipoker_state::umipoker_scrolly_2_w){ COMBINE_DATA(&m_umipoker_scrolly[2]); } -WRITE16_MEMBER(umipoker_state::umipoker_scrolly_3_w){ COMBINE_DATA(&m_umipoker_scrolly[3]); } +void umipoker_state::umipoker_scrolly_0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_umipoker_scrolly[0]); } +void umipoker_state::umipoker_scrolly_1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_umipoker_scrolly[1]); } +void umipoker_state::umipoker_scrolly_2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_umipoker_scrolly[2]); } +void umipoker_state::umipoker_scrolly_3_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_umipoker_scrolly[3]); } -WRITE16_MEMBER(umipoker_state::umipoker_vram_0_w) +void umipoker_state::umipoker_vram_0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram_0[offset]); m_tilemap_0->mark_tile_dirty(offset >> 1); } -WRITE16_MEMBER(umipoker_state::umipoker_vram_1_w) +void umipoker_state::umipoker_vram_1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram_1[offset]); m_tilemap_1->mark_tile_dirty(offset >> 1); } -WRITE16_MEMBER(umipoker_state::umipoker_vram_2_w) +void umipoker_state::umipoker_vram_2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram_2[offset]); m_tilemap_2->mark_tile_dirty(offset >> 1); } -WRITE16_MEMBER(umipoker_state::umipoker_vram_3_w) +void umipoker_state::umipoker_vram_3_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_vram_3[offset]); m_tilemap_3->mark_tile_dirty(offset >> 1); } -WRITE16_MEMBER(saiyukip_state::lamps_w) +void saiyukip_state::lamps_w(uint16_t data) { /* Umipoker buttons layout: @@ -297,7 +297,7 @@ WRITE16_MEMBER(saiyukip_state::lamps_w) m_lamps[5] = BIT(data, 13); // Lamp 5 - START } -WRITE16_MEMBER(umipoker_state::umi_counters_w) +void umipoker_state::umi_counters_w(uint16_t data) {/* 0x0000 - Normal State (lamps off). 0x0001 - Payout pulse. @@ -318,7 +318,7 @@ WRITE16_MEMBER(umipoker_state::umi_counters_w) machine().bookkeeping().coin_counter_w(2, BIT(data, 0)); // PAYOUT } -WRITE16_MEMBER(saiyukip_state::saiyu_counters_w) +void saiyukip_state::saiyu_counters_w(uint16_t data) { /* 0x0000 - Normal State (lamps off). diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index 9b36f607b00..fa042790363 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -68,23 +68,23 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ16_MEMBER(line_printer_r); + uint16_t line_printer_r(); void disk_control_w(uint8_t data); - DECLARE_WRITE16_MEMBER(gcr_w); + void gcr_w(offs_t offset, uint16_t data); DECLARE_WRITE_LINE_MEMBER(romlmap_w); DECLARE_WRITE_LINE_MEMBER(error_enable_w); DECLARE_WRITE_LINE_MEMBER(parity_enable_w); DECLARE_WRITE_LINE_MEMBER(bpplus_w); - DECLARE_READ16_MEMBER(ram_mmu_r); - DECLARE_WRITE16_MEMBER(ram_mmu_w); - DECLARE_READ16_MEMBER(gsr_r); - DECLARE_WRITE16_MEMBER(tcr_w); - DECLARE_READ16_MEMBER(tsr_r); - DECLARE_READ16_MEMBER(rtc_r); - DECLARE_WRITE16_MEMBER(rtc_w); - DECLARE_READ16_MEMBER(diskdma_size_r); - DECLARE_WRITE16_MEMBER(diskdma_size_w); - DECLARE_WRITE16_MEMBER(diskdma_ptr_w); + uint16_t ram_mmu_r(offs_t offset); + void ram_mmu_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t gsr_r(); + void tcr_w(offs_t offset, uint16_t data); + uint16_t tsr_r(); + uint16_t rtc_r(); + void rtc_w(uint16_t data); + uint16_t diskdma_size_r(); + void diskdma_size_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void diskdma_ptr_w(offs_t offset, uint16_t data); DECLARE_WRITE_LINE_MEMBER(wd2797_intrq_w); DECLARE_WRITE_LINE_MEMBER(wd2797_drq_w); @@ -122,7 +122,7 @@ private: MEMORY ***************************************************************************/ -WRITE16_MEMBER(unixpc_state::gcr_w) +void unixpc_state::gcr_w(offs_t offset, uint16_t data) { m_gcr->write_bit(offset >> 11, BIT(data, 15)); } @@ -132,7 +132,7 @@ WRITE_LINE_MEMBER(unixpc_state::romlmap_w) m_ramrombank->set_bank(state ? 1 : 0); } -READ16_MEMBER(unixpc_state::ram_mmu_r) +uint16_t unixpc_state::ram_mmu_r(offs_t offset) { // TODO: MMU translation if (offset > m_ramsize) @@ -142,7 +142,7 @@ READ16_MEMBER(unixpc_state::ram_mmu_r) return m_ramptr[offset]; } -WRITE16_MEMBER(unixpc_state::ram_mmu_w) +void unixpc_state::ram_mmu_w(offs_t offset, uint16_t data, uint16_t mem_mask) { // TODO: MMU translation if (offset < m_ramsize) @@ -181,32 +181,32 @@ WRITE_LINE_MEMBER(unixpc_state::bpplus_w) MISC ***************************************************************************/ -READ16_MEMBER(unixpc_state::gsr_r) +uint16_t unixpc_state::gsr_r() { return 0; } -WRITE16_MEMBER(unixpc_state::tcr_w) +void unixpc_state::tcr_w(offs_t offset, uint16_t data) { m_tcr->write_bit(offset >> 11, BIT(data, 14)); } -READ16_MEMBER(unixpc_state::tsr_r) +uint16_t unixpc_state::tsr_r() { return 0; } -READ16_MEMBER(unixpc_state::rtc_r) +uint16_t unixpc_state::rtc_r() { return 0; } -WRITE16_MEMBER(unixpc_state::rtc_w) +void unixpc_state::rtc_w(uint16_t data) { logerror("rtc_w: %04x\n", data); } -READ16_MEMBER(unixpc_state::line_printer_r) +uint16_t unixpc_state::line_printer_r() { uint16_t data = 0; @@ -224,18 +224,18 @@ READ16_MEMBER(unixpc_state::line_printer_r) DMA ***************************************************************************/ -READ16_MEMBER(unixpc_state::diskdma_size_r) +uint16_t unixpc_state::diskdma_size_r() { return m_diskdmasize; } -WRITE16_MEMBER(unixpc_state::diskdma_size_w) +void unixpc_state::diskdma_size_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA( &m_diskdmasize ); logerror("%x to disk DMA size\n", data); } -WRITE16_MEMBER(unixpc_state::diskdma_ptr_w) +void unixpc_state::diskdma_ptr_w(offs_t offset, uint16_t data) { if (offset >= 0x2000) { diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index ecf231b4e92..432c2ccb57d 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -50,8 +50,8 @@ private: std::unique_ptr<uint8_t[]> m_colorram; uint8_t m_output; - DECLARE_READ8_MEMBER(colorram_r) { return m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] | 0x0f; } - DECLARE_WRITE8_MEMBER(colorram_w) { m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] = data & 0xf0; } + uint8_t colorram_r(offs_t offset) { return m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] | 0x0f; } + void colorram_w(offs_t offset, uint8_t data) { m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] = data & 0xf0; } uint8_t input_r(); void output_w(uint8_t data); diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index 27357530321..f7407df54c4 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -53,14 +53,14 @@ private: required_device<snes_control_port_device> m_ctrl2; required_device<speaker_sound_device> m_speaker; - DECLARE_READ8_MEMBER(port_a_r); - DECLARE_WRITE8_MEMBER(port_a_w); - DECLARE_READ8_MEMBER(port_b_r); - DECLARE_WRITE8_MEMBER(port_b_w); - DECLARE_READ8_MEMBER(port_c_r); - DECLARE_WRITE8_MEMBER(port_c_w); - DECLARE_READ8_MEMBER(port_d_r); - DECLARE_WRITE8_MEMBER(port_d_w); + uint8_t port_a_r(); + void port_a_w(uint8_t data); + uint8_t port_b_r(); + void port_b_w(uint8_t data); + uint8_t port_c_r(); + void port_c_w(uint8_t data); + uint8_t port_d_r(); + void port_d_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; @@ -102,7 +102,7 @@ void uzebox_state::machine_reset() } -WRITE8_MEMBER(uzebox_state::port_a_w) +void uzebox_state::port_a_w(uint8_t data) { // xxxx ---- NC // ---- x--- SNES controller clk @@ -124,12 +124,12 @@ WRITE8_MEMBER(uzebox_state::port_a_w) m_port_a = (data & 0x0c) | (m_port_a & 0x03); } -READ8_MEMBER(uzebox_state::port_a_r) +uint8_t uzebox_state::port_a_r() { return m_port_a | 0xf0; } -WRITE8_MEMBER(uzebox_state::port_b_w) +void uzebox_state::port_b_w(uint8_t data) { // xxx- ---- SDCard // ---x ---- AD725 CE @@ -156,12 +156,12 @@ WRITE8_MEMBER(uzebox_state::port_b_w) m_port_b = data; } -READ8_MEMBER(uzebox_state::port_b_r) +uint8_t uzebox_state::port_b_r() { return m_port_b; } -WRITE8_MEMBER(uzebox_state::port_c_w) +void uzebox_state::port_c_w(uint8_t data) { // xx-- ---- blue // --xx x--- green @@ -171,12 +171,12 @@ WRITE8_MEMBER(uzebox_state::port_c_w) m_port_c = data; } -READ8_MEMBER(uzebox_state::port_c_r) +uint8_t uzebox_state::port_c_r() { return m_port_c; } -WRITE8_MEMBER(uzebox_state::port_d_w) +void uzebox_state::port_d_w(uint8_t data) { // x--- ---- sound // -x-- ---- SDCard CS @@ -191,7 +191,7 @@ WRITE8_MEMBER(uzebox_state::port_d_w) m_port_d = data; } -READ8_MEMBER(uzebox_state::port_d_r) +uint8_t uzebox_state::port_d_r() { return m_port_d; } diff --git a/src/mame/drivers/v100.cpp b/src/mame/drivers/v100.cpp index 6a58c9d1a09..e7d66a7937b 100644 --- a/src/mame/drivers/v100.cpp +++ b/src/mame/drivers/v100.cpp @@ -47,11 +47,11 @@ public: private: u8 status_r(); - DECLARE_WRITE8_MEMBER(port30_w); - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_WRITE8_MEMBER(key_row_w); - DECLARE_WRITE8_MEMBER(port48_w); - DECLARE_WRITE8_MEMBER(picu_w); + void port30_w(u8 data); + u8 keyboard_r(); + void key_row_w(u8 data); + void port48_w(u8 data); + void picu_w(u8 data); template<int N> DECLARE_WRITE_LINE_MEMBER(picu_r_w); IRQ_CALLBACK_MEMBER(irq_ack); void ppi_porta_w(u8 data); @@ -168,29 +168,29 @@ u8 v100_state::status_r() return status; } -WRITE8_MEMBER(v100_state::port30_w) +void v100_state::port30_w(u8 data) { // D6 = cursor/text blinking? //logerror("Writing %02X to port 30\n", data); } -READ8_MEMBER(v100_state::keyboard_r) +u8 v100_state::keyboard_r() { return m_key_row[m_active_row & 15].read_safe(0xff); } -WRITE8_MEMBER(v100_state::key_row_w) +void v100_state::key_row_w(u8 data) { m_active_row = data; } -WRITE8_MEMBER(v100_state::port48_w) +void v100_state::port48_w(u8 data) { //logerror("Writing %02X to port 48\n", data); } -WRITE8_MEMBER(v100_state::picu_w) +void v100_state::picu_w(u8 data) { m_picu->b_w((data & 0x0e) >> 1); m_picu->sgs_w(BIT(data, 4)); diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index d265742af15..4789484e789 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -185,29 +185,29 @@ private: void boonggab_prize_w(offs_t offset, u16 data); void boonggab_lamps_w(offs_t offset, u16 data); - DECLARE_READ16_MEMBER(vamphalf_speedup_r); - DECLARE_READ16_MEMBER(vamphalfr1_speedup_r); - DECLARE_READ16_MEMBER(vamphafk_speedup_r); - DECLARE_READ16_MEMBER(coolmini_speedup_r); - DECLARE_READ16_MEMBER(coolminii_speedup_r); - DECLARE_READ16_MEMBER(suplup_speedup_r); - DECLARE_READ16_MEMBER(luplup_speedup_r); - DECLARE_READ16_MEMBER(luplup29_speedup_r); - DECLARE_READ16_MEMBER(luplup10_speedup_r); - DECLARE_READ16_MEMBER(puzlbang_speedup_r); - DECLARE_READ16_MEMBER(puzlbanga_speedup_r); - DECLARE_READ16_MEMBER(mrkicker_speedup_r); - DECLARE_READ16_MEMBER(dquizgo2_speedup_r); - DECLARE_READ32_MEMBER(aoh_speedup_r); - DECLARE_READ16_MEMBER(jmpbreak_speedup_r); - DECLARE_READ16_MEMBER(jmpbreaka_speedup_r); - DECLARE_READ16_MEMBER(poosho_speedup_r); - DECLARE_READ16_MEMBER(newxpang_speedup_r); - DECLARE_READ16_MEMBER(worldadv_speedup_r); - DECLARE_READ16_MEMBER(mrdig_speedup_r); - DECLARE_READ16_MEMBER(dtfamily_speedup_r); - DECLARE_READ16_MEMBER(toyland_speedup_r); - DECLARE_READ16_MEMBER(boonggab_speedup_r); + u16 vamphalf_speedup_r(); + u16 vamphalfr1_speedup_r(); + u16 vamphafk_speedup_r(); + u16 coolmini_speedup_r(); + u16 coolminii_speedup_r(); + u16 suplup_speedup_r(); + u16 luplup_speedup_r(); + u16 luplup29_speedup_r(); + u16 luplup10_speedup_r(); + u16 puzlbang_speedup_r(); + u16 puzlbanga_speedup_r(); + u16 mrkicker_speedup_r(); + u16 dquizgo2_speedup_r(); + u32 aoh_speedup_r(); + u16 jmpbreak_speedup_r(); + u16 jmpbreaka_speedup_r(); + u16 poosho_speedup_r(); + u16 newxpang_speedup_r(); + u16 worldadv_speedup_r(); + u16 mrdig_speedup_r(); + u16 dtfamily_speedup_r(); + u16 toyland_speedup_r(); + u16 boonggab_speedup_r(); void aoh_oki_bank_w(u32 data); void boonggab_oki_bank_w(offs_t offset, u16 data); @@ -252,11 +252,11 @@ public: private: required_device<i8052_device> m_qdsp_cpu; - DECLARE_READ16_MEMBER(misncrft_speedup_r); - DECLARE_READ16_MEMBER(misncrfta_speedup_r); - DECLARE_READ32_MEMBER(wivernwg_speedup_r); - DECLARE_READ32_MEMBER(wyvernwg_speedup_r); - DECLARE_READ32_MEMBER(wyvernwga_speedup_r); + u16 misncrft_speedup_r(); + u16 misncrfta_speedup_r(); + u32 wivernwg_speedup_r(); + u32 wyvernwg_speedup_r(); + u32 wyvernwga_speedup_r(); u32 wyvernwg_prot_r(); void wyvernwg_prot_w(u32 data); @@ -298,8 +298,8 @@ private: u32 finalgdr_prot_r(); void finalgdr_prot_w(u32 data); - DECLARE_READ32_MEMBER(finalgdr_speedup_r); - DECLARE_READ32_MEMBER(mrkickera_speedup_r); + u32 finalgdr_speedup_r(); + u32 mrkickera_speedup_r(); void finalgdr_prize_w(u32 data); void finalgdr_oki_bank_w(u32 data); @@ -2906,7 +2906,7 @@ void vamphalf_state::banked_oki(int chip) m_okibank->set_base(&ROM[0x20000]); } -READ16_MEMBER(vamphalf_state::vamphalf_speedup_r) +u16 vamphalf_state::vamphalf_speedup_r() { if (m_maincpu->pc() == 0x82ec) { @@ -2919,7 +2919,7 @@ READ16_MEMBER(vamphalf_state::vamphalf_speedup_r) return m_wram[0x4a7b8 / 2]; } -READ16_MEMBER(vamphalf_state::vamphalfr1_speedup_r) +u16 vamphalf_state::vamphalfr1_speedup_r() { if (m_maincpu->pc() == 0x82ec) { @@ -2932,7 +2932,7 @@ READ16_MEMBER(vamphalf_state::vamphalfr1_speedup_r) return m_wram[0x4a468 / 2]; } -READ16_MEMBER(vamphalf_state::vamphafk_speedup_r) +u16 vamphalf_state::vamphafk_speedup_r() { if (m_maincpu->pc() == 0x82ec) { @@ -2945,7 +2945,7 @@ READ16_MEMBER(vamphalf_state::vamphafk_speedup_r) return m_wram[0x4a648 / 2]; } -READ16_MEMBER(vamphalf_qdsp_state::misncrft_speedup_r) +u16 vamphalf_qdsp_state::misncrft_speedup_r() { if (m_maincpu->pc() == 0xff5a) { @@ -2958,7 +2958,7 @@ READ16_MEMBER(vamphalf_qdsp_state::misncrft_speedup_r) return m_wram[0x741e8 / 2]; } -READ16_MEMBER(vamphalf_qdsp_state::misncrfta_speedup_r) +u16 vamphalf_qdsp_state::misncrfta_speedup_r() { if (m_maincpu->pc() == 0xecd6) { @@ -2971,7 +2971,7 @@ READ16_MEMBER(vamphalf_qdsp_state::misncrfta_speedup_r) return m_wram[0x72e2c / 2]; } -READ16_MEMBER(vamphalf_state::coolmini_speedup_r) +u16 vamphalf_state::coolmini_speedup_r() { if (m_maincpu->pc() == 0x75f88) { @@ -2984,7 +2984,7 @@ READ16_MEMBER(vamphalf_state::coolmini_speedup_r) return m_wram[0xd2df8 / 2]; } -READ16_MEMBER(vamphalf_state::coolminii_speedup_r) +u16 vamphalf_state::coolminii_speedup_r() { if (m_maincpu->pc() == 0x76024) { @@ -2997,7 +2997,7 @@ READ16_MEMBER(vamphalf_state::coolminii_speedup_r) return m_wram[0xd30a8 / 2]; } -READ16_MEMBER(vamphalf_state::suplup_speedup_r) +u16 vamphalf_state::suplup_speedup_r() { if (m_maincpu->pc() == 0xaf184) { @@ -3010,7 +3010,7 @@ READ16_MEMBER(vamphalf_state::suplup_speedup_r) return m_wram[0x11605c / 2]; } -READ16_MEMBER(vamphalf_state::luplup_speedup_r) +u16 vamphalf_state::luplup_speedup_r() { if (m_maincpu->pc() == 0xaefac) { @@ -3023,7 +3023,7 @@ READ16_MEMBER(vamphalf_state::luplup_speedup_r) return m_wram[0x115e84 / 2]; } -READ16_MEMBER(vamphalf_state::luplup29_speedup_r) +u16 vamphalf_state::luplup29_speedup_r() { if (m_maincpu->pc() == 0xae6c0) { @@ -3036,7 +3036,7 @@ READ16_MEMBER(vamphalf_state::luplup29_speedup_r) return m_wram[0x113f08 / 2]; } -READ16_MEMBER(vamphalf_state::luplup10_speedup_r) +u16 vamphalf_state::luplup10_speedup_r() { if (m_maincpu->pc() == 0xb1128) { @@ -3049,7 +3049,7 @@ READ16_MEMBER(vamphalf_state::luplup10_speedup_r) return m_wram[0x113b78 / 2]; } -READ16_MEMBER(vamphalf_state::puzlbang_speedup_r) +u16 vamphalf_state::puzlbang_speedup_r() { if (m_maincpu->pc() == 0xae6cc) { @@ -3062,7 +3062,7 @@ READ16_MEMBER(vamphalf_state::puzlbang_speedup_r) return m_wram[0x113f14 / 2]; } -READ16_MEMBER(vamphalf_state::puzlbanga_speedup_r) +u16 vamphalf_state::puzlbanga_speedup_r() { if (m_maincpu->pc() == 0xae6cc) { @@ -3075,7 +3075,7 @@ READ16_MEMBER(vamphalf_state::puzlbanga_speedup_r) return m_wram[0x113ecc / 2]; } -READ32_MEMBER(vamphalf_qdsp_state::wivernwg_speedup_r) +u32 vamphalf_qdsp_state::wivernwg_speedup_r() { if (m_maincpu->pc() == 0x10766) { @@ -3088,7 +3088,7 @@ READ32_MEMBER(vamphalf_qdsp_state::wivernwg_speedup_r) return m_wram32[0xb4cc4 / 4]; } -READ32_MEMBER(vamphalf_qdsp_state::wyvernwg_speedup_r) +u32 vamphalf_qdsp_state::wyvernwg_speedup_r() { if (m_maincpu->pc() == 0x10766) { @@ -3101,7 +3101,7 @@ READ32_MEMBER(vamphalf_qdsp_state::wyvernwg_speedup_r) return m_wram32[0xb56f4 / 4]; } -READ32_MEMBER(vamphalf_qdsp_state::wyvernwga_speedup_r) +u32 vamphalf_qdsp_state::wyvernwga_speedup_r() { if (m_maincpu->pc() == 0x10766) { @@ -3114,7 +3114,7 @@ READ32_MEMBER(vamphalf_qdsp_state::wyvernwga_speedup_r) return m_wram32[0xb74f0 / 4]; } -READ32_MEMBER(vamphalf_nvram_state::finalgdr_speedup_r) +u32 vamphalf_nvram_state::finalgdr_speedup_r() { if (m_maincpu->pc() == 0x1c20c) { @@ -3127,7 +3127,7 @@ READ32_MEMBER(vamphalf_nvram_state::finalgdr_speedup_r) return m_wram32[0x5e870 / 4]; } -READ32_MEMBER(vamphalf_nvram_state::mrkickera_speedup_r) +u32 vamphalf_nvram_state::mrkickera_speedup_r() { if (m_maincpu->pc() == 0x46a30) { @@ -3140,7 +3140,7 @@ READ32_MEMBER(vamphalf_nvram_state::mrkickera_speedup_r) return m_wram32[0x701a0 / 4]; } -READ16_MEMBER(vamphalf_state::mrkicker_speedup_r) +u16 vamphalf_state::mrkicker_speedup_r() { if (m_maincpu->pc() == 0x41ec6) { @@ -3153,7 +3153,7 @@ READ16_MEMBER(vamphalf_state::mrkicker_speedup_r) return m_wram[0x63fc0 / 2]; } -READ16_MEMBER(vamphalf_state::dquizgo2_speedup_r) +u16 vamphalf_state::dquizgo2_speedup_r() { if (m_maincpu->pc() == 0xaa630) { @@ -3166,7 +3166,7 @@ READ16_MEMBER(vamphalf_state::dquizgo2_speedup_r) return m_wram[0xcdde8 / 2]; } -READ32_MEMBER(vamphalf_state::aoh_speedup_r) +u32 vamphalf_state::aoh_speedup_r() { if (m_maincpu->pc() == 0xb994 || m_maincpu->pc() == 0xba40) { @@ -3176,7 +3176,7 @@ READ32_MEMBER(vamphalf_state::aoh_speedup_r) return m_wram32[0x28a09c / 4]; } -READ16_MEMBER(vamphalf_state::jmpbreak_speedup_r) +u16 vamphalf_state::jmpbreak_speedup_r() { if (m_maincpu->pc() == 0x984a) { @@ -3189,7 +3189,7 @@ READ16_MEMBER(vamphalf_state::jmpbreak_speedup_r) return m_wram[0x906f4 / 2]; } -READ16_MEMBER(vamphalf_state::jmpbreaka_speedup_r) +u16 vamphalf_state::jmpbreaka_speedup_r() { if (m_maincpu->pc() == 0x909ac) { @@ -3202,7 +3202,7 @@ READ16_MEMBER(vamphalf_state::jmpbreaka_speedup_r) return m_wram[0xe1dfc / 2]; } -READ16_MEMBER(vamphalf_state::poosho_speedup_r) +u16 vamphalf_state::poosho_speedup_r() { if (m_maincpu->pc() == 0xa8c78) { @@ -3215,7 +3215,7 @@ READ16_MEMBER(vamphalf_state::poosho_speedup_r) return m_wram[0xc8b58 / 2]; } -READ16_MEMBER(vamphalf_state::newxpang_speedup_r) +u16 vamphalf_state::newxpang_speedup_r() { if (m_maincpu->pc() == 0x8b8e) { @@ -3228,7 +3228,7 @@ READ16_MEMBER(vamphalf_state::newxpang_speedup_r) return m_wram[0x61218 / 2]; } -READ16_MEMBER(vamphalf_state::worldadv_speedup_r) +u16 vamphalf_state::worldadv_speedup_r() { if (m_maincpu->pc() == 0x93ae) { @@ -3241,7 +3241,7 @@ READ16_MEMBER(vamphalf_state::worldadv_speedup_r) return m_wram[0xc5e78 / 2]; } -READ16_MEMBER(vamphalf_state::mrdig_speedup_r) +u16 vamphalf_state::mrdig_speedup_r() { if (m_maincpu->pc() == 0xae38) { @@ -3254,7 +3254,7 @@ READ16_MEMBER(vamphalf_state::mrdig_speedup_r) return m_wram[0x0e0768 / 2]; } -READ16_MEMBER(vamphalf_state::dtfamily_speedup_r) +u16 vamphalf_state::dtfamily_speedup_r() { if (m_maincpu->pc() == 0x12fa6) { @@ -3267,7 +3267,7 @@ READ16_MEMBER(vamphalf_state::dtfamily_speedup_r) return m_wram[0xcc2a8 / 2]; } -READ16_MEMBER(vamphalf_state::toyland_speedup_r) +u16 vamphalf_state::toyland_speedup_r() { if (m_maincpu->pc() == 0x130c2) { @@ -3280,7 +3280,7 @@ READ16_MEMBER(vamphalf_state::toyland_speedup_r) return m_wram[0x780d8 / 2]; } -READ16_MEMBER(vamphalf_state::boonggab_speedup_r) +u16 vamphalf_state::boonggab_speedup_r() { if (m_maincpu->pc() == 0x131a6) { @@ -3295,7 +3295,7 @@ READ16_MEMBER(vamphalf_state::boonggab_speedup_r) void vamphalf_state::init_vamphalf() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0004a7b8, 0x0004a7b9, read16_delegate(*this, FUNC(vamphalf_state::vamphalf_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0004a7b8, 0x0004a7b9, read16smo_delegate(*this, FUNC(vamphalf_state::vamphalf_speedup_r))); m_palshift = 0; m_flip_bit = 0x80; @@ -3303,7 +3303,7 @@ void vamphalf_state::init_vamphalf() void vamphalf_state::init_vamphalfr1() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0004a468, 0x0004a469, read16_delegate(*this, FUNC(vamphalf_state::vamphalfr1_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0004a468, 0x0004a469, read16smo_delegate(*this, FUNC(vamphalf_state::vamphalfr1_speedup_r))); m_palshift = 0; m_flip_bit = 0x80; @@ -3311,7 +3311,7 @@ void vamphalf_state::init_vamphalfr1() void vamphalf_state::init_vamphafk() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0004a648, 0x0004a649, read16_delegate(*this, FUNC(vamphalf_state::vamphafk_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0004a648, 0x0004a649, read16smo_delegate(*this, FUNC(vamphalf_state::vamphafk_speedup_r))); m_palshift = 0; m_flip_bit = 0x80; @@ -3319,8 +3319,8 @@ void vamphalf_state::init_vamphafk() void vamphalf_qdsp_state::init_misncrft() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x000741e8, 0x000741e9, read16_delegate(*this, FUNC(vamphalf_qdsp_state::misncrft_speedup_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00072e2c, 0x00072e2d, read16_delegate(*this, FUNC(vamphalf_qdsp_state::misncrfta_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x000741e8, 0x000741e9, read16smo_delegate(*this, FUNC(vamphalf_qdsp_state::misncrft_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00072e2c, 0x00072e2d, read16smo_delegate(*this, FUNC(vamphalf_qdsp_state::misncrfta_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3331,7 +3331,7 @@ void vamphalf_qdsp_state::init_misncrft() void vamphalf_state::init_coolmini() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x000d2df8, 0x000d2df9, read16_delegate(*this, FUNC(vamphalf_state::coolmini_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x000d2df8, 0x000d2df9, read16smo_delegate(*this, FUNC(vamphalf_state::coolmini_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3339,7 +3339,7 @@ void vamphalf_state::init_coolmini() void vamphalf_state::init_coolminii() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x000d30a8, 0x000d30a9, read16_delegate(*this, FUNC(vamphalf_state::coolminii_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x000d30a8, 0x000d30a9, read16smo_delegate(*this, FUNC(vamphalf_state::coolminii_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3348,7 +3348,7 @@ void vamphalf_state::init_coolminii() void vamphalf_state::init_mrkicker() { banked_oki(0); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00063fc0, 0x00063fc1, read16_delegate(*this, FUNC(vamphalf_state::mrkicker_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00063fc0, 0x00063fc1, read16smo_delegate(*this, FUNC(vamphalf_state::mrkicker_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3356,7 +3356,7 @@ void vamphalf_state::init_mrkicker() void vamphalf_state::init_suplup() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0011605c, 0x0011605d, read16_delegate(*this, FUNC(vamphalf_state::suplup_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0011605c, 0x0011605d, read16smo_delegate(*this, FUNC(vamphalf_state::suplup_speedup_r))); m_palshift = 8; /* no flipscreen */ @@ -3364,7 +3364,7 @@ void vamphalf_state::init_suplup() void vamphalf_state::init_luplup() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00115e84, 0x00115e85, read16_delegate(*this, FUNC(vamphalf_state::luplup_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00115e84, 0x00115e85, read16smo_delegate(*this, FUNC(vamphalf_state::luplup_speedup_r))); m_palshift = 8; /* no flipscreen */ @@ -3372,7 +3372,7 @@ void vamphalf_state::init_luplup() void vamphalf_state::init_luplup29() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113f08, 0x00113f09, read16_delegate(*this, FUNC(vamphalf_state::luplup29_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113f08, 0x00113f09, read16smo_delegate(*this, FUNC(vamphalf_state::luplup29_speedup_r))); m_palshift = 8; /* no flipscreen */ @@ -3380,7 +3380,7 @@ void vamphalf_state::init_luplup29() void vamphalf_state::init_luplup10() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113b78, 0x00113b79, read16_delegate(*this, FUNC(vamphalf_state::luplup10_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113b78, 0x00113b79, read16smo_delegate(*this, FUNC(vamphalf_state::luplup10_speedup_r))); m_palshift = 8; /* no flipscreen */ @@ -3388,8 +3388,8 @@ void vamphalf_state::init_luplup10() void vamphalf_state::init_puzlbang() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113f14, 0x00113f15, read16_delegate(*this, FUNC(vamphalf_state::puzlbang_speedup_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113ecc, 0x00113ecd, read16_delegate(*this, FUNC(vamphalf_state::puzlbanga_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113f14, 0x00113f15, read16smo_delegate(*this, FUNC(vamphalf_state::puzlbang_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00113ecc, 0x00113ecd, read16smo_delegate(*this, FUNC(vamphalf_state::puzlbanga_speedup_r))); m_palshift = 8; /* no flipscreen */ @@ -3397,9 +3397,9 @@ void vamphalf_state::init_puzlbang() void vamphalf_qdsp_state::init_wyvernwg() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00b4cc4, 0x00b4cc7, read32_delegate(*this, FUNC(vamphalf_qdsp_state::wivernwg_speedup_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00b56f4, 0x00b56f7, read32_delegate(*this, FUNC(vamphalf_qdsp_state::wyvernwg_speedup_r))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00b74f0, 0x00b74f3, read32_delegate(*this, FUNC(vamphalf_qdsp_state::wyvernwga_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00b4cc4, 0x00b4cc7, read32smo_delegate(*this, FUNC(vamphalf_qdsp_state::wivernwg_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00b56f4, 0x00b56f7, read32smo_delegate(*this, FUNC(vamphalf_qdsp_state::wyvernwg_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00b74f0, 0x00b74f3, read32smo_delegate(*this, FUNC(vamphalf_qdsp_state::wyvernwga_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3441,7 +3441,7 @@ void vamphalf_nvram_state::init_finalgdr() banked_oki(0); m_finalgdr_backupram_bank = 1; m_finalgdr_backupram = std::make_unique<u8[]>(0x80*0x100); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x005e870, 0x005e873, read32_delegate(*this, FUNC(vamphalf_nvram_state::finalgdr_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x005e870, 0x005e873, read32smo_delegate(*this, FUNC(vamphalf_nvram_state::finalgdr_speedup_r))); m_nvram->set_base(m_finalgdr_backupram.get(), 0x80*0x100); m_palshift = 0; @@ -3463,7 +3463,7 @@ void vamphalf_nvram_state::init_mrkickera() // backup ram isn't used m_finalgdr_backupram_bank = 1; m_finalgdr_backupram = std::make_unique<u8[]>(0x80*0x100); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00701a0, 0x00701a3, read32_delegate(*this, FUNC(vamphalf_nvram_state::mrkickera_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00701a0, 0x00701a3, read32smo_delegate(*this, FUNC(vamphalf_nvram_state::mrkickera_speedup_r))); m_nvram->set_base(m_finalgdr_backupram.get(), 0x80*0x100); m_palshift = 0; @@ -3479,7 +3479,7 @@ void vamphalf_nvram_state::init_mrkickera() void vamphalf_state::init_dquizgo2() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00cdde8, 0x00cdde9, read16_delegate(*this, FUNC(vamphalf_state::dquizgo2_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00cdde8, 0x00cdde9, read16smo_delegate(*this, FUNC(vamphalf_state::dquizgo2_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3488,7 +3488,7 @@ void vamphalf_state::init_dquizgo2() void vamphalf_state::init_dtfamily() { banked_oki(0); - m_maincpu->space(AS_PROGRAM).install_read_handler(0xcc2a8, 0xcc2a9, read16_delegate(*this, FUNC(vamphalf_state::dtfamily_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xcc2a8, 0xcc2a9, read16smo_delegate(*this, FUNC(vamphalf_state::dtfamily_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3497,7 +3497,7 @@ void vamphalf_state::init_dtfamily() void vamphalf_state::init_toyland() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x780d8, 0x780d9, read16_delegate(*this, FUNC(vamphalf_state::toyland_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x780d8, 0x780d9, read16smo_delegate(*this, FUNC(vamphalf_state::toyland_speedup_r))); m_palshift = 0; m_flip_bit = 1; @@ -3506,7 +3506,7 @@ void vamphalf_state::init_toyland() void vamphalf_state::init_aoh() { banked_oki(1); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x028a09c, 0x028a09f, read32_delegate(*this, FUNC(vamphalf_state::aoh_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x028a09c, 0x028a09f, read32smo_delegate(*this, FUNC(vamphalf_state::aoh_speedup_r))); m_palshift = 0; /* no flipscreen */ @@ -3514,7 +3514,7 @@ void vamphalf_state::init_aoh() void vamphalf_state::init_jmpbreak() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00906f4, 0x00906f5, read16_delegate(*this, FUNC(vamphalf_state::jmpbreak_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00906f4, 0x00906f5, read16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_speedup_r))); m_maincpu->space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_flipscreen_w))); m_palshift = 0; @@ -3522,7 +3522,7 @@ void vamphalf_state::init_jmpbreak() void vamphalf_state::init_jmpbreaka() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x00e1dfc, 0x00e1dfd, read16_delegate(*this, FUNC(vamphalf_state::jmpbreaka_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x00e1dfc, 0x00e1dfd, read16smo_delegate(*this, FUNC(vamphalf_state::jmpbreaka_speedup_r))); m_maincpu->space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_flipscreen_w))); m_palshift = 0; @@ -3530,7 +3530,7 @@ void vamphalf_state::init_jmpbreaka() void vamphalf_state::init_mrdig() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0768, 0x0e0769, read16_delegate(*this, FUNC(vamphalf_state::mrdig_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0e0768, 0x0e0769, read16smo_delegate(*this, FUNC(vamphalf_state::mrdig_speedup_r))); m_maincpu->space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_flipscreen_w))); m_palshift = 0; @@ -3538,7 +3538,7 @@ void vamphalf_state::init_mrdig() void vamphalf_state::init_poosho() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0c8b58, 0x0c8b59, read16_delegate(*this, FUNC(vamphalf_state::poosho_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0c8b58, 0x0c8b59, read16smo_delegate(*this, FUNC(vamphalf_state::poosho_speedup_r))); m_maincpu->space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_flipscreen_w))); m_palshift = 0; @@ -3546,7 +3546,7 @@ void vamphalf_state::init_poosho() void vamphalf_state::init_newxpang() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x061218, 0x061219, read16_delegate(*this, FUNC(vamphalf_state::newxpang_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x061218, 0x061219, read16smo_delegate(*this, FUNC(vamphalf_state::newxpang_speedup_r))); m_maincpu->space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_flipscreen_w))); m_palshift = 0; @@ -3554,7 +3554,7 @@ void vamphalf_state::init_newxpang() void vamphalf_state::init_worldadv() { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0c5e78, 0x0c5e79, read16_delegate(*this, FUNC(vamphalf_state::worldadv_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0c5e78, 0x0c5e79, read16smo_delegate(*this, FUNC(vamphalf_state::worldadv_speedup_r))); m_maincpu->space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16smo_delegate(*this, FUNC(vamphalf_state::jmpbreak_flipscreen_w))); m_palshift = 0; @@ -3563,7 +3563,7 @@ void vamphalf_state::init_worldadv() void vamphalf_state::init_boonggab() { banked_oki(0); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x000f1b74, 0x000f1b75, read16_delegate(*this, FUNC(vamphalf_state::boonggab_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x000f1b74, 0x000f1b75, read16smo_delegate(*this, FUNC(vamphalf_state::boonggab_speedup_r))); m_palshift = 0; m_has_extra_gfx = true; diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp index c07cfe1798a..01c16de4fe8 100644 --- a/src/mame/drivers/vax11.cpp +++ b/src/mame/drivers/vax11.cpp @@ -85,33 +85,33 @@ public: private: required_device<t11_device> m_maincpu; required_device<generic_terminal_device> m_terminal; - DECLARE_READ16_MEMBER( term_r ); - DECLARE_READ16_MEMBER( term_tx_status_r ); - DECLARE_READ16_MEMBER( term_rx_status_r ); - DECLARE_WRITE16_MEMBER( term_w ); + uint16_t term_r(); + uint16_t term_tx_status_r(); + uint16_t term_rx_status_r(); + void term_w(uint16_t data); void kbd_put(u8 data); uint8_t m_term_data; uint16_t m_term_status; void vax11_mem(address_map &map); }; -WRITE16_MEMBER(vax11_state::term_w) +void vax11_state::term_w(uint16_t data) { m_terminal->write(data); } -READ16_MEMBER(vax11_state::term_r) +uint16_t vax11_state::term_r() { m_term_status = 0x0000; return m_term_data; } -READ16_MEMBER(vax11_state::term_tx_status_r) +uint16_t vax11_state::term_tx_status_r() { // always ready return 0xffff; } -READ16_MEMBER(vax11_state::term_rx_status_r) +uint16_t vax11_state::term_rx_status_r() { return m_term_status; } diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index fc7213e15a5..ef69def55cc 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -146,28 +146,28 @@ private: uint8_t m_row_num; attotime m_input_latch_time; - DECLARE_READ32_MEMBER(io_r); - DECLARE_WRITE32_MEMBER(io_w); - DECLARE_READ16_MEMBER(vip_r); - DECLARE_WRITE16_MEMBER(vip_w); - DECLARE_WRITE16_MEMBER(font0_w); - DECLARE_WRITE16_MEMBER(font1_w); - DECLARE_WRITE16_MEMBER(font2_w); - DECLARE_WRITE16_MEMBER(font3_w); - DECLARE_READ16_MEMBER(font0_r); - DECLARE_READ16_MEMBER(font1_r); - DECLARE_READ16_MEMBER(font2_r); - DECLARE_READ16_MEMBER(font3_r); - DECLARE_WRITE16_MEMBER(vboy_bgmap_w); - DECLARE_READ16_MEMBER(vboy_bgmap_r); - DECLARE_READ8_MEMBER(lfb0_r); - DECLARE_READ8_MEMBER(lfb1_r); - DECLARE_READ8_MEMBER(rfb0_r); - DECLARE_READ8_MEMBER(rfb1_r); - DECLARE_WRITE8_MEMBER(lfb0_w); - DECLARE_WRITE8_MEMBER(lfb1_w); - DECLARE_WRITE8_MEMBER(rfb0_w); - DECLARE_WRITE8_MEMBER(rfb1_w); + uint32_t io_r(offs_t offset); + void io_w(offs_t offset, uint32_t data); + uint16_t vip_r(offs_t offset); + void vip_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void font0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void font1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void font2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void font3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t font0_r(offs_t offset); + uint16_t font1_r(offs_t offset); + uint16_t font2_r(offs_t offset); + uint16_t font3_r(offs_t offset); + void vboy_bgmap_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t vboy_bgmap_r(offs_t offset); + uint8_t lfb0_r(offs_t offset); + uint8_t lfb1_r(offs_t offset); + uint8_t rfb0_r(offs_t offset); + uint8_t rfb1_r(offs_t offset); + void lfb0_w(offs_t offset, uint8_t data); + void lfb1_w(offs_t offset, uint8_t data); + void rfb0_w(offs_t offset, uint8_t data); + void rfb1_w(offs_t offset, uint8_t data); void m_timer_tick(); void m_scanline_tick(int scanline, uint8_t screen_type); @@ -557,7 +557,7 @@ uint32_t vboy_state::screen_update_vboy_right(screen_device &screen, bitmap_ind1 * *********************************/ -READ32_MEMBER( vboy_state::io_r ) +uint32_t vboy_state::io_r(offs_t offset) { uint32_t value = 0x00; @@ -602,7 +602,7 @@ READ32_MEMBER( vboy_state::io_r ) return value; } -WRITE32_MEMBER( vboy_state::io_w ) +void vboy_state::io_w(offs_t offset, uint32_t data) { switch (offset<<2) { @@ -719,7 +719,7 @@ void vboy_state::m_set_brightness() m_palette->set_pen_color(3, c,0,0); } -READ16_MEMBER( vboy_state::vip_r ) +uint16_t vboy_state::vip_r(offs_t offset) { switch(offset << 1) { case 0x00: //INTPND @@ -842,7 +842,7 @@ READ16_MEMBER( vboy_state::vip_r ) return 0xffff; } -WRITE16_MEMBER( vboy_state::vip_w ) +void vboy_state::vip_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(mem_mask != 0xffff) printf("%04x %02x\n",mem_mask,offset*2); @@ -986,64 +986,64 @@ WRITE16_MEMBER( vboy_state::vip_w ) -WRITE16_MEMBER( vboy_state::font0_w ) +void vboy_state::font0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { WRITE_FONT(offset); } -WRITE16_MEMBER( vboy_state::font1_w ) +void vboy_state::font1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { WRITE_FONT(offset+0x1000); } -WRITE16_MEMBER( vboy_state::font2_w ) +void vboy_state::font2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { WRITE_FONT(offset+0x2000); } -WRITE16_MEMBER( vboy_state::font3_w ) +void vboy_state::font3_w(offs_t offset, uint16_t data, uint16_t mem_mask) { WRITE_FONT(offset+0x3000); } -READ16_MEMBER( vboy_state::font0_r ) +uint16_t vboy_state::font0_r(offs_t offset) { return READ_FONT(offset); } -READ16_MEMBER( vboy_state::font1_r ) +uint16_t vboy_state::font1_r(offs_t offset) { return READ_FONT(offset + 0x1000); } -READ16_MEMBER( vboy_state::font2_r ) +uint16_t vboy_state::font2_r(offs_t offset) { return READ_FONT(offset + 0x2000); } -READ16_MEMBER( vboy_state::font3_r ) +uint16_t vboy_state::font3_r(offs_t offset) { return READ_FONT(offset + 0x3000); } -WRITE16_MEMBER( vboy_state::vboy_bgmap_w ) +void vboy_state::vboy_bgmap_w(offs_t offset, uint16_t data, uint16_t mem_mask) { m_bgmap[offset] = data | (m_bgmap[offset] & (mem_mask ^ 0xffff)); } -READ16_MEMBER( vboy_state::vboy_bgmap_r ) +uint16_t vboy_state::vboy_bgmap_r(offs_t offset) { return m_bgmap[offset]; } -READ8_MEMBER( vboy_state::lfb0_r ) { return m_l_frame_0[offset]; } -READ8_MEMBER( vboy_state::lfb1_r ) { return m_l_frame_1[offset]; } -READ8_MEMBER( vboy_state::rfb0_r ) { return m_r_frame_0[offset]; } -READ8_MEMBER( vboy_state::rfb1_r ) { return m_r_frame_1[offset]; } -WRITE8_MEMBER( vboy_state::lfb0_w ) { m_l_frame_0[offset] = data; } -WRITE8_MEMBER( vboy_state::lfb1_w ) { m_l_frame_1[offset] = data; } -WRITE8_MEMBER( vboy_state::rfb0_w ) { m_r_frame_0[offset] = data; } -WRITE8_MEMBER( vboy_state::rfb1_w ) { m_r_frame_1[offset] = data; } +uint8_t vboy_state::lfb0_r(offs_t offset) { return m_l_frame_0[offset]; } +uint8_t vboy_state::lfb1_r(offs_t offset) { return m_l_frame_1[offset]; } +uint8_t vboy_state::rfb0_r(offs_t offset) { return m_r_frame_0[offset]; } +uint8_t vboy_state::rfb1_r(offs_t offset) { return m_r_frame_1[offset]; } +void vboy_state::lfb0_w(offs_t offset, uint8_t data) { m_l_frame_0[offset] = data; } +void vboy_state::lfb1_w(offs_t offset, uint8_t data) { m_l_frame_1[offset] = data; } +void vboy_state::rfb0_w(offs_t offset, uint8_t data) { m_r_frame_0[offset] = data; } +void vboy_state::rfb1_w(offs_t offset, uint8_t data) { m_r_frame_1[offset] = data; } void vboy_state::vboy_mem(address_map &map) diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index 5381fd8fc8e..ef93aec1594 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -133,19 +133,19 @@ private: std::unique_ptr<uint16_t[]> m_i860_framebuffer[2][2]; int m_crtc_select; - DECLARE_WRITE16_MEMBER(main_video_write); - DECLARE_READ16_MEMBER(control_1_r); - DECLARE_READ16_MEMBER(control_2_r); - DECLARE_READ16_MEMBER(control_3_r); + void main_video_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t control_1_r(); + uint16_t control_2_r(); + uint16_t control_3_r(); void wiggle_i860_common(int which, uint16_t data); - DECLARE_WRITE16_MEMBER(wiggle_i860p0_pins_w); - DECLARE_WRITE16_MEMBER(wiggle_i860p1_pins_w); - DECLARE_READ16_MEMBER(main_irqiack_r); - DECLARE_READ16_MEMBER(sound_resetmain_r); - DECLARE_WRITE64_MEMBER(v0_fb_w); - DECLARE_WRITE64_MEMBER(v1_fb_w); - DECLARE_WRITE16_MEMBER(crtc_w); - DECLARE_WRITE16_MEMBER(vcombat_dac_w); + void wiggle_i860p0_pins_w(uint16_t data); + void wiggle_i860p1_pins_w(uint16_t data); + uint16_t main_irqiack_r(); + uint16_t sound_resetmain_r(); + void v0_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + void v1_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + void crtc_w(uint16_t data); + void vcombat_dac_w(uint16_t data); DECLARE_WRITE_LINE_MEMBER(sound_update); uint32_t update_screen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int index); @@ -210,7 +210,7 @@ uint32_t vcombat_state::screen_update_vcombat_main(screen_device &screen, bitmap uint32_t vcombat_state::screen_update_vcombat_aux(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 1); } -WRITE16_MEMBER(vcombat_state::main_video_write) +void vcombat_state::main_video_write(offs_t offset, uint16_t data, uint16_t mem_mask) { int fb = (*m_framebuffer_ctrl & 0x20) ? 0 : 1; uint16_t old_data = m_m68k_framebuffer[fb][offset]; @@ -234,17 +234,17 @@ WRITE16_MEMBER(vcombat_state::main_video_write) } } -READ16_MEMBER(vcombat_state::control_1_r) +uint16_t vcombat_state::control_1_r() { return (ioport("IN0")->read() << 8); } -READ16_MEMBER(vcombat_state::control_2_r) +uint16_t vcombat_state::control_2_r() { return (ioport("IN1")->read() << 8); } -READ16_MEMBER(vcombat_state::control_3_r) +uint16_t vcombat_state::control_3_r() { return (ioport("IN2")->read() << 8); } @@ -277,17 +277,17 @@ void vcombat_state::wiggle_i860_common(int which, uint16_t data) device.i860_set_pin(DEC_PIN_RESET, 0); } -WRITE16_MEMBER(vcombat_state::wiggle_i860p0_pins_w) +void vcombat_state::wiggle_i860p0_pins_w(uint16_t data) { wiggle_i860_common(0, data); } -WRITE16_MEMBER(vcombat_state::wiggle_i860p1_pins_w) +void vcombat_state::wiggle_i860p1_pins_w(uint16_t data) { wiggle_i860_common(1, data); } -READ16_MEMBER(vcombat_state::main_irqiack_r) +uint16_t vcombat_state::main_irqiack_r() { //LOG("M0: irq iack\n"); m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); @@ -295,14 +295,14 @@ READ16_MEMBER(vcombat_state::main_irqiack_r) return 0; } -READ16_MEMBER(vcombat_state::sound_resetmain_r) +uint16_t vcombat_state::sound_resetmain_r() { //LOG("M1: reset line to M0\n"); //m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); return 0; } -WRITE64_MEMBER(vcombat_state::v0_fb_w) +void vcombat_state::v0_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask) { /* The frame buffer seems to sit on a 32-bit data bus, while the i860 uses a 64-bit data bus. Adjust accordingly. */ @@ -325,7 +325,7 @@ WRITE64_MEMBER(vcombat_state::v0_fb_w) /* This is just temporary so we can see what each i860 is doing to the framebuffer. */ -WRITE64_MEMBER(vcombat_state::v1_fb_w) +void vcombat_state::v1_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask) { /* The frame buffer seems to sit on a 32-bit data bus, while the i860 uses a 64-bit data bus. Adjust accordingly. */ @@ -346,7 +346,7 @@ WRITE64_MEMBER(vcombat_state::v1_fb_w) } } -WRITE16_MEMBER(vcombat_state::crtc_w) +void vcombat_state::crtc_w(uint16_t data) { if (m_crtc == nullptr) return; @@ -359,7 +359,7 @@ WRITE16_MEMBER(vcombat_state::crtc_w) m_crtc_select ^= 1; } -WRITE16_MEMBER(vcombat_state::vcombat_dac_w) +void vcombat_state::vcombat_dac_w(uint16_t data) { m_dac->write(data >> 5); if (data & 0x801f) diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp index 22b6d1ebda6..7c2dfc40376 100644 --- a/src/mame/drivers/vcs80.cpp +++ b/src/mame/drivers/vcs80.cpp @@ -86,7 +86,7 @@ private: m_bdmem->write8(offset, data); } - DECLARE_READ8_MEMBER( io_r ) + uint8_t io_r(offs_t offset) { m_pio->port_b_write((!BIT(offset, 0)) << 7); if (BIT(offset, 2)) @@ -94,7 +94,7 @@ private: return 0xff; } - DECLARE_WRITE8_MEMBER( io_w ) + void io_w(offs_t offset, uint8_t data) { m_pio->port_b_write((!BIT(offset, 0)) << 7); if (BIT(offset, 2)) diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp index e06b9053ff7..acfd9002b93 100644 --- a/src/mame/drivers/vd.cpp +++ b/src/mame/drivers/vd.cpp @@ -37,11 +37,11 @@ public: void vd(machine_config &config); private: - DECLARE_READ8_MEMBER(ack_r); - DECLARE_WRITE8_MEMBER(col_w); - DECLARE_WRITE8_MEMBER(disp_w); - DECLARE_WRITE8_MEMBER(lamp_w) { }; - DECLARE_WRITE8_MEMBER(sol_w) { }; + uint8_t ack_r(); + void col_w(uint8_t data); + void disp_w(offs_t offset, uint8_t data); + void lamp_w(uint8_t data) { }; + void sol_w(uint8_t data) { }; TIMER_DEVICE_CALLBACK_MEMBER(irq); void vd_io(address_map &map); void vd_map(address_map &map); @@ -55,7 +55,7 @@ private: }; -READ8_MEMBER(vd_state::ack_r) +uint8_t vd_state::ack_r() { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); // guess return 0; // this value is not used @@ -159,7 +159,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( vd_state::irq ) m_t_c++; } -WRITE8_MEMBER( vd_state::disp_w ) +void vd_state::disp_w(offs_t offset, uint8_t data) { segment[offset] = data; #if 0 // probably not how this works @@ -168,7 +168,7 @@ WRITE8_MEMBER( vd_state::disp_w ) #endif } -WRITE8_MEMBER( vd_state::col_w ) +void vd_state::col_w(uint8_t data) { if (data != 0x3f) { diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index 5b3ef25af1a..796a3c03332 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -47,10 +47,10 @@ private: std::unique_ptr<uint8_t[]> m_vram; int m_vbuffer; - DECLARE_WRITE8_MEMBER(vram_w); - DECLARE_READ8_MEMBER(vram_r); - DECLARE_WRITE32_MEMBER(vega_misc_w); - DECLARE_READ32_MEMBER(vegaeo_custom_read); + void vram_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + uint8_t vram_r(offs_t offset); + void vega_misc_w(uint32_t data); + uint32_t vegaeo_custom_read(); void qs1000_p1_w(uint8_t data); void qs1000_p2_w(uint8_t data); void qs1000_p3_w(uint8_t data); @@ -79,19 +79,19 @@ void vegaeo_state::qs1000_p3_w(uint8_t data) m_soundlatch->acknowledge_w(); } -WRITE8_MEMBER(vegaeo_state::vram_w) +void vegaeo_state::vram_w(offs_t offset, uint8_t data, uint8_t mem_mask) { // don't write transparent pen if (data != 0xff) COMBINE_DATA(&m_vram[offset + m_vbuffer * 0x14000]); } -READ8_MEMBER(vegaeo_state::vram_r) +uint8_t vegaeo_state::vram_r(offs_t offset) { return m_vram[offset + 0x14000 * m_vbuffer]; } -WRITE32_MEMBER(vegaeo_state::vega_misc_w) +void vegaeo_state::vega_misc_w(uint32_t data) { // other bits ??? @@ -99,7 +99,7 @@ WRITE32_MEMBER(vegaeo_state::vega_misc_w) } -READ32_MEMBER(vegaeo_state::vegaeo_custom_read) +uint32_t vegaeo_state::vegaeo_custom_read() { speedup_read(); return m_system_io->read(); diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 39868016eb2..ac37e0b5643 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -420,31 +420,25 @@ private: DECLARE_WRITE_LINE_MEMBER(watchdog_reset); DECLARE_WRITE_LINE_MEMBER(watchdog_irq); - DECLARE_WRITE32_MEMBER(timekeeper_w); - DECLARE_READ32_MEMBER(timekeeper_r); + void timekeeper_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t timekeeper_r(offs_t offset, uint32_t mem_mask = ~0); void reset_sio(void); - DECLARE_READ8_MEMBER(sio_r); - DECLARE_WRITE8_MEMBER(sio_w); - DECLARE_WRITE8_MEMBER( cpu_io_w ); - DECLARE_READ8_MEMBER( cpu_io_r ); - DECLARE_READ32_MEMBER( analog_port_r ); - DECLARE_WRITE32_MEMBER( analog_port_w ); - DECLARE_WRITE32_MEMBER( asic_fifo_w ); - DECLARE_READ32_MEMBER( ide_main_r ); - DECLARE_WRITE32_MEMBER( ide_main_w ); - DECLARE_READ32_MEMBER( ide_alt_r ); - DECLARE_WRITE32_MEMBER( ide_alt_w ); - DECLARE_READ32_MEMBER( ide_bus_master32_r ); - DECLARE_WRITE32_MEMBER( ide_bus_master32_w ); - DECLARE_READ32_MEMBER( ethernet_r ); - DECLARE_WRITE32_MEMBER( ethernet_w ); - DECLARE_WRITE32_MEMBER( dcs3_fifo_full_w ); + uint8_t sio_r(offs_t offset); + void sio_w(offs_t offset, uint8_t data); + void cpu_io_w(offs_t offset, uint8_t data); + uint8_t cpu_io_r(offs_t offset); + uint32_t analog_port_r(offs_t offset, uint32_t mem_mask = ~0); + void analog_port_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void asic_fifo_w(uint32_t data); + uint32_t ethernet_r(offs_t offset, uint32_t mem_mask = ~0); + void ethernet_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void dcs3_fifo_full_w(uint32_t data); DECLARE_WRITE_LINE_MEMBER(ethernet_interrupt); DECLARE_WRITE_LINE_MEMBER(ioasic_irq); - DECLARE_READ32_MEMBER(unknown_r); - DECLARE_READ8_MEMBER(parallel_r); - DECLARE_WRITE8_MEMBER(parallel_w); - DECLARE_WRITE8_MEMBER(mpsreset_w); + uint32_t unknown_r(offs_t offset, uint32_t mem_mask = ~0); + uint8_t parallel_r(offs_t offset); + void parallel_w(offs_t offset, uint8_t data); + void mpsreset_w(offs_t offset, uint8_t data); void i40_w(uint32_t data); void wheel_board_w(uint32_t data); @@ -569,7 +563,7 @@ WRITE_LINE_MEMBER(vegas_state::watchdog_reset) * *************************************/ -WRITE32_MEMBER( vegas_state::timekeeper_w ) +void vegas_state::timekeeper_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_cmos_unlocked) { @@ -590,7 +584,7 @@ WRITE32_MEMBER( vegas_state::timekeeper_w ) } -READ32_MEMBER( vegas_state::timekeeper_r ) +uint32_t vegas_state::timekeeper_r(offs_t offset, uint32_t mem_mask) { uint32_t result = 0xffffffff; if (ACCESSING_BITS_0_7) @@ -692,7 +686,7 @@ void vegas_state::reset_sio() update_sio_irqs(); } -READ8_MEMBER(vegas_state::sio_r) +uint8_t vegas_state::sio_r(offs_t offset) { uint32_t result = 0x0; int index = offset >> 12; @@ -770,7 +764,7 @@ READ8_MEMBER(vegas_state::sio_r) } -WRITE8_MEMBER(vegas_state::sio_w) +void vegas_state::sio_w(offs_t offset, uint8_t data) { // Bit 0 of data is used to program the 6016 FPGA in programming mode (m_cpio_data[3](Bit 0)==0) if (m_cpuio_data[3] & 0x1) { @@ -839,7 +833,7 @@ WRITE8_MEMBER(vegas_state::sio_w) * *************************************/ -WRITE8_MEMBER(vegas_state::cpu_io_w) +void vegas_state::cpu_io_w(offs_t offset, uint8_t data) { // 0: system LED // 1: PLD Config / Clock Gen @@ -906,7 +900,7 @@ WRITE8_MEMBER(vegas_state::cpu_io_w) } } -READ8_MEMBER( vegas_state::cpu_io_r ) +uint8_t vegas_state::cpu_io_r(offs_t offset) { uint32_t result = 0; if (offset < 4) @@ -924,7 +918,7 @@ READ8_MEMBER( vegas_state::cpu_io_r ) * *************************************/ -READ32_MEMBER( vegas_state::analog_port_r ) +uint32_t vegas_state::analog_port_r(offs_t offset, uint32_t mem_mask) { //logerror("%s: analog_port_r = %08X & %08X\n", machine().describe_context(), m_pending_analog_read, mem_mask); // Clear interrupt @@ -937,7 +931,7 @@ READ32_MEMBER( vegas_state::analog_port_r ) } -WRITE32_MEMBER( vegas_state::analog_port_w ) +void vegas_state::analog_port_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t shift_data = data >> m_a2d_shift; int index = shift_data & 0x7; @@ -979,12 +973,12 @@ WRITE32_MEMBER( vegas_state::analog_port_w ) * *************************************/ -WRITE32_MEMBER( vegas_state::asic_fifo_w ) +void vegas_state::asic_fifo_w(uint32_t data) { m_ioasic->fifo_w(data); } -READ32_MEMBER( vegas_state::ethernet_r ) +uint32_t vegas_state::ethernet_r(offs_t offset, uint32_t mem_mask) { uint32_t result = 0; if (ACCESSING_BITS_0_15) @@ -996,7 +990,7 @@ READ32_MEMBER( vegas_state::ethernet_r ) } -WRITE32_MEMBER( vegas_state::ethernet_w ) +void vegas_state::ethernet_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_0_15) m_ethernet->write(offset * 2 + 0, data, mem_mask); @@ -1006,12 +1000,12 @@ WRITE32_MEMBER( vegas_state::ethernet_w ) } -WRITE32_MEMBER( vegas_state::dcs3_fifo_full_w ) +void vegas_state::dcs3_fifo_full_w(uint32_t data) { m_ioasic->fifo_full_w(data); } -READ32_MEMBER(vegas_state::unknown_r) +uint32_t vegas_state::unknown_r(offs_t offset, uint32_t mem_mask) { uint32_t result = 0xffffffff; if (1) @@ -1022,14 +1016,14 @@ READ32_MEMBER(vegas_state::unknown_r) /************************************* * Parallel Port *************************************/ -READ8_MEMBER(vegas_state::parallel_r) +uint8_t vegas_state::parallel_r(offs_t offset) { uint8_t result = 0x7; logerror("%s: parallel_r %08x = %02x\n", machine().describe_context(), offset, result); return result; } -WRITE8_MEMBER(vegas_state::parallel_w) +void vegas_state::parallel_w(offs_t offset, uint8_t data) { logerror("%s: parallel_w %08x = %02x\n", machine().describe_context(), offset, data); } @@ -1037,7 +1031,7 @@ WRITE8_MEMBER(vegas_state::parallel_w) /************************************* * MPS Reset *************************************/ -WRITE8_MEMBER(vegas_state::mpsreset_w) +void vegas_state::mpsreset_w(offs_t offset, uint8_t data) { logerror("%s: mpsreset_w %08x = %02x\n", machine().describe_context(), offset, data); } diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp index 8663c4bc291..6b1d0979df5 100644 --- a/src/mame/drivers/vg5k.cpp +++ b/src/mame/drivers/vg5k.cpp @@ -95,13 +95,13 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER( printer_r ); - DECLARE_WRITE8_MEMBER( printer_w ); - DECLARE_WRITE8_MEMBER ( ef9345_offset_w ); - DECLARE_READ8_MEMBER ( ef9345_io_r ); - DECLARE_WRITE8_MEMBER ( ef9345_io_w ); - DECLARE_READ8_MEMBER ( cassette_r ); - DECLARE_WRITE8_MEMBER ( cassette_w ); + uint8_t printer_r(); + void printer_w(uint8_t data); + void ef9345_offset_w(uint8_t data); + uint8_t ef9345_io_r(); + void ef9345_io_w(uint8_t data); + uint8_t cassette_r(); + void cassette_w(uint8_t data); TIMER_CALLBACK_MEMBER(z80_irq_clear); TIMER_DEVICE_CALLBACK_MEMBER(z80_irq); TIMER_DEVICE_CALLBACK_MEMBER(vg5k_scanline); @@ -110,37 +110,37 @@ private: }; -READ8_MEMBER( vg5k_state::printer_r ) +uint8_t vg5k_state::printer_r() { return (m_printer->is_ready() ? 0x00 : 0xff); } -WRITE8_MEMBER( vg5k_state::printer_w ) +void vg5k_state::printer_w(uint8_t data) { m_printer->output(data); } -WRITE8_MEMBER ( vg5k_state::ef9345_offset_w ) +void vg5k_state::ef9345_offset_w(uint8_t data) { m_ef9345_offset = data; } -READ8_MEMBER ( vg5k_state::ef9345_io_r ) +uint8_t vg5k_state::ef9345_io_r() { return m_ef9345->data_r(m_ef9345_offset); } -WRITE8_MEMBER ( vg5k_state::ef9345_io_w ) +void vg5k_state::ef9345_io_w(uint8_t data) { m_ef9345->data_w(m_ef9345_offset, data); } -READ8_MEMBER ( vg5k_state::cassette_r ) +uint8_t vg5k_state::cassette_r() { double level = m_cassette->input(); @@ -148,7 +148,7 @@ READ8_MEMBER ( vg5k_state::cassette_r ) } -WRITE8_MEMBER ( vg5k_state::cassette_w ) +void vg5k_state::cassette_w(uint8_t data) { m_dac->write(BIT(data, 3)); diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index c45c5c39c2d..42439e94f22 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -246,35 +246,35 @@ public: virtual std::unique_ptr<util::disasm_interface> create_disassembler() override; - template<int Index> DECLARE_READ8_MEMBER(segapcm_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ym2608_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ym2610_adpcm_a_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ym2610_adpcm_b_rom_r); - template<int Index> DECLARE_READ8_MEMBER(y8950_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ymf278b_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ymf271_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ymz280b_rom_r); - template<int Index> DECLARE_READ8_MEMBER(multipcm_rom_r); - template<int Index> DECLARE_READ8_MEMBER(upd7759_rom_r); - template<int Index> DECLARE_READ8_MEMBER(okim6295_rom_r); - template<int Index> DECLARE_READ8_MEMBER(k054539_rom_r); - template<int Index> DECLARE_READ16_MEMBER(c140_rom_r); - template<int Index> DECLARE_READ16_MEMBER(c219_rom_r); - template<int Index> DECLARE_READ8_MEMBER(k053260_rom_r); - template<int Index> DECLARE_READ8_MEMBER(qsound_rom_r); - template<int Index> DECLARE_READ8_MEMBER(es5505_rom_r); - template<int Index> DECLARE_READ8_MEMBER(x1_010_rom_r); - template<int Index> DECLARE_READ8_MEMBER(c352_rom_r); - template<int Index> DECLARE_READ8_MEMBER(ga20_rom_r); - - template<int Index> DECLARE_WRITE8_MEMBER(multipcm_bank_hi_w); - template<int Index> DECLARE_WRITE8_MEMBER(multipcm_bank_lo_w); - - template<int Index> DECLARE_WRITE8_MEMBER(upd7759_bank_w); - - template<int Index> DECLARE_WRITE8_MEMBER(okim6295_nmk112_enable_w); - template<int Index> DECLARE_WRITE8_MEMBER(okim6295_bank_w); - template<int Index> DECLARE_WRITE8_MEMBER(okim6295_nmk112_bank_w); + template<int Index> uint8_t segapcm_rom_r(offs_t offset); + template<int Index> uint8_t ym2608_rom_r(offs_t offset); + template<int Index> uint8_t ym2610_adpcm_a_rom_r(offs_t offset); + template<int Index> uint8_t ym2610_adpcm_b_rom_r(offs_t offset); + template<int Index> uint8_t y8950_rom_r(offs_t offset); + template<int Index> uint8_t ymf278b_rom_r(offs_t offset); + template<int Index> uint8_t ymf271_rom_r(offs_t offset); + template<int Index> uint8_t ymz280b_rom_r(offs_t offset); + template<int Index> uint8_t multipcm_rom_r(offs_t offset); + template<int Index> uint8_t upd7759_rom_r(offs_t offset); + template<int Index> uint8_t okim6295_rom_r(offs_t offset); + template<int Index> uint8_t k054539_rom_r(offs_t offset); + template<int Index> uint16_t c140_rom_r(offs_t offset); + template<int Index> uint16_t c219_rom_r(offs_t offset); + template<int Index> uint8_t k053260_rom_r(offs_t offset); + template<int Index> uint8_t qsound_rom_r(offs_t offset); + template<int Index> uint8_t es5505_rom_r(offs_t offset); + template<int Index> uint8_t x1_010_rom_r(offs_t offset); + template<int Index> uint8_t c352_rom_r(offs_t offset); + template<int Index> uint8_t ga20_rom_r(offs_t offset); + + template<int Index> void multipcm_bank_hi_w(offs_t offset, uint8_t data); + template<int Index> void multipcm_bank_lo_w(offs_t offset, uint8_t data); + + template<int Index> void upd7759_bank_w(uint8_t data); + + template<int Index> void okim6295_nmk112_enable_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + template<int Index> void okim6295_bank_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + template<int Index> void okim6295_nmk112_bank_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); void set_c140_bank_type(int index, C140_TYPE type); C140_TYPE c140_bank(int index) { return m_c140_bank[index]; } @@ -421,19 +421,19 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(load_file); - DECLARE_READ8_MEMBER(file_r); - DECLARE_READ8_MEMBER(file_size_r); + uint8_t file_r(offs_t offset); + uint8_t file_size_r(offs_t offset); DECLARE_INPUT_CHANGED_MEMBER(key_pressed); - template<int Index> DECLARE_WRITE8_MEMBER(upd7759_reset_w); - template<int Index> DECLARE_WRITE8_MEMBER(upd7759_data_w); + template<int Index> void upd7759_reset_w(uint8_t data); + template<int Index> void upd7759_data_w(uint8_t data); template<int Index> DECLARE_WRITE_LINE_MEMBER(upd7759_drq_w); - template<int Index> DECLARE_WRITE8_MEMBER(okim6258_clock_w); - template<int Index> DECLARE_WRITE8_MEMBER(okim6258_divider_w); - template<int Index> DECLARE_WRITE8_MEMBER(okim6295_clock_w); - template<int Index> DECLARE_WRITE8_MEMBER(okim6295_pin7_w); - template<int Index> DECLARE_WRITE8_MEMBER(scc_w); - template<int Index> DECLARE_WRITE8_MEMBER(c140_c219_w); + template<int Index> void okim6258_clock_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + template<int Index> void okim6258_divider_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + template<int Index> void okim6295_clock_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + template<int Index> void okim6295_pin7_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + template<int Index> void scc_w(offs_t offset, uint8_t data); + template<int Index> void c140_c219_w(offs_t offset, uint8_t data); void vgmplay(machine_config &config); void file_map(address_map &map); @@ -2423,55 +2423,55 @@ uint8_t vgmplay_device::rom_r(int index, uint8_t type, offs_t offset) } template<int Index> -READ8_MEMBER(vgmplay_device::segapcm_rom_r) +uint8_t vgmplay_device::segapcm_rom_r(offs_t offset) { return rom_r(Index, 0x80, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ym2608_rom_r) +uint8_t vgmplay_device::ym2608_rom_r(offs_t offset) { return rom_r(Index, 0x81, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ym2610_adpcm_a_rom_r) +uint8_t vgmplay_device::ym2610_adpcm_a_rom_r(offs_t offset) { return rom_r(Index, 0x82, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ym2610_adpcm_b_rom_r) +uint8_t vgmplay_device::ym2610_adpcm_b_rom_r(offs_t offset) { return rom_r(Index, 0x83, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ymf278b_rom_r) +uint8_t vgmplay_device::ymf278b_rom_r(offs_t offset) { return rom_r(Index, 0x84, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ymf271_rom_r) +uint8_t vgmplay_device::ymf271_rom_r(offs_t offset) { return rom_r(Index, 0x85, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ymz280b_rom_r) +uint8_t vgmplay_device::ymz280b_rom_r(offs_t offset) { return rom_r(Index, 0x86, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::y8950_rom_r) +uint8_t vgmplay_device::y8950_rom_r(offs_t offset) { return rom_r(Index, 0x88, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::multipcm_rom_r) +uint8_t vgmplay_device::multipcm_rom_r(offs_t offset) { if (m_multipcm_banked[Index] == 1) { @@ -2499,13 +2499,13 @@ READ8_MEMBER(vgmplay_device::multipcm_rom_r) } template<int Index> -READ8_MEMBER(vgmplay_device::upd7759_rom_r) +uint8_t vgmplay_device::upd7759_rom_r(offs_t offset) { return rom_r(Index, 0x8a, m_upd7759_bank[Index] | offset); } template<int Index> -READ8_MEMBER(vgmplay_device::okim6295_rom_r) +uint8_t vgmplay_device::okim6295_rom_r(offs_t offset) { if (m_okim6295_nmk112_enable[Index]) { @@ -2526,13 +2526,13 @@ READ8_MEMBER(vgmplay_device::okim6295_rom_r) } template<int Index> -READ8_MEMBER(vgmplay_device::k054539_rom_r) +uint8_t vgmplay_device::k054539_rom_r(offs_t offset) { return rom_r(Index, 0x8c, offset); } template<int Index> -READ16_MEMBER(vgmplay_device::c140_rom_r) +uint16_t vgmplay_device::c140_rom_r(offs_t offset) { switch (m_c140_bank[Index]) { @@ -2551,7 +2551,7 @@ READ16_MEMBER(vgmplay_device::c140_rom_r) } template<int Index> -READ16_MEMBER(vgmplay_device::c219_rom_r) +uint16_t vgmplay_device::c219_rom_r(offs_t offset) { if (m_c140_bank[Index] == C140_ASIC219) return (rom_r(Index, 0x8d, offset * 2 + 1) << 8) | rom_r(Index, 0x8d, offset * 2); // 8 bit sample @@ -2560,37 +2560,37 @@ READ16_MEMBER(vgmplay_device::c219_rom_r) } template<int Index> -READ8_MEMBER(vgmplay_device::k053260_rom_r) +uint8_t vgmplay_device::k053260_rom_r(offs_t offset) { return rom_r(Index, 0x8e, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::qsound_rom_r) +uint8_t vgmplay_device::qsound_rom_r(offs_t offset) { return rom_r(Index, 0x8f, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::es5505_rom_r) +uint8_t vgmplay_device::es5505_rom_r(offs_t offset) { return rom_r(Index, 0x90, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::x1_010_rom_r) +uint8_t vgmplay_device::x1_010_rom_r(offs_t offset) { return rom_r(Index, 0x91, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::c352_rom_r) +uint8_t vgmplay_device::c352_rom_r(offs_t offset) { return rom_r(Index, 0x92, offset); } template<int Index> -READ8_MEMBER(vgmplay_device::ga20_rom_r) +uint8_t vgmplay_device::ga20_rom_r(offs_t offset) { return rom_r(Index, 0x93, offset); } @@ -3017,21 +3017,21 @@ QUICKLOAD_LOAD_MEMBER(vgmplay_state::load_file) } } -READ8_MEMBER(vgmplay_state::file_r) +uint8_t vgmplay_state::file_r(offs_t offset) { if (offset < m_file_data.size()) return m_file_data[offset]; return 0; } -READ8_MEMBER(vgmplay_state::file_size_r) +uint8_t vgmplay_state::file_size_r(offs_t offset) { uint32_t size = m_file_data.size(); return size >> (8 * offset); } template<int Index> -WRITE8_MEMBER(vgmplay_device::multipcm_bank_hi_w) +void vgmplay_device::multipcm_bank_hi_w(offs_t offset, uint8_t data) { if (offset & 1) m_multipcm_bank_l[Index] = (m_multipcm_bank_l[Index] & 0xff) | (data << 16); @@ -3040,7 +3040,7 @@ WRITE8_MEMBER(vgmplay_device::multipcm_bank_hi_w) } template<int Index> -WRITE8_MEMBER(vgmplay_device::multipcm_bank_lo_w) +void vgmplay_device::multipcm_bank_lo_w(offs_t offset, uint8_t data) { if (offset & 1) m_multipcm_bank_l[Index] = (m_multipcm_bank_l[Index] & 0xff00) | data; @@ -3051,7 +3051,7 @@ WRITE8_MEMBER(vgmplay_device::multipcm_bank_lo_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::upd7759_reset_w) +void vgmplay_state::upd7759_reset_w(uint8_t data) { int reset = data != 0; @@ -3067,7 +3067,7 @@ WRITE8_MEMBER(vgmplay_state::upd7759_reset_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::upd7759_data_w) +void vgmplay_state::upd7759_data_w(uint8_t data) { if (!m_upd7759_md[Index] && !m_upd7759_drq[Index]) { @@ -3098,14 +3098,14 @@ WRITE_LINE_MEMBER(vgmplay_state::upd7759_drq_w) } template<int Index> -WRITE8_MEMBER(vgmplay_device::upd7759_bank_w) +void vgmplay_device::upd7759_bank_w(uint8_t data) { // TODO: upd7759 update stream m_upd7759_bank[Index] = data * 0x20000; } template<int Index> -WRITE8_MEMBER(vgmplay_state::okim6258_clock_w) +void vgmplay_state::okim6258_clock_w(offs_t offset, uint8_t data, uint8_t mem_mask) { int shift = ((offset & 3) << 3); uint32_t c = (m_okim6258[Index]->unscaled_clock() & ~(mem_mask << shift)) | ((data & mem_mask) << shift); @@ -3114,7 +3114,7 @@ WRITE8_MEMBER(vgmplay_state::okim6258_clock_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::okim6258_divider_w) +void vgmplay_state::okim6258_divider_w(offs_t offset, uint8_t data, uint8_t mem_mask) { if ((data & mem_mask) != (m_okim6258_divider[Index] & mem_mask)) { @@ -3124,7 +3124,7 @@ WRITE8_MEMBER(vgmplay_state::okim6258_divider_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::okim6295_clock_w) +void vgmplay_state::okim6295_clock_w(offs_t offset, uint8_t data, uint8_t mem_mask) { int shift = ((offset & 3) << 3); uint32_t c = (m_okim6295[Index]->unscaled_clock() & ~(mem_mask << shift)) | ((data & mem_mask) << shift); @@ -3133,7 +3133,7 @@ WRITE8_MEMBER(vgmplay_state::okim6295_clock_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::okim6295_pin7_w) +void vgmplay_state::okim6295_pin7_w(offs_t offset, uint8_t data, uint8_t mem_mask) { if ((data & mem_mask) != (m_okim6295_pin7[Index] & mem_mask)) { @@ -3143,13 +3143,13 @@ WRITE8_MEMBER(vgmplay_state::okim6295_pin7_w) } template<int Index> -WRITE8_MEMBER(vgmplay_device::okim6295_nmk112_enable_w) +void vgmplay_device::okim6295_nmk112_enable_w(offs_t offset, uint8_t data, uint8_t mem_mask) { COMBINE_DATA(&m_okim6295_nmk112_enable[Index]); } template<int Index> -WRITE8_MEMBER(vgmplay_device::okim6295_bank_w) +void vgmplay_device::okim6295_bank_w(offs_t offset, uint8_t data, uint8_t mem_mask) { if ((data & mem_mask) != (m_okim6295_bank[Index] & mem_mask)) { @@ -3158,7 +3158,7 @@ WRITE8_MEMBER(vgmplay_device::okim6295_bank_w) } template<int Index> -WRITE8_MEMBER(vgmplay_device::okim6295_nmk112_bank_w) +void vgmplay_device::okim6295_nmk112_bank_w(offs_t offset, uint8_t data, uint8_t mem_mask) { offset &= 3; if ((data & mem_mask) != (m_okim6295_nmk112_bank[Index][offset] & mem_mask)) @@ -3168,7 +3168,7 @@ WRITE8_MEMBER(vgmplay_device::okim6295_nmk112_bank_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::scc_w) +void vgmplay_state::scc_w(offs_t offset, uint8_t data) { switch (offset & 1) { @@ -3202,7 +3202,7 @@ WRITE8_MEMBER(vgmplay_state::scc_w) } template<int Index> -WRITE8_MEMBER(vgmplay_state::c140_c219_w) +void vgmplay_state::c140_c219_w(offs_t offset, uint8_t data) { if (m_vgmplay->c140_bank(Index) == C140_ASIC219) m_c219[Index]->c219_w(offset, data); diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index af31fae0b82..78e89ec5052 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -88,10 +88,10 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( vic_videoram_r ); + uint8_t vic_videoram_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER( write_light_pen ); DECLARE_WRITE_LINE_MEMBER( write_user_joy0 ); @@ -175,7 +175,7 @@ QUICKLOAD_LOAD_MEMBER(vic20_state::quickload_vc20) // read - //------------------------------------------------- -READ8_MEMBER( vic20_state::read ) +uint8_t vic20_state::read(offs_t offset) { uint8_t data = m_vic->bus_r(); @@ -256,7 +256,7 @@ READ8_MEMBER( vic20_state::read ) // write - //------------------------------------------------- -WRITE8_MEMBER( vic20_state::write ) +void vic20_state::write(offs_t offset, uint8_t data) { int ram1 = 1, ram2 = 1, ram3 = 1; int blk1 = 1, blk2 = 1, blk3 = 1, blk5 = 1; @@ -323,7 +323,7 @@ WRITE8_MEMBER( vic20_state::write ) // vic_videoram_r - //------------------------------------------------- -READ8_MEMBER( vic20_state::vic_videoram_r ) +uint8_t vic20_state::vic_videoram_r(offs_t offset) { int ram1 = 1, ram2 = 1, ram3 = 1; int blk1 = 1, blk2 = 1, blk3 = 1, blk5 = 1; diff --git a/src/mame/drivers/video21.cpp b/src/mame/drivers/video21.cpp index 699f0390d66..66a1ed5521e 100644 --- a/src/mame/drivers/video21.cpp +++ b/src/mame/drivers/video21.cpp @@ -51,9 +51,9 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(lamp1_w); - DECLARE_WRITE8_MEMBER(lamp2_w); + void sound_w(uint8_t data); + void lamp1_w(uint8_t data); + void lamp2_w(uint8_t data); int m_hopper_motor; int m_hopper_coin; @@ -112,14 +112,14 @@ TIMER_CALLBACK_MEMBER(video21_state::hopper_coinout) m_hopper_timer->adjust(attotime::from_msec(100), m_hopper_coin ^ 1); } -WRITE8_MEMBER(video21_state::sound_w) +void video21_state::sound_w(uint8_t data) { // beeper pitch m_beeper->set_state(data != 0xff); // FF is off m_beeper->set_clock(4 * data); } -WRITE8_MEMBER(video21_state::lamp1_w) +void video21_state::lamp1_w(uint8_t data) { // d1-d3: coincounters machine().bookkeeping().coin_counter_w(0, data & 0x04); // coin in @@ -139,7 +139,7 @@ WRITE8_MEMBER(video21_state::lamp1_w) m_lamps[i+0] = BIT(data, 7-i); } -WRITE8_MEMBER(video21_state::lamp2_w) +void video21_state::lamp2_w(uint8_t data) { // lamps: // d5: bet diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 50bf6d44fcc..0e127efe2bc 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -324,16 +324,16 @@ public: void bpoker(machine_config &config); private: - DECLARE_READ8_MEMBER(videopkr_io_r); - DECLARE_WRITE8_MEMBER(videopkr_io_w); + uint8_t videopkr_io_r(offs_t offset); + void videopkr_io_w(offs_t offset, uint8_t data); uint8_t videopkr_p1_data_r(); uint8_t videopkr_p2_data_r(); void videopkr_p1_data_w(uint8_t data); void videopkr_p2_data_w(uint8_t data); DECLARE_READ_LINE_MEMBER(videopkr_t0_latch); DECLARE_WRITE_LINE_MEMBER(prog_w); - DECLARE_READ8_MEMBER(sound_io_r); - DECLARE_WRITE8_MEMBER(sound_io_w); + uint8_t sound_io_r(); + void sound_io_w(uint8_t data); uint8_t sound_p2_r(); void sound_p2_w(uint8_t data); uint8_t baby_sound_p0_r(); @@ -549,7 +549,7 @@ uint32_t videopkr_state::screen_update_videopkr(screen_device &screen, bitmap_in * R/W Handlers * *************************/ -READ8_MEMBER(videopkr_state::videopkr_io_r) +uint8_t videopkr_state::videopkr_io_r(offs_t offset) { uint8_t valor = 0, hf, co; @@ -629,7 +629,7 @@ READ8_MEMBER(videopkr_state::videopkr_io_r) return valor; } -WRITE8_MEMBER(videopkr_state::videopkr_io_w) +void videopkr_state::videopkr_io_w(offs_t offset, uint8_t data) { switch (m_p2) { @@ -802,7 +802,7 @@ WRITE_LINE_MEMBER(videopkr_state::prog_w) */ -READ8_MEMBER(videopkr_state::sound_io_r) +uint8_t videopkr_state::sound_io_r() { switch (m_vp_sound_p2) { @@ -824,7 +824,7 @@ READ8_MEMBER(videopkr_state::sound_io_r) return m_sound_latch; } -WRITE8_MEMBER(videopkr_state::sound_io_w) +void videopkr_state::sound_io_w(uint8_t data) { if (m_vp_sound_p2 == 0x5f || m_vp_sound_p2 == 0xdf) { diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 0680a5da6c5..f41c85361a6 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -395,35 +395,35 @@ public: DECLARE_READ_LINE_MEMBER(ds2430_unk_r); private: - DECLARE_READ32_MEMBER(epic_r); - DECLARE_WRITE32_MEMBER(epic_w); - DECLARE_WRITE64_MEMBER(unk2_w); - DECLARE_READ64_MEMBER(voodoo3_io_r); - DECLARE_WRITE64_MEMBER(voodoo3_io_w); - DECLARE_READ64_MEMBER(voodoo3_r); - DECLARE_WRITE64_MEMBER(voodoo3_w); - DECLARE_READ64_MEMBER(voodoo3_lfb_r); - DECLARE_WRITE64_MEMBER(voodoo3_lfb_w); - DECLARE_READ8_MEMBER(input_r); - DECLARE_READ64_MEMBER(e70000_r); - DECLARE_WRITE64_MEMBER(e70000_w); - DECLARE_WRITE64_MEMBER(unk1a_w); - DECLARE_WRITE64_MEMBER(unk1b_w); - DECLARE_READ64_MEMBER(e00008_r); - DECLARE_WRITE64_MEMBER(e00008_w); - DECLARE_READ64_MEMBER(e00000_r); - DECLARE_READ64_MEMBER(pci_config_addr_r); - DECLARE_WRITE64_MEMBER(pci_config_addr_w); - DECLARE_READ64_MEMBER(pci_config_data_r); - DECLARE_WRITE64_MEMBER(pci_config_data_w); - DECLARE_READ64_MEMBER(cf_card_data_r); - DECLARE_WRITE64_MEMBER(cf_card_data_w); - DECLARE_READ64_MEMBER(cf_card_r); - DECLARE_WRITE64_MEMBER(cf_card_w); - DECLARE_READ64_MEMBER(ata_r); - DECLARE_WRITE64_MEMBER(ata_w); - DECLARE_READ64_MEMBER(unk_serial_r); - DECLARE_WRITE64_MEMBER(unk_serial_w); + uint32_t epic_r(offs_t offset); + void epic_w(offs_t offset, uint32_t data); + void unk2_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t voodoo3_io_r(offs_t offset, uint64_t mem_mask = ~0); + void voodoo3_io_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t voodoo3_r(offs_t offset, uint64_t mem_mask = ~0); + void voodoo3_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t voodoo3_lfb_r(offs_t offset, uint64_t mem_mask = ~0); + void voodoo3_lfb_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint8_t input_r(offs_t offset); + uint64_t e70000_r(offs_t offset, uint64_t mem_mask = ~0); + void e70000_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + void unk1a_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + void unk1b_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t e00008_r(offs_t offset, uint64_t mem_mask = ~0); + void e00008_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t e00000_r(); + uint64_t pci_config_addr_r(); + void pci_config_addr_w(uint64_t data); + uint64_t pci_config_data_r(); + void pci_config_data_w(uint64_t data); + uint64_t cf_card_data_r(offs_t offset, uint64_t mem_mask = ~0); + void cf_card_data_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t cf_card_r(offs_t offset, uint64_t mem_mask = ~0); + void cf_card_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t ata_r(offs_t offset, uint64_t mem_mask = ~0); + void ata_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t unk_serial_r(offs_t offset, uint64_t mem_mask = ~0); + void unk_serial_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(voodoo_vblank); uint32_t screen_update_viper(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -664,22 +664,22 @@ void viper_state::mpc8240_pci_w(int function, int reg, uint32_t data, uint32_t m } -READ64_MEMBER(viper_state::pci_config_addr_r) +uint64_t viper_state::pci_config_addr_r() { return m_lpci->read_64be(0, 0xffffffff00000000U); } -WRITE64_MEMBER(viper_state::pci_config_addr_w) +void viper_state::pci_config_addr_w(uint64_t data) { m_lpci->write_64be(0, data, 0xffffffff00000000U); } -READ64_MEMBER(viper_state::pci_config_data_r) +uint64_t viper_state::pci_config_data_r() { return m_lpci->read_64be(1, 0x00000000ffffffffU) << 32; } -WRITE64_MEMBER(viper_state::pci_config_data_w) +void viper_state::pci_config_data_w(uint64_t data) { m_lpci->write_64be(1, data >> 32, 0x00000000ffffffffU); } @@ -877,7 +877,7 @@ void viper_state::epic_update_interrupts() } } -READ32_MEMBER(viper_state::epic_r) +uint32_t viper_state::epic_r(offs_t offset) { int reg; reg = offset * 4; @@ -1074,7 +1074,7 @@ READ32_MEMBER(viper_state::epic_r) return swapendian_int32(ret); } -WRITE32_MEMBER(viper_state::epic_w) +void viper_state::epic_w(offs_t offset, uint32_t data) { int reg; reg = offset * 4; @@ -1355,16 +1355,6 @@ WRITE32_MEMBER(viper_state::epic_w) } } } -/* -READ64_MEMBER(viper_state::epic_64be_r) -{ - return read64be_with_32le_handler(epic_r, space, offset, mem_mask); -} -WRITE64_MEMBER(viper_state::epic_64be_w) -{ - write64be_with_32le_handler(epic_w, space, offset, data, mem_mask); -} -*/ void viper_state::mpc8240_interrupt(int irq) { @@ -1412,7 +1402,7 @@ static const uint8_t cf_card_tuples[] = 0x00, 0x01, 0x00, 0x00, // CCR base (0x00000100) }; -READ64_MEMBER(viper_state::cf_card_data_r) +uint64_t viper_state::cf_card_data_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -1435,7 +1425,7 @@ READ64_MEMBER(viper_state::cf_card_data_r) return r; } -WRITE64_MEMBER(viper_state::cf_card_data_w) +void viper_state::cf_card_data_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_16_31) { @@ -1455,7 +1445,7 @@ WRITE64_MEMBER(viper_state::cf_card_data_w) } } -READ64_MEMBER(viper_state::cf_card_r) +uint64_t viper_state::cf_card_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -1518,7 +1508,7 @@ READ64_MEMBER(viper_state::cf_card_r) return r; } -WRITE64_MEMBER(viper_state::cf_card_w) +void viper_state::cf_card_w(offs_t offset, uint64_t data, uint64_t mem_mask) { #ifdef VIPER_DEBUG_LOG //logerror("%s:compact_flash_w: %08X%08X, %08X, %08X%08X\n", machine().describe_context(), (uint32_t)(data>>32), (uint32_t)(data), offset, (uint32_t)(mem_mask >> 32), (uint32_t)(mem_mask)); @@ -1587,7 +1577,7 @@ WRITE64_MEMBER(viper_state::cf_card_w) } } -WRITE64_MEMBER(viper_state::unk2_w) +void viper_state::unk2_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_56_63) { @@ -1598,7 +1588,7 @@ WRITE64_MEMBER(viper_state::unk2_w) -READ64_MEMBER(viper_state::ata_r) +uint64_t viper_state::ata_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -1620,7 +1610,7 @@ READ64_MEMBER(viper_state::ata_r) return r; } -WRITE64_MEMBER(viper_state::ata_w) +void viper_state::ata_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_16_31) { @@ -1743,33 +1733,33 @@ void viper_state::voodoo3_pci_w(int function, int reg, uint32_t data, uint32_t m } } -READ64_MEMBER(viper_state::voodoo3_io_r) +uint64_t viper_state::voodoo3_io_r(offs_t offset, uint64_t mem_mask) { return read64be_with_32sle_device_handler(read32s_delegate(*m_voodoo, FUNC(voodoo_3_device::banshee_io_r)), offset, mem_mask); } -WRITE64_MEMBER(viper_state::voodoo3_io_w) +void viper_state::voodoo3_io_w(offs_t offset, uint64_t data, uint64_t mem_mask) { // printf("voodoo3_io_w: %08X%08X, %08X at %08X\n", (uint32_t)(data >> 32), (uint32_t)(data), offset, m_maincpu->pc()); write64be_with_32sle_device_handler(write32s_delegate(*m_voodoo, FUNC(voodoo_3_device::banshee_io_w)), offset, data, mem_mask); } -READ64_MEMBER(viper_state::voodoo3_r) +uint64_t viper_state::voodoo3_r(offs_t offset, uint64_t mem_mask) { return read64be_with_32sle_device_handler(read32s_delegate(*m_voodoo, FUNC(voodoo_3_device::banshee_r)), offset, mem_mask); } -WRITE64_MEMBER(viper_state::voodoo3_w) +void viper_state::voodoo3_w(offs_t offset, uint64_t data, uint64_t mem_mask) { // printf("voodoo3_w: %08X%08X, %08X at %08X\n", (uint32_t)(data >> 32), (uint32_t)(data), offset, m_maincpu->pc()); write64be_with_32sle_device_handler(write32s_delegate(*m_voodoo, FUNC(voodoo_3_device::banshee_w)), offset, data, mem_mask); } -READ64_MEMBER(viper_state::voodoo3_lfb_r) +uint64_t viper_state::voodoo3_lfb_r(offs_t offset, uint64_t mem_mask) { return read64be_with_32smle_device_handler(read32sm_delegate(*m_voodoo, FUNC(voodoo_3_device::banshee_fb_r)), offset, mem_mask); } -WRITE64_MEMBER(viper_state::voodoo3_lfb_w) +void viper_state::voodoo3_lfb_w(offs_t offset, uint64_t data, uint64_t mem_mask) { // printf("voodoo3_lfb_w: %08X%08X, %08X at %08X\n", (uint32_t)(data >> 32), (uint32_t)(data), offset, m_maincpu->pc()); @@ -1795,7 +1785,7 @@ TIMER_CALLBACK_MEMBER(viper_state::ds2430_timer_callback) } #ifdef UNUSED_FUNCTION -READ64_MEMBER(viper_state::input_r) +uint64_t viper_state::input_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; //return 0;//0x0000400000000000U; @@ -1842,7 +1832,7 @@ READ64_MEMBER(viper_state::input_r) } #endif -READ8_MEMBER(viper_state::input_r) +uint8_t viper_state::input_r(offs_t offset) { return (m_io_ports[offset & 7])->read(); } @@ -1950,7 +1940,7 @@ void viper_state::DS2430_w(int bit) } -READ64_MEMBER(viper_state::e70000_r) +uint64_t viper_state::e70000_r(offs_t offset, uint64_t mem_mask) { if (ACCESSING_BITS_56_63) { @@ -1963,7 +1953,7 @@ READ64_MEMBER(viper_state::e70000_r) return 0; } -WRITE64_MEMBER(viper_state::e70000_w) +void viper_state::e70000_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_56_63) { @@ -1993,7 +1983,7 @@ WRITE64_MEMBER(viper_state::e70000_w) } } -WRITE64_MEMBER(viper_state::unk1a_w) +void viper_state::unk1a_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_56_63) { @@ -2001,7 +1991,7 @@ WRITE64_MEMBER(viper_state::unk1a_w) } } -WRITE64_MEMBER(viper_state::unk1b_w) +void viper_state::unk1b_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_56_63) { @@ -2010,7 +2000,7 @@ WRITE64_MEMBER(viper_state::unk1b_w) } } -READ64_MEMBER(viper_state::e00008_r) +uint64_t viper_state::e00008_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; if (ACCESSING_BITS_0_7) @@ -2021,7 +2011,7 @@ READ64_MEMBER(viper_state::e00008_r) return r; } -WRITE64_MEMBER(viper_state::e00008_w) +void viper_state::e00008_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_0_7) { @@ -2029,13 +2019,13 @@ WRITE64_MEMBER(viper_state::e00008_w) } } -READ64_MEMBER(viper_state::e00000_r) +uint64_t viper_state::e00000_r() { uint64_t r = 0;//0xffffffffffffffffU; return r; } -READ64_MEMBER(viper_state::unk_serial_r) +uint64_t viper_state::unk_serial_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; if (ACCESSING_BITS_16_31) @@ -2047,7 +2037,7 @@ READ64_MEMBER(viper_state::unk_serial_r) return r; } -WRITE64_MEMBER(viper_state::unk_serial_w) +void viper_state::unk_serial_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (ACCESSING_BITS_16_31) { @@ -2467,17 +2457,17 @@ void viper_state::init_viperhd() { init_viper(); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff300000, 0xff300fff, read64_delegate(*this, FUNC(viper_state::ata_r)), write64_delegate(*this, FUNC(viper_state::ata_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff300000, 0xff300fff, read64s_delegate(*this, FUNC(viper_state::ata_r)), write64s_delegate(*this, FUNC(viper_state::ata_w))); } void viper_state::init_vipercf() { init_viper(); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff000000, 0xff000fff, read64_delegate(*this, FUNC(viper_state::cf_card_data_r)), write64_delegate(*this, FUNC(viper_state::cf_card_data_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff200000, 0xff200fff, read64_delegate(*this, FUNC(viper_state::cf_card_r)), write64_delegate(*this, FUNC(viper_state::cf_card_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff000000, 0xff000fff, read64s_delegate(*this, FUNC(viper_state::cf_card_data_r)), write64s_delegate(*this, FUNC(viper_state::cf_card_data_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff200000, 0xff200fff, read64s_delegate(*this, FUNC(viper_state::cf_card_r)), write64s_delegate(*this, FUNC(viper_state::cf_card_w))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff300000, 0xff300fff, read64_delegate(*this, FUNC(viper_state::unk_serial_r)), write64_delegate(*this, FUNC(viper_state::unk_serial_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xff300000, 0xff300fff, read64s_delegate(*this, FUNC(viper_state::unk_serial_r)), write64s_delegate(*this, FUNC(viper_state::unk_serial_w))); } diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 48c2f9526d2..1ade543187c 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -728,8 +728,8 @@ private: void unk_w(offs_t offset, uint8_t data); uint8_t unk2_r(); uint8_t unk3_r(); - DECLARE_READ16_MEMBER(pad_r); - DECLARE_WRITE16_MEMBER(pad_w); + uint16_t pad_r(offs_t offset); + void pad_w(offs_t offset, uint16_t data); uint8_t unk1_r(offs_t offset); void unk1_w(offs_t offset, uint8_t data); void io_map(address_map &map); @@ -783,7 +783,7 @@ uint8_t vis_state::unk3_r() return 0x00; } -READ16_MEMBER(vis_state::pad_r) +uint16_t vis_state::pad_r(offs_t offset) { uint16_t ret = 0; switch(offset) @@ -803,7 +803,7 @@ READ16_MEMBER(vis_state::pad_r) return ret; } -WRITE16_MEMBER(vis_state::pad_w) +void vis_state::pad_w(offs_t offset, uint16_t data) { switch(offset) { diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index 6e1e4fa8a1c..b56b800fdbb 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -234,18 +234,18 @@ private: uint8_t m_ADSR; ioport_port* m_col_array[16]; - DECLARE_WRITE8_MEMBER(vgLD_X); - DECLARE_WRITE8_MEMBER(vgLD_Y); - DECLARE_WRITE8_MEMBER(vgERR); - DECLARE_WRITE8_MEMBER(vgSOPS); - DECLARE_WRITE8_MEMBER(vgPAT); - DECLARE_WRITE8_MEMBER(vgPMUL); - DECLARE_WRITE8_MEMBER(vgREG); - DECLARE_WRITE8_MEMBER(vgEX); - DECLARE_WRITE8_MEMBER(KBDW); - DECLARE_READ8_MEMBER(vk100_keyboard_column_r); - DECLARE_READ8_MEMBER(SYSTAT_A); - DECLARE_READ8_MEMBER(SYSTAT_B); + void vgLD_X(offs_t offset, uint8_t data); + void vgLD_Y(offs_t offset, uint8_t data); + void vgERR(uint8_t data); + void vgSOPS(uint8_t data); + void vgPAT(uint8_t data); + void vgPMUL(uint8_t data); + void vgREG(offs_t offset, uint8_t data); + void vgEX(offs_t offset, uint8_t data); + void KBDW(uint8_t data); + uint8_t vk100_keyboard_column_r(offs_t offset); + uint8_t SYSTAT_A(offs_t offset); + uint8_t SYSTAT_B(); virtual void machine_start() override; virtual void video_start() override; @@ -430,7 +430,7 @@ TIMER_CALLBACK_MEMBER(vk100_state::execute_vg) } /* ports 0x40 and 0x41: load low and high bytes of vector gen X register */ -WRITE8_MEMBER(vk100_state::vgLD_X) +void vk100_state::vgLD_X(offs_t offset, uint8_t data) { m_vgX &= 0xFF << ((1-offset)*8); m_vgX |= ((uint16_t)data) << (offset*8); @@ -440,7 +440,7 @@ WRITE8_MEMBER(vk100_state::vgLD_X) } /* ports 0x42 and 0x43: load low and high bytes of vector gen Y register */ -WRITE8_MEMBER(vk100_state::vgLD_Y) +void vk100_state::vgLD_Y(offs_t offset, uint8_t data) { m_vgY &= 0xFF << ((1-offset)*8); m_vgY |= ((uint16_t)data) << (offset*8); @@ -450,7 +450,7 @@ WRITE8_MEMBER(vk100_state::vgLD_Y) } /* port 0x44: "ERR" load bresenham line algorithm 'error' count */ -WRITE8_MEMBER(vk100_state::vgERR) +void vk100_state::vgERR(uint8_t data) { m_vgERR = data; #ifdef VG40_VERBOSE @@ -474,7 +474,7 @@ WRITE8_MEMBER(vk100_state::vgERR) * 1 1 8251TXD ACTS(loop) 8251RXD J6 /DTR J7 URTS GND 8251RTS(loop) J6 /DSR * * and UCTS, the pin drives both pins on J7 */ -WRITE8_MEMBER(vk100_state::vgSOPS) +void vk100_state::vgSOPS(uint8_t data) { m_vgSOPS = data; #ifdef VG40_VERBOSE @@ -484,7 +484,7 @@ WRITE8_MEMBER(vk100_state::vgSOPS) } /* port 0x46: "PAT" load vg Pattern register */ -WRITE8_MEMBER(vk100_state::vgPAT) +void vk100_state::vgPAT(uint8_t data) { m_vgPAT = data; #ifdef PAT_DEBUG @@ -504,7 +504,7 @@ WRITE8_MEMBER(vk100_state::vgPAT) the pattern register and increments on each one. if it overflows from 1111 to 0000 the pattern register is shifted right one bit and the counter is reloaded from PMUL */ -WRITE8_MEMBER(vk100_state::vgPMUL) +void vk100_state::vgPMUL(uint8_t data) { m_vgPMUL = data; #ifdef VG40_VERBOSE @@ -521,7 +521,7 @@ WRITE8_MEMBER(vk100_state::vgPMUL) * Change * d7 d6 d5 d4 d3 d2 d1 d0 */ -WRITE8_MEMBER(vk100_state::vgREG) +void vk100_state::vgREG(offs_t offset, uint8_t data) { m_vgRegFile[offset] = data; #ifdef VG60_VERBOSE @@ -537,7 +537,7 @@ WRITE8_MEMBER(vk100_state::vgREG) /* port 0x65: "EX DOT" execute a dot (draw a dot at x,y?) */ /* port 0x66: "EX VEC" execute a vector (draw a vector from x,y to a destination using du/dvm/dir/err ) */ /* port 0x67: "EX ER" execute an erase (clear the screen to the bg color, i.e. fill vram with zeroes) */ -WRITE8_MEMBER(vk100_state::vgEX) +void vk100_state::vgEX(offs_t offset, uint8_t data) { #ifdef VG60_VERBOSE static const char *const ex_functions[] = { "Move", "Dot", "Vector", "Erase" }; @@ -554,7 +554,7 @@ WRITE8_MEMBER(vk100_state::vgEX) /* port 0x68: "KBDW" d7 is beeper, d6 is keyclick, d5-d0 are keyboard LEDS */ -WRITE8_MEMBER(vk100_state::KBDW) +void vk100_state::KBDW(uint8_t data) { output().set_value("online_led",BIT(data, 5) ? 1 : 0); output().set_value("local_led", BIT(data, 5) ? 0 : 1); @@ -639,7 +639,7 @@ WRITE8_MEMBER(vk100_state::KBDW) 299 reads, rotates result right 3 times and ANDs the result with 0x0F 2A4 reads, rotates result left 1 time and ANDS the result with 0xF0 */ -READ8_MEMBER(vk100_state::SYSTAT_A) +uint8_t vk100_state::SYSTAT_A(offs_t offset) { uint8_t dipswitchLUT[8] = { 1,3,5,7,6,4,2,0 }; // the dipswitches map in a weird order to offsets #ifdef SYSTAT_A_VERBOSE @@ -666,7 +666,7 @@ READ8_MEMBER(vk100_state::SYSTAT_A) * The 4 attribute ram bits for the cell being pointed at by the X and Y regs are readable as the low nybble. * The DSR pin is readable as bit 6. */ -READ8_MEMBER(vk100_state::SYSTAT_B) +uint8_t vk100_state::SYSTAT_B() { #ifdef SYSTAT_B_VERBOSE logerror("0x%04X: SYSTAT_B Read!\n", m_maincpu->pc()); @@ -674,7 +674,7 @@ READ8_MEMBER(vk100_state::SYSTAT_B) return (m_ACTS<<7)|(m_ADSR<<6)|vram_attr_read(); } -READ8_MEMBER(vk100_state::vk100_keyboard_column_r) +uint8_t vk100_state::vk100_keyboard_column_r(offs_t offset) { uint8_t code = m_col_array[offset&0xF]->read() | m_capsshift->read(); #ifdef KBD_VERBOSE diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 870130bf8df..67b58ccfe2f 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -204,12 +204,12 @@ private: template<int N> void duart_w(offs_t offset, uint8_t data); uint8_t rtc_r(offs_t offset); void rtc_w(offs_t offset, uint8_t data); - DECLARE_READ16_MEMBER(io_board_r); - DECLARE_WRITE16_MEMBER(io_board_w); - DECLARE_WRITE16_MEMBER (io_board_x); - DECLARE_READ16_MEMBER( nevada_sec_r ); - DECLARE_WRITE16_MEMBER( nevada_sec_w ); - DECLARE_WRITE16_MEMBER( vram_w ); + uint16_t io_board_r(); + void io_board_w(uint16_t data); + void io_board_x(uint16_t data); + uint16_t nevada_sec_r(); + void nevada_sec_w(uint16_t data); + void vram_w(offs_t offset, uint16_t data); DECLARE_MACHINE_START(nevada); @@ -268,7 +268,7 @@ static const gfx_layout charlayout = /***************************************************************************/ -WRITE16_MEMBER( nevada_state::vram_w ) +void nevada_state::vram_w(offs_t offset, uint16_t data) { // Todo, Just for sample @@ -373,24 +373,24 @@ void nevada_state::rtc_w(offs_t offset, uint8_t data) /***************************************************************************/ -READ16_MEMBER(nevada_state::io_board_r) +uint16_t nevada_state::io_board_r() { // IO board Serial communication 0xA00000 return 1; } /***************************************************************************/ -WRITE16_MEMBER(nevada_state::io_board_w) +void nevada_state::io_board_w(uint16_t data) { // IO board Serial communication 0xA00000 on bit0 } /***************************************************************************/ -WRITE16_MEMBER(nevada_state::io_board_x) +void nevada_state::io_board_x(uint16_t data) { // IO board Serial communication 0xA80000 on bit15 } /***************************************************************************/ -READ16_MEMBER(nevada_state::nevada_sec_r ) +uint16_t nevada_state::nevada_sec_r() { // D3..D0 = DOOR OPEN or Track STATE of PAL35 uint16_t res; @@ -403,7 +403,7 @@ READ16_MEMBER(nevada_state::nevada_sec_r ) return res; } /***************************************************************************/ -WRITE16_MEMBER(nevada_state::nevada_sec_w ) +void nevada_state::nevada_sec_w(uint16_t data) { // 74LS173 $bits Register used LOWER bits D3..D0 for DOOR LOGIC SWITCH m_datA40000 = data | 0x00f0; // since D7..D4 are not used and are connected to PULLUP diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp index 02875b7c383..85dbc8955fb 100644 --- a/src/mame/drivers/voyager.cpp +++ b/src/mame/drivers/voyager.cpp @@ -57,7 +57,7 @@ private: uint8_t m_mtxc_config_reg[256]; uint8_t m_piix4_config_reg[4][256]; - DECLARE_WRITE32_MEMBER(bios_ram_w); + void bios_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint8_t nvram_r(offs_t offset); void nvram_w(offs_t offset, uint8_t data); @@ -238,7 +238,7 @@ void voyager_state::intel82371ab_pci_w(int function, int reg, uint32_t data, uin } } -WRITE32_MEMBER(voyager_state::bios_ram_w) +void voyager_state::bios_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { //if (m_mtxc_config_reg[0x59] & 0x20) // write to RAM if this region is write-enabled if (m_mtxc_config_reg[0x63] & 0x50) diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp index 5585772cb33..7104d1ffbb7 100644 --- a/src/mame/drivers/vp101.cpp +++ b/src/mame/drivers/vp101.cpp @@ -124,23 +124,23 @@ private: virtual void machine_reset() override; virtual void machine_start() override; - DECLARE_READ32_MEMBER(tty_ready_r); - DECLARE_WRITE32_MEMBER(tty_w); - DECLARE_READ32_MEMBER(test_r) { return 0xffffffff; } + uint32_t tty_ready_r(); + void tty_w(uint32_t data); + uint32_t test_r() { return 0xffffffff; } - DECLARE_READ32_MEMBER(pic_r); - DECLARE_WRITE32_MEMBER(pic_w); + uint32_t pic_r(); + void pic_w(uint32_t data); - DECLARE_WRITE32_MEMBER(dmaaddr_w); + void dmaaddr_w(uint32_t data); DECLARE_WRITE_LINE_MEMBER(dmarq_w); - DECLARE_READ32_MEMBER(tty_4925_rdy_r) { return 0x2; } + uint32_t tty_4925_rdy_r() { return 0x2; } - DECLARE_READ32_MEMBER(spi_status_r) { return 0x8007; } + uint32_t spi_status_r() { return 0x8007; } - DECLARE_READ32_MEMBER(spi_r); - DECLARE_WRITE32_MEMBER(spi_w); + uint32_t spi_r(); + void spi_w(uint32_t data); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t vp50_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -175,7 +175,7 @@ void vp10x_state::machine_start() // m_maincpu->add_fastram(0x00000000, 0x03ffffff, false, m_mainram); } -WRITE32_MEMBER(vp10x_state::dmaaddr_w) +void vp10x_state::dmaaddr_w(uint32_t data) { m_dma_ptr = (data & 0x07ffffff); } @@ -204,7 +204,7 @@ WRITE_LINE_MEMBER(vp10x_state::dmarq_w) } } -READ32_MEMBER(vp10x_state::pic_r) +uint32_t vp10x_state::pic_r() { static const uint8_t vers[5] = { 0x00, 0x01, 0x00, 0x00, 0x00 }; static const uint8_t serial[10] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a }; @@ -226,7 +226,7 @@ READ32_MEMBER(vp10x_state::pic_r) return 0; } -WRITE32_MEMBER(vp10x_state::pic_w) +void vp10x_state::pic_w(uint32_t data) { //printf("%02x to pic_cmd\n", data&0xff); if ((data & 0xff) == 0) @@ -237,12 +237,12 @@ WRITE32_MEMBER(vp10x_state::pic_w) pic_state = 0; } -READ32_MEMBER(vp10x_state::spi_r) +uint32_t vp10x_state::spi_r() { return 0xffffffff; } -WRITE32_MEMBER(vp10x_state::spi_w) +void vp10x_state::spi_w(uint32_t data) { // printf("%d to SPI select\n", data); m_spi_select = data; @@ -292,12 +292,12 @@ uint32_t vp10x_state::vp50_screen_update(screen_device &screen, bitmap_rgb32 &bi return 0; } -READ32_MEMBER(vp10x_state::tty_ready_r) +uint32_t vp10x_state::tty_ready_r() { return 0x60; // must return &0x20 for output at tty_w to continue } -WRITE32_MEMBER(vp10x_state::tty_w) // set breakpoint at bfc01430 to catch when it's printing things +void vp10x_state::tty_w(uint32_t data) // set breakpoint at bfc01430 to catch when it's printing things { // uncomment to see startup messages - it says "RAM OK" and "EPI RSS Ver 4.5.1" followed by "<RSS active>" and then lots of dots // Special Forces also says "<inited tv_cap> = 00000032" diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp index eafe391270f..6c7f004641a 100644 --- a/src/mame/drivers/vpoker.cpp +++ b/src/mame/drivers/vpoker.cpp @@ -121,8 +121,8 @@ public: private: std::unique_ptr<uint8_t[]> m_videoram; uint8_t m_blit_ram[8]; - DECLARE_READ8_MEMBER(blitter_r); - DECLARE_WRITE8_MEMBER(blitter_w); + uint8_t blitter_r(offs_t offset); + void blitter_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(ptm_irq); virtual void video_start() override; uint32_t screen_update_vpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -161,7 +161,7 @@ uint32_t vpoker_state::screen_update_vpoker(screen_device &screen, bitmap_ind16 return 0; } -READ8_MEMBER(vpoker_state::blitter_r) +uint8_t vpoker_state::blitter_r(offs_t offset) { if(offset == 6) return ioport("IN0")->read(); @@ -169,7 +169,7 @@ READ8_MEMBER(vpoker_state::blitter_r) return 0; } -WRITE8_MEMBER(vpoker_state::blitter_w) +void vpoker_state::blitter_w(offs_t offset, uint8_t data) { uint8_t *videoram = m_videoram.get(); diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp index 5987dbd16f8..99208384039 100644 --- a/src/mame/drivers/vroulet.cpp +++ b/src/mame/drivers/vroulet.cpp @@ -74,9 +74,9 @@ private: tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(paletteram_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(colorram_w); + void paletteram_w(offs_t offset, uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void colorram_w(offs_t offset, uint8_t data); void ppi8255_a_w(uint8_t data); void ppi8255_b_w(uint8_t data); void ppi8255_c_w(uint8_t data); @@ -94,7 +94,7 @@ private: /* video */ -WRITE8_MEMBER(vroulet_state::paletteram_w) +void vroulet_state::paletteram_w(offs_t offset, uint8_t data) { /* paletteram_xxxxBBBBGGGGRRRR_byte_be_w @@ -114,13 +114,13 @@ WRITE8_MEMBER(vroulet_state::paletteram_w) } } -WRITE8_MEMBER(vroulet_state::videoram_w) +void vroulet_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(vroulet_state::colorram_w) +void vroulet_state::colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/drivers/vt1682.cpp b/src/mame/drivers/vt1682.cpp index 76a75557d54..6bd7b73712f 100644 --- a/src/mame/drivers/vt1682.cpp +++ b/src/mame/drivers/vt1682.cpp @@ -239,120 +239,120 @@ private: uint8_t m_2030; - DECLARE_READ8_MEMBER(vt1682_2000_r); - DECLARE_WRITE8_MEMBER(vt1682_2000_w); - - DECLARE_READ8_MEMBER(vt1682_2001_vblank_r); - DECLARE_WRITE8_MEMBER(vt1682_2001_w); - - DECLARE_READ8_MEMBER(vt1682_2002_sprramaddr_2_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2002_sprramaddr_2_0_w); - DECLARE_READ8_MEMBER(vt1682_2003_sprramaddr_10_3_r); - DECLARE_WRITE8_MEMBER(vt1682_2003_sprramaddr_10_3_w); - DECLARE_READ8_MEMBER(vt1682_2004_sprram_data_r); - DECLARE_WRITE8_MEMBER(vt1682_2004_sprram_data_w); - - DECLARE_READ8_MEMBER(vt1682_2005_vramaddr_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2005_vramaddr_7_0_w); - DECLARE_READ8_MEMBER(vt1682_2006_vramaddr_15_8_r); - DECLARE_WRITE8_MEMBER(vt1682_2006_vramaddr_15_8_w); - DECLARE_READ8_MEMBER(vt1682_2007_vram_data_r); - DECLARE_WRITE8_MEMBER(vt1682_2007_vram_data_w); - - DECLARE_READ8_MEMBER(vt1682_201a_sp_segment_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_201a_sp_segment_7_0_w); - DECLARE_READ8_MEMBER(vt1682_201b_sp_segment_11_8_r); - DECLARE_WRITE8_MEMBER(vt1682_201b_sp_segment_11_8_w); - - DECLARE_READ8_MEMBER(vt1682_201c_bk1_segment_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_201c_bk1_segment_7_0_w); - DECLARE_READ8_MEMBER(vt1682_201d_bk1_segment_11_8_r); - DECLARE_WRITE8_MEMBER(vt1682_201d_bk1_segment_11_8_w); - DECLARE_READ8_MEMBER(vt1682_201e_bk2_segment_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_201e_bk2_segment_7_0_w); - DECLARE_READ8_MEMBER(vt1682_201f_bk2_segment_11_8_r); - DECLARE_WRITE8_MEMBER(vt1682_201f_bk2_segment_11_8_w); - - DECLARE_READ8_MEMBER(vt1682_2013_bk1_main_control_r); - DECLARE_WRITE8_MEMBER(vt1682_2013_bk1_main_control_w); - DECLARE_READ8_MEMBER(vt1682_2017_bk2_main_control_r); - DECLARE_WRITE8_MEMBER(vt1682_2017_bk2_main_control_w); - - DECLARE_READ8_MEMBER(vt1682_2012_bk1_scroll_control_r); - DECLARE_WRITE8_MEMBER(vt1682_2012_bk1_scroll_control_w); - DECLARE_READ8_MEMBER(vt1682_2016_bk2_scroll_control_r); - DECLARE_WRITE8_MEMBER(vt1682_2016_bk2_scroll_control_w); - - DECLARE_READ8_MEMBER(vt1682_2010_bk1_xscroll_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2010_bk1_xscroll_7_0_w); - DECLARE_READ8_MEMBER(vt1682_2011_bk1_yscoll_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2011_bk1_yscoll_7_0_w); - DECLARE_READ8_MEMBER(vt1682_2014_bk2_xscroll_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2014_bk2_xscroll_7_0_w); - DECLARE_READ8_MEMBER(vt1682_2015_bk2_yscoll_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2015_bk2_yscoll_7_0_w); - - DECLARE_READ8_MEMBER(vt1682_200e_blend_pal_sel_r); - DECLARE_WRITE8_MEMBER(vt1682_200e_blend_pal_sel_w); - DECLARE_READ8_MEMBER(vt1682_200f_bk_pal_sel_r); - DECLARE_WRITE8_MEMBER(vt1682_200f_bk_pal_sel_w); - - DECLARE_READ8_MEMBER(vt1682_2008_lcd_vs_delay_r); - DECLARE_WRITE8_MEMBER(vt1682_2008_lcd_vs_delay_w); - DECLARE_READ8_MEMBER(vt1682_2009_lcd_hs_delay_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2009_lcd_hs_delay_7_0_w); - DECLARE_READ8_MEMBER(vt1682_200a_lcd_fr_delay_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_200a_lcd_fr_delay_7_0_w); - - DECLARE_READ8_MEMBER(vt1682_200d_misc_vregs2_r); - DECLARE_WRITE8_MEMBER(vt1682_200d_misc_vregs2_w); - DECLARE_READ8_MEMBER(vt1682_200c_misc_vregs1_r); - DECLARE_WRITE8_MEMBER(vt1682_200c_misc_vregs1_w); - DECLARE_READ8_MEMBER(vt1682_200b_misc_vregs0_r); - DECLARE_WRITE8_MEMBER(vt1682_200b_misc_vregs0_w); - - DECLARE_READ8_MEMBER(vt1682_2018_spregs_r); - DECLARE_WRITE8_MEMBER(vt1682_2018_spregs_w); - DECLARE_READ8_MEMBER(vt1682_2019_bkgain_r); - DECLARE_WRITE8_MEMBER(vt1682_2019_bkgain_w); - - DECLARE_READ8_MEMBER(vt1682_2020_bk_linescroll_r); - DECLARE_WRITE8_MEMBER(vt1682_2020_bk_linescroll_w); - DECLARE_READ8_MEMBER(vt1682_2021_lum_offset_r); - DECLARE_WRITE8_MEMBER(vt1682_2021_lum_offset_w); - DECLARE_READ8_MEMBER(vt1682_2022_saturation_misc_r); - DECLARE_WRITE8_MEMBER(vt1682_2022_saturation_misc_w); - - DECLARE_READ8_MEMBER(vt1682_2023_lightgun_reset_r); - DECLARE_WRITE8_MEMBER(vt1682_2023_lightgun_reset_w); - DECLARE_READ8_MEMBER(vt1682_2024_lightgun1_y_r); - DECLARE_WRITE8_MEMBER(vt1682_2024_lightgun1_y_w); - DECLARE_READ8_MEMBER(vt1682_2025_lightgun1_x_r); - DECLARE_WRITE8_MEMBER(vt1682_2025_lightgun1_x_w); - DECLARE_READ8_MEMBER(vt1682_2026_lightgun2_y_r); - DECLARE_WRITE8_MEMBER(vt1682_2026_lightgun2_y_w); - DECLARE_READ8_MEMBER(vt1682_2027_lightgun2_x_r); - DECLARE_WRITE8_MEMBER(vt1682_2027_lightgun2_x_w); - - DECLARE_READ8_MEMBER(vt1682_2031_red_dac_r); - DECLARE_WRITE8_MEMBER(vt1682_2031_red_dac_w); - DECLARE_READ8_MEMBER(vt1682_2032_green_dac_r); - DECLARE_WRITE8_MEMBER(vt1682_2032_green_dac_w); - DECLARE_READ8_MEMBER(vt1682_2033_blue_dac_r); - DECLARE_WRITE8_MEMBER(vt1682_2033_blue_dac_w); - - DECLARE_READ8_MEMBER(vt1682_2028_r); - DECLARE_WRITE8_MEMBER(vt1682_2028_w); - DECLARE_READ8_MEMBER(vt1682_2029_r); - DECLARE_WRITE8_MEMBER(vt1682_2029_w); - DECLARE_READ8_MEMBER(vt1682_202a_r); - DECLARE_WRITE8_MEMBER(vt1682_202a_w); - DECLARE_READ8_MEMBER(vt1682_202b_r); - DECLARE_WRITE8_MEMBER(vt1682_202b_w); - DECLARE_READ8_MEMBER(vt1682_202e_r); - DECLARE_WRITE8_MEMBER(vt1682_202e_w); - DECLARE_READ8_MEMBER(vt1682_2030_r); - DECLARE_WRITE8_MEMBER(vt1682_2030_w); + uint8_t vt1682_2000_r(); + void vt1682_2000_w(uint8_t data); + + uint8_t vt1682_2001_vblank_r(); + void vt1682_2001_w(uint8_t data); + + uint8_t vt1682_2002_sprramaddr_2_0_r(); + void vt1682_2002_sprramaddr_2_0_w(uint8_t data); + uint8_t vt1682_2003_sprramaddr_10_3_r(); + void vt1682_2003_sprramaddr_10_3_w(uint8_t data); + uint8_t vt1682_2004_sprram_data_r(); + void vt1682_2004_sprram_data_w(uint8_t data); + + uint8_t vt1682_2005_vramaddr_7_0_r(); + void vt1682_2005_vramaddr_7_0_w(uint8_t data); + uint8_t vt1682_2006_vramaddr_15_8_r(); + void vt1682_2006_vramaddr_15_8_w(uint8_t data); + uint8_t vt1682_2007_vram_data_r(); + void vt1682_2007_vram_data_w(uint8_t data); + + uint8_t vt1682_201a_sp_segment_7_0_r(); + void vt1682_201a_sp_segment_7_0_w(uint8_t data); + uint8_t vt1682_201b_sp_segment_11_8_r(); + void vt1682_201b_sp_segment_11_8_w(uint8_t data); + + uint8_t vt1682_201c_bk1_segment_7_0_r(); + void vt1682_201c_bk1_segment_7_0_w(uint8_t data); + uint8_t vt1682_201d_bk1_segment_11_8_r(); + void vt1682_201d_bk1_segment_11_8_w(uint8_t data); + uint8_t vt1682_201e_bk2_segment_7_0_r(); + void vt1682_201e_bk2_segment_7_0_w(uint8_t data); + uint8_t vt1682_201f_bk2_segment_11_8_r(); + void vt1682_201f_bk2_segment_11_8_w(uint8_t data); + + uint8_t vt1682_2013_bk1_main_control_r(); + void vt1682_2013_bk1_main_control_w(uint8_t data); + uint8_t vt1682_2017_bk2_main_control_r(); + void vt1682_2017_bk2_main_control_w(uint8_t data); + + uint8_t vt1682_2012_bk1_scroll_control_r(); + void vt1682_2012_bk1_scroll_control_w(uint8_t data); + uint8_t vt1682_2016_bk2_scroll_control_r(); + void vt1682_2016_bk2_scroll_control_w(uint8_t data); + + uint8_t vt1682_2010_bk1_xscroll_7_0_r(); + void vt1682_2010_bk1_xscroll_7_0_w(uint8_t data); + uint8_t vt1682_2011_bk1_yscoll_7_0_r(); + void vt1682_2011_bk1_yscoll_7_0_w(uint8_t data); + uint8_t vt1682_2014_bk2_xscroll_7_0_r(); + void vt1682_2014_bk2_xscroll_7_0_w(uint8_t data); + uint8_t vt1682_2015_bk2_yscoll_7_0_r(); + void vt1682_2015_bk2_yscoll_7_0_w(uint8_t data); + + uint8_t vt1682_200e_blend_pal_sel_r(); + void vt1682_200e_blend_pal_sel_w(uint8_t data); + uint8_t vt1682_200f_bk_pal_sel_r(); + void vt1682_200f_bk_pal_sel_w(uint8_t data); + + uint8_t vt1682_2008_lcd_vs_delay_r(); + void vt1682_2008_lcd_vs_delay_w(uint8_t data); + uint8_t vt1682_2009_lcd_hs_delay_7_0_r(); + void vt1682_2009_lcd_hs_delay_7_0_w(uint8_t data); + uint8_t vt1682_200a_lcd_fr_delay_7_0_r(); + void vt1682_200a_lcd_fr_delay_7_0_w(uint8_t data); + + uint8_t vt1682_200d_misc_vregs2_r(); + void vt1682_200d_misc_vregs2_w(uint8_t data); + uint8_t vt1682_200c_misc_vregs1_r(); + void vt1682_200c_misc_vregs1_w(uint8_t data); + uint8_t vt1682_200b_misc_vregs0_r(); + void vt1682_200b_misc_vregs0_w(uint8_t data); + + uint8_t vt1682_2018_spregs_r(); + void vt1682_2018_spregs_w(uint8_t data); + uint8_t vt1682_2019_bkgain_r(); + void vt1682_2019_bkgain_w(uint8_t data); + + uint8_t vt1682_2020_bk_linescroll_r(); + void vt1682_2020_bk_linescroll_w(uint8_t data); + uint8_t vt1682_2021_lum_offset_r(); + void vt1682_2021_lum_offset_w(uint8_t data); + uint8_t vt1682_2022_saturation_misc_r(); + void vt1682_2022_saturation_misc_w(uint8_t data); + + uint8_t vt1682_2023_lightgun_reset_r(); + void vt1682_2023_lightgun_reset_w(uint8_t data); + uint8_t vt1682_2024_lightgun1_y_r(); + void vt1682_2024_lightgun1_y_w(uint8_t data); + uint8_t vt1682_2025_lightgun1_x_r(); + void vt1682_2025_lightgun1_x_w(uint8_t data); + uint8_t vt1682_2026_lightgun2_y_r(); + void vt1682_2026_lightgun2_y_w(uint8_t data); + uint8_t vt1682_2027_lightgun2_x_r(); + void vt1682_2027_lightgun2_x_w(uint8_t data); + + uint8_t vt1682_2031_red_dac_r(); + void vt1682_2031_red_dac_w(uint8_t data); + uint8_t vt1682_2032_green_dac_r(); + void vt1682_2032_green_dac_w(uint8_t data); + uint8_t vt1682_2033_blue_dac_r(); + void vt1682_2033_blue_dac_w(uint8_t data); + + uint8_t vt1682_2028_r(); + void vt1682_2028_w(uint8_t data); + uint8_t vt1682_2029_r(); + void vt1682_2029_w(uint8_t data); + uint8_t vt1682_202a_r(); + void vt1682_202a_w(uint8_t data); + uint8_t vt1682_202b_r(); + void vt1682_202b_w(uint8_t data); + uint8_t vt1682_202e_r(); + void vt1682_202e_w(uint8_t data); + uint8_t vt1682_2030_r(); + void vt1682_2030_w(uint8_t data); /* Video Helpers */ @@ -426,73 +426,73 @@ private: uint8_t m_2106_enable_reg; - DECLARE_READ8_MEMBER(vt1682_2100_prgbank1_r3_r); - DECLARE_WRITE8_MEMBER(vt1682_2100_prgbank1_r3_w); - DECLARE_READ8_MEMBER(vt1682_210c_prgbank1_r2_r); - DECLARE_WRITE8_MEMBER(vt1682_210c_prgbank1_r2_w); + uint8_t vt1682_2100_prgbank1_r3_r(); + void vt1682_2100_prgbank1_r3_w(uint8_t data); + uint8_t vt1682_210c_prgbank1_r2_r(); + void vt1682_210c_prgbank1_r2_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2107_prgbank0_r0_r); - DECLARE_WRITE8_MEMBER(vt1682_2107_prgbank0_r0_w); - DECLARE_READ8_MEMBER(vt1682_2108_prgbank0_r1_r); - DECLARE_WRITE8_MEMBER(vt1682_2108_prgbank0_r1_w); - DECLARE_READ8_MEMBER(vt1682_2109_prgbank0_r2_r); - DECLARE_WRITE8_MEMBER(vt1682_2109_prgbank0_r2_w); - DECLARE_READ8_MEMBER(vt1682_210a_prgbank0_r3_r); - DECLARE_WRITE8_MEMBER(vt1682_210a_prgbank0_r3_w); + uint8_t vt1682_2107_prgbank0_r0_r(); + void vt1682_2107_prgbank0_r0_w(uint8_t data); + uint8_t vt1682_2108_prgbank0_r1_r(); + void vt1682_2108_prgbank0_r1_w(uint8_t data); + uint8_t vt1682_2109_prgbank0_r2_r(); + void vt1682_2109_prgbank0_r2_w(uint8_t data); + uint8_t vt1682_210a_prgbank0_r3_r(); + void vt1682_210a_prgbank0_r3_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_prgbank0_r4_r); - DECLARE_READ8_MEMBER(vt1682_prgbank0_r5_r); - DECLARE_READ8_MEMBER(vt1682_prgbank1_r0_r); - DECLARE_READ8_MEMBER(vt1682_prgbank1_r1_r); + uint8_t vt1682_prgbank0_r4_r(); + uint8_t vt1682_prgbank0_r5_r(); + uint8_t vt1682_prgbank1_r0_r(); + uint8_t vt1682_prgbank1_r1_r(); - DECLARE_WRITE8_MEMBER(vt1682_prgbank1_r0_w); - DECLARE_WRITE8_MEMBER(vt1682_prgbank1_r1_w); - DECLARE_WRITE8_MEMBER(vt1682_prgbank0_r4_w); - DECLARE_WRITE8_MEMBER(vt1682_prgbank0_r5_w); + void vt1682_prgbank1_r0_w(uint8_t data); + void vt1682_prgbank1_r1_w(uint8_t data); + void vt1682_prgbank0_r4_w(uint8_t data); + void vt1682_prgbank0_r5_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2118_prgbank1_r4_r5_r); - DECLARE_WRITE8_MEMBER(vt1682_2118_prgbank1_r4_r5_w); + uint8_t vt1682_2118_prgbank1_r4_r5_r(); + void vt1682_2118_prgbank1_r4_r5_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_210b_misc_cs_prg0_bank_sel_r); - DECLARE_WRITE8_MEMBER(vt1682_210b_misc_cs_prg0_bank_sel_w); + uint8_t vt1682_210b_misc_cs_prg0_bank_sel_r(); + void vt1682_210b_misc_cs_prg0_bank_sel_w(uint8_t data); - DECLARE_WRITE8_MEMBER(vt1682_2105_comr6_tvmodes_w); + void vt1682_2105_comr6_tvmodes_w(uint8_t data); - DECLARE_WRITE8_MEMBER(vt1682_211c_regs_ext2421_w); + void vt1682_211c_regs_ext2421_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2122_dma_dt_addr_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2122_dma_dt_addr_7_0_w); - DECLARE_READ8_MEMBER(vt1682_2123_dma_dt_addr_15_8_r); - DECLARE_WRITE8_MEMBER(vt1682_2123_dma_dt_addr_15_8_w); + uint8_t vt1682_2122_dma_dt_addr_7_0_r(); + void vt1682_2122_dma_dt_addr_7_0_w(uint8_t data); + uint8_t vt1682_2123_dma_dt_addr_15_8_r(); + void vt1682_2123_dma_dt_addr_15_8_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2124_dma_sr_addr_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_2124_dma_sr_addr_7_0_w); - DECLARE_READ8_MEMBER(vt1682_2125_dma_sr_addr_15_8_r); - DECLARE_WRITE8_MEMBER(vt1682_2125_dma_sr_addr_15_8_w); + uint8_t vt1682_2124_dma_sr_addr_7_0_r(); + void vt1682_2124_dma_sr_addr_7_0_w(uint8_t data); + uint8_t vt1682_2125_dma_sr_addr_15_8_r(); + void vt1682_2125_dma_sr_addr_15_8_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2126_dma_sr_bank_addr_22_15_r); - DECLARE_WRITE8_MEMBER(vt1682_2126_dma_sr_bank_addr_22_15_w); - DECLARE_READ8_MEMBER(vt1682_2128_dma_sr_bank_addr_24_23_r); - DECLARE_WRITE8_MEMBER(vt1682_2128_dma_sr_bank_addr_24_23_w); + uint8_t vt1682_2126_dma_sr_bank_addr_22_15_r(); + void vt1682_2126_dma_sr_bank_addr_22_15_w(uint8_t data); + uint8_t vt1682_2128_dma_sr_bank_addr_24_23_r(); + void vt1682_2128_dma_sr_bank_addr_24_23_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2127_dma_status_r); - DECLARE_WRITE8_MEMBER(vt1682_2127_dma_size_trigger_w); + uint8_t vt1682_2127_dma_status_r(); + void vt1682_2127_dma_size_trigger_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_2106_enable_regs_r); - DECLARE_WRITE8_MEMBER(vt1682_2106_enable_regs_w); + uint8_t vt1682_2106_enable_regs_r(); + void vt1682_2106_enable_regs_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_212c_prng_r); - DECLARE_WRITE8_MEMBER(vt1682_212c_prng_seed_w); + uint8_t vt1682_212c_prng_r(); + void vt1682_212c_prng_seed_w(uint8_t data); virtual void clock_joy2(); - READ8_MEMBER(inteact_212a_send_joy_clock2_r); + uint8_t inteact_212a_send_joy_clock2_r(); /* Hacky */ - DECLARE_READ8_MEMBER(soundcpu_irq_vector_hack_r); - DECLARE_READ8_MEMBER(maincpu_irq_vector_hack_r); - DECLARE_WRITE8_MEMBER(vt1682_sound_reset_hack_w); + uint8_t soundcpu_irq_vector_hack_r(offs_t offset); + uint8_t maincpu_irq_vector_hack_r(offs_t offset); + void vt1682_sound_reset_hack_w(offs_t offset, uint8_t data); bool m_scpu_is_in_reset; /* System Helpers */ @@ -560,30 +560,30 @@ private: uint8_t m_soundcpu_211a_dacright_7_0; uint8_t m_soundcpu_211b_dacright_15_8; - DECLARE_WRITE8_MEMBER(vt1682_soundcpu_211c_reg_irqctrl_w); + void vt1682_soundcpu_211c_reg_irqctrl_w(uint8_t data); - DECLARE_READ8_MEMBER(vt1682_soundcpu_2118_dacleft_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_soundcpu_2118_dacleft_7_0_w); - DECLARE_READ8_MEMBER(vt1682_soundcpu_2119_dacleft_15_8_r); - DECLARE_WRITE8_MEMBER(vt1682_soundcpu_2119_dacleft_15_8_w); - DECLARE_READ8_MEMBER(vt1682_soundcpu_211a_dacright_7_0_r); - DECLARE_WRITE8_MEMBER(vt1682_soundcpu_211a_dacright_7_0_w); - DECLARE_READ8_MEMBER(vt1682_soundcpu_211b_dacright_15_8_r); - DECLARE_WRITE8_MEMBER(vt1682_soundcpu_211b_dacright_15_8_w); + uint8_t vt1682_soundcpu_2118_dacleft_7_0_r(); + void vt1682_soundcpu_2118_dacleft_7_0_w(uint8_t data); + uint8_t vt1682_soundcpu_2119_dacleft_15_8_r(); + void vt1682_soundcpu_2119_dacleft_15_8_w(uint8_t data); + uint8_t vt1682_soundcpu_211a_dacright_7_0_r(); + void vt1682_soundcpu_211a_dacright_7_0_w(uint8_t data); + uint8_t vt1682_soundcpu_211b_dacright_15_8_r(); + void vt1682_soundcpu_211b_dacright_15_8_w(uint8_t data); /* Support */ - DECLARE_WRITE8_MEMBER(vt1682_timer_enable_trampoline_w) + void vt1682_timer_enable_trampoline_w(uint8_t data) { // this is used for raster interrpt effects, despite not being a scanline timer, so knowing when it triggers is useful, so trampoline it to avoid passing m_screen to the device LOGMASKED(LOG_OTHER, "%s: vt1682_timer_enable_trampoline_w: %02x @ position y%d, x%d\n", machine().describe_context(), data, m_screen->vpos(), m_screen->hpos()); - m_system_timer_dev->vt1682_timer_enable_w(space, offset, data); + m_system_timer_dev->vt1682_timer_enable_w(data); }; - DECLARE_WRITE8_MEMBER(vt1682_timer_preload_15_8_trampoline_w) + void vt1682_timer_preload_15_8_trampoline_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_timer_preload_15_8_trampoline_w: %02x @ position y%d, x%d\n", machine().describe_context(), data, m_screen->vpos(), m_screen->hpos()); - m_system_timer_dev->vt1682_timer_preload_15_8_w(space, offset, data); + m_system_timer_dev->vt1682_timer_preload_15_8_w(data); }; @@ -592,8 +592,8 @@ private: uint32_t translate_address_4000_to_7fff(uint16_t address); uint32_t translate_address_8000_to_ffff(uint16_t address); - DECLARE_READ8_MEMBER(rom_4000_to_7fff_r); - DECLARE_READ8_MEMBER(rom_8000_to_ffff_r); + uint8_t rom_4000_to_7fff_r(offs_t offset); + uint8_t rom_8000_to_ffff_r(offs_t offset); TIMER_DEVICE_CALLBACK_MEMBER(scanline); TIMER_DEVICE_CALLBACK_MEMBER(line_render_start); @@ -944,7 +944,7 @@ void vt_vt1682_state::machine_reset() /* -Address tranlsation +Address translation ---------------------------------------------------------------- @@ -1174,13 +1174,13 @@ uint32_t vt_vt1682_state::translate_address_8000_to_ffff(uint16_t address) return realaddress; } -READ8_MEMBER(vt_vt1682_state::rom_4000_to_7fff_r) +uint8_t vt_vt1682_state::rom_4000_to_7fff_r(offs_t offset) { const uint32_t address = translate_address_4000_to_7fff(offset + 0x4000); return m_fullrom->read8(address); } -READ8_MEMBER(vt_vt1682_state::rom_8000_to_ffff_r) +uint8_t vt_vt1682_state::rom_8000_to_ffff_r(offs_t offset) { const uint32_t address = translate_address_8000_to_ffff(offset + 0x8000); return m_fullrom->read8(address); @@ -1203,14 +1203,14 @@ READ8_MEMBER(vt_vt1682_state::rom_8000_to_ffff_r) 0x01 - NMI_EN */ -READ8_MEMBER(vt_vt1682_state::vt1682_2000_r) +uint8_t vt_vt1682_state::vt1682_2000_r() { uint8_t ret = m_2000; LOGMASKED(LOG_OTHER, "%s: vt1682_2000_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2000_w) +void vt_vt1682_state::vt1682_2000_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2000_w writing: %02x (Capture:%1x Slave:%1x NMI_Enable:%1x)\n", machine().describe_context(), data, (data & 0x10)>>4, (data & 0x08)>>3, (data & 0x01)>>0 ); m_2000 = data; @@ -1240,7 +1240,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2000_w) 0x01 - BK INI (blank bg on left 8 pixels) */ -READ8_MEMBER(vt_vt1682_state::vt1682_2001_vblank_r) +uint8_t vt_vt1682_state::vt1682_2001_vblank_r() { uint8_t ret = 0x00; @@ -1254,7 +1254,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_2001_vblank_r) return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2001_w) +void vt_vt1682_state::vt1682_2001_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2001_w writing: %02x (ext_clk_div:%1x sp_ini:%1x bk_ini:%1x)\n", machine().describe_context(), data, (data & 0x0c) >> 2, (data & 0x02) >> 1, (data & 0x01) >> 0); @@ -1276,14 +1276,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2001_w) 0x01 - SPRAM ADDR:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2002_sprramaddr_2_0_r) +uint8_t vt_vt1682_state::vt1682_2002_sprramaddr_2_0_r() { uint8_t ret = m_2002_sprramaddr_2_0; LOGMASKED(LOG_OTHER, "%s: vt1682_2002_sprramaddr_2_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2002_sprramaddr_2_0_w) +void vt_vt1682_state::vt1682_2002_sprramaddr_2_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2002_sprramaddr_2_0_w writing: %02x\n", machine().describe_context(), data); m_2002_sprramaddr_2_0 = data & 0x07; @@ -1302,14 +1302,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2002_sprramaddr_2_0_w) 0x01 - SPRAM ADDR:3 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2003_sprramaddr_10_3_r) +uint8_t vt_vt1682_state::vt1682_2003_sprramaddr_10_3_r() { uint8_t ret = m_2003_sprramaddr_10_3; LOGMASKED(LOG_OTHER, "%s: vt1682_2003_sprramaddr_10_3_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2003_sprramaddr_10_3_w) +void vt_vt1682_state::vt1682_2003_sprramaddr_10_3_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2003_sprramaddr_10_3_w writing: %02x\n", machine().describe_context(), data); m_2003_sprramaddr_10_3 = data; @@ -1328,7 +1328,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2003_sprramaddr_10_3_w) 0x01 - SPRAM DATA:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2004_sprram_data_r) +uint8_t vt_vt1682_state::vt1682_2004_sprram_data_r() { uint16_t spriteram_address = get_spriteram_addr(); uint8_t ret = m_spriteram->read8(spriteram_address); @@ -1338,7 +1338,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_2004_sprram_data_r) return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2004_sprram_data_w) +void vt_vt1682_state::vt1682_2004_sprram_data_w(uint8_t data) { uint16_t spriteram_address = get_spriteram_addr(); m_spriteram->write8(spriteram_address, data); @@ -1361,14 +1361,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2004_sprram_data_w) 0x01 - VRAM ADDR:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2005_vramaddr_7_0_r) +uint8_t vt_vt1682_state::vt1682_2005_vramaddr_7_0_r() { uint8_t ret = m_2005_vramaddr_7_0; LOGMASKED(LOG_OTHER, "%s: vt1682_2005_vramaddr_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2005_vramaddr_7_0_w) +void vt_vt1682_state::vt1682_2005_vramaddr_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2005_vramaddr_7_0_w writing: %02x\n", machine().describe_context(), data); m_2005_vramaddr_7_0 = data; @@ -1387,14 +1387,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2005_vramaddr_7_0_w) 0x01 - VRAM ADDR:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2006_vramaddr_15_8_r) +uint8_t vt_vt1682_state::vt1682_2006_vramaddr_15_8_r() { uint8_t ret = m_2006_vramaddr_15_8; LOGMASKED(LOG_OTHER, "%s: vt1682_2006_vramaddr_15_8 returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2006_vramaddr_15_8_w) +void vt_vt1682_state::vt1682_2006_vramaddr_15_8_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2006_vramaddr_15_8 writing: %02x\n", machine().describe_context(), data); m_2006_vramaddr_15_8 = data; @@ -1414,7 +1414,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2006_vramaddr_15_8_w) 0x01 - VRAM DATA:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2007_vram_data_r) +uint8_t vt_vt1682_state::vt1682_2007_vram_data_r() { uint16_t vram_address = get_vram_addr(); uint8_t ret = m_vram->read8(vram_address); @@ -1424,7 +1424,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_2007_vram_data_r) return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2007_vram_data_w) +void vt_vt1682_state::vt1682_2007_vram_data_w(uint8_t data) { uint16_t vram_address = get_vram_addr(); m_vram->write8(vram_address, data); @@ -1447,14 +1447,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2007_vram_data_w) 0x01 - LCD VS DELAY */ -READ8_MEMBER(vt_vt1682_state::vt1682_2008_lcd_vs_delay_r) +uint8_t vt_vt1682_state::vt1682_2008_lcd_vs_delay_r() { uint8_t ret = m_2008_lcd_vs_delay; LOGMASKED(LOG_OTHER, "%s: vt1682_2008_lcd_vs_delay_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2008_lcd_vs_delay_w) +void vt_vt1682_state::vt1682_2008_lcd_vs_delay_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2008_lcd_vs_delay_w writing: %02x\n", machine().describe_context(), data); m_2008_lcd_vs_delay = data; @@ -1473,14 +1473,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2008_lcd_vs_delay_w) 0x01 - LCD HS DELAY:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2009_lcd_hs_delay_7_0_r) +uint8_t vt_vt1682_state::vt1682_2009_lcd_hs_delay_7_0_r() { uint8_t ret = m_2009_lcd_hs_delay_7_0; LOGMASKED(LOG_OTHER, "%s: vt1682_2009_lcd_hs_delay_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2009_lcd_hs_delay_7_0_w) +void vt_vt1682_state::vt1682_2009_lcd_hs_delay_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2009_lcd_hs_delay_7_0_w writing: %02x\n", machine().describe_context(), data); m_2009_lcd_hs_delay_7_0 = data; @@ -1499,14 +1499,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2009_lcd_hs_delay_7_0_w) 0x01 - LCD FR DELAY:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_200a_lcd_fr_delay_7_0_r) +uint8_t vt_vt1682_state::vt1682_200a_lcd_fr_delay_7_0_r() { uint8_t ret = m_200a_lcd_fr_delay_7_0; LOGMASKED(LOG_OTHER, "%s: vt1682_200a_lcd_fr_delay_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_200a_lcd_fr_delay_7_0_w) +void vt_vt1682_state::vt1682_200a_lcd_fr_delay_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_200a_lcd_fr_delay_7_0_w writing: %02x\n", machine().describe_context(), data); m_200a_lcd_fr_delay_7_0 = data; @@ -1526,14 +1526,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_200a_lcd_fr_delay_7_0_w) 0x01 - LCD HS:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_200b_misc_vregs0_r) +uint8_t vt_vt1682_state::vt1682_200b_misc_vregs0_r() { uint8_t ret = m_200b_misc_vregs0; LOGMASKED(LOG_OTHER, "%s: vt1682_200b_misc_vregs0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_200b_misc_vregs0_w) +void vt_vt1682_state::vt1682_200b_misc_vregs0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_200b_misc_vregs0_w writing: %02x\n", machine().describe_context(), data); m_200b_misc_vregs0 = data; @@ -1552,14 +1552,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_200b_misc_vregs0_w) 0x01 - LCD MODE */ -READ8_MEMBER(vt_vt1682_state::vt1682_200c_misc_vregs1_r) +uint8_t vt_vt1682_state::vt1682_200c_misc_vregs1_r() { uint8_t ret = m_200c_misc_vregs1; LOGMASKED(LOG_OTHER, "%s: vt1682_200c_misc_vregs1_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_200c_misc_vregs1_w) +void vt_vt1682_state::vt1682_200c_misc_vregs1_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_200c_misc_vregs1_w writing: %02x\n", machine().describe_context(), data); m_200c_misc_vregs1 = data; @@ -1578,14 +1578,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_200c_misc_vregs1_w) 0x01 - Even Line Color */ -READ8_MEMBER(vt_vt1682_state::vt1682_200d_misc_vregs2_r) +uint8_t vt_vt1682_state::vt1682_200d_misc_vregs2_r() { uint8_t ret = m_200d_misc_vregs2; LOGMASKED(LOG_OTHER, "%s: vt1682_200d_misc_vregs2_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_200d_misc_vregs2_w) +void vt_vt1682_state::vt1682_200d_misc_vregs2_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_200d_misc_vregs2_w writing: %02x\n", machine().describe_context(), data); m_200d_misc_vregs2 = data; @@ -1605,14 +1605,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_200d_misc_vregs2_w) 0x01 - Palette 1 Out Sel 'SB5' /- 0 = output Palette 1 Disable, 1 = output Palette 1 to LCD only, 2 = Output Palette 1 to TV only, 3 = Output Palette 1 to both */ -READ8_MEMBER(vt_vt1682_state::vt1682_200e_blend_pal_sel_r) +uint8_t vt_vt1682_state::vt1682_200e_blend_pal_sel_r() { uint8_t ret = m_200e_blend_pal_sel; LOGMASKED(LOG_OTHER, "%s: vt1682_200e_blend_pal_sel_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_200e_blend_pal_sel_w) +void vt_vt1682_state::vt1682_200e_blend_pal_sel_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_200e_blend_pal_sel_w writing: %02x\n", machine().describe_context(), data); m_200e_blend_pal_sel = data; @@ -1631,14 +1631,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_200e_blend_pal_sel_w) 0x01 - Bk1 Palette Select 'BK1 SB1' */ -READ8_MEMBER(vt_vt1682_state::vt1682_200f_bk_pal_sel_r) +uint8_t vt_vt1682_state::vt1682_200f_bk_pal_sel_r() { uint8_t ret = m_200f_bk_pal_sel; LOGMASKED(LOG_OTHER, "%s: vt1682_200f_bk_pal_sel_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_200f_bk_pal_sel_w) +void vt_vt1682_state::vt1682_200f_bk_pal_sel_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_200f_bk_pal_sel_w writing: %02x\n", machine().describe_context(), data); m_200f_bk_pal_sel = data; @@ -1657,14 +1657,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_200f_bk_pal_sel_w) 0x01 - BK1X:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2010_bk1_xscroll_7_0_r) +uint8_t vt_vt1682_state::vt1682_2010_bk1_xscroll_7_0_r() { uint8_t ret = m_xscroll_7_0_bk[0]; LOGMASKED(LOG_OTHER, "%s: vt1682_2010_bk1_xscroll_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2010_bk1_xscroll_7_0_w) +void vt_vt1682_state::vt1682_2010_bk1_xscroll_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2010_bk1_xscroll_7_0_w writing: %02x\n", machine().describe_context(), data); m_xscroll_7_0_bk[0] = data; @@ -1683,14 +1683,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2010_bk1_xscroll_7_0_w) 0x01 - BK1Y:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2011_bk1_yscoll_7_0_r) +uint8_t vt_vt1682_state::vt1682_2011_bk1_yscoll_7_0_r() { uint8_t ret = m_yscroll_7_0_bk[0]; LOGMASKED(LOG_OTHER, "%s: vt1682_2011_bk1_yscoll_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2011_bk1_yscoll_7_0_w) +void vt_vt1682_state::vt1682_2011_bk1_yscoll_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2011_bk1_yscoll_7_0_w writing: %02x\n", machine().describe_context(), data); m_yscroll_7_0_bk[0] = data; @@ -1710,7 +1710,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2011_bk1_yscoll_7_0_w) 0x01 - BK1X:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2012_bk1_scroll_control_r) +uint8_t vt_vt1682_state::vt1682_2012_bk1_scroll_control_r() { uint8_t ret = m_scroll_control_bk[0]; LOGMASKED(LOG_OTHER, "%s: vt1682_2012_bk1_scroll_control_r returning: %02x\n", machine().describe_context(), ret); @@ -1718,7 +1718,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_2012_bk1_scroll_control_r) } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2012_bk1_scroll_control_w) +void vt_vt1682_state::vt1682_2012_bk1_scroll_control_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2012_bk1_scroll_control_w writing: %02x (hclr: %1x page_layout:%1x ymsb:%1x xmsb:%1x)\n", machine().describe_context(), data, @@ -1741,14 +1741,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2012_bk1_scroll_control_w) 0x01 - BK1 Size */ -READ8_MEMBER(vt_vt1682_state::vt1682_2013_bk1_main_control_r) +uint8_t vt_vt1682_state::vt1682_2013_bk1_main_control_r() { uint8_t ret = m_main_control_bk[0]; LOGMASKED(LOG_OTHER, "%s: vt1682_2013_bk1_main_control_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2013_bk1_main_control_w) +void vt_vt1682_state::vt1682_2013_bk1_main_control_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2013_bk1_main_control_w writing: %02x (enable:%01x palette:%01x depth:%01x bpp:%01x linemode:%01x tilesize:%01x)\n", machine().describe_context(), data, (data & 0x80) >> 7, (data & 0x40) >> 6, (data & 0x30) >> 4, (data & 0x0c) >> 2, (data & 0x02) >> 1, (data & 0x01) >> 0 ); @@ -1770,14 +1770,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2013_bk1_main_control_w) */ -READ8_MEMBER(vt_vt1682_state::vt1682_2014_bk2_xscroll_7_0_r) +uint8_t vt_vt1682_state::vt1682_2014_bk2_xscroll_7_0_r() { uint8_t ret = m_xscroll_7_0_bk[1]; LOGMASKED(LOG_OTHER, "%s: vt1682_2014_bk2_xscroll_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2014_bk2_xscroll_7_0_w) +void vt_vt1682_state::vt1682_2014_bk2_xscroll_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2014_bk2_xscroll_7_0_w writing: %02x\n", machine().describe_context(), data); m_xscroll_7_0_bk[1] = data; @@ -1796,14 +1796,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2014_bk2_xscroll_7_0_w) 0x01 - BK2Y:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2015_bk2_yscoll_7_0_r) +uint8_t vt_vt1682_state::vt1682_2015_bk2_yscoll_7_0_r() { uint8_t ret = m_yscroll_7_0_bk[1]; LOGMASKED(LOG_OTHER, "%s: vt1682_2015_bk2_yscoll_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2015_bk2_yscoll_7_0_w) +void vt_vt1682_state::vt1682_2015_bk2_yscoll_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2015_bk2_yscoll_7_0_w writing: %02x\n", machine().describe_context(), data); m_yscroll_7_0_bk[1] = data; @@ -1823,7 +1823,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2015_bk2_yscoll_7_0_w) 0x01 - BK2X:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2016_bk2_scroll_control_r) +uint8_t vt_vt1682_state::vt1682_2016_bk2_scroll_control_r() { uint8_t ret = m_scroll_control_bk[1]; LOGMASKED(LOG_OTHER, "%s: vt1682_2016_bk2_scroll_control_r returning: %02x\n", machine().describe_context(), ret); @@ -1831,7 +1831,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_2016_bk2_scroll_control_r) } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2016_bk2_scroll_control_w) +void vt_vt1682_state::vt1682_2016_bk2_scroll_control_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2016_bk2_scroll_control_w writing: %02x ((invalid): %1x page_layout:%1x ymsb:%1x xmsb:%1x)\n", machine().describe_context(), data, (data & 0x10) >> 4, (data & 0x0c) >> 2, (data & 0x02) >> 1, (data & 0x01) >> 0); @@ -1853,14 +1853,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2016_bk2_scroll_control_w) 0x01 - BK2 Size */ -READ8_MEMBER(vt_vt1682_state::vt1682_2017_bk2_main_control_r) +uint8_t vt_vt1682_state::vt1682_2017_bk2_main_control_r() { uint8_t ret = m_main_control_bk[1]; LOGMASKED(LOG_OTHER, "%s: vt1682_2017_bk2_main_control_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2017_bk2_main_control_w) +void vt_vt1682_state::vt1682_2017_bk2_main_control_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2017_bk2_main_control_w writing: %02x (enable:%01x palette:%01x depth:%01x bpp:%01x (invalid):%01x tilesize:%01x)\n", machine().describe_context(), data, (data & 0x80) >> 7, (data & 0x40) >> 6, (data & 0x30) >> 4, (data & 0x0c) >> 2, (data & 0x02) >> 1, (data & 0x01) >> 0 ); @@ -1882,14 +1882,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2017_bk2_main_control_w) 0x01 - SP SIZE */ -READ8_MEMBER(vt_vt1682_state::vt1682_2018_spregs_r) +uint8_t vt_vt1682_state::vt1682_2018_spregs_r() { uint8_t ret = m_2018_spregs; LOGMASKED(LOG_OTHER, "%s: vt1682_2018_spregs_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2018_spregs_w) +void vt_vt1682_state::vt1682_2018_spregs_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2018_spregs_w writing: %02x\n", machine().describe_context(), data); m_2018_spregs = data; @@ -1908,14 +1908,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2018_spregs_w) 0x01 - BK1 Gain */ -READ8_MEMBER(vt_vt1682_state::vt1682_2019_bkgain_r) +uint8_t vt_vt1682_state::vt1682_2019_bkgain_r() { uint8_t ret = m_2019_bkgain; LOGMASKED(LOG_OTHER, "%s: vt1682_2019_bkgain_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2019_bkgain_w) +void vt_vt1682_state::vt1682_2019_bkgain_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2019_bkgain_w writing: %02x\n", machine().describe_context(), data); m_2019_bkgain = data; @@ -1935,14 +1935,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2019_bkgain_w) 0x01 - SP SEGMENT:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_201a_sp_segment_7_0_r) +uint8_t vt_vt1682_state::vt1682_201a_sp_segment_7_0_r() { uint8_t ret = m_201a_sp_segment_7_0; LOGMASKED(LOG_OTHER, "%s: vt1682_201a_sp_segment_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_201a_sp_segment_7_0_w) +void vt_vt1682_state::vt1682_201a_sp_segment_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_201a_sp_segment_7_0_w writing: %02x\n", machine().describe_context(), data); m_201a_sp_segment_7_0 = data; @@ -1961,14 +1961,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_201a_sp_segment_7_0_w) 0x01 - SP SEGMENT:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_201b_sp_segment_11_8_r) +uint8_t vt_vt1682_state::vt1682_201b_sp_segment_11_8_r() { uint8_t ret = m_201b_sp_segment_11_8; LOGMASKED(LOG_OTHER, "%s: vt1682_201b_sp_segment_11_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_201b_sp_segment_11_8_w) +void vt_vt1682_state::vt1682_201b_sp_segment_11_8_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_201b_sp_segment_11_8_w writing: %02x\n", machine().describe_context(), data); m_201b_sp_segment_11_8 = data & 0x0f; @@ -1988,14 +1988,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_201b_sp_segment_11_8_w) 0x01 - BK1 SEGMENT:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_201c_bk1_segment_7_0_r) +uint8_t vt_vt1682_state::vt1682_201c_bk1_segment_7_0_r() { uint8_t ret = m_segment_7_0_bk[0]; LOGMASKED(LOG_OTHER, "%s: vt1682_201c_bk1_segment_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_201c_bk1_segment_7_0_w) +void vt_vt1682_state::vt1682_201c_bk1_segment_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_201c_bk1_segment_7_0_w writing: %02x\n", machine().describe_context(), data); m_segment_7_0_bk[0] = data; @@ -2014,14 +2014,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_201c_bk1_segment_7_0_w) 0x01 - BK1 SEGMENT:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_201d_bk1_segment_11_8_r) +uint8_t vt_vt1682_state::vt1682_201d_bk1_segment_11_8_r() { uint8_t ret = m_segment_11_8_bk[0]; LOGMASKED(LOG_OTHER, "%s: vt1682_201d_bk1_segment_11_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_201d_bk1_segment_11_8_w) +void vt_vt1682_state::vt1682_201d_bk1_segment_11_8_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_201d_bk1_segment_11_8_w writing: %02x\n", machine().describe_context(), data); m_segment_11_8_bk[0] = data & 0x0f; @@ -2041,14 +2041,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_201d_bk1_segment_11_8_w) 0x01 - BK2 SEGMENT:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_201e_bk2_segment_7_0_r) +uint8_t vt_vt1682_state::vt1682_201e_bk2_segment_7_0_r() { uint8_t ret = m_segment_7_0_bk[1]; LOGMASKED(LOG_OTHER, "%s: vt1682_201e_bk2_segment_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_201e_bk2_segment_7_0_w) +void vt_vt1682_state::vt1682_201e_bk2_segment_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_201e_bk2_segment_7_0_w writing: %02x\n", machine().describe_context(), data); m_segment_7_0_bk[1] = data; @@ -2067,14 +2067,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_201e_bk2_segment_7_0_w) 0x01 - BK2 SEGMENT:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_201f_bk2_segment_11_8_r) +uint8_t vt_vt1682_state::vt1682_201f_bk2_segment_11_8_r() { uint8_t ret = m_segment_11_8_bk[1]; LOGMASKED(LOG_OTHER, "%s: vt1682_201f_bk2_segment_11_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_201f_bk2_segment_11_8_w) +void vt_vt1682_state::vt1682_201f_bk2_segment_11_8_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_201f_bk2_segment_11_8_w writing: %02x\n", machine().describe_context(), data); m_segment_11_8_bk[1] = data & 0x0f; @@ -2093,14 +2093,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_201f_bk2_segment_11_8_w) 0x01 - Scroll Bank */ -READ8_MEMBER(vt_vt1682_state::vt1682_2020_bk_linescroll_r) +uint8_t vt_vt1682_state::vt1682_2020_bk_linescroll_r() { uint8_t ret = m_2020_bk_linescroll; LOGMASKED(LOG_OTHER, "%s: vt1682_2020_bk_linescroll_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2020_bk_linescroll_w) +void vt_vt1682_state::vt1682_2020_bk_linescroll_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2020_bk_linescroll_w writing: %02x\n", machine().describe_context(), data); m_2020_bk_linescroll = data; @@ -2122,14 +2122,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2020_bk_linescroll_w) 0x01 - Luminance_offset */ -READ8_MEMBER(vt_vt1682_state::vt1682_2021_lum_offset_r) +uint8_t vt_vt1682_state::vt1682_2021_lum_offset_r() { uint8_t ret = m_2021_lum_offset; LOGMASKED(LOG_OTHER, "%s: vt1682_2021_lum_offset_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2021_lum_offset_w) +void vt_vt1682_state::vt1682_2021_lum_offset_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2021_lum_offset_w writing: %02x\n", machine().describe_context(), data); m_2021_lum_offset = data; @@ -2149,14 +2149,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2021_lum_offset_w) 0x01 - Saturation */ -READ8_MEMBER(vt_vt1682_state::vt1682_2022_saturation_misc_r) +uint8_t vt_vt1682_state::vt1682_2022_saturation_misc_r() { uint8_t ret = m_2022_saturation_misc; LOGMASKED(LOG_OTHER, "%s: vt1682_2022_saturation_misc_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2022_saturation_misc_w) +void vt_vt1682_state::vt1682_2022_saturation_misc_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2022_saturation_misc_w writing: %02x\n", machine().describe_context(), data); m_2022_saturation_misc = data; @@ -2175,14 +2175,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2022_saturation_misc_w) 0x01 - Light Gun Reset */ -READ8_MEMBER(vt_vt1682_state::vt1682_2023_lightgun_reset_r) +uint8_t vt_vt1682_state::vt1682_2023_lightgun_reset_r() { uint8_t ret = m_2023_lightgun_reset; LOGMASKED(LOG_OTHER, "%s: vt1682_2023_lightgun_reset_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2023_lightgun_reset_w) +void vt_vt1682_state::vt1682_2023_lightgun_reset_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2023_lightgun_reset_w writing: %02x\n", machine().describe_context(), data); m_2023_lightgun_reset = data; @@ -2201,14 +2201,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2023_lightgun_reset_w) 0x01 - Light Gun 1 Y */ -READ8_MEMBER(vt_vt1682_state::vt1682_2024_lightgun1_y_r) +uint8_t vt_vt1682_state::vt1682_2024_lightgun1_y_r() { uint8_t ret = m_2024_lightgun1_y; LOGMASKED(LOG_OTHER, "%s: vt1682_2024_lightgun1_y_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2024_lightgun1_y_w) +void vt_vt1682_state::vt1682_2024_lightgun1_y_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2024_lightgun1_y_w writing: %02x\n", machine().describe_context(), data); m_2024_lightgun1_y = data; @@ -2227,14 +2227,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2024_lightgun1_y_w) 0x01 - Light Gun 1 X */ -READ8_MEMBER(vt_vt1682_state::vt1682_2025_lightgun1_x_r) +uint8_t vt_vt1682_state::vt1682_2025_lightgun1_x_r() { uint8_t ret = m_2025_lightgun1_x; LOGMASKED(LOG_OTHER, "%s: vt1682_2025_lightgun1_x_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2025_lightgun1_x_w) +void vt_vt1682_state::vt1682_2025_lightgun1_x_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2025_lightgun1_x_w writing: %02x\n", machine().describe_context(), data); m_2025_lightgun1_x = data; @@ -2253,14 +2253,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2025_lightgun1_x_w) 0x01 - Light Gun 2 Y */ -READ8_MEMBER(vt_vt1682_state::vt1682_2026_lightgun2_y_r) +uint8_t vt_vt1682_state::vt1682_2026_lightgun2_y_r() { uint8_t ret = m_2026_lightgun2_y; LOGMASKED(LOG_OTHER, "%s: vt1682_2026_lightgun2_y_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2026_lightgun2_y_w) +void vt_vt1682_state::vt1682_2026_lightgun2_y_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2026_lightgun2_y_w writing: %02x\n", machine().describe_context(), data); m_2026_lightgun2_y = data; @@ -2280,14 +2280,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2026_lightgun2_y_w) 0x01 - Light Gun 2 X */ -READ8_MEMBER(vt_vt1682_state::vt1682_2027_lightgun2_x_r) +uint8_t vt_vt1682_state::vt1682_2027_lightgun2_x_r() { uint8_t ret = m_2027_lightgun2_x; LOGMASKED(LOG_OTHER, "%s: vt1682_2027_lightgun2_x_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2027_lightgun2_x_w) +void vt_vt1682_state::vt1682_2027_lightgun2_x_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2027_lightgun2_x_w writing: %02x\n", machine().describe_context(), data); m_2027_lightgun2_x = data; @@ -2307,14 +2307,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2027_lightgun2_x_w) 0x01 - CCIR Y */ -READ8_MEMBER(vt_vt1682_state::vt1682_2028_r) +uint8_t vt_vt1682_state::vt1682_2028_r() { uint8_t ret = m_2028; LOGMASKED(LOG_OTHER, "%s: vt1682_2028_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2028_w) +void vt_vt1682_state::vt1682_2028_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2028_w writing: %02x\n", machine().describe_context(), data); m_2028 = data; @@ -2333,14 +2333,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2028_w) 0x01 - CCIR X */ -READ8_MEMBER(vt_vt1682_state::vt1682_2029_r) +uint8_t vt_vt1682_state::vt1682_2029_r() { uint8_t ret = m_2029; LOGMASKED(LOG_OTHER, "%s: vt1682_2029_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2029_w) +void vt_vt1682_state::vt1682_2029_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2029_w writing: %02x\n", machine().describe_context(), data); m_2029 = data; @@ -2361,14 +2361,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2029_w) */ -READ8_MEMBER(vt_vt1682_state::vt1682_202a_r) +uint8_t vt_vt1682_state::vt1682_202a_r() { uint8_t ret = m_202a; LOGMASKED(LOG_OTHER, "%s: vt1682_202a_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_202a_w) +void vt_vt1682_state::vt1682_202a_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_202a_w writing: %02x\n", machine().describe_context(), data); m_202a = data; @@ -2389,14 +2389,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_202a_w) */ -READ8_MEMBER(vt_vt1682_state::vt1682_202b_r) +uint8_t vt_vt1682_state::vt1682_202b_r() { uint8_t ret = m_202b; LOGMASKED(LOG_OTHER, "%s: vt1682_202b_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_202b_w) +void vt_vt1682_state::vt1682_202b_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_202b_w writing: %02x\n", machine().describe_context(), data); m_202b = data; @@ -2420,14 +2420,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_202b_w) */ -READ8_MEMBER(vt_vt1682_state::vt1682_202e_r) +uint8_t vt_vt1682_state::vt1682_202e_r() { uint8_t ret = m_202e; LOGMASKED(LOG_OTHER, "%s: vt1682_202e_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_202e_w) +void vt_vt1682_state::vt1682_202e_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_202e_w writing: %02x\n", machine().describe_context(), data); m_202e = data; @@ -2450,14 +2450,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_202e_w) */ -READ8_MEMBER(vt_vt1682_state::vt1682_2030_r) +uint8_t vt_vt1682_state::vt1682_2030_r() { uint8_t ret = m_2030; LOGMASKED(LOG_OTHER, "%s: vt1682_2030_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2030_w) +void vt_vt1682_state::vt1682_2030_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2030_w writing: %02x\n", machine().describe_context(), data); m_2030 = data; @@ -2477,14 +2477,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2030_w) 0x01 - R DAC OUT:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2031_red_dac_r) +uint8_t vt_vt1682_state::vt1682_2031_red_dac_r() { uint8_t ret = m_2031_red_dac; LOGMASKED(LOG_OTHER, "%s: vt1682_2031_red_dac_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2031_red_dac_w) +void vt_vt1682_state::vt1682_2031_red_dac_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2031_red_dac_w writing: %02x\n", machine().describe_context(), data); m_2031_red_dac = data; @@ -2503,14 +2503,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2031_red_dac_w) 0x01 - G DAC OUT:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2032_green_dac_r) +uint8_t vt_vt1682_state::vt1682_2032_green_dac_r() { uint8_t ret = m_2032_green_dac; LOGMASKED(LOG_OTHER, "%s: vt1682_2032_green_dac_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2032_green_dac_w) +void vt_vt1682_state::vt1682_2032_green_dac_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2032_green_dac_w writing: %02x\n", machine().describe_context(), data); m_2032_green_dac = data; @@ -2529,14 +2529,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2032_green_dac_w) 0x01 - B DAC OUT:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2033_blue_dac_r) +uint8_t vt_vt1682_state::vt1682_2033_blue_dac_r() { uint8_t ret = m_2033_blue_dac; LOGMASKED(LOG_OTHER, "%s: vt1682_2033_blue_dac_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2033_blue_dac_w) +void vt_vt1682_state::vt1682_2033_blue_dac_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2033_blue_dac_w writing: %02x\n", machine().describe_context(), data); m_2033_blue_dac = data; @@ -2560,14 +2560,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2033_blue_dac_w) 0x01 - Program Bank 1 Register 3 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2100_prgbank1_r3_r) +uint8_t vt_vt1682_state::vt1682_2100_prgbank1_r3_r() { uint8_t ret = m_2100_prgbank1_r3; LOGMASKED(LOG_OTHER, "%s: vt1682_2100_prgbank1_r3_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2100_prgbank1_r3_w) +void vt_vt1682_state::vt1682_2100_prgbank1_r3_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2100_prgbank1_r3_w writing: %02x (4-bits)\n", machine().describe_context(), data); m_2100_prgbank1_r3 = data; @@ -2595,7 +2595,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2100_prgbank1_r3_w) */ -WRITE8_MEMBER(vt_vt1682_state::vt1682_2105_comr6_tvmodes_w) +void vt_vt1682_state::vt1682_2105_comr6_tvmodes_w(uint8_t data) { // COMR6 is used for banking LOGMASKED(LOG_OTHER, "%s: vt1682_2105_comr6_tvmodes_w writing: %02x\n", machine().describe_context(), data); @@ -2617,14 +2617,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2105_comr6_tvmodes_w) 0x01 - LCD ON (LCD display controller enable) */ -READ8_MEMBER(vt_vt1682_state::vt1682_2106_enable_regs_r) +uint8_t vt_vt1682_state::vt1682_2106_enable_regs_r() { uint8_t ret = m_2106_enable_reg; LOGMASKED(LOG_OTHER, "%s: vt1682_2106_enable_regs_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2106_enable_regs_w) +void vt_vt1682_state::vt1682_2106_enable_regs_w(uint8_t data) { // COMR6 is used for banking LOGMASKED(LOG_OTHER, "%s: vt1682_2106_enable_regs_w writing: %02x (scpurn:%1x scpuon:%1x spion:%1x uarton:%1x tvon:%1x lcdon:%1x)\n", machine().describe_context().c_str(), data, @@ -2657,14 +2657,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2106_enable_regs_w) 0x01 - Program Bank 0 Register 0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2107_prgbank0_r0_r) +uint8_t vt_vt1682_state::vt1682_2107_prgbank0_r0_r() { uint8_t ret = m_2107_prgbank0_r0; LOGMASKED(LOG_OTHER, "%s: vt1682_2107_prgbank0_r0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2107_prgbank0_r0_w) +void vt_vt1682_state::vt1682_2107_prgbank0_r0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2107_prgbank0_r0_w writing: %02x\n", machine().describe_context(), data); m_2107_prgbank0_r0 = data; @@ -2684,14 +2684,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2107_prgbank0_r0_w) 0x01 - Program Bank 0 Register 1 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2108_prgbank0_r1_r) +uint8_t vt_vt1682_state::vt1682_2108_prgbank0_r1_r() { uint8_t ret = m_2108_prgbank0_r1; LOGMASKED(LOG_OTHER, "%s: vt1682_2108_prgbank0_r1_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2108_prgbank0_r1_w) +void vt_vt1682_state::vt1682_2108_prgbank0_r1_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2108_prgbank0_r1_w writing: %02x\n", machine().describe_context(), data); m_2108_prgbank0_r1 = data; @@ -2713,14 +2713,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2108_prgbank0_r1_w) */ -READ8_MEMBER(vt_vt1682_state::vt1682_2109_prgbank0_r2_r) +uint8_t vt_vt1682_state::vt1682_2109_prgbank0_r2_r() { uint8_t ret = m_2109_prgbank0_r2; LOGMASKED(LOG_OTHER, "%s: vt1682_2109_prgbank0_r2_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2109_prgbank0_r2_w) +void vt_vt1682_state::vt1682_2109_prgbank0_r2_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2109_prgbank0_r2_w writing: %02x\n", machine().describe_context(), data); m_2109_prgbank0_r2 = data; @@ -2740,14 +2740,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2109_prgbank0_r2_w) 0x01 - Program Bank 0 Register 3 */ -READ8_MEMBER(vt_vt1682_state::vt1682_210a_prgbank0_r3_r) +uint8_t vt_vt1682_state::vt1682_210a_prgbank0_r3_r() { uint8_t ret = m_210a_prgbank0_r3; LOGMASKED(LOG_OTHER, "%s: vt1682_210a_prgbank0_r3_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_210a_prgbank0_r3_w) +void vt_vt1682_state::vt1682_210a_prgbank0_r3_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_210a_prgbank0_r3_w writing: %02x\n", machine().describe_context(), data); m_210a_prgbank0_r3 = data; @@ -2767,14 +2767,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_210a_prgbank0_r3_w) 0x01 - Program Bank 0 Select */ -READ8_MEMBER(vt_vt1682_state::vt1682_210b_misc_cs_prg0_bank_sel_r) +uint8_t vt_vt1682_state::vt1682_210b_misc_cs_prg0_bank_sel_r() { uint8_t ret = m_210b_misc_cs_prg0_bank_sel; LOGMASKED(LOG_OTHER, "%s: vt1682_210b_misc_cs_prg0_bank_sel_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_210b_misc_cs_prg0_bank_sel_w) +void vt_vt1682_state::vt1682_210b_misc_cs_prg0_bank_sel_w(uint8_t data) { // PQ2 Enable is also used for ROM banking along with Program Bank 0 select uint32_t clock = m_maincpu->clock(); @@ -2818,14 +2818,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_210b_misc_cs_prg0_bank_sel_w) 0x01 - Program Bank 1 Register 2 */ -READ8_MEMBER(vt_vt1682_state::vt1682_210c_prgbank1_r2_r) +uint8_t vt_vt1682_state::vt1682_210c_prgbank1_r2_r() { uint8_t ret = m_210c_prgbank1_r2; LOGMASKED(LOG_OTHER, "%s: vt1682_210c_prgbank1_r2_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_210c_prgbank1_r2_w) +void vt_vt1682_state::vt1682_210c_prgbank1_r2_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_210c_prgbank1_r2_w writing: %02x (4-bits)\n", machine().describe_context(), data); m_210c_prgbank1_r2 = data; @@ -2862,14 +2862,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_210c_prgbank1_r2_w) 0x01 - Program Bank 1 Register 0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r4_r) +uint8_t vt_vt1682_state::vt1682_prgbank0_r4_r() { uint8_t ret = m_prgbank0_r4; LOGMASKED(LOG_OTHER, "%s: (2110) vt1682_prgbank0_r4_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r0_w) +void vt_vt1682_state::vt1682_prgbank1_r0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: (2110) vt1682_prgbank1_r0_w writing: %02x (4-bits)\n", machine().describe_context(), data); m_prgbank1_r0 = data; @@ -2900,7 +2900,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r0_w) 0x01 - Program Bank 1 Register 1 */ -READ8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r5_r) +uint8_t vt_vt1682_state::vt1682_prgbank0_r5_r() { uint8_t ret = m_prgbank0_r5; LOGMASKED(LOG_OTHER, "%s: (2111) vt1682_prgbank0_r5_r returning: %02x\n", machine().describe_context(), ret); @@ -2908,7 +2908,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r5_r) } -WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r1_w) +void vt_vt1682_state::vt1682_prgbank1_r1_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: (2111) vt1682_prgbank1_r1_w writing: %02x (4-bits)\n", machine().describe_context(), data); m_prgbank1_r1 = data; @@ -2940,7 +2940,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r1_w) 0x01 - Program Bank 0 Register 4 */ -READ8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r0_r) +uint8_t vt_vt1682_state::vt1682_prgbank1_r0_r() { uint8_t ret = m_prgbank1_r0; LOGMASKED(LOG_OTHER, "%s: (2112) vt1682_prgbank1_r0_r returning: %02x\n", machine().describe_context(), ret); @@ -2948,7 +2948,7 @@ READ8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r0_r) } -WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r4_w) +void vt_vt1682_state::vt1682_prgbank0_r4_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: (2112) vt1682_prgbank0_r4_w writing: %02x (8-bits)\n", machine().describe_context(), data); m_prgbank0_r4 = data; @@ -2980,14 +2980,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r4_w) 0x01 - Program Bank 0 Register 5 */ -READ8_MEMBER(vt_vt1682_state::vt1682_prgbank1_r1_r) +uint8_t vt_vt1682_state::vt1682_prgbank1_r1_r() { uint8_t ret = m_prgbank1_r1; LOGMASKED(LOG_OTHER, "%s: (2113) vt1682_prgbank1_r1_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r5_w) +void vt_vt1682_state::vt1682_prgbank0_r5_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: (2113) vt1682_prgbank0_r5_w writing: %02x (8-bits)\n", machine().describe_context(), data); m_prgbank0_r5 = data; @@ -3070,14 +3070,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_prgbank0_r5_w) 0x01 - Program Bank 1 Register 4 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2118_prgbank1_r4_r5_r) +uint8_t vt_vt1682_state::vt1682_2118_prgbank1_r4_r5_r() { uint8_t ret = m_2118_prgbank1_r4_r5; LOGMASKED(LOG_OTHER, "%s: vt1682_2118_prgbank1_r4_r5_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2118_prgbank1_r4_r5_w) +void vt_vt1682_state::vt1682_2118_prgbank1_r4_r5_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2118_prgbank1_r4_r5_w writing: %02x (2x 4-bits)\n", machine().describe_context(), data); m_2118_prgbank1_r4_r5 = data; @@ -3170,7 +3170,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2118_prgbank1_r4_r5_w) 0x01 - Clear_SCPU_IRQ */ -WRITE8_MEMBER(vt_vt1682_state::vt1682_211c_regs_ext2421_w) +void vt_vt1682_state::vt1682_211c_regs_ext2421_w(uint8_t data) { // EXT2421EN is used for ROM banking LOGMASKED(LOG_OTHER, "%s: vt1682_211c_regs_ext2421_w writing: %02x\n", machine().describe_context(), data); @@ -3296,14 +3296,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_211c_regs_ext2421_w) 0x01 - DMA DT ADDR:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2122_dma_dt_addr_7_0_r) +uint8_t vt_vt1682_state::vt1682_2122_dma_dt_addr_7_0_r() { uint8_t ret = m_2122_dma_dt_addr_7_0; LOGMASKED(LOG_OTHER, "%s: vt1682_2122_dma_dt_addr_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2122_dma_dt_addr_7_0_w) +void vt_vt1682_state::vt1682_2122_dma_dt_addr_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2122_dma_dt_addr_7_0_w writing: %02x\n", machine().describe_context(), data); m_2122_dma_dt_addr_7_0 = data; @@ -3323,14 +3323,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2122_dma_dt_addr_7_0_w) 0x01 - DMA DT ADDR:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2123_dma_dt_addr_15_8_r) +uint8_t vt_vt1682_state::vt1682_2123_dma_dt_addr_15_8_r() { uint8_t ret = m_2123_dma_dt_addr_15_8; LOGMASKED(LOG_OTHER, "%s: vt1682_2123_dma_dt_addr_15_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2123_dma_dt_addr_15_8_w) +void vt_vt1682_state::vt1682_2123_dma_dt_addr_15_8_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2123_dma_dt_addr_15_8_w writing: %02x\n", machine().describe_context(), data); m_2123_dma_dt_addr_15_8 = data; @@ -3350,14 +3350,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2123_dma_dt_addr_15_8_w) 0x01 - DMA SR ADDR:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2124_dma_sr_addr_7_0_r) +uint8_t vt_vt1682_state::vt1682_2124_dma_sr_addr_7_0_r() { uint8_t ret = m_2124_dma_sr_addr_7_0; LOGMASKED(LOG_OTHER, "%s: vt1682_2124_dma_sr_addr_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2124_dma_sr_addr_7_0_w) +void vt_vt1682_state::vt1682_2124_dma_sr_addr_7_0_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2124_dma_sr_addr_7_0_w writing: %02x\n", machine().describe_context(), data); m_2124_dma_sr_addr_7_0 = data; @@ -3377,14 +3377,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2124_dma_sr_addr_7_0_w) 0x01 - DMA SR ADDR:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2125_dma_sr_addr_15_8_r) +uint8_t vt_vt1682_state::vt1682_2125_dma_sr_addr_15_8_r() { uint8_t ret = m_2125_dma_sr_addr_15_8; LOGMASKED(LOG_OTHER, "%s: vt1682_2125_dma_sr_addr_15_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2125_dma_sr_addr_15_8_w) +void vt_vt1682_state::vt1682_2125_dma_sr_addr_15_8_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2125_dma_sr_addr_15_8_w writing: %02x\n", machine().describe_context(), data); m_2125_dma_sr_addr_15_8 = data; @@ -3405,14 +3405,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2125_dma_sr_addr_15_8_w) 0x01 - DMA SR BANK:15 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2126_dma_sr_bank_addr_22_15_r) +uint8_t vt_vt1682_state::vt1682_2126_dma_sr_bank_addr_22_15_r() { uint8_t ret = m_2126_dma_sr_bank_addr_22_15; LOGMASKED(LOG_OTHER, "%s: vt1682_2126_dma_sr_bank_addr_22_15_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2126_dma_sr_bank_addr_22_15_w) +void vt_vt1682_state::vt1682_2126_dma_sr_bank_addr_22_15_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2126_dma_sr_bank_addr_22_15_w writing: %02x\n", machine().describe_context(), data); m_2126_dma_sr_bank_addr_22_15 = data; @@ -3442,7 +3442,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2126_dma_sr_bank_addr_22_15_w) 0x01 - DMA Status */ -READ8_MEMBER(vt_vt1682_state::vt1682_2127_dma_status_r) +uint8_t vt_vt1682_state::vt1682_2127_dma_status_r() { uint8_t ret = 0x00; @@ -3523,7 +3523,7 @@ void vt_vt1682_state::do_dma_internal_to_internal(int data, bool is_video) -WRITE8_MEMBER(vt_vt1682_state::vt1682_2127_dma_size_trigger_w) +void vt_vt1682_state::vt1682_2127_dma_size_trigger_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2127_dma_size_trigger_w writing: %02x\n", machine().describe_context(), data); @@ -3612,14 +3612,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_2127_dma_size_trigger_w) 0x01 - DMA SR BANK:23 */ -READ8_MEMBER(vt_vt1682_state::vt1682_2128_dma_sr_bank_addr_24_23_r) +uint8_t vt_vt1682_state::vt1682_2128_dma_sr_bank_addr_24_23_r() { uint8_t ret = m_2128_dma_sr_bank_addr_24_23; LOGMASKED(LOG_OTHER, "%s: vt1682_2128_dma_sr_bank_addr_24_23_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_2128_dma_sr_bank_addr_24_23_w) +void vt_vt1682_state::vt1682_2128_dma_sr_bank_addr_24_23_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_2128_dma_sr_bank_addr_24_23_w writing: %02x\n", machine().describe_context(), data); m_2128_dma_sr_bank_addr_24_23 = data & 0x03; @@ -3679,9 +3679,9 @@ void vt_vt1682_state::clock_joy2() { } -READ8_MEMBER(vt_vt1682_state::inteact_212a_send_joy_clock2_r) +uint8_t vt_vt1682_state::inteact_212a_send_joy_clock2_r() { - uint8_t ret = m_uio->inteact_212a_uio_a_direction_r(space,offset); + uint8_t ret = m_uio->inteact_212a_uio_a_direction_r(); clock_joy2(); return ret; } @@ -3723,14 +3723,14 @@ READ8_MEMBER(vt_vt1682_state::inteact_212a_send_joy_clock2_r) 0x01 - Pseudo Random Number Seed */ -READ8_MEMBER(vt_vt1682_state::vt1682_212c_prng_r) +uint8_t vt_vt1682_state::vt1682_212c_prng_r() { uint8_t ret = machine().rand(); LOGMASKED(LOG_OTHER, "%s: vt1682_212c_prng_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_212c_prng_seed_w) +void vt_vt1682_state::vt1682_212c_prng_seed_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: vt1682_212c_prng_seed_w writing: %02x\n", machine().describe_context(), data); // don't know the algorithm @@ -3952,14 +3952,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_212c_prng_seed_w) actually 12 bits precision so only 15 to 4 are used */ -READ8_MEMBER(vt_vt1682_state::vt1682_soundcpu_2118_dacleft_7_0_r) +uint8_t vt_vt1682_state::vt1682_soundcpu_2118_dacleft_7_0_r() { uint8_t ret = m_soundcpu_2118_dacleft_7_0; //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_2118_dacleft_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_2118_dacleft_7_0_w) +void vt_vt1682_state::vt1682_soundcpu_2118_dacleft_7_0_w(uint8_t data) { //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_2118_dacleft_7_0_r writing: %02x\n", machine().describe_context(), data); m_soundcpu_2118_dacleft_7_0 = data; @@ -3978,14 +3978,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_2118_dacleft_7_0_w) 0x01 - Audio DAC Left:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_soundcpu_2119_dacleft_15_8_r) +uint8_t vt_vt1682_state::vt1682_soundcpu_2119_dacleft_15_8_r() { uint8_t ret = m_soundcpu_2119_dacleft_15_8; //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_2119_dacleft_15_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_2119_dacleft_15_8_w) +void vt_vt1682_state::vt1682_soundcpu_2119_dacleft_15_8_w(uint8_t data) { //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_2119_dacleft_15_8_r writing: %02x\n", machine().describe_context(), data); m_soundcpu_2119_dacleft_15_8 = data; @@ -4007,14 +4007,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_2119_dacleft_15_8_w) 0x01 - Audio DAC Right:0 */ -READ8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211a_dacright_7_0_r) +uint8_t vt_vt1682_state::vt1682_soundcpu_211a_dacright_7_0_r() { uint8_t ret = m_soundcpu_211a_dacright_7_0; //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_211a_dacright_7_0_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211a_dacright_7_0_w) +void vt_vt1682_state::vt1682_soundcpu_211a_dacright_7_0_w(uint8_t data) { //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_211a_dacright_7_0_r writing: %02x\n", machine().describe_context(), data); m_soundcpu_211a_dacright_7_0 = data; @@ -4033,14 +4033,14 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211a_dacright_7_0_w) 0x01 - Audio DAC Right:8 */ -READ8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211b_dacright_15_8_r) +uint8_t vt_vt1682_state::vt1682_soundcpu_211b_dacright_15_8_r() { uint8_t ret = m_soundcpu_211b_dacright_15_8; //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_211b_dacright_15_8_r returning: %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211b_dacright_15_8_w) +void vt_vt1682_state::vt1682_soundcpu_211b_dacright_15_8_w(uint8_t data) { //LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_211b_dacright_15_8_r writing: %02x\n", machine().describe_context(), data); m_soundcpu_211b_dacright_15_8 = data; @@ -4074,7 +4074,7 @@ WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211b_dacright_15_8_w) 0x01 - Clear_CPU_IRQ */ -WRITE8_MEMBER(vt_vt1682_state::vt1682_soundcpu_211c_reg_irqctrl_w) +void vt_vt1682_state::vt1682_soundcpu_211c_reg_irqctrl_w(uint8_t data) { // EXT2421EN is used for ROM banking LOGMASKED(LOG_OTHER, "%s: vt1682_soundcpu_211c_reg_irqctrl_w writing: %02x\n", machine().describe_context(), data); @@ -5282,21 +5282,21 @@ Ext IRQ 0x0ffe - 0x0fff */ -READ8_MEMBER(vt_vt1682_state::soundcpu_irq_vector_hack_r) +uint8_t vt_vt1682_state::soundcpu_irq_vector_hack_r(offs_t offset) { // redirect to Timer IRQ! return m_sound_share[0x0ff8 + offset]; } -READ8_MEMBER(vt_vt1682_state::maincpu_irq_vector_hack_r) +uint8_t vt_vt1682_state::maincpu_irq_vector_hack_r(offs_t offset) { // redirect to Timer IRQ! - return rom_8000_to_ffff_r(space, (0xfff8 - 0x8000)+offset); + return rom_8000_to_ffff_r((0xfff8 - 0x8000)+offset); } // intg5410 writes a new program without resetting the CPU when selecting from the 'arcade' game main menu, this is problematic // it does appear to rewrite the vectors first, so maybe there is some hardware side-effect of this putting the CPU in reset state?? -WRITE8_MEMBER(vt_vt1682_state::vt1682_sound_reset_hack_w) +void vt_vt1682_state::vt1682_sound_reset_hack_w(offs_t offset, uint8_t data) { m_sound_share[0x0ff4 + offset] = data; m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index 924dc90a65c..b8a29a08829 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -68,33 +68,33 @@ private: DECLARE_WRITE_LINE_MEMBER(tx_w); DECLARE_WRITE_LINE_MEMBER(t11_reset_w); DECLARE_READ_LINE_MEMBER(i8085_sid_r); - DECLARE_READ8_MEMBER(i8085_comm_r); - DECLARE_WRITE8_MEMBER(i8085_comm_w); - DECLARE_READ8_MEMBER(t11_comm_r); - DECLARE_WRITE8_MEMBER(t11_comm_w); - DECLARE_READ8_MEMBER(duart_r); - DECLARE_WRITE8_MEMBER(duart_w); + uint8_t i8085_comm_r(offs_t offset); + void i8085_comm_w(offs_t offset, uint8_t data); + uint8_t t11_comm_r(); + void t11_comm_w(uint8_t data); + uint8_t duart_r(offs_t offset); + void duart_w(offs_t offset, uint8_t data); void duartout_w(uint8_t data); - DECLARE_READ8_MEMBER(mem_map_cs_r); - DECLARE_WRITE8_MEMBER(mem_map_cs_w); - DECLARE_READ8_MEMBER(ctrl_r); - DECLARE_WRITE8_MEMBER(mem_map_sel_w); - DECLARE_READ8_MEMBER(char_buf_r); - DECLARE_WRITE8_MEMBER(char_buf_w); - DECLARE_WRITE8_MEMBER(patmult_w); - DECLARE_WRITE8_MEMBER(vpat_w); - DECLARE_READ16_MEMBER(vram_r); + uint8_t mem_map_cs_r(offs_t offset); + void mem_map_cs_w(offs_t offset, uint8_t data); + uint8_t ctrl_r(); + void mem_map_sel_w(uint8_t data); + uint8_t char_buf_r(); + void char_buf_w(uint8_t data); + void patmult_w(uint8_t data); + void vpat_w(uint8_t data); + uint16_t vram_r(offs_t offset); void vram_w(offs_t offset, uint16_t data); - DECLARE_READ8_MEMBER(vom_r); - DECLARE_WRITE8_MEMBER(vom_w); - DECLARE_READ8_MEMBER(nvr_store_r); - DECLARE_WRITE8_MEMBER(nvr_store_w); - DECLARE_WRITE8_MEMBER(mask_w); - DECLARE_WRITE8_MEMBER(reg0_w); - DECLARE_WRITE8_MEMBER(reg1_w); - DECLARE_WRITE8_MEMBER(lu_w); - DECLARE_WRITE8_MEMBER(hbscrl_w); - DECLARE_WRITE8_MEMBER(lbscrl_w); + uint8_t vom_r(offs_t offset); + void vom_w(offs_t offset, uint8_t data); + uint8_t nvr_store_r(); + void nvr_store_w(uint8_t data); + void mask_w(uint8_t data); + void reg0_w(uint8_t data); + void reg1_w(uint8_t data); + void lu_w(uint8_t data); + void hbscrl_w(uint8_t data); + void lbscrl_w(uint8_t data); uint16_t mem_r(offs_t offset, uint16_t mem_mask); void mem_w(offs_t offset, uint16_t data, uint16_t mem_mask); @@ -223,19 +223,19 @@ UPD7220_DISPLAY_PIXELS_MEMBER( vt240_state::hgdc_draw ) } } -READ8_MEMBER(vt240_state::t11_comm_r) +uint8_t vt240_state::t11_comm_r() { m_t11 = 1; m_i8085->set_input_line(I8085_RST65_LINE, CLEAR_LINE); return m_t11_out; } -WRITE8_MEMBER(vt240_state::t11_comm_w) +void vt240_state::t11_comm_w(uint8_t data) { m_i8085_out = data; } -READ8_MEMBER(vt240_state::i8085_comm_r) +uint8_t vt240_state::i8085_comm_r(offs_t offset) { switch(offset) { @@ -250,7 +250,7 @@ READ8_MEMBER(vt240_state::i8085_comm_r) return 0xff; } -WRITE8_MEMBER(vt240_state::i8085_comm_w) +void vt240_state::i8085_comm_w(offs_t offset, uint8_t data) { switch(offset) { @@ -267,14 +267,14 @@ WRITE8_MEMBER(vt240_state::i8085_comm_w) } } -READ8_MEMBER(vt240_state::duart_r) +uint8_t vt240_state::duart_r(offs_t offset) { if(!(offset & 1)) return m_duart->read(offset >> 1); return 0; } -WRITE8_MEMBER(vt240_state::duart_w) +void vt240_state::duart_w(offs_t offset, uint8_t data) { if(offset & 1) m_duart->write(offset >> 1, data); @@ -290,22 +290,22 @@ void vt240_state::duartout_w(uint8_t data) irq_encoder(10, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE); } -READ8_MEMBER(vt240_state::mem_map_cs_r) +uint8_t vt240_state::mem_map_cs_r(offs_t offset) { return ~m_mem_map[offset]; } -WRITE8_MEMBER(vt240_state::mem_map_cs_w) +void vt240_state::mem_map_cs_w(offs_t offset, uint8_t data) { m_mem_map[offset] = ~data; } -READ8_MEMBER(vt240_state::ctrl_r) +uint8_t vt240_state::ctrl_r() { return m_mem_map_sel | ((m_lb ? 0 : 1) << 3) | (m_i8085_rdy << 6) | (m_t11 << 7) | (1<<5); // no modem } -WRITE8_MEMBER(vt240_state::mem_map_sel_w) +void vt240_state::mem_map_sel_w(uint8_t data) { m_mem_map_sel = data & 1; } @@ -330,31 +330,31 @@ void vt240_state::mem_w(offs_t offset, uint16_t data, uint16_t mem_mask) } } -READ8_MEMBER(vt240_state::char_buf_r) +uint8_t vt240_state::char_buf_r() { m_char_idx = 0; return 0xff; } -WRITE8_MEMBER(vt240_state::char_buf_w) +void vt240_state::char_buf_w(uint8_t data) { m_char_buf[m_char_idx++] = bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7); m_char_idx &= 0xf; } -WRITE8_MEMBER(vt240_state::patmult_w) +void vt240_state::patmult_w(uint8_t data) { m_patmult = data & 0xf; } -WRITE8_MEMBER(vt240_state::vpat_w) +void vt240_state::vpat_w(uint8_t data) { m_vpat = data; m_patcnt = m_patmult; m_patidx = 7; } -READ8_MEMBER(vt240_state::vom_r) +uint8_t vt240_state::vom_r(offs_t offset) { if(!BIT(m_reg0, 2)) return m_vom[offset]; @@ -365,7 +365,7 @@ READ8_MEMBER(vt240_state::vom_r) return m_vom[((m_reg0 & 3) << 2) + 3]; } -WRITE8_MEMBER(vt240_state::vom_w) +void vt240_state::vom_w(offs_t offset, uint8_t data) { if(!BIT(m_reg0, 2)) { @@ -376,7 +376,7 @@ WRITE8_MEMBER(vt240_state::vom_w) } } -READ16_MEMBER(vt240_state::vram_r) +uint16_t vt240_state::vram_r(offs_t offset) { if(!BIT(m_reg0, 3) || machine().side_effects_disabled()) { @@ -492,45 +492,45 @@ void vt240_state::vram_w(offs_t offset, uint16_t data) video_ram[offset] = data; } -WRITE8_MEMBER(vt240_state::mask_w) +void vt240_state::mask_w(uint8_t data) { m_mask = bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7); } -READ8_MEMBER(vt240_state::nvr_store_r) +uint8_t vt240_state::nvr_store_r() { m_nvram->store(ASSERT_LINE); m_nvram->store(CLEAR_LINE); return 0; } -WRITE8_MEMBER(vt240_state::nvr_store_w) +void vt240_state::nvr_store_w(uint8_t data) { m_nvram->store(ASSERT_LINE); m_nvram->store(CLEAR_LINE); } -WRITE8_MEMBER(vt240_state::reg0_w) +void vt240_state::reg0_w(uint8_t data) { m_reg0 = data; } -WRITE8_MEMBER(vt240_state::reg1_w) +void vt240_state::reg1_w(uint8_t data) { m_reg1 = data; } -WRITE8_MEMBER(vt240_state::lu_w) +void vt240_state::lu_w(uint8_t data) { m_lu = data; } -WRITE8_MEMBER(vt240_state::lbscrl_w) +void vt240_state::lbscrl_w(uint8_t data) { m_scrl = (m_scrl & 0xff00) | data; } -WRITE8_MEMBER(vt240_state::hbscrl_w) +void vt240_state::hbscrl_w(uint8_t data) { m_scrl = (m_scrl & 0xff) | ((data & 0x3f) << 8); } diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp index 5d0d853938e..ae03e19ff5b 100644 --- a/src/mame/drivers/vt520.cpp +++ b/src/mame/drivers/vt520.cpp @@ -29,7 +29,7 @@ public: void vt420(machine_config &config); private: - DECLARE_READ8_MEMBER(vt520_some_r); + uint8_t vt520_some_r(); virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_vt520(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -51,7 +51,7 @@ void vt520_state::vt520_mem(address_map &map) there is 43.320MHz xtal near by */ -READ8_MEMBER( vt520_state::vt520_some_r ) +uint8_t vt520_state::vt520_some_r() { //bit 5 0 //bit 6 1 diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp index 4c5fa46565e..8850e90af1a 100644 --- a/src/mame/drivers/vta2000.cpp +++ b/src/mame/drivers/vta2000.cpp @@ -43,7 +43,7 @@ public: void vta2000(machine_config &config); private: - DECLARE_WRITE8_MEMBER(output_00); + void output_00(uint8_t data); DECLARE_WRITE_LINE_MEMBER(speaker_w); uint32_t screen_update_vta2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -59,7 +59,7 @@ private: required_region_ptr<u8> m_p_chargen; }; -WRITE8_MEMBER(vta2000_state::output_00) +void vta2000_state::output_00(uint8_t data) { m_mainpit->write_gate0(BIT(data, 4)); } diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index 212273322ea..d9e1f6226b1 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -85,11 +85,11 @@ public: void init_vtech1h(); private: - DECLARE_READ8_MEMBER(vtech1_lightpen_r); - DECLARE_READ8_MEMBER(vtech1_keyboard_r); - DECLARE_WRITE8_MEMBER(vtech1_latch_w); + uint8_t vtech1_lightpen_r(offs_t offset); + uint8_t vtech1_keyboard_r(offs_t offset); + void vtech1_latch_w(uint8_t data); - DECLARE_WRITE8_MEMBER(vtech1_video_bank_w); + void vtech1_video_bank_w(uint8_t data); uint8_t mc6847_videoram_r(offs_t offset); DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb); @@ -191,13 +191,13 @@ SNAPSHOT_LOAD_MEMBER(vtech1_state::snapshot_cb) INPUTS ***************************************************************************/ -READ8_MEMBER( vtech1_state::vtech1_lightpen_r ) +uint8_t vtech1_state::vtech1_lightpen_r(offs_t offset) { logerror("vtech1_lightpen_r(%d)\n", offset); return 0xff; } -READ8_MEMBER( vtech1_state::vtech1_keyboard_r ) +uint8_t vtech1_state::vtech1_keyboard_r(offs_t offset) { uint8_t result = 0x3f; @@ -225,7 +225,7 @@ READ8_MEMBER( vtech1_state::vtech1_keyboard_r ) I/O LATCH ***************************************************************************/ -WRITE8_MEMBER( vtech1_state::vtech1_latch_w ) +void vtech1_state::vtech1_latch_w(uint8_t data) { if (LOG_VTECH1_LATCH) logerror("vtech1_latch_w $%02X\n", data); @@ -253,7 +253,7 @@ WRITE8_MEMBER( vtech1_state::vtech1_latch_w ) MEMORY BANKING ***************************************************************************/ -WRITE8_MEMBER( vtech1_state::vtech1_video_bank_w ) +void vtech1_state::vtech1_video_bank_w(uint8_t data) { membank("bank4")->set_entry(data & 0x03); } diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index ce819679c9e..578a009b8b6 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -55,7 +55,7 @@ private: virtual void machine_reset() override; DECLARE_WRITE_LINE_MEMBER(adpcm_int); - DECLARE_WRITE8_MEMBER(sample_ctrl_w); + void sample_ctrl_w(uint8_t data); void alligators_ctrl1_w(uint8_t data); void alligators_ctrl2_w(uint8_t data); @@ -69,8 +69,8 @@ private: void pmm8713_ck(int i, int state); template <unsigned N> DECLARE_WRITE_LINE_MEMBER(alligator_ck) { pmm8713_ck(N, state); } - DECLARE_WRITE8_MEMBER(irq_ack_w) { m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } - DECLARE_WRITE8_MEMBER(firq_ack_w) { m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); } + void irq_ack_w(uint8_t data) { m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } + void firq_ack_w(uint8_t data) { m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer) { m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } @@ -109,7 +109,7 @@ void wackygtr_state::status_lamps_w(uint8_t data) m_ticket->motor_w(BIT(data, 7)); } -WRITE8_MEMBER(wackygtr_state::sample_ctrl_w) +void wackygtr_state::sample_ctrl_w(uint8_t data) { /* --xx xxxx sample index diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index b2b98ca0d59..f0304ee9c67 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -96,11 +96,11 @@ private: bool m_bookkeeping_mode; - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(wallc_coin_counter_w); - DECLARE_WRITE8_MEMBER(unkitpkr_out0_w); - DECLARE_WRITE8_MEMBER(unkitpkr_out1_w); - DECLARE_WRITE8_MEMBER(unkitpkr_out2_w); + void videoram_w(offs_t offset, uint8_t data); + void wallc_coin_counter_w(uint8_t data); + void unkitpkr_out0_w(uint8_t data); + void unkitpkr_out1_w(uint8_t data); + void unkitpkr_out2_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info_unkitpkr); @@ -214,7 +214,7 @@ void wallc_state::unkitpkr_palette(palette_device &palette) const } } -WRITE8_MEMBER(wallc_state::videoram_w) +void wallc_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); @@ -263,22 +263,22 @@ uint32_t wallc_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -WRITE8_MEMBER(wallc_state::wallc_coin_counter_w) +void wallc_state::wallc_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 2); } -WRITE8_MEMBER(wallc_state::unkitpkr_out0_w) +void wallc_state::unkitpkr_out0_w(uint8_t data) { } -WRITE8_MEMBER(wallc_state::unkitpkr_out1_w) +void wallc_state::unkitpkr_out1_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, BIT(data, 4)); } -WRITE8_MEMBER(wallc_state::unkitpkr_out2_w) +void wallc_state::unkitpkr_out2_w(uint8_t data) { if (m_bookkeeping_mode != BIT(data, 0)) { diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp index 5c04a0b4299..c8a02e3554e 100644 --- a/src/mame/drivers/wangpc.cpp +++ b/src/mame/drivers/wangpc.cpp @@ -122,45 +122,45 @@ private: void update_fdc_drq(); void update_fdc_tc(); - DECLARE_WRITE8_MEMBER( fdc_ctrl_w ); - DECLARE_READ8_MEMBER( deselect_drive1_r ); - DECLARE_WRITE8_MEMBER( deselect_drive1_w ); - DECLARE_READ8_MEMBER( select_drive1_r ); - DECLARE_WRITE8_MEMBER( select_drive1_w ); - DECLARE_READ8_MEMBER( deselect_drive2_r ); - DECLARE_WRITE8_MEMBER( deselect_drive2_w ); - DECLARE_READ8_MEMBER( select_drive2_r ); - DECLARE_WRITE8_MEMBER( select_drive2_w ); - DECLARE_READ8_MEMBER( motor1_off_r ); - DECLARE_WRITE8_MEMBER( motor1_off_w ); - DECLARE_READ8_MEMBER( motor1_on_r ); - DECLARE_WRITE8_MEMBER( motor1_on_w ); - DECLARE_READ8_MEMBER( motor2_off_r ); - DECLARE_WRITE8_MEMBER( motor2_off_w ); - DECLARE_READ8_MEMBER( motor2_on_r ); - DECLARE_WRITE8_MEMBER( motor2_on_w ); - DECLARE_READ8_MEMBER( fdc_reset_r ); - DECLARE_WRITE8_MEMBER( fdc_reset_w ); - DECLARE_READ8_MEMBER( fdc_tc_r ); - DECLARE_WRITE8_MEMBER( fdc_tc_w ); - DECLARE_WRITE8_MEMBER( dma_page_w ); - DECLARE_READ8_MEMBER( status_r ); - DECLARE_WRITE8_MEMBER( timer0_irq_clr_w ); - DECLARE_READ8_MEMBER( timer2_irq_clr_r ); - DECLARE_WRITE8_MEMBER( nmi_mask_w ); - DECLARE_READ8_MEMBER( led_on_r ); - DECLARE_WRITE8_MEMBER( fpu_mask_w ); - DECLARE_READ8_MEMBER( dma_eop_clr_r ); - DECLARE_WRITE8_MEMBER( uart_tbre_clr_w ); - DECLARE_READ8_MEMBER( uart_r ); - DECLARE_WRITE8_MEMBER( uart_w ); - DECLARE_READ8_MEMBER( centronics_r ); - DECLARE_WRITE8_MEMBER( centronics_w ); - DECLARE_READ8_MEMBER( busy_clr_r ); - DECLARE_WRITE8_MEMBER( acknlg_clr_w ); - DECLARE_READ8_MEMBER( led_off_r ); - DECLARE_WRITE8_MEMBER( parity_nmi_clr_w ); - DECLARE_READ8_MEMBER( option_id_r ); + void fdc_ctrl_w(uint8_t data); + uint8_t deselect_drive1_r(); + void deselect_drive1_w(uint8_t data); + uint8_t select_drive1_r(); + void select_drive1_w(uint8_t data); + uint8_t deselect_drive2_r(); + void deselect_drive2_w(uint8_t data); + uint8_t select_drive2_r(); + void select_drive2_w(uint8_t data); + uint8_t motor1_off_r(); + void motor1_off_w(uint8_t data); + uint8_t motor1_on_r(); + void motor1_on_w(uint8_t data); + uint8_t motor2_off_r(); + void motor2_off_w(uint8_t data); + uint8_t motor2_on_r(); + void motor2_on_w(uint8_t data); + uint8_t fdc_reset_r(); + void fdc_reset_w(uint8_t data); + uint8_t fdc_tc_r(); + void fdc_tc_w(uint8_t data); + void dma_page_w(offs_t offset, uint8_t data); + uint8_t status_r(); + void timer0_irq_clr_w(uint8_t data); + uint8_t timer2_irq_clr_r(); + void nmi_mask_w(uint8_t data); + uint8_t led_on_r(); + void fpu_mask_w(uint8_t data); + uint8_t dma_eop_clr_r(); + void uart_tbre_clr_w(uint8_t data); + uint8_t uart_r(); + void uart_w(uint8_t data); + uint8_t centronics_r(); + void centronics_w(uint8_t data); + uint8_t busy_clr_r(); + void acknlg_clr_w(uint8_t data); + uint8_t led_off_r(); + void parity_nmi_clr_w(uint8_t data); + uint8_t option_id_r(); DECLARE_WRITE_LINE_MEMBER( hrq_w ); DECLARE_WRITE_LINE_MEMBER( eop_w ); @@ -250,7 +250,7 @@ void wangpc_state::select_drive() m_fdc->set_floppy(floppy); } -WRITE8_MEMBER( wangpc_state::fdc_ctrl_w ) +void wangpc_state::fdc_ctrl_w(uint8_t data) { /* @@ -284,7 +284,7 @@ WRITE8_MEMBER( wangpc_state::fdc_ctrl_w ) } -READ8_MEMBER( wangpc_state::deselect_drive1_r ) +uint8_t wangpc_state::deselect_drive1_r() { m_ds1 = false; select_drive(); @@ -292,12 +292,12 @@ READ8_MEMBER( wangpc_state::deselect_drive1_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::deselect_drive1_w ) +void wangpc_state::deselect_drive1_w(uint8_t data) { - deselect_drive1_r(space, offset); + deselect_drive1_r(); } -READ8_MEMBER( wangpc_state::select_drive1_r ) +uint8_t wangpc_state::select_drive1_r() { m_ds1 = true; select_drive(); @@ -305,12 +305,12 @@ READ8_MEMBER( wangpc_state::select_drive1_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::select_drive1_w ) +void wangpc_state::select_drive1_w(uint8_t data) { - select_drive1_r(space, offset); + select_drive1_r(); } -READ8_MEMBER( wangpc_state::deselect_drive2_r ) +uint8_t wangpc_state::deselect_drive2_r() { m_ds2 = false; select_drive(); @@ -318,12 +318,12 @@ READ8_MEMBER( wangpc_state::deselect_drive2_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::deselect_drive2_w ) +void wangpc_state::deselect_drive2_w(uint8_t data) { - deselect_drive2_r(space, offset); + deselect_drive2_r(); } -READ8_MEMBER( wangpc_state::select_drive2_r ) +uint8_t wangpc_state::select_drive2_r() { m_ds2 = true; select_drive(); @@ -331,12 +331,12 @@ READ8_MEMBER( wangpc_state::select_drive2_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::select_drive2_w ) +void wangpc_state::select_drive2_w(uint8_t data) { - select_drive2_r(space, offset); + select_drive2_r(); } -READ8_MEMBER( wangpc_state::motor1_off_r ) +uint8_t wangpc_state::motor1_off_r() { if (LOG) logerror("%s: Drive 1 motor OFF\n", machine().describe_context()); @@ -345,12 +345,12 @@ READ8_MEMBER( wangpc_state::motor1_off_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::motor1_off_w ) +void wangpc_state::motor1_off_w(uint8_t data) { - motor1_off_r(space, offset); + motor1_off_r(); } -READ8_MEMBER( wangpc_state::motor1_on_r ) +uint8_t wangpc_state::motor1_on_r() { if (LOG) logerror("%s: Drive 1 motor ON\n", machine().describe_context()); @@ -359,12 +359,12 @@ READ8_MEMBER( wangpc_state::motor1_on_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::motor1_on_w ) +void wangpc_state::motor1_on_w(uint8_t data) { - motor1_on_r(space, offset); + motor1_on_r(); } -READ8_MEMBER( wangpc_state::motor2_off_r ) +uint8_t wangpc_state::motor2_off_r() { if (LOG) logerror("%s: Drive 2 motor OFF\n", machine().describe_context()); @@ -373,12 +373,12 @@ READ8_MEMBER( wangpc_state::motor2_off_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::motor2_off_w ) +void wangpc_state::motor2_off_w(uint8_t data) { - motor2_off_r(space, offset); + motor2_off_r(); } -READ8_MEMBER( wangpc_state::motor2_on_r ) +uint8_t wangpc_state::motor2_on_r() { if (LOG) logerror("%s: Drive 2 motor ON\n", machine().describe_context()); @@ -387,12 +387,12 @@ READ8_MEMBER( wangpc_state::motor2_on_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::motor2_on_w ) +void wangpc_state::motor2_on_w(uint8_t data) { - motor2_on_r(space, offset); + motor2_on_r(); } -READ8_MEMBER( wangpc_state::fdc_reset_r ) +uint8_t wangpc_state::fdc_reset_r() { if (LOG) logerror("%s: FDC reset\n", machine().describe_context()); @@ -401,12 +401,12 @@ READ8_MEMBER( wangpc_state::fdc_reset_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::fdc_reset_w ) +void wangpc_state::fdc_reset_w(uint8_t data) { - fdc_reset_r(space, offset); + fdc_reset_r(); } -READ8_MEMBER( wangpc_state::fdc_tc_r ) +uint8_t wangpc_state::fdc_tc_r() { if (LOG) logerror("%s: FDC TC\n", machine().describe_context()); @@ -416,9 +416,9 @@ READ8_MEMBER( wangpc_state::fdc_tc_r ) return 0xff; } -WRITE8_MEMBER( wangpc_state::fdc_tc_w ) +void wangpc_state::fdc_tc_w(uint8_t data) { - fdc_tc_r(space, offset); + fdc_tc_r(); } @@ -426,7 +426,7 @@ WRITE8_MEMBER( wangpc_state::fdc_tc_w ) // dma_page_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::dma_page_w ) +void wangpc_state::dma_page_w(offs_t offset, uint8_t data) { if (LOG) logerror("%s: DMA page %u: %06x\n", machine().describe_context(), offset + 1, (data & 0x0f) << 16); @@ -438,7 +438,7 @@ WRITE8_MEMBER( wangpc_state::dma_page_w ) // status_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::status_r ) +uint8_t wangpc_state::status_r() { /* @@ -472,7 +472,7 @@ READ8_MEMBER( wangpc_state::status_r ) // timer0_int_clr_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::timer0_irq_clr_w ) +void wangpc_state::timer0_irq_clr_w(uint8_t data) { //if (LOG) logerror("%s: Timer 0 IRQ clear\n", machine().describe_context()); @@ -484,7 +484,7 @@ WRITE8_MEMBER( wangpc_state::timer0_irq_clr_w ) // timer2_irq_clr_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::timer2_irq_clr_r ) +uint8_t wangpc_state::timer2_irq_clr_r() { //if (LOG) logerror("%s: Timer 2 IRQ clear\n", machine().describe_context()); @@ -499,7 +499,7 @@ READ8_MEMBER( wangpc_state::timer2_irq_clr_r ) // nmi_mask_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::nmi_mask_w ) +void wangpc_state::nmi_mask_w(uint8_t data) { if (LOG) logerror("%s: NMI mask %02x\n", machine().describe_context(), data); } @@ -509,7 +509,7 @@ WRITE8_MEMBER( wangpc_state::nmi_mask_w ) // led_on_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::led_on_r ) +uint8_t wangpc_state::led_on_r() { if (LOG) logerror("%s: Diagnostic LED on\n", machine().describe_context()); @@ -523,7 +523,7 @@ READ8_MEMBER( wangpc_state::led_on_r ) // fpu_mask_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::fpu_mask_w ) +void wangpc_state::fpu_mask_w(uint8_t data) { if (LOG) logerror("%s: FPU mask %02x\n", machine().describe_context(), data); } @@ -533,7 +533,7 @@ WRITE8_MEMBER( wangpc_state::fpu_mask_w ) // dma_eop_clr_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::dma_eop_clr_r ) +uint8_t wangpc_state::dma_eop_clr_r() { if (LOG) logerror("%s: EOP clear\n", machine().describe_context()); @@ -549,7 +549,7 @@ READ8_MEMBER( wangpc_state::dma_eop_clr_r ) // uart_tbre_clr_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::uart_tbre_clr_w ) +void wangpc_state::uart_tbre_clr_w(uint8_t data) { if (LOG) logerror("%s: TBRE clear\n", machine().describe_context()); @@ -563,7 +563,7 @@ WRITE8_MEMBER( wangpc_state::uart_tbre_clr_w ) // uart_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::uart_r ) +uint8_t wangpc_state::uart_r() { m_uart_dr = 0; @@ -581,7 +581,7 @@ READ8_MEMBER( wangpc_state::uart_r ) // uart_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::uart_w ) +void wangpc_state::uart_w(uint8_t data) { if (LOG) logerror("%s: UART write %02x\n", machine().describe_context(), data); @@ -616,7 +616,7 @@ WRITE8_MEMBER( wangpc_state::uart_w ) // centronics_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::centronics_r ) +uint8_t wangpc_state::centronics_r() { m_dav = 1; check_level1_interrupts(); @@ -629,7 +629,7 @@ READ8_MEMBER( wangpc_state::centronics_r ) // centronics_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::centronics_w ) +void wangpc_state::centronics_w(uint8_t data) { m_centronics_ack = 1; check_level1_interrupts(); @@ -645,7 +645,7 @@ WRITE8_MEMBER( wangpc_state::centronics_w ) // busy_clr_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::busy_clr_r ) +uint8_t wangpc_state::busy_clr_r() { if (LOG) logerror("%s: BUSY clear\n", machine().describe_context()); @@ -660,7 +660,7 @@ READ8_MEMBER( wangpc_state::busy_clr_r ) // acknlg_clr_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::acknlg_clr_w ) +void wangpc_state::acknlg_clr_w(uint8_t data) { if (LOG) logerror("%s: ACKNLG clear\n", machine().describe_context()); @@ -673,7 +673,7 @@ WRITE8_MEMBER( wangpc_state::acknlg_clr_w ) // led_off_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::led_off_r ) +uint8_t wangpc_state::led_off_r() { if (LOG) logerror("%s: Diagnostic LED off\n", machine().describe_context()); @@ -687,7 +687,7 @@ READ8_MEMBER( wangpc_state::led_off_r ) // parity_nmi_clr_w - //------------------------------------------------- -WRITE8_MEMBER( wangpc_state::parity_nmi_clr_w ) +void wangpc_state::parity_nmi_clr_w(uint8_t data) { if (LOG) logerror("%s: Parity NMI clear\n", machine().describe_context()); } @@ -697,7 +697,7 @@ WRITE8_MEMBER( wangpc_state::parity_nmi_clr_w ) // option_id_r - //------------------------------------------------- -READ8_MEMBER( wangpc_state::option_id_r ) +uint8_t wangpc_state::option_id_r() { /* diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index 95efd91bf72..bc94e9abfa1 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -158,7 +158,7 @@ protected: private: required_device<address_map_bank_device> m_membank; - DECLARE_WRITE8_MEMBER(wardner_bank_w); + void wardner_bank_w(uint8_t data); void dsp_io_map(address_map &map); void dsp_program_map(address_map &map); @@ -172,7 +172,7 @@ private: /***************************** Z80 Main Memory Map **************************/ -WRITE8_MEMBER(wardner_state::wardner_bank_w) +void wardner_state::wardner_bank_w(uint8_t data) { m_membank->set_bank(data & 7); } diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index 36416f9d642..53c6360c58d 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -115,8 +115,8 @@ private: tilemap_t *m_starfield_tilemap; uint8_t m_regs[0x28]; - DECLARE_WRITE8_MEMBER(hardware_w); - DECLARE_WRITE8_MEMBER(vidram_w); + void hardware_w(offs_t offset, uint8_t data); + void vidram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_starfield_tile_info); @@ -130,7 +130,7 @@ private: void warpspeed_map(address_map &map); }; -WRITE8_MEMBER(warpspeed_state::hardware_w) +void warpspeed_state::hardware_w(offs_t offset, uint8_t data) { m_regs[offset] = data; } @@ -151,7 +151,7 @@ TILE_GET_INFO_MEMBER(warpspeed_state::get_starfield_tile_info) tileinfo.set(1, code, 0, 0); } -WRITE8_MEMBER(warpspeed_state::vidram_w) +void warpspeed_state::vidram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_text_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index aaafc6179fa..0a462c9f937 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -248,13 +248,11 @@ private: } return 0; } - DECLARE_WRITE16_MEMBER(wheelfir_scanline_cnt_w); - DECLARE_WRITE16_MEMBER(wheelfir_blit_w); - DECLARE_WRITE16_MEMBER(wheelfir_7c0000_w); - DECLARE_READ16_MEMBER(wheelfir_7c0000_r); - DECLARE_WRITE16_MEMBER(wheelfir_snd_w); - DECLARE_READ16_MEMBER(wheelfir_snd_r); - DECLARE_WRITE16_MEMBER(coin_cnt_w); + void wheelfir_scanline_cnt_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wheelfir_blit_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wheelfir_7c0000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t wheelfir_7c0000_r(offs_t offset, uint16_t mem_mask = ~0); + void coin_cnt_w(uint16_t data); DECLARE_WRITE_LINE_MEMBER(adc_eoc_w); uint32_t screen_update_wheelfir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_wheelfir); @@ -266,13 +264,13 @@ private: }; -WRITE16_MEMBER(wheelfir_state::wheelfir_scanline_cnt_w) +void wheelfir_state::wheelfir_scanline_cnt_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_scanline_cnt); } -WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) +void wheelfir_state::wheelfir_blit_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_blitter_data[offset]); @@ -535,7 +533,7 @@ WRITE_LINE_MEMBER(wheelfir_state::screen_vblank_wheelfir) } -WRITE16_MEMBER(wheelfir_state::wheelfir_7c0000_w) +void wheelfir_state::wheelfir_7c0000_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_8_15) { @@ -554,7 +552,7 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_7c0000_w) } } -READ16_MEMBER(wheelfir_state::wheelfir_7c0000_r) +uint16_t wheelfir_state::wheelfir_7c0000_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0; @@ -573,7 +571,7 @@ READ16_MEMBER(wheelfir_state::wheelfir_7c0000_r) return data; } -WRITE16_MEMBER(wheelfir_state::coin_cnt_w) +void wheelfir_state::coin_cnt_w(uint16_t data) { /* bits 0/1 coin counters */ machine().bookkeeping().coin_counter_w(0, data & 0x01); diff --git a/src/mame/drivers/whitestar.cpp b/src/mame/drivers/whitestar.cpp index 22e687d854c..948093f1b8d 100644 --- a/src/mame/drivers/whitestar.cpp +++ b/src/mame/drivers/whitestar.cpp @@ -31,11 +31,11 @@ private: optional_device<decobsmt_device> m_decobsmt; required_device<decodmd_type2_device> m_decodmd; - DECLARE_WRITE8_MEMBER(bank_w); - DECLARE_WRITE8_MEMBER(dmddata_w); + void bank_w(uint8_t data); + void dmddata_w(uint8_t data); - DECLARE_READ8_MEMBER(switch_r); - DECLARE_WRITE8_MEMBER(switch_w); + uint8_t switch_r(); + void switch_w(uint8_t data); virtual void machine_start() override; INTERRUPT_GEN_MEMBER(whitestar_firq_interrupt); @@ -95,22 +95,22 @@ void whitestar_state::whitestarm_map(address_map &map) // TODO: sound writes } -READ8_MEMBER(whitestar_state::switch_r) +uint8_t whitestar_state::switch_r() { return 0; } -WRITE8_MEMBER(whitestar_state::switch_w) +void whitestar_state::switch_w(uint8_t data) { } -WRITE8_MEMBER(whitestar_state::bank_w) +void whitestar_state::bank_w(uint8_t data) { membank("bank1")->set_entry(data & 0x1f); } // Whitestar automatically pulses the DMD IRQ line? DE hardware doesn't do that... -WRITE8_MEMBER(whitestar_state::dmddata_w) +void whitestar_state::dmddata_w(uint8_t data) { m_decodmd->data_w(data); m_decodmd->ctrl_w(1); diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index eb39e74398c..7c273fc5b04 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -65,30 +65,30 @@ public: void wicat(machine_config &config); private: - DECLARE_READ16_MEMBER(invalid_r); - DECLARE_WRITE16_MEMBER(invalid_w); - DECLARE_READ16_MEMBER(memmap_r); - DECLARE_WRITE16_MEMBER(memmap_w); + uint16_t invalid_r(offs_t offset); + void invalid_w(offs_t offset, uint16_t data); + uint16_t memmap_r(); + void memmap_w(uint16_t data); DECLARE_WRITE_LINE_MEMBER(adir_w); DECLARE_WRITE_LINE_MEMBER(bdir_w); void via_a_w(uint8_t data); void via_b_w(uint8_t data); - DECLARE_WRITE8_MEMBER(videosram_store_w); - DECLARE_WRITE8_MEMBER(videosram_recall_w); - DECLARE_READ8_MEMBER(video_timer_r); - DECLARE_WRITE8_MEMBER(video_timer_w); + void videosram_store_w(uint8_t data); + void videosram_recall_w(uint8_t data); + uint8_t video_timer_r(offs_t offset); + void video_timer_w(offs_t offset, uint8_t data); uint8_t vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(video_status_r); + uint8_t video_status_r(); DECLARE_WRITE_LINE_MEMBER(dma_hrq_w); DECLARE_WRITE_LINE_MEMBER(crtc_irq_w); DECLARE_WRITE_LINE_MEMBER(crtc_irq_clear_w); - DECLARE_READ8_MEMBER(hdc_r); - DECLARE_WRITE8_MEMBER(hdc_w); - DECLARE_READ8_MEMBER(fdc_r); - DECLARE_WRITE8_MEMBER(fdc_w); - DECLARE_READ16_MEMBER(via_r); - DECLARE_WRITE16_MEMBER(via_w); + uint8_t hdc_r(offs_t offset); + void hdc_w(offs_t offset, uint8_t data); + uint8_t fdc_r(offs_t offset); + void fdc_w(offs_t offset, uint8_t data); + uint16_t via_r(offs_t offset, uint16_t mem_mask = ~0); + void via_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); I8275_DRAW_CHARACTER_MEMBER(wicat_display_pixels); required_device<m68000_device> m_maincpu; @@ -378,7 +378,7 @@ void wicat_state::via_b_w(uint8_t data) logerror("VIA: write %02x to port B\n",data); } -READ16_MEMBER( wicat_state::invalid_r ) +uint16_t wicat_state::invalid_r(offs_t offset) { if(!machine().side_effects_disabled()) { @@ -389,7 +389,7 @@ READ16_MEMBER( wicat_state::invalid_r ) return 0xff; } -WRITE16_MEMBER( wicat_state::invalid_w ) +void wicat_state::invalid_w(offs_t offset, uint16_t data) { if(!machine().side_effects_disabled()) { @@ -400,20 +400,20 @@ WRITE16_MEMBER( wicat_state::invalid_w ) } // TODO -READ16_MEMBER(wicat_state::memmap_r) +uint16_t wicat_state::memmap_r() { popmessage("Memory mapping register EFFC01 read!"); return 0xff; } -WRITE16_MEMBER(wicat_state::memmap_w) +void wicat_state::memmap_w(uint16_t data) { popmessage("Memory mapping register EFFC01 written!"); } // WD1000 Winchester Disk controller (10MB 5 1/4" HD) // for now, we'll just try to tell the system there is no HD -READ8_MEMBER(wicat_state::hdc_r) +uint8_t wicat_state::hdc_r(offs_t offset) { switch(offset) { @@ -425,7 +425,7 @@ READ8_MEMBER(wicat_state::hdc_r) return 0x00; } -WRITE8_MEMBER(wicat_state::hdc_w) +void wicat_state::hdc_w(offs_t offset, uint8_t data) { switch(offset) { @@ -471,7 +471,7 @@ WRITE8_MEMBER(wicat_state::hdc_w) } } -READ8_MEMBER(wicat_state::fdc_r) +uint8_t wicat_state::fdc_r(offs_t offset) { uint8_t ret = 0x00; @@ -497,7 +497,7 @@ READ8_MEMBER(wicat_state::fdc_r) return ret; } -WRITE8_MEMBER(wicat_state::fdc_w) +void wicat_state::fdc_w(offs_t offset, uint8_t data) { popmessage("FDC: write offset %02x data %02x",offset,data); switch(offset) @@ -520,14 +520,14 @@ WRITE8_MEMBER(wicat_state::fdc_w) } } -READ16_MEMBER(wicat_state::via_r) +uint16_t wicat_state::via_r(offs_t offset, uint16_t mem_mask) { if(ACCESSING_BITS_0_7) return m_via->read(offset); return 0x00; } -WRITE16_MEMBER(wicat_state::via_w) +void wicat_state::via_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if(ACCESSING_BITS_0_7) m_via->write(offset,data); @@ -545,7 +545,7 @@ void wicat_state::vram_w(offs_t offset, uint8_t data) m_videocpu->space(AS_IO).write_byte(offset*2,data); } -WRITE8_MEMBER(wicat_state::videosram_store_w) +void wicat_state::videosram_store_w(uint8_t data) { if(data & 0x01) // unsure of the actual bit checked, the terminal code just writes 0xff { @@ -555,7 +555,7 @@ WRITE8_MEMBER(wicat_state::videosram_store_w) } } -WRITE8_MEMBER(wicat_state::videosram_recall_w) +void wicat_state::videosram_recall_w(uint8_t data) { if(data & 0x01) // unsure of the actual bit checked, the terminal code just writes 0xff { @@ -565,7 +565,7 @@ WRITE8_MEMBER(wicat_state::videosram_recall_w) } } -READ8_MEMBER(wicat_state::video_timer_r) +uint8_t wicat_state::video_timer_r(offs_t offset) { uint8_t ret = 0x00; @@ -583,14 +583,14 @@ READ8_MEMBER(wicat_state::video_timer_r) return ret; } -WRITE8_MEMBER(wicat_state::video_timer_w) +void wicat_state::video_timer_w(offs_t offset, uint8_t data) { logerror("I/O port 0x%04x write %02x\n",offset,data); if(offset == 0x01) m_videouart->write(data); } -READ8_MEMBER(wicat_state::video_status_r) +uint8_t wicat_state::video_status_r() { // this port is read in the NVI IRQ routine, which if bit 2 is set, will unmask DMA channel 0. But no idea what triggers it... return m_crtc_irq ? 0x04 : 0x00; diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index 71377155aaa..6a259b065d3 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -63,17 +63,17 @@ public: void wico(machine_config &config); private: - DECLARE_READ8_MEMBER(lampst_r); - DECLARE_READ8_MEMBER(switch_r); - DECLARE_WRITE8_MEMBER(muxen_w); - DECLARE_WRITE8_MEMBER(muxld_w); - DECLARE_WRITE8_MEMBER(csols_w); - DECLARE_WRITE8_MEMBER(msols_w); - DECLARE_WRITE8_MEMBER(dled0_w); - DECLARE_WRITE8_MEMBER(dled1_w); - DECLARE_WRITE8_MEMBER(zcres_w); - DECLARE_WRITE8_MEMBER(wdogcl_w); - DECLARE_READ8_MEMBER(gentmrcl_r); + uint8_t lampst_r(); + uint8_t switch_r(offs_t offset); + void muxen_w(uint8_t data); + void muxld_w(uint8_t data); + void csols_w(uint8_t data); + void msols_w(uint8_t data); + void dled0_w(uint8_t data); + void dled1_w(uint8_t data); + void zcres_w(uint8_t data); + void wdogcl_w(uint8_t data); + uint8_t gentmrcl_r(); TIMER_DEVICE_CALLBACK_MEMBER(irq_housekeeping); TIMER_DEVICE_CALLBACK_MEMBER(firq_housekeeping); void ccpu_map(address_map &map); @@ -315,29 +315,29 @@ static INPUT_PORTS_START( wico ) INPUT_PORTS_END // diagnostic display off -WRITE8_MEMBER( wico_state::dled0_w ) +void wico_state::dled0_w(uint8_t data) { m_diag_on = 0; m_digits[9] = 0; } // diagnostic display on -WRITE8_MEMBER( wico_state::dled1_w ) +void wico_state::dled1_w(uint8_t data) { m_diag_on = 1; m_digits[9] = m_diag_segments; } -WRITE8_MEMBER( wico_state::csols_w ) +void wico_state::csols_w(uint8_t data) { } -WRITE8_MEMBER( wico_state::msols_w ) +void wico_state::msols_w(uint8_t data) { } // write to diagnostic display -WRITE8_MEMBER( wico_state::muxen_w ) +void wico_state::muxen_w(uint8_t data) { static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x77, 0x7c, 0x39, 0x5e, 0x79, 0x71 }; // MC14495 @@ -352,25 +352,25 @@ WRITE8_MEMBER( wico_state::muxen_w ) } // reset digit/scan counter -WRITE8_MEMBER( wico_state::muxld_w ) +void wico_state::muxld_w(uint8_t data) { } // enable zero-crossing interrupt -WRITE8_MEMBER( wico_state::zcres_w ) +void wico_state::zcres_w(uint8_t data) { m_zcen = 1; } // enable firq -READ8_MEMBER( wico_state::gentmrcl_r ) +uint8_t wico_state::gentmrcl_r() { m_gten = 1; return 0xff; } // read a switch row -READ8_MEMBER( wico_state::switch_r ) +uint8_t wico_state::switch_r(offs_t offset) { char kbdrow[8]; offset = m_shared_ram[0x95]; @@ -388,7 +388,7 @@ READ8_MEMBER( wico_state::switch_r ) } // write digits in main display -READ8_MEMBER( wico_state::lampst_r ) +uint8_t wico_state::lampst_r() { int i, j; for (i = 0; i < 5; i++) @@ -403,7 +403,7 @@ READ8_MEMBER( wico_state::lampst_r ) } // reset watchdog and enable housekeeping cpu -WRITE8_MEMBER( wico_state::wdogcl_w ) +void wico_state::wdogcl_w(uint8_t data) { m_hcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); } diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp index a5f75a822f6..9f77a554c81 100644 --- a/src/mame/drivers/wildpkr.cpp +++ b/src/mame/drivers/wildpkr.cpp @@ -213,17 +213,17 @@ private: u16 m_clock_rate; void wildpkr_palette(palette_device &palette) const; - DECLARE_READ8_MEMBER(unknown_read8); - DECLARE_WRITE8_MEMBER(unknown_write8); - DECLARE_WRITE16_MEMBER(nvram_w); - DECLARE_READ16_MEMBER(id_serial_r); - DECLARE_WRITE16_MEMBER(id_serial_w); - DECLARE_WRITE16_MEMBER(out0_w); - DECLARE_WRITE16_MEMBER(out1_w); - DECLARE_WRITE8_MEMBER(dac_w); - DECLARE_WRITE16_MEMBER(clock_start_w); - DECLARE_WRITE16_MEMBER(clock_rate_w); - DECLARE_WRITE16_MEMBER(unknown_trigger_w); + u8 unknown_read8(); + void unknown_write8(u8 data); + void nvram_w(offs_t offset, u16 data); + u16 id_serial_r(); + void id_serial_w(u16 data); + void out0_w(u16 data); + void out1_w(u16 data); + void dac_w(u8 data); + void clock_start_w(u16 data); + void clock_rate_w(u16 data); + void unknown_trigger_w(u16 data); u16 tabpkr_irq_ack(offs_t offset); void cpu_space_map(address_map &map); void hd63484_map(address_map &map); @@ -255,44 +255,44 @@ void wildpkr_state::wildpkr_palette(palette_device &palette) const * Misc Handlers * *************************/ -READ8_MEMBER(wildpkr_state::unknown_read8) +u8 wildpkr_state::unknown_read8() { return 0xff; } -WRITE8_MEMBER(wildpkr_state::unknown_write8) +void wildpkr_state::unknown_write8(u8 data) { } -WRITE16_MEMBER(wildpkr_state::nvram_w) +void wildpkr_state::nvram_w(offs_t offset, u16 data) { m_nvram[offset] = data | 0xff00; } -READ16_MEMBER(wildpkr_state::id_serial_r) +u16 wildpkr_state::id_serial_r() { return m_id->read(); } -WRITE16_MEMBER(wildpkr_state::id_serial_w) +void wildpkr_state::id_serial_w(u16 data) { m_id->write(data & 1); } -WRITE16_MEMBER(wildpkr_state::out0_w) +void wildpkr_state::out0_w(u16 data) { } -WRITE16_MEMBER(wildpkr_state::out1_w) +void wildpkr_state::out1_w(u16 data) { } -WRITE8_MEMBER(wildpkr_state::dac_w) +void wildpkr_state::dac_w(u8 data) { m_dac->write(data); } -WRITE16_MEMBER(wildpkr_state::clock_start_w) +void wildpkr_state::clock_start_w(u16 data) { if (data != 0 && m_clock_rate != 0) m_dac_clock->set_clock_scale(1.0 / m_clock_rate); @@ -300,12 +300,12 @@ WRITE16_MEMBER(wildpkr_state::clock_start_w) m_dac_clock->set_clock_scale(0.0); } -WRITE16_MEMBER(wildpkr_state::clock_rate_w) +void wildpkr_state::clock_rate_w(u16 data) { m_clock_rate = data; } -WRITE16_MEMBER(wildpkr_state::unknown_trigger_w) +void wildpkr_state::unknown_trigger_w(u16 data) { } diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 8620839d388..95b42890ecc 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -52,17 +52,17 @@ private: bool m_nmi_enable; - DECLARE_WRITE8_MEMBER(bgram_w); + void bgram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(nmi_clock_w); DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); DECLARE_WRITE_LINE_MEMBER(player_mux_w); DECLARE_WRITE_LINE_MEMBER(tile_banking_w); template<int Player> DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_READ8_MEMBER(analog_port_r); - DECLARE_READ8_MEMBER(player_inputs_r); - DECLARE_WRITE8_MEMBER(sound_irq_w); - DECLARE_READ8_MEMBER(prot_r); - DECLARE_WRITE8_MEMBER(prot_w); + uint8_t analog_port_r(); + uint8_t player_inputs_r(); + void sound_irq_w(uint8_t data); + uint8_t prot_r(); + void prot_w(uint8_t data); uint8_t sound_r(); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -107,10 +107,9 @@ uint32_t wink_state::screen_update_wink(screen_device &screen, bitmap_ind16 &bit return 0; } -WRITE8_MEMBER(wink_state::bgram_w) +void wink_state::bgram_w(offs_t offset, uint8_t data) { - uint8_t *videoram = m_videoram; - videoram[offset] = data; + m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -145,17 +144,17 @@ WRITE_LINE_MEMBER(wink_state::coin_counter_w) machine().bookkeeping().coin_counter_w(Player, state); } -READ8_MEMBER(wink_state::analog_port_r) +uint8_t wink_state::analog_port_r() { return ioport(/* player_mux ? "DIAL2" : */ "DIAL1")->read(); } -READ8_MEMBER(wink_state::player_inputs_r) +uint8_t wink_state::player_inputs_r() { return ioport(/* player_mux ? "INPUTS2" : */ "INPUTS1")->read(); } -WRITE8_MEMBER(wink_state::sound_irq_w) +void wink_state::sound_irq_w(uint8_t data) { m_audiocpu->set_input_line(0, HOLD_LINE); //sync with sound cpu (but it still loses some soundlatches...) @@ -171,7 +170,7 @@ void wink_state::wink_map(address_map &map) } -READ8_MEMBER(wink_state::prot_r) +uint8_t wink_state::prot_r() { //take a0-a7 and do some math using the variable created from the upper address-lines, //put the result onto the databus. @@ -191,7 +190,7 @@ the 8bit result is placed on the databus. return 0x20; //hack to pass the jump calculated using this value } -WRITE8_MEMBER(wink_state::prot_w) +void wink_state::prot_w(uint8_t data) { //take a9-a15 and stuff them in a variable for later use. } diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp index b06a92ef97b..369a81ccc2f 100644 --- a/src/mame/drivers/wms.cpp +++ b/src/mame/drivers/wms.cpp @@ -103,7 +103,7 @@ public: void init_wms(); private: - DECLARE_READ8_MEMBER(test_r); + uint8_t test_r(); uint32_t screen_update_wms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void adsp_data_map(address_map &map); @@ -130,7 +130,7 @@ void wms_state::wms_map(address_map &map) map(0x60000, 0xfffff).rom().region("maincpu", 0x60000); // TODO: fix me } -READ8_MEMBER(wms_state::test_r) +uint8_t wms_state::test_r() { return 1; } diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp index 88d9706f205..30ea552fda9 100644 --- a/src/mame/drivers/wpc_95.cpp +++ b/src/mame/drivers/wpc_95.cpp @@ -49,16 +49,16 @@ public: void init_ttt(); private: - DECLARE_WRITE8_MEMBER(bank_w); - DECLARE_WRITE8_MEMBER(watchdog_w); - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(firq_src_r); - DECLARE_READ8_MEMBER(zc_r); - DECLARE_READ8_MEMBER(dcs_data_r); - DECLARE_WRITE8_MEMBER(dcs_data_w); - DECLARE_READ8_MEMBER(dcs_ctrl_r); - DECLARE_WRITE8_MEMBER(dcs_reset_w); - DECLARE_READ8_MEMBER(rtc_r); + void bank_w(uint8_t data); + void watchdog_w(uint8_t data); + void irq_ack_w(uint8_t data); + uint8_t firq_src_r(); + uint8_t zc_r(); + uint8_t dcs_data_r(); + void dcs_data_w(uint8_t data); + uint8_t dcs_ctrl_r(); + void dcs_reset_w(uint8_t data); + uint8_t rtc_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(scanline_irq); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); @@ -161,28 +161,28 @@ void wpc_95_state::wpc_95_map(address_map &map) map(0x8000, 0xffff).rom().region("maincpu", 0xf8000); } -READ8_MEMBER(wpc_95_state::dcs_data_r) +uint8_t wpc_95_state::dcs_data_r() { return dcs->data_r(); } -WRITE8_MEMBER(wpc_95_state::dcs_data_w) +void wpc_95_state::dcs_data_w(uint8_t data) { dcs->data_w(data); } -READ8_MEMBER(wpc_95_state::dcs_ctrl_r) +uint8_t wpc_95_state::dcs_ctrl_r() { return dcs->control_r(); } -WRITE8_MEMBER(wpc_95_state::dcs_reset_w) +void wpc_95_state::dcs_reset_w(uint8_t data) { dcs->reset_w(0); dcs->reset_w(1); } -READ8_MEMBER(wpc_95_state::rtc_r) +uint8_t wpc_95_state::rtc_r(offs_t offset) { system_time systime; machine().base_datetime(systime); @@ -204,12 +204,12 @@ READ8_MEMBER(wpc_95_state::rtc_r) } } -READ8_MEMBER(wpc_95_state::firq_src_r) +uint8_t wpc_95_state::firq_src_r() { return firq_src; } -READ8_MEMBER(wpc_95_state::zc_r) +uint8_t wpc_95_state::zc_r() { uint8_t res = zc; zc &= 0x7f; @@ -221,12 +221,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(wpc_95_state::zc_timer) zc |= 0x80; } -WRITE8_MEMBER(wpc_95_state::bank_w) +void wpc_95_state::bank_w(uint8_t data) { rombank->set_entry(data & 0x3f); } -WRITE8_MEMBER(wpc_95_state::watchdog_w) +void wpc_95_state::watchdog_w(uint8_t data) { } @@ -236,7 +236,7 @@ WRITE_LINE_MEMBER(wpc_95_state::scanline_irq) maincpu->set_input_line(1, state); } -WRITE8_MEMBER(wpc_95_state::irq_ack_w) +void wpc_95_state::irq_ack_w(uint8_t data) { maincpu->set_input_line(0, CLEAR_LINE); maincpu->set_input_line(1, CLEAR_LINE); diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index b08bd08a8f2..94325baa4e3 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -55,8 +55,8 @@ private: 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); @@ -288,12 +288,12 @@ void wpc_an_state::wpc_sound_s11_w(uint8_t data) } } -READ8_MEMBER(wpc_an_state::ram_r) +uint8_t wpc_an_state::ram_r(offs_t offset) { return m_ram[offset]; } -WRITE8_MEMBER(wpc_an_state::ram_w) +void wpc_an_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/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp index 3c14a1f7fe4..89e2510feb5 100644 --- a/src/mame/drivers/wpc_dcs.cpp +++ b/src/mame/drivers/wpc_dcs.cpp @@ -39,18 +39,18 @@ public: void init_afv(); private: - DECLARE_WRITE8_MEMBER(bank_w); - DECLARE_WRITE8_MEMBER(watchdog_w); - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(firq_src_r); - DECLARE_READ8_MEMBER(zc_r); - DECLARE_READ8_MEMBER(dcs_data_r); - DECLARE_WRITE8_MEMBER(dcs_data_w); - DECLARE_READ8_MEMBER(dcs_ctrl_r); - DECLARE_WRITE8_MEMBER(dcs_reset_w); - DECLARE_READ8_MEMBER(rtc_r); - DECLARE_READ8_MEMBER(switches_r); - DECLARE_WRITE8_MEMBER(switches_w); + void bank_w(uint8_t data); + void watchdog_w(uint8_t data); + void irq_ack_w(uint8_t data); + uint8_t firq_src_r(); + uint8_t zc_r(); + uint8_t dcs_data_r(); + void dcs_data_w(uint8_t data); + uint8_t dcs_ctrl_r(); + void dcs_reset_w(uint8_t data); + uint8_t rtc_r(offs_t offset); + uint8_t switches_r(); + void switches_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(scanline_irq); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); @@ -113,28 +113,28 @@ void wpc_dcs_state::wpc_dcs_map(address_map &map) map(0x8000, 0xffff).rom().region("maincpu", 0x78000); } -READ8_MEMBER(wpc_dcs_state::dcs_data_r) +uint8_t wpc_dcs_state::dcs_data_r() { return dcs->data_r(); } -WRITE8_MEMBER(wpc_dcs_state::dcs_data_w) +void wpc_dcs_state::dcs_data_w(uint8_t data) { dcs->data_w(data); } -READ8_MEMBER(wpc_dcs_state::dcs_ctrl_r) +uint8_t wpc_dcs_state::dcs_ctrl_r() { return dcs->control_r(); } -WRITE8_MEMBER(wpc_dcs_state::dcs_reset_w) +void wpc_dcs_state::dcs_reset_w(uint8_t data) { dcs->reset_w(0); dcs->reset_w(1); } -READ8_MEMBER(wpc_dcs_state::switches_r) +uint8_t wpc_dcs_state::switches_r() { uint8_t res = 0xff; for(int i=0; i<8; i++) @@ -143,12 +143,12 @@ READ8_MEMBER(wpc_dcs_state::switches_r) return res; } -WRITE8_MEMBER(wpc_dcs_state::switches_w) +void wpc_dcs_state::switches_w(uint8_t data) { switch_col = data; } -READ8_MEMBER(wpc_dcs_state::rtc_r) +uint8_t wpc_dcs_state::rtc_r(offs_t offset) { system_time systime; machine().base_datetime(systime); @@ -170,12 +170,12 @@ READ8_MEMBER(wpc_dcs_state::rtc_r) } } -READ8_MEMBER(wpc_dcs_state::firq_src_r) +uint8_t wpc_dcs_state::firq_src_r() { return firq_src; } -READ8_MEMBER(wpc_dcs_state::zc_r) +uint8_t wpc_dcs_state::zc_r() { uint8_t res = zc; zc &= 0x7f; @@ -187,12 +187,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(wpc_dcs_state::zc_timer) zc |= 0x80; } -WRITE8_MEMBER(wpc_dcs_state::bank_w) +void wpc_dcs_state::bank_w(uint8_t data) { rombank->set_entry(data & 0x1f); } -WRITE8_MEMBER(wpc_dcs_state::watchdog_w) +void wpc_dcs_state::watchdog_w(uint8_t data) { // Mhhh? Maybe it's not 3ff3, maybe it's going down by itself... maincpu->set_input_line(0, CLEAR_LINE); @@ -204,7 +204,7 @@ WRITE_LINE_MEMBER(wpc_dcs_state::scanline_irq) maincpu->set_input_line(1, state); } -WRITE8_MEMBER(wpc_dcs_state::irq_ack_w) +void wpc_dcs_state::irq_ack_w(uint8_t data) { maincpu->set_input_line(0, CLEAR_LINE); maincpu->set_input_line(1, CLEAR_LINE); diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp index ee081c96ce1..5984e40739e 100644 --- a/src/mame/drivers/wpc_s.cpp +++ b/src/mame/drivers/wpc_s.cpp @@ -44,16 +44,16 @@ public: void init_tfs(); private: - DECLARE_WRITE8_MEMBER(bank_w); - DECLARE_WRITE8_MEMBER(watchdog_w); - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(firq_src_r); - DECLARE_READ8_MEMBER(zc_r); - DECLARE_READ8_MEMBER(dcs_data_r); - DECLARE_WRITE8_MEMBER(dcs_data_w); - DECLARE_READ8_MEMBER(dcs_ctrl_r); - DECLARE_WRITE8_MEMBER(dcs_reset_w); - DECLARE_READ8_MEMBER(rtc_r); + void bank_w(uint8_t data); + void watchdog_w(uint8_t data); + void irq_ack_w(uint8_t data); + uint8_t firq_src_r(); + uint8_t zc_r(); + uint8_t dcs_data_r(); + void dcs_data_w(uint8_t data); + uint8_t dcs_ctrl_r(); + void dcs_reset_w(uint8_t data); + uint8_t rtc_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(scanline_irq); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); @@ -140,29 +140,29 @@ void wpc_s_state::wpc_s_map(address_map &map) map(0x8000, 0xffff).rom().region("maincpu", 0x78000); } -READ8_MEMBER(wpc_s_state::dcs_data_r) +uint8_t wpc_s_state::dcs_data_r() { return dcs->data_r(); } -WRITE8_MEMBER(wpc_s_state::dcs_data_w) +void wpc_s_state::dcs_data_w(uint8_t data) { dcs->data_w(data); } -READ8_MEMBER(wpc_s_state::dcs_ctrl_r) +uint8_t wpc_s_state::dcs_ctrl_r() { return dcs->control_r(); } -WRITE8_MEMBER(wpc_s_state::dcs_reset_w) +void wpc_s_state::dcs_reset_w(uint8_t data) { dcs->reset_w(0); dcs->reset_w(1); } -READ8_MEMBER(wpc_s_state::rtc_r) +uint8_t wpc_s_state::rtc_r(offs_t offset) { system_time systime; machine().base_datetime(systime); @@ -184,12 +184,12 @@ READ8_MEMBER(wpc_s_state::rtc_r) } } -READ8_MEMBER(wpc_s_state::firq_src_r) +uint8_t wpc_s_state::firq_src_r() { return firq_src; } -READ8_MEMBER(wpc_s_state::zc_r) +uint8_t wpc_s_state::zc_r() { uint8_t res = zc; zc &= 0x7f; @@ -201,12 +201,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(wpc_s_state::zc_timer) zc |= 0x80; } -WRITE8_MEMBER(wpc_s_state::bank_w) +void wpc_s_state::bank_w(uint8_t data) { rombank->set_entry(data & 0x1f); } -WRITE8_MEMBER(wpc_s_state::watchdog_w) +void wpc_s_state::watchdog_w(uint8_t data) { // Mhhh? Maybe it's not 3ff3, maybe it's going down by itself... maincpu->set_input_line(0, CLEAR_LINE); @@ -218,7 +218,7 @@ WRITE_LINE_MEMBER(wpc_s_state::scanline_irq) maincpu->set_input_line(1, state); } -WRITE8_MEMBER(wpc_s_state::irq_ack_w) +void wpc_s_state::irq_ack_w(uint8_t data) { maincpu->set_input_line(0, CLEAR_LINE); maincpu->set_input_line(1, CLEAR_LINE); diff --git a/src/mame/drivers/wxstar4000.cpp b/src/mame/drivers/wxstar4000.cpp index f81b5f68af5..dfa504814ce 100644 --- a/src/mame/drivers/wxstar4000.cpp +++ b/src/mame/drivers/wxstar4000.cpp @@ -106,7 +106,7 @@ private: optional_shared_ptr<uint16_t> m_mainram, m_extram, m_vram; required_device<icm7170_device> m_rtc; - DECLARE_READ16_MEMBER(buserr_r) + uint16_t buserr_r() { m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE); diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index 61c52b01ed9..56b724c5215 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -84,8 +84,8 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_WRITE8_MEMBER(bgram_w); - DECLARE_WRITE8_MEMBER(fgram_w); + void bgram_w(offs_t offset, uint8_t data); + void fgram_w(offs_t offset, uint8_t data); uint32_t screen_update_wyvernf0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, bool is_foreground ); @@ -95,14 +95,14 @@ private: uint8_t m_rombank; uint8_t m_rambank; - DECLARE_WRITE8_MEMBER(rambank_w); - DECLARE_WRITE8_MEMBER(rombank_w); - DECLARE_WRITE8_MEMBER(sound_command_w); - DECLARE_WRITE8_MEMBER(nmi_disable_w); - DECLARE_WRITE8_MEMBER(nmi_enable_w); + void rambank_w(uint8_t data); + void rombank_w(uint8_t data); + void sound_command_w(uint8_t data); + void nmi_disable_w(uint8_t data); + void nmi_enable_w(uint8_t data); TIMER_CALLBACK_MEMBER(nmi_callback); - DECLARE_READ8_MEMBER(mcu_status_r); + uint8_t mcu_status_r(); // devices required_device<cpu_device> m_maincpu; @@ -132,13 +132,13 @@ private: ***************************************************************************/ -WRITE8_MEMBER(wyvernf0_state::bgram_w) +void wyvernf0_state::bgram_w(offs_t offset, uint8_t data) { m_bgram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } -WRITE8_MEMBER(wyvernf0_state::fgram_w) +void wyvernf0_state::fgram_w(offs_t offset, uint8_t data) { m_fgram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset / 2); @@ -299,7 +299,7 @@ if (machine().input().code_pressed(KEYCODE_Z)) ***************************************************************************/ -READ8_MEMBER(wyvernf0_state::mcu_status_r) +uint8_t wyvernf0_state::mcu_status_r() { // bit 0 = when 1, MCU is ready to receive data from main CPU // bit 1 = when 1, MCU has sent data to the main CPU @@ -316,7 +316,7 @@ READ8_MEMBER(wyvernf0_state::mcu_status_r) ***************************************************************************/ // D100 -WRITE8_MEMBER(wyvernf0_state::rambank_w) +void wyvernf0_state::rambank_w(uint8_t data) { // bit 0 Flip X/Y // bit 1 Flip X/Y @@ -337,7 +337,7 @@ WRITE8_MEMBER(wyvernf0_state::rambank_w) } // D200 -WRITE8_MEMBER(wyvernf0_state::rombank_w) +void wyvernf0_state::rombank_w(uint8_t data) { // bit 0-2 ROM bank m_rombank = data; @@ -355,18 +355,18 @@ TIMER_CALLBACK_MEMBER(wyvernf0_state::nmi_callback) m_pending_nmi = 1; } -WRITE8_MEMBER(wyvernf0_state::sound_command_w) +void wyvernf0_state::sound_command_w(uint8_t data) { m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(wyvernf0_state::nmi_callback),this), data); } -WRITE8_MEMBER(wyvernf0_state::nmi_disable_w) +void wyvernf0_state::nmi_disable_w(uint8_t data) { m_sound_nmi_enable = 0; } -WRITE8_MEMBER(wyvernf0_state::nmi_enable_w) +void wyvernf0_state::nmi_enable_w(uint8_t data) { m_sound_nmi_enable = 1; if (m_pending_nmi) diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp index 91a7a11caf4..a1971a6f27f 100644 --- a/src/mame/drivers/xtheball.cpp +++ b/src/mame/drivers/xtheball.cpp @@ -52,8 +52,8 @@ private: required_ioport m_analog_y; DECLARE_WRITE_LINE_MEMBER(foreground_mode_w); - DECLARE_READ16_MEMBER(analogx_r); - DECLARE_READ16_MEMBER(analogy_watchdog_r); + uint16_t analogx_r(); + uint16_t analogy_watchdog_r(); virtual void machine_start() override; @@ -166,13 +166,13 @@ WRITE_LINE_MEMBER(xtheball_state::foreground_mode_w) * *************************************/ -READ16_MEMBER(xtheball_state::analogx_r) +uint16_t xtheball_state::analogx_r() { return (m_analog_x->read() << 8) | 0x00ff; } -READ16_MEMBER(xtheball_state::analogy_watchdog_r) +uint16_t xtheball_state::analogy_watchdog_r() { /* doubles as a watchdog address */ m_watchdog->watchdog_reset(); diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index 4f6e70ef612..80126638f8d 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -71,11 +71,11 @@ private: bool m_nmi_mask; DECLARE_WRITE_LINE_MEMBER(nmiclk_w); - DECLARE_WRITE8_MEMBER(irqack_w); - DECLARE_WRITE8_MEMBER(nmiack_w); - DECLARE_READ8_MEMBER(io_r); - DECLARE_WRITE8_MEMBER(io_w); - DECLARE_WRITE8_MEMBER(vidram_w); + void irqack_w(uint8_t data); + void nmiack_w(uint8_t data); + uint8_t io_r(); + void io_w(uint8_t data); + void vidram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void xyonix_palette(palette_device &palette) const; @@ -102,7 +102,7 @@ void xyonix_state::machine_reset() m_nmi_mask = false; } -WRITE8_MEMBER(xyonix_state::irqack_w) +void xyonix_state::irqack_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); } @@ -113,7 +113,7 @@ WRITE_LINE_MEMBER(xyonix_state::nmiclk_w) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE8_MEMBER(xyonix_state::nmiack_w) +void xyonix_state::nmiack_w(uint8_t data) { m_nmi_mask = BIT(data, 0); if (!m_nmi_mask) @@ -160,7 +160,7 @@ TILE_GET_INFO_MEMBER(xyonix_state::get_tile_info) tileinfo.set(0,tileno,attr >> 4,0); } -WRITE8_MEMBER(xyonix_state::vidram_w) +void xyonix_state::vidram_w(offs_t offset, uint8_t data) { m_vidram[offset] = data; m_tilemap->mark_tile_dirty((offset-1)&0x0fff); @@ -246,7 +246,7 @@ void xyonix_state::handle_coins(int coin) } -READ8_MEMBER(xyonix_state::io_r) +uint8_t xyonix_state::io_r() { int regPC = m_maincpu->pc(); @@ -297,7 +297,7 @@ READ8_MEMBER(xyonix_state::io_r) return 0xff; } -WRITE8_MEMBER(xyonix_state::io_w) +void xyonix_state::io_w(uint8_t data) { //logerror ("xyonix_port_e0_w %02x - PC = %04x\n", data, m_maincpu->pc()); m_e0_data = data; |