summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/mame/audio/irem.c152
-rw-r--r--src/mame/audio/irem.h39
-rw-r--r--src/mame/drivers/m52.c12
-rw-r--r--src/mame/drivers/m57.c8
-rw-r--r--src/mame/drivers/m58.c15
-rw-r--r--src/mame/drivers/m62.c48
-rw-r--r--src/mame/drivers/travrusa.c18
7 files changed, 183 insertions, 109 deletions
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 5d524b2a002..6a765ce5a69 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -12,15 +12,31 @@
#include "audio/irem.h"
-const device_type IREM_AUDIO = &device_creator<irem_audio_device>;
-
-irem_audio_device::irem_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, IREM_AUDIO, "Irem Audio", tag, owner, clock, "irem_audio", __FILE__),
- device_sound_interface(mconfig, *this),
- m_port1(0),
- m_port2(0)
- //m_ay_45L(*this, "ay_45l"),
- //m_ay_45M(*this, "ay_45m")
+const device_type IREM_M62_AUDIO = &device_creator<m62_audio_device>;
+const device_type IREM_M52_SOUNDC_AUDIO = &device_creator<m52_soundc_audio_device>;
+const device_type IREM_M52_LARGE_AUDIO = &device_creator<m52_large_audio_device>;
+
+irem_audio_device::irem_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)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+ m_port1(0),
+ m_port2(0)
+ //m_ay_45L(*this, "ay_45l"),
+ //m_ay_45M(*this, "ay_45m")
+{
+}
+
+m62_audio_device::m62_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ : irem_audio_device(mconfig, IREM_M62_AUDIO, "Irem M62 Audio", tag, owner, clock, "irem_m62_audio", __FILE__)
+{
+}
+
+m52_soundc_audio_device::m52_soundc_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ : irem_audio_device(mconfig, IREM_M52_SOUNDC_AUDIO, "Irem M52 SoundC Audio", tag, owner, clock, "irem_m52_soundc_audio", __FILE__)
+{
+}
+
+m52_large_audio_device::m52_large_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ : irem_audio_device(mconfig, IREM_M52_LARGE_AUDIO, "Irem M52 Large Audio", tag, owner, clock, "irem_m52_large_audio", __FILE__)
{
}
@@ -40,16 +56,16 @@ void irem_audio_device::device_config_complete()
void irem_audio_device::device_start()
{
- m_adpcm1 = machine().device<msm5205_device>("msm1");
- m_adpcm2 = machine().device<msm5205_device>("msm2");
- m_ay_45L = machine().device<ay8910_device>("ay_45l");
- m_ay_45M = machine().device<ay8910_device>("ay_45m");
+ m_adpcm1 = subdevice<msm5205_device>("msm1");
+ m_adpcm2 = subdevice<msm5205_device>("msm2");
+ m_ay_45L = subdevice<ay8910_device>("ay_45l");
+ m_ay_45M = subdevice<ay8910_device>("ay_45m");
- m_audio_BD = machine().device<netlist_mame_logic_input_t>("snd_nl:ibd");
- m_audio_SD = machine().device<netlist_mame_logic_input_t>("snd_nl:isd");
- m_audio_OH = machine().device<netlist_mame_logic_input_t>("snd_nl:ioh");
- m_audio_CH = machine().device<netlist_mame_logic_input_t>("snd_nl:ich");
- m_audio_SINH = machine().device<netlist_mame_logic_input_t>("snd_nl:sinh");
+ m_audio_BD = subdevice<netlist_mame_logic_input_t>("snd_nl:ibd");
+ m_audio_SD = subdevice<netlist_mame_logic_input_t>("snd_nl:isd");
+ m_audio_OH = subdevice<netlist_mame_logic_input_t>("snd_nl:ioh");
+ m_audio_CH = subdevice<netlist_mame_logic_input_t>("snd_nl:ich");
+ m_audio_SINH = subdevice<netlist_mame_logic_input_t>("snd_nl:sinh");
save_item(NAME(m_port1));
save_item(NAME(m_port2));
@@ -71,7 +87,7 @@ WRITE8_MEMBER( irem_audio_device::cmd_w )
if ((data & 0x80) == 0)
drvstate->soundlatch_byte_w(space, 0, data & 0x7f);
else
- space.machine().device("iremsound")->execute().set_input_line(0, ASSERT_LINE);
+ subdevice("iremsound")->execute().set_input_line(0, ASSERT_LINE);
}
@@ -139,8 +155,8 @@ READ8_MEMBER( irem_audio_device::m6803_port2_r )
* Pin21, 6803 (Port 21) tied with 4.7k to +5V
*
*/
- printf("port2 read\n");
- return 0;
+ //printf("port2 read\n"); // used by 10yard
+ return 0x0;
}
@@ -193,7 +209,7 @@ WRITE8_MEMBER( irem_audio_device::ay8910_45L_porta_w )
WRITE8_MEMBER( irem_audio_device::sound_irq_ack_w )
{
- space.machine().device("iremsound")->execute().set_input_line(0, CLEAR_LINE);
+ subdevice("iremsound")->execute().set_input_line(0, CLEAR_LINE);
}
@@ -228,7 +244,7 @@ WRITE8_MEMBER( irem_audio_device::m62_adpcm_w )
void irem_audio_device::adpcm_int(int st)
{
- machine().device("iremsound")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
+ subdevice("iremsound")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
/* the first MSM5205 clocks the second */
if (m_adpcm2 != NULL)
@@ -352,31 +368,31 @@ DISCRETE_SOUND_END
/* complete address map verified from Moon Patrol/10 Yard Fight schematics */
/* large map uses 8k ROMs, small map uses 4k ROMs; this is selected via a jumper */
-static ADDRESS_MAP_START( m52_small_sound_map, AS_PROGRAM, 8, driver_device )
+static ADDRESS_MAP_START( m52_small_sound_map, AS_PROGRAM, 8, irem_audio_device )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x0fff) AM_DEVWRITE("irem_audio", irem_audio_device, m52_adpcm_w)
- AM_RANGE(0x1000, 0x1fff) AM_DEVWRITE("irem_audio", irem_audio_device, sound_irq_ack_w)
+ AM_RANGE(0x0000, 0x0fff) AM_WRITE(m52_adpcm_w)
+ AM_RANGE(0x1000, 0x1fff) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x2000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m52_large_sound_map, AS_PROGRAM, 8, driver_device )
- AM_RANGE(0x0000, 0x1fff) AM_DEVWRITE("irem_audio", irem_audio_device, m52_adpcm_w)
- AM_RANGE(0x2000, 0x3fff) AM_DEVWRITE("irem_audio", irem_audio_device, sound_irq_ack_w)
+static ADDRESS_MAP_START( m52_large_sound_map, AS_PROGRAM, 8, irem_audio_device )
+ AM_RANGE(0x0000, 0x1fff) AM_WRITE(m52_adpcm_w)
+ AM_RANGE(0x2000, 0x3fff) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
/* complete address map verified from Kid Niki schematics */
-static ADDRESS_MAP_START( m62_sound_map, AS_PROGRAM, 8, driver_device )
- AM_RANGE(0x0800, 0x0800) AM_MIRROR(0xf7fc) AM_DEVWRITE("irem_audio", irem_audio_device, sound_irq_ack_w)
- AM_RANGE(0x0801, 0x0802) AM_MIRROR(0xf7fc) AM_DEVWRITE("irem_audio", irem_audio_device, m62_adpcm_w)
+static ADDRESS_MAP_START( m62_sound_map, AS_PROGRAM, 8, irem_audio_device )
+ AM_RANGE(0x0800, 0x0800) AM_MIRROR(0xf7fc) AM_WRITE(sound_irq_ack_w)
+ AM_RANGE(0x0801, 0x0802) AM_MIRROR(0xf7fc) AM_WRITE(m62_adpcm_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( irem_sound_portmap, AS_IO, 8, driver_device )
- AM_RANGE(M6801_PORT1, M6801_PORT1) AM_DEVREADWRITE("irem_audio", irem_audio_device, m6803_port1_r, m6803_port1_w)
- AM_RANGE(M6801_PORT2, M6801_PORT2) AM_DEVREADWRITE("irem_audio", irem_audio_device, m6803_port2_r, m6803_port2_w)
+static ADDRESS_MAP_START( irem_sound_portmap, AS_IO, 8, irem_audio_device )
+ AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READWRITE(m6803_port1_r, m6803_port1_w)
+ AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(m6803_port2_r, m6803_port2_w)
ADDRESS_MAP_END
/*
@@ -496,13 +512,11 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
-
MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(driver_device, soundlatch_byte_r))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("irem_audio", irem_audio_device, ay8910_45M_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(DEVREAD8(":", driver_device, soundlatch_byte_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 0)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 2)
@@ -510,13 +524,13 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("irem_audio", irem_audio_device, ay8910_45L_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 3)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 4)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 5)
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
- MCFG_MSM5205_VCLK_CB(DEVWRITELINE("irem_audio", irem_audio_device, adpcm_int)) /* interrupt function */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(irem_audio_device, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 6)
@@ -567,23 +581,21 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
-
MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(driver_device, soundlatch_byte_r))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("irem_audio", irem_audio_device, ay8910_45M_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(DEVREAD8(":", driver_device, soundlatch_byte_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("irem_audio", irem_audio_device, ay8910_45L_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
- MCFG_MSM5205_VCLK_CB(DEVWRITELINE("irem_audio", irem_audio_device, adpcm_int)) /* interrupt function */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(irem_audio_device, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
@@ -593,11 +605,38 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED( m52_large_audio, irem_audio_base ) /* 10 yard fight */
+MACHINE_CONFIG_FRAGMENT( m52_large_audio) /* 10 yard fight */
/* basic machine hardware */
- MCFG_CPU_MODIFY("iremsound")
+ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(m52_large_sound_map)
+ MCFG_CPU_IO_MAP(irem_sound_portmap)
+
+ /* sound hardware */
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
+ MCFG_AY8910_RES_LOADS(470, 0, 0)
+ MCFG_AY8910_PORT_A_READ_CB(DEVREAD8(":", driver_device, soundlatch_byte_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
+ MCFG_AY8910_RES_LOADS(470, 0, 0)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(irem_audio_device, adpcm_int)) /* interrupt function */
+ MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* default to 4KHz, but can be changed at run time */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+
MACHINE_CONFIG_END
@@ -608,10 +647,17 @@ MACHINE_CONFIG_DERIVED( m62_audio, irem_audio_base )
MCFG_CPU_PROGRAM_MAP(m62_sound_map)
MACHINE_CONFIG_END
-//-------------------------------------------------
-// sound_stream_update - handle a stream update
-//-------------------------------------------------
+machine_config_constructor m62_audio_device::device_mconfig_additions() const
+{
+ return MACHINE_CONFIG_NAME( m62_audio );
+}
+
+machine_config_constructor m52_soundc_audio_device::device_mconfig_additions() const
+{
+ return MACHINE_CONFIG_NAME( m52_sound_c_audio );
+}
-void irem_audio_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
+machine_config_constructor m52_large_audio_device::device_mconfig_additions() const
{
+ return MACHINE_CONFIG_NAME( m52_large_audio );
}
diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h
index aa59e4e5c63..4e7fd6161a8 100644
--- a/src/mame/audio/irem.h
+++ b/src/mame/audio/irem.h
@@ -4,11 +4,10 @@
#include "sound/msm5205.h"
#include "machine/netlist.h"
-class irem_audio_device : public device_t,
- public device_sound_interface
+class irem_audio_device : public device_t
{
public:
- irem_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ irem_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);
~irem_audio_device() {}
DECLARE_WRITE8_MEMBER( cmd_w );
@@ -31,9 +30,6 @@ protected:
virtual void device_config_complete();
virtual void device_start();
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
private:
// internal state
UINT8 m_port1;
@@ -53,8 +49,31 @@ private:
netlist_mame_logic_input_t * m_audio_CH;
};
-MACHINE_CONFIG_EXTERN( m52_sound_c_audio );
-MACHINE_CONFIG_EXTERN( m52_large_audio );
-MACHINE_CONFIG_EXTERN( m62_audio );
+class m62_audio_device : public irem_audio_device
+{
+public:
+ m62_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ virtual machine_config_constructor device_mconfig_additions() const;
+};
+
+class m52_soundc_audio_device : public irem_audio_device
+{
+public:
+ m52_soundc_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ virtual machine_config_constructor device_mconfig_additions() const;
+};
+
+class m52_large_audio_device : public irem_audio_device
+{
+public:
+ m52_large_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ virtual machine_config_constructor device_mconfig_additions() const;
+};
+
+//MACHINE_CONFIG_EXTERN( m52_sound_c_audio );
+//MACHINE_CONFIG_EXTERN( m52_large_audio );
+//MACHINE_CONFIG_EXTERN( m62_audio );
-extern const device_type IREM_AUDIO;
+extern const device_type IREM_M62_AUDIO;
+extern const device_type IREM_M52_SOUNDC_AUDIO;
+extern const device_type IREM_M52_LARGE_AUDIO;
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index 9bac80fb154..aafd131d6a2 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -411,7 +411,9 @@ static MACHINE_CONFIG_START( m52, m52_state )
MCFG_SCREEN_PALETTE("palette")
/* sound hardware */
- MCFG_FRAGMENT_ADD(m52_sound_c_audio)
+ //MCFG_FRAGMENT_ADD(m52_sound_c_audio)
+ MCFG_DEVICE_ADD("irem_audio", IREM_M52_SOUNDC_AUDIO, 0)
+
MACHINE_CONFIG_END
@@ -437,7 +439,7 @@ ROM_START( mpatrol )
ROM_LOAD( "mpa-3.3k", 0x2000, 0x1000, CRC(2e1a598c) SHA1(112c3c9678db8a8540a8df3708020c87fd10c91b) )
ROM_LOAD( "mpa-4.3j", 0x3000, 0x1000, CRC(dd05b587) SHA1(727961b0dafa4a96b580d51013336db2a18aff1e) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "mp-s1.1a", 0x7000, 0x1000, CRC(561d3108) SHA1(4998c68a9e9a8002251fa8f07aa1082444a9dc80) )
ROM_REGION( 0x2000, "gfx1", 0 )
@@ -471,7 +473,7 @@ ROM_START( mpatrolw )
ROM_LOAD( "mpa-3w.3k", 0x2000, 0x1000, CRC(9b249fe5) SHA1(c01e0d572c4c163f3cf4b2aa9f4246427811b78d) )
ROM_LOAD( "mpa-4w.3j", 0x3000, 0x1000, CRC(fee76972) SHA1(c3166b027f89f61964ead804d3c2da387454c4c2) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "mp-s1.1a", 0x7000, 0x1000, CRC(561d3108) SHA1(4998c68a9e9a8002251fa8f07aa1082444a9dc80) )
ROM_REGION( 0x2000, "gfx1", 0 )
@@ -505,7 +507,7 @@ ROM_START( mranger )
ROM_LOAD( "mra-3.3k", 0x2000, 0x1000, CRC(9f0af7b2) SHA1(3daaec15b0d3bc30723ebb14b50f66f288f0d096) )
ROM_LOAD( "mra-4.3j", 0x3000, 0x1000, CRC(7fe8e2cd) SHA1(4ffad9c7a9360999b213b790c6c76cc79c8e49d5) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "mp-s1.1a", 0x7000, 0x1000, CRC(561d3108) SHA1(4998c68a9e9a8002251fa8f07aa1082444a9dc80) )
ROM_REGION( 0x2000, "gfx1", 0 )
@@ -543,7 +545,7 @@ ROM_START( alpha1v )
ROM_LOAD( "7-f3", 0x5000, 0x1000, CRC(99db9781) SHA1(a56a675cc4cbc9681bfe8052f51f19336eb2a0a6) )
ROM_LOAD( "7a e3", 0x6000, 0x1000, CRC(3b0b4b0d) SHA1(0d8eea1e2db269943611289b3490a578ee347f85) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "1-a1", 0x7000, 0x1000, CRC(9e07fdd5) SHA1(ed4f462fcfe91fa8e88bfeaaba0a0c11fa0b4601) )
ROM_REGION( 0x2000, "gfx1", 0 )
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 10213ff93bb..53f790b63a9 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -249,7 +249,9 @@ static MACHINE_CONFIG_START( m57, m57_state )
MCFG_PALETTE_INIT_OWNER(m57_state, m57)
/* sound hardware */
- MCFG_FRAGMENT_ADD(m52_sound_c_audio)
+ //MCFG_FRAGMENT_ADD(m52_sound_c_audio)
+ MCFG_DEVICE_ADD("irem_audio", IREM_M52_SOUNDC_AUDIO, 0)
+
MACHINE_CONFIG_END
@@ -267,7 +269,7 @@ ROM_START( troangel )
ROM_LOAD( "ta-a-3n", 0x4000, 0x2000, CRC(de3dea44) SHA1(1290755ffc04dc3b3667e063118669a0eab6fb79) )
ROM_LOAD( "ta-a-3q", 0x6000, 0x2000, CRC(fff0fc2a) SHA1(82f3f5a8817e956192323eb555daa85b7766676d) )
- ROM_REGION( 0x8000 , "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x8000 , "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "ta-s-1a", 0x6000, 0x2000, CRC(15a83210) SHA1(8ada510db689ffa372b2f4dc4bd1b1c69a0c5307) )
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -297,7 +299,7 @@ ROM_START( newtangl ) /* Offical "upgrade" or hack? */
ROM_LOAD( "3n", 0x4000, 0x2000, CRC(17b5a775) SHA1(d85c3371080bea82f19ac96fa0f1b332e1c86e27) )
ROM_LOAD( "3q", 0x6000, 0x2000, CRC(2e5fa773) SHA1(9a34fa43bde021fc7b00d8c3762c248e7b96dbf1) )
- ROM_REGION( 0x8000 , "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x8000 , "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "ta-s-1a-", 0x6000, 0x2000, CRC(ea8a05cb) SHA1(5683e4dca93066ee788287ab73a766fa303ebe84) )
ROM_REGION( 0x06000, "gfx1", 0 )
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index f82aef0c0be..0a6d31216cb 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -209,7 +209,8 @@ static MACHINE_CONFIG_START( yard, m58_state )
MCFG_SCREEN_PALETTE("palette")
/* sound hardware */
- MCFG_FRAGMENT_ADD(m52_large_audio)
+ MCFG_DEVICE_ADD("irem_audio", IREM_M52_LARGE_AUDIO, 0)
+
MACHINE_CONFIG_END
@@ -227,7 +228,7 @@ ROM_START( 10yard )
ROM_LOAD( "yf-a-3n-b", 0x2000, 0x2000, CRC(82fcd980) SHA1(7846705b29961cb95ee1571ee7e16baceea522d4) )
ROM_LOAD( "yf-a-3m-b", 0x4000, 0x2000, CRC(a8d5c311) SHA1(28edb5cfd943a2262d7e37ef9a7245f7017cbc51) )
- ROM_REGION( 0x10000, "iremsound", 0 )
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
ROM_LOAD( "yf-s.3b", 0x8000, 0x2000, CRC(0392a60c) SHA1(68030504eafc58db250099edd3c3323bdb9eff6b) )
ROM_LOAD( "yf-s.1b", 0xa000, 0x2000, CRC(6588f41a) SHA1(209305efc68171886427216b9a0b37333f40daa8) )
ROM_LOAD( "yf-s.3a", 0xc000, 0x2000, CRC(bd054e44) SHA1(f10c32c70d60680229fc0891d0e1308015fa69d6) )
@@ -261,7 +262,7 @@ ROM_START( 10yardj )
ROM_LOAD( "yf-a.3n", 0x2000, 0x2000, CRC(947fa760) SHA1(bd6c2ee6e6800b063b81dbdd9fc929120019439d) )
ROM_LOAD( "yf-a.3m", 0x4000, 0x2000, CRC(d4975633) SHA1(84a506ae680a9dd26ef6f33880400e965ccf8260) )
- ROM_REGION( 0x10000, "iremsound", 0 )
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
ROM_LOAD( "yf-s.3b", 0x8000, 0x2000, CRC(0392a60c) SHA1(68030504eafc58db250099edd3c3323bdb9eff6b) )
ROM_LOAD( "yf-s.1b", 0xa000, 0x2000, CRC(6588f41a) SHA1(209305efc68171886427216b9a0b37333f40daa8) )
ROM_LOAD( "yf-s.3a", 0xc000, 0x2000, CRC(bd054e44) SHA1(f10c32c70d60680229fc0891d0e1308015fa69d6) )
@@ -295,7 +296,7 @@ ROM_START( vs10yard )
ROM_LOAD( "vyf-a.3m", 0x2000, 0x2000, CRC(3b9330f8) SHA1(b35fe72cf724cfb887906060bbcf40b0c896ccf0) )
ROM_LOAD( "a.3m", 0x4000, 0x2000, CRC(cf783dad) SHA1(0b1b875ac65ba90c92ca06d0aa01c477b7427322) )
- ROM_REGION( 0x10000, "iremsound", 0 )
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
ROM_LOAD( "yf-s.3b", 0x8000, 0x2000, CRC(0392a60c) SHA1(68030504eafc58db250099edd3c3323bdb9eff6b) )
ROM_LOAD( "yf-s.1b", 0xa000, 0x2000, CRC(6588f41a) SHA1(209305efc68171886427216b9a0b37333f40daa8) )
ROM_LOAD( "yf-s.3a", 0xc000, 0x2000, CRC(bd054e44) SHA1(f10c32c70d60680229fc0891d0e1308015fa69d6) )
@@ -329,7 +330,7 @@ ROM_START( vs10yardj )
ROM_LOAD( "vyf-a.3m", 0x2000, 0x2000, CRC(3b9330f8) SHA1(b35fe72cf724cfb887906060bbcf40b0c896ccf0) )
ROM_LOAD( "vyf-a.3k", 0x4000, 0x2000, CRC(a0ec15bb) SHA1(a5ce9341e9d05e33c025ac62a27faf738c88326e) )
- ROM_REGION( 0x10000, "iremsound", 0 )
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
ROM_LOAD( "yf-s.3b", 0x8000, 0x2000, CRC(0392a60c) SHA1(68030504eafc58db250099edd3c3323bdb9eff6b) )
ROM_LOAD( "yf-s.1b", 0xa000, 0x2000, CRC(6588f41a) SHA1(209305efc68171886427216b9a0b37333f40daa8) )
ROM_LOAD( "yf-s.3a", 0xc000, 0x2000, CRC(bd054e44) SHA1(f10c32c70d60680229fc0891d0e1308015fa69d6) )
@@ -363,7 +364,7 @@ ROM_START( vs10yardu )
ROM_LOAD( "yf-a-3n-h-vs.3n", 0x2000, 0x2000, CRC(a14d7a14) SHA1(1b900ed276dd2d918f82613399416cf399362405) )
ROM_LOAD( "yf-a-3m-h-vs.3m", 0x4000, 0x2000, CRC(dc4bb0ce) SHA1(9d9c960744720ffeddc7c9f1db4981fb6a0006d7) )
- ROM_REGION( 0x10000, "iremsound", 0 )
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
ROM_LOAD( "yf-s-3b.3b", 0x8000, 0x2000, CRC(0392a60c) SHA1(68030504eafc58db250099edd3c3323bdb9eff6b) )
ROM_LOAD( "yf-s-1b.1b", 0xa000, 0x2000, CRC(6588f41a) SHA1(209305efc68171886427216b9a0b37333f40daa8) )
ROM_LOAD( "yf-s-3a.3a", 0xc000, 0x2000, CRC(bd054e44) SHA1(f10c32c70d60680229fc0891d0e1308015fa69d6) )
@@ -397,7 +398,7 @@ ROM_START( 10yard85 )
ROM_LOAD( "yf-a-3n-h.3n", 0x2000, 0x2000, CRC(8dc5f32f) SHA1(f550ed326711d1103711b99777f302f0d48e8eaf) )
ROM_LOAD( "yf-a-3m-h.3m", 0x4000, 0x2000, CRC(7d5d0c20) SHA1(38ada7a53881f7f812b02514d13fbf0fa013c0f1) )
- ROM_REGION( 0x10000, "iremsound", 0 )
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
ROM_LOAD( "yf-s-3b.3b", 0x8000, 0x2000, CRC(0392a60c) SHA1(68030504eafc58db250099edd3c3323bdb9eff6b) )
ROM_LOAD( "yf-s-1b.1b", 0xa000, 0x2000, CRC(6588f41a) SHA1(209305efc68171886427216b9a0b37333f40daa8) )
ROM_LOAD( "yf-s-3a.3a", 0xc000, 0x2000, CRC(bd054e44) SHA1(f10c32c70d60680229fc0891d0e1308015fa69d6) )
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 506b153c9d6..c4e034e73fc 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -953,7 +953,9 @@ static MACHINE_CONFIG_START( ldrun, m62_state )
MCFG_PALETTE_INIT_OWNER(m62_state,m62)
/* sound hardware */
- MCFG_FRAGMENT_ADD(m62_audio)
+ //MCFG_FRAGMENT_ADD(m62_audio)
+ MCFG_DEVICE_ADD("irem_audio", IREM_M62_AUDIO, 0)
+
MACHINE_CONFIG_END
@@ -1150,7 +1152,7 @@ ROM_START( kungfum )
ROM_LOAD( "a-4e-c.bin", 0x0000, 0x4000, CRC(b6e2d083) SHA1(17e2cfe2b9d6121239803aba7132918e54ae02bf) )
ROM_LOAD( "a-4d-c.bin", 0x4000, 0x4000, CRC(7532918e) SHA1(9d513d5a3b99cc54c4491371cd44af048ef0fb33) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "a-3e-.bin", 0xa000, 0x2000, CRC(58e87ab0) SHA1(3b03c101fec58eac13fc309a78df9a2cd44f7604) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3f-.bin", 0xc000, 0x2000, CRC(c81e31ea) SHA1(f0fc58b929188c8802cd85549bdf9f4566e6a677) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3h-.bin", 0xe000, 0x2000, CRC(d99fb995) SHA1(caa6acdbc3b02d248fd123be95ea6fdcb4f35b59) )
@@ -1191,7 +1193,7 @@ ROM_START( kungfumd )
ROM_LOAD( "snx_a-4e-d", 0x0000, 0x4000, CRC(fc330a46) SHA1(50edbd6131310afa17d476e278a7098ab1cfae73) )
ROM_LOAD( "snx_a-4d-d", 0x4000, 0x4000, CRC(1b2fd32f) SHA1(34487dacf2ec9fbf55148953a9f248fae9442568) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "snx_a-3d-b", 0x8000, 0x4000, CRC(85ca7956) SHA1(f97f744520770766cf9633c8762013d77b0e7a61) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "snx_a-3f-b", 0xc000, 0x4000, CRC(3ef1100a) SHA1(901c40477b4c6fbc984446fa7171006d67b48652) ) /* samples (ADPCM 4-bit) */
@@ -1225,7 +1227,7 @@ ROM_START( spartanx )
ROM_LOAD( "a-4e-c-j.bin", 0x0000, 0x4000, CRC(32a0a9a6) SHA1(fbb601a4c98a131013ea49a6877f2cd8139434fa) )
ROM_LOAD( "a-4d-c-j.bin", 0x4000, 0x4000, CRC(3173ea78) SHA1(cb6102abf9cf8df531f6e808b59e076831456ff5) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "a-3e-.bin", 0xa000, 0x2000, CRC(58e87ab0) SHA1(3b03c101fec58eac13fc309a78df9a2cd44f7604) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3f-.bin", 0xc000, 0x2000, CRC(c81e31ea) SHA1(f0fc58b929188c8802cd85549bdf9f4566e6a677) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3h-.bin", 0xe000, 0x2000, CRC(d99fb995) SHA1(caa6acdbc3b02d248fd123be95ea6fdcb4f35b59) )
@@ -1266,7 +1268,7 @@ ROM_START( kungfub )
ROM_LOAD( "c5.5h", 0x0000, 0x4000, CRC(5d8e791d) SHA1(90cd911f715a50a90427abd89b38272a6df08d69) )
ROM_LOAD( "c4.5k", 0x4000, 0x4000, CRC(4000e2b8) SHA1(719b0aa1fd0cbe671178ac728d76d439bd7932d9) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "a-3e-.bin", 0xa000, 0x2000, CRC(58e87ab0) SHA1(3b03c101fec58eac13fc309a78df9a2cd44f7604) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3f-.bin", 0xc000, 0x2000, CRC(c81e31ea) SHA1(f0fc58b929188c8802cd85549bdf9f4566e6a677) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3h-.bin", 0xe000, 0x2000, CRC(d99fb995) SHA1(caa6acdbc3b02d248fd123be95ea6fdcb4f35b59) )
@@ -1324,7 +1326,7 @@ ROM_START( kungfub2 )
ROM_LOAD( "kf4", 0x0000, 0x4000, CRC(3f65313f) SHA1(bd584896f558440a0f7bf8e1ca49bf478fe77553) )
ROM_LOAD( "kf5", 0x4000, 0x4000, CRC(9ea325f3) SHA1(7c35128a3e70e5994a5e17db656dec1a53c1fe67) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "a-3e-.bin", 0xa000, 0x2000, CRC(58e87ab0) SHA1(3b03c101fec58eac13fc309a78df9a2cd44f7604) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3f-.bin", 0xc000, 0x2000, CRC(c81e31ea) SHA1(f0fc58b929188c8802cd85549bdf9f4566e6a677) ) /* samples (ADPCM 4-bit) */
ROM_LOAD( "a-3h-.bin", 0xe000, 0x2000, CRC(d99fb995) SHA1(caa6acdbc3b02d248fd123be95ea6fdcb4f35b59) )
@@ -1373,7 +1375,7 @@ ROM_START( battroad )
ROM_LOAD( "br-c-7a", 0x18000, 0x2000, CRC(ec3b0080) SHA1(83dc0d0c4ecf2ff62cfb213c02a3869c6f72f2e9) )
ROM_LOAD( "br-c-7k", 0x1c000, 0x2000, CRC(edc75f7f) SHA1(3650521874c85a7cf403ede2588b989ac93fb92e) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "br-a-3e", 0xa000, 0x2000, CRC(a7140871) SHA1(bf993e8ed776974ae59e1995eb5d3055c632eda7) )
ROM_LOAD( "br-a-3f", 0xc000, 0x2000, CRC(1bb51b30) SHA1(c8e99d79e2fdb6b02c57cba475be0e5e35359124) )
ROM_LOAD( "br-a-3h", 0xe000, 0x2000, CRC(afb3e083) SHA1(b1aaca64bbcce73203e55d2f16be3f3cef46f39b) )
@@ -1415,7 +1417,7 @@ ROM_START( ldrun )
ROM_LOAD( "lr-a-4b", 0x4000, 0x2000, CRC(b041c4a9) SHA1(77768b03ea2497e25c3e47b68a0eb2fe3e9aea35) )
ROM_LOAD( "lr-a-4a", 0x6000, 0x2000, CRC(645e42aa) SHA1(c806ffce7ece418bad86854c987f78c70c13e492) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lr-a-3f", 0xc000, 0x2000, CRC(7a96accd) SHA1(e94815dbfaabbb562df8f3298060aa6bd7825904) )
ROM_LOAD( "lr-a-3h", 0xe000, 0x2000, CRC(3f7f3939) SHA1(7ee25a21e74995bfb36ac11b45d384b33a6d8515) )
@@ -1448,7 +1450,7 @@ ROM_START( ldruna )
ROM_LOAD( "roma4b", 0x4000, 0x2000, CRC(3c464bad) SHA1(df34a9ec2f29f8d2a2ef1a2fc065ba7541ea4178) )
ROM_LOAD( "roma4a", 0x6000, 0x2000, CRC(899df8e0) SHA1(e80154dccd04e2928124591f16e088de3554995b) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lr-a-3f", 0xc000, 0x2000, CRC(7a96accd) SHA1(e94815dbfaabbb562df8f3298060aa6bd7825904) )
ROM_LOAD( "lr-a-3h", 0xe000, 0x2000, CRC(3f7f3939) SHA1(7ee25a21e74995bfb36ac11b45d384b33a6d8515) )
@@ -1483,7 +1485,7 @@ ROM_START( ldrun2 )
ROM_LOAD( "lr2-h-1c.a", 0x10000, 0x2000, CRC(7ebcadbc) SHA1(ff8377cb1f349f2957280b6a633e596740a489be) ) /* banked at 8000-9fff */
ROM_LOAD( "lr2-h-1d.a", 0x12000, 0x2000, CRC(64cbb7f9) SHA1(897d53c3892e636734f5a380c67c41c0d810955e) ) /* banked at 8000-9fff */
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lr2-a-3e", 0xa000, 0x2000, CRC(853f3898) SHA1(12ade2f6f10c85c6a2c380dd0727aad64b317d56) )
ROM_LOAD( "lr2-a-3f", 0xc000, 0x2000, CRC(7a96accd) SHA1(e94815dbfaabbb562df8f3298060aa6bd7825904) )
ROM_LOAD( "lr2-a-3h", 0xe000, 0x2000, CRC(2a0e83ca) SHA1(207bfb3912e7a9caa61b742fc3357154a0189434) )
@@ -1519,7 +1521,7 @@ ROM_START( ldrun3 )
ROM_LOAD( "lr3a4db.bin", 0x4000, 0x4000, CRC(23a02178) SHA1(0560b92dfc9b57d01abb62a7b270beb27fa42040) )
ROM_LOAD( "lr3a4bb.bin", 0x8000, 0x4000, CRC(3d501a1a) SHA1(a92ff743eb21145154fa717ee9e6ede4da458aa9) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lr3-a-3d", 0x8000, 0x4000, CRC(28be68cd) SHA1(1e48cdf649bc861066fbef0293466091092045f3) )
ROM_LOAD( "lr3-a-3f", 0xc000, 0x4000, CRC(cb7186b7) SHA1(cc99821f3f1523523598e4b7d68b95eee6c84e69) )
@@ -1555,7 +1557,7 @@ ROM_START( ldrun3j )
ROM_LOAD( "lr3-a-4d.a", 0x4000, 0x4000, CRC(a84bc931) SHA1(0348d238a85a059a6423794910adec4462e14f27) )
ROM_LOAD( "lr3-a-4b.a", 0x8000, 0x4000, CRC(be09031d) SHA1(c124163895d295969b66386fee91c89bbd8b8774) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lr3-a-3d", 0x8000, 0x4000, CRC(28be68cd) SHA1(1e48cdf649bc861066fbef0293466091092045f3) )
ROM_LOAD( "lr3-a-3f", 0xc000, 0x4000, CRC(cb7186b7) SHA1(cc99821f3f1523523598e4b7d68b95eee6c84e69) )
@@ -1588,7 +1590,7 @@ ROM_START( ldrun4 )
ROM_LOAD( "lr4-a-4d.c", 0x04000, 0x4000, CRC(298afa36) SHA1(077b5fa8a246059801232c5287225e3bb7507345) )
ROM_LOAD( "lr4-v-4k", 0x10000, 0x8000, CRC(8b248abd) SHA1(3e755c8f8011d6f878a1777a2c22b2156ef926e6) ) /* banked at 8000-bfff */
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lr4-a-3d", 0x8000, 0x4000, CRC(86c6d445) SHA1(644b86fba745a5be545c4dd9c534157af75492b8) )
ROM_LOAD( "lr4-a-3f", 0xc000, 0x4000, CRC(097c6c0a) SHA1(627ccdd1d77ae78db9660b51484d2a9110d035e5) )
@@ -1623,7 +1625,7 @@ ROM_START( lotlot )
ROM_LOAD( "lot-a-4e", 0x0000, 0x4000, CRC(2913d08f) SHA1(829115333825a9483322a910efee9ee470d85a0e) )
ROM_LOAD( "lot-a-4d", 0x4000, 0x4000, CRC(0443095f) SHA1(2c3ca107b54519632513a75b80a1a7d8b971f2b1) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "lot-a-3h", 0xe000, 0x2000, CRC(0781cee7) SHA1(bff8592f96b43af6554f1a04e0c00f45b178cce6) )
ROM_REGION( 0x6000, "gfx1", 0 )
@@ -1666,7 +1668,7 @@ ROM_START( kidniki )
ROM_LOAD( "dr12.8l", 0x18000, 0x08000, CRC(c0b255fd) SHA1(bdd74239a3490eb35cb736cac6f5030bec4b2392) )
ROM_CONTINUE( 0x28000, 0x08000 )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "dr00.3a", 0x4000, 0x04000, CRC(458309f7) SHA1(7dfd77e0cd76a4b6f913eb434ac20ef5a172e2f0) )
ROM_LOAD( "dr01.3cd", 0x8000, 0x04000, CRC(e66897bd) SHA1(04ea4a857a94d4e884fb28623ec6195dae701e25) )
ROM_LOAD( "dr02.3f", 0xc000, 0x04000, CRC(f9e31e26) SHA1(712b1bde4b3c18c9ac26d58ade48316af004e733) ) /* 6803 code */
@@ -1716,7 +1718,7 @@ ROM_START( kidnikiu )
ROM_LOAD( "dr12.8l", 0x18000, 0x08000, CRC(c0b255fd) SHA1(bdd74239a3490eb35cb736cac6f5030bec4b2392) )
ROM_CONTINUE( 0x28000, 0x08000 )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "dr00.3a", 0x4000, 0x04000, CRC(458309f7) SHA1(7dfd77e0cd76a4b6f913eb434ac20ef5a172e2f0) )
ROM_LOAD( "dr01.3cd", 0x8000, 0x04000, CRC(e66897bd) SHA1(04ea4a857a94d4e884fb28623ec6195dae701e25) )
ROM_LOAD( "dr02.3f", 0xc000, 0x04000, CRC(f9e31e26) SHA1(712b1bde4b3c18c9ac26d58ade48316af004e733) ) /* 6803 code */
@@ -1767,7 +1769,7 @@ ROM_START( yanchamr )
ROM_LOAD( "ky_t-8l-.bin", 0x18000, 0x08000, CRC(a929110b) SHA1(87334f946e14c79426bc7a14e8da984bb8ef9cfc) )
/* ROM_CONTINUE( 0x28000, 0x08000 ) */
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "ky_a-3a-.bin", 0x4000, 0x04000, CRC(cb365f3b) SHA1(fefad25459eb00d228ee29931c5714ae895b76c7) )
ROM_LOAD( "dr01.3cd", 0x8000, 0x04000, CRC(e66897bd) SHA1(04ea4a857a94d4e884fb28623ec6195dae701e25) )
ROM_LOAD( "dr02.3f", 0xc000, 0x04000, CRC(f9e31e26) SHA1(712b1bde4b3c18c9ac26d58ade48316af004e733) ) /* 6803 code */
@@ -1816,7 +1818,7 @@ ROM_START( lithero )
ROM_LOAD( "12.bin", 0x18000, 0x08000, CRC(a929110b) SHA1(87334f946e14c79426bc7a14e8da984bb8ef9cfc) )
/* ROM_CONTINUE( 0x28000, 0x08000 ) */
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "ky_a-3a-.bin", 0x4000, 0x04000, CRC(cb365f3b) SHA1(fefad25459eb00d228ee29931c5714ae895b76c7) )
ROM_LOAD( "dr01.3cd", 0x8000, 0x04000, CRC(e66897bd) SHA1(04ea4a857a94d4e884fb28623ec6195dae701e25) )
ROM_LOAD( "dr02.3f", 0xc000, 0x04000, CRC(f9e31e26) SHA1(712b1bde4b3c18c9ac26d58ade48316af004e733) ) /* 6803 code */
@@ -1859,7 +1861,7 @@ ROM_START( spelunkr )
ROM_LOAD( "sprm.7c", 0x10000, 0x4000, CRC(fb6197e2) SHA1(8c3ccc2c14d076a1d6d14c2548a101a87af4211a) ) /* banked at 8000-9fff */
ROM_LOAD( "sprm.7b", 0x14000, 0x4000, CRC(26bb25a4) SHA1(d384901042664a4e46d7b6b5d183ce49e360dac8) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "spra.3d", 0x8000, 0x04000, CRC(4110363c) SHA1(8c1f4966291887c17175ab921acd732be6266186) ) /* adpcm data */
ROM_LOAD( "spra.3f", 0xc000, 0x04000, CRC(67a9d2e6) SHA1(d859648d7a3f05ae777a3909ddcd866b786c5b26) ) /* 6803 code */
@@ -1925,7 +1927,7 @@ ROM_START( spelunkrj )
ROM_LOAD( "spr_m7cc.bin", 0x10000, 0x4000, CRC(57598a36) SHA1(7d9c5790eb2a79c7977ca7b590d228685bd3a6b2) ) /* banked at 8000-9fff */
ROM_LOAD( "spr_m7bd.bin", 0x14000, 0x4000, CRC(ecf5137f) SHA1(6daa88b40698e2a3a11206cd946465621bb3c059) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "spra.3d", 0x8000, 0x04000, CRC(4110363c) SHA1(8c1f4966291887c17175ab921acd732be6266186) ) /* adpcm data */
ROM_LOAD( "spra.3f", 0xc000, 0x04000, CRC(67a9d2e6) SHA1(d859648d7a3f05ae777a3909ddcd866b786c5b26) ) /* 6803 code */
@@ -1992,7 +1994,7 @@ ROM_START( spelunk2 )
ROM_LOAD( "sp2-r.7c", 0x18000, 0x8000, CRC(4b380162) SHA1(867e441411e8b74d1d6ce0333c47b1aec3d4f5f2) ) /* banked at 9000-9fff */
ROM_LOAD( "sp2-r.7b", 0x20000, 0x4000, CRC(7709a1fe) SHA1(4c2b57982b3d3e4524a8e0d24f38d3c3f5a809f3) ) /* banked at 8000-8fff */
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "sp2-a.3d", 0x8000, 0x04000, CRC(839ec7e2) SHA1(a2c45553b149fc16b8af6338627cd2a8a31e08a0) ) /* adpcm data */
ROM_LOAD( "sp2-a.3f", 0xc000, 0x04000, CRC(ad3ce898) SHA1(36876b6d51a480a0664413dfcc57ef343e0f9965) ) /* 6803 code */
@@ -2058,7 +2060,7 @@ ROM_START( youjyudn )
ROM_LOAD( "yju_p4cb.0", 0x10000, 0x4000, CRC(60baf3b1) SHA1(2ab577bdbec7c8695a8f530b3e476aa91447cd60) ) /* banked at 8000-bfff */
ROM_LOAD( "yju_p4eb.1", 0x14000, 0x4000, CRC(8d0521f8) SHA1(e03385b94194806e347cd6be4151686e2f38c890) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* sound CPU */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* sound CPU */
ROM_LOAD( "yju_a3fb.bin", 0xc000, 0x04000, CRC(e15c8030) SHA1(bbbf4fa0349d614af86e356a106d5dd24b0b8baa) ) /* 6803 code */
ROM_REGION( 0x0c000, "gfx1", 0 )
@@ -2104,7 +2106,7 @@ ROM_START( horizon )
ROM_LOAD( "hrza-4d", 0x4000, 0x4000, CRC(06b06ac7) SHA1(d9ae9633455733fd14fc4d448b85365bfebef446) )
ROM_LOAD( "hrza-4b", 0x8000, 0x4000, CRC(39c0bd02) SHA1(8d3b465ef7db11863cd2d343656e99cfb77c89ef) )
- ROM_REGION( 0x10000, "iremsound", 0 ) /* 64k for the audio CPU (6803) */
+ ROM_REGION( 0x10000, "irem_audio:iremsound", 0 ) /* 64k for the audio CPU (6803) */
ROM_LOAD( "hrza-3f", 0xc000, 0x4000, CRC(7412c99f) SHA1(33e7cffa08d9644c78e1bada9a2b08ce5d3f97e1) )
ROM_REGION( 0x06000, "gfx1", 0 )
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index e0a6d427eef..4033885b793 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -326,7 +326,9 @@ static MACHINE_CONFIG_START( travrusa, travrusa_state )
MCFG_PALETTE_INIT_OWNER(travrusa_state, travrusa)
/* sound hardware */
- MCFG_FRAGMENT_ADD(m52_sound_c_audio)
+ //MCFG_FRAGMENT_ADD(m52_sound_c_audio)
+ MCFG_DEVICE_ADD("irem_audio", IREM_M52_SOUNDC_AUDIO, 0)
+
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shtrider, travrusa )
@@ -357,7 +359,7 @@ ROM_START( travrusa )
ROM_LOAD( "zr1-6a.k3", 0x4000, 0x2000, CRC(e1b51383) SHA1(34f4476c1bcc28c53c8ffa7b614f443a329aae13) )
ROM_LOAD( "zr1-7.j3", 0x6000, 0x2000, CRC(85cd1a51) SHA1(7eb046514845cb9d2507ee24d1b2f7cc5402ac02) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "mr10.1a", 0x7000, 0x1000, CRC(a02ad8a0) SHA1(aff80b506dbecabed2a36eb743693940f6a22d16) )
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -384,7 +386,7 @@ ROM_START( travrusab )
ROM_LOAD( "at6.k3", 0x4000, 0x2000, CRC(baf87d80) SHA1(761d687ef3f3dde80a47f547d3c822704a2ac821) )
ROM_LOAD( "at7.h3", 0x6000, 0x2000, CRC(48091ebe) SHA1(6146af6f08053a5955d9b388d25bfbab7ad6b0e5) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "11.a1", 0x7000, 0x1000, CRC(d2c0bc33) SHA1(3a52ae514daf985d297416301dac0ac6cbe671d7) )
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -410,7 +412,7 @@ ROM_START( motorace )
ROM_LOAD( "mr2.3k", 0x4000, 0x2000, CRC(8a2374ec) SHA1(7159731f5ef2485e3c822e3e8e51e9583dd1c6bc) )
ROM_LOAD( "mr3.3j", 0x6000, 0x2000, CRC(2f04c341) SHA1(ae990d9d4abdd7d6ef9d21aa62125fe2e0067623) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "mr10.1a", 0x7000, 0x1000, CRC(a02ad8a0) SHA1(aff80b506dbecabed2a36eb743693940f6a22d16) )
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -470,7 +472,7 @@ ROM_START( mototour )
ROM_LOAD( "mt1-6.k3", 0x4000, 0x2000, CRC(efd325f2) SHA1(0862c0ec87f601b6c1cba2bd25e3186b6ad0c68e) )
ROM_LOAD( "mt1-7.j3", 0x6000, 0x2000, CRC(ab8a3a33) SHA1(e332b6e727083cf508ccec721ce42ccc3aa54e91) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "snd.a1", 0x7000, 0x1000, CRC(a02ad8a0) SHA1(aff80b506dbecabed2a36eb743693940f6a22d16) ) // == mr10.1a
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -498,7 +500,7 @@ ROM_START( shtrider )
ROM_LOAD( "sr03a.bin", 0x4000, 0x2000, CRC(3ade11b9) SHA1(70b9dbd510cf6192194acf6876856d4c19bdf279) )
ROM_LOAD( "sr04a.bin", 0x6000, 0x2000, CRC(02b96eaa) SHA1(ba4d61cf57142192684c45dd22720234d3521241) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "sr11a.bin", 0x6000, 0x2000, CRC(a8396b76) SHA1(614151fb1d25930e9fee4ab290a63f8fe97adbe6) )
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -525,7 +527,7 @@ ROM_START( shtridera )
ROM_LOAD( "3.bin", 0x4000, 0x2000, CRC(78d051cd) SHA1(e1dc2dcfc4af35bdd5245d23977e8640d81a43f1) )
ROM_LOAD( "4.bin", 0x6000, 0x2000, CRC(02b96eaa) SHA1(ba4d61cf57142192684c45dd22720234d3521241) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "11.bin", 0x6000, 0x2000, CRC(a8396b76) SHA1(614151fb1d25930e9fee4ab290a63f8fe97adbe6) )
ROM_REGION( 0x06000, "gfx1", 0 )
@@ -552,7 +554,7 @@ ROM_START( shtriderb )
ROM_LOAD( "sr3.22.k3", 0x4000, 0x2000, CRC(44cab4cc) SHA1(9e87d88353c858c25fb4ff9528c3f369505ffd88) )
ROM_LOAD( "sr4.23.h3", 0x6000, 0x2000, CRC(02b96eaa) SHA1(ba4d61cf57142192684c45dd22720234d3521241) )
- ROM_REGION( 0x8000, "iremsound", 0 )
+ ROM_REGION( 0x8000, "irem_audio:iremsound", 0 )
ROM_LOAD( "sr11.7.a1", 0x6000, 0x2000, CRC(a8396b76) SHA1(614151fb1d25930e9fee4ab290a63f8fe97adbe6) )
ROM_REGION( 0x06000, "gfx1", 0 )