From dd8e2cf083f1b159a078a317630f74eec3137515 Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 28 Jul 2023 12:13:24 +0200 Subject: gts80: use sc01(not-A) only for marspp --- src/mame/pinball/gts80.cpp | 59 +++++++++++++++++++++++------------------- src/mame/shared/gottlieb_a.cpp | 5 ++-- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/mame/pinball/gts80.cpp b/src/mame/pinball/gts80.cpp index a6403ee9632..0c7bb5bf031 100644 --- a/src/mame/pinball/gts80.cpp +++ b/src/mame/pinball/gts80.cpp @@ -78,6 +78,7 @@ public: void p0(machine_config &config); // no sound card void p2(machine_config &config); // multi-mode card void r1v(machine_config &config); // r1 with votrax + void marspp(machine_config &config); // marspp has either SC-01 or SC-01-A DECLARE_INPUT_CHANGED_MEMBER(slam_w); protected: @@ -545,6 +546,12 @@ void gts80_state::p2(machine_config &config) } void gts80_state::r1v(machine_config &config) +{ + p0(config); + GOTTLIEB_SOUND_SPEECH_REV1A(config, m_r1_sound).add_route(ALL_OUTPUTS, "mono", 0.75); +} + +void gts80_state::marspp(machine_config &config) { p0(config); GOTTLIEB_SOUND_SPEECH_REV1(config, m_r1_sound).add_route(ALL_OUTPUTS, "mono", 0.75); @@ -920,29 +927,29 @@ ROM_END } // Anonymous namespace -GAME(1981, s80tst, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "System 80 Test", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) - -GAME(1980, panthera, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Panthera", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, grand8, panthera, p0, gts80, gts80_state, empty_init, ROT0, "Christian Tabart", "Le Grand 8", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, spidermn, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "The Amazing Spider-Man", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, circusp, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Circus", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, cntforce, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Counterforce", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, starrace, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Star Race", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, jamesb, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "James Bond (Timed Play)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, jamesb2, jamesb, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "James Bond (3/5-Ball)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1980, timeline, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Time Line", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, forceii, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Force II", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, pnkpnthr, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Pink Panther", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, marsp, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Mars - God of War", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, marspf, marsp, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Mars - God of War (French speech)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, marspp, marsp, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Mars - God of War (Prototype)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, vlcno_ax, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, vlcno_1c, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano (Sound Only set 1)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, vlcno_1b, vlcno_1c, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano (Sound Only set 2)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, vlcno_1a, vlcno_1c, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano (Sound Only set 3)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, blckhole, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Black Hole (Rev. 4)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, blckhole2, blckhole, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Black Hole (Rev. 2)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, blckhols, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Black Hole (Sound Only)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1982, hh, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Haunted House (Rev. 2)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1982, hh_1, hh, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Haunted House (Rev. 1)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) -GAME(1981, eclipse, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Eclipse", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, s80tst, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "System 80 Test", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) + +GAME(1980, panthera, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Panthera", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, grand8, panthera, p0, gts80, gts80_state, empty_init, ROT0, "Christian Tabart", "Le Grand 8", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, spidermn, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "The Amazing Spider-Man", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, circusp, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Circus", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, cntforce, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Counterforce", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, starrace, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Star Race", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, jamesb, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "James Bond (Timed Play)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, jamesb2, jamesb, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "James Bond (3/5-Ball)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1980, timeline, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Time Line", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, forceii, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Force II", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, pnkpnthr, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Pink Panther", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, marsp, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Mars - God of War", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, marspf, marsp, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Mars - God of War (French speech)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, marspp, marsp, marspp, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Mars - God of War (Prototype)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, vlcno_ax, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, vlcno_1c, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano (Sound Only set 1)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, vlcno_1b, vlcno_1c, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano (Sound Only set 2)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, vlcno_1a, vlcno_1c, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Volcano (Sound Only set 3)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, blckhole, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Black Hole (Rev. 4)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, blckhole2, blckhole, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Black Hole (Rev. 2)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, blckhols, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Black Hole (Sound Only)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1982, hh, 0, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Haunted House (Rev. 2)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1982, hh_1, hh, r1v, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Haunted House (Rev. 1)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME(1981, eclipse, 0, p2, gts80, gts80_state, empty_init, ROT0, "Gottlieb", "Eclipse", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/shared/gottlieb_a.cpp b/src/mame/shared/gottlieb_a.cpp index 69644ce6295..cb6813a71a7 100644 --- a/src/mame/shared/gottlieb_a.cpp +++ b/src/mame/shared/gottlieb_a.cpp @@ -427,7 +427,6 @@ u32 gottlieb_sound_speech_r1_device::convert_speech_clock(u8 data) void gottlieb_sound_speech_r1_device::speech_clock_dac_w(u8 data) { //logerror("clock = %02X\n", data); - m_votrax->set_unscaled_clock(convert_speech_clock(data)); } @@ -472,7 +471,7 @@ void gottlieb_sound_speech_r1_device::device_add_mconfig(machine_config &config) m_dac->reset_routes(); m_dac->add_route(ALL_OUTPUTS, *this, 0.20); - // Note: used on machines in early 1981, such as reactor, q-bert test version, mars: god of war, and maybe early boards of black hole and volcano + // Note: used on machines in early 1981, such as reactor, q-bert test version, mars: god of war prototype VOTRAX_SC01(config, m_votrax, convert_speech_clock(0)); m_votrax->ar_callback().set("nmi", FUNC(input_merger_device::in_w<1>)); m_votrax->add_route(ALL_OUTPUTS, *this, 0.80); @@ -494,7 +493,7 @@ void gottlieb_sound_speech_r1_device::device_start() //************************************************************************** -// REV 1 SOUND/SPEECH BOARD; part number MA-216 (same PCB as MA-309 above but with a Votrax SC-01-A and support components populated) +// REV 1 SOUND/SPEECH BOARD: as above, but with SC-01-A instead of SC-01 //************************************************************************** //------------------------------------------------- -- cgit v1.2.3