Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 21:29:15 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

x1_010: converted to use inline config. nw.

Browse Source
This commit is contained in:
Fabio Priuli 2014-04-11 05:35:09 +00:00
parent 30e5cbd70a
commit 02b3036c3d
5 changed files with 12 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/emu/sound/x1_010.c
View File

@ -86,6 +86,7 @@ x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, dev
: device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__), : device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__),
device_sound_interface(mconfig, *this), device_sound_interface(mconfig, *this),
m_rate(0), m_rate(0),
m_adr(0),
m_stream(NULL), m_stream(NULL),
m_region(NULL), m_region(NULL),
m_sound_enable(0), m_sound_enable(0),
@ -97,26 +98,6 @@ x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, dev
memset(m_env_offset, 0, sizeof(SETA_NUM_CHANNELS)); memset(m_env_offset, 0, sizeof(SETA_NUM_CHANNELS));
} }
//-------------------------------------------------
// device_config_complete - perform any
// operations now that the configuration is
// complete
//-------------------------------------------------
void x1_010_device::device_config_complete()
{
// inherit a copy of the static data
const x1_010_interface *intf = reinterpret_cast<const x1_010_interface *>(static_config());
if (intf != NULL)
*static_cast<x1_010_interface *>(this) = *intf;
// or initialize to defaults if none provided
else
{
m_adr = 0;
}
}
//------------------------------------------------- //-------------------------------------------------
// device_start - device-specific startup // device_start - device-specific startup
//------------------------------------------------- //-------------------------------------------------

18
src/emu/sound/x1_010.h
View File

