From d58c0abc64caa82e5d8245121fed51856bfdeb57 Mon Sep 17 00:00:00 2001 From: smf- Date: Fri, 14 Sep 2018 00:48:54 +0100 Subject: less space (nw) --- src/devices/bus/bbc/userport/beebspch.cpp | 2 +- src/devices/bus/c64/currah_speech.cpp | 2 +- src/devices/bus/coco/coco_ssc.cpp | 2 +- src/devices/bus/cpc/cpc_ssa1.cpp | 4 ++-- src/devices/bus/einstein/userport/speech.cpp | 2 +- src/devices/bus/intv/voice.cpp | 4 ++-- src/devices/bus/odyssey2/voice.cpp | 2 +- src/devices/bus/spectrum/uspeech.cpp | 2 +- src/devices/sound/sp0256.cpp | 8 ++++---- src/devices/sound/sp0256.h | 6 +++--- src/mame/drivers/idsa.cpp | 2 +- src/mame/drivers/jupace.cpp | 2 +- src/mame/drivers/sauro.cpp | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/devices/bus/bbc/userport/beebspch.cpp b/src/devices/bus/bbc/userport/beebspch.cpp index 3ca1a0ca4cd..ee2bdb67e6b 100644 --- a/src/devices/bus/bbc/userport/beebspch.cpp +++ b/src/devices/bus/bbc/userport/beebspch.cpp @@ -107,7 +107,7 @@ WRITE8_MEMBER(bbc_beebspch_device::pb_w) } // allophone - m_nsp->ald_w(space, 0, data & 0x3f); + m_nsp->ald_w(data & 0x3f); } WRITE_LINE_MEMBER(bbc_beebspch_device::cb1_w) diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp index 5e97ee9b645..84d64f2ea2a 100644 --- a/src/devices/bus/c64/currah_speech.cpp +++ b/src/devices/bus/c64/currah_speech.cpp @@ -234,6 +234,6 @@ void c64_currah_speech_cartridge_device::c64_cd_w(address_space &space, offs_t o set_osc1(voice, intonation); - m_nsp->ald_w(space, 0, data & 0x3f); + m_nsp->ald_w(data & 0x3f); } } diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index e19a7cdd2f5..21eab3abc53 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -448,7 +448,7 @@ WRITE8_MEMBER(coco_ssc_device::ssc_port_c_w) if( (data & C_ALD) == 0 ) { - m_spo->ald_w(space, 0, m_tms7000_portd); + m_spo->ald_w(m_tms7000_portd); } if( ((m_tms7000_portc & C_BSY) == 0) && ((data & C_BSY) == C_BSY) ) diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index ae661828a9e..c5758069a26 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -41,7 +41,7 @@ READ8_MEMBER(cpc_ssa1_device::ssa1_r) WRITE8_MEMBER(cpc_ssa1_device::ssa1_w) { - m_sp0256_device->ald_w(space, 0, data); + m_sp0256_device->ald_w(data); } READ8_MEMBER(cpc_dkspeech_device::dkspeech_r) @@ -58,7 +58,7 @@ READ8_MEMBER(cpc_dkspeech_device::dkspeech_r) WRITE8_MEMBER(cpc_dkspeech_device::dkspeech_w) { - m_sp0256_device->ald_w(space, 0, data & 0x3f); + m_sp0256_device->ald_w(data & 0x3f); } WRITE_LINE_MEMBER(cpc_ssa1_device::lrq_cb) diff --git a/src/devices/bus/einstein/userport/speech.cpp b/src/devices/bus/einstein/userport/speech.cpp index f8ea0d72b31..435423f9f82 100644 --- a/src/devices/bus/einstein/userport/speech.cpp +++ b/src/devices/bus/einstein/userport/speech.cpp @@ -85,5 +85,5 @@ uint8_t einstein_speech_device::read() void einstein_speech_device::write(uint8_t data) { if (BIT(data, 7) == 0) - m_sp0256->ald_w(machine().dummy_space(), 0, data & 0x3f); + m_sp0256->ald_w(data & 0x3f); } diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp index d10abb03e23..7cc62da7856 100644 --- a/src/devices/bus/intv/voice.cpp +++ b/src/devices/bus/intv/voice.cpp @@ -98,7 +98,7 @@ const tiny_rom_entry *intv_voice_device::device_rom_region() const READ16_MEMBER(intv_voice_device::read_speech) { if (ACCESSING_BITS_0_7) - return m_speech->spb640_r(space, offset, mem_mask); + return m_speech->spb640_r(offset); else return 0xff; } @@ -110,7 +110,7 @@ READ16_MEMBER(intv_voice_device::read_speech) WRITE16_MEMBER(intv_voice_device::write_speech) { if (ACCESSING_BITS_0_7) - return m_speech->spb640_w(space, offset, data, mem_mask); + return m_speech->spb640_w(offset, data); } diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index d4d8e83b738..073b4a83173 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -88,7 +88,7 @@ WRITE_LINE_MEMBER(o2_voice_device::lrq_callback) WRITE8_MEMBER(o2_voice_device::io_write) { if (data & 0x20) - m_speech->ald_w(space, 0, offset & 0x7f); + m_speech->ald_w(offset & 0x7f); else m_speech->reset(); } diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp index a07852c15c7..852ac24c11d 100644 --- a/src/devices/bus/spectrum/uspeech.cpp +++ b/src/devices/bus/spectrum/uspeech.cpp @@ -128,7 +128,7 @@ WRITE8_MEMBER(spectrum_uspeech_device::mreq_w) { case 0x1000: // allophone - m_nsp->ald_w(space, 0, data & 0x3f); + m_nsp->ald_w(data & 0x3f); break; case 0x3000: diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp index 78f77da29ba..54c17fcaf21 100644 --- a/src/devices/sound/sp0256.cpp +++ b/src/devices/sound/sp0256.cpp @@ -1141,7 +1141,7 @@ void sp0256_device::micro() -WRITE8_MEMBER( sp0256_device::ald_w ) +void sp0256_device::ald_w(uint8_t data) { /* ---------------------------------------------------------------- */ /* Drop writes to the ALD register if we're busy. */ @@ -1180,7 +1180,7 @@ READ_LINE_MEMBER( sp0256_device::sby_r ) return m_sby_line; } -READ16_MEMBER( sp0256_device::spb640_r ) +uint16_t sp0256_device::spb640_r(offs_t offset) { /* -------------------------------------------------------------------- */ /* Offset 0 returns the SP0256 LRQ status on bit 15. */ @@ -1204,11 +1204,11 @@ READ16_MEMBER( sp0256_device::spb640_r ) return 0x00ff; } -WRITE16_MEMBER( sp0256_device::spb640_w ) +void sp0256_device::spb640_w(offs_t offset, uint16_t data) { if (offset == 0) { - ald_w(space, 0, data & 0xff); + ald_w(data & 0xff); return; } diff --git a/src/devices/sound/sp0256.h b/src/devices/sound/sp0256.h index aad9370e91c..83a3aa75c5d 100644 --- a/src/devices/sound/sp0256.h +++ b/src/devices/sound/sp0256.h @@ -45,11 +45,11 @@ public: auto data_request_callback() { return m_drq_cb.bind(); } auto standby_callback() { return m_sby_cb.bind(); } - DECLARE_WRITE8_MEMBER(ald_w); + void ald_w(uint8_t data); DECLARE_READ_LINE_MEMBER(lrq_r); DECLARE_READ_LINE_MEMBER(sby_r); - DECLARE_READ16_MEMBER(spb640_r); - DECLARE_WRITE16_MEMBER(spb640_w); + uint16_t spb640_r(offs_t offset); + void spb640_w(offs_t offset, uint16_t data); TIMER_CALLBACK_MEMBER(set_lrq_timer_proc); void set_clock(int clock); diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp index 11b2bfcac01..d10be5f8c59 100644 --- a/src/mame/drivers/idsa.cpp +++ b/src/mame/drivers/idsa.cpp @@ -233,7 +233,7 @@ INPUT_PORTS_END // This came from pinmame, even though there's no spb640 chip READ8_MEMBER( idsa_state::portb0_r ) { - uint16_t data = m_speech->spb640_r(space, offset / 2); + uint16_t data = m_speech->spb640_r(offset / 2); return offset % 2 ? (uint8_t)(data >> 8) : (uint8_t)(data & 0xff); } diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 4b016b66190..d2db0f2b4b4 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -666,7 +666,7 @@ WRITE8_MEMBER(ace_state::ald_w) if (!BIT(data, 6)) { - m_sp0256->ald_w(space, 0, data & 0x3f); + m_sp0256->ald_w(data & 0x3f); } } diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index 1e6c0934694..54d30fdc4bc 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -181,7 +181,7 @@ WRITE_LINE_MEMBER(sauro_state::flip_screen_w) WRITE8_MEMBER(sauro_state::adpcm_w) { - m_sp0256->ald_w(space, 0, data); + m_sp0256->ald_w(data); } void sauro_state::sauro_map(address_map &map) -- cgit v1.2.3