summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/devcb.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-01-21 03:56:53 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-01-21 03:56:53 +0000
commita5668c2eb9d17e3e51f3230db68d3aec09c34507 (patch)
tree006e76de745dde9508f521d2d6998a00a979de1e /src/emu/devcb.c
parentc12ffe8e5f3932e69e9139dc362a0f4d124ce9ed (diff)
Made direct accessors for device configuration state. Currently they
just call through to the get info function. Removed old macros that wrapped calls.
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 81f0275fe42..f56e9448367 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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), 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.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
/* 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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), 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.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_write_line: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
/* 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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), 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.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
/* 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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_write8: unable to find CPU '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
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_get_name(device), 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.cstr());
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_get_name(device), device->tag.cstr());
+ fatalerror("devcb_resolve_write8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag.cstr());
/* write8 to write8 is direct */
if (config->writedevice != NULL)