modernised YM2203 [smf]

This commit is contained in:
smf- 2013-05-11 13:20:38 +00:00
parent 725996afbd
commit 3a8b7344f0
132 changed files with 1245 additions and 1456 deletions

View File

@ -2,49 +2,28 @@
#include "2203intf.h"
#include "fm.h"
struct ym2203_state
{
sound_stream * stream;
emu_timer * timer[2];
void * chip;
void * psg;
const ym2203_interface *intf;
devcb_resolved_write_line irqhandler;
device_t *device;
};
INLINE ym2203_state *get_safe_token(device_t *device)
{
assert(device != NULL);
assert(device->type() == YM2203);
return (ym2203_state *)downcast<ym2203_device *>(device)->token();
}
static void psg_set_clock(void *param, int clock)
{
ym2203_state *info = (ym2203_state *)param;
ay8910_set_clock_ym(info->psg, clock);
ym2203_device *ym2203 = (ym2203_device *) param;
ay8910_set_clock_ym(ym2203->_psg(), clock);
}
static void psg_write(void *param, int address, int data)
{
ym2203_state *info = (ym2203_state *)param;
ay8910_write_ym(info->psg, address, data);
ym2203_device *ym2203 = (ym2203_device *) param;
ay8910_write_ym(ym2203->_psg(), address, data);
}
static int psg_read(void *param)
{
ym2203_state *info = (ym2203_state *)param;
return ay8910_read_ym(info->psg);
ym2203_device *ym2203 = (ym2203_device *) param;
return ay8910_read_ym(ym2203->_psg());
}
static void psg_reset(void *param)
{
ym2203_state *info = (ym2203_state *)param;
ay8910_reset_ym(info->psg);
ym2203_device *ym2203 = (ym2203_device *) param;
ay8910_reset_ym(ym2203->_psg());
}
static const ssg_callbacks psgintf =
@ -55,138 +34,180 @@ static const ssg_callbacks psgintf =
psg_reset
};
void *ym2203_device::_psg()
{
return m_psg;
}
/* IRQ Handler */
static void IRQHandler(void *param,int irq)
{
ym2203_state *info = (ym2203_state *)param;
if (!info->irqhandler.isnull())
info->irqhandler(irq);
ym2203_device *ym2203 = (ym2203_device *) param;
ym2203->_IRQHandler(irq);
}
void ym2203_device::_IRQHandler(int irq)
{
if (!m_irq_handler.isnull())
m_irq_handler(irq);
}
/* Timer overflow callback from timer.c */
static TIMER_CALLBACK( timer_callback_2203_0 )
void ym2203_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
ym2203_state *info = (ym2203_state *)ptr;
ym2203_timer_over(info->chip,0);
switch(id)
{
case 0:
ym2203_timer_over(m_chip,0);
break;
case 1:
ym2203_timer_over(m_chip,1);
break;
}
}
static TIMER_CALLBACK( timer_callback_2203_1 )
static void timer_handler(void *param,int c,int count,int clock)
{
ym2203_state *info = (ym2203_state *)ptr;
ym2203_timer_over(info->chip,1);
ym2203_device *ym2203 = (ym2203_device *) param;
ym2203->_timer_handler(c, count, clock);
}
void ym2203_device::_timer_handler(int c,int count,int clock)
{
if( count == 0 )
{ /* Reset FM Timer */
m_timer[c]->enable(false);
}
else
{ /* Start FM Timer */
attotime period = attotime::from_hz(clock) * count;
if (!m_timer[c]->enable(true))
m_timer[c]->adjust(period);
}
}
/* update request from fm.c */
void ym2203_update_request(void *param)
{
ym2203_state *info = (ym2203_state *)param;
info->stream->update();
ym2203_device *ym2203 = (ym2203_device *) param;
ym2203->_ym2203_update_request();
}
void ym2203_device::_ym2203_update_request()
{
m_stream->update();
}
static void timer_handler(void *param,int c,int count,int clock)
{
ym2203_state *info = (ym2203_state *)param;
if( count == 0 )
{ /* Reset FM Timer */
info->timer[c]->enable(false);
}
else
{ /* Start FM Timer */
attotime period = attotime::from_hz(clock) * count;
if (!info->timer[c]->enable(true))
info->timer[c]->adjust(period);
}
}
static STREAM_UPDATE( ym2203_stream_update )
//-------------------------------------------------
// sound_stream_update - handle a stream update
//-------------------------------------------------
void ym2203_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
ym2203_state *info = (ym2203_state *)param;
ym2203_update_one(info->chip, outputs[0], samples);
ym2203_update_one(m_chip, outputs[0], samples);
}
static void ym2203_intf_postload (ym2203_state *info)
void ym2203_device::device_post_load()
{
ym2203_postload(info->chip);
ym2203_postload(m_chip);
}
static DEVICE_START( ym2203 )
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void ym2203_device::device_start()
{
static const ym2203_interface generic_2203 =
static const ay8910_interface default_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
const ym2203_interface *intf = device->static_config() ? (const ym2203_interface *)device->static_config() : &generic_2203;
ym2203_state *info = get_safe_token(device);
int rate = device->clock()/72; /* ??? */
info->irqhandler.resolve(intf->irqhandler, *device);
info->intf = intf;
info->device = device;
info->psg = ay8910_start_ym(NULL, YM2203, device, device->clock(), &intf->ay8910_intf);
assert_always(info->psg != NULL, "Error creating YM2203/AY8910 chip");
int rate = clock()/72; /* ??? */
const ay8910_interface *ay8910_config = m_ay8910_config != NULL ? m_ay8910_config : &default_ay8910_config;
m_irq_handler.resolve();
m_psg = ay8910_start_ym(NULL, YM2203, this, clock(), ay8910_config);
assert_always(m_psg != NULL, "Error creating YM2203/AY8910 chip");
/* Timer Handler set */
info->timer[0] = device->machine().scheduler().timer_alloc(FUNC(timer_callback_2203_0), info);
info->timer[1] = device->machine().scheduler().timer_alloc(FUNC(timer_callback_2203_1), info);
m_timer[0] = timer_alloc(0);
m_timer[1] = timer_alloc(1);
/* stream system initialize */
info->stream = device->machine().sound().stream_alloc(*device,0,1,rate,info,ym2203_stream_update);
m_stream = machine().sound().stream_alloc(*this,0,1,rate);
/* Initialize FM emurator */
info->chip = ym2203_init(info,device,device->clock(),rate,timer_handler,IRQHandler,&psgintf);
assert_always(info->chip != NULL, "Error creating YM2203 chip");
device->machine().save().register_postload(save_prepost_delegate(FUNC(ym2203_intf_postload), info));
m_chip = ym2203_init(this,this,clock(),rate,timer_handler,IRQHandler,&psgintf);
assert_always(m_chip != NULL, "Error creating YM2203 chip");
}
static DEVICE_STOP( ym2203 )
//-------------------------------------------------
// device_stop - device-specific stop
//-------------------------------------------------
void ym2203_device::device_stop()
{
ym2203_state *info = get_safe_token(device);
ym2203_shutdown(info->chip);
ay8910_stop_ym(info->psg);
ym2203_shutdown(m_chip);
ay8910_stop_ym(m_psg);
}
static DEVICE_RESET( ym2203 )
//-------------------------------------------------
// device_reset - device-specific reset
//-------------------------------------------------
void ym2203_device::device_reset()
{
ym2203_state *info = get_safe_token(device);
ym2203_reset_chip(info->chip);
ym2203_reset_chip(m_chip);
}
READ8_DEVICE_HANDLER( ym2203_r )
READ8_MEMBER( ym2203_device::read )
{
ym2203_state *info = get_safe_token(device);
return ym2203_read(info->chip, offset & 1);
return ym2203_read(m_chip, offset & 1);
}
WRITE8_DEVICE_HANDLER( ym2203_w )
WRITE8_MEMBER( ym2203_device::write )
{
ym2203_state *info = get_safe_token(device);
ym2203_write(info->chip, offset & 1, data);
ym2203_write(m_chip, offset & 1, data);
}
READ8_MEMBER( ym2203_device::status_port_r )
{
return read(space, 0);
}
READ8_DEVICE_HANDLER( ym2203_status_port_r ) { return ym2203_r(device, space, 0); }
READ8_DEVICE_HANDLER( ym2203_read_port_r ) { return ym2203_r(device, space, 1); }
WRITE8_DEVICE_HANDLER( ym2203_control_port_w ) { ym2203_w(device, space, 0, data); }
WRITE8_DEVICE_HANDLER( ym2203_write_port_w ) { ym2203_w(device, space, 1, data); }
READ8_MEMBER( ym2203_device::read_port_r )
{
return read(space, 1);
}
WRITE8_MEMBER( ym2203_device::control_port_w )
{
write(space, 0, data);
}
WRITE8_MEMBER( ym2203_device::write_port_w )
{
write(space, 1, data);
}
const device_type YM2203 = &device_creator<ym2203_device>;
ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2203, "YM2203", tag, owner, clock),
device_sound_interface(mconfig, *this)
device_sound_interface(mconfig, *this),
m_irq_handler(*this)
{
m_token = global_alloc_clear(ym2203_state);
}
//-------------------------------------------------
@ -198,40 +219,3 @@ ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, dev
void ym2203_device::device_config_complete()
{
}
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void ym2203_device::device_start()
{
DEVICE_START_NAME( ym2203 )(this);
}
//-------------------------------------------------
// device_reset - device-specific reset
//-------------------------------------------------
void ym2203_device::device_reset()
{
DEVICE_RESET_NAME( ym2203 )(this);
}
//-------------------------------------------------
// device_stop - device-specific stop
//-------------------------------------------------
void ym2203_device::device_stop()
{
DEVICE_STOP_NAME( ym2203 )(this);
}
//-------------------------------------------------
// sound_stream_update - handle a stream update
//-------------------------------------------------
void ym2203_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
// should never get here
fatalerror("sound_stream_update called; not applicable to legacy sound devices\n");
}

View File

@ -3,47 +3,60 @@
#ifndef __2203INTF_H__
#define __2203INTF_H__
#include "devlegcy.h"
#include "emu.h"
#include "ay8910.h"
void ym2203_update_request(void *param);
struct ym2203_interface
{
const ay8910_interface ay8910_intf;
devcb_write_line irqhandler;
};
#define MCFG_YM2203_IRQ_HANDLER(_devcb) \
devcb = &ym2203_device::set_irq_handler(*device, DEVCB2_##_devcb);
DECLARE_READ8_DEVICE_HANDLER( ym2203_r );
DECLARE_WRITE8_DEVICE_HANDLER( ym2203_w );
DECLARE_READ8_DEVICE_HANDLER( ym2203_status_port_r );
DECLARE_READ8_DEVICE_HANDLER( ym2203_read_port_r );
DECLARE_WRITE8_DEVICE_HANDLER( ym2203_control_port_w );
DECLARE_WRITE8_DEVICE_HANDLER( ym2203_write_port_w );
#define MCFG_YM2203_AY8910_INTF(_ay8910_config) \
ym2203_device::set_ay8910_config(*device, _ay8910_config);
class ym2203_device : public device_t,
public device_sound_interface
{
public:
ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~ym2203_device() { global_free(m_token); }
// access to legacy token
void *token() const { assert(m_token != NULL); return m_token; }
// static configuration helpers
template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2203_device &>(device).m_irq_handler.set_callback(object); }
static void set_ay8910_config(device_t &device, const ay8910_interface *ay8910_config) { downcast<ym2203_device &>(device).m_ay8910_config = ay8910_config; }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( status_port_r );
DECLARE_READ8_MEMBER( read_port_r );
DECLARE_WRITE8_MEMBER( control_port_w );
DECLARE_WRITE8_MEMBER( write_port_w );
void *_psg();
void _IRQHandler(int irq);
void _timer_handler(int c,int count,int clock);
void _ym2203_update_request();
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_post_load();
virtual void device_stop();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
// 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
void *m_token;
sound_stream * m_stream;
emu_timer * m_timer[2];
void * m_chip;
void * m_psg;
devcb2_write_line m_irq_handler;
const ay8910_interface *m_ay8910_config;
};
extern const device_type YM2203;

View File

