From ac0d6afa0627813546c5412dd75a8bcc10ef0b7b Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 18 Feb 2019 21:17:47 -0500 Subject: kingobox.cpp, videopin.cpp: Simplify read/write handlers (nw) --- src/mame/drivers/kingobox.cpp | 14 +++++++------- src/mame/drivers/videopin.cpp | 14 +++++++------- src/mame/includes/kingobox.h | 18 +++++++++--------- src/mame/includes/videopin.h | 14 +++++++------- src/mame/video/kingobox.cpp | 10 +++++----- src/mame/video/videopin.cpp | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index e2f2e19cddc..220e39e9d20 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -29,25 +29,25 @@ Main CPU: #include "speaker.h" -WRITE8_MEMBER(kingofb_state::video_interrupt_w) +void kingofb_state::video_interrupt_w(uint8_t data) { m_video_cpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } -WRITE8_MEMBER(kingofb_state::sprite_interrupt_w) +void kingofb_state::sprite_interrupt_w(uint8_t data) { m_sprite_cpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } -WRITE8_MEMBER(kingofb_state::scroll_interrupt_w) +void kingofb_state::scroll_interrupt_w(uint8_t data) { - sprite_interrupt_w(space, offset, data); + sprite_interrupt_w(data); *m_scroll_y = data; } -WRITE8_MEMBER(kingofb_state::sound_command_w) +void kingofb_state::sound_command_w(uint8_t data) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(machine().dummy_space(), 0, data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } @@ -459,7 +459,7 @@ void kingofb_state::machine_start() void kingofb_state::machine_reset() { - kingofb_f800_w(machine().dummy_space(), 0, 0); // LS174 reset + kingofb_f800_w(0); // LS174 reset } MACHINE_CONFIG_START(kingofb_state::kingofb) diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 239e5731eae..e93c6154ac8 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -97,8 +97,8 @@ void videopin_state::machine_reset() /* both output latches are cleared on reset */ - out1_w(machine().dummy_space(), 0, 0); - out2_w(machine().dummy_space(), 0, 0); + out1_w(0); + out2_w(0); } @@ -108,7 +108,7 @@ double videopin_state::calc_plunger_pos() } -READ8_MEMBER(videopin_state::misc_r) +uint8_t videopin_state::misc_r() { double plunger = calc_plunger_pos(); @@ -136,7 +136,7 @@ READ8_MEMBER(videopin_state::misc_r) } -WRITE8_MEMBER(videopin_state::led_w) +void videopin_state::led_w(uint8_t data) { // LED matrix as seen in Video Pinball manual, fig. 4-14 // output to "LEDxx" where xx = 01 to 32, videopin START = LED30 @@ -162,7 +162,7 @@ WRITE8_MEMBER(videopin_state::led_w) } -WRITE8_MEMBER(videopin_state::out1_w) +void videopin_state::out1_w(uint8_t data) { /* D0 => OCTAVE0 */ /* D1 => OCTACE1 */ @@ -185,7 +185,7 @@ WRITE8_MEMBER(videopin_state::out1_w) } -WRITE8_MEMBER(videopin_state::out2_w) +void videopin_state::out2_w(uint8_t data) { /* D0 => VOL0 */ /* D1 => VOL1 */ @@ -205,7 +205,7 @@ WRITE8_MEMBER(videopin_state::out2_w) } -WRITE8_MEMBER(videopin_state::note_dvsr_w) +void videopin_state::note_dvsr_w(uint8_t data) { /* note data */ m_discrete->write(VIDEOPIN_NOTE_DATA, ~data &0xff); diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 123ef8da5ab..ccd6c86e15f 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -58,15 +58,15 @@ private: /* devices */ required_device m_video_cpu; required_device m_sprite_cpu; - DECLARE_WRITE8_MEMBER(video_interrupt_w); - DECLARE_WRITE8_MEMBER(sprite_interrupt_w); - DECLARE_WRITE8_MEMBER(scroll_interrupt_w); - DECLARE_WRITE8_MEMBER(sound_command_w); - DECLARE_WRITE8_MEMBER(kingofb_videoram_w); - DECLARE_WRITE8_MEMBER(kingofb_colorram_w); - DECLARE_WRITE8_MEMBER(kingofb_videoram2_w); - DECLARE_WRITE8_MEMBER(kingofb_colorram2_w); - DECLARE_WRITE8_MEMBER(kingofb_f800_w); + void video_interrupt_w(uint8_t data); + void sprite_interrupt_w(uint8_t data); + void scroll_interrupt_w(uint8_t data); + void sound_command_w(uint8_t data); + void kingofb_videoram_w(offs_t offset, uint8_t data); + void kingofb_colorram_w(offs_t offset, uint8_t data); + void kingofb_videoram2_w(offs_t offset, uint8_t data); + void kingofb_colorram2_w(offs_t offset, uint8_t data); + void kingofb_f800_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(ringking_get_bg_tile_info); diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 8bea498b233..17002b6f535 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -45,13 +45,13 @@ private: TIMER_INTERRUPT }; - DECLARE_READ8_MEMBER(misc_r); - DECLARE_WRITE8_MEMBER(led_w); - DECLARE_WRITE8_MEMBER(ball_w); - DECLARE_WRITE8_MEMBER(video_ram_w); - DECLARE_WRITE8_MEMBER(out1_w); - DECLARE_WRITE8_MEMBER(out2_w); - DECLARE_WRITE8_MEMBER(note_dvsr_w); + uint8_t misc_r(); + void led_w(uint8_t data); + void ball_w(uint8_t data); + void video_ram_w(offs_t offset, uint8_t data); + void out1_w(uint8_t data); + void out2_w(uint8_t data); + void note_dvsr_w(uint8_t data); TILEMAP_MAPPER_MEMBER(get_memory_offset); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/video/kingobox.cpp b/src/mame/video/kingobox.cpp index 70e62dac753..fc5a692786c 100644 --- a/src/mame/video/kingobox.cpp +++ b/src/mame/video/kingobox.cpp @@ -132,31 +132,31 @@ void kingofb_state::ringking_palette(palette_device &palette) palette_init_common(palette, color_prom, &kingofb_state::ringking_get_rgb_data); } -WRITE8_MEMBER(kingofb_state::kingofb_videoram_w) +void kingofb_state::kingofb_videoram_w(offs_t offset, uint8_t data) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(kingofb_state::kingofb_colorram_w) +void kingofb_state::kingofb_colorram_w(offs_t offset, uint8_t data) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(kingofb_state::kingofb_videoram2_w) +void kingofb_state::kingofb_videoram2_w(offs_t offset, uint8_t data) { m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(kingofb_state::kingofb_colorram2_w) +void kingofb_state::kingofb_colorram2_w(offs_t offset, uint8_t data) { m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(kingofb_state::kingofb_f800_w) +void kingofb_state::kingofb_f800_w(uint8_t data) { m_nmigate->in_w<1>(BIT(data, 5)); diff --git a/src/mame/video/videopin.cpp b/src/mame/video/videopin.cpp index 71c50bc9334..1db00b15dc2 100644 --- a/src/mame/video/videopin.cpp +++ b/src/mame/video/videopin.cpp @@ -89,14 +89,14 @@ uint32_t videopin_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE8_MEMBER(videopin_state::ball_w) +void videopin_state::ball_w(uint8_t data) { m_ball_x = data & 15; m_ball_y = data >> 4; } -WRITE8_MEMBER(videopin_state::video_ram_w) +void videopin_state::video_ram_w(offs_t offset, uint8_t data) { m_video_ram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); -- cgit v1.2.3