summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/gts80.c
diff options
context:
space:
mode:
author Robbbert <robbbert@users.noreply.github.com>2014-10-11 14:09:40 +0000
committer Robbbert <robbbert@users.noreply.github.com>2014-10-11 14:09:40 +0000
commit6202f4b574aef4c9f4f2bcb4607b5de6c3493132 (patch)
tree03b5f7448e7a396ca52fc2c6046dc53ff6dffc0b /src/mame/drivers/gts80.c
parent92f61919c1c629e7ea4ffca0d33a8d999b8c23e2 (diff)
gts80.c: moved original sound board to audio/gottlieb as a device.
Diffstat (limited to 'src/mame/drivers/gts80.c')
-rw-r--r--src/mame/drivers/gts80.c135
1 files changed, 51 insertions, 84 deletions
diff --git a/src/mame/drivers/gts80.c b/src/mame/drivers/gts80.c
index 3b1a78b549d..d5c5b7e4c71 100644
--- a/src/mame/drivers/gts80.c
+++ b/src/mame/drivers/gts80.c
@@ -23,10 +23,7 @@ ToDO:
#include "machine/genpin.h"
-#include "cpu/m6502/m6502.h"
-#include "machine/6532riot.h"
-#include "machine/mos6530.h"
-#include "sound/dac.h"
+#include "audio/gottlieb.h"
#include "gts80.lh"
class gts80_state : public genpin_class
@@ -35,28 +32,27 @@ public:
gts80_state(const machine_config &mconfig, device_type type, const char *tag)
: genpin_class(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
- , m_audiocpu(*this, "audiocpu")
+ , m_r0_sound(*this, "r0sound")
+ , m_r1_sound(*this, "r1sound")
{ }
DECLARE_DRIVER_INIT(gts80);
DECLARE_READ8_MEMBER(port1a_r);
DECLARE_READ8_MEMBER(port2a_r);
- DECLARE_READ8_MEMBER(r6530b_r);
DECLARE_WRITE8_MEMBER(port1b_w);
DECLARE_WRITE8_MEMBER(port2a_w);
DECLARE_WRITE8_MEMBER(port2b_w);
DECLARE_WRITE8_MEMBER(port3a_w);
DECLARE_WRITE8_MEMBER(port3b_w);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
private:
UINT8 m_port2;
UINT8 m_segment;
UINT8 m_lamprow;
UINT8 m_swrow;
- UINT8 m_sndcmd;
virtual void machine_reset();
required_device<cpu_device> m_maincpu;
- optional_device<cpu_device> m_audiocpu;
+ optional_device<gottlieb_sound_r0_device> m_r0_sound;
+ optional_device<gottlieb_sound_r1_device> m_r1_sound;
};
static ADDRESS_MAP_START( gts80_map, AS_PROGRAM, 8, gts80_state )
@@ -71,20 +67,7 @@ static ADDRESS_MAP_START( gts80_map, AS_PROGRAM, 8, gts80_state )
AM_RANGE(0x3000, 0x3fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gts80_r0_map, AS_PROGRAM, 8, gts80_state )
- ADDRESS_MAP_GLOBAL_MASK(0x0fff)
- AM_RANGE(0x0000, 0x003f) AM_RAM AM_MIRROR(0x1c0)
- AM_RANGE(0x0200, 0x020f) AM_DEVREADWRITE("r6530", mos6530_device, read, write)
- AM_RANGE(0x0400, 0x0fff) AM_ROM
-ADDRESS_MAP_END
-
-
static INPUT_PORTS_START( gts80 )
- PORT_START("SND")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_0) PORT_CHANGED_MEMBER(DEVICE_SELF, gts80_state, audio_nmi, 1)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Attract") PORT_CODE(KEYCODE_F1) PORT_TOGGLE
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Music") PORT_CODE(KEYCODE_F2) PORT_TOGGLE
-
PORT_START("DSW.0")
PORT_DIPNAME( 0x80, 0x00, "SW 1")
PORT_DIPSETTING( 0x00, DEF_STR(Off))
@@ -273,13 +256,6 @@ static INPUT_PORTS_START( gts80 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_O)
INPUT_PORTS_END
-INPUT_CHANGED_MEMBER( gts80_state::audio_nmi )
-{
- // Diagnostic button sends a pulse to NMI pin
- if ((newval==CLEAR_LINE) && (m_audiocpu))
- m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
-}
-
READ8_MEMBER( gts80_state::port1a_r )
{
char kbdrow[8];
@@ -347,15 +323,12 @@ WRITE8_MEMBER( gts80_state::port3a_w )
//pb0-3 = sound; pb4-7 = lamprow
WRITE8_MEMBER( gts80_state::port3b_w )
{
- m_sndcmd = data & 15;
+ UINT8 sndcmd = data & 15;
m_lamprow = data >> 4;
-}
-
-// d0-3 = sndcmd in; d4 = attract-mode dip; d6 = 'spare' input; d7 = sound/tone dip
-READ8_MEMBER( gts80_state::r6530b_r )
-{
- UINT8 data = m_sndcmd ^ 15;
- return data | 0x20 | (ioport("SND")->read() & 0x90);
+ if (m_r0_sound)
+ m_r0_sound->write(space, offset, sndcmd);
+ if (m_r1_sound)
+ m_r1_sound->write(space, offset, sndcmd);
}
void gts80_state::machine_reset()
@@ -367,7 +340,7 @@ DRIVER_INIT_MEMBER( gts80_state, gts80 )
}
/* with Sound Board */
-static MACHINE_CONFIG_START( gts80_s, gts80_state )
+static MACHINE_CONFIG_START( gts80, gts80_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
MCFG_CPU_PROGRAM_MAP(gts80_map)
@@ -384,13 +357,13 @@ static MACHINE_CONFIG_START( gts80_s, gts80_state )
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port1b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot2", RIOT6532, 850000)
+ MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL_3_579545MHz/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port2a_r)) // pa7 - slam tilt
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port2a_w)) // digit select
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port2b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot3", RIOT6532, 850000)
+ MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL_3_579545MHz/4)
//MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port3a_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port3a_w)) // sol, snd
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port3b_r))
@@ -399,29 +372,23 @@ static MACHINE_CONFIG_START( gts80_s, gts80_state )
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_3_579545MHz/4) // M6503 - clock is a gate, a resistor and a capacitor. Freq unknown.
- MCFG_CPU_PROGRAM_MAP(gts80_r0_map)
- MCFG_DEVICE_ADD("r6530", MOS6530, 3572549/4) // unknown - same as cpu
- MCFG_MOS6530_OUT_PA_CB(DEVWRITE8("dac", dac_device, write_unsigned8))
- MCFG_MOS6530_IN_PB_CB(READ8(gts80_state, r6530b_r))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac", DAC, 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+MACHINE_CONFIG_END
- /* related to src/mame/audio/gottlieb.c */
-// MCFG_IMPORT_FROM(gts80s_s)
+static MACHINE_CONFIG_DERIVED( gts80_s, gts80 )
+ MCFG_GOTTLIEB_SOUND_R0_ADD("r0sound")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-/* with Sound & Speech Board */
-/* Note: hh uses this but it does not have the Votrax chip (?) */
-//static MACHINE_CONFIG_START( gts80_ss, gts80_state )
- /* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", M6502, 850000)
-// MCFG_CPU_PROGRAM_MAP(gts80_map)
-static MACHINE_CONFIG_DERIVED( gts80_ss, gts80_s )
+static MACHINE_CONFIG_DERIVED( gts80_hh, gts80 )
+ MCFG_GOTTLIEB_SOUND_R1_ADD("r1sound")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+MACHINE_CONFIG_END
- /* related to src/mame/audio/gottlieb.c */
-// MCFG_IMPORT_FROM(gts80s_ss)
+static MACHINE_CONFIG_DERIVED( gts80_ss, gts80 )
+ MCFG_GOTTLIEB_SOUND_R1_ADD("r1sound")
+ //MCFG_GOTTLIEB_SOUND_R1_ADD_VOTRAX("r1sound") // votrax crashes
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
@@ -433,7 +400,7 @@ ROM_START(blckhole)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("668-4.cpu", 0x1000, 0x0800, CRC(01b53045) SHA1(72d73bbb09358b331696cd1cc44fc4958feffbe2))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("668-s1.snd", 0x7000, 0x0800, CRC(23d5045d) SHA1(a20bf02ece97e8238d1dbe8d35ca63d82b62431e))
ROM_LOAD("668-s2.snd", 0x7800, 0x0800, CRC(d63da498) SHA1(84dd87783f47fbf64b1830284c168501f9b455e2))
ROM_END
@@ -444,7 +411,7 @@ ROM_START(blckhole2)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("668-2.cpu", 0x1000, 0x0800, CRC(df03ffea) SHA1(7ca8fc321f74b9193104c282c7b4b92af93694c9))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("668-s1.snd", 0x7000, 0x0800, CRC(23d5045d) SHA1(a20bf02ece97e8238d1dbe8d35ca63d82b62431e))
ROM_LOAD("668-s2.snd", 0x7800, 0x0800, CRC(d63da498) SHA1(84dd87783f47fbf64b1830284c168501f9b455e2))
ROM_END
@@ -455,7 +422,7 @@ ROM_START(blckhols)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("668-a2.cpu", 0x1000, 0x0800, CRC(df56f896) SHA1(1ec945a7ed8d25064476791adab2b554371dadbe))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("668-a-s.snd", 0x0400, 0x0400, CRC(5175f307) SHA1(97be8f2bbc393cc45a07fa43daec4bbba2336af8))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -473,7 +440,7 @@ ROM_START(circusp)
ROM_LOAD("654-2.cpu", 0x1200, 0x0200, CRC(01e23569) SHA1(47088421254e487aa1d1e87ea911dc1634e7d9ad))
ROM_RELOAD(0x1600, 0x0200)
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("654.snd", 0x0400, 0x0400, CRC(75c3ad67) SHA1(4f59c451b8659d964d5242728814c2d97f68445b))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -491,7 +458,7 @@ ROM_START(cntforce)
ROM_LOAD("656-2.cpu", 0x1200, 0x0200, CRC(0e185c30) SHA1(01d9fb5d335c24bed9f747d6e23f57adb6ef09a5))
ROM_RELOAD(0x1600, 0x0200)
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("656.snd", 0x0400, 0x0400, CRC(0be2cbe9) SHA1(306a3e7d93733562360285de35b331b5daae7250))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -510,7 +477,7 @@ ROM_START(eclipse)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("671-a.cpu", 0x1000, 0x0800, CRC(efad7312) SHA1(fcfd5e5c7924d65ac42561994797156a80018667))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("671-a-s.snd", 0x0400, 0x0400, CRC(5175f307) SHA1(97be8f2bbc393cc45a07fa43daec4bbba2336af8))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -525,7 +492,7 @@ ROM_START(forceii)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("661-2.cpu", 0x1000, 0x0800, CRC(a4fa42a4) SHA1(c17af4f0da6d5630e43db44655bece0e26b0112a))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("661.snd", 0x0400, 0x0400, CRC(650158a7) SHA1(c7a9d521d1e7de1e00e7abc3a97aaaee04f8052e))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -540,7 +507,7 @@ ROM_START(hh)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("669-2.cpu", 0x1000, 0x0800, CRC(f3085f77) SHA1(ebd43588401a735d9c941d06d67ac90183139e90))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("669-s1.snd", 0x7000, 0x0800, CRC(52ec7335) SHA1(2b08dd8a89057c9c8c184d5b723ecad01572129f))
ROM_LOAD("669-s2.snd", 0x7800, 0x0800, CRC(a3317b4b) SHA1(c3b14aa58fd4588c8b8fa3540ea6331a9ee40f1f))
ROM_END
@@ -551,7 +518,7 @@ ROM_START(hh_1)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("669-1.cpu", 0x1000, 0x0800, CRC(96e72b93) SHA1(3eb3d3e064ba2fe637bba2a93ffd07f00edfa0f2))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("669-s1.snd", 0x7000, 0x0800, CRC(52ec7335) SHA1(2b08dd8a89057c9c8c184d5b723ecad01572129f))
ROM_LOAD("669-s2.snd", 0x7800, 0x0800, CRC(a3317b4b) SHA1(c3b14aa58fd4588c8b8fa3540ea6331a9ee40f1f))
ROM_END
@@ -565,7 +532,7 @@ ROM_START(jamesb)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("658-1.cpu", 0x1000, 0x0800, CRC(b841ad7a) SHA1(3396e82351c975781cac9112bfa341a3b799f296))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("658.snd", 0x0400, 0x0400, CRC(962c03df) SHA1(e8ff5d502a038531a921380b75c27ef79b6feac8))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -577,7 +544,7 @@ ROM_START(jamesb2)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("658-x.cpu", 0x1000, 0x0800, CRC(e7e0febf) SHA1(2c101a88b61229f30ed15d38f395bc538999d766))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("658.snd", 0x0400, 0x0400, CRC(962c03df) SHA1(e8ff5d502a038531a921380b75c27ef79b6feac8))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -592,7 +559,7 @@ ROM_START(marsp)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("666-1.cpu", 0x1000, 0x0800, CRC(bb7d476a) SHA1(22d5d7f0e52c5180f73a1ca0b3c6bd4b7d0843d6))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("666-s1.snd", 0x7000, 0x0800, CRC(d33dc8a5) SHA1(8d071c392996a74c3cdc2cf5ea3be3c86553ce89))
ROM_LOAD("666-s2.snd", 0x7800, 0x0800, CRC(e5616f3e) SHA1(a6b5ebd0b456a555db0889cd63ce79aafc64dbe5))
ROM_END
@@ -606,7 +573,7 @@ ROM_START(panthera)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("652.cpu", 0x1000, 0x0800, CRC(5386e5fb) SHA1(822f47951b702f9c6a1ce674baaab0a596f34413))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("652.snd", 0x0400, 0x0400, CRC(4d0cf2c0) SHA1(0da5d118ffd19b1e78dfaaee3e31c43750d45c8d))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -619,7 +586,7 @@ ROM_START(panther7)
ROM_LOAD("u3g807dc.bin", 0x3000, 0x1000, CRC(6e31242e) SHA1(14e371a0352a6068dec20af1f2b344e34a5b9011))
ROM_LOAD("652.cpu", 0x1000, 0x0800, CRC(5386e5fb) SHA1(822f47951b702f9c6a1ce674baaab0a596f34413))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("652.snd", 0x0400, 0x0400, CRC(4d0cf2c0) SHA1(0da5d118ffd19b1e78dfaaee3e31c43750d45c8d))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -635,7 +602,7 @@ ROM_START(pnkpnthr)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("664-1.cpu", 0x1000, 0x0800, CRC(a0d3e69a) SHA1(590e68dc28067e61832927cd4b3eefcc066f0a92))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("664.snd", 0x0400, 0x0400, CRC(18f4abfd) SHA1(9e85eb7e9b1e2fe71be828ff1b5752424ed42588))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -648,7 +615,7 @@ ROM_START(pnkpntr7)
ROM_LOAD("u3g807dc.bin", 0x3000, 0x1000, CRC(6e31242e) SHA1(14e371a0352a6068dec20af1f2b344e34a5b9011))
ROM_LOAD("664-1.cpu", 0x1000, 0x0800, CRC(a0d3e69a) SHA1(590e68dc28067e61832927cd4b3eefcc066f0a92))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("664.snd", 0x0400, 0x0400, CRC(18f4abfd) SHA1(9e85eb7e9b1e2fe71be828ff1b5752424ed42588))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -667,7 +634,7 @@ ROM_START(starrace)
ROM_LOAD("657-2.cpu", 0x1200, 0x0200, CRC(c56e31c8) SHA1(1e129fb6309e015a16f2bdb1e389cbc85d1919a7))
ROM_RELOAD(0x1600, 0x0200)
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("657.snd", 0x0400, 0x0400, CRC(3a1d3995) SHA1(6f0bdb34c4fa11d5f8ecbb98ae55bafeb5d62c9e))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -683,7 +650,7 @@ ROM_START(starrac7)
ROM_LOAD("657-2.cpu", 0x1200, 0x0200, CRC(c56e31c8) SHA1(1e129fb6309e015a16f2bdb1e389cbc85d1919a7))
ROM_RELOAD(0x1600, 0x0200)
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("657.snd", 0x0400, 0x0400, CRC(3a1d3995) SHA1(6f0bdb34c4fa11d5f8ecbb98ae55bafeb5d62c9e))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -702,7 +669,7 @@ ROM_START(spidermn)
ROM_LOAD("653-2.cpu", 0x1200, 0x0200, CRC(ff1ddfd7) SHA1(dd7b98e491045916153b760f36432506277a4093))
ROM_RELOAD(0x1600, 0x0200)
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("653.snd", 0x0400, 0x0400, CRC(f5650c46) SHA1(2d0e50fa2f4b3d633daeaa7454630e3444453cb2))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -721,7 +688,7 @@ ROM_START(timeline)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("659.cpu", 0x1000, 0x0800, CRC(d6950e3b) SHA1(939b45a9ee4bb122fbea534ad728ec6b85120416))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("659.snd", 0x0400, 0x0400, CRC(28185568) SHA1(2fd26e7e0a8f050d67159f17634df2b1fc47cbd3))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -736,7 +703,7 @@ ROM_START(vlcno_ax)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("667-a-x.cpu", 0x1000, 0x0800, CRC(1f51c351) SHA1(8e1850808faab843ac324040ca665a83809cdc7b))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("667-s1.snd", 0x7000, 0x0800, CRC(ba9d40b7) SHA1(3d6640b259cd8ae87b998cbf1ae2dc13a2913e4f))
ROM_LOAD("667-s2.snd", 0x7800, 0x0800, CRC(b54bd123) SHA1(3522ccdcb28bfacff2287f5537d52f22879249ab))
ROM_END
@@ -747,7 +714,7 @@ ROM_START(vlcno_1b)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("667-1b.cpu", 0x1000, 0x0800, CRC(a422d862) SHA1(2785388eb43c08405774a9413ffa52c1591a84f2))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("667-a-s.snd", 0x0400, 0x0400, CRC(894b4e2e) SHA1(d888f8e00b2b50cef5cc916d46e4c5e6699914a1))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -759,7 +726,7 @@ ROM_START(vlcno_1a)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("667-1a.cpu", 0x1000, 0x0800, CRC(5931c6f7) SHA1(e104a6c3ca2175bb49199e06963e26185dd563d2))
- ROM_REGION(0x1000, "audiocpu", 0)
+ ROM_REGION(0x1000, "r0sound:audiocpu", 0)
ROM_LOAD("667-a-s.snd", 0x0400, 0x0400, CRC(894b4e2e) SHA1(d888f8e00b2b50cef5cc916d46e4c5e6699914a1))
ROM_RELOAD( 0x0800, 0x0400)
ROM_LOAD("6530sy80.bin", 0x0c00, 0x0400, CRC(c8ba951d) SHA1(e4aa152b36695a0205c19a8914e4d77373f64c6c))
@@ -774,7 +741,7 @@ ROM_START(s80tst)
ROM_LOAD("u3_80.bin", 0x3000, 0x1000, CRC(1e69f9d0) SHA1(ad738cac2555830257b531e5e533b15362f624b9))
ROM_LOAD("80tst.cpu", 0x1000, 0x0800, CRC(a0f9e56b) SHA1(5146745ab61fea4b3070c6cf4324a9e77a7cee36))
- ROM_REGION(0x10000, "audiocpu", 0)
+ ROM_REGION(0x10000, "r1sound:audiocpu", 0)
ROM_LOAD("80tst-s1.snd", 0x7000, 0x0800, CRC(b9dbdd21) SHA1(dfe42c9e6e02f82ffd0cafe164df3211cdc2d966))
ROM_LOAD("80tst-s2.snd", 0x7800, 0x0800, CRC(1a4b1e9d) SHA1(18e7ffbdbdaf83ab1c8daa5fa5201d9f54390758))
ROM_END
@@ -798,6 +765,6 @@ ROM_END
/* disp2 */GAME(1981, blckhole, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Rev. 4)", GAME_IS_SKELETON_MECHANICAL)
/* disp2 */GAME(1981, blckhole2, blckhole, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Rev. 2)", GAME_IS_SKELETON_MECHANICAL)
/* disp2 */GAME(1981, blckhols, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Sound Only)", GAME_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1982, hh, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 2)", GAME_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1982, hh_1, hh, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 1)", GAME_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1982, hh, 0, gts80_hh, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 2)", GAME_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1982, hh_1, hh, gts80_hh, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 1)", GAME_IS_SKELETON_MECHANICAL)
/* disp2 */GAME(1981, eclipse, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Eclipse", GAME_IS_SKELETON_MECHANICAL)