diff options
author | 2020-05-28 18:10:20 +0200 | |
---|---|---|
committer | 2020-05-28 18:10:20 +0200 | |
commit | d4c772bcc7263dd2697a7977d196a96ad2d067a3 (patch) | |
tree | 3fa4d24ee8250f44ec9f7a0cc9df94bf8bd3c5cb /src/mame/drivers/joctronic.cpp | |
parent | c7d667d41adaa9627a3350e7f984fe7fc431f081 (diff) |
drivers starting with i, j, k, l and m: more macro removal (nw)
Diffstat (limited to 'src/mame/drivers/joctronic.cpp')
-rw-r--r-- | src/mame/drivers/joctronic.cpp | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp index ff687c8fdf6..50438bab5ec 100644 --- a/src/mame/drivers/joctronic.cpp +++ b/src/mame/drivers/joctronic.cpp @@ -34,31 +34,31 @@ public: void bldyrolr(machine_config &config); private: - DECLARE_READ8_MEMBER(csin_r); - DECLARE_WRITE8_MEMBER(control_port_w); - DECLARE_WRITE8_MEMBER(display_1_w); - DECLARE_WRITE8_MEMBER(display_2_w); - DECLARE_WRITE8_MEMBER(display_3_w); - DECLARE_WRITE8_MEMBER(display_4_w); - DECLARE_WRITE8_MEMBER(display_a_w); - DECLARE_WRITE8_MEMBER(drivers_l_w); - DECLARE_WRITE8_MEMBER(drivers_b_w); - - DECLARE_READ8_MEMBER(inputs_r); - DECLARE_READ8_MEMBER(ports_r); - DECLARE_READ8_MEMBER(csint_r); - DECLARE_WRITE8_MEMBER(display_strobe_w); - DECLARE_WRITE8_MEMBER(drivers_w); - DECLARE_WRITE8_MEMBER(display_ck_w); - - DECLARE_READ8_MEMBER(bldyrolr_unknown_r); - DECLARE_WRITE8_MEMBER(bldyrolr_unknown_w); - - DECLARE_WRITE8_MEMBER(soundlatch_nmi_w); - DECLARE_WRITE8_MEMBER(soundlatch_nmi_pulse_w); - DECLARE_READ8_MEMBER(soundlatch_r); - DECLARE_READ8_MEMBER(soundlatch_nmi_r); - DECLARE_WRITE8_MEMBER(resint_w); + u8 csin_r(offs_t offset); + void control_port_w(offs_t offset, u8 data); + void display_1_w(offs_t offset, u8 data); + void display_2_w(offs_t offset, u8 data); + void display_3_w(offs_t offset, u8 data); + void display_4_w(offs_t offset, u8 data); + void display_a_w(offs_t offset, u8 data); + void drivers_l_w(offs_t offset, u8 data); + void drivers_b_w(offs_t offset, u8 data); + + u8 inputs_r(); + u8 ports_r(); + u8 csint_r(offs_t offset); + void display_strobe_w(offs_t offset, u8 data); + void drivers_w(offs_t offset, u8 data); + void display_ck_w(offs_t offset, u8 data); + + u8 bldyrolr_unknown_r(); + void bldyrolr_unknown_w(u8 data); + + void soundlatch_nmi_w(u8 data); + void soundlatch_nmi_pulse_w(u8 data); + u8 soundlatch_r(); + u8 soundlatch_nmi_r(); + void resint_w(u8 data); void slalom03_oki_bank_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(vck_w); @@ -85,48 +85,48 @@ private: bool m_adpcm_toggle; }; -READ8_MEMBER(joctronic_state::csin_r) +u8 joctronic_state::csin_r(offs_t offset) { logerror("csin_r[%d] read\n", offset); return 0xff; } -WRITE8_MEMBER(joctronic_state::control_port_w) +void joctronic_state::control_port_w(offs_t offset, u8 data) { logerror("control_port[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::display_1_w) +void joctronic_state::display_1_w(offs_t offset, u8 data) { logerror("display_1[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::display_2_w) +void joctronic_state::display_2_w(offs_t offset, u8 data) { logerror("display_2[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::display_3_w) +void joctronic_state::display_3_w(offs_t offset, u8 data) { logerror("display_3[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::display_4_w) +void joctronic_state::display_4_w(offs_t offset, u8 data) { logerror("display_4[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::display_a_w) +void joctronic_state::display_a_w(offs_t offset, u8 data) { logerror("display_a[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::drivers_l_w) +void joctronic_state::drivers_l_w(offs_t offset, u8 data) { logerror("drivers_l[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::drivers_b_w) +void joctronic_state::drivers_b_w(offs_t offset, u8 data) { logerror("drivers_b[%d] = $%02X\n", offset, data); } @@ -149,35 +149,35 @@ void joctronic_state::maincpu_map(address_map &map) map(0xe000, 0xe000).mirror(0x0fff).w(FUNC(joctronic_state::soundlatch_nmi_w)); // PSON } -READ8_MEMBER(joctronic_state::inputs_r) +u8 joctronic_state::inputs_r() { return 0xff; } -READ8_MEMBER(joctronic_state::ports_r) +u8 joctronic_state::ports_r() { return 0xff; } -READ8_MEMBER(joctronic_state::csint_r) +u8 joctronic_state::csint_r(offs_t offset) { logerror("csint_r[%d] read\n", offset); return 0xff; } -WRITE8_MEMBER(joctronic_state::display_strobe_w) +void joctronic_state::display_strobe_w(offs_t offset, u8 data) { logerror("display_strobe[%d] = $%02X\n", offset, data); } -WRITE8_MEMBER(joctronic_state::drivers_w) +void joctronic_state::drivers_w(offs_t offset, u8 data) { for (int i = 0; i < 6; ++i) if (m_driver_latch[i].found()) m_driver_latch[i]->write_bit(offset, BIT(data, i)); } -WRITE8_MEMBER(joctronic_state::display_ck_w) +void joctronic_state::display_ck_w(offs_t offset, u8 data) { logerror("display_ck[%d] = $%02X\n", offset, data); } @@ -199,13 +199,13 @@ void joctronic_state::slalom03_maincpu_map(address_map &map) map(0xf000, 0xf000).mirror(0x0fff).w(FUNC(joctronic_state::soundlatch_nmi_pulse_w)); // CSSON } -READ8_MEMBER(joctronic_state::bldyrolr_unknown_r) +u8 joctronic_state::bldyrolr_unknown_r() { logerror("bldyrolr_unknown read\n"); return 0xff; } -WRITE8_MEMBER(joctronic_state::bldyrolr_unknown_w) +void joctronic_state::bldyrolr_unknown_w(u8 data) { logerror("bldyrolr_unknown = $%02X\n", data); } @@ -222,30 +222,30 @@ void joctronic_state::maincpu_io_map(address_map &map) map(0x00, 0x03).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); } -WRITE8_MEMBER(joctronic_state::soundlatch_nmi_w) +void joctronic_state::soundlatch_nmi_w(u8 data) { m_soundcpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); m_soundlatch = data; } -WRITE8_MEMBER(joctronic_state::soundlatch_nmi_pulse_w) +void joctronic_state::soundlatch_nmi_pulse_w(u8 data) { m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); m_soundlatch = data; } -READ8_MEMBER(joctronic_state::soundlatch_r) +u8 joctronic_state::soundlatch_r() { return m_soundlatch; } -READ8_MEMBER(joctronic_state::soundlatch_nmi_r) +u8 joctronic_state::soundlatch_nmi_r() { m_soundcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); return m_soundlatch; } -WRITE8_MEMBER(joctronic_state::resint_w) +void joctronic_state::resint_w(u8 data) { // acknowledge INTR by clearing flip-flop m_soundcpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); |