diff options
214 files changed, 1273 insertions, 1301 deletions
diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp index a18fcd2fc92..6b2704b5150 100644 --- a/src/devices/cpu/clipper/clipper.cpp +++ b/src/devices/cpu/clipper/clipper.cpp @@ -333,7 +333,7 @@ bool clipper_device::memory_translate(int spacenum, int intention, offs_t &addre return ((intention & TRANSLATE_TYPE_MASK) == TRANSLATE_FETCH ? get_icammu() : get_dcammu()).memory_translate(m_ssw, spacenum, intention, address); } -WRITE16_MEMBER(clipper_device::set_exception) +void clipper_device::set_exception(u16 data) { LOGMASKED(LOG_EXCEPTION, "external exception 0x%04x triggered\n", data); diff --git a/src/devices/cpu/clipper/clipper.h b/src/devices/cpu/clipper/clipper.h index 47d035ec3b0..3e78a5fdfff 100644 --- a/src/devices/cpu/clipper/clipper.h +++ b/src/devices/cpu/clipper/clipper.h @@ -18,8 +18,8 @@ class clipper_device : public cpu_device { public: - DECLARE_WRITE8_MEMBER(set_ivec) { m_ivec = data; } - DECLARE_WRITE16_MEMBER(set_exception); + void set_ivec(u8 data) { m_ivec = data; } + void set_exception(u16 data); // branch conditions (first description for comparison, second for move/logical) enum branch_conditions : u8 diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index 4e1e4ea8c6b..5c1028c01c1 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -243,7 +243,7 @@ WRITE_LINE_MEMBER(phi_device::ren_w) set_ext_signal(PHI_488_REN , state); } -WRITE8_MEMBER(phi_device::bus_dio_w) +void phi_device::bus_dio_w(uint8_t data) { update_pp(); } diff --git a/src/devices/machine/phi.h b/src/devices/machine/phi.h index 33def593315..dc3d0d76fd2 100644 --- a/src/devices/machine/phi.h +++ b/src/devices/machine/phi.h @@ -60,7 +60,7 @@ public: DECLARE_WRITE_LINE_MEMBER(atn_w); DECLARE_WRITE_LINE_MEMBER(ren_w); - DECLARE_WRITE8_MEMBER(bus_dio_w); + void bus_dio_w(uint8_t data); void set_ext_signal(phi_488_signal_t signal , int state); diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index d6970d34c53..b2c6f43e029 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -45,7 +45,7 @@ static const int scramble_timer[10] = 0x00, 0x10, 0x20, 0x30, 0x40, 0x90, 0xa0, 0xb0, 0xa0, 0xd0 }; -READ8_MEMBER( scramble_state::scramble_portB_r ) +uint8_t scramble_state::scramble_portB_r() { return scramble_timer[(m_audiocpu->total_cycles()/512) % 10]; } @@ -74,12 +74,12 @@ static const int frogger_timer[10] = 0x00, 0x10, 0x08, 0x18, 0x40, 0x90, 0x88, 0x98, 0x88, 0xd0 }; -READ8_MEMBER( scramble_state::hustler_portB_r ) +uint8_t scramble_state::hustler_portB_r() { return frogger_timer[(m_audiocpu->total_cycles()/512) % 10]; } -WRITE8_MEMBER( scramble_state::scramble_sh_irqtrigger_w ) +void scramble_state::scramble_sh_irqtrigger_w(uint8_t data) { /* the complement of bit 3 is connected to the flip-flop's clock */ m_konami_7474->clock_w((~data & 0x08) >> 3); @@ -88,7 +88,7 @@ WRITE8_MEMBER( scramble_state::scramble_sh_irqtrigger_w ) machine().sound().system_mute((data & 0x10) >> 4); } -WRITE8_MEMBER( scramble_state::mrkougar_sh_irqtrigger_w ) +void scramble_state::mrkougar_sh_irqtrigger_w(uint8_t data) { /* the complement of bit 3 is connected to the flip-flop's clock */ m_konami_7474->clock_w((~data & 0x08) >> 3); @@ -114,12 +114,12 @@ WRITE_LINE_MEMBER(scramble_state::scramble_sh_7474_q_callback) m_audiocpu->set_input_line(0, !state ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER(scramble_state::hotshock_sh_irqtrigger_w) +void scramble_state::hotshock_sh_irqtrigger_w(uint8_t data) { m_audiocpu->set_input_line(0, ASSERT_LINE); } -READ8_MEMBER( scramble_state::hotshock_soundlatch_r ) +uint8_t scramble_state::hotshock_soundlatch_r() { m_audiocpu->set_input_line(0, CLEAR_LINE); return m_soundlatch->read(); @@ -139,7 +139,7 @@ READ8_MEMBER(scramble_state::harem_digitalker_intr_r) return m_digitalker->digitalker_0_intr_r(); } -WRITE8_MEMBER(scramble_state::harem_digitalker_control_w) +void scramble_state::harem_digitalker_control_w(uint8_t data) { m_digitalker->digitalker_0_cs_w (data & 1 ? ASSERT_LINE : CLEAR_LINE); m_digitalker->digitalker_0_cms_w(data & 2 ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index 2672faf4087..32999e0d1e2 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -252,7 +252,7 @@ INPUT_PORTS_END * *************************************/ -WRITE8_MEMBER( _88games_state::banking_callback ) +void _88games_state::banking_callback(uint8_t data) { logerror("%s: bank select %02x\n", machine().describe_context(), data); diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index faa75435354..01d1f86e677 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -641,7 +641,7 @@ WRITE8_MEMBER( abc1600_state::cio_w ) m_cio->write(A2_A1, data); } -READ8_MEMBER( abc1600_state::cio_pa_r ) +uint8_t abc1600_state::cio_pa_r() { /* @@ -672,7 +672,7 @@ READ8_MEMBER( abc1600_state::cio_pa_r ) return data; } -READ8_MEMBER( abc1600_state::cio_pb_r ) +uint8_t abc1600_state::cio_pb_r() { /* @@ -700,7 +700,7 @@ READ8_MEMBER( abc1600_state::cio_pb_r ) return data; } -WRITE8_MEMBER( abc1600_state::cio_pb_w ) +void abc1600_state::cio_pb_w(uint8_t data) { /* @@ -724,7 +724,7 @@ WRITE8_MEMBER( abc1600_state::cio_pb_w ) m_dart->rxca_w(prbr); } -READ8_MEMBER( abc1600_state::cio_pc_r ) +uint8_t abc1600_state::cio_pc_r() { /* @@ -745,7 +745,7 @@ READ8_MEMBER( abc1600_state::cio_pc_r ) return data; } -WRITE8_MEMBER( abc1600_state::cio_pc_w ) +void abc1600_state::cio_pc_w(uint8_t data) { /* diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 54d3d332575..028f9e1e142 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -219,7 +219,7 @@ void abc80_state::abc80_io(address_map &map) // Z80PIO //------------------------------------------------- -READ8_MEMBER( abc80_state::pio_pa_r ) +uint8_t abc80_state::pio_pa_r() { /* @@ -247,7 +247,7 @@ READ8_MEMBER( abc80_state::pio_pa_r ) return data; } -READ8_MEMBER( abc80_state::pio_pb_r ) +uint8_t abc80_state::pio_pb_r() { /* @@ -283,7 +283,7 @@ READ8_MEMBER( abc80_state::pio_pb_r ) return data; } -WRITE8_MEMBER( abc80_state::pio_pb_w ) +void abc80_state::pio_pb_w(uint8_t data) { /* diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index 1d984639dcc..cba3c579e0e 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -151,7 +151,7 @@ WRITE8_MEMBER(ajax_state::sound_bank_w) m_k007232_2->set_bank(bank_A, bank_B); } -WRITE8_MEMBER(ajax_state::volume_callback0) +void ajax_state::volume_callback0(uint8_t data) { m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11); @@ -163,7 +163,7 @@ WRITE8_MEMBER(ajax_state::k007232_extvol_w) m_k007232_2->set_volume(0, (data & 0x0f) * 0x11/2, (data & 0x0f) * 0x11/2); } -WRITE8_MEMBER(ajax_state::volume_callback1) +void ajax_state::volume_callback1(uint8_t data) { /* channel B volume/pan */ m_k007232_2->set_volume(1, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2); diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index c0712544c42..ddf4af77576 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -48,7 +48,7 @@ WRITE8_MEMBER(aliens_state::aliens_sh_irqtrigger_w) m_audiocpu->set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(aliens_state::aliens_snd_bankswitch_w) +void aliens_state::aliens_snd_bankswitch_w(uint8_t data) { /* b1: bank for chanel A */ /* b0: bank for chanel B */ @@ -172,7 +172,7 @@ INPUT_PORTS_END ***************************************************************************/ -WRITE8_MEMBER(aliens_state::volume_callback) +void aliens_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data & 0x0f) * 0x11, 0); m_k007232->set_volume(1, 0, (data >> 4) * 0x11); @@ -189,7 +189,7 @@ void aliens_state::machine_reset() m_bank0000->set_bank(0); } -WRITE8_MEMBER( aliens_state::banking_callback ) +void aliens_state::banking_callback(uint8_t data) { m_rombank->set_entry(data & 0x1f); } diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index e17eef39264..f3123075e8a 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -220,7 +220,7 @@ WRITE8_MEMBER(seawolf2_state::sound_2_w)// Port 41 * *************************************/ -READ8_MEMBER(astrocde_state::input_mux_r) +uint8_t astrocde_state::input_mux_r(offs_t offset) { return m_handle[offset & 3].read_safe(0xff); } @@ -395,7 +395,7 @@ WRITE8_MEMBER(tenpindx_state::lights_w) * *************************************/ -WRITE8_MEMBER(astrocde_state::votrax_speech_w) +void astrocde_state::votrax_speech_w(uint8_t data) { m_votrax->inflection_w(data >> 6); m_votrax->write(data & 0x3f); diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 0dc5af430bf..f7c40ac8d6f 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -149,8 +149,8 @@ private: READ8_MEMBER (exprom_r); WRITE8_MEMBER(exprom_w); - WRITE32_MEMBER(user_io_output); - READ32_MEMBER(user_io_input); + void user_io_output(uint32_t data); + uint32_t user_io_input(); int m_user_io_state; // Board Ctrl Reg Offsets @@ -387,13 +387,13 @@ WRITE32_MEMBER(atlantis_state::dcs3_fifo_full_w) /************************************* * PCI9050 User I/O handlers *************************************/ -WRITE32_MEMBER(atlantis_state::user_io_output) +void atlantis_state::user_io_output(uint32_t data) { m_user_io_state = data; logerror("atlantis_state::user_io_output m_user_io_state = %1x\n", m_user_io_state); } -READ32_MEMBER(atlantis_state::user_io_input) +uint32_t atlantis_state::user_io_input() { // user io 0: 6016 nCONFIG -- output // user io 1: 6016 nSTATUS -- input diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp index 2b044eda37f..fb9c96f70c9 100644 --- a/src/mame/drivers/b16.cpp +++ b/src/mame/drivers/b16.cpp @@ -57,8 +57,8 @@ private: DECLARE_WRITE8_MEMBER(b16_6845_data_w); DECLARE_READ8_MEMBER(unk_dev_r); DECLARE_WRITE8_MEMBER(unk_dev_w); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -253,13 +253,13 @@ static GFXDECODE_START( gfx_b16 ) GFXDECODE_ENTRY( "pcg", 0x0000, b16_charlayout, 0, 1 ) GFXDECODE_END -READ8_MEMBER(b16_state::memory_read_byte) +uint8_t b16_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER(b16_state::memory_write_byte) +void b16_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.write_byte(offset, data); diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp index 5633b8fdc3c..edf66797a63 100644 --- a/src/mame/drivers/baraduke.cpp +++ b/src/mame/drivers/baraduke.cpp @@ -116,7 +116,7 @@ DIP locations verified for: #include "speaker.h" -WRITE8_MEMBER(baraduke_state::inputport_select_w) +void baraduke_state::inputport_select_w(uint8_t data) { if ((data & 0xe0) == 0x60) m_inputport_selected = data & 0x07; @@ -128,7 +128,7 @@ WRITE8_MEMBER(baraduke_state::inputport_select_w) } } -READ8_MEMBER(baraduke_state::inputport_r) +uint8_t baraduke_state::inputport_r() { switch (m_inputport_selected) { @@ -151,13 +151,13 @@ READ8_MEMBER(baraduke_state::inputport_r) } } -WRITE8_MEMBER(baraduke_state::baraduke_lamps_w) +void baraduke_state::baraduke_lamps_w(uint8_t data) { m_lamps[0] = BIT(data, 3); m_lamps[1] = BIT(data, 4); } -WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w) +void baraduke_state::baraduke_irq_ack_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); } @@ -177,7 +177,7 @@ void baraduke_state::baraduke_map(address_map &map) map(0x6000, 0xffff).rom(); /* ROM */ } -READ8_MEMBER(baraduke_state::soundkludge_r) +uint8_t baraduke_state::soundkludge_r() { return ((m_counter++) >> 4) & 0xff; } diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp index 6e3e193ca05..2f32dd90b95 100644 --- a/src/mame/drivers/barata.cpp +++ b/src/mame/drivers/barata.cpp @@ -53,10 +53,10 @@ public: , m_lamps(*this, "lamp%u", 0U) { } - DECLARE_WRITE8_MEMBER(fpga_w); - DECLARE_WRITE8_MEMBER(port0_w); - DECLARE_WRITE8_MEMBER(port2_w); - DECLARE_READ8_MEMBER(port2_r); + void fpga_w(uint8_t data); + void port0_w(uint8_t data); + void port2_w(uint8_t data); + uint8_t port2_r(); void barata(machine_config &config); private: unsigned char row_selection; @@ -274,7 +274,7 @@ void barata_state::fpga_send(unsigned char cmd) } } -WRITE8_MEMBER(barata_state::fpga_w) +void barata_state::fpga_w(uint8_t data) { static unsigned char old_data = 0; if (!BIT(old_data, 5) && BIT(data, 5)){ @@ -284,17 +284,17 @@ WRITE8_MEMBER(barata_state::fpga_w) old_data = data; } -WRITE8_MEMBER(barata_state::port0_w) +void barata_state::port0_w(uint8_t data) { row_selection = data; } -WRITE8_MEMBER(barata_state::port2_w) +void barata_state::port2_w(uint8_t data) { /* why does it write to PORT2 ? */ } -READ8_MEMBER(barata_state::port2_r) +uint8_t barata_state::port2_r() { if (!BIT(row_selection, 0)) return ioport("PLAYER1_ROW1")->read(); if (!BIT(row_selection, 1)) return ioport("PLAYER1_ROW2")->read(); diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp index 907cf613ab2..30d92570710 100644 --- a/src/mame/drivers/basic52.cpp +++ b/src/mame/drivers/basic52.cpp @@ -52,8 +52,8 @@ public: protected: void kbd_put(u8 data); - DECLARE_READ8_MEMBER(unk_r); - DECLARE_READ8_MEMBER(from_term); + uint8_t unk_r(); + uint8_t from_term(); void basic52_io(address_map &map); void basic52_mem(address_map &map); uint8_t m_term_data; @@ -87,12 +87,12 @@ static INPUT_PORTS_START( basic52 ) INPUT_PORTS_END -READ8_MEMBER(basic52_state::from_term) +uint8_t basic52_state::from_term() { return m_term_data; } -READ8_MEMBER( basic52_state::unk_r) +uint8_t basic52_state::unk_r() { return m_term_data; // won't boot without this } diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index 94ebb553f50..c3158356de4 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -86,7 +86,7 @@ WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w) } -WRITE8_MEMBER(bladestl_state::bladestl_port_B_w) +void bladestl_state::bladestl_port_B_w(uint8_t data) { // bits 3-5 = ROM bank select m_upd7759->set_rom_bank((data & 0x38) >> 3); diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index 318fba0869f..ba110574629 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -58,7 +58,7 @@ public: DECLARE_WRITE8_MEMBER(sound_irq_w); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); void blockhl(machine_config &config); void audio_map(address_map &map); @@ -194,7 +194,7 @@ void blockhl_state::machine_start() m_rombank->configure_entries(0, 4, memregion("maincpu")->base(), 0x2000); } -WRITE8_MEMBER( blockhl_state::banking_callback ) +void blockhl_state::banking_callback(uint8_t data) { // bits 0-1 = ROM bank m_rombank->set_entry(data & 0x03); diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index 54b7007b4c5..7795f327f4e 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -65,7 +65,7 @@ * *************************************/ -WRITE8_MEMBER(blueprnt_state::dipsw_w) +void blueprnt_state::dipsw_w(uint8_t data) { m_dipsw = data; } diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp index 67ccb984eba..ab94c778a4e 100644 --- a/src/mame/drivers/bml3.cpp +++ b/src/mame/drivers/bml3.cpp @@ -102,7 +102,7 @@ public: DECLARE_WRITE8_MEMBER(vram_attr_w); DECLARE_READ8_MEMBER(beep_r); DECLARE_WRITE8_MEMBER(beep_w); - DECLARE_WRITE8_MEMBER(piaA_w); + void piaA_w(uint8_t data); DECLARE_READ8_MEMBER(keyb_nmi_r); DECLARE_WRITE8_MEMBER(firq_mask_w); DECLARE_READ8_MEMBER(firq_status_r); @@ -776,7 +776,7 @@ void bml3_state::machine_reset() m_firq_mask = -1; // disable firq } -WRITE8_MEMBER(bml3_state::piaA_w) +void bml3_state::piaA_w(uint8_t data) { address_space &mem = m_maincpu->space(AS_PROGRAM); /* ROM banking: diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index 92f954c9ed4..8276aca6732 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -262,13 +262,13 @@ INPUT_PORTS_END -WRITE8_MEMBER(bottom9_state::volume_callback0) +void bottom9_state::volume_callback0(uint8_t data) { m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11); } -WRITE8_MEMBER(bottom9_state::volume_callback1) +void bottom9_state::volume_callback1(uint8_t data) { m_k007232_2->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_2->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp index 4b3dbe20342..6e52b3976be 100644 --- a/src/mame/drivers/cabaret.cpp +++ b/src/mame/drivers/cabaret.cpp @@ -52,9 +52,9 @@ public: DECLARE_WRITE8_MEMBER(bg_tile_w); DECLARE_WRITE8_MEMBER(fg_tile_w); DECLARE_WRITE8_MEMBER(fg_color_w); - DECLARE_WRITE8_MEMBER(nmi_and_coins_w); - DECLARE_WRITE8_MEMBER(ppi2_b_w); - DECLARE_WRITE8_MEMBER(ppi2_c_w); + void nmi_and_coins_w(uint8_t data); + void ppi2_b_w(uint8_t data); + void ppi2_c_w(uint8_t data); void show_out(); void init_cabaret(); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -163,7 +163,7 @@ void cabaret_state::show_out() #endif } -WRITE8_MEMBER(cabaret_state::nmi_and_coins_w) +void cabaret_state::nmi_and_coins_w(uint8_t data) { if ((m_nmi_enable ^ data) & (~0xdd)) { @@ -184,13 +184,13 @@ WRITE8_MEMBER(cabaret_state::nmi_and_coins_w) show_out(); } -WRITE8_MEMBER(cabaret_state::ppi2_b_w) +void cabaret_state::ppi2_b_w(uint8_t data) { m_out[1] = data; show_out(); } -WRITE8_MEMBER(cabaret_state::ppi2_c_w) +void cabaret_state::ppi2_c_w(uint8_t data) { m_out[2] = data; show_out(); diff --git a/src/mame/drivers/cgang.cpp b/src/mame/drivers/cgang.cpp index a166a5f23a4..5748098cf03 100644 --- a/src/mame/drivers/cgang.cpp +++ b/src/mame/drivers/cgang.cpp @@ -165,26 +165,26 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(door_motor_tick); void refresh_motor_output(); - DECLARE_READ8_MEMBER(ppi1_b_r); - DECLARE_READ8_MEMBER(ppi1_c_r); - DECLARE_READ8_MEMBER(ppi2_a_r); - DECLARE_READ8_MEMBER(ppi2_b_r); - DECLARE_WRITE8_MEMBER(ppi2_c_w); - DECLARE_WRITE8_MEMBER(ppi3_a_w); - DECLARE_WRITE8_MEMBER(ppi3_b_w); - DECLARE_WRITE8_MEMBER(ppi3_c_w); + u8 ppi1_b_r(); + u8 ppi1_c_r(); + u8 ppi2_a_r(); + u8 ppi2_b_r(); + void ppi2_c_w(u8 data); + void ppi3_a_w(u8 data); + void ppi3_b_w(u8 data); + void ppi3_c_w(u8 data); void set_en_sol(int i, int state); - DECLARE_WRITE8_MEMBER(ppi4_a_w); - DECLARE_WRITE8_MEMBER(ppi4_b_w); - DECLARE_WRITE8_MEMBER(ppi4_c_w); + void ppi4_a_w(u8 data); + void ppi4_b_w(u8 data); + void ppi4_c_w(u8 data); - template<int N> DECLARE_WRITE8_MEMBER(adpcm_w); - DECLARE_WRITE8_MEMBER(spot_w); - DECLARE_WRITE8_MEMBER(output_spot_w) { m_spot_lamps[offset >> 6] = data; } + template<int N> void adpcm_w(u8 data); + void spot_w(u8 data); + void output_spot_w(offs_t offset, u8 data) { m_spot_lamps[offset >> 6] = data; } - DECLARE_WRITE8_MEMBER(ppi5_a_w); - DECLARE_WRITE8_MEMBER(ppi5_b_w); - DECLARE_READ8_MEMBER(ppi5_c_r); + void ppi5_a_w(u8 data); + void ppi5_b_w(u8 data); + u8 ppi5_c_r(); int m_watchdog_clk = 0; int m_main_irq = 0; @@ -359,7 +359,7 @@ void cgang_state::refresh_motor_output() // maincpu (PPI1-PPI4) -READ8_MEMBER(cgang_state::ppi1_b_r) +u8 cgang_state::ppi1_b_r() { u8 data = 0xff; @@ -376,7 +376,7 @@ READ8_MEMBER(cgang_state::ppi1_b_r) return data; } -READ8_MEMBER(cgang_state::ppi1_c_r) +u8 cgang_state::ppi1_c_r() { u8 data = 0x7f; @@ -396,7 +396,7 @@ READ8_MEMBER(cgang_state::ppi1_c_r) return data; } -READ8_MEMBER(cgang_state::ppi2_a_r) +u8 cgang_state::ppi2_a_r() { u8 data = 0x60; @@ -424,7 +424,7 @@ READ8_MEMBER(cgang_state::ppi2_a_r) return data; } -READ8_MEMBER(cgang_state::ppi2_b_r) +u8 cgang_state::ppi2_b_r() { u8 data = 0x1f; @@ -436,7 +436,7 @@ READ8_MEMBER(cgang_state::ppi2_b_r) return data; } -WRITE8_MEMBER(cgang_state::ppi2_c_w) +void cgang_state::ppi2_c_w(u8 data) { // PC0: coincounter // PC1: coinlock solenoid @@ -449,7 +449,7 @@ WRITE8_MEMBER(cgang_state::ppi2_c_w) m_misc_lamps[1] = BIT(data, 3); } -WRITE8_MEMBER(cgang_state::ppi3_a_w) +void cgang_state::ppi3_a_w(u8 data) { // PA0-PA4: cosmogang motor direction m_cg_motor_dir = data & 0x1f; @@ -459,7 +459,7 @@ WRITE8_MEMBER(cgang_state::ppi3_a_w) m_misc_lamps[i + 6] = BIT(data, i + 5); } -WRITE8_MEMBER(cgang_state::ppi3_b_w) +void cgang_state::ppi3_b_w(u8 data) { // PB0-PB4: cosmogang motor power m_cg_motor_on = data & 0x1f; @@ -471,7 +471,7 @@ WRITE8_MEMBER(cgang_state::ppi3_b_w) m_misc_lamps[i + 8] = BIT(data, i + 5); } -WRITE8_MEMBER(cgang_state::ppi3_c_w) +void cgang_state::ppi3_c_w(u8 data) { // PC0-PC3: 7448 // PC4-PC7: 7445 @@ -488,7 +488,7 @@ void cgang_state::set_en_sol(int i, int state) m_sol_filter[i]->adjust(attotime::from_msec(1), i << 1 | state); } -WRITE8_MEMBER(cgang_state::ppi4_a_w) +void cgang_state::ppi4_a_w(u8 data) { // PA2-PA4: round leds for (int i = 0; i < 3; i++) @@ -499,7 +499,7 @@ WRITE8_MEMBER(cgang_state::ppi4_a_w) set_en_sol(i, BIT(data, i + 5)); } -WRITE8_MEMBER(cgang_state::ppi4_b_w) +void cgang_state::ppi4_b_w(u8 data) { // PB0,PB1: energy crate solenoids (4-5) for (int i = 0; i < 2; i++) @@ -513,7 +513,7 @@ WRITE8_MEMBER(cgang_state::ppi4_b_w) m_misc_lamps[5] = BIT(data, 7); } -WRITE8_MEMBER(cgang_state::ppi4_c_w) +void cgang_state::ppi4_c_w(u8 data) { // PC0,PC1: gun xenon lamps for (int i = 0; i < 2; i++) @@ -538,7 +538,7 @@ WRITE8_MEMBER(cgang_state::ppi4_c_w) // audiocpu template<int N> -WRITE8_MEMBER(cgang_state::adpcm_w) +void cgang_state::adpcm_w(u8 data) { m_adpcm[N]->port_w(data); @@ -547,7 +547,7 @@ WRITE8_MEMBER(cgang_state::adpcm_w) m_adpcm[N]->start_w(1); } -WRITE8_MEMBER(cgang_state::spot_w) +void cgang_state::spot_w(u8 data) { // d0-d2: ufo boss spotlights // d3-d7: cosmo spotlights @@ -555,7 +555,7 @@ WRITE8_MEMBER(cgang_state::spot_w) m_spot->matrix(1, data); } -WRITE8_MEMBER(cgang_state::ppi5_a_w) +void cgang_state::ppi5_a_w(u8 data) { // PA0,PA1: ADPCM reset m_adpcm[0]->reset_w(BIT(data, 0)); @@ -573,14 +573,14 @@ WRITE8_MEMBER(cgang_state::ppi5_a_w) m_ufo_sol = BIT(data, 7); } -WRITE8_MEMBER(cgang_state::ppi5_b_w) +void cgang_state::ppi5_b_w(u8 data) { // PB0-PB7: ufo lamps for (int i = 0; i < 8; i++) m_ufo_lamps[i] = BIT(data, i); } -READ8_MEMBER(cgang_state::ppi5_c_r) +u8 cgang_state::ppi5_c_r() { u8 data = 0; diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index d5a94d0f287..239192f4e47 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -255,7 +255,7 @@ INPUT_PORTS_END -WRITE8_MEMBER(chqflag_state::volume_callback0) +void chqflag_state::volume_callback0(uint8_t data) { // volume/pan for one of the channels on this chip // which channel and which bits are left/right is a guess @@ -269,7 +269,7 @@ WRITE8_MEMBER(chqflag_state::k007232_extvolume_w) m_k007232[0]->set_volume(1, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2); } -WRITE8_MEMBER(chqflag_state::volume_callback1) +void chqflag_state::volume_callback1(uint8_t data) { m_k007232[1]->set_volume(0, (data >> 4) * 0x11, 0); m_k007232[1]->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index bdfdf088c84..2a54d3e6f1b 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -257,9 +257,9 @@ public: DECLARE_WRITE8_MEMBER( aic_ad565_msb_w ); DECLARE_WRITE8_MEMBER( aic_ad565_lsb_w ); - DECLARE_READ8_MEMBER( q133_1_porta_r ); - DECLARE_WRITE8_MEMBER( q133_1_porta_w ); - DECLARE_WRITE8_MEMBER( q133_1_portb_w ); + uint8_t q133_1_porta_r(); + void q133_1_porta_w(uint8_t data); + void q133_1_portb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( cmi_iix_vblank ); IRQ_CALLBACK_MEMBER( cpu1_interrupt_callback ); @@ -268,10 +268,10 @@ public: // Video-related DECLARE_READ8_MEMBER( video_r ); DECLARE_READ8_MEMBER( lightpen_r ); - DECLARE_READ8_MEMBER( pia_q219_b_r ); + uint8_t pia_q219_b_r(); DECLARE_WRITE8_MEMBER( video_w ); - DECLARE_WRITE8_MEMBER( vscroll_w ); - DECLARE_WRITE8_MEMBER( video_attr_w ); + void vscroll_w(uint8_t data); + void video_attr_w(uint8_t data); DECLARE_READ8_MEMBER( vram_r ); DECLARE_WRITE8_MEMBER( vram_w ); DECLARE_READ8_MEMBER( tvt_r ); @@ -311,8 +311,8 @@ public: // Master card DECLARE_READ8_MEMBER( cmi02_r ); DECLARE_WRITE8_MEMBER( cmi02_w ); - DECLARE_WRITE8_MEMBER( cmi02_chsel_w ); - DECLARE_WRITE8_MEMBER( master_tune_w ); + void cmi02_chsel_w(uint8_t data); + void master_tune_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( cmi02_ptm_irq ); DECLARE_WRITE_LINE_MEMBER( cmi02_ptm_o2 ); DECLARE_WRITE_LINE_MEMBER( cmi02_pia2_irqa_w ); @@ -594,7 +594,7 @@ READ8_MEMBER( cmi_state::lightpen_r ) return m_lp_x >> 1; } -READ8_MEMBER( cmi_state::pia_q219_b_r ) +uint8_t cmi_state::pia_q219_b_r() { return ((m_lp_x << 7) & 0x80) | m_q219_b_touch; } @@ -606,12 +606,12 @@ WRITE8_MEMBER( cmi_state::video_w ) video_write(offset); } -WRITE8_MEMBER( cmi_state::vscroll_w ) +void cmi_state::vscroll_w(uint8_t data) { // TODO: Partial updates. Also, this should be done through a PIA } -WRITE8_MEMBER( cmi_state::video_attr_w ) +void cmi_state::video_attr_w(uint8_t data) { // TODO } @@ -1277,12 +1277,12 @@ WRITE_LINE_MEMBER( cmi_state::wd1791_drq ) 28 - 2B = PIA */ -WRITE8_MEMBER( cmi_state::master_tune_w ) +void cmi_state::master_tune_w(uint8_t data) { // double mfreq = (double)data * ((double)MASTER_OSCILLATOR / 2.0) / 256.0; } -WRITE8_MEMBER( cmi_state::cmi02_chsel_w ) +void cmi_state::cmi02_chsel_w(uint8_t data) { m_cmi02_pia_chsel = data; } @@ -1725,7 +1725,7 @@ WRITE_LINE_MEMBER( cmi_state::pia_q219_irqb ) IRQA/B = /RTINT? */ -READ8_MEMBER( cmi_state::q133_1_porta_r ) +uint8_t cmi_state::q133_1_porta_r() { if (BIT(m_q133_pia[0]->b_output(), 1)) { @@ -1734,13 +1734,13 @@ READ8_MEMBER( cmi_state::q133_1_porta_r ) return 0xff; } -WRITE8_MEMBER( cmi_state::q133_1_porta_w ) +void cmi_state::q133_1_porta_w(uint8_t data) { m_msm5832_addr = data & 0xf; m_msm5832->address_w(data & 0x0f); } -WRITE8_MEMBER( cmi_state::q133_1_portb_w ) +void cmi_state::q133_1_portb_w(uint8_t data) { m_msm5832->hold_w(BIT(data, 0)); m_msm5832->read_w(BIT(data, 1)); diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index 86ecbabcfd3..82a119c776d 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -329,7 +329,7 @@ WRITE8_MEMBER(combatsc_state::combatsc_voice_reset_w) m_upd7759->reset_w(data & 1); } -WRITE8_MEMBER(combatsc_state::combatsc_portA_w) +void combatsc_state::combatsc_portA_w(uint8_t data) { /* unknown. always write 0 */ } diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp index 7be709ab659..f5dc5662f4b 100644 --- a/src/mame/drivers/compucolor.cpp +++ b/src/mame/drivers/compucolor.cpp @@ -72,8 +72,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( xi_r ); - DECLARE_WRITE8_MEMBER( xo_w ); + uint8_t xi_r(); + void xo_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( xmt_w ); IRQ_CALLBACK_MEMBER( int_ack ); @@ -299,7 +299,7 @@ uint32_t compucolor2_state::screen_update(screen_device &screen, bitmap_rgb32 &b return 0; } -READ8_MEMBER( compucolor2_state::xi_r ) +uint8_t compucolor2_state::xi_r() { uint8_t data = 0xff; @@ -321,7 +321,7 @@ READ8_MEMBER( compucolor2_state::xi_r ) return data; } -WRITE8_MEMBER( compucolor2_state::xo_w ) +void compucolor2_state::xo_w(uint8_t data) { /* diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index 147f8619994..4a382ffd5c7 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -68,9 +68,9 @@ IRQ_CALLBACK_MEMBER( crimfght_state::audiocpu_irq_ack ) return 0xff; } -WRITE8_MEMBER(crimfght_state::ym2151_ct_w) +void crimfght_state::ym2151_ct_w(uint8_t data) { - // ne output from the 007232 is connected to a ls399 which + // one output from the 007232 is connected to a ls399 which // has inputs connected to the ct1 and ct2 outputs from // the ym2151 used to select the bank @@ -260,7 +260,7 @@ INPUT_PORTS_END ***************************************************************************/ -WRITE8_MEMBER(crimfght_state::volume_callback) +void crimfght_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data & 0x0f) * 0x11, 0); m_k007232->set_volume(1, 0, (data >> 4) * 0x11); @@ -272,7 +272,7 @@ void crimfght_state::machine_start() m_rombank->set_entry(0); } -WRITE8_MEMBER( crimfght_state::banking_callback ) +void crimfght_state::banking_callback(uint8_t data) { m_rombank->set_entry(data & 0x0f); diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index 52a4809eaa7..593b2fd1a3b 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -63,7 +63,7 @@ public: DECLARE_READ16_MEMBER(csplayh5_mux_r); DECLARE_WRITE16_MEMBER(csplayh5_mux_w); - DECLARE_WRITE16_MEMBER(tmp68301_parallel_port_w); + void tmp68301_parallel_port_w(uint16_t data); #if USE_H8 DECLARE_READ16_MEMBER(test_r); @@ -342,7 +342,7 @@ WRITE_LINE_MEMBER(csplayh5_state::ide_irq) } #endif -WRITE16_MEMBER(csplayh5_state::tmp68301_parallel_port_w) +void csplayh5_state::tmp68301_parallel_port_w(uint16_t data) { /* -x-- ---- used during ROM check, h8 reset assert? diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp index 0d2a055b07e..20270a163fd 100644 --- a/src/mame/drivers/ddribble.cpp +++ b/src/mame/drivers/ddribble.cpp @@ -68,7 +68,7 @@ WRITE8_MEMBER(ddribble_state::ddribble_coin_counter_w) machine().bookkeeping().coin_counter_w(1,(data >> 1) & 0x01); } -READ8_MEMBER(ddribble_state::ddribble_vlm5030_busy_r) +uint8_t ddribble_state::ddribble_vlm5030_busy_r() { return machine().rand(); /* patch */ /* FIXME: remove ? */ @@ -78,7 +78,7 @@ READ8_MEMBER(ddribble_state::ddribble_vlm5030_busy_r) #endif } -WRITE8_MEMBER(ddribble_state::ddribble_vlm5030_ctrl_w) +void ddribble_state::ddribble_vlm5030_ctrl_w(uint8_t data) { /* b7 : vlm data bus OE */ diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index edd0580fc6b..d006205fddf 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -263,13 +263,13 @@ void djboy_state::soundcpu_port_am(address_map &map) /******************************************************************************/ -READ8_MEMBER(djboy_state::beast_p0_r) +uint8_t djboy_state::beast_p0_r() { // ? return 0; } -WRITE8_MEMBER(djboy_state::beast_p0_w) +void djboy_state::beast_p0_w(uint8_t data) { if (!BIT(m_beast_p0, 1) && BIT(data, 1)) { @@ -282,7 +282,7 @@ WRITE8_MEMBER(djboy_state::beast_p0_w) m_beast_p0 = data; } -READ8_MEMBER(djboy_state::beast_p1_r) +uint8_t djboy_state::beast_p1_r() { if (BIT(m_beast_p0, 0) == 0) return m_beastlatch->read(); @@ -290,12 +290,12 @@ READ8_MEMBER(djboy_state::beast_p1_r) return 0; // ? } -WRITE8_MEMBER(djboy_state::beast_p1_w) +void djboy_state::beast_p1_w(uint8_t data) { m_beast_p1 = data; } -READ8_MEMBER(djboy_state::beast_p2_r) +uint8_t djboy_state::beast_p2_r() { switch ((m_beast_p0 >> 2) & 3) { @@ -306,12 +306,12 @@ READ8_MEMBER(djboy_state::beast_p2_r) } } -WRITE8_MEMBER(djboy_state::beast_p2_w) +void djboy_state::beast_p2_w(uint8_t data) { m_beast_p2 = data; } -READ8_MEMBER(djboy_state::beast_p3_r) +uint8_t djboy_state::beast_p3_r() { uint8_t dsw = 0; uint8_t dsw1 = ~m_port_dsw[0]->read(); @@ -327,7 +327,7 @@ READ8_MEMBER(djboy_state::beast_p3_r) return (dsw << 4) | (m_beastlatch->pending_r() ? 0x0 : 0x4) | (m_slavelatch->pending_r() ? 0x8 : 0x0); } -WRITE8_MEMBER(djboy_state::beast_p3_w) +void djboy_state::beast_p3_w(uint8_t data) { m_beast_p3 = data; m_slavecpu->set_input_line(INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp index 6807e990f74..fa768209258 100644 --- a/src/mame/drivers/drw80pkr.cpp +++ b/src/mame/drivers/drw80pkr.cpp @@ -78,16 +78,16 @@ private: required_device<ay8912_device> m_aysnd; required_memory_bank m_mainbank; - DECLARE_WRITE8_MEMBER(p1_w); - DECLARE_WRITE8_MEMBER(p2_w); + void p1_w(uint8_t data); + void p2_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(prog_w); - DECLARE_WRITE8_MEMBER(bus_w); + void bus_w(uint8_t data); DECLARE_WRITE8_MEMBER(io_w); DECLARE_READ_LINE_MEMBER(t0_r); DECLARE_READ_LINE_MEMBER(t1_r); - DECLARE_READ8_MEMBER(p1_r); - DECLARE_READ8_MEMBER(p2_r); - DECLARE_READ8_MEMBER(bus_r); + uint8_t p1_r(); + uint8_t p2_r(); + uint8_t bus_r(); DECLARE_READ8_MEMBER(io_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -111,12 +111,12 @@ void drw80pkr_state::machine_start() * Write Handlers * ******************/ -WRITE8_MEMBER(drw80pkr_state::p1_w) +void drw80pkr_state::p1_w(uint8_t data) { m_p1 = data; } -WRITE8_MEMBER(drw80pkr_state::p2_w) +void drw80pkr_state::p2_w(uint8_t data) { m_p2 = data; } @@ -134,7 +134,7 @@ WRITE_LINE_MEMBER(drw80pkr_state::prog_w) } } -WRITE8_MEMBER(drw80pkr_state::bus_w) +void drw80pkr_state::bus_w(uint8_t data) { m_bus = data; } @@ -204,17 +204,17 @@ READ_LINE_MEMBER(drw80pkr_state::t1_r) return m_t1; } -READ8_MEMBER(drw80pkr_state::p1_r) +uint8_t drw80pkr_state::p1_r() { return m_p1; } -READ8_MEMBER(drw80pkr_state::p2_r) +uint8_t drw80pkr_state::p2_r() { return m_p2; } -READ8_MEMBER(drw80pkr_state::bus_r) +uint8_t drw80pkr_state::bus_r() { return m_bus; } diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index dc487f2307f..dc902f5df72 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -100,11 +100,11 @@ private: DECLARE_WRITE8_MEMBER(block_addr_hi_w); DECLARE_WRITE8_MEMBER(block_h_w); DECLARE_WRITE8_MEMBER(layers_w); - DECLARE_WRITE8_MEMBER(input_w); + void input_w(uint8_t data); DECLARE_READ8_MEMBER(service_r); DECLARE_READ8_MEMBER(input_r); DECLARE_WRITE8_MEMBER(rombank_w); - DECLARE_READ8_MEMBER(dsw_r); + uint8_t dsw_r(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void dunhuang_io_map(address_map &map); @@ -439,7 +439,7 @@ void dunhuang_state::dunhuang_map(address_map &map) // Inputs -WRITE8_MEMBER(dunhuang_state::input_w) +void dunhuang_state::input_w(uint8_t data) { m_input = data; } @@ -452,7 +452,7 @@ READ8_MEMBER(dunhuang_state::service_r) ; } -READ8_MEMBER(dunhuang_state::dsw_r) +uint8_t dunhuang_state::dsw_r() { if (!(m_input & 0x01)) return m_dsw[0]->read(); if (!(m_input & 0x02)) return m_dsw[1]->read(); diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index cc0609461aa..1f2ffe31567 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -105,8 +105,8 @@ private: DECLARE_READ8_MEMBER(dip_switch_r); DECLARE_WRITE8_MEMBER(sound_data_w); DECLARE_WRITE8_MEMBER(enigma2_flip_screen_w); - DECLARE_READ8_MEMBER(sound_latch_r); - DECLARE_WRITE8_MEMBER(protection_data_w); + uint8_t sound_latch_r(); + void protection_data_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_enigma2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -411,13 +411,13 @@ WRITE8_MEMBER(enigma2_state::sound_data_w) } -READ8_MEMBER(enigma2_state::sound_latch_r) +uint8_t enigma2_state::sound_latch_r() { return bitswap<8>(m_sound_latch,0,1,2,3,4,5,6,7); } -WRITE8_MEMBER(enigma2_state::protection_data_w) +void enigma2_state::protection_data_w(uint8_t data) { if (LOG_PROT) logerror("%s: Protection Data Write: %x\n", machine().describe_context(), data); m_protection_data = data; diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index 6cf98f4d71a..ad007626b8c 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -57,13 +57,13 @@ private: virtual void machine_start() override; - DECLARE_READ8_MEMBER(keypad_r); - DECLARE_WRITE8_MEMBER(display_w); - template <int Digit> DECLARE_WRITE8_MEMBER(led_w); - DECLARE_READ8_MEMBER(pia_ar); - DECLARE_WRITE8_MEMBER(pia_aw); - DECLARE_READ8_MEMBER(pia_br); - DECLARE_WRITE8_MEMBER(pia_bw); + uint8_t keypad_r(offs_t offset); + void display_w(offs_t offset, uint8_t data); + template <int Digit> void led_w(uint8_t data); + uint8_t pia_ar(); + void pia_aw(uint8_t data); + uint8_t pia_br(); + void pia_bw(uint8_t data); void mem_map(address_map &map); @@ -84,7 +84,7 @@ void et3400_state::machine_start() } -READ8_MEMBER(et3400_state::keypad_r) +uint8_t et3400_state::keypad_r(offs_t offset) { uint8_t data = 0xff; @@ -95,7 +95,7 @@ READ8_MEMBER(et3400_state::keypad_r) return data; } -WRITE8_MEMBER(et3400_state::display_w) +void et3400_state::display_w(offs_t offset, uint8_t data) { // A6-A4 decoded by IC22 (74LS42); D0 inverted by one gate of IC21 (74S00) uint8_t digit = (offset >> 4) & 7; @@ -104,7 +104,7 @@ WRITE8_MEMBER(et3400_state::display_w) } template <int Digit> -WRITE8_MEMBER(et3400_state::led_w) +void et3400_state::led_w(uint8_t data) { // This computer sets each segment, one at a time. m_digit[Digit - 1] = bitswap<8>(~data, 7, 0, 1, 2, 3, 4, 5, 6); @@ -113,25 +113,25 @@ WRITE8_MEMBER(et3400_state::led_w) // d1,2,3 = Baud rate // d4 = gnd // d7 = rs232 in -READ8_MEMBER(et3400_state::pia_ar) +uint8_t et3400_state::pia_ar() { return ioport("BAUD")->read() | (m_rs232->rxd_r() << 7); } // d0 = rs232 out -WRITE8_MEMBER(et3400_state::pia_aw) +void et3400_state::pia_aw(uint8_t data) { m_rs232->write_txd(BIT(data, 0)); } // d7 = cass in -READ8_MEMBER(et3400_state::pia_br) +uint8_t et3400_state::pia_br() { return (m_cass->input() > +0.0) << 7; } // d0 = cass out -WRITE8_MEMBER(et3400_state::pia_bw) +void et3400_state::pia_bw(uint8_t data) { m_cass->output(BIT(data, 0) ? -1.0 : +1.0); } diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp index f89a3242dd4..8fe90169a96 100644 --- a/src/mame/drivers/exerion.cpp +++ b/src/mame/drivers/exerion.cpp @@ -158,14 +158,14 @@ INPUT_CHANGED_MEMBER(exerion_state::coin_inserted) /* This is the first of many Exerion "features". No clue if it's */ /* protection or some sort of timer. */ -READ8_MEMBER(exerion_state::exerion_porta_r) +uint8_t exerion_state::exerion_porta_r() { m_porta ^= 0x40; return m_porta; } -WRITE8_MEMBER(exerion_state::exerion_portb_w) +void exerion_state::exerion_portb_w(uint8_t data) { /* pull the expected value from the ROM */ m_porta = memregion("maincpu")->base()[0x5f76]; @@ -175,7 +175,7 @@ WRITE8_MEMBER(exerion_state::exerion_portb_w) } -READ8_MEMBER(exerion_state::exerion_protection_r) +uint8_t exerion_state::exerion_protection_r(offs_t offset) { if (m_maincpu->pc() == 0x4143) return memregion("maincpu")->base()[0x33c0 + (m_main_ram[0xd] << 2) + offset]; diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp index 1fb0df22581..3bb840559f0 100644 --- a/src/mame/drivers/fastfred.cpp +++ b/src/mame/drivers/fastfred.cpp @@ -149,7 +149,7 @@ WRITE_LINE_MEMBER(fastfred_state::imago_dma_irq_w) m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER(fastfred_state::imago_sprites_bank_w) +void fastfred_state::imago_sprites_bank_w(uint8_t data) { m_imago_sprites_bank = (data & 2) >> 1; } @@ -184,7 +184,7 @@ WRITE_LINE_MEMBER(fastfred_state::nmi_mask_w) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE8_MEMBER(fastfred_state::sound_nmi_mask_w) +void fastfred_state::sound_nmi_mask_w(uint8_t data) { m_sound_nmi_mask = data & 1; } diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp index bac17f048fc..dfb52a86d35 100644 --- a/src/mame/drivers/fastlane.cpp +++ b/src/mame/drivers/fastlane.cpp @@ -180,13 +180,13 @@ GFXDECODE_END ***************************************************************************/ -WRITE8_MEMBER(fastlane_state::volume_callback0) +void fastlane_state::volume_callback0(uint8_t data) { m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11); } -WRITE8_MEMBER(fastlane_state::volume_callback1) +void fastlane_state::volume_callback1(uint8_t data) { m_k007232_2->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_2->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index 4d390cde0b1..7b91ee74e07 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -97,7 +97,7 @@ * - A32/D32 VMEbus master/slave interface with system controller function (VMEchip ASIC) * - Ethernet transceiver interface (AM79C90) * - SCSI bus interface with independent data bus on P2 connector (MB87033/34) - * - Flopyy disk interface on P2 connector (FCD37C65C) + * - Floppy disk interface on P2 connector (FCD37C65C) * - Four serial ports (DUSCC SCN68562 x 2) * - 20 bit digital i/o for user applications( 2 x 68230 PI/T ) * - Real-Time Clock with interrupt (72423) @@ -107,7 +107,7 @@ * * Address Map * -------------------------------------------------------------------------- - * Range Decscription + * Range Desccription * -------------------------------------------------------------------------- * 00000000-0xxFFFFF Shared DRAM D8-D32 xx=0x1F-0x03 for 32Mb-4Mb * 0yy00000-FAFFFFFF VME A32 D8-D32 yy=xx+1 @@ -287,16 +287,16 @@ private: int fga_irq_level; /* Rotary switch PIT input */ - DECLARE_READ8_MEMBER (rotary_rd); - DECLARE_READ8_MEMBER (flop_dmac_r); - DECLARE_WRITE8_MEMBER (flop_dmac_w); - DECLARE_READ8_MEMBER (pit1c_r); - DECLARE_WRITE8_MEMBER (pit1c_w); - DECLARE_READ8_MEMBER (pit2a_r); - DECLARE_WRITE8_MEMBER (pit2a_w); - DECLARE_READ8_MEMBER (board_mem_id_rd); - DECLARE_READ8_MEMBER (pit2c_r); - DECLARE_WRITE8_MEMBER (pit2c_w); + uint8_t rotary_rd(); + uint8_t flop_dmac_r(); + void flop_dmac_w(uint8_t data); + uint8_t pit1c_r(); + void pit1c_w(uint8_t data); + uint8_t pit2a_r(); + void pit2a_w(uint8_t data); + uint8_t board_mem_id_rd(); + uint8_t pit2c_r(); + void pit2c_w(uint8_t data); /* VME bus accesses */ //DECLARE_READ16_MEMBER (vme_a24_r); @@ -487,42 +487,42 @@ WRITE32_MEMBER (cpu30_state::bootvect_w){ * * "To start VMEPROM, the rotary switches must both be set to 'F':" Hmm... */ -READ8_MEMBER (cpu30_state::rotary_rd){ +uint8_t cpu30_state::rotary_rd(){ LOG("%s\n", FUNCNAME); return 0xff; // TODO: make this configurable from commandline or artwork } // PIT#1 Port B TODO: implement floppy and dma control -READ8_MEMBER (cpu30_state::flop_dmac_r){ +uint8_t cpu30_state::flop_dmac_r(){ LOG("%s\n", FUNCNAME); return 0xff; } -WRITE8_MEMBER (cpu30_state::flop_dmac_w){ +void cpu30_state::flop_dmac_w(uint8_t data){ LOG("%s(%02x)\n", FUNCNAME, data); } #define FPCP_SENSE 0x40 /* Port C bit 6 is low if a Floating Point Co Processor is installed */ // PIT#1 Port C TODO: implement timer+port interrupts // TODO: Connect PC0, PC1, PC4 and PC7 to B5 and/or P2 connector -READ8_MEMBER (cpu30_state::pit1c_r){ +uint8_t cpu30_state::pit1c_r(){ LOG("%s\n", FUNCNAME); m_maincpu->set_fpu_enable(1); // Lets assume the FPCP is always installed ( which is default for 68030 atm ) return 0xff & ~FPCP_SENSE; // Should really be command line for the edge cases... } -WRITE8_MEMBER (cpu30_state::pit1c_w){ +void cpu30_state::pit1c_w(uint8_t data){ LOG("%s(%02x)\n", FUNCNAME, data); } // PIT#2 Port A TODO: Connect to B5 and /or P2 connector -READ8_MEMBER (cpu30_state::pit2a_r){ +uint8_t cpu30_state::pit2a_r(){ LOG("%s\n", FUNCNAME); logerror("Unsupported user i/o on PIT2 port A detected\n"); return 0xff; } -WRITE8_MEMBER (cpu30_state::pit2a_w){ +void cpu30_state::pit2a_w(uint8_t data){ LOG("%s(%02x)\n", FUNCNAME, data); logerror("Unsupported user i/o on PIT2 port A detected\n"); } @@ -541,11 +541,11 @@ WRITE8_MEMBER (cpu30_state::pit2a_w){ * contain the same identification number. In the case of the CPU-30 R4, the * number is 0x0a * - * The speed of the board is meassured by looping some instructions and meassure the time it takes with a timer + * The speed of the board is measured by looping some instructions and measure the time it takes with a timer * Currently this doesn't work so the wrong speed is displayed on the screen. To fix this timing needs to be more exact. - * Speed meassure subroutine is at address 0xffe033c4 in the FGA-002 firmware with CRC (faa38972) (for example) + * Speed measure subroutine is at address 0xffe033c4 in the FGA-002 firmware with CRC (faa38972) (for example) */ -READ8_MEMBER (cpu30_state::board_mem_id_rd) +uint8_t cpu30_state::board_mem_id_rd() { int sz; LOG("%s\n", FUNCNAME); @@ -591,12 +591,12 @@ READ8_MEMBER (cpu30_state::board_mem_id_rd) } // PIT#2 Port C TODO: implement timer interrupt, DMA i/o, memory control and Hardware ID -READ8_MEMBER (cpu30_state::pit2c_r){ +uint8_t cpu30_state::pit2c_r(){ LOG("%s\n", FUNCNAME); return 0xfe; } -WRITE8_MEMBER (cpu30_state::pit2c_w){ +void cpu30_state::pit2c_w(uint8_t data){ LOG("%s(%02x)\n", FUNCNAME, data); } diff --git a/src/mame/drivers/fidel_card.cpp b/src/mame/drivers/fidel_card.cpp index 215fd9daa26..9717115c937 100644 --- a/src/mame/drivers/fidel_card.cpp +++ b/src/mame/drivers/fidel_card.cpp @@ -237,9 +237,9 @@ private: // I/O handlers void update_display(); - DECLARE_WRITE8_MEMBER(speech_w); - DECLARE_WRITE8_MEMBER(mcu_p1_w); - DECLARE_READ8_MEMBER(mcu_p2_r); + void speech_w(u8 data); + void mcu_p1_w(u8 data); + u8 mcu_p2_r(); DECLARE_READ_LINE_MEMBER(mcu_t0_r); template<int P> void ioexp_port_w(uint8_t data); }; @@ -278,7 +278,7 @@ void card_state::update_display() m_dac->write(BIT(~m_inp_mux, 7) & BIT(m_vfd_data, 13)); } -WRITE8_MEMBER(card_state::speech_w) +void card_state::speech_w(u8 data) { if (m_speech == nullptr) return; @@ -326,14 +326,14 @@ void card_state::ioexp_port_w(uint8_t data) // I8041 MCU -WRITE8_MEMBER(card_state::mcu_p1_w) +void card_state::mcu_p1_w(u8 data) { // P10-P17: input mux, digit select m_inp_mux = data; update_display(); } -READ8_MEMBER(card_state::mcu_p2_r) +u8 card_state::mcu_p2_r() { // P20-P23: I8243 P2 u8 data = m_i8243->p2_r() & 0x0f; diff --git a/src/mame/drivers/fidel_cc1.cpp b/src/mame/drivers/fidel_cc1.cpp index eb1ec8ce428..902b3c0d3d5 100644 --- a/src/mame/drivers/fidel_cc1.cpp +++ b/src/mame/drivers/fidel_cc1.cpp @@ -107,9 +107,9 @@ private: // I/O handlers void update_display(); - DECLARE_READ8_MEMBER(ppi_porta_r); - DECLARE_WRITE8_MEMBER(ppi_portb_w); - DECLARE_WRITE8_MEMBER(ppi_portc_w); + u8 ppi_porta_r(); + void ppi_portb_w(u8 data); + void ppi_portc_w(u8 data); u8 m_led_select; u8 m_7seg_data; @@ -140,7 +140,7 @@ void cc1_state::update_display() m_display->matrix(m_led_select, m_7seg_data); } -READ8_MEMBER(cc1_state::ppi_porta_r) +u8 cc1_state::ppi_porta_r() { // 74148(priority encoder) I0-I7: inputs // d0-d2: 74148 S0-S2, d3: 74148 GS @@ -153,14 +153,14 @@ READ8_MEMBER(cc1_state::ppi_porta_r) return data | ((m_delay->enabled()) ? 0x10 : 0); } -WRITE8_MEMBER(cc1_state::ppi_portb_w) +void cc1_state::ppi_portb_w(u8 data) { // d0-d6: digit segment data m_7seg_data = bitswap<7>(data,0,1,2,3,4,5,6); update_display(); } -WRITE8_MEMBER(cc1_state::ppi_portc_w) +void cc1_state::ppi_portc_w(u8 data) { // d6: trigger monostable 555 (R=15K, C=1uF) if (~data & m_led_select & 0x40 && !m_delay->enabled()) diff --git a/src/mame/drivers/fidel_cc10.cpp b/src/mame/drivers/fidel_cc10.cpp index 701bcfe3d8e..03b2cab3b19 100644 --- a/src/mame/drivers/fidel_cc10.cpp +++ b/src/mame/drivers/fidel_cc10.cpp @@ -89,10 +89,10 @@ private: // I/O handlers void update_display(); - DECLARE_WRITE8_MEMBER(ppi_porta_w); - DECLARE_WRITE8_MEMBER(ppi_portb_w); - DECLARE_READ8_MEMBER(ppi_portc_r); - DECLARE_WRITE8_MEMBER(ppi_portc_w); + void ppi_porta_w(u8 data); + void ppi_portb_w(u8 data); + u8 ppi_portc_r(); + void ppi_portc_w(u8 data); u8 m_inp_mux; u8 m_led_select; @@ -126,7 +126,7 @@ void ccx_state::update_display() m_display->matrix(m_led_select, m_7seg_data); } -WRITE8_MEMBER(ccx_state::ppi_porta_w) +void ccx_state::ppi_porta_w(u8 data) { // d7: enable beeper on falling edge (556 monostable) (unpopulated on ACR) if (m_beeper != nullptr && ~data & m_7seg_data & 0x80 && !m_beeper_off->enabled()) @@ -140,7 +140,7 @@ WRITE8_MEMBER(ccx_state::ppi_porta_w) update_display(); } -WRITE8_MEMBER(ccx_state::ppi_portb_w) +void ccx_state::ppi_portb_w(u8 data) { // d0: lose led, d1: check(win) led // d2-d5: digit select @@ -148,7 +148,7 @@ WRITE8_MEMBER(ccx_state::ppi_portb_w) update_display(); } -READ8_MEMBER(ccx_state::ppi_portc_r) +u8 ccx_state::ppi_portc_r() { u8 data = 0; @@ -160,7 +160,7 @@ READ8_MEMBER(ccx_state::ppi_portc_r) return ~data & 0xf; } -WRITE8_MEMBER(ccx_state::ppi_portc_w) +void ccx_state::ppi_portc_w(u8 data) { // d4-d7: input mux (inverted) m_inp_mux = ~data >> 4 & 0xf; diff --git a/src/mame/drivers/fidel_csc.cpp b/src/mame/drivers/fidel_csc.cpp index d78062c2ba5..eb707d0ff7f 100644 --- a/src/mame/drivers/fidel_csc.cpp +++ b/src/mame/drivers/fidel_csc.cpp @@ -270,18 +270,18 @@ protected: u16 read_inputs(); void update_display(); void update_sound(); - DECLARE_READ8_MEMBER(speech_r); + u8 speech_r(offs_t offset); - DECLARE_WRITE8_MEMBER(pia0_pa_w); - DECLARE_WRITE8_MEMBER(pia0_pb_w); - DECLARE_READ8_MEMBER(pia0_pa_r); + void pia0_pa_w(u8 data); + void pia0_pb_w(u8 data); + u8 pia0_pa_r(); DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w); DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w); DECLARE_READ_LINE_MEMBER(pia0_ca1_r); DECLARE_READ_LINE_MEMBER(pia0_cb1_r); - DECLARE_WRITE8_MEMBER(pia1_pa_w); - DECLARE_WRITE8_MEMBER(pia1_pb_w); - DECLARE_READ8_MEMBER(pia1_pb_r); + void pia1_pa_w(u8 data); + void pia1_pb_w(u8 data); + u8 pia1_pb_r(); DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w); u8 m_led_data; @@ -398,7 +398,7 @@ void csc_state::update_sound() m_dac->write(BIT(1 << m_inp_mux, 9)); } -READ8_MEMBER(csc_state::speech_r) +u8 csc_state::speech_r(offs_t offset) { return m_speech_rom[m_speech_bank << 12 | offset]; } @@ -406,13 +406,13 @@ READ8_MEMBER(csc_state::speech_r) // 6821 PIA 0 -READ8_MEMBER(csc_state::pia0_pa_r) +u8 csc_state::pia0_pa_r() { // d0-d5: button row 0-5 return (read_inputs() & 0x3f) | 0xc0; } -WRITE8_MEMBER(csc_state::pia0_pa_w) +void csc_state::pia0_pa_w(u8 data) { // d6,d7: 7442 A0,A1 m_inp_mux = (m_inp_mux & ~3) | (data >> 6 & 3); @@ -420,7 +420,7 @@ WRITE8_MEMBER(csc_state::pia0_pa_w) update_sound(); } -WRITE8_MEMBER(csc_state::pia0_pb_w) +void csc_state::pia0_pb_w(u8 data) { // d0-d7: led row data m_led_data = data; @@ -458,7 +458,7 @@ WRITE_LINE_MEMBER(csc_state::pia0_ca2_w) // 6821 PIA 1 -WRITE8_MEMBER(csc_state::pia1_pa_w) +void csc_state::pia1_pa_w(u8 data) { // d0-d5: TSI C0-C5 m_speech->data_w(data & 0x3f); @@ -468,7 +468,7 @@ WRITE8_MEMBER(csc_state::pia1_pa_w) update_display(); } -WRITE8_MEMBER(csc_state::pia1_pb_w) +void csc_state::pia1_pb_w(u8 data) { // d0: speech ROM A12 m_speech->force_update(); // update stream to now @@ -481,7 +481,7 @@ WRITE8_MEMBER(csc_state::pia1_pb_w) m_speech->set_output_gain(0, (data & 0x10) ? 0.25 : 1.0); } -READ8_MEMBER(csc_state::pia1_pb_r) +u8 csc_state::pia1_pb_r() { // d2: printer? u8 data = 0x04; diff --git a/src/mame/drivers/fidel_elite.cpp b/src/mame/drivers/fidel_elite.cpp index 0b18d43a514..216b84c21c1 100644 --- a/src/mame/drivers/fidel_elite.cpp +++ b/src/mame/drivers/fidel_elite.cpp @@ -134,13 +134,13 @@ protected: // I/O handlers void update_display(); - DECLARE_READ8_MEMBER(speech_r); - DECLARE_WRITE8_MEMBER(segment_w); - DECLARE_WRITE8_MEMBER(led_w); - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(ppi_porta_w); - DECLARE_READ8_MEMBER(ppi_portb_r); - DECLARE_WRITE8_MEMBER(ppi_portc_w); + u8 speech_r(offs_t offset); + void segment_w(offs_t offset, u8 data); + void led_w(offs_t offset, u8 data); + u8 input_r(); + void ppi_porta_w(u8 data); + u8 ppi_portb_r(); + void ppi_portc_w(u8 data); bool m_rotate; u8 m_led_data; @@ -209,12 +209,12 @@ void elite_state::update_display() m_display->matrix(1 << m_inp_mux, m_led_data << 8 | seg_data); } -READ8_MEMBER(elite_state::speech_r) +u8 elite_state::speech_r(offs_t offset) { return m_speech_rom[m_speech_bank << 12 | offset]; } -WRITE8_MEMBER(elite_state::segment_w) +void elite_state::segment_w(offs_t offset, u8 data) { // a0-a2,d7: digit segment u8 mask = 1 << offset; @@ -222,14 +222,14 @@ WRITE8_MEMBER(elite_state::segment_w) update_display(); } -WRITE8_MEMBER(elite_state::led_w) +void elite_state::led_w(offs_t offset, u8 data) { // a0-a2,d0: led data m_led_data = (m_led_data & ~(1 << offset)) | ((data & 1) << offset); update_display(); } -READ8_MEMBER(elite_state::input_r) +u8 elite_state::input_r() { u8 data = 0; @@ -254,7 +254,7 @@ READ8_MEMBER(elite_state::input_r) // 8255 PPI (PC: done with TTL instead) -WRITE8_MEMBER(elite_state::ppi_porta_w) +void elite_state::ppi_porta_w(u8 data) { // d0-d5: TSI C0-C5 // d6: TSI START line @@ -264,7 +264,7 @@ WRITE8_MEMBER(elite_state::ppi_porta_w) // d7: printer? (black wire to LED pcb) } -WRITE8_MEMBER(elite_state::ppi_portc_w) +void elite_state::ppi_portc_w(u8 data) { // d0-d3: 7442 a0-a3 // 7442 0-8: led select, input mux @@ -286,7 +286,7 @@ WRITE8_MEMBER(elite_state::ppi_portc_w) m_rombank->set_entry(data >> 6 & 3); } -READ8_MEMBER(elite_state::ppi_portb_r) +u8 elite_state::ppi_portb_r() { // d0: printer? white wire from LED pcb u8 data = 1; diff --git a/src/mame/drivers/fidel_excel.cpp b/src/mame/drivers/fidel_excel.cpp index 6a5db5bc199..868fb8b22ed 100644 --- a/src/mame/drivers/fidel_excel.cpp +++ b/src/mame/drivers/fidel_excel.cpp @@ -202,9 +202,9 @@ private: template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); } // I/O handlers - DECLARE_READ8_MEMBER(speech_r); - DECLARE_WRITE8_MEMBER(ttl_w); - DECLARE_READ8_MEMBER(ttl_r); + u8 speech_r(offs_t offset); + void ttl_w(offs_t offset, u8 data); + u8 ttl_r(offs_t offset); u8 m_select; u8 m_7seg_data; @@ -242,7 +242,7 @@ INPUT_CHANGED_MEMBER(excel_state::speech_bankswitch) m_speech_bank = (m_speech_bank & 1) | newval << 1; } -READ8_MEMBER(excel_state::speech_r) +u8 excel_state::speech_r(offs_t offset) { // TSI A11 is A12, program controls A11, user controls A13,A14(language switches) offset = (offset & 0x7ff) | (offset << 1 & 0x1000); @@ -252,7 +252,7 @@ READ8_MEMBER(excel_state::speech_r) // TTL -WRITE8_MEMBER(excel_state::ttl_w) +void excel_state::ttl_w(offs_t offset, u8 data) { // a0-a2,d0: 74259(1) u8 mask = 1 << offset; @@ -294,7 +294,7 @@ WRITE8_MEMBER(excel_state::ttl_w) } } -READ8_MEMBER(excel_state::ttl_r) +u8 excel_state::ttl_r(offs_t offset) { u8 sel = m_select & 0xf; u8 d7 = 0x80; diff --git a/src/mame/drivers/fidel_sc6.cpp b/src/mame/drivers/fidel_sc6.cpp index 927f3a2928f..f396a449d19 100644 --- a/src/mame/drivers/fidel_sc6.cpp +++ b/src/mame/drivers/fidel_sc6.cpp @@ -69,11 +69,11 @@ private: // I/O handlers void update_display(); - DECLARE_WRITE8_MEMBER(mux_w); - DECLARE_WRITE8_MEMBER(select_w); + void mux_w(u8 data); + void select_w(u8 data); u8 read_inputs(); - DECLARE_READ8_MEMBER(input_r); + u8 input_r(); DECLARE_READ_LINE_MEMBER(input6_r); DECLARE_READ_LINE_MEMBER(input7_r); @@ -106,7 +106,7 @@ void sc6_state::update_display() m_display->matrix(m_led_select, 1 << m_inp_mux); } -WRITE8_MEMBER(sc6_state::mux_w) +void sc6_state::mux_w(u8 data) { // P24-P27: 7442 A-D // 7442 0-8: input mux, 7seg data @@ -117,7 +117,7 @@ WRITE8_MEMBER(sc6_state::mux_w) m_dac->write(BIT(1 << m_inp_mux, 9)); } -WRITE8_MEMBER(sc6_state::select_w) +void sc6_state::select_w(u8 data) { // P16,P17: digit select m_led_select = ~data >> 6 & 3; @@ -139,7 +139,7 @@ u8 sc6_state::read_inputs() return ~data; } -READ8_MEMBER(sc6_state::input_r) +u8 sc6_state::input_r() { // P10-P15: multiplexed inputs low return (read_inputs() & 0x3f) | 0xc0; diff --git a/src/mame/drivers/fidel_vcc.cpp b/src/mame/drivers/fidel_vcc.cpp index ffaededb2fe..3ea064afb4c 100644 --- a/src/mame/drivers/fidel_vcc.cpp +++ b/src/mame/drivers/fidel_vcc.cpp @@ -152,12 +152,12 @@ private: // I/O handlers void update_display(); - DECLARE_READ8_MEMBER(speech_r); - DECLARE_WRITE8_MEMBER(ppi_porta_w); - DECLARE_READ8_MEMBER(ppi_portb_r); - DECLARE_WRITE8_MEMBER(ppi_portb_w); - DECLARE_READ8_MEMBER(ppi_portc_r); - DECLARE_WRITE8_MEMBER(ppi_portc_w); + u8 speech_r(offs_t offset); + void ppi_porta_w(u8 data); + u8 ppi_portb_r(); + void ppi_portb_w(u8 data); + u8 ppi_portc_r(); + void ppi_portc_w(u8 data); u8 m_led_select; u8 m_7seg_data; @@ -199,7 +199,7 @@ void vcc_state::update_display() m_display->matrix(m_led_select >> 2 & 0xf, outdata); } -READ8_MEMBER(vcc_state::speech_r) +u8 vcc_state::speech_r(offs_t offset) { return m_speech_rom[m_speech_bank << 12 | offset]; } @@ -207,7 +207,7 @@ READ8_MEMBER(vcc_state::speech_r) // I8255 PPI -WRITE8_MEMBER(vcc_state::ppi_porta_w) +void vcc_state::ppi_porta_w(u8 data) { // d0-d6: digit segment data, bits are xABCDEFG m_7seg_data = bitswap<8>(data,7,0,1,2,3,4,5,6); @@ -227,13 +227,13 @@ WRITE8_MEMBER(vcc_state::ppi_porta_w) } } -READ8_MEMBER(vcc_state::ppi_portb_r) +u8 vcc_state::ppi_portb_r() { // d7: TSI BUSY line return (m_speech->busy_r()) ? 0x80 : 0x00; } -WRITE8_MEMBER(vcc_state::ppi_portb_w) +void vcc_state::ppi_portb_w(u8 data) { // d0,d2-d5: digit/led select // _d6: enable language switches @@ -241,7 +241,7 @@ WRITE8_MEMBER(vcc_state::ppi_portb_w) update_display(); } -READ8_MEMBER(vcc_state::ppi_portc_r) +u8 vcc_state::ppi_portc_r() { u8 data = 0; @@ -258,7 +258,7 @@ READ8_MEMBER(vcc_state::ppi_portc_r) return ~data & 0xf; } -WRITE8_MEMBER(vcc_state::ppi_portc_w) +void vcc_state::ppi_portc_w(u8 data) { // d4-d7: input mux (inverted) m_inp_mux = ~data >> 4 & 0xf; diff --git a/src/mame/drivers/fidel_vsc.cpp b/src/mame/drivers/fidel_vsc.cpp index 7542d07aa62..5dba5bf8982 100644 --- a/src/mame/drivers/fidel_vsc.cpp +++ b/src/mame/drivers/fidel_vsc.cpp @@ -202,8 +202,8 @@ private: // address maps void main_map(address_map &map); void main_io(address_map &map); - DECLARE_READ8_MEMBER(main_io_trampoline_r); - DECLARE_WRITE8_MEMBER(main_io_trampoline_w); + u8 main_io_trampoline_r(offs_t offset); + void main_io_trampoline_w(offs_t offset, u8 data); // periodic interrupts template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); } @@ -211,13 +211,13 @@ private: // I/O handlers void update_display(); - DECLARE_READ8_MEMBER(speech_r); - DECLARE_WRITE8_MEMBER(ppi_porta_w); - DECLARE_WRITE8_MEMBER(ppi_portb_w); - DECLARE_WRITE8_MEMBER(ppi_portc_w); - DECLARE_READ8_MEMBER(pio_porta_r); - DECLARE_READ8_MEMBER(pio_portb_r); - DECLARE_WRITE8_MEMBER(pio_portb_w); + u8 speech_r(offs_t offset); + void ppi_porta_w(u8 data); + void ppi_portb_w(u8 data); + void ppi_portc_w(u8 data); + u8 pio_porta_r(); + u8 pio_portb_r(); + void pio_portb_w(u8 data); u8 m_led_data; u8 m_7seg_data; @@ -260,7 +260,7 @@ void vsc_state::update_display() m_display->matrix(m_cb_mux, m_led_data << 8 | m_7seg_data); } -READ8_MEMBER(vsc_state::speech_r) +u8 vsc_state::speech_r(offs_t offset) { return m_speech_rom[m_speech_bank << 12 | offset]; } @@ -268,7 +268,7 @@ READ8_MEMBER(vsc_state::speech_r) // I8255 PPI -WRITE8_MEMBER(vsc_state::ppi_porta_w) +void vsc_state::ppi_porta_w(u8 data) { // d0-d5: TSI C0-C5 m_speech->data_w(data & 0x3f); @@ -278,14 +278,14 @@ WRITE8_MEMBER(vsc_state::ppi_porta_w) update_display(); } -WRITE8_MEMBER(vsc_state::ppi_portb_w) +void vsc_state::ppi_portb_w(u8 data) { // d0-d7: led row data m_led_data = data; update_display(); } -WRITE8_MEMBER(vsc_state::ppi_portc_w) +void vsc_state::ppi_portc_w(u8 data) { // d0-d3: select digits // d0-d7: select leds, chessboard input mux @@ -296,7 +296,7 @@ WRITE8_MEMBER(vsc_state::ppi_portc_w) // Z80 PIO -READ8_MEMBER(vsc_state::pio_porta_r) +u8 vsc_state::pio_porta_r() { u8 data = 0; @@ -318,7 +318,7 @@ READ8_MEMBER(vsc_state::pio_porta_r) return data; } -READ8_MEMBER(vsc_state::pio_portb_r) +u8 vsc_state::pio_portb_r() { u8 data = 0; @@ -328,7 +328,7 @@ READ8_MEMBER(vsc_state::pio_portb_r) return data; } -WRITE8_MEMBER(vsc_state::pio_portb_w) +void vsc_state::pio_portb_w(u8 data) { // d0,d1: keypad input mux // d5: enable language switch @@ -361,7 +361,7 @@ void vsc_state::main_map(address_map &map) } // VSC io: A2 is 8255 _CE, A3 is Z80 PIO _CE - in theory, both chips can be accessed simultaneously -READ8_MEMBER(vsc_state::main_io_trampoline_r) +u8 vsc_state::main_io_trampoline_r(offs_t offset) { u8 data = 0xff; // open bus if (~offset & 4) @@ -372,7 +372,7 @@ READ8_MEMBER(vsc_state::main_io_trampoline_r) return data; } -WRITE8_MEMBER(vsc_state::main_io_trampoline_w) +void vsc_state::main_io_trampoline_w(offs_t offset, u8 data) { if (~offset & 4) m_ppi8255->write(offset & 3, data); diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index 0e94cf52187..f02cf728002 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -65,7 +65,7 @@ WRITE8_MEMBER(finalizr_state::finalizr_i8039_irq_w) m_audiocpu->set_input_line(0, ASSERT_LINE); } -WRITE8_MEMBER(finalizr_state::i8039_irqen_w) +void finalizr_state::i8039_irqen_w(uint8_t data) { /* bit 0x80 goes active low, indicating that the external IRQ being serviced is complete diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index a184903a2be..972eaa21f96 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -188,7 +188,7 @@ static GFXDECODE_START( gfx_flkatck ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 32 ) GFXDECODE_END -WRITE8_MEMBER(flkatck_state::volume_callback) +void flkatck_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index 30fe9cfb9d9..4db7f63ebb3 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -965,16 +965,6 @@ READ8_MEMBER(fm7_state::fm7_fmirq_r) return ret; } -READ8_MEMBER(fm7_state::fm77av_joy_1_r) -{ - return m_joy1->read(); -} - -READ8_MEMBER(fm7_state::fm77av_joy_2_r) -{ - return m_joy2->read(); -} - READ8_MEMBER(fm7_state::fm7_unknown_r) { // Port 0xFDFC is read by Dig Dug. Controller port, perhaps? @@ -2145,8 +2135,8 @@ void fm7_state::fm77av(machine_config &config) SPEAKER(config, "mono").front_center(); YM2203(config, m_ym, 4.9152_MHz_XTAL / 4); m_ym->irq_handler().set(FUNC(fm7_state::fm77av_fmirq)); - m_ym->port_a_read_callback().set(FUNC(fm7_state::fm77av_joy_1_r)); - m_ym->port_b_read_callback().set(FUNC(fm7_state::fm77av_joy_2_r)); + m_ym->port_a_read_callback().set_ioport("joy1"); + m_ym->port_b_read_callback().set_ioport("joy2"); m_ym->add_route(ALL_OUTPUTS,"mono", 1.00); BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index bea9210ef2f..c9988667c6a 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -656,12 +656,12 @@ WRITE8_MEMBER(towns_state::towns_floppy_w) } } -READ16_MEMBER(towns_state::towns_fdc_dma_r) +uint16_t towns_state::towns_fdc_dma_r() { uint16_t data = m_fdc->data_r(); return data; } -WRITE16_MEMBER(towns_state::towns_fdc_dma_w) +void towns_state::towns_fdc_dma_w(uint16_t data) { m_fdc->data_w(data); } @@ -1734,7 +1734,7 @@ void towns_state::towns_cdrom_execute_command(cdrom_image_device* device) } } -READ16_MEMBER(towns_state::towns_cdrom_dma_r) +uint16_t towns_state::towns_cdrom_dma_r() { if(m_towns_cd.buffer_ptr >= 2048) return 0x00; @@ -2012,12 +2012,12 @@ WRITE_LINE_MEMBER(towns_state::rtc_busy_w) } // SCSI controller - I/O ports 0xc30 and 0xc32 -READ16_MEMBER(towns_state::towns_scsi_dma_r) +uint16_t towns_state::towns_scsi_dma_r() { return m_scsi->fmscsi_data_r(); } -WRITE16_MEMBER(towns_state::towns_scsi_dma_w) +void towns_state::towns_scsi_dma_w(uint16_t data) { m_scsi->fmscsi_data_w(data & 0xff); } @@ -2783,7 +2783,7 @@ void towns_state::machine_reset() m_towns_fm_irq_flag = 0; } -READ8_MEMBER(towns_state::get_slave_ack) +uint8_t towns_state::get_slave_ack(offs_t offset) { if (offset==7) { // IRQ = 7 return m_pic_slave->acknowledge(); diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index af5436ecd82..1987638c7d8 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -38,14 +38,14 @@ private: required_device<isa8_device> m_isabus; required_ioport_array<4> m_inp; - DECLARE_READ8_MEMBER(fruit_inp_r); - DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); + uint8_t fruit_inp_r(offs_t offset); + void dma8237_1_dack_w(uint8_t data); static void fruitpc_sb_conf(device_t *device); void fruitpc_io(address_map &map); void fruitpc_map(address_map &map); }; -READ8_MEMBER(fruitpc_state::fruit_inp_r) +uint8_t fruitpc_state::fruit_inp_r(offs_t offset) { return m_inp[offset & 0x03]->read(); } @@ -98,7 +98,7 @@ static INPUT_PORTS_START( fruitpc ) INPUT_PORTS_END //TODO: use atmb device -WRITE8_MEMBER( fruitpc_state::dma8237_1_dack_w ){ m_isabus->dack_w(1, data); } +void fruitpc_state::dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); } static void fruitpc_isa8_cards(device_slot_interface &device) { diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index e31ae730960..c399dbb34c6 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -658,7 +658,7 @@ * Read/Write Handlers * **********************/ -WRITE8_MEMBER(funworld_state::funworld_lamp_a_w) +void funworld_state::funworld_lamp_a_w(uint8_t data) { /* - bits - 7654 3210 @@ -686,7 +686,7 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_a_w) // popmessage("Lamps A: %02X", (data ^ 0xff)); } -WRITE8_MEMBER(funworld_state::funworld_lamp_b_w) +void funworld_state::funworld_lamp_b_w(uint8_t data) { /* - bits - 7654 3210 @@ -2966,12 +2966,12 @@ GFXDECODE_END */ /* these ports are set to output anyway, but this quietens the log */ -READ8_MEMBER(funworld_state::funquiz_ay8910_a_r) +uint8_t funworld_state::funquiz_ay8910_a_r() { return 0x00; } -READ8_MEMBER(funworld_state::funquiz_ay8910_b_r) +uint8_t funworld_state::funquiz_ay8910_b_r() { return 0x00; } diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp index effd653945a..90009bc79d7 100644 --- a/src/mame/drivers/gaelco3d.cpp +++ b/src/mame/drivers/gaelco3d.cpp @@ -388,7 +388,7 @@ WRITE32_MEMBER(gaelco3d_state::tms_m68k_ram_w) } -WRITE8_MEMBER(gaelco3d_state::tms_iack_w) +void gaelco3d_state::tms_iack_w(offs_t offset, uint8_t data) { if (LOG) logerror("iack_w(%d) - %06X\n", data, offset); @@ -551,7 +551,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(gaelco3d_state::adsp_autobuffer_irq) m_adsp->set_state_int(ADSP2100_I0 + m_adsp_ireg, reg); } -WRITE32_MEMBER(gaelco3d_state::adsp_tx_callback) +void gaelco3d_state::adsp_tx_callback(offs_t offset, uint32_t data) { /* check if it's for SPORT1 */ if (offset != 1) diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index 6c3a47d90bb..83523b472ea 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -759,7 +759,7 @@ WRITE_LINE_MEMBER(galaga_state::nmion_w) m_sub2_nmi_mask = !state; } -WRITE8_MEMBER(galaga_state::out) +void galaga_state::out(uint8_t data) { m_leds[1] = BIT(data, 0); m_leds[0] = BIT(data, 1); @@ -772,7 +772,7 @@ WRITE_LINE_MEMBER(galaga_state::lockout) machine().bookkeeping().coin_lockout_global_w(state); } -READ8_MEMBER(galaga_state::namco_52xx_rom_r) +uint8_t galaga_state::namco_52xx_rom_r(offs_t offset) { uint32_t length = memregion("52xx")->bytes(); //printf("ROM read %04X\n", offset); @@ -787,7 +787,7 @@ READ8_MEMBER(galaga_state::namco_52xx_rom_r) return (offset < length) ? memregion("52xx")->base()[offset] : 0xff; } -READ8_MEMBER(galaga_state::namco_52xx_si_r) +uint8_t galaga_state::namco_52xx_si_r() { /* pulled to GND */ return 0; diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 962de624fa0..caafede0388 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -770,7 +770,7 @@ WRITE8_MEMBER(galaxian_state::konami_ay8910_w) } -WRITE8_MEMBER(galaxian_state::konami_sound_control_w) +void galaxian_state::konami_sound_control_w(uint8_t data) { uint8_t old = m_konami_sound_control; m_konami_sound_control = data; @@ -785,7 +785,7 @@ WRITE8_MEMBER(galaxian_state::konami_sound_control_w) } -READ8_MEMBER(galaxian_state::konami_sound_timer_r) +uint8_t galaxian_state::konami_sound_timer_r() { /* The timer is clocked at KONAMI_SOUND_CLOCK and cascades through a @@ -845,13 +845,13 @@ WRITE8_MEMBER(galaxian_state::konami_sound_filter_w) } -WRITE8_MEMBER(galaxian_state::konami_portc_0_w) +void galaxian_state::konami_portc_0_w(uint8_t data) { logerror("%s:ppi0_portc_w = %02X\n", machine().describe_context(), data); } -WRITE8_MEMBER(galaxian_state::konami_portc_1_w) +void galaxian_state::konami_portc_1_w(uint8_t data) { logerror("%s:ppi1_portc_w = %02X\n", machine().describe_context(), data); } @@ -881,13 +881,13 @@ WRITE8_MEMBER(galaxian_state::theend_ppi8255_w) } -WRITE8_MEMBER(galaxian_state::theend_coin_counter_w) +void galaxian_state::theend_coin_counter_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x80); } -WRITE8_MEMBER(galaxian_state::theend_protection_w) +void galaxian_state::theend_protection_w(uint8_t data) { /* Handled by a PAL16VR8(?) at 6J. Both inputs and outputs are a nibble. @@ -926,7 +926,7 @@ WRITE8_MEMBER(galaxian_state::theend_protection_w) } -READ8_MEMBER(galaxian_state::theend_protection_r) +uint8_t galaxian_state::theend_protection_r() { return m_protection_result; } @@ -954,7 +954,7 @@ WRITE8_MEMBER(galaxian_state::explorer_sound_control_w) } -READ8_MEMBER(galaxian_state::explorer_sound_latch_r) +uint8_t galaxian_state::explorer_sound_latch_r() { m_audiocpu->set_input_line(0, CLEAR_LINE); return m_soundlatch->read(); @@ -985,7 +985,7 @@ WRITE8_MEMBER(galaxian_state::sfx_sample_io_w) } -WRITE8_MEMBER(galaxian_state::sfx_sample_control_w) +void galaxian_state::sfx_sample_control_w(uint8_t data) { uint8_t old = m_sfx_sample_control; m_sfx_sample_control = data; @@ -1030,7 +1030,7 @@ void galaxian_state::monsterz_set_latch() } -WRITE8_MEMBER(galaxian_state::monsterz_porta_1_w) +void galaxian_state::monsterz_porta_1_w(uint8_t data) { // d7 high: set latch + advance address high bits (and reset low bits?) if (data & 0x80) @@ -1040,7 +1040,7 @@ WRITE8_MEMBER(galaxian_state::monsterz_porta_1_w) } } -WRITE8_MEMBER(galaxian_state::monsterz_portb_1_w) +void galaxian_state::monsterz_portb_1_w(uint8_t data) { // d3 high: set latch + advance address low bits if (data & 0x08) @@ -1050,7 +1050,7 @@ WRITE8_MEMBER(galaxian_state::monsterz_portb_1_w) } } -WRITE8_MEMBER(galaxian_state::monsterz_portc_1_w) +void galaxian_state::monsterz_portc_1_w(uint8_t data) { } @@ -1098,10 +1098,10 @@ WRITE8_MEMBER(galaxian_state::frogger_ay8910_w) } -READ8_MEMBER(galaxian_state::frogger_sound_timer_r) +uint8_t galaxian_state::frogger_sound_timer_r() { /* same as regular Konami sound but with bits 3,5 swapped */ - uint8_t konami_value = konami_sound_timer_r(space, 0); + uint8_t konami_value = konami_sound_timer_r(); return bitswap<8>(konami_value, 7,6,3,4,5,2,1,0); } @@ -1186,7 +1186,7 @@ WRITE8_MEMBER(galaxian_state::scorpion_ay8910_w) } -READ8_MEMBER(galaxian_state::scorpion_protection_r) +uint8_t galaxian_state::scorpion_protection_r() { uint16_t paritybits; uint8_t parity = 0; @@ -1201,7 +1201,7 @@ READ8_MEMBER(galaxian_state::scorpion_protection_r) } -WRITE8_MEMBER(galaxian_state::scorpion_protection_w) +void galaxian_state::scorpion_protection_w(uint8_t data) { /* bit 5 low is a reset */ if (!(data & 0x20)) @@ -1211,7 +1211,7 @@ WRITE8_MEMBER(galaxian_state::scorpion_protection_w) if (!(data & 0x10)) { /* each clock shifts left one bit and ORs in the inverse of the parity */ - m_protection_state = (m_protection_state << 1) | (~scorpion_protection_r(space, 0) & 1); + m_protection_state = (m_protection_state << 1) | (~scorpion_protection_r() & 1); } } @@ -1220,7 +1220,7 @@ READ8_MEMBER(galaxian_state::scorpion_digitalker_intr_r) return m_digitalker->digitalker_0_intr_r(); } -WRITE8_MEMBER(galaxian_state::scorpion_digitalker_control_w) +void galaxian_state::scorpion_digitalker_control_w(uint8_t data) { m_digitalker->digitalker_0_cs_w(data & 1 ? ASSERT_LINE : CLEAR_LINE); m_digitalker->digitalker_0_cms_w(data & 2 ? ASSERT_LINE : CLEAR_LINE); @@ -1486,7 +1486,7 @@ READ8_MEMBER(galaxian_state::dingoe_3001_r) * *************************************/ -WRITE8_MEMBER(galaxian_state::moonwar_port_select_w) +void galaxian_state::moonwar_port_select_w(uint8_t data) { m_moonwar_port_select = data & 0x10; } diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index 8e63b24593b..fbb59b0cd2b 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -91,7 +91,7 @@ TODO: * *************************************/ -WRITE8_MEMBER(gameplan_state::io_select_w) +void gameplan_state::io_select_w(uint8_t data) { switch (data) { @@ -105,7 +105,7 @@ WRITE8_MEMBER(gameplan_state::io_select_w) } -READ8_MEMBER(gameplan_state::io_port_r) +uint8_t gameplan_state::io_port_r() { static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3", "DSW0", "DSW1" }; @@ -138,7 +138,7 @@ WRITE_LINE_MEMBER(gameplan_state::audio_reset_w) } -WRITE8_MEMBER(gameplan_state::audio_cmd_w) +void gameplan_state::audio_cmd_w(uint8_t data) { m_riot->porta_in_set(data, 0x7f); } @@ -165,11 +165,6 @@ WRITE_LINE_MEMBER(gameplan_state::r6532_irq) } -WRITE8_MEMBER(gameplan_state::r6532_soundlatch_w) -{ - m_soundlatch->write(data); -} - /************************************* * @@ -967,7 +962,7 @@ void gameplan_state::gameplan(machine_config &config) m_audiocpu->set_addrmap(AS_PROGRAM, &gameplan_state::gameplan_audio_map); RIOT6532(config, m_riot, GAMEPLAN_AUDIO_CPU_CLOCK); - m_riot->out_pb_callback().set(FUNC(gameplan_state::r6532_soundlatch_w)); + m_riot->out_pb_callback().set(m_soundlatch, FUNC(generic_latch_8_device::write)); m_riot->irq_callback().set(FUNC(gameplan_state::r6532_irq)); /* video hardware */ diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index 8c0630c1db3..3188074a7e9 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -484,7 +484,7 @@ static const char *const gaplus_sample_names[] = ***************************************************************************/ -WRITE8_MEMBER(gaplus_state::out_lamps0) +void gaplus_state::out_lamps0(uint8_t data) { m_lamps[0] = BIT(data, 0); m_lamps[1] = BIT(data, 1); @@ -492,7 +492,7 @@ WRITE8_MEMBER(gaplus_state::out_lamps0) machine().bookkeeping().coin_counter_w(0, ~data & 8); } -WRITE8_MEMBER(gaplus_state::out_lamps1) +void gaplus_state::out_lamps1(uint8_t data) { machine().bookkeeping().coin_counter_w(1, ~data & 1); } diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index 78c4691b1c3..ac428dd0e67 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -345,7 +345,7 @@ * Read/Write Handlers * ****************************/ -WRITE8_MEMBER(gatron_state::output_port_0_w) +void gatron_state::output_port_0_w(uint8_t data) { /*--------------- Poker 4-1 lamps @@ -422,7 +422,7 @@ WRITE8_MEMBER(gatron_state::output_port_0_w) } -WRITE8_MEMBER(gatron_state::output_port_1_w) +void gatron_state::output_port_1_w(uint8_t data) { /*---------------- Lamps & Counters diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index 578c4373e6d..76e5f116817 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -34,17 +34,17 @@ public: private: void gmaster_palette(palette_device &palette) const; - DECLARE_READ8_MEMBER(gmaster_io_r); - DECLARE_WRITE8_MEMBER(gmaster_io_w); - DECLARE_READ8_MEMBER(gmaster_portb_r); - DECLARE_READ8_MEMBER(gmaster_portc_r); - DECLARE_READ8_MEMBER(gmaster_portd_r); - DECLARE_READ8_MEMBER(gmaster_portf_r); - DECLARE_WRITE8_MEMBER(gmaster_porta_w); - DECLARE_WRITE8_MEMBER(gmaster_portb_w); - DECLARE_WRITE8_MEMBER(gmaster_portc_w); - DECLARE_WRITE8_MEMBER(gmaster_portd_w); - DECLARE_WRITE8_MEMBER(gmaster_portf_w); + uint8_t gmaster_io_r(offs_t offset); + void gmaster_io_w(offs_t offset, uint8_t data); + uint8_t gmaster_portb_r(); + uint8_t gmaster_portc_r(); + uint8_t gmaster_portd_r(); + uint8_t gmaster_portf_r(); + void gmaster_porta_w(uint8_t data); + void gmaster_portb_w(uint8_t data); + void gmaster_portc_w(uint8_t data); + void gmaster_portd_w(uint8_t data); + void gmaster_portf_w(uint8_t data); uint32_t screen_update_gmaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void gmaster_mem(address_map &map); @@ -68,7 +68,7 @@ private: }; -READ8_MEMBER(gmaster_state::gmaster_io_r) +uint8_t gmaster_state::gmaster_io_r(offs_t offset) { uint8_t data = 0; @@ -101,7 +101,7 @@ READ8_MEMBER(gmaster_state::gmaster_io_r) #define BLITTER_Y ((m_ports[2]&4)|(m_video.data[0]&3)) -WRITE8_MEMBER(gmaster_state::gmaster_io_w) +void gmaster_state::gmaster_io_w(offs_t offset, uint8_t data) { if (m_ports[2] & 1) { @@ -164,7 +164,7 @@ WRITE8_MEMBER(gmaster_state::gmaster_io_w) } -READ8_MEMBER(gmaster_state::gmaster_portb_r) +uint8_t gmaster_state::gmaster_portb_r() { // uint8_t data = m_ports[1]; uint8_t data = 0xff; @@ -174,7 +174,7 @@ READ8_MEMBER(gmaster_state::gmaster_portb_r) return data; } -READ8_MEMBER(gmaster_state::gmaster_portc_r) +uint8_t gmaster_state::gmaster_portc_r() { // uint8_t data = m_ports[2]; uint8_t data = 0xff; @@ -184,7 +184,7 @@ READ8_MEMBER(gmaster_state::gmaster_portc_r) return data; } -READ8_MEMBER(gmaster_state::gmaster_portd_r) +uint8_t gmaster_state::gmaster_portd_r() { // uint8_t data = m_ports[3]; uint8_t data = 0xff; @@ -194,7 +194,7 @@ READ8_MEMBER(gmaster_state::gmaster_portd_r) return data; } -READ8_MEMBER(gmaster_state::gmaster_portf_r) +uint8_t gmaster_state::gmaster_portf_r() { // uint8_t data = m_ports[4]; uint8_t data = 0xff; @@ -205,19 +205,19 @@ READ8_MEMBER(gmaster_state::gmaster_portf_r) } -WRITE8_MEMBER(gmaster_state::gmaster_porta_w) +void gmaster_state::gmaster_porta_w(uint8_t data) { m_ports[0] = data; logerror("%.4x port A written %.2x\n", m_maincpu->pc(), data); } -WRITE8_MEMBER(gmaster_state::gmaster_portb_w) +void gmaster_state::gmaster_portb_w(uint8_t data) { m_ports[1] = data; logerror("%.4x port B written %.2x\n", m_maincpu->pc(), data); } -WRITE8_MEMBER(gmaster_state::gmaster_portc_w) +void gmaster_state::gmaster_portc_w(uint8_t data) { m_ports[2] = data; logerror("%.4x port C written %.2x\n", m_maincpu->pc(), data); @@ -226,13 +226,13 @@ WRITE8_MEMBER(gmaster_state::gmaster_portc_w) m_speaker->level_w(BIT(data, 4)); } -WRITE8_MEMBER(gmaster_state::gmaster_portd_w) +void gmaster_state::gmaster_portd_w(uint8_t data) { m_ports[3] = data; logerror("%.4x port D written %.2x\n", m_maincpu->pc(), data); } -WRITE8_MEMBER(gmaster_state::gmaster_portf_w) +void gmaster_state::gmaster_portf_w(uint8_t data) { m_ports[4] = data; logerror("%.4x port F written %.2x\n", m_maincpu->pc(), data); diff --git a/src/mame/drivers/goldart.cpp b/src/mame/drivers/goldart.cpp index cd2387a53f0..b7d4601ee19 100644 --- a/src/mame/drivers/goldart.cpp +++ b/src/mame/drivers/goldart.cpp @@ -70,8 +70,8 @@ private: required_device<palette_device> m_palette; required_region_ptr<uint8_t> m_data; - DECLARE_WRITE8_MEMBER(mcu_port1_w); - DECLARE_READ8_MEMBER(mcu_port1_r); + void mcu_port1_w(uint8_t data); + uint8_t mcu_port1_r(); uint32_t screen_update_goldart(screen_device& screen, bitmap_ind16& bitmap, const rectangle& cliprect); @@ -87,13 +87,13 @@ private: DECLARE_WRITE8_MEMBER(hostmem_w); }; -WRITE8_MEMBER(goldart_state::mcu_port1_w) +void goldart_state::mcu_port1_w(uint8_t data) { logerror("%s: mcu_port1_w %02x\n", machine().describe_context(), data); m_port1 = data; } -READ8_MEMBER(goldart_state::mcu_port1_r) +uint8_t goldart_state::mcu_port1_r() { uint8_t ret = m_port1; logerror("%s: mcu_port1_r %02x\n", machine().describe_context(), ret); diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 19c29292fbd..300d8b799f0 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -1106,7 +1106,7 @@ WRITE8_MEMBER(wingco_state::magodds_outb860_w) // popmessage("magodds_outb860_w %02x\n", data); } -WRITE8_MEMBER(wingco_state::fl7w4_outc802_w) +void wingco_state::fl7w4_outc802_w(uint8_t data) { m_fl7w4_id->write((data >> 6) & 0x01); } @@ -8509,19 +8509,19 @@ static GFXDECODE_START( gfx_cm97 ) GFXDECODE_END -WRITE8_MEMBER(wingco_state::system_outputa_w) +void wingco_state::system_outputa_w(uint8_t data) { //popmessage("system_outputa_w %02x",data); } -WRITE8_MEMBER(wingco_state::system_outputb_w) +void wingco_state::system_outputb_w(uint8_t data) { //popmessage("system_outputb_w %02x",data); } -WRITE8_MEMBER(wingco_state::system_outputc_w) +void wingco_state::system_outputc_w(uint8_t data) { m_nmi_enable = data & 8; m_vidreg = data & 2; @@ -8531,12 +8531,12 @@ WRITE8_MEMBER(wingco_state::system_outputc_w) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE8_MEMBER(goldstar_state::ay8910_outputa_w) +void goldstar_state::ay8910_outputa_w(uint8_t data) { //popmessage("ay8910_outputa_w %02x",data); } -WRITE8_MEMBER(goldstar_state::ay8910_outputb_w) +void goldstar_state::ay8910_outputb_w(uint8_t data) { //popmessage("ay8910_outputb_w %02x",data); } diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index 06aacaae97e..33a3aef3e68 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -233,7 +233,7 @@ static INPUT_PORTS_START( gradius3 ) INPUT_PORTS_END -WRITE8_MEMBER(gradius3_state::volume_callback) +void gradius3_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index 76cafe36e3d..20feb659669 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -98,17 +98,17 @@ private: DECLARE_READ16_MEMBER(tms34061_r); uint32_t screen_update_guab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(output1_w); - DECLARE_WRITE8_MEMBER(output2_w); - DECLARE_WRITE8_MEMBER(output3_w); - DECLARE_WRITE8_MEMBER(output4_w); - DECLARE_WRITE8_MEMBER(output5_w); - DECLARE_WRITE8_MEMBER(output6_w); - DECLARE_READ8_MEMBER(sn76489_ready_r); - DECLARE_WRITE8_MEMBER(sn76489_buffer_w); - DECLARE_WRITE8_MEMBER(system_w); - DECLARE_READ8_MEMBER(watchdog_r); - DECLARE_WRITE8_MEMBER(watchdog_w); + void output1_w(uint8_t data); + void output2_w(uint8_t data); + void output3_w(uint8_t data); + void output4_w(uint8_t data); + void output5_w(uint8_t data); + void output6_w(uint8_t data); + uint8_t sn76489_ready_r(); + void sn76489_buffer_w(uint8_t data); + void system_w(uint8_t data); + uint8_t watchdog_r(); + void watchdog_w(uint8_t data); DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -313,20 +313,20 @@ void guab_state::machine_start() m_fdc->set_floppy(m_floppy->get_device()); } -READ8_MEMBER( guab_state::watchdog_r ) +uint8_t guab_state::watchdog_r() { // only read after writing the sequence below return 0xff; } -WRITE8_MEMBER( guab_state::watchdog_w ) +void guab_state::watchdog_w(uint8_t data) { // watchdog? // writes b 3 1 5 d a 2 0 4 0 8 b 3 1 5 d a 2 0 4 0 8 // then later toggles between 0 and f } -WRITE8_MEMBER( guab_state::system_w ) +void guab_state::system_w(uint8_t data) { // bit 0, sound latch if (m_sound_latch != bool(BIT(data, 0))) @@ -363,7 +363,7 @@ INPUT_CHANGED_MEMBER( guab_state::coin_inserted ) } } -WRITE8_MEMBER( guab_state::output1_w ) +void guab_state::output1_w(uint8_t data) { m_leds[0] = BIT(data, 0); // cash in (ten up: cash in) m_leds[1] = BIT(data, 1); // cash out (ten up: cash out) @@ -375,7 +375,7 @@ WRITE8_MEMBER( guab_state::output1_w ) m_leds[7] = BIT(data, 7); } -WRITE8_MEMBER( guab_state::output2_w ) +void guab_state::output2_w(uint8_t data) { m_leds[8] = BIT(data, 0); m_leds[9] = BIT(data, 1); @@ -387,7 +387,7 @@ WRITE8_MEMBER( guab_state::output2_w ) m_leds[15] = BIT(data, 7); // lamp b (ten up: pass) } -WRITE8_MEMBER( guab_state::output3_w ) +void guab_state::output3_w(uint8_t data) { m_leds[16] = BIT(data, 0); // select (ten up: collect) m_leds[17] = BIT(data, 1); // (ten up: feature 14) @@ -399,7 +399,7 @@ WRITE8_MEMBER( guab_state::output3_w ) m_leds[23] = BIT(data, 7); } -WRITE8_MEMBER( guab_state::output4_w ) +void guab_state::output4_w(uint8_t data) { m_leds[24] = BIT(data, 0); // feature 1 (ten up: feature 1) m_leds[25] = BIT(data, 1); // feature 2 (ten up: feature 10) @@ -411,7 +411,7 @@ WRITE8_MEMBER( guab_state::output4_w ) m_leds[31] = BIT(data, 7); // feature 8 (ten up: feature 5) } -WRITE8_MEMBER( guab_state::output5_w ) +void guab_state::output5_w(uint8_t data) { m_leds[32] = BIT(data, 0); m_leds[33] = BIT(data, 1); @@ -423,7 +423,7 @@ WRITE8_MEMBER( guab_state::output5_w ) m_leds[39] = BIT(data, 7); // mech lamp (ten up: mech lamp) } -WRITE8_MEMBER( guab_state::output6_w ) +void guab_state::output6_w(uint8_t data) { m_leds[40] = BIT(data, 0); m_leds[41] = BIT(data, 1); @@ -449,13 +449,13 @@ DEVICE_INPUT_DEFAULTS_END // AUDIO //************************************************************************** -READ8_MEMBER( guab_state::sn76489_ready_r ) +uint8_t guab_state::sn76489_ready_r() { // bit 7 connected to sn76489 ready output (0 = ready) return ~(m_sn->ready_r() << 7); } -WRITE8_MEMBER( guab_state::sn76489_buffer_w ) +void guab_state::sn76489_buffer_w(uint8_t data) { m_sound_buffer = data; } diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp index 198a7707af5..473281d7ed0 100644 --- a/src/mame/drivers/gyruss.cpp +++ b/src/mame/drivers/gyruss.cpp @@ -111,23 +111,23 @@ static const int gyruss_timer[10] = 0x00, 0x01, 0x02, 0x03, 0x04, 0x09, 0x0a, 0x0b, 0x0a, 0x0d }; -READ8_MEMBER(gyruss_state::gyruss_portA_r) +uint8_t gyruss_state::gyruss_portA_r() { return gyruss_timer[(m_audiocpu->total_cycles() / 1024) % 10]; } -WRITE8_MEMBER(gyruss_state::gyruss_dac_w) +void gyruss_state::gyruss_dac_w(uint8_t data) { m_discrete->write(NODE(16), data); } -WRITE8_MEMBER(gyruss_state::gyruss_irq_clear_w) +void gyruss_state::gyruss_irq_clear_w(uint8_t data) { m_audiocpu_2->set_input_line(0, CLEAR_LINE); } -void gyruss_state::filter_w(address_space &space, int chip, int data ) +void gyruss_state::filter_w(int chip, int data ) { //printf("chip %d - %02x\n", chip, data); for (int i = 0; i < 3; i++) @@ -139,24 +139,24 @@ void gyruss_state::filter_w(address_space &space, int chip, int data ) } } -WRITE8_MEMBER(gyruss_state::gyruss_filter0_w) +void gyruss_state::gyruss_filter0_w(uint8_t data) { - filter_w(space, 0, data); + filter_w(0, data); } -WRITE8_MEMBER(gyruss_state::gyruss_filter1_w) +void gyruss_state::gyruss_filter1_w(uint8_t data) { - filter_w(space, 1, data); + filter_w(1, data); } -WRITE8_MEMBER(gyruss_state::gyruss_sh_irqtrigger_w) +void gyruss_state::gyruss_sh_irqtrigger_w(uint8_t data) { /* writing to this register triggers IRQ on the sound CPU */ m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -WRITE8_MEMBER(gyruss_state::gyruss_i8039_irq_w) +void gyruss_state::gyruss_i8039_irq_w(uint8_t data) { m_audiocpu_2->set_input_line(0, ASSERT_LINE); } @@ -168,7 +168,7 @@ WRITE_LINE_MEMBER(gyruss_state::master_nmi_mask_w) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE8_MEMBER(gyruss_state::slave_irq_mask_w) +void gyruss_state::slave_irq_mask_w(uint8_t data) { m_slave_irq_mask = data & 1; if (!m_slave_irq_mask) diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index 3798c8fc3c4..61224c0f22d 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -78,7 +78,7 @@ private: DECLARE_READ8_MEMBER(portf0_r); DECLARE_WRITE8_MEMBER(portf0_w); DECLARE_WRITE8_MEMBER(portf1_w); - DECLARE_WRITE8_MEMBER(h8_status_callback); + void h8_status_callback(uint8_t data); DECLARE_WRITE_LINE_MEMBER(h8_inte_callback); TIMER_DEVICE_CALLBACK_MEMBER(h8_irq_pulse); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); @@ -258,7 +258,7 @@ WRITE_LINE_MEMBER( h8_state::h8_inte_callback ) m_irq_ctl &= 0x7f | ((state) ? 0 : 0x80); } -WRITE8_MEMBER( h8_state::h8_status_callback ) +void h8_state::h8_status_callback(uint8_t data) { /* This is rather messy, but basically there are 2 D flipflops, one drives the other, the data is /INTE while the clock is /M1. If the system is in Single Instruction mode, diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 65097d75925..a0f37eefb02 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -158,7 +158,7 @@ GFXDECODE_END /*****************************************************************************/ -WRITE8_MEMBER(hcastle_state::volume_callback) +void hcastle_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index fa5c8bc14cf..cc0d76738e6 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -115,7 +115,7 @@ WRITE_LINE_MEMBER(hexion_state::nmi_ack_w) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE8_MEMBER(hexion_state::ccu_int_time_w) +void hexion_state::ccu_int_time_w(uint8_t data) { logerror("ccu_int_time rewritten with value of %02x\n", data); m_ccu_int_time = data; diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index def4ce9a854..db020140c25 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -271,15 +271,15 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u8 input_r(); void bambball(machine_config &config); }; // handlers -WRITE8_MEMBER(bambball_state::plate_w) +void bambball_state::plate_w(offs_t offset, u8 data) { // R1x-R3x(,D0-D3): vfd plate int shift = (offset - 1) * 4; @@ -290,7 +290,7 @@ WRITE8_MEMBER(bambball_state::plate_w) m_display->matrix(m_grid, plate); } -WRITE16_MEMBER(bambball_state::grid_w) +void bambball_state::grid_w(u16 data) { // D4: speaker out m_speaker->level_w(data >> 4 & 1); @@ -302,10 +302,10 @@ WRITE16_MEMBER(bambball_state::grid_w) m_grid = data >> 7 & 0x1ff; // D0-D3: more plates (update display there) - plate_w(space, 3 + 1, data & 0xf); + plate_w(3 + 1, data & 0xf); } -READ8_MEMBER(bambball_state::input_r) +u8 bambball_state::input_r() { // R0x: multiplexed inputs return read_inputs(4); @@ -396,9 +396,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u8 input_r(); void bmboxing(machine_config &config); }; @@ -411,7 +411,7 @@ void bmboxing_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(bmboxing_state::plate_w) +void bmboxing_state::plate_w(offs_t offset, u8 data) { // R1x-R3x: vfd plate int shift = (offset - 1) * 4; @@ -419,7 +419,7 @@ WRITE8_MEMBER(bmboxing_state::plate_w) update_display(); } -WRITE16_MEMBER(bmboxing_state::grid_w) +void bmboxing_state::grid_w(u16 data) { // D13: speaker out m_speaker->level_w(data >> 13 & 1); @@ -432,7 +432,7 @@ WRITE16_MEMBER(bmboxing_state::grid_w) update_display(); } -READ8_MEMBER(bmboxing_state::input_r) +u8 bmboxing_state::input_r() { // R0x: multiplexed inputs return read_inputs(4); @@ -543,8 +543,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); } @@ -560,7 +560,7 @@ void bfriskyt_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(bfriskyt_state::plate_w) +void bfriskyt_state::plate_w(offs_t offset, u8 data) { // R0x-R3x: vfd plate int shift = offset * 4; @@ -568,7 +568,7 @@ WRITE8_MEMBER(bfriskyt_state::plate_w) update_display(); } -WRITE16_MEMBER(bfriskyt_state::grid_w) +void bfriskyt_state::grid_w(u16 data) { // D6: speaker out m_speaker->level_w(data >> 6 & 1); @@ -677,15 +677,15 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ16_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u16 input_r(); void packmon(machine_config &config); }; // handlers -WRITE8_MEMBER(packmon_state::plate_w) +void packmon_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D0-D3): vfd plate int shift = offset * 4; @@ -697,7 +697,7 @@ WRITE8_MEMBER(packmon_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(packmon_state::grid_w) +void packmon_state::grid_w(u16 data) { // D4: speaker out m_speaker->level_w(data >> 4 & 1); @@ -709,10 +709,10 @@ WRITE16_MEMBER(packmon_state::grid_w) m_grid = data >> 6 & 0x3ff; // D0-D3: plate 9-12 (update display there) - plate_w(space, 4, data & 0xf); + plate_w(4, data & 0xf); } -READ16_MEMBER(packmon_state::input_r) +u16 packmon_state::input_r() { // D5: multiplexed inputs return read_inputs(5) & 0x20; @@ -794,8 +794,8 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); } @@ -804,7 +804,7 @@ public: // handlers -WRITE8_MEMBER(bzaxxon_state::plate_w) +void bzaxxon_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D0-D2): vfd plate int shift = offset * 4; @@ -816,7 +816,7 @@ WRITE8_MEMBER(bzaxxon_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(bzaxxon_state::grid_w) +void bzaxxon_state::grid_w(u16 data) { // D4: speaker out m_speaker->level_w(data >> 4 & 1); @@ -833,7 +833,7 @@ WRITE16_MEMBER(bzaxxon_state::grid_w) m_grid = data >> 5 & 0x7ff; // D0-D2: plate 7-9 (update display there) - plate_w(space, 4, data & 7); + plate_w(4, data & 7); } void bzaxxon_state::update_int1() @@ -919,8 +919,8 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); } @@ -929,7 +929,7 @@ public: // handlers -WRITE8_MEMBER(zackman_state::plate_w) +void zackman_state::plate_w(offs_t offset, u8 data) { // R0x-R6x(,D0,D1): vfd plate int shift = offset * 4; @@ -941,7 +941,7 @@ WRITE8_MEMBER(zackman_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(zackman_state::grid_w) +void zackman_state::grid_w(u16 data) { // D2: speaker out m_speaker->level_w(data >> 2 & 1); @@ -958,7 +958,7 @@ WRITE16_MEMBER(zackman_state::grid_w) m_grid = data >> 8 & 0xff; // D0,D1: plate 12,13 (update display there) - plate_w(space, 7, data & 3); + plate_w(7, data & 3); } void zackman_state::update_int0() @@ -1044,8 +1044,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); } @@ -1061,7 +1061,7 @@ void bpengo_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(bpengo_state::plate_w) +void bpengo_state::plate_w(offs_t offset, u8 data) { // R0x-R6x: vfd plate int shift = offset * 4; @@ -1069,7 +1069,7 @@ WRITE8_MEMBER(bpengo_state::plate_w) update_display(); } -WRITE16_MEMBER(bpengo_state::grid_w) +void bpengo_state::grid_w(u16 data) { // D10: speaker out m_speaker->level_w(data >> 10 & 1); @@ -1177,8 +1177,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); } @@ -1194,7 +1194,7 @@ void bbtime_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(bbtime_state::plate_w) +void bbtime_state::plate_w(offs_t offset, u8 data) { // R0x-R6x: vfd plate int shift = offset * 4; @@ -1202,7 +1202,7 @@ WRITE8_MEMBER(bbtime_state::plate_w) update_display(); } -WRITE16_MEMBER(bbtime_state::grid_w) +void bbtime_state::grid_w(u16 data) { // D3: speaker out m_speaker->level_w(data >> 3 & 1); @@ -1305,14 +1305,14 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void bdoramon(machine_config &config); }; // handlers -WRITE8_MEMBER(bdoramon_state::plate_w) +void bdoramon_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D0-D3): vfd plate int shift = offset * 4; @@ -1324,7 +1324,7 @@ WRITE8_MEMBER(bdoramon_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(bdoramon_state::grid_w) +void bdoramon_state::grid_w(u16 data) { // D7: speaker out m_speaker->level_w(data >> 7 & 1); @@ -1333,7 +1333,7 @@ WRITE16_MEMBER(bdoramon_state::grid_w) m_grid = data >> 8 & 0xff; // D0-D3: plate 15-18 (update display there) - plate_w(space, 4, data & 0xf); + plate_w(4, data & 0xf); } // config @@ -1414,14 +1414,14 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void bultrman(machine_config &config); }; // handlers -WRITE8_MEMBER(bultrman_state::plate_w) +void bultrman_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D0-D2): vfd plate int shift = offset * 4; @@ -1433,7 +1433,7 @@ WRITE8_MEMBER(bultrman_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(bultrman_state::grid_w) +void bultrman_state::grid_w(u16 data) { // D7: speaker out m_speaker->level_w(data >> 7 & 1); @@ -1442,7 +1442,7 @@ WRITE16_MEMBER(bultrman_state::grid_w) m_grid = data >> 8 & 0xff; // D0-D2: plate 15-17 (update display there) - plate_w(space, 4, data & 7); + plate_w(4, data & 7); } // config @@ -1516,8 +1516,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void machiman(machine_config &config); }; @@ -1529,7 +1529,7 @@ void machiman_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(machiman_state::plate_w) +void machiman_state::plate_w(offs_t offset, u8 data) { // R0x-R3x,R6012: vfd plate int shift = (offset == 6) ? 16 : offset * 4; @@ -1537,7 +1537,7 @@ WRITE8_MEMBER(machiman_state::plate_w) update_display(); } -WRITE16_MEMBER(machiman_state::grid_w) +void machiman_state::grid_w(u16 data) { // D13: speaker out m_speaker->level_w(data >> 13 & 1); @@ -1626,13 +1626,13 @@ public: required_device_array<generic_latch_8_device, 2> m_soundlatch; void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u8 input_r(); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(sound2_w); - DECLARE_WRITE16_MEMBER(speaker_w); + void sound_w(u8 data); + void sound2_w(u8 data); + void speaker_w(u16 data); void pairmtch(machine_config &config); }; @@ -1643,7 +1643,7 @@ void pairmtch_state::update_display() m_display->matrix(m_grid, m_plate); } -WRITE8_MEMBER(pairmtch_state::plate_w) +void pairmtch_state::plate_w(offs_t offset, u8 data) { // R2x,R3x,R6x: vfd plate int shift = (offset == 6) ? 8 : (offset-2) * 4; @@ -1651,7 +1651,7 @@ WRITE8_MEMBER(pairmtch_state::plate_w) update_display(); } -WRITE16_MEMBER(pairmtch_state::grid_w) +void pairmtch_state::grid_w(u16 data) { // D7: sound reset (to audiocpu reset line) m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x80) ? ASSERT_LINE : CLEAR_LINE); @@ -1667,13 +1667,13 @@ WRITE16_MEMBER(pairmtch_state::grid_w) update_display(); } -READ8_MEMBER(pairmtch_state::input_r) +u8 pairmtch_state::input_r() { // R4x: multiplexed inputs return read_inputs(2); } -WRITE8_MEMBER(pairmtch_state::sound_w) +void pairmtch_state::sound_w(u8 data) { // R5x: soundlatch (to audiocpu R2x) m_soundlatch[0]->write(bitswap<8>(data,7,6,5,4,0,1,2,3)); @@ -1681,13 +1681,13 @@ WRITE8_MEMBER(pairmtch_state::sound_w) // handlers: audiocpu side -WRITE8_MEMBER(pairmtch_state::sound2_w) +void pairmtch_state::sound2_w(u8 data) { // R2x: soundlatch (to maincpu R5x) m_soundlatch[1]->write(bitswap<8>(data,7,6,5,4,0,1,2,3)); } -WRITE16_MEMBER(pairmtch_state::speaker_w) +void pairmtch_state::speaker_w(u16 data) { // D0: speaker out m_speaker->level_w(data & 1); @@ -1793,15 +1793,15 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ16_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u16 input_r(); void alnattck(machine_config &config); }; // handlers -WRITE8_MEMBER(alnattck_state::plate_w) +void alnattck_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D0-D3): vfd plate int shift = offset * 4; @@ -1812,7 +1812,7 @@ WRITE8_MEMBER(alnattck_state::plate_w) m_display->matrix(m_grid, plate); } -WRITE16_MEMBER(alnattck_state::grid_w) +void alnattck_state::grid_w(u16 data) { // D4: speaker out m_speaker->level_w(data >> 4 & 1); @@ -1824,10 +1824,10 @@ WRITE16_MEMBER(alnattck_state::grid_w) m_grid = data >> 6 & 0x3ff; // D0-D3: plate 16-19 (update display there) - plate_w(space, 4, data & 0xf); + plate_w(4, data & 0xf); } -READ16_MEMBER(alnattck_state::input_r) +u16 alnattck_state::input_r() { // D5: multiplexed inputs return read_inputs(7) & 0x20; @@ -1917,8 +1917,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void speaker_update(); TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); @@ -1962,7 +1962,7 @@ void cdkong_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(cdkong_state::plate_w) +void cdkong_state::plate_w(offs_t offset, u8 data) { // R13: speaker on m_r[offset] = data; @@ -1974,7 +1974,7 @@ WRITE8_MEMBER(cdkong_state::plate_w) update_display(); } -WRITE16_MEMBER(cdkong_state::grid_w) +void cdkong_state::grid_w(u16 data) { // D3: speaker out m_d = data; @@ -2073,9 +2073,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE16_MEMBER(plate_w); - DECLARE_READ8_MEMBER(input_r); + void grid_w(offs_t offset, u8 data); + void plate_w(u16 data); + u8 input_r(); DECLARE_INPUT_CHANGED_MEMBER(player_switch); void cgalaxn(machine_config &config); @@ -2097,7 +2097,7 @@ INPUT_CHANGED_MEMBER(cgalaxn_state::player_switch) update_display(); } -WRITE8_MEMBER(cgalaxn_state::grid_w) +void cgalaxn_state::grid_w(offs_t offset, u8 data) { // R10,R11: input mux if (offset == 1) @@ -2109,7 +2109,7 @@ WRITE8_MEMBER(cgalaxn_state::grid_w) update_display(); } -WRITE16_MEMBER(cgalaxn_state::plate_w) +void cgalaxn_state::plate_w(u16 data) { // D0: speaker out m_speaker->level_w(data & 1); @@ -2121,7 +2121,7 @@ WRITE16_MEMBER(cgalaxn_state::plate_w) update_display(); } -READ8_MEMBER(cgalaxn_state::input_r) +u8 cgalaxn_state::input_r() { // R0x: multiplexed inputs return read_inputs(2); @@ -2215,15 +2215,15 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u8 input_r(); void cpacman(machine_config &config); }; // handlers -WRITE8_MEMBER(cpacman_state::plate_w) +void cpacman_state::plate_w(offs_t offset, u8 data) { // R1x-R6x(,D1,D2): vfd plate int shift = (offset - 1) * 4; @@ -2235,7 +2235,7 @@ WRITE8_MEMBER(cpacman_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(cpacman_state::grid_w) +void cpacman_state::grid_w(u16 data) { // D0: speaker out m_speaker->level_w(data & 1); @@ -2247,10 +2247,10 @@ WRITE16_MEMBER(cpacman_state::grid_w) m_grid = data >> 5 & 0x7ff; // D1,D2: plate 8,14 (update display there) - plate_w(space, 6 + 1, data >> 1 & 3); + plate_w(6 + 1, data >> 1 & 3); } -READ8_MEMBER(cpacman_state::input_r) +u8 cpacman_state::input_r() { // R0x: multiplexed inputs return read_inputs(3); @@ -2351,15 +2351,15 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u8 input_r(); void cmspacmn(machine_config &config); }; // handlers -WRITE8_MEMBER(cmspacmn_state::plate_w) +void cmspacmn_state::plate_w(offs_t offset, u8 data) { // R1x-R6x(,D0,D1): vfd plate int shift = (offset - 1) * 4; @@ -2371,7 +2371,7 @@ WRITE8_MEMBER(cmspacmn_state::plate_w) m_display->matrix(grid, u64(BIT(m_plate,15)) << 32 | plate); } -WRITE16_MEMBER(cmspacmn_state::grid_w) +void cmspacmn_state::grid_w(u16 data) { // D2: speaker out m_speaker->level_w(data >> 2 & 1); @@ -2383,10 +2383,10 @@ WRITE16_MEMBER(cmspacmn_state::grid_w) m_grid = data >> 5 & 0x7ff; // D0,D1: more plates (update display there) - plate_w(space, 6 + 1, data & 3); + plate_w(6 + 1, data & 3); } -READ8_MEMBER(cmspacmn_state::input_r) +u8 cmspacmn_state::input_r() { // R0x: multiplexed inputs return read_inputs(3); @@ -2476,9 +2476,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u8 input_r(); void egalaxn2(machine_config &config); }; @@ -2491,7 +2491,7 @@ void egalaxn2_state::update_display() m_display->matrix(grid, plate); } -WRITE16_MEMBER(egalaxn2_state::grid_w) +void egalaxn2_state::grid_w(u16 data) { // D0: speaker out m_speaker->level_w(data & 1); @@ -2504,7 +2504,7 @@ WRITE16_MEMBER(egalaxn2_state::grid_w) update_display(); } -WRITE8_MEMBER(egalaxn2_state::plate_w) +void egalaxn2_state::plate_w(offs_t offset, u8 data) { // R1x-R6x: vfd plate int shift = (offset - 1) * 4; @@ -2512,7 +2512,7 @@ WRITE8_MEMBER(egalaxn2_state::plate_w) update_display(); } -READ8_MEMBER(egalaxn2_state::input_r) +u8 egalaxn2_state::input_r() { // R0x: multiplexed inputs return read_inputs(4); @@ -2702,9 +2702,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ16_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u16 input_r(); void einvader2(machine_config &config); }; @@ -2715,7 +2715,7 @@ void einvader2_state::update_display() m_display->matrix(m_grid, m_plate); } -WRITE8_MEMBER(einvader2_state::plate_w) +void einvader2_state::plate_w(offs_t offset, u8 data) { // R0x-R3x: vfd plate int shift = offset * 4; @@ -2723,7 +2723,7 @@ WRITE8_MEMBER(einvader2_state::plate_w) update_display(); } -WRITE16_MEMBER(einvader2_state::grid_w) +void einvader2_state::grid_w(u16 data) { // D0: speaker out m_speaker->level_w(data & 1); @@ -2736,7 +2736,7 @@ WRITE16_MEMBER(einvader2_state::grid_w) update_display(); } -READ16_MEMBER(einvader2_state::input_r) +u16 einvader2_state::input_r() { // D13-D15: multiplexed inputs return read_inputs(3) << 13; @@ -2827,14 +2827,14 @@ public: required_device<cop411_cpu_device> m_audiocpu; virtual void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); u8 m_cop_irq; DECLARE_WRITE_LINE_MEMBER(speaker_w); - DECLARE_WRITE8_MEMBER(cop_irq_w); - DECLARE_READ8_MEMBER(cop_latch_r); - DECLARE_READ8_MEMBER(cop_ack_r); + void cop_irq_w(u8 data); + u8 cop_latch_r(); + u8 cop_ack_r(); void update_int(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int(); } @@ -2861,7 +2861,7 @@ void eturtles_state::update_display() m_display->matrix(grid, plate | (grid >> 5 & 8)); // grid 8 also forces plate 3 high } -WRITE8_MEMBER(eturtles_state::plate_w) +void eturtles_state::plate_w(offs_t offset, u8 data) { m_r[offset] = data; @@ -2871,7 +2871,7 @@ WRITE8_MEMBER(eturtles_state::plate_w) update_display(); } -WRITE16_MEMBER(eturtles_state::grid_w) +void eturtles_state::grid_w(u16 data) { m_d = data; @@ -2904,20 +2904,20 @@ WRITE_LINE_MEMBER(eturtles_state::speaker_w) m_speaker->level_w(!state); } -WRITE8_MEMBER(eturtles_state::cop_irq_w) +void eturtles_state::cop_irq_w(u8 data) { // D0: maincpu INT0 (active low) m_cop_irq = ~data & 1; update_int(); } -READ8_MEMBER(eturtles_state::cop_latch_r) +u8 eturtles_state::cop_latch_r() { // L0-L3: soundlatch from maincpu R0x return m_r[0]; } -READ8_MEMBER(eturtles_state::cop_ack_r) +u8 eturtles_state::cop_ack_r() { // G0: ack from maincpu D0 return m_d & 1; @@ -3026,7 +3026,7 @@ public: { } virtual void update_display() override; - DECLARE_READ8_MEMBER(cop_data_r); + u8 cop_data_r(); void estargte(machine_config &config); }; @@ -3039,7 +3039,7 @@ void estargte_state::update_display() m_display->matrix(grid, plate); } -READ8_MEMBER(estargte_state::cop_data_r) +u8 estargte_state::cop_data_r() { // L0-L3: soundlatch from maincpu R0x // L7: ack from maincpu D0 @@ -3149,15 +3149,15 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_READ16_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + u16 input_r(); void ghalien(machine_config &config); }; // handlers -WRITE8_MEMBER(ghalien_state::plate_w) +void ghalien_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D10-D13): vfd plate int shift = offset * 4; @@ -3169,7 +3169,7 @@ WRITE8_MEMBER(ghalien_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(ghalien_state::grid_w) +void ghalien_state::grid_w(u16 data) { // D14: speaker out m_speaker->level_w(data >> 14 & 1); @@ -3181,10 +3181,10 @@ WRITE16_MEMBER(ghalien_state::grid_w) m_grid = data & 0x3ff; // D10-D13: more plates (update display there) - plate_w(space, 4, data >> 10 & 0xf); + plate_w(4, data >> 10 & 0xf); } -READ16_MEMBER(ghalien_state::input_r) +u16 ghalien_state::input_r() { // D15: multiplexed inputs return read_inputs(7) & 0x8000; @@ -3276,8 +3276,8 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); } @@ -3286,7 +3286,7 @@ public: // handlers -WRITE8_MEMBER(gckong_state::plate_w) +void gckong_state::plate_w(offs_t offset, u8 data) { // R0x-R3x(,D0,D1): vfd plate int shift = offset * 4; @@ -3298,7 +3298,7 @@ WRITE8_MEMBER(gckong_state::plate_w) m_display->matrix(grid, plate); } -WRITE16_MEMBER(gckong_state::grid_w) +void gckong_state::grid_w(u16 data) { // D2: speaker out m_speaker->level_w(data >> 2 & 1); @@ -3315,7 +3315,7 @@ WRITE16_MEMBER(gckong_state::grid_w) m_grid = data >> 5 & 0x7ff; // D0,D1: more plates (update display there) - plate_w(space, 4, data & 3); + plate_w(4, data & 3); } void gckong_state::update_int1() @@ -3405,8 +3405,8 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); } @@ -3415,7 +3415,7 @@ public: // handlers -WRITE8_MEMBER(gdigdug_state::plate_w) +void gdigdug_state::plate_w(offs_t offset, u8 data) { // R0x-R6x(,D0-D3): vfd plate int shift = offset * 4; @@ -3426,7 +3426,7 @@ WRITE8_MEMBER(gdigdug_state::plate_w) m_display->matrix(m_grid, plate); } -WRITE16_MEMBER(gdigdug_state::grid_w) +void gdigdug_state::grid_w(u16 data) { // D6: speaker out m_speaker->level_w(data >> 6 & 1); @@ -3443,7 +3443,7 @@ WRITE16_MEMBER(gdigdug_state::grid_w) m_grid = data >> 7 & 0x1ff; // D0-D3: more plates (update display there) - plate_w(space, 7, data & 0xf); + plate_w(7, data & 0xf); } void gdigdug_state::update_int1() @@ -3536,10 +3536,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(speaker_w); - DECLARE_READ8_MEMBER(input_r); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); + void speaker_w(u8 data); + u8 input_r(); void mwcbaseb(machine_config &config); }; @@ -3551,7 +3551,7 @@ void mwcbaseb_state::update_display() m_display->matrix(grid, m_plate); } -WRITE8_MEMBER(mwcbaseb_state::plate_w) +void mwcbaseb_state::plate_w(offs_t offset, u8 data) { // R1x-R3x,R6x: vfd plate int shift = (offset == 6) ? 12 : (offset - 1) * 4; @@ -3559,7 +3559,7 @@ WRITE8_MEMBER(mwcbaseb_state::plate_w) update_display(); } -WRITE16_MEMBER(mwcbaseb_state::grid_w) +void mwcbaseb_state::grid_w(u16 data) { // D9-D15: input mux m_inp_mux = data >> 9 & 0x7f; @@ -3569,13 +3569,13 @@ WRITE16_MEMBER(mwcbaseb_state::grid_w) update_display(); } -WRITE8_MEMBER(mwcbaseb_state::speaker_w) +void mwcbaseb_state::speaker_w(u8 data) { // R50,R51+R52(tied together): speaker out m_speaker->level_w(data & 7); } -READ8_MEMBER(mwcbaseb_state::input_r) +u8 mwcbaseb_state::input_r() { // R4x: multiplexed inputs return read_inputs(7); @@ -3710,8 +3710,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); } @@ -3727,7 +3727,7 @@ void msthawk_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(msthawk_state::plate_w) +void msthawk_state::plate_w(offs_t offset, u8 data) { // R0x-R3x: vfd plate int shift = offset * 4; @@ -3735,7 +3735,7 @@ WRITE8_MEMBER(msthawk_state::plate_w) update_display(); } -WRITE16_MEMBER(msthawk_state::grid_w) +void msthawk_state::grid_w(u16 data) { // D5: speaker out m_speaker->level_w(data >> 5 & 1); @@ -3842,14 +3842,14 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void pbqbert(machine_config &config); }; // handlers -WRITE8_MEMBER(pbqbert_state::plate_w) +void pbqbert_state::plate_w(offs_t offset, u8 data) { // R0x-R6x(,D8): vfd plate int shift = offset * 4; @@ -3860,7 +3860,7 @@ WRITE8_MEMBER(pbqbert_state::plate_w) m_display->matrix(m_grid, plate); } -WRITE16_MEMBER(pbqbert_state::grid_w) +void pbqbert_state::grid_w(u16 data) { // D14: speaker out m_speaker->level_w(data >> 14 & 1); @@ -3869,7 +3869,7 @@ WRITE16_MEMBER(pbqbert_state::grid_w) m_grid = data & 0xff; // D8: plate 25 (update display there) - plate_w(space, 7, data >> 8 & 1); + plate_w(7, data >> 8 & 1); } // config @@ -3942,8 +3942,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int1(); } @@ -3959,7 +3959,7 @@ void tmtron_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(tmtron_state::plate_w) +void tmtron_state::plate_w(offs_t offset, u8 data) { // R0x-R3x: vfd plate int shift = offset * 4; @@ -3967,7 +3967,7 @@ WRITE8_MEMBER(tmtron_state::plate_w) update_display(); } -WRITE16_MEMBER(tmtron_state::grid_w) +void tmtron_state::grid_w(u16 data) { // D4: speaker out m_speaker->level_w(data >> 4 & 1); @@ -4068,8 +4068,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed) { update_int0(); } @@ -4085,7 +4085,7 @@ void kingman_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(kingman_state::plate_w) +void kingman_state::plate_w(offs_t offset, u8 data) { // R0x-R3x: vfd plate int shift = offset * 4; @@ -4093,7 +4093,7 @@ WRITE8_MEMBER(kingman_state::plate_w) update_display(); } -WRITE16_MEMBER(kingman_state::grid_w) +void kingman_state::grid_w(u16 data) { // D6: speaker out m_speaker->level_w(data >> 6 & 1); @@ -4197,14 +4197,14 @@ public: hh_hmcs40_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE16_MEMBER(grid_w); + void plate_w(offs_t offset, u8 data); + void grid_w(u16 data); void vinvader(machine_config &config); }; // handlers -WRITE8_MEMBER(vinvader_state::plate_w) +void vinvader_state::plate_w(offs_t offset, u8 data) { // R1x-R3x(,D4-D6): vfd plate int shift = (offset - 1) * 4; @@ -4215,7 +4215,7 @@ WRITE8_MEMBER(vinvader_state::plate_w) m_display->matrix(m_grid, plate); } -WRITE16_MEMBER(vinvader_state::grid_w) +void vinvader_state::grid_w(u16 data) { // D0: speaker out m_speaker->level_w(data & 1); @@ -4224,7 +4224,7 @@ WRITE16_MEMBER(vinvader_state::grid_w) m_grid = data >> 7 & 0x1ff; // D4-D6: more plates (update display there) - plate_w(space, 3 + 1, data >> 4 & 7); + plate_w(3 + 1, data >> 4 & 7); } // config diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index a1c763be43f..8fb36a746c4 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -204,9 +204,9 @@ public: void update_display(); void update_speaker(); - DECLARE_READ8_MEMBER(read_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + u8 read_a(); + void write_b(u8 data); + void write_c(u8 data); void touchme(machine_config &config); }; @@ -222,13 +222,13 @@ void touchme_state::update_speaker() m_speaker->level_w((m_b >> 7 & 1) | (m_c >> 6 & 2)); } -READ8_MEMBER(touchme_state::read_a) +u8 touchme_state::read_a() { // A: multiplexed inputs return read_inputs(3, 0xf); } -WRITE8_MEMBER(touchme_state::write_b) +void touchme_state::write_b(u8 data) { // B0-B2: input mux m_inp_mux = data & 7; @@ -242,7 +242,7 @@ WRITE8_MEMBER(touchme_state::write_b) update_speaker(); } -WRITE8_MEMBER(touchme_state::write_c) +void touchme_state::write_c(u8 data) { // C0-C6: digit segments m_c = data; @@ -327,8 +327,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + void write_b(u8 data); + void write_c(u8 data); void pabball(machine_config &config); }; @@ -345,14 +345,14 @@ void pabball_state::update_display() m_display->matrix(sel, m_b); } -WRITE8_MEMBER(pabball_state::write_b) +void pabball_state::write_b(u8 data) { // B: led data m_b = ~data; update_display(); } -WRITE8_MEMBER(pabball_state::write_c) +void pabball_state::write_c(u8 data) { // C2: RTCC pin m_maincpu->set_input_line(PIC16C5x_RTCC, data >> 2 & 1); @@ -433,27 +433,27 @@ public: hh_pic16_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_READ8_MEMBER(read_c); - DECLARE_WRITE8_MEMBER(write_c); + void write_b(u8 data); + u8 read_c(); + void write_c(u8 data); void melodym(machine_config &config); }; // handlers -WRITE8_MEMBER(melodym_state::write_b) +void melodym_state::write_b(u8 data) { // B2-B6: input mux m_inp_mux = data >> 2 & 0x1f; } -READ8_MEMBER(melodym_state::read_c) +u8 melodym_state::read_c() { // C0-C4: multiplexed inputs return read_inputs(5, 0x1f) | 0xe0; } -WRITE8_MEMBER(melodym_state::write_c) +void melodym_state::write_c(u8 data) { // C6: both lamps m_display->matrix(1, ~data >> 6 & 1); @@ -561,8 +561,8 @@ public: void update_display(); void update_speaker(); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + void write_b(u8 data); + void write_c(u8 data); void maniac(machine_config &config); }; @@ -580,7 +580,7 @@ void maniac_state::update_speaker() m_speaker->level_w((m_b >> 7 & 1) | (m_c >> 6 & 2)); } -WRITE8_MEMBER(maniac_state::write_b) +void maniac_state::write_b(u8 data) { // B0-B6: left 7seg m_b = data; @@ -590,7 +590,7 @@ WRITE8_MEMBER(maniac_state::write_b) update_speaker(); } -WRITE8_MEMBER(maniac_state::write_c) +void maniac_state::write_c(u8 data) { // C0-C6: right 7seg m_c = data; @@ -674,9 +674,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_READ8_MEMBER(read_c); - DECLARE_WRITE8_MEMBER(write_c); + void write_b(u8 data); + u8 read_c(); + void write_c(u8 data); void speaker_decay_reset(); TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); @@ -720,7 +720,7 @@ void flash_state::update_display() m_display->matrix(~m_b >> 4 & 3, (~m_c >> 1 & 0x7f) | (~m_b << 7 & 0x780)); } -WRITE8_MEMBER(flash_state::write_b) +void flash_state::write_b(u8 data) { // B0-B3: led data // B4,B5: led select @@ -733,13 +733,13 @@ WRITE8_MEMBER(flash_state::write_b) m_speaker->level_w(data >> 7 & 1); } -READ8_MEMBER(flash_state::read_c) +u8 flash_state::read_c() { // C1-C7: buttons return (m_c & 1) ? 0xff : m_inputs[1]->read(); } -WRITE8_MEMBER(flash_state::write_c) +void flash_state::write_c(u8 data) { // C0: enable buttons // C1-C7: digit segments @@ -822,9 +822,9 @@ public: hh_pic16_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); - DECLARE_READ8_MEMBER(read_c); + void write_b(u8 data); + void write_c(u8 data); + u8 read_c(); void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(speed_switch) { set_clock(); } @@ -849,13 +849,13 @@ void matchme_state::set_clock() m_maincpu->set_unscaled_clock((m_inputs[4]->read() & 1) ? 1300000 : 1200000); } -WRITE8_MEMBER(matchme_state::write_b) +void matchme_state::write_b(u8 data) { // B0-B7: lamps m_display->matrix(1, data); } -READ8_MEMBER(matchme_state::read_c) +u8 matchme_state::read_c() { // C0-C3: multiplexed inputs from C4-C6 m_inp_mux = m_c >> 4 & 7; @@ -868,7 +868,7 @@ READ8_MEMBER(matchme_state::read_c) return lo | hi << 4 | 0x80; } -WRITE8_MEMBER(matchme_state::write_c) +void matchme_state::write_c(u8 data) { // C0-C6: input mux m_c = data; @@ -980,9 +980,9 @@ public: hh_pic16_state(mconfig, type, tag) { } - DECLARE_READ8_MEMBER(read_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + u8 read_a(); + void write_b(u8 data); + void write_c(u8 data); void speaker_decay_reset(); TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); @@ -1019,19 +1019,19 @@ TIMER_DEVICE_CALLBACK_MEMBER(leboom_state::speaker_decay_sim) m_speaker_volume /= 1.015; } -READ8_MEMBER(leboom_state::read_a) +u8 leboom_state::read_a() { // A: multiplexed inputs return read_inputs(6, 0xf); } -WRITE8_MEMBER(leboom_state::write_b) +void leboom_state::write_b(u8 data) { // B0-B5: input mux m_inp_mux = data & 0x3f; } -WRITE8_MEMBER(leboom_state::write_c) +void leboom_state::write_c(u8 data) { // C4: single led m_display->matrix(1, data >> 4 & 1); @@ -1133,9 +1133,9 @@ public: { } void update_display(); - DECLARE_READ8_MEMBER(read_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + u8 read_a(); + void write_b(u8 data); + void write_c(u8 data); void tbaskb(machine_config &config); }; @@ -1146,13 +1146,13 @@ void tbaskb_state::update_display() m_display->matrix(m_b, m_c); } -READ8_MEMBER(tbaskb_state::read_a) +u8 tbaskb_state::read_a() { // A2: skill switch, A3: multiplexed inputs return m_inputs[5]->read() | read_inputs(5, 8) | 3; } -WRITE8_MEMBER(tbaskb_state::write_b) +void tbaskb_state::write_b(u8 data) { // B0: RTCC pin m_maincpu->set_input_line(PIC16C5x_RTCC, data & 1); @@ -1166,7 +1166,7 @@ WRITE8_MEMBER(tbaskb_state::write_b) update_display(); } -WRITE8_MEMBER(tbaskb_state::write_c) +void tbaskb_state::write_c(u8 data) { // C7: speaker out m_speaker->level_w(data >> 7 & 1); @@ -1253,10 +1253,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); - DECLARE_WRITE8_MEMBER(write_d); + void write_a(u8 data); + void write_b(u8 data); + void write_c(u8 data); + void write_d(u8 data); void rockpin(machine_config &config); }; @@ -1271,7 +1271,7 @@ void rockpin_state::update_display() m_display->matrix_partial(3, 6, m_d, m_c); } -WRITE8_MEMBER(rockpin_state::write_a) +void rockpin_state::write_a(u8 data) { // A3,A4: speaker out m_speaker->level_w(data >> 3 & 3); @@ -1281,21 +1281,21 @@ WRITE8_MEMBER(rockpin_state::write_a) update_display(); } -WRITE8_MEMBER(rockpin_state::write_b) +void rockpin_state::write_b(u8 data) { // B0-B6: digit segments m_b = data & 0x7f; update_display(); } -WRITE8_MEMBER(rockpin_state::write_c) +void rockpin_state::write_c(u8 data) { // C0-C7: led data m_c = ~data; update_display(); } -WRITE8_MEMBER(rockpin_state::write_d) +void rockpin_state::write_d(u8 data) { // D0-D5: led select m_d = ~data; @@ -1372,9 +1372,9 @@ public: { } void update_display(); - DECLARE_READ8_MEMBER(read_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + u8 read_a(); + void write_b(u8 data); + void write_c(u8 data); void hccbaskb(machine_config &config); }; @@ -1385,13 +1385,13 @@ void hccbaskb_state::update_display() m_display->matrix(m_b, m_c); } -READ8_MEMBER(hccbaskb_state::read_a) +u8 hccbaskb_state::read_a() { // A2: skill switch, A3: multiplexed inputs return m_inputs[5]->read() | read_inputs(5, 8) | 3; } -WRITE8_MEMBER(hccbaskb_state::write_b) +void hccbaskb_state::write_b(u8 data) { // B0: RTCC pin m_maincpu->set_input_line(PIC16C5x_RTCC, data & 1); @@ -1408,7 +1408,7 @@ WRITE8_MEMBER(hccbaskb_state::write_b) update_display(); } -WRITE8_MEMBER(hccbaskb_state::write_c) +void hccbaskb_state::write_c(u8 data) { // C0-C6: led data m_c = ~data; @@ -1496,9 +1496,9 @@ public: { } void update_display(); - DECLARE_READ8_MEMBER(read_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); + u8 read_a(); + void write_b(u8 data); + void write_c(u8 data); void ttfball(machine_config &config); }; @@ -1515,13 +1515,13 @@ void ttfball_state::update_display() m_display->matrix(m_b | (m_c << 1 & 0x100), led_data); } -READ8_MEMBER(ttfball_state::read_a) +u8 ttfball_state::read_a() { // A3: multiplexed inputs, A0-A2: other inputs return m_inputs[5]->read() | read_inputs(5, 8); } -WRITE8_MEMBER(ttfball_state::write_b) +void ttfball_state::write_b(u8 data) { // B0: RTCC pin m_maincpu->set_input_line(PIC16C5x_RTCC, data & 1); @@ -1534,7 +1534,7 @@ WRITE8_MEMBER(ttfball_state::write_b) update_display(); } -WRITE8_MEMBER(ttfball_state::write_c) +void ttfball_state::write_c(u8 data) { // C6: speaker out m_speaker->level_w(data >> 6 & 1); @@ -1657,10 +1657,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); - DECLARE_WRITE8_MEMBER(write_d); + void write_a(u8 data); + void write_b(u8 data); + void write_c(u8 data); + void write_d(u8 data); void uspbball(machine_config &config); }; @@ -1671,27 +1671,27 @@ void uspbball_state::update_display() m_display->matrix(m_d, m_c << 8 | m_b); } -WRITE8_MEMBER(uspbball_state::write_a) +void uspbball_state::write_a(u8 data) { // A0: speaker out m_speaker->level_w(data & 1); } -WRITE8_MEMBER(uspbball_state::write_b) +void uspbball_state::write_b(u8 data) { // B: digit segment data m_b = bitswap<8>(data,0,1,2,3,4,5,6,7); update_display(); } -WRITE8_MEMBER(uspbball_state::write_c) +void uspbball_state::write_c(u8 data) { // C: led data m_c = ~data; update_display(); } -WRITE8_MEMBER(uspbball_state::write_d) +void uspbball_state::write_d(u8 data) { // D0-D2: digit select // D3-D5: led select @@ -1775,11 +1775,11 @@ public: { } void update_display(); - DECLARE_READ8_MEMBER(read_a); - DECLARE_WRITE8_MEMBER(write_a); - DECLARE_WRITE8_MEMBER(write_b); - DECLARE_WRITE8_MEMBER(write_c); - DECLARE_WRITE8_MEMBER(write_d); + u8 read_a(); + void write_a(u8 data); + void write_b(u8 data); + void write_c(u8 data); + void write_d(u8 data); void us2pfball(machine_config &config); }; @@ -1790,26 +1790,26 @@ void us2pfball_state::update_display() m_display->matrix(m_d | (m_a << 6 & 0x300), m_c); } -READ8_MEMBER(us2pfball_state::read_a) +u8 us2pfball_state::read_a() { // A0,A1: multiplexed inputs, A4-A7: other inputs return read_inputs(4, 3) | (m_inputs[4]->read() & 0xf0) | 0x0c; } -WRITE8_MEMBER(us2pfball_state::write_a) +void us2pfball_state::write_a(u8 data) { // A2,A3: leds m_a = data; update_display(); } -WRITE8_MEMBER(us2pfball_state::write_b) +void us2pfball_state::write_b(u8 data) { // B0-B3: input mux m_inp_mux = data & 0xf; } -WRITE8_MEMBER(us2pfball_state::write_c) +void us2pfball_state::write_c(u8 data) { // C7: speaker out m_speaker->level_w(data >> 7 & 1); @@ -1819,7 +1819,7 @@ WRITE8_MEMBER(us2pfball_state::write_c) update_display(); } -WRITE8_MEMBER(us2pfball_state::write_d) +void us2pfball_state::write_d(u8 data) { // D0-D7: digit select m_d = ~data; diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp index d785957e74f..31b837451fd 100644 --- a/src/mame/drivers/himesiki.cpp +++ b/src/mame/drivers/himesiki.cpp @@ -104,7 +104,7 @@ A 12.000MHz #define MCLK XTAL(12'000'000) // this is on the video board #define CLK2 XTAL(8'000'000) // near the CPUs -WRITE8_MEMBER(himesiki_state::himesiki_rombank_w) +void himesiki_state::himesiki_rombank_w(uint8_t data) { membank("bank1")->set_entry(((data & 0x0c) >> 2)); @@ -115,7 +115,7 @@ WRITE8_MEMBER(himesiki_state::himesiki_rombank_w) logerror("p06_w %02x\n", data); } -WRITE8_MEMBER(himesiki_state::himesiki_sound_w) +void himesiki_state::himesiki_sound_w(uint8_t data) { m_soundlatch->write(data); m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp index 85d0e84db9b..425fecdbb6b 100644 --- a/src/mame/drivers/hp49gp.cpp +++ b/src/mame/drivers/hp49gp.cpp @@ -44,8 +44,8 @@ private: lcd_spi_t m_lcd_spi; virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ32_MEMBER(s3c2410_gpio_port_r); - DECLARE_WRITE32_MEMBER(s3c2410_gpio_port_w); + uint32_t s3c2410_gpio_port_r(offs_t offset); + void s3c2410_gpio_port_w(offs_t offset, uint32_t data); inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); void lcd_spi_reset(); void lcd_spi_init(); @@ -176,7 +176,7 @@ int hp49gp_state::lcd_spi_line_r( int line) // I/O PORT -READ32_MEMBER(hp49gp_state::s3c2410_gpio_port_r) +uint32_t hp49gp_state::s3c2410_gpio_port_r(offs_t offset) { uint32_t data = m_port[offset]; switch (offset) @@ -226,7 +226,7 @@ READ32_MEMBER(hp49gp_state::s3c2410_gpio_port_r) return data; } -WRITE32_MEMBER(hp49gp_state::s3c2410_gpio_port_w) +void hp49gp_state::s3c2410_gpio_port_w(offs_t offset, uint32_t data) { m_port[offset] = data; switch (offset) diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp index f28cb631f45..8abad641e25 100644 --- a/src/mame/drivers/hp80.cpp +++ b/src/mame/drivers/hp80.cpp @@ -178,8 +178,8 @@ protected: TIMER_DEVICE_CALLBACK_MEMBER(timer_update); TIMER_DEVICE_CALLBACK_MEMBER(clk_busy_timer); - DECLARE_WRITE8_MEMBER(irl_w); - DECLARE_WRITE8_MEMBER(halt_w); + void irl_w(offs_t offset, uint8_t data); + void halt_w(offs_t offset, uint8_t data); required_device<capricorn_cpu_device> m_cpu; required_device<timer_device> m_clk_busy_timer; @@ -861,12 +861,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(hp80_base_state::clk_busy_timer) m_clk_busy = false; } -WRITE8_MEMBER(hp80_base_state::irl_w) +void hp80_base_state::irl_w(offs_t offset, uint8_t data) { irq_w(offset + IRQ_IOP0_BIT , data != 0); } -WRITE8_MEMBER(hp80_base_state::halt_w) +void hp80_base_state::halt_w(offs_t offset, uint8_t data) { bool prev_halt = m_halt_lines != 0; COPY_BIT(data != 0 , m_halt_lines , offset); diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index 8299d549e5e..f1ea2ea3a2f 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -68,10 +68,10 @@ protected: virtual void machine_reset() override; private: - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_READ8_MEMBER(portb_r); - DECLARE_WRITE8_MEMBER(keyboard_w); - DECLARE_READ8_MEMBER(portc_r); + uint8_t keyboard_r(); + uint8_t portb_r(); + void keyboard_w(uint8_t data); + uint8_t portc_r(); DECLARE_WRITE8_MEMBER(display_ctrl_w); DECLARE_WRITE8_MEMBER(serial_tx_w); DECLARE_WRITE8_MEMBER(serial_dtr_w); @@ -212,7 +212,7 @@ static INPUT_PORTS_START( hunter2 ) PORT_CONFSETTING(0x04, "Low") INPUT_PORTS_END -READ8_MEMBER( hunter2_state::keyboard_r ) +uint8_t hunter2_state::keyboard_r() { uint8_t data = 0xff; for (int i = 0; i < 7; i++) @@ -225,7 +225,7 @@ READ8_MEMBER( hunter2_state::keyboard_r ) return data; } -READ8_MEMBER( hunter2_state::portb_r ) +uint8_t hunter2_state::portb_r() { uint8_t res = 0x00; @@ -235,7 +235,7 @@ READ8_MEMBER( hunter2_state::portb_r ) return res; } -WRITE8_MEMBER( hunter2_state::keyboard_w ) +void hunter2_state::keyboard_w(uint8_t data) { m_keydata = data; } @@ -247,7 +247,7 @@ Bit 1 = DCD (inverted from RS-232 line) Bit 2 = Power low warning (0 = Power OK, 1 = Power low) Bit 3 = TXCLK (inverted from RS-232 line) */ -READ8_MEMBER( hunter2_state::portc_r ) +uint8_t hunter2_state::portc_r() { uint8_t res = 0x28; diff --git a/src/mame/drivers/husky.cpp b/src/mame/drivers/husky.cpp index 0ec5f7d2cd5..1c9260f88a6 100644 --- a/src/mame/drivers/husky.cpp +++ b/src/mame/drivers/husky.cpp @@ -62,11 +62,11 @@ protected: virtual void machine_reset() override; private: - DECLARE_READ8_MEMBER(porta_r); - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_READ8_MEMBER(portb_r); - DECLARE_READ8_MEMBER(portc_r); - DECLARE_WRITE8_MEMBER(portc_w); + uint8_t porta_r(); + void porta_w(uint8_t data); + uint8_t portb_r(); + uint8_t portc_r(); + void portc_w(uint8_t data); DECLARE_WRITE8_MEMBER(serial_tx_w); DECLARE_WRITE8_MEMBER(cursor_w); DECLARE_WRITE8_MEMBER(curinh_w); @@ -199,7 +199,7 @@ static INPUT_PORTS_START(husky) INPUT_PORTS_END -READ8_MEMBER(husky_state::porta_r) +uint8_t husky_state::porta_r() { uint8_t data = 0xff; @@ -211,12 +211,12 @@ READ8_MEMBER(husky_state::porta_r) return data; } -WRITE8_MEMBER(husky_state::porta_w) +void husky_state::porta_w(uint8_t data) { m_keydata = data; } -READ8_MEMBER(husky_state::portb_r) +uint8_t husky_state::portb_r() { uint8_t data = 0xff; @@ -232,7 +232,7 @@ READ8_MEMBER(husky_state::portb_r) Bit 2 = Power low warning (1 = Power OK, 0 = Power low) Input bits 7,6,4,3,2 */ -READ8_MEMBER(husky_state::portc_r) +uint8_t husky_state::portc_r() { uint8_t data = 0x23; @@ -245,7 +245,7 @@ READ8_MEMBER(husky_state::portc_r) /* Output bits 5,1,0 */ -WRITE8_MEMBER(husky_state::portc_w) +void husky_state::portc_w(uint8_t data) { m_beeper->set_state(!BIT(data, 0)); m_rs232->write_rts(BIT(data, 1)); diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index 9afb165aeb8..38c78e6985b 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -142,13 +142,13 @@ private: DECLARE_WRITE8_MEMBER(scrolly_w); DECLARE_WRITE8_MEMBER(slave_ack_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); - DECLARE_WRITE8_MEMBER(mermaid_p0_w); - DECLARE_READ8_MEMBER(mermaid_p1_r); - DECLARE_WRITE8_MEMBER(mermaid_p1_w); - DECLARE_READ8_MEMBER(mermaid_p2_r); - DECLARE_WRITE8_MEMBER(mermaid_p2_w); - DECLARE_READ8_MEMBER(mermaid_p3_r); - DECLARE_WRITE8_MEMBER(mermaid_p3_w); + void mermaid_p0_w(uint8_t data); + uint8_t mermaid_p1_r(); + void mermaid_p1_w(uint8_t data); + uint8_t mermaid_p2_r(); + void mermaid_p2_w(uint8_t data); + uint8_t mermaid_p3_r(); + void mermaid_p3_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -318,7 +318,7 @@ WRITE8_MEMBER(hvyunit_state::sound_bankswitch_w) * *************************************/ -WRITE8_MEMBER(hvyunit_state::mermaid_p0_w) +void hvyunit_state::mermaid_p0_w(uint8_t data) { if (!BIT(m_mermaid_p[0], 1) && BIT(data, 1)) m_slavelatch->write(m_mermaid_p[1]); @@ -337,17 +337,17 @@ WRITE8_MEMBER(hvyunit_state::mermaid_p0_w) m_mermaid_p[0] = data; } -READ8_MEMBER(hvyunit_state::mermaid_p1_r) +uint8_t hvyunit_state::mermaid_p1_r() { return m_mermaid_p[1]; } -WRITE8_MEMBER(hvyunit_state::mermaid_p1_w) +void hvyunit_state::mermaid_p1_w(uint8_t data) { m_mermaid_p[1] = data; } -READ8_MEMBER(hvyunit_state::mermaid_p2_r) +uint8_t hvyunit_state::mermaid_p2_r() { switch ((m_mermaid_p[0] >> 2) & 3) { @@ -358,12 +358,12 @@ READ8_MEMBER(hvyunit_state::mermaid_p2_r) } } -WRITE8_MEMBER(hvyunit_state::mermaid_p2_w) +void hvyunit_state::mermaid_p2_w(uint8_t data) { m_mermaid_p[2] = data; } -READ8_MEMBER(hvyunit_state::mermaid_p3_r) +uint8_t hvyunit_state::mermaid_p3_r() { uint8_t dsw = 0; uint8_t dsw1 = ioport("DSW1")->read(); @@ -380,7 +380,7 @@ READ8_MEMBER(hvyunit_state::mermaid_p3_r) return (dsw << 4) | (m_slavelatch->pending_r() << 3) | (!m_mermaidlatch->pending_r() << 2); } -WRITE8_MEMBER(hvyunit_state::mermaid_p3_w) +void hvyunit_state::mermaid_p3_w(uint8_t data) { m_mermaid_p[3] = data; m_slavecpu->set_input_line(INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 55b5f520970..fcc7dc9bed7 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -162,10 +162,10 @@ private: DECLARE_READ8_MEMBER(video_r); DECLARE_WRITE_LINE_MEMBER(vblank_w); - DECLARE_READ8_MEMBER(ppi_a_r); - DECLARE_WRITE8_MEMBER(led_w); - DECLARE_WRITE8_MEMBER(ppi_c_w); - DECLARE_READ8_MEMBER(ppi_c_r); + uint8_t ppi_a_r(); + void led_w(uint8_t data); + void ppi_c_w(uint8_t data); + uint8_t ppi_c_r(); DECLARE_WRITE_LINE_MEMBER(kb_data_w); DECLARE_WRITE_LINE_MEMBER(kb_clock_w); @@ -178,8 +178,8 @@ private: DECLARE_WRITE_LINE_MEMBER(floppy_hdl); DECLARE_WRITE8_MEMBER(dmapg_w); DECLARE_WRITE_LINE_MEMBER(hrq_w); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -355,7 +355,7 @@ WRITE16_MEMBER(ibm6580_state::unk_latch_w) m_p40 |= 0x10; } -WRITE8_MEMBER(ibm6580_state::led_w) +void ibm6580_state::led_w(uint8_t data) { output().set_value("led5", BIT(data, 7)); output().set_value("led6", BIT(data, 6)); @@ -417,7 +417,7 @@ WRITE8_MEMBER(ibm6580_state::led_w) } } -WRITE8_MEMBER(ibm6580_state::ppi_c_w) +void ibm6580_state::ppi_c_w(uint8_t data) { LOG("PPI Port C <- %02x\n", data); @@ -433,7 +433,7 @@ WRITE8_MEMBER(ibm6580_state::ppi_c_w) m_kbd->ack_w(BIT(data, 5)); } -READ8_MEMBER(ibm6580_state::ppi_c_r) +uint8_t ibm6580_state::ppi_c_r() { uint8_t data = 0; @@ -444,7 +444,7 @@ READ8_MEMBER(ibm6580_state::ppi_c_r) return data; } -READ8_MEMBER(ibm6580_state::ppi_a_r) +uint8_t ibm6580_state::ppi_a_r() { uint8_t data = m_kb_fifo.dequeue(); @@ -486,13 +486,13 @@ WRITE_LINE_MEMBER(ibm6580_state::hrq_w) m_dma8257->hlda_w(state); } -READ8_MEMBER(ibm6580_state::memory_read_byte) +uint8_t ibm6580_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset | (m_dma0pg << 16)); } -WRITE8_MEMBER(ibm6580_state::memory_write_byte) +void ibm6580_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); prog_space.write_byte(offset | (m_dma0pg << 16), data); diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index 97eff43ff7f..49a3af5164f 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -76,9 +76,9 @@ private: DECLARE_WRITE8_MEMBER(bg_scroll_w); DECLARE_WRITE8_MEMBER(fg_tile_w); DECLARE_WRITE8_MEMBER(fg_color_w); - DECLARE_WRITE8_MEMBER(nmi_and_coins_w); - DECLARE_WRITE8_MEMBER(video_and_leds_w); - DECLARE_WRITE8_MEMBER(leds_w); + void nmi_and_coins_w(uint8_t data); + void video_and_leds_w(uint8_t data); + void leds_w(uint8_t data); DECLARE_WRITE8_MEMBER(magic_w); DECLARE_READ8_MEMBER(magic_r); @@ -400,7 +400,7 @@ void igs009_state::show_out() #endif } -WRITE8_MEMBER(igs009_state::nmi_and_coins_w) +void igs009_state::nmi_and_coins_w(uint8_t data) { if ((m_nmi_enable ^ data) & (~0xdd)) { @@ -421,7 +421,7 @@ WRITE8_MEMBER(igs009_state::nmi_and_coins_w) show_out(); } -WRITE8_MEMBER(igs009_state::video_and_leds_w) +void igs009_state::video_and_leds_w(uint8_t data) { m_leds[4] = BIT(data, 0); // start? m_leds[5] = BIT(data, 2); // l_bet? @@ -433,7 +433,7 @@ WRITE8_MEMBER(igs009_state::video_and_leds_w) show_out(); } -WRITE8_MEMBER(igs009_state::leds_w) +void igs009_state::leds_w(uint8_t data) { m_leds[0] = BIT(data, 0); // stop_1 m_leds[1] = BIT(data, 1); // stop_2 diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index 495f6d22a15..edf96a87ec8 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -133,7 +133,7 @@ private: DECLARE_WRITE8_MEMBER(bg_tile_w); DECLARE_WRITE8_MEMBER(fg_tile_w); DECLARE_WRITE8_MEMBER(fg_color_w); - DECLARE_WRITE8_MEMBER(igs_nmi_and_coins_w); + void igs_nmi_and_coins_w(uint8_t data); DECLARE_WRITE8_MEMBER(igs_lamps_w); DECLARE_READ8_MEMBER(custom_io_r); DECLARE_WRITE8_MEMBER(custom_io_w); @@ -281,7 +281,7 @@ void igspoker_state::show_out() #endif } -WRITE8_MEMBER(igspoker_state::igs_nmi_and_coins_w) +void igspoker_state::igs_nmi_and_coins_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index b0448f44562..4481fe270d6 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -453,7 +453,7 @@ READ32_MEMBER(interpro_state::unmapped_r) m_error |= (ERROR_SRXNEM | ERROR_SRXVALID); // tell ioga to raise a bus error - m_ioga->bus_error(space, interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); + m_ioga->bus_error(interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); } return space.unmap(); @@ -467,7 +467,7 @@ WRITE32_MEMBER(interpro_state::unmapped_w) m_error |= (ERROR_SRXNEM | ERROR_SRXVALID); // tell ioga to raise a bus error - m_ioga->bus_error(space, interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); + m_ioga->bus_error(interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); } } @@ -481,7 +481,7 @@ READ32_MEMBER(sapphire_state::unmapped_r) m_error |= (ERROR_SRXNEM | ERROR_SRXVALID); // tell ioga to raise a bus error - m_ioga->bus_error(space, interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); + m_ioga->bus_error(interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); } return space.unmap(); @@ -496,7 +496,7 @@ WRITE32_MEMBER(sapphire_state::unmapped_w) m_error |= (ERROR_SRXNEM | ERROR_SRXVALID); // tell ioga to raise a bus error - m_ioga->bus_error(space, interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); + m_ioga->bus_error(interpro_ioga_device::BINFO_BERR | interpro_ioga_device::BINFO_SNAPOK, offset << 2); } } diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp index 3b7c86eb1d1..ff6ec9f3ba2 100644 --- a/src/mame/drivers/iqblock.cpp +++ b/src/mame/drivers/iqblock.cpp @@ -96,7 +96,7 @@ WRITE8_MEMBER(iqblock_state::irqack_w) } -WRITE8_MEMBER(iqblock_state::port_C_w) +void iqblock_state::port_C_w(uint8_t data) { /* bit 4 unknown; it is pulsed at the end of every NMI */ diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 4cd28d4cb7d..f43f9f77fea 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -45,7 +45,7 @@ WRITE8_MEMBER(ironhors_state::sh_irqtrigger_w) m_soundcpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -WRITE8_MEMBER(ironhors_state::filter_w) +void ironhors_state::filter_w(uint8_t data) { m_disc_ih->write(NODE_11, (data & 0x04) >> 2); m_disc_ih->write(NODE_12, (data & 0x02) >> 1); @@ -433,11 +433,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ironhors_state::farwest_scanline_tick) } } -READ8_MEMBER(ironhors_state::farwest_soundlatch_r) -{ - return m_soundlatch->read(); -} - void ironhors_state::farwest(machine_config &config) { ironhors(config); @@ -453,7 +448,7 @@ void ironhors_state::farwest(machine_config &config) m_screen->set_screen_update(FUNC(ironhors_state::screen_update_farwest)); - subdevice<ym2203_device>("ym2203")->port_b_read_callback().set(FUNC(ironhors_state::farwest_soundlatch_r)); + subdevice<ym2203_device>("ym2203")->port_b_read_callback().set(m_soundlatch, FUNC(generic_latch_8_device::read)); } diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index a8a0192b84d..c447382d842 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -62,8 +62,8 @@ private: DECLARE_WRITE_LINE_MEMBER(isbc86_tmr2_w); DECLARE_WRITE_LINE_MEMBER(isbc286_tmr2_w); // DECLARE_WRITE_LINE_MEMBER(isbc_uart8274_irq); - DECLARE_READ8_MEMBER(get_slave_ack); - DECLARE_WRITE8_MEMBER(ppi_c_w); + uint8_t get_slave_ack(offs_t offset); + void ppi_c_w(uint8_t data); DECLARE_WRITE8_MEMBER(upperen_w); DECLARE_READ16_MEMBER(bioslo_r); DECLARE_WRITE16_MEMBER(bioslo_w); @@ -237,7 +237,7 @@ WRITE_LINE_MEMBER( isbc_state::isbc86_tmr2_w ) m_uart8251->write_txc(state); } -READ8_MEMBER( isbc_state::get_slave_ack ) +uint8_t isbc_state::get_slave_ack(offs_t offset) { if (offset == 7) return m_pic_1->acknowledge(); @@ -259,7 +259,7 @@ WRITE_LINE_MEMBER( isbc_state::write_centronics_ack ) m_pic_1->ir7_w(1); } -WRITE8_MEMBER( isbc_state::ppi_c_w ) +void isbc_state::ppi_c_w(uint8_t data) { m_centronics->write_strobe(data & 1); diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index 7227cedb2e4..d65077d26e9 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -765,14 +765,14 @@ READ_LINE_MEMBER(itech8_state::special_r) * *************************************/ -WRITE8_MEMBER(itech8_state::pia_porta_out) +void itech8_state::pia_porta_out(uint8_t data) { logerror("PIA port A write = %02x\n", data); m_pia_porta_data = data; } -WRITE8_MEMBER(itech8_state::pia_portb_out) +void itech8_state::pia_portb_out(uint8_t data) { logerror("PIA port B write = %02x\n", data); @@ -786,7 +786,7 @@ WRITE8_MEMBER(itech8_state::pia_portb_out) } -WRITE8_MEMBER(itech8_state::ym2203_portb_out) +void itech8_state::ym2203_portb_out(uint8_t data) { logerror("YM2203 port B write = %02x\n", data); diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index a3bef6e870f..91f9d36663c 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -84,8 +84,8 @@ private: DECLARE_WRITE8_MEMBER(fg_color_w); template<uint8_t Which> DECLARE_WRITE8_MEMBER(reel_ram_w); - DECLARE_WRITE8_MEMBER(nmi_and_coins_w); - DECLARE_WRITE8_MEMBER(lamps_w); + void nmi_and_coins_w(uint8_t data); + void lamps_w(uint8_t data); DECLARE_READ8_MEMBER(igs_irqack_r); DECLARE_WRITE8_MEMBER(igs_irqack_w); DECLARE_READ8_MEMBER(expram_r); @@ -274,7 +274,7 @@ WRITE8_MEMBER(jackie_state::unk_reg_hi_w) show_out(); } -WRITE8_MEMBER(jackie_state::nmi_and_coins_w) +void jackie_state::nmi_and_coins_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c @@ -290,7 +290,7 @@ WRITE8_MEMBER(jackie_state::nmi_and_coins_w) show_out(); } -WRITE8_MEMBER(jackie_state::lamps_w) +void jackie_state::lamps_w(uint8_t data) { /* - Lbits - diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp index 402fa56e677..d3c260f1c49 100644 --- a/src/mame/drivers/jongkyo.cpp +++ b/src/mame/drivers/jongkyo.cpp @@ -73,8 +73,8 @@ private: DECLARE_WRITE8_MEMBER(jongkyo_coin_counter_w); DECLARE_WRITE8_MEMBER(videoram2_w); DECLARE_WRITE8_MEMBER(unknown_w); - DECLARE_READ8_MEMBER(input_1p_r); - DECLARE_READ8_MEMBER(input_2p_r); + uint8_t input_1p_r(); + uint8_t input_2p_r(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -178,7 +178,7 @@ WRITE8_MEMBER(jongkyo_state::jongkyo_coin_counter_w) m_flip_screen = (data & 4) >> 2; } -READ8_MEMBER(jongkyo_state::input_1p_r) +uint8_t jongkyo_state::input_1p_r() { uint8_t cr_clear = ioport("CR_CLEAR")->read(); @@ -197,7 +197,7 @@ READ8_MEMBER(jongkyo_state::input_1p_r) ioport("PL1_4")->read() & ioport("PL1_5")->read() & ioport("PL1_6")->read()) | cr_clear; } -READ8_MEMBER(jongkyo_state::input_2p_r) +uint8_t jongkyo_state::input_2p_r() { uint8_t coin_port = ioport("COINS")->read(); diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index 7513719a1c6..f2db979c868 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -882,7 +882,7 @@ void jpmimpct_state::jpmimpct(machine_config &config) * *************************************/ -READ8_MEMBER(jpmimpct_state::hopper_b_r) +uint8_t jpmimpct_state::hopper_b_r() { int retval; // B0 = 100p Hopper Out Verif @@ -908,7 +908,7 @@ READ8_MEMBER(jpmimpct_state::hopper_b_r) return retval; } -READ8_MEMBER(jpmimpct_state::hopper_c_r) +uint8_t jpmimpct_state::hopper_c_r() { int retval; // C0-C2 = Alpha @@ -945,7 +945,7 @@ READ8_MEMBER(jpmimpct_state::hopper_c_r) return retval; } -WRITE8_MEMBER(jpmimpct_state::payen_a_w) +void jpmimpct_state::payen_a_w(uint8_t data) { m_motor[0] = (data & 0x01); m_payen = (data & 0x10); @@ -954,7 +954,7 @@ WRITE8_MEMBER(jpmimpct_state::payen_a_w) m_hopinhibit = (data & 0x80); } -WRITE8_MEMBER(jpmimpct_state::display_c_w) +void jpmimpct_state::display_c_w(uint8_t data) { //Reset 0x04, data 0x02, clock 0x01 m_vfd->por(data & 0x04); diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index d85260b2da5..7337dcdbcc4 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -165,9 +165,9 @@ private: required_device<tms9902_device> m_uart_ic5; required_device<tms9902_device> m_uart_ic10; - DECLARE_WRITE8_MEMBER(jpmmps_meters_w); - DECLARE_WRITE8_MEMBER(jpmmps_psg_buf_w); - DECLARE_WRITE8_MEMBER(jpmmps_ic22_portc_w); + void jpmmps_meters_w(uint8_t data); + void jpmmps_psg_buf_w(uint8_t data); + void jpmmps_ic22_portc_w(uint8_t data); }; void jpmmps_state::jpmmps_map(address_map &map) @@ -203,7 +203,7 @@ void jpmmps_state::jpmmps_io_map(address_map &map) static INPUT_PORTS_START( jpmmps ) INPUT_PORTS_END -WRITE8_MEMBER(jpmmps_state::jpmmps_meters_w) +void jpmmps_state::jpmmps_meters_w(uint8_t data) { for (int meter = 0; meter < 8; meter ++) { @@ -212,12 +212,12 @@ WRITE8_MEMBER(jpmmps_state::jpmmps_meters_w) } -WRITE8_MEMBER(jpmmps_state::jpmmps_psg_buf_w) +void jpmmps_state::jpmmps_psg_buf_w(uint8_t data) { m_sound_buffer = data; } -WRITE8_MEMBER(jpmmps_state::jpmmps_ic22_portc_w) +void jpmmps_state::jpmmps_ic22_portc_w(uint8_t data) { //Handle PSG diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp index 4d0f42f443f..cd7b51be214 100644 --- a/src/mame/drivers/jpmsys5.cpp +++ b/src/mame/drivers/jpmsys5.cpp @@ -467,7 +467,7 @@ WRITE_LINE_MEMBER(jpmsys5_state::pia_irq) m_maincpu->set_input_line(INT_6821PIA, state ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER(jpmsys5_state::u29_porta_r) +uint8_t jpmsys5_state::u29_porta_r() { int meter_bit =0; @@ -485,7 +485,7 @@ READ8_MEMBER(jpmsys5_state::u29_porta_r) return m_direct_port->read() | meter_bit; } -WRITE8_MEMBER(jpmsys5_state::u29_portb_w) +void jpmsys5_state::u29_portb_w(uint8_t data) { if (m_meters) { diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index 4ba5a7f36fe..1de19749a74 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -120,9 +120,9 @@ private: DECLARE_WRITE8_MEMBER(bankselect_w); DECLARE_WRITE8_MEMBER(sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(i8039_irq_w); - DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w); - DECLARE_READ8_MEMBER(portA_r); - DECLARE_WRITE8_MEMBER(portB_w); + void i8039_irqen_and_status_w(uint8_t data); + uint8_t portA_r(); + void portB_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; @@ -222,7 +222,7 @@ WRITE8_MEMBER(junofrst_state::bankselect_w) } -READ8_MEMBER(junofrst_state::portA_r) +uint8_t junofrst_state::portA_r() { int timer; @@ -238,7 +238,7 @@ READ8_MEMBER(junofrst_state::portA_r) } -WRITE8_MEMBER(junofrst_state::portB_w) +void junofrst_state::portB_w(uint8_t data) { filter_rc_device *filter[3] = { m_filter_0_0, m_filter_0_1, m_filter_0_2 }; int i; @@ -276,7 +276,7 @@ WRITE8_MEMBER(junofrst_state::i8039_irq_w) } -WRITE8_MEMBER(junofrst_state::i8039_irqen_and_status_w) +void junofrst_state::i8039_irqen_and_status_w(uint8_t data) { if ((data & 0x80) == 0) m_i8039->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index 697ed56e801..9f42669438d 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -72,10 +72,10 @@ public: private: DECLARE_WRITE_LINE_MEMBER(busreq_w); - DECLARE_READ8_MEMBER(memory_r); - DECLARE_WRITE8_MEMBER(memory_w); - DECLARE_READ8_MEMBER(io_r); - DECLARE_WRITE8_MEMBER(io_w); + uint8_t memory_r(offs_t offset); + void memory_w(offs_t offset, uint8_t data); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER(page0_r); DECLARE_READ8_MEMBER(page1_r); DECLARE_READ8_MEMBER(mapper_r); @@ -105,7 +105,7 @@ private: MC6845_UPDATE_ROW(crtc_update_row); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(pio_porta_w); + void pio_porta_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(keyboard_rx_w); DECLARE_WRITE_LINE_MEMBER(rs232b_rx_w); DECLARE_WRITE_LINE_MEMBER(siob_tx_w); @@ -344,7 +344,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( kdt6_state::beeper_off ) // EXTERNAL I/O //************************************************************************** -WRITE8_MEMBER( kdt6_state::pio_porta_w ) +void kdt6_state::pio_porta_w(uint8_t data) { m_centronics->write_strobe(BIT(data, 0)); m_centronics->write_init(BIT(data, 1)); @@ -390,22 +390,22 @@ WRITE_LINE_MEMBER( kdt6_state::busreq_w ) m_dma->bai_w(state); } -READ8_MEMBER( kdt6_state::memory_r ) +uint8_t kdt6_state::memory_r(offs_t offset) { return m_ram[m_dma_map << 16 | offset]; } -WRITE8_MEMBER( kdt6_state::memory_w ) +void kdt6_state::memory_w(offs_t offset, uint8_t data) { m_ram[m_dma_map << 16 | offset] = data; } -READ8_MEMBER( kdt6_state::io_r ) +uint8_t kdt6_state::io_r(offs_t offset) { return m_cpu->space(AS_IO).read_byte(offset); } -WRITE8_MEMBER( kdt6_state::io_w ) +void kdt6_state::io_w(offs_t offset, uint8_t data) { m_cpu->space(AS_IO).write_byte(offset, data); } diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index 5f815f53fcb..24591c4598c 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -78,8 +78,8 @@ private: DECLARE_WRITE8_MEMBER(vram_w); DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(unknown_w); + uint8_t input_r(); + void unknown_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_start() override; virtual void machine_reset() override; @@ -172,7 +172,7 @@ WRITE8_MEMBER(koikoi_state::vram_w) m_tmap->mark_tile_dirty(offset & 0x3ff); } -READ8_MEMBER(koikoi_state::input_r) +uint8_t koikoi_state::input_r() { if (m_inputcnt < 0) return 0; @@ -208,7 +208,7 @@ READ8_MEMBER(koikoi_state::input_r) return 0xff; //return 0^0xff } -WRITE8_MEMBER(koikoi_state::unknown_w) +void koikoi_state::unknown_w(uint8_t data) { //xor'ed mux select, player 1 = 1,2,4,8, player 2 = 0x10, 0x20, 0x40, 0x80 } diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp index 68ec4d37f16..13728e0ea0d 100644 --- a/src/mame/drivers/konamim2.cpp +++ b/src/mame/drivers/konamim2.cpp @@ -290,10 +290,10 @@ public: DECLARE_WRITE_LINE_MEMBER(ppc1_int); DECLARE_WRITE_LINE_MEMBER(ppc2_int); - DECLARE_WRITE32_MEMBER(cde_sdbg_out); + void cde_sdbg_out(uint32_t data); - DECLARE_WRITE16_MEMBER(ldac_out); - DECLARE_WRITE16_MEMBER(rdac_out); + void ldac_out(uint16_t data); + void rdac_out(uint16_t data); DECLARE_WRITE_LINE_MEMBER(ata_int); @@ -390,7 +390,7 @@ WRITE_LINE_MEMBER(konamim2_state::ppc2_int) m_ppc2->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE32_MEMBER(konamim2_state::cde_sdbg_out) +void konamim2_state::cde_sdbg_out(uint32_t data) { if (data == 0xd) putc('\n', stdout); @@ -406,12 +406,12 @@ WRITE32_MEMBER(konamim2_state::cde_sdbg_out) #endif } -WRITE16_MEMBER( konamim2_state::ldac_out ) +void konamim2_state::ldac_out(uint16_t data) { m_ldac->write(data); } -WRITE16_MEMBER( konamim2_state::rdac_out ) +void konamim2_state::rdac_out(uint16_t data) { m_rdac->write(data); } diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 7d39c0c4900..6a9e4499ea2 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -116,7 +116,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(konmedal_scanline); WRITE_LINE_MEMBER(vbl_ack_w) { m_maincpu->set_input_line(0, CLEAR_LINE); } WRITE_LINE_MEMBER(nmi_ack_w) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } - WRITE8_MEMBER(ccu_int_time_w) { m_ccu_int_time = data; } + void ccu_int_time_w(uint8_t data) { m_ccu_int_time = data; } WRITE8_MEMBER(k056832_w) { m_k056832->write(offset ^ 1, data); } WRITE8_MEMBER(k056832_b_w) { m_k056832->b_w(offset ^ 1, data); } diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index 4003ac48221..c62e0c65b59 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -526,12 +526,12 @@ private: DECLARE_WRITE_LINE_MEMBER( ata_interrupt ); TIMER_CALLBACK_MEMBER( atapi_xfer_end ); - DECLARE_WRITE8_MEMBER( ddr_output_callback ); - DECLARE_WRITE8_MEMBER( ddrsolo_output_callback ); - DECLARE_WRITE8_MEMBER( drmn_output_callback ); - DECLARE_WRITE8_MEMBER( dmx_output_callback ); - DECLARE_WRITE8_MEMBER( mamboagg_output_callback ); - DECLARE_WRITE8_MEMBER( punchmania_output_callback ); + void ddr_output_callback(offs_t offset, uint8_t data); + void ddrsolo_output_callback(offs_t offset, uint8_t data); + void drmn_output_callback(offs_t offset, uint8_t data); + void dmx_output_callback(offs_t offset, uint8_t data); + void mamboagg_output_callback(offs_t offset, uint8_t data); + void punchmania_output_callback(offs_t offset, uint8_t data); double analogue_inputs_callback(uint8_t input); void cdrom_dma_read( uint32_t *ram, uint32_t n_address, int32_t n_size ); @@ -565,7 +565,7 @@ private: inline void ATTR_PRINTF( 3,4 ) verboselog( int n_level, const char *s_fmt, ... ); void update_disc(); void gx700pwbf_output( int offset, uint8_t data ); - void gx700pwfbf_init( void ( ksys573_state::*output_callback_func )( address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t data, ATTR_UNUSED uint8_t mem_mask ) ); + void gx700pwfbf_init( void ( ksys573_state::*output_callback_func )( ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t data ) ); void gn845pwbb_do_w( int offset, int data ); void gn845pwbb_clk_w( int offset, int data ); @@ -588,7 +588,7 @@ private: int m_h8_clk; uint8_t m_gx700pwbf_output_data[ 4 ]; - void ( ksys573_state::*m_gx700pwfbf_output_callback )( address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t data, ATTR_UNUSED uint8_t mem_mask ); + void ( ksys573_state::*m_gx700pwfbf_output_callback )( ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t data ); uint32_t m_stage_mask; struct @@ -1036,7 +1036,7 @@ void ksys573_state::gx700pwbf_output( int offset, uint8_t data ) int newbit = ( data >> shift[ i ] ) & 1; if( oldbit != newbit ) { - ( this->*m_gx700pwfbf_output_callback )( m_maincpu->space( AS_PROGRAM ), ( offset * 8 ) + i, newbit, 0xff ); + ( this->*m_gx700pwfbf_output_callback )( ( offset * 8 ) + i, newbit ); } } } @@ -1071,7 +1071,7 @@ WRITE16_MEMBER( ksys573_state::gx700pwbf_io_w ) } } -void ksys573_state::gx700pwfbf_init( void ( ksys573_state::*output_callback_func )( address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t data, ATTR_UNUSED uint8_t mem_mask ) ) +void ksys573_state::gx700pwfbf_init( void ( ksys573_state::*output_callback_func )( ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t data ) ) { memset( m_gx700pwbf_output_data, 0, sizeof( m_gx700pwbf_output_data ) ); @@ -1159,7 +1159,7 @@ CUSTOM_INPUT_MEMBER( ksys573_state::gn845pwbb_read ) return m_stage->read() & m_stage_mask; } -WRITE8_MEMBER( ksys573_state::ddr_output_callback ) +void ksys573_state::ddr_output_callback(offs_t offset, uint8_t data) { switch( offset ) { @@ -1278,7 +1278,7 @@ WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b4 ) /* ddr solo */ -WRITE8_MEMBER( ksys573_state::ddrsolo_output_callback ) +void ksys573_state::ddrsolo_output_callback(offs_t offset, uint8_t data) { switch( offset ) { @@ -1333,7 +1333,7 @@ WRITE8_MEMBER( ksys573_state::ddrsolo_output_callback ) /* drummania */ -WRITE8_MEMBER( ksys573_state::drmn_output_callback ) +void ksys573_state::drmn_output_callback(offs_t offset, uint8_t data) { switch( offset ) { @@ -1404,7 +1404,7 @@ void ksys573_state::init_drmn() /* dance maniax */ -WRITE8_MEMBER( ksys573_state::dmx_output_callback ) +void ksys573_state::dmx_output_callback(offs_t offset, uint8_t data) { switch( offset ) { @@ -1814,7 +1814,7 @@ void ksys573_state::init_hyperbbc() /* Mambo A Go Go */ -WRITE8_MEMBER( ksys573_state::mamboagg_output_callback ) +void ksys573_state::mamboagg_output_callback(offs_t offset, uint8_t data) { switch( offset ) { @@ -1906,7 +1906,7 @@ void ksys573_state::punchmania_cassette_install(device_t *device) int pad_light[ 6 ]; -WRITE8_MEMBER( ksys573_state::punchmania_output_callback ) +void ksys573_state::punchmania_output_callback(offs_t offset, uint8_t data) { double *pad_position = m_pad_position; char pad[ 7 ]; diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index d3ffedc9310..31a1f945f87 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -158,17 +158,17 @@ READ16_MEMBER(lordgun_state::aliencha_protection_r) return 0; } -WRITE8_MEMBER(lordgun_state::fake_w) +void lordgun_state::fake_w(uint8_t data) { // popmessage("%02x",data); } -WRITE8_MEMBER(lordgun_state::fake2_w) +void lordgun_state::fake2_w(uint8_t data) { // popmessage("%02x",data); } -WRITE8_MEMBER(lordgun_state::lordgun_eeprom_w) +void lordgun_state::lordgun_eeprom_w(uint8_t data) { int i; @@ -199,7 +199,7 @@ WRITE8_MEMBER(lordgun_state::lordgun_eeprom_w) m_old = data; } -WRITE8_MEMBER(lordgun_state::aliencha_eeprom_w) +void lordgun_state::aliencha_eeprom_w(uint8_t data) { if (~data & ~0xf8) { @@ -224,7 +224,7 @@ WRITE8_MEMBER(lordgun_state::aliencha_eeprom_w) } -READ8_MEMBER(lordgun_state::aliencha_dip_r) +uint8_t lordgun_state::aliencha_dip_r() { switch (m_aliencha_dip_sel & 0x70) { @@ -238,7 +238,7 @@ READ8_MEMBER(lordgun_state::aliencha_dip_r) } } -WRITE8_MEMBER(lordgun_state::aliencha_dip_w) +void lordgun_state::aliencha_dip_w(uint8_t data) { m_aliencha_dip_sel = data; } @@ -347,7 +347,7 @@ void lordgun_state::soundmem_map(address_map &map) map(0xf000, 0xffff).ram(); } -WRITE8_MEMBER(lordgun_state::lordgun_okibank_w) +void lordgun_state::lordgun_okibank_w(uint8_t data) { m_oki->set_rom_bank((data >> 1) & 1); if (data & ~3) logerror("%s: unknown okibank bits %02x\n", machine().describe_context(), data); diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index dc5d4934e96..50cc3f7f12d 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -200,8 +200,8 @@ private: DECLARE_WRITE_LINE_MEMBER(coin2_w); DECLARE_WRITE8_MEMBER(snd_irq_w); DECLARE_WRITE8_MEMBER(snddata_w); - DECLARE_WRITE8_MEMBER(p1_w); - DECLARE_WRITE8_MEMBER(p2_w); + void p1_w(uint8_t data); + void p2_w(uint8_t data); DECLARE_READ8_MEMBER(snd_status_r); DECLARE_READ_LINE_MEMBER(irq_r); DECLARE_READ8_MEMBER(snddata_r); @@ -425,12 +425,12 @@ WRITE8_MEMBER(m63_state::snddata_w) m_sound_status = offset; } -WRITE8_MEMBER(m63_state::p1_w) +void m63_state::p1_w(uint8_t data) { m_p1 = data; } -WRITE8_MEMBER(m63_state::p2_w) +void m63_state::p2_w(uint8_t data) { m_p2 = data; if((m_p2 & 0xf0) == 0x50) diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp index 6ea9e6fda18..c3723b42e18 100644 --- a/src/mame/drivers/mainevt.cpp +++ b/src/mame/drivers/mainevt.cpp @@ -387,7 +387,7 @@ INPUT_PORTS_END /*****************************************************************************/ -WRITE8_MEMBER(mainevt_state::volume_callback) +void mainevt_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index 128fa91beff..1f1be5ee93d 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -158,14 +158,14 @@ void maygay1b_state::cpu0_nmi() ***************************************************************************/ // some games might differ.. -WRITE8_MEMBER(maygay1b_state::m1_pia_porta_w) +void maygay1b_state::m1_pia_porta_w(uint8_t data) { m_vfd->por(data & 0x40); m_vfd->data(data & 0x10); m_vfd->sclk(data & 0x20); } -WRITE8_MEMBER(maygay1b_state::m1_pia_portb_w) +void maygay1b_state::m1_pia_portb_w(uint8_t data) { for (int i = 0; i < 8; i++) { @@ -324,15 +324,14 @@ WRITE8_MEMBER(maygay1b_state::reel56_w) awp_draw_reel(machine(),"reel6", *m_reels[5]); } -READ8_MEMBER(maygay1b_state::m1_duart_r) +uint8_t maygay1b_state::m1_duart_r() { return ~(m_optic_pattern); } -WRITE8_MEMBER(maygay1b_state::m1_meter_w) +void maygay1b_state::m1_meter_w(uint8_t data) { - int i; - for (i=0; i<8; i++) + for (int i=0; i<8; i++) { if ( data & (1 << i) ) { @@ -413,10 +412,9 @@ READ8_MEMBER(maygay1b_state::m1_meter_r) //TODO: Can we just return the AY port A data? return m_meter; } -WRITE8_MEMBER(maygay1b_state::m1_lockout_w) +void maygay1b_state::m1_lockout_w(uint8_t data) { - int i; - for (i=0; i<6; i++) + for (int i=0; i<6; i++) { machine().bookkeeping().coin_lockout_w(i, data & (1 << i) ); } @@ -561,12 +559,12 @@ void maygay1b_state::m1_nec_memmap(address_map &map) * *************************************/ -WRITE8_MEMBER( maygay1b_state::scanlines_w ) +void maygay1b_state::scanlines_w(uint8_t data) { m_lamp_strobe = data; } -WRITE8_MEMBER( maygay1b_state::lamp_data_w ) +void maygay1b_state::lamp_data_w(uint8_t data) { //The two A/B ports are merged back into one, to make one row of 8 lamps. @@ -583,17 +581,17 @@ WRITE8_MEMBER( maygay1b_state::lamp_data_w ) } -READ8_MEMBER( maygay1b_state::kbd_r ) +uint8_t maygay1b_state::kbd_r() { return (m_kbd_ports[(m_lamp_strobe&0x07)^4])->read(); } -WRITE8_MEMBER( maygay1b_state::scanlines_2_w ) +void maygay1b_state::scanlines_2_w(uint8_t data) { m_lamp_strobe2 = data; } -WRITE8_MEMBER( maygay1b_state::lamp_data_2_w ) +void maygay1b_state::lamp_data_2_w(uint8_t data) { //The two A/B ports are merged back into one, to make one row of 8 lamps. @@ -636,7 +634,7 @@ WRITE8_MEMBER(maygay1b_state::main_to_mcu_1_w) } -WRITE8_MEMBER(maygay1b_state::mcu_port0_w) +void maygay1b_state::mcu_port0_w(uint8_t data) { #ifdef USE_MCU // only during startup @@ -644,7 +642,7 @@ WRITE8_MEMBER(maygay1b_state::mcu_port0_w) #endif } -WRITE8_MEMBER(maygay1b_state::mcu_port1_w) +void maygay1b_state::mcu_port1_w(uint8_t data) { #ifdef USE_MCU int bit_offset; @@ -663,7 +661,7 @@ WRITE8_MEMBER(maygay1b_state::mcu_port1_w) #endif } -WRITE8_MEMBER(maygay1b_state::mcu_port2_w) +void maygay1b_state::mcu_port2_w(uint8_t data) { #ifdef USE_MCU // only during startup @@ -671,7 +669,7 @@ WRITE8_MEMBER(maygay1b_state::mcu_port2_w) #endif } -WRITE8_MEMBER(maygay1b_state::mcu_port3_w) +void maygay1b_state::mcu_port3_w(uint8_t data) { #ifdef USE_MCU // only during startup @@ -679,7 +677,7 @@ WRITE8_MEMBER(maygay1b_state::mcu_port3_w) #endif } -READ8_MEMBER(maygay1b_state::mcu_port0_r) +uint8_t maygay1b_state::mcu_port0_r() { uint8_t ret = m_lamp_strobe; #ifdef USE_MCU @@ -693,7 +691,7 @@ READ8_MEMBER(maygay1b_state::mcu_port0_r) } -READ8_MEMBER(maygay1b_state::mcu_port2_r) +uint8_t maygay1b_state::mcu_port2_r() { // this is read in BOTH the external interrupts // it seems that both the writes from the main cpu go here diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp index 024e0553408..59dfbd0969d 100644 --- a/src/mame/drivers/maygayv1.cpp +++ b/src/mame/drivers/maygayv1.cpp @@ -235,15 +235,15 @@ private: DECLARE_WRITE16_MEMBER(vsync_int_ctrl); DECLARE_READ8_MEMBER(mcu_r); DECLARE_WRITE8_MEMBER(mcu_w); - DECLARE_READ8_MEMBER(b_read); - DECLARE_WRITE8_MEMBER(b_writ); - DECLARE_WRITE8_MEMBER(strobe_w); - DECLARE_WRITE8_MEMBER(lamp_data_w); - DECLARE_READ8_MEMBER(kbd_r); + uint8_t b_read(); + void b_writ(uint8_t data); + void strobe_w(uint8_t data); + void lamp_data_w(uint8_t data); + uint8_t kbd_r(); uint32_t screen_update_maygayv1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_maygayv1); - DECLARE_WRITE8_MEMBER(data_from_i8031); - DECLARE_READ8_MEMBER(data_to_i8031); + void data_from_i8031(uint8_t data); + uint8_t data_to_i8031(); DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); DECLARE_WRITE_LINE_MEMBER(duart_txa); void main_map(address_map &map); @@ -527,12 +527,12 @@ READ16_MEMBER(maygayv1_state::read_odd) * *************************************/ -WRITE8_MEMBER( maygayv1_state::strobe_w ) +void maygayv1_state::strobe_w(uint8_t data) { m_lamp_strobe = data; } -WRITE8_MEMBER( maygayv1_state::lamp_data_w ) +void maygayv1_state::lamp_data_w(uint8_t data) { //The two A/B ports are merged back into one, to make one row of 8 lamps. @@ -551,7 +551,7 @@ WRITE8_MEMBER( maygayv1_state::lamp_data_w ) } -READ8_MEMBER( maygayv1_state::kbd_r ) +uint8_t maygayv1_state::kbd_r() { static const char *const portnames[] = { "STROBE1","STROBE2","STROBE3","STROBE4","STROBE5","STROBE6","STROBE7","STROBE8" }; @@ -842,23 +842,23 @@ WRITE_LINE_MEMBER(maygayv1_state::duart_txa) m_soundcpu->set_input_line(MCS51_RX_LINE, ASSERT_LINE); // ? } -READ8_MEMBER(maygayv1_state::data_to_i8031) +uint8_t maygayv1_state::data_to_i8031() { return m_d68681_val; } -WRITE8_MEMBER(maygayv1_state::data_from_i8031) +void maygayv1_state::data_from_i8031(uint8_t data) { m_duart68681->rx_a_w(data); } -READ8_MEMBER(maygayv1_state::b_read) +uint8_t maygayv1_state::b_read() { // Meters - upper nibble? return 0xff; } -WRITE8_MEMBER(maygayv1_state::b_writ) +void maygayv1_state::b_writ(uint8_t data) { logerror("B WRITE %x\n",data); } diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp index 70c3e70d790..b02a1659364 100644 --- a/src/mame/drivers/megazone.cpp +++ b/src/mame/drivers/megazone.cpp @@ -76,7 +76,7 @@ REAR BOARD 1C026 N/U (CUSTOM ON ORIGINAL) #include "speaker.h" -READ8_MEMBER(megazone_state::megazone_port_a_r) +uint8_t megazone_state::megazone_port_a_r() { int clock, timer; @@ -95,7 +95,7 @@ READ8_MEMBER(megazone_state::megazone_port_a_r) return (timer << 4) | m_i8039_status; } -WRITE8_MEMBER(megazone_state::megazone_port_b_w) +void megazone_state::megazone_port_b_w(uint8_t data) { for (int i = 0; i < 3; i++) { @@ -110,12 +110,12 @@ WRITE8_MEMBER(megazone_state::megazone_port_b_w) } } -WRITE8_MEMBER(megazone_state::megazone_i8039_irq_w) +void megazone_state::megazone_i8039_irq_w(uint8_t data) { m_daccpu->set_input_line(0, ASSERT_LINE); } -WRITE8_MEMBER(megazone_state::i8039_irqen_and_status_w) +void megazone_state::i8039_irqen_and_status_w(uint8_t data) { if ((data & 0x80) == 0) m_daccpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/drivers/mephisto_brikett.cpp b/src/mame/drivers/mephisto_brikett.cpp index f41cfabf655..5bafbb6eb94 100644 --- a/src/mame/drivers/mephisto_brikett.cpp +++ b/src/mame/drivers/mephisto_brikett.cpp @@ -144,7 +144,7 @@ private: DECLARE_READ8_MEMBER(input_r); DECLARE_READ8_MEMBER(sound_r); - DECLARE_WRITE8_MEMBER(esb_w); + void esb_w(u8 data); DECLARE_READ_LINE_MEMBER(esb_r); TIMER_DEVICE_CALLBACK_MEMBER(speaker_off) { m_dac->write(0); } @@ -269,7 +269,7 @@ READ8_MEMBER(brikett_state::input_r) return data; } -WRITE8_MEMBER(brikett_state::esb_w) +void brikett_state::esb_w(u8 data) { // CDP1852 SR + DO0-DO7 goes to external port, to chessboard if (!m_inputs[5].read_safe(0)) diff --git a/src/mame/drivers/mephisto_mondial68k.cpp b/src/mame/drivers/mephisto_mondial68k.cpp index 4e41ccdaac8..8b41e79584f 100644 --- a/src/mame/drivers/mephisto_mondial68k.cpp +++ b/src/mame/drivers/mephisto_mondial68k.cpp @@ -51,7 +51,7 @@ protected: void mondial68k_mem(address_map &map); - DECLARE_WRITE32_MEMBER(lcd_s_w); + void lcd_s_w(u32 data); DECLARE_WRITE8_MEMBER(input_mux_w); DECLARE_WRITE8_MEMBER(board_mux_w); DECLARE_READ8_MEMBER(inputs_r); @@ -89,7 +89,7 @@ void mondial68k_state::update_display() m_display->matrix(m_input_mux >> 6, ~m_board_mux); } -WRITE32_MEMBER(mondial68k_state::lcd_s_w) +void mondial68k_state::lcd_s_w(u32 data) { // output LCD digits (note: last digit DP segment is unused) for (int i=0; i<4; i++) diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 397d758ae4c..7fd77bcf074 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -248,15 +248,15 @@ private: DECLARE_WRITE8_MEMBER(crt250_questions_bank_w); DECLARE_WRITE8_MEMBER(ds1644_w); DECLARE_READ8_MEMBER(ds1644_r); - DECLARE_READ8_MEMBER(_8255_port_c_r); - DECLARE_WRITE8_MEMBER(crt250_port_b_w); - DECLARE_WRITE8_MEMBER(ay8930_port_b_w); - DECLARE_READ8_MEMBER(audio_pio_port_a_r); - DECLARE_READ8_MEMBER(audio_pio_port_b_r); - DECLARE_WRITE8_MEMBER(audio_pio_port_a_w); - DECLARE_WRITE8_MEMBER(audio_pio_port_b_w); - DECLARE_WRITE8_MEMBER(io_pio_port_a_w); - DECLARE_WRITE8_MEMBER(io_pio_port_b_w); + uint8_t _8255_port_c_r(); + void crt250_port_b_w(uint8_t data); + void ay8930_port_b_w(uint8_t data); + uint8_t audio_pio_port_a_r(); + uint8_t audio_pio_port_b_r(); + void audio_pio_port_a_w(uint8_t data); + void audio_pio_port_b_w(uint8_t data); + void io_pio_port_a_w(uint8_t data); + void io_pio_port_b_w(uint8_t data); DECLARE_MACHINE_START(crt250_questions); DECLARE_MACHINE_START(crt250_crt252_crt258); @@ -876,13 +876,13 @@ INPUT_PORTS_END * *************************************/ -READ8_MEMBER(meritm_state::_8255_port_c_r) +uint8_t meritm_state::_8255_port_c_r() { //logerror( "8255 port C read\n" ); return 0xff; } -WRITE8_MEMBER(meritm_state::crt250_port_b_w) +void meritm_state::crt250_port_b_w(uint8_t data) { //popmessage("Lamps: %d %d %d %d %d %d %d", BIT(data,0), BIT(data,1), BIT(data,2), BIT(data,3), BIT(data,4), BIT(data,5), BIT(data,6) ); output().set_value("P1 DISC 1 LAMP", !BIT(data,0)); @@ -905,7 +905,7 @@ WRITE8_MEMBER(meritm_state::crt250_port_b_w) Port B: Bits 0,1 used */ -WRITE8_MEMBER(meritm_state::ay8930_port_b_w) +void meritm_state::ay8930_port_b_w(uint8_t data) { // lamps } @@ -916,7 +916,7 @@ WRITE8_MEMBER(meritm_state::ay8930_port_b_w) * *************************************/ -READ8_MEMBER(meritm_state::audio_pio_port_a_r) +uint8_t meritm_state::audio_pio_port_a_r() { /* @@ -936,7 +936,7 @@ READ8_MEMBER(meritm_state::audio_pio_port_a_r) return m_vint; } -READ8_MEMBER(meritm_state::audio_pio_port_b_r) +uint8_t meritm_state::audio_pio_port_b_r() { /* @@ -956,7 +956,7 @@ READ8_MEMBER(meritm_state::audio_pio_port_b_r) return m_ds1204->read_dq(); } -WRITE8_MEMBER(meritm_state::audio_pio_port_a_w) +void meritm_state::audio_pio_port_a_w(uint8_t data) { /* @@ -977,7 +977,7 @@ WRITE8_MEMBER(meritm_state::audio_pio_port_a_w) //logerror("Writing BANK with %x (raw = %x)\n", m_bank, data); } -WRITE8_MEMBER(meritm_state::audio_pio_port_b_w) +void meritm_state::audio_pio_port_b_w(uint8_t data) { /* @@ -999,7 +999,7 @@ WRITE8_MEMBER(meritm_state::audio_pio_port_b_w) m_ds1204->write_dq(data & 0x01); } -WRITE8_MEMBER(meritm_state::io_pio_port_a_w) +void meritm_state::io_pio_port_a_w(uint8_t data) { /* @@ -1017,7 +1017,7 @@ WRITE8_MEMBER(meritm_state::io_pio_port_a_w) */ } -WRITE8_MEMBER(meritm_state::io_pio_port_b_w) +void meritm_state::io_pio_port_b_w(uint8_t data) { /* diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 63bb06f44b4..6cc911b804b 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -339,23 +339,23 @@ WRITE8_MEMBER(metro_state::soundstatus_w) } template<int Mask> -WRITE8_MEMBER(metro_state::upd7810_rombank_w) +void metro_state::upd7810_rombank_w(uint8_t data) { m_audiobank->set_entry((data >> 4) & Mask); } -READ8_MEMBER(metro_state::upd7810_porta_r) +uint8_t metro_state::upd7810_porta_r() { return m_porta; } -WRITE8_MEMBER(metro_state::upd7810_porta_w) +void metro_state::upd7810_porta_w(uint8_t data) { m_porta = data; } -WRITE8_MEMBER(metro_state::upd7810_portb_w) +void metro_state::upd7810_portb_w(uint8_t data) { /* port B layout: 7 !clock latch for message to main CPU @@ -404,7 +404,7 @@ WRITE8_MEMBER(metro_state::upd7810_portb_w) } -WRITE8_MEMBER(metro_state::daitorid_portb_w) +void metro_state::daitorid_portb_w(uint8_t data) { /* port B layout: 7 !clock latch for message to main CPU @@ -1270,7 +1270,7 @@ void metro_state::puzzlet_map(address_map &map) } -WRITE16_MEMBER(metro_state::puzzlet_portb_w) +void metro_state::puzzlet_portb_w(uint16_t data) { // popmessage("PORTB %02x", data); } diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index 9fa97266383..bfdb49b57d8 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -375,7 +375,7 @@ WRITE8_MEMBER(nemesis_state::salamand_speech_start_w) // bit 2 is OE for VLM data } -READ8_MEMBER(nemesis_state::nemesis_portA_r) +uint8_t nemesis_state::nemesis_portA_r() { /* bit 0-3: timer @@ -1687,7 +1687,7 @@ GFXDECODE_END /******************************************************************************/ -WRITE8_MEMBER(nemesis_state::volume_callback) +void nemesis_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index 8504e93ba83..5413714d878 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -367,7 +367,7 @@ READ8_MEMBER( newbrain_state::ust_b_r ) // cop_in_r - //------------------------------------------------- -READ8_MEMBER( newbrain_state::cop_in_r ) +uint8_t newbrain_state::cop_in_r() { /* @@ -395,7 +395,7 @@ READ8_MEMBER( newbrain_state::cop_in_r ) // cop_g_r - //------------------------------------------------- -READ8_MEMBER( newbrain_state::cop_g_r ) +uint8_t newbrain_state::cop_g_r() { /* @@ -438,7 +438,7 @@ void newbrain_state::tm() // m_cassette2->change_state(tm2, CASSETTE_MASK_MOTOR); } -WRITE8_MEMBER( newbrain_state::cop_g_w ) +void newbrain_state::cop_g_w(uint8_t data) { /* @@ -471,7 +471,7 @@ WRITE8_MEMBER( newbrain_state::cop_g_w ) // cop_d_w - //------------------------------------------------- -WRITE8_MEMBER( newbrain_state::cop_d_w ) +void newbrain_state::cop_d_w(uint8_t data) { /* bit description diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index a445ed2a42d..8a4cbe3bd52 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -61,7 +61,7 @@ protected: DECLARE_READ_LINE_MEMBER(t1_read); void odyssey2_palette(palette_device &palette) const; - DECLARE_WRITE16_MEMBER(scanline_postprocess); + void scanline_postprocess(uint16_t data); void odyssey2_io(address_map &map); void odyssey2_mem(address_map &map); @@ -84,12 +84,12 @@ protected: DECLARE_READ8_MEMBER(io_read); DECLARE_WRITE8_MEMBER(io_write); - DECLARE_READ8_MEMBER(bus_read); - DECLARE_WRITE8_MEMBER(bus_write); - DECLARE_READ8_MEMBER(p1_read); - DECLARE_WRITE8_MEMBER(p1_write); - DECLARE_READ8_MEMBER(p2_read); - DECLARE_WRITE8_MEMBER(p2_write); + uint8_t bus_read(); + void bus_write(uint8_t data); + uint8_t p1_read(); + void p1_write(uint8_t data); + uint8_t p2_read(); + void p2_write(uint8_t data); }; class g7400_state : public odyssey2_state @@ -111,14 +111,14 @@ private: void g7400_palette(palette_device &palette) const; virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER(p2_write); + void p2_write(uint8_t data); DECLARE_READ8_MEMBER(io_read); DECLARE_WRITE8_MEMBER(io_write); void i8243_p4_w(uint8_t data); void i8243_p5_w(uint8_t data); void i8243_p6_w(uint8_t data); void i8243_p7_w(uint8_t data); - DECLARE_WRITE16_MEMBER(scanline_postprocess); + void scanline_postprocess(uint16_t data); void g7400_io(address_map &map); @@ -416,7 +416,7 @@ WRITE8_MEMBER(g7400_state::io_write) } -WRITE16_MEMBER(odyssey2_state::scanline_postprocess) +void odyssey2_state::scanline_postprocess(uint16_t data) { int vpos = data; bitmap_ind16 *bitmap = m_i8244->get_bitmap(); @@ -434,7 +434,7 @@ WRITE16_MEMBER(odyssey2_state::scanline_postprocess) } -WRITE16_MEMBER(g7400_state::scanline_postprocess) +void g7400_state::scanline_postprocess(uint16_t data) { int vpos = data; int y = vpos - i8244_device::START_Y - 5; @@ -489,7 +489,7 @@ READ_LINE_MEMBER(odyssey2_state::t1_read) } -READ8_MEMBER(odyssey2_state::p1_read) +uint8_t odyssey2_state::p1_read() { uint8_t data = m_p1; @@ -497,7 +497,7 @@ READ8_MEMBER(odyssey2_state::p1_read) } -WRITE8_MEMBER(odyssey2_state::p1_write) +void odyssey2_state::p1_write(uint8_t data) { m_p1 = data; m_lum = ( data & 0x80 ) >> 4; @@ -505,7 +505,7 @@ WRITE8_MEMBER(odyssey2_state::p1_write) } -READ8_MEMBER(odyssey2_state::p2_read) +uint8_t odyssey2_state::p2_read() { uint8_t h = 0xFF; int i, j; @@ -542,20 +542,20 @@ READ8_MEMBER(odyssey2_state::p2_read) } -WRITE8_MEMBER(odyssey2_state::p2_write) +void odyssey2_state::p2_write(uint8_t data) { m_p2 = data; } -WRITE8_MEMBER(g7400_state::p2_write) +void g7400_state::p2_write(uint8_t data) { m_p2 = data; m_i8243->p2_w(m_p2 & 0x0f); } -READ8_MEMBER(odyssey2_state::bus_read) +uint8_t odyssey2_state::bus_read() { uint8_t data = 0xff; @@ -573,7 +573,7 @@ READ8_MEMBER(odyssey2_state::bus_read) } -WRITE8_MEMBER(odyssey2_state::bus_write) +void odyssey2_state::bus_write(uint8_t data) { logerror("%.6f bus written %.2x\n", machine().time().as_double(), data); } diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp index e822b3b8390..b14cf664010 100644 --- a/src/mame/drivers/pandoras.cpp +++ b/src/mame/drivers/pandoras.cpp @@ -86,7 +86,7 @@ WRITE8_MEMBER(pandoras_state::pandoras_i8039_irqtrigger_w) m_mcu->set_input_line(0, ASSERT_LINE); } -WRITE8_MEMBER(pandoras_state::i8039_irqen_and_status_w) +void pandoras_state::i8039_irqen_and_status_w(uint8_t data) { /* bit 7 enables IRQ */ if ((data & 0x80) == 0) @@ -295,12 +295,12 @@ void pandoras_state::machine_reset() m_i8039_status = 0; } -READ8_MEMBER(pandoras_state::pandoras_portA_r) +uint8_t pandoras_state::pandoras_portA_r() { return m_i8039_status; } -READ8_MEMBER(pandoras_state::pandoras_portB_r) +uint8_t pandoras_state::pandoras_portB_r() { return (m_audiocpu->total_cycles() / 512) & 0x0f; } diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index 549f9d8c799..7366c97c11d 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -214,7 +214,7 @@ void parodius_state::machine_reset() m_bank2000->set_bank(0); } -WRITE8_MEMBER( parodius_state::banking_callback ) +void parodius_state::banking_callback(uint8_t data) { if (data & 0xf0) logerror("%s: setlines %02x\n", machine().describe_context(), data); diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index 88088ce51af..1a3169964a2 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -59,7 +59,7 @@ private: DECLARE_WRITE8_MEMBER(bank1_w); DECLARE_WRITE8_MEMBER(bank2_w); DECLARE_READ8_MEMBER(audio_r); - DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); + void dma8237_1_dack_w(uint8_t data); virtual void machine_start() override; void nvram_init(nvram_device &nvram, void *base, size_t size); static void pcat_dyn_sb_conf(device_t *device); @@ -126,7 +126,7 @@ void pcat_dyn_state::pcat_io(address_map &map) } //TODO: use atmb device -WRITE8_MEMBER( pcat_dyn_state::dma8237_1_dack_w ){ m_isabus->dack_w(1, data); } +void pcat_dyn_state::dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); } static INPUT_PORTS_START( pcat_dyn ) // M,N,Numpad 6 -- Hang diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index bc36c582cb5..a69d810b47c 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -330,7 +330,7 @@ private: emu_timer *m_assert_lp_timer; DECLARE_WRITE8_MEMBER(bgcolor_w); - template<uint8_t Which> DECLARE_WRITE8_MEMBER(paldata_w); + template<uint8_t Which> void paldata_w(uint8_t data); DECLARE_WRITE8_MEMBER(crtc_display_w); DECLARE_WRITE8_MEMBER(duart_w); DECLARE_WRITE8_MEMBER(cmos_w); @@ -448,7 +448,7 @@ WRITE_LINE_MEMBER(peplus_state::crtc_vsync) } template<uint8_t Which> -WRITE8_MEMBER(peplus_state::paldata_w) +void peplus_state::paldata_w(uint8_t data) { m_paldata[Which] = data; } diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp index 2919d4106fe..fb934162ce8 100644 --- a/src/mame/drivers/quickpick5.cpp +++ b/src/mame/drivers/quickpick5.cpp @@ -57,7 +57,7 @@ private: K05324X_CB_MEMBER(sprite_callback); TILE_GET_INFO_MEMBER(ttl_get_tile_info); - DECLARE_WRITE8_MEMBER(ccu_int_time_w); + void ccu_int_time_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(scanline); READ8_MEMBER(control_r) { return m_control; } @@ -107,7 +107,7 @@ private: int m_ccu_int_time, m_ccu_int_time_count; }; -WRITE8_MEMBER(quickpick5_state::ccu_int_time_w) +void quickpick5_state::ccu_int_time_w(uint8_t data) { logerror("ccu_int_time rewritten with value of %02x\n", data); m_ccu_int_time = data; diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index 1c60e6bb5ea..50f861de6dd 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -238,7 +238,7 @@ void rollerg_state::machine_reset() m_readzoomroms = 0; } -WRITE8_MEMBER( rollerg_state::banking_callback ) +void rollerg_state::banking_callback(uint8_t data) { membank("bank1")->set_entry(data & 0x07); } diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp index ea45991250d..2b288225fd6 100644 --- a/src/mame/drivers/rotaryf.cpp +++ b/src/mame/drivers/rotaryf.cpp @@ -47,10 +47,10 @@ private: required_shared_ptr<uint8_t> m_videoram; - DECLARE_READ8_MEMBER(portb_r); - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_WRITE8_MEMBER(portc_w); - DECLARE_WRITE8_MEMBER(port30_w); + uint8_t portb_r(); + void porta_w(uint8_t data); + void portc_w(uint8_t data); + void port30_w(uint8_t data); bool m_flipscreen; uint8_t m_last; @@ -89,7 +89,7 @@ void rotaryf_state::machine_start() save_item(NAME(m_last)); } -READ8_MEMBER(rotaryf_state::portb_r) +uint8_t rotaryf_state::portb_r() { uint8_t data = ioport("INPUTS")->read(); @@ -98,7 +98,7 @@ READ8_MEMBER(rotaryf_state::portb_r) return (data & 0xCD) | ((data & 0x01) << 1) | ((data & 0x0c) << 2); } -WRITE8_MEMBER(rotaryf_state::porta_w) +void rotaryf_state::porta_w(uint8_t data) { uint8_t rising_bits = data & ~m_last; @@ -121,14 +121,14 @@ WRITE8_MEMBER(rotaryf_state::porta_w) m_last = data; } -WRITE8_MEMBER(rotaryf_state::portc_w) +void rotaryf_state::portc_w(uint8_t data) { machine().bookkeeping().coin_counter_w(0, BIT(data, 1)); // bit 5 set when game starts, but isn't coin lockout? } -WRITE8_MEMBER(rotaryf_state::port30_w) +void rotaryf_state::port30_w(uint8_t data) { /* bit 0 = player 2 is playing */ diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp index 1092fc0852d..1ba5b8373ff 100644 --- a/src/mame/drivers/sbc6510.cpp +++ b/src/mame/drivers/sbc6510.cpp @@ -74,12 +74,12 @@ public: void sbc6510(machine_config &config); private: - DECLARE_READ8_MEMBER(a2_r); - DECLARE_WRITE8_MEMBER(a2_w); - DECLARE_READ8_MEMBER(psg_a_r); - DECLARE_READ8_MEMBER(psg_b_r); - DECLARE_WRITE8_MEMBER(key_w); - DECLARE_READ8_MEMBER(key_r); + uint8_t a2_r(); + void a2_w(uint8_t data); + uint8_t psg_a_r(); + uint8_t psg_b_r(); + void key_w(uint8_t data); + uint8_t key_r(); void sbc6510_mem(address_map &map); void sbc6510_video_data(address_map &map); @@ -213,12 +213,12 @@ static INPUT_PORTS_START( sbc6510 ) // cbm keyboard INPUT_PORTS_END -READ8_MEMBER( sbc6510_state::a2_r ) +uint8_t sbc6510_state::a2_r() { return m_2; } -WRITE8_MEMBER( sbc6510_state::a2_w ) +void sbc6510_state::a2_w(uint8_t data) { m_2 = data; m_terminal->write(data); @@ -233,17 +233,17 @@ void sbc6510_state::machine_reset() { } -READ8_MEMBER( sbc6510_state::psg_a_r ) +uint8_t sbc6510_state::psg_a_r() { return 0xff; } -READ8_MEMBER( sbc6510_state::psg_b_r ) +uint8_t sbc6510_state::psg_b_r() { return 0x7f; } -READ8_MEMBER( sbc6510_state::key_r ) +uint8_t sbc6510_state::key_r() { u8 i, data=0; @@ -254,7 +254,7 @@ READ8_MEMBER( sbc6510_state::key_r ) return ~data; } -WRITE8_MEMBER( sbc6510_state::key_w ) +void sbc6510_state::key_w(uint8_t data) { m_key_row = data; } diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp index f73518148fd..cf10a8648c8 100644 --- a/src/mame/drivers/sdk86.cpp +++ b/src/mame/drivers/sdk86.cpp @@ -52,9 +52,9 @@ public: void sdk86(machine_config &config); private: - DECLARE_WRITE8_MEMBER(scanlines_w); - DECLARE_WRITE8_MEMBER(digit_w); - DECLARE_READ8_MEMBER(kbd_r); + void scanlines_w(uint8_t data); + void digit_w(uint8_t data); + uint8_t kbd_r(); void sdk86_io(address_map &map); void sdk86_mem(address_map &map); @@ -114,18 +114,18 @@ static INPUT_PORTS_START( sdk86 ) INPUT_PORTS_END -WRITE8_MEMBER( sdk86_state::scanlines_w ) +void sdk86_state::scanlines_w(uint8_t data) { m_digit = data; } -WRITE8_MEMBER( sdk86_state::digit_w ) +void sdk86_state::digit_w(uint8_t data) { if (m_digit < 8) m_digits[m_digit] = data; } -READ8_MEMBER( sdk86_state::kbd_r ) +uint8_t sdk86_state::kbd_r() { uint8_t data = 0xff; diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index aee12dd5773..7c07de69911 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -1045,7 +1045,7 @@ ROM_START( sfjbl ) // main PCB is marked '17-51-1' on component side ROM_LOAD( "a-6.6.8f", 0x0000, 0x8000, CRC(4a9ac534) SHA1(933645f8db4756aa2a35a843c3ac6f93cb8d565d) ) ROM_REGION( 0x1000, "protcpu", 0 ) - ROM_LOAD( "c8751h-88.5o", 0x0000, 0x1000, BAD_DUMP CRC(6588891f) SHA1(699a96c682dd527dc77aa5cb2c2655136d2bfc90) ) // C8751H-88, not dumped yet for this PCB + ROM_LOAD( "c8751h-88.5o", 0x0000, 0x1000, CRC(6588891f) SHA1(699a96c682dd527dc77aa5cb2c2655136d2bfc90) ) // decapped, matches other dump from unprotected 8751 ROM_REGION( 0x40000, "audio2", 0 ) // samples CPU, identical to the original, but with half size ROMs ROM_LOAD( "a-2.2.6b", 0x00000, 0x10000, CRC(a3212da3) SHA1(4f95eb1dedbcca05016d92f62968ffce8173defe) ) diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp index 49f1407cb6e..a5f2efee605 100644 --- a/src/mame/drivers/sitcom.cpp +++ b/src/mame/drivers/sitcom.cpp @@ -71,13 +71,13 @@ public: DECLARE_INPUT_CHANGED_MEMBER(update_buttons); protected: - template <unsigned D> DECLARE_WRITE16_MEMBER(update_ds) { m_digits[(D << 2) | offset] = data; } + template <unsigned D> void update_ds(offs_t offset, uint16_t data) { m_digits[(D << 2) | offset] = data; } DECLARE_WRITE_LINE_MEMBER(update_rxd) { m_rxd = bool(state); } DECLARE_WRITE_LINE_MEMBER(sod_led) { output().set_value("sod_led", state); } DECLARE_READ_LINE_MEMBER(sid_line) { return m_rxd ? 1 : 0; } - virtual DECLARE_WRITE8_MEMBER(update_ppi_pa); - virtual DECLARE_WRITE8_MEMBER(update_ppi_pb); + virtual void update_ppi_pa(uint8_t data); + virtual void update_ppi_pb(uint8_t data); void sitcom_bank(address_map &map); void sitcom_io(address_map &map); @@ -123,8 +123,8 @@ public: void sitcomtmr(machine_config &config); protected: - virtual DECLARE_WRITE8_MEMBER(update_ppi_pa) override; - virtual DECLARE_WRITE8_MEMBER(update_ppi_pb) override; + virtual void update_ppi_pa(uint8_t data) override; + virtual void update_ppi_pb(uint8_t data) override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -224,13 +224,13 @@ void sitcom_state::machine_reset() m_bank->set_bank(0); } -WRITE8_MEMBER( sitcom_state::update_ppi_pa ) +void sitcom_state::update_ppi_pa(uint8_t data) { for (int i = 0; 8 > i; ++i) m_leds[0][i] = BIT(data, i); } -WRITE8_MEMBER( sitcom_state::update_ppi_pb ) +void sitcom_state::update_ppi_pb(uint8_t data) { for (int i = 0; 8 > i; ++i) m_leds[1][i] = BIT(data, i); @@ -250,7 +250,7 @@ INPUT_CHANGED_MEMBER( sitcom_state::update_buttons ) } -WRITE8_MEMBER( sitcom_timer_state::update_ppi_pa ) +void sitcom_timer_state::update_ppi_pa(uint8_t data) { if (!m_dac_cs && !m_dac_wr) update_dac(data); @@ -258,7 +258,7 @@ WRITE8_MEMBER( sitcom_timer_state::update_ppi_pa ) m_ds2->data_w(data & 0x7f); } -WRITE8_MEMBER( sitcom_timer_state::update_ppi_pb ) +void sitcom_timer_state::update_ppi_pb(uint8_t data) { if (!m_dac_cs && !BIT(data, 0)) update_dac(m_ppi->pa_r()); diff --git a/src/mame/drivers/slc1a.cpp b/src/mame/drivers/slc1a.cpp index 6009bfead12..44f267fc26e 100644 --- a/src/mame/drivers/slc1a.cpp +++ b/src/mame/drivers/slc1a.cpp @@ -56,9 +56,9 @@ private: uint8_t m_matrix; - DECLARE_WRITE8_MEMBER(matrix_w); - DECLARE_WRITE8_MEMBER(pio_port_a_w); - DECLARE_READ8_MEMBER(pio_port_b_r); + void matrix_w(uint8_t data); + void pio_port_a_w(uint8_t data); + uint8_t pio_port_b_r(); }; void slc1_state::machine_start() @@ -75,7 +75,7 @@ void slc1_state::machine_start() ***************************************************************************/ -WRITE8_MEMBER(slc1_state::pio_port_a_w) +void slc1_state::pio_port_a_w(uint8_t data) { // digit segment data uint8_t digit = bitswap<8>(data,3,4,6,0,1,2,7,5); @@ -97,7 +97,7 @@ WRITE8_MEMBER(slc1_state::pio_port_a_w) ***************************************************************************/ -WRITE8_MEMBER(slc1_state::matrix_w) +void slc1_state::matrix_w(uint8_t data) { // d1: speaker out //m_dac->write(BIT(data, 1)); @@ -106,7 +106,7 @@ WRITE8_MEMBER(slc1_state::matrix_w) m_matrix = data; } -READ8_MEMBER(slc1_state::pio_port_b_r) +uint8_t slc1_state::pio_port_b_r() { uint8_t data = 0; diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp index 292968ef178..265d11c78fe 100644 --- a/src/mame/drivers/splus.cpp +++ b/src/mame/drivers/splus.cpp @@ -77,14 +77,14 @@ private: return 0; } - DECLARE_WRITE8_MEMBER(splus_p1_w); + void splus_p1_w(uint8_t data); DECLARE_WRITE8_MEMBER(splus_load_pulse_w); DECLARE_WRITE8_MEMBER(splus_serial_w); DECLARE_WRITE8_MEMBER(splus_7seg_w); DECLARE_WRITE8_MEMBER(splus_duart_w); DECLARE_READ8_MEMBER(splus_serial_r); DECLARE_READ8_MEMBER(splus_m_reel_ram_r); - DECLARE_READ8_MEMBER(splus_p3_r); + uint8_t splus_p3_r(); DECLARE_READ8_MEMBER(splus_duart_r); DECLARE_READ8_MEMBER(splus_watchdog_r); DECLARE_READ8_MEMBER(splus_registers_r); @@ -166,7 +166,7 @@ static const uint8_t optics[200] = { * Write Handlers * ******************/ -WRITE8_MEMBER(splus_state::splus_p1_w) +void splus_state::splus_p1_w(uint8_t data) { // P1.0 = Reel 1 Controller // P1.1 = Reel 2 Controller @@ -520,7 +520,7 @@ READ8_MEMBER(splus_state::splus_m_reel_ram_r) return m_reel_ram[offset]; } -READ8_MEMBER(splus_state::splus_p3_r) +uint8_t splus_state::splus_p3_r() { return 0xf3; // Ignore Int0 and Int1, or machine will loop forever waiting } diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index b16e6e69bec..60a2e945350 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -97,11 +97,11 @@ private: DECLARE_WRITE8_MEMBER(bg_tile_w); DECLARE_WRITE8_MEMBER(fg_tile_w); DECLARE_WRITE8_MEMBER(fg_color_w); - DECLARE_WRITE8_MEMBER(nmi_and_coins_w); - DECLARE_WRITE8_MEMBER(leds_w); + void nmi_and_coins_w(uint8_t data); + void leds_w(uint8_t data); // spk116it and spk115it specific - DECLARE_WRITE8_MEMBER(video_and_leds_w); + void video_and_leds_w(uint8_t data); DECLARE_WRITE8_MEMBER(magic_w); DECLARE_READ8_MEMBER(magic_r); @@ -182,7 +182,7 @@ static void show_out(running_machine &machine, uint8_t *out) #endif } -WRITE8_MEMBER(spoker_state::nmi_and_coins_w) +void spoker_state::nmi_and_coins_w(uint8_t data) { if ((data) & (0x22)) { @@ -206,7 +206,7 @@ WRITE8_MEMBER(spoker_state::nmi_and_coins_w) show_out(machine(), m_out); } -WRITE8_MEMBER(spoker_state::video_and_leds_w) +void spoker_state::video_and_leds_w(uint8_t data) { m_leds[4] = BIT(data, 0); // start? m_leds[5] = BIT(data, 2); // l_bet? @@ -218,7 +218,7 @@ WRITE8_MEMBER(spoker_state::video_and_leds_w) show_out(machine(), m_out); } -WRITE8_MEMBER(spoker_state::leds_w) +void spoker_state::leds_w(uint8_t data) { m_leds[0] = BIT(data, 0); // stop_1 m_leds[1] = BIT(data, 1); // stop_2 diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp index dacaf45fa28..1b429af55a0 100644 --- a/src/mame/drivers/spy.cpp +++ b/src/mame/drivers/spy.cpp @@ -448,13 +448,13 @@ INPUT_PORTS_END -WRITE8_MEMBER(spy_state::volume_callback0) +void spy_state::volume_callback0(uint8_t data) { m_k007232_1->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_1->set_volume(1, 0, (data & 0x0f) * 0x11); } -WRITE8_MEMBER(spy_state::volume_callback1) +void spy_state::volume_callback1(uint8_t data) { m_k007232_2->set_volume(0, (data >> 4) * 0x11, 0); m_k007232_2->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index ec87ab2aa5f..cea6f3ed21b 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -79,15 +79,15 @@ private: DECLARE_WRITE8_MEMBER(pen_w); DECLARE_WRITE8_MEMBER(adpcm_data_w); DECLARE_WRITE8_MEMBER(rom2_bank_select_w); - DECLARE_READ8_MEMBER(vregs_r); - DECLARE_WRITE8_MEMBER(vregs_w); - DECLARE_READ8_MEMBER(rom_bank_select_r); - DECLARE_WRITE8_MEMBER(rom_bank_select_w); - DECLARE_READ8_MEMBER(pedal_extra_bits_r); - DECLARE_READ8_MEMBER(p1_r); - DECLARE_READ8_MEMBER(p2_r); - DECLARE_WRITE8_MEMBER(writeA); - DECLARE_WRITE8_MEMBER(writeB); + uint8_t vregs_r(); + void vregs_w(uint8_t data); + uint8_t rom_bank_select_r(); + void rom_bank_select_w(uint8_t data); + uint8_t pedal_extra_bits_r(); + uint8_t p1_r(); + uint8_t p2_r(); + void writeA(uint8_t data); + void writeB(uint8_t data); DECLARE_WRITE_LINE_MEMBER(adpcm_int); TILE_GET_INFO_MEMBER(get_tile_info); @@ -207,12 +207,12 @@ WRITE8_MEMBER(suprgolf_state::videoram_w) } } -READ8_MEMBER(suprgolf_state::vregs_r) +uint8_t suprgolf_state::vregs_r() { return m_vreg_bank; } -WRITE8_MEMBER(suprgolf_state::vregs_w) +void suprgolf_state::vregs_w(uint8_t data) { //printf("%02x\n",data); @@ -298,12 +298,12 @@ WRITE8_MEMBER(suprgolf_state::adpcm_data_w) m_msm5205next = data; } -READ8_MEMBER(suprgolf_state::rom_bank_select_r) +uint8_t suprgolf_state::rom_bank_select_r() { return m_rom_bank; } -WRITE8_MEMBER(suprgolf_state::rom_bank_select_w) +void suprgolf_state::rom_bank_select_w(uint8_t data) { m_rom_bank = data; @@ -324,7 +324,7 @@ WRITE8_MEMBER(suprgolf_state::rom2_bank_select_w) printf("Rom bank select 2 with data %02x activated\n",data); } -READ8_MEMBER(suprgolf_state::pedal_extra_bits_r) +uint8_t suprgolf_state::pedal_extra_bits_r() { uint8_t p1_sht_sw,p2_sht_sw; @@ -334,12 +334,12 @@ READ8_MEMBER(suprgolf_state::pedal_extra_bits_r) return p1_sht_sw | p2_sht_sw; } -READ8_MEMBER(suprgolf_state::p1_r) +uint8_t suprgolf_state::p1_r() { return (ioport("P1")->read() & 0xf0) | ((ioport("P1_ANALOG")->read() & 0xf)); } -READ8_MEMBER(suprgolf_state::p2_r) +uint8_t suprgolf_state::p2_r() { return (ioport("P2")->read() & 0xf0) | ((ioport("P2_ANALOG")->read() & 0xf)); } @@ -450,12 +450,12 @@ static INPUT_PORTS_START( suprgolf ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "SW2:8" ) INPUT_PORTS_END -WRITE8_MEMBER(suprgolf_state::writeA) +void suprgolf_state::writeA(uint8_t data) { osd_printf_debug("ymwA\n"); } -WRITE8_MEMBER(suprgolf_state::writeB) +void suprgolf_state::writeB(uint8_t data) { osd_printf_debug("ymwA\n"); } diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index 8e768ddc45b..bb6bfbf4f30 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -155,7 +155,7 @@ void surpratk_state::machine_reset() m_sprite_colorbase = 0; } -WRITE8_MEMBER( surpratk_state::banking_callback ) +void surpratk_state::banking_callback(uint8_t data) { // logerror("%s: setlines %02x\n", machine().describe_context(), data); membank("bank1")->set_entry(data & 0x1f); diff --git a/src/mame/drivers/test_t400.cpp b/src/mame/drivers/test_t400.cpp index cdefb163259..05c3a907066 100644 --- a/src/mame/drivers/test_t400.cpp +++ b/src/mame/drivers/test_t400.cpp @@ -22,11 +22,11 @@ public: void test_t420(machine_config &config); private: - DECLARE_WRITE8_MEMBER( port_l_w ); + void port_l_w(uint8_t data); required_device<cop400_cpu_device> m_maincpu; }; -WRITE8_MEMBER( t400_test_suite_state::port_l_w ) +void t400_test_suite_state::port_l_w(uint8_t data) { // printf("L: %u\n", data); } diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index 3f642b07a75..2a9e3ef9709 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -102,7 +102,7 @@ READ8_MEMBER(timeplt_state::psurge_protection_r) } // chkun has access to an extra soundchip via ay2 port a -WRITE8_MEMBER(timeplt_state::chkun_sound_w) +void timeplt_state::chkun_sound_w(uint8_t data) { // d0-d3: P0-P3 // d5: /R (unused?) diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 4a57cfcfffb..fc86a3dda0f 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -1899,7 +1899,7 @@ static INPUT_PORTS_START( prmrsocr ) INPUT_PORTS_END -WRITE8_MEMBER(tmnt_state::volume_callback) +void tmnt_state::volume_callback(uint8_t data) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index 8def7118f0d..639f8ad548e 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -84,13 +84,13 @@ private: DECLARE_READ8_MEMBER(timer_r); DECLARE_WRITE8_MEMBER(clear_timer_w); DECLARE_WRITE_LINE_MEMBER(cb2_u2_w); - DECLARE_WRITE8_MEMBER(port_b_u1_w); + void port_b_u1_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(main_cpu_irq); - DECLARE_WRITE8_MEMBER(sn1_port_a_u3_w); - DECLARE_WRITE8_MEMBER(sn1_port_b_u3_w); + void sn1_port_a_u3_w(uint8_t data); + void sn1_port_b_u3_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(sn1_ca2_u3_w); - DECLARE_WRITE8_MEMBER(sn2_port_a_u2_w); - DECLARE_WRITE8_MEMBER(sn2_port_b_u2_w); + void sn2_port_a_u2_w(uint8_t data); + void sn2_port_b_u2_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(sn2_ca2_u2_w); virtual void machine_start() override; virtual void machine_reset() override; @@ -163,7 +163,7 @@ WRITE8_MEMBER(toratora_state::clear_tv_w) * *************************************/ -WRITE8_MEMBER(toratora_state::port_b_u1_w) +void toratora_state::port_b_u1_w(uint8_t data) { if (m_pia_u1->port_b_z_mask() & 0x20) machine().bookkeeping().coin_counter_w(0, 1); @@ -225,14 +225,14 @@ WRITE8_MEMBER(toratora_state::clear_timer_w) *************************************/ -WRITE8_MEMBER(toratora_state::sn1_port_a_u3_w) +void toratora_state::sn1_port_a_u3_w(uint8_t data) { m_sn1->vco_voltage_w(2.35 * (data & 0x7f) / 128.0); m_sn1->enable_w((data >> 7) & 0x01); } -WRITE8_MEMBER(toratora_state::sn1_port_b_u3_w) +void toratora_state::sn1_port_b_u3_w(uint8_t data) { static const double resistances[] = { @@ -269,14 +269,14 @@ WRITE_LINE_MEMBER(toratora_state::sn1_ca2_u3_w) m_sn1->vco_w(state); } -WRITE8_MEMBER(toratora_state::sn2_port_a_u2_w) +void toratora_state::sn2_port_a_u2_w(uint8_t data) { m_sn2->vco_voltage_w(2.35 * (data & 0x7f) / 128.0); m_sn2->enable_w((data >> 7) & 0x01); } -WRITE8_MEMBER(toratora_state::sn2_port_b_u2_w) +void toratora_state::sn2_port_b_u2_w(uint8_t data) { static const double resistances[] = { diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp index 587e37b2ad5..e8a4c9db208 100644 --- a/src/mame/drivers/trvquest.cpp +++ b/src/mame/drivers/trvquest.cpp @@ -32,7 +32,7 @@ as is. driver by Pierpaolo Prazzoli Notes: -- Hardware is similar to the one in gameplan.c +- Hardware is similar to the one in gameplan.cpp */ @@ -46,7 +46,7 @@ Notes: #include "speaker.h" -READ8_MEMBER(gameplan_state::trvquest_question_r) +uint8_t gameplan_state::trvquest_question_r(offs_t offset) { return memregion("questions")->base()[*m_trvquest_question * 0x2000 + offset]; } diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index 47b834326ed..9ac145cb775 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -628,7 +628,7 @@ GFXDECODE_END /* Sound Interfaces */ -WRITE8_MEMBER(twin16_state::volume_callback) +void twin16_state::volume_callback(uint8_t data) { m_k007232->set_volume(0,(data >> 4) * 0x11,0); m_k007232->set_volume(1,0,(data & 0x0f) * 0x11); diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index e98208e0b22..54a6d2cb308 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -417,7 +417,7 @@ void vendetta_state::machine_reset() m_irq_enabled = 0; } -WRITE8_MEMBER( vendetta_state::banking_callback ) +void vendetta_state::banking_callback(uint8_t data) { if (data >= 0x1c) logerror("%s Unknown bank selected %02x\n", machine().describe_context(), data); diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index ebc407d5905..50bf6d44fcc 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -326,20 +326,20 @@ public: private: DECLARE_READ8_MEMBER(videopkr_io_r); DECLARE_WRITE8_MEMBER(videopkr_io_w); - DECLARE_READ8_MEMBER(videopkr_p1_data_r); - DECLARE_READ8_MEMBER(videopkr_p2_data_r); - DECLARE_WRITE8_MEMBER(videopkr_p1_data_w); - DECLARE_WRITE8_MEMBER(videopkr_p2_data_w); + 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); - DECLARE_READ8_MEMBER(sound_p2_r); - DECLARE_WRITE8_MEMBER(sound_p2_w); - DECLARE_READ8_MEMBER(baby_sound_p0_r); - DECLARE_WRITE8_MEMBER(baby_sound_p0_w); - DECLARE_READ8_MEMBER(baby_sound_p1_r); - DECLARE_WRITE8_MEMBER(baby_sound_p3_w); + uint8_t sound_p2_r(); + void sound_p2_w(uint8_t data); + uint8_t baby_sound_p0_r(); + void baby_sound_p0_w(uint8_t data); + uint8_t baby_sound_p1_r(); + void baby_sound_p3_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); void videopkr_palette(palette_device &palette) const; DECLARE_VIDEO_START(vidadcba); @@ -698,17 +698,17 @@ WRITE8_MEMBER(videopkr_state::videopkr_io_w) } } -READ8_MEMBER(videopkr_state::videopkr_p1_data_r) +uint8_t videopkr_state::videopkr_p1_data_r() { return m_p1; } -READ8_MEMBER(videopkr_state::videopkr_p2_data_r) +uint8_t videopkr_state::videopkr_p2_data_r() { return m_p2; } -WRITE8_MEMBER(videopkr_state::videopkr_p1_data_w) +void videopkr_state::videopkr_p1_data_w(uint8_t data) { m_p1 = data; @@ -750,7 +750,7 @@ WRITE8_MEMBER(videopkr_state::videopkr_p1_data_w) m_ant_jckp = m_jckp; } -WRITE8_MEMBER(videopkr_state::videopkr_p2_data_w) +void videopkr_state::videopkr_p2_data_w(uint8_t data) { m_p2 = data; } @@ -833,12 +833,12 @@ WRITE8_MEMBER(videopkr_state::sound_io_w) } } -READ8_MEMBER(videopkr_state::sound_p2_r) +uint8_t videopkr_state::sound_p2_r() { return m_vp_sound_p2; } -WRITE8_MEMBER(videopkr_state::sound_p2_w) +void videopkr_state::sound_p2_w(uint8_t data) { m_vp_sound_p2 = data; @@ -870,17 +870,17 @@ WRITE8_MEMBER(videopkr_state::sound_p2_w) /* Baby Sound Handlers */ -READ8_MEMBER(videopkr_state::baby_sound_p0_r) +uint8_t videopkr_state::baby_sound_p0_r() { return m_sbp0; } -WRITE8_MEMBER(videopkr_state::baby_sound_p0_w) +void videopkr_state::baby_sound_p0_w(uint8_t data) { m_sbp0 = data; } -READ8_MEMBER(videopkr_state::baby_sound_p1_r) +uint8_t videopkr_state::baby_sound_p1_r() { m_c_io = (m_p1 >> 5) & 1; m_hp_1 = (~m_p24_data >> 6) & 1; @@ -890,7 +890,7 @@ READ8_MEMBER(videopkr_state::baby_sound_p1_r) return m_c_io | (m_hp_1 << 1) | (m_hp_2 << 2) | (m_bell << 3) | (m_aux3 << 4) | 0xe0; } -WRITE8_MEMBER(videopkr_state::baby_sound_p3_w) +void videopkr_state::baby_sound_p3_w(uint8_t data) { uint8_t lmp_ports, ay_intf; lmp_ports = data >> 1 & 0x07; diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index adc29cf0e82..3b14850648f 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -635,7 +635,7 @@ WRITE8_MEMBER(wecleman_state::multiply_w) ** sample playing ends when a byte with bit 7 set is reached **/ -WRITE8_MEMBER(wecleman_state::wecleman_volume_callback) +void wecleman_state::wecleman_volume_callback(uint8_t data) { m_k007232[0]->set_volume(0, (data >> 4) * 0x11, 0); m_k007232[0]->set_volume(1, 0, (data & 0x0f) * 0x11); diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 65a2080f504..8620839d388 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -63,7 +63,7 @@ private: DECLARE_WRITE8_MEMBER(sound_irq_w); DECLARE_READ8_MEMBER(prot_r); DECLARE_WRITE8_MEMBER(prot_w); - DECLARE_READ8_MEMBER(sound_r); + uint8_t sound_r(); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -361,7 +361,7 @@ static GFXDECODE_START( gfx_wink ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_END -READ8_MEMBER(wink_state::sound_r) +uint8_t wink_state::sound_r() { return m_sound_flag; } diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index b26fdbd041c..5832b83f177 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -71,7 +71,7 @@ private: K051316_CB_MEMBER(zoom_callback); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); void main_map(address_map &map); void sound_map(address_map &map); diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h index 1a15fcb766c..ecd4a238f19 100644 --- a/src/mame/includes/abc1600.h +++ b/src/mame/includes/abc1600.h @@ -117,11 +117,11 @@ public: DECLARE_WRITE_LINE_MEMBER( dbrq_w ); - DECLARE_READ8_MEMBER( cio_pa_r ); - DECLARE_READ8_MEMBER( cio_pb_r ); - DECLARE_WRITE8_MEMBER( cio_pb_w ); - DECLARE_READ8_MEMBER( cio_pc_r ); - DECLARE_WRITE8_MEMBER( cio_pc_w ); + uint8_t cio_pa_r(); + uint8_t cio_pb_r(); + void cio_pb_w(uint8_t data); + uint8_t cio_pc_r(); + void cio_pc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( nmi_w ); diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index b89da1fb058..2e4f0e1fe90 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -142,9 +142,9 @@ public: DECLARE_WRITE_LINE_MEMBER( vco_voltage_w ); - DECLARE_READ8_MEMBER( pio_pa_r ); - DECLARE_READ8_MEMBER( pio_pb_r ); - DECLARE_WRITE8_MEMBER( pio_pb_w ); + uint8_t pio_pa_r(); + uint8_t pio_pb_r(); + void pio_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( keydown_w ); void kbd_w(u8 data); diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h index f7e30043ce0..f04b70a5a39 100644 --- a/src/mame/includes/abc80x.h +++ b/src/mame/includes/abc80x.h @@ -211,7 +211,7 @@ public: void hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( char_ram_r ); + uint8_t char_ram_r(offs_t offset); void abc800c_palette(palette_device &palette) const; void abc800c(machine_config &config); void abc800c_video(machine_config &config); diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index cbb7a31f09c..6dba7a9e698 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -41,8 +41,8 @@ public: DECLARE_WRITE8_MEMBER(lamps_w); DECLARE_WRITE8_MEMBER(k007232_extvol_w); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(volume_callback0); - DECLARE_WRITE8_MEMBER(volume_callback1); + void volume_callback0(uint8_t data); + void volume_callback1(uint8_t data); K051316_CB_MEMBER(zoom_callback); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index 609b67f79b3..48e8cc1a5e2 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -46,14 +46,14 @@ public: DECLARE_WRITE8_MEMBER(aliens_sh_irqtrigger_w); DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); - DECLARE_WRITE8_MEMBER(aliens_snd_bankswitch_w); + void aliens_snd_bankswitch_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_aliens(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); void aliens(machine_config &config); void aliens_map(address_map &map); void aliens_sound_map(address_map &map); diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 8642e16d11b..e37a6f80952 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -114,7 +114,7 @@ public: DECLARE_WRITE8_MEMBER(protected_ram_enable_w); DECLARE_READ8_MEMBER(protected_ram_r); DECLARE_WRITE8_MEMBER(protected_ram_w); - DECLARE_READ8_MEMBER(input_mux_r); + uint8_t input_mux_r(offs_t offset); template<int Coin> DECLARE_WRITE_LINE_MEMBER(coin_counter_w); template<int Bit> DECLARE_WRITE_LINE_MEMBER(sparkle_w); DECLARE_WRITE_LINE_MEMBER(gorf_sound_switch_w); @@ -158,7 +158,7 @@ public: void init_sparklestar(); virtual void machine_start() override; - DECLARE_WRITE8_MEMBER(votrax_speech_w); + void votrax_speech_w(uint8_t data); DECLARE_READ_LINE_MEMBER( votrax_speech_status_r ); void astrocade_base(machine_config &config); diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index 917bd500886..8c3a1178ad0 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -26,11 +26,11 @@ public: m_lamps(*this, "lamp%u", 0U) { } - DECLARE_WRITE8_MEMBER(inputport_select_w); - DECLARE_READ8_MEMBER(inputport_r); - DECLARE_WRITE8_MEMBER(baraduke_lamps_w); - DECLARE_WRITE8_MEMBER(baraduke_irq_ack_w); - DECLARE_READ8_MEMBER(soundkludge_r); + void inputport_select_w(uint8_t data); + uint8_t inputport_r(); + void baraduke_lamps_w(uint8_t data); + void baraduke_irq_ack_w(uint8_t data); + uint8_t soundkludge_r(); DECLARE_READ8_MEMBER(baraduke_videoram_r); DECLARE_WRITE8_MEMBER(baraduke_videoram_w); DECLARE_READ8_MEMBER(baraduke_textram_r); diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 44357dde603..89709fcbeed 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -42,7 +42,7 @@ public: /* devices */ DECLARE_READ8_MEMBER(trackball_r); DECLARE_WRITE8_MEMBER(bladestl_bankswitch_w); - DECLARE_WRITE8_MEMBER(bladestl_port_B_w); + void bladestl_port_B_w(uint8_t data); DECLARE_READ8_MEMBER(bladestl_speech_busy_r); DECLARE_WRITE8_MEMBER(bladestl_speech_ctrl_w); void bladestl_palette(palette_device &palette) const; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index aba9cf20950..c4a798c41ae 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -55,7 +55,7 @@ public: DECLARE_WRITE8_MEMBER(blueprnt_videoram_w); DECLARE_WRITE8_MEMBER(blueprnt_colorram_w); DECLARE_WRITE8_MEMBER(blueprnt_flipscreen_w); - DECLARE_WRITE8_MEMBER(dipsw_w); + void dipsw_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index a132758868d..4c43831bb46 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -62,8 +62,8 @@ public: virtual void machine_reset() override; uint32_t screen_update_bottom9(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(bottom9_sound_interrupt); - DECLARE_WRITE8_MEMBER(volume_callback0); - DECLARE_WRITE8_MEMBER(volume_callback1); + void volume_callback0(uint8_t data); + void volume_callback1(uint8_t data); K051316_CB_MEMBER(zoom_callback); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index a69717bc06d..6eea620bec3 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -41,8 +41,8 @@ public: DECLARE_READ8_MEMBER(analog_read_r); DECLARE_WRITE8_MEMBER(k007232_bankswitch_w); DECLARE_WRITE8_MEMBER(k007232_extvolume_w); - DECLARE_WRITE8_MEMBER(volume_callback0); - DECLARE_WRITE8_MEMBER(volume_callback1); + void volume_callback0(uint8_t data); + void volume_callback1(uint8_t data); DECLARE_WRITE_LINE_MEMBER(background_brt_w); K051316_CB_MEMBER(zoom_callback_1); K051316_CB_MEMBER(zoom_callback_2); diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 57ac5f6f52f..3fc18a36bd9 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -99,7 +99,7 @@ public: DECLARE_READ8_MEMBER(combatsc_busy_r); DECLARE_WRITE8_MEMBER(combatsc_play_w); DECLARE_WRITE8_MEMBER(combatsc_voice_reset_w); - DECLARE_WRITE8_MEMBER(combatsc_portA_w); + void combatsc_portA_w(uint8_t data); DECLARE_WRITE8_MEMBER(combatscb_msm_w); DECLARE_WRITE8_MEMBER(combatscb_sound_irq_ack); void init_combatsc(); diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index 8e0924e042c..cfd2bd1c04c 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -50,13 +50,13 @@ public: DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); IRQ_CALLBACK_MEMBER(audiocpu_irq_ack); - DECLARE_WRITE8_MEMBER(ym2151_ct_w); + void ym2151_ct_w(uint8_t data); virtual void machine_start() override; uint32_t screen_update_crimfght(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); DECLARE_CUSTOM_INPUT_MEMBER(system_r); void crimfght(machine_config &config); diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 45d1a7d88ae..1b72fc0e5c3 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -75,8 +75,8 @@ private: DECLARE_WRITE8_MEMBER(K005885_1_w); DECLARE_WRITE8_MEMBER(ddribble_fg_videoram_w); DECLARE_WRITE8_MEMBER(ddribble_bg_videoram_w); - DECLARE_READ8_MEMBER(ddribble_vlm5030_busy_r); - DECLARE_WRITE8_MEMBER(ddribble_vlm5030_ctrl_w); + uint8_t ddribble_vlm5030_busy_r(); + void ddribble_vlm5030_ctrl_w(uint8_t data); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h index 313ebb05ddb..95b1be0892a 100644 --- a/src/mame/includes/digdug.h +++ b/src/mame/includes/digdug.h @@ -41,7 +41,7 @@ private: uint32_t screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(digdug_videoram_w); - DECLARE_WRITE8_MEMBER(bg_select_w); + void bg_select_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(tx_color_mode_w); DECLARE_WRITE_LINE_MEMBER(bg_disable_w); diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 8c72f1c3d31..8f8646a88d7 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -92,14 +92,14 @@ private: DECLARE_WRITE8_MEMBER(slavecpu_bankswitch_w); DECLARE_WRITE8_MEMBER(coin_count_w); DECLARE_WRITE8_MEMBER(soundcpu_bankswitch_w); - DECLARE_READ8_MEMBER(beast_p0_r); - DECLARE_WRITE8_MEMBER(beast_p0_w); - DECLARE_READ8_MEMBER(beast_p1_r); - DECLARE_WRITE8_MEMBER(beast_p1_w); - DECLARE_READ8_MEMBER(beast_p2_r); - DECLARE_WRITE8_MEMBER(beast_p2_w); - DECLARE_READ8_MEMBER(beast_p3_r); - DECLARE_WRITE8_MEMBER(beast_p3_w); + uint8_t beast_p0_r(); + void beast_p0_w(uint8_t data); + uint8_t beast_p1_r(); + void beast_p1_w(uint8_t data); + uint8_t beast_p2_r(); + void beast_p2_w(uint8_t data); + uint8_t beast_p3_r(); + void beast_p3_w(uint8_t data); DECLARE_WRITE8_MEMBER(djboy_scrollx_w); DECLARE_WRITE8_MEMBER(djboy_scrolly_w); DECLARE_WRITE8_MEMBER(djboy_videoram_w); diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index e5547146658..edc900fabfe 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -76,12 +76,12 @@ private: required_device<screen_device> m_screen; required_device<palette_device> m_palette; - DECLARE_READ8_MEMBER(exerion_protection_r); + uint8_t exerion_protection_r(offs_t offset); DECLARE_WRITE8_MEMBER(exerion_videoreg_w); DECLARE_WRITE8_MEMBER(exerion_video_latch_w); DECLARE_READ8_MEMBER(exerion_video_timing_r); - DECLARE_READ8_MEMBER(exerion_porta_r); - DECLARE_WRITE8_MEMBER(exerion_portb_w); + uint8_t exerion_porta_r(); + void exerion_portb_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 0a5efe8377b..d747af2d5d0 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -67,11 +67,11 @@ private: DECLARE_READ8_MEMBER(jumpcoas_custom_io_r); DECLARE_READ8_MEMBER(boggy84_custom_io_r); DECLARE_WRITE_LINE_MEMBER(imago_dma_irq_w); - DECLARE_WRITE8_MEMBER(imago_sprites_bank_w); + void imago_sprites_bank_w(uint8_t data); DECLARE_WRITE8_MEMBER(imago_sprites_dma_w); DECLARE_READ8_MEMBER(imago_sprites_offset_r); DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE8_MEMBER(sound_nmi_mask_w); + void sound_nmi_mask_w(uint8_t data); DECLARE_WRITE8_MEMBER(fastfred_videoram_w); DECLARE_WRITE8_MEMBER(fastfred_attributes_w); DECLARE_WRITE_LINE_MEMBER(charbank1_w); diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index dd139c48f47..80d755efe4e 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -76,8 +76,8 @@ private: void fastlane_palette(palette_device &palette) const; uint32_t screen_update_fastlane(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(fastlane_scanline); - DECLARE_WRITE8_MEMBER(volume_callback0); - DECLARE_WRITE8_MEMBER(volume_callback1); + void volume_callback0(uint8_t data); + void volume_callback1(uint8_t data); void fastlane_map(address_map &map); }; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index d5e09023f6b..1c23dc64e36 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -65,7 +65,7 @@ private: DECLARE_WRITE8_MEMBER(finalizr_coin_w); DECLARE_WRITE8_MEMBER(finalizr_flipscreen_w); DECLARE_WRITE8_MEMBER(finalizr_i8039_irq_w); - DECLARE_WRITE8_MEMBER(i8039_irqen_w); + void i8039_irqen_w(uint8_t data); DECLARE_READ_LINE_MEMBER(i8039_t1_r); DECLARE_WRITE8_MEMBER(i8039_t0_w); DECLARE_WRITE8_MEMBER(finalizr_videoctrl_w); diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 46232fe7366..7983b62a011 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -70,7 +70,7 @@ private: virtual void video_start() override; uint32_t screen_update_flkatck(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(flkatck_interrupt); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); void flkatck_map(address_map &map); void flkatck_sound_map(address_map &map); }; diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h index 5a8f07ac8b7..0a3e78a0a9c 100644 --- a/src/mame/includes/fm7.h +++ b/src/mame/includes/fm7.h @@ -138,7 +138,6 @@ public: m_kb_ports(*this, "key%u", 1), m_keymod(*this, "key_modifiers"), m_joy1(*this, "joy1"), - m_joy2(*this, "joy2"), m_dsw(*this, "DSW"), m_palette(*this, "palette"), m_av_palette(*this, "av_palette"), @@ -176,8 +175,6 @@ private: DECLARE_WRITE_LINE_MEMBER(fm7_fdc_intrq_w); DECLARE_WRITE_LINE_MEMBER(fm7_fdc_drq_w); - DECLARE_READ8_MEMBER(fm77av_joy_1_r); - DECLARE_READ8_MEMBER(fm77av_joy_2_r); DECLARE_WRITE_LINE_MEMBER(fm77av_fmirq); DECLARE_READ8_MEMBER(fm7_subintf_r); @@ -393,7 +390,6 @@ private: required_ioport_array<3> m_kb_ports; required_ioport m_keymod; required_ioport m_joy1; - required_ioport m_joy2; required_ioport m_dsw; required_device<palette_device> m_palette; optional_device<palette_device> m_av_palette; diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h index 8d69e4a59c3..5565a33cdd8 100644 --- a/src/mame/includes/fmtowns.h +++ b/src/mame/includes/fmtowns.h @@ -167,8 +167,8 @@ protected: DECLARE_WRITE_LINE_MEMBER(towns_scsi_irq); DECLARE_WRITE_LINE_MEMBER(towns_scsi_drq); - DECLARE_READ16_MEMBER(towns_scsi_dma_r); - DECLARE_WRITE16_MEMBER(towns_scsi_dma_w); + uint16_t towns_scsi_dma_r(); + void towns_scsi_dma_w(uint16_t data); private: /* devices */ @@ -414,7 +414,7 @@ private: DECLARE_WRITE_LINE_MEMBER(towns_pit_out0_changed); DECLARE_WRITE_LINE_MEMBER(towns_pit_out1_changed); DECLARE_WRITE_LINE_MEMBER(pit2_out1_changed); - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE_LINE_MEMBER(towns_fm_irq); void towns_crtc_refresh_mode(); void towns_update_kanji_offset(); @@ -431,11 +431,11 @@ private: inline uint8_t byte_to_bcd(uint8_t val); inline uint8_t bcd_to_byte(uint8_t val); inline uint32_t msf_to_lbafm(uint32_t val); // because the CDROM core doesn't provide this; - DECLARE_READ16_MEMBER(towns_fdc_dma_r); - DECLARE_WRITE16_MEMBER(towns_fdc_dma_w); + uint16_t towns_fdc_dma_r(); + void towns_fdc_dma_w(uint16_t data); void towns_cdrom_set_irq(int line,int state); uint8_t towns_cd_get_track(); - DECLARE_READ16_MEMBER(towns_cdrom_dma_r); + uint16_t towns_cdrom_dma_r(); }; class towns16_state : public towns_state diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 7168d56c7ee..4bed1e1bc19 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -47,8 +47,8 @@ public: protected: DECLARE_WRITE8_MEMBER(funworld_videoram_w); DECLARE_WRITE8_MEMBER(funworld_colorram_w); - DECLARE_WRITE8_MEMBER(funworld_lamp_a_w); - DECLARE_WRITE8_MEMBER(funworld_lamp_b_w); + void funworld_lamp_a_w(uint8_t data); + void funworld_lamp_b_w(uint8_t data); virtual void machine_start() override { m_lamps.resolve(); } virtual void video_start() override; @@ -66,8 +66,8 @@ private: DECLARE_READ8_MEMBER(questions_r); DECLARE_WRITE8_MEMBER(question_bank_w); DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w); - DECLARE_READ8_MEMBER(funquiz_ay8910_a_r); - DECLARE_READ8_MEMBER(funquiz_ay8910_b_r); + uint8_t funquiz_ay8910_a_r(); + uint8_t funquiz_ay8910_b_r(); void cuoreuno_map(address_map &map); void funquiz_map(address_map &map); diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 6d0f4dc8eb4..d1e512cbc22 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -148,7 +148,7 @@ private: DECLARE_WRITE_LINE_MEMBER(analog_port_latch_w); DECLARE_READ32_MEMBER(tms_m68k_ram_r); DECLARE_WRITE32_MEMBER(tms_m68k_ram_w); - DECLARE_WRITE8_MEMBER(tms_iack_w); + void tms_iack_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(tms_reset_w); DECLARE_WRITE_LINE_MEMBER(tms_irq_w); DECLARE_WRITE_LINE_MEMBER(tms_control3_w); @@ -169,7 +169,7 @@ private: INTERRUPT_GEN_MEMBER(vblank_gen); TIMER_DEVICE_CALLBACK_MEMBER(adsp_autobuffer_irq); void gaelco3d_render(screen_device &screen); - DECLARE_WRITE32_MEMBER(adsp_tx_callback); + void adsp_tx_callback(offs_t offset, uint32_t data); DECLARE_WRITE_LINE_MEMBER(fp_analog_clock_w); void adsp_data_map(address_map &map); diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index eab6dbb7c73..05492459167 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -47,10 +47,10 @@ public: DECLARE_WRITE_LINE_MEMBER(nmion_w); DECLARE_WRITE8_MEMBER(galaga_videoram_w); DECLARE_WRITE_LINE_MEMBER(gatsbee_bank_w); - DECLARE_WRITE8_MEMBER(out); + void out(uint8_t data); DECLARE_WRITE_LINE_MEMBER(lockout); - DECLARE_READ8_MEMBER(namco_52xx_rom_r); - DECLARE_READ8_MEMBER(namco_52xx_si_r); + uint8_t namco_52xx_rom_r(offs_t offset); + uint8_t namco_52xx_si_r(); void init_galaga(); void init_gatsbee(); TILEMAP_MAPPER_MEMBER(tilemap_scan); diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index f730f1803e3..5279c61ae4d 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -115,8 +115,8 @@ public: DECLARE_WRITE8_MEMBER(konami_sound_filter_w); DECLARE_READ8_MEMBER(theend_ppi8255_r); DECLARE_WRITE8_MEMBER(theend_ppi8255_w); - DECLARE_WRITE8_MEMBER(theend_protection_w); - DECLARE_READ8_MEMBER(theend_protection_r); + void theend_protection_w(uint8_t data); + uint8_t theend_protection_r(); template <int N> DECLARE_READ_LINE_MEMBER(theend_protection_alt_r); DECLARE_WRITE8_MEMBER(explorer_sound_control_w); DECLARE_READ8_MEMBER(sfx_sample_io_r); @@ -159,22 +159,22 @@ public: DECLARE_WRITE8_MEMBER(froggeram_ppi8255_w); DECLARE_WRITE8_MEMBER(artic_gfxbank_w); DECLARE_READ8_MEMBER(tenspot_dsw_read); - DECLARE_WRITE8_MEMBER(konami_sound_control_w); - DECLARE_READ8_MEMBER(konami_sound_timer_r); - DECLARE_WRITE8_MEMBER(konami_portc_0_w); - DECLARE_WRITE8_MEMBER(konami_portc_1_w); - DECLARE_WRITE8_MEMBER(theend_coin_counter_w); - DECLARE_READ8_MEMBER(explorer_sound_latch_r); - DECLARE_WRITE8_MEMBER(sfx_sample_control_w); - DECLARE_WRITE8_MEMBER(monsterz_porta_1_w); - DECLARE_WRITE8_MEMBER(monsterz_portb_1_w); - DECLARE_WRITE8_MEMBER(monsterz_portc_1_w); - DECLARE_READ8_MEMBER(frogger_sound_timer_r); - DECLARE_READ8_MEMBER(scorpion_protection_r); - DECLARE_WRITE8_MEMBER(scorpion_protection_w); - DECLARE_WRITE8_MEMBER(scorpion_digitalker_control_w); + void konami_sound_control_w(uint8_t data); + uint8_t konami_sound_timer_r(); + void konami_portc_0_w(uint8_t data); + void konami_portc_1_w(uint8_t data); + void theend_coin_counter_w(uint8_t data); + uint8_t explorer_sound_latch_r(); + void sfx_sample_control_w(uint8_t data); + void monsterz_porta_1_w(uint8_t data); + void monsterz_portb_1_w(uint8_t data); + void monsterz_portc_1_w(uint8_t data); + uint8_t frogger_sound_timer_r(); + uint8_t scorpion_protection_r(); + void scorpion_protection_w(uint8_t data); + void scorpion_digitalker_control_w(uint8_t data); DECLARE_WRITE8_MEMBER(kingball_dac_w); - DECLARE_WRITE8_MEMBER(moonwar_port_select_w); + void moonwar_port_select_w(uint8_t data); void init_fourplay(); void init_videight(); void init_galaxian(); diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 3949ac17a24..c080c9dd38e 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -155,7 +155,7 @@ public: DECLARE_WRITE8_MEMBER(dambustr_bg_color_w); DECLARE_WRITE_LINE_MEMBER(galaxold_7474_9m_2_q_callback); DECLARE_WRITE_LINE_MEMBER(galaxold_7474_9m_1_callback); - DECLARE_READ8_MEMBER(rescueb_a002_r) { return 0xfc; } + uint8_t rescueb_a002_r() { return 0xfc; } template <int Mask> DECLARE_READ_LINE_MEMBER(_4in1_fake_port_r); template <int Mask> DECLARE_READ_LINE_MEMBER(vpool_lives_r); template <int Mask> DECLARE_CUSTOM_INPUT_MEMBER(ckongg_coinage_r); diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index dcab096a92d..e0583a5e643 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -83,14 +83,13 @@ private: optional_device<generic_latch_8_device> m_soundlatch; - DECLARE_WRITE8_MEMBER(io_select_w); - DECLARE_READ8_MEMBER(io_port_r); + void io_select_w(uint8_t data); + uint8_t io_port_r(); DECLARE_WRITE_LINE_MEMBER(coin_w); DECLARE_WRITE_LINE_MEMBER(audio_reset_w); - DECLARE_WRITE8_MEMBER(audio_cmd_w); + void audio_cmd_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(audio_trigger_w); DECLARE_WRITE_LINE_MEMBER(r6532_irq); - DECLARE_WRITE8_MEMBER(r6532_soundlatch_w); DECLARE_MACHINE_START(gameplan); DECLARE_MACHINE_RESET(gameplan); DECLARE_MACHINE_START(trvquest); @@ -99,15 +98,15 @@ private: uint32_t screen_update_leprechn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(clear_screen_done_callback); TIMER_CALLBACK_MEMBER(via_irq_delayed); - DECLARE_WRITE8_MEMBER(video_data_w); - DECLARE_WRITE8_MEMBER(gameplan_video_command_w); - DECLARE_WRITE8_MEMBER(leprechn_video_command_w); - DECLARE_READ8_MEMBER(leprechn_videoram_r); + void video_data_w(uint8_t data); + void gameplan_video_command_w(uint8_t data); + void leprechn_video_command_w(uint8_t data); + uint8_t leprechn_videoram_r(); DECLARE_WRITE_LINE_MEMBER(video_command_trigger_w); void gameplan_get_pens( pen_t *pens ); void leprechn_get_pens( pen_t *pens ); DECLARE_WRITE_LINE_MEMBER(via_irq); - DECLARE_READ8_MEMBER(trvquest_question_r); + uint8_t trvquest_question_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(trvquest_coin_w); DECLARE_WRITE_LINE_MEMBER(trvquest_misc_w); diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 74e227dd09f..3e9b0745176 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -153,8 +153,8 @@ public: protected: virtual void machine_start() override; - DECLARE_WRITE8_MEMBER(out_lamps0); - DECLARE_WRITE8_MEMBER(out_lamps1); + void out_lamps0(uint8_t data); + void out_lamps1(uint8_t data); output_finder<2> m_lamps; }; diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 82aed496533..1b784c7853c 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -25,9 +25,9 @@ private: output_finder<9> m_lamps; tilemap_t *m_bg_tilemap; - DECLARE_WRITE8_MEMBER(output_port_0_w); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(output_port_1_w); + void output_port_0_w(uint8_t data); + void videoram_w(offs_t offset, uint8_t data); + void output_port_1_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index e44e1512bb2..f93e2ecf2a6 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -47,8 +47,8 @@ public: DECLARE_WRITE8_MEMBER(goldstar_reel2_ram_w); DECLARE_WRITE8_MEMBER(goldstar_reel3_ram_w); DECLARE_WRITE8_MEMBER(goldstar_fa00_w); - DECLARE_WRITE8_MEMBER(ay8910_outputa_w); - DECLARE_WRITE8_MEMBER(ay8910_outputb_w); + void ay8910_outputa_w(uint8_t data); + void ay8910_outputb_w(uint8_t data); void init_chryangl(); void init_goldstar(); void init_jkrmast(); @@ -226,10 +226,10 @@ public: DECLARE_WRITE8_MEMBER(magodds_outb850_w); DECLARE_WRITE8_MEMBER(magodds_outb860_w); - DECLARE_WRITE8_MEMBER(fl7w4_outc802_w); - DECLARE_WRITE8_MEMBER(system_outputa_w); - DECLARE_WRITE8_MEMBER(system_outputb_w); - DECLARE_WRITE8_MEMBER(system_outputc_w); + void fl7w4_outc802_w(uint8_t data); + void system_outputa_w(uint8_t data); + void system_outputb_w(uint8_t data); + void system_outputc_w(uint8_t data); void init_lucky8a(); void init_lucky8f(); diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index ba7b5fff9e8..61b7347e1fd 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -67,7 +67,7 @@ private: INTERRUPT_GEN_MEMBER(cpuA_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(gradius3_sub_scanline); void gradius3_postload(); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); void gradius3_map(address_map &map); diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index df368d3530d..79cf6bc0e17 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -57,20 +57,20 @@ private: uint8_t m_slave_irq_mask; bool m_flipscreen; - DECLARE_WRITE8_MEMBER(gyruss_irq_clear_w); - DECLARE_WRITE8_MEMBER(gyruss_sh_irqtrigger_w); - DECLARE_WRITE8_MEMBER(gyruss_i8039_irq_w); + void gyruss_irq_clear_w(uint8_t data); + void gyruss_sh_irqtrigger_w(uint8_t data); + void gyruss_i8039_irq_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(master_nmi_mask_w); - DECLARE_WRITE8_MEMBER(slave_irq_mask_w); + void slave_irq_mask_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); DECLARE_WRITE8_MEMBER(gyruss_spriteram_w); DECLARE_READ8_MEMBER(gyruss_scanline_r); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_READ8_MEMBER(gyruss_portA_r); - DECLARE_WRITE8_MEMBER(gyruss_dac_w); - DECLARE_WRITE8_MEMBER(gyruss_filter0_w); - DECLARE_WRITE8_MEMBER(gyruss_filter1_w); + uint8_t gyruss_portA_r(); + void gyruss_dac_w(uint8_t data); + void gyruss_filter0_w(uint8_t data); + void gyruss_filter1_w(uint8_t data); TILE_GET_INFO_MEMBER(gyruss_get_tile_info); virtual void machine_start() override; virtual void video_start() override; @@ -78,7 +78,7 @@ private: uint32_t screen_update_gyruss(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void filter_w(address_space &space, int chip, int data ); + void filter_w(int chip, int data ); void audio_cpu1_io_map(address_map &map); void audio_cpu1_map(address_map &map); void audio_cpu2_io_map(address_map &map); diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index f546449a1e9..f8dcd282fed 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -77,7 +77,7 @@ private: void hcastle_palette(palette_device &palette) const; uint32_t screen_update_hcastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, uint8_t *sbank, int bank ); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 6496eaeaa41..658da5a0d0b 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -48,7 +48,7 @@ private: DECLARE_WRITE8_MEMBER(gfxrom_select_w); DECLARE_WRITE_LINE_MEMBER(irq_ack_w); DECLARE_WRITE_LINE_MEMBER(nmi_ack_w); - DECLARE_WRITE8_MEMBER(ccu_int_time_w); + void ccu_int_time_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index b5d42e6af77..b2d7fc84bb6 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -52,8 +52,8 @@ private: required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; - DECLARE_WRITE8_MEMBER(himesiki_rombank_w); - DECLARE_WRITE8_MEMBER(himesiki_sound_w); + void himesiki_rombank_w(uint8_t data); + void himesiki_sound_w(uint8_t data); DECLARE_WRITE8_MEMBER(himesiki_bg_ram_w); DECLARE_WRITE8_MEMBER(himesiki_scrollx_w); DECLARE_WRITE8_MEMBER(himesiki_scrolly_w); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index d2ffeef345f..d17667d153b 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -64,10 +64,10 @@ private: void control_w(u8 data); void d7756_sample_w(u8 data); - DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(scrollhi_w); - DECLARE_WRITE8_MEMBER(scrolly_w); - DECLARE_WRITE8_MEMBER(scrollx_w); + void videoram_w(offs_t offset, u8 data); + void scrollhi_w(u8 data); + void scrolly_w(u8 data); + void scrollx_w(u8 data); static rgb_t homerun_RGB332(u32 raw); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index 01f9f4e8024..4b1cda4e264 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -113,16 +113,16 @@ private: /* memory controller */ DECLARE_WRITE_LINE_MEMBER(mem_reset); - DECLARE_WRITE32_MEMBER(mem_config); - DECLARE_WRITE32_MEMBER(mem_unconfig); - DECLARE_READ32_MEMBER(mem_id); + void mem_config(uint32_t data); + void mem_unconfig(uint32_t data); + uint32_t mem_id(); /* CRC computation */ - DECLARE_WRITE32_MEMBER(mem_crc); + void mem_crc(offs_t offset, uint32_t data); /* IN/OUT registers */ - DECLARE_READ32_MEMBER(reg_in); - DECLARE_WRITE32_MEMBER(reg_out); + uint32_t reg_in(); + void reg_out(uint32_t data); /* keyboard interrupt system */ DECLARE_WRITE_LINE_MEMBER(rsi); diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 57e1ffa5fe8..db797bd01c1 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -44,7 +44,7 @@ private: DECLARE_WRITE8_MEMBER(fgvideoram_w); DECLARE_WRITE8_MEMBER(bgvideoram_w); DECLARE_WRITE8_MEMBER(fgscroll_w); - DECLARE_WRITE8_MEMBER(port_C_w); + void port_C_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(irq); diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 6eea4b11dd7..d17988d3894 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -47,8 +47,7 @@ private: DECLARE_WRITE8_MEMBER(charbank_w); DECLARE_WRITE8_MEMBER(palettebank_w); DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(filter_w); - DECLARE_READ8_MEMBER(farwest_soundlatch_r); + void filter_w(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_farwest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 13e4ca70bf2..bc6729301d3 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -136,7 +136,7 @@ protected: DECLARE_WRITE8_MEMBER(nmi_ack_w); DECLARE_WRITE8_MEMBER(blitter_bank_w); DECLARE_WRITE8_MEMBER(rimrockn_bank_w); - DECLARE_WRITE8_MEMBER(pia_portb_out); + void pia_portb_out(uint8_t data); DECLARE_WRITE8_MEMBER(gtg2_sound_data_w); DECLARE_WRITE8_MEMBER(grom_bank_w); DECLARE_WRITE8_MEMBER(palette_w); @@ -145,8 +145,8 @@ protected: DECLARE_WRITE8_MEMBER(blitter_w); DECLARE_WRITE8_MEMBER(tms34061_w); DECLARE_READ8_MEMBER(tms34061_r); - DECLARE_WRITE8_MEMBER(pia_porta_out); - DECLARE_WRITE8_MEMBER(ym2203_portb_out); + void pia_porta_out(uint8_t data); + void ym2203_portb_out(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index cbfec3351f3..5f37d58f48b 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -101,10 +101,10 @@ private: DECLARE_WRITE16_MEMBER(volume_w); DECLARE_WRITE16_MEMBER(upd7759_w); DECLARE_READ16_MEMBER(upd7759_r); - DECLARE_READ8_MEMBER(hopper_b_r); - DECLARE_READ8_MEMBER(hopper_c_r); - DECLARE_WRITE8_MEMBER(payen_a_w); - DECLARE_WRITE8_MEMBER(display_c_w); + uint8_t hopper_b_r(); + uint8_t hopper_c_r(); + void payen_a_w(uint8_t data); + void display_c_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(tms_irq); TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h index e94cbcce9c1..39cde833a19 100644 --- a/src/mame/includes/jpmsys5.h +++ b/src/mame/includes/jpmsys5.h @@ -46,8 +46,8 @@ public: DECLARE_WRITE_LINE_MEMBER(a1_tx_w); DECLARE_WRITE_LINE_MEMBER(a2_tx_w); - DECLARE_READ8_MEMBER(u29_porta_r); - DECLARE_WRITE8_MEMBER(u29_portb_w); + uint8_t u29_porta_r(); + void u29_portb_w(uint8_t data); protected: virtual void machine_start() override; diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h index 03cbe8296b3..28ef1759183 100644 --- a/src/mame/includes/kaypro.h +++ b/src/mame/includes/kaypro.h @@ -50,9 +50,9 @@ public: DECLARE_WRITE8_MEMBER(kaypro484_index_w); DECLARE_WRITE8_MEMBER(kaypro484_register_w); DECLARE_WRITE8_MEMBER(kaypro484_videoram_w); - DECLARE_READ8_MEMBER(pio_system_r); - DECLARE_WRITE8_MEMBER(kayproii_pio_system_w); - DECLARE_WRITE8_MEMBER(kayproiv_pio_system_w); + uint8_t pio_system_r(); + void kayproii_pio_system_w(uint8_t data); + void kayproiv_pio_system_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); DECLARE_READ8_MEMBER(kaypro_videoram_r); diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 22e0be35d42..633d6935325 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -84,13 +84,13 @@ private: DECLARE_READ16_MEMBER(lordgun_gun_1_y_r); DECLARE_WRITE16_MEMBER(soundlatch_w); template<int Layer> DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_WRITE8_MEMBER(fake_w); - DECLARE_WRITE8_MEMBER(fake2_w); - DECLARE_WRITE8_MEMBER(lordgun_eeprom_w); - DECLARE_WRITE8_MEMBER(aliencha_eeprom_w); - DECLARE_READ8_MEMBER(aliencha_dip_r); - DECLARE_WRITE8_MEMBER(aliencha_dip_w); - DECLARE_WRITE8_MEMBER(lordgun_okibank_w); + void fake_w(uint8_t data); + void fake2_w(uint8_t data); + void lordgun_eeprom_w(uint8_t data); + void aliencha_eeprom_w(uint8_t data); + uint8_t aliencha_dip_r(); + void aliencha_dip_w(uint8_t data); + void lordgun_okibank_w(uint8_t data); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 7368b7348b9..8ebd35935fb 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -52,7 +52,7 @@ private: DECLARE_WRITE_LINE_MEMBER(dv_vblank_w); INTERRUPT_GEN_MEMBER(mainevt_sound_timer_irq); INTERRUPT_GEN_MEMBER(devstors_sound_timer_irq); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); K052109_CB_MEMBER(mainevt_tile_callback); K052109_CB_MEMBER(dv_tile_callback); K051960_CB_MEMBER(mainevt_sprite_callback); diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h index b3c3809e084..a0e2fa52cc4 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -93,11 +93,11 @@ private: uint8_t m_Lamps[256]; int m_optic_pattern; template <unsigned N> DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } - DECLARE_WRITE8_MEMBER(scanlines_w); - DECLARE_WRITE8_MEMBER(scanlines_2_w); - DECLARE_WRITE8_MEMBER(lamp_data_w); - DECLARE_WRITE8_MEMBER(lamp_data_2_w); - DECLARE_READ8_MEMBER(kbd_r); + void scanlines_w(uint8_t data); + void scanlines_2_w(uint8_t data); + void lamp_data_w(uint8_t data); + void lamp_data_2_w(uint8_t data); + uint8_t kbd_r(); DECLARE_WRITE8_MEMBER(reel12_w); DECLARE_WRITE8_MEMBER(reel34_w); DECLARE_WRITE8_MEMBER(reel56_w); @@ -112,10 +112,10 @@ private: DECLARE_READ8_MEMBER(latch_st_hi); DECLARE_READ8_MEMBER(latch_st_lo); DECLARE_WRITE8_MEMBER(m1ab_no_oki_w); - DECLARE_WRITE8_MEMBER(m1_pia_porta_w); - DECLARE_WRITE8_MEMBER(m1_pia_portb_w); - DECLARE_WRITE8_MEMBER(m1_lockout_w); - DECLARE_WRITE8_MEMBER(m1_meter_w); + void m1_pia_porta_w(uint8_t data); + void m1_pia_portb_w(uint8_t data); + void m1_lockout_w(uint8_t data); + void m1_meter_w(uint8_t data); DECLARE_READ8_MEMBER(m1_meter_r); DECLARE_READ8_MEMBER(m1_firq_clr_r); DECLARE_READ8_MEMBER(m1_firq_trg_r); @@ -124,13 +124,13 @@ private: DECLARE_WRITE8_MEMBER(nec_bank0_w); DECLARE_WRITE8_MEMBER(nec_bank1_w); DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - DECLARE_READ8_MEMBER(m1_duart_r); - DECLARE_WRITE8_MEMBER(mcu_port0_w); - DECLARE_WRITE8_MEMBER(mcu_port1_w); - DECLARE_WRITE8_MEMBER(mcu_port2_w); - DECLARE_WRITE8_MEMBER(mcu_port3_w); - DECLARE_READ8_MEMBER(mcu_port0_r); - DECLARE_READ8_MEMBER(mcu_port2_r); + uint8_t m1_duart_r(); + void mcu_port0_w(uint8_t data); + void mcu_port1_w(uint8_t data); + void mcu_port2_w(uint8_t data); + void mcu_port3_w(uint8_t data); + uint8_t mcu_port0_r(); + uint8_t mcu_port2_r(); DECLARE_WRITE8_MEMBER(main_to_mcu_0_w); DECLARE_WRITE8_MEMBER(main_to_mcu_1_w); diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 7573acd4439..6d9f36a8eb1 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -62,14 +62,14 @@ private: required_device_array<filter_rc_device, 3> m_filter; uint8_t m_irq_mask; - DECLARE_WRITE8_MEMBER(megazone_i8039_irq_w); - DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w); + void megazone_i8039_irq_w(uint8_t data); + void i8039_irqen_and_status_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); DECLARE_WRITE_LINE_MEMBER(irq_mask_w); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_READ8_MEMBER(megazone_port_a_r); - DECLARE_WRITE8_MEMBER(megazone_port_b_w); + uint8_t megazone_port_a_r(); + void megazone_port_b_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index aa8c8546299..076b385259a 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -114,18 +114,18 @@ private: TIMER_CALLBACK_MEMBER(sound_data_sync); DECLARE_READ8_MEMBER(soundstatus_r); DECLARE_WRITE8_MEMBER(soundstatus_w); - template<int Mask> DECLARE_WRITE8_MEMBER(upd7810_rombank_w); - DECLARE_READ8_MEMBER(upd7810_porta_r); - DECLARE_WRITE8_MEMBER(upd7810_porta_w); - DECLARE_WRITE8_MEMBER(upd7810_portb_w); - DECLARE_WRITE8_MEMBER(daitorid_portb_w); + template<int Mask> void upd7810_rombank_w(uint8_t data); + uint8_t upd7810_porta_r(); + void upd7810_porta_w(uint8_t data); + void upd7810_portb_w(uint8_t data); + void daitorid_portb_w(uint8_t data); DECLARE_WRITE8_MEMBER(coin_lockout_1word_w); DECLARE_WRITE16_MEMBER(coin_lockout_4words_w); DECLARE_READ16_MEMBER(balcube_dsw_r); DECLARE_READ16_MEMBER(gakusai_input_r); DECLARE_WRITE8_MEMBER(blzntrnd_sh_bankswitch_w); DECLARE_WRITE16_MEMBER(puzzlet_irq_enable_w); - DECLARE_WRITE16_MEMBER(puzzlet_portb_w); + void puzzlet_portb_w(uint16_t data); DECLARE_WRITE16_MEMBER(k053936_w); DECLARE_WRITE8_MEMBER(gakusai_oki_bank_hi_w); DECLARE_WRITE8_MEMBER(gakusai_oki_bank_lo_w); diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index cec7817ddbd..5face5ec934 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -141,7 +141,7 @@ private: DECLARE_WRITE8_MEMBER(nemesis_filter_w); DECLARE_WRITE8_MEMBER(gx400_speech_start_w); DECLARE_WRITE8_MEMBER(salamand_speech_start_w); - DECLARE_READ8_MEMBER(nemesis_portA_r); + uint8_t nemesis_portA_r(); DECLARE_WRITE8_MEMBER(city_sound_bank_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -160,7 +160,7 @@ private: void create_palette_lookups(); void nemesis_postload(); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); void set_screen_raw_params(machine_config &config); void blkpnthr_map(address_map &map); diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h index b52184ce58f..90689676942 100644 --- a/src/mame/includes/newbrain.h +++ b/src/mame/includes/newbrain.h @@ -68,10 +68,10 @@ private: DECLARE_READ8_MEMBER( ust_a_r ); DECLARE_READ8_MEMBER( ust_b_r ); - DECLARE_WRITE8_MEMBER( cop_g_w ); - DECLARE_READ8_MEMBER( cop_g_r ); - DECLARE_WRITE8_MEMBER( cop_d_w ); - DECLARE_READ8_MEMBER( cop_in_r ); + void cop_g_w(uint8_t data); + uint8_t cop_g_r(); + void cop_d_w(uint8_t data); + uint8_t cop_in_r(); DECLARE_WRITE_LINE_MEMBER( k2_w ); DECLARE_READ_LINE_MEMBER( tdi_r ); DECLARE_WRITE_LINE_MEMBER( k1_w ); diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 0598d443943..b0d000d7cc2 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -58,7 +58,7 @@ public: DECLARE_WRITE8_MEMBER(pandoras_cpua_irqtrigger_w); DECLARE_WRITE8_MEMBER(pandoras_cpub_irqtrigger_w); DECLARE_WRITE8_MEMBER(pandoras_i8039_irqtrigger_w); - DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w); + void i8039_irqen_and_status_w(uint8_t data); DECLARE_WRITE8_MEMBER(pandoras_z80_irqtrigger_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); @@ -66,8 +66,8 @@ public: DECLARE_WRITE8_MEMBER(pandoras_cram_w); DECLARE_WRITE8_MEMBER(pandoras_scrolly_w); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_READ8_MEMBER(pandoras_portA_r); - DECLARE_READ8_MEMBER(pandoras_portB_r); + uint8_t pandoras_portA_r(); + uint8_t pandoras_portB_r(); TILE_GET_INFO_MEMBER(get_tile_info0); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index da6d0160fca..11347f3ac2b 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -61,7 +61,7 @@ public: uint32_t screen_update_parodius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); K05324X_CB_MEMBER(sprite_callback); K052109_CB_MEMBER(tile_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); void parodius(machine_config &config); void bank0000_map(address_map &map); diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 46e2afd606a..24a8cfadf8e 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -57,7 +57,7 @@ private: uint32_t screen_update_rollerg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); K05324X_CB_MEMBER(sprite_callback); K051316_CB_MEMBER(zoom_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); void rollerg_map(address_map &map); void rollerg_sound_map(address_map &map); diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 681d0ee753e..2f4c0b68adf 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -46,10 +46,10 @@ public: DECLARE_READ8_MEMBER(mars_ppi8255_0_r); DECLARE_READ8_MEMBER(mars_ppi8255_1_r); DECLARE_WRITE8_MEMBER(scramble_soundram_w); - DECLARE_READ8_MEMBER(scramble_portB_r); - DECLARE_READ8_MEMBER(hustler_portB_r); - DECLARE_WRITE8_MEMBER(hotshock_sh_irqtrigger_w); - DECLARE_READ8_MEMBER(hotshock_soundlatch_r); + uint8_t scramble_portB_r(); + uint8_t hustler_portB_r(); + void hotshock_sh_irqtrigger_w(uint8_t data); + uint8_t hotshock_soundlatch_r(); DECLARE_WRITE8_MEMBER(mars_ppi8255_0_w); DECLARE_WRITE8_MEMBER(mars_ppi8255_1_w); DECLARE_WRITE8_MEMBER(ad2083_tms5110_ctrl_w); @@ -59,7 +59,7 @@ public: DECLARE_WRITE8_MEMBER(harem_decrypt_clk_w); DECLARE_WRITE8_MEMBER(harem_decrypt_rst_w); DECLARE_READ8_MEMBER(harem_digitalker_intr_r); - DECLARE_WRITE8_MEMBER(harem_digitalker_control_w); + void harem_digitalker_control_w(uint8_t data); void init_cavelon(); void init_mariner(); @@ -96,8 +96,8 @@ public: DECLARE_WRITE8_MEMBER( cavelon_banksw_w ); DECLARE_READ8_MEMBER( hunchbks_mirror_r ); DECLARE_WRITE8_MEMBER( hunchbks_mirror_w ); - DECLARE_WRITE8_MEMBER( scramble_sh_irqtrigger_w ); - DECLARE_WRITE8_MEMBER( mrkougar_sh_irqtrigger_w ); + void scramble_sh_irqtrigger_w(uint8_t data); + void mrkougar_sh_irqtrigger_w(uint8_t data); IRQ_CALLBACK_MEMBER( scramble_sh_irq_callback ); void scramble(machine_config &config); diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 7d195375b37..21876cbb712 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -72,7 +72,7 @@ private: void simpsons_objdma(); void z80_nmi_w(int state); K052109_CB_MEMBER(tile_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(u8 data); K053246_CB_MEMBER(sprite_callback); void bank0000_map(address_map &map); diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index df2012af954..cc6811db0e4 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -65,8 +65,8 @@ private: virtual void machine_reset() override; uint32_t screen_update_spy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void spy_collision( ); - DECLARE_WRITE8_MEMBER(volume_callback0); - DECLARE_WRITE8_MEMBER(volume_callback1); + void volume_callback0(uint8_t data); + void volume_callback1(uint8_t data); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index ad2f593bcc6..1a2b8ad6193 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -55,7 +55,7 @@ private: K05324X_CB_MEMBER(sprite_callback); K052109_CB_MEMBER(tile_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); void bank0000_map(address_map &map); void surpratk_map(address_map &map); }; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 32f04cb2927..c93643c36ee 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -78,7 +78,7 @@ private: DECLARE_READ8_MEMBER(psurge_protection_r); /* chkun */ - DECLARE_WRITE8_MEMBER(chkun_sound_w); + void chkun_sound_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_chkun_tile_info); diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 6a0da21f451..b3e8cdaafd3 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -170,7 +170,7 @@ protected: INTERRUPT_GEN_MEMBER(lgtnfght_interrupt); inline uint32_t tmnt2_get_word( uint32_t addr ); void tmnt2_put_word( address_space &space, uint32_t addr, uint16_t data ); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); K051960_CB_MEMBER(mia_sprite_callback); K051960_CB_MEMBER(tmnt_sprite_callback); K051960_CB_MEMBER(punkshot_sprite_callback); diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 5a3c38ffef3..8313000d18c 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -81,7 +81,7 @@ protected: optional_ioport m_stars_config; TIMER_DEVICE_CALLBACK_MEMBER(scramble_stars_blink_timer); - DECLARE_WRITE8_MEMBER(galaxian_stars_enable_w); + void galaxian_stars_enable_w(uint8_t data); void stars_init(); void stars_init_scramble(); void stars_init_bootleg(); diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 11e30772a8e..4a89518f755 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -40,7 +40,7 @@ public: void init_twin16(); - DECLARE_WRITE8_MEMBER(volume_callback); + void volume_callback(uint8_t data); DECLARE_WRITE_LINE_MEMBER(screen_vblank_twin16); uint32_t screen_update_twin16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index f0cd809e669..cb1c77bec61 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -84,7 +84,7 @@ private: K052109_CB_MEMBER(vendetta_tile_callback); K052109_CB_MEMBER(esckids_tile_callback); - DECLARE_WRITE8_MEMBER(banking_callback); + void banking_callback(uint8_t data); K053246_CB_MEMBER(sprite_callback); void esckids_map(address_map &map); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 75352e1c2ef..98e411d077e 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -104,7 +104,7 @@ private: DECLARE_WRITE16_MEMBER(hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w); DECLARE_WRITE16_MEMBER(wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w); DECLARE_WRITE8_MEMBER(wecleman_K00723216_bank_w); - DECLARE_WRITE8_MEMBER(wecleman_volume_callback); + void wecleman_volume_callback(uint8_t data); template<int Chip> DECLARE_READ8_MEMBER(hotchase_k007232_r); template<int Chip> DECLARE_WRITE8_MEMBER(hotchase_k007232_w); diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h index 42f4c3e2a1c..47cdef8a7ec 100644 --- a/src/mame/machine/abc1600mac.h +++ b/src/mame/machine/abc1600mac.h @@ -47,18 +47,18 @@ public: DECLARE_WRITE8_MEMBER( page_w ); DECLARE_WRITE8_MEMBER( dmamap_w ); - DECLARE_READ8_MEMBER( dma0_mreq_r ) { return dma_mreq_r(DMAMAP_R0_LO, offset); } - DECLARE_WRITE8_MEMBER( dma0_mreq_w ) { dma_mreq_w(DMAMAP_R0_LO, offset, data); } - DECLARE_READ8_MEMBER( dma0_iorq_r ) { return dma_iorq_r(DMAMAP_R0_LO, offset); } - DECLARE_WRITE8_MEMBER( dma0_iorq_w ) { dma_iorq_w(DMAMAP_R0_LO, offset, data); } - DECLARE_READ8_MEMBER( dma1_mreq_r ) { return dma_mreq_r(DMAMAP_R1_LO, offset); } - DECLARE_WRITE8_MEMBER( dma1_mreq_w ) { dma_mreq_w(DMAMAP_R1_LO, offset, data); } - DECLARE_READ8_MEMBER( dma1_iorq_r ) { return dma_iorq_r(DMAMAP_R1_LO, offset); } - DECLARE_WRITE8_MEMBER( dma1_iorq_w ) { dma_iorq_w(DMAMAP_R1_LO, offset, data); } - DECLARE_READ8_MEMBER( dma2_mreq_r ) { return dma_mreq_r(DMAMAP_R2_LO, offset); } - DECLARE_WRITE8_MEMBER( dma2_mreq_w ) { dma_mreq_w(DMAMAP_R2_LO, offset, data); } - DECLARE_READ8_MEMBER( dma2_iorq_r ) { return dma_iorq_r(DMAMAP_R2_LO, offset); } - DECLARE_WRITE8_MEMBER( dma2_iorq_w ) { dma_iorq_w(DMAMAP_R2_LO, offset, data); } + uint8_t dma0_mreq_r(offs_t offset) { return dma_mreq_r(DMAMAP_R0_LO, offset); } + void dma0_mreq_w(offs_t offset, uint8_t data) { dma_mreq_w(DMAMAP_R0_LO, offset, data); } + uint8_t dma0_iorq_r(offs_t offset) { return dma_iorq_r(DMAMAP_R0_LO, offset); } + void dma0_iorq_w(offs_t offset, uint8_t data) { dma_iorq_w(DMAMAP_R0_LO, offset, data); } + uint8_t dma1_mreq_r(offs_t offset) { return dma_mreq_r(DMAMAP_R1_LO, offset); } + void dma1_mreq_w(offs_t offset, uint8_t data) { dma_mreq_w(DMAMAP_R1_LO, offset, data); } + uint8_t dma1_iorq_r(offs_t offset) { return dma_iorq_r(DMAMAP_R1_LO, offset); } + void dma1_iorq_w(offs_t offset, uint8_t data) { dma_iorq_w(DMAMAP_R1_LO, offset, data); } + uint8_t dma2_mreq_r(offs_t offset) { return dma_mreq_r(DMAMAP_R2_LO, offset); } + void dma2_mreq_w(offs_t offset, uint8_t data) { dma_mreq_w(DMAMAP_R2_LO, offset, data); } + uint8_t dma2_iorq_r(offs_t offset) { return dma_iorq_r(DMAMAP_R2_LO, offset); } + void dma2_iorq_w(offs_t offset, uint8_t data) { dma_iorq_w(DMAMAP_R2_LO, offset, data); } void program_map(address_map &map); protected: diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp index 5e1f871686d..f1365b38f7f 100644 --- a/src/mame/machine/hp48.cpp +++ b/src/mame/machine/hp48.cpp @@ -147,7 +147,7 @@ void hp48_state::rs232_send_byte() /* CPU sets OUT register (keyboard + beeper) */ -WRITE32_MEMBER( hp48_state::reg_out ) +void hp48_state::reg_out(uint32_t data) { LOG(("%s %f hp48_state::reg_out: %03x\n", machine().describe_context(), machine().time().as_double(), data)); @@ -182,7 +182,7 @@ int hp48_state::get_in() } /* CPU reads IN register (keyboard) */ -READ32_MEMBER( hp48_state::reg_in ) +uint32_t hp48_state::reg_in() { int in = get_in(); LOG(("%s %f hp48_state::reg_in: %04x\n", machine().describe_context(), machine().time().as_double(), in)); @@ -784,7 +784,7 @@ WRITE_LINE_MEMBER( hp48_state::mem_reset ) /* CONFIG opcode */ -WRITE32_MEMBER( hp48_state::mem_config ) +void hp48_state::mem_config(uint32_t data) { LOG(("%s %f hp48_state::mem_config: %05x\n", machine().describe_context(), machine().time().as_double(), data)); @@ -813,7 +813,7 @@ WRITE32_MEMBER( hp48_state::mem_config ) /* UNCFG opcode */ -WRITE32_MEMBER( hp48_state::mem_unconfig ) +void hp48_state::mem_unconfig(uint32_t data) { LOG(("%s %f hp48_state::mem_unconfig: %05x\n", machine().describe_context(), machine().time().as_double(), data)); @@ -833,7 +833,7 @@ WRITE32_MEMBER( hp48_state::mem_unconfig ) /* C=ID opcode */ -READ32_MEMBER( hp48_state::mem_id ) +uint32_t hp48_state::mem_id() { int data = 0; /* 0 = everything is configured */ @@ -865,7 +865,7 @@ READ32_MEMBER( hp48_state::mem_id ) /* --------- CRC ---------- */ /* each memory read by the CPU updates the internal CRC state */ -WRITE32_MEMBER( hp48_state::mem_crc ) +void hp48_state::mem_crc(offs_t offset, uint32_t data) { /* no CRC for I/O RAM */ if (offset >= m_io_addr && offset < m_io_addr + 0x40) return; diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp index d8dd2a41d38..83ae60d551b 100644 --- a/src/mame/machine/interpro_ioga.cpp +++ b/src/mame/machine/interpro_ioga.cpp @@ -263,7 +263,7 @@ void sapphire_ioga_device::device_reset() /* * Interrupts */ -WRITE32_MEMBER(interpro_ioga_device::bus_error) +void interpro_ioga_device::bus_error(offs_t offset, u32 data) { LOG("bus_error address 0x%08x businfo 0x%08x\n", data, offset); @@ -1257,7 +1257,7 @@ READ32_MEMBER(interpro_ioga_device::mouse_status_r) return result; } -WRITE32_MEMBER(interpro_ioga_device::mouse_status_w) +void interpro_ioga_device::mouse_status_w(offs_t offset, u32 data, u32 mem_mask) { LOGMASKED(LOG_MOUSE, "mouse_status_w status 0x%08x mask 0x%08x\n", data, mem_mask); diff --git a/src/mame/machine/interpro_ioga.h b/src/mame/machine/interpro_ioga.h index 05f66ca980f..1a13257ecca 100644 --- a/src/mame/machine/interpro_ioga.h +++ b/src/mame/machine/interpro_ioga.h @@ -205,7 +205,7 @@ public: DECLARE_READ32_MEMBER(bus_timeout_r) { return m_bus_timeout; } DECLARE_WRITE32_MEMBER(bus_timeout_w) { m_bus_timeout = data; } - DECLARE_WRITE32_MEMBER(bus_error); + void bus_error(offs_t offset, u32 data); // timers DECLARE_READ32_MEMBER(timer0_r); @@ -235,7 +235,7 @@ public: MOUSE_BUTTONS = 0x00070000 }; DECLARE_READ32_MEMBER(mouse_status_r); - DECLARE_WRITE32_MEMBER(mouse_status_w); + void mouse_status_w(offs_t offset, u32 data, u32 mem_mask = ~0); protected: // device-level overrides diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp index 1bef83edaf0..446d852792e 100644 --- a/src/mame/machine/kaypro.cpp +++ b/src/mame/machine/kaypro.cpp @@ -21,7 +21,7 @@ WRITE_LINE_MEMBER( kaypro_state::write_centronics_busy ) m_centronics_busy = state; } -READ8_MEMBER( kaypro_state::pio_system_r ) +uint8_t kaypro_state::pio_system_r() { uint8_t data = 0; @@ -34,7 +34,7 @@ READ8_MEMBER( kaypro_state::pio_system_r ) return data; } -WRITE8_MEMBER( kaypro_state::kayproii_pio_system_w ) +void kaypro_state::kayproii_pio_system_w(uint8_t data) { /* d7 bank select d6 disk drive motors - (0=on) @@ -72,9 +72,9 @@ WRITE8_MEMBER( kaypro_state::kayproii_pio_system_w ) m_system_port = data; } -WRITE8_MEMBER( kaypro_state::kayproiv_pio_system_w ) +void kaypro_state::kayproiv_pio_system_w(uint8_t data) { - kayproii_pio_system_w(space, offset, data); + kayproii_pio_system_w(data); /* side select */ m_floppy->ss_w(BIT(data, 2)); diff --git a/src/mame/machine/simpsons.cpp b/src/mame/machine/simpsons.cpp index ee919dad196..5606f44b376 100644 --- a/src/mame/machine/simpsons.cpp +++ b/src/mame/machine/simpsons.cpp @@ -58,7 +58,7 @@ READ8_MEMBER(simpsons_state::simpsons_sound_interrupt_r) ***************************************************************************/ -WRITE8_MEMBER( simpsons_state::banking_callback ) +void simpsons_state::banking_callback(u8 data) { membank("bank1")->set_entry(data & 0x3f); } diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index 412890a5f18..a14ca763e3c 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -120,7 +120,7 @@ uint32_t abc800c_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma // SAA5050_INTERFACE( trom_intf ) //------------------------------------------------- -READ8_MEMBER( abc800c_state::char_ram_r ) +uint8_t abc800c_state::char_ram_r(offs_t offset) { int row = offset / 40; int col = offset % 40; diff --git a/src/mame/video/digdug.cpp b/src/mame/video/digdug.cpp index a5d6d538a28..d19e69f7c42 100644 --- a/src/mame/video/digdug.cpp +++ b/src/mame/video/digdug.cpp @@ -171,7 +171,7 @@ WRITE8_MEMBER( digdug_state::digdug_videoram_w ) m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE8_MEMBER(digdug_state::bg_select_w) +void digdug_state::bg_select_w(uint8_t data) { // select background picture if (m_bg_select != (data & 0x03)) diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index aecd079a48c..85b8d5216a7 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -138,25 +138,25 @@ uint32_t gameplan_state::screen_update_leprechn(screen_device &screen, bitmap_rg * *************************************/ -WRITE8_MEMBER(gameplan_state::video_data_w) +void gameplan_state::video_data_w(uint8_t data) { m_video_data = data; } -WRITE8_MEMBER(gameplan_state::gameplan_video_command_w) +void gameplan_state::gameplan_video_command_w(uint8_t data) { m_video_command = data & 0x07; } -WRITE8_MEMBER(gameplan_state::leprechn_video_command_w) +void gameplan_state::leprechn_video_command_w(uint8_t data) { m_video_command = (data >> 3) & 0x07; } -READ8_MEMBER(gameplan_state::leprechn_videoram_r) +uint8_t gameplan_state::leprechn_videoram_r() { return m_videoram[m_video_y * (HBSTART - HBEND) + m_video_x]; } diff --git a/src/mame/video/gatron.cpp b/src/mame/video/gatron.cpp index c3dde5deba1..2508a909d83 100644 --- a/src/mame/video/gatron.cpp +++ b/src/mame/video/gatron.cpp @@ -23,7 +23,7 @@ #include "includes/gatron.h" -WRITE8_MEMBER(gatron_state::videoram_w) +void gatron_state::videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); diff --git a/src/mame/video/homerun.cpp b/src/mame/video/homerun.cpp index cf3cab274c5..47495cbe2ce 100644 --- a/src/mame/video/homerun.cpp +++ b/src/mame/video/homerun.cpp @@ -18,7 +18,7 @@ READ_LINE_MEMBER(homerun_state::sprite0_r) return (m_screen->vpos() > (m_spriteram[0] - 16 + 1)) ? 1 : 0; } -WRITE8_MEMBER(homerun_state::scrollhi_w) +void homerun_state::scrollhi_w(u8 data) { // d0: scroll y high bit // d1: scroll x high bit @@ -27,12 +27,12 @@ WRITE8_MEMBER(homerun_state::scrollhi_w) m_scrollx = (m_scrollx & 0xff) | (data << 7 & 0x100); } -WRITE8_MEMBER(homerun_state::scrolly_w) +void homerun_state::scrolly_w(u8 data) { m_scrolly = (m_scrolly & 0xff00) | data; } -WRITE8_MEMBER(homerun_state::scrollx_w) +void homerun_state::scrollx_w(u8 data) { m_scrollx = (m_scrollx & 0xff00) | data; } @@ -62,7 +62,7 @@ void homerun_state::banking_w(u8 data) } } -WRITE8_MEMBER(homerun_state::videoram_w) +void homerun_state::videoram_w(offs_t offset, u8 data) { m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset & 0xfff); diff --git a/src/mame/video/tutankhm.cpp b/src/mame/video/tutankhm.cpp index fcec41c4461..9487065e945 100644 --- a/src/mame/video/tutankhm.cpp +++ b/src/mame/video/tutankhm.cpp @@ -431,7 +431,7 @@ void tutankhm_state::scramble_draw_background(bitmap_rgb32 &bitmap, const rectan scramble_draw_stars(bitmap, cliprect, 256); } -WRITE8_MEMBER(tutankhm_state::galaxian_stars_enable_w) +void tutankhm_state::galaxian_stars_enable_w(uint8_t data) { if ((m_stars_enabled ^ data) & 0x01) { |