summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ti99_peb/peribox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ti99_peb/peribox.cpp')
-rw-r--r--src/devices/bus/ti99_peb/peribox.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp
index f91622742d1..6da994728bf 100644
--- a/src/devices/bus/ti99_peb/peribox.cpp
+++ b/src/devices/bus/ti99_peb/peribox.cpp
@@ -216,7 +216,7 @@ CRUCLK* 51||52 DBIN
#define PEBSLOT7 "slot7"
#define PEBSLOT8 "slot8"
-peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_device::peribox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__),
m_console_inta(*this),
m_console_intb(*this),
@@ -231,7 +231,7 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d
/*
Constructor called from subclasses.
*/
-peribox_device::peribox_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)
+peribox_device::peribox_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)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_console_inta(*this),
m_console_intb(*this),
@@ -327,7 +327,7 @@ void peribox_device::set_genmod(bool set)
*/
void peribox_device::inta_join(int slot, int state)
{
- if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag(), slot, state);
+ if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag().c_str(), slot, state);
if (state==ASSERT_LINE)
m_inta_flag |= (1 << slot);
else
@@ -338,7 +338,7 @@ void peribox_device::inta_join(int slot, int state)
void peribox_device::intb_join(int slot, int state)
{
- if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag(), slot, state);
+ if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag().c_str(), slot, state);
if (state==ASSERT_LINE)
m_intb_flag |= (1 << slot);
else
@@ -352,7 +352,7 @@ void peribox_device::intb_join(int slot, int state)
*/
void peribox_device::ready_join(int slot, int state)
{
- if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag(), state, slot);
+ if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag().c_str(), state, slot);
// We store the inverse state
if (state==CLEAR_LINE)
m_ready_flag |= (1 << slot);
@@ -369,7 +369,7 @@ void peribox_device::set_slot_loaded(int slot, peribox_slot_device* slotdev)
void peribox_device::device_start(void)
{
- if (TRACE_EMU) logerror("%s: started\n", tag());
+ if (TRACE_EMU) logerror("%s: started\n", tag().c_str());
// Resolve the callback lines to the console
m_console_inta.resolve();
@@ -378,10 +378,10 @@ void peribox_device::device_start(void)
if (TRACE_EMU)
{
- logerror("%s: AMA/B/C address prefix set to %05x\n", tag(), m_address_prefix);
+ logerror("%s: AMA/B/C address prefix set to %05x\n", tag().c_str(), m_address_prefix);
for (int i=2; i < 9; i++)
{
- logerror("%s: Slot %d = %s\n", tag(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag() : "EMPTY");
+ logerror("%s: Slot %d = %s\n", tag().c_str(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag().c_str() : "EMPTY");
}
}
}
@@ -443,7 +443,7 @@ machine_config_constructor peribox_device::device_mconfig_additions() const
A variant of the box used for the Geneve.
*****************************************************************************/
-peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_gen_device::peribox_gen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_GEN, "Peripheral expansion box Geneve", tag, owner, clock, "peribox_gen", __FILE__)
{
// The Geneve sits in slot 1; there is no prefix here - it can control
@@ -497,7 +497,7 @@ machine_config_constructor peribox_gen_device::device_mconfig_additions() const
A variant of the box used for the TI-99/8
*****************************************************************************/
-peribox_998_device::peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_998_device::peribox_998_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_998, "Peripheral expansion box 99/8", tag, owner, clock, "peribox_998", __FILE__)
{
m_address_prefix = 0x70000;
@@ -536,7 +536,7 @@ machine_config_constructor peribox_998_device::device_mconfig_additions() const
A variant of the box used for the SGCPU (aka TI-99/4P).
*****************************************************************************/
-peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_sg_device::peribox_sg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__)
{
m_address_prefix = 0x70000;
@@ -577,7 +577,7 @@ machine_config_constructor peribox_sg_device::device_mconfig_additions() const
obviously required.
*****************************************************************************/
-peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_ev_device::peribox_ev_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__)
{
m_address_prefix = 0x70000;
@@ -604,7 +604,7 @@ machine_config_constructor peribox_ev_device::device_mconfig_additions() const
int peribox_slot_device::get_index_from_tagname()
{
- const char *mytag = tag();
+ const char *mytag = tag().c_str();
int maxlen = strlen(mytag);
int i;
for (i=maxlen-1; i >=0; i--)
@@ -613,7 +613,7 @@ int peribox_slot_device::get_index_from_tagname()
return atoi(mytag+i+1);
}
-peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_slot_device::peribox_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr), m_slotnumber(0)
{
}