@ -450,14 +450,11 @@ const ym3812_interface seibu_ym3812_interface =
DEVCB_LINE(seibu_ym3812_irqhandler)
};
const ym2203_interface seibu_ym2203_interface =
const ay8910_interface seibu_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_LINE(seibu_ym2203_irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
/***************************************************************************/
@ -563,13 +560,13 @@ ADDRESS_MAP_START( seibu3_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x4002, 0x4002) AM_WRITE_LEGACY(seibu_rst10_ack_w)
AM_RANGE(0x4003, 0x4003) AM_WRITE_LEGACY(seibu_rst18_ack_w)
AM_RANGE(0x4007, 0x4007) AM_WRITE_LEGACY(seibu_bank_w)
AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x4010, 0x4011) AM_READ_LEGACY(seibu_soundlatch_r)
AM_RANGE(0x4012, 0x4012) AM_READ_LEGACY(seibu_main_data_pending_r)
AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
AM_RANGE(0x4018, 0x4019) AM_WRITE_LEGACY(seibu_main_data_w)
AM_RANGE(0x401b, 0x401b) AM_WRITE_LEGACY(seibu_coin_w)
AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@ -582,7 +579,7 @@ ADDRESS_MAP_START( seibu3_adpcm_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x4003, 0x4003) AM_WRITE_LEGACY(seibu_rst18_ack_w)
AM_RANGE(0x4005, 0x4006) AM_DEVWRITE_LEGACY("adpcm1", seibu_adpcm_adr_w)
AM_RANGE(0x4007, 0x4007) AM_WRITE_LEGACY(seibu_bank_w)
AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x4010, 0x4011) AM_READ_LEGACY(seibu_soundlatch_r)
AM_RANGE(0x4012, 0x4012) AM_READ_LEGACY(seibu_main_data_pending_r)
AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
@ -590,7 +587,7 @@ ADDRESS_MAP_START( seibu3_adpcm_sound_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x401a, 0x401a) AM_DEVWRITE_LEGACY("adpcm1", seibu_adpcm_ctl_w)
AM_RANGE(0x401b, 0x401b) AM_WRITE_LEGACY(seibu_coin_w)
AM_RANGE(0x6005, 0x6006) AM_DEVWRITE_LEGACY("adpcm2", seibu_adpcm_adr_w)
AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0x601a, 0x601a) AM_DEVWRITE_LEGACY("adpcm2", seibu_adpcm_ctl_w)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END

View File

@ -88,7 +88,7 @@ extern const device_type SEIBU_ADPCM;
extern const ym3812_interface seibu_ym3812_interface;
extern const ym2203_interface seibu_ym2203_interface;
extern const ay8910_interface seibu_ay8910_config;
struct seibu_adpcm_interface
{
@ -189,7 +189,8 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf;
MCFG_SPEAKER_STANDARD_MONO("mono") \
\
MCFG_SOUND_ADD("ym1", YM2203, freq) \
MCFG_SOUND_CONFIG(seibu_ym2203_interface) \
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<seibu_ym2203_irqhandler>)) \
MCFG_YM2203_AY8910_INTF(&seibu_ay8910_config) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
\
MCFG_SOUND_ADD("ym2", YM2203, freq) \

View File

@ -81,8 +81,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, _1943_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("ym2", ym2203_device, write)
ADDRESS_MAP_END
/* Input Ports */

View File

@ -115,7 +115,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dec0_s_map, AS_PROGRAM, 8, actfancr_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x3800, 0x3800) AM_DEVREADWRITE("oki", okim6295_device, read, write)

View File

@ -388,7 +388,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_io_map, AS_IO, 8, airbustr_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x04, 0x04) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0x06, 0x06) AM_READWRITE(soundcommand_r, soundcommand2_w)
ADDRESS_MAP_END
@ -529,16 +529,13 @@ GFXDECODE_END
/* Sound Interfaces */
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"), // DSW-1 connected to port A
DEVCB_INPUT_PORT("DSW2"), // DSW-2 connected to port B
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"), // DSW-1 connected to port A
DEVCB_INPUT_PORT("DSW2"), // DSW-2 connected to port B
DEVCB_NULL,
DEVCB_NULL
};
@ -653,7 +650,7 @@ static MACHINE_CONFIG_START( airbustr, airbustr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)

View File

@ -792,17 +792,17 @@ static ADDRESS_MAP_START( sound_portmap, AS_IO, 8, alpha68k_state )
AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_byte_r, soundlatch_clear_byte_w)
AM_RANGE(0x08, 0x08) AM_DEVWRITE("dac", dac_device, write_signed8)
AM_RANGE(0x0a, 0x0b) AM_DEVWRITE_LEGACY("ym2", ym2413_w)
AM_RANGE(0x0c, 0x0d) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0c, 0x0d) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x0e, 0x0e) AM_WRITE(sound_bank_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( kyros_sound_portmap, AS_IO, 8, alpha68k_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x80, 0x80) AM_DEVWRITE_LEGACY("ym2", ym2203_write_port_w)
AM_RANGE(0x81, 0x81) AM_DEVWRITE_LEGACY("ym2", ym2203_control_port_w)
AM_RANGE(0x90, 0x90) AM_DEVWRITE_LEGACY("ym3", ym2203_write_port_w)
AM_RANGE(0x91, 0x91) AM_DEVWRITE_LEGACY("ym3", ym2203_control_port_w)
AM_RANGE(0x10, 0x11) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("ym2", ym2203_device, write_port_w)
AM_RANGE(0x81, 0x81) AM_DEVWRITE("ym2", ym2203_device, control_port_w)
AM_RANGE(0x90, 0x90) AM_DEVWRITE("ym3", ym2203_device, write_port_w)
AM_RANGE(0x91, 0x91) AM_DEVWRITE("ym3", ym2203_device, control_port_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( jongbou_sound_portmap, AS_IO, 8, alpha68k_state )
@ -1833,16 +1833,13 @@ WRITE8_MEMBER(alpha68k_state::porta_w)
m_sound_pa_latch = data & 1;
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ym2203_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(driver_device, soundlatch_byte_r),
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(alpha68k_state, porta_w),
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(driver_device, soundlatch_byte_r),
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(alpha68k_state, porta_w),
DEVCB_NULL
};
@ -2146,7 +2143,7 @@ static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ym2203_ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MCFG_SOUND_ADD("ym2", YM2413, 3579545)
@ -2195,7 +2192,7 @@ static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ym2203_ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MCFG_SOUND_ADD("ym2", YM2413, 3579545)
@ -2238,7 +2235,7 @@ static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ym2203_ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MCFG_SOUND_ADD("ym2", YM2413, 3579545)
@ -2280,7 +2277,7 @@ static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ym2203_ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MCFG_SOUND_ADD("ym2", YM2413, 3579545)

View File

@ -236,8 +236,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sub_portmap, AS_IO, 8, angelkds_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0x80, 0x83) AM_READWRITE(angelkds_sub_sound_r, angelkds_sub_sound_w) // spcpostn
ADDRESS_MAP_END
@ -512,14 +512,11 @@ WRITE_LINE_MEMBER(angelkds_state::irqhandler)
m_subcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(angelkds_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
/*** Graphics Decoding
@ -622,7 +619,8 @@ static MACHINE_CONFIG_START( angelkds, angelkds_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, XTAL_4MHz)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(angelkds_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)

View File

@ -157,14 +157,11 @@ WRITE_LINE_MEMBER(argus_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(argus_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
@ -280,14 +277,14 @@ ADDRESS_MAP_END
#if 0
static ADDRESS_MAP_START( sound_portmap_1, AS_IO, 8, argus_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
ADDRESS_MAP_END
#endif
static ADDRESS_MAP_START( sound_portmap_2, AS_IO, 8, argus_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
@ -571,7 +568,8 @@ static MACHINE_CONFIG_START( argus, argus_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(argus_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -615,7 +613,8 @@ static MACHINE_CONFIG_START( valtric, argus_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(argus_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -659,7 +658,8 @@ static MACHINE_CONFIG_START( butasan, argus_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(argus_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)

View File

@ -142,7 +142,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_portmap, AS_IO, 8, ashnojoe_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_w)
AM_RANGE(0x04, 0x04) AM_READ(sound_latch_r)
AM_RANGE(0x06, 0x06) AM_READ(sound_latch_status_r)
@ -289,17 +289,14 @@ WRITE8_MEMBER(ashnojoe_state::ym2203_write_b)
membank("bank4")->set_entry(data & 0x0f);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ashnojoe_state,ym2203_write_a),
DEVCB_DRIVER_MEMBER(ashnojoe_state,ym2203_write_b),
},
DEVCB_DRIVER_LINE_MEMBER(ashnojoe_state,ym2203_irq_handler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ashnojoe_state,ym2203_write_a),
DEVCB_DRIVER_MEMBER(ashnojoe_state,ym2203_write_b),
};
WRITE_LINE_MEMBER(ashnojoe_state::ashnojoe_vclk_cb)
@ -367,7 +364,8 @@ static MACHINE_CONFIG_START( ashnojoe, ashnojoe_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(ashnojoe_state, ym2203_irq_handler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
MCFG_SOUND_ADD("msm", MSM5205, 384000)

View File

@ -105,7 +105,7 @@ WRITE8_MEMBER(battlera_state::battlera_adpcm_reset_w)
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, battlera_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_DEVWRITE_LEGACY("ymsnd", ym2203_w)
AM_RANGE(0x040000, 0x040001) AM_DEVWRITE("ymsnd", ym2203_device, write)
AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w)
AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE("c6280", c6280_device, c6280_w)
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank7") /* Main ram */

View File

@ -139,7 +139,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, bladestl_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) /* YM2203 */
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) /* YM2203 */
AM_RANGE(0x3000, 0x3000) AM_WRITE(bladestl_speech_ctrl_w) /* UPD7759 */
AM_RANGE(0x4000, 0x4000) AM_READ(bladestl_speech_busy_r) /* UPD7759 */
AM_RANGE(0x5000, 0x5000) AM_WRITENOP /* ??? */
@ -271,17 +271,14 @@ GFXDECODE_END
*
*************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DEVICE_HANDLER("upd", upd7759_port_w),
DEVCB_DRIVER_MEMBER(bladestl_state,bladestl_port_B_w)
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DEVICE_HANDLER("upd", upd7759_port_w),
DEVCB_DRIVER_MEMBER(bladestl_state,bladestl_port_B_w)
};
static const k007342_interface bladestl_k007342_intf =
@ -355,7 +352,7 @@ static MACHINE_CONFIG_START( bladestl, bladestl_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_ADD("ymsnd", YM2203, 3579545)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END

View File

@ -116,8 +116,8 @@ static ADDRESS_MAP_START( blktiger_sound_map, AS_PROGRAM, 8, blktiger_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xe002, 0xe003) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xe002, 0xe003) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( blktiger_mcu_map, AS_PROGRAM, 8, blktiger_state )
@ -264,14 +264,11 @@ WRITE_LINE_MEMBER(blktiger_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(blktiger_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
};
void blktiger_state::machine_start()
@ -341,7 +338,8 @@ static MACHINE_CONFIG_START( blktiger, blktiger_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(blktiger_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */

View File

@ -149,7 +149,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, brkthru_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE_LEGACY("ym2", ym3526_w)
AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END

View File

@ -306,7 +306,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ym2", ym3526_r, ym3526_w)
AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_byte_r) AM_WRITE(bublbobl_sound_status_w)
AM_RANGE(0xb001, 0xb001) AM_WRITE(bublbobl_sh_nmi_enable_w) AM_READNOP
@ -396,7 +396,7 @@ static ADDRESS_MAP_START( tokio_sound_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0x9800, 0x9800) AM_READNOP // ???
AM_RANGE(0xa000, 0xa000) AM_WRITE(bublbobl_sh_nmi_disable_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(bublbobl_sh_nmi_enable_w)
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xe000, 0xffff) AM_ROM // space for diagnostic ROM?
ADDRESS_MAP_END
@ -701,14 +701,11 @@ WRITE_LINE_MEMBER(bublbobl_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(bublbobl_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
@ -780,7 +777,8 @@ static MACHINE_CONFIG_START( tokio, bublbobl_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, MAIN_XTAL/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(bublbobl_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.08)
MCFG_SOUND_ROUTE(1, "mono", 0.08)
MCFG_SOUND_ROUTE(2, "mono", 0.08)
@ -859,7 +857,8 @@ static MACHINE_CONFIG_START( bublbobl, bublbobl_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, MAIN_XTAL/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(bublbobl_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ym2", YM3526, MAIN_XTAL/8)

View File

@ -259,7 +259,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, capbowl_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x2000, 0x2000) AM_WRITENOP /* Not hooked up according to the schematics */
AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("dac", dac_device, write_unsigned8)
AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_byte_r)
@ -311,17 +311,14 @@ INPUT_PORTS_END
*
*************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DEVICE_MEMBER("ticket", ticket_dispenser_device, read),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DEVICE_MEMBER("ticket", ticket_dispenser_device, write), /* Also a status LED. See memory map above */
},
DEVCB_DRIVER_LINE_MEMBER(capbowl_state,firqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DEVICE_MEMBER("ticket", ticket_dispenser_device, read),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DEVICE_MEMBER("ticket", ticket_dispenser_device, write), /* Also a status LED. See memory map above */
};
@ -375,7 +372,8 @@ static MACHINE_CONFIG_START( capbowl, capbowl_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK/2)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(capbowl_state, firqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.07)
MCFG_SOUND_ROUTE(1, "mono", 0.07)
MCFG_SOUND_ROUTE(2, "mono", 0.07)

View File

@ -1057,7 +1057,7 @@ static ADDRESS_MAP_START( hotdogst_sound_portmap, AS_IO, 8, cave_state )
AM_RANGE(0x00, 0x00) AM_WRITE(hotdogst_rombank_w) // ROM bank
AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU
AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r) //
AM_RANGE(0x50, 0x51) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) //
AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) //
AM_RANGE(0x60, 0x60) AM_DEVREADWRITE("oki", okim6295_device, read, write) // M6295
AM_RANGE(0x70, 0x70) AM_WRITE(hotdogst_okibank_w) // Samples bank
ADDRESS_MAP_END
@ -1087,8 +1087,8 @@ static ADDRESS_MAP_START( mazinger_sound_portmap, AS_IO, 8, cave_state )
AM_RANGE(0x00, 0x00) AM_WRITE(mazinger_rombank_w) // ROM bank
AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w) // To Main CPU
AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU
AM_RANGE(0x50, 0x51) AM_DEVWRITE_LEGACY("ymsnd", ym2203_w) // YM2203
AM_RANGE(0x52, 0x53) AM_DEVREAD_LEGACY("ymsnd", ym2203_r) // YM2203
AM_RANGE(0x50, 0x51) AM_DEVWRITE("ymsnd", ym2203_device, write) // YM2203
AM_RANGE(0x52, 0x53) AM_DEVREAD("ymsnd", ym2203_device, read) // YM2203
AM_RANGE(0x70, 0x70) AM_DEVWRITE("oki", okim6295_device, write) // M6295
AM_RANGE(0x74, 0x74) AM_WRITE(hotdogst_okibank_w) // Samples bank
ADDRESS_MAP_END
@ -1165,7 +1165,7 @@ static ADDRESS_MAP_START( pwrinst2_sound_portmap, AS_IO, 8, cave_state )
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("oki1", okim6295_device, read, write) // M6295
AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("oki2", okim6295_device, read, write) //
AM_RANGE(0x10, 0x17) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_w) // Samples bank
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) //
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) //
AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch_ack_w) // To Main CPU
// AM_RANGE(0x51, 0x51) AM_WRITENOP // ?? volume
AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w) // ROM bank
@ -1802,14 +1802,11 @@ WRITE_LINE_MEMBER(cave_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(cave_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
/***************************************************************************
@ -2106,7 +2103,8 @@ static MACHINE_CONFIG_START( hotdogst, cave_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(cave_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
@ -2212,7 +2210,8 @@ static MACHINE_CONFIG_START( mazinger, cave_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(cave_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
@ -2381,7 +2380,8 @@ static MACHINE_CONFIG_START( pwrinst2, cave_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(cave_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.40)

View File

@ -127,7 +127,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, cbuster_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_device, read, write)
AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_device, read, write)

View File

@ -227,7 +227,7 @@ static ADDRESS_MAP_START( chanbara_map, AS_PROGRAM, 8, chanbara_state )
AM_RANGE(0x2001, 0x2001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x2002, 0x2002) AM_READ_PORT("P2")
AM_RANGE(0x2003, 0x2003) AM_READ_PORT("P1")
AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@ -369,17 +369,14 @@ WRITE_LINE_MEMBER(chanbara_state::sound_irq)
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(chanbara_state,chanbara_ay_out_0_w),
DEVCB_DRIVER_MEMBER(chanbara_state,chanbara_ay_out_1_w),
},
DEVCB_DRIVER_LINE_MEMBER(chanbara_state,sound_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(chanbara_state,chanbara_ay_out_0_w),
DEVCB_DRIVER_MEMBER(chanbara_state,chanbara_ay_out_1_w),
};
@ -416,7 +413,8 @@ static MACHINE_CONFIG_START( chanbara, chanbara_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(chanbara_state, sound_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

View File

@ -363,10 +363,10 @@ static ADDRESS_MAP_START( ym2203c_sound_map, AS_PROGRAM, 8, chinagat_state )
// 8804 and/or 8805 make a gong sound when the coin goes in
// but only on the title screen....
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
// AM_RANGE(0x8802, 0x8802) AM_DEVREADWRITE("oki", okim6295_device, read, write)
// AM_RANGE(0x8803, 0x8803) AM_DEVWRITE("oki", okim6295_device, write)
AM_RANGE(0x8804, 0x8805) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x8804, 0x8805) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
// AM_RANGE(0x8804, 0x8804) AM_WRITEONLY
// AM_RANGE(0x8805, 0x8805) AM_WRITEONLY
@ -518,14 +518,11 @@ static const msm5205_interface msm5205_config =
};
/* This is only on the second bootleg board */
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(chinagat_state,chinagat_irq_handler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
@ -684,7 +681,8 @@ static MACHINE_CONFIG_START( saiyugoub2, chinagat_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3579545)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(chinagat_state, chinagat_irq_handler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)

View File

@ -147,17 +147,14 @@ WRITE8_MEMBER(chinsan_state::ym_port_w2)
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_DRIVER_MEMBER(chinsan_state,ym_port_w1),
DEVCB_DRIVER_MEMBER(chinsan_state,ym_port_w2)
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_DRIVER_MEMBER(chinsan_state,ym_port_w1),
DEVCB_DRIVER_MEMBER(chinsan_state,ym_port_w2)
};
WRITE8_MEMBER(chinsan_state::chinsan_port00_w)
@ -261,7 +258,7 @@ static ADDRESS_MAP_START( chinsan_io, AS_IO, 8, chinsan_state )
AM_RANGE(0x00, 0x00) AM_WRITE(chinsan_port00_w)
AM_RANGE(0x01, 0x01) AM_READ(chinsan_input_port_0_r)
AM_RANGE(0x02, 0x02) AM_READ(chinsan_input_port_1_r)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x20, 0x20) AM_WRITE(chin_adpcm_w)
AM_RANGE(0x30, 0x30) AM_WRITE(ctrl_w) // ROM bank + unknown stuff (input mutliplex?)
ADDRESS_MAP_END
@ -621,7 +618,7 @@ static MACHINE_CONFIG_START( chinsan, chinsan_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) /* ? Mhz */
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)

