diff options
author | Andrew Gardner <andrew-gardner@users.noreply.github.com> | 2013-02-09 17:14:27 +0000 |
---|---|---|
committer | Andrew Gardner <andrew-gardner@users.noreply.github.com> | 2013-02-09 17:14:27 +0000 |
commit | 830642e1dfe906c40f1f6e6364479eeee0e48985 (patch) | |
tree | 52baa3e1354b998a3aa6e3717c070306a99cc420 | |
parent | 50f5a58821cdb349e45ab920947f69874fd8a7fa (diff) |
Reverted x1_010 modernization. (nw)
I don't have the time between now and Monday to figure this one out.
(This doesn't undo any changes done by other modernizations)
-rw-r--r-- | src/emu/sound/x1_010.c | 238 | ||||
-rw-r--r-- | src/emu/sound/x1_010.h | 54 | ||||
-rw-r--r-- | src/mame/drivers/champbwl.c | 8 | ||||
-rw-r--r-- | src/mame/drivers/seta.c | 126 | ||||
-rw-r--r-- | src/mame/drivers/seta2.c | 20 | ||||
-rw-r--r-- | src/mame/video/seta.c | 4 |
6 files changed, 237 insertions, 213 deletions
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c index 6d150da2b56..29d6b27d26f 100644 --- a/src/emu/sound/x1_010.c +++ b/src/emu/sound/x1_010.c @@ -51,6 +51,7 @@ Registers: #include "emu.h" #include "x1_010.h" + #define VERBOSE_SOUND 0 #define VERBOSE_REGISTER_WRITE 0 #define VERBOSE_REGISTER_READ 0 @@ -59,9 +60,11 @@ Registers: #define LOG_REGISTER_WRITE(x) do { if (VERBOSE_REGISTER_WRITE) logerror x; } while (0) #define LOG_REGISTER_READ(x) do { if (VERBOSE_REGISTER_READ) logerror x; } while (0) +#define SETA_NUM_CHANNELS 16 + #define FREQ_BASE_BITS 8 // Frequency fixed decimal shift bits #define ENV_BASE_BITS 16 // wave form envelope fixed decimal shift bits -#define VOL_BASE (2*32*256/30) // Volume base +#define VOL_BASE (2*32*256/30) // Volume base /* this structure defines the parameters for a channel */ struct X1_010_CHANNEL { @@ -74,82 +77,54 @@ struct X1_010_CHANNEL { unsigned char reserve[2]; }; +struct x1_010_state +{ + /* Variables only used here */ + int rate; // Output sampling rate (Hz) + sound_stream * stream; // Stream handle + int address; // address eor data + const UINT8 *region; // region name + int sound_enable; // sound output enable/disable + UINT8 reg[0x2000]; // X1-010 Register & wave form area + UINT8 HI_WORD_BUF[0x2000]; // X1-010 16bit access ram check avoidance work + UINT32 smp_offset[SETA_NUM_CHANNELS]; + UINT32 env_offset[SETA_NUM_CHANNELS]; + + UINT32 base_clock; +}; + /* mixer tables and internal buffers */ //static short *mixer_buffer = NULL; - -// device type definition -const device_type X1_010 = &device_creator<x1_010_device>; - - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// x1_010_device - constructor -//------------------------------------------------- - -x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, X1_010, "X1-010", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_rate(0), - m_stream(NULL), - m_address(0), - m_region(NULL), - m_sound_enable(0), - m_base_clock(0) +INLINE x1_010_state *get_safe_token(device_t *device) { + assert(device != NULL); + assert(device->type() == X1_010); + return (x1_010_state *)downcast<x1_010_device *>(device)->token(); } -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void x1_010_device::device_start() -{ - int i; - const x1_010_interface *intf = (const x1_010_interface *)static_config(); - - m_region = *region(); - m_base_clock = clock(); - m_rate = clock() / 1024; - m_address = intf->adr; - - for( i = 0; i < SETA_NUM_CHANNELS; i++ ) { - m_smp_offset[i] = 0; - m_env_offset[i] = 0; - } - /* Print some more debug info */ - LOG_SOUND(("masterclock = %d rate = %d\n", clock(), m_rate )); - - /* get stream channels */ - m_stream = stream_alloc(0, 2, m_rate); -} - - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) +/*-------------------------------------------------------------- + generate sound to the mix buffer +--------------------------------------------------------------*/ +static STREAM_UPDATE( seta_update ) { + x1_010_state *info = (x1_010_state *)param; X1_010_CHANNEL *reg; int ch, i, volL, volR, freq; register INT8 *start, *end, data; register UINT8 *env; register UINT32 smp_offs, smp_step, env_offs, env_step, delta; - const UINT8 *snd1 = m_region; + const UINT8 *snd1 = info->region; // mixer buffer zero clear memset( outputs[0], 0, samples*sizeof(*outputs[0]) ); memset( outputs[1], 0, samples*sizeof(*outputs[1]) ); -// if( m_sound_enable == 0 ) return; +// if( info->sound_enable == 0 ) return; for( ch = 0; ch < SETA_NUM_CHANNELS; ch++ ) { - reg = (X1_010_CHANNEL *)&(m_reg[ch*sizeof(X1_010_CHANNEL)]); + reg = (X1_010_CHANNEL *)&(info->reg[ch*sizeof(X1_010_CHANNEL)]); if( (reg->status&1) != 0 ) { // Key On stream_sample_t *bufL = outputs[0]; stream_sample_t *bufR = outputs[1]; @@ -158,12 +133,12 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t ** end = (INT8 *)((0x100-reg->end)*0x1000+snd1); volL = ((reg->volume>>4)&0xf)*VOL_BASE; volR = ((reg->volume>>0)&0xf)*VOL_BASE; - smp_offs = m_smp_offset[ch]; + smp_offs = info->smp_offset[ch]; freq = reg->frequency&0x1f; // Meta Fox does not write the frequency register. Ever if( freq == 0 ) freq = 4; - smp_step = (UINT32)((float)m_base_clock/8192.0 - *freq*(1<<FREQ_BASE_BITS)/(float)m_rate); + smp_step = (UINT32)((float)info->base_clock/8192.0 + *freq*(1<<FREQ_BASE_BITS)/(float)info->rate); if( smp_offs == 0 ) { LOG_SOUND(( "Play sample %p - %p, channel %X volume %d:%d freq %X step %X offset %X\n", start, end, ch, volL, volR, freq, smp_step, smp_offs )); @@ -180,16 +155,16 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t ** *bufR++ += (data*volR/256); smp_offs += smp_step; } - m_smp_offset[ch] = smp_offs; + info->smp_offset[ch] = smp_offs; } else { // Wave form - start = (INT8 *)&(m_reg[reg->volume*128+0x1000]); - smp_offs = m_smp_offset[ch]; + start = (INT8 *)&(info->reg[reg->volume*128+0x1000]); + smp_offs = info->smp_offset[ch]; freq = (reg->pitch_hi<<8)+reg->frequency; - smp_step = (UINT32)((float)m_base_clock/128.0/1024.0/4.0*freq*(1<<FREQ_BASE_BITS)/(float)m_rate); + smp_step = (UINT32)((float)info->base_clock/128.0/1024.0/4.0*freq*(1<<FREQ_BASE_BITS)/(float)info->rate); - env = (UINT8 *)&(m_reg[reg->end*128]); - env_offs = m_env_offset[ch]; - env_step = (UINT32)((float)m_base_clock/128.0/1024.0/4.0*reg->start*(1<<ENV_BASE_BITS)/(float)m_rate); + env = (UINT8 *)&(info->reg[reg->end*128]); + env_offs = info->env_offset[ch]; + env_step = (UINT32)((float)info->base_clock/128.0/1024.0/4.0*reg->start*(1<<ENV_BASE_BITS)/(float)info->rate); /* Print some more debug info */ if( smp_offs == 0 ) { LOG_SOUND(( "Play waveform %X, channel %X volume %X freq %4X step %X offset %X\n", @@ -212,63 +187,136 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t ** smp_offs += smp_step; env_offs += env_step; } - m_smp_offset[ch] = smp_offs; - m_env_offset[ch] = env_offs; + info->smp_offset[ch] = smp_offs; + info->env_offset[ch] = env_offs; } } } } -void x1_010_device::seta_sound_enable_w(int data) + +static DEVICE_START( x1_010 ) { - m_sound_enable = data; + int i; + const x1_010_interface *intf = (const x1_010_interface *)device->static_config(); + x1_010_state *info = get_safe_token(device); + + info->region = *device->region(); + info->base_clock = device->clock(); + info->rate = device->clock() / 1024; + info->address = intf->adr; + + for( i = 0; i < SETA_NUM_CHANNELS; i++ ) { + info->smp_offset[i] = 0; + info->env_offset[i] = 0; + } + /* Print some more debug info */ + LOG_SOUND(("masterclock = %d rate = %d\n", device->clock(), info->rate )); + + /* get stream channels */ + info->stream = device->machine().sound().stream_alloc(*device,0,2,info->rate,info,seta_update); } -// -// Use these for 8 bit CPUs -// -READ8_MEMBER( x1_010_device::seta_sound_r ) +void seta_sound_enable_w(device_t *device, int data) { - offset ^= m_address; - return m_reg[offset]; + x1_010_state *info = get_safe_token(device); + info->sound_enable = data; } -WRITE8_MEMBER( x1_010_device::seta_sound_w ) + +/* Use these for 8 bit CPUs */ + + +READ8_DEVICE_HANDLER( seta_sound_r ) { + x1_010_state *info = get_safe_token(device); + offset ^= info->address; + return info->reg[offset]; +} + + + + +WRITE8_DEVICE_HANDLER( seta_sound_w ) +{ + x1_010_state *info = get_safe_token(device); int channel, reg; - offset ^= m_address; + offset ^= info->address; channel = offset/sizeof(X1_010_CHANNEL); reg = offset%sizeof(X1_010_CHANNEL); if( channel < SETA_NUM_CHANNELS && reg == 0 - && (m_reg[offset]&1) == 0 && (data&1) != 0 ) { - m_smp_offset[channel] = 0; - m_env_offset[channel] = 0; + && (info->reg[offset]&1) == 0 && (data&1) != 0 ) { + info->smp_offset[channel] = 0; + info->env_offset[channel] = 0; } - LOG_REGISTER_WRITE(("%s: offset %6X : data %2X\n", machine().describe_context(), offset, data )); - m_reg[offset] = data; + LOG_REGISTER_WRITE(("%s: offset %6X : data %2X\n", device->machine().describe_context(), offset, data )); + info->reg[offset] = data; } -// -// Use these for 16 bit CPUs -// -READ16_MEMBER( x1_010_device::seta_sound_word_r ) + + +/* Use these for 16 bit CPUs */ + +READ16_DEVICE_HANDLER( seta_sound_word_r ) { + x1_010_state *info = get_safe_token(device); UINT16 ret; - ret = m_HI_WORD_BUF[offset]<<8; - ret += (seta_sound_r( space, offset )&0xff); - LOG_REGISTER_READ(( "%s: Read X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, ret )); + + ret = info->HI_WORD_BUF[offset]<<8; + ret += (seta_sound_r( device, space, offset )&0xff); + LOG_REGISTER_READ(( "%s: Read X1-010 Offset:%04X Data:%04X\n", device->machine().describe_context(), offset, ret )); return ret; } -WRITE16_MEMBER( x1_010_device::seta_sound_word_w ) +WRITE16_DEVICE_HANDLER( seta_sound_word_w ) +{ + x1_010_state *info = get_safe_token(device); + info->HI_WORD_BUF[offset] = (data>>8)&0xff; + seta_sound_w( device, space, offset, data&0xff ); + LOG_REGISTER_WRITE(( "%s: Write X1-010 Offset:%04X Data:%04X\n", device->machine().describe_context(), offset, data )); +} + + +const device_type X1_010 = &device_creator<x1_010_device>; + +x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : device_t(mconfig, X1_010, "X1-010", tag, owner, clock), + device_sound_interface(mconfig, *this) +{ + m_token = global_alloc_clear(x1_010_state); +} + +//------------------------------------------------- +// device_config_complete - perform any +// operations now that the configuration is +// complete +//------------------------------------------------- + +void x1_010_device::device_config_complete() +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void x1_010_device::device_start() +{ + DEVICE_START_NAME( x1_010 )(this); +} + +//------------------------------------------------- +// sound_stream_update - handle a stream update +//------------------------------------------------- + +void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) { - m_HI_WORD_BUF[offset] = (data>>8)&0xff; - seta_sound_w( space, offset, data&0xff ); - LOG_REGISTER_WRITE(( "%s: Write X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, data )); + // should never get here + fatalerror("sound_stream_update called; not applicable to legacy sound devices\n"); } diff --git a/src/emu/sound/x1_010.h b/src/emu/sound/x1_010.h index e33cdfd3e49..0ebd53c318c 100644 --- a/src/emu/sound/x1_010.h +++ b/src/emu/sound/x1_010.h @@ -3,66 +3,42 @@ #ifndef __X1_010_H__ #define __X1_010_H__ -#define SETA_NUM_CHANNELS 16 +#include "devlegcy.h" -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_X1_010_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, X1_010, _clock) -#define MCFG_X1_010_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, X1_010, _clock) - - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - struct x1_010_interface { int adr; /* address */ }; -// ======================> x1_010_device +DECLARE_READ8_DEVICE_HANDLER ( seta_sound_r ); +DECLARE_WRITE8_DEVICE_HANDLER( seta_sound_w ); + +DECLARE_READ16_DEVICE_HANDLER ( seta_sound_word_r ); +DECLARE_WRITE16_DEVICE_HANDLER( seta_sound_word_w ); + +void seta_sound_enable_w(device_t *device, int data); class x1_010_device : public device_t, - public device_sound_interface + public device_sound_interface { public: x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - ~x1_010_device() { } - - void seta_sound_enable_w(int data); + ~x1_010_device() { global_free(m_token); } + // access to legacy token + void *token() const { assert(m_token != NULL); return m_token; } protected: // device-level overrides + 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); - -public: - DECLARE_READ8_MEMBER( seta_sound_r ); - DECLARE_WRITE8_MEMBER( seta_sound_w ); - - DECLARE_READ16_MEMBER( seta_sound_word_r ); - DECLARE_WRITE16_MEMBER( seta_sound_word_w ); - private: - int m_rate; // Output sampling rate (Hz) - sound_stream *m_stream; // Stream handle - int m_address; // address eor data - const UINT8 *m_region; // region name - int m_sound_enable; // sound output enable/disable - UINT8 m_reg[0x2000]; // X1-010 Register & wave form area - UINT8 m_HI_WORD_BUF[0x2000]; // X1-010 16bit access ram check avoidance work - UINT32 m_smp_offset[SETA_NUM_CHANNELS]; - UINT32 m_env_offset[SETA_NUM_CHANNELS]; - - UINT32 m_base_clock; + // internal state + void *m_token; }; extern const device_type X1_010; diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index f186bcd30ff..b45e1febfe1 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -210,7 +210,7 @@ static ADDRESS_MAP_START( champbwl_map, AS_PROGRAM, 8, champbwl_state ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0xa000, 0xafff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecodelow_r8, spritecodelow_w8) AM_RANGE(0xb000, 0xbfff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecodehigh_r8, spritecodehigh_w8) - AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_r, seta_sound_w) + AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_r, seta_sound_w) AM_RANGE(0xe000, 0xe2ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r8, spriteylow_w8) AM_RANGE(0xe300, 0xe303) AM_MIRROR(0xfc) AM_DEVWRITE_LEGACY("spritegen", spritectrl_w8) /* control registers (0x80 mirror used by Arkanoid 2) */ AM_RANGE(0xe800, 0xe800) AM_DEVWRITE_LEGACY("spritegen", spritebgflag_w8) /* enable / disable background transparency */ @@ -249,7 +249,7 @@ static ADDRESS_MAP_START( doraemon, AS_PROGRAM, 8, champbwl_state ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0xa000, 0xafff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecodelow_r8, spritecodelow_w8) AM_RANGE(0xb000, 0xbfff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecodehigh_r8, spritecodehigh_w8) - AM_RANGE(0xc000, 0xc07f) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_r, seta_sound_w) // Sound + AM_RANGE(0xc000, 0xc07f) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_r,seta_sound_w) // Sound AM_RANGE(0xe000, 0xe2ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r8, spriteylow_w8) AM_RANGE(0xe300, 0xe303) AM_DEVWRITE_LEGACY("spritegen", spritectrl_w8) AM_RANGE(0xe800, 0xe800) AM_DEVWRITE_LEGACY("spritegen", spritebgflag_w8) /* enable / disable background transparency */ @@ -505,7 +505,7 @@ static MACHINE_CONFIG_START( champbwl, champbwl_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 16000000) + MCFG_SOUND_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_CONFIG(champbwl_sound_intf) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -567,7 +567,7 @@ static MACHINE_CONFIG_START( doraemon, champbwl_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_X1_010_ADD("x1snd", 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) MACHINE_CONFIG_END diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 589aa6feae5..ae2bb2d82fe 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1654,7 +1654,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( downtown_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x000000, 0x09ffff) AM_ROM // ROM - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_NOP // watchdog? (twineagl) AM_RANGE(0x300000, 0x300001) AM_WRITENOP // IRQ enable/acknowledge? AM_RANGE(0x400000, 0x400007) AM_WRITE(twineagl_tilebank_w) // special tile banking to animate water in twineagl @@ -1823,7 +1823,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atehate_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM AM_RANGE(0x900000, 0x9fffff) AM_RAM // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? watchdog ? AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? 0 (irq ack lev 2?) AM_RANGE(0x500000, 0x500001) AM_WRITENOP // ? (end of lev 1: bit 4 goes 1,0,1) @@ -1866,7 +1866,7 @@ static ADDRESS_MAP_START( blandia_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xb04000, 0xb0ffff) AM_RAM // (jjsquawk) AM_RANGE(0xb80000, 0xb83fff) AM_RAM_WRITE(seta_vram_2_w) AM_SHARE("vram_2") // VRAM 2&3 AM_RANGE(0xb84000, 0xb8ffff) AM_RAM // (jjsquawk) - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd00007) AM_WRITENOP // ? AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ? VBlank IRQ Ack AM_RANGE(0xf00000, 0xf00001) AM_WRITENOP // ? Sound IRQ Ack @@ -1901,7 +1901,7 @@ static ADDRESS_MAP_START( blandiap_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16) /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd00007) AM_WRITENOP // ? AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ? VBlank IRQ Ack AM_RANGE(0xf00000, 0xf00001) AM_WRITENOP // ? Sound IRQ Ack @@ -1981,7 +1981,7 @@ static ADDRESS_MAP_START( wrofaero_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16) /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w) // ? #else @@ -2057,7 +2057,7 @@ static ADDRESS_MAP_START( jjsquawb_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xa0a600, 0xa0a607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16) // AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // RZ: Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w) // ? #else @@ -2084,7 +2084,7 @@ static ADDRESS_MAP_START( orbs_map, AS_PROGRAM, 16, seta_state ) //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_RAM // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_RAM // NVRAM - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_SHARE("paletteram") // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2165,7 +2165,7 @@ static ADDRESS_MAP_START( keroppi_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x800100, 0x8001ff) AM_RAM // NVRAM AM_RANGE(0x900000, 0x900001) AM_WRITENOP // ? AM_RANGE(0x900002, 0x900003) AM_WRITE(keroppi_prize_w) // - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_SHARE("paletteram") // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2196,7 +2196,7 @@ static ADDRESS_MAP_START( blockcar_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_SHARE("paletteram") // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2233,7 +2233,7 @@ static ADDRESS_MAP_START( daioh_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr AM_RANGE(0xb04000, 0xb13fff) AM_RAM - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ADDRESS_MAP_END @@ -2246,7 +2246,7 @@ static ADDRESS_MAP_START( drgnunit_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x000000, 0x0bffff) AM_ROM // ROM AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM (qzkklogy) AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM (drgnunit,stg) - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // Watchdog AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? IRQ Ack AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_SHARE("vregs") // Coin Lockout + Video Registers @@ -2364,7 +2364,7 @@ static ADDRESS_MAP_START( extdwnhl_map, AS_PROGRAM, 16, seta_state ) /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr AM_RANGE(0xb04000, 0xb13fff) AM_RAM // - AM_RANGE(0xe00000, 0xe03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xe00000, 0xe03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2401,7 +2401,7 @@ static ADDRESS_MAP_START( kamenrid_map, AS_PROGRAM, 16, seta_state ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITENOP // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END /* almost identical to kamenrid */ @@ -2430,7 +2430,7 @@ static ADDRESS_MAP_START( madshark_map, AS_PROGRAM, 16, seta_state ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITENOP // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2477,7 +2477,7 @@ static ADDRESS_MAP_START( magspeed_map, AS_PROGRAM, 16, seta_state ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITENOP // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2522,7 +2522,7 @@ static ADDRESS_MAP_START( krzybowl_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_RAM // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_RAM // NVRAM - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_SHARE("paletteram") // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr /**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2568,7 +2568,7 @@ static ADDRESS_MAP_START( msgundam_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xa80000, 0xa83fff) AM_RAM_WRITE(seta_vram_2_w) AM_SHARE("vram_2") // VRAM 2&3 AM_RANGE(0xb00000, 0xb00005) AM_RAM AM_SHARE("vctrl_0") // VRAM 0&1 Ctrl AM_RANGE(0xb80000, 0xb80005) AM_RAM AM_SHARE("vctrl_2") // VRAM 2&3 Ctrl - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w) // ? #else @@ -2592,7 +2592,7 @@ static ADDRESS_MAP_START( oisipuzl_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? IRQ Ack AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_SHARE("vregs") // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x703fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x700000, 0x703fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_SHARE("vram_0") // VRAM 0&1 AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_SHARE("vram_2") // VRAM 2&3 /**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_SHARE("vctrl_0") // VRAM 0&1 Ctrl @@ -2683,7 +2683,7 @@ static ADDRESS_MAP_START( kiwame_map, AS_PROGRAM, 16, seta_state ) /**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16) AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_SHARE("paletteram") // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd00009) AM_READ(kiwame_input_r) // mahjong panel AM_RANGE(0xe00000, 0xe00003) AM_READ(seta_dsw_r) // DSW ADDRESS_MAP_END @@ -2708,7 +2708,7 @@ WRITE16_MEMBER(seta_state::thunderl_protection_w) static ADDRESS_MAP_START( thunderl_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? AM_RANGE(0x400000, 0x40ffff) AM_WRITE(thunderl_protection_w) // Protection (not in wits) @@ -2732,7 +2732,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( thunderlbl_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM -// AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound +// AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? // AM_RANGE(0x400000, 0x40ffff) AM_WRITE(thunderl_protection_w) // Protection (not in wits) @@ -2818,7 +2818,7 @@ static ADDRESS_MAP_START( umanclub_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16) /**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound ADDRESS_MAP_END @@ -2886,7 +2886,7 @@ static ADDRESS_MAP_START( pairlove_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x900000, 0x9001ff) AM_READWRITE(pairlove_prot_r,pairlove_prot_w) - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xb00000, 0xb00fff) AM_RAM AM_SHARE("paletteram") // Palette AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000 @@ -2976,7 +2976,7 @@ static ADDRESS_MAP_START( inttoote_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE8("rtc", msm6242_device, read, write, 0x00ff) - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w ) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound AM_RANGE(0xa00000, 0xa00005) AM_WRITEONLY AM_SHARE("vctrl_0") // VRAM 0&1 Ctrl AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(seta_vram_0_w) AM_SHARE("vram_0") // VRAM 0&1 @@ -3038,7 +3038,7 @@ static ADDRESS_MAP_START( jockeyc_map, AS_PROGRAM, 16, seta_state ) AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE8("rtc", msm6242_device, read, write, 0x00ff) - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w) // Sound AM_RANGE(0xa00000, 0xa00005) AM_WRITEONLY AM_SHARE("vctrl_0") // VRAM 0&1 Ctrl AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(seta_vram_0_w) AM_SHARE("vram_0") // VRAM 0&1 @@ -3177,7 +3177,7 @@ WRITE8_MEMBER(seta_state::calibr50_soundlatch2_w) } static ADDRESS_MAP_START( calibr50_sub_map, AS_PROGRAM, 8, seta_state ) - AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_r, seta_sound_w) // Sound + AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_r,seta_sound_w) // Sound AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_byte_r) // From Main CPU AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_bankswitch_w) // Bankswitching AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM @@ -3213,7 +3213,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_map, AS_PROGRAM, 8, seta_state ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xefff) AM_RAM - AM_RANGE(0xf000, 0xffff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_r, seta_sound_w) + AM_RANGE(0xf000, 0xffff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_r,seta_sound_w) ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_io_map, AS_IO, 8, seta_state ) @@ -7544,7 +7544,7 @@ static MACHINE_CONFIG_START( twineagl, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7585,7 +7585,7 @@ static MACHINE_CONFIG_START( downtown, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_X1_010_ADD("x1snd", 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) MACHINE_CONFIG_END @@ -7645,7 +7645,7 @@ static MACHINE_CONFIG_START( usclssic, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 16000000) /* 16 MHz */ + MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_CONFIG(seta_sound_intf2) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -7692,7 +7692,7 @@ static MACHINE_CONFIG_START( calibr50, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_X1_010_ADD("x1snd", 16000000) /* 16 MHz */ + MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */ MCFG_SOUND_CONFIG(seta_sound_intf2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END @@ -7733,7 +7733,7 @@ static MACHINE_CONFIG_START( metafox, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7769,7 +7769,7 @@ static MACHINE_CONFIG_START( atehate, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7813,7 +7813,7 @@ static MACHINE_CONFIG_START( blandia, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7846,7 +7846,7 @@ static MACHINE_CONFIG_START( blandiap, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7882,7 +7882,7 @@ static MACHINE_CONFIG_START( blockcar, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7918,7 +7918,7 @@ static MACHINE_CONFIG_START( daioh, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7960,7 +7960,7 @@ static MACHINE_CONFIG_START( drgnunit, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -7995,7 +7995,7 @@ static MACHINE_CONFIG_START( qzkklgy2, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8046,7 +8046,7 @@ static MACHINE_CONFIG_START( setaroul, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8082,7 +8082,7 @@ static MACHINE_CONFIG_START( eightfrc, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8124,7 +8124,7 @@ static MACHINE_CONFIG_START( extdwnhl, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8185,7 +8185,7 @@ static MACHINE_CONFIG_START( gundhara, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8226,7 +8226,7 @@ static MACHINE_CONFIG_START( jjsquawk, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8258,7 +8258,7 @@ static MACHINE_CONFIG_START( jjsquawb, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8298,7 +8298,7 @@ static MACHINE_CONFIG_START( kamenrid, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8335,7 +8335,7 @@ static MACHINE_CONFIG_START( orbs, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8373,7 +8373,7 @@ static MACHINE_CONFIG_START( keroppi, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8409,7 +8409,7 @@ static MACHINE_CONFIG_START( krzybowl, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8452,7 +8452,7 @@ static MACHINE_CONFIG_START( madshark, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8492,7 +8492,7 @@ static MACHINE_CONFIG_START( magspeed, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8539,7 +8539,7 @@ static MACHINE_CONFIG_START( msgundam, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8576,7 +8576,7 @@ static MACHINE_CONFIG_START( oisipuzl, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8648,7 +8648,7 @@ static MACHINE_CONFIG_START( kiwame, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8687,7 +8687,7 @@ static MACHINE_CONFIG_START( rezon, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8726,7 +8726,7 @@ static MACHINE_CONFIG_START( thunderl, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8831,7 +8831,7 @@ static MACHINE_CONFIG_START( wits, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8867,7 +8867,7 @@ static MACHINE_CONFIG_START( umanclub, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -8907,7 +8907,7 @@ static MACHINE_CONFIG_START( utoukond, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 16000000) + MCFG_SOUND_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_CONFIG(seta_sound_intf) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -8956,7 +8956,7 @@ static MACHINE_CONFIG_START( wrofaero, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -9000,7 +9000,7 @@ static MACHINE_CONFIG_START( zingzip, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -9052,7 +9052,7 @@ static MACHINE_CONFIG_START( pairlove, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) @@ -9196,7 +9196,7 @@ static MACHINE_CONFIG_START( inttoote, seta_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 16000000) + MCFG_SOUND_ADD("x1snd", X1_010, 16000000) MCFG_SOUND_CONFIG(seta_sound_intf) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 9b270e5e5ab..cb89ff278da 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -161,7 +161,7 @@ static ADDRESS_MAP_START( grdians_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x70000c, 0x70000d) AM_READ(watchdog_reset16_r) // Watchdog AM_RANGE(0x800000, 0x800001) AM_WRITE(grdians_lockout_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared @@ -203,7 +203,7 @@ static ADDRESS_MAP_START( gundamex_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("IN1") // P2 AM_RANGE(0x70000c, 0x70000d) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x800000, 0x800001) AM_WRITE(grdians_lockout_w) - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared @@ -262,7 +262,7 @@ static ADDRESS_MAP_START( mj4simai_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x600300, 0x60030f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") // Video Registers @@ -285,7 +285,7 @@ static ADDRESS_MAP_START( myangel_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x700300, 0x700301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x700302, 0x700303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x700310, 0x70031f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") // Video Registers @@ -308,7 +308,7 @@ static ADDRESS_MAP_START( myangel2_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x600300, 0x60030f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xd00000, 0xd3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xd40000, 0xd4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xd60000, 0xd6003f) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") // Video Registers @@ -356,7 +356,7 @@ static ADDRESS_MAP_START( pzlbowl_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0x840000, 0x84ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0x860000, 0x86003f) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") // Video Registers - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers ADDRESS_MAP_END @@ -382,7 +382,7 @@ static ADDRESS_MAP_START( penbros_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0xb00000, 0xb3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xb40000, 0xb4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xb60000, 0xb6003f) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers ADDRESS_MAP_END @@ -437,7 +437,7 @@ static ADDRESS_MAP_START( reelquak_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE(0x400300, 0x400301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x400302, 0x400303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0x400300, 0x40030f) AM_WRITE(seta2_sound_bank_w) // Samples Banks - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_SHARE("spriteram") // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") // Video Registers @@ -499,7 +499,7 @@ static ADDRESS_MAP_START( samshoot_map, AS_PROGRAM, 16, seta2_state ) AM_RANGE( 0x840000, 0x84ffff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette AM_RANGE( 0x860000, 0x86003f ) AM_WRITE(seta2_vregs_w) AM_SHARE("vregs") // Video Registers - AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE("x1snd", x1_010_device, seta_sound_word_r, seta_sound_word_w ) // Sound + AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound AM_RANGE( 0xfffd0a, 0xfffd0b ) AM_READ_PORT("DSW2") // parallel data register (DSW 2) AM_RANGE( 0xfffc00, 0xffffff ) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers @@ -2042,7 +2042,7 @@ static MACHINE_CONFIG_START( seta2, seta2_state ) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_X1_010_ADD("x1snd", 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(1, "rspeaker", 1.0) diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index e4a5895ef24..3797d2fcaa8 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -266,10 +266,10 @@ WRITE16_MEMBER(seta_state::seta_vregs_w) ---- ---- ---- ---0 Coin #0 Counter */ if (ACCESSING_BITS_0_7) { - x1_010_device *x1_010 = machine().device<x1_010_device>("x1snd"); + device_t *x1_010 = machine().device("x1snd"); seta_coin_lockout_w (machine(), data & 0x0f); if (x1_010 != NULL) - x1_010->seta_sound_enable_w (data & 0x20); + seta_sound_enable_w (x1_010, data & 0x20); coin_counter_w(machine(), 0,data & 0x01); coin_counter_w(machine(), 1,data & 0x02); } |