From 92b6d20440435b8ff19c6c757a5d0b56ea89736e Mon Sep 17 00:00:00 2001 From: cam900 Date: Sat, 30 Mar 2019 08:43:35 +0900 Subject: gen_latch.cpp : Remove unnecessary arguments in handlers (#4623) * gen_latch.cpp : Remove unnecessary arguments in acknowledge related handlers * gen_latch.cpp : Remove unnecessary handlers in 16 bit read/write handlers * gen_latch.cpp : Remove unnecessary arguments in 8 bit handlers --- src/devices/machine/gen_latch.cpp | 26 ++++++++-------- src/devices/machine/gen_latch.h | 26 +++++++--------- src/mame/audio/aztarac.cpp | 4 +-- src/mame/audio/cage.cpp | 6 ++-- src/mame/audio/cchasm.cpp | 12 ++++---- src/mame/audio/efo_zsu.cpp | 2 +- src/mame/audio/hyprolyb.cpp | 4 +-- src/mame/audio/leland.cpp | 8 ++--- src/mame/audio/mario.cpp | 62 +++++++++++++++++++-------------------- src/mame/audio/nichisnd.cpp | 4 +-- src/mame/audio/rax.cpp | 8 ++--- src/mame/audio/redalert.cpp | 6 ++-- src/mame/audio/scramble.cpp | 2 +- src/mame/audio/starwars.cpp | 4 +-- src/mame/audio/timeplt.cpp | 2 +- src/mame/drivers/aerofgt.cpp | 2 +- src/mame/drivers/aliens.cpp | 2 +- src/mame/drivers/alpha68k.cpp | 2 +- src/mame/drivers/armedf.cpp | 4 +-- src/mame/drivers/atetris.cpp | 8 ++--- src/mame/drivers/bbusters.cpp | 2 +- src/mame/drivers/bingoc.cpp | 2 +- src/mame/drivers/bionicc.cpp | 2 +- src/mame/drivers/bking.cpp | 2 +- src/mame/drivers/bladestl.cpp | 2 +- src/mame/drivers/blueprnt.cpp | 2 +- src/mame/drivers/bombjack.cpp | 4 +-- src/mame/drivers/bwing.cpp | 2 +- src/mame/drivers/calorie.cpp | 4 +-- src/mame/drivers/capbowl.cpp | 2 +- src/mame/drivers/cave.cpp | 6 ++-- src/mame/drivers/cbuster.cpp | 2 +- src/mame/drivers/cclimber.cpp | 2 +- src/mame/drivers/chinagat.cpp | 2 +- src/mame/drivers/cntsteer.cpp | 2 +- src/mame/drivers/combatsc.cpp | 2 +- src/mame/drivers/cop01.cpp | 6 ++-- src/mame/drivers/corona.cpp | 4 +-- src/mame/drivers/cps1.cpp | 6 ++-- src/mame/drivers/crimfght.cpp | 2 +- src/mame/drivers/cvs.cpp | 4 +-- src/mame/drivers/cybertnk.cpp | 2 +- src/mame/drivers/cyclemb.cpp | 10 +++---- src/mame/drivers/dbz.cpp | 2 +- src/mame/drivers/ddayjlc.cpp | 2 +- src/mame/drivers/ddragon.cpp | 8 ++--- src/mame/drivers/ddragon3.cpp | 2 +- src/mame/drivers/dec0.cpp | 6 ++-- src/mame/drivers/dec8.cpp | 2 +- src/mame/drivers/deco_ld.cpp | 2 +- src/mame/drivers/diverboy.cpp | 2 +- src/mame/drivers/djboy.cpp | 6 ++-- src/mame/drivers/dmndrby.cpp | 2 +- src/mame/drivers/egghunt.cpp | 2 +- src/mame/drivers/equites.cpp | 2 +- src/mame/drivers/esd16.cpp | 4 +-- src/mame/drivers/espial.cpp | 2 +- src/mame/drivers/exterm.cpp | 4 +-- src/mame/drivers/fantland.cpp | 2 +- src/mame/drivers/fcrash.cpp | 4 +-- src/mame/drivers/flipjack.cpp | 2 +- src/mame/drivers/flkatck.cpp | 2 +- src/mame/drivers/flower.cpp | 2 +- src/mame/drivers/fromanc2.cpp | 4 +-- src/mame/drivers/fuukifg2.cpp | 2 +- src/mame/drivers/gaelco3d.cpp | 2 +- src/mame/drivers/galaxian.cpp | 6 ++-- src/mame/drivers/galivan.cpp | 4 +-- src/mame/drivers/galspnbl.cpp | 2 +- src/mame/drivers/gameplan.cpp | 3 +- src/mame/drivers/ghosteo.cpp | 2 +- src/mame/drivers/gladiatr.cpp | 8 ++--- src/mame/drivers/go2000.cpp | 2 +- src/mame/drivers/goal92.cpp | 2 +- src/mame/drivers/gsword.cpp | 2 +- src/mame/drivers/halleys.cpp | 2 +- src/mame/drivers/hh_hmcs40.cpp | 4 +-- src/mame/drivers/himesiki.cpp | 2 +- src/mame/drivers/homedata.cpp | 4 +-- src/mame/drivers/hvyunit.cpp | 4 +-- src/mame/drivers/ironhors.cpp | 2 +- src/mame/drivers/itech8.cpp | 2 +- src/mame/drivers/jangou.cpp | 4 +-- src/mame/drivers/kas89.cpp | 6 ++-- src/mame/drivers/kickgoal.cpp | 4 +-- src/mame/drivers/kingobox.cpp | 2 +- src/mame/drivers/kingpin.cpp | 2 +- src/mame/drivers/kncljoe.cpp | 2 +- src/mame/drivers/ksayakyu.cpp | 4 +-- src/mame/drivers/ladyfrog.cpp | 2 +- src/mame/drivers/lasso.cpp | 2 +- src/mame/drivers/limenko.cpp | 4 +-- src/mame/drivers/looping.cpp | 2 +- src/mame/drivers/lordgun.cpp | 4 +-- src/mame/drivers/lwings.cpp | 4 +-- src/mame/drivers/m63.cpp | 2 +- src/mame/drivers/macrossp.cpp | 4 +-- src/mame/drivers/magmax.cpp | 2 +- src/mame/drivers/matmania.cpp | 4 +-- src/mame/drivers/mazerbla.cpp | 4 +-- src/mame/drivers/megasys1.cpp | 2 +- src/mame/drivers/meijinsn.cpp | 2 +- src/mame/drivers/metro.cpp | 7 ++--- src/mame/drivers/mirax.cpp | 2 +- src/mame/drivers/mitchell.cpp | 2 +- src/mame/drivers/ms32.cpp | 4 +-- src/mame/drivers/msisaac.cpp | 2 +- src/mame/drivers/mugsmash.cpp | 2 +- src/mame/drivers/nbmj8991.cpp | 2 +- src/mame/drivers/nbmj9195.cpp | 2 +- src/mame/drivers/neogeo.cpp | 6 ++-- src/mame/drivers/neoprint.cpp | 4 +-- src/mame/drivers/nmg5.cpp | 2 +- src/mame/drivers/nyny.cpp | 6 ++-- src/mame/drivers/olibochu.cpp | 2 +- src/mame/drivers/omegrace.cpp | 2 +- src/mame/drivers/othello.cpp | 4 +-- src/mame/drivers/pbaction.cpp | 12 ++++---- src/mame/drivers/pcktgal.cpp | 2 +- src/mame/drivers/pgm.cpp | 4 +-- src/mame/drivers/pokechmp.cpp | 2 +- src/mame/drivers/polepos.cpp | 2 +- src/mame/drivers/prehisle.cpp | 2 +- src/mame/drivers/pturn.cpp | 3 +- src/mame/drivers/quasar.cpp | 6 ++-- src/mame/drivers/quizpun2.cpp | 2 +- src/mame/drivers/r2dtank.cpp | 8 ++--- src/mame/drivers/retofinv.cpp | 2 +- src/mame/drivers/rockrage.cpp | 2 +- src/mame/drivers/roul.cpp | 2 +- src/mame/drivers/royalmah.cpp | 2 +- src/mame/drivers/sandscrp.cpp | 4 +-- src/mame/drivers/sauro.cpp | 6 ++-- src/mame/drivers/scotrsht.cpp | 2 +- src/mame/drivers/scyclone.cpp | 8 ++--- src/mame/drivers/segahang.cpp | 2 +- src/mame/drivers/segas16a.cpp | 2 +- src/mame/drivers/segas16b.cpp | 2 +- src/mame/drivers/seta.cpp | 10 +++---- src/mame/drivers/sf.cpp | 2 +- src/mame/drivers/shootout.cpp | 8 ++--- src/mame/drivers/silvmil.cpp | 6 ++-- src/mame/drivers/skyfox.cpp | 2 +- src/mame/drivers/sliver.cpp | 2 +- src/mame/drivers/snk.cpp | 8 ++--- src/mame/drivers/snk68.cpp | 2 +- src/mame/drivers/solomon.cpp | 2 +- src/mame/drivers/speedspn.cpp | 2 +- src/mame/drivers/sslam.cpp | 10 +++---- src/mame/drivers/stuntair.cpp | 2 +- src/mame/drivers/suna16.cpp | 2 +- src/mame/drivers/suna8.cpp | 6 ++-- src/mame/drivers/supduck.cpp | 2 +- src/mame/drivers/suprridr.cpp | 2 +- src/mame/drivers/system1.cpp | 4 +-- src/mame/drivers/system16.cpp | 8 ++--- src/mame/drivers/tatsumi.cpp | 2 +- src/mame/drivers/tbowl.cpp | 2 +- src/mame/drivers/tehkanwc.cpp | 4 +-- src/mame/drivers/terracre.cpp | 4 +-- src/mame/drivers/tetrisp2.cpp | 2 +- src/mame/drivers/tigeroad.cpp | 4 +-- src/mame/drivers/toaplan2.cpp | 4 +-- src/mame/drivers/toki.cpp | 2 +- src/mame/drivers/tryout.cpp | 2 +- src/mame/drivers/tsamurai.cpp | 2 +- src/mame/drivers/tumbleb.cpp | 8 ++--- src/mame/drivers/vamphalf.cpp | 2 +- src/mame/drivers/vegaeo.cpp | 2 +- src/mame/drivers/wc90b.cpp | 2 +- src/mame/drivers/wyvernf0.cpp | 2 +- src/mame/drivers/yunsun16.cpp | 2 +- src/mame/drivers/zerozone.cpp | 2 +- src/mame/drivers/zodiack.cpp | 2 +- src/mame/includes/ddragon.h | 2 +- src/mame/includes/esd16.h | 2 +- src/mame/machine/ajax.cpp | 2 +- src/mame/machine/bublbobl.cpp | 2 +- src/mame/machine/decocass.cpp | 8 ++--- src/mame/machine/midyunit.cpp | 2 +- src/mame/machine/tnzs.cpp | 2 +- src/mame/video/cischeat.cpp | 2 +- src/mame/video/ginganin.cpp | 2 +- src/mame/video/liberate.cpp | 6 ++-- src/mame/video/megasys1.cpp | 6 ++-- 185 files changed, 365 insertions(+), 376 deletions(-) diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp index 7f1b382e0ab..b96d39a14be 100644 --- a/src/devices/machine/gen_latch.cpp +++ b/src/devices/machine/gen_latch.cpp @@ -2,7 +2,7 @@ // copyright-holders:Miodrag Milanovic /*************************************************************************** - Generic 8bit and 16 bit latch devices + Generic 8 bit and 16 bit latch devices ***************************************************************************/ @@ -89,14 +89,14 @@ void generic_latch_base_device::set_latch_written(bool latch_written) } } -READ8_MEMBER(generic_latch_base_device::acknowledge_r) +u8 generic_latch_base_device::acknowledge_r(address_space &space) { if (!machine().side_effects_disabled()) set_latch_written(false); return space.unmap(); } -WRITE8_MEMBER(generic_latch_base_device::acknowledge_w) +void generic_latch_base_device::acknowledge_w(u8 data) { set_latch_written(false); } @@ -111,24 +111,24 @@ generic_latch_8_device::generic_latch_8_device(const machine_config &mconfig, co { } -READ8_MEMBER( generic_latch_8_device::read ) +u8 generic_latch_8_device::read() { if (!has_separate_acknowledge() && !machine().side_effects_disabled()) set_latch_written(false); return m_latched_value; } -WRITE8_MEMBER( generic_latch_8_device::write ) +void generic_latch_8_device::write(u8 data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(generic_latch_8_device::sync_callback), this), data); } -WRITE8_MEMBER( generic_latch_8_device::preset_w ) +void generic_latch_8_device::preset_w(u8 data) { - m_latched_value = 0xff; + m_latched_value = data; } -WRITE8_MEMBER( generic_latch_8_device::clear_w ) +void generic_latch_8_device::clear_w(u8 data) { m_latched_value = 0x00; } @@ -182,24 +182,24 @@ generic_latch_16_device::generic_latch_16_device(const machine_config &mconfig, { } -READ16_MEMBER( generic_latch_16_device::read ) +u16 generic_latch_16_device::read() { if (!has_separate_acknowledge() && !machine().side_effects_disabled()) set_latch_written(false); return m_latched_value; } -WRITE16_MEMBER( generic_latch_16_device::write ) +void generic_latch_16_device::write(u16 data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(generic_latch_16_device::sync_callback), this), data); } -WRITE16_MEMBER( generic_latch_16_device::preset_w ) +void generic_latch_16_device::preset_w(u16 data) { - m_latched_value = 0xffff; + m_latched_value = data; } -WRITE16_MEMBER( generic_latch_16_device::clear_w ) +void generic_latch_16_device::clear_w(u16 data) { m_latched_value = 0x0000; } diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h index d98bf428646..4080cbebe8d 100644 --- a/src/devices/machine/gen_latch.h +++ b/src/devices/machine/gen_latch.h @@ -2,7 +2,7 @@ // copyright-holders:Miodrag Milanovic /*************************************************************************** - Generic 8bit and 16 bit latch devices + Generic 8 bit and 16 bit latch devices ***************************************************************************/ @@ -36,8 +36,8 @@ public: DECLARE_READ_LINE_MEMBER(pending_r); - DECLARE_READ8_MEMBER( acknowledge_r ); - DECLARE_WRITE8_MEMBER( acknowledge_w ); + u8 acknowledge_r(address_space &space); + void acknowledge_w(u8 data = 0); protected: // construction/destruction @@ -67,16 +67,14 @@ public: // construction/destruction generic_latch_8_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + u8 read(); + void write(u8 data); - DECLARE_WRITE8_MEMBER( preset_w ); - DECLARE_WRITE8_MEMBER( clear_w ); + void preset_w(u8 data = 0xff); + void clear_w(u8 data = 0); DECLARE_WRITE_LINE_MEMBER( preset ); DECLARE_WRITE_LINE_MEMBER( clear ); - void preset_w(u8 value) { m_latched_value = value; } - protected: virtual void device_start() override; @@ -95,16 +93,14 @@ public: // construction/destruction generic_latch_16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - DECLARE_READ16_MEMBER( read ); - DECLARE_WRITE16_MEMBER( write ); + u16 read(); + void write(u16 data); - DECLARE_WRITE16_MEMBER( preset_w ); - DECLARE_WRITE16_MEMBER( clear_w ); + void preset_w(u16 data = 0xffff); + void clear_w(u16 data = 0); DECLARE_WRITE_LINE_MEMBER( preset ); DECLARE_WRITE_LINE_MEMBER( clear ); - void preset_w(u16 value) { m_latched_value = value; } - protected: virtual void device_start() override; diff --git a/src/mame/audio/aztarac.cpp b/src/mame/audio/aztarac.cpp index 74a1b32bcdc..24d0a930fd3 100644 --- a/src/mame/audio/aztarac.cpp +++ b/src/mame/audio/aztarac.cpp @@ -21,7 +21,7 @@ WRITE16_MEMBER(aztarac_state::sound_w) if (ACCESSING_BITS_0_7) { data &= 0xff; - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_sound_status ^= 0x21; if (m_sound_status & 0x20) m_audiocpu->set_input_line(0, HOLD_LINE); @@ -32,7 +32,7 @@ READ8_MEMBER(aztarac_state::snd_command_r) { m_sound_status |= 0x01; m_sound_status &= ~0x20; - return m_soundlatch->read(space,offset); + return m_soundlatch->read(); } READ8_MEMBER(aztarac_state::snd_status_r) diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 71be3313f6a..9a3a3bec780 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -469,7 +469,7 @@ WRITE32_MEMBER( atari_cage_device::cage_to_main_w ) { if (LOG_COMM) logerror("%s Data from CAGE = %04X\n", machine().describe_context(), data); - m_soundlatch->write(space, 0, data, mem_mask); + m_soundlatch->write(data); m_cage_to_cpu_ready = 1; update_control_lines(); } @@ -489,10 +489,10 @@ READ32_MEMBER( atari_cage_device::cage_io_status_r ) uint16_t atari_cage_device::main_r() { if (LOG_COMM) - logerror("%s:main read data = %04X\n", machine().describe_context(), m_soundlatch->read(machine().dummy_space(), 0, 0)); + logerror("%s:main read data = %04X\n", machine().describe_context(), m_soundlatch->read()); m_cage_to_cpu_ready = 0; update_control_lines(); - return m_soundlatch->read(machine().dummy_space(), 0, 0xffff); + return m_soundlatch->read(); } diff --git a/src/mame/audio/cchasm.cpp b/src/mame/audio/cchasm.cpp index f72a19ac0e5..6ca1bbf1240 100644 --- a/src/mame/audio/cchasm.cpp +++ b/src/mame/audio/cchasm.cpp @@ -41,13 +41,13 @@ READ8_MEMBER(cchasm_state::soundlatch2_r) { m_sound_flags &= ~0x80; m_ctc->trg2(0); - return m_soundlatch2->read(space, offset); + return m_soundlatch2->read(); } WRITE8_MEMBER(cchasm_state::soundlatch4_w) { m_sound_flags |= 0x40; - m_soundlatch4->write(space, offset, data); + m_soundlatch4->write(data); m_maincpu->set_input_line(1, HOLD_LINE); } @@ -61,11 +61,11 @@ WRITE16_MEMBER(cchasm_state::io_w) switch (offset & 0xf) { case 0: - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); break; case 1: m_sound_flags |= 0x80; - m_soundlatch2->write(space, offset, data); + m_soundlatch2->write(data); m_ctc->trg2(1); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); break; @@ -81,10 +81,10 @@ READ16_MEMBER(cchasm_state::io_r) switch (offset & 0xf) { case 0x0: - return m_soundlatch3->read(space, offset) << 8; + return m_soundlatch3->read() << 8; case 0x1: m_sound_flags &= ~0x40; - return m_soundlatch4->read(space,offset) << 8; + return m_soundlatch4->read() << 8; case 0x2: return (m_sound_flags| (ioport("IN3")->read() & 0x07) | 0x08) << 8; case 0x5: diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index 785cb67a3a2..4c731aad393 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -78,7 +78,7 @@ cedar_magnet_sound_device::cedar_magnet_sound_device(const machine_config &mconf WRITE8_MEMBER(efo_zsu_device::sound_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); } diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index e4a3c024219..6f52a35727b 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -43,7 +43,7 @@ void hyprolyb_adpcm_device::device_reset() WRITE8_MEMBER( hyprolyb_adpcm_device::write ) { - m_soundlatch2->write(m_audiocpu->space(AS_PROGRAM), offset, data); + m_soundlatch2->write(data); m_adpcm_ready = 0x80; } @@ -73,7 +73,7 @@ READ8_MEMBER( hyprolyb_adpcm_device::ready_r ) READ8_MEMBER( hyprolyb_adpcm_device::data_r ) { m_adpcm_ready = 0x00; - return m_soundlatch2->read(m_audiocpu->space(AS_PROGRAM), offset); + return m_soundlatch2->read(); } void hyprolyb_adpcm_device::vck_callback( int st ) diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 3d44fd2a539..c27e2871bdf 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -550,7 +550,7 @@ WRITE8_MEMBER( leland_80186_sound_device::leland_80186_command_lo_w ) { if (LOG_COMM) logerror("%s:Write sound command latch lo = %02X\n", machine().describe_context(), data); m_sound_command = (m_sound_command & 0xff00) | data; - m_soundlatch->write(space, offset, m_sound_command); + m_soundlatch->write(m_sound_command); } @@ -558,7 +558,7 @@ WRITE8_MEMBER( leland_80186_sound_device::leland_80186_command_hi_w ) { if (LOG_COMM) logerror("%s:Write sound command latch hi = %02X\n", machine().describe_context(), data); m_sound_command = (m_sound_command & 0x00ff) | (data << 8); - m_soundlatch->write(space, offset, m_sound_command); + m_soundlatch->write(m_sound_command); } @@ -730,8 +730,8 @@ READ16_MEMBER( leland_80186_sound_device::peripheral_r ) return ((m_clock_active << 1) & 0x7e); case 1: - if (LOG_COMM) logerror("%s:Read sound command latch = %02X\n", machine().describe_context(), m_soundlatch->read(space, offset)); - return m_soundlatch->read(space, offset); + if (LOG_COMM) logerror("%s:Read sound command latch = %02X\n", machine().describe_context(), m_soundlatch->read()); + return m_soundlatch->read(); case 2: if (ACCESSING_BITS_0_7) diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index f9b912e8305..94fa3f3da1e 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -25,21 +25,21 @@ #define ACTIVELOW_PORT_BIT(P,A,D) ((P & (~(1 << A))) | ((D ^ 1) << A)) #define ACTIVEHIGH_PORT_BIT(P,A,D) ((P & (~(1 << A))) | (D << A)) -#define I8035_T_R(M,N) ((m_soundlatch2->read(M,0) >> (N)) & 1) -#define I8035_T_W_AH(M,N,D) do { m_portT = ACTIVEHIGH_PORT_BIT(m_portT,N,D); m_soundlatch2->write(M, 0, m_portT); } while (0) +#define I8035_T_R(N) ((m_soundlatch2->read() >> (N)) & 1) +#define I8035_T_W_AH(N,D) do { m_portT = ACTIVEHIGH_PORT_BIT(m_portT,N,D); m_soundlatch2->write(m_portT); } while (0) -#define I8035_P1_R(M) (m_soundlatch3->read(M,0)) -#define I8035_P2_R(M) (m_soundlatch4->read(M,0)) -#define I8035_P1_W(M,D) m_soundlatch3->write(M,0,D) +#define I8035_P1_R() (m_soundlatch3->read()) +#define I8035_P2_R() (m_soundlatch4->read()) +#define I8035_P1_W(D) m_soundlatch3->write(D) #if (USE_8039) -#define I8035_P2_W(M,D) do { m_soundlatch4->write(M,0,D); } while (0) +#define I8035_P2_W(D) do { m_soundlatch4->write(D); } while (0) #else -#define I8035_P2_W(M,D) do { set_ea(((D) & 0x20) ? 0 : 1); m_soundlatch4->write(M,0,D); } while (0) +#define I8035_P2_W(D) do { set_ea(((D) & 0x20) ? 0 : 1); m_soundlatch4->write(D); } while (0) #endif -#define I8035_P1_W_AH(M,B,D) I8035_P1_W(M,ACTIVEHIGH_PORT_BIT(I8035_P1_R(M),B,(D))) -#define I8035_P2_W_AH(M,B,D) I8035_P2_W(M,ACTIVEHIGH_PORT_BIT(I8035_P2_R(M),B,(D))) +#define I8035_P1_W_AH(B,D) I8035_P1_W(ACTIVEHIGH_PORT_BIT(I8035_P1_R(),B,(D))) +#define I8035_P2_W_AH(B,D) I8035_P2_W(ACTIVEHIGH_PORT_BIT(I8035_P2_R(),B,(D))) #if OLD_SOUND @@ -446,19 +446,17 @@ void mario_state::sound_start() void mario_state::sound_reset() { - address_space &space = m_audiocpu->space(AS_PROGRAM); - #if USE_8039 set_ea(1); #endif /* FIXME: convert to latch8 */ - m_soundlatch->clear_w(space, 0, 0); - if (m_soundlatch2) m_soundlatch2->clear_w(space, 0, 0); - if (m_soundlatch3) m_soundlatch3->clear_w(space, 0, 0); - if (m_soundlatch4) m_soundlatch4->clear_w(space, 0, 0); - if (m_soundlatch3) I8035_P1_W(space, 0x00); /* Input port */ - if (m_soundlatch4) I8035_P2_W(space, 0xff); /* Port is in high impedance state after reset */ + m_soundlatch->clear_w(); + if (m_soundlatch2) m_soundlatch2->clear_w(); + if (m_soundlatch3) m_soundlatch3->clear_w(); + if (m_soundlatch4) m_soundlatch4->clear_w(); + if (m_soundlatch3) I8035_P1_W(0x00); /* Input port */ + if (m_soundlatch4) I8035_P2_W(0xff); /* Port is in high impedance state after reset */ m_last = 0; } @@ -471,32 +469,32 @@ void mario_state::sound_reset() READ8_MEMBER(mario_state::mario_sh_p1_r) { - return I8035_P1_R(space); + return I8035_P1_R(); } READ8_MEMBER(mario_state::mario_sh_p2_r) { - return I8035_P2_R(space) & 0xEF; /* Bit 4 connected to GND! */ + return I8035_P2_R() & 0xEF; /* Bit 4 connected to GND! */ } READ_LINE_MEMBER(mario_state::mario_sh_t0_r) { - return I8035_T_R(machine().dummy_space(), 0); + return I8035_T_R(0); } READ_LINE_MEMBER(mario_state::mario_sh_t1_r) { - return I8035_T_R(machine().dummy_space(), 1); + return I8035_T_R(1); } READ8_MEMBER(mario_state::mario_sh_tune_r) { uint8_t *SND = memregion("audiocpu")->base(); uint16_t mask = memregion("audiocpu")->bytes()-1; - uint8_t p2 = I8035_P2_R(space); + uint8_t p2 = I8035_P2_R(); if ((p2 >> 7) & 1) - return m_soundlatch->read(space, offset); + return m_soundlatch->read(); else return (SND[(0x1000 + (p2 & 0x0f) * 256 + offset) & mask]); } @@ -512,12 +510,12 @@ WRITE8_MEMBER(mario_state::mario_sh_sound_w) WRITE8_MEMBER(mario_state::mario_sh_p1_w) { - I8035_P1_W(space, data); + I8035_P1_W(data); } WRITE8_MEMBER(mario_state::mario_sh_p2_w) { - I8035_P2_W(space, data); + I8035_P2_W(data); } /**************************************************************** @@ -539,7 +537,7 @@ WRITE8_MEMBER(mario_state::masao_sh_irqtrigger_w) WRITE8_MEMBER(mario_state::mario_sh_tuneselect_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); } /* Sound 0 and 1 are pulsed !*/ @@ -576,22 +574,22 @@ WRITE8_MEMBER(mario_state::mario_sh3_w) m_audiocpu->set_input_line(0,CLEAR_LINE); break; case 1: /* get coin */ - I8035_T_W_AH(space, 0,data & 1); + I8035_T_W_AH(0,data & 1); break; case 2: /* ice */ - I8035_T_W_AH(space, 1, data & 1); + I8035_T_W_AH(1, data & 1); break; case 3: /* crab */ - I8035_P1_W_AH(space, 0, data & 1); + I8035_P1_W_AH(0, data & 1); break; case 4: /* turtle */ - I8035_P1_W_AH(space, 1, data & 1); + I8035_P1_W_AH(1, data & 1); break; case 5: /* fly */ - I8035_P1_W_AH(space, 2, data & 1); + I8035_P1_W_AH(2, data & 1); break; case 6: /* coin */ - I8035_P1_W_AH(space, 3, data & 1); + I8035_P1_W_AH(3, data & 1); break; case 7: /* skid */ #if OLD_SOUND diff --git a/src/mame/audio/nichisnd.cpp b/src/mame/audio/nichisnd.cpp index f6dd3030111..5df8f043dca 100644 --- a/src/mame/audio/nichisnd.cpp +++ b/src/mame/audio/nichisnd.cpp @@ -61,7 +61,7 @@ WRITE8_MEMBER(nichisnd_device::soundbank_w) WRITE8_MEMBER(nichisnd_device::soundlatch_clear_w) { - if (!(data & 0x01)) m_soundlatch->clear_w(space, 0, 0); + if (!(data & 0x01)) m_soundlatch->clear_w(); } @@ -139,5 +139,5 @@ void nichisnd_device::device_reset() // use this to connect to the sound board WRITE8_MEMBER(nichisnd_device::sound_host_command_w) { - m_soundlatch->write(space,0,data); + m_soundlatch->write(data); } diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index d294628464d..ee023e613a6 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -56,7 +56,7 @@ enum WRITE16_MEMBER( acclaim_rax_device::data_w ) { - m_data_in->write(space, 0, data, 0xffff); + m_data_in->write(data); m_cpu->set_input_line(ADSP2181_IRQL0, ASSERT_LINE); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(5)); } @@ -65,7 +65,7 @@ WRITE16_MEMBER( acclaim_rax_device::data_w ) READ16_MEMBER( acclaim_rax_device::data_r ) { m_adsp_snd_pf0 = 1; - return m_data_out->read(space, 0); + return m_data_out->read(); } @@ -256,12 +256,12 @@ WRITE16_MEMBER( acclaim_rax_device::rom_bank_w ) READ16_MEMBER( acclaim_rax_device::host_r ) { m_cpu->set_input_line(ADSP2181_IRQL0, CLEAR_LINE); - return m_data_in->read(space, 0); + return m_data_in->read(); } WRITE16_MEMBER( acclaim_rax_device::host_w ) { - m_data_out->write(space, 0, data, 0xffff); + m_data_out->write(data); m_adsp_snd_pf0 = 0; } diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index a962dffd207..c6d93755eb8 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -66,7 +66,7 @@ WRITE8_MEMBER(redalert_state::redalert_analog_w) WRITE8_MEMBER(redalert_state::redalert_audio_command_w) { /* the byte is connected to port A of the AY8910 */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); /* D7 is also connected to the NMI input of the CPU - the NMI is actually toggled by a 74121 (R1=27K, C10=330p) */ @@ -142,7 +142,7 @@ void redalert_state::sound_start() WRITE8_MEMBER(redalert_state::redalert_voice_command_w) { - m_soundlatch2->write(space, 0, (data & 0x78) >> 3); + m_soundlatch2->write((data & 0x78) >> 3); m_voicecpu->set_input_line(I8085_RST75_LINE, (~data & 0x80) ? ASSERT_LINE : CLEAR_LINE); } @@ -246,7 +246,7 @@ void redalert_state::ww3_audio(machine_config &config) WRITE8_MEMBER(redalert_state::demoneye_audio_command_w) { /* the byte is connected to port A of the AY8910 */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 075d0fd235a..710568d899b 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -122,7 +122,7 @@ WRITE8_MEMBER(scramble_state::hotshock_sh_irqtrigger_w) READ8_MEMBER( scramble_state::hotshock_soundlatch_r ) { m_audiocpu->set_input_line(0, CLEAR_LINE); - return m_soundlatch->read(m_audiocpu->space(AS_PROGRAM),0); + return m_soundlatch->read(); } void scramble_state::sh_init() diff --git a/src/mame/audio/starwars.cpp b/src/mame/audio/starwars.cpp index 8d962273545..2f9074f2f56 100644 --- a/src/mame/audio/starwars.cpp +++ b/src/mame/audio/starwars.cpp @@ -68,8 +68,8 @@ READ8_MEMBER(starwars_state::starwars_main_ready_flag_r) WRITE8_MEMBER(starwars_state::starwars_soundrst_w) { - m_soundlatch->acknowledge_w(space, 0, 0); - m_mainlatch->acknowledge_w(space, 0, 0); + m_soundlatch->acknowledge_w(); + m_mainlatch->acknowledge_w(); /* reset sound CPU here */ m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index c276cd3fcfe..78e41db51d2 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -128,7 +128,7 @@ WRITE8_MEMBER( timeplt_audio_device::filter_w ) WRITE8_MEMBER(timeplt_audio_device::sound_data_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); } diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 0639b91322b..fdf4c27c720 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -76,7 +76,7 @@ Verification still needed for the other PCBs. WRITE8_MEMBER(aerofgt_state::karatblzbl_soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index f99907d2e3a..e57b00000bd 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -44,7 +44,7 @@ WRITE8_MEMBER(aliens_state::aliens_coin_counter_w) WRITE8_MEMBER(aliens_state::aliens_sh_irqtrigger_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 2f33da06c14..91cf03e1d66 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -291,7 +291,7 @@ WRITE8_MEMBER(alpha68k_state::outlatch_w) //AT WRITE8_MEMBER(alpha68k_state::tnextspc_soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } //ZT diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 240f6224d7b..7c030762afa 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -391,12 +391,12 @@ WRITE16_MEMBER(armedf_state::bootleg_io_w) WRITE16_MEMBER(armedf_state::sound_command_w) { if (ACCESSING_BITS_0_7) - m_soundlatch->write(space, 0, ((data & 0x7f) << 1) | 1); + m_soundlatch->write(((data & 0x7f) << 1) | 1); } READ8_MEMBER(armedf_state::soundlatch_clear_r) { - m_soundlatch->clear_w(space, 0, 0); + m_soundlatch->clear_w(); return 0; } diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 1b9d58ee07d..82b98b17fea 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -242,10 +242,10 @@ READ8_MEMBER(atetris_mcu_state::mcu_bus_r) switch (m_mcu->p2_r() & 0xf0) { case 0x40: - return m_soundlatch[1]->read(space, 0); + return m_soundlatch[1]->read(); case 0xf0: - return m_soundlatch[0]->read(space, 0); + return m_soundlatch[0]->read(); default: return 0xff; @@ -261,8 +261,8 @@ WRITE8_MEMBER(atetris_mcu_state::mcu_p2_w) WRITE8_MEMBER(atetris_mcu_state::mcu_reg_w) { // FIXME: a lot of sound writes seem to get lost this way; why doesn't that hurt? - m_soundlatch[0]->write(space, 0, offset | 0x20); - m_soundlatch[1]->write(space, 0, data); + m_soundlatch[0]->write(offset | 0x20); + m_soundlatch[1]->write(data); } diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index 701d7eadabe..26b9f3ba59c 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -244,7 +244,7 @@ void bbusters_state::machine_start() WRITE8_MEMBER(bbusters_state_base::sound_cpu_w) { - m_soundlatch[0]->write(space, 0, data&0xff); + m_soundlatch[0]->write(data&0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp index 65861f43ff7..1b16e332a72 100644 --- a/src/mame/drivers/bingoc.cpp +++ b/src/mame/drivers/bingoc.cpp @@ -109,7 +109,7 @@ READ8_MEMBER(bingoc_state::sound_test_r) #else WRITE16_MEMBER(bingoc_state::main_sound_latch_w) { - m_soundlatch->write(space,0,data&0xff); + m_soundlatch->write(data&0xff); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } #endif diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index 5a69d4abef7..635b9ef7c6f 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -108,7 +108,7 @@ WRITE8_MEMBER(bionicc_state::mcu_shared_w) WRITE8_MEMBER(bionicc_state::out1_w) { - m_soundlatch->write(space,0,data); + m_soundlatch->write(data); } WRITE8_MEMBER(bionicc_state::out3_w) diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp index 930b4417530..7243c7be871 100644 --- a/src/mame/drivers/bking.cpp +++ b/src/mame/drivers/bking.cpp @@ -42,7 +42,7 @@ WRITE8_MEMBER(bking_state::bking_sndnmi_enable_w) WRITE8_MEMBER(bking_state::bking_soundlatch_w) { - m_soundlatch->write(space, offset, bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7)); + m_soundlatch->write(bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7)); } WRITE8_MEMBER(bking_state::bking3_addr_l_w) diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index 13d982f6de9..1897ab49c91 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -300,7 +300,7 @@ void bladestl_state::machine_reset() for (i = 0; i < 4 ; i++) m_last_track[i] = 0; - m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); + m_soundlatch->acknowledge_w(); } void bladestl_state::bladestl(machine_config &config) diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index 604c520cad2..b99d4516e5b 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -85,7 +85,7 @@ READ8_MEMBER(blueprnt_state::grasspin_sh_dipsw_r) WRITE8_MEMBER(blueprnt_state::blueprnt_sound_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp index f9874712a8b..c884dc89d10 100644 --- a/src/mame/drivers/bombjack.cpp +++ b/src/mame/drivers/bombjack.cpp @@ -110,9 +110,9 @@ READ8_MEMBER(bombjack_state::soundlatch_read_and_clear) { // An extra flip-flop is used to clear the LS273 after reading it through a LS245 // (this flip-flop is then cleared in sync with the sound CPU clock) - uint8_t res = m_soundlatch->read(space, 0); + uint8_t res = m_soundlatch->read(); if (!machine().side_effects_disabled()) - m_soundlatch->clear_w(space, 0, 0); + m_soundlatch->clear_w(); return res; } diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp index 48f7c73023c..b7c493e2dc9 100644 --- a/src/mame/drivers/bwing.cpp +++ b/src/mame/drivers/bwing.cpp @@ -89,7 +89,7 @@ WRITE8_MEMBER(bwing_state::bwp1_ctrl_w) m_subcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); // SNMI else { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(DECO16_IRQ_LINE, HOLD_LINE); // SNDREQ } break; diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp index 5d3236a7d39..ad1109fffdf 100644 --- a/src/mame/drivers/calorie.cpp +++ b/src/mame/drivers/calorie.cpp @@ -250,8 +250,8 @@ WRITE8_MEMBER(calorie_state::calorie_flipscreen_w) READ8_MEMBER(calorie_state::calorie_soundlatch_r) { - uint8_t latch = m_soundlatch->read(space, 0); - m_soundlatch->clear_w(space, 0, 0); + uint8_t latch = m_soundlatch->read(); + m_soundlatch->clear_w(); return latch; } diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp index 4475eb512b2..40c47292461 100644 --- a/src/mame/drivers/capbowl.cpp +++ b/src/mame/drivers/capbowl.cpp @@ -198,7 +198,7 @@ WRITE8_MEMBER(capbowl_state::track_reset_w) WRITE8_MEMBER(capbowl_state::sndcmd_w) { m_audiocpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); } diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 54047855bc0..9b1dde95e6e 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -242,7 +242,7 @@ WRITE16_MEMBER(cave_state::sound_cmd_w) { // m_sound_flag[0] = 1; // m_sound_flag[1] = 1; - m_soundlatch->write(space, offset, data, mem_mask); + m_soundlatch->write(data); m_maincpu->spin_until_time(attotime::from_usec(50)); // Allow the other cpu to reply } @@ -250,14 +250,14 @@ WRITE16_MEMBER(cave_state::sound_cmd_w) READ8_MEMBER(cave_state::soundlatch_lo_r) { // m_sound_flag[0] = 0; - return m_soundlatch->read(space, offset, 0x00ff) & 0xff; + return m_soundlatch->read() & 0xff; } /* Sound CPU: read the high 8 bits of the 16 bit sound latch */ READ8_MEMBER(cave_state::soundlatch_hi_r) { // m_sound_flag[1] = 0; - return m_soundlatch->read(space, offset, 0xff00) >> 8; + return m_soundlatch->read() >> 8; } /* Main CPU: read the latch written by the sound CPU (acknowledge) */ diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp index 6bfd645ed19..ee619cd198e 100644 --- a/src/mame/drivers/cbuster.cpp +++ b/src/mame/drivers/cbuster.cpp @@ -64,7 +64,7 @@ WRITE16_MEMBER(cbuster_state::twocrude_control_w) return; case 2: /* Sound CPU write */ - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); return; case 4: /* Protection, maybe this is a PAL on the board? diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 1025f696fa0..803c089a1ba 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -255,7 +255,7 @@ void cclimber_state::machine_start() WRITE8_MEMBER(cclimber_state::swimmer_sh_soundlatch_w) { - m_soundlatch->write(space,offset,data); + m_soundlatch->write(data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index a01a688822c..38d578349f8 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -186,7 +186,7 @@ WRITE8_MEMBER(chinagat_state::interrupt_w) switch (offset) { case 0: /* 3e00 - SND irq */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); break; case 1: /* 3e01 - NMI ack */ diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index 8c51d520398..d22c8ac16ef 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -512,7 +512,7 @@ WRITE8_MEMBER(cntsteer_state::gekitsui_sub_irq_ack) WRITE8_MEMBER(cntsteer_state::cntsteer_sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index c0381746fb0..c1ae7af450b 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -202,7 +202,7 @@ WRITE8_MEMBER(combatsc_state::combatscb_io_w) switch (offset) { case 0x400: combatscb_priority_w(space, 0, data); break; - case 0x800: m_soundlatch->write(space, offset, data); break; + case 0x800: m_soundlatch->write(data); break; case 0xc00: combatsc_vreg_w(space, 0, data); break; default: m_io_ram[offset] = data; break; } diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp index 605268c84f0..06a8329f43a 100644 --- a/src/mame/drivers/cop01.cpp +++ b/src/mame/drivers/cop01.cpp @@ -79,13 +79,13 @@ Mighty Guy board layout: WRITE8_MEMBER(cop01_state::cop01_sound_command_w) { - m_soundlatch->write(space, offset, data); - m_audiocpu->set_input_line(0, ASSERT_LINE ); + m_soundlatch->write(data); + m_audiocpu->set_input_line(0, ASSERT_LINE); } READ8_MEMBER(cop01_state::cop01_sound_command_r) { - int res = (m_soundlatch->read(space, offset) & 0x7f) << 1; + int res = (m_soundlatch->read() & 0x7f) << 1; /* bit 0 seems to be a timer */ if ((m_audiocpu->total_cycles() / TIMER_RATE) & 1) diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp index 21453d8c290..6cec44a583e 100644 --- a/src/mame/drivers/corona.cpp +++ b/src/mame/drivers/corona.cpp @@ -526,14 +526,14 @@ uint32_t corona_state::screen_update_luckyrlt(screen_device &screen, bitmap_ind1 WRITE8_MEMBER(corona_state::sound_latch_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_soundcpu->set_input_line(0, ASSERT_LINE); } READ8_MEMBER(corona_state::sound_latch_r) { m_soundcpu->set_input_line(0, CLEAR_LINE); - return m_soundlatch->read(space, 0); + return m_soundlatch->read(); } diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 0d0394a4e40..331e605040c 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -299,15 +299,15 @@ WRITE8_MEMBER(cps_state::cps1_oki_pin7_w) WRITE16_MEMBER(cps_state::cps1_soundlatch_w) { if (ACCESSING_BITS_0_7) - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); else - m_soundlatch->write(space, 0, data >> 8); + m_soundlatch->write(data >> 8); } WRITE16_MEMBER(cps_state::cps1_soundlatch2_w) { if (ACCESSING_BITS_0_7) - m_soundlatch2->write(space, 0, data & 0xff); + m_soundlatch2->write(data & 0xff); } WRITE16_MEMBER(cps_state::cps1_coinctrl_w) diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index 861696da537..b56c39cac2f 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -57,7 +57,7 @@ WRITE8_MEMBER(crimfght_state::k052109_051960_w) WRITE8_MEMBER(crimfght_state::sound_w) { // writing the latch asserts the irq line - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index 66c87ae485f..f5b527639a0 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -376,7 +376,7 @@ READ8_MEMBER(cvs_state::cvs_speech_command_r) { /* FIXME: this was by observation on board ??? * -bit 7 is TMS status (active LO) */ - return ((m_tms5110->ctl_r(space, 0) ^ 1) << 7) | (m_soundlatch->read(space, 0) & 0x7f); + return ((m_tms5110->ctl_r(space, 0) ^ 1) << 7) | (m_soundlatch->read() & 0x7f); } @@ -432,7 +432,7 @@ WRITE8_MEMBER(cvs_state::audio_command_w) { LOG(("data %02x\n", data)); /* cause interrupt on audio CPU if bit 7 set */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); cvs_slave_cpu_interrupt(data & 0x80 ? 1 : 0); } diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp index c44fa12bf29..fa85d13f0d3 100644 --- a/src/mame/drivers/cybertnk.cpp +++ b/src/mame/drivers/cybertnk.cpp @@ -513,7 +513,7 @@ WRITE8_MEMBER( cybertnk_state::sound_cmd_w ) } else if (offset == 1) { - m_soundlatch->write(space, offset, data & 0xff); + m_soundlatch->write(data & 0xff); } } diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp index d60a7f808e8..7c5e4a10c77 100644 --- a/src/mame/drivers/cyclemb.cpp +++ b/src/mame/drivers/cyclemb.cpp @@ -404,7 +404,7 @@ WRITE8_MEMBER(cyclemb_state::cyclemb_bankswitch_w) #if 0 WRITE8_MEMBER(cyclemb_state::sound_cmd_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } #endif @@ -418,7 +418,7 @@ READ8_MEMBER(cyclemb_state::mcu_status_r) WRITE8_MEMBER(cyclemb_state::sound_cmd_w)//actually ciom { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } #endif @@ -561,7 +561,7 @@ WRITE8_MEMBER( cyclemb_state::skydest_i8741_0_w ) m_mcu[0].txd = data; m_mcu[1].rst = 0; - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); if(m_mcu[0].txd == 0x41) m_mcu[0].state = 1; @@ -627,7 +627,7 @@ READ8_MEMBER(cyclemb_state::skydest_i8741_1_r) if(m_mcu[1].rst == 1) return 0x40; - return m_soundlatch->read(space,0); + return m_soundlatch->read(); } WRITE8_MEMBER(cyclemb_state::skydest_i8741_1_w) @@ -639,7 +639,7 @@ WRITE8_MEMBER(cyclemb_state::skydest_i8741_1_w) m_mcu[1].rst = 1; } //else - // m_soundlatch->clear_w(space, 0, 0); + // m_soundlatch->clear_w(); } diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index 2555c1aa644..aba4c725577 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -97,7 +97,7 @@ WRITE16_MEMBER(dbz_state::dbzcontrol_w) WRITE16_MEMBER(dbz_state::dbz_sound_command_w) { - m_soundlatch->write(space, 0, data >> 8); + m_soundlatch->write(data >> 8); } WRITE16_MEMBER(dbz_state::dbz_sound_cause_nmi) diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index 9681a93f218..95662ced4bb 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -349,7 +349,7 @@ WRITE8_MEMBER(ddayjlc_state::bg2_w) WRITE8_MEMBER(ddayjlc_state::sound_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index 19efd23349f..ce4f861d11c 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -260,7 +260,7 @@ WRITE8_MEMBER(darktowr_state::darktowr_bankswitch_w) * *************************************/ -void ddragon_state::ddragon_interrupt_ack(address_space &space, offs_t offset, uint8_t data) +void ddragon_state::ddragon_interrupt_ack(offs_t offset, uint8_t data) { switch (offset) { @@ -277,7 +277,7 @@ void ddragon_state::ddragon_interrupt_ack(address_space &space, offs_t offset, u break; case 3: /* 380e - SND IRQ and latch */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); break; case 4: /* 380f - MCU IRQ */ @@ -290,14 +290,14 @@ void ddragon_state::ddragon_interrupt_ack(address_space &space, offs_t offset, u READ8_MEMBER(ddragon_state::ddragon_interrupt_r) { - ddragon_interrupt_ack(space, offset, 0xff); + ddragon_interrupt_ack(offset, 0xff); return 0xff; } WRITE8_MEMBER(ddragon_state::ddragon_interrupt_w) { - ddragon_interrupt_ack(space, offset, data); + ddragon_interrupt_ack(offset, data); } diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 840baf29b3a..746b587b3a3 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -206,7 +206,7 @@ WRITE8_MEMBER(ddragon3_state::oki_bankswitch_w) WRITE16_MEMBER(wwfwfest_state::wwfwfest_soundwrite) { // upper byte is always set to 0x31 for some reason - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); } diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index e6030feec9a..5cd6700491b 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -363,7 +363,7 @@ WRITE16_MEMBER(dec0_state::dec0_control_w) case 4: /* 6502 sound cpu */ if (ACCESSING_BITS_0_7) - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); break; case 6: /* Intel 8751 microcontroller - Bad Dudes, Heavy Barrel, Birdy Try only */ @@ -398,7 +398,7 @@ WRITE16_MEMBER(dec0_automat_state::automat_control_w) { case 0xe: /* z80 sound cpu */ if (ACCESSING_BITS_0_7) - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); break; case 12: /* DMA flag */ @@ -425,7 +425,7 @@ WRITE16_MEMBER(dec0_automat_state::automat_control_w) WRITE16_MEMBER(dec0_state::midres_sound_w) { if (ACCESSING_BITS_0_7) - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); } /******************************************************************************/ diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index c753f285d4e..1b1a1c7ddc1 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -361,7 +361,7 @@ WRITE8_MEMBER(dec8_state::csilver_control_w) WRITE8_MEMBER(dec8_state::dec8_sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(m6502_device::NMI_LINE, ASSERT_LINE); m_m6502_timer->adjust(m_audiocpu->cycles_to_attotime(3)); } diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp index 8caa719787b..c4fe0e9a003 100644 --- a/src/mame/drivers/deco_ld.cpp +++ b/src/mame/drivers/deco_ld.cpp @@ -255,7 +255,7 @@ uint32_t deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_ind WRITE8_MEMBER(deco_ld_state::decold_sound_cmd_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp index 63f3eafefec..304cacca37e 100644 --- a/src/mame/drivers/diverboy.cpp +++ b/src/mame/drivers/diverboy.cpp @@ -151,7 +151,7 @@ WRITE16_MEMBER(diverboy_state::soundcmd_w) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } } diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index 23b4ea2caf6..c6e8dcdcea1 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -273,11 +273,11 @@ WRITE8_MEMBER(djboy_state::beast_p0_w) { if (!BIT(m_beast_p0, 1) && BIT(data, 1)) { - m_slavelatch->write(space, 0, m_beast_p1); + m_slavelatch->write(m_beast_p1); } if (BIT(data, 0) == 0) - m_beastlatch->acknowledge_w(space, 0, data); + m_beastlatch->acknowledge_w(); m_beast_p0 = data; } @@ -285,7 +285,7 @@ WRITE8_MEMBER(djboy_state::beast_p0_w) READ8_MEMBER(djboy_state::beast_p1_r) { if (BIT(m_beast_p0, 0) == 0) - return m_beastlatch->read(space, 0); + return m_beastlatch->read(); else return 0; // ? } diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp index 0de837b2e2d..25b833b0540 100644 --- a/src/mame/drivers/dmndrby.cpp +++ b/src/mame/drivers/dmndrby.cpp @@ -115,7 +115,7 @@ private: WRITE8_MEMBER(dmndrby_state::dderby_sound_w) { - m_soundlatch->write(space,0,data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp index 29d48c6fe2e..b01bd8a025a 100644 --- a/src/mame/drivers/egghunt.cpp +++ b/src/mame/drivers/egghunt.cpp @@ -227,7 +227,7 @@ WRITE8_MEMBER(egghunt_state::egghunt_vidram_bank_w) WRITE8_MEMBER(egghunt_state::egghunt_soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index ebec71eb31d..b3b34eecd71 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -444,7 +444,7 @@ WRITE8_MEMBER(equites_state::equites_c0f8_w) case 7: // c0ff: sound command latch clear // Note: solder pad CP1 on the pcb would allow to disable this - m_soundlatch->clear_w(space, 0, 0); + m_soundlatch->clear_w(); break; } } diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp index ec6ec003c0e..094df3194e7 100644 --- a/src/mame/drivers/esd16.cpp +++ b/src/mame/drivers/esd16.cpp @@ -85,9 +85,9 @@ ToDo: ***************************************************************************/ -WRITE8_MEMBER(esd16_state::sound_command_w) +void esd16_state::sound_command_w(u8 data) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_maincpu->spin_until_time(attotime::from_usec(50)); // Allow the other CPU to reply } diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp index a222b72a6d6..74d539b2225 100644 --- a/src/mame/drivers/espial.cpp +++ b/src/mame/drivers/espial.cpp @@ -96,7 +96,7 @@ INTERRUPT_GEN_MEMBER(espial_state::espial_sound_nmi_gen) WRITE8_MEMBER(espial_state::espial_master_soundlatch_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index fdc3b8337dc..08498e86355 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -174,8 +174,8 @@ WRITE16_MEMBER(exterm_state::output_port_0_w) WRITE8_MEMBER(exterm_state::sound_latch_w) { // data is latched independently for both sound CPUs - m_soundlatch[0]->write(space, 0, data); - m_soundlatch[1]->write(space, 0, data); + m_soundlatch[0]->write(data); + m_soundlatch[1]->write(data); } diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 4299704624b..1f1acef77df 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -74,7 +74,7 @@ WRITE8_MEMBER(fantland_state::nmi_enable_w) WRITE8_MEMBER(fantland_state::soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index 0bc74f47002..e00e92efb17 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -102,7 +102,7 @@ WRITE16_MEMBER( cps_state::fcrash_soundlatch_w ) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } } @@ -111,7 +111,7 @@ WRITE16_MEMBER(cps_state::cawingbl_soundlatch_w) { if (ACCESSING_BITS_8_15) { - m_soundlatch->write(space, 0, data >> 8); + m_soundlatch->write(data >> 8); m_audiocpu->set_input_line(0, HOLD_LINE); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(50)); /* boost the interleave or some voices get dropped */ } diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index 49710b33951..6fa9210f59a 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -262,7 +262,7 @@ WRITE8_MEMBER(flipjack_state::layer_w) WRITE8_MEMBER(flipjack_state::soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); if (BIT(data, 7)) m_audiocpu->set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index d58e65bda44..59ca6d48324 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -69,7 +69,7 @@ WRITE8_MEMBER(flkatck_state::flkatck_ls138_w) flkatck_bankswitch_w(space, 0, data); break; case 0x05: /* sound code number */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); break; case 0x06: /* Cause interrupt on audio CPU */ m_audiocpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index eca0e8d727e..e007c8decf4 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -316,7 +316,7 @@ WRITE8_MEMBER(flower_state::coin_counter_w) WRITE8_MEMBER(flower_state::sound_command_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); if(m_audio_nmi_enable == true) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index b9aec13b2ea..8bd66cfc0fb 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -37,8 +37,8 @@ WRITE16_MEMBER(fromanc2_state::sndcmd_w) { - m_soundlatch->write(space, offset, (data >> 8) & 0xff); // 1P (LEFT) - m_soundlatch2->write(space, offset, data & 0xff); // 2P (RIGHT) + m_soundlatch->write((data >> 8) & 0xff); // 1P (LEFT) + m_soundlatch2->write(data & 0xff); // 2P (RIGHT) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); m_sndcpu_nmi_flag = 0; diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index c30d173c010..a2342012754 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -77,7 +77,7 @@ WRITE16_MEMBER(fuuki16_state::vregs_w) WRITE8_MEMBER( fuuki16_state::sound_command_w ) { - m_soundlatch->write(space,0,data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // m_maincpu->spin_until_time(attotime::from_usec(50)); // Allow the other CPU to reply machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(50)); // Fixes glitching in rasters diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp index 50ec35f225a..2c6498c9886 100644 --- a/src/mame/drivers/gaelco3d.cpp +++ b/src/mame/drivers/gaelco3d.cpp @@ -213,7 +213,7 @@ void gaelco3d_state::machine_reset() { MACHINE_RESET_CALL_MEMBER( common ); m_tms_offset_xor = 0; - m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); + m_soundlatch->acknowledge_w(); } diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 1cbe080ddcf..80f07246f8e 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -955,7 +955,7 @@ WRITE8_MEMBER(galaxian_state::explorer_sound_control_w) READ8_MEMBER(galaxian_state::explorer_sound_latch_r) { m_audiocpu->set_input_line(0, CLEAR_LINE); - return m_soundlatch->read(m_audiocpu->space(AS_PROGRAM), 0); + return m_soundlatch->read(); } @@ -1349,7 +1349,7 @@ WRITE8_MEMBER(galaxian_state::kingball_sound1_w) WRITE8_MEMBER(galaxian_state::kingball_sound2_w) { m_kingball_sound = (m_kingball_sound & ~0x02) | (data << 1); - m_soundlatch->write(space, 0, m_kingball_sound | 0xf0); + m_soundlatch->write(m_kingball_sound | 0xf0); } @@ -1425,7 +1425,7 @@ READ8_MEMBER(galaxian_state::jumpbug_protection_r) WRITE8_MEMBER(galaxian_state::checkman_sound_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 1bcf2709313..bc6fa8cdb8a 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -44,12 +44,12 @@ TODO WRITE8_MEMBER(galivan_state::galivan_sound_command_w) { - m_soundlatch->write(space,0,((data & 0x7f) << 1) | 1); + m_soundlatch->write(((data & 0x7f) << 1) | 1); } READ8_MEMBER(galivan_state::soundlatch_clear_r) { - m_soundlatch->clear_w(space, 0, 0); + m_soundlatch->clear_w(); return 0; } diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index 266975edcf0..a9334dce508 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -51,7 +51,7 @@ WRITE16_MEMBER(galspnbl_state::soundcommand_w) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space,offset,data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } } diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index 57fdb0a0629..b663151fc37 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -167,8 +167,7 @@ WRITE_LINE_MEMBER(gameplan_state::r6532_irq) WRITE8_MEMBER(gameplan_state::r6532_soundlatch_w) { - address_space &progspace = m_maincpu->space(AS_PROGRAM); - m_soundlatch->write(progspace, 0, data); + m_soundlatch->write(data); } diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index 2ef6214f5f8..6f9e166c67a 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -185,7 +185,7 @@ WRITE8_MEMBER( ghosteo_state::qs1000_p3_w ) membank("qs1000:bank")->set_entry(data & 0x07); if (!BIT(data, 5)) - m_soundlatch->acknowledge_w(space, 0, !BIT(data, 5)); + m_soundlatch->acknowledge_w(); } diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index a641ea11a38..3bb329ab9ea 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -254,14 +254,14 @@ WRITE8_MEMBER(ppking_state::cpu2_irq_ack_w) WRITE8_MEMBER(gladiatr_state_base::adpcm_command_w) { - m_soundlatch->write(space,0,data); + m_soundlatch->write(data); m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } READ8_MEMBER(gladiatr_state_base::adpcm_command_r) { m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - return m_soundlatch->read(space,0); + return m_soundlatch->read(); } WRITE_LINE_MEMBER(gladiatr_state_base::flipscreen_w) @@ -550,7 +550,7 @@ WRITE8_MEMBER(ppking_state::ppking_qx0_w) m_mcu[0].txd = data; m_mcu[1].rst = 0; - m_soundlatch2->write(space, 0, data & 0xff); + m_soundlatch2->write(data & 0xff); mcu_input_check(); @@ -580,7 +580,7 @@ READ8_MEMBER(ppking_state::ppking_qx1_r) if(m_mcu[1].rst == 1) return 0x40; - return m_soundlatch2->read(space,0); + return m_soundlatch2->read(); } READ8_MEMBER(ppking_state::ppking_qx3_r) diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index a841c6a9f03..588c2b10b1c 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -85,7 +85,7 @@ private: WRITE16_MEMBER(go2000_state::sound_cmd_w) { - m_soundlatch->write(space, offset, data & 0xff); + m_soundlatch->write(data & 0xff); m_soundcpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index 11828b83cf4..d9a83a4058a 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -24,7 +24,7 @@ WRITE16_MEMBER(goal92_state::goal92_sound_command_w) { if (ACCESSING_BITS_8_15) { - m_soundlatch->write(space, 0, (data >> 8) & 0xff); + m_soundlatch->write((data >> 8) & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } } diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index 43ef1af09de..2343771b234 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -395,7 +395,7 @@ WRITE8_MEMBER(gsword_state::nmi_set_w) WRITE8_MEMBER(gsword_state::sound_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index c4278cadb6f..f6c23f9dc17 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -1603,7 +1603,7 @@ WRITE8_MEMBER(halleys_state::sndnmi_msk_w) WRITE8_MEMBER(halleys_state::soundcommand_w) { m_io_ram[0x8a] = data; - m_soundlatch->write(space,offset,data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index b1a48703efa..3e06972b1cb 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -1773,7 +1773,7 @@ READ8_MEMBER(pairmtch_state::input_r) WRITE8_MEMBER(pairmtch_state::sound_w) { // R5x: soundlatch (to audiocpu R2x) - m_soundlatch[0]->write(space, 0, bitswap<8>(data,7,6,5,4,0,1,2,3)); + m_soundlatch[0]->write(bitswap<8>(data,7,6,5,4,0,1,2,3)); } // handlers: audiocpu side @@ -1781,7 +1781,7 @@ WRITE8_MEMBER(pairmtch_state::sound_w) WRITE8_MEMBER(pairmtch_state::sound2_w) { // R2x: soundlatch (to maincpu R5x) - m_soundlatch[1]->write(space, 0, bitswap<8>(data,7,6,5,4,0,1,2,3)); + m_soundlatch[1]->write(bitswap<8>(data,7,6,5,4,0,1,2,3)); } WRITE16_MEMBER(pairmtch_state::speaker_w) diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp index 11450a4f99c..d785957e74f 100644 --- a/src/mame/drivers/himesiki.cpp +++ b/src/mame/drivers/himesiki.cpp @@ -117,7 +117,7 @@ WRITE8_MEMBER(himesiki_state::himesiki_rombank_w) WRITE8_MEMBER(himesiki_state::himesiki_sound_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index b43a51f46fa..e0d202ed7d9 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -311,7 +311,7 @@ WRITE8_MEMBER(homedata_state::mrokumei_sound_bank_w) WRITE8_MEMBER(homedata_state::mrokumei_sound_cmd_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } @@ -430,7 +430,7 @@ READ8_MEMBER(homedata_state::pteacher_keyboard_r) READ8_MEMBER(homedata_state::pteacher_upd7807_porta_r) { if (!BIT(m_upd7807_portc, 6)) - m_upd7807_porta = m_soundlatch->read(space, 0); + m_upd7807_porta = m_soundlatch->read(); else logerror("%s: read PA with PC *not* clear\n", machine().describe_context()); diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index 8290f0d6837..fc0b73138ff 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -327,10 +327,10 @@ READ8_MEMBER(hvyunit_state::mermaid_p0_r) WRITE8_MEMBER(hvyunit_state::mermaid_p0_w) { if (!BIT(m_mermaid_p[0], 1) && BIT(data, 1)) - m_slavelatch->write(space, 0, m_mermaid_p[1]); + m_slavelatch->write(m_mermaid_p[1]); if (BIT(data, 0) == 0) - m_mermaid_p[1] = m_mermaidlatch->read(space, 0); + m_mermaid_p[1] = m_mermaidlatch->read(); m_mermaid_p[0] = data; } diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 421898ca5f9..a5d64a49be4 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -436,7 +436,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ironhors_state::farwest_scanline_tick) READ8_MEMBER(ironhors_state::farwest_soundlatch_r) { - return m_soundlatch->read(m_soundcpu->space(AS_PROGRAM), 0); + return m_soundlatch->read(); } void ironhors_state::farwest(machine_config &config) diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index aa4b51c5d35..79886c8b5f3 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -814,7 +814,7 @@ WRITE8_MEMBER(itech8_state::gtg2_sound_data_w) ((data & 0x5d) << 1) | ((data & 0x20) >> 3) | ((data & 0x02) << 5); - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); } diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index f35b4a257f1..7a5f2409031 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -260,14 +260,14 @@ READ8_MEMBER(jangou_state::input_system_r) WRITE8_MEMBER(jangou_state::sound_latch_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_cpu_1->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } READ8_MEMBER(jangou_state::sound_latch_r) { m_cpu_1->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - return m_soundlatch->read(space, 0); + return m_soundlatch->read(); } /* Jangou HC-55516 CVSD */ diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index 5de1f4a17af..8cb66d12e2b 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -389,14 +389,14 @@ WRITE8_MEMBER(kas89_state::sound_comm_w) else { - m_soundlatch->write(space, 0, data); - m_audiocpu->set_input_line(0, ASSERT_LINE ); + m_soundlatch->write(data); + m_audiocpu->set_input_line(0, ASSERT_LINE); } } WRITE8_MEMBER(kas89_state::int_ack_w) { - m_audiocpu->set_input_line(0, CLEAR_LINE ); + m_audiocpu->set_input_line(0, CLEAR_LINE); } diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp index 4520698d0c7..96c206769aa 100644 --- a/src/mame/drivers/kickgoal.cpp +++ b/src/mame/drivers/kickgoal.cpp @@ -385,7 +385,7 @@ WRITE8_MEMBER(kickgoal_state::soundio_port_c_w) { if (!(data & 0x10)) { - m_pic_portb = m_soundlatch->read(space, 0); + m_pic_portb = m_soundlatch->read(); m_sound_command_sent = 0x00; } } @@ -412,7 +412,7 @@ WRITE8_MEMBER(kickgoal_state::soundio_port_c_w) WRITE16_MEMBER(kickgoal_state::to_pic_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_sound_command_sent = 0x20; } diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index 575bd849403..68d6f3776ae 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -47,7 +47,7 @@ void kingofb_state::scroll_interrupt_w(uint8_t data) void kingofb_state::sound_command_w(uint8_t data) { - m_soundlatch->write(machine().dummy_space(), 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp index 0273e41542a..b0cf004626e 100644 --- a/src/mame/drivers/kingpin.cpp +++ b/src/mame/drivers/kingpin.cpp @@ -69,7 +69,7 @@ private: WRITE8_MEMBER(kingpin_state::sound_nmi_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index 74d90fec1c6..670a8c18638 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -39,7 +39,7 @@ Updates: WRITE8_MEMBER(kncljoe_state::sound_cmd_w) { if ((data & 0x80) == 0) - m_soundlatch->write(space, 0, data & 0x7f); + m_soundlatch->write(data & 0x7f); else m_soundcpu->set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp index f0ca353b282..2bb6b96cad4 100644 --- a/src/mame/drivers/ksayakyu.cpp +++ b/src/mame/drivers/ksayakyu.cpp @@ -93,7 +93,7 @@ WRITE8_MEMBER(ksayakyu_state::bank_select_w) WRITE8_MEMBER(ksayakyu_state::latch_w) { m_sound_status &= ~0x80; - m_soundlatch->write(space, 0, data | 0x80); + m_soundlatch->write(data | 0x80); } READ8_MEMBER(ksayakyu_state::sound_status_r) @@ -104,7 +104,7 @@ READ8_MEMBER(ksayakyu_state::sound_status_r) WRITE8_MEMBER(ksayakyu_state::tomaincpu_w) { m_sound_status |= 0x80; - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); } READ8_MEMBER(ksayakyu_state::int_ack_r) diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index 718eabb91b7..8bbe47e89fa 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -89,7 +89,7 @@ TIMER_CALLBACK_MEMBER(ladyfrog_state::nmi_callback) WRITE8_MEMBER(ladyfrog_state::sound_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(ladyfrog_state::nmi_callback),this), data); } diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index f5ecc749f62..2b4be527c75 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -52,7 +52,7 @@ INPUT_CHANGED_MEMBER(lasso_state::coin_inserted) /* Write to the sound latch and generate an IRQ on the sound CPU */ WRITE8_MEMBER(lasso_state::sound_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index bb0fe8a026e..6d7c3a7b9b2 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -198,7 +198,7 @@ WRITE8_MEMBER(limenko_state::qs1000_p3_w) membank("qs1000:bank")->set_entry(data & 0x07); if (!BIT(data, 5)) - m_soundlatch->acknowledge_w(space, 0, !BIT(data, 5)); + m_soundlatch->acknowledge_w(); } /***************************************************************************************************** @@ -273,7 +273,7 @@ READ8_MEMBER(limenko_state::spotty_sound_r) // check m_spotty_sound_cmd bits... if(m_spotty_sound_cmd == 0xf7) - return m_soundlatch->read(space,0); + return m_soundlatch->read(); else return m_oki->read(); } diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp index 04202e11ff0..86448a1593b 100644 --- a/src/mame/drivers/looping.cpp +++ b/src/mame/drivers/looping.cpp @@ -419,7 +419,7 @@ WRITE_LINE_MEMBER(looping_state::looping_spcint) WRITE8_MEMBER(looping_state::looping_soundlatch_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(INT_9980A_LEVEL2, ASSERT_LINE); } diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index 575d80e3a3c..5e488dee5ac 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -272,8 +272,8 @@ READ16_MEMBER(lordgun_state::lordgun_gun_1_y_r) WRITE16_MEMBER(lordgun_state::soundlatch_w) { - if (ACCESSING_BITS_0_7) m_soundlatch->write(space, 0, (data >> 0) & 0xff); - if (ACCESSING_BITS_8_15) m_soundlatch2->write(space, 0, (data >> 8) & 0xff); + if (ACCESSING_BITS_0_7) m_soundlatch->write((data >> 0) & 0xff); + if (ACCESSING_BITS_8_15) m_soundlatch2->write((data >> 8) & 0xff); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index f96736b6c7e..cac34b47796 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -139,7 +139,7 @@ WRITE8_MEMBER(lwings_state::avengers_protection_w) else if (pc == 0x0445) { m_soundstate = 0x80; - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); } } @@ -1766,7 +1766,7 @@ ROM_END void lwings_state::init_avengersb() { /* set up protection handlers */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0xf80c, 0xf80c, write8_delegate(FUNC(generic_latch_8_device::write), (generic_latch_8_device*)m_soundlatch)); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xf80c, 0xf80c, write8smo_delegate(FUNC(generic_latch_8_device::write), (generic_latch_8_device*)m_soundlatch)); } diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index cebcc902653..36043376f5b 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -457,7 +457,7 @@ READ8_MEMBER(m63_state::snddata_r) { switch (m_p2 & 0xf0) { - case 0x60: return m_soundlatch->read(space, 0); ; + case 0x60: return m_soundlatch->read(); case 0x70: return memregion("user1")->base()[((m_p1 & 0x1f) << 8) | offset]; } return 0xff; diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp index 62ae2e8c7f5..d0fe5b3b565 100644 --- a/src/mame/drivers/macrossp.cpp +++ b/src/mame/drivers/macrossp.cpp @@ -310,7 +310,7 @@ WRITE32_MEMBER(macrossp_state::macrossp_soundcmd_w) if (ACCESSING_BITS_16_31) { //logerror("%08x write soundcmd %08x (%08x)\n",m_maincpu->pc(),data,mem_mask); - m_soundlatch->write(space, 0, data >> 16, 0xffff); + m_soundlatch->write(data >> 16); m_sndpending = 1; m_audiocpu->set_input_line(2, HOLD_LINE); /* spin for a while to let the sound CPU read the command */ @@ -322,7 +322,7 @@ READ16_MEMBER(macrossp_state::macrossp_soundcmd_r) { // logerror("%06x read soundcmd\n",m_audiocpu->pc()); m_sndpending = 0; - return m_soundlatch->read(space, offset, mem_mask); + return m_soundlatch->read(); } WRITE16_MEMBER(macrossp_state::palette_fade_w) diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp index 647abfb29a6..0b3aef9ecb9 100644 --- a/src/mame/drivers/magmax.cpp +++ b/src/mame/drivers/magmax.cpp @@ -40,7 +40,7 @@ WRITE16_MEMBER(magmax_state::cpu_irq_ack_w) READ8_MEMBER(magmax_state::sound_r) { - return (m_soundlatch->read(space, 0) << 1) | m_LS74_q; + return (m_soundlatch->read() << 1) | m_LS74_q; } WRITE8_MEMBER(magmax_state::ay8910_portB_0_w) diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp index 003d1281534..4b75f814977 100644 --- a/src/mame/drivers/matmania.cpp +++ b/src/mame/drivers/matmania.cpp @@ -58,13 +58,13 @@ READ8_MEMBER(matmania_state::maniach_mcu_status_r) WRITE8_MEMBER(matmania_state::matmania_sh_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6502_IRQ_LINE, HOLD_LINE); } WRITE8_MEMBER(matmania_state::maniach_sh_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); } diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index c5cdaa330d3..14c437ef855 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -962,8 +962,8 @@ void mazerbla_state::machine_reset() if (m_soundlatch.found()) { - m_soundlatch->clear_w(machine().dummy_space(), 0, 0); - m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); + m_soundlatch->clear_w(); + m_soundlatch->acknowledge_w(); } for (i = 0; i < 4; i++) diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 34b19cf50a4..c0ae6c43862 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -571,7 +571,7 @@ void megasys1_state::z80_sound_map(address_map &map) { map(0x0000, 0x3fff).rom(); map(0xc000, 0xc7ff).ram(); - map(0xe000, 0xe000).lr8("soundlatch_r_z", [this](address_space &space, offs_t offset){ return m_soundlatch[0]->read(space, 0) & 0xff; }); + map(0xe000, 0xe000).lr8("soundlatch_r_z", [this](){ return m_soundlatch[0]->read() & 0xff; }); map(0xf000, 0xf000).nopw(); /* ?? */ } diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp index 044f9e47e00..fab8e143cfa 100644 --- a/src/mame/drivers/meijinsn.cpp +++ b/src/mame/drivers/meijinsn.cpp @@ -118,7 +118,7 @@ private: WRITE16_MEMBER(meijinsn_state::sound_w) { if (ACCESSING_BITS_0_7) - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); } READ16_MEMBER(meijinsn_state::alpha_mcu_r) diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index f707ab3cb4d..989513f433e 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -292,10 +292,9 @@ WRITE_LINE_MEMBER(metro_state::puzzlet_vblank_irq) READ_LINE_MEMBER(metro_state::rxd_r) { - address_space &space = m_maincpu->space(AS_PROGRAM); - uint8_t data = m_soundlatch->read(space, 0); + uint8_t data = m_soundlatch->read(); - m_soundlatch->write(space, 0, data >> 1); + m_soundlatch->write(data >> 1); return data & 1; @@ -303,7 +302,7 @@ READ_LINE_MEMBER(metro_state::rxd_r) WRITE8_MEMBER(metro_state::soundlatch_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // seen rxd_r m_maincpu->spin_until_interrupt(); m_busy_sndcpu = 1; diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index 41946d23965..8a4f47b3c80 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -296,7 +296,7 @@ WRITE_LINE_MEMBER(mirax_state::nmi_mask_w) WRITE8_MEMBER(mirax_state::sound_cmd_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 5bddb9f9bdb..bc3baaef96c 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -433,7 +433,7 @@ void mitchell_state::mstworld_sound_map(address_map &map) WRITE8_MEMBER(mitchell_state::mstworld_sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index 431ee15cae4..83b746c473a 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -522,7 +522,7 @@ READ32_MEMBER(ms32_state::ms32_read_inputs3) WRITE32_MEMBER(ms32_state::ms32_sound_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); // give the Z80 time to respond m_maincpu->spin_until_time(attotime::from_usec(40)); @@ -1657,7 +1657,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ms32_state::ms32_interrupt) READ8_MEMBER(ms32_state::latch_r) { - return m_soundlatch->read(space,0)^0xff; + return m_soundlatch->read()^0xff; } WRITE8_MEMBER(ms32_state::ms32_snd_bank_w) diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index 6aeb46add8f..37c029fda7e 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -36,7 +36,7 @@ TIMER_CALLBACK_MEMBER(msisaac_state::nmi_callback) WRITE8_MEMBER(msisaac_state::sound_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(msisaac_state::nmi_callback),this), data); } diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp index 55d8c7d9358..8e4b03d8ea0 100644 --- a/src/mame/drivers/mugsmash.cpp +++ b/src/mame/drivers/mugsmash.cpp @@ -60,7 +60,7 @@ WRITE16_MEMBER(mugsmash_state::mugsmash_reg2_w) switch (offset) { case 1: - m_soundlatch->write(space, 1, data & 0xff); + m_soundlatch->write(data & 0xff); break; default: diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp index c42bd8cae89..0099eeea68f 100644 --- a/src/mame/drivers/nbmj8991.cpp +++ b/src/mame/drivers/nbmj8991.cpp @@ -44,7 +44,7 @@ Notes: WRITE8_MEMBER(nbmj8991_state::soundbank_w) { - if (!(data & 0x80)) m_soundlatch->clear_w(space, 0, 0); + if (!(data & 0x80)) m_soundlatch->clear_w(); membank("bank1")->set_entry(data & 0x03); } diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index 6d113bd3ddf..ccf226021ef 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -205,7 +205,7 @@ READ8_MEMBER(nbmj9195_state::others_cpu_portc_r) WRITE8_MEMBER(nbmj9195_state::soundcpu_porte_w) { - if (!(data & 0x01)) m_soundlatch->clear_w(space, 0, 0); + if (!(data & 0x01)) m_soundlatch->clear_w(); } diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index 3832b156820..638e1cce022 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -991,7 +991,7 @@ WRITE8_MEMBER(mvs_state::io_control_w) WRITE8_MEMBER(neogeo_base_state::audio_command_w) { // glitches in s1945p without the boost_interleave here - m_soundlatch->write(space, offset, data, mem_mask); + m_soundlatch->write(data); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(50)); } @@ -1092,7 +1092,7 @@ WRITE16_MEMBER(neogeo_base_state::memcard_w) CUSTOM_INPUT_MEMBER(neogeo_base_state::get_audio_result) { - uint8_t ret = m_soundlatch2->read(m_audiocpu->space(AS_PROGRAM), 0); + uint8_t ret = m_soundlatch2->read(); return ret; } @@ -1648,7 +1648,7 @@ void neogeo_base_state::machine_reset() { // disable audiocpu NMI m_audionmi->in_w<1>(0); - m_soundlatch->acknowledge_r(machine().dummy_space(), 0); + m_soundlatch->acknowledge_w(); m_maincpu->reset(); diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index 60a5bef44ab..a074b6c05f7 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -224,7 +224,7 @@ WRITE8_MEMBER(neoprint_state::audio_cpu_clear_nmi_w) WRITE8_MEMBER(neoprint_state::audio_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); audio_cpu_assert_nmi(); @@ -237,7 +237,7 @@ WRITE8_MEMBER(neoprint_state::audio_command_w) READ8_MEMBER(neoprint_state::audio_command_r) { - uint8_t ret = m_soundlatch->read(space, 0); + uint8_t ret = m_soundlatch->read(); //if (LOG_CPU_COMM) logerror(" AUD CPU PC %04x: audio_command_r %02x\n", m_audiocpu->pc(), ret); diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index 29f0938e8b5..f3867cd07b0 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -335,7 +335,7 @@ WRITE16_MEMBER(nmg5_state::vram_w) WRITE8_MEMBER(nmg5_state::soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index 70c933ae030..df6f824ec22 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -371,14 +371,14 @@ MC6845_END_UPDATE( nyny_state::crtc_end_update ) WRITE8_MEMBER(nyny_state::audio_1_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6802_IRQ_LINE, HOLD_LINE); } WRITE8_MEMBER(nyny_state::audio_1_answer_w) { - m_soundlatch3->write(space, 0, data); + m_soundlatch3->write(data); m_maincpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); } @@ -398,7 +398,7 @@ WRITE8_MEMBER(nyny_state::nyny_ay8910_37_port_a_w) WRITE8_MEMBER(nyny_state::audio_2_command_w) { - m_soundlatch2->write(space, 0, (data & 0x60) >> 5); + m_soundlatch2->write((data & 0x60) >> 5); m_audiocpu2->set_input_line(M6802_IRQ_LINE, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp index 8f3db209f83..1b54945cdcb 100644 --- a/src/mame/drivers/olibochu.cpp +++ b/src/mame/drivers/olibochu.cpp @@ -263,7 +263,7 @@ WRITE8_MEMBER(olibochu_state::sound_command_w) for (c = 15; c >= 0; c--) if (m_cmd & (1 << c)) break; - if (c >= 0) m_soundlatch->write(space, 0, 15 - c); + if (c >= 0) m_soundlatch->write(15 - c); } diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp index e1533bfd65a..464628c8aa3 100644 --- a/src/mame/drivers/omegrace.cpp +++ b/src/mame/drivers/omegrace.cpp @@ -356,7 +356,7 @@ WRITE8_MEMBER(omegrace_state::omegrace_leds_w) WRITE8_MEMBER(omegrace_state::omegrace_soundlatch_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp index b7588ab04c4..513ea3fbe3e 100644 --- a/src/mame/drivers/othello.cpp +++ b/src/mame/drivers/othello.cpp @@ -234,8 +234,8 @@ void othello_state::main_portmap(address_map &map) READ8_MEMBER(othello_state::latch_r) { - int retval = m_soundlatch->read(space, 0); - m_soundlatch->clear_w(space, 0, 0); + int retval = m_soundlatch->read(); + m_soundlatch->clear_w(); return retval; } diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp index e327f926ff3..1fa8cc13dc6 100644 --- a/src/mame/drivers/pbaction.cpp +++ b/src/mame/drivers/pbaction.cpp @@ -107,7 +107,7 @@ Stephh's notes (based on the game Z80 code and some tests) : WRITE8_MEMBER(pbaction_state::pbaction_sh_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_soundcommand_timer->adjust(attotime::zero, 0); } @@ -154,7 +154,7 @@ READ8_MEMBER(pbaction_state::sound_data_r) { if (!machine().side_effects_disabled()) m_audiocpu->set_input_line(0, CLEAR_LINE); - return m_soundlatch->read(space, 0); + return m_soundlatch->read(); } WRITE8_MEMBER(pbaction_state::sound_irq_ack_w) @@ -235,23 +235,23 @@ WRITE8_MEMBER(pbaction_tecfri_state::sub8008_w) WRITE8_MEMBER(pbaction_tecfri_state::subtomain_w) { - //m_subtomainlatch->write(space, offset, data); // where does this go if it can't go to maincpu? + //m_subtomainlatch->write(data); // where does this go if it can't go to maincpu? } READ8_MEMBER(pbaction_tecfri_state::maintosub_r) { - return m_maintosublatch->read(space, offset); + return m_maintosublatch->read(); } READ8_MEMBER(pbaction_tecfri_state::subcpu_r) { return 0x00; // other values stop the flippers from working? are there different inputs from the custom cabinet in here somehow? -// return m_subtomainlatch->read(space, offset); +// return m_subtomainlatch->read(); } WRITE8_MEMBER(pbaction_tecfri_state::subcpu_w) { - m_maintosublatch->write(space, offset, data); + m_maintosublatch->write(data); m_subcommand_timer->adjust(attotime::zero, 0); } diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index 5a2c05a40d0..30c34152edd 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -43,7 +43,7 @@ WRITE8_MEMBER(pcktgal_state::sound_bank_w) WRITE8_MEMBER(pcktgal_state::sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index 2f3ac8a9cf8..bc98846a054 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -282,7 +282,7 @@ WRITE16_MEMBER(pgm_state::m68k_l1_w) { if (PGMLOGERROR) logerror("SL 1 m68.w %02x (%06x) IRQ\n", data & 0xff, m_maincpu->pc()); - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } } @@ -291,7 +291,7 @@ WRITE8_MEMBER(pgm_state::z80_l3_w) { if (PGMLOGERROR) logerror("SL 3 z80.w %02x (%04x)\n", data, m_soundcpu->pc()); - m_soundlatch3->write(space, 0, data); + m_soundlatch3->write(data); } diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp index 11662fdc8c7..3d56bb32c3a 100644 --- a/src/mame/drivers/pokechmp.cpp +++ b/src/mame/drivers/pokechmp.cpp @@ -74,7 +74,7 @@ WRITE8_MEMBER(pokechmp_state::pokechmp_sound_bank_w) WRITE8_MEMBER(pokechmp_state::pokechmp_sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index 583ca54b1a4..6d4f1b5ca95 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -951,7 +951,7 @@ void polepos_state::polepos(machine_config &config) WRITE8_MEMBER(polepos_state::bootleg_soundlatch_w) { if (m_soundlatch.found()) // topracern also uses this; no idea what it should do there - m_soundlatch->write(space, 0, data | 0xfc); + m_soundlatch->write(data | 0xfc); } void polepos_state::topracern_io(address_map &map) diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp index 15421ccff07..9bed8d3cc2e 100644 --- a/src/mame/drivers/prehisle.cpp +++ b/src/mame/drivers/prehisle.cpp @@ -24,7 +24,7 @@ WRITE16_MEMBER(prehisle_state::soundcmd_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index 14d50a76a92..41d42fb1870 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -512,8 +512,7 @@ void pturn_state::machine_start() void pturn_state::machine_reset() { - address_space &space = m_maincpu->space(AS_PROGRAM); - m_soundlatch->clear_w(space,0,0); + m_soundlatch->clear_w(); m_nmi_sub = false; } diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index 3edcfd88703..f14c2e4a4ab 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -95,17 +95,17 @@ WRITE8_MEMBER(quasar_state::quasar_sh_command_w) // lower nibble = command to I8035 // not necessarily like this, but it seems to work better than direct mapping // (although schematics has it as direct - but then the schematics are wrong elsewhere to!) - m_soundlatch->write(space, 0, (data & 8) + ((data >> 1) & 3) + ((data << 2) & 4)); + m_soundlatch->write((data & 8) + ((data >> 1) & 3) + ((data << 2) & 4)); } READ8_MEMBER(quasar_state::quasar_sh_command_r) { - return m_soundlatch->read(space, 0) + (ioport("DSW2")->read() & 0x30); + return m_soundlatch->read() + (ioport("DSW2")->read() & 0x30); } READ_LINE_MEMBER(quasar_state::audio_t1_r) { - return (m_soundlatch->read(machine().dummy_space(), 0) == 0); + return (m_soundlatch->read() == 0); } // memory map taken from the manual diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index 08a258ad216..ef4be0ec9ec 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -326,7 +326,7 @@ WRITE8_MEMBER(quizpun2_state::irq_ack) WRITE8_MEMBER(quizpun2_state::soundlatch_w) { - m_soundlatch->write(space, 0, data ^ 0x80); + m_soundlatch->write(data ^ 0x80); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp index dff5a7cfa5a..f97d9f48f16 100644 --- a/src/mame/drivers/r2dtank.cpp +++ b/src/mame/drivers/r2dtank.cpp @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(r2dtank_state::main_cpu_irq) READ8_MEMBER(r2dtank_state::audio_command_r) { - uint8_t ret = m_soundlatch->read(space, 0); + uint8_t ret = m_soundlatch->read(); if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Command Read: %x\n", m_audiocpu->pc(), ret); @@ -152,7 +152,7 @@ if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Command Read: %x\n", m_audiocpu WRITE8_MEMBER(r2dtank_state::audio_command_w) { - m_soundlatch->write(space, 0, ~data); + m_soundlatch->write(~data); m_audiocpu->set_input_line(M6802_IRQ_LINE, HOLD_LINE); if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Command Write: %x\n", m_maincpu->pc(), data^0xff); @@ -161,7 +161,7 @@ if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Command Write: %x\n", m_maincp READ8_MEMBER(r2dtank_state::audio_answer_r) { - uint8_t ret = m_soundlatch2->read(space, 0); + uint8_t ret = m_soundlatch2->read(); if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Answer Read: %x\n", m_maincpu->pc(), ret); return ret; @@ -174,7 +174,7 @@ WRITE8_MEMBER(r2dtank_state::audio_answer_w) if (m_audiocpu->pc() == 0xfb12) data = 0x00; - m_soundlatch2->write(space, 0, data); + m_soundlatch2->write(data); m_maincpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Answer Write: %x\n", m_audiocpu->pc(), data); diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index bb0be85c97b..b951cce01fc 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -132,7 +132,7 @@ READ8_MEMBER(retofinv_state::cpu0_mf800_r) WRITE8_MEMBER(retofinv_state::soundcommand_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 803b9859ffa..4d28a96862c 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -81,7 +81,7 @@ WRITE8_MEMBER(rockrage_state::rockrage_bankswitch_w) WRITE8_MEMBER(rockrage_state::rockrage_sh_irqtrigger_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); } diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp index 51e23dcbb38..69939afd1f8 100644 --- a/src/mame/drivers/roul.cpp +++ b/src/mame/drivers/roul.cpp @@ -200,7 +200,7 @@ WRITE8_MEMBER(roul_state::blitter_cmd_w) WRITE8_MEMBER(roul_state::sound_latch_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_soundcpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index e7911dd960b..9e081d51c1a 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -948,7 +948,7 @@ READ8_MEMBER(royalmah_state::jansou_6405_r) WRITE8_MEMBER(royalmah_state::jansou_sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index 979af82096b..b7d812576f9 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -268,14 +268,14 @@ template READ8_MEMBER(sandscrp_state::soundlatch_r) { m_latch_full[Latch] = 0; - return m_soundlatch[Latch]->read(space,0); + return m_soundlatch[Latch]->read(); } template WRITE8_MEMBER(sandscrp_state::soundlatch_w) { m_latch_full[Latch] = 1; - m_soundlatch[Latch]->write(space,0,data); + m_soundlatch[Latch]->write(data); } void sandscrp_state::sandscrp_mem(address_map &map) diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index fa40c602acc..8c6399d45df 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -141,13 +141,13 @@ void sauro_state::machine_start() WRITE8_MEMBER(sauro_state::sauro_sound_command_w) { data |= 0x80; - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); } READ8_MEMBER(sauro_state::sauro_sound_command_r) { - int ret = m_soundlatch->read(space, offset); - m_soundlatch->clear_w(space, offset, 0); + int ret = m_soundlatch->read(); + m_soundlatch->clear_w(); return ret; } diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index b8685aacfac..a8de6f17167 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -60,7 +60,7 @@ WRITE_LINE_MEMBER(scotrsht_state::vblank_irq) WRITE8_MEMBER(scotrsht_state::soundlatch_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp index 020e76915c5..81e84ef52f0 100644 --- a/src/mame/drivers/scyclone.cpp +++ b/src/mame/drivers/scyclone.cpp @@ -534,24 +534,24 @@ WRITE8_MEMBER(scyclone_state::snd_3001_w) // need to clear the latch somewhere, the command value is written back here and at 3005 // after acknowledging a command // might actually reset the DACs as there are (at least) 2 of them? - m_soundlatch->clear_w(space, 0, data); + m_soundlatch->clear_w(); } /* WRITE8_MEMBER(scyclone_state::snd_3003_w) { -// m_soundlatch->clear_w(space, 0, data); +// m_soundlatch->clear_w(); } WRITE8_MEMBER(scyclone_state::snd_3004_w) { -// m_soundlatch->clear_w(space, 0, data); +// m_soundlatch->clear_w(); } */ WRITE8_MEMBER(scyclone_state::snd_3005_w) { -// m_soundlatch->clear_w(space, 0, data); +// m_soundlatch->clear_w(); } diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index 547192894ba..84cc3e77bab 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -301,7 +301,7 @@ READ8_MEMBER( segahang_state::sound_data_r ) { // assert ACK m_i8255_1->pc6_w(CLEAR_LINE); - return m_soundlatch->read(space, 0); + return m_soundlatch->read(); } diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index a9f15030879..5f45d7f174e 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -318,7 +318,7 @@ READ8_MEMBER( segas16a_state::sound_data_r ) { // assert ACK m_i8255->pc6_w(CLEAR_LINE); - return m_soundlatch->read(space, 0); + return m_soundlatch->read(); } diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 1b13df462e6..93dfe82841f 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -966,7 +966,7 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t WRITE16_MEMBER( segas16b_state::sound_w16 ) { if (m_soundlatch != nullptr) - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); if (m_soundcpu != nullptr) m_soundcpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 8ee07a16bed..791819745e0 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1579,11 +1579,11 @@ WRITE16_MEMBER(seta_state::sub_ctrl_w) break; case 4/2: // not sure - if (ACCESSING_BITS_0_7) if(m_soundlatch[0] != nullptr) m_soundlatch[0]->write(space, 0, data & 0xff); + if (ACCESSING_BITS_0_7) if(m_soundlatch[0] != nullptr) m_soundlatch[0]->write(data & 0xff); break; case 6/2: // not sure - if (ACCESSING_BITS_0_7) if(m_soundlatch[1] != nullptr) m_soundlatch[1]->write(space, 0, data & 0xff); + if (ACCESSING_BITS_0_7) if(m_soundlatch[1] != nullptr) m_soundlatch[1]->write(data & 0xff); break; } @@ -3062,7 +3062,7 @@ void seta_state::umanclub_map(address_map &map) WRITE8_MEMBER(seta_state::utoukond_sound_control_w) { if (!BIT(data, 6)) - m_soundlatch[0]->acknowledge_w(space, 0, 0); + m_soundlatch[0]->acknowledge_w(); // other bits used for banking? (low nibble seems to always be 2) } @@ -3558,7 +3558,7 @@ WRITE8_MEMBER(seta_state::calibr50_sub_bankswitch_w) // Bit 3: NMICLR if (!BIT(data, 3)) - m_soundlatch[0]->acknowledge_w(space, 0, 0); + m_soundlatch[0]->acknowledge_w(); // Bit 2: IRQCLR if (!BIT(data, 2)) @@ -3570,7 +3570,7 @@ WRITE8_MEMBER(seta_state::calibr50_sub_bankswitch_w) WRITE8_MEMBER(seta_state::calibr50_soundlatch2_w) { - m_soundlatch[1]->write(space,0,data); + m_soundlatch[1]->write(data); m_subcpu->spin_until_time(attotime::from_usec(50)); // Allow the other cpu to reply } diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index 4fd07309f70..ae3f4045808 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -134,7 +134,7 @@ WRITE8_MEMBER(sf_state::coin_w) WRITE8_MEMBER(sf_state::soundcmd_w) { - m_soundlatch->write(space, offset, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index 32193741630..82713d8b766 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -60,17 +60,17 @@ WRITE8_MEMBER(shootout_state::bankswitch_w) READ8_MEMBER(shootout_state::sound_cpu_command_r) { - m_audiocpu->set_input_line (INPUT_LINE_NMI, CLEAR_LINE); - return (m_soundlatch->read (space, 0)); + m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); + return m_soundlatch->read(); } WRITE8_MEMBER(shootout_state::sound_cpu_command_w) { - m_soundlatch->write( space, offset, data ); + m_soundlatch->write(data); m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); // Allow the other CPU to reply. This fixes the missing music on the title screen (parent set). - m_maincpu->spin_until_time (attotime :: from_usec (200)); + m_maincpu->spin_until_time(attotime::from_usec(200)); } WRITE8_MEMBER(shootout_state::flipscreen_w) diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index a0e538791fb..dfd7e380e28 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -80,7 +80,7 @@ private: void fg_videoram_w(offs_t offset, u16 data, u16 mem_mask = ~0); void bg_videoram_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_WRITE8_MEMBER(soundcmd_w); + void soundcmd_w(u8 data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -183,9 +183,9 @@ u32 silvmil_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } -WRITE8_MEMBER(silvmil_state::soundcmd_w) +void silvmil_state::soundcmd_w(u8 data) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20)); } diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp index 52124948780..93d8938768b 100644 --- a/src/mame/drivers/skyfox.cpp +++ b/src/mame/drivers/skyfox.cpp @@ -42,7 +42,7 @@ WRITE8_MEMBER(skyfox_state::skyfox_vregs_w) break; case 1: - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); break; default: diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index 6b40485c904..97a02dc5dc6 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -351,7 +351,7 @@ WRITE16_MEMBER(sliver_state::io_data_w) WRITE16_MEMBER(sliver_state::sound_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(MCS51_INT0_LINE, HOLD_LINE); } diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 20d356abcb0..85309fbb9fd 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -363,14 +363,14 @@ TIMER_CALLBACK_MEMBER(snk_state::sgladiat_sndirq_update_callback) WRITE8_MEMBER(snk_state::sgladiat_soundlatch_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sgladiat_sndirq_update_callback),this), CMDIRQ_BUSY_ASSERT); } READ8_MEMBER(snk_state::sgladiat_soundlatch_r) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sgladiat_sndirq_update_callback),this), BUSY_CLEAR); - return m_soundlatch->read(space,0); + return m_soundlatch->read(); } READ8_MEMBER(snk_state::sgladiat_sound_nmi_ack_r) @@ -461,7 +461,7 @@ WRITE_LINE_MEMBER(snk_state::ymirq_callback_2) WRITE8_MEMBER(snk_state::snk_soundlatch_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), CMDIRQ_BUSY_ASSERT); } @@ -507,7 +507,7 @@ READ8_MEMBER(snk_state::tnk3_ymirq_ack_r) READ8_MEMBER(snk_state::tnk3_busy_clear_r) { // it's uncertain whether the latch should be cleared here or when it's read - m_soundlatch->clear_w(space, 0, 0); + m_soundlatch->clear_w(); machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), BUSY_CLEAR); return 0xff; } diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index 0f7c8e1e3ff..29303aae434 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -99,7 +99,7 @@ WRITE16_MEMBER(snk68_state::protection_w) WRITE8_MEMBER(snk68_state::sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // caused by 74123 } diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp index 39cdefa9b9d..55ce2429728 100644 --- a/src/mame/drivers/solomon.cpp +++ b/src/mame/drivers/solomon.cpp @@ -19,7 +19,7 @@ driver by Mirko Buffoni WRITE8_MEMBER(solomon_state::solomon_sh_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp index 9b77b916489..2310135280a 100644 --- a/src/mame/drivers/speedspn.cpp +++ b/src/mame/drivers/speedspn.cpp @@ -80,7 +80,7 @@ WRITE8_MEMBER(speedspn_state::rombank_w) WRITE8_MEMBER(speedspn_state::sound_w) { - m_soundlatch->write(space, 1, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index 634bfc7eb90..6cb9436f92d 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -366,7 +366,7 @@ WRITE8_MEMBER(sslam_state::sslam_snd_w) WRITE16_MEMBER(powerbls_state::powerbls_sound_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(MCS51_INT1_LINE, HOLD_LINE); } @@ -426,12 +426,10 @@ READ8_MEMBER(sslam_state::playmark_snd_command_r) { uint8_t data = 0; - if ((m_oki_control & 0x38) == 0x30) { - data = m_soundlatch->read(space,0); - } - else if ((m_oki_control & 0x38) == 0x28) { + if ((m_oki_control & 0x38) == 0x30) + data = m_soundlatch->read(); + else if ((m_oki_control & 0x38) == 0x28) data = (m_oki->read() & 0x0f); - } return data; } diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index 3fcf547ecd6..9cce11f085f 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -320,7 +320,7 @@ WRITE8_MEMBER(stuntair_state::stuntair_sound_w) { // each command is written three times: with bit 7 set, then with bit 7 clear, then with bit 7 set again // the 3 highest bits are ignored by the sound program - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(INPUT_LINE_NMI, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 6449ad12a1e..fd7d424ab66 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -49,7 +49,7 @@ WRITE16_MEMBER(suna16_state::soundlatch_w) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space, 0, data & 0xff ); + m_soundlatch->write(data & 0xff); } if (data & ~0xff) logerror("CPU#0 PC %06X - Sound latch unknown bits: %04X\n", m_maincpu->pc(), data); } diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index b71d7ccef27..9fd70f3ba0c 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -608,7 +608,7 @@ WRITE8_MEMBER(suna8_state::rranger_bankswitch_w) */ READ8_MEMBER(suna8_state::rranger_soundstatus_r) { - m_soundlatch2->read(space, offset); + m_soundlatch2->read(); return 0x02; } @@ -784,7 +784,7 @@ WRITE8_MEMBER(suna8_state::brickzn_multi_w) */ uint8_t remap = (m_remap_sound ? bitswap<8>(data, 7,6,3,4,5,2,1,0) : data); - m_soundlatch->write(space, 0, remap); + m_soundlatch->write(remap); logerror("CPU #0 - PC %04X: soundlatch = %02X (->%02X)\n",m_maincpu->pc(),data,remap); } @@ -1038,7 +1038,7 @@ WRITE8_MEMBER(suna8_state::starfigh_rombank_latch_w) WRITE8_MEMBER(suna8_state::starfigh_sound_latch_w) { if ( !(m_rombank_latch & 0x20) ) - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); } /* diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index 9c90251b91b..d90dc44bee5 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -220,7 +220,7 @@ WRITE16_MEMBER(supduck_state::supduck_4002_w) { data &= mem_mask; - m_soundlatch->write(space, 0, (data>>8)); + m_soundlatch->write((data>>8)); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index de1c458ea2d..5c401d2e7a7 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -100,7 +100,7 @@ void suprridr_state::machine_start() void suprridr_state::machine_reset() { - m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); + m_soundlatch->acknowledge_w(); } /************************************* diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index f5deda2c5f1..967a8082b60 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -529,7 +529,7 @@ READ8_MEMBER(system1_state::sound_data_r) { m_ppi8255->pc6_w(0); m_ppi8255->pc6_w(1); - return m_soundlatch->read(space, offset); + return m_soundlatch->read(); } /* if we have a Z80 PIO, get the data from the port and toggle the strobe */ @@ -548,7 +548,7 @@ READ8_MEMBER(system1_state::sound_data_r) WRITE8_MEMBER(system1_state::soundport_w) { /* boost interleave when communicating with the sound CPU */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100)); } diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 83b760a1f4a..56846e6c522 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -111,7 +111,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_nmi_w) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } } @@ -120,7 +120,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_irq_w) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_soundcpu->set_input_line(0, HOLD_LINE); } } @@ -128,7 +128,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_irq_w) READ8_MEMBER(segas1x_bootleg_state::sound_command_irq_r) { m_soundcpu->set_input_line(0, CLEAR_LINE); - return m_soundlatch->read(space, 0, 0xff); + return m_soundlatch->read(); } WRITE8_MEMBER(segas1x_bootleg_state::soundbank_msm_w) @@ -4043,7 +4043,7 @@ void segas1x_bootleg_state::init_astormb2() init_sys18bl_oki(); m_maincpu->space(AS_PROGRAM).unmap_write(0xa00006, 0xa00007); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xa00006, 0xa00007, write8_delegate(FUNC(generic_latch_8_device::write), (generic_latch_8_device*)m_soundlatch), 0x00ff); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa00006, 0xa00007, write8smo_delegate(FUNC(generic_latch_8_device::write), (generic_latch_8_device*)m_soundlatch), 0x00ff); } /************************************* diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 51aa5849fda..431265ca5c0 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -175,7 +175,7 @@ WRITE8_MEMBER(cyclwarr_state::cyclwarr_sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index 9f28339519e..ee03744b36b 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -427,7 +427,7 @@ void tbowl_state::machine_reset() m_adpcm_pos[0] = m_adpcm_pos[1] = 0; m_adpcm_end[0] = m_adpcm_end[1] = 0; m_adpcm_data[0] = m_adpcm_data[1] = -1; - m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); + m_soundlatch->acknowledge_w(); } void tbowl_state::tbowl(machine_config &config) diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index 84fcb199fc9..f14ac0b5601 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -157,7 +157,7 @@ WRITE8_MEMBER(tehkanwc_state::track_1_reset_w) WRITE8_MEMBER(tehkanwc_state::sound_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } @@ -175,7 +175,7 @@ void tehkanwc_state::device_timer(emu_timer &timer, device_timer_id id, int para WRITE8_MEMBER(tehkanwc_state::sound_answer_w) { - m_soundlatch2->write(space, 0, data); + m_soundlatch2->write(data); /* in Gridiron, the sound CPU goes in a tight loop after the self test, */ /* probably waiting to be reset by a watchdog */ diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index 745c79bf475..1199b72a951 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -95,12 +95,12 @@ AT-2 WRITE16_MEMBER(terracre_state::amazon_sound_w) { - m_soundlatch->write(space,0,((data & 0x7f) << 1) | 1); + m_soundlatch->write(((data & 0x7f) << 1) | 1); } READ8_MEMBER(terracre_state::soundlatch_clear_r) { - m_soundlatch->clear_w(space,0,0); + m_soundlatch->clear_w(); return 0; } diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 5947f894901..ba2f9a316c8 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -582,7 +582,7 @@ READ16_MEMBER(stepstag_state::stepstag_pc2main_r) WRITE16_MEMBER(stepstag_state::stepstag_soundlatch_word_w) { - m_soundlatch->write(space, offset, data, mem_mask); + m_soundlatch->write(data); m_subcpu->set_input_line(M68K_IRQ_6, HOLD_LINE); diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index 0b77fcf66e2..581115eb59a 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -61,7 +61,7 @@ single plane board. WRITE16_MEMBER(tigeroad_state::tigeroad_soundcmd_w) { if (ACCESSING_BITS_8_15) - m_soundlatch->write(space,offset,data >> 8); + m_soundlatch->write(data >> 8); } @@ -76,7 +76,7 @@ WRITE8_MEMBER(tigeroad_state::msm5205_w) WRITE8_MEMBER(f1dream_state::out1_w) { - m_soundlatch->write(space,2,data); + m_soundlatch->write(data); } WRITE8_MEMBER(f1dream_state::out3_w) diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index e0294a4002b..d8b92603e19 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -771,14 +771,14 @@ READ16_MEMBER(toaplan2_state::batrider_z80rom_r) // these two latches are always written together, via a single move.l instruction WRITE8_MEMBER(toaplan2_state::batrider_soundlatch_w) { - m_soundlatch->write(space, offset, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } WRITE8_MEMBER(toaplan2_state::batrider_soundlatch2_w) { - m_soundlatch2->write(space, offset, data & 0xff); + m_soundlatch2->write(data & 0xff); m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 88bca68e625..20dabd1812b 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -105,7 +105,7 @@ Notes: WRITE16_MEMBER(toki_state::tokib_soundcommand_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp index 5a30afd1faf..99b6ba0e83d 100644 --- a/src/mame/drivers/tryout.cpp +++ b/src/mame/drivers/tryout.cpp @@ -35,7 +35,7 @@ WRITE8_MEMBER(tryout_state::nmi_ack_w) WRITE8_MEMBER(tryout_state::sound_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 9d29fcc3e03..1b6cde80e5f 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -341,7 +341,7 @@ READ8_MEMBER(tsamurai_state::vsgongf_a100_r) WRITE8_MEMBER(tsamurai_state::vsgongf_sound_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index fb2ca9a1bc5..44f4cf76f6f 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -757,7 +757,7 @@ void tumbleb_state::htchctch_main_map(address_map &map) WRITE16_MEMBER(tumbleb_state::jumpkids_sound_w) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } @@ -822,9 +822,9 @@ void tumbleb_pic_state::pic_ctrl_w(uint8_t data) } if (!BIT(data, 4)) - m_pic_data = m_soundlatch->read(machine().dummy_space(), 0); + m_pic_data = m_soundlatch->read(); if (!BIT(data, 5)) - m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); + m_soundlatch->acknowledge_w(); } void tumbleb_pic_state::driver_start() @@ -841,7 +841,7 @@ WRITE16_MEMBER(tumbleb_state::semicom_soundcmd_w) { if (ACCESSING_BITS_0_7) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); // needed for Super Trio which reads the sound with polling // m_maincpu->spin_until_time(attotime::from_usec(100)); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20)); diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index a4366848760..50fde56e844 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -495,7 +495,7 @@ WRITE16_MEMBER(vamphalf_state::boonggab_lamps_w) WRITE8_MEMBER( vamphalf_state::qs1000_p3_w ) { if (!BIT(data, 5)) - m_soundlatch->acknowledge_w(space, 0, !BIT(data, 5)); + m_soundlatch->acknowledge_w(); membank("qs1000:data")->set_entry(data & 7); } diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index 6783050ab0b..d51c1255e12 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -75,7 +75,7 @@ WRITE8_MEMBER( vegaeo_state::qs1000_p3_w ) membank("qs1000:bank")->set_entry(data & 0x07); if (!BIT(data, 5)) - m_soundlatch->acknowledge_w(space, 0, !BIT(data, 5)); + m_soundlatch->acknowledge_w(); } WRITE8_MEMBER(vegaeo_state::vram_w) diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index 8a92726da2d..b658ebe7a41 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -113,7 +113,7 @@ WRITE8_MEMBER(wc90b_state::bankswitch1_w) WRITE8_MEMBER(wc90b_state::sound_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index 932feb70810..f7162038ce4 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -373,7 +373,7 @@ TIMER_CALLBACK_MEMBER(wyvernf0_state::nmi_callback) WRITE8_MEMBER(wyvernf0_state::sound_command_w) { - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); machine().scheduler().synchronize(timer_expired_delegate(FUNC(wyvernf0_state::nmi_callback),this), data); } diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp index 6d89fc31b09..3ee2f5391a3 100644 --- a/src/mame/drivers/yunsun16.cpp +++ b/src/mame/drivers/yunsun16.cpp @@ -159,7 +159,7 @@ WRITE8_MEMBER(magicbub_state::magicbub_sound_command_w) // HACK: the game continuously sends this. It'll play the oki sample number 0 on each voice. That sample is 00000-00000. if ((data & 0xff) != 0x3a) { - m_soundlatch->write(space, 0, data & 0xff); + m_soundlatch->write(data & 0xff); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } } diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp index bf6df337d4c..ce2c7c71a35 100644 --- a/src/mame/drivers/zerozone.cpp +++ b/src/mame/drivers/zerozone.cpp @@ -44,7 +44,7 @@ WRITE16_MEMBER( zerozone_state::sound_w ) { if (ACCESSING_BITS_8_15) { - m_soundlatch->write(space, offset, data >> 8); + m_soundlatch->write(data >> 8); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } } diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp index 705d99273af..b8d34577f7f 100644 --- a/src/mame/drivers/zodiack.cpp +++ b/src/mame/drivers/zodiack.cpp @@ -129,7 +129,7 @@ INTERRUPT_GEN_MEMBER(zodiack_state::zodiack_sound_nmi_gen) WRITE8_MEMBER( zodiack_state::master_soundlatch_w ) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 8b6e164597f..db4a5313ee2 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -123,7 +123,7 @@ private: optional_region_ptr_array m_adpcm_rom; - void ddragon_interrupt_ack(address_space &space, offs_t offset, uint8_t data); + void ddragon_interrupt_ack(offs_t offset, uint8_t data); void dd_adpcm_int(int chip); /* video/ddragon.c */ diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 21d84172f45..62682d3f280 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -72,7 +72,7 @@ private: optional_device m_eeprom; required_device m_soundlatch; - DECLARE_WRITE8_MEMBER(sound_command_w); + void sound_command_w(u8 data); void hedpanic_platform_w(u16 data); u8 eeprom_r(); void eeprom_w(u8 data); diff --git a/src/mame/machine/ajax.cpp b/src/mame/machine/ajax.cpp index 6ac648670e2..0b0db87970e 100644 --- a/src/mame/machine/ajax.cpp +++ b/src/mame/machine/ajax.cpp @@ -150,7 +150,7 @@ WRITE8_MEMBER(ajax_state::ls138_f10_w) m_audiocpu->set_input_line(0, HOLD_LINE); break; case 0x02: /* Sound command number */ - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); break; case 0x03: /* Bankswitch + coin counters + priority*/ bankswitch_w(space, 0, data); diff --git a/src/mame/machine/bublbobl.cpp b/src/mame/machine/bublbobl.cpp index 55ecc04b88f..5f2ae51ad1a 100644 --- a/src/mame/machine/bublbobl.cpp +++ b/src/mame/machine/bublbobl.cpp @@ -22,7 +22,7 @@ void bublbobl_state::common_sreset(int state) if (m_ym2203 != nullptr) m_ym2203->reset(); // ym2203, if present, is reset if (m_ym3526 != nullptr) m_ym3526->reset(); // ym3526, if present, is reset m_audiocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); // if a sound irq is active, it is cleared. is this necessary? if the above two devices de-assert /IRQ on reset (as a device_line write) properly, it shouldn't be... - m_sound_to_main->acknowledge_w(m_audiocpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // sound->main semaphore is cleared + m_sound_to_main->acknowledge_w(); // sound->main semaphore is cleared m_soundnmi->in_w<0>(0); // sound nmi enable is unset } m_audiocpu->set_input_line(INPUT_LINE_RESET, state); // soundcpu is reset diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp index 140e928e2bd..53c42a8559c 100644 --- a/src/mame/machine/decocass.cpp +++ b/src/mame/machine/decocass.cpp @@ -57,7 +57,7 @@ READ8_MEMBER( decocass_state::decocass_sound_command_main_r) WRITE8_MEMBER(decocass_state::decocass_sound_command_w) { LOG(2,("CPU %s sound command -> $%02x\n", m_maincpu->tag(), data)); - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_sound_ack |= 0x80; /* remove snd cpu data ack bit. i don't see it in the schems, but... */ m_sound_ack &= ~0x40; @@ -66,7 +66,7 @@ WRITE8_MEMBER(decocass_state::decocass_sound_command_w) READ8_MEMBER(decocass_state::decocass_sound_data_r) { - uint8_t data = m_soundlatch2->read(space, 0); + uint8_t data = m_soundlatch2->read(); LOG(2,("CPU %s sound data <- $%02x\n", m_maincpu->tag(), data)); return data; } @@ -81,13 +81,13 @@ READ8_MEMBER(decocass_state::decocass_sound_ack_r) WRITE8_MEMBER(decocass_state::decocass_sound_data_w) { LOG(2,("CPU %s sound data -> $%02x\n", m_audiocpu->tag(), data)); - m_soundlatch2->write(space, 0, data); + m_soundlatch2->write(data); m_sound_ack |= 0x40; } READ8_MEMBER(decocass_state::decocass_sound_command_r) { - uint8_t data = m_soundlatch->read(space, 0); + uint8_t data = m_soundlatch->read(); LOG(4,("CPU %s sound command <- $%02x\n", m_audiocpu->tag(), data)); m_audiocpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); m_sound_ack &= ~0x80; diff --git a/src/mame/machine/midyunit.cpp b/src/mame/machine/midyunit.cpp index a959e493516..c40aae938d3 100644 --- a/src/mame/machine/midyunit.cpp +++ b/src/mame/machine/midyunit.cpp @@ -592,7 +592,7 @@ WRITE16_MEMBER(midyunit_state::midyunit_sound_w) break; case SOUND_YAWDIM: - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); break; } diff --git a/src/mame/machine/tnzs.cpp b/src/mame/machine/tnzs.cpp index c6b88fcf275..f55bb847e5c 100644 --- a/src/mame/machine/tnzs.cpp +++ b/src/mame/machine/tnzs.cpp @@ -485,7 +485,7 @@ WRITE8_MEMBER(jpopnics_state::subbankswitch_w) WRITE8_MEMBER(tnzsb_state::sound_command_w) { - m_soundlatch->write(space, offset, data); + m_soundlatch->write(data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } diff --git a/src/mame/video/cischeat.cpp b/src/mame/video/cischeat.cpp index 91ecd99365d..750ecf21fae 100644 --- a/src/mame/video/cischeat.cpp +++ b/src/mame/video/cischeat.cpp @@ -224,7 +224,7 @@ READ16_MEMBER(cischeat_state::cischeat_ip_select_r) WRITE16_MEMBER(cischeat_state::cischeat_soundlatch_w) { /* Sound CPU: reads latch during int 4, and stores command */ - m_soundlatch->write(space, 0, data, mem_mask); + m_soundlatch->write(data); m_soundcpu->set_input_line(4, HOLD_LINE); } diff --git a/src/mame/video/ginganin.cpp b/src/mame/video/ginganin.cpp index b6bdb2de6eb..a477c41b80b 100644 --- a/src/mame/video/ginganin.cpp +++ b/src/mame/video/ginganin.cpp @@ -172,7 +172,7 @@ WRITE16_MEMBER(ginganin_state::ginganin_vregs16_w) machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); break; case 7: - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); break; default: diff --git a/src/mame/video/liberate.cpp b/src/mame/video/liberate.cpp index 35b1fbf6f57..4bd3e8d580b 100644 --- a/src/mame/video/liberate.cpp +++ b/src/mame/video/liberate.cpp @@ -126,7 +126,7 @@ WRITE8_MEMBER(liberate_state::deco16_io_w) m_maincpu->set_input_line(DECO16_IRQ_LINE, CLEAR_LINE); break; case 9: /* Sound */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6502_IRQ_LINE, HOLD_LINE); break; } @@ -154,7 +154,7 @@ WRITE8_MEMBER(liberate_state::prosoccr_io_w) m_maincpu->set_input_line(DECO16_IRQ_LINE, CLEAR_LINE); break; case 9: /* Sound */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6502_IRQ_LINE, HOLD_LINE); break; } @@ -173,7 +173,7 @@ WRITE8_MEMBER(liberate_state::prosport_io_w) m_back_tilemap->mark_all_dirty(); break; case 2: /* Sound */ - m_soundlatch->write(space, 0, data); + m_soundlatch->write(data); m_audiocpu->set_input_line(M6502_IRQ_LINE, HOLD_LINE); break; case 4: /* Irq ack */ diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp index ace59ad82cd..18868e4a545 100644 --- a/src/mame/video/megasys1.cpp +++ b/src/mame/video/megasys1.cpp @@ -271,20 +271,20 @@ WRITE16_MEMBER(megasys1_state::screen_flag_w) WRITE16_MEMBER(megasys1_state::soundlatch_w) { - m_soundlatch[0]->write(space, 0, data, mem_mask); + m_soundlatch[0]->write(data); m_audiocpu->set_input_line(4, HOLD_LINE); } WRITE16_MEMBER(megasys1_state::soundlatch_z_w) { - m_soundlatch[0]->write(space, 0, data & 0xff); + m_soundlatch[0]->write(data & 0xff); m_audiocpu->set_input_line(5, HOLD_LINE); } WRITE16_MEMBER(megasys1_state::soundlatch_c_w) { // Cybattler reads sound latch on irq 2 - m_soundlatch[0]->write(space, 0, data, mem_mask); + m_soundlatch[0]->write(data); m_audiocpu->set_input_line(2, HOLD_LINE); } -- cgit v1.2.3