summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/vertigo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/vertigo.cpp')
-rw-r--r--src/mame/drivers/vertigo.cpp58
1 files changed, 9 insertions, 49 deletions
diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp
index 10ff3ce80da..ed97be3ae51 100644
--- a/src/mame/drivers/vertigo.cpp
+++ b/src/mame/drivers/vertigo.cpp
@@ -19,15 +19,11 @@
#include "cpu/m6805/m68705.h"
#include "cpu/m6805/m6805.h"
-#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "machine/pit8253.h"
#include "machine/nvram.h"
#include "screen.h"
-#define EXIDY440_AUDIO_CLOCK (XTAL(12'979'200) / 4)
-#define EXIDY440_MC3418_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 16)
-
/*************************************
*
@@ -53,21 +49,6 @@ void vertigo_state::vertigo_map(address_map &map)
map(0x800000, 0x81ffff).rom();
}
-void vertigo_state::exidy440_audio_map(address_map &map)
-{
- map(0x0000, 0x7fff).noprw();
- map(0x8000, 0x801f).mirror(0x03e0).rw(m_custom, FUNC(exidy440_sound_device::m6844_r), FUNC(exidy440_sound_device::m6844_w));
- map(0x8400, 0x840f).mirror(0x03f0).rw(m_custom, FUNC(exidy440_sound_device::sound_volume_r), FUNC(exidy440_sound_device::sound_volume_w));
- map(0x8800, 0x8800).mirror(0x03ff).r(m_custom, FUNC(exidy440_sound_device::sound_command_r)).nopw();
- map(0x8c00, 0x93ff).noprw();
- map(0x9400, 0x9403).mirror(0x03fc).nopr().w(m_custom, FUNC(exidy440_sound_device::sound_banks_w));
- map(0x9800, 0x9800).mirror(0x03ff).nopr().w(m_custom, FUNC(exidy440_sound_device::sound_interrupt_clear_w));
- map(0x9c00, 0x9fff).noprw();
- map(0xa000, 0xbfff).ram();
- map(0xc000, 0xdfff).noprw();
- map(0xe000, 0xffff).rom();
-}
-
/*************************************
*
@@ -139,7 +120,12 @@ MACHINE_CONFIG_START(vertigo_state::vertigo)
MCFG_ADC0808_IN2_CB(IOPORT("PADDLE"))
// IN3-IN7 tied to Vss
- exidy440_audio(config);
+ SPEAKER(config, "lspeaker").front_left();
+ SPEAKER(config, "rspeaker").front_right();
+
+ MCFG_DEVICE_ADD("440audio", EXIDY440, EXIDY440_MC3418_CLOCK)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(24_MHz_XTAL / 100)
@@ -165,32 +151,6 @@ MACHINE_CONFIG_START(vertigo_state::vertigo)
MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(vertigo_state::exidy440_audio)
-
- MCFG_DEVICE_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK)
- MCFG_DEVICE_PROGRAM_MAP(exidy440_audio_map)
- MCFG_DEVICE_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert)
-
- SPEAKER(config, "lspeaker").front_left();
- SPEAKER(config, "rspeaker").front_right();
-
- MCFG_DEVICE_ADD("custom", EXIDY440, EXIDY440_MC3418_CLOCK)
- MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
- MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-
-// MCFG_DEVICE_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
-// MCFG_DEVICE_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
-// MCFG_DEVICE_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
-// MCFG_DEVICE_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-MACHINE_CONFIG_END
-
/*************************************
*
@@ -238,10 +198,10 @@ ROM_START( topgunnr )
ROMX_LOAD( "vuc.03", 7, 0x200, CRC(23c1f136) SHA1(0eb959aa8fb6028dd97bdaa28981cec16652bf2d), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(7))
ROMX_LOAD( "vuc.04", 7, 0x200, CRC(a5389228) SHA1(922d49c949e31413bbbff118c04965b649864a67), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(7))
- ROM_REGION( 0x010000, "audiocpu", 0 )
- ROM_LOAD( "vga1_7.g7", 0x0e000, 0x2000, CRC(db109b19) SHA1(c3fbb28cb4679c021bc48f844097add39a2208a5) )
+ ROM_REGION( 0x02000, "440audio:audiocpu", 0 )
+ ROM_LOAD( "vga1_7.g7", 0x00000, 0x2000, CRC(db109b19) SHA1(c3fbb28cb4679c021bc48f844097add39a2208a5) )
- ROM_REGION( 0x20000, "cvsd", 0 )
+ ROM_REGION( 0x20000, "440audio:samples", 0 )
ROM_LOAD( "vga1_7.l6", 0x00000, 0x2000, CRC(20cbf97a) SHA1(13e138b08ba3328db6a2fba95a369422455d1c5c) )
ROM_LOAD( "vga1_7.m6", 0x02000, 0x2000, CRC(76197050) SHA1(d26701ba83a34384348fa34e3de78cc69dc5362e) )
ROM_LOAD( "vga1_7.n6", 0x04000, 0x2000, CRC(b93d7cbb) SHA1(1a4d05e03765b66ff20b963c5a0b5f7c3d5a360c) )