diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-11-12 16:13:48 -0500 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-11-12 16:13:48 -0500 |
commit | c188d549658934ae30de9516e0975e792d058f00 (patch) | |
tree | c586441e4209539b7ffa2989a28d0353db947ef9 /src/mame/audio | |
parent | 5b59f07b1b72576e611fba43e0c63b49553a9a66 (diff) |
discrete: Eliminate unnecessary address space argument from handlers (nw)
audio/galaxian: Move configuration to driver files (nw)
Diffstat (limited to 'src/mame/audio')
-rw-r--r-- | src/mame/audio/8080bw.cpp | 42 | ||||
-rw-r--r-- | src/mame/audio/asteroid.cpp | 10 | ||||
-rw-r--r-- | src/mame/audio/avalnche.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/bsktball.cpp | 6 | ||||
-rw-r--r-- | src/mame/audio/bzone.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/canyon.cpp | 4 | ||||
-rw-r--r-- | src/mame/audio/circus.cpp | 14 | ||||
-rw-r--r-- | src/mame/audio/crbaloon.cpp | 6 | ||||
-rw-r--r-- | src/mame/audio/dkong.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/firetrk.cpp | 16 | ||||
-rw-r--r-- | src/mame/audio/galaxian.cpp | 60 | ||||
-rw-r--r-- | src/mame/audio/galaxian.h | 5 | ||||
-rw-r--r-- | src/mame/audio/llander.cpp | 10 | ||||
-rw-r--r-- | src/mame/audio/m79amb.cpp | 16 | ||||
-rw-r--r-- | src/mame/audio/mw8080bw.cpp | 167 | ||||
-rw-r--r-- | src/mame/audio/namco52.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/namco54.cpp | 6 | ||||
-rw-r--r-- | src/mame/audio/orbit.cpp | 12 | ||||
-rw-r--r-- | src/mame/audio/phoenix.cpp | 14 | ||||
-rw-r--r-- | src/mame/audio/poolshrk.cpp | 8 | ||||
-rw-r--r-- | src/mame/audio/qix.cpp | 4 | ||||
-rw-r--r-- | src/mame/audio/skyraid.cpp | 10 | ||||
-rw-r--r-- | src/mame/audio/snk6502.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/spiders.cpp | 14 | ||||
-rw-r--r-- | src/mame/audio/subs.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/vicdual.cpp | 40 |
26 files changed, 215 insertions, 261 deletions
diff --git a/src/mame/audio/8080bw.cpp b/src/mame/audio/8080bw.cpp index 518d1db7a0b..ed88e244747 100644 --- a/src/mame/audio/8080bw.cpp +++ b/src/mame/audio/8080bw.cpp @@ -242,7 +242,7 @@ DISCRETE_SOUND_END WRITE8_MEMBER( _8080bw_state::ballbomb_01_w ) { - m_discrete->write(space, BALLBOMB_MUSIC_DATA, data|0x80); + m_discrete->write(BALLBOMB_MUSIC_DATA, data|0x80); } WRITE8_MEMBER(_8080bw_state::ballbomb_sh_port_1_w) @@ -351,7 +351,7 @@ WRITE8_MEMBER(_8080bw_state::indianbt_sh_port_2_w) WRITE8_MEMBER(_8080bw_state::indianbt_sh_port_3_w) { - m_discrete->write(space, INDIANBT_MUSIC_DATA, data); + m_discrete->write(INDIANBT_MUSIC_DATA, data); } WRITE8_MEMBER(_8080bw_state::indianbtbr_sh_port_1_w) @@ -695,27 +695,27 @@ DISCRETE_SOUND_END WRITE8_MEMBER(_8080bw_state::polaris_sh_port_1_w) { - m_discrete->write(space, POLARIS_MUSIC_DATA, data); + m_discrete->write(POLARIS_MUSIC_DATA, data); } WRITE8_MEMBER(_8080bw_state::polaris_sh_port_2_w) { /* 0x01 - SX0 - Shot */ - m_discrete->write(space, POLARIS_SX0_EN, data & 0x01); + m_discrete->write(POLARIS_SX0_EN, data & 0x01); /* 0x02 - SX1 - Ship Hit (Sub) */ - m_discrete->write(space, POLARIS_SX1_EN, data & 0x02); + m_discrete->write(POLARIS_SX1_EN, data & 0x02); /* 0x04 - SX2 - Ship */ - m_discrete->write(space, POLARIS_SX2_EN, data & 0x04); + m_discrete->write(POLARIS_SX2_EN, data & 0x04); /* 0x08 - SX3 - Explosion */ - m_discrete->write(space, POLARIS_SX3_EN, data & 0x08); + m_discrete->write(POLARIS_SX3_EN, data & 0x08); /* 0x10 - SX4 */ /* 0x20 - SX5 - Sound Enable */ - m_discrete->write(space, POLARIS_SX5_EN, data & 0x20); + m_discrete->write(POLARIS_SX5_EN, data & 0x20); } WRITE8_MEMBER(_8080bw_state::polaris_sh_port_3_w) @@ -725,16 +725,16 @@ WRITE8_MEMBER(_8080bw_state::polaris_sh_port_3_w) m_flip_screen = BIT(data, 5) & BIT(ioport("IN2")->read(), 2); /* SX11 */ /* 0x01 - SX6 - Plane Down */ - m_discrete->write(space, POLARIS_SX6_EN, data & 0x01); + m_discrete->write(POLARIS_SX6_EN, data & 0x01); /* 0x02 - SX7 - Plane Up */ - m_discrete->write(space, POLARIS_SX7_EN, data & 0x02); + m_discrete->write(POLARIS_SX7_EN, data & 0x02); /* 0x08 - SX9 - Hit */ - m_discrete->write(space, POLARIS_SX9_EN, data & 0x08); + m_discrete->write(POLARIS_SX9_EN, data & 0x08); /* 0x10 - SX10 - Hit */ - m_discrete->write(space, POLARIS_SX10_EN, data & 0x10); + m_discrete->write(POLARIS_SX10_EN, data & 0x10); } @@ -859,8 +859,8 @@ WRITE8_MEMBER(_8080bw_state::schaser_sh_port_1_w) Note that the schematic has SX2 and SX4 the wrong way around. See MT 2662 for video proof. */ - m_discrete->write(space, SCHASER_DOT_EN, data & 0x01); - m_discrete->write(space, SCHASER_DOT_SEL, data & 0x02); + m_discrete->write(SCHASER_DOT_EN, data & 0x01); + m_discrete->write(SCHASER_DOT_SEL, data & 0x02); /* The effect is a variable rate 555 timer. A diode/resistor array is used to * select the frequency. Because of the diode voltage drop, we can not use the @@ -921,9 +921,9 @@ WRITE8_MEMBER(_8080bw_state::schaser_sh_port_2_w) bit 4 - Field Control B (SX10) bit 5 - Flip Screen */ - m_discrete->write(space, SCHASER_MUSIC_BIT, BIT(data, 0)); + m_discrete->write(SCHASER_MUSIC_BIT, BIT(data, 0)); - m_discrete->write(space, SCHASER_SND_EN, BIT(data, 1)); + m_discrete->write(SCHASER_SND_EN, BIT(data, 1)); machine().sound().system_enable(BIT(data, 1)); machine().bookkeeping().coin_lockout_global_w(BIT(data, 2)); @@ -1061,7 +1061,7 @@ const char *const lupin3_sample_names[] = WRITE8_MEMBER( _8080bw_state::lupin3_00_w ) { - m_discrete->write(space, INDIANBT_MUSIC_DATA, data); + m_discrete->write(INDIANBT_MUSIC_DATA, data); } WRITE8_MEMBER(_8080bw_state::lupin3_sh_port_1_w) @@ -1151,10 +1151,10 @@ WRITE8_MEMBER(_8080bw_state::crashrd_port03_w) bit 4 - Dot Sound Enable (SX0) bit 5 - Effect Sound C (SX4) */ - m_discrete->write(space, SCHASER_SND_EN, BIT(data,5)); + m_discrete->write(SCHASER_SND_EN, BIT(data,5)); machine().sound().system_enable(BIT(data,5)); - m_discrete->write(space, SCHASER_DOT_EN, BIT(data, 4)); - m_discrete->write(space, SCHASER_DOT_SEL, BIT(data, 0)); + m_discrete->write(SCHASER_DOT_EN, BIT(data, 4)); + m_discrete->write(SCHASER_DOT_SEL, BIT(data, 0)); /* The effect is a variable rate 555 timer. A diode/resistor array is used to * select the frequency. Because of the diode voltage drop, we can not use the @@ -1210,7 +1210,7 @@ WRITE8_MEMBER(_8080bw_state::crashrd_port05_w) { // bit 0 = bitstream audio // bit 4 = not sure - m_discrete->write(space, SCHASER_MUSIC_BIT, BIT(data, 0)); + m_discrete->write(SCHASER_MUSIC_BIT, BIT(data, 0)); } diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp index 1b647d42a4e..bfc5bb773f7 100644 --- a/src/mame/audio/asteroid.cpp +++ b/src/mame/audio/asteroid.cpp @@ -283,7 +283,7 @@ DISCRETE_SOUND_END WRITE8_MEMBER(asteroid_state::asteroid_explode_w) { - m_discrete->write(space,ASTEROID_EXPLODE_DATA,(data&0x3c)>>2); // Volume + m_discrete->write(ASTEROID_EXPLODE_DATA,(data&0x3c)>>2); // Volume /* We will modify the pitch data to send the divider value. */ switch ((data&0xc0)) { @@ -300,18 +300,18 @@ WRITE8_MEMBER(asteroid_state::asteroid_explode_w) data = 5; break; } - m_discrete->write(space, ASTEROID_EXPLODE_PITCH, data); + m_discrete->write(ASTEROID_EXPLODE_PITCH, data); } WRITE8_MEMBER(asteroid_state::asteroid_thump_w) { - m_discrete->write(space, ASTEROID_THUMP_EN, data & 0x10); - m_discrete->write(space, ASTEROID_THUMP_DATA, data & 0x0f); + m_discrete->write(ASTEROID_THUMP_EN, data & 0x10); + m_discrete->write(ASTEROID_THUMP_DATA, data & 0x0f); } WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w) { - m_discrete->write(space, ASTEROID_NOISE_RESET, 0); + m_discrete->write(ASTEROID_NOISE_RESET, 0); } diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp index 2572b907698..3200bd8576f 100644 --- a/src/mame/audio/avalnche.cpp +++ b/src/mame/audio/avalnche.cpp @@ -26,7 +26,7 @@ WRITE8_MEMBER(avalnche_state::avalnche_noise_amplitude_w) { - m_discrete->write(space, AVALNCHE_SOUNDLVL_DATA, data & 0x3f); + m_discrete->write(AVALNCHE_SOUNDLVL_DATA, data & 0x3f); } diff --git a/src/mame/audio/bsktball.cpp b/src/mame/audio/bsktball.cpp index 287d6523d6e..3acf428145b 100644 --- a/src/mame/audio/bsktball.cpp +++ b/src/mame/audio/bsktball.cpp @@ -14,13 +14,13 @@ Sound handlers ***************************************************************************/ WRITE8_MEMBER(bsktball_state::bsktball_bounce_w) { - m_discrete->write(space, BSKTBALL_CROWD_DATA, data & 0x0f); // Crowd - m_discrete->write(space, BSKTBALL_BOUNCE_EN, data & 0x10); // Bounce + m_discrete->write(BSKTBALL_CROWD_DATA, data & 0x0f); // Crowd + m_discrete->write(BSKTBALL_BOUNCE_EN, data & 0x10); // Bounce } WRITE8_MEMBER(bsktball_state::bsktball_note_w) { - m_discrete->write(space, BSKTBALL_NOTE_DATA, data); // Note + m_discrete->write(BSKTBALL_NOTE_DATA, data); // Note } diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index aada4df6c6f..5698b787737 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -390,7 +390,7 @@ DISCRETE_SOUND_END WRITE8_MEMBER(bzone_state::bzone_sounds_w) { - m_discrete->write(space, BZ_INPUT, data); + m_discrete->write(BZ_INPUT, data); m_startled = BIT(data, 6); machine().sound().system_enable(data & 0x20); diff --git a/src/mame/audio/canyon.cpp b/src/mame/audio/canyon.cpp index 2819659e030..f928c997e69 100644 --- a/src/mame/audio/canyon.cpp +++ b/src/mame/audio/canyon.cpp @@ -18,13 +18,13 @@ WRITE8_MEMBER(canyon_state::canyon_motor_w) { - m_discrete->write(space, NODE_RELATIVE(CANYON_MOTOR1_DATA, (offset & 0x01)), data & 0x0f); + m_discrete->write(NODE_RELATIVE(CANYON_MOTOR1_DATA, (offset & 0x01)), data & 0x0f); } WRITE8_MEMBER(canyon_state::canyon_explode_w) { - m_discrete->write(space, CANYON_EXPLODE_DATA, data >> 4); + m_discrete->write(CANYON_EXPLODE_DATA, data >> 4); } diff --git a/src/mame/audio/circus.cpp b/src/mame/audio/circus.cpp index b589d1ccc5a..c5e27151029 100644 --- a/src/mame/audio/circus.cpp +++ b/src/mame/audio/circus.cpp @@ -162,11 +162,11 @@ WRITE8_MEMBER(circus_state::circus_clown_z_w) switch ((data & 0x70) >> 4) { case 0 : /* All Off */ - m_discrete->write(space, CIRCUS_MUSIC_BIT, 0); + m_discrete->write(CIRCUS_MUSIC_BIT, 0); break; case 1 : /* Music */ - m_discrete->write(space, CIRCUS_MUSIC_BIT, 1); + m_discrete->write(CIRCUS_MUSIC_BIT, 1); break; case 2 : /* Circus = Pop; Rip Cord = Splash */ @@ -195,7 +195,7 @@ WRITE8_MEMBER(circus_state::circus_clown_z_w) break; case 2: /* robotbwl */ - m_discrete->write(space, ROBOTBWL_MUSIC_BIT, data & 0x08); /* Footsteps */ + m_discrete->write(ROBOTBWL_MUSIC_BIT, data & 0x08); /* Footsteps */ if (data & 0x40) /* Hit */ m_samples->start(0, 0); @@ -220,11 +220,11 @@ WRITE8_MEMBER(circus_state::circus_clown_z_w) switch ((data & 0x70) >> 4) { case 0 : /* All Off */ - m_discrete->write(space, CRASH_MUSIC_BIT, 0); + m_discrete->write(CRASH_MUSIC_BIT, 0); break; case 1 : /* Music */ - m_discrete->write(space, CRASH_MUSIC_BIT, 1); + m_discrete->write(CRASH_MUSIC_BIT, 1); break; case 2 : /* Crash */ @@ -232,14 +232,14 @@ WRITE8_MEMBER(circus_state::circus_clown_z_w) break; case 3 : /* Normal Video and Beep */ - m_discrete->write(space, CRASH_BEEPER_EN, 0); + m_discrete->write(CRASH_BEEPER_EN, 0); break; case 4 : /* Skid */ break; case 5 : /* Invert Video and Beep */ - m_discrete->write(space, CRASH_BEEPER_EN, 0); + m_discrete->write(CRASH_BEEPER_EN, 0); break; case 6 : /* Hi Motor */ diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index 48f4236aabe..1b9649aa891 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -33,13 +33,13 @@ WRITE8_MEMBER(crbaloon_state::crbaloon_audio_set_music_freq) { - m_discrete->write(space, CRBALOON_MUSIC_DATA, data); + m_discrete->write(CRBALOON_MUSIC_DATA, data); } WRITE8_MEMBER(crbaloon_state::crbaloon_audio_set_music_enable) { - m_discrete->write(space, CRBALOON_MUSIC_EN, data); + m_discrete->write(CRBALOON_MUSIC_EN, data); } @@ -67,7 +67,7 @@ void crbaloon_state::crbaloon_audio_set_appear_enable(int enabled) WRITE8_MEMBER(crbaloon_state::crbaloon_audio_set_laugh_enable) { - m_discrete->write(space, CRBALOON_LAUGH_EN, data); + m_discrete->write(CRBALOON_LAUGH_EN, data); } diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 0d1080e8098..8119918ffa4 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1245,7 +1245,7 @@ READ8_MEMBER(dkong_state::dkong_tune_r) WRITE8_MEMBER(dkong_state::dkong_p1_w) { - m_discrete->write(space,DS_DAC,data); + m_discrete->write(DS_DAC,data); } diff --git a/src/mame/audio/firetrk.cpp b/src/mame/audio/firetrk.cpp index 562423e5391..849fe26138f 100644 --- a/src/mame/audio/firetrk.cpp +++ b/src/mame/audio/firetrk.cpp @@ -17,50 +17,50 @@ WRITE8_MEMBER(firetrk_state::firetrk_skid_reset_w) m_skid[1] = 0; // also SUPERBUG_SKID_EN - m_discrete->write(space, FIRETRUCK_SKID_EN, 1); + m_discrete->write(FIRETRUCK_SKID_EN, 1); } WRITE8_MEMBER(firetrk_state::montecar_skid_reset_w) { - m_discrete->write(space, MONTECAR_SKID_EN, 1); + m_discrete->write(MONTECAR_SKID_EN, 1); } WRITE8_MEMBER(firetrk_state::firetrk_crash_snd_w) { // also SUPERBUG_CRASH_DATA and MONTECAR_CRASH_DATA - m_discrete->write(space, FIRETRUCK_CRASH_DATA, data >> 4); + m_discrete->write(FIRETRUCK_CRASH_DATA, data >> 4); } WRITE8_MEMBER(firetrk_state::firetrk_skid_snd_w) { // also SUPERBUG_SKID_EN and MONTECAR_SKID_EN - m_discrete->write(space, FIRETRUCK_SKID_EN, 0); + m_discrete->write(FIRETRUCK_SKID_EN, 0); } WRITE8_MEMBER(firetrk_state::firetrk_motor_snd_w) { // also MONTECAR_DRONE_MOTOR_DATA - m_discrete->write(space, FIRETRUCK_SIREN_DATA, data >> 4); + m_discrete->write(FIRETRUCK_SIREN_DATA, data >> 4); // also MONTECAR_MOTOR_DATA - m_discrete->write(space, FIRETRUCK_MOTOR_DATA, data & 0x0f); + m_discrete->write(FIRETRUCK_MOTOR_DATA, data & 0x0f); } WRITE8_MEMBER(firetrk_state::superbug_motor_snd_w) { - m_discrete->write(space, SUPERBUG_SPEED_DATA, data & 0x0f); + m_discrete->write(SUPERBUG_SPEED_DATA, data & 0x0f); } WRITE8_MEMBER(firetrk_state::firetrk_xtndply_w) { // also SUPERBUG_ASR_EN (extended play) - m_discrete->write(space, FIRETRUCK_XTNDPLY_EN, data); + m_discrete->write(FIRETRUCK_XTNDPLY_EN, data); } diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index 06a3ad300ec..57277decfd6 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -25,7 +25,6 @@ TODO: #include "emu.h" #include "audio/galaxian.h" #include "includes/galaxian.h" -#include "includes/galaxold.h" /************************************* * @@ -244,7 +243,7 @@ static const discrete_op_amp_filt_info galaxian_bandpass_desc = *************************************/ -static DISCRETE_SOUND_START(galaxian_discrete) +DISCRETE_SOUND_START(galaxian_discrete) /************************************************/ /* Input register mapping for galaxian */ @@ -376,7 +375,7 @@ static DISCRETE_SOUND_START(galaxian_discrete) DISCRETE_SOUND_END -static DISCRETE_SOUND_START(mooncrst_discrete) +DISCRETE_SOUND_START(mooncrst_discrete) DISCRETE_IMPORT(galaxian_discrete) /************************************************/ @@ -417,7 +416,7 @@ void galaxian_sound_device::device_start() /* IC 9J */ WRITE8_MEMBER( galaxian_sound_device::pitch_w ) { - m_discrete->write(space, GAL_INP_PITCH, data ); + m_discrete->write(GAL_INP_PITCH, data ); } WRITE8_MEMBER( galaxian_sound_device::lfo_freq_w ) @@ -427,28 +426,28 @@ WRITE8_MEMBER( galaxian_sound_device::lfo_freq_w ) if (m_lfo_val != lfo_val_new) { m_lfo_val = lfo_val_new; - m_discrete->write(space, GAL_INP_BG_DAC, m_lfo_val); + m_discrete->write(GAL_INP_BG_DAC, m_lfo_val); } } WRITE8_MEMBER( galaxian_sound_device::background_enable_w ) { - m_discrete->write(space, NODE_RELATIVE(GAL_INP_FS1, offset), data & 0x01); + m_discrete->write(NODE_RELATIVE(GAL_INP_FS1, offset), data & 0x01); } WRITE8_MEMBER( galaxian_sound_device::noise_enable_w ) { - m_discrete->write(space, GAL_INP_HIT, data & 0x01); + m_discrete->write(GAL_INP_HIT, data & 0x01); } WRITE8_MEMBER( galaxian_sound_device::vol_w ) { - m_discrete->write(space, NODE_RELATIVE(GAL_INP_VOL1,offset), data & 0x01); + m_discrete->write(NODE_RELATIVE(GAL_INP_VOL1,offset), data & 0x01); } WRITE8_MEMBER( galaxian_sound_device::fire_enable_w ) { - m_discrete->write(space, GAL_INP_FIRE, data & 0x01); + m_discrete->write(GAL_INP_FIRE, data & 0x01); } /* FIXME: May be replaced by one call! */ @@ -488,46 +487,3 @@ WRITE8_MEMBER( galaxian_sound_device::sound_w ) void galaxian_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) { } - -/************************************* - * - * Driver definitions - * - *************************************/ - -MACHINE_CONFIG_START(galaxold_state::galaxian_audio) - - MCFG_DEVICE_ADD("cust", GALAXIAN, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, galaxian_discrete) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(galaxold_state::mooncrst_audio) - - MCFG_DEVICE_ADD("cust", GALAXIAN, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, mooncrst_discrete) - - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(galaxian_state::galaxian_audio) - - MCFG_DEVICE_ADD("cust", GALAXIAN, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, galaxian_discrete) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(galaxian_state::mooncrst_audio) - - MCFG_DEVICE_ADD("cust", GALAXIAN, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, mooncrst_discrete) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) -MACHINE_CONFIG_END diff --git a/src/mame/audio/galaxian.h b/src/mame/audio/galaxian.h index 58ae3e360c2..7165ca6d011 100644 --- a/src/mame/audio/galaxian.h +++ b/src/mame/audio/galaxian.h @@ -22,9 +22,6 @@ public: DECLARE_WRITE8_MEMBER( fire_enable_w ); DECLARE_WRITE8_MEMBER( lfo_freq_w ); - void mooncrst_audio(machine_config &config); - void galaxian_audio(machine_config &config); - protected: // device-level overrides virtual void device_start() override; @@ -40,5 +37,7 @@ private: DECLARE_DEVICE_TYPE(GALAXIAN, galaxian_sound_device) +DISCRETE_SOUND_EXTERN(galaxian_discrete); +DISCRETE_SOUND_EXTERN(mooncrst_discrete); #endif // MAME_AUDIO_GALAXIAN_H diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp index 6c2ec3510b1..4c216f3679b 100644 --- a/src/mame/audio/llander.cpp +++ b/src/mame/audio/llander.cpp @@ -86,15 +86,15 @@ DISCRETE_SOUND_END WRITE8_MEMBER(asteroid_state::llander_snd_reset_w) { /* Resets the LFSR that is used for the white noise generator */ - m_discrete->write(space, LLANDER_NOISE_RESET, 0); /* Reset */ + m_discrete->write(LLANDER_NOISE_RESET, 0); /* Reset */ } WRITE8_MEMBER(asteroid_state::llander_sounds_w) { - m_discrete->write(space, LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */ - m_discrete->write(space, LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */ - m_discrete->write(space, LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */ - m_discrete->write(space, LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */ + m_discrete->write(LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */ + m_discrete->write(LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */ + m_discrete->write(LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */ + m_discrete->write(LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */ } diff --git a/src/mame/audio/m79amb.cpp b/src/mame/audio/m79amb.cpp index 0d989b357d0..ad33b2f3761 100644 --- a/src/mame/audio/m79amb.cpp +++ b/src/mame/audio/m79amb.cpp @@ -327,9 +327,9 @@ WRITE8_MEMBER(m79amb_state::m79amb_8000_w) /* these values are not latched */ /* they are pulsed when the port is addressed */ /* the discrete system will just trigger from them */ - m_discrete->write(space, M79AMB_SHOT_EN, data & 0x01); - m_discrete->write(space, M79AMB_BOOM_EN, data & 0x02); - m_discrete->write(space, M79AMB_THUD_EN, data & 0x04); + m_discrete->write(M79AMB_SHOT_EN, data & 0x01); + m_discrete->write(M79AMB_BOOM_EN, data & 0x02); + m_discrete->write(M79AMB_THUD_EN, data & 0x04); } WRITE8_MEMBER(m79amb_state::m79amb_8003_w) @@ -337,9 +337,9 @@ WRITE8_MEMBER(m79amb_state::m79amb_8003_w) /* Self Test goes low on reset and lights LED */ /* LED goes off on pass */ m_self_test = BIT(data, 0); - m_discrete->write(space, M79AMB_MC_REV_EN, data & 0x02); - m_discrete->write(space, M79AMB_MC_CONTROL_EN, data & 0x04); - m_discrete->write(space, M79AMB_TANK_TRUCK_JEEP_EN, data & 0x08); - m_discrete->write(space, M79AMB_WHISTLE_B_EN, data & 0x10); - m_discrete->write(space, M79AMB_WHISTLE_A_EN, data & 0x20); + m_discrete->write(M79AMB_MC_REV_EN, data & 0x02); + m_discrete->write(M79AMB_MC_CONTROL_EN, data & 0x04); + m_discrete->write(M79AMB_TANK_TRUCK_JEEP_EN, data & 0x08); + m_discrete->write(M79AMB_WHISTLE_B_EN, data & 0x10); + m_discrete->write(M79AMB_WHISTLE_A_EN, data & 0x20); } diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index f4d9781f174..67c7a133406 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -84,9 +84,9 @@ static const discrete_op_amp_tvca_info midway_music_tvca_info = WRITE8_MEMBER(mw8080bw_state::midway_tone_generator_lo_w) { - m_discrete->write(space, MIDWAY_TONE_EN, (data >> 0) & 0x01); + m_discrete->write(MIDWAY_TONE_EN, (data >> 0) & 0x01); - m_discrete->write(space, MIDWAY_TONE_DATA_L, (data >> 1) & 0x1f); + m_discrete->write(MIDWAY_TONE_DATA_L, (data >> 1) & 0x1f); /* D6 and D7 are not connected */ } @@ -94,7 +94,7 @@ WRITE8_MEMBER(mw8080bw_state::midway_tone_generator_lo_w) WRITE8_MEMBER(mw8080bw_state::midway_tone_generator_hi_w) { - m_discrete->write(space, MIDWAY_TONE_DATA_H, data & 0x3f); + m_discrete->write(MIDWAY_TONE_DATA_H, data & 0x3f); /* D6 and D7 are not connected */ } @@ -317,11 +317,11 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::tornbase_audio_w) { - m_discrete->write(space, TORNBASE_TONE_240_EN, (data >> 0) & 0x01); + m_discrete->write(TORNBASE_TONE_240_EN, (data >> 0) & 0x01); - m_discrete->write(space, TORNBASE_TONE_960_EN, (data >> 1) & 0x01); + m_discrete->write(TORNBASE_TONE_960_EN, (data >> 1) & 0x01); - m_discrete->write(space, TORNBASE_TONE_120_EN, (data >> 2) & 0x01); + m_discrete->write(TORNBASE_TONE_120_EN, (data >> 2) & 0x01); /* if (data & 0x08) enable SIREN sound */ @@ -565,18 +565,17 @@ void mw8080bw_state::maze_write_discrete(uint8_t maze_tone_timing_state) /* controls need to be active low */ int controls = ~ioport("IN0")->read() & 0xff; - address_space &space = machine().dummy_space(); - m_discrete->write(space, MAZE_TONE_TIMING, maze_tone_timing_state); - m_discrete->write(space, MAZE_P1_DATA, controls & 0x0f); - m_discrete->write(space, MAZE_P2_DATA, (controls >> 4) & 0x0f); - m_discrete->write(space, MAZE_JOYSTICK_IN_USE, controls != 0xff); + m_discrete->write(MAZE_TONE_TIMING, maze_tone_timing_state); + m_discrete->write(MAZE_P1_DATA, controls & 0x0f); + m_discrete->write(MAZE_P2_DATA, (controls >> 4) & 0x0f); + m_discrete->write(MAZE_JOYSTICK_IN_USE, controls != 0xff); /* The coin line is connected directly to the discrete circuit. */ /* We can't really do that, so updating it with the tone timing is close enough. */ /* A better option might be to update it at vblank or set a timer to do it. */ /* The only noticeable difference doing it here, is that the controls don't */ /* immediately start making tones if pressed right after the coin is inserted. */ - m_discrete->write(space, MAZE_COIN, (~ioport("IN1")->read() >> 3) & 0x01); + m_discrete->write(MAZE_COIN, (~ioport("IN1")->read() >> 3) & 0x01); } @@ -814,15 +813,15 @@ WRITE8_MEMBER(mw8080bw_state::boothill_audio_w) machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); - m_discrete->write(space, BOOTHILL_GAME_ON_EN, (data >> 3) & 0x01); + m_discrete->write(BOOTHILL_GAME_ON_EN, (data >> 3) & 0x01); - m_discrete->write(space, BOOTHILL_LEFT_SHOT_EN, (data >> 4) & 0x01); + m_discrete->write(BOOTHILL_LEFT_SHOT_EN, (data >> 4) & 0x01); - m_discrete->write(space, BOOTHILL_RIGHT_SHOT_EN, (data >> 5) & 0x01); + m_discrete->write(BOOTHILL_RIGHT_SHOT_EN, (data >> 5) & 0x01); - m_discrete->write(space, BOOTHILL_LEFT_HIT_EN, (data >> 6) & 0x01); + m_discrete->write(BOOTHILL_LEFT_HIT_EN, (data >> 6) & 0x01); - m_discrete->write(space, BOOTHILL_RIGHT_HIT_EN, (data >> 7) & 0x01); + m_discrete->write(BOOTHILL_RIGHT_HIT_EN, (data >> 7) & 0x01); } @@ -1038,16 +1037,16 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::checkmat_audio_w) { - m_discrete->write(space, CHECKMAT_TONE_EN, data & 0x01); + m_discrete->write(CHECKMAT_TONE_EN, data & 0x01); - m_discrete->write(space, CHECKMAT_BOOM_EN, (data >> 1) & 0x01); + m_discrete->write(CHECKMAT_BOOM_EN, (data >> 1) & 0x01); machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); - m_discrete->write(space, CHECKMAT_TONE_DATA_45, (data >> 4) & 0x03); - m_discrete->write(space, CHECKMAT_TONE_DATA_67, (data >> 6) & 0x03); + m_discrete->write(CHECKMAT_TONE_DATA_45, (data >> 4) & 0x03); + m_discrete->write(CHECKMAT_TONE_DATA_67, (data >> 6) & 0x03); } @@ -1252,23 +1251,23 @@ WRITE8_MEMBER(mw8080bw_state::desertgu_audio_1_w) machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); - m_discrete->write(space, DESERTGU_GAME_ON_EN, (data >> 3) & 0x01); + m_discrete->write(DESERTGU_GAME_ON_EN, (data >> 3) & 0x01); - m_discrete->write(space, DESERTGU_RIFLE_SHOT_EN, (data >> 4) & 0x01); + m_discrete->write(DESERTGU_RIFLE_SHOT_EN, (data >> 4) & 0x01); - m_discrete->write(space, DESERTGU_BOTTLE_HIT_EN, (data >> 5) & 0x01); + m_discrete->write(DESERTGU_BOTTLE_HIT_EN, (data >> 5) & 0x01); - m_discrete->write(space, DESERTGU_ROAD_RUNNER_HIT_EN, (data >> 6) & 0x01); + m_discrete->write(DESERTGU_ROAD_RUNNER_HIT_EN, (data >> 6) & 0x01); - m_discrete->write(space, DESERTGU_CREATURE_HIT_EN, (data >> 7) & 0x01); + m_discrete->write(DESERTGU_CREATURE_HIT_EN, (data >> 7) & 0x01); } WRITE8_MEMBER(mw8080bw_state::desertgu_audio_2_w) { - m_discrete->write(space, DESERTGU_ROADRUNNER_BEEP_BEEP_EN, (data >> 0) & 0x01); + m_discrete->write(DESERTGU_ROADRUNNER_BEEP_BEEP_EN, (data >> 0) & 0x01); - m_discrete->write(space, DESERTGU_TRIGGER_CLICK_EN, (data >> 1) & 0x01); + m_discrete->write(DESERTGU_TRIGGER_CLICK_EN, (data >> 1) & 0x01); output().set_value("Player1_Gun_Recoil", (data >> 2) & 0x01); @@ -1512,15 +1511,15 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::dplay_audio_w) { - m_discrete->write(space, DPLAY_TONE_ON_EN, (data >> 0) & 0x01); + m_discrete->write(DPLAY_TONE_ON_EN, (data >> 0) & 0x01); - m_discrete->write(space, DPLAY_CHEER_EN, (data >> 1) & 0x01); + m_discrete->write(DPLAY_CHEER_EN, (data >> 1) & 0x01); - m_discrete->write(space, DPLAY_SIREN_EN, (data >> 2) & 0x01); + m_discrete->write(DPLAY_SIREN_EN, (data >> 2) & 0x01); - m_discrete->write(space, DPLAY_WHISTLE_EN, (data >> 3) & 0x01); + m_discrete->write(DPLAY_WHISTLE_EN, (data >> 3) & 0x01); - m_discrete->write(space, DPLAY_GAME_ON_EN, (data >> 4) & 0x01); + m_discrete->write(DPLAY_GAME_ON_EN, (data >> 4) & 0x01); machine().bookkeeping().coin_counter_w(0, (data >> 5) & 0x01); @@ -1922,15 +1921,15 @@ WRITE8_MEMBER(mw8080bw_state::clowns_audio_2_w) { uint8_t rising_bits = data & ~m_port_2_last; - m_discrete->write(space, CLOWNS_POP_BOTTOM_EN, (data >> 0) & 0x01); + m_discrete->write(CLOWNS_POP_BOTTOM_EN, (data >> 0) & 0x01); - m_discrete->write(space, CLOWNS_POP_MIDDLE_EN, (data >> 1) & 0x01); + m_discrete->write(CLOWNS_POP_MIDDLE_EN, (data >> 1) & 0x01); - m_discrete->write(space, CLOWNS_POP_TOP_EN, (data >> 2) & 0x01); + m_discrete->write(CLOWNS_POP_TOP_EN, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); - m_discrete->write(space, CLOWNS_SPRINGBOARD_HIT_EN, (data >> 4) & 0x01); + m_discrete->write(CLOWNS_SPRINGBOARD_HIT_EN, (data >> 4) & 0x01); if (rising_bits & 0x20) m_samples->start(0, 0); /* springboard miss */ @@ -2280,22 +2279,22 @@ WRITE8_MEMBER(mw8080bw_state::spacwalk_audio_1_w) machine().sound().system_enable((data >> 2) & 0x01); - m_discrete->write(space, SPACWALK_SPACE_SHIP_EN, (data >> 3) & 0x01); + m_discrete->write(SPACWALK_SPACE_SHIP_EN, (data >> 3) & 0x01); } WRITE8_MEMBER(mw8080bw_state::spacwalk_audio_2_w) { - m_discrete->write(space, SPACWALK_TARGET_HIT_BOTTOM_EN, (data >> 0) & 0x01); + m_discrete->write(SPACWALK_TARGET_HIT_BOTTOM_EN, (data >> 0) & 0x01); - m_discrete->write(space, SPACWALK_TARGET_HIT_MIDDLE_EN, (data >> 1) & 0x01); + m_discrete->write(SPACWALK_TARGET_HIT_MIDDLE_EN, (data >> 1) & 0x01); - m_discrete->write(space, SPACWALK_TARGET_HIT_TOP_EN, (data >> 2) & 0x01); + m_discrete->write(SPACWALK_TARGET_HIT_TOP_EN, (data >> 2) & 0x01); - m_discrete->write(space, SPACWALK_SPRINGBOARD_HIT1_EN, (data >> 3) & 0x01); + m_discrete->write(SPACWALK_SPRINGBOARD_HIT1_EN, (data >> 3) & 0x01); - m_discrete->write(space, SPACWALK_SPRINGBOARD_HIT2_EN, (data >> 4) & 0x01); + m_discrete->write(SPACWALK_SPRINGBOARD_HIT2_EN, (data >> 4) & 0x01); - m_discrete->write(space, SPACWALK_SPRINGBOARD_MISS_EN, (data >> 5) & 0x01); + m_discrete->write(SPACWALK_SPRINGBOARD_MISS_EN, (data >> 5) & 0x01); } @@ -2503,17 +2502,17 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::shuffle_audio_1_w) { - m_discrete->write(space, SHUFFLE_CLICK_EN, (data >> 0) & 0x01); + m_discrete->write(SHUFFLE_CLICK_EN, (data >> 0) & 0x01); - m_discrete->write(space, SHUFFLE_ROLLOVER_EN, (data >> 1) & 0x01); + m_discrete->write(SHUFFLE_ROLLOVER_EN, (data >> 1) & 0x01); machine().sound().system_enable((data >> 2) & 0x01); - m_discrete->write(space, NODE_29, (data >> 3) & 0x07); + m_discrete->write(NODE_29, (data >> 3) & 0x07); - m_discrete->write(space, SHUFFLE_ROLLING_3_EN, (data >> 3) & 0x01); - m_discrete->write(space, SHUFFLE_ROLLING_2_EN, (data >> 4) & 0x01); - m_discrete->write(space, SHUFFLE_ROLLING_1_EN, (data >> 5) & 0x01); + m_discrete->write(SHUFFLE_ROLLING_3_EN, (data >> 3) & 0x01); + m_discrete->write(SHUFFLE_ROLLING_2_EN, (data >> 4) & 0x01); + m_discrete->write(SHUFFLE_ROLLING_1_EN, (data >> 5) & 0x01); /* D6 and D7 are not connected */ } @@ -2521,7 +2520,7 @@ WRITE8_MEMBER(mw8080bw_state::shuffle_audio_1_w) WRITE8_MEMBER(mw8080bw_state::shuffle_audio_2_w) { - m_discrete->write(space, SHUFFLE_FOUL_EN, (data >> 0) & 0x01); + m_discrete->write(SHUFFLE_FOUL_EN, (data >> 0) & 0x01); machine().bookkeeping().coin_counter_w(0, (data >> 1) & 0x01); @@ -2688,13 +2687,13 @@ WRITE8_MEMBER(mw8080bw_state::dogpatch_audio_w) machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); - m_discrete->write(space, DOGPATCH_GAME_ON_EN, (data >> 3) & 0x01); + m_discrete->write(DOGPATCH_GAME_ON_EN, (data >> 3) & 0x01); - m_discrete->write(space, DOGPATCH_LEFT_SHOT_EN, (data >> 4) & 0x01); + m_discrete->write(DOGPATCH_LEFT_SHOT_EN, (data >> 4) & 0x01); - m_discrete->write(space, DOGPATCH_RIGHT_SHOT_EN, (data >> 5) & 0x01); + m_discrete->write(DOGPATCH_RIGHT_SHOT_EN, (data >> 5) & 0x01); - m_discrete->write(space, DOGPATCH_HIT_EN, (data >> 6) & 0x01); + m_discrete->write(DOGPATCH_HIT_EN, (data >> 6) & 0x01); } @@ -3209,7 +3208,7 @@ WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_1_w) /* D1 is marked as 'OPTIONAL SWITCH VIDEO FOR COCKTAIL', but it is never set by the software */ - m_discrete->write(space, SPCENCTR_CRASH_EN, (data >> 2) & 0x01); + m_discrete->write(SPCENCTR_CRASH_EN, (data >> 2) & 0x01); /* D3-D7 are not connected */ } @@ -3219,9 +3218,9 @@ WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_2_w) { /* set WIND SOUND FREQ(data & 0x0f) 0, if no wind */ - m_discrete->write(space, SPCENCTR_EXPLOSION_EN, (data >> 4) & 0x01); + m_discrete->write(SPCENCTR_EXPLOSION_EN, (data >> 4) & 0x01); - m_discrete->write(space, SPCENCTR_PLAYER_SHOT_EN, (data >> 5) & 0x01); + m_discrete->write(SPCENCTR_PLAYER_SHOT_EN, (data >> 5) & 0x01); /* D6 and D7 are not connected */ @@ -3233,13 +3232,13 @@ WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_3_w) { /* if (data & 0x01) enable SCREECH (hit the sides) sound */ - m_discrete->write(space, SPCENCTR_ENEMY_SHIP_SHOT_EN, (data >> 1) & 0x01); + m_discrete->write(SPCENCTR_ENEMY_SHIP_SHOT_EN, (data >> 1) & 0x01); m_spcenctr_strobe_state = (data >> 2) & 0x01; output().set_value("LAMP", (data >> 3) & 0x01); - m_discrete->write(space, SPCENCTR_BONUS_EN, (data >> 4) & 0x01); + m_discrete->write(SPCENCTR_BONUS_EN, (data >> 4) & 0x01); m_sn->enable_w((data >> 5) & 0x01); /* saucer sound */ @@ -3408,7 +3407,7 @@ WRITE8_MEMBER(mw8080bw_state::bowler_audio_1_w) machine().sound().system_enable((data >> 2) & 0x01); - m_discrete->write(space, BOWLER_FOWL_EN, (data >> 3) & 0x01); + m_discrete->write(BOWLER_FOWL_EN, (data >> 3) & 0x01); /* D4 - appears to be a screen flip, but it's shown unconnected on the schematics for both the @@ -4116,10 +4115,10 @@ WRITE8_MEMBER(mw8080bw_state::invaders_audio_1_w) { m_sn->enable_w((~data >> 0) & 0x01); /* saucer sound */ - m_discrete->write(space, INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02); - m_discrete->write(space, INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04); - m_discrete->write(space, INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08); - m_discrete->write(space, INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10); + m_discrete->write(INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02); + m_discrete->write(INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04); + m_discrete->write(INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08); + m_discrete->write(INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10); machine().sound().system_enable(data & 0x20); @@ -4129,8 +4128,8 @@ WRITE8_MEMBER(mw8080bw_state::invaders_audio_1_w) WRITE8_MEMBER(mw8080bw_state::invaders_audio_2_w) { - m_discrete->write(space, INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f); - m_discrete->write(space, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10); + m_discrete->write(INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f); + m_discrete->write(INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10); /* the flip screen line is only connected on the cocktail PCB */ if (invaders_is_cabinet_cocktail()) @@ -4514,18 +4513,18 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::blueshrk_audio_w) { - m_discrete->write(space, BLUESHRK_GAME_ON_EN, (data >> 0) & 0x01); + m_discrete->write(BLUESHRK_GAME_ON_EN, (data >> 0) & 0x01); - m_discrete->write(space, BLUESHRK_SHOT_EN, (data >> 1) & 0x01); + m_discrete->write(BLUESHRK_SHOT_EN, (data >> 1) & 0x01); - m_discrete->write(space, BLUESHRK_HIT_EN, (data >> 2) & 0x01); + m_discrete->write(BLUESHRK_HIT_EN, (data >> 2) & 0x01); - m_discrete->write(space, BLUESHRK_SHARK_EN, (data >> 3) & 0x01); + m_discrete->write(BLUESHRK_SHARK_EN, (data >> 3) & 0x01); /* if (data & 0x10) enable KILLED DIVER sound, this circuit doesn't appear to be on the schematics */ - m_discrete->write(space, BLUESHRK_OCTOPUS_EN, (data >> 5) & 0x01); + m_discrete->write(BLUESHRK_OCTOPUS_EN, (data >> 5) & 0x01); /* D6 and D7 are not connected */ } @@ -4712,10 +4711,10 @@ WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_1_w) { m_sn1->enable_w((~data >> 0) & 0x01); /* saucer sound */ - m_discrete->write(space, INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02); - m_discrete->write(space, INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04); - m_discrete->write(space, INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08); - m_discrete->write(space, INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10); + m_discrete->write(INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02); + m_discrete->write(INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04); + m_discrete->write(INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08); + m_discrete->write(INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10); machine().sound().system_enable(data & 0x20); @@ -4725,8 +4724,8 @@ WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_1_w) WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_2_w) { - m_discrete->write(space, INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f); - m_discrete->write(space, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10); + m_discrete->write(INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f); + m_discrete->write(INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10); /* D5-D7 are not connected */ } @@ -4736,10 +4735,10 @@ WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_3_w) { m_sn2->enable_w((~data >> 0) & 0x01); /* saucer sound */ - m_discrete->write(space, INVADERS_NODE(INVADERS_MISSILE_EN, 2), data & 0x02); - m_discrete->write(space, INVADERS_NODE(INVADERS_EXPLOSION_EN, 2), data & 0x04); - m_discrete->write(space, INVADERS_NODE(INVADERS_INVADER_HIT_EN, 2), data & 0x08); - m_discrete->write(space, INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 2), data & 0x10); + m_discrete->write(INVADERS_NODE(INVADERS_MISSILE_EN, 2), data & 0x02); + m_discrete->write(INVADERS_NODE(INVADERS_EXPLOSION_EN, 2), data & 0x04); + m_discrete->write(INVADERS_NODE(INVADERS_INVADER_HIT_EN, 2), data & 0x08); + m_discrete->write(INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 2), data & 0x10); /* D5-D7 are not connected */ } @@ -4747,8 +4746,8 @@ WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_3_w) WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_4_w) { - m_discrete->write(space, INVADERS_NODE(INVADERS_FLEET_DATA, 2), data & 0x0f); - m_discrete->write(space, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 2), data & 0x10); + m_discrete->write(INVADERS_NODE(INVADERS_FLEET_DATA, 2), data & 0x0f); + m_discrete->write(INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 2), data & 0x10); /* D5-D7 are not connected */ } diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp index e7bdb78990b..287711d428c 100644 --- a/src/mame/audio/namco52.cpp +++ b/src/mame/audio/namco52.cpp @@ -78,7 +78,7 @@ READ8_MEMBER( namco_52xx_device::R1_r ) WRITE8_MEMBER( namco_52xx_device::P_w ) { - m_discrete->write(space, NAMCO_52XX_P_DATA(m_basenode), data & 0x0f); + m_discrete->write(NAMCO_52XX_P_DATA(m_basenode), data & 0x0f); } WRITE8_MEMBER( namco_52xx_device::R2_w ) diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp index e6deb1fdc59..2db6af5e8d3 100644 --- a/src/mame/audio/namco54.cpp +++ b/src/mame/audio/namco54.cpp @@ -71,16 +71,16 @@ WRITE8_MEMBER( namco_54xx_device::O_w ) { uint8_t out = (data & 0x0f); if (data & 0x10) - m_discrete->write(space, NAMCO_54XX_1_DATA(m_basenode), out); + m_discrete->write(NAMCO_54XX_1_DATA(m_basenode), out); else - m_discrete->write(space, NAMCO_54XX_0_DATA(m_basenode), out); + m_discrete->write(NAMCO_54XX_0_DATA(m_basenode), out); } WRITE8_MEMBER( namco_54xx_device::R1_w ) { uint8_t out = (data & 0x0f); - m_discrete->write(space, NAMCO_54XX_2_DATA(m_basenode), out); + m_discrete->write(NAMCO_54XX_2_DATA(m_basenode), out); } diff --git a/src/mame/audio/orbit.cpp b/src/mame/audio/orbit.cpp index 646a1cbf793..2d69ee7ab15 100644 --- a/src/mame/audio/orbit.cpp +++ b/src/mame/audio/orbit.cpp @@ -16,24 +16,24 @@ WRITE8_MEMBER(orbit_state::note_w) { - m_discrete->write(space, ORBIT_NOTE_FREQ, (~data) & 0xff); + m_discrete->write(ORBIT_NOTE_FREQ, (~data) & 0xff); } WRITE8_MEMBER(orbit_state::note_amp_w) { - m_discrete->write(space, ORBIT_ANOTE1_AMP, data & 0x0f); - m_discrete->write(space, ORBIT_ANOTE2_AMP, data >> 4); + m_discrete->write(ORBIT_ANOTE1_AMP, data & 0x0f); + m_discrete->write(ORBIT_ANOTE2_AMP, data >> 4); } WRITE8_MEMBER(orbit_state::noise_amp_w) { - m_discrete->write(space, ORBIT_NOISE1_AMP, data & 0x0f); - m_discrete->write(space, ORBIT_NOISE2_AMP, data >> 4); + m_discrete->write(ORBIT_NOISE1_AMP, data & 0x0f); + m_discrete->write(ORBIT_NOISE2_AMP, data >> 4); } WRITE8_MEMBER(orbit_state::noise_rst_w) { - m_discrete->write(space, ORBIT_NOISE_EN, 0); + m_discrete->write(ORBIT_NOISE_EN, 0); } diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp index b7788a218a3..60a70850e07 100644 --- a/src/mame/audio/phoenix.cpp +++ b/src/mame/audio/phoenix.cpp @@ -497,12 +497,12 @@ DISCRETE_SOUND_END WRITE8_MEMBER( phoenix_sound_device::control_a_w ) { - m_discrete->write(space, PHOENIX_EFFECT_2_DATA, data & 0x0f); - m_discrete->write(space, PHOENIX_EFFECT_2_FREQ, (data & 0x30) >> 4); + m_discrete->write(PHOENIX_EFFECT_2_DATA, data & 0x0f); + m_discrete->write(PHOENIX_EFFECT_2_FREQ, (data & 0x30) >> 4); #if 0 /* future handling of noise sounds */ - m_discrete->write(space, PHOENIX_EFFECT_3_EN , data & 0x40); - m_discrete->write(space, PHOENIX_EFFECT_4_EN , data & 0x80); + m_discrete->write(PHOENIX_EFFECT_3_EN , data & 0x40); + m_discrete->write(PHOENIX_EFFECT_4_EN , data & 0x80); #endif m_channel->update(); m_sound_latch_a = data; @@ -510,9 +510,9 @@ WRITE8_MEMBER( phoenix_sound_device::control_a_w ) WRITE8_MEMBER( phoenix_sound_device::control_b_w ) { - m_discrete->write(space, PHOENIX_EFFECT_1_DATA, data & 0x0f); - m_discrete->write(space, PHOENIX_EFFECT_1_FILT, data & 0x20); - m_discrete->write(space, PHOENIX_EFFECT_1_FREQ, data & 0x10); + m_discrete->write(PHOENIX_EFFECT_1_DATA, data & 0x0f); + m_discrete->write(PHOENIX_EFFECT_1_FILT, data & 0x20); + m_discrete->write(PHOENIX_EFFECT_1_FREQ, data & 0x10); /* update the tune that the MM6221AA is playing */ m_tms->mm6221aa_tune_w(data >> 6); diff --git a/src/mame/audio/poolshrk.cpp b/src/mame/audio/poolshrk.cpp index ab4ca35ff5c..9a966f31b9a 100644 --- a/src/mame/audio/poolshrk.cpp +++ b/src/mame/audio/poolshrk.cpp @@ -159,20 +159,20 @@ DISCRETE_SOUND_END WRITE8_MEMBER(poolshrk_state::scratch_sound_w) { - m_discrete->write(space, POOLSHRK_SCRATCH_SND, offset & 1); + m_discrete->write(POOLSHRK_SCRATCH_SND, offset & 1); } WRITE8_MEMBER(poolshrk_state::score_sound_w) { - m_discrete->write(space, POOLSHRK_SCORE_EN, 1); /* this will trigger the sound code for 1 sample */ + m_discrete->write(POOLSHRK_SCORE_EN, 1); /* this will trigger the sound code for 1 sample */ } WRITE8_MEMBER(poolshrk_state::click_sound_w) { - m_discrete->write(space, POOLSHRK_CLICK_EN, 1); /* this will trigger the sound code for 1 sample */ + m_discrete->write(POOLSHRK_CLICK_EN, 1); /* this will trigger the sound code for 1 sample */ } WRITE8_MEMBER(poolshrk_state::bump_sound_w) { - m_discrete->write(space, POOLSHRK_BUMP_EN, offset & 1); + m_discrete->write(POOLSHRK_BUMP_EN, offset & 1); } diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index 1e2172a8b75..c701d840fb8 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -31,12 +31,12 @@ Audio handlers WRITE8_MEMBER(qix_state::qix_dac_w) { - m_discrete->write(space, QIX_DAC_DATA, data); + m_discrete->write(QIX_DAC_DATA, data); } WRITE8_MEMBER(qix_state::qix_vol_w) { - m_discrete->write(space, QIX_VOL_DATA, data); + m_discrete->write(QIX_VOL_DATA, data); } diff --git a/src/mame/audio/skyraid.cpp b/src/mame/audio/skyraid.cpp index 75e9eac3397..d18e0a75cbf 100644 --- a/src/mame/audio/skyraid.cpp +++ b/src/mame/audio/skyraid.cpp @@ -294,10 +294,10 @@ WRITE8_MEMBER(skyraid_state::skyraid_sound_w) /* BIT4 => PLANE ON */ /* BIT5 => ATTRACT */ - m_discrete->write(space, SKYRAID_PLANE_SWEEP_EN, data & 0x01); - m_discrete->write(space, SKYRAID_MISSILE_EN, data & 0x02); - m_discrete->write(space, SKYRAID_EXPLOSION_EN, data & 0x04); + m_discrete->write(SKYRAID_PLANE_SWEEP_EN, data & 0x01); + m_discrete->write(SKYRAID_MISSILE_EN, data & 0x02); + m_discrete->write(SKYRAID_EXPLOSION_EN, data & 0x04); m_led = !BIT(data, 3); - m_discrete->write(space, SKYRAID_PLANE_ON_EN, data & 0x10); - m_discrete->write(space, SKYRAID_ATTRACT_EN, data & 0x20); + m_discrete->write(SKYRAID_PLANE_ON_EN, data & 0x10); + m_discrete->write(SKYRAID_ATTRACT_EN, data & 0x20); } diff --git a/src/mame/audio/snk6502.cpp b/src/mame/audio/snk6502.cpp index 659deadd16d..1fa6af8811c 100644 --- a/src/mame/audio/snk6502.cpp +++ b/src/mame/audio/snk6502.cpp @@ -789,7 +789,7 @@ WRITE8_MEMBER(fantasy_sound_device::sound_w) m_custom->mute_channel(2); /* BOMB */ - m_discrete->write(space, FANTASY_BOMB_EN, data & 0x80); + m_discrete->write(FANTASY_BOMB_EN, data & 0x80); m_last_port1 = data; break; diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index de491db21ec..93c03844447 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -185,22 +185,22 @@ WRITE8_MEMBER(spiders_state::spiders_audio_command_w) WRITE8_MEMBER(spiders_state::spiders_audio_a_w) { - m_discrete->write(space, SPIDER_WEB_SOUND_MOD_DATA, 1 + (data & 4) * 8 + (data & 2) * 4 + (data & 1) * 2); + m_discrete->write(SPIDER_WEB_SOUND_MOD_DATA, 1 + (data & 4) * 8 + (data & 2) * 4 + (data & 1) * 2); } WRITE8_MEMBER(spiders_state::spiders_audio_b_w) { - m_discrete->write(space, SPIDERS_WEB_SOUND_DATA, data); + m_discrete->write(SPIDERS_WEB_SOUND_DATA, data); } WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w) { - m_discrete->write(space, SPIDERS_FIRE_EN, data & 0x10 ? 1 : 0); - m_discrete->write(space, SPIDERS_EXP_EN, data & 0x08 ? 1 : 0); - m_discrete->write(space, SPIDERS_SUPER_WEB_EXPL_EN, data & 0x04 ? 1 : 0); - m_discrete->write(space, SPIDERS_SUPER_WEB_EN, data & 0x02 ? 1 : 0); - m_discrete->write(space, SPIDERS_X_EN, data & 0x01 ? 1 : 0); + m_discrete->write(SPIDERS_FIRE_EN, data & 0x10 ? 1 : 0); + m_discrete->write(SPIDERS_EXP_EN, data & 0x08 ? 1 : 0); + m_discrete->write(SPIDERS_SUPER_WEB_EXPL_EN, data & 0x04 ? 1 : 0); + m_discrete->write(SPIDERS_SUPER_WEB_EN, data & 0x02 ? 1 : 0); + m_discrete->write(SPIDERS_X_EN, data & 0x01 ? 1 : 0); } diff --git a/src/mame/audio/subs.cpp b/src/mame/audio/subs.cpp index cb550ec12a5..10fd6c08118 100644 --- a/src/mame/audio/subs.cpp +++ b/src/mame/audio/subs.cpp @@ -17,7 +17,7 @@ sub sound functions WRITE8_MEMBER(subs_state::noise_reset_w) { /* Pulse noise reset */ - m_discrete->write(space, SUBS_NOISE_RESET, 0); + m_discrete->write(SUBS_NOISE_RESET, 0); } diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index 1b2f6af170b..e0ab608bd7b 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -143,12 +143,12 @@ WRITE8_MEMBER( vicdual_state::frogs_audio_w ) int new_croak = data & 0x08; int new_buzzz = data & 0x10; -// m_discrete->write(space, FROGS_HOP_EN, data & 0x01); -// m_discrete->write(space, FROGS_JUMP_EN, data & 0x02); - m_discrete->write(space, FROGS_TONGUE_EN, data & 0x04); -// m_discrete->write(space, FROGS_CAPTURE_EN, data & 0x08); -// m_discrete->write(space, FROGS_FLY_EN, data & 0x10); -// m_discrete->write(space, FROGS_SPLASH_EN, data & 0x80); +// m_discrete->write(FROGS_HOP_EN, data & 0x01); +// m_discrete->write(FROGS_JUMP_EN, data & 0x02); + m_discrete->write(FROGS_TONGUE_EN, data & 0x04); +// m_discrete->write(FROGS_CAPTURE_EN, data & 0x08); +// m_discrete->write(FROGS_FLY_EN, data & 0x10); +// m_discrete->write(FROGS_SPLASH_EN, data & 0x80); if (data & 0x01) m_samples->start(3, 3); // Hop @@ -454,13 +454,13 @@ WRITE8_MEMBER( vicdual_state::headon_audio_w ) { if (m_discrete == nullptr) return; - m_discrete->write(space, HEADON_HISPEED_PC_EN, data & 0x01); - m_discrete->write(space, HEADON_SCREECH1_EN, data & 0x02); - m_discrete->write(space, HEADON_CRASH_EN, data & 0x04); - m_discrete->write(space, HEADON_HISPEED_CC_EN, data & 0x08); - m_discrete->write(space, HEADON_SCREECH2_EN, data & 0x10); - m_discrete->write(space, HEADON_BONUS_EN, data & 0x20); - m_discrete->write(space, HEADON_CAR_ON_EN, data & 0x40); + m_discrete->write(HEADON_HISPEED_PC_EN, data & 0x01); + m_discrete->write(HEADON_SCREECH1_EN, data & 0x02); + m_discrete->write(HEADON_CRASH_EN, data & 0x04); + m_discrete->write(HEADON_HISPEED_CC_EN, data & 0x08); + m_discrete->write(HEADON_SCREECH2_EN, data & 0x10); + m_discrete->write(HEADON_BONUS_EN, data & 0x20); + m_discrete->write(HEADON_CAR_ON_EN, data & 0x40); } @@ -468,13 +468,13 @@ WRITE8_MEMBER( vicdual_state::invho2_audio_w ) { if (m_discrete == nullptr) return; - m_discrete->write(space, HEADON_HISPEED_PC_EN, data & 0x10); - m_discrete->write(space, HEADON_SCREECH1_EN, data & 0x08); - m_discrete->write(space, HEADON_CRASH_EN, data & 0x80); - m_discrete->write(space, HEADON_HISPEED_CC_EN, data & 0x40); - m_discrete->write(space, HEADON_SCREECH2_EN, data & 0x04); - m_discrete->write(space, HEADON_BONUS_EN, data & 0x02); - m_discrete->write(space, HEADON_CAR_ON_EN, data & 0x20); + m_discrete->write(HEADON_HISPEED_PC_EN, data & 0x10); + m_discrete->write(HEADON_SCREECH1_EN, data & 0x08); + m_discrete->write(HEADON_CRASH_EN, data & 0x80); + m_discrete->write(HEADON_HISPEED_CC_EN, data & 0x40); + m_discrete->write(HEADON_SCREECH2_EN, data & 0x04); + m_discrete->write(HEADON_BONUS_EN, data & 0x02); + m_discrete->write(HEADON_CAR_ON_EN, data & 0x20); } |