summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Fabio Priuli <etabeta78@users.noreply.github.com>2014-04-11 06:44:25 +0000
committer Fabio Priuli <etabeta78@users.noreply.github.com>2014-04-11 06:44:25 +0000
commit591f39ce28297ea397f987d9721b9bbcae832c4e (patch)
tree3ad35ac3df64283642f0adf4bac23951c15125b1
parent4a942f72f5462957f4ba367540e78c7401a3e17a (diff)
namco_audio: converted to use inline config. nw.
-rw-r--r--src/emu/sound/namco.c25
-rw-r--r--src/emu/sound/namco.h25
-rw-r--r--src/mame/drivers/20pacgal.c16
-rw-r--r--src/mame/drivers/baraduke.c10
-rw-r--r--src/mame/drivers/galaga.c13
-rw-r--r--src/mame/drivers/gaplus.c8
-rw-r--r--src/mame/drivers/jrpacman.c16
-rw-r--r--src/mame/drivers/mappy.c20
-rw-r--r--src/mame/drivers/namcos1.c9
-rw-r--r--src/mame/drivers/namcos86.c9
-rw-r--r--src/mame/drivers/pacland.c9
-rw-r--r--src/mame/drivers/pacman.c16
-rw-r--r--src/mame/drivers/pengo.c17
-rw-r--r--src/mame/drivers/polepos.c17
-rw-r--r--src/mame/drivers/rallyx.c8
-rw-r--r--src/mame/drivers/skykid.c9
-rw-r--r--src/mame/drivers/tceptor.c12
-rw-r--r--src/mame/drivers/toypop.c11
18 files changed, 45 insertions, 205 deletions
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index 80c034a5b3a..f696abb5978 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -44,7 +44,9 @@ namco_audio_device::namco_audio_device(const machine_config &mconfig, device_typ
m_stream(NULL),
m_namco_clock(0),
m_sample_rate(0),
- m_f_fracbits(0)
+ m_f_fracbits(0),
+ m_voices(0),
+ m_stereo(0)
{
}
@@ -65,27 +67,6 @@ namco_cus30_device::namco_cus30_device(const machine_config &mconfig, const char
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void namco_audio_device::device_config_complete()
-{
- // inherit a copy of the static data
- const namco_interface *intf = reinterpret_cast<const namco_interface *>(static_config());
- if (intf != NULL)
- *static_cast<namco_interface *>(this) = *intf;
-
- // or initialize to defaults if none provided
- else
- {
- m_voices = 0;
- m_stereo = 0;
- }
-}
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
diff --git a/src/emu/sound/namco.h b/src/emu/sound/namco.h
index cd2a22c76ac..b0c1d2a4fbc 100644
--- a/src/emu/sound/namco.h
+++ b/src/emu/sound/namco.h
@@ -8,11 +8,13 @@
#define MAX_VOLUME 16
-struct namco_interface
-{
- int m_voices; /* number of voices */
- int m_stereo; /* set to 1 to indicate stereo (e.g., System 1) */
-};
+
+#define MCFG_NAMCO_AUDIO_VOICES(_voices) \
+ namco_audio_device::set_voices(*device, _voices);
+
+#define MCFG_NAMCO_AUDIO_STEREO(_stereo) \
+ namco_audio_device::set_stereo(*device, _stereo);
+
/* this structure defines the parameters for a channel */
struct sound_channel
@@ -29,16 +31,18 @@ struct sound_channel
};
class namco_audio_device : public device_t,
- public device_sound_interface,
- public namco_interface
+ public device_sound_interface
{
public:
namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~namco_audio_device() {}
- protected:
+ // static configuration
+ static void set_voices(device_t &device, int voices) { downcast<namco_audio_device &>(device).m_voices = voices; }
+ static void set_stereo(device_t &device, int stereo) { downcast<namco_audio_device &>(device).m_stereo = stereo; }
+
+protected:
// device-level overrides
- virtual void device_config_complete();
virtual void device_start();
// internal state
@@ -61,6 +65,9 @@ public:
int m_sample_rate;
int m_f_fracbits;
+ int m_voices; /* number of voices */
+ int m_stereo; /* set to 1 to indicate stereo (e.g., System 1) */
+
/* decoded waveform table */
INT16 *m_waveform[MAX_VOLUME];
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index aef7026ce40..4285b894dca 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -121,20 +121,6 @@ WRITE8_MEMBER(_20pacgal_state::timer_pulse_w)
/*************************************
*
- * Audio
- *
- *************************************/
-
-static const namco_interface namco_config =
-{
- 3, /* number of voices */
- 0 /* stereo */
-};
-
-
-
-/*************************************
- *
* Coin counter
*
*************************************/
@@ -408,7 +394,7 @@ static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_CUS30, NAMCO_AUDIO_CLOCK)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DAC_ADD("dac")
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 8224240e75f..ae56f5f62cd 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -364,14 +364,6 @@ GFXDECODE_END
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
-
-
static MACHINE_CONFIG_START( baraduke, baraduke_state )
/* basic machine hardware */
@@ -401,7 +393,7 @@ static MACHINE_CONFIG_START( baraduke, baraduke_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 2022b72ec9d..ba2f9c0b78f 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1574,11 +1574,6 @@ GFXDECODE_END
/* The resistance path of the namco sound is 16k compared to
* the 10k of the highest gain 54xx filter. Giving a 10/16 gain.
*/
-static const namco_interface namco_config =
-{
- 3, /* number of voices */
- 0 /* stereo */
-};
static const char *const battles_sample_names[] =
{
@@ -1682,7 +1677,7 @@ static MACHINE_CONFIG_START( bosco, bosco_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
@@ -1746,7 +1741,7 @@ static MACHINE_CONFIG_START( galaga, galaga_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
@@ -1834,7 +1829,7 @@ static MACHINE_CONFIG_START( xevious, xevious_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
@@ -1935,7 +1930,7 @@ static MACHINE_CONFIG_START( digdug, digdug_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index b8e6e72e01f..a4d8befc836 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -467,12 +467,6 @@ static GFXDECODE_START( gaplus )
GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 64*4, 64 )
GFXDECODE_END
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
static const char *const gaplus_sample_names[] =
{
"*gaplus",
@@ -583,7 +577,7 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_15XX, 24576000/1024)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SAMPLES_ADD("samples", gaplus_samples_interface)
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 6be11e631f6..2483997d57e 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -260,20 +260,6 @@ GFXDECODE_END
/*************************************
*
- * Sound interfaces
- *
- *************************************/
-
-static const namco_interface namco_config =
-{
- 3, /* number of voices */
- 0 /* stereo */
-};
-
-
-
-/*************************************
- *
* Machine drivers
*
*************************************/
@@ -311,7 +297,7 @@ static MACHINE_CONFIG_START( jrpacman, jrpacman_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, 3072000/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index d33bb4030db..6c2516170cc 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1595,20 +1595,6 @@ static GFXDECODE_START( todruaga )
GFXDECODE_END
-
-/***************************************************************************
-
- Sound interface
-
-***************************************************************************/
-
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
-
/***************************************************************************
Custom I/O initialization
@@ -1709,7 +1695,7 @@ static MACHINE_CONFIG_FRAGMENT( superpac_common )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1832,7 +1818,7 @@ static MACHINE_CONFIG_START( phozon, mappy_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1871,7 +1857,7 @@ static MACHINE_CONFIG_FRAGMENT( mappy_common )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 12efc719605..ba57cf426f8 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -1056,12 +1056,6 @@ GFXDECODE_END
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 1 /* stereo */
-};
-
/*
namcos1 has two 8bit dac channel. But They are mixed before pre-amp.
And,they are connected with pre-amp through active LPF.
@@ -1115,7 +1109,8 @@ static MACHINE_CONFIG_START( ns1, namcos1_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048/2)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
+ MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index e4db1fbe1f0..0221a86ec35 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -979,13 +979,6 @@ GFXDECODE_END
/*******************************************************************/
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
-
static MACHINE_CONFIG_START( hopmappy, namcos86_state )
/* basic machine hardware */
@@ -1024,7 +1017,7 @@ static MACHINE_CONFIG_START( hopmappy, namcos86_state )
MCFG_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */
MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 444863aa6bd..625a41b0505 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -402,13 +402,6 @@ static GFXDECODE_START( pacland )
GFXDECODE_END
-
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
INTERRUPT_GEN_MEMBER(pacland_state::main_vblank_irq)
{
if(m_main_irq_mask)
@@ -450,7 +443,7 @@ static MACHINE_CONFIG_START( pacland, pacland_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2/1024)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index ef5a9ae90d0..87c408ae27c 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -3298,20 +3298,6 @@ static GFXDECODE_START( crush4 )
GFXDECODE_END
-
-/*************************************
- *
- * Sound interfaces
- *
- *************************************/
-
-static const namco_interface namco_config =
-{
- 3, /* number of voices */
- 0 /* stereo */
-};
-
-
/*************************************
*
* Machine drivers
@@ -3344,7 +3330,7 @@ static MACHINE_CONFIG_START( pacman, pacman_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 967517f8144..7754326c425 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -346,21 +346,6 @@ static GFXDECODE_START( pengo )
GFXDECODE_END
-
-/*************************************
- *
- * Sound interfaces
- *
- *************************************/
-
-static const namco_interface namco_config =
-{
- 3, /* number of voices */
- 0 /* stereo */
-};
-
-
-
/*************************************
*
* Machine drivers
@@ -398,7 +383,7 @@ static MACHINE_CONFIG_START( pengo, pengo_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index d2c130cc7d8..10c2392d1fc 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -823,17 +823,6 @@ GFXDECODE_END
/*********************************************************************
- * Sound interfaces
- *********************************************************************/
-
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 1 /* stereo */
-};
-
-
-/*********************************************************************
* Machine driver
*********************************************************************/
@@ -911,7 +900,8 @@ static MACHINE_CONFIG_START( polepos, polepos_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
+ MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
@@ -979,7 +969,8 @@ static MACHINE_CONFIG_START( topracern, polepos_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
+ MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 07b9eebdfca..330afddab04 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -797,12 +797,6 @@ GFXDECODE_END
*
*************************************/
-static const namco_interface namco_config =
-{
- 3, /* number of voices */
- 0 /* stereo */
-};
-
static const char *const rallyx_sample_names[] =
{
"*rallyx",
@@ -880,7 +874,7 @@ static MACHINE_CONFIG_START( rallyx, rallyx_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32) /* 96 KHz */
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SAMPLES_ADD("samples", rallyx_samples_interface)
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 25eb471234a..054d47ad3f4 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -415,13 +415,6 @@ static GFXDECODE_START( skykid )
GFXDECODE_END
-
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
INTERRUPT_GEN_MEMBER(skykid_state::main_vblank_irq)
{
if(m_main_irq_mask)
@@ -469,7 +462,7 @@ static MACHINE_CONFIG_START( skykid, skykid_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 751caa1f9cd..090160afae7 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -323,15 +323,6 @@ GFXDECODE_END
/*******************************************************************/
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 1 /* stereo */
-};
-
-
-/*******************************************************************/
-
void tceptor_state::machine_start()
{
save_item(NAME(m_m6809_irq_enable));
@@ -424,7 +415,8 @@ static MACHINE_CONFIG_START( tceptor, tceptor_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
+ MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 899bc6a8531..1d92ebc227e 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -473,15 +473,6 @@ static GFXDECODE_START( toypop )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 128*4, 64 )
GFXDECODE_END
-
-
-static const namco_interface namco_config =
-{
- 8, /* number of voices */
- 0 /* stereo */
-};
-
-
/***************************************************************************
Custom I/O initialization
@@ -563,7 +554,7 @@ static MACHINE_CONFIG_START( liblrabl, toypop_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("namco", NAMCO_15XX, 24000)
- MCFG_SOUND_CONFIG(namco_config)
+ MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END