summaryrefslogtreecommitdiffstats
path: root/src/devices/sound/tms5220.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/sound/tms5220.cpp')
-rw-r--r--src/devices/sound/tms5220.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index ac512ffb004..f5b2fd9c202 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -1454,12 +1454,12 @@ void tms5220_device::update_ready_state()
void tms5220_device::device_start()
{
- if (m_speechrom_tag)
+ if (!m_speechrom_tag.empty())
{
m_speechrom = siblingdevice<speechrom_device>( m_speechrom_tag );
if( !m_speechrom )
{
- throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag(), m_speechrom_tag );
+ throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag().c_str(), m_speechrom_tag.c_str() );
}
}
else
@@ -1904,7 +1904,7 @@ void tms5220_device::set_frequency(int frequency)
const device_type TMS5220C = &device_creator<tms5220c_device>;
-tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5220c_device::tms5220c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, TMS5220C, "TMS5220C", tag, owner, clock, "tms5220c", __FILE__)
{
}
@@ -1912,21 +1912,19 @@ tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag,
const device_type TMS5220 = &device_creator<tms5220_device>;
-tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5220_device::tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS5220, "TMS5220", tag, owner, clock, "tms5220", __FILE__),
device_sound_interface(mconfig, *this),
m_irq_handler(*this),
- m_readyq_handler(*this),
- m_speechrom_tag(nullptr)
+ m_readyq_handler(*this)
{
}
-tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_irq_handler(*this),
- m_readyq_handler(*this),
- m_speechrom_tag(nullptr)
+ m_readyq_handler(*this)
{
}
@@ -1943,7 +1941,7 @@ void tms5220_device::device_config_complete()
const device_type CD2501E = &device_creator<cd2501e_device>;
-cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cd2501e_device::cd2501e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, CD2501E, "CD2501E", tag, owner, clock, "cd2501e", __FILE__)
{
}
@@ -1951,7 +1949,7 @@ cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, d
const device_type TMS5200 = &device_creator<tms5200_device>;
-tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms5200_device::tms5200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, TMS5200, "TMS5200", tag, owner, clock, "tms5200", __FILE__)
{
}
@@ -1959,7 +1957,7 @@ tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, d
const device_type CD2501ECD = &device_creator<cd2501ecd_device>;
-cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: tms5220_device(mconfig, CD2501ECD, "CD2501ECD", tag, owner, clock, "cd2501ecd", __FILE__)
{
}