diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2017-07-24 09:18:26 -0400 |
---|---|---|
committer | Vas Crabb <cuavas@users.noreply.github.com> | 2017-07-25 11:21:43 +1000 |
commit | 6cd14950840131ab3576081a95d7e134b56209de (patch) | |
tree | c36d56d21d8e8fceaa81261d4d10fe31c4a0c885 | |
parent | d20c49178189a6d583f43bea80a016d47e7b710d (diff) |
Cleanups for various Atari drivers and PlayChoice-10 (nw)
-rw-r--r-- | src/mame/audio/asteroid.cpp | 58 | ||||
-rw-r--r-- | src/mame/audio/avalnche.cpp | 38 | ||||
-rw-r--r-- | src/mame/audio/copsnrob.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/llander.cpp | 14 | ||||
-rw-r--r-- | src/mame/audio/llander.h | 2 | ||||
-rw-r--r-- | src/mame/drivers/asteroid.cpp | 55 | ||||
-rw-r--r-- | src/mame/drivers/avalnche.cpp | 44 | ||||
-rw-r--r-- | src/mame/drivers/playch10.cpp | 16 | ||||
-rw-r--r-- | src/mame/includes/asteroid.h | 28 | ||||
-rw-r--r-- | src/mame/includes/avalnche.h | 12 | ||||
-rw-r--r-- | src/mame/includes/playch10.h | 16 | ||||
-rw-r--r-- | src/mame/machine/playch10.cpp | 16 |
12 files changed, 167 insertions, 134 deletions
diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp index dcf5cde8b7a..3bce9a4ca31 100644 --- a/src/mame/audio/asteroid.cpp +++ b/src/mame/audio/asteroid.cpp @@ -7,8 +7,9 @@ *****************************************************************************/ #include "emu.h" -#include "sound/discrete.h" #include "includes/asteroid.h" +#include "machine/74259.h" +#include "speaker.h" /************************************************************************/ /* Asteroids Sound System Analog emulation by K.Wilkins Nov 2000 */ @@ -48,7 +49,29 @@ static const discrete_555_cc_desc asteroid_thump_555cc = 0.8 // VBE 2N3906 (Si) }; -DISCRETE_SOUND_START(asteroid) +#define ASTEROID_SAUCER_SND_EN NODE_01 +#define ASTEROID_SAUCER_FIRE_EN NODE_02 +#define ASTEROID_SAUCER_SEL NODE_03 +#define ASTEROID_THRUST_EN NODE_04 +#define ASTEROID_SHIP_FIRE_EN NODE_05 +#define ASTEROID_LIFE_EN NODE_06 +#define ASTEROID_NOISE_RESET NODE_07 + +#define ASTEROID_THUMP_EN NODE_08 +#define ASTEROID_THUMP_DATA NODE_09 +#define ASTEROID_EXPLODE_DATA NODE_10 +#define ASTEROID_EXPLODE_PITCH NODE_11 + +#define ASTEROID_NOISE NODE_20 +#define ASTEROID_THUMP_SND NODE_21 +#define ASTEROID_SAUCER_SND NODE_22 +#define ASTEROID_LIFE_SND NODE_23 +#define ASTEROID_SAUCER_FIRE_SND NODE_24 +#define ASTEROID_SHIP_FIRE_SND NODE_25 +#define ASTEROID_EXPLODE_SND NODE_26 +#define ASTEROID_THRUST_SND NODE_27 + +static DISCRETE_SOUND_START(asteroid) /************************************************/ /* Asteroid Effects Relataive Gain Table */ /* */ @@ -194,7 +217,7 @@ DISCRETE_SOUND_START(asteroid) DISCRETE_SOUND_END -DISCRETE_SOUND_START(astdelux) +static DISCRETE_SOUND_START(astdelux) /************************************************/ /* Asteroid delux sound hardware is mostly done */ /* in the Pokey chip except for the thrust and */ @@ -290,3 +313,32 @@ WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w) { m_discrete->write(space, ASTEROID_NOISE_RESET, 0); } + + +MACHINE_CONFIG_START(asteroid_sound) + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("discrete", DISCRETE, 0) + MCFG_DISCRETE_INTF(asteroid) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4) + + MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10 + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SND_EN>)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_FIRE_EN>)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SEL>)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SHIP_FIRE_EN>)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_LIFE_EN>)) +MACHINE_CONFIG_END + + +MACHINE_CONFIG_START(astdelux_sound) + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("discrete", DISCRETE, 0) + MCFG_DISCRETE_INTF(astdelux) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10 + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>)) +MACHINE_CONFIG_END diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp index 8040ea4c734..6d01a99077d 100644 --- a/src/mame/audio/avalnche.cpp +++ b/src/mame/audio/avalnche.cpp @@ -5,8 +5,20 @@ audio\avalnche.c *************************************************************************/ + #include "emu.h" #include "includes/avalnche.h" +#include "machine/74259.h" +#include "sound/discrete.h" +#include "speaker.h" + + +/* Avalanche Discrete Sound Input Nodes */ +#define AVALNCHE_AUD0_EN NODE_01 +#define AVALNCHE_AUD1_EN NODE_02 +#define AVALNCHE_AUD2_EN NODE_03 +#define AVALNCHE_SOUNDLVL_DATA NODE_04 +#define AVALNCHE_ATTRACT_EN NODE_05 /*************************************************************************** @@ -43,7 +55,7 @@ static const discrete_lfsr_desc avalnche_lfsr={ #define AVALNCHE_AUD2_SND NODE_12 #define AVALNCHE_SOUNDLVL_AUD0_SND NODE_13 -DISCRETE_SOUND_START(avalnche) +static DISCRETE_SOUND_START(avalnche) /************************************************/ /* avalnche Effects Relataive Gain Table */ /* */ @@ -91,6 +103,30 @@ DISCRETE_SOUND_START(avalnche) DISCRETE_SOUND_END +MACHINE_CONFIG_START( avalnche_sound ) + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("discrete", DISCRETE, 0) + MCFG_DISCRETE_INTF(avalnche) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_DEVICE_MODIFY("latch") + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_ATTRACT_EN>)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD0_EN>)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD1_EN>)) + MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD2_EN>)) +MACHINE_CONFIG_END + + +MACHINE_CONFIG_START( catch_sound ) // just a stub here... + MCFG_DEVICE_MODIFY("latch") + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // It is attract_enable just like avalnche, but not hooked up yet. + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(avalnche_state, catch_aud0_w)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(avalnche_state, catch_aud1_w)) + MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(avalnche_state, catch_aud2_w)) +MACHINE_CONFIG_END + + /*************************************************************************** Catch memory audio output handlers ***************************************************************************/ diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp index c5200a5d6ce..f1b98e62677 100644 --- a/src/mame/audio/copsnrob.cpp +++ b/src/mame/audio/copsnrob.cpp @@ -5,9 +5,9 @@ * Nov 2010, Derrick Renaud ************************************************************************/ #include "emu.h" -#include "speaker.h" #include "includes/copsnrob.h" #include "sound/discrete.h" +#include "speaker.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp index ac977bf2ad1..41153505578 100644 --- a/src/mame/audio/llander.cpp +++ b/src/mame/audio/llander.cpp @@ -8,8 +8,9 @@ #include "emu.h" #include "includes/asteroid.h" -#include "sound/discrete.h" #include "audio/llander.h" +#include "sound/discrete.h" +#include "speaker.h" /************************************************************************/ /* Lunar Lander Sound System Analog emulation by K.Wilkins Nov 2000 */ @@ -41,7 +42,7 @@ static const discrete_lfsr_desc llander_lfsr = 14 /* Output bit */ }; -DISCRETE_SOUND_START(llander) +static DISCRETE_SOUND_START(llander) /************************************************/ /* llander Effects Relataive Gain Table */ /* */ @@ -96,3 +97,12 @@ WRITE8_MEMBER(asteroid_state::llander_sounds_w) m_discrete->write(space, LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */ m_discrete->write(space, LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */ } + + +MACHINE_CONFIG_START( llander_sound ) + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("discrete", DISCRETE, 0) + MCFG_DISCRETE_INTF(llander) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) +MACHINE_CONFIG_END diff --git a/src/mame/audio/llander.h b/src/mame/audio/llander.h index 567a938fb00..249a4954576 100644 --- a/src/mame/audio/llander.h +++ b/src/mame/audio/llander.h @@ -1,4 +1,4 @@ // license:BSD-3-Clause // copyright-holders:K.Wilkins -DISCRETE_SOUND_EXTERN( llander ); +MACHINE_CONFIG_EXTERN(llander_sound); diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index dc883abc49e..60296fedfea 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -192,12 +192,10 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a #include "machine/74259.h" #include "machine/atari_vg.h" #include "machine/watchdog.h" -#include "sound/discrete.h" #include "sound/pokey.h" #include "video/avgdvg.h" #include "video/vector.h" #include "screen.h" -#include "speaker.h" #include "astdelux.lh" @@ -652,21 +650,13 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( asteroid ) +static MACHINE_CONFIG_START( asteroid_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) MCFG_CPU_PROGRAM_MAP(asteroid_map) MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, asteroid_interrupt, CLOCK_3KHZ/12) - MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10 - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SND_EN>)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_FIRE_EN>)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SEL>)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>)) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SHIP_FIRE_EN>)) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_LIFE_EN>)) - MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ @@ -679,13 +669,12 @@ static MACHINE_CONFIG_START( asteroid ) MCFG_DEVICE_ADD("dvg", DVG, 0) MCFG_AVGDVG_VECTOR("vector") +MACHINE_CONFIG_END - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") +static MACHINE_CONFIG_DERIVED( asteroid, asteroid_base ) - MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_DISCRETE_INTF(asteroid) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4) + /* sound hardware */ + MCFG_FRAGMENT_ADD(asteroid_sound) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( asterock, asteroid ) @@ -696,55 +685,47 @@ static MACHINE_CONFIG_DERIVED( asterock, asteroid ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astdelux, asteroid ) +static MACHINE_CONFIG_DERIVED( astdelux, asteroid_base ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(astdelux_map) - MCFG_DEVICE_MODIFY("audiolatch") - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(asteroid_state, start1_led_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(asteroid_state, start2_led_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) - // Q3 still activates the thrusters - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(MEMBANK("ram1")) - MCFG_DEVCB_CHAIN_OUTPUT(MEMBANK("ram2")) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(asteroid_state, coin_counter_left_w)) - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(asteroid_state, coin_counter_center_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(asteroid_state, coin_counter_right_w)) - MCFG_ATARIVGEAROM_ADD("earom") /* sound hardware */ - MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_DISCRETE_INTF(astdelux) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FRAGMENT_ADD(astdelux_sound) MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8) MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW2")) MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_DEVICE_MODIFY("audiolatch") + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(asteroid_state, start1_led_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(asteroid_state, start2_led_w)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(MEMBANK("ram1")) + MCFG_DEVCB_CHAIN_OUTPUT(MEMBANK("ram2")) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(asteroid_state, coin_counter_left_w)) + MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(asteroid_state, coin_counter_center_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(asteroid_state, coin_counter_right_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( llander, asteroid ) +static MACHINE_CONFIG_DERIVED( llander, asteroid_base ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(llander_map) MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, (double)MASTER_CLOCK/4096/12) - MCFG_DEVICE_REMOVE("audiolatch") - MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(CLOCK_3KHZ/12/6) MCFG_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) /* sound hardware */ - MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_DISCRETE_INTF(llander) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FRAGMENT_ADD(llander_sound) MACHINE_CONFIG_END diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp index a91f4fa5ec4..e1e9628eb2b 100644 --- a/src/mame/drivers/avalnche.cpp +++ b/src/mame/drivers/avalnche.cpp @@ -35,9 +35,7 @@ #include "cpu/m6502/m6502.h" #include "machine/74259.h" #include "machine/watchdog.h" -#include "sound/discrete.h" #include "screen.h" -#include "speaker.h" #include "avalnche.lh" @@ -232,17 +230,20 @@ void avalnche_state::machine_start() save_item(NAME(m_avalance_video_inverted)); } -void avalnche_state::machine_reset() -{ -} - -static MACHINE_CONFIG_START( avalnche ) +static MACHINE_CONFIG_START( avalnche_base ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */ MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_PERIODIC_INT_DRIVER(avalnche_state, nmi_line_pulse, 8*60) + MCFG_DEVICE_ADD("latch", F9334, 0) // F8 + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(avalnche_state, credit_1_lamp_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(avalnche_state, video_invert_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(avalnche_state, credit_2_lamp_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(avalnche_state, start_lamp_w)) + // Q1, Q4, Q5, Q6 are configured in audio/avalnche.cpp + MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ @@ -252,40 +253,21 @@ static MACHINE_CONFIG_START( avalnche ) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(avalnche_state, screen_update_avalnche) +MACHINE_CONFIG_END +static MACHINE_CONFIG_DERIVED( avalnche, avalnche_base) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_DISCRETE_INTF(avalnche) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - - MCFG_DEVICE_ADD("latch", F9334, 0) // F8 - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(avalnche_state, credit_1_lamp_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_ATTRACT_EN>)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(avalnche_state, video_invert_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(avalnche_state, credit_2_lamp_w)) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD0_EN>)) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD1_EN>)) - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD2_EN>)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(avalnche_state, start_lamp_w)) + MCFG_FRAGMENT_ADD(avalnche_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( catch, avalnche ) +static MACHINE_CONFIG_DERIVED( catch, avalnche_base ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(catch_map) /* sound hardware... */ - MCFG_DEVICE_REMOVE("discrete") - MCFG_DEVICE_REMOVE("mono") - - MCFG_DEVICE_MODIFY("latch") - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // It is attract_enable just like avalnche, but not hooked up yet. - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(avalnche_state, catch_aud0_w)) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(avalnche_state, catch_aud1_w)) - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(avalnche_state, catch_aud2_w)) + MCFG_FRAGMENT_ADD(catch_sound) MACHINE_CONFIG_END diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index a50b4fecb06..2116729f35b 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -651,19 +651,19 @@ static MACHINE_CONFIG_START( playch10 ) MCFG_CPU_PROGRAM_MAP(cart_map) MCFG_DEVICE_ADD("outlatch1", LS259, 0) // 7D - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(playch10_state, SDCS_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(playch10_state, CNTRLMASK_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(playch10_state, DISPMASK_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(playch10_state, SOUNDMASK_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(playch10_state, sdcs_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(playch10_state, cntrl_mask_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(playch10_state, disp_mask_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(playch10_state, sound_mask_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("cart", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // GAMERES MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("cart", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT // GAMESTOP MCFG_DEVICE_ADD("outlatch2", LS259, 0) // 7E - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(playch10_state, NMIENABLE_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(playch10_state, DOGDI_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(playch10_state, PPURES_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(playch10_state, nmi_enable_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(playch10_state, dog_di_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(playch10_state, ppu_reset_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(playch10_state, up8w_w)) - MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(playch10_state, CARTSEL_w)) MCFG_DEVCB_MASK(0x78) MCFG_DEVCB_RSHIFT(-3) + MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(playch10_state, cart_sel_w)) MCFG_DEVCB_MASK(0x78) MCFG_DEVCB_RSHIFT(-3) // video hardware MCFG_GFXDECODE_ADD("gfxdecode", "palette", playch10) diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index 314f3bc672d..c89e6494b18 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -9,28 +9,6 @@ #include "sound/discrete.h" #include "video/avgdvg.h" -#define ASTEROID_SAUCER_SND_EN NODE_01 -#define ASTEROID_SAUCER_FIRE_EN NODE_02 -#define ASTEROID_SAUCER_SEL NODE_03 -#define ASTEROID_THRUST_EN NODE_04 -#define ASTEROID_SHIP_FIRE_EN NODE_05 -#define ASTEROID_LIFE_EN NODE_06 -#define ASTEROID_NOISE_RESET NODE_07 - -#define ASTEROID_THUMP_EN NODE_08 -#define ASTEROID_THUMP_DATA NODE_09 -#define ASTEROID_EXPLODE_DATA NODE_10 -#define ASTEROID_EXPLODE_PITCH NODE_11 - -#define ASTEROID_NOISE NODE_20 -#define ASTEROID_THUMP_SND NODE_21 -#define ASTEROID_SAUCER_SND NODE_22 -#define ASTEROID_LIFE_SND NODE_23 -#define ASTEROID_SAUCER_FIRE_SND NODE_24 -#define ASTEROID_SHIP_FIRE_SND NODE_25 -#define ASTEROID_EXPLODE_SND NODE_26 -#define ASTEROID_THRUST_SND NODE_27 - class asteroid_state : public driver_device { public: @@ -81,7 +59,7 @@ public: virtual void machine_reset() override; }; -/*----------- defined in audio/asteroid.c -----------*/ +/*----------- defined in audio/asteroid.cpp -----------*/ -DISCRETE_SOUND_EXTERN( asteroid ); -DISCRETE_SOUND_EXTERN( astdelux ); +MACHINE_CONFIG_EXTERN(asteroid_sound); +MACHINE_CONFIG_EXTERN(astdelux_sound); diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 6c42bdfd902..12cbbc00fad 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -8,12 +8,6 @@ #include "sound/discrete.h" -/* Avalanche Discrete Sound Input Nodes */ -#define AVALNCHE_AUD0_EN NODE_01 -#define AVALNCHE_AUD1_EN NODE_02 -#define AVALNCHE_AUD2_EN NODE_03 -#define AVALNCHE_SOUNDLVL_DATA NODE_04 -#define AVALNCHE_ATTRACT_EN NODE_05 class avalnche_state : public driver_device @@ -36,7 +30,6 @@ public: DECLARE_WRITE_LINE_MEMBER(credit_2_lamp_w); DECLARE_WRITE_LINE_MEMBER(start_lamp_w); virtual void machine_start() override; - virtual void machine_reset() override; uint32_t screen_update_avalnche(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(avalnche_noise_amplitude_w); DECLARE_WRITE_LINE_MEMBER(catch_aud0_w); @@ -46,6 +39,7 @@ public: }; -/*----------- defined in audio/avalnche.c -----------*/ +/*----------- defined in audio/avalnche.cpp -----------*/ -DISCRETE_SOUND_EXTERN( avalnche ); +MACHINE_CONFIG_EXTERN(avalnche_sound); +MACHINE_CONFIG_EXTERN(catch_sound); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 608b72baf8c..1d987914634 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -77,15 +77,15 @@ public: DECLARE_WRITE8_MEMBER(ram_8w_w); DECLARE_WRITE8_MEMBER(sprite_dma_w); DECLARE_WRITE8_MEMBER(time_w); - DECLARE_WRITE_LINE_MEMBER(SDCS_w); - DECLARE_WRITE_LINE_MEMBER(CNTRLMASK_w); - DECLARE_WRITE_LINE_MEMBER(DISPMASK_w); - DECLARE_WRITE_LINE_MEMBER(SOUNDMASK_w); - DECLARE_WRITE_LINE_MEMBER(NMIENABLE_w); - DECLARE_WRITE_LINE_MEMBER(DOGDI_w); - DECLARE_WRITE_LINE_MEMBER(PPURES_w); + DECLARE_WRITE_LINE_MEMBER(sdcs_w); + DECLARE_WRITE_LINE_MEMBER(cntrl_mask_w); + DECLARE_WRITE_LINE_MEMBER(disp_mask_w); + DECLARE_WRITE_LINE_MEMBER(sound_mask_w); + DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); + DECLARE_WRITE_LINE_MEMBER(dog_di_w); + DECLARE_WRITE_LINE_MEMBER(ppu_reset_w); DECLARE_READ8_MEMBER(pc10_detectclr_r); - DECLARE_WRITE8_MEMBER(CARTSEL_w); + DECLARE_WRITE8_MEMBER(cart_sel_w); DECLARE_READ8_MEMBER(pc10_prot_r); DECLARE_WRITE8_MEMBER(pc10_prot_w); DECLARE_WRITE8_MEMBER(pc10_in0_w); diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp index bc260701840..e0c24c87314 100644 --- a/src/mame/machine/playch10.cpp +++ b/src/mame/machine/playch10.cpp @@ -82,7 +82,7 @@ CUSTOM_INPUT_MEMBER(playch10_state::pc10_int_detect_r) return ~m_pc10_int_detect & 1; } -WRITE_LINE_MEMBER(playch10_state::SDCS_w) +WRITE_LINE_MEMBER(playch10_state::sdcs_w) { /* Hooked to CLR on LS194A - Sheet 2, bottom left. @@ -93,32 +93,32 @@ WRITE_LINE_MEMBER(playch10_state::SDCS_w) m_pc10_sdcs = !state; } -WRITE_LINE_MEMBER(playch10_state::CNTRLMASK_w) +WRITE_LINE_MEMBER(playch10_state::cntrl_mask_w) { m_cntrl_mask = !state; } -WRITE_LINE_MEMBER(playch10_state::DISPMASK_w) +WRITE_LINE_MEMBER(playch10_state::disp_mask_w) { m_pc10_dispmask = !state; } -WRITE_LINE_MEMBER(playch10_state::SOUNDMASK_w) +WRITE_LINE_MEMBER(playch10_state::sound_mask_w) { /* should mute the APU - unimplemented yet */ } -WRITE_LINE_MEMBER(playch10_state::NMIENABLE_w) +WRITE_LINE_MEMBER(playch10_state::nmi_enable_w) { m_pc10_nmi_enable = state; } -WRITE_LINE_MEMBER(playch10_state::DOGDI_w) +WRITE_LINE_MEMBER(playch10_state::dog_di_w) { m_pc10_dog_di = state; } -WRITE_LINE_MEMBER(playch10_state::PPURES_w) +WRITE_LINE_MEMBER(playch10_state::ppu_reset_w) { if (state) machine().device("ppu")->reset(); @@ -131,7 +131,7 @@ READ8_MEMBER(playch10_state::pc10_detectclr_r) return 0; } -WRITE8_MEMBER(playch10_state::CARTSEL_w) +WRITE8_MEMBER(playch10_state::cart_sel_w) { m_cart_sel = data; } |