View File

@ -45,7 +45,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, citycon_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
// AM_RANGE(0x4002, 0x4002) AM_DEVREAD_LEGACY("aysnd", ay8910_r) /* ?? */
AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@ -171,16 +171,13 @@ GFXDECODE_END
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(driver_device, soundlatch_byte_r),
DEVCB_DRIVER_MEMBER(driver_device, soundlatch2_byte_r),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(driver_device, soundlatch_byte_r),
DEVCB_DRIVER_MEMBER(driver_device, soundlatch2_byte_r),
DEVCB_NULL,
DEVCB_NULL
};
@ -229,7 +226,7 @@ static MACHINE_CONFIG_START( citycon, citycon_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ymsnd", YM2203, 1250000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)

View File

@ -302,7 +302,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, cninja_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_device, read, write)
AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_device, read, write)

View File

@ -394,7 +394,7 @@ static ADDRESS_MAP_START( combatsc_sound_map, AS_PROGRAM, 8, combatsc_state )
AM_RANGE(0xc000, 0xc000) AM_WRITE(combatsc_voice_reset_w) /* upd7759 reset? */
AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_byte_r) /* soundlatch_byte_r? */
AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) /* YM 2203 intercepted */
AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) /* YM 2203 intercepted */
ADDRESS_MAP_END
WRITE8_MEMBER(combatsc_state::combatscb_dac_w)
@ -413,8 +413,8 @@ WRITE8_MEMBER(combatsc_state::combatscb_dac_w)
static ADDRESS_MAP_START( combatscb_sound_map, AS_PROGRAM, 8, combatsc_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) /* YM 2203 */
AM_RANGE(0x9008, 0x9009) AM_DEVREAD_LEGACY("ymsnd", ym2203_r) /* ??? */
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) /* YM 2203 */
AM_RANGE(0x9008, 0x9009) AM_DEVREAD("ymsnd", ym2203_device, read) /* ??? */
AM_RANGE(0x9800, 0x9800) AM_WRITE(combatscb_dac_w)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r) /* soundlatch_byte_r? */
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bl_abank")
@ -638,29 +638,23 @@ GFXDECODE_END
*
*************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(combatsc_state,combatsc_portA_w),
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(combatsc_state,combatsc_portA_w),
DEVCB_NULL
};
static const ym2203_interface ym2203_bootleg_config =
static const ay8910_interface ay8910_bootleg_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
};
@ -752,7 +746,7 @@ static MACHINE_CONFIG_START( combatsc, combatsc_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
@ -799,7 +793,7 @@ static MACHINE_CONFIG_START( combatscb, combatsc_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_bootleg_config)
MCFG_YM2203_AY8910_INTF(&ay8910_bootleg_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_SOUND_ADD("msm5205", MSM5205, 384000)

View File

@ -74,8 +74,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, commando_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x8002, 0x8003) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x8002, 0x8003) AM_DEVWRITE("ym2", ym2203_device, write)
ADDRESS_MAP_END
/* Input Ports */

View File

@ -65,7 +65,7 @@ static ADDRESS_MAP_START( compgolf_map, AS_PROGRAM, 8, compgolf_state )
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("P2") AM_WRITE(compgolf_ctrl_w)
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1")
AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2")
AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@ -202,17 +202,14 @@ WRITE_LINE_MEMBER(compgolf_state::sound_irq)
m_maincpu->set_input_line(0, state);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(compgolf_state,compgolf_scrollx_lo_w),
DEVCB_DRIVER_MEMBER(compgolf_state,compgolf_scrolly_lo_w),
},
DEVCB_DRIVER_LINE_MEMBER(compgolf_state,sound_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(compgolf_state,compgolf_scrollx_lo_w),
DEVCB_DRIVER_MEMBER(compgolf_state,compgolf_scrolly_lo_w),
};
@ -263,7 +260,8 @@ static MACHINE_CONFIG_START( compgolf, compgolf_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(compgolf_state, sound_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

View File

@ -326,8 +326,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, cshooter_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_WRITENOP // AM_DEVWRITE_LEGACY("ym1", ym2203_w) ?
AM_RANGE(0xc800, 0xc801) AM_WRITENOP // AM_DEVWRITE_LEGACY("ym2", ym2203_w) ?
AM_RANGE(0xc000, 0xc001) AM_WRITENOP // AM_DEVWRITE("ym1", ym2203_device, write) ?
AM_RANGE(0xc800, 0xc801) AM_WRITENOP // AM_DEVWRITE("ym2", ym2203_device, write) ?
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END

View File

@ -583,7 +583,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cyclemb_sound_io, AS_IO, 8, cyclemb_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x40, 0x40) AM_READ(soundlatch_byte_r) AM_WRITE(soundlatch2_byte_w)
ADDRESS_MAP_END

View File

@ -464,8 +464,8 @@ WRITE8_MEMBER(darius_state::darius_write_portB1)
static ADDRESS_MAP_START( darius_sound_map, AS_PROGRAM, 8, darius_state )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xb000, 0xb000) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, tc0140syt_slave_port_w)
AM_RANGE(0xb001, 0xb001) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, tc0140syt_slave_comm_r, tc0140syt_slave_comm_w)
AM_RANGE(0xc000, 0xc000) AM_WRITE(darius_fm0_pan)
@ -767,30 +767,24 @@ WRITE_LINE_MEMBER(darius_state::irqhandler) /* assumes Z80 sandwiched between 68
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_interface_1 =
static const ay8910_interface ay8910_config_1 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, /* portA read */
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portA0), /* portA write */
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portB0), /* portB write */
},
DEVCB_DRIVER_LINE_MEMBER(darius_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, /* portA read */
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portA0), /* portA write */
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portB0), /* portB write */
};
static const ym2203_interface ym2203_interface_2 =
static const ay8910_interface ay8910_config_2 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, /* portA read */
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portA1), /* portA write */
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portB1) /* portB write */
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, /* portA read */
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portA1), /* portA write */
DEVCB_DRIVER_MEMBER(darius_state,darius_write_portB1) /* portB write */
};
@ -913,7 +907,8 @@ static MACHINE_CONFIG_START( darius, darius_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_interface_1)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(darius_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config_1)
MCFG_SOUND_ROUTE(0, "filter0.0l", 0.08)
MCFG_SOUND_ROUTE(0, "filter0.0r", 0.08)
MCFG_SOUND_ROUTE(1, "filter0.1l", 0.08)
@ -924,7 +919,7 @@ static MACHINE_CONFIG_START( darius, darius_state )
MCFG_SOUND_ROUTE(3, "filter0.3r", 0.60)
MCFG_SOUND_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_interface_2)
MCFG_YM2203_AY8910_INTF(&ay8910_config_2)
MCFG_SOUND_ROUTE(0, "filter1.0l", 0.08)
MCFG_SOUND_ROUTE(0, "filter1.0r", 0.08)
MCFG_SOUND_ROUTE(1, "filter1.1l", 0.08)

