From 9a26068af359f29e620476e4a3800ceed486b2db Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 14 Jun 2019 07:24:43 -0400 Subject: poly88: Simplify handlers; remove unused variable (nw) --- src/mame/drivers/poly88.cpp | 6 +++--- src/mame/includes/poly88.h | 7 +++---- src/mame/machine/poly88.cpp | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index 180078aff0f..e4dcb628132 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -70,9 +70,9 @@ void poly88_state::poly88_io(address_map &map) map.unmap_value_high(); map.global_mask(0xff); map(0x00, 0x01).rw(m_usart, FUNC(i8251_device::read), FUNC(i8251_device::write)); - map(0x04, 0x04).w(FUNC(poly88_state::poly88_baud_rate_w)); - map(0x08, 0x08).w(FUNC(poly88_state::poly88_intr_w)); - map(0xf8, 0xf8).r(FUNC(poly88_state::poly88_keyboard_r)); + map(0x04, 0x04).w(FUNC(poly88_state::baud_rate_w)); + map(0x08, 0x08).w(FUNC(poly88_state::intr_w)); + map(0xf8, 0xf8).r(FUNC(poly88_state::keyboard_r)); } void poly88_state::poly8813_mem(address_map &map) diff --git a/src/mame/includes/poly88.h b/src/mame/includes/poly88.h index 29d39c049fa..77480419d12 100644 --- a/src/mame/includes/poly88.h +++ b/src/mame/includes/poly88.h @@ -55,11 +55,10 @@ private: emu_timer * m_usart_timer; emu_timer * m_keyboard_timer; int m_previous_level; - int m_clk_level; int m_clk_level_tape; - DECLARE_WRITE8_MEMBER(poly88_baud_rate_w); - DECLARE_READ8_MEMBER(poly88_keyboard_r); - DECLARE_WRITE8_MEMBER(poly88_intr_w); + void baud_rate_w(uint8_t data); + uint8_t keyboard_r(); + void intr_w(uint8_t data); virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_poly88(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/machine/poly88.cpp b/src/mame/machine/poly88.cpp index 1d317a1182e..cd27aa80c81 100644 --- a/src/mame/machine/poly88.cpp +++ b/src/mame/machine/poly88.cpp @@ -36,7 +36,7 @@ TIMER_CALLBACK_MEMBER(poly88_state::poly88_usart_timer_callback) m_maincpu->set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(poly88_state::poly88_baud_rate_w) +void poly88_state::baud_rate_w(uint8_t data) { logerror("poly88_baud_rate_w %02x\n",data); m_brg->control_w(data & 15); @@ -241,7 +241,7 @@ WRITE_LINE_MEMBER(poly88_state::poly88_usart_rxready) //execute().set_input_line(0, HOLD_LINE); } -READ8_MEMBER(poly88_state::poly88_keyboard_r) +uint8_t poly88_state::keyboard_r() { uint8_t retVal = m_last_code; m_maincpu->set_input_line(0, CLEAR_LINE); @@ -249,7 +249,7 @@ READ8_MEMBER(poly88_state::poly88_keyboard_r) return retVal; } -WRITE8_MEMBER(poly88_state::poly88_intr_w) +void poly88_state::intr_w(uint8_t data) { m_maincpu->set_input_line(0, CLEAR_LINE); } -- cgit v1.2.3