summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2018-09-19 13:15:47 +0100
committer smf- <smf-@users.noreply.github.com>2018-09-19 13:16:18 +0100
commit817495ed3ce92aa59ad29d7f1103f13a846a27d0 (patch)
treebe9fe59d51febd3fb0b951fa575132954f211227 /src
parentd12d0cab88138ca9be3cb9cbddd771ced7e9ec3d (diff)
fix regression (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/sound/2610intf.cpp10
-rw-r--r--src/devices/sound/2610intf.h1
2 files changed, 6 insertions, 5 deletions
diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp
index d6b269cf872..94d8758c5f8 100644
--- a/src/devices/sound/2610intf.cpp
+++ b/src/devices/sound/2610intf.cpp
@@ -109,10 +109,13 @@ void ym2610_device::device_start()
if (m_adpcm_a_region)
space(0).install_rom(0, m_adpcm_a_region->bytes() - 1, m_adpcm_a_region->base());
- if (m_adpcm_b_region)
- space(1).install_rom(1, m_adpcm_b_region->bytes() - 1, m_adpcm_b_region->base());
+ const std::string name("^" + std::string(basetag()) + ".deltat");
+ memory_region *adpcm_b_region = memregion(name.c_str());
+
+ if (adpcm_b_region)
+ space(1).install_rom(0, adpcm_b_region->bytes() - 1, adpcm_b_region->base());
else if (m_adpcm_a_region)
- space(1).install_rom(1, m_adpcm_a_region->bytes() - 1, m_adpcm_a_region->base());
+ space(1).install_rom(0, m_adpcm_a_region->bytes() - 1, m_adpcm_a_region->base());
}
/**** initialize YM2610 ****/
@@ -191,7 +194,6 @@ ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, co
, m_timer{ nullptr, nullptr }
, m_irq_handler(*this)
, m_adpcm_a_region(*this, DEVICE_SELF)
- , m_adpcm_b_region(*this, "deltat")
{
}
diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h
index b82cbf73b22..cf90c835186 100644
--- a/src/devices/sound/2610intf.h
+++ b/src/devices/sound/2610intf.h
@@ -66,7 +66,6 @@ private:
emu_timer * m_timer[2];
devcb_write_line m_irq_handler;
optional_memory_region m_adpcm_a_region;
- optional_memory_region m_adpcm_b_region;
static const ssg_callbacks psgintf;
};