View File

@ -83,7 +83,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, darkseal_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_device, read, write)
AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_device, read, write)

View File

@ -260,7 +260,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, dassault_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_device, read, write)
AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_device, read, write)

View File

@ -471,7 +471,7 @@ static ADDRESS_MAP_START( ddealer, AS_PROGRAM, 16, ddealer_state )
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("UNK")
AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8_LEGACY("ymsnd", ym2203_w, 0x00ff) // ym ?
AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8("ymsnd", ym2203_device, write, 0x00ff) // ym ?
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") // palette ram
AM_RANGE(0x08c000, 0x08cfff) AM_RAM_WRITE(ddealer_vregs_w) AM_SHARE("vregs") // palette ram

View File

@ -138,7 +138,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, ddribble_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("snd_sharedram") /* shared RAM with CPU #1 */
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) /* YM2203 */
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) /* YM2203 */
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE_LEGACY("vlm", vlm5030_data_w) /* Speech data */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
@ -223,16 +223,13 @@ static GFXDECODE_START( ddribble )
GFXDECODE_ENTRY( "gfx2", 0x40000, spritelayout, 64, 16 ) /* colors 0-15 but using lookup table */
GFXDECODE_END
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ddribble_state,ddribble_vlm5030_busy_r),
DEVCB_DRIVER_MEMBER(ddribble_state,ddribble_vlm5030_ctrl_w),
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ddribble_state,ddribble_vlm5030_busy_r),
DEVCB_DRIVER_MEMBER(ddribble_state,ddribble_vlm5030_ctrl_w),
DEVCB_NULL
};
@ -310,7 +307,7 @@ static MACHINE_CONFIG_START( ddribble, ddribble_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "filter1", 0.25)
MCFG_SOUND_ROUTE(1, "filter2", 0.25)
MCFG_SOUND_ROUTE(2, "filter3", 0.25)

View File

@ -546,7 +546,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dec0_s_map, AS_PROGRAM, 8, dec0_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x3800, 0x3800) AM_DEVREADWRITE("oki", okim6295_device, read, write)
@ -558,7 +558,7 @@ static ADDRESS_MAP_START( slyspy_s_map, AS_PROGRAM, 8, dec0_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x090000, 0x090001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x0a0000, 0x0a0001) AM_READNOP /* Protection counter */
AM_RANGE(0x0b0000, 0x0b0001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0b0000, 0x0b0001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x0e0000, 0x0e0001) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0x0f0000, 0x0f0001) AM_READ(soundlatch_byte_r)
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8")
@ -568,7 +568,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( midres_s_map, AS_PROGRAM, 8, dec0_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x108000, 0x108001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x118000, 0x118001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x118000, 0x118001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0x138000, 0x138001) AM_READ(soundlatch_byte_r)
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8")
@ -667,9 +667,9 @@ WRITE8_MEMBER(dec0_automat_state::automat_adpcm_w)
static ADDRESS_MAP_START( automat_s_map, AS_PROGRAM, 8, dec0_automat_state )
AM_RANGE(0x0103, 0x0103) AM_WRITENOP
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE_LEGACY("2203a", ym2203_w)
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("2203a", ym2203_device, write)
AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE_LEGACY("2203b", ym2203_w)
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("2203b", ym2203_device, write)
AM_RANGE(0xf000, 0xf000) AM_WRITE(automat_adpcm_w)
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END

View File

@ -845,7 +845,7 @@ ADDRESS_MAP_END
/* Used for Cobra Command, Maze Hunter, Super Real Darwin etc */
static ADDRESS_MAP_START( dec8_s_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x8000, 0xffff) AM_ROM
@ -854,7 +854,7 @@ ADDRESS_MAP_END
/* Used by Gondomania, Psycho-Nics Oscar & Garyo Retsuden */
static ADDRESS_MAP_START( oscar_s_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE_LEGACY("ym2", ym3526_w)
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x8000, 0xffff) AM_ROM
@ -863,7 +863,7 @@ ADDRESS_MAP_END
/* Used by Last Mission, Shackled & Breywood */
static ADDRESS_MAP_START( ym3526_s_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym2", ym3526_w)
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x8000, 0xffff) AM_ROM
@ -872,7 +872,7 @@ ADDRESS_MAP_END
/* Captain Silver - same sound system as Pocket Gal */
static ADDRESS_MAP_START( csilver_s_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym2", ym3526_w)
AM_RANGE(0x1800, 0x1800) AM_WRITE(csilver_adpcm_data_w) /* ADPCM data for the MSM5205 chip */
AM_RANGE(0x2000, 0x2000) AM_WRITE(csilver_sound_bank_w)

View File

@ -178,7 +178,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dfruit_map, AS_PROGRAM, 8, dfruit_state )
AM_IMPORT_FROM(tc0091lvc_map)
AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ppi8255_0", i8255_device, read, write)
AM_RANGE(0xa004, 0xa005) AM_DEVREADWRITE_LEGACY("opn",ym2203_r,ym2203_w)
AM_RANGE(0xa004, 0xa005) AM_DEVREADWRITE("opn", ym2203_device, read, write)
AM_RANGE(0xa008, 0xa008) AM_READNOP //watchdog
ADDRESS_MAP_END
@ -368,14 +368,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(dfruit_state::dfruit_irq_scanline)
}
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("IN4"), DEVCB_INPUT_PORT("IN5"), DEVCB_NULL, DEVCB_NULL,
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("IN4"), DEVCB_INPUT_PORT("IN5"), DEVCB_NULL, DEVCB_NULL,
};
@ -410,7 +407,7 @@ static MACHINE_CONFIG_START( dfruit, dfruit_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("opn", YM2203, MASTER_CLOCK/4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END

View File

@ -289,7 +289,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_port_am, AS_IO, 8, djboy_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu2_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x04, 0x04) AM_READ(soundlatch_byte_r)
AM_RANGE(0x06, 0x06) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x07, 0x07) AM_DEVREADWRITE("oki2", okim6295_device, read, write)

View File

@ -286,16 +286,16 @@ static ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xf802, 0xf803) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xf804, 0xf805) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0xf802, 0xf803) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xf804, 0xf805) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bluehawk_sound_map, AS_PROGRAM, 8, dooyong_state )
@ -784,24 +784,18 @@ WRITE_LINE_MEMBER(dooyong_state::irqhandler_2203_2)
m_audiocpu->set_input_line(0, (m_interrupt_line_1 | m_interrupt_line_2) ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_interface_1 =
static const ay8910_interface ay8910_config_1 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(dooyong_state,unk_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(dooyong_state,irqhandler_2203_1)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(dooyong_state,unk_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static const ym2203_interface ym2203_interface_2 =
static const ay8910_interface ay8910_config_2 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(dooyong_state,unk_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(dooyong_state,irqhandler_2203_2)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(dooyong_state,unk_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
/***************************************************************************
@ -815,11 +809,13 @@ static MACHINE_CONFIG_FRAGMENT( sound_2203 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_interface_1)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state,irqhandler_2203_1))
MCFG_YM2203_AY8910_INTF(&ay8910_config_1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_interface_2)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state, irqhandler_2203_2))
MCFG_YM2203_AY8910_INTF(&ay8910_config_2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@ -881,11 +877,13 @@ static MACHINE_CONFIG_START( lastday, dooyong_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_interface_1)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state,irqhandler_2203_1))
MCFG_YM2203_AY8910_INTF(&ay8910_config_1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_interface_2)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state, irqhandler_2203_2))
MCFG_YM2203_AY8910_INTF(&ay8910_config_2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END

View File

@ -531,7 +531,7 @@ static ADDRESS_MAP_START( hanamai_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x74, 0x74 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
AM_RANGE( 0x76, 0x76 ) AM_WRITE(dynax_blit_palbank_w) // Layers Palettes (High Bit)
AM_RANGE( 0x77, 0x77 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) // 2 x DSW
AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) // 2 x DSW
AM_RANGE( 0x7a, 0x7b ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w) // AY8910
// AM_RANGE( 0x7c, 0x7c ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x7d, 0x7d ) AM_WRITENOP //
@ -845,7 +845,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sprtmtch_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) // 2 x DSW
AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) // 2 x DSW
// AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x13, 0x13 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x20, 0x20 ) AM_READ_PORT("P1") // P1
@ -1022,7 +1022,7 @@ static ADDRESS_MAP_START( jantouki_sound_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x10, 0x10 ) AM_WRITE(jantouki_sound_vblank_ack_w) // VBlank IRQ Ack
AM_RANGE( 0x21, 0x21 ) AM_DEVREAD_LEGACY("aysnd", ay8910_r) // AY8910
AM_RANGE( 0x22, 0x23 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w) //
AM_RANGE( 0x28, 0x29 ) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) //
AM_RANGE( 0x28, 0x29 ) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) //
AM_RANGE( 0x30, 0x30 ) AM_WRITE(adpcm_reset_w) // MSM5205 reset
AM_RANGE( 0x40, 0x40 ) AM_WRITE(adpcm_data_w) // MSM5205 data
AM_RANGE( 0x50, 0x50 ) AM_READ(jantouki_soundlatch_status_r) // Soundlatch status
@ -4065,17 +4065,14 @@ MACHINE_START_MEMBER(dynax_state,hnoridur)
Hana no Mai
***************************************************************************/
static const ym2203_interface hanamai_ym2203_interface =
static const ay8910_interface hanamai_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"), /* Port A Read: DSW */
DEVCB_INPUT_PORT("DSW0"), /* Port B Read: DSW */
DEVCB_NULL, /* Port A Write */
DEVCB_NULL, /* Port B Write */
},
DEVCB_DRIVER_LINE_MEMBER(dynax_state,sprtmtch_sound_callback) /* IRQ handler */
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"), /* Port A Read: DSW */
DEVCB_INPUT_PORT("DSW0"), /* Port B Read: DSW */
DEVCB_NULL, /* Port A Write */
DEVCB_NULL, /* Port B Write */
};
static const msm5205_interface hanamai_msm5205_interface =
@ -4119,7 +4116,8 @@ static MACHINE_CONFIG_START( hanamai, dynax_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
MCFG_SOUND_CONFIG(hanamai_ym2203_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dynax_state, sprtmtch_sound_callback))
MCFG_YM2203_AY8910_INTF(&hanamai_ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@ -4233,17 +4231,14 @@ MACHINE_CONFIG_END
Sports Match
***************************************************************************/
static const ym2203_interface sprtmtch_ym2203_interface =
static const ay8910_interface sprtmtch_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW0"), /* Port A Read: DSW */
DEVCB_INPUT_PORT("DSW1"), /* Port B Read: DSW */
DEVCB_NULL, /* Port A Write */
DEVCB_NULL, /* Port B Write */
},
DEVCB_DRIVER_LINE_MEMBER(dynax_state,sprtmtch_sound_callback), /* IRQ handler */
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW0"), /* Port A Read: DSW */
DEVCB_INPUT_PORT("DSW1"), /* Port B Read: DSW */
DEVCB_NULL, /* Port A Write */
DEVCB_NULL, /* Port B Write */
};
static MACHINE_CONFIG_START( sprtmtch, dynax_state )
@ -4276,7 +4271,8 @@ static MACHINE_CONFIG_START( sprtmtch, dynax_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
MCFG_SOUND_CONFIG(sprtmtch_ym2203_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dynax_state, sprtmtch_sound_callback))
MCFG_YM2203_AY8910_INTF(&sprtmtch_ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@ -4407,14 +4403,11 @@ MACHINE_CONFIG_END
// dual monitor, 2 CPU's, 2 blitters
static const ym2203_interface jantouki_ym2203_interface =
static const ay8910_interface jantouki_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(dynax_state,jantouki_sound_callback) /* IRQ handler */
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static const msm5205_interface jantouki_msm5205_interface =
@ -4489,7 +4482,8 @@ static MACHINE_CONFIG_START( jantouki, dynax_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
MCFG_SOUND_CONFIG(jantouki_ym2203_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dynax_state, jantouki_sound_callback))
MCFG_YM2203_AY8910_INTF(&jantouki_ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)

View File

@ -269,7 +269,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8, exprraid_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE_LEGACY("ym2", ym3526_r, ym3526_w)
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x8000, 0xffff) AM_ROM

View File

@ -804,8 +804,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, cps_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xdc00, 0xdc01) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xdc00, 0xdc01) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xe000, 0xe000) AM_WRITE(fcrash_snd_bankswitch_w)
AM_RANGE(0xe400, 0xe400) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe800, 0xe800) AM_WRITE(fcrash_msm5205_0_data_w)

View File

