From c47c4e288fc36a1a64224f9c366e778279c53d16 Mon Sep 17 00:00:00 2001 From: cam900 Date: Mon, 15 Apr 2019 22:20:27 +0900 Subject: [PATCH] es5503.cpp : Simplify handlers --- src/devices/sound/es5503.cpp | 4 ++-- src/devices/sound/es5503.h | 4 ++-- src/mame/drivers/apple2gs.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/sound/es5503.cpp b/src/devices/sound/es5503.cpp index 2344a7c695b..05c2f16eae5 100644 --- a/src/devices/sound/es5503.cpp +++ b/src/devices/sound/es5503.cpp @@ -270,7 +270,7 @@ void es5503_device::device_reset() output_rate = (clock()/8)/34; // (input clock / 8) / # of oscs. enabled + 2 } -READ8_MEMBER( es5503_device::read ) +u8 es5503_device::read(offs_t offset) { uint8_t retval; int i; @@ -361,7 +361,7 @@ READ8_MEMBER( es5503_device::read ) return 0; } -WRITE8_MEMBER( es5503_device::write ) +void es5503_device::write(offs_t offset, u8 data) { m_stream->update(); diff --git a/src/devices/sound/es5503.h b/src/devices/sound/es5503.h index 967ec70a2d2..489c821d8cd 100644 --- a/src/devices/sound/es5503.h +++ b/src/devices/sound/es5503.h @@ -23,8 +23,8 @@ public: auto irq_func() { return m_irq_func.bind(); } auto adc_func() { return m_adc_func.bind(); } - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + u8 read(offs_t offset); + void write(offs_t offset, u8 data); uint8_t get_channel_strobe() { return m_channel_strobe; } diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 02c24e34e1e..33aed3703e9 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -2262,7 +2262,7 @@ READ8_MEMBER(apple2gs_state::c000_r) } else { - m_sndglu_dummy_read = m_doc->read(space, m_sndglu_addr); + m_sndglu_dummy_read = m_doc->read(m_sndglu_addr); } if (m_sndglu_ctrl & 0x20) // auto-increment @@ -2591,7 +2591,7 @@ WRITE8_MEMBER(apple2gs_state::c000_w) } else { - m_doc->write(space, m_sndglu_addr, data); + m_doc->write(m_sndglu_addr, data); } if (m_sndglu_ctrl & 0x20) // auto-increment