@ -5,20 +5,16 @@
#define SETA_NUM_CHANNELS 16 #define SETA_NUM_CHANNELS 16
struct x1_010_interface
{
int m_adr; /* address */
};
class x1_010_device : public device_t, class x1_010_device : public device_t,
public device_sound_interface, public device_sound_interface
public x1_010_interface
{ {
public: public:
x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~x1_010_device() {} ~x1_010_device() {}
// static configuration
static void set_address(device_t &device, int addr) { downcast<x1_010_device &>(device).m_adr = addr; }
DECLARE_READ8_MEMBER ( read ); DECLARE_READ8_MEMBER ( read );
DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE8_MEMBER( write );
@ -29,7 +25,6 @@ public:
protected: protected:
// device-level overrides // device-level overrides
virtual void device_config_complete();
virtual void device_start(); virtual void device_start();
// sound stream update overrides // sound stream update overrides
@ -39,6 +34,7 @@ private:
/* Variables only used here */ /* Variables only used here */
int m_rate; // Output sampling rate (Hz) int m_rate; // Output sampling rate (Hz)
int m_adr; // address
sound_stream * m_stream; // Stream handle sound_stream * m_stream; // Stream handle
const UINT8 *m_region; // region name const UINT8 *m_region; // region name
int m_sound_enable; // sound output enable/disable int m_sound_enable; // sound output enable/disable
@ -53,4 +49,8 @@ private:
extern const device_type X1_010; extern const device_type X1_010;
#define MCFG_X1_010_ADDRESS(_addr) \
x1_010_device::set_address(*device, _addr);
#endif /* __X1_010_H__ */ #endif /* __X1_010_H__ */

7
src/mame/drivers/champbwl.c
View File

@ -430,11 +430,6 @@ static GFXDECODE_START( champbwl )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_END GFXDECODE_END
static const x1_010_interface champbwl_sound_intf =
{
0x0000 /* address */
};
MACHINE_START_MEMBER(champbwl_state,champbwl) MACHINE_START_MEMBER(champbwl_state,champbwl)
{ {
UINT8 *ROM = memregion("maincpu")->base(); UINT8 *ROM = memregion("maincpu")->base();
@ -508,7 +503,6 @@ static MACHINE_CONFIG_START( champbwl, champbwl_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
MCFG_SOUND_CONFIG(champbwl_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -573,7 +567,6 @@ static MACHINE_CONFIG_START( doraemon, champbwl_state )
/* sound hardware */ /* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("x1snd", X1_010, XTAL_14_31818MHz) MCFG_SOUND_ADD("x1snd", X1_010, XTAL_14_31818MHz)
MCFG_SOUND_CONFIG(champbwl_sound_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END

47
src/mame/drivers/seta.c
View File

@ -1476,15 +1476,6 @@ WRITE16_MEMBER(seta_state::timer_regs_w)
***************************************************************************/ ***************************************************************************/
static const x1_010_interface seta_sound_intf =
{
0x0000, /* address */
};
static const x1_010_interface seta_sound_intf2 =
{
0x1000, /* address */
};
WRITE_LINE_MEMBER(seta_state::utoukond_ym3438_interrupt) WRITE_LINE_MEMBER(seta_state::utoukond_ym3438_interrupt)
{ {
m_audiocpu->set_input_line(INPUT_LINE_NMI, state); m_audiocpu->set_input_line(INPUT_LINE_NMI, state);
@ -7651,7 +7642,6 @@ static MACHINE_CONFIG_START( twineagl, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7695,7 +7685,6 @@ static MACHINE_CONFIG_START( downtown, seta_state )
/* sound hardware */ /* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7760,7 +7749,7 @@ static MACHINE_CONFIG_START( usclssic, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf2) MCFG_X1_010_ADDRESS(0x1000)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7810,7 +7799,7 @@ static MACHINE_CONFIG_START( calibr50, seta_state )
/* sound hardware */ /* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf2) MCFG_X1_010_ADDRESS(0x1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7854,7 +7843,6 @@ static MACHINE_CONFIG_START( metafox, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7893,7 +7881,6 @@ static MACHINE_CONFIG_START( atehate, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7942,7 +7929,6 @@ static MACHINE_CONFIG_START( blandia, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -7980,7 +7966,6 @@ static MACHINE_CONFIG_START( blandiap, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8019,7 +8004,6 @@ static MACHINE_CONFIG_START( blockcar, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8094,7 +8078,6 @@ static MACHINE_CONFIG_START( daioh, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8139,7 +8122,6 @@ static MACHINE_CONFIG_START( drgnunit, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8177,7 +8159,6 @@ static MACHINE_CONFIG_START( qzkklgy2, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8232,7 +8213,6 @@ static MACHINE_CONFIG_START( setaroul, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8271,7 +8251,6 @@ static MACHINE_CONFIG_START( eightfrc, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8318,7 +8297,6 @@ static MACHINE_CONFIG_START( extdwnhl, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8384,7 +8362,6 @@ static MACHINE_CONFIG_START( gundhara, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8430,7 +8407,6 @@ static MACHINE_CONFIG_START( jjsquawk, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8467,7 +8443,6 @@ static MACHINE_CONFIG_START( jjsquawb, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8510,7 +8485,6 @@ static MACHINE_CONFIG_START( kamenrid, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8550,7 +8524,6 @@ static MACHINE_CONFIG_START( orbs, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8593,7 +8566,6 @@ static MACHINE_CONFIG_START( keroppij, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8635,7 +8607,6 @@ static MACHINE_CONFIG_START( krzybowl, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8682,7 +8653,6 @@ static MACHINE_CONFIG_START( madshark, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8725,7 +8695,6 @@ static MACHINE_CONFIG_START( magspeed, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8775,7 +8744,6 @@ static MACHINE_CONFIG_START( msgundam, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8815,7 +8783,6 @@ static MACHINE_CONFIG_START( oisipuzl, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8893,7 +8860,6 @@ static MACHINE_CONFIG_START( kiwame, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8935,7 +8901,6 @@ static MACHINE_CONFIG_START( rezon, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -8977,7 +8942,6 @@ static MACHINE_CONFIG_START( thunderl, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -9088,7 +9052,6 @@ static MACHINE_CONFIG_START( wits, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -9127,7 +9090,6 @@ static MACHINE_CONFIG_START( umanclub, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -9170,7 +9132,6 @@ static MACHINE_CONFIG_START( utoukond, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@ -9222,7 +9183,6 @@ static MACHINE_CONFIG_START( wrofaero, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -9271,7 +9231,6 @@ static MACHINE_CONFIG_START( zingzip, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -9326,7 +9285,6 @@ static MACHINE_CONFIG_START( pairlove, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -9443,7 +9401,6 @@ static MACHINE_CONFIG_START( inttoote, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
MCFG_SOUND_CONFIG(seta_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)

7
src/mame/drivers/seta2.c
View File

@ -2065,12 +2065,6 @@ INTERRUPT_GEN_MEMBER(seta2_state::samshoot_interrupt)
m_tmp68301->external_interrupt_2(); // to do: hook up x1-10 interrupts m_tmp68301->external_interrupt_2(); // to do: hook up x1-10 interrupts
} }
static const x1_010_interface x1_010_sound_intf =
{
0x0000, /* address */
};
static MACHINE_CONFIG_START( seta2, seta2_state ) static MACHINE_CONFIG_START( seta2, seta2_state )
MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !! MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !!
MCFG_CPU_PROGRAM_MAP(mj4simai_map) MCFG_CPU_PROGRAM_MAP(mj4simai_map)
@ -2098,7 +2092,6 @@ static MACHINE_CONFIG_START( seta2, seta2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("x1snd", X1_010, XTAL_50MHz/3) // clock? MCFG_SOUND_ADD("x1snd", X1_010, XTAL_50MHz/3) // clock?
MCFG_SOUND_CONFIG(x1_010_sound_intf)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END