@ -142,7 +142,7 @@ static ADDRESS_MAP_START( fuuki16_sound_io_map, AS_IO, 8, fuuki16_state )
AM_RANGE(0x11, 0x11) AM_READ(soundlatch_byte_r) AM_WRITENOP // From Main CPU / ? To Main CPU ?
AM_RANGE(0x20, 0x20) AM_WRITE(fuuki16_oki_banking_w) // Oki Banking
AM_RANGE(0x30, 0x30) AM_WRITENOP // ? In the NMI routine
AM_RANGE(0x40, 0x41) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x50, 0x51) AM_DEVREADWRITE_LEGACY("ym2", ym3812_r, ym3812_w)
AM_RANGE(0x60, 0x60) AM_DEVREAD("oki", okim6295_device, read) // M6295
AM_RANGE(0x61, 0x61) AM_DEVWRITE("oki", okim6295_device, write) // M6295

View File

@ -428,8 +428,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, gaiden_state )
AM_RANGE(0xe000, 0xefff) AM_ROM /* raiga only */
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0xf810, 0xf811) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0xf820, 0xf821) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0xf820, 0xf821) AM_DEVWRITE("ym2", ym2203_device, write)
AM_RANGE(0xfc00, 0xfc00) AM_NOP /* ?? */
AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END
@ -741,14 +741,11 @@ WRITE_LINE_MEMBER(gaiden_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(gaiden_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static MACHINE_CONFIG_START( shadoww, gaiden_state )
@ -782,7 +779,8 @@ static MACHINE_CONFIG_START( shadoww, gaiden_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(gaiden_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -893,8 +891,8 @@ Others
static ADDRESS_MAP_START( mastninj_sound_map, AS_PROGRAM, 8, gaiden_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xc400, 0xc401) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0xc400, 0xc401) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ym2", ym2203_device, write)
// AM_RANGE(0xfc00, 0xfc00) AM_NOP /* ?? */
// AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END
@ -954,7 +952,8 @@ static MACHINE_CONFIG_START( mastninj, gaiden_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 4000000) /* ?? MHz */
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(gaiden_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)

View File

@ -396,7 +396,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ppking_cpu2_io, AS_IO, 8, gladiatr_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x20, 0x21) AM_READ(qx1_r) AM_WRITE(qx1_w)
AM_RANGE(0x40, 0x40) AM_READNOP
AM_RANGE(0x60, 0x61) AM_READWRITE(qx2_r,qx2_w)
@ -443,7 +443,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gladiatr_cpu2_io, AS_IO, 8, gladiatr_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x20, 0x21) AM_READWRITE_LEGACY(TAITO8741_1_r, TAITO8741_1_w)
AM_RANGE(0x40, 0x40) AM_NOP // WRITE(sub_irq_ack_w)
AM_RANGE(0x60, 0x61) AM_READWRITE_LEGACY(TAITO8741_2_r, TAITO8741_2_w)
@ -625,30 +625,24 @@ READ8_MEMBER(gladiatr_state::f1_r)
return machine().rand();
}
static const ym2203_interface ppking_ym2203_interface =
static const ay8910_interface ppking_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(gladiatr_state,f1_r),
DEVCB_DRIVER_MEMBER(gladiatr_state,f1_r),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(gladiatr_state,f1_r),
DEVCB_DRIVER_MEMBER(gladiatr_state,f1_r),
DEVCB_NULL,
DEVCB_NULL
};
static const ym2203_interface gladiatr_ym2203_interface =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_INPUT_PORT("DSW3"), /* port B read */
DEVCB_DRIVER_MEMBER(gladiatr_state,gladiator_int_control_w), /* port A write */
DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(gladiatr_state,gladiator_ym_irq) /* NMI request for 2nd cpu */
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_INPUT_PORT("DSW3"), /* port B read */
DEVCB_DRIVER_MEMBER(gladiatr_state,gladiator_int_control_w), /* port A write */
DEVCB_NULL,
};
static const msm5205_interface msm5205_config =
@ -697,7 +691,7 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_SOUND_CONFIG(ppking_ym2203_interface)
MCFG_YM2203_AY8910_INTF(&ppking_ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MCFG_SOUND_ROUTE(2, "mono", 0.60)
@ -745,7 +739,8 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_SOUND_CONFIG(gladiatr_ym2203_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state, gladiator_ym_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MCFG_SOUND_ROUTE(2, "mono", 0.60)

View File

@ -70,8 +70,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, gng_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("ym2", ym2203_device, write)
ADDRESS_MAP_END

View File

@ -84,8 +84,8 @@ static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8, goal92_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe000) AM_WRITE(adpcm_control_w)
AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w)
AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END
@ -214,14 +214,11 @@ WRITE_LINE_MEMBER(goal92_state::irqhandler)
//m_audiocpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(goal92_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
WRITE_LINE_MEMBER(goal92_state::goal92_adpcm_int)
@ -334,7 +331,8 @@ static MACHINE_CONFIG_START( goal92, goal92_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 2500000/2)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(goal92_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ym2", YM2203, 2500000/2)

View File

@ -103,7 +103,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, goindol_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE_LEGACY("ymsnd", ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ymsnd", ym2203_device, write)
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END

View File

@ -78,7 +78,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, gundealr_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END
@ -390,16 +390,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::gundealr_scanline)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 10h */
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
};
@ -428,7 +425,7 @@ static MACHINE_CONFIG_START( gundealr, gundealr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END

View File

@ -122,8 +122,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, gunsmoke_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("ym2", ym2203_device, write)
ADDRESS_MAP_END
/* Input Ports */

View File

@ -136,7 +136,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( himesiki_iom1, AS_IO, 8, himesiki_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym2203", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_device, read, write)
AM_RANGE(0x04, 0x04) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END

View File

@ -96,8 +96,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hnayayoi_io_map, AS_IO, 8, hnayayoi_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("ymsnd", ym2203_w)
AM_RANGE(0x02, 0x03) AM_DEVREAD_LEGACY("ymsnd", ym2203_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym2203_device, write)
AM_RANGE(0x02, 0x03) AM_DEVREAD("ymsnd", ym2203_device, read)
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW3")
AM_RANGE(0x06, 0x06) AM_WRITE(adpcm_data_w)
// AM_RANGE(0x08, 0x08) AM_WRITENOP // CRT Controller
@ -118,8 +118,8 @@ static ADDRESS_MAP_START( hnfubuki_map, AS_PROGRAM, 8, hnayayoi_state )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0xfeff) AM_ROM
AM_RANGE(0xff00, 0xff01) AM_DEVWRITE_LEGACY("ymsnd", ym2203_w)
AM_RANGE(0xff02, 0xff03) AM_DEVREAD_LEGACY("ymsnd", ym2203_r)
AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("ymsnd", ym2203_device, write)
AM_RANGE(0xff02, 0xff03) AM_DEVREAD("ymsnd", ym2203_device, read)
AM_RANGE(0xff04, 0xff04) AM_READ_PORT("DSW3")
AM_RANGE(0xff06, 0xff06) AM_WRITE(adpcm_data_w)
// AM_RANGE(0xff08, 0xff08) AM_WRITENOP // CRT Controller
@ -144,8 +144,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( untoucha_io_map, AS_IO, 8, hnayayoi_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_DEVWRITE_LEGACY("ymsnd", ym2203_control_port_w)
AM_RANGE(0x11, 0x11) AM_DEVREAD_LEGACY("ymsnd", ym2203_status_port_r)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("ymsnd", ym2203_device, control_port_w)
AM_RANGE(0x11, 0x11) AM_DEVREAD("ymsnd", ym2203_device, status_port_r)
// AM_RANGE(0x12, 0x12) AM_WRITENOP // CRT Controller
AM_RANGE(0x13, 0x13) AM_WRITE(adpcm_data_w)
AM_RANGE(0x14, 0x14) AM_READ_PORT("COIN")
@ -158,8 +158,8 @@ static ADDRESS_MAP_START( untoucha_io_map, AS_IO, 8, hnayayoi_state )
AM_RANGE(0x28, 0x28) AM_WRITE(dynax_blitter_rev1_start_w)
AM_RANGE(0x31, 0x31) AM_WRITE(adpcm_vclk_w)
AM_RANGE(0x32, 0x32) AM_WRITE(adpcm_reset_inv_w)
AM_RANGE(0x50, 0x50) AM_DEVWRITE_LEGACY("ymsnd", ym2203_write_port_w)
AM_RANGE(0x51, 0x51) AM_DEVREAD_LEGACY("ymsnd", ym2203_read_port_r)
AM_RANGE(0x50, 0x50) AM_DEVWRITE("ymsnd", ym2203_device, write_port_w)
AM_RANGE(0x51, 0x51) AM_DEVREAD("ymsnd", ym2203_device, read_port_r)
// AM_RANGE(0x52, 0x52) AM_WRITENOP // CRT Controller
ADDRESS_MAP_END
@ -505,17 +505,14 @@ WRITE_LINE_MEMBER(hnayayoi_state::irqhandler)
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(hnayayoi_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL,
};
static const msm5205_interface msm5205_config =
@ -576,7 +573,8 @@ static MACHINE_CONFIG_START( hnayayoi, hnayayoi_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 20000000/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(hnayayoi_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)

View File

@ -357,10 +357,10 @@ WRITE8_MEMBER(homedata_state::reikaids_upd7807_portc_w)
coin_counter_w(machine(), 0, ~data & 0x80);
if (BIT(m_upd7807_portc, 5) && !BIT(data, 5)) /* write clock 1->0 */
ym2203_w(m_ym, space, BIT(data, 3), m_upd7807_porta);
m_ymsnd->write(space, BIT(data, 3), m_upd7807_porta);
if (BIT(m_upd7807_portc, 4) && !BIT(data, 4)) /* read clock 1->0 */
m_upd7807_porta = ym2203_r(m_ym, space, BIT(data, 3));
m_upd7807_porta = m_ymsnd->read(space, BIT(data, 3));
m_upd7807_portc = data;
}
@ -1140,7 +1140,6 @@ static const sn76496_config psg_intf =
MACHINE_START_MEMBER(homedata_state,homedata)
{
m_ym = machine().device("ymsnd");
m_sn = machine().device<sn76489a_device>("snsnd");
save_item(NAME(m_visible_page));
@ -1279,16 +1278,13 @@ MACHINE_CONFIG_END
/**************************************************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
};
@ -1337,7 +1333,7 @@ static MACHINE_CONFIG_START( reikaids, homedata_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)

View File

@ -117,7 +117,7 @@ static ADDRESS_MAP_START( homerun_iomap, AS_IO, 8, homerun_state )
AM_RANGE(0x40, 0x40) AM_READ_PORT("IN0")
AM_RANGE(0x50, 0x50) AM_READ_PORT("IN2")
AM_RANGE(0x60, 0x60) AM_READ_PORT("IN1")
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END
@ -335,17 +335,14 @@ static I8255A_INTERFACE( ppi8255_intf )
DEVCB_DRIVER_MEMBER(homerun_state, homerun_scrollx_w) /* Port C write */
};
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW"),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(homerun_state, homerun_banking_w)
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW"),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(homerun_state, homerun_banking_w)
};
/**************************************************************************/
@ -400,7 +397,7 @@ static MACHINE_CONFIG_START( dynashot, homerun_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_20MHz/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END

View File

@ -449,7 +449,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_io, AS_IO, 8, hvyunit_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x04, 0x04) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END

View File

@ -91,7 +91,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_io_map, AS_IO, 8, ironhors_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym2203", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( farwest_master_map, AS_PROGRAM, 8, ironhors_state )
@ -131,7 +131,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( farwest_slave_map, AS_PROGRAM, 8, ironhors_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE_LEGACY("ym2203", ym2203_r, ym2203_w)
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym2203", ym2203_device, read, write)
ADDRESS_MAP_END
@ -340,16 +340,13 @@ DISCRETE_SOUND_END
*
*************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ironhors_state,ironhors_filter_w),
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ironhors_state,ironhors_filter_w),
DEVCB_NULL
};
@ -396,7 +393,7 @@ static MACHINE_CONFIG_START( ironhors, ironhors_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym2203", YM2203, 18432000/6)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE_EX(0, "disc_ih", 1.0, 0)
MCFG_SOUND_ROUTE_EX(1, "disc_ih", 1.0, 1)
@ -430,16 +427,13 @@ READ8_MEMBER(ironhors_state::farwest_soundlatch_r)
return soundlatch_byte_r(m_soundcpu->space(AS_PROGRAM), 0);
}
static const ym2203_interface farwest_ym2203_config =
static const ay8910_interface farwest_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ironhors_state,farwest_soundlatch_r),
DEVCB_DRIVER_MEMBER(ironhors_state,ironhors_filter_w),
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(ironhors_state,farwest_soundlatch_r),
DEVCB_DRIVER_MEMBER(ironhors_state,ironhors_filter_w),
DEVCB_NULL
};
@ -462,7 +456,7 @@ static MACHINE_CONFIG_DERIVED( farwest, ironhors )
MCFG_SCREEN_UPDATE_DRIVER(ironhors_state, screen_update_farwest)
MCFG_SOUND_MODIFY("ym2203")
MCFG_SOUND_CONFIG(farwest_ym2203_config)
MCFG_YM2203_AY8910_INTF(&farwest_ay8910_config)
MACHINE_CONFIG_END

