diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp index cfbf2fcd326..30ac0b04fdc 100644 --- a/src/devices/bus/coco/cococart.cpp +++ b/src/devices/bus/coco/cococart.cpp @@ -82,7 +82,6 @@ cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const m_nmi_callback(*this), m_halt_callback(*this), m_cart(nullptr) { - set_default_clock(DERIVED_CLOCK(1, 1)); } diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index 9040030d8fa..5ff0aab0b68 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -404,7 +404,7 @@ MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("d8253", pit8253_device, write_clk1)) MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright") - MCFG_YM2151_ADD("ym2151", XTAL(4'000'000)) + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(4'000'000)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, ibm_mfc_ym_irq)) MCFG_SOUND_ROUTE(0, "ymleft", 1.00) MCFG_SOUND_ROUTE(1, "ymright", 1.00) diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp index ef1d807751e..27d014aa61f 100644 --- a/src/devices/bus/msx_cart/yamaha.cpp +++ b/src/devices/bus/msx_cart/yamaha.cpp @@ -52,7 +52,7 @@ MACHINE_CONFIG_START(msx_cart_sfg_device::device_add_mconfig) // YM2148 (MKS) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, msx_cart_sfg_device, ym2151_irq_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp index 242af9b152e..5556dcba3e9 100644 --- a/src/devices/bus/vic20/exp.cpp +++ b/src/devices/bus/vic20/exp.cpp @@ -66,7 +66,6 @@ vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &m m_write_res(*this), m_card(nullptr) { - set_default_clock(DERIVED_CLOCK(1, 1)); } diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h index 3418d8b852f..4ce38d32a9e 100644 --- a/src/devices/machine/74153.h +++ b/src/devices/machine/74153.h @@ -29,9 +29,6 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_TTL153_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL153, 0) - #define MCFG_TTL153_ZA_CB(_devcb) \ devcb = &downcast(*device).set_za_callback(DEVCB_##_devcb); @@ -47,7 +44,7 @@ class ttl153_device : public device_t { public: // construction/destruction - ttl153_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl153_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // configuration template devcb_base &set_za_callback(Object &&cb) { return m_za_cb.set_callback(std::forward(cb)); } diff --git a/src/devices/machine/74161.h b/src/devices/machine/74161.h index 9ba767af9ad..8428411c05b 100644 --- a/src/devices/machine/74161.h +++ b/src/devices/machine/74161.h @@ -76,18 +76,6 @@ #define MCFG_7416x_TC_CB(_devcb) \ devcb = &downcast(*device).set_tc_cb(DEVCB_##_devcb); -#define MCFG_74160_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74160, 0) - -#define MCFG_74161_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74161, 0) - -#define MCFG_74162_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74162, 0) - -#define MCFG_74163_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74163, 0) - class ttl7416x_device : public device_t { public: @@ -154,25 +142,25 @@ private: class ttl74160_device : public ttl7416x_device { public: - ttl74160_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74160_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; class ttl74161_device : public ttl7416x_device { public: - ttl74161_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74161_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; class ttl74162_device : public ttl7416x_device { public: - ttl74162_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74162_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; class ttl74163_device : public ttl7416x_device { public: - ttl74163_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74163_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; // device type definition diff --git a/src/devices/machine/74165.h b/src/devices/machine/74165.h index f59d69e25dd..8b608760572 100644 --- a/src/devices/machine/74165.h +++ b/src/devices/machine/74165.h @@ -30,9 +30,6 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_TTL165_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL165, 0) - #define MCFG_TTL165_DATA_CB(_devcb) \ devcb = &downcast(*device).set_data_callback(DEVCB_##_devcb); @@ -48,7 +45,7 @@ class ttl165_device : public device_t { public: // construction/destruction - ttl165_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl165_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // configuration template devcb_base &set_data_callback(Object &&cb) diff --git a/src/devices/machine/74166.h b/src/devices/machine/74166.h index d1a240084ad..77497b1be5e 100644 --- a/src/devices/machine/74166.h +++ b/src/devices/machine/74166.h @@ -30,9 +30,6 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_TTL166_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL166, 0) - #define MCFG_TTL166_DATA_CB(_devcb) \ devcb = &downcast(*device).set_data_callback(DEVCB_##_devcb); @@ -48,7 +45,7 @@ class ttl166_device : public device_t { public: // construction/destruction - ttl166_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl166_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // configuration template devcb_base &set_data_callback(Object &&cb) { return m_data_cb.set_callback(std::forward(cb)); } diff --git a/src/devices/machine/74175.h b/src/devices/machine/74175.h index fb0c68bbeda..e8f17a5ecbb 100644 --- a/src/devices/machine/74175.h +++ b/src/devices/machine/74175.h @@ -90,11 +90,6 @@ #define MCFG_74175_NOT_Q4_CB(_devcb) \ devcb = &downcast(*device).set_not_q1_cb(DEVCB_##_devcb); -#define MCFG_74174_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74174, 0) - -#define MCFG_74175_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74175, 0) class ttl741745_device : public device_t { @@ -144,7 +139,7 @@ protected: class ttl74174_device : public ttl741745_device { public: - ttl74174_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74174_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); template devcb_base &set_q5_cb(Object &&cb) { return m_q5_func.set_callback(std::forward(cb)); } template devcb_base &set_q6_cb(Object &&cb) { return m_q6_func.set_callback(std::forward(cb)); } @@ -172,7 +167,7 @@ private: class ttl74175_device : public ttl741745_device { public: - ttl74175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); template devcb_base &set_not_q1_cb(Object &&cb) { return m_not_q1_func.set_callback(std::forward(cb)); } template devcb_base &set_not_q2_cb(Object &&cb) { return m_not_q2_func.set_callback(std::forward(cb)); } diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h index 67ba714eacf..40a55abc042 100644 --- a/src/devices/machine/74181.h +++ b/src/devices/machine/74181.h @@ -14,14 +14,6 @@ #pragma once - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_TTL74181_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TTL74181, 0) - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -32,7 +24,7 @@ class ttl74181_device : public device_t { public: // construction/destruction - ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // inputs void input_a_w(uint8_t data); diff --git a/src/devices/sound/315-5641.cpp b/src/devices/sound/315-5641.cpp index f45f3071ae7..10ab5502691 100644 --- a/src/devices/sound/315-5641.cpp +++ b/src/devices/sound/315-5641.cpp @@ -8,38 +8,38 @@ DEFINE_DEVICE_TYPE(SEGA_315_5641_PCM, sega_315_5641_pcm_device, "315_5641_pcm", "Sega 315-5641 PCM") sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : upd7759_device(mconfig, SEGA_315_5641_PCM, tag, owner, clock), m_fifo_read(0), m_fifo_write(0) + : upd7756_device(mconfig, SEGA_315_5641_PCM, tag, owner, clock), m_fifo_read(0), m_fifo_write(0) { } void sega_315_5641_pcm_device::device_start() { + upd7756_device::device_start(); + save_item(NAME(m_fifo_data), 0x40); save_item(NAME(m_fifo_read)); save_item(NAME(m_fifo_write)); - - upd7759_device::device_start(); } void sega_315_5641_pcm_device::advance_state() { switch (m_state) { - case STATE_DROP_DRQ: - if (m_rombase == nullptr) + case STATE_DROP_DRQ: + if (m_rombase == nullptr) + { + // Slave Mode: get data from FIFO buffer + uint8_t fiforead = (m_fifo_read + 1) & 0x3F; + if (fiforead != m_fifo_write) { - // Slave Mode: get data from FIFO buffer - uint8_t fiforead = (m_fifo_read + 1) & 0x3F; - if (fiforead != m_fifo_write) - { - m_fifo_in = m_fifo_data[fiforead]; - m_fifo_read = fiforead; - } + m_fifo_in = m_fifo_data[fiforead]; + m_fifo_read = fiforead; } - break; + } + break; } - upd775x_device::advance_state(); + upd7756_device::advance_state(); } @@ -47,7 +47,7 @@ WRITE8_MEMBER( sega_315_5641_pcm_device::port_w ) { if (m_rombase != nullptr) { - /* update the FIFO value */ + // update the FIFO value m_fifo_in = data; } else @@ -65,8 +65,8 @@ uint8_t sega_315_5641_pcm_device::get_fifo_space() void sega_315_5641_pcm_device::device_reset() { + upd7756_device::device_reset(); + m_fifo_read = 0x3F; m_fifo_write = 0x00; - - upd775x_device::device_reset(); } diff --git a/src/devices/sound/315-5641.h b/src/devices/sound/315-5641.h index 700fcaccaa2..1419e83d961 100644 --- a/src/devices/sound/315-5641.h +++ b/src/devices/sound/315-5641.h @@ -13,7 +13,7 @@ #include "upd7759.h" -class sega_315_5641_pcm_device : public upd7759_device +class sega_315_5641_pcm_device : public upd7756_device { public: sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -27,7 +27,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - void advance_state() override; + virtual void advance_state() override; uint8_t m_fifo_data[0x40]; uint8_t m_fifo_read; // last read offset (will read in m_fifo_read+1) diff --git a/src/devices/sound/segapcm.h b/src/devices/sound/segapcm.h index fd2847a0f67..3d4004d7814 100644 --- a/src/devices/sound/segapcm.h +++ b/src/devices/sound/segapcm.h @@ -14,12 +14,6 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_SEGAPCM_ADD(tag, clock) \ - MCFG_DEVICE_ADD((tag), SEGAPCM, (clock)) - -#define MCFG_SEGAPCM_REPLACE(tag, clock) \ - MCFG_DEVICE_REPLACE((tag), SEGAPCM, (clock)) - #define MCFG_SEGAPCM_BANK(bank) \ downcast(*device).set_bank((segapcm_device::bank)); diff --git a/src/devices/sound/snkwave.h b/src/devices/sound/snkwave.h index b05f483139d..6f07bca26af 100644 --- a/src/devices/sound/snkwave.h +++ b/src/devices/sound/snkwave.h @@ -5,15 +5,6 @@ #pragma once -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_SNKWAVE_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, SNKWAVE, _clock) -#define MCFG_SNKWAVE_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, SNKWAVE, _clock) - //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp index ad046d3382e..5c20e7c13da 100644 --- a/src/devices/sound/upd7759.cpp +++ b/src/devices/sound/upd7759.cpp @@ -174,7 +174,6 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, , m_rom(nullptr) , m_romoffset(0) , m_rommask(0) - , m_drqcallback(*this) { } @@ -188,6 +187,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, d upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : upd775x_device(mconfig, type, tag, owner, clock) + , m_drqcallback(*this) , m_timer(nullptr) { } @@ -196,7 +196,12 @@ upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, DEFINE_DEVICE_TYPE(UPD7756, upd7756_device, "upd7756", "NEC uPD7756") upd7756_device::upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : upd775x_device(mconfig, UPD7756, tag, owner, clock) + : upd7756_device(mconfig, UPD7756, tag, owner, clock) +{ +} + +upd7756_device::upd7756_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) + : upd775x_device(mconfig, type, tag, owner, clock) { } @@ -206,58 +211,41 @@ upd7756_device::upd7756_device(const machine_config &mconfig, const char *tag, d void upd775x_device::device_start() { -} + // chip configuration + m_sample_offset_shift = 0; -void upd7759_device::device_start() -{ - m_drqcallback.resolve_safe(); - - /* chip configuration */ - m_sample_offset_shift = (type() == UPD7759) ? 1 : 0; - - /* allocate a stream channel */ + // allocate a stream channel m_channel = machine().sound().stream_alloc(*this, 0, 1, clock()/4); - /* compute the stepping rate based on the chip's clock speed */ + // compute the stepping rate based on the chip's clock speed m_step = 4 * FRAC_ONE; - /* compute the clock period */ + // compute the clock period m_clock_period = attotime::from_hz(clock()); - /* set the intial state */ + // set the intial state m_state = STATE_IDLE; - /* compute the ROM base or allocate a timer */ + // compute the ROM base or allocate a timer m_romoffset = 0; m_rom = m_rombase; - if (m_rombase != nullptr) + if (m_rombase) { - uint32_t romsize = m_rombase.bytes(); + uint32_t const romsize = m_rombase.bytes(); if (romsize >= 0x20000) - { m_rommask = 0x1ffff; - } else - { m_rommask = romsize - 1; - } - - m_drqcallback.set_callback(DEVCB_NOOP); } else { - assert(type() == UPD7759); // other chips do not support slave mode - m_timer = timer_alloc(TIMER_SLAVE_UPDATE); m_rommask = 0; } - /* assume /RESET and /START are both high */ + // assume /RESET and /START are both high m_reset = 1; m_start = 1; - /* toggle the reset line to finish the reset */ - device_reset(); - save_item(NAME(m_pos)); save_item(NAME(m_step)); @@ -285,86 +273,34 @@ void upd7759_device::device_start() save_item(NAME(m_sample)); save_item(NAME(m_romoffset)); - machine().save().register_postload(save_prepost_delegate(FUNC(upd7759_device::postload), this)); +} + +void upd7759_device::device_start() +{ + upd775x_device::device_start(); + + // chip configuration + m_sample_offset_shift = 1; + + // alloate a timer + if (m_rombase) + m_drqcallback.reset(); + else + m_timer = timer_alloc(TIMER_SLAVE_UPDATE); + + m_drqcallback.resolve_safe(); + + // toggle the reset line to finish the reset + device_reset(); } void upd7756_device::device_start() { - m_drqcallback.resolve_safe(); + upd775x_device::device_start(); - /* chip configuration */ - m_sample_offset_shift = (type() == UPD7759) ? 1 : 0; - - /* allocate a stream channel */ - m_channel = machine().sound().stream_alloc(*this, 0, 1, clock()/4); - - /* compute the stepping rate based on the chip's clock speed */ - m_step = 4 * FRAC_ONE; - - /* compute the clock period */ - m_clock_period = attotime::from_hz(clock()); - - /* set the intial state */ - m_state = STATE_IDLE; - - /* compute the ROM base or allocate a timer */ - m_romoffset = 0; - m_rom = m_rombase; - if (m_rombase != nullptr) - { - uint32_t romsize = m_rombase.bytes(); - if (romsize >= 0x20000) - { - m_rommask = 0x1ffff; - } - else - { - m_rommask = romsize - 1; - } - - m_drqcallback.set_callback(DEVCB_NOOP); - } - else - { - m_rommask = 0; - } - - /* assume /RESET and /START are both high */ - m_reset = 1; - m_start = 1; - - /* toggle the reset line to finish the reset */ + // toggle the reset line to finish the reset device_reset(); - - save_item(NAME(m_pos)); - save_item(NAME(m_step)); - - save_item(NAME(m_fifo_in)); - save_item(NAME(m_reset)); - save_item(NAME(m_start)); - save_item(NAME(m_drq)); - - save_item(NAME(m_state)); - save_item(NAME(m_clocks_left)); - save_item(NAME(m_nibbles_left)); - save_item(NAME(m_repeat_count)); - save_item(NAME(m_post_drq_state)); - save_item(NAME(m_post_drq_clocks)); - save_item(NAME(m_req_sample)); - save_item(NAME(m_last_sample)); - save_item(NAME(m_block_header)); - save_item(NAME(m_sample_rate)); - save_item(NAME(m_first_valid_header)); - save_item(NAME(m_offset)); - save_item(NAME(m_repeat_offset)); - - save_item(NAME(m_adpcm_state)); - save_item(NAME(m_adpcm_data)); - save_item(NAME(m_sample)); - - save_item(NAME(m_romoffset)); - machine().save().register_postload(save_prepost_delegate(FUNC(upd7759_device::postload), this)); } //------------------------------------------------- @@ -373,58 +309,36 @@ void upd7756_device::device_start() void upd775x_device::device_reset() { + m_pos = 0; + m_fifo_in = 0; + m_drq = 0; + m_state = STATE_IDLE; + m_clocks_left = 0; + m_nibbles_left = 0; + m_repeat_count = 0; + m_post_drq_state = STATE_IDLE; + m_post_drq_clocks = 0; + m_req_sample = 0; + m_last_sample = 0; + m_block_header = 0; + m_sample_rate = 0; + m_first_valid_header = 0; + m_offset = 0; + m_repeat_offset = 0; + m_adpcm_state = 0; + m_adpcm_data = 0; + m_sample = 0; } void upd7759_device::device_reset() { - m_pos = 0; - m_fifo_in = 0; - m_drq = 0; - m_state = STATE_IDLE; - m_clocks_left = 0; - m_nibbles_left = 0; - m_repeat_count = 0; - m_post_drq_state = STATE_IDLE; - m_post_drq_clocks = 0; - m_req_sample = 0; - m_last_sample = 0; - m_block_header = 0; - m_sample_rate = 0; - m_first_valid_header = 0; - m_offset = 0; - m_repeat_offset = 0; - m_adpcm_state = 0; - m_adpcm_data = 0; - m_sample = 0; + upd775x_device::device_reset(); - /* turn off any timer */ + // turn off any timer if (m_timer) m_timer->adjust(attotime::never); } -void upd7756_device::device_reset() -{ - m_pos = 0; - m_fifo_in = 0; - m_drq = 0; - m_state = STATE_IDLE; - m_clocks_left = 0; - m_nibbles_left = 0; - m_repeat_count = 0; - m_post_drq_state = STATE_IDLE; - m_post_drq_clocks = 0; - m_req_sample = 0; - m_last_sample = 0; - m_block_header = 0; - m_sample_rate = 0; - m_first_valid_header = 0; - m_offset = 0; - m_repeat_offset = 0; - m_adpcm_state = 0; - m_adpcm_data = 0; - m_sample = 0; -} - /************************************************************ @@ -728,12 +642,10 @@ void upd7759_device::device_timer(emu_timer &timer, device_timer_id id, int para *************************************************************/ -void upd775x_device::postload() +void upd775x_device::device_post_load() { if (m_rombase) - { m_rom = m_rombase + m_romoffset; - } } /************************************************************ @@ -877,13 +789,3 @@ void upd775x_device::sound_stream_update(sound_stream &stream, stream_sample_t * m_clocks_left = clocks_left; m_pos = pos; } - -void upd7759_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) -{ - upd775x_device::sound_stream_update(stream, inputs, outputs, samples); -} - -void upd7756_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) -{ - upd775x_device::sound_stream_update(stream, inputs, outputs, samples); -} diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h index 419365fc9e3..6c41e4b0f43 100644 --- a/src/devices/sound/upd7759.h +++ b/src/devices/sound/upd7759.h @@ -18,14 +18,11 @@ class upd775x_device : public device_t, public device_sound_interface public: enum : u32 { STANDARD_CLOCK = 640'000 }; - template devcb_base &set_drq_callback(Object &&cb) { return m_drqcallback.set_callback(std::forward(cb)); } - void set_bank_base(offs_t base); DECLARE_WRITE_LINE_MEMBER( reset_w ); DECLARE_READ_LINE_MEMBER( busy_r ); virtual DECLARE_WRITE8_MEMBER( port_w ); - void postload(); protected: // chip states @@ -51,6 +48,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + virtual void device_post_load() override; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; @@ -100,13 +98,13 @@ protected: uint8_t * m_rom; /* pointer to ROM data or nullptr for slave mode */ uint32_t m_romoffset; /* ROM offset to make save/restore easier */ uint32_t m_rommask; /* maximum address offset */ - - devcb_write_line m_drqcallback; }; class upd7759_device : public upd775x_device { public: + template devcb_base &set_drq_callback(Object &&cb) { return m_drqcallback.set_callback(std::forward(cb)); } + upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = STANDARD_CLOCK); DECLARE_WRITE_LINE_MEMBER( start_w ); @@ -122,8 +120,8 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; + devcb_write_line m_drqcallback; emu_timer *m_timer; }; @@ -135,9 +133,9 @@ public: DECLARE_WRITE_LINE_MEMBER( start_w ); protected: + upd7756_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + virtual void device_start() override; - virtual void device_reset() override; - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; }; DECLARE_DEVICE_TYPE(UPD7759, upd7759_device) @@ -146,7 +144,4 @@ DECLARE_DEVICE_TYPE(UPD7756, upd7756_device) #define MCFG_UPD7759_DRQ_CALLBACK(_write) \ devcb = &downcast(*device).set_drq_callback(DEVCB_##_write); -#define MCFG_UPD7756_DRQ_CALLBACK(_write) \ - devcb = &downcast(*device).set_drq_callback(DEVCB_##_write); - #endif // MAME_SOUND_UPD7759_H diff --git a/src/devices/sound/vrc6.h b/src/devices/sound/vrc6.h index 7e1e72fdddf..dbcd5152c3b 100644 --- a/src/devices/sound/vrc6.h +++ b/src/devices/sound/vrc6.h @@ -12,16 +12,6 @@ #pragma once -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_VRC6_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, VRC6, _clock) - -#define MCFG_VRC6_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, VRC6, _clock) - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/devices/sound/ym2151.h b/src/devices/sound/ym2151.h index 989607bbf62..0aba974025f 100644 --- a/src/devices/sound/ym2151.h +++ b/src/devices/sound/ym2151.h @@ -40,9 +40,6 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_YM2151_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, YM2151, _clock) - #define MCFG_YM2151_IRQ_HANDLER(_devcb) \ devcb = &downcast(*device).set_irq_handler(DEVCB_##_devcb); #define MCFG_YM2151_PORT_WRITE_HANDLER(_devcb) \ diff --git a/src/devices/sound/ymz770.h b/src/devices/sound/ymz770.h index cd0dfe1e11d..22e20e1817b 100644 --- a/src/devices/sound/ymz770.h +++ b/src/devices/sound/ymz770.h @@ -11,22 +11,6 @@ #pragma once -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_YMZ770_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, YMZ770, _clock) - -#define MCFG_YMZ770_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, YMZ770, _clock) - -#define MCFG_YMZ774_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, YMZ774, _clock) - -#define MCFG_YMZ774_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, YMZ774, _clock) - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/devices/video/bufsprite.h b/src/devices/video/bufsprite.h index 995f0894eaf..d967b51c4b2 100644 --- a/src/devices/video/bufsprite.h +++ b/src/devices/video/bufsprite.h @@ -27,20 +27,6 @@ DECLARE_DEVICE_TYPE(BUFFERED_SPRITERAM64, buffered_spriteram64_device) -//************************************************************************** -// DEVICE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_BUFFERED_SPRITERAM8_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM8, 0) -#define MCFG_BUFFERED_SPRITERAM16_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM16, 0) -#define MCFG_BUFFERED_SPRITERAM32_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM32, 0) -#define MCFG_BUFFERED_SPRITERAM64_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM64, 0) - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -98,7 +84,7 @@ class buffered_spriteram8_device : public buffered_spriteram_device { public: // construction - buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; @@ -108,7 +94,7 @@ class buffered_spriteram16_device : public buffered_spriteram_device { public: // construction - buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; @@ -118,7 +104,7 @@ class buffered_spriteram32_device : public buffered_spriteram_device { public: // construction - buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; @@ -128,7 +114,7 @@ class buffered_spriteram64_device : public buffered_spriteram_device { public: // construction - buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); }; diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp index 5086a658ab8..e5bb4cff0d3 100644 --- a/src/emu/dislot.cpp +++ b/src/emu/dislot.cpp @@ -17,7 +17,7 @@ device_slot_interface::device_slot_interface(const machine_config &mconfig, device_t &device) : device_interface(device, "slot"), - m_default_clock(0), // FIXME: zero to preserve behaviour - should probably be DERIVED_CLOCK(1, 1) + m_default_clock(DERIVED_CLOCK(1, 1)), m_default_option(nullptr), m_fixed(false), m_card_device(nullptr) diff --git a/src/emu/render.cpp b/src/emu/render.cpp index 2bb74643d91..c5f4418f447 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1042,7 +1042,7 @@ void render_target::set_bounds(s32 width, s32 height, float pixel_aspect) void render_target::set_view(int viewindex) { layout_view *view = view_by_index(viewindex); - if (view != nullptr) + if (view) { m_curview = view; view->recompute(m_layerconfig); @@ -1170,7 +1170,7 @@ void render_target::compute_visible_area(s32 target_width, s32 target_height, fl { switch (m_scale_mode) { - case SCALE_FRACTIONAL: + case SCALE_FRACTIONAL: { float width, height; float scale; @@ -1210,7 +1210,7 @@ void render_target::compute_visible_area(s32 target_width, s32 target_height, fl break; } - default: + default: { // get source size and aspect s32 src_width, src_height; @@ -1691,13 +1691,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have if (!have_default && !have_artwork) { - if (screens == 0) - { - load_layout_file(nullptr, &layout_noscreens); - if (m_filelist.empty()) - throw emu_fatalerror("Couldn't parse default layout??"); - } - else if (screens == 2) + if (screens == 2) { load_layout_file(nullptr, &layout_dualhsxs); if (m_filelist.empty()) @@ -1705,8 +1699,16 @@ void render_target::load_additional_layout_files(const char *basename, bool have } } - // generate default layouts for larger numbers of screens - if (screens >= 3) + if (screens == 0) // ensure the fallback view for systems with no screens is loaded if necessary + { + if (!view_by_index(0)) + { + load_layout_file(nullptr, &layout_noscreens); + if (m_filelist.empty()) + throw emu_fatalerror("Couldn't parse default layout??"); + } + } + else if (screens >= 3) // generate default layouts for larger numbers of screens { util::xml::file::ptr const root(util::xml::file::create()); if (!root) diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index 3d854ded7c4..916e06a969a 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -706,7 +706,7 @@ MACHINE_CONFIG_START(atari_jsa_i_device::device_add_mconfig) // sound hardware MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(*this, atari_jsa_base_device, main_int_write_line)) - MCFG_YM2151_ADD("ym2151", JSA_MASTER_CLOCK) + MCFG_DEVICE_ADD("ym2151", YM2151, JSA_MASTER_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w)) MCFG_MIXER_ROUTE(0, *this, 0.60, 0) @@ -836,7 +836,7 @@ MACHINE_CONFIG_START(atari_jsa_ii_device::device_add_mconfig) // sound hardware MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(*this, atari_jsa_base_device, main_int_write_line)) - MCFG_YM2151_ADD("ym2151", JSA_MASTER_CLOCK) + MCFG_DEVICE_ADD("ym2151", YM2151, JSA_MASTER_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w)) MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.60, 0) @@ -918,7 +918,7 @@ MACHINE_CONFIG_START(atari_jsa_iii_device::device_add_mconfig) // sound hardware MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(*this, atari_jsa_base_device, main_int_write_line)) - MCFG_YM2151_ADD("ym2151", JSA_MASTER_CLOCK) + MCFG_DEVICE_ADD("ym2151", YM2151, JSA_MASTER_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w)) MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.60, 0) diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index f816a7ef176..c9300beb150 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -270,7 +270,7 @@ MACHINE_CONFIG_START(wsf_80186_sound_device::device_add_mconfig) MCFG_SOUND_ROUTE(0, "dac9", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac9", -1.0, DAC_VREF_NEG_INPUT) /* sound hardware */ - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(0, "speaker", 0.40) MCFG_SOUND_ROUTE(1, "speaker", 0.40) diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index 802e4f19642..6a140ded447 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -62,7 +62,7 @@ MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig) MCFG_DEVICE_PROGRAM_MAP(s11c_bg_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // "3.58 MHz" on schematics and parts list + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) // "3.58 MHz" on schematics and parts list MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11c_bg_device, ym2151_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 0eae5aaa1d2..a412638617a 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -185,7 +185,7 @@ MACHINE_CONFIG_START(williams_cvsd_sound_device::device_add_mconfig) MCFG_PIA_IRQA_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("cpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ym2151", CVSD_FM_CLOCK) + MCFG_DEVICE_ADD("ym2151", YM2151, CVSD_FM_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE("pia", pia6821_device, ca1_w)) MCFG_DEVCB_INVERT // IRQ is not true state MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(williams_narc_sound_device::device_add_mconfig) MCFG_DEVICE_ADD("cpu1", MC6809E, NARC_MASTER_CLOCK / 4) MCFG_DEVICE_PROGRAM_MAP(williams_narc_slave_map) - MCFG_YM2151_ADD("ym2151", NARC_FM_CLOCK) + MCFG_DEVICE_ADD("ym2151", YM2151, NARC_FM_CLOCK) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("cpu0", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) @@ -754,7 +754,7 @@ MACHINE_CONFIG_START(williams_adpcm_sound_device::device_add_mconfig) MCFG_DEVICE_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4) MCFG_DEVICE_PROGRAM_MAP(williams_adpcm_map) - MCFG_YM2151_ADD("ym2151", ADPCM_FM_CLOCK) + MCFG_DEVICE_ADD("ym2151", YM2151, ADPCM_FM_CLOCK) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp index d96ed034a86..470790492bc 100644 --- a/src/mame/audio/wpcsnd.cpp +++ b/src/mame/audio/wpcsnd.cpp @@ -74,7 +74,7 @@ MACHINE_CONFIG_START(wpcsnd_device::device_add_mconfig) MCFG_DEVICE_PROGRAM_MAP(wpcsnd_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) - MCFG_YM2151_ADD("ym2151", 3580000) + MCFG_DEVICE_ADD("ym2151", YM2151, 3580000) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, wpcsnd_device, ym2151_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index f6da79fb92d..40fcc9e1323 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -350,7 +350,7 @@ MACHINE_CONFIG_START(_88games_state::_88games) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "mono", 0.75) MCFG_SOUND_ROUTE(1, "mono", 0.75) diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index 53bb1eb0122..60a0e715a81 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -406,7 +406,7 @@ MACHINE_CONFIG_START(airraid_state::airraid) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index fe0fdb08120..fd36a1d1eae 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -218,7 +218,7 @@ MACHINE_CONFIG_START(ajax_state::ajax) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index e364a2e7c52..046106353c5 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -240,7 +240,7 @@ MACHINE_CONFIG_START(aliens_state::aliens) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, aliens_state,aliens_snd_bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp index 8a398a08118..bc57d7c596f 100644 --- a/src/mame/drivers/amspdwy.cpp +++ b/src/mame/drivers/amspdwy.cpp @@ -279,7 +279,7 @@ MACHINE_CONFIG_START(amspdwy_state::amspdwy) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 3000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index eeacbb4b68e..2e8d81f936c 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -43,28 +43,28 @@ class apricot_state : public driver_device { public: apricot_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_cpu(*this, "ic91"), - m_iop(*this, "ic71"), - m_ram(*this, RAM_TAG), - m_crtc(*this, "ic30"), - m_ppi(*this, "ic17"), - m_pic(*this, "ic31"), - m_pit(*this, "ic16"), - m_sio(*this, "ic15"), - m_rs232(*this, "rs232"), - m_centronics(*this, "centronics"), - m_fdc(*this, "ic68"), - m_floppy0(*this, "ic68:0"), - m_floppy1(*this, "ic68:1"), - m_palette(*this, "palette"), - m_screen_buffer(*this, "screen_buffer"), - m_video_mode(0), - m_display_on(1), - m_display_enabled(0), - m_centronics_fault(1), - m_centronics_perror(1), - m_bus_locked(0) + driver_device(mconfig, type, tag), + m_cpu(*this, "ic91"), + m_iop(*this, "ic71"), + m_ram(*this, RAM_TAG), + m_crtc(*this, "ic30"), + m_ppi(*this, "ic17"), + m_pic(*this, "ic31"), + m_pit(*this, "ic16"), + m_sio(*this, "ic15"), + m_rs232(*this, "rs232"), + m_centronics(*this, "centronics"), + m_fdc(*this, "ic68"), + m_floppy0(*this, "ic68:0"), + m_floppy1(*this, "ic68:1"), + m_palette(*this, "palette"), + m_screen_buffer(*this, "screen_buffer"), + m_video_mode(0), + m_display_on(1), + m_display_enabled(0), + m_centronics_fault(1), + m_centronics_perror(1), + m_bus_locked(0) { } DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -416,7 +416,7 @@ MACHINE_CONFIG_START(apricot_state::apricot) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2a_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2b_w)) - MCFG_TTL153_ADD("ic14") + MCFG_DEVICE_ADD("ic14", TTL153) MCFG_TTL153_ZA_CB(WRITELINE("ic15", z80sio_device, rxca_w)) MCFG_TTL153_ZB_CB(WRITELINE("ic15", z80sio_device, txca_w)) diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp index e01eb4b2ca1..762bb0cc979 100644 --- a/src/mame/drivers/aquarium.cpp +++ b/src/mame/drivers/aquarium.cpp @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(aquarium_state::aquarium) MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) // clock not verified on pcb + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) // clock not verified on pcb MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 317fef6d5d1..4e4430313d8 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -1299,7 +1299,7 @@ MACHINE_CONFIG_START(armedf_state::terraf) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ terraf_sound(config); @@ -1340,7 +1340,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -1390,7 +1390,7 @@ MACHINE_CONFIG_START(armedf_state::kozure) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ terraf_sound(config); @@ -1427,7 +1427,7 @@ MACHINE_CONFIG_START(armedf_state::armedf) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -1477,7 +1477,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -1527,7 +1527,7 @@ MACHINE_CONFIG_START(armedf_state::legion) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -1575,7 +1575,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -1619,7 +1619,7 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ terraf_sound(config); diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp index dcb210a1df1..1dc9835d11f 100644 --- a/src/mame/drivers/asterix.cpp +++ b/src/mame/drivers/asterix.cpp @@ -299,7 +299,7 @@ MACHINE_CONFIG_START(asterix_state::asterix) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'000'000)/8) // 4MHz MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index d11876fb033..baa9a0cd030 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(asteroid_state::asteroid_base) MCFG_WATCHDOG_ADD("watchdog") - MCFG_TTL153_ADD("dsw_sel") + MCFG_DEVICE_ADD("dsw_sel", TTL153) MCFG_DEVICE_ADD("outlatch", OUTPUT_LATCH, 0) // LS174 at N11 MCFG_OUTPUT_LATCH_BIT0_HANDLER(OUTPUT("led1")) MCFG_DEVCB_INVERT // 2 PLYR START LAMP diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index 86c69995841..a53f1fbd775 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -953,7 +953,7 @@ MACHINE_CONFIG_START(asuka_state::asuka) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(MEMBANK("audiobank")) MCFG_DEVCB_MASK(0x03) MCFG_SOUND_ROUTE(0, "mono", 0.50) @@ -1029,7 +1029,7 @@ MACHINE_CONFIG_START(asuka_state::cadash) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(8'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(8'000'000)/2) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(MEMBANK("audiobank")) MCFG_DEVCB_MASK(0x03) MCFG_SOUND_ROUTE(0, "mono", 0.50) @@ -1092,7 +1092,7 @@ MACHINE_CONFIG_START(asuka_state::mofflott) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(MEMBANK("audiobank")) MCFG_DEVCB_MASK(0x03) MCFG_SOUND_ROUTE(0, "mono", 0.50) @@ -1163,7 +1163,7 @@ MACHINE_CONFIG_START(asuka_state::eto) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(MEMBANK("audiobank")) MCFG_DEVCB_MASK(0x03) MCFG_SOUND_ROUTE(0, "mono", 0.50) diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index cd75472b3a6..4b54289ea4a 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -776,7 +776,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_6)) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", ATARI_CLOCK_14MHz/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index b989521bc6d..cb3858cb58c 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -1238,7 +1238,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2) /* sound hardware */ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", NOOP) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK/4) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp index d8dcd7081b1..d3fa3010177 100644 --- a/src/mame/drivers/badlands.cpp +++ b/src/mame/drivers/badlands.cpp @@ -483,7 +483,7 @@ MACHINE_CONFIG_START(badlands_state::badlands) MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_2)) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", ATARI_CLOCK_14MHz/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MCFG_SOUND_ROUTE(0, "mono", 0.30) MCFG_SOUND_ROUTE(1, "mono", 0.30) MACHINE_CONFIG_END diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp index 965c1449b1c..e82e93fdcce 100644 --- a/src/mame/drivers/badlandsbl.cpp +++ b/src/mame/drivers/badlandsbl.cpp @@ -258,7 +258,7 @@ MACHINE_CONFIG_START(badlandsbl_state::badlandsb) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(20'000'000)/8) /* Divisor estimated */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(20'000'000)/8) /* Divisor estimated */ MCFG_SOUND_ROUTE(0, "mono", 0.30) MCFG_SOUND_ROUTE(1, "mono", 0.30) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index 39cf2a438ee..b84b6fdc903 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -681,8 +681,8 @@ MACHINE_CONFIG_START(bbusters_state::bbusters) MCFG_VIDEO_START_OVERRIDE(bbusters_state,bbuster) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -723,7 +723,7 @@ MACHINE_CONFIG_START(bbusters_state::mechatt) MCFG_VIDEO_START_OVERRIDE(bbusters_state,mechatt) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index 0459f86a5d0..366580a7f37 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -1120,8 +1120,8 @@ MACHINE_CONFIG_START(berzerk_state::berzerk) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_TTL74181_ADD("ls181_10c") - MCFG_TTL74181_ADD("ls181_12c") + MCFG_DEVICE_ADD("ls181_10c", TTL74181) + MCFG_DEVICE_ADD("ls181_12c", TTL74181) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp index 32d47aa7409..364a00274f9 100644 --- a/src/mame/drivers/bigstrkb.cpp +++ b/src/mame/drivers/bigstrkb.cpp @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(bigstrkb_state::bigstrkb) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") -// MCFG_YM2151_ADD("ymsnd", ym2151_config) +// MCFG_DEVICE_ADD("ymsnd", YM2151, ym2151_config) MCFG_OKIM6295_ADD("oki1", 4000000, PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp index d508b61ba29..64d801f7b75 100644 --- a/src/mame/drivers/bingoc.cpp +++ b/src/mame/drivers/bingoc.cpp @@ -215,7 +215,7 @@ MACHINE_CONFIG_START(bingoc_state::bingoc) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 7159160/2) + MCFG_DEVICE_ADD("ymsnd", YM2151, 7159160/2) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index 82c91cbe04e..cc1f604595f 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -421,13 +421,13 @@ MACHINE_CONFIG_START(bionicc_state::bionicc) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT_CLASS(2, bionicc_state, RRRRGGGGBBBBIIII) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181) / 4) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) MACHINE_CONFIG_END diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index c0aa71169bc..f462cd8ab9a 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -324,7 +324,7 @@ MACHINE_CONFIG_START(blktiger_state::blktiger) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index e42d31afe05..0fb737288d8 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(blockhl_state::blockhl) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) MACHINE_CONFIG_END diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp index 8d89b16f923..512d60889e4 100644 --- a/src/mame/drivers/blockout.cpp +++ b/src/mame/drivers/blockout.cpp @@ -331,7 +331,7 @@ MACHINE_CONFIG_START(blockout_state::blockout) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", AUDIO_CLOCK) + MCFG_DEVICE_ADD("ymsnd", YM2151, AUDIO_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, blockout_state,irq_handler)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp index 07f96e7c6c8..624d49a85a4 100644 --- a/src/mame/drivers/boogwing.cpp +++ b/src/mame/drivers/boogwing.cpp @@ -358,8 +358,8 @@ MACHINE_CONFIG_START(boogwing_state::boogwing) MCFG_PALETTE_ADD("palette", 2048) MCFG_GFXDECODE_ADD("gfxdecode", "palette", boogwing) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_DECO_ACE_ADD("deco_ace") MCFG_DECO_ACE_PALETTE("palette") @@ -415,7 +415,7 @@ MACHINE_CONFIG_START(boogwing_state::boogwing) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", SOUND_XTAL/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_XTAL/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ2 */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, boogwing_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 002b574cc10..0b7082b5bb7 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -536,7 +536,7 @@ MACHINE_CONFIG_START(cabal_state::cabal) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -618,7 +618,7 @@ MACHINE_CONFIG_START(cabal_state::cabalbl) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_GENERIC_LATCH_8_ADD("soundlatch3") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80) diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp index de2a375a8e8..2c7e9a4de0f 100644 --- a/src/mame/drivers/carpolo.cpp +++ b/src/mame/drivers/carpolo.cpp @@ -278,7 +278,7 @@ MACHINE_CONFIG_START(carpolo_state::carpolo) MCFG_DEVICE_ADD("74148_3s", TTL74148, 0) MCFG_74148_OUTPUT_CB(carpolo_state, ttl74148_3s_cb) - MCFG_TTL153_ADD("74153_1k") + MCFG_DEVICE_ADD("74153_1k", TTL153) MCFG_TTL153_ZA_CB(WRITELINE(*this, carpolo_state, ls153_za_w)) // pia1 pb5 MCFG_TTL153_ZB_CB(WRITELINE(*this, carpolo_state, ls153_zb_w)) // pia1 pb4 diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 11ffacc8b10..e4b08361bbb 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -2539,7 +2539,7 @@ MACHINE_CONFIG_START(cave_state::metmqstr) MCFG_GENERIC_LATCH_16_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 16_MHz_XTAL / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 16_MHz_XTAL / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6) @@ -2795,7 +2795,7 @@ MACHINE_CONFIG_START(cave_state::sailormn) MCFG_GENERIC_LATCH_16_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 16_MHz_XTAL/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 16_MHz_XTAL/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp index 83c0e35c6eb..3e3fbde8a5f 100644 --- a/src/mame/drivers/cbuster.cpp +++ b/src/mame/drivers/cbuster.cpp @@ -326,7 +326,8 @@ MACHINE_CONFIG_START(cbuster_state::twocrude) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -374,7 +375,7 @@ MACHINE_CONFIG_START(cbuster_state::twocrude) MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/24 * 3) /* 1.3425MHz Verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) /* 3.58MHz Verified */ + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000)/9) /* 3.58MHz Verified */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ2 */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index 4910930cf2a..93e74e5ff80 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -593,7 +593,7 @@ MACHINE_CONFIG_START(chinagat_state::chinagat) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.80) MCFG_SOUND_ROUTE(1, "mono", 0.80) @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.80) MCFG_SOUND_ROUTE(1, "mono", 0.80) diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index d6880b30b8f..eb327faa94b 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -377,7 +377,7 @@ MACHINE_CONFIG_START(chqflag_state::chqflag) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index 077704681ab..1826e4f121b 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -1976,7 +1976,7 @@ MACHINE_CONFIG_START(cischeat_state::bigrun) MCFG_GENERIC_LATCH_16_ADD("soundlatch") MCFG_GENERIC_LATCH_16_ADD("soundlatch2") - MCFG_YM2151_ADD("ymsnd", STD_FM_CLOCK) + MCFG_DEVICE_ADD("ymsnd", YM2151, STD_FM_CLOCK) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index ac2fd0f1b65..822173e4072 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -848,7 +848,7 @@ MACHINE_CONFIG_START(cninja_state::cninja) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(1) @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(cninja_state::cninja) MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000) / 8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2 MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.45) @@ -938,7 +938,7 @@ MACHINE_CONFIG_START(cninja_state::stoneage) MCFG_VIDEO_START_OVERRIDE(cninja_state,stoneage) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(1) @@ -985,7 +985,7 @@ MACHINE_CONFIG_START(cninja_state::stoneage) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_SOUND_ROUTE(0, "mono", 0.45) MCFG_SOUND_ROUTE(1, "mono", 0.45) @@ -1036,7 +1036,7 @@ MACHINE_CONFIG_START(cninja_state::cninjabl) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(1) @@ -1074,7 +1074,7 @@ MACHINE_CONFIG_START(cninja_state::cninjabl) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_SOUND_ROUTE(0, "mono", 0.45) MCFG_SOUND_ROUTE(1, "mono", 0.45) @@ -1108,7 +1108,7 @@ MACHINE_CONFIG_START(cninja_state::edrandy) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -1157,7 +1157,7 @@ MACHINE_CONFIG_START(cninja_state::edrandy) MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000) / 8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2 MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.45) @@ -1198,7 +1198,7 @@ MACHINE_CONFIG_START(cninja_state::robocop2) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -1251,7 +1251,7 @@ MACHINE_CONFIG_START(cninja_state::robocop2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2 MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) @@ -1290,8 +1290,8 @@ MACHINE_CONFIG_START(cninja_state::mutantf) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -1342,7 +1342,7 @@ MACHINE_CONFIG_START(cninja_state::mutantf) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2 MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp index 51ffcd22f1c..53e31cf5637 100644 --- a/src/mame/drivers/commando.cpp +++ b/src/mame/drivers/commando.cpp @@ -278,7 +278,7 @@ MACHINE_CONFIG_START(commando_state::commando) MCFG_GFXDECODE_ADD("gfxdecode", "palette", commando) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp index dc61014eb9a..9fe3295a2dd 100644 --- a/src/mame/drivers/contra.cpp +++ b/src/mame/drivers/contra.cpp @@ -246,7 +246,7 @@ MACHINE_CONFIG_START(contra_state::contra) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 9bce5eb8c5d..fe30d374e17 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -3384,7 +3384,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_YM2151_ADD("2151", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("2151", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index 1e8f6fbde97..85644f85288 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -347,7 +347,7 @@ MACHINE_CONFIG_START(crimfght_state::crimfght) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, crimfght_state, ym2151_ct_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp index ade43071932..a591e5274a6 100644 --- a/src/mame/drivers/crshrace.cpp +++ b/src/mame/drivers/crshrace.cpp @@ -433,8 +433,8 @@ MACHINE_CONFIG_START(crshrace_state::crshrace) MCFG_VSYSTEM_SPR_SET_GFXREGION(2) MCFG_VSYSTEM_SPR_GFXDECODE("gfxdecode") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("k053936", K053936, 0) MCFG_K053936_WRAP(1) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index ec2d8d3d5da..5f3c286cce6 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -488,7 +488,7 @@ MACHINE_CONFIG_START(cv1k_state::cv1k) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YMZ770_ADD("ymz770", 16.384_MHz_XTAL) + MCFG_DEVICE_ADD("ymz770", YMZ770, 16.384_MHz_XTAL) MCFG_SOUND_ROUTE(1, "mono", 1.0) // only Right output used, Left is not connected MCFG_EPIC12_ADD("blitter") diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp index 0d8985d20ff..b50133946ad 100644 --- a/src/mame/drivers/cyberbal.cpp +++ b/src/mame/drivers/cyberbal.cpp @@ -455,7 +455,7 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal) MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_1)) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", ATARI_CLOCK_14MHz/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp index b9dc841147a..15bb5c240b4 100644 --- a/src/mame/drivers/darkmist.cpp +++ b/src/mame/drivers/darkmist.cpp @@ -266,7 +266,7 @@ MACHINE_CONFIG_START(darkmist_state::darkmist) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 14318180/4) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, 14318180/4) /* 3.579545 MHz */ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp index 0696db39cf3..81e90b86458 100644 --- a/src/mame/drivers/darkseal.cpp +++ b/src/mame/drivers/darkseal.cpp @@ -229,7 +229,7 @@ MACHINE_CONFIG_START(darkseal_state::darkseal) MCFG_GFXDECODE_ADD("gfxdecode", "palette", darkseal) MCFG_PALETTE_ADD("palette", 2048) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -273,7 +273,7 @@ MACHINE_CONFIG_START(darkseal_state::darkseal) MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000)/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2 MCFG_SOUND_ROUTE(0, "mono", 0.55) MCFG_SOUND_ROUTE(1, "mono", 0.55) diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index 287a533abd9..c6e44a01e00 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -556,8 +556,8 @@ MACHINE_CONFIG_START(dassault_state::dassault) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(XBGR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -612,7 +612,7 @@ MACHINE_CONFIG_START(dassault_state::dassault) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000)/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dassault_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index d845b41cb60..224441f0079 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -413,7 +413,7 @@ MACHINE_CONFIG_START(dblewing_state::dblewing) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000)/9) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index 6ca18756523..b5033eba918 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(dbz_state::dbz) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp index 589e6b0b818..38f9fdc37fb 100644 --- a/src/mame/drivers/dcon.cpp +++ b/src/mame/drivers/dcon.cpp @@ -349,7 +349,7 @@ MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */ /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index c466107c800..828e29dddd8 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -980,7 +980,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", M6809_IRQ_LINE)) - MCFG_YM2151_ADD("fmsnd", SOUND_CLOCK) + MCFG_DEVICE_ADD("fmsnd", YM2151, SOUND_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, ddragon_state, irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) @@ -1052,7 +1052,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", M6809_IRQ_LINE)) - MCFG_YM2151_ADD("fmsnd", SOUND_CLOCK) + MCFG_DEVICE_ADD("fmsnd", YM2151, SOUND_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, ddragon_state,irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) @@ -1105,7 +1105,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("fmsnd", SOUND_CLOCK) + MCFG_DEVICE_ADD("fmsnd", YM2151, SOUND_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, ddragon_state,irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 96a1605ba9c..120476f4c81 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -849,7 +849,7 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) @@ -908,7 +908,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(28_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ @@ -926,7 +926,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.45) MCFG_SOUND_ROUTE(1, "mono", 0.45) diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index e1f61791da7..b0dfd88dbeb 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -536,7 +536,7 @@ MACHINE_CONFIG_START(de_2_state::de_bg_audio) MCFG_SPEAKER_STANDARD_MONO("bg") - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, de_2_state, ym2151_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index 9f6800fff72..4433731dfab 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -1963,7 +1963,7 @@ MACHINE_CONFIG_START(dec8_state::lastmisn) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("spritegen_krn", DECO_KARNOVSPRITES, 0) MCFG_DECO_KARNOVSPRITES_GFX_REGION(1) @@ -2028,7 +2028,7 @@ MACHINE_CONFIG_START(dec8_state::shackled) MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, dec8_state, shackled_coin_irq)) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("spritegen_krn", DECO_KARNOVSPRITES, 0) MCFG_DECO_KARNOVSPRITES_GFX_REGION(1) @@ -2084,7 +2084,7 @@ MACHINE_CONFIG_START(dec8_state::gondo) MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751")) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("spritegen_krn", DECO_KARNOVSPRITES, 0) MCFG_DECO_KARNOVSPRITES_GFX_REGION(1) @@ -2145,7 +2145,7 @@ MACHINE_CONFIG_START(dec8_state::garyoret) MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751")) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("spritegen_krn", DECO_KARNOVSPRITES, 0) MCFG_DECO_KARNOVSPRITES_GFX_REGION(1) @@ -2206,7 +2206,7 @@ MACHINE_CONFIG_START(dec8_state::ghostb) MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751")) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0) MCFG_DECO_BAC06_GFX_REGION_WIDE(2, 2, 0) @@ -2269,7 +2269,7 @@ MACHINE_CONFIG_START(dec8_state::csilver) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("spritegen_krn", DECO_KARNOVSPRITES, 0) MCFG_DECO_KARNOVSPRITES_GFX_REGION(1) @@ -2330,7 +2330,7 @@ MACHINE_CONFIG_START(dec8_state::oscar) MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, dec8_state, oscar_coin_irq)) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0) MCFG_DECO_BAC06_GFX_REGION_WIDE(2, 2, 0) @@ -2391,7 +2391,7 @@ MACHINE_CONFIG_START(dec8_state::srdarwin) MCFG_QUANTUM_PERFECT_CPU("maincpu") /* needed for stability with emulated MCU or sometimes commands get missed and game crashes at bosses */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) // MCFG_SCREEN_REFRESH_RATE(58) @@ -2436,7 +2436,7 @@ MACHINE_CONFIG_START(dec8_state::cobracom) /* NMIs are caused by the main CPU */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0) MCFG_DECO_BAC06_GFX_REGION_WIDE(2, 2, 0) diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index 0c7d41a92da..a6827ef5ff0 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -1947,7 +1947,7 @@ MACHINE_CONFIG_START(captaven_state::captaven) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000)/9) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) @@ -2031,7 +2031,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) @@ -2108,7 +2108,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun) MCFG_SCREEN_UPDATE_DRIVER(dragngun_state, screen_update_dragngun) //MCFG_SCREEN_PALETTE("palette") - MCFG_BUFFERED_SPRITERAM32_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM32) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -2160,7 +2160,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) @@ -2240,7 +2240,7 @@ MACHINE_CONFIG_START(dragngun_state::lockload) MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248) MCFG_SCREEN_UPDATE_DRIVER(dragngun_state, screen_update_dragngun) - MCFG_BUFFERED_SPRITERAM32_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM32) MCFG_GFXDECODE_ADD("gfxdecode", "palette", dragngun) MCFG_PALETTE_ADD("palette", 2048) @@ -2292,7 +2292,7 @@ MACHINE_CONFIG_START(dragngun_state::lockload) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dragngun_state, lockload_okibank_lo_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.42) @@ -2463,7 +2463,7 @@ MACHINE_CONFIG_START(nslasher_state::nslasher) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.40) diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp index 57418b8de34..d4751386a42 100644 --- a/src/mame/drivers/dietgo.cpp +++ b/src/mame/drivers/dietgo.cpp @@ -268,7 +268,7 @@ MACHINE_CONFIG_START(dietgo_state::dietgo) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000)/9) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index a6de06fcd87..8f7fb260146 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -1485,7 +1485,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::sound_2151) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3.579'545_MHz_XTAL) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3.579'545_MHz_XTAL) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) @@ -1499,7 +1499,7 @@ MACHINE_CONFIG_START(dooyong_state::sound_2151_4mhz) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 16_MHz_XTAL/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */ + MCFG_DEVICE_ADD("ymsnd", YM2151, 16_MHz_XTAL/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) @@ -1523,7 +1523,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1575,7 +1575,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm) MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1614,7 +1614,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1652,7 +1652,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1692,7 +1692,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1778,7 +1778,7 @@ MACHINE_CONFIG_START(rshark_state::dooyong_68k) MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) // video hardware - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1830,7 +1830,7 @@ MACHINE_CONFIG_START(popbingo_state::popbingo) MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map) // video hardware - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp index e477571578e..4ff20db0e02 100644 --- a/src/mame/drivers/dynduke.cpp +++ b/src/mame/drivers/dynduke.cpp @@ -332,7 +332,7 @@ MACHINE_CONFIG_START(dynduke_state::dynduke) MCFG_QUANTUM_TIME(attotime::from_hz(3600)) // video hardware - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp index 758f7744366..92a97bb8243 100644 --- a/src/mame/drivers/exedexes.cpp +++ b/src/mame/drivers/exedexes.cpp @@ -232,7 +232,7 @@ MACHINE_CONFIG_START(exedexes_state::exedexes) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index 829ff381a22..d9c217cb4b2 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -446,7 +446,7 @@ MACHINE_CONFIG_START(exterm_state::exterm) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT) - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index d979ffe841f..5775eab1508 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -264,7 +264,7 @@ MACHINE_CONFIG_START(exzisus_state::exzisus) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp index 98950d7023a..7f076a8e883 100644 --- a/src/mame/drivers/f-32.cpp +++ b/src/mame/drivers/f-32.cpp @@ -190,7 +190,7 @@ MACHINE_CONFIG_START(mosaicf2_state::mosaicf2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -268,7 +268,7 @@ MACHINE_CONFIG_START(mosaicf2_state::royalpk2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") -// MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */ +// MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545 MHz */ // MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) // MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index f88752a6e42..e701e453efc 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -884,7 +884,7 @@ MACHINE_CONFIG_START(fantland_state::fantland) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3000000) MCFG_SOUND_ROUTE(0, "speaker", 0.35) MCFG_SOUND_ROUTE(1, "speaker", 0.35) @@ -932,7 +932,7 @@ MACHINE_CONFIG_START(fantland_state::galaxygn) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3000000) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, fantland_state, galaxygn_sound_irq)) MCFG_SOUND_ROUTE(0, "speaker", 1.0) MCFG_SOUND_ROUTE(1, "speaker", 1.0) diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp index 29a87c4ebc5..770b64c2964 100644 --- a/src/mame/drivers/fb01.cpp +++ b/src/mame/drivers/fb01.cpp @@ -218,7 +218,7 @@ MACHINE_CONFIG_START(fb01_state::fb01) MCFG_MIDI_PORT_ADD("mdthru", midiout_slot, "midiout") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ym2164", XTAL(4'000'000)) + MCFG_DEVICE_ADD("ym2164", YM2151, XTAL(4'000'000)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, fb01_state, ym2164_irq_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index 498e23b26a1..8cf9cf3d9d2 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -1714,7 +1714,7 @@ MACHINE_CONFIG_START(cps_state::kodb) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("2151", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("2151", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) @@ -1757,7 +1757,7 @@ MACHINE_CONFIG_START(cps_state::sf2mdt) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("2151", 3579545) + MCFG_DEVICE_ADD("2151", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) @@ -1812,7 +1812,7 @@ MACHINE_CONFIG_START(cps_state::knightsb) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("2151", 29821000 / 8) + MCFG_DEVICE_ADD("2151", YM2151, 29821000 / 8) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) @@ -2356,7 +2356,7 @@ MACHINE_CONFIG_START(cps_state::sgyxz) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_YM2151_ADD("2151", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("2151", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) @@ -2671,7 +2671,7 @@ MACHINE_CONFIG_START(cps_state::sf2m1) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_YM2151_ADD("2151", XTAL(3'579'545)) + MCFG_DEVICE_ADD("2151", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) @@ -3163,7 +3163,7 @@ MACHINE_CONFIG_START(cps_state::varthb) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_YM2151_ADD("2151", XTAL(3'579'545)) + MCFG_DEVICE_ADD("2151", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) MCFG_SOUND_ROUTE(1, "mono", 0.35) diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index ffe98c72245..941189f82a0 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -246,7 +246,7 @@ MACHINE_CONFIG_START(flkatck_state::flkatck) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index 225e1a0102c..d0c6a546a87 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(funkyjet_state::funkyjet) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000)/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2 MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index a847d6827ff..46039d87bfd 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -184,7 +184,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsq) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -614,7 +614,7 @@ MACHINE_CONFIG_START(gaelco2_state::play2000) // MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -718,7 +718,7 @@ MACHINE_CONFIG_START(bang_state::bang) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -955,7 +955,7 @@ MACHINE_CONFIG_START(gaelco2_state::alighunt) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -1259,7 +1259,7 @@ MACHINE_CONFIG_START(gaelco2_state::touchgo) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gaelco2_state, coin4_counter_w)) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_DEFAULT_LAYOUT(layout_dualhsxs) @@ -1565,7 +1565,7 @@ MACHINE_CONFIG_START(gaelco2_state::snowboar) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -1607,7 +1607,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsqs) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -1852,7 +1852,7 @@ MACHINE_CONFIG_START(wrally2_state::wrally2) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wrally2_state, wrally2_adc_cs)) /* ADCs chip select line */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_DEFAULT_LAYOUT(layout_dualhsxs) diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 1a2a02feaec..ece66fb9072 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -868,7 +868,7 @@ MACHINE_CONFIG_START(gaiden_state::drgnbowl) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 43cab98addb..78da7f01ca2 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -446,7 +446,7 @@ MACHINE_CONFIG_START(galivan_state::galivan) MCFG_MACHINE_RESET_OVERRIDE(galivan_state,galivan) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -506,7 +506,7 @@ MACHINE_CONFIG_START(galivan_state::ninjemak) MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index c0ebf50a211..4badebf2afa 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -525,7 +525,7 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base) MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_6)) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", ATARI_CLOCK_14MHz/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4) MCFG_SOUND_ROUTE(1, "lspeaker", 0.48) MCFG_SOUND_ROUTE(0, "rspeaker", 0.48) diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 992b4d9a546..636b95c1bac 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -407,7 +407,7 @@ MACHINE_CONFIG_START(gng_state::gng) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gng_state, coin_counter_2_w)) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.59) /* verified on pcb */ diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp index 77422304641..c3d230dc30e 100644 --- a/src/mame/drivers/gotcha.cpp +++ b/src/mame/drivers/gotcha.cpp @@ -295,7 +295,7 @@ MACHINE_CONFIG_START(gotcha_state::gotcha) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 14318180/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 14318180/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.80) MCFG_SOUND_ROUTE(1, "mono", 0.80) diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index 8f8992ec6b7..685cd83c9c0 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -326,7 +326,7 @@ MACHINE_CONFIG_START(gradius3_state::gradius3) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 352be579cbf..9b4e2bcdf0e 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -199,8 +199,8 @@ MACHINE_CONFIG_START(hcastle_state::hcastle) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59) diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index 10109399250..95a02df7441 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -508,7 +508,7 @@ MACHINE_CONFIG_START(hyprduel_state::hyprduel) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("sub", 1)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index b9a8f525608..f56af0a5a4a 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -390,7 +390,7 @@ MACHINE_CONFIG_START(jackal_state::jackal) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK) // verified on pcb + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK) // verified on pcb MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 9c8b2f76663..87f6bd1490c 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -1960,7 +1960,7 @@ MACHINE_CONFIG_START(kaneko16_state::blazeon) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -2015,7 +2015,7 @@ MACHINE_CONFIG_START(kaneko16_state::wingforc) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000)/16, PIN7_HIGH) diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index 511722a52c3..b15f2d96720 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -820,7 +820,7 @@ MACHINE_CONFIG_START(karnov_state::karnov) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(karnov_state::wndrplnt) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index f1f89c43dd5..1f14be2f83c 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastduel) MCFG_PALETTE_ADD("palette", 1024) @@ -556,7 +556,7 @@ MACHINE_CONFIG_START(lastduel_state::madgear) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", madgear) MCFG_PALETTE_ADD("palette", 1024) diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index 2b1e89bb8cb..b4e085db282 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1368,7 +1368,7 @@ MACHINE_CONFIG_START(legionna_state::godzilla) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 14318180/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 14318180/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) @@ -1421,7 +1421,7 @@ MACHINE_CONFIG_START(legionna_state::denjinmk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 14318180/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 14318180/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) @@ -1474,7 +1474,7 @@ MACHINE_CONFIG_START(legionna_state::grainbow) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 14318180/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 14318180/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp index 9aace7fff73..0d91b86bcec 100644 --- a/src/mame/drivers/lemmings.cpp +++ b/src/mame/drivers/lemmings.cpp @@ -224,8 +224,8 @@ MACHINE_CONFIG_START(lemmings_state::lemmings) MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -259,7 +259,7 @@ MACHINE_CONFIG_START(lemmings_state::lemmings) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 957584c2e51..0ad4378c8d4 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -940,7 +940,7 @@ MACHINE_CONFIG_START(lwings_state::lwings) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -976,12 +976,6 @@ MACHINE_CONFIG_END - - - - - - MACHINE_CONFIG_START(lwings_state::fball) /* basic machine hardware */ @@ -996,7 +990,7 @@ MACHINE_CONFIG_START(lwings_state::fball) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index 70bbfdc3010..1c1509baec5 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -758,7 +758,7 @@ MACHINE_CONFIG_START(m107_state::firebarr) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("upd71059c", pic8259_device, ir3_w)) - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", NEC_INPUT_LINE_INTP0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.40) MCFG_SOUND_ROUTE(1, "rspeaker", 0.40) diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index ec9bbe4aca6..afef37e615a 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -1872,7 +1872,7 @@ MACHINE_CONFIG_START(m72_state::m72_audio_chips) MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO) - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index dbfbdd11db4..24166ce4552 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -760,7 +760,7 @@ MACHINE_CONFIG_START(m90_state::m90) MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO) - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "speaker", 0.15) MCFG_SOUND_ROUTE(1, "speaker", 0.15) diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index a363a16b9b8..689d119812c 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -910,7 +910,7 @@ MACHINE_CONFIG_START(m92_state::m92) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", m92_state, m92_scanline_interrupt, "screen", 0, 1) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -936,7 +936,7 @@ MACHINE_CONFIG_START(m92_state::m92) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("upd71059c", pic8259_device, ir3_w)) - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", NEC_INPUT_LINE_INTP0)) MCFG_SOUND_ROUTE(0, "mono", 0.40) MCFG_SOUND_ROUTE(1, "mono", 0.40) diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp index a846f511513..55bb32bd590 100644 --- a/src/mame/drivers/madmotor.cpp +++ b/src/mame/drivers/madmotor.cpp @@ -315,7 +315,7 @@ MACHINE_CONFIG_START(madmotor_state::madmotor) MCFG_DEVICE_ADD("ym1", YM2203, 21470000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MCFG_YM2151_ADD("ym2", 21470000/6) + MCFG_DEVICE_ADD("ym2", YM2151, 21470000/6) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_SOUND_ROUTE(0, "mono", 0.45) MCFG_SOUND_ROUTE(1, "mono", 0.45) diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp index 01aaab86be4..03ca77e0731 100644 --- a/src/mame/drivers/mainevt.cpp +++ b/src/mame/drivers/mainevt.cpp @@ -498,7 +498,7 @@ MACHINE_CONFIG_START(mainevt_state::devstors) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3.579545_MHz_XTAL) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3.579545_MHz_XTAL) MCFG_SOUND_ROUTE(0, "mono", 0.30) MCFG_SOUND_ROUTE(1, "mono", 0.30) diff --git a/src/mame/drivers/megaphx.cpp b/src/mame/drivers/megaphx.cpp index 7ffa1018263..a11a3e391a4 100644 --- a/src/mame/drivers/megaphx.cpp +++ b/src/mame/drivers/megaphx.cpp @@ -385,11 +385,11 @@ MACHINE_CONFIG_START(megaphx_state::megaphx) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_TTL166_ADD("ttl166_1") + MCFG_DEVICE_ADD("ttl166_1", TTL166) MCFG_TTL166_DATA_CB(IOPORT("DSW1")) MCFG_TTL166_QH_CB(WRITELINE("ttl166_2", ttl166_device, serial_w)) - MCFG_TTL166_ADD("ttl166_2") + MCFG_DEVICE_ADD("ttl166_2", TTL166) MCFG_TTL166_DATA_CB(IOPORT("DSW2")) MCFG_TTL166_QH_CB(WRITELINE(*this, megaphx_state, dsw_w)) diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 720aa6f1bf5..27905148fea 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -1721,7 +1721,7 @@ MACHINE_CONFIG_START(megasys1_state::system_A) MCFG_GENERIC_LATCH_16_ADD("soundlatch") MCFG_GENERIC_LATCH_16_ADD("soundlatch2") - MCFG_YM2151_ADD("ymsnd", SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */ + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, megasys1_state,sound_irq)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp index 8ef457878b4..33bb0bde88c 100644 --- a/src/mame/drivers/metlfrzr.cpp +++ b/src/mame/drivers/metlfrzr.cpp @@ -390,7 +390,7 @@ MACHINE_CONFIG_START(metlfrzr_state::metlfrzr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181) / 4) /* 3.579545 MHz */ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 9519e11f0be..3b9d1288d84 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -3258,7 +3258,7 @@ MACHINE_CONFIG_START(metro_state::daitorid) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3.579545_MHz_XTAL) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3.579545_MHz_XTAL) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", UPD7810_INTF2)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -3598,7 +3598,7 @@ MACHINE_CONFIG_START(metro_state::pururun) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3.579545_MHz_XTAL) /* Confirmed match to reference video */ + MCFG_DEVICE_ADD("ymsnd", YM2151, 3.579545_MHz_XTAL) /* Confirmed match to reference video */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", UPD7810_INTF2)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp index f11812a0378..516274617f2 100644 --- a/src/mame/drivers/micro3d.cpp +++ b/src/mame/drivers/micro3d.cpp @@ -380,21 +380,21 @@ MACHINE_CONFIG_START(micro3d_state::micro3d) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_DEVICE_ADD("upd7759", UPD7759) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) + UPD7759(config, m_upd7759) + .add_route(ALL_OUTPUTS, "lspeaker", 0.35) + .add_route(ALL_OUTPUTS, "rspeaker", 0.35); - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) - MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) - MCFG_SOUND_ROUTE(1, "rspeaker", 0.35) + YM2151(config, "ym2151", XTAL(3'579'545)) + .add_route(0, "lspeaker", 0.35) + .add_route(1, "rspeaker", 0.35); - MCFG_DEVICE_ADD("noise_1", MICRO3D_SOUND) - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) + MICRO3D_SOUND(config, m_noise_1) + .add_route(0, "lspeaker", 1.0) + .add_route(1, "rspeaker", 1.0); - MCFG_DEVICE_ADD("noise_2", MICRO3D_SOUND) - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) + MICRO3D_SOUND(config, m_noise_2) + .add_route(0, "lspeaker", 1.0) + .add_route(1, "rspeaker", 1.0); MACHINE_CONFIG_END MACHINE_CONFIG_START(micro3d_state::botss11) diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index e29b72c9b2e..8e8c904e413 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -298,7 +298,7 @@ MACHINE_CONFIG_START(miragemj_state::mirage) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") // 93C45 /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index 0eb6b949265..e2de86ef911 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -972,7 +972,7 @@ MACHINE_CONFIG_START(mlanding_state::mlanding) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, mlanding_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.50) diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp index c8db0a01f52..38c9b5e00fd 100644 --- a/src/mame/drivers/moo.cpp +++ b/src/mame/drivers/moo.cpp @@ -547,7 +547,7 @@ MACHINE_CONFIG_START(moo_state::moo) MCFG_K054321_ADD("k054321", "lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz verified + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'000'000)/8) // 4MHz verified MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp index e34d4257b0b..4de63ffb65c 100644 --- a/src/mame/drivers/mugsmash.cpp +++ b/src/mame/drivers/mugsmash.cpp @@ -427,7 +427,7 @@ MACHINE_CONFIG_START(mugsmash_state::mugsmash) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) /* music */ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp index 4ea0e21f5af..52dfae4e28f 100644 --- a/src/mame/drivers/mustache.cpp +++ b/src/mame/drivers/mustache.cpp @@ -207,7 +207,7 @@ MACHINE_CONFIG_START(mustache_state::mustache) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", YM_CLOCK) + MCFG_DEVICE_ADD("ymsnd", YM2151, YM_CLOCK) MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index 2b23ca5d4ec..f256770ed17 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -1078,7 +1078,7 @@ MACHINE_CONFIG_START(namcos1_state::ns1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 3579580) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579580) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 51c9da74655..c82b771cc0b 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -1777,7 +1777,7 @@ MACHINE_CONFIG_START(namcos2_state::base) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END @@ -1857,7 +1857,7 @@ MACHINE_CONFIG_START(namcos2_state::gollygho) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END @@ -1912,7 +1912,7 @@ MACHINE_CONFIG_START(namcos2_state::finallap) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END @@ -1964,7 +1964,7 @@ MACHINE_CONFIG_START(namcos2_state::sgunner) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END @@ -2021,7 +2021,7 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END @@ -2076,7 +2076,7 @@ MACHINE_CONFIG_START(namcos2_state::luckywld) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END @@ -2128,7 +2128,7 @@ MACHINE_CONFIG_START(namcos2_state::metlhawk) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_YM2151_ADD("ymsnd", YM2151_SOUND_CLOCK) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */ // MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index 4c3c74df433..4b9b372bc30 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1971,7 +1971,7 @@ MACHINE_CONFIG_START(namcos21_state::namcos21) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) - MCFG_YM2151_ADD("ymsnd", 3579580) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579580) MCFG_SOUND_ROUTE(0, "lspeaker", 0.30) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_CONFIG_END @@ -2032,7 +2032,7 @@ MACHINE_CONFIG_START(namcos21_state::driveyes) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) - MCFG_YM2151_ADD("ymsnd", 3579580) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579580) MCFG_SOUND_ROUTE(0, "lspeaker", 0.30) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_CONFIG_END @@ -2095,7 +2095,7 @@ MACHINE_CONFIG_START(namcos21_state::winrun) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) - MCFG_YM2151_ADD("ymsnd", 3579580) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579580) MCFG_SOUND_ROUTE(0, "lspeaker", 0.30) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_CONFIG_END diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index e7097351157..6e0d69d06b4 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -1094,7 +1094,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 3579580) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579580) MCFG_SOUND_ROUTE(0, "mono", 0.0) MCFG_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */ diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index f5e0f28d28e..6e25c246d0f 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -1782,7 +1782,7 @@ MACHINE_CONFIG_START(nemesis_state::salamand) MCFG_SOUND_ROUTE(1, "lspeaker", 0.08) MCFG_SOUND_ROUTE(1, "rspeaker", 0.08) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) // MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(0, "rspeaker", 1.2) // reversed according to MT #4565 MCFG_SOUND_ROUTE(1, "lspeaker", 1.2) @@ -1828,7 +1828,7 @@ MACHINE_CONFIG_START(nemesis_state::blkpnthr) MCFG_SOUND_ROUTE(1, "lspeaker", 0.10) MCFG_SOUND_ROUTE(1, "rspeaker", 0.10) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) // MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1983,7 +1983,7 @@ MACHINE_CONFIG_START(nemesis_state::hcrash) MCFG_SOUND_ROUTE(1, "lspeaker", 0.10) MCFG_SOUND_ROUTE(1, "rspeaker", 0.10) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) // MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 5335b155c98..2708ba85a22 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -5181,7 +5181,7 @@ MACHINE_CONFIG_START(nmk16_state::stagger1) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_YM2151_ADD("ymsnd", XTAL(4'000'000)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(4'000'000)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.30) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 02545ddcdb6..29f4edc0a94 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -822,7 +822,7 @@ MACHINE_CONFIG_START(opwolf_state::opwolf) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", SOUND_CPU_CLOCK ) /* 4 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK) /* 4 MHz */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, opwolf_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) @@ -899,7 +899,7 @@ MACHINE_CONFIG_START(opwolf_state::opwolfb) /* OSC clocks unknown for the bootle /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", SOUND_CPU_CLOCK ) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, opwolf_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index 830172c02c0..0193a071e65 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(overdriv_state::overdriv) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.5) MCFG_SOUND_ROUTE(1, "rspeaker", 0.5) diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index 0ffd629d38b..3a88559033a 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -634,7 +634,7 @@ MACHINE_CONFIG_START(panicr_state::panicr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK/4) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK/4) /* 3.579545 MHz */ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index 1749a32970e..e5a09b62d14 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -282,7 +282,7 @@ MACHINE_CONFIG_START(parodius_state::parodius) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index d72880243e8..e9c1b018b7b 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -807,7 +807,7 @@ MACHINE_CONFIG_START(pgm2_state::pgm2) MCFG_NVRAM_ADD_0FILL("sram") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YMZ774_ADD("ymz774", 16384000) // is clock correct ? + MCFG_DEVICE_ADD("ymz774", YMZ774, 16384000) // is clock correct ? MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index 13a63c83197..bb99d77bbdc 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo3v1) MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) /* video hardware */ - MCFG_BUFFERED_SPRITERAM32_ADD("spriteram") /* If using alpha */ + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM32) /* If using alpha */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index 104a548f7ac..18ddf067228 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -349,7 +349,7 @@ MACHINE_CONFIG_START(raiden_state::raiden) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.60) /* verified on pcb */ diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index 9b767ec933c..385f51882d9 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -1464,7 +1464,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(28'636'363)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(28'636'363)/8) MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index d25917a89bc..c058ae3edd5 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -403,7 +403,7 @@ MACHINE_CONFIG_START(rastan_state::rastan) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rastan_state,rastan_bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.50) diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index e307b5df60e..74b64197413 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -698,7 +698,7 @@ MACHINE_CONFIG_START(rbisland_state::rbisland) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rbisland_state,bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.50) diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 55301b272da..ea8f0115152 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -599,7 +599,7 @@ MACHINE_CONFIG_START(rbmk_state::rbmk) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) - MCFG_YM2151_ADD("ymsnd", 22000000 / 8) + MCFG_DEVICE_ADD("ymsnd", YM2151, 22000000 / 8) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 781ef802b29..34cec84fc0b 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -291,7 +291,7 @@ MACHINE_CONFIG_START(rockrage_state::rockrage) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index 20d85d0d676..8780bfa03c2 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -884,7 +884,7 @@ MACHINE_CONFIG_START(rohga_state::rohga) MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1") + MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) @@ -947,7 +947,7 @@ MACHINE_CONFIG_START(rohga_state::rohga) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.78) @@ -973,8 +973,8 @@ MACHINE_CONFIG_START(rohga_state::wizdfire) MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) @@ -1041,7 +1041,7 @@ MACHINE_CONFIG_START(rohga_state::wizdfire) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) @@ -1067,8 +1067,8 @@ MACHINE_CONFIG_START(rohga_state::nitrobal) MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1") - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2") + MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) @@ -1136,7 +1136,7 @@ MACHINE_CONFIG_START(rohga_state::nitrobal) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) @@ -1162,7 +1162,7 @@ MACHINE_CONFIG_START(rohga_state::schmeisr) MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1") + MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) @@ -1225,7 +1225,7 @@ MACHINE_CONFIG_START(rohga_state::schmeisr) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index 5d202b66723..2b832513626 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -492,7 +492,7 @@ MACHINE_CONFIG_START(rpunch_state::rpunch) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, MASTER_CLOCK/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) @@ -544,7 +544,7 @@ MACHINE_CONFIG_START(rpunch_state::svolleybl) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, MASTER_CLOCK/4) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index 2b69234bf05..d2e2602d30f 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -470,7 +470,7 @@ MACHINE_CONFIG_START(s11_state::s11) MCFG_DEVICE_PROGRAM_MAP(s11_bg_map) MCFG_SPEAKER_STANDARD_MONO("bg") - MCFG_YM2151_ADD("ym2151", 3580000) + MCFG_DEVICE_ADD("ym2151", YM2151, 3580000) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11_state, ym2151_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index af6899b0ff7..7cfcc75b382 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -261,7 +261,7 @@ MACHINE_CONFIG_START(s11a_state::s11a) MCFG_DEVICE_PROGRAM_MAP(s11a_bg_map) MCFG_SPEAKER_STANDARD_MONO("bg") - MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11a_state, ym2151_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index 96f82b46022..109f2555430 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -337,7 +337,7 @@ MACHINE_CONFIG_START(s11b_state::s11b) MCFG_QUANTUM_TIME(attotime::from_hz(50)) MCFG_SPEAKER_STANDARD_MONO("bg") - MCFG_YM2151_ADD("ym2151", 3580000) + MCFG_DEVICE_ADD("ym2151", YM2151, 3580000) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11b_state, ym2151_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25) diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index 98dbccb7749..c5029197fb6 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -857,7 +857,7 @@ MACHINE_CONFIG_START(segahang_state::sound_board_2203) MCFG_SOUND_ROUTE(3, "lspeaker", 0.37) MCFG_SOUND_ROUTE(3, "rspeaker", 0.37) - MCFG_SEGAPCM_ADD("pcm", MASTER_CLOCK_8MHz) + MCFG_DEVICE_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -895,7 +895,7 @@ MACHINE_CONFIG_START(segahang_state::sound_board_2203x2) MCFG_SOUND_ROUTE(3, "lspeaker", 0.37) MCFG_SOUND_ROUTE(3, "rspeaker", 0.37) - MCFG_SEGAPCM_ADD("pcm", MASTER_CLOCK_8MHz/2) + MCFG_DEVICE_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -912,12 +912,12 @@ MACHINE_CONFIG_START(segahang_state::sound_board_2151) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK_8MHz/2) + MCFG_DEVICE_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.43) MCFG_SOUND_ROUTE(1, "rspeaker", 0.43) - MCFG_SEGAPCM_ADD("pcm", MASTER_CLOCK_8MHz/2) + MCFG_DEVICE_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index 64a5de44874..6818c4e9f0a 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -1190,11 +1190,11 @@ MACHINE_CONFIG_START(segaorun_state::outrun_base) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK/4) MCFG_SOUND_ROUTE(0, "lspeaker", 0.43) MCFG_SOUND_ROUTE(1, "rspeaker", 0.43) - MCFG_SEGAPCM_ADD("pcm", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("pcm", SEGAPCM, SOUND_CLOCK/4) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp index 8c4a52411b8..6dea58c5e11 100644 --- a/src/mame/drivers/segapico.cpp +++ b/src/mame/drivers/segapico.cpp @@ -404,7 +404,7 @@ MACHINE_CONFIG_START(pico_state::pico) MCFG_SOFTWARE_LIST_ADD("cart_list","pico") MCFG_DEVICE_ADD("315_5641", SEGA_315_5641_PCM, upd7759_device::STANDARD_CLOCK*2) - MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, pico_state,sound_cause_irq)) + //MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, pico_state,sound_cause_irq)) FIXME: this never worked - the MAME 315_5641 doesn't support slave mode MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16) MACHINE_CONFIG_END @@ -425,7 +425,7 @@ MACHINE_CONFIG_START(pico_state::picopal) MCFG_SOFTWARE_LIST_ADD("cart_list","pico") MCFG_DEVICE_ADD("315_5641", SEGA_315_5641_PCM, upd7759_device::STANDARD_CLOCK*2) - MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, pico_state,sound_cause_irq)) + //MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, pico_state,sound_cause_irq)) FIXME: this never worked - the MAME 315_5641 doesn't support slave mode MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index 7bd6f8632fa..1d4ff898b23 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -2019,7 +2019,7 @@ MACHINE_CONFIG_START(segas16a_state::system16a) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, segas16a_state, n7751_control_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.43) diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 7e0646428a7..47bc1cbf7f5 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -3749,7 +3749,7 @@ MACHINE_CONFIG_START(segas16b_state::system16b) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ym2151", MASTER_CLOCK_8MHz/2) + MCFG_DEVICE_ADD("ym2151", YM2151, MASTER_CLOCK_8MHz/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43) MCFG_DEVICE_ADD("upd", UPD7759) @@ -3948,7 +3948,7 @@ MACHINE_CONFIG_START(segas16b_state::lockonph) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", 0)) - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) // ?? + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) // ?? // MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) // does set up the timer, but end up with no sound? MCFG_SOUND_ROUTE(0, "mono", 0.5) MCFG_SOUND_ROUTE(1, "mono", 0.5) diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp index bc156c1f102..519378e9a6f 100644 --- a/src/mame/drivers/segas24.cpp +++ b/src/mame/drivers/segas24.cpp @@ -1911,7 +1911,7 @@ MACHINE_CONFIG_START(segas24_state::system24) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, segas24_state,irq_ym)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index fcfc764e7fd..274301fd6ba 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -1764,12 +1764,12 @@ MACHINE_CONFIG_START(segaxbd_state::xboard_base_mconfig ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.43) MCFG_SOUND_ROUTE(1, "rspeaker", 0.43) - MCFG_SEGAPCM_ADD("pcm", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("pcm", SEGAPCM, SOUND_CLOCK/4) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1949,7 +1949,7 @@ MACHINE_CONFIG_START(segaxbd_smgp_fd1094_state::device_add_mconfig) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright") - MCFG_SEGAPCM_ADD("pcm2", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("pcm2", SEGAPCM, SOUND_CLOCK/4) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "rearleft", 1.0) MCFG_SOUND_ROUTE(1, "rearright", 1.0) @@ -1990,7 +1990,7 @@ MACHINE_CONFIG_START(segaxbd_smgp_state::device_add_mconfig) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright") - MCFG_SEGAPCM_ADD("pcm2", SOUND_CLOCK/4) + MCFG_DEVICE_ADD("pcm2", SEGAPCM, SOUND_CLOCK/4) MCFG_SEGAPCM_BANK(BANK_512) MCFG_SOUND_ROUTE(0, "rearleft", 1.0) MCFG_SOUND_ROUTE(1, "rearright", 1.0) diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 684eb6e293f..ede8038ffef 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -1339,12 +1339,12 @@ MACHINE_CONFIG_START(segaybd_state::yboard) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, SOUND_CLOCK/8) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.43) MCFG_SOUND_ROUTE(1, "rspeaker", 0.43) - MCFG_SEGAPCM_ADD("pcm", SOUND_CLOCK/8) + MCFG_DEVICE_ADD("pcm", SEGAPCM, SOUND_CLOCK/8) MCFG_SEGAPCM_BANK_MASK(BANK_12M, BANK_MASKF8) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 36c5aa3242b..2c7e19a7319 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -9345,7 +9345,7 @@ MACHINE_CONFIG_START(seta_state::thunderlbl) /* the sound hardware / program is ripped from Tetris (S16B) */ MCFG_DEVICE_REMOVE("x1snd") - MCFG_YM2151_ADD("ymsnd", 10000000/2) + MCFG_DEVICE_ADD("ymsnd", YM2151, 10000000/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_GENERIC_LATCH_8_ADD("soundlatch1") diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index 412fdd4f61c..5a087f007d9 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -574,7 +574,7 @@ MACHINE_CONFIG_START(sf_state::sfan) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index f70c0a75972..f5bee429127 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -562,7 +562,7 @@ MACHINE_CONFIG_START(shadfrce_state::shadfrce) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 0430b4cff29..76bef305c4b 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -253,7 +253,7 @@ MACHINE_CONFIG_START(shisen_state::shisen) MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.5) MCFG_SOUND_ROUTE(1, "rspeaker", 0.5) diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp index 56f044a46ec..9101c89a5ed 100644 --- a/src/mame/drivers/sidearms.cpp +++ b/src/mame/drivers/sidearms.cpp @@ -612,7 +612,7 @@ MACHINE_CONFIG_START(sidearms_state::sidearms) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -661,7 +661,7 @@ MACHINE_CONFIG_START(sidearms_state::turtship) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -713,7 +713,7 @@ MACHINE_CONFIG_START(sidearms_state::whizz) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -734,7 +734,7 @@ MACHINE_CONFIG_START(sidearms_state::whizz) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index b9e434b7480..20bb2e9ec4f 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -2860,7 +2860,7 @@ MACHINE_CONFIG_START(sigmab98_state::sigmab98) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -2931,11 +2931,11 @@ MACHINE_CONFIG_START(lufykzku_state::lufykzku) MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ) // 2 x 8-bit parallel/serial converters - MCFG_TTL165_ADD("ttl165_1") + MCFG_DEVICE_ADD("ttl165_1", TTL165) MCFG_TTL165_DATA_CB(IOPORT("DSW2")) MCFG_TTL165_QH_CB(WRITELINE("ttl165_2", ttl165_device, serial_w)) - MCFG_TTL165_ADD("ttl165_2") + MCFG_DEVICE_ADD("ttl165_2", TTL165) MCFG_TTL165_DATA_CB(IOPORT("DSW1")) MCFG_TTL165_QH_CB(WRITELINE(*this, lufykzku_state, dsw_w)) @@ -2953,7 +2953,7 @@ MACHINE_CONFIG_START(lufykzku_state::lufykzku) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) -// MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") // same as sammymdl? +// MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) // same as sammymdl? // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -3016,7 +3016,7 @@ MACHINE_CONFIG_START(sigmab98_state::sammymdl) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) -// MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") // not on sammymdl? +// MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) // not on sammymdl? // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index ca39f4c70e0..5234b7946ea 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -297,7 +297,7 @@ MACHINE_CONFIG_START(silkroad_state::silkroad) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index 03db675c98f..250a5d2b38c 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -437,7 +437,7 @@ MACHINE_CONFIG_START(silvmil_state::silvmil) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* Verified */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* Verified */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) @@ -462,7 +462,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(silvmil_state::puzzlovek) puzzlove(config); MCFG_DEVICE_REMOVE("ymsnd") - MCFG_YM2151_ADD("ymsnd", XTAL(15'000'000)/4) /* Verified */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(15'000'000)/4) /* Verified */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp index 05c54d23deb..d9372ae8747 100644 --- a/src/mame/drivers/simpsons.cpp +++ b/src/mame/drivers/simpsons.cpp @@ -378,7 +378,7 @@ MACHINE_CONFIG_START(simpsons_state::simpsons) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) /* only left channel is connected */ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "lspeaker", 0.0) diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index d0d6c514c6e..57b06926576 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -909,7 +909,7 @@ MACHINE_CONFIG_START(slapfght_state::perfrman) MCFG_QUANTUM_PERFECT_CPU("maincpu") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -961,7 +961,7 @@ MACHINE_CONFIG_START(slapfght_state::tigerh) MCFG_QUANTUM_PERFECT_CPU("maincpu") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1034,7 +1034,7 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh) MCFG_QUANTUM_PERFECT_CPU("maincpu") /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 743dfd43d19..9fc2776aa9d 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -3692,7 +3692,7 @@ MACHINE_CONFIG_START(snk_state::marvins) MCFG_DEVICE_ADD("ay2", AY8910, 2000000) /* verified on schematics */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) - MCFG_SNKWAVE_ADD("wave", 8000000) /* verified on schematics */ + MCFG_DEVICE_ADD("wave", SNKWAVE, 8000000) /* verified on schematics */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp index a6450ba63e6..419feffcb3c 100644 --- a/src/mame/drivers/srumbler.cpp +++ b/src/mame/drivers/srumbler.cpp @@ -258,7 +258,7 @@ MACHINE_CONFIG_START(srumbler_state::srumbler) /* video hardware */ - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index cd249f5aca4..971d4220a53 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -854,7 +854,7 @@ MACHINE_CONFIG_START(suna16_state::bssoccer) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_GENERIC_LATCH_8_ADD("soundlatch3") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.2) MCFG_SOUND_ROUTE(1, "rspeaker", 0.2) @@ -915,7 +915,7 @@ MACHINE_CONFIG_START(suna16_state::uballoon) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) @@ -971,7 +971,7 @@ MACHINE_CONFIG_START(suna16_state::sunaq) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index 706b772e8fc..25848a0ee39 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -482,7 +482,7 @@ MACHINE_CONFIG_START(supbtime_state::supbtime) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'220'000) / 9) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ 2 MCFG_SOUND_ROUTE(0, "mono", 0.45) MCFG_SOUND_ROUTE(1, "mono", 0.45) diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index 5261ce3ffdc..2eb4ad1438b 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -460,7 +460,7 @@ MACHINE_CONFIG_START(supduck_state::supduck) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_GFXDECODE_ADD("gfxdecode", "palette", supduck) diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index b41c19efd4a..f855c66444f 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -212,7 +212,7 @@ MACHINE_CONFIG_START(surpratk_state::surpratk) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("maincpu", KONAMI_FIRQ_LINE)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index cf926e6038e..372525d92d0 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2087,7 +2087,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(0, "lspeaker", 0.32) MCFG_SOUND_ROUTE(1, "rspeaker", 0.32) MACHINE_CONFIG_END @@ -2107,7 +2107,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151_upd7759) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(0, "lspeaker", 0.32) MCFG_SOUND_ROUTE(1, "rspeaker", 0.32) @@ -2129,7 +2129,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::datsu_ym2151_msm5205) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", 4000000) + MCFG_DEVICE_ADD("ymsnd", YM2151, 4000000) MCFG_SOUND_ROUTE(0, "lspeaker", 0.32) MCFG_SOUND_ROUTE(1, "rspeaker", 0.32) diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 07b07a7a61f..dd8efaf4534 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -911,7 +911,7 @@ MACHINE_CONFIG_START(taitox_state::daisenpu) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 897d757d4e5..c4e535b2f93 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -900,7 +900,7 @@ MACHINE_CONFIG_START(apache3_state::apache3) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", CLOCK_1 / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, CLOCK_1 / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -948,7 +948,7 @@ MACHINE_CONFIG_START(roundup5_state::roundup5) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", CLOCK_1 / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, CLOCK_1 / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -1006,7 +1006,7 @@ MACHINE_CONFIG_START(cyclwarr_state::cyclwarr) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", CLOCK_1 / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, CLOCK_1 / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -1064,7 +1064,7 @@ MACHINE_CONFIG_START(cyclwarr_state::bigfight) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", CLOCK_1 / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, CLOCK_1 / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp index 6eb954f761b..5be7cc5dc0c 100644 --- a/src/mame/drivers/tceptor.cpp +++ b/src/mame/drivers/tceptor.cpp @@ -372,7 +372,7 @@ MACHINE_CONFIG_START(tceptor_state::tceptor) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index e7b4bfcb27a..d6a0ee30016 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -403,7 +403,7 @@ MACHINE_CONFIG_START(tecmo16_state::fstarfrc) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK/6) // 4 MHz + MCFG_DEVICE_ADD("ymsnd", YM2151, MASTER_CLOCK/6) // 4 MHz MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index a8f0a9a8421..22d5f10b497 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -464,7 +464,7 @@ MACHINE_CONFIG_START(terracre_state::ym3526) MCFG_DEVICE_IO_MAP(sound_3526_io_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(terracre_state, irq0_line_hold, XTAL(16'000'000)/4/512) // ? - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE( 60 ) diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp index 629c448ebe7..eb41a27c0bc 100644 --- a/src/mame/drivers/thunderx.cpp +++ b/src/mame/drivers/thunderx.cpp @@ -684,7 +684,7 @@ MACHINE_CONFIG_START(thunderx_state::scontra) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified on pcb */ MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index 7f6176b7970..45e8c28fd42 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -662,7 +662,7 @@ MACHINE_CONFIG_START(tigeroad_state::tigeroad) /* IRQs are triggered by the YM2203 */ /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60.08) /* verified on pcb */ @@ -739,7 +739,7 @@ MACHINE_CONFIG_START(tigeroad_state::f1dream_comad) MCFG_QUANTUM_TIME(attotime::from_hz(3600)) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60.08) /* verified on pcb */ diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 85d3e4e7e42..b7637285155 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -1955,7 +1955,7 @@ MACHINE_CONFIG_START(tmnt_state::cuebrick) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_6)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2009,7 +2009,7 @@ MACHINE_CONFIG_START(tmnt_state::mia) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2075,7 +2075,7 @@ MACHINE_CONFIG_START(tmnt_state::tmnt) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2139,7 +2139,7 @@ MACHINE_CONFIG_START(tmnt_state::punkshot) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "mono", 1.0) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2194,7 +2194,7 @@ MACHINE_CONFIG_START(tmnt_state::lgtnfght) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2255,7 +2255,7 @@ MACHINE_CONFIG_START(tmnt_state::blswhstl) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.70) MCFG_SOUND_ROUTE(1, "rspeaker", 0.70) @@ -2466,7 +2466,7 @@ MACHINE_CONFIG_START(tmnt_state::tmnt2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2525,7 +2525,7 @@ MACHINE_CONFIG_START(tmnt_state::ssriders) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2627,7 +2627,7 @@ MACHINE_CONFIG_START(tmnt_state::thndrx2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index 2ff8f32d9ef..8509b79f839 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -1735,7 +1735,7 @@ MACHINE_CONFIG_START(jpopnics_state::jpopnics) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) /* sound hardware */ - MCFG_YM2151_ADD("ymsnd", XTAL(12'000'000)/4) /* Not verified - Main board Crystal is 12MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(12'000'000)/4) /* Not verified - Main board Crystal is 12MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) MACHINE_CONFIG_END diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index c302202608f..fc915abf397 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -3317,7 +3317,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3408,7 +3408,7 @@ MACHINE_CONFIG_START(toaplan2_state::dogyuun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_OKIM6295_ADD("oki", XTAL(25'000'000)/24, PIN7_HIGH) /* verified on pcb */ @@ -3454,7 +3454,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) @@ -3527,7 +3527,7 @@ MACHINE_CONFIG_START(toaplan2_state::truxton2) #ifdef TRUXTON2_STEREO // music data is stereo... MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -3537,7 +3537,7 @@ MACHINE_CONFIG_START(toaplan2_state::truxton2) #else // ...but the hardware is mono MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4, PIN7_LOW) /* verified on pcb */ @@ -3704,7 +3704,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* verified on pcb */ @@ -3783,7 +3783,7 @@ MACHINE_CONFIG_START(toaplan2_state::vfive) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3827,7 +3827,7 @@ MACHINE_CONFIG_START(toaplan2_state::batsugun) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/8, PIN7_LOW) @@ -3929,7 +3929,7 @@ MACHINE_CONFIG_START(toaplan2_state::enmadaio) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4, PIN7_LOW) // pin7 not confirmed @@ -3966,7 +3966,7 @@ MACHINE_CONFIG_START(toaplan2_state::snowbro2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL(27'000'000)/10, PIN7_HIGH) @@ -4011,7 +4011,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) @@ -4056,7 +4056,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(27'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) @@ -4104,7 +4104,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga) MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) - MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'000'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/16, PIN7_HIGH) @@ -4166,7 +4166,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider) MCFG_GENERIC_LATCH_8_ADD("soundlatch3") MCFG_GENERIC_LATCH_8_ADD("soundlatch4") - MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator (verified) */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator (verified) */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000)/10, PIN7_HIGH) diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index c06ef647d33..9761f761c63 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -507,7 +507,7 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */ MCFG_DEVICE_ROM("audiocpu") /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.61) /* verified on pcb */ @@ -560,7 +560,7 @@ MACHINE_CONFIG_START(toki_state::tokib) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index 4ef1106c225..b7163c0b178 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -383,7 +383,7 @@ MACHINE_CONFIG_START(tomcat_state::tomcat) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181) / 4) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_CONFIG_END diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 2dc485aef8b..892637887d4 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -631,7 +631,7 @@ MACHINE_CONFIG_START(topspeed_state::topspeed) // sound hardware MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000) / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, topspeed_state, sound_bankswitch_w)) MCFG_SOUND_ROUTE(0, "filter1l", 1.0) diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index cabcd1ffbb8..45ae179220f 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -2171,7 +2171,7 @@ MACHINE_CONFIG_START(tumbleb_state::fncywld) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YM2151_ADD("ymsnd", 32220000/9) + MCFG_DEVICE_ADD("ymsnd", YM2151, 32220000/9) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified @@ -2234,7 +2234,7 @@ MACHINE_CONFIG_START(tumbleb_state::htchctch) MCFG_GENERIC_LATCH_8_ADD("soundlatch") /* on at least hatch catch, cookie & bibi and choky choky the YM2151 clock is connected directly to the Z80 clock so the speed should match */ - MCFG_YM2151_ADD("ymsnd", 15000000/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, 15000000/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index a30287199f7..f8b5784e99b 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -665,7 +665,7 @@ MACHINE_CONFIG_START(twin16_state::twin16) MCFG_WATCHDOG_ADD("watchdog") // video hardware - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 0, 40*8, 264, 2*8, 30*8) @@ -685,7 +685,7 @@ MACHINE_CONFIG_START(twin16_state::twin16) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -719,7 +719,7 @@ MACHINE_CONFIG_START(fround_state::fround) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 0, 40*8, 264, 2*8, 30*8) @@ -739,7 +739,7 @@ MACHINE_CONFIG_START(fround_state::fround) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 181a3c3c4dc..50cc0c7f480 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -692,7 +692,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr) MCFG_TOAPLAN_SCU_ADD("scu", "palette", 31, 15) - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram16") + MCFG_DEVICE_ADD("spriteram16", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp index 46f46c89117..8208499b092 100644 --- a/src/mame/drivers/ultraman.cpp +++ b/src/mame/drivers/ultraman.cpp @@ -228,7 +228,7 @@ MACHINE_CONFIG_START(ultraman_state::ultraman) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 24000000/6) + MCFG_DEVICE_ADD("ymsnd", YM2151, 24000000/6) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index 8b57666a2c8..b61f2475326 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -667,7 +667,7 @@ MACHINE_CONFIG_START(zeropnt2_state::zeropnt2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.70) MCFG_SOUND_ROUTE(1, "rspeaker", 0.70) diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 5552ee3e30f..8efd14855c1 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -1065,7 +1065,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vamphalf_state::sound_ym_oki) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(28'000'000)/8) /* 3.5MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(28'000'000)/8) /* 3.5MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1084,7 +1084,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vamphalf_state::sound_suplup) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(14'318'181)/4) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1239,7 +1239,7 @@ MACHINE_CONFIG_START(vamphalf_state::aoh) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index 340e04ff5a0..60920ca2a4b 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) /* video hardware */ - MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") + MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) @@ -280,7 +280,7 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) // uses a preset LS163 to force the odd speed + MCFG_DEVICE_ADD("ym2", YM2151, XTAL(32'220'000)/9) // uses a preset LS163 to force the odd speed MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */ MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp index 76f20180757..1801d3f518c 100644 --- a/src/mame/drivers/vball.cpp +++ b/src/mame/drivers/vball.cpp @@ -424,7 +424,7 @@ MACHINE_CONFIG_START(vball_state::vball) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index dada75a07d2..46df9f5a2ff 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -486,7 +486,7 @@ MACHINE_CONFIG_START(vendetta_state::vendetta) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified with PCB */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) /* verified with PCB */ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 85047960c3e..0853b8ff047 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -520,7 +520,7 @@ MACHINE_CONFIG_START(vigilant_state::vigilant) MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO) - MCFG_YM2151_ADD("ymsnd", 3579645) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579645) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.55) MCFG_SOUND_ROUTE(1, "rspeaker", 0.55) @@ -636,7 +636,7 @@ MACHINE_CONFIG_START(vigilant_state::kikcubic) MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO) - MCFG_YM2151_ADD("ymsnd", 3579645) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579645) MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.55) MCFG_SOUND_ROUTE(1, "rspeaker", 0.55) diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index f1c9c24bde3..3eb092a88e6 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -422,7 +422,7 @@ MACHINE_CONFIG_START(wardner_state::wardner) MCFG_TOAPLAN_SCU_ADD("scu", "palette", 32, 14) - MCFG_BUFFERED_SPRITERAM8_ADD("spriteram8") + MCFG_DEVICE_ADD("spriteram8", BUFFERED_SPRITERAM8) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 817d6173aad..5c37a3fa4a2 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -1078,7 +1078,7 @@ MACHINE_CONFIG_START(wecleman_state::wecleman) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", 3579545) + MCFG_DEVICE_ADD("ymsnd", YM2151, 3579545) MCFG_SOUND_ROUTE(0, "lspeaker", 0.85) MCFG_SOUND_ROUTE(1, "rspeaker", 0.85) diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index ea7b1c60bf0..fdd788e6832 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -439,7 +439,7 @@ MACHINE_CONFIG_START(wwfsstar_state::wwfsstar) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(3'579'545)) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index abb676613fb..74f0864f765 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2314,7 +2314,7 @@ MACHINE_CONFIG_START(x1_state::x1turbo) MCFG_DEVICE_MODIFY("fdc") MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, x1_state, fdc_drq_w)) - MCFG_YM2151_ADD("ym", MAIN_CLOCK/8) //option board + MCFG_DEVICE_ADD("ym", YM2151, MAIN_CLOCK/8) //option board MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 504edfee48d..6aa321b1c7d 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1695,7 +1695,7 @@ MACHINE_CONFIG_START(x68k_state::x68000) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ym2151", 4000000) + MCFG_DEVICE_ADD("ym2151", YM2151, 4000000) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, x68k_state,x68k_fm_irq)) MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, x68k_state,x68k_ct_w)) // CT1, CT2 from YM2151 port 0x1b MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 5f06ebb3beb..01b685409c6 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -522,7 +522,7 @@ MACHINE_CONFIG_START(xexex_state::xexex) MCFG_K054321_ADD("k054321", "lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(32'000'000)/8) // 4MHz MCFG_SOUND_ROUTE(0, "filter1_l", 0.50) MCFG_SOUND_ROUTE(0, "filter1_r", 0.50) MCFG_SOUND_ROUTE(1, "filter2_l", 0.50) diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index e79ff8b248f..cbd16afb735 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -340,7 +340,7 @@ MACHINE_CONFIG_START(xmen_state::xmen) MCFG_K054321_ADD("k054321", "lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) /* verified on pcb */ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20) MCFG_SOUND_ROUTE(1, "rspeaker", 0.20) @@ -405,7 +405,7 @@ MACHINE_CONFIG_START(xmen_state::xmen6p) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) + MCFG_DEVICE_ADD("ymsnd", YM2151, XTAL(16'000'000)/4) MCFG_SOUND_ROUTE(0, "lspeaker", 0.20) MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)