diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp index 428bf1de639..a98cd163a49 100644 --- a/src/mame/audio/m72.cpp +++ b/src/mame/audio/m72.cpp @@ -51,11 +51,9 @@ DEFINE_DEVICE_TYPE(IREM_M72_AUDIO, m72_audio_device, "m72_audio", "Irem M72 Audi m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, IREM_M72_AUDIO, tag, owner, clock) - , device_sound_interface(mconfig, *this) + , device_rom_interface(mconfig, *this, 32) // unknown address bits , m_sample_addr(0) - , m_samples(*this, "^samples") - , m_samples_size(0) - , m_dac(*this, "^dac") + , m_dac(*this, finder_base::DUMMY_TAG) { } @@ -65,19 +63,23 @@ m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *ta void m72_audio_device::device_start() { - m_samples_size = m_samples.bytes(); - save_item(NAME(m_sample_addr)); } +//------------------------------------------------- +// rom_bank_updated - the rom bank has changed +//------------------------------------------------- +void m72_audio_device::rom_bank_updated() +{ +} void m72_audio_device::set_sample_start(int start) { m_sample_addr = start; } -WRITE8_MEMBER( m72_audio_device::vigilant_sample_addr_w ) +void m72_audio_device::vigilant_sample_addr_w(offs_t offset, u8 data) { if (offset == 1) m_sample_addr = (m_sample_addr & 0x00ff) | ((data << 8) & 0xff00); @@ -85,7 +87,7 @@ WRITE8_MEMBER( m72_audio_device::vigilant_sample_addr_w ) m_sample_addr = (m_sample_addr & 0xff00) | ((data << 0) & 0x00ff); } -WRITE8_MEMBER( m72_audio_device::shisen_sample_addr_w ) +void m72_audio_device::shisen_sample_addr_w(offs_t offset, u8 data) { m_sample_addr >>= 2; @@ -97,7 +99,7 @@ WRITE8_MEMBER( m72_audio_device::shisen_sample_addr_w ) m_sample_addr <<= 2; } -WRITE8_MEMBER( m72_audio_device::rtype2_sample_addr_w ) +void m72_audio_device::rtype2_sample_addr_w(offs_t offset, u8 data) { m_sample_addr >>= 5; @@ -109,7 +111,7 @@ WRITE8_MEMBER( m72_audio_device::rtype2_sample_addr_w ) m_sample_addr <<= 5; } -WRITE8_MEMBER( m72_audio_device::poundfor_sample_addr_w ) +void m72_audio_device::poundfor_sample_addr_w(offs_t offset, u8 data) { /* poundfor writes both sample start and sample END - a first for Irem... we don't handle the end written here, 00 marks the sample end as usual. */ @@ -125,22 +127,13 @@ WRITE8_MEMBER( m72_audio_device::poundfor_sample_addr_w ) m_sample_addr <<= 4; } -READ8_MEMBER( m72_audio_device::sample_r ) +u8 m72_audio_device::sample_r() { - return m_samples[m_sample_addr]; + return read_byte(m_sample_addr); } -WRITE8_MEMBER( m72_audio_device::sample_w ) +void m72_audio_device::sample_w(u8 data) { m_dac->write(data); - m_sample_addr = (m_sample_addr + 1) & (m_samples_size - 1); -} - - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void m72_audio_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) -{ + m_sample_addr++; } diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h index 83509e0e739..798cacad3c8 100644 --- a/src/mame/audio/m72.h +++ b/src/mame/audio/m72.h @@ -12,34 +12,33 @@ #include "sound/dac.h" -class m72_audio_device : public device_t, public device_sound_interface +class m72_audio_device : public device_t, public device_rom_interface { public: m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); ~m72_audio_device() {} - DECLARE_READ8_MEMBER(sample_r); - DECLARE_WRITE8_MEMBER(sample_w); + template void set_dac_tag(T &&tag) { m_dac.set_tag(std::forward(tag)); } + u8 sample_r(); + void sample_w(u8 data); /* the port goes to different address bits depending on the game */ void set_sample_start(int start); - DECLARE_WRITE8_MEMBER(vigilant_sample_addr_w); - DECLARE_WRITE8_MEMBER(shisen_sample_addr_w); - DECLARE_WRITE8_MEMBER(rtype2_sample_addr_w); - DECLARE_WRITE8_MEMBER(poundfor_sample_addr_w); + void vigilant_sample_addr_w(offs_t offset, u8 data); + void shisen_sample_addr_w(offs_t offset, u8 data); + void rtype2_sample_addr_w(offs_t offset, u8 data); + void poundfor_sample_addr_w(offs_t offset, u8 data); protected: // device-level overrides virtual void device_start() override; - // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; + // device_rom_interface overrides + virtual void rom_bank_updated() override; private: // internal state uint32_t m_sample_addr; - optional_region_ptr m_samples; - uint32_t m_samples_size; optional_device m_dac; }; diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 0f28dc9212b..e5dc5e0584c 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -449,10 +449,9 @@ int m72_state::find_sample(int num) INTERRUPT_GEN_MEMBER(m72_state::fake_nmi) { - address_space &space = generic_space(); - int sample = m_audio->sample_r(space,0); + int sample = m_audio->sample_r(); if (sample) - m_audio->sample_w(space,0,sample); + m_audio->sample_w(sample); } @@ -1819,13 +1818,15 @@ void m72_state::m72_audio_chips(machine_config &config) m_soundcpu->set_irq_acknowledge_callback("soundirq", FUNC(rst_neg_buffer_device::inta_cb)); - IREM_M72_AUDIO(config, "m72"); + IREM_M72_AUDIO(config, m_audio); + m_audio->set_device_rom_tag("samples"); + m_audio->set_dac_tag("dac"); ym2151_device &ymsnd(YM2151(config, "ymsnd", SOUND_CLOCK)); ymsnd.irq_handler().set("soundirq", FUNC(rst_neg_buffer_device::rst28_w)); ymsnd.add_route(ALL_OUTPUTS, "speaker", 1.0); - DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.2); // unknown DAC + DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.3); // unknown DAC voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT); diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index e6b27b02fab..12dbe65962e 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -701,30 +701,28 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(m90_state::fake_nmi) { - address_space &space = m_maincpu->space(AS_PROGRAM); - int sample = m_audio->sample_r(space,0); + int sample = m_audio->sample_r(); if (sample) - m_audio->sample_w(space,0,sample); + m_audio->sample_w(sample); } INTERRUPT_GEN_MEMBER(m90_state::bomblord_fake_nmi) { - address_space &space = m_maincpu->space(AS_PROGRAM); - int sample = m_audio->sample_r(space,0); + int sample = m_audio->sample_r(); if (sample != 0x80) - m_audio->sample_w(space,0,sample); + m_audio->sample_w(sample); } WRITE_LINE_MEMBER(m90_state::dynablsb_vblank_int_w) { if (state) - m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x60/4); // V35 + m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x60/4); // V30 } WRITE_LINE_MEMBER(m90_state::bomblord_vblank_int_w) { if (state) - m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x50/4); // V35 + m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x50/4); // V30 } @@ -765,7 +763,8 @@ void m90_state::m90(machine_config &config) RST_NEG_BUFFER(config, "soundirq", 0).int_callback().set_inputline(m_soundcpu, 0); - IREM_M72_AUDIO(config, "m72"); + IREM_M72_AUDIO(config, m_audio); + m_audio->set_dac_tag("dac"); ym2151_device &ymsnd(YM2151(config, "ymsnd", XTAL(3'579'545))); /* verified on pcb */ ymsnd.irq_handler().set("soundirq", FUNC(rst_neg_buffer_device::rst28_w)); @@ -894,7 +893,7 @@ ROM_START( hasamu ) ROM_LOAD( "hasc-c2.bin", 0x040000, 0x20000, CRC(d90f9a68) SHA1(c9eab3e87dd5d3eb88461be493d88f5482c9e257) ) ROM_LOAD( "hasc-c3.bin", 0x060000, 0x20000, CRC(6cfe0d39) SHA1(104feeacbbc86b168c41cd37fc5797781d9b5a0f) ) - ROM_REGION( 0x20000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x20000, "m72", ROMREGION_ERASE00 ) /* samples */ /* No samples */ ROM_END @@ -913,7 +912,7 @@ ROM_START( dynablst ) ROM_LOAD( "bbm-c2.68", 0x080000, 0x40000, CRC(0700d406) SHA1(0d43a31a726b0de0004beef41307de2508106b69) ) ROM_LOAD( "bbm-c3.69", 0x0c0000, 0x40000, CRC(3c3613af) SHA1(f9554a73e95102333e449f6e81f2bb817ec00881) ) - ROM_REGION( 0x20000, "samples", 0 ) /* samples */ + ROM_REGION( 0x20000, "m72", 0 ) /* samples */ ROM_LOAD( "bbm-v0.20", 0x0000, 0x20000, CRC(0fa803fe) SHA1(d2ac1e624de38bed385442ceae09a76f203fa084) ) ROM_END @@ -932,7 +931,7 @@ ROM_START( bombrman ) ROM_LOAD( "bbm-c2.68", 0x080000, 0x40000, CRC(0700d406) SHA1(0d43a31a726b0de0004beef41307de2508106b69) ) ROM_LOAD( "bbm-c3.69", 0x0c0000, 0x40000, CRC(3c3613af) SHA1(f9554a73e95102333e449f6e81f2bb817ec00881) ) - ROM_REGION( 0x20000, "samples", 0 ) /* samples */ + ROM_REGION( 0x20000, "m72", 0 ) /* samples */ ROM_LOAD( "bbm-v0.20", 0x0000, 0x20000, CRC(0fa803fe) SHA1(d2ac1e624de38bed385442ceae09a76f203fa084) ) ROM_END @@ -951,7 +950,7 @@ ROM_START( atompunk ) ROM_LOAD( "bbm-c2.68", 0x080000, 0x40000, CRC(0700d406) SHA1(0d43a31a726b0de0004beef41307de2508106b69) ) /* Labeled as 9134HD002 */ ROM_LOAD( "bbm-c3.69", 0x0c0000, 0x40000, CRC(3c3613af) SHA1(f9554a73e95102333e449f6e81f2bb817ec00881) ) /* Labeled as 9134HD003 */ - ROM_REGION( 0x20000, "samples", 0 ) /* samples */ + ROM_REGION( 0x20000, "m72", 0 ) /* samples */ ROM_LOAD( "bbm-v0.20", 0x0000, 0x20000, CRC(0fa803fe) SHA1(d2ac1e624de38bed385442ceae09a76f203fa084) ) /* Labeled as 9132E9001 */ ROM_END @@ -970,7 +969,7 @@ ROM_START( dynablstb ) ROM_LOAD( "bbm-c2.68", 0x080000, 0x40000, CRC(0700d406) SHA1(0d43a31a726b0de0004beef41307de2508106b69) ) ROM_LOAD( "bbm-c3.69", 0x0c0000, 0x40000, CRC(3c3613af) SHA1(f9554a73e95102333e449f6e81f2bb817ec00881) ) - ROM_REGION( 0x20000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x20000, "m72", ROMREGION_ERASE00 ) /* samples */ /* the samples are in the Z80 ROM in this bootleg */ ROM_END @@ -989,7 +988,7 @@ ROM_START( dynablstb2 ) ROM_LOAD( "bbm-c2.68", 0x080000, 0x40000, CRC(0700d406) SHA1(0d43a31a726b0de0004beef41307de2508106b69) ) ROM_LOAD( "bbm-c3.69", 0x0c0000, 0x40000, CRC(3c3613af) SHA1(f9554a73e95102333e449f6e81f2bb817ec00881) ) - ROM_REGION( 0x20000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x20000, "m72", ROMREGION_ERASE00 ) /* samples */ /* the samples are in the Z80 ROM in this bootleg */ ROM_END @@ -1019,7 +1018,7 @@ ROM_START( dynablstb3 ) ROM_LOAD( "5.ic108", 0x080000, 0x40000, CRC(0700d406) SHA1(0d43a31a726b0de0004beef41307de2508106b69) ) ROM_LOAD( "4.ic107", 0x0c0000, 0x40000, CRC(3c3613af) SHA1(f9554a73e95102333e449f6e81f2bb817ec00881) ) - ROM_REGION( 0x20000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x20000, "m72", ROMREGION_ERASE00 ) /* samples */ /* the samples are in the Z80 ROM in this bootleg */ ROM_END @@ -1077,7 +1076,7 @@ ROM_START( bbmanw ) ROM_LOAD( "bbm2-c2.83", 0x100000, 0x40000, CRC(9ac2142f) SHA1(744fe1acae2fcba0051c303b644081546b4aed9e) ) ROM_LOAD( "bbm2-c3.84", 0x180000, 0x40000, CRC(47af1750) SHA1(dce176a6ca95852208b6eba7fb88a0d96467c34b) ) - ROM_REGION( 0x20000, "samples", 0 ) + ROM_REGION( 0x20000, "m72", 0 ) ROM_LOAD( "bbm2-v0.30", 0x0000, 0x20000, CRC(4ad889ed) SHA1(b685892a2348f17f89c6d6ce91216f6cf1e33751) ) ROM_END @@ -1096,7 +1095,7 @@ ROM_START( bbmanwj ) ROM_LOAD( "bbm2-c2.83", 0x100000, 0x40000, CRC(9ac2142f) SHA1(744fe1acae2fcba0051c303b644081546b4aed9e) ) ROM_LOAD( "bbm2-c3.84", 0x180000, 0x40000, CRC(47af1750) SHA1(dce176a6ca95852208b6eba7fb88a0d96467c34b) ) - ROM_REGION( 0x20000, "samples", 0 ) /* samples */ + ROM_REGION( 0x20000, "m72", 0 ) /* samples */ ROM_LOAD( "bbm2-v0-b.30", 0x0000, 0x20000, CRC(0ae655ff) SHA1(78752182662fd8f5b55bbbc2787c9f2b04096ea1) ) ROM_END @@ -1115,7 +1114,7 @@ ROM_START( bbmanwja ) ROM_LOAD( "bbm2-c2.83", 0x100000, 0x40000, CRC(9ac2142f) SHA1(744fe1acae2fcba0051c303b644081546b4aed9e) ) ROM_LOAD( "bbm2-c3.84", 0x180000, 0x40000, CRC(47af1750) SHA1(dce176a6ca95852208b6eba7fb88a0d96467c34b) ) - ROM_REGION( 0x20000, "samples", 0 ) /* samples */ + ROM_REGION( 0x20000, "m72", 0 ) /* samples */ ROM_LOAD( "bbm2-v0-b.30", 0x0000, 0x20000, CRC(0ae655ff) SHA1(78752182662fd8f5b55bbbc2787c9f2b04096ea1) ) ROM_END @@ -1134,7 +1133,7 @@ ROM_START( newapunk ) ROM_LOAD( "bbm2-c2.83", 0x100000, 0x40000, CRC(9ac2142f) SHA1(744fe1acae2fcba0051c303b644081546b4aed9e) ) ROM_LOAD( "bbm2-c3.84", 0x180000, 0x40000, CRC(47af1750) SHA1(dce176a6ca95852208b6eba7fb88a0d96467c34b) ) - ROM_REGION( 0x20000, "samples", 0 ) /* samples */ + ROM_REGION( 0x20000, "m72", 0 ) /* samples */ ROM_LOAD( "bbm2-v0.30", 0x0000, 0x20000, CRC(4ad889ed) SHA1(b685892a2348f17f89c6d6ce91216f6cf1e33751) ) ROM_END @@ -1157,7 +1156,7 @@ ROM_START( bomblord ) // ROM_LOAD( "bomblord.7", 0x100000, 0x40000, CRC(68935e94) SHA1(6725c7ad49bd0ee6ed1db22193852a11cdf95aaa) ) ROM_LOAD( "27c020_8.u72", 0x180000, 0x40000, CRC(6a423b24) SHA1(d30dac90a7dc2a616714eae7450ae0edef566c31) ) - ROM_REGION( 0x20000, "samples", 0 ) + ROM_REGION( 0x20000, "m72", 0 ) ROM_LOAD( "27c010_2.u104", 0x0000, 0x20000, CRC(37d356bd) SHA1(15f187954f94e2b1a4757e4a27ab7be9598972ff) ) ROM_REGION( 0x700, "plds", ROMREGION_ERASE00 ) // all read protected @@ -1185,7 +1184,7 @@ ROM_START( quizf1 ) ROM_LOAD( "qf1-c2-.83", 0x100000, 0x80000, CRC(0b1460ae) SHA1(c6394e6bb2a4e3722c20d9f291cb6ba7aad5766d) ) ROM_LOAD( "qf1-c3-.84", 0x180000, 0x80000, CRC(2d32ff37) SHA1(f414f6bad1ffc4396fd757155e602bdefdc99408) ) - ROM_REGION( 0x40000, "samples", 0 ) /* samples */ + ROM_REGION( 0x40000, "m72", 0 ) /* samples */ ROM_LOAD( "qf1-v0-.30", 0x0000, 0x40000, CRC(b8d16e7c) SHA1(28a20afb171dc68848f9fe793f53571d4c7502dd) ) ROM_END @@ -1204,7 +1203,7 @@ ROM_START( riskchal ) ROM_LOAD( "rc_c2.rom", 0x100000, 0x80000, CRC(687164d7) SHA1(0f0beb0a85ae5ae4434d1e45a27bbe67f5ee378a) ) ROM_LOAD( "rc_c3.rom", 0x180000, 0x80000, CRC(c86be6af) SHA1(c8a66b8b38a62e3eebb4a0e65a85e20f91182097) ) - ROM_REGION( 0x40000, "samples", 0 ) /* samples */ + ROM_REGION( 0x40000, "m72", 0 ) /* samples */ ROM_LOAD( "rc_v0.rom", 0x0000, 0x40000, CRC(cddac360) SHA1(a3b18325991473c6d54b778a02bed86180aad37c) ) ROM_END @@ -1223,7 +1222,7 @@ ROM_START( gussun ) ROM_LOAD( "rc_c2.rom", 0x100000, 0x80000, CRC(687164d7) SHA1(0f0beb0a85ae5ae4434d1e45a27bbe67f5ee378a) ) ROM_LOAD( "rc_c3.rom", 0x180000, 0x80000, CRC(c86be6af) SHA1(c8a66b8b38a62e3eebb4a0e65a85e20f91182097) ) - ROM_REGION( 0x40000, "samples", 0 ) /* samples */ + ROM_REGION( 0x40000, "m72", 0 ) /* samples */ ROM_LOAD( "rc_v0.rom", 0x0000, 0x40000, CRC(cddac360) SHA1(a3b18325991473c6d54b778a02bed86180aad37c) ) ROM_END @@ -1242,7 +1241,7 @@ ROM_START( matchit2 ) ROM_LOAD( "ic83.rom", 0x100000, 0x80000, CRC(2bd65dc6) SHA1(b50dec707ea5a71972df0a8dc47141d75e8f874e) ) ROM_LOAD( "ic84.rom", 0x180000, 0x80000, CRC(876d5fdb) SHA1(723c58268be60f4973e914df238b264708d3f1e3) ) - ROM_REGION( 0x20000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x20000, "m72", ROMREGION_ERASE00 ) /* samples */ /* Does this have a sample rom? */ ROM_END @@ -1261,7 +1260,7 @@ ROM_START( shisen2 ) ROM_LOAD( "ic83.rom", 0x100000, 0x80000, CRC(2bd65dc6) SHA1(b50dec707ea5a71972df0a8dc47141d75e8f874e) ) ROM_LOAD( "ic84.rom", 0x180000, 0x80000, CRC(876d5fdb) SHA1(723c58268be60f4973e914df238b264708d3f1e3) ) - ROM_REGION( 0x20000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x20000, "m72", ROMREGION_ERASE00 ) /* samples */ /* Does this have a sample rom? */ ROM_END diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index e4e91e6e2ea..d6a1592d95a 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -251,6 +251,7 @@ void shisen_state::shisen(machine_config &config) RST_NEG_BUFFER(config, "soundirq", 0).int_callback().set_inputline("soundcpu", 0); IREM_M72_AUDIO(config, m_audio); + m_audio->set_dac_tag("dac"); ym2151_device &ymsnd(YM2151(config, "ymsnd", 3579545)); ymsnd.irq_handler().set("soundirq", FUNC(rst_neg_buffer_device::rst28_w)); @@ -298,7 +299,7 @@ ROM_START( sichuan2 ) ROM_LOAD( "ic10.06", 0xe0000, 0x10000, CRC(473b349a) SHA1(9f5d08e07c8175bc7ec3854499177af2c398bd76) ) ROM_LOAD( "ic11.07", 0xf0000, 0x10000, CRC(d9a60285) SHA1(f8ef211e022e9c8ea25f6d8fb16266867656a591) ) - ROM_REGION( 0x40000, "samples", 0 ) /* samples */ + ROM_REGION( 0x40000, "m72", 0 ) /* samples */ ROM_LOAD( "ic02.02", 0x00000, 0x10000, CRC(92f0093d) SHA1(530b924aa991283045577d03524dfc7eacf1be49) ) ROM_LOAD( "ic03.03", 0x10000, 0x10000, CRC(116a049c) SHA1(656c0d1d7f945c5f5637892721a58421b682fd01) ) ROM_LOAD( "ic04.04", 0x20000, 0x10000, CRC(6840692b) SHA1(f6f7b063ecf7206e172843515be38376f8845b42) ) @@ -332,7 +333,7 @@ ROM_START( sichuan2a ) ROM_LOAD( "ic10.06", 0xe0000, 0x10000, CRC(473b349a) SHA1(9f5d08e07c8175bc7ec3854499177af2c398bd76) ) ROM_LOAD( "ic11.07", 0xf0000, 0x10000, CRC(d9a60285) SHA1(f8ef211e022e9c8ea25f6d8fb16266867656a591) ) - ROM_REGION( 0x40000, "samples", 0 ) /* samples */ + ROM_REGION( 0x40000, "m72", 0 ) /* samples */ ROM_LOAD( "ic02.02", 0x00000, 0x10000, CRC(92f0093d) SHA1(530b924aa991283045577d03524dfc7eacf1be49) ) ROM_LOAD( "ic03.03", 0x10000, 0x10000, CRC(116a049c) SHA1(656c0d1d7f945c5f5637892721a58421b682fd01) ) ROM_LOAD( "ic04.04", 0x20000, 0x10000, CRC(6840692b) SHA1(f6f7b063ecf7206e172843515be38376f8845b42) ) @@ -365,7 +366,7 @@ ROM_START( shisen ) ROM_LOAD( "ic10.06", 0xe0000, 0x10000, CRC(473b349a) SHA1(9f5d08e07c8175bc7ec3854499177af2c398bd76) ) ROM_LOAD( "ic11.07", 0xf0000, 0x10000, CRC(d9a60285) SHA1(f8ef211e022e9c8ea25f6d8fb16266867656a591) ) - ROM_REGION( 0x40000, "samples", 0 ) /* samples */ + ROM_REGION( 0x40000, "m72", 0 ) /* samples */ ROM_LOAD( "ic02.02", 0x00000, 0x10000, CRC(92f0093d) SHA1(530b924aa991283045577d03524dfc7eacf1be49) ) ROM_LOAD( "ic03.03", 0x10000, 0x10000, CRC(116a049c) SHA1(656c0d1d7f945c5f5637892721a58421b682fd01) ) ROM_LOAD( "ic04.04", 0x20000, 0x10000, CRC(6840692b) SHA1(f6f7b063ecf7206e172843515be38376f8845b42) ) @@ -438,7 +439,7 @@ ROM_START( matchit ) ROM_LOAD( "ic10.06", 0xe0000, 0x10000, CRC(473b349a) SHA1(9f5d08e07c8175bc7ec3854499177af2c398bd76) ) ROM_LOAD( "ic11.07", 0xf0000, 0x10000, CRC(d9a60285) SHA1(f8ef211e022e9c8ea25f6d8fb16266867656a591) ) - ROM_REGION( 0x40000, "samples", ROMREGION_ERASE00 ) /* samples */ + ROM_REGION( 0x40000, "m72", ROMREGION_ERASE00 ) /* samples */ /* no samples on this board */ ROM_END diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 6d40069b725..f58c86c6d40 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -518,6 +518,7 @@ void vigilant_state::vigilant(machine_config &config) RST_NEG_BUFFER(config, "soundirq", 0).int_callback().set_inputline("soundcpu", 0); IREM_M72_AUDIO(config, m_audio); + m_audio->set_dac_tag("dac"); ym2151_device &ymsnd(YM2151(config, "ymsnd", 3.579545_MHz_XTAL)); ymsnd.irq_handler().set("soundirq", FUNC(rst_neg_buffer_device::rst28_w)); @@ -570,6 +571,7 @@ void vigilant_state::buccanrs(machine_config &config) RST_NEG_BUFFER(config, "soundirq", 0).int_callback().set_inputline("soundcpu", 0); IREM_M72_AUDIO(config, m_audio); + m_audio->set_dac_tag("dac"); ym2203_device &ym1(YM2203(config, "ym1", 18432000/6)); ym1.irq_handler().set("soundirq", FUNC(rst_neg_buffer_device::rst28_w)); @@ -638,6 +640,7 @@ void vigilant_state::kikcubic(machine_config &config) RST_NEG_BUFFER(config, "soundirq", 0).int_callback().set_inputline("soundcpu", 0); IREM_M72_AUDIO(config, m_audio); + m_audio->set_dac_tag("dac"); ym2151_device &ymsnd(YM2151(config, "ymsnd", 3.579545_MHz_XTAL)); ymsnd.irq_handler().set("soundirq", FUNC(rst_neg_buffer_device::rst28_w)); @@ -689,7 +692,7 @@ ROM_START( vigilant ) // World Rev E ROM_LOAD( "vg_b-1f-.ic3", 0x10000, 0x10000, CRC(d0d33673) SHA1(39761d97a71deaf7f17233d5bd5a55dbb1e6b30e) ) ROM_LOAD( "vg_b-1h-.ic4", 0x20000, 0x10000, CRC(aae81695) SHA1(ca8e136eca3543b27f3a61b105d4a280711cd6ea) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "vg_a-4d-.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -729,7 +732,7 @@ ROM_START( vigilantg ) // US Rev G ROM_LOAD( "vg_b-1f-.ic3", 0x10000, 0x10000, CRC(d0d33673) SHA1(39761d97a71deaf7f17233d5bd5a55dbb1e6b30e) ) ROM_LOAD( "vg_b-1h-.ic4", 0x20000, 0x10000, CRC(aae81695) SHA1(ca8e136eca3543b27f3a61b105d4a280711cd6ea) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "vg_a-4d-.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -771,7 +774,7 @@ ROM_START( vigilanto ) // US (earliest base version) ROM_LOAD( "612.ic4", 0x20000, 0x10000, CRC(85057c81) SHA1(47663e17f08f47d847605c14e849266468ff39ba) ) ROM_IGNORE(0x10000) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "vg_a-4d-.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -813,7 +816,7 @@ ROM_START( vigilanta ) // World Rev A ROM_LOAD( "612.ic4", 0x20000, 0x10000, CRC(85057c81) SHA1(47663e17f08f47d847605c14e849266468ff39ba) ) ROM_IGNORE(0x10000) - ROM_REGION( 0x10000, "samples", 0 ) /* samples, matches base set */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples, matches base set */ ROM_LOAD( "vg_a-4d-a.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -855,7 +858,7 @@ ROM_START( vigilantb ) // US Rev B ROM_LOAD( "612.ic4", 0x20000, 0x10000, CRC(85057c81) SHA1(47663e17f08f47d847605c14e849266468ff39ba) ) ROM_IGNORE(0x10000) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "vg_a-4d-.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -897,7 +900,7 @@ ROM_START( vigilantc ) // World Rev C ROM_LOAD( "612.ic4", 0x20000, 0x10000, CRC(85057c81) SHA1(47663e17f08f47d847605c14e849266468ff39ba) ) ROM_IGNORE(0x10000) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "vg_a-4d-.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -939,7 +942,7 @@ ROM_START( vigilantd ) // Japan Rev D ROM_LOAD( "612.ic4", 0x20000, 0x10000, CRC(85057c81) SHA1(47663e17f08f47d847605c14e849266468ff39ba) ) ROM_IGNORE(0x10000) - ROM_REGION( 0x10000, "samples", 0 ) /* samples, matches base set */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples, matches base set */ ROM_LOAD( "vg_a-4d-d.ic26", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - protected */ @@ -979,7 +982,7 @@ ROM_START( vigilantbl ) /* Bootleg */ ROM_LOAD( "e01_c06.bin", 0x10000, 0x10000, CRC(d0d33673) SHA1(39761d97a71deaf7f17233d5bd5a55dbb1e6b30e) ) ROM_LOAD( "f01_c07.bin", 0x20000, 0x10000, CRC(aae81695) SHA1(ca8e136eca3543b27f3a61b105d4a280711cd6ea) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "d04_c01.bin", 0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) ) ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - not convinced these exist in this form on bootleg */ @@ -1006,7 +1009,7 @@ ROM_START( kikcubic ) ROM_LOAD( "mqj-00", 0x00000, 0x40000, CRC(7fb0c58f) SHA1(f70ff39e2d648606686c87cf1a7a3ffb46c2656a) ) ROM_LOAD( "mqj-10", 0x40000, 0x40000, CRC(3a189205) SHA1(063d664d4cf709931b5e3a5b6eb7c75bcd57b518) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "mqj-v0", 0x00000, 0x10000, CRC(54762956) SHA1(f08e983af28b16d27505d465ca64e7c7a93373a4) ) ROM_REGION( 0x0140, "proms", 0 ) @@ -1039,7 +1042,7 @@ ROM_START( kikcubicb ) ROM_LOAD( "8.bin", 0x50000, 0x10000, CRC(947dbd4e) SHA1(278ad7126bacb752886800cf48c6fe704427149d) ) ROM_RELOAD( 0x70000, 0x10000 ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "mqj-v0", 0x00000, 0x10000, CRC(54762956) SHA1(f08e983af28b16d27505d465ca64e7c7a93373a4) ) ROM_REGION( 0x0140, "proms", 0 ) @@ -1073,7 +1076,7 @@ ROM_START( buccanrs ) ROM_LOAD( "bc-009_k-163.u49", 0x20000, 0x20000, CRC(0c6188fb) SHA1(d49034384c6d0e94db2890223b32a2a49e79a639) ) ROM_LOAD( "bc-010_k-163.u27", 0x00000, 0x20000, CRC(2d383ff8) SHA1(3062baac27feba69c6ed94935c5ced72d89ed4fb) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "bc-002_k-0161.u74", 0x00000, 0x10000, CRC(36ee1dac) SHA1(6dfd2a885c0b1c9347abc4b204ade66551c4b404) ) ROM_REGION( 0x400, "proms", 0 ) @@ -1112,7 +1115,7 @@ ROM_START( buccanrsa ) ROM_LOAD( "bc-009_k-163.u49", 0x20000, 0x20000, CRC(0c6188fb) SHA1(d49034384c6d0e94db2890223b32a2a49e79a639) ) ROM_LOAD( "bc-010_k-163.u27", 0x00000, 0x20000, CRC(2d383ff8) SHA1(3062baac27feba69c6ed94935c5ced72d89ed4fb) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "bc-002_k-0161.u74", 0x00000, 0x10000, CRC(36ee1dac) SHA1(6dfd2a885c0b1c9347abc4b204ade66551c4b404) ) ROM_REGION( 0x400, "proms", 0 ) @@ -1147,7 +1150,7 @@ ROM_START( buccanrsb ) ROM_LOAD( "bc-009_k-163.u49", 0x20000, 0x20000, CRC(0c6188fb) SHA1(d49034384c6d0e94db2890223b32a2a49e79a639) ) ROM_LOAD( "bc-010_k-163.u27", 0x00000, 0x20000, CRC(2d383ff8) SHA1(3062baac27feba69c6ed94935c5ced72d89ed4fb) ) - ROM_REGION( 0x10000, "samples", 0 ) /* samples */ + ROM_REGION( 0x10000, "m72", 0 ) /* samples */ ROM_LOAD( "bc-002_k-0161.u74", 0x00000, 0x10000, CRC(36ee1dac) SHA1(6dfd2a885c0b1c9347abc4b204ade66551c4b404) ) ROM_REGION( 0x400, "proms", 0 )