View File

@ -925,7 +925,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound2203_map, AS_PROGRAM, 8, itech8_state )
AM_RANGE(0x0000, 0x0000) AM_WRITENOP
AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x3000, 0x37ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0x8000, 0xffff) AM_ROM
@ -1635,20 +1635,6 @@ INPUT_PORTS_END
*
*************************************/
static const ym2203_interface ym2203_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(itech8_state,ym2203_portb_out)
},
DEVCB_DRIVER_LINE_MEMBER(itech8_state,generate_sound_irq)
};
static const ay8910_interface ay8910_config =
{
AY8910_LEGACY_OUTPUT,
@ -1719,7 +1705,8 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 )
/* sound hardware */
MCFG_SOUND_ADD("ymsnd", YM2203, CLOCK_8MHz/2)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(itech8_state, generate_sound_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.07)
MCFG_SOUND_ROUTE(1, "mono", 0.07)
MCFG_SOUND_ROUTE(2, "mono", 0.07)

View File

@ -433,7 +433,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( karnov_sound_map, AS_PROGRAM, 8, karnov_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_byte_r)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1800, 0x1801) AM_DEVWRITE_LEGACY("ym2", ym3526_w)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END

View File

@ -466,7 +466,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cowrace_sound_io, AS_IO, 8, kingdrby_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x41) AM_DEVWRITE_LEGACY("aysnd", ym2203_w)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ym2203_device, write)
ADDRESS_MAP_END
@ -945,17 +945,14 @@ static const ay8910_interface ay8910_config =
DEVCB_NULL /* discrete write? */
};
static const ym2203_interface cowrace_ym2203_interface =
static const ay8910_interface cowrace_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(kingdrby_state,sound_cmd_r), // read A
DEVCB_DEVICE_MEMBER("oki", okim6295_device, read), // read B
DEVCB_NULL, // write A
DEVCB_DEVICE_MEMBER("oki", okim6295_device, write) // write B
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(kingdrby_state,sound_cmd_r), // read A
DEVCB_DEVICE_MEMBER("oki", okim6295_device, read), // read B
DEVCB_NULL, // write A
DEVCB_DEVICE_MEMBER("oki", okim6295_device, write) // write B
};
PALETTE_INIT_MEMBER(kingdrby_state,kingdrby)
@ -1084,7 +1081,7 @@ static MACHINE_CONFIG_DERIVED( cowrace, kingdrbb )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_SOUND_REPLACE("aysnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(cowrace_ym2203_interface)
MCFG_YM2203_AY8910_INTF(&cowrace_ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END

View File

@ -46,10 +46,10 @@ WRITE8_MEMBER(labyrunr_state::labyrunr_bankswitch_w)
static ADDRESS_MAP_START( labyrunr_map, AS_PROGRAM, 8, labyrunr_state )
AM_RANGE(0x0000, 0x0007) AM_DEVWRITE_LEGACY("k007121", k007121_ctrl_w)
AM_RANGE(0x0020, 0x005f) AM_RAM AM_SHARE("scrollram")
AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE_LEGACY("ym1", ym2203_read_port_r, ym2203_write_port_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE_LEGACY("ym1", ym2203_status_port_r, ym2203_control_port_w)
AM_RANGE(0x0900, 0x0900) AM_DEVREADWRITE_LEGACY("ym2", ym2203_read_port_r, ym2203_write_port_w)
AM_RANGE(0x0901, 0x0901) AM_DEVREADWRITE_LEGACY("ym2", ym2203_status_port_r, ym2203_control_port_w)
AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("ym1", ym2203_device, read_port_r, write_port_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("ym1", ym2203_device, status_port_r, control_port_w)
AM_RANGE(0x0900, 0x0900) AM_DEVREADWRITE("ym2", ym2203_device, read_port_r, write_port_w)
AM_RANGE(0x0901, 0x0901) AM_DEVREADWRITE("ym2", ym2203_device, status_port_r, control_port_w)
AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("P2")
AM_RANGE(0x0a01, 0x0a01) AM_READ_PORT("P1")
AM_RANGE(0x0b00, 0x0b00) AM_READ_PORT("SYSTEM")
@ -153,29 +153,23 @@ GFXDECODE_END
***************************************************************************/
static const ym2203_interface ym2203_interface_1 =
static const ay8910_interface ay8910_config_1 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
};
static const ym2203_interface ym2203_interface_2 =
static const ay8910_interface ay8910_config_2 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_INPUT_PORT("DSW3"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_INPUT_PORT("DSW3"),
DEVCB_NULL,
DEVCB_NULL
};
@ -216,14 +210,14 @@ static MACHINE_CONFIG_START( labyrunr, labyrunr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_interface_1)
MCFG_YM2203_AY8910_INTF(&ay8910_config_1)
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
MCFG_SOUND_ADD("ym2", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_interface_2)
MCFG_YM2203_AY8910_INTF(&ay8910_config_2)
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)

View File

@ -168,8 +168,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, lastduel_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w)
AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END
@ -182,8 +182,8 @@ static ADDRESS_MAP_START( madgear_sound_map, AS_PROGRAM, 8, lastduel_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xcfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xf004, 0xf004) AM_DEVWRITE("oki", okim6295_device, write)
AM_RANGE(0xf006, 0xf006) AM_READ(soundlatch_byte_r)
AM_RANGE(0xf00a, 0xf00a) AM_WRITE(mg_bankswitch_w)
@ -444,14 +444,11 @@ WRITE_LINE_MEMBER(lastduel_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(lastduel_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
};
TIMER_DEVICE_CALLBACK_MEMBER(lastduel_state::lastduel_timer_cb)
@ -524,7 +521,8 @@ static MACHINE_CONFIG_START( lastduel, lastduel_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 3579545)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lastduel_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, 3579545)
@ -567,7 +565,8 @@ static MACHINE_CONFIG_START( madgear, lastduel_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lastduel_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */

View File

@ -183,8 +183,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lkage_sound_map, AS_PROGRAM, 8, lkage_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w)
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_byte_r) AM_WRITENOP /* ??? */
AM_RANGE(0xb001, 0xb001) AM_READNOP /* ??? */ AM_WRITE(lkage_sh_nmi_enable_w)
AM_RANGE(0xb002, 0xb002) AM_WRITE(lkage_sh_nmi_disable_w)
@ -479,14 +479,11 @@ WRITE_LINE_MEMBER(lkage_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(lkage_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
void lkage_state::machine_start()
@ -573,7 +570,8 @@ static MACHINE_CONFIG_START( lkage, lkage_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK )
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lkage_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -616,7 +614,8 @@ static MACHINE_CONFIG_START( lkageb, lkage_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lkage_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)

View File

@ -197,7 +197,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_io, AS_IO, 8, lockon_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x02, 0x02) AM_NOP
ADDRESS_MAP_END
@ -429,17 +429,14 @@ WRITE8_MEMBER(lockon_state::ym2203_out_b)
set_led_status(machine(), 1, !(data & 0x10));
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("YM2203"),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(lockon_state,ym2203_out_b),
},
DEVCB_DRIVER_LINE_MEMBER(lockon_state,ym2203_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("YM2203"),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(lockon_state,ym2203_out_b),
};
@ -522,7 +519,8 @@ static MACHINE_CONFIG_START( lockon, lockon_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lockon_state, ym2203_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "f2203.1l", 1.0)

View File

@ -189,7 +189,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lsasquad_sound_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
AM_RANGE(0xd000, 0xd000) AM_READWRITE(lsasquad_sh_sound_command_r, lsasquad_sh_result_w)
AM_RANGE(0xd400, 0xd400) AM_WRITE(lsasquad_sh_nmi_disable_w)
@ -396,7 +396,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( daikaiju_sound_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
AM_RANGE(0xd000, 0xd000) AM_READ(daikaiju_sh_sound_command_r)
AM_RANGE(0xd400, 0xd400) AM_WRITENOP
@ -548,17 +548,14 @@ WRITE8_MEMBER(lsasquad_state::unk)
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(lsasquad_state,unk),
DEVCB_DRIVER_MEMBER(lsasquad_state,unk),
},
DEVCB_DRIVER_LINE_MEMBER(lsasquad_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(lsasquad_state,unk),
DEVCB_DRIVER_MEMBER(lsasquad_state,unk),
};
@ -647,7 +644,8 @@ static MACHINE_CONFIG_START( lsasquad, lsasquad_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lsasquad_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.12)
MCFG_SOUND_ROUTE(1, "mono", 0.12)
MCFG_SOUND_ROUTE(2, "mono", 0.12)
@ -703,7 +701,8 @@ static MACHINE_CONFIG_START( daikaiju, lsasquad_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lsasquad_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.12)
MCFG_SOUND_ROUTE(1, "mono", 0.12)
MCFG_SOUND_ROUTE(2, "mono", 0.12)

View File

@ -347,8 +347,8 @@ static ADDRESS_MAP_START( lwings_sound_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("2203a", ym2203_w)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE_LEGACY("2203b", ym2203_w)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("2203a", ym2203_device, write)
AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("2203b", ym2203_device, write)
AM_RANGE(0xe006, 0xe006) AM_READ(avengers_soundlatch2_r) //AT: (avengers061gre)
AM_RANGE(0xe006, 0xe006) AM_WRITEONLY AM_SHARE("soundlatch2")
ADDRESS_MAP_END

View File

@ -67,8 +67,8 @@ ADDRESS_MAP_END
/* Physical memory map (21 bits) */
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, madmotor_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_device,read,write)
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_device, read, write)
AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_device, read, write)
AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_byte_r)

View File

