summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/devcb.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-03-08 17:06:27 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-03-08 17:06:27 +0000
commitec586731b9a1d8bb7a4d48de9ada4e8905a4f74e (patch)
treeda971ef612bddc69e8d748f920ac52fe71d7c63b /src/emu/devcb.c
parent5826c45ea48778bd9bf513fef1311a77c447ff8e (diff)
Made device->tag and devconfig->tag into private member variables (m_tag).
Added inline tag() function to return a const char * version. Updated callers to use this instead of directly accessing tag.cstr() which was awkward.
Diffstat (limited to 'src/emu/devcb.c')
-rw-r--r--src/emu/devcb.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/emu/devcb.c b/src/emu/devcb.c
index f56e9448367..f989ce66ca4 100644
--- a/src/emu/devcb.c
+++ b/src/emu/devcb.c
@@ -43,7 +43,7 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea
{
resolved->target = device->machine->port(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->read = trampoline_read_port_to_read_line;
}
@@ -59,12 +59,12 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea
cpu = device->machine->device(config->tag);
if (cpu == NULL)
- fatalerror("devcb_resolve_read_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->target = resolved;
resolved->read = trampoline_read8_to_read_line;
resolved->realtarget = cpu->space(spacenum);
if (resolved->realtarget == NULL)
- fatalerror("devcb_resolve_read_line: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag());
resolved->real.readspace = config->readspace;
}
@@ -80,7 +80,7 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea
resolved->target = device->machine->device(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_read_line: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
/* read_line to read_line is direct */
if (config->readline != NULL)
@@ -130,7 +130,7 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w
{
resolved->target = device->machine->port(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_write_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->write = trampoline_write_port_to_write_line;
}
@@ -146,12 +146,12 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w
cpu = device->machine->device(config->tag);
if (cpu == NULL)
- fatalerror("devcb_resolve_write_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->target = resolved;
resolved->write = trampoline_write8_to_write_line;
resolved->realtarget = cpu->space(spacenum);
if (resolved->realtarget == NULL)
- fatalerror("devcb_resolve_write_line: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag());
resolved->real.writespace = config->writespace;
}
@@ -167,7 +167,7 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w
cpu = device->machine->device(config->tag);
if (cpu == NULL)
- fatalerror("devcb_resolve_write_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->target = resolved;
resolved->write = trampoline_writecpu_to_write_line;
resolved->realtarget = cpu;
@@ -186,7 +186,7 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w
resolved->target = device->machine->device(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_write_line: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
/* write_line to write_line is direct */
if (config->writeline != NULL)
@@ -230,7 +230,7 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf
{
resolved->target = device->machine->port(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_read8: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->read = trampoline_read_port_to_read8;
}
@@ -246,10 +246,10 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf
cpu = device->machine->device(config->tag);
if (cpu == NULL)
- fatalerror("devcb_resolve_read8: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->target = cpu->space(spacenum);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_read8: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag());
resolved->read = (read8_device_func)config->readspace;
}
@@ -258,7 +258,7 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf
{
resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : device->machine->device(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_read8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
/* read8 to read8 is direct */
if (config->readdevice != NULL)
@@ -301,7 +301,7 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c
{
resolved->target = device->machine->port(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->write = trampoline_write_port_to_write8;
}
@@ -317,10 +317,10 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c
cpu = device->machine->device(config->tag);
if (cpu == NULL)
- fatalerror("devcb_resolve_write8: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write8: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
resolved->target = cpu->space(spacenum);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_write8: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write8: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[spacenum], device->name(), device->tag());
resolved->write = (write8_device_func)config->writespace;
}
@@ -329,7 +329,7 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c
{
resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : device->machine->device(config->tag);
if (resolved->target == NULL)
- fatalerror("devcb_resolve_write8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
+ fatalerror("devcb_resolve_write8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag());
/* write8 to write8 is direct */
if (config->writedevice != NULL)