@ -129,7 +129,7 @@ static ADDRESS_MAP_START( mayumi_io_map, AS_IO, 8, mayumi_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x30, 0x30) AM_READ_PORT("IN0") AM_WRITE(bank_sel_w)
AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE("i8255", i8255_device, read, write)
AM_RANGE(0xd0, 0xd1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xd0, 0xd1) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END
/*************************************
@ -356,16 +356,13 @@ GFXDECODE_END
*
*************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
};
@ -420,7 +417,7 @@ static MACHINE_CONFIG_START( mayumi, mayumi_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, MCLK/4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)

View File

@ -442,7 +442,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( z80_sound_io_map, AS_IO, 8, megasys1_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END
@ -1640,14 +1640,11 @@ WRITE_LINE_MEMBER(megasys1_state::irqhandler)
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(megasys1_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static MACHINE_CONFIG_START( system_Z, megasys1_state )
@ -1678,7 +1675,8 @@ static MACHINE_CONFIG_START( system_Z, megasys1_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(megasys1_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END

View File

@ -67,7 +67,7 @@ static ADDRESS_MAP_START( metlclsh_master_map, AS_PROGRAM, 8, metlclsh_state )
AM_RANGE(0xc0c3, 0xc0c3) AM_WRITE(metlclsh_ack_nmi) // nmi ack
/**/AM_RANGE(0xc800, 0xc82f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
/**/AM_RANGE(0xcc00, 0xcc2f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xd000, 0xd001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xd000, 0xd001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
/**/AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(metlclsh_fgram_w) AM_SHARE("fgram")
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ym2", ym3526_w )
AM_RANGE(0xe800, 0xe9ff) AM_RAM AM_SHARE("spriteram")

View File

@ -65,8 +65,7 @@ PS4 J8635 PS4 J8541 PS4 J8648
READ8_MEMBER(mexico86_state::kiki_ym2203_r)
{
device_t *device = machine().device("ymsnd");
UINT8 result = ym2203_r(device, space, offset);
UINT8 result = m_ymsnd->read(space, offset);
if (offset == 0)
result &= 0x7f;
@ -100,7 +99,7 @@ static ADDRESS_MAP_START( mexico86_sound_map, AS_PROGRAM, 8, mexico86_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xa7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xa800, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc001) AM_READ(kiki_ym2203_r) AM_DEVWRITE_LEGACY("ymsnd", ym2203_w)
AM_RANGE(0xc000, 0xc001) AM_READ(kiki_ym2203_r) AM_DEVWRITE("ymsnd", ym2203_device, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mexico86_m68705_map, AS_PROGRAM, 8, mexico86_state )
@ -399,16 +398,13 @@ GFXDECODE_END
*
*************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW0"),
DEVCB_INPUT_PORT("DSW1"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW0"),
DEVCB_INPUT_PORT("DSW1"),
DEVCB_NULL,
DEVCB_NULL
};
@ -501,7 +497,7 @@ static MACHINE_CONFIG_START( mexico86, mexico86_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)

View File

@ -82,9 +82,9 @@ static ADDRESS_MAP_START( momoko_sound_map, AS_PROGRAM, 8, momoko_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITENOP /* unknown */
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xb000, 0xb000) AM_WRITENOP /* unknown */
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w)
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
@ -212,16 +212,13 @@ GFXDECODE_END
/****************************************************************************/
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(driver_device, soundlatch_byte_r),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(driver_device, soundlatch_byte_r),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
};
@ -289,7 +286,7 @@ static MACHINE_CONFIG_START( momoko, momoko_state )
MCFG_SOUND_ROUTE(3, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, 1250000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)

View File

@ -105,7 +105,7 @@ static ADDRESS_MAP_START( mosaic_io_map, AS_IO, 8, mosaic_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_WRITENOP /* Z180 internal registers */
AM_RANGE(0x30, 0x30) AM_READNOP /* Z180 internal registers */
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x72, 0x72) AM_READWRITE(protection_r, protection_w)
AM_RANGE(0x74, 0x74) AM_READ_PORT("P1")
AM_RANGE(0x76, 0x76) AM_READ_PORT("P2")
@ -115,7 +115,7 @@ static ADDRESS_MAP_START( gfire2_io_map, AS_IO, 8, mosaic_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_WRITENOP /* Z180 internal registers */
AM_RANGE(0x30, 0x30) AM_READNOP /* Z180 internal registers */
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x72, 0x72) AM_READWRITE(gfire2_protection_r, gfire2_protection_w)
AM_RANGE(0x74, 0x74) AM_READ_PORT("P1")
AM_RANGE(0x76, 0x76) AM_READ_PORT("P2")
@ -232,16 +232,13 @@ GFXDECODE_END
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW"),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW"),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL
};
@ -282,7 +279,7 @@ static MACHINE_CONFIG_START( mosaic, mosaic_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END

View File

@ -563,7 +563,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sexygal_io, AS_IO, 8, nightgal_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00,0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
// AM_RANGE(0x10,0x10) AM_WRITE(output_w)
AM_RANGE(0x10,0x10) AM_READ_PORT("DSWC")
AM_RANGE(0x11,0x11) AM_READ_PORT("SYSA") AM_WRITE(mux_w)

View File

@ -458,8 +458,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ninjakd2_sound_io, AS_IO, 8, ninjakd2_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("2203.1", ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("2203.2", ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("2203.1", ym2203_device, write)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("2203.2", ym2203_device, write)
ADDRESS_MAP_END
@ -870,14 +870,11 @@ WRITE_LINE_MEMBER(ninjakd2_state::irqhandler)
m_soundcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(ninjakd2_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
@ -957,7 +954,8 @@ static MACHINE_CONFIG_START( ninjakd2, ninjakd2_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(ninjakd2_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)

View File

@ -395,7 +395,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tharrier_sound_io_map, AS_IO, 8, nmk16_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END
//Read input port 1 030c8/ BAD
@ -1077,7 +1077,7 @@ WRITE8_MEMBER(nmk16_state::raphero_sound_rombank_w)
static ADDRESS_MAP_START( raphero_sound_mem_map, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xc800, 0xc800) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0xc808, 0xc808) AM_DEVREADWRITE("oki2", okim6295_device, read, write)
AM_RANGE(0xc810, 0xc817) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_w)
@ -1098,7 +1098,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( macross2_sound_io_map, AS_IO, 8, nmk16_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x88, 0x88) AM_DEVREADWRITE("oki2", okim6295_device, read, write)
AM_RANGE(0x90, 0x97) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_w)
@ -3491,29 +3491,16 @@ GFXDECODE_END
static const ym2203_interface ym2203_nmk004_interface =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_LINE(NMK004_irq)
};
WRITE_LINE_MEMBER(nmk16_state::ym2203_irqhandler)
{
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(nmk16_state,ym2203_irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::nmk16_scanline)
@ -3580,7 +3567,8 @@ static MACHINE_CONFIG_START( tharrier, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -3623,7 +3611,8 @@ static MACHINE_CONFIG_START( manybloc, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -3664,7 +3653,8 @@ static MACHINE_CONFIG_START( mustang, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -3739,7 +3729,8 @@ static MACHINE_CONFIG_START( bioship, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -3780,7 +3771,8 @@ static MACHINE_CONFIG_START( vandyke, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -3855,7 +3847,8 @@ static MACHINE_CONFIG_START( acrobatm, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -3930,7 +3923,8 @@ static MACHINE_CONFIG_START( tdragon, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4004,7 +3998,8 @@ static MACHINE_CONFIG_START( strahl, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4046,7 +4041,8 @@ static MACHINE_CONFIG_START( hachamf, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4087,7 +4083,8 @@ static MACHINE_CONFIG_START( macross, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4128,7 +4125,8 @@ static MACHINE_CONFIG_START( blkheart, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8 ) /* verified on pcb */
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4169,7 +4167,8 @@ static MACHINE_CONFIG_START( gunnail, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<NMK004_irq>))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@ -4212,7 +4211,8 @@ static MACHINE_CONFIG_START( macross2, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
@ -4254,7 +4254,8 @@ static MACHINE_CONFIG_START( tdragon2, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
@ -4295,7 +4296,8 @@ static MACHINE_CONFIG_START( raphero, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(nmk16_state, ym2203_irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)

View File

@ -128,7 +128,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pass_sound_io_map, AS_IO, 8, pass_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_byte_r)
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki", okim6295_device, write)
AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_byte_w)
ADDRESS_MAP_END

View File

@ -89,7 +89,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pcktgal_sound_map, AS_PROGRAM, 8, pcktgal_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x1800, 0x1800) AM_WRITE(pcktgal_adpcm_data_w) /* ADPCM data for the MSM5205 chip */
AM_RANGE(0x2000, 0x2000) AM_WRITE(pcktgal_sound_bank_w)

View File

@ -359,14 +359,11 @@ static I8255A_INTERFACE( ppi8255_2_intf )
DEVCB_NULL /* Port C write */
};
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_NULL
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
void pipeline_state::palette_init()
@ -425,7 +422,7 @@ static MACHINE_CONFIG_START( pipeline, pipeline_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 7372800/4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END

View File

@ -126,7 +126,7 @@ static ADDRESS_MAP_START( pkscramble_map, AS_PROGRAM, 16, pkscram_state )
AM_RANGE(0x049018, 0x049019) AM_WRITENOP
AM_RANGE(0x04901c, 0x04901d) AM_WRITENOP
AM_RANGE(0x049020, 0x049021) AM_WRITENOP
AM_RANGE(0x04900c, 0x04900f) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2203_r, ym2203_w, 0x00ff)
AM_RANGE(0x04900c, 0x04900f) AM_DEVREADWRITE8("ymsnd", ym2203_device, read, write, 0x00ff)
AM_RANGE(0x052086, 0x052087) AM_WRITENOP
ADDRESS_MAP_END
@ -277,14 +277,11 @@ WRITE_LINE_MEMBER(pkscram_state::irqhandler)
m_maincpu->set_input_line(2, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(pkscram_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
void pkscram_state::machine_start()
@ -328,7 +325,8 @@ static MACHINE_CONFIG_START( pkscramble, pkscram_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(pkscram_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END

View File

@ -104,7 +104,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pokechmp_sound_map, AS_PROGRAM, 8, pokechmp_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x1800, 0x1800) AM_WRITENOP /* MSM5205 chip on Pocket Gal, not connected here? */
AM_RANGE(0x2000, 0x2000) AM_WRITE(pokechmp_sound_bank_w) /* sound rom bank seems to be replaced with OKI bank */

View File

@ -121,7 +121,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( powerins_sound_io_map, AS_IO, 8, powerins_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym2203", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_device, read, write)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
AM_RANGE(0x88, 0x88) AM_DEVREADWRITE("oki2", okim6295_device, read, write)
AM_RANGE(0x90, 0x97) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_w)
@ -322,14 +322,11 @@ WRITE_LINE_MEMBER(powerins_state::irqhandler)
m_soundcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(powerins_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
};
static const nmk112_interface powerins_nmk112_intf =
@ -372,7 +369,8 @@ static MACHINE_CONFIG_START( powerins, powerins_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(powerins_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MCFG_NMK112_ADD("nmk112", powerins_nmk112_intf)

View File

@ -429,8 +429,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( psychic5_soundport_map, AS_IO, 8, psychic5_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_device, write)
ADDRESS_MAP_END
@ -462,8 +462,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bombsa_soundport_map, AS_IO, 8, psychic5_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
@ -648,14 +648,11 @@ WRITE_LINE_MEMBER(psychic5_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(psychic5_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static MACHINE_CONFIG_START( psychic5, psychic5_state )
@ -690,7 +687,8 @@ static MACHINE_CONFIG_START( psychic5, psychic5_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(psychic5_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -734,7 +732,8 @@ static MACHINE_CONFIG_START( bombsa, psychic5_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(psychic5_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)

View File

@ -166,8 +166,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_io_map, AS_IO, 8, pushman_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_device, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bballs_map, AS_PROGRAM, 16, pushman_state )
@ -383,14 +383,11 @@ WRITE_LINE_MEMBER(pushman_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(pushman_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
};
@ -447,7 +444,8 @@ static MACHINE_CONFIG_START( pushman, pushman_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 2000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(pushman_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, 2000000)
@ -492,7 +490,8 @@ static MACHINE_CONFIG_START( bballs, pushman_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 2000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(pushman_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("ym2", YM2203, 2000000)

View File

@ -63,7 +63,7 @@ static ADDRESS_MAP_START( quizdna_io_map, AS_IO, 8, quizdna_state )
AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE")
AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w)
AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
@ -78,7 +78,7 @@ static ADDRESS_MAP_START( gakupara_io_map, AS_IO, 8, quizdna_state )
AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE")
AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w)
AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
@ -93,7 +93,7 @@ static ADDRESS_MAP_START( gekiretu_io_map, AS_IO, 8, quizdna_state )
AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE")
AM_RANGE(0xc0, 0xc0) AM_WRITE(gekiretu_rombank_w)
AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
@ -427,16 +427,13 @@ static GFXDECODE_START( quizdna )
GFXDECODE_END
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW3"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW3"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
};
@ -465,7 +462,7 @@ static MACHINE_CONFIG_START( quizdna, quizdna_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, MCLK/4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)

View File

@ -400,7 +400,7 @@ static ADDRESS_MAP_START( quizpun2_sound_io_map, AS_IO, 8, quizpun2_state )
AM_RANGE( 0x00, 0x00 ) AM_WRITENOP // IRQ end
AM_RANGE( 0x20, 0x20 ) AM_WRITENOP // NMI end
AM_RANGE( 0x40, 0x40 ) AM_READ(soundlatch_byte_r )
AM_RANGE( 0x60, 0x61 ) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w )
AM_RANGE( 0x60, 0x61 ) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write )
ADDRESS_MAP_END

View File

@ -418,8 +418,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jumping_sound_map, AS_PROGRAM, 8, rbisland_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xb400, 0xb401) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w)
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xb400, 0xb401) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
AM_RANGE(0xb800, 0xb800) AM_READ(jumping_latch_r)
AM_RANGE(0xbc00, 0xbc00) AM_WRITENOP /* looks like a bankswitch, but sound works with or without it */
AM_RANGE(0xc000, 0xffff) AM_ROM

View File

@ -323,7 +323,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sandscrp_soundport, AS_IO, 8, sandscrp_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sandscrp_bankswitch_w) // ROM Bank
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) // PORTA/B read
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) // PORTA/B read
AM_RANGE(0x04, 0x04) AM_DEVWRITE("oki", okim6295_device, write) // OKIM6295
AM_RANGE(0x06, 0x06) AM_WRITE(sandscrp_soundlatch_w) //
AM_RANGE(0x07, 0x07) AM_READ(sandscrp_soundlatch_r) //
@ -468,17 +468,14 @@ WRITE_LINE_MEMBER(sandscrp_state::irqhandler)
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_intf_sandscrp =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"), /* Port A Read */
DEVCB_INPUT_PORT("DSW2"), /* Port B Read */
DEVCB_NULL, /* Port A Write */
DEVCB_NULL, /* Port B Write */
},
DEVCB_DRIVER_LINE_MEMBER(sandscrp_state,irqhandler) /* IRQ handler */
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"), /* Port A Read */
DEVCB_INPUT_PORT("DSW2"), /* Port B Read */
DEVCB_NULL, /* Port A Write */
DEVCB_NULL, /* Port B Write */
};
@ -532,7 +529,8 @@ static MACHINE_CONFIG_START( sandscrp, sandscrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_intf_sandscrp)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(sandscrp_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END

View File

@ -89,7 +89,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( scotrsht_sound_port, AS_IO, 8, scotrsht_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END

View File

@ -520,7 +520,7 @@ static ADDRESS_MAP_START( sound_map_2203, AS_PROGRAM, 8, segahang_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x0800) AM_RAM
AM_RANGE(0xd000, 0xd001) AM_MIRROR(0x0ffe) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xd000, 0xd001) AM_MIRROR(0x0ffe) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xe000, 0xe0ff) AM_MIRROR(0x0f00) AM_DEVREADWRITE("pcm", segapcm_device, sega_pcm_r, sega_pcm_w)
ADDRESS_MAP_END
@ -547,9 +547,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_portmap_2203x2, AS_IO, 8, segahang_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
AM_RANGE(0xc0, 0xc1) AM_MIRROR(0x3e) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
AM_RANGE(0xc0, 0xc1) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
@ -802,14 +802,11 @@ INPUT_PORTS_END
// SOUND CONFIGURATIONS
//**************************************************************************
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(segahang_state, sound_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static const sega_pcm_interface segapcm_interface =
@ -899,7 +896,8 @@ static MACHINE_CONFIG_FRAGMENT( sound_board_2203 )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK_8MHz/2)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(segahang_state, sound_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.13)
@ -927,7 +925,8 @@ static MACHINE_CONFIG_FRAGMENT( sound_board_2203x2 )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(segahang_state, sound_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.13)

View File

@ -3091,7 +3091,7 @@ static ADDRESS_MAP_START( tndrcade_sub_map, AS_PROGRAM, 8, seta_state )
AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w) // ROM Bank + Coin Lockout
AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2") // P2
AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0x3000, 0x3001) AM_DEVWRITE_LEGACY("ym2", ym3812_w)
AM_RANGE(0x5000, 0x57ff) AM_RAM AM_SHARE("sharedram") // Shared RAM
AM_RANGE(0x6000, 0x7fff) AM_ROM // ROM
@ -7439,16 +7439,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::seta_sub_interrupt)
Thundercade
***************************************************************************/
static const ym2203_interface tndrcade_ym2203_interface =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(seta_state,dsw1_r), /* input A: DSW 1 */
DEVCB_DRIVER_MEMBER(seta_state,dsw2_r), /* input B: DSW 2 */
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_DRIVER_MEMBER(seta_state,dsw1_r), /* input A: DSW 1 */
DEVCB_DRIVER_MEMBER(seta_state,dsw2_r), /* input B: DSW 2 */
DEVCB_NULL,
DEVCB_NULL
};
@ -7494,7 +7491,7 @@ static MACHINE_CONFIG_START( tndrcade, seta_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */
MCFG_SOUND_CONFIG(tndrcade_ym2203_interface)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)

View File

@ -356,7 +356,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sfkick_sound_io_map, AS_IO, 8, sfkick_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_byte_r)
AM_RANGE(0x04, 0x05) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x04, 0x05) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
ADDRESS_MAP_END
WRITE8_MEMBER(sfkick_state::ppi_port_c_w)
@ -466,14 +466,11 @@ WRITE_LINE_MEMBER(sfkick_state::irqhandler)
m_soundcpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xff);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,DEVCB_NULL,DEVCB_NULL,DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(sfkick_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,DEVCB_NULL,DEVCB_NULL,DEVCB_NULL,
};
static MACHINE_CONFIG_START( sfkick, sfkick_state )
@ -508,7 +505,8 @@ static MACHINE_CONFIG_START( sfkick, sfkick_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/6)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(sfkick_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)

View File

@ -157,7 +157,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( shanghai_portmap, AS_IO, 16, shanghai_state )
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("hd63484", hd63484_status_r, hd63484_address_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE_LEGACY("hd63484", hd63484_data_r, hd63484_data_w)
AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2203_r, ym2203_w, 0x00ff)
AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8("ymsnd", ym2203_device, read, write, 0x00ff)
AM_RANGE(0x40, 0x41) AM_READ_PORT("P1")
AM_RANGE(0x44, 0x45) AM_READ_PORT("P2")
AM_RANGE(0x48, 0x49) AM_READ_PORT("SYSTEM")
@ -171,7 +171,7 @@ static ADDRESS_MAP_START( shangha2_portmap, AS_IO, 16, shanghai_state )
AM_RANGE(0x20, 0x21) AM_READ_PORT("SYSTEM")
AM_RANGE(0x30, 0x31) AM_DEVREADWRITE_LEGACY("hd63484", hd63484_status_r, hd63484_address_w)
AM_RANGE(0x32, 0x33) AM_DEVREADWRITE_LEGACY("hd63484", hd63484_data_r, hd63484_data_w)
AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2203_r, ym2203_w, 0x00ff)
AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("ymsnd", ym2203_device, read, write, 0x00ff)
AM_RANGE(0x50, 0x51) AM_WRITE(shanghai_coin_w)
ADDRESS_MAP_END
@ -416,29 +416,23 @@ INPUT_PORTS_END
static const ym2203_interface sh_ym2203_interface =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
},
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW1"),
DEVCB_INPUT_PORT("DSW2"),
DEVCB_NULL,
DEVCB_NULL
};
static const ym2203_interface kothello_ym2203_interface =
static const ay8910_interface kothello_ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW"),
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_LINE(seibu_ym2203_irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSW"),
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static const hd63484_interface shanghai_hd63484_intf = { 0 };
@ -468,7 +462,7 @@ static MACHINE_CONFIG_START( shanghai, shanghai_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
MCFG_SOUND_CONFIG(sh_ym2203_interface)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -500,7 +494,7 @@ static MACHINE_CONFIG_START( shangha2, shanghai_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
MCFG_SOUND_CONFIG(sh_ym2203_interface)
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -538,7 +532,8 @@ static MACHINE_CONFIG_START( kothello, shanghai_state )
/* same as standard seibu ym2203, but "ym1" also reads "DSW" */
MCFG_SOUND_ADD("ym1", YM2203, 14318180/4)
MCFG_SOUND_CONFIG(kothello_ym2203_interface)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<seibu_ym2203_irqhandler>))
MCFG_YM2203_AY8910_INTF(&kothello_ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("ym2", YM2203, 14318180/4)

View File

@ -87,7 +87,7 @@ static ADDRESS_MAP_START( shootouj_map, AS_PROGRAM, 8, shootout_state )
AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW2")
AM_RANGE(0x1800, 0x1800) AM_WRITE(shootout_coin_counter_w)
AM_RANGE(0x2000, 0x21ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(shootout_textram_w) AM_SHARE("textram")
AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(shootout_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
@ -99,7 +99,7 @@ ADDRESS_MAP_END
/* same as Tryout */
static ADDRESS_MAP_START( shootout_sound_map, AS_PROGRAM, 8, shootout_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r)
AM_RANGE(0xc000, 0xffff) AM_ROM
AM_RANGE(0xd000, 0xd000) AM_WRITENOP // unknown, NOT irq/nmi mask
@ -239,27 +239,21 @@ WRITE_LINE_MEMBER(shootout_state::shootout_snd2_irq)
m_maincpu->set_input_line(0, state);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(shootout_state,shootout_snd_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static const ym2203_interface ym2203_interface2 =
static const ay8910_interface ay8910_config2 =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(shootout_state, shootout_bankswitch_w),
DEVCB_DRIVER_MEMBER(shootout_state, shootout_flipscreen_w)
},
DEVCB_DRIVER_LINE_MEMBER(shootout_state,shootout_snd2_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(shootout_state, shootout_bankswitch_w),
DEVCB_DRIVER_MEMBER(shootout_state, shootout_flipscreen_w)
};
static MACHINE_CONFIG_START( shootout, shootout_state )
@ -287,7 +281,8 @@ static MACHINE_CONFIG_START( shootout, shootout_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(shootout_state, shootout_snd_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@ -314,7 +309,8 @@ static MACHINE_CONFIG_START( shootouj, shootout_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_CONFIG(ym2203_interface2)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(shootout_state, shootout_snd2_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END

View File

@ -114,8 +114,8 @@ static ADDRESS_MAP_START( sidearms_sound_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_byte_r)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w)
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym1", ym2203_device, read, write)
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
/* Whizz */
@ -594,14 +594,11 @@ WRITE_LINE_MEMBER( sidearms_state::irqhandler )
m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(sidearms_state, irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL,
};
static MACHINE_CONFIG_START( sidearms, sidearms_state )
@ -633,7 +630,8 @@ static MACHINE_CONFIG_START( sidearms, sidearms_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(sidearms_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@ -675,7 +673,8 @@ static MACHINE_CONFIG_START( turtship, sidearms_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(sidearms_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)

View File

@ -245,7 +245,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, sidepckt_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE_LEGACY("ym2", ym3526_w)
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_byte_r)
AM_RANGE(0x8000, 0xffff) AM_ROM

View File

@ -67,9 +67,9 @@ static ADDRESS_MAP_START( skyfox_sound_map, AS_PROGRAM, 8, skyfox_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM // RAM
// AM_RANGE(0x9000, 0x9001) AM_WRITENOP // ??
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w) // YM2203 #1
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym1", ym2203_device, read, write) // YM2203 #1
// AM_RANGE(0xb000, 0xb001) AM_WRITENOP // ??
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r,ym2203_w) // YM2203 #2
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym2", ym2203_device, read, write) // YM2203 #2
AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_byte_r) // From Main CPU
ADDRESS_MAP_END

View File

@ -165,7 +165,7 @@ static ADDRESS_MAP_START( maincpu_io_map, AS_IO, 8, sothello_state )
AM_RANGE( 0x33, 0x33) AM_READ(soundcpu_status_r)
AM_RANGE( 0x40, 0x4f) AM_WRITE(soundlatch_byte_w)
AM_RANGE( 0x50, 0x50) AM_WRITE(bank_w)
AM_RANGE( 0x60, 0x61) AM_MIRROR(0x02) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE( 0x60, 0x61) AM_MIRROR(0x02) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
/* not sure, but the A1 line is ignored, code @ $8b8 */
AM_RANGE( 0x70, 0x73) AM_DEVREADWRITE( "v9938", v9938_device, read, write )
ADDRESS_MAP_END
@ -351,17 +351,14 @@ void sothello_state::machine_reset()
{
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSWA"),
DEVCB_INPUT_PORT("DSWB"),
DEVCB_NULL,
DEVCB_NULL,
},
DEVCB_DRIVER_LINE_MEMBER(sothello_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("DSWA"),
DEVCB_INPUT_PORT("DSWB"),
DEVCB_NULL,
DEVCB_NULL,
};
static MACHINE_CONFIG_START( sothello, sothello_state )
@ -398,7 +395,8 @@ static MACHINE_CONFIG_START( sothello, sothello_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, YM_CLOCK)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(sothello_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)

View File

@ -194,7 +194,7 @@ READ8_MEMBER(splash_state::roldfrog_unk_r)
static ADDRESS_MAP_START( roldfrog_sound_io_map, AS_IO, 8, splash_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x40, 0x40) AM_NOP
AM_RANGE(0x31, 0x31) AM_WRITE(sound_bank_w)
AM_RANGE(0x37, 0x37) AM_WRITE(roldfrog_vblank_ack_w )
@ -520,15 +520,12 @@ static MACHINE_CONFIG_START( splash, splash_state )
MACHINE_CONFIG_END
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL,
DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(splash_state,ym_irq)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL,
DEVCB_NULL, DEVCB_NULL
};
INTERRUPT_GEN_MEMBER(splash_state::roldfrog_interrupt)
@ -568,7 +565,8 @@ static MACHINE_CONFIG_START( roldfrog, splash_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz / 8)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(splash_state, ym_irq))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)

View File

@ -99,8 +99,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( srumbler_sound_map, AS_PROGRAM, 8, srumbler_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE_LEGACY("ym1", ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE_LEGACY("ym2", ym2203_w)
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym1", ym2203_device, write)
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym2", ym2203_device, write)
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END

View File

@ -227,7 +227,7 @@ WRITE8_MEMBER(sshangha_state::sshangha_sound_shared_w)
/* Note: there's rom data after 0x8000 but the game never seem to call a rom bank, left-over? */
static ADDRESS_MAP_START( sshangha_sound_map, AS_PROGRAM, 8, sshangha_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0xc200, 0xc201) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0xf800, 0xf807) AM_READWRITE(sshangha_sound_shared_r,sshangha_sound_shared_w)
AM_RANGE(0xf808, 0xffff) AM_RAM
@ -360,14 +360,11 @@ WRITE_LINE_MEMBER(sshangha_state::irqhandler)
m_audiocpu->set_input_line(0, state);
}
static const ym2203_interface ym2203_config =
static const ay8910_interface ay8910_config =
{
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
},
DEVCB_DRIVER_LINE_MEMBER(sshangha_state,irqhandler)
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
};
static int sshangha_bank_callback( int bank )
@ -426,7 +423,8 @@ static MACHINE_CONFIG_START( sshangha, sshangha_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* sure it's stereo? */
MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(sshangha_state, irqhandler))
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)

Some files were not shown because too many files have changed